diff --git a/.gitignore b/.gitignore index b4b9525a..5a8bba06 100644 --- a/.gitignore +++ b/.gitignore @@ -24,3 +24,4 @@ runs run-data repo +src/generated/resources/.cache diff --git a/build.gradle b/build.gradle index 197022fd..ed8c8d51 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.97' + id 'net.neoforged.gradle.userdev' version '7.0.105' } version = mod_version @@ -24,8 +24,8 @@ base { archivesName = mod_id } -// Mojang ships Java 17 to end users in 1.18+, so your mod should target Java 17. -java.toolchain.languageVersion = JavaLanguageVersion.of(17) +// Mojang ships Java 21 to end users starting in 1.20.5, so mods should target Java 21. +java.toolchain.languageVersion = JavaLanguageVersion.of(21) minecraft.accessTransformers.file rootProject.file('src/main/resources/META-INF/accesstransformer.cfg') @@ -94,10 +94,6 @@ dependencies { // And its provides the option to then use net.minecraft as the group, and one of; client, server or joined as the module name, plus the game version as version. // For all intends and purposes: You can treat this dependency as if it is a normal library you would use. implementation "net.neoforged:neoforge:${neo_version}" - implementation "curse.maven:immersive-engineering-231951:${immersive_engineering_version}" - implementation "curse.maven:jade-324717:${jade_version}" - implementation "curse.maven:jei-238222:${jei_version}" - implementation "curse.maven:mekanism-268560:${mekanism_version}" // Example optional mod dependency with JEI // The JEI API is declared for compile time use, while the full JEI artifact is used at runtime @@ -142,7 +138,7 @@ tasks.withType(ProcessResources).configureEach { ] inputs.properties replaceProperties - filesMatching(['META-INF/mods.toml']) { + filesMatching(['META-INF/neoforge.mods.toml']) { expand replaceProperties } } diff --git a/gradle.properties b/gradle.properties index 42adb0b4..df2e12e0 100644 --- a/gradle.properties +++ b/gradle.properties @@ -1,32 +1,27 @@ # Sets default memory used for gradle commands. Can be overridden by user or command line properties. -#org.gradle.jvmargs= +org.gradle.jvmargs=-Xmx4G org.gradle.daemon=false org.gradle.debug=false #read more on this at https://github.com/neoforged/NeoGradle/blob/NG_7.0/README.md#apply-parchment-mappings # you can also find the latest versions at: https://parchmentmc.org/docs/getting-started -neogradle.subsystems.parchment.minecraftVersion=1.20.3 -neogradle.subsystems.parchment.mappingsVersion=2023.12.31 +neogradle.subsystems.parchment.minecraftVersion=1.20.4 +neogradle.subsystems.parchment.mappingsVersion=2024.04.14 # 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.4 +minecraft_version=1.20.5 # 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.4,1.21) +minecraft_version_range=[1.20.5,1.21) # The Neo version must agree with the Minecraft version to get a valid artifact -neo_version=20.4.235 +neo_version=20.5.21-beta # The Neo version range can use any version of Neo as bounds -neo_version_range=[20.4,) +neo_version_range=[20.5,) # The loader version range can only use the major version of FML as bounds loader_version_range=[2,) -immersive_engineering_version=5306499 -jade_version=5109393 -jei_version=5306217 -mekanism_version=5316226 - ## Mod Properties # The unique mod identifier for the mod. Must be lowercase in English locale. Must fit the regex [a-z][a-z0-9_]{1,63} @@ -37,7 +32,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=13.0.0 +mod_version=14.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/gradle/wrapper/gradle-wrapper.properties b/gradle/wrapper/gradle-wrapper.properties index a80b22ce..b82aa23a 100644 --- a/gradle/wrapper/gradle-wrapper.properties +++ b/gradle/wrapper/gradle-wrapper.properties @@ -1,6 +1,6 @@ distributionBase=GRADLE_USER_HOME distributionPath=wrapper/dists -distributionUrl=https\://services.gradle.org/distributions/gradle-8.6-bin.zip +distributionUrl=https\://services.gradle.org/distributions/gradle-8.7-bin.zip networkTimeout=10000 validateDistributionUrl=true zipStoreBase=GRADLE_USER_HOME diff --git a/src/main/resources/data/forge/tags/blocks/storage_blocks.json b/src/generated/resources/data/c/tags/blocks/storage_blocks.json similarity index 85% rename from src/main/resources/data/forge/tags/blocks/storage_blocks.json rename to src/generated/resources/data/c/tags/blocks/storage_blocks.json index 63edb1dd..3c4747a0 100644 --- a/src/main/resources/data/forge/tags/blocks/storage_blocks.json +++ b/src/generated/resources/data/c/tags/blocks/storage_blocks.json @@ -1,7 +1,5 @@ { - "replace": false, "values": [ - "floralis:plant_fibers_block", "floralis:white_dye_block", "floralis:light_gray_dye_block", "floralis:gray_dye_block", @@ -17,6 +15,7 @@ "floralis:blue_dye_block", "floralis:purple_dye_block", "floralis:magenta_dye_block", - "floralis:pink_dye_block" + "floralis:pink_dye_block", + "floralis:plant_fibers_block" ] } \ No newline at end of file diff --git a/src/main/resources/data/forge/tags/items/fertilizer.json b/src/generated/resources/data/c/tags/items/fertilizer.json similarity index 71% rename from src/main/resources/data/forge/tags/items/fertilizer.json rename to src/generated/resources/data/c/tags/items/fertilizer.json index e16cd584..c67fcde5 100644 --- a/src/main/resources/data/forge/tags/items/fertilizer.json +++ b/src/generated/resources/data/c/tags/items/fertilizer.json @@ -1,5 +1,4 @@ { - "replace": false, "values": [ "floralis:plant_fibers" ] diff --git a/src/main/resources/data/forge/tags/items/seeds.json b/src/generated/resources/data/c/tags/items/seeds.json similarity index 98% rename from src/main/resources/data/forge/tags/items/seeds.json rename to src/generated/resources/data/c/tags/items/seeds.json index 55cc0777..ff0008bf 100644 --- a/src/main/resources/data/forge/tags/items/seeds.json +++ b/src/generated/resources/data/c/tags/items/seeds.json @@ -1,5 +1,4 @@ { - "replace": false, "values": [ "floralis:white_flower_seeds", "floralis:light_gray_flower_seeds", diff --git a/src/main/resources/data/forge/tags/items/storage_blocks.json b/src/generated/resources/data/c/tags/items/storage_blocks.json similarity index 85% rename from src/main/resources/data/forge/tags/items/storage_blocks.json rename to src/generated/resources/data/c/tags/items/storage_blocks.json index 63edb1dd..3c4747a0 100644 --- a/src/main/resources/data/forge/tags/items/storage_blocks.json +++ b/src/generated/resources/data/c/tags/items/storage_blocks.json @@ -1,7 +1,5 @@ { - "replace": false, "values": [ - "floralis:plant_fibers_block", "floralis:white_dye_block", "floralis:light_gray_dye_block", "floralis:gray_dye_block", @@ -17,6 +15,7 @@ "floralis:blue_dye_block", "floralis:purple_dye_block", "floralis:magenta_dye_block", - "floralis:pink_dye_block" + "floralis:pink_dye_block", + "floralis:plant_fibers_block" ] } \ No newline at end of file diff --git a/src/generated/resources/data/floralis/advancements/recipes/misc/black_dye_block_from_black_dye.json b/src/generated/resources/data/floralis/advancements/recipes/misc/black_dye_block_from_black_dye.json new file mode 100644 index 00000000..91fca5b2 --- /dev/null +++ b/src/generated/resources/data/floralis/advancements/recipes/misc/black_dye_block_from_black_dye.json @@ -0,0 +1,32 @@ +{ + "parent": "minecraft:recipes/root", + "criteria": { + "has_black_dye": { + "conditions": { + "items": [ + { + "items": "minecraft:black_dye" + } + ] + }, + "trigger": "minecraft:inventory_changed" + }, + "has_the_recipe": { + "conditions": { + "recipe": "floralis:black_dye_block_from_black_dye" + }, + "trigger": "minecraft:recipe_unlocked" + } + }, + "requirements": [ + [ + "has_the_recipe", + "has_black_dye" + ] + ], + "rewards": { + "recipes": [ + "floralis:black_dye_block_from_black_dye" + ] + } +} \ No newline at end of file diff --git a/src/generated/resources/data/floralis/advancements/recipes/misc/black_dye_from_black_dye_block.json b/src/generated/resources/data/floralis/advancements/recipes/misc/black_dye_from_black_dye_block.json new file mode 100644 index 00000000..22600003 --- /dev/null +++ b/src/generated/resources/data/floralis/advancements/recipes/misc/black_dye_from_black_dye_block.json @@ -0,0 +1,32 @@ +{ + "parent": "minecraft:recipes/root", + "criteria": { + "has_black_dye_block": { + "conditions": { + "items": [ + { + "items": "floralis:black_dye_block" + } + ] + }, + "trigger": "minecraft:inventory_changed" + }, + "has_the_recipe": { + "conditions": { + "recipe": "floralis:black_dye_from_black_dye_block" + }, + "trigger": "minecraft:recipe_unlocked" + } + }, + "requirements": [ + [ + "has_the_recipe", + "has_black_dye_block" + ] + ], + "rewards": { + "recipes": [ + "floralis:black_dye_from_black_dye_block" + ] + } +} \ No newline at end of file diff --git a/src/generated/resources/data/floralis/advancements/recipes/misc/black_dye_from_smelting_black_petals.json b/src/generated/resources/data/floralis/advancements/recipes/misc/black_dye_from_smelting_black_petals.json new file mode 100644 index 00000000..1c7cb2e1 --- /dev/null +++ b/src/generated/resources/data/floralis/advancements/recipes/misc/black_dye_from_smelting_black_petals.json @@ -0,0 +1,32 @@ +{ + "parent": "minecraft:recipes/root", + "criteria": { + "has_black_petals": { + "conditions": { + "items": [ + { + "items": "floralis:black_petals" + } + ] + }, + "trigger": "minecraft:inventory_changed" + }, + "has_the_recipe": { + "conditions": { + "recipe": "floralis:black_dye_from_smelting_black_petals" + }, + "trigger": "minecraft:recipe_unlocked" + } + }, + "requirements": [ + [ + "has_the_recipe", + "has_black_petals" + ] + ], + "rewards": { + "recipes": [ + "floralis:black_dye_from_smelting_black_petals" + ] + } +} \ No newline at end of file diff --git a/src/generated/resources/data/floralis/advancements/recipes/misc/blue_dye_block_from_blue_dye.json b/src/generated/resources/data/floralis/advancements/recipes/misc/blue_dye_block_from_blue_dye.json new file mode 100644 index 00000000..ac51cf79 --- /dev/null +++ b/src/generated/resources/data/floralis/advancements/recipes/misc/blue_dye_block_from_blue_dye.json @@ -0,0 +1,32 @@ +{ + "parent": "minecraft:recipes/root", + "criteria": { + "has_blue_dye": { + "conditions": { + "items": [ + { + "items": "minecraft:blue_dye" + } + ] + }, + "trigger": "minecraft:inventory_changed" + }, + "has_the_recipe": { + "conditions": { + "recipe": "floralis:blue_dye_block_from_blue_dye" + }, + "trigger": "minecraft:recipe_unlocked" + } + }, + "requirements": [ + [ + "has_the_recipe", + "has_blue_dye" + ] + ], + "rewards": { + "recipes": [ + "floralis:blue_dye_block_from_blue_dye" + ] + } +} \ No newline at end of file diff --git a/src/generated/resources/data/floralis/advancements/recipes/misc/blue_dye_from_blue_dye_block.json b/src/generated/resources/data/floralis/advancements/recipes/misc/blue_dye_from_blue_dye_block.json new file mode 100644 index 00000000..2573559a --- /dev/null +++ b/src/generated/resources/data/floralis/advancements/recipes/misc/blue_dye_from_blue_dye_block.json @@ -0,0 +1,32 @@ +{ + "parent": "minecraft:recipes/root", + "criteria": { + "has_blue_dye_block": { + "conditions": { + "items": [ + { + "items": "floralis:blue_dye_block" + } + ] + }, + "trigger": "minecraft:inventory_changed" + }, + "has_the_recipe": { + "conditions": { + "recipe": "floralis:blue_dye_from_blue_dye_block" + }, + "trigger": "minecraft:recipe_unlocked" + } + }, + "requirements": [ + [ + "has_the_recipe", + "has_blue_dye_block" + ] + ], + "rewards": { + "recipes": [ + "floralis:blue_dye_from_blue_dye_block" + ] + } +} \ No newline at end of file diff --git a/src/generated/resources/data/floralis/advancements/recipes/misc/blue_dye_from_smelting_blue_petals.json b/src/generated/resources/data/floralis/advancements/recipes/misc/blue_dye_from_smelting_blue_petals.json new file mode 100644 index 00000000..e88f9be6 --- /dev/null +++ b/src/generated/resources/data/floralis/advancements/recipes/misc/blue_dye_from_smelting_blue_petals.json @@ -0,0 +1,32 @@ +{ + "parent": "minecraft:recipes/root", + "criteria": { + "has_blue_petals": { + "conditions": { + "items": [ + { + "items": "floralis:blue_petals" + } + ] + }, + "trigger": "minecraft:inventory_changed" + }, + "has_the_recipe": { + "conditions": { + "recipe": "floralis:blue_dye_from_smelting_blue_petals" + }, + "trigger": "minecraft:recipe_unlocked" + } + }, + "requirements": [ + [ + "has_the_recipe", + "has_blue_petals" + ] + ], + "rewards": { + "recipes": [ + "floralis:blue_dye_from_smelting_blue_petals" + ] + } +} \ No newline at end of file diff --git a/src/generated/resources/data/floralis/advancements/recipes/misc/brown_dye_block_from_brown_dye.json b/src/generated/resources/data/floralis/advancements/recipes/misc/brown_dye_block_from_brown_dye.json new file mode 100644 index 00000000..51fd3e4f --- /dev/null +++ b/src/generated/resources/data/floralis/advancements/recipes/misc/brown_dye_block_from_brown_dye.json @@ -0,0 +1,32 @@ +{ + "parent": "minecraft:recipes/root", + "criteria": { + "has_brown_dye": { + "conditions": { + "items": [ + { + "items": "minecraft:brown_dye" + } + ] + }, + "trigger": "minecraft:inventory_changed" + }, + "has_the_recipe": { + "conditions": { + "recipe": "floralis:brown_dye_block_from_brown_dye" + }, + "trigger": "minecraft:recipe_unlocked" + } + }, + "requirements": [ + [ + "has_the_recipe", + "has_brown_dye" + ] + ], + "rewards": { + "recipes": [ + "floralis:brown_dye_block_from_brown_dye" + ] + } +} \ No newline at end of file diff --git a/src/generated/resources/data/floralis/advancements/recipes/misc/brown_dye_from_brown_dye_block.json b/src/generated/resources/data/floralis/advancements/recipes/misc/brown_dye_from_brown_dye_block.json new file mode 100644 index 00000000..d751e38b --- /dev/null +++ b/src/generated/resources/data/floralis/advancements/recipes/misc/brown_dye_from_brown_dye_block.json @@ -0,0 +1,32 @@ +{ + "parent": "minecraft:recipes/root", + "criteria": { + "has_brown_dye_block": { + "conditions": { + "items": [ + { + "items": "floralis:brown_dye_block" + } + ] + }, + "trigger": "minecraft:inventory_changed" + }, + "has_the_recipe": { + "conditions": { + "recipe": "floralis:brown_dye_from_brown_dye_block" + }, + "trigger": "minecraft:recipe_unlocked" + } + }, + "requirements": [ + [ + "has_the_recipe", + "has_brown_dye_block" + ] + ], + "rewards": { + "recipes": [ + "floralis:brown_dye_from_brown_dye_block" + ] + } +} \ No newline at end of file diff --git a/src/generated/resources/data/floralis/advancements/recipes/misc/brown_dye_from_smelting_brown_petals.json b/src/generated/resources/data/floralis/advancements/recipes/misc/brown_dye_from_smelting_brown_petals.json new file mode 100644 index 00000000..143ad444 --- /dev/null +++ b/src/generated/resources/data/floralis/advancements/recipes/misc/brown_dye_from_smelting_brown_petals.json @@ -0,0 +1,32 @@ +{ + "parent": "minecraft:recipes/root", + "criteria": { + "has_brown_petals": { + "conditions": { + "items": [ + { + "items": "floralis:brown_petals" + } + ] + }, + "trigger": "minecraft:inventory_changed" + }, + "has_the_recipe": { + "conditions": { + "recipe": "floralis:brown_dye_from_smelting_brown_petals" + }, + "trigger": "minecraft:recipe_unlocked" + } + }, + "requirements": [ + [ + "has_the_recipe", + "has_brown_petals" + ] + ], + "rewards": { + "recipes": [ + "floralis:brown_dye_from_smelting_brown_petals" + ] + } +} \ No newline at end of file diff --git a/src/generated/resources/data/floralis/advancements/recipes/misc/cyan_dye_block_from_cyan_dye.json b/src/generated/resources/data/floralis/advancements/recipes/misc/cyan_dye_block_from_cyan_dye.json new file mode 100644 index 00000000..b2ca8356 --- /dev/null +++ b/src/generated/resources/data/floralis/advancements/recipes/misc/cyan_dye_block_from_cyan_dye.json @@ -0,0 +1,32 @@ +{ + "parent": "minecraft:recipes/root", + "criteria": { + "has_cyan_dye": { + "conditions": { + "items": [ + { + "items": "minecraft:cyan_dye" + } + ] + }, + "trigger": "minecraft:inventory_changed" + }, + "has_the_recipe": { + "conditions": { + "recipe": "floralis:cyan_dye_block_from_cyan_dye" + }, + "trigger": "minecraft:recipe_unlocked" + } + }, + "requirements": [ + [ + "has_the_recipe", + "has_cyan_dye" + ] + ], + "rewards": { + "recipes": [ + "floralis:cyan_dye_block_from_cyan_dye" + ] + } +} \ No newline at end of file diff --git a/src/generated/resources/data/floralis/advancements/recipes/misc/cyan_dye_from_cyan_dye_block.json b/src/generated/resources/data/floralis/advancements/recipes/misc/cyan_dye_from_cyan_dye_block.json new file mode 100644 index 00000000..63534b8d --- /dev/null +++ b/src/generated/resources/data/floralis/advancements/recipes/misc/cyan_dye_from_cyan_dye_block.json @@ -0,0 +1,32 @@ +{ + "parent": "minecraft:recipes/root", + "criteria": { + "has_cyan_dye_block": { + "conditions": { + "items": [ + { + "items": "floralis:cyan_dye_block" + } + ] + }, + "trigger": "minecraft:inventory_changed" + }, + "has_the_recipe": { + "conditions": { + "recipe": "floralis:cyan_dye_from_cyan_dye_block" + }, + "trigger": "minecraft:recipe_unlocked" + } + }, + "requirements": [ + [ + "has_the_recipe", + "has_cyan_dye_block" + ] + ], + "rewards": { + "recipes": [ + "floralis:cyan_dye_from_cyan_dye_block" + ] + } +} \ No newline at end of file diff --git a/src/generated/resources/data/floralis/advancements/recipes/misc/cyan_dye_from_smelting_cyan_petals.json b/src/generated/resources/data/floralis/advancements/recipes/misc/cyan_dye_from_smelting_cyan_petals.json new file mode 100644 index 00000000..afed6217 --- /dev/null +++ b/src/generated/resources/data/floralis/advancements/recipes/misc/cyan_dye_from_smelting_cyan_petals.json @@ -0,0 +1,32 @@ +{ + "parent": "minecraft:recipes/root", + "criteria": { + "has_cyan_petals": { + "conditions": { + "items": [ + { + "items": "floralis:cyan_petals" + } + ] + }, + "trigger": "minecraft:inventory_changed" + }, + "has_the_recipe": { + "conditions": { + "recipe": "floralis:cyan_dye_from_smelting_cyan_petals" + }, + "trigger": "minecraft:recipe_unlocked" + } + }, + "requirements": [ + [ + "has_the_recipe", + "has_cyan_petals" + ] + ], + "rewards": { + "recipes": [ + "floralis:cyan_dye_from_smelting_cyan_petals" + ] + } +} \ No newline at end of file diff --git a/src/generated/resources/data/floralis/advancements/recipes/misc/gray_dye_block_from_gray_dye.json b/src/generated/resources/data/floralis/advancements/recipes/misc/gray_dye_block_from_gray_dye.json new file mode 100644 index 00000000..7bdbdff9 --- /dev/null +++ b/src/generated/resources/data/floralis/advancements/recipes/misc/gray_dye_block_from_gray_dye.json @@ -0,0 +1,32 @@ +{ + "parent": "minecraft:recipes/root", + "criteria": { + "has_gray_dye": { + "conditions": { + "items": [ + { + "items": "minecraft:gray_dye" + } + ] + }, + "trigger": "minecraft:inventory_changed" + }, + "has_the_recipe": { + "conditions": { + "recipe": "floralis:gray_dye_block_from_gray_dye" + }, + "trigger": "minecraft:recipe_unlocked" + } + }, + "requirements": [ + [ + "has_the_recipe", + "has_gray_dye" + ] + ], + "rewards": { + "recipes": [ + "floralis:gray_dye_block_from_gray_dye" + ] + } +} \ No newline at end of file diff --git a/src/generated/resources/data/floralis/advancements/recipes/misc/gray_dye_from_gray_dye_block.json b/src/generated/resources/data/floralis/advancements/recipes/misc/gray_dye_from_gray_dye_block.json new file mode 100644 index 00000000..5e106b0b --- /dev/null +++ b/src/generated/resources/data/floralis/advancements/recipes/misc/gray_dye_from_gray_dye_block.json @@ -0,0 +1,32 @@ +{ + "parent": "minecraft:recipes/root", + "criteria": { + "has_gray_dye_block": { + "conditions": { + "items": [ + { + "items": "floralis:gray_dye_block" + } + ] + }, + "trigger": "minecraft:inventory_changed" + }, + "has_the_recipe": { + "conditions": { + "recipe": "floralis:gray_dye_from_gray_dye_block" + }, + "trigger": "minecraft:recipe_unlocked" + } + }, + "requirements": [ + [ + "has_the_recipe", + "has_gray_dye_block" + ] + ], + "rewards": { + "recipes": [ + "floralis:gray_dye_from_gray_dye_block" + ] + } +} \ No newline at end of file diff --git a/src/generated/resources/data/floralis/advancements/recipes/misc/gray_dye_from_smelting_gray_petals.json b/src/generated/resources/data/floralis/advancements/recipes/misc/gray_dye_from_smelting_gray_petals.json new file mode 100644 index 00000000..720c0389 --- /dev/null +++ b/src/generated/resources/data/floralis/advancements/recipes/misc/gray_dye_from_smelting_gray_petals.json @@ -0,0 +1,32 @@ +{ + "parent": "minecraft:recipes/root", + "criteria": { + "has_gray_petals": { + "conditions": { + "items": [ + { + "items": "floralis:gray_petals" + } + ] + }, + "trigger": "minecraft:inventory_changed" + }, + "has_the_recipe": { + "conditions": { + "recipe": "floralis:gray_dye_from_smelting_gray_petals" + }, + "trigger": "minecraft:recipe_unlocked" + } + }, + "requirements": [ + [ + "has_the_recipe", + "has_gray_petals" + ] + ], + "rewards": { + "recipes": [ + "floralis:gray_dye_from_smelting_gray_petals" + ] + } +} \ No newline at end of file diff --git a/src/generated/resources/data/floralis/advancements/recipes/misc/green_dye_block_from_green_dye.json b/src/generated/resources/data/floralis/advancements/recipes/misc/green_dye_block_from_green_dye.json new file mode 100644 index 00000000..db7f545e --- /dev/null +++ b/src/generated/resources/data/floralis/advancements/recipes/misc/green_dye_block_from_green_dye.json @@ -0,0 +1,32 @@ +{ + "parent": "minecraft:recipes/root", + "criteria": { + "has_green_dye": { + "conditions": { + "items": [ + { + "items": "minecraft:green_dye" + } + ] + }, + "trigger": "minecraft:inventory_changed" + }, + "has_the_recipe": { + "conditions": { + "recipe": "floralis:green_dye_block_from_green_dye" + }, + "trigger": "minecraft:recipe_unlocked" + } + }, + "requirements": [ + [ + "has_the_recipe", + "has_green_dye" + ] + ], + "rewards": { + "recipes": [ + "floralis:green_dye_block_from_green_dye" + ] + } +} \ No newline at end of file diff --git a/src/generated/resources/data/floralis/advancements/recipes/misc/green_dye_from_green_dye_block.json b/src/generated/resources/data/floralis/advancements/recipes/misc/green_dye_from_green_dye_block.json new file mode 100644 index 00000000..667b0f73 --- /dev/null +++ b/src/generated/resources/data/floralis/advancements/recipes/misc/green_dye_from_green_dye_block.json @@ -0,0 +1,32 @@ +{ + "parent": "minecraft:recipes/root", + "criteria": { + "has_green_dye_block": { + "conditions": { + "items": [ + { + "items": "floralis:green_dye_block" + } + ] + }, + "trigger": "minecraft:inventory_changed" + }, + "has_the_recipe": { + "conditions": { + "recipe": "floralis:green_dye_from_green_dye_block" + }, + "trigger": "minecraft:recipe_unlocked" + } + }, + "requirements": [ + [ + "has_the_recipe", + "has_green_dye_block" + ] + ], + "rewards": { + "recipes": [ + "floralis:green_dye_from_green_dye_block" + ] + } +} \ No newline at end of file diff --git a/src/generated/resources/data/floralis/advancements/recipes/misc/green_dye_from_smelting_green_petals.json b/src/generated/resources/data/floralis/advancements/recipes/misc/green_dye_from_smelting_green_petals.json new file mode 100644 index 00000000..63fb3c8c --- /dev/null +++ b/src/generated/resources/data/floralis/advancements/recipes/misc/green_dye_from_smelting_green_petals.json @@ -0,0 +1,32 @@ +{ + "parent": "minecraft:recipes/root", + "criteria": { + "has_green_petals": { + "conditions": { + "items": [ + { + "items": "floralis:green_petals" + } + ] + }, + "trigger": "minecraft:inventory_changed" + }, + "has_the_recipe": { + "conditions": { + "recipe": "floralis:green_dye_from_smelting_green_petals" + }, + "trigger": "minecraft:recipe_unlocked" + } + }, + "requirements": [ + [ + "has_the_recipe", + "has_green_petals" + ] + ], + "rewards": { + "recipes": [ + "floralis:green_dye_from_smelting_green_petals" + ] + } +} \ No newline at end of file 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/advancements/recipes/misc/light_blue_dye_block_from_light_blue_dye.json new file mode 100644 index 00000000..2e24b974 --- /dev/null +++ b/src/generated/resources/data/floralis/advancements/recipes/misc/light_blue_dye_block_from_light_blue_dye.json @@ -0,0 +1,32 @@ +{ + "parent": "minecraft:recipes/root", + "criteria": { + "has_light_blue_dye": { + "conditions": { + "items": [ + { + "items": "minecraft:light_blue_dye" + } + ] + }, + "trigger": "minecraft:inventory_changed" + }, + "has_the_recipe": { + "conditions": { + "recipe": "floralis:light_blue_dye_block_from_light_blue_dye" + }, + "trigger": "minecraft:recipe_unlocked" + } + }, + "requirements": [ + [ + "has_the_recipe", + "has_light_blue_dye" + ] + ], + "rewards": { + "recipes": [ + "floralis:light_blue_dye_block_from_light_blue_dye" + ] + } +} \ No newline at end of file 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/advancements/recipes/misc/light_blue_dye_from_light_blue_dye_block.json new file mode 100644 index 00000000..8157748d --- /dev/null +++ b/src/generated/resources/data/floralis/advancements/recipes/misc/light_blue_dye_from_light_blue_dye_block.json @@ -0,0 +1,32 @@ +{ + "parent": "minecraft:recipes/root", + "criteria": { + "has_light_blue_dye_block": { + "conditions": { + "items": [ + { + "items": "floralis:light_blue_dye_block" + } + ] + }, + "trigger": "minecraft:inventory_changed" + }, + "has_the_recipe": { + "conditions": { + "recipe": "floralis:light_blue_dye_from_light_blue_dye_block" + }, + "trigger": "minecraft:recipe_unlocked" + } + }, + "requirements": [ + [ + "has_the_recipe", + "has_light_blue_dye_block" + ] + ], + "rewards": { + "recipes": [ + "floralis:light_blue_dye_from_light_blue_dye_block" + ] + } +} \ No newline at end of file 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/advancements/recipes/misc/light_blue_dye_from_smelting_light_blue_petals.json new file mode 100644 index 00000000..50c798b4 --- /dev/null +++ b/src/generated/resources/data/floralis/advancements/recipes/misc/light_blue_dye_from_smelting_light_blue_petals.json @@ -0,0 +1,32 @@ +{ + "parent": "minecraft:recipes/root", + "criteria": { + "has_light_blue_petals": { + "conditions": { + "items": [ + { + "items": "floralis:light_blue_petals" + } + ] + }, + "trigger": "minecraft:inventory_changed" + }, + "has_the_recipe": { + "conditions": { + "recipe": "floralis:light_blue_dye_from_smelting_light_blue_petals" + }, + "trigger": "minecraft:recipe_unlocked" + } + }, + "requirements": [ + [ + "has_the_recipe", + "has_light_blue_petals" + ] + ], + "rewards": { + "recipes": [ + "floralis:light_blue_dye_from_smelting_light_blue_petals" + ] + } +} \ No newline at end of file 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/advancements/recipes/misc/light_gray_dye_block_from_light_gray_dye.json new file mode 100644 index 00000000..b48f5b12 --- /dev/null +++ b/src/generated/resources/data/floralis/advancements/recipes/misc/light_gray_dye_block_from_light_gray_dye.json @@ -0,0 +1,32 @@ +{ + "parent": "minecraft:recipes/root", + "criteria": { + "has_light_gray_dye": { + "conditions": { + "items": [ + { + "items": "minecraft:light_gray_dye" + } + ] + }, + "trigger": "minecraft:inventory_changed" + }, + "has_the_recipe": { + "conditions": { + "recipe": "floralis:light_gray_dye_block_from_light_gray_dye" + }, + "trigger": "minecraft:recipe_unlocked" + } + }, + "requirements": [ + [ + "has_the_recipe", + "has_light_gray_dye" + ] + ], + "rewards": { + "recipes": [ + "floralis:light_gray_dye_block_from_light_gray_dye" + ] + } +} \ No newline at end of file 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/advancements/recipes/misc/light_gray_dye_from_light_gray_dye_block.json new file mode 100644 index 00000000..353903a3 --- /dev/null +++ b/src/generated/resources/data/floralis/advancements/recipes/misc/light_gray_dye_from_light_gray_dye_block.json @@ -0,0 +1,32 @@ +{ + "parent": "minecraft:recipes/root", + "criteria": { + "has_light_gray_dye_block": { + "conditions": { + "items": [ + { + "items": "floralis:light_gray_dye_block" + } + ] + }, + "trigger": "minecraft:inventory_changed" + }, + "has_the_recipe": { + "conditions": { + "recipe": "floralis:light_gray_dye_from_light_gray_dye_block" + }, + "trigger": "minecraft:recipe_unlocked" + } + }, + "requirements": [ + [ + "has_the_recipe", + "has_light_gray_dye_block" + ] + ], + "rewards": { + "recipes": [ + "floralis:light_gray_dye_from_light_gray_dye_block" + ] + } +} \ No newline at end of file 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/advancements/recipes/misc/light_gray_dye_from_smelting_light_gray_petals.json new file mode 100644 index 00000000..53e8766d --- /dev/null +++ b/src/generated/resources/data/floralis/advancements/recipes/misc/light_gray_dye_from_smelting_light_gray_petals.json @@ -0,0 +1,32 @@ +{ + "parent": "minecraft:recipes/root", + "criteria": { + "has_light_gray_petals": { + "conditions": { + "items": [ + { + "items": "floralis:light_gray_petals" + } + ] + }, + "trigger": "minecraft:inventory_changed" + }, + "has_the_recipe": { + "conditions": { + "recipe": "floralis:light_gray_dye_from_smelting_light_gray_petals" + }, + "trigger": "minecraft:recipe_unlocked" + } + }, + "requirements": [ + [ + "has_the_recipe", + "has_light_gray_petals" + ] + ], + "rewards": { + "recipes": [ + "floralis:light_gray_dye_from_smelting_light_gray_petals" + ] + } +} \ No newline at end of file diff --git a/src/generated/resources/data/floralis/advancements/recipes/misc/lime_dye_block_from_lime_dye.json b/src/generated/resources/data/floralis/advancements/recipes/misc/lime_dye_block_from_lime_dye.json new file mode 100644 index 00000000..c582b9c3 --- /dev/null +++ b/src/generated/resources/data/floralis/advancements/recipes/misc/lime_dye_block_from_lime_dye.json @@ -0,0 +1,32 @@ +{ + "parent": "minecraft:recipes/root", + "criteria": { + "has_lime_dye": { + "conditions": { + "items": [ + { + "items": "minecraft:lime_dye" + } + ] + }, + "trigger": "minecraft:inventory_changed" + }, + "has_the_recipe": { + "conditions": { + "recipe": "floralis:lime_dye_block_from_lime_dye" + }, + "trigger": "minecraft:recipe_unlocked" + } + }, + "requirements": [ + [ + "has_the_recipe", + "has_lime_dye" + ] + ], + "rewards": { + "recipes": [ + "floralis:lime_dye_block_from_lime_dye" + ] + } +} \ No newline at end of file diff --git a/src/generated/resources/data/floralis/advancements/recipes/misc/lime_dye_from_lime_dye_block.json b/src/generated/resources/data/floralis/advancements/recipes/misc/lime_dye_from_lime_dye_block.json new file mode 100644 index 00000000..e08d3ba9 --- /dev/null +++ b/src/generated/resources/data/floralis/advancements/recipes/misc/lime_dye_from_lime_dye_block.json @@ -0,0 +1,32 @@ +{ + "parent": "minecraft:recipes/root", + "criteria": { + "has_lime_dye_block": { + "conditions": { + "items": [ + { + "items": "floralis:lime_dye_block" + } + ] + }, + "trigger": "minecraft:inventory_changed" + }, + "has_the_recipe": { + "conditions": { + "recipe": "floralis:lime_dye_from_lime_dye_block" + }, + "trigger": "minecraft:recipe_unlocked" + } + }, + "requirements": [ + [ + "has_the_recipe", + "has_lime_dye_block" + ] + ], + "rewards": { + "recipes": [ + "floralis:lime_dye_from_lime_dye_block" + ] + } +} \ No newline at end of file diff --git a/src/generated/resources/data/floralis/advancements/recipes/misc/lime_dye_from_smelting_lime_petals.json b/src/generated/resources/data/floralis/advancements/recipes/misc/lime_dye_from_smelting_lime_petals.json new file mode 100644 index 00000000..77d4e2ff --- /dev/null +++ b/src/generated/resources/data/floralis/advancements/recipes/misc/lime_dye_from_smelting_lime_petals.json @@ -0,0 +1,32 @@ +{ + "parent": "minecraft:recipes/root", + "criteria": { + "has_lime_petals": { + "conditions": { + "items": [ + { + "items": "floralis:lime_petals" + } + ] + }, + "trigger": "minecraft:inventory_changed" + }, + "has_the_recipe": { + "conditions": { + "recipe": "floralis:lime_dye_from_smelting_lime_petals" + }, + "trigger": "minecraft:recipe_unlocked" + } + }, + "requirements": [ + [ + "has_the_recipe", + "has_lime_petals" + ] + ], + "rewards": { + "recipes": [ + "floralis:lime_dye_from_smelting_lime_petals" + ] + } +} \ No newline at end of file diff --git a/src/generated/resources/data/floralis/advancements/recipes/misc/magenta_dye_block_from_magenta_dye.json b/src/generated/resources/data/floralis/advancements/recipes/misc/magenta_dye_block_from_magenta_dye.json new file mode 100644 index 00000000..74e49b37 --- /dev/null +++ b/src/generated/resources/data/floralis/advancements/recipes/misc/magenta_dye_block_from_magenta_dye.json @@ -0,0 +1,32 @@ +{ + "parent": "minecraft:recipes/root", + "criteria": { + "has_magenta_dye": { + "conditions": { + "items": [ + { + "items": "minecraft:magenta_dye" + } + ] + }, + "trigger": "minecraft:inventory_changed" + }, + "has_the_recipe": { + "conditions": { + "recipe": "floralis:magenta_dye_block_from_magenta_dye" + }, + "trigger": "minecraft:recipe_unlocked" + } + }, + "requirements": [ + [ + "has_the_recipe", + "has_magenta_dye" + ] + ], + "rewards": { + "recipes": [ + "floralis:magenta_dye_block_from_magenta_dye" + ] + } +} \ No newline at end of file diff --git a/src/generated/resources/data/floralis/advancements/recipes/misc/magenta_dye_from_magenta_dye_block.json b/src/generated/resources/data/floralis/advancements/recipes/misc/magenta_dye_from_magenta_dye_block.json new file mode 100644 index 00000000..72b0715b --- /dev/null +++ b/src/generated/resources/data/floralis/advancements/recipes/misc/magenta_dye_from_magenta_dye_block.json @@ -0,0 +1,32 @@ +{ + "parent": "minecraft:recipes/root", + "criteria": { + "has_magenta_dye_block": { + "conditions": { + "items": [ + { + "items": "floralis:magenta_dye_block" + } + ] + }, + "trigger": "minecraft:inventory_changed" + }, + "has_the_recipe": { + "conditions": { + "recipe": "floralis:magenta_dye_from_magenta_dye_block" + }, + "trigger": "minecraft:recipe_unlocked" + } + }, + "requirements": [ + [ + "has_the_recipe", + "has_magenta_dye_block" + ] + ], + "rewards": { + "recipes": [ + "floralis:magenta_dye_from_magenta_dye_block" + ] + } +} \ No newline at end of file diff --git a/src/generated/resources/data/floralis/advancements/recipes/misc/magenta_dye_from_smelting_magenta_petals.json b/src/generated/resources/data/floralis/advancements/recipes/misc/magenta_dye_from_smelting_magenta_petals.json new file mode 100644 index 00000000..180d9c53 --- /dev/null +++ b/src/generated/resources/data/floralis/advancements/recipes/misc/magenta_dye_from_smelting_magenta_petals.json @@ -0,0 +1,32 @@ +{ + "parent": "minecraft:recipes/root", + "criteria": { + "has_magenta_petals": { + "conditions": { + "items": [ + { + "items": "floralis:magenta_petals" + } + ] + }, + "trigger": "minecraft:inventory_changed" + }, + "has_the_recipe": { + "conditions": { + "recipe": "floralis:magenta_dye_from_smelting_magenta_petals" + }, + "trigger": "minecraft:recipe_unlocked" + } + }, + "requirements": [ + [ + "has_the_recipe", + "has_magenta_petals" + ] + ], + "rewards": { + "recipes": [ + "floralis:magenta_dye_from_smelting_magenta_petals" + ] + } +} \ No newline at end of file diff --git a/src/generated/resources/data/floralis/advancements/recipes/misc/orange_dye_block_from_orange_dye.json b/src/generated/resources/data/floralis/advancements/recipes/misc/orange_dye_block_from_orange_dye.json new file mode 100644 index 00000000..771b49bb --- /dev/null +++ b/src/generated/resources/data/floralis/advancements/recipes/misc/orange_dye_block_from_orange_dye.json @@ -0,0 +1,32 @@ +{ + "parent": "minecraft:recipes/root", + "criteria": { + "has_orange_dye": { + "conditions": { + "items": [ + { + "items": "minecraft:orange_dye" + } + ] + }, + "trigger": "minecraft:inventory_changed" + }, + "has_the_recipe": { + "conditions": { + "recipe": "floralis:orange_dye_block_from_orange_dye" + }, + "trigger": "minecraft:recipe_unlocked" + } + }, + "requirements": [ + [ + "has_the_recipe", + "has_orange_dye" + ] + ], + "rewards": { + "recipes": [ + "floralis:orange_dye_block_from_orange_dye" + ] + } +} \ No newline at end of file diff --git a/src/generated/resources/data/floralis/advancements/recipes/misc/orange_dye_from_orange_dye_block.json b/src/generated/resources/data/floralis/advancements/recipes/misc/orange_dye_from_orange_dye_block.json new file mode 100644 index 00000000..77508ee5 --- /dev/null +++ b/src/generated/resources/data/floralis/advancements/recipes/misc/orange_dye_from_orange_dye_block.json @@ -0,0 +1,32 @@ +{ + "parent": "minecraft:recipes/root", + "criteria": { + "has_orange_dye_block": { + "conditions": { + "items": [ + { + "items": "floralis:orange_dye_block" + } + ] + }, + "trigger": "minecraft:inventory_changed" + }, + "has_the_recipe": { + "conditions": { + "recipe": "floralis:orange_dye_from_orange_dye_block" + }, + "trigger": "minecraft:recipe_unlocked" + } + }, + "requirements": [ + [ + "has_the_recipe", + "has_orange_dye_block" + ] + ], + "rewards": { + "recipes": [ + "floralis:orange_dye_from_orange_dye_block" + ] + } +} \ No newline at end of file diff --git a/src/generated/resources/data/floralis/advancements/recipes/misc/orange_dye_from_smelting_orange_petals.json b/src/generated/resources/data/floralis/advancements/recipes/misc/orange_dye_from_smelting_orange_petals.json new file mode 100644 index 00000000..c146aca9 --- /dev/null +++ b/src/generated/resources/data/floralis/advancements/recipes/misc/orange_dye_from_smelting_orange_petals.json @@ -0,0 +1,32 @@ +{ + "parent": "minecraft:recipes/root", + "criteria": { + "has_orange_petals": { + "conditions": { + "items": [ + { + "items": "floralis:orange_petals" + } + ] + }, + "trigger": "minecraft:inventory_changed" + }, + "has_the_recipe": { + "conditions": { + "recipe": "floralis:orange_dye_from_smelting_orange_petals" + }, + "trigger": "minecraft:recipe_unlocked" + } + }, + "requirements": [ + [ + "has_the_recipe", + "has_orange_petals" + ] + ], + "rewards": { + "recipes": [ + "floralis:orange_dye_from_smelting_orange_petals" + ] + } +} \ No newline at end of file diff --git a/src/generated/resources/data/floralis/advancements/recipes/misc/pink_dye_block_from_pink_dye.json b/src/generated/resources/data/floralis/advancements/recipes/misc/pink_dye_block_from_pink_dye.json new file mode 100644 index 00000000..8712bdc0 --- /dev/null +++ b/src/generated/resources/data/floralis/advancements/recipes/misc/pink_dye_block_from_pink_dye.json @@ -0,0 +1,32 @@ +{ + "parent": "minecraft:recipes/root", + "criteria": { + "has_pink_dye": { + "conditions": { + "items": [ + { + "items": "minecraft:pink_dye" + } + ] + }, + "trigger": "minecraft:inventory_changed" + }, + "has_the_recipe": { + "conditions": { + "recipe": "floralis:pink_dye_block_from_pink_dye" + }, + "trigger": "minecraft:recipe_unlocked" + } + }, + "requirements": [ + [ + "has_the_recipe", + "has_pink_dye" + ] + ], + "rewards": { + "recipes": [ + "floralis:pink_dye_block_from_pink_dye" + ] + } +} \ No newline at end of file diff --git a/src/generated/resources/data/floralis/advancements/recipes/misc/pink_dye_from_pink_dye_block.json b/src/generated/resources/data/floralis/advancements/recipes/misc/pink_dye_from_pink_dye_block.json new file mode 100644 index 00000000..0864dfcd --- /dev/null +++ b/src/generated/resources/data/floralis/advancements/recipes/misc/pink_dye_from_pink_dye_block.json @@ -0,0 +1,32 @@ +{ + "parent": "minecraft:recipes/root", + "criteria": { + "has_pink_dye_block": { + "conditions": { + "items": [ + { + "items": "floralis:pink_dye_block" + } + ] + }, + "trigger": "minecraft:inventory_changed" + }, + "has_the_recipe": { + "conditions": { + "recipe": "floralis:pink_dye_from_pink_dye_block" + }, + "trigger": "minecraft:recipe_unlocked" + } + }, + "requirements": [ + [ + "has_the_recipe", + "has_pink_dye_block" + ] + ], + "rewards": { + "recipes": [ + "floralis:pink_dye_from_pink_dye_block" + ] + } +} \ No newline at end of file diff --git a/src/generated/resources/data/floralis/advancements/recipes/misc/pink_dye_from_smelting_pink_petals.json b/src/generated/resources/data/floralis/advancements/recipes/misc/pink_dye_from_smelting_pink_petals.json new file mode 100644 index 00000000..c7fc49c6 --- /dev/null +++ b/src/generated/resources/data/floralis/advancements/recipes/misc/pink_dye_from_smelting_pink_petals.json @@ -0,0 +1,32 @@ +{ + "parent": "minecraft:recipes/root", + "criteria": { + "has_pink_petals": { + "conditions": { + "items": [ + { + "items": "floralis:pink_petals" + } + ] + }, + "trigger": "minecraft:inventory_changed" + }, + "has_the_recipe": { + "conditions": { + "recipe": "floralis:pink_dye_from_smelting_pink_petals" + }, + "trigger": "minecraft:recipe_unlocked" + } + }, + "requirements": [ + [ + "has_the_recipe", + "has_pink_petals" + ] + ], + "rewards": { + "recipes": [ + "floralis:pink_dye_from_smelting_pink_petals" + ] + } +} \ No newline at end of file diff --git a/src/generated/resources/data/floralis/advancements/recipes/misc/plant_fibers_block_from_plant_fibers.json b/src/generated/resources/data/floralis/advancements/recipes/misc/plant_fibers_block_from_plant_fibers.json new file mode 100644 index 00000000..6ba59335 --- /dev/null +++ b/src/generated/resources/data/floralis/advancements/recipes/misc/plant_fibers_block_from_plant_fibers.json @@ -0,0 +1,32 @@ +{ + "parent": "minecraft:recipes/root", + "criteria": { + "has_plant_fibers": { + "conditions": { + "items": [ + { + "items": "floralis:plant_fibers" + } + ] + }, + "trigger": "minecraft:inventory_changed" + }, + "has_the_recipe": { + "conditions": { + "recipe": "floralis:plant_fibers_block_from_plant_fibers" + }, + "trigger": "minecraft:recipe_unlocked" + } + }, + "requirements": [ + [ + "has_the_recipe", + "has_plant_fibers" + ] + ], + "rewards": { + "recipes": [ + "floralis:plant_fibers_block_from_plant_fibers" + ] + } +} \ No newline at end of file diff --git a/src/generated/resources/data/floralis/advancements/recipes/misc/plant_fibers_from_plant_fibers_block.json b/src/generated/resources/data/floralis/advancements/recipes/misc/plant_fibers_from_plant_fibers_block.json new file mode 100644 index 00000000..4aa5f68f --- /dev/null +++ b/src/generated/resources/data/floralis/advancements/recipes/misc/plant_fibers_from_plant_fibers_block.json @@ -0,0 +1,32 @@ +{ + "parent": "minecraft:recipes/root", + "criteria": { + "has_plant_fibers_block": { + "conditions": { + "items": [ + { + "items": "floralis:plant_fibers_block" + } + ] + }, + "trigger": "minecraft:inventory_changed" + }, + "has_the_recipe": { + "conditions": { + "recipe": "floralis:plant_fibers_from_plant_fibers_block" + }, + "trigger": "minecraft:recipe_unlocked" + } + }, + "requirements": [ + [ + "has_the_recipe", + "has_plant_fibers_block" + ] + ], + "rewards": { + "recipes": [ + "floralis:plant_fibers_from_plant_fibers_block" + ] + } +} \ No newline at end of file diff --git a/src/generated/resources/data/floralis/advancements/recipes/misc/purple_dye_block_from_purple_dye.json b/src/generated/resources/data/floralis/advancements/recipes/misc/purple_dye_block_from_purple_dye.json new file mode 100644 index 00000000..a898e0ce --- /dev/null +++ b/src/generated/resources/data/floralis/advancements/recipes/misc/purple_dye_block_from_purple_dye.json @@ -0,0 +1,32 @@ +{ + "parent": "minecraft:recipes/root", + "criteria": { + "has_purple_dye": { + "conditions": { + "items": [ + { + "items": "minecraft:purple_dye" + } + ] + }, + "trigger": "minecraft:inventory_changed" + }, + "has_the_recipe": { + "conditions": { + "recipe": "floralis:purple_dye_block_from_purple_dye" + }, + "trigger": "minecraft:recipe_unlocked" + } + }, + "requirements": [ + [ + "has_the_recipe", + "has_purple_dye" + ] + ], + "rewards": { + "recipes": [ + "floralis:purple_dye_block_from_purple_dye" + ] + } +} \ No newline at end of file diff --git a/src/generated/resources/data/floralis/advancements/recipes/misc/purple_dye_from_purple_dye_block.json b/src/generated/resources/data/floralis/advancements/recipes/misc/purple_dye_from_purple_dye_block.json new file mode 100644 index 00000000..41de4b52 --- /dev/null +++ b/src/generated/resources/data/floralis/advancements/recipes/misc/purple_dye_from_purple_dye_block.json @@ -0,0 +1,32 @@ +{ + "parent": "minecraft:recipes/root", + "criteria": { + "has_purple_dye_block": { + "conditions": { + "items": [ + { + "items": "floralis:purple_dye_block" + } + ] + }, + "trigger": "minecraft:inventory_changed" + }, + "has_the_recipe": { + "conditions": { + "recipe": "floralis:purple_dye_from_purple_dye_block" + }, + "trigger": "minecraft:recipe_unlocked" + } + }, + "requirements": [ + [ + "has_the_recipe", + "has_purple_dye_block" + ] + ], + "rewards": { + "recipes": [ + "floralis:purple_dye_from_purple_dye_block" + ] + } +} \ No newline at end of file diff --git a/src/generated/resources/data/floralis/advancements/recipes/misc/purple_dye_from_smelting_purple_petals.json b/src/generated/resources/data/floralis/advancements/recipes/misc/purple_dye_from_smelting_purple_petals.json new file mode 100644 index 00000000..032b3195 --- /dev/null +++ b/src/generated/resources/data/floralis/advancements/recipes/misc/purple_dye_from_smelting_purple_petals.json @@ -0,0 +1,32 @@ +{ + "parent": "minecraft:recipes/root", + "criteria": { + "has_purple_petals": { + "conditions": { + "items": [ + { + "items": "floralis:purple_petals" + } + ] + }, + "trigger": "minecraft:inventory_changed" + }, + "has_the_recipe": { + "conditions": { + "recipe": "floralis:purple_dye_from_smelting_purple_petals" + }, + "trigger": "minecraft:recipe_unlocked" + } + }, + "requirements": [ + [ + "has_the_recipe", + "has_purple_petals" + ] + ], + "rewards": { + "recipes": [ + "floralis:purple_dye_from_smelting_purple_petals" + ] + } +} \ No newline at end of file diff --git a/src/generated/resources/data/floralis/advancements/recipes/misc/red_dye_block_from_red_dye.json b/src/generated/resources/data/floralis/advancements/recipes/misc/red_dye_block_from_red_dye.json new file mode 100644 index 00000000..8211615b --- /dev/null +++ b/src/generated/resources/data/floralis/advancements/recipes/misc/red_dye_block_from_red_dye.json @@ -0,0 +1,32 @@ +{ + "parent": "minecraft:recipes/root", + "criteria": { + "has_red_dye": { + "conditions": { + "items": [ + { + "items": "minecraft:red_dye" + } + ] + }, + "trigger": "minecraft:inventory_changed" + }, + "has_the_recipe": { + "conditions": { + "recipe": "floralis:red_dye_block_from_red_dye" + }, + "trigger": "minecraft:recipe_unlocked" + } + }, + "requirements": [ + [ + "has_the_recipe", + "has_red_dye" + ] + ], + "rewards": { + "recipes": [ + "floralis:red_dye_block_from_red_dye" + ] + } +} \ No newline at end of file diff --git a/src/generated/resources/data/floralis/advancements/recipes/misc/red_dye_from_red_dye_block.json b/src/generated/resources/data/floralis/advancements/recipes/misc/red_dye_from_red_dye_block.json new file mode 100644 index 00000000..c900247a --- /dev/null +++ b/src/generated/resources/data/floralis/advancements/recipes/misc/red_dye_from_red_dye_block.json @@ -0,0 +1,32 @@ +{ + "parent": "minecraft:recipes/root", + "criteria": { + "has_red_dye_block": { + "conditions": { + "items": [ + { + "items": "floralis:red_dye_block" + } + ] + }, + "trigger": "minecraft:inventory_changed" + }, + "has_the_recipe": { + "conditions": { + "recipe": "floralis:red_dye_from_red_dye_block" + }, + "trigger": "minecraft:recipe_unlocked" + } + }, + "requirements": [ + [ + "has_the_recipe", + "has_red_dye_block" + ] + ], + "rewards": { + "recipes": [ + "floralis:red_dye_from_red_dye_block" + ] + } +} \ No newline at end of file diff --git a/src/generated/resources/data/floralis/advancements/recipes/misc/red_dye_from_smelting_red_petals.json b/src/generated/resources/data/floralis/advancements/recipes/misc/red_dye_from_smelting_red_petals.json new file mode 100644 index 00000000..13e64683 --- /dev/null +++ b/src/generated/resources/data/floralis/advancements/recipes/misc/red_dye_from_smelting_red_petals.json @@ -0,0 +1,32 @@ +{ + "parent": "minecraft:recipes/root", + "criteria": { + "has_red_petals": { + "conditions": { + "items": [ + { + "items": "floralis:red_petals" + } + ] + }, + "trigger": "minecraft:inventory_changed" + }, + "has_the_recipe": { + "conditions": { + "recipe": "floralis:red_dye_from_smelting_red_petals" + }, + "trigger": "minecraft:recipe_unlocked" + } + }, + "requirements": [ + [ + "has_the_recipe", + "has_red_petals" + ] + ], + "rewards": { + "recipes": [ + "floralis:red_dye_from_smelting_red_petals" + ] + } +} \ No newline at end of file diff --git a/src/generated/resources/data/floralis/advancements/recipes/misc/white_dye_block_from_white_dye.json b/src/generated/resources/data/floralis/advancements/recipes/misc/white_dye_block_from_white_dye.json new file mode 100644 index 00000000..2ec3ee06 --- /dev/null +++ b/src/generated/resources/data/floralis/advancements/recipes/misc/white_dye_block_from_white_dye.json @@ -0,0 +1,32 @@ +{ + "parent": "minecraft:recipes/root", + "criteria": { + "has_the_recipe": { + "conditions": { + "recipe": "floralis:white_dye_block_from_white_dye" + }, + "trigger": "minecraft:recipe_unlocked" + }, + "has_white_dye": { + "conditions": { + "items": [ + { + "items": "minecraft:white_dye" + } + ] + }, + "trigger": "minecraft:inventory_changed" + } + }, + "requirements": [ + [ + "has_the_recipe", + "has_white_dye" + ] + ], + "rewards": { + "recipes": [ + "floralis:white_dye_block_from_white_dye" + ] + } +} \ No newline at end of file diff --git a/src/generated/resources/data/floralis/advancements/recipes/misc/white_dye_from_smelting_white_petals.json b/src/generated/resources/data/floralis/advancements/recipes/misc/white_dye_from_smelting_white_petals.json new file mode 100644 index 00000000..933dddba --- /dev/null +++ b/src/generated/resources/data/floralis/advancements/recipes/misc/white_dye_from_smelting_white_petals.json @@ -0,0 +1,32 @@ +{ + "parent": "minecraft:recipes/root", + "criteria": { + "has_the_recipe": { + "conditions": { + "recipe": "floralis:white_dye_from_smelting_white_petals" + }, + "trigger": "minecraft:recipe_unlocked" + }, + "has_white_petals": { + "conditions": { + "items": [ + { + "items": "floralis:white_petals" + } + ] + }, + "trigger": "minecraft:inventory_changed" + } + }, + "requirements": [ + [ + "has_the_recipe", + "has_white_petals" + ] + ], + "rewards": { + "recipes": [ + "floralis:white_dye_from_smelting_white_petals" + ] + } +} \ No newline at end of file diff --git a/src/generated/resources/data/floralis/advancements/recipes/misc/white_dye_from_white_dye_block.json b/src/generated/resources/data/floralis/advancements/recipes/misc/white_dye_from_white_dye_block.json new file mode 100644 index 00000000..345d33bc --- /dev/null +++ b/src/generated/resources/data/floralis/advancements/recipes/misc/white_dye_from_white_dye_block.json @@ -0,0 +1,32 @@ +{ + "parent": "minecraft:recipes/root", + "criteria": { + "has_the_recipe": { + "conditions": { + "recipe": "floralis:white_dye_from_white_dye_block" + }, + "trigger": "minecraft:recipe_unlocked" + }, + "has_white_dye_block": { + "conditions": { + "items": [ + { + "items": "floralis:white_dye_block" + } + ] + }, + "trigger": "minecraft:inventory_changed" + } + }, + "requirements": [ + [ + "has_the_recipe", + "has_white_dye_block" + ] + ], + "rewards": { + "recipes": [ + "floralis:white_dye_from_white_dye_block" + ] + } +} \ No newline at end of file diff --git a/src/generated/resources/data/floralis/advancements/recipes/misc/yellow_dye_block_from_yellow_dye.json b/src/generated/resources/data/floralis/advancements/recipes/misc/yellow_dye_block_from_yellow_dye.json new file mode 100644 index 00000000..6b07b8b5 --- /dev/null +++ b/src/generated/resources/data/floralis/advancements/recipes/misc/yellow_dye_block_from_yellow_dye.json @@ -0,0 +1,32 @@ +{ + "parent": "minecraft:recipes/root", + "criteria": { + "has_the_recipe": { + "conditions": { + "recipe": "floralis:yellow_dye_block_from_yellow_dye" + }, + "trigger": "minecraft:recipe_unlocked" + }, + "has_yellow_dye": { + "conditions": { + "items": [ + { + "items": "minecraft:yellow_dye" + } + ] + }, + "trigger": "minecraft:inventory_changed" + } + }, + "requirements": [ + [ + "has_the_recipe", + "has_yellow_dye" + ] + ], + "rewards": { + "recipes": [ + "floralis:yellow_dye_block_from_yellow_dye" + ] + } +} \ No newline at end of file diff --git a/src/generated/resources/data/floralis/advancements/recipes/misc/yellow_dye_from_smelting_yellow_petals.json b/src/generated/resources/data/floralis/advancements/recipes/misc/yellow_dye_from_smelting_yellow_petals.json new file mode 100644 index 00000000..8aa00ba2 --- /dev/null +++ b/src/generated/resources/data/floralis/advancements/recipes/misc/yellow_dye_from_smelting_yellow_petals.json @@ -0,0 +1,32 @@ +{ + "parent": "minecraft:recipes/root", + "criteria": { + "has_the_recipe": { + "conditions": { + "recipe": "floralis:yellow_dye_from_smelting_yellow_petals" + }, + "trigger": "minecraft:recipe_unlocked" + }, + "has_yellow_petals": { + "conditions": { + "items": [ + { + "items": "floralis:yellow_petals" + } + ] + }, + "trigger": "minecraft:inventory_changed" + } + }, + "requirements": [ + [ + "has_the_recipe", + "has_yellow_petals" + ] + ], + "rewards": { + "recipes": [ + "floralis:yellow_dye_from_smelting_yellow_petals" + ] + } +} \ No newline at end of file diff --git a/src/generated/resources/data/floralis/advancements/recipes/misc/yellow_dye_from_yellow_dye_block.json b/src/generated/resources/data/floralis/advancements/recipes/misc/yellow_dye_from_yellow_dye_block.json new file mode 100644 index 00000000..1913f872 --- /dev/null +++ b/src/generated/resources/data/floralis/advancements/recipes/misc/yellow_dye_from_yellow_dye_block.json @@ -0,0 +1,32 @@ +{ + "parent": "minecraft:recipes/root", + "criteria": { + "has_the_recipe": { + "conditions": { + "recipe": "floralis:yellow_dye_from_yellow_dye_block" + }, + "trigger": "minecraft:recipe_unlocked" + }, + "has_yellow_dye_block": { + "conditions": { + "items": [ + { + "items": "floralis:yellow_dye_block" + } + ] + }, + "trigger": "minecraft:inventory_changed" + } + }, + "requirements": [ + [ + "has_the_recipe", + "has_yellow_dye_block" + ] + ], + "rewards": { + "recipes": [ + "floralis:yellow_dye_from_yellow_dye_block" + ] + } +} \ No newline at end of file diff --git a/src/generated/resources/data/floralis/loot_tables/blocks/black_cactus.json b/src/generated/resources/data/floralis/loot_tables/blocks/black_cactus.json new file mode 100644 index 00000000..358a4b8c --- /dev/null +++ b/src/generated/resources/data/floralis/loot_tables/blocks/black_cactus.json @@ -0,0 +1,202 @@ +{ + "type": "minecraft:block", + "pools": [ + { + "bonus_rolls": 0.0, + "entries": [ + { + "type": "minecraft:item", + "conditions": [ + { + "condition": "minecraft:any_of", + "terms": [ + { + "condition": "minecraft:match_tool", + "predicate": { + "items": "minecraft:shears" + } + }, + { + "condition": "minecraft:match_tool", + "predicate": { + "predicates": { + "minecraft:enchantments": [ + { + "enchantment": "minecraft:silk_touch", + "levels": { + "min": 1 + } + } + ] + } + } + } + ] + } + ], + "name": "floralis:black_cactus" + } + ], + "rolls": 1.0 + }, + { + "bonus_rolls": 0.0, + "entries": [ + { + "type": "minecraft:item", + "conditions": [ + { + "condition": "minecraft:inverted", + "term": { + "condition": "minecraft:any_of", + "terms": [ + { + "condition": "minecraft:match_tool", + "predicate": { + "items": "minecraft:shears" + } + }, + { + "condition": "minecraft:match_tool", + "predicate": { + "predicates": { + "minecraft:enchantments": [ + { + "enchantment": "minecraft:silk_touch", + "levels": { + "min": 1 + } + } + ] + } + } + } + ] + } + } + ], + "functions": [ + { + "enchantment": "minecraft:fortune", + "formula": "minecraft:uniform_bonus_count", + "function": "minecraft:apply_bonus", + "parameters": { + "bonusMultiplier": 2 + } + }, + { + "add": false, + "count": 2.0, + "function": "minecraft:set_count" + } + ], + "name": "floralis:black_cactus_seeds" + } + ], + "rolls": 1.0 + }, + { + "bonus_rolls": 0.0, + "entries": [ + { + "type": "minecraft:item", + "conditions": [ + { + "condition": "minecraft:inverted", + "term": { + "condition": "minecraft:any_of", + "terms": [ + { + "condition": "minecraft:match_tool", + "predicate": { + "items": "minecraft:shears" + } + }, + { + "condition": "minecraft:match_tool", + "predicate": { + "predicates": { + "minecraft:enchantments": [ + { + "enchantment": "minecraft:silk_touch", + "levels": { + "min": 1 + } + } + ] + } + } + } + ] + } + } + ], + "functions": [ + { + "enchantment": "minecraft:fortune", + "formula": "minecraft:uniform_bonus_count", + "function": "minecraft:apply_bonus", + "parameters": { + "bonusMultiplier": 2 + } + } + ], + "name": "floralis:black_petals" + } + ], + "rolls": 1.0 + }, + { + "bonus_rolls": 0.0, + "entries": [ + { + "type": "minecraft:item", + "conditions": [ + { + "condition": "minecraft:inverted", + "term": { + "condition": "minecraft:any_of", + "terms": [ + { + "condition": "minecraft:match_tool", + "predicate": { + "items": "minecraft:shears" + } + }, + { + "condition": "minecraft:match_tool", + "predicate": { + "predicates": { + "minecraft:enchantments": [ + { + "enchantment": "minecraft:silk_touch", + "levels": { + "min": 1 + } + } + ] + } + } + } + ] + } + } + ], + "functions": [ + { + "enchantment": "minecraft:fortune", + "formula": "minecraft:uniform_bonus_count", + "function": "minecraft:apply_bonus", + "parameters": { + "bonusMultiplier": 2 + } + } + ], + "name": "floralis:plant_fibers" + } + ], + "rolls": 1.0 + } + ], + "random_sequence": "floralis:blocks/black_cactus" +} \ No newline at end of file diff --git a/src/generated/resources/data/floralis/loot_tables/blocks/black_cactus_crop.json b/src/generated/resources/data/floralis/loot_tables/blocks/black_cactus_crop.json new file mode 100644 index 00000000..0f44a7f7 --- /dev/null +++ b/src/generated/resources/data/floralis/loot_tables/blocks/black_cactus_crop.json @@ -0,0 +1,329 @@ +{ + "type": "minecraft:block", + "pools": [ + { + "bonus_rolls": 0.0, + "entries": [ + { + "type": "minecraft:item", + "conditions": [ + { + "condition": "minecraft:any_of", + "terms": [ + { + "condition": "minecraft:match_tool", + "predicate": { + "items": "minecraft:shears" + } + }, + { + "condition": "minecraft:match_tool", + "predicate": { + "predicates": { + "minecraft:enchantments": [ + { + "enchantment": "minecraft:silk_touch", + "levels": { + "min": 1 + } + } + ] + } + } + } + ] + }, + { + "block": "floralis:black_cactus_crop", + "condition": "minecraft:block_state_property", + "properties": { + "age": "5" + } + } + ], + "name": "floralis:black_cactus" + } + ], + "rolls": 1.0 + }, + { + "bonus_rolls": 0.0, + "entries": [ + { + "type": "minecraft:item", + "conditions": [ + { + "condition": "minecraft:any_of", + "terms": [ + { + "condition": "minecraft:match_tool", + "predicate": { + "items": "minecraft:shears" + } + }, + { + "condition": "minecraft:match_tool", + "predicate": { + "predicates": { + "minecraft:enchantments": [ + { + "enchantment": "minecraft:silk_touch", + "levels": { + "min": 1 + } + } + ] + } + } + } + ] + }, + { + "condition": "minecraft:inverted", + "term": { + "block": "floralis:black_cactus_crop", + "condition": "minecraft:block_state_property", + "properties": { + "age": "5" + } + } + } + ], + "name": "floralis:black_cactus_seeds" + } + ], + "rolls": 1.0 + }, + { + "bonus_rolls": 0.0, + "entries": [ + { + "type": "minecraft:item", + "conditions": [ + { + "condition": "minecraft:inverted", + "term": { + "condition": "minecraft:any_of", + "terms": [ + { + "condition": "minecraft:match_tool", + "predicate": { + "items": "minecraft:shears" + } + }, + { + "condition": "minecraft:match_tool", + "predicate": { + "predicates": { + "minecraft:enchantments": [ + { + "enchantment": "minecraft:silk_touch", + "levels": { + "min": 1 + } + } + ] + } + } + } + ] + } + }, + { + "block": "floralis:black_cactus_crop", + "condition": "minecraft:block_state_property", + "properties": { + "age": "5" + } + } + ], + "functions": [ + { + "enchantment": "minecraft:fortune", + "formula": "minecraft:uniform_bonus_count", + "function": "minecraft:apply_bonus", + "parameters": { + "bonusMultiplier": 2 + } + }, + { + "add": false, + "count": 2.0, + "function": "minecraft:set_count" + } + ], + "name": "floralis:black_cactus_seeds" + } + ], + "rolls": 1.0 + }, + { + "bonus_rolls": 0.0, + "entries": [ + { + "type": "minecraft:item", + "conditions": [ + { + "condition": "minecraft:inverted", + "term": { + "condition": "minecraft:any_of", + "terms": [ + { + "condition": "minecraft:match_tool", + "predicate": { + "items": "minecraft:shears" + } + }, + { + "condition": "minecraft:match_tool", + "predicate": { + "predicates": { + "minecraft:enchantments": [ + { + "enchantment": "minecraft:silk_touch", + "levels": { + "min": 1 + } + } + ] + } + } + } + ] + } + }, + { + "block": "floralis:black_cactus_crop", + "condition": "minecraft:block_state_property", + "properties": { + "age": "5" + } + } + ], + "functions": [ + { + "enchantment": "minecraft:fortune", + "formula": "minecraft:uniform_bonus_count", + "function": "minecraft:apply_bonus", + "parameters": { + "bonusMultiplier": 2 + } + } + ], + "name": "floralis:black_petals" + } + ], + "rolls": 1.0 + }, + { + "bonus_rolls": 0.0, + "entries": [ + { + "type": "minecraft:item", + "conditions": [ + { + "condition": "minecraft:inverted", + "term": { + "condition": "minecraft:any_of", + "terms": [ + { + "condition": "minecraft:match_tool", + "predicate": { + "items": "minecraft:shears" + } + }, + { + "condition": "minecraft:match_tool", + "predicate": { + "predicates": { + "minecraft:enchantments": [ + { + "enchantment": "minecraft:silk_touch", + "levels": { + "min": 1 + } + } + ] + } + } + } + ] + } + }, + { + "block": "floralis:black_cactus_crop", + "condition": "minecraft:block_state_property", + "properties": { + "age": "5" + } + } + ], + "functions": [ + { + "enchantment": "minecraft:fortune", + "formula": "minecraft:uniform_bonus_count", + "function": "minecraft:apply_bonus", + "parameters": { + "bonusMultiplier": 2 + } + } + ], + "name": "floralis:plant_fibers" + } + ], + "rolls": 1.0 + }, + { + "bonus_rolls": 0.0, + "entries": [ + { + "type": "minecraft:item", + "conditions": [ + { + "condition": "minecraft:inverted", + "term": { + "condition": "minecraft:any_of", + "terms": [ + { + "condition": "minecraft:match_tool", + "predicate": { + "items": "minecraft:shears" + } + }, + { + "condition": "minecraft:match_tool", + "predicate": { + "predicates": { + "minecraft:enchantments": [ + { + "enchantment": "minecraft:silk_touch", + "levels": { + "min": 1 + } + } + ] + } + } + } + ] + } + }, + { + "condition": "minecraft:inverted", + "term": { + "block": "floralis:black_cactus_crop", + "condition": "minecraft:block_state_property", + "properties": { + "age": "5" + } + } + } + ], + "name": "floralis:black_cactus_seeds" + } + ], + "rolls": 1.0 + } + ], + "random_sequence": "floralis:blocks/black_cactus_crop" +} \ No newline at end of file diff --git a/src/main/resources/data/floralis/loot_tables/blocks/black_dye_block.json b/src/generated/resources/data/floralis/loot_tables/blocks/black_dye_block.json similarity index 55% rename from src/main/resources/data/floralis/loot_tables/blocks/black_dye_block.json rename to src/generated/resources/data/floralis/loot_tables/blocks/black_dye_block.json index 1bf80867..ff15fdd6 100644 --- a/src/main/resources/data/floralis/loot_tables/blocks/black_dye_block.json +++ b/src/generated/resources/data/floralis/loot_tables/blocks/black_dye_block.json @@ -2,19 +2,15 @@ "type": "minecraft:block", "pools": [ { - "rolls": 1, - "bonus_rolls": 0, + "bonus_rolls": 0.0, "entries": [ { "type": "minecraft:item", "name": "floralis:black_dye_block" } ], - "conditions": [ - { - "condition": "minecraft:survives_explosion" - } - ] + "rolls": 1.0 } - ] + ], + "random_sequence": "floralis:blocks/black_dye_block" } \ No newline at end of file diff --git a/src/generated/resources/data/floralis/loot_tables/blocks/black_flower.json b/src/generated/resources/data/floralis/loot_tables/blocks/black_flower.json new file mode 100644 index 00000000..1f4698ef --- /dev/null +++ b/src/generated/resources/data/floralis/loot_tables/blocks/black_flower.json @@ -0,0 +1,202 @@ +{ + "type": "minecraft:block", + "pools": [ + { + "bonus_rolls": 0.0, + "entries": [ + { + "type": "minecraft:item", + "conditions": [ + { + "condition": "minecraft:any_of", + "terms": [ + { + "condition": "minecraft:match_tool", + "predicate": { + "items": "minecraft:shears" + } + }, + { + "condition": "minecraft:match_tool", + "predicate": { + "predicates": { + "minecraft:enchantments": [ + { + "enchantment": "minecraft:silk_touch", + "levels": { + "min": 1 + } + } + ] + } + } + } + ] + } + ], + "name": "floralis:black_flower" + } + ], + "rolls": 1.0 + }, + { + "bonus_rolls": 0.0, + "entries": [ + { + "type": "minecraft:item", + "conditions": [ + { + "condition": "minecraft:inverted", + "term": { + "condition": "minecraft:any_of", + "terms": [ + { + "condition": "minecraft:match_tool", + "predicate": { + "items": "minecraft:shears" + } + }, + { + "condition": "minecraft:match_tool", + "predicate": { + "predicates": { + "minecraft:enchantments": [ + { + "enchantment": "minecraft:silk_touch", + "levels": { + "min": 1 + } + } + ] + } + } + } + ] + } + } + ], + "functions": [ + { + "enchantment": "minecraft:fortune", + "formula": "minecraft:uniform_bonus_count", + "function": "minecraft:apply_bonus", + "parameters": { + "bonusMultiplier": 2 + } + }, + { + "add": false, + "count": 2.0, + "function": "minecraft:set_count" + } + ], + "name": "floralis:black_flower_seeds" + } + ], + "rolls": 1.0 + }, + { + "bonus_rolls": 0.0, + "entries": [ + { + "type": "minecraft:item", + "conditions": [ + { + "condition": "minecraft:inverted", + "term": { + "condition": "minecraft:any_of", + "terms": [ + { + "condition": "minecraft:match_tool", + "predicate": { + "items": "minecraft:shears" + } + }, + { + "condition": "minecraft:match_tool", + "predicate": { + "predicates": { + "minecraft:enchantments": [ + { + "enchantment": "minecraft:silk_touch", + "levels": { + "min": 1 + } + } + ] + } + } + } + ] + } + } + ], + "functions": [ + { + "enchantment": "minecraft:fortune", + "formula": "minecraft:uniform_bonus_count", + "function": "minecraft:apply_bonus", + "parameters": { + "bonusMultiplier": 2 + } + } + ], + "name": "floralis:black_petals" + } + ], + "rolls": 1.0 + }, + { + "bonus_rolls": 0.0, + "entries": [ + { + "type": "minecraft:item", + "conditions": [ + { + "condition": "minecraft:inverted", + "term": { + "condition": "minecraft:any_of", + "terms": [ + { + "condition": "minecraft:match_tool", + "predicate": { + "items": "minecraft:shears" + } + }, + { + "condition": "minecraft:match_tool", + "predicate": { + "predicates": { + "minecraft:enchantments": [ + { + "enchantment": "minecraft:silk_touch", + "levels": { + "min": 1 + } + } + ] + } + } + } + ] + } + } + ], + "functions": [ + { + "enchantment": "minecraft:fortune", + "formula": "minecraft:uniform_bonus_count", + "function": "minecraft:apply_bonus", + "parameters": { + "bonusMultiplier": 2 + } + } + ], + "name": "floralis:plant_fibers" + } + ], + "rolls": 1.0 + } + ], + "random_sequence": "floralis:blocks/black_flower" +} \ No newline at end of file diff --git a/src/generated/resources/data/floralis/loot_tables/blocks/black_flower_crop.json b/src/generated/resources/data/floralis/loot_tables/blocks/black_flower_crop.json new file mode 100644 index 00000000..04c6a305 --- /dev/null +++ b/src/generated/resources/data/floralis/loot_tables/blocks/black_flower_crop.json @@ -0,0 +1,329 @@ +{ + "type": "minecraft:block", + "pools": [ + { + "bonus_rolls": 0.0, + "entries": [ + { + "type": "minecraft:item", + "conditions": [ + { + "condition": "minecraft:any_of", + "terms": [ + { + "condition": "minecraft:match_tool", + "predicate": { + "items": "minecraft:shears" + } + }, + { + "condition": "minecraft:match_tool", + "predicate": { + "predicates": { + "minecraft:enchantments": [ + { + "enchantment": "minecraft:silk_touch", + "levels": { + "min": 1 + } + } + ] + } + } + } + ] + }, + { + "block": "floralis:black_flower_crop", + "condition": "minecraft:block_state_property", + "properties": { + "age": "5" + } + } + ], + "name": "floralis:black_flower" + } + ], + "rolls": 1.0 + }, + { + "bonus_rolls": 0.0, + "entries": [ + { + "type": "minecraft:item", + "conditions": [ + { + "condition": "minecraft:any_of", + "terms": [ + { + "condition": "minecraft:match_tool", + "predicate": { + "items": "minecraft:shears" + } + }, + { + "condition": "minecraft:match_tool", + "predicate": { + "predicates": { + "minecraft:enchantments": [ + { + "enchantment": "minecraft:silk_touch", + "levels": { + "min": 1 + } + } + ] + } + } + } + ] + }, + { + "condition": "minecraft:inverted", + "term": { + "block": "floralis:black_flower_crop", + "condition": "minecraft:block_state_property", + "properties": { + "age": "5" + } + } + } + ], + "name": "floralis:black_flower_seeds" + } + ], + "rolls": 1.0 + }, + { + "bonus_rolls": 0.0, + "entries": [ + { + "type": "minecraft:item", + "conditions": [ + { + "condition": "minecraft:inverted", + "term": { + "condition": "minecraft:any_of", + "terms": [ + { + "condition": "minecraft:match_tool", + "predicate": { + "items": "minecraft:shears" + } + }, + { + "condition": "minecraft:match_tool", + "predicate": { + "predicates": { + "minecraft:enchantments": [ + { + "enchantment": "minecraft:silk_touch", + "levels": { + "min": 1 + } + } + ] + } + } + } + ] + } + }, + { + "block": "floralis:black_flower_crop", + "condition": "minecraft:block_state_property", + "properties": { + "age": "5" + } + } + ], + "functions": [ + { + "enchantment": "minecraft:fortune", + "formula": "minecraft:uniform_bonus_count", + "function": "minecraft:apply_bonus", + "parameters": { + "bonusMultiplier": 2 + } + }, + { + "add": false, + "count": 2.0, + "function": "minecraft:set_count" + } + ], + "name": "floralis:black_flower_seeds" + } + ], + "rolls": 1.0 + }, + { + "bonus_rolls": 0.0, + "entries": [ + { + "type": "minecraft:item", + "conditions": [ + { + "condition": "minecraft:inverted", + "term": { + "condition": "minecraft:any_of", + "terms": [ + { + "condition": "minecraft:match_tool", + "predicate": { + "items": "minecraft:shears" + } + }, + { + "condition": "minecraft:match_tool", + "predicate": { + "predicates": { + "minecraft:enchantments": [ + { + "enchantment": "minecraft:silk_touch", + "levels": { + "min": 1 + } + } + ] + } + } + } + ] + } + }, + { + "block": "floralis:black_flower_crop", + "condition": "minecraft:block_state_property", + "properties": { + "age": "5" + } + } + ], + "functions": [ + { + "enchantment": "minecraft:fortune", + "formula": "minecraft:uniform_bonus_count", + "function": "minecraft:apply_bonus", + "parameters": { + "bonusMultiplier": 2 + } + } + ], + "name": "floralis:black_petals" + } + ], + "rolls": 1.0 + }, + { + "bonus_rolls": 0.0, + "entries": [ + { + "type": "minecraft:item", + "conditions": [ + { + "condition": "minecraft:inverted", + "term": { + "condition": "minecraft:any_of", + "terms": [ + { + "condition": "minecraft:match_tool", + "predicate": { + "items": "minecraft:shears" + } + }, + { + "condition": "minecraft:match_tool", + "predicate": { + "predicates": { + "minecraft:enchantments": [ + { + "enchantment": "minecraft:silk_touch", + "levels": { + "min": 1 + } + } + ] + } + } + } + ] + } + }, + { + "block": "floralis:black_flower_crop", + "condition": "minecraft:block_state_property", + "properties": { + "age": "5" + } + } + ], + "functions": [ + { + "enchantment": "minecraft:fortune", + "formula": "minecraft:uniform_bonus_count", + "function": "minecraft:apply_bonus", + "parameters": { + "bonusMultiplier": 2 + } + } + ], + "name": "floralis:plant_fibers" + } + ], + "rolls": 1.0 + }, + { + "bonus_rolls": 0.0, + "entries": [ + { + "type": "minecraft:item", + "conditions": [ + { + "condition": "minecraft:inverted", + "term": { + "condition": "minecraft:any_of", + "terms": [ + { + "condition": "minecraft:match_tool", + "predicate": { + "items": "minecraft:shears" + } + }, + { + "condition": "minecraft:match_tool", + "predicate": { + "predicates": { + "minecraft:enchantments": [ + { + "enchantment": "minecraft:silk_touch", + "levels": { + "min": 1 + } + } + ] + } + } + } + ] + } + }, + { + "condition": "minecraft:inverted", + "term": { + "block": "floralis:black_flower_crop", + "condition": "minecraft:block_state_property", + "properties": { + "age": "5" + } + } + } + ], + "name": "floralis:black_flower_seeds" + } + ], + "rolls": 1.0 + } + ], + "random_sequence": "floralis:blocks/black_flower_crop" +} \ No newline at end of file diff --git a/src/generated/resources/data/floralis/loot_tables/blocks/blue_cactus.json b/src/generated/resources/data/floralis/loot_tables/blocks/blue_cactus.json new file mode 100644 index 00000000..3fbefe6b --- /dev/null +++ b/src/generated/resources/data/floralis/loot_tables/blocks/blue_cactus.json @@ -0,0 +1,202 @@ +{ + "type": "minecraft:block", + "pools": [ + { + "bonus_rolls": 0.0, + "entries": [ + { + "type": "minecraft:item", + "conditions": [ + { + "condition": "minecraft:any_of", + "terms": [ + { + "condition": "minecraft:match_tool", + "predicate": { + "items": "minecraft:shears" + } + }, + { + "condition": "minecraft:match_tool", + "predicate": { + "predicates": { + "minecraft:enchantments": [ + { + "enchantment": "minecraft:silk_touch", + "levels": { + "min": 1 + } + } + ] + } + } + } + ] + } + ], + "name": "floralis:blue_cactus" + } + ], + "rolls": 1.0 + }, + { + "bonus_rolls": 0.0, + "entries": [ + { + "type": "minecraft:item", + "conditions": [ + { + "condition": "minecraft:inverted", + "term": { + "condition": "minecraft:any_of", + "terms": [ + { + "condition": "minecraft:match_tool", + "predicate": { + "items": "minecraft:shears" + } + }, + { + "condition": "minecraft:match_tool", + "predicate": { + "predicates": { + "minecraft:enchantments": [ + { + "enchantment": "minecraft:silk_touch", + "levels": { + "min": 1 + } + } + ] + } + } + } + ] + } + } + ], + "functions": [ + { + "enchantment": "minecraft:fortune", + "formula": "minecraft:uniform_bonus_count", + "function": "minecraft:apply_bonus", + "parameters": { + "bonusMultiplier": 2 + } + }, + { + "add": false, + "count": 2.0, + "function": "minecraft:set_count" + } + ], + "name": "floralis:blue_cactus_seeds" + } + ], + "rolls": 1.0 + }, + { + "bonus_rolls": 0.0, + "entries": [ + { + "type": "minecraft:item", + "conditions": [ + { + "condition": "minecraft:inverted", + "term": { + "condition": "minecraft:any_of", + "terms": [ + { + "condition": "minecraft:match_tool", + "predicate": { + "items": "minecraft:shears" + } + }, + { + "condition": "minecraft:match_tool", + "predicate": { + "predicates": { + "minecraft:enchantments": [ + { + "enchantment": "minecraft:silk_touch", + "levels": { + "min": 1 + } + } + ] + } + } + } + ] + } + } + ], + "functions": [ + { + "enchantment": "minecraft:fortune", + "formula": "minecraft:uniform_bonus_count", + "function": "minecraft:apply_bonus", + "parameters": { + "bonusMultiplier": 2 + } + } + ], + "name": "floralis:blue_petals" + } + ], + "rolls": 1.0 + }, + { + "bonus_rolls": 0.0, + "entries": [ + { + "type": "minecraft:item", + "conditions": [ + { + "condition": "minecraft:inverted", + "term": { + "condition": "minecraft:any_of", + "terms": [ + { + "condition": "minecraft:match_tool", + "predicate": { + "items": "minecraft:shears" + } + }, + { + "condition": "minecraft:match_tool", + "predicate": { + "predicates": { + "minecraft:enchantments": [ + { + "enchantment": "minecraft:silk_touch", + "levels": { + "min": 1 + } + } + ] + } + } + } + ] + } + } + ], + "functions": [ + { + "enchantment": "minecraft:fortune", + "formula": "minecraft:uniform_bonus_count", + "function": "minecraft:apply_bonus", + "parameters": { + "bonusMultiplier": 2 + } + } + ], + "name": "floralis:plant_fibers" + } + ], + "rolls": 1.0 + } + ], + "random_sequence": "floralis:blocks/blue_cactus" +} \ No newline at end of file diff --git a/src/generated/resources/data/floralis/loot_tables/blocks/blue_cactus_crop.json b/src/generated/resources/data/floralis/loot_tables/blocks/blue_cactus_crop.json new file mode 100644 index 00000000..b330fef7 --- /dev/null +++ b/src/generated/resources/data/floralis/loot_tables/blocks/blue_cactus_crop.json @@ -0,0 +1,329 @@ +{ + "type": "minecraft:block", + "pools": [ + { + "bonus_rolls": 0.0, + "entries": [ + { + "type": "minecraft:item", + "conditions": [ + { + "condition": "minecraft:any_of", + "terms": [ + { + "condition": "minecraft:match_tool", + "predicate": { + "items": "minecraft:shears" + } + }, + { + "condition": "minecraft:match_tool", + "predicate": { + "predicates": { + "minecraft:enchantments": [ + { + "enchantment": "minecraft:silk_touch", + "levels": { + "min": 1 + } + } + ] + } + } + } + ] + }, + { + "block": "floralis:blue_cactus_crop", + "condition": "minecraft:block_state_property", + "properties": { + "age": "5" + } + } + ], + "name": "floralis:blue_cactus" + } + ], + "rolls": 1.0 + }, + { + "bonus_rolls": 0.0, + "entries": [ + { + "type": "minecraft:item", + "conditions": [ + { + "condition": "minecraft:any_of", + "terms": [ + { + "condition": "minecraft:match_tool", + "predicate": { + "items": "minecraft:shears" + } + }, + { + "condition": "minecraft:match_tool", + "predicate": { + "predicates": { + "minecraft:enchantments": [ + { + "enchantment": "minecraft:silk_touch", + "levels": { + "min": 1 + } + } + ] + } + } + } + ] + }, + { + "condition": "minecraft:inverted", + "term": { + "block": "floralis:blue_cactus_crop", + "condition": "minecraft:block_state_property", + "properties": { + "age": "5" + } + } + } + ], + "name": "floralis:blue_cactus_seeds" + } + ], + "rolls": 1.0 + }, + { + "bonus_rolls": 0.0, + "entries": [ + { + "type": "minecraft:item", + "conditions": [ + { + "condition": "minecraft:inverted", + "term": { + "condition": "minecraft:any_of", + "terms": [ + { + "condition": "minecraft:match_tool", + "predicate": { + "items": "minecraft:shears" + } + }, + { + "condition": "minecraft:match_tool", + "predicate": { + "predicates": { + "minecraft:enchantments": [ + { + "enchantment": "minecraft:silk_touch", + "levels": { + "min": 1 + } + } + ] + } + } + } + ] + } + }, + { + "block": "floralis:blue_cactus_crop", + "condition": "minecraft:block_state_property", + "properties": { + "age": "5" + } + } + ], + "functions": [ + { + "enchantment": "minecraft:fortune", + "formula": "minecraft:uniform_bonus_count", + "function": "minecraft:apply_bonus", + "parameters": { + "bonusMultiplier": 2 + } + }, + { + "add": false, + "count": 2.0, + "function": "minecraft:set_count" + } + ], + "name": "floralis:blue_cactus_seeds" + } + ], + "rolls": 1.0 + }, + { + "bonus_rolls": 0.0, + "entries": [ + { + "type": "minecraft:item", + "conditions": [ + { + "condition": "minecraft:inverted", + "term": { + "condition": "minecraft:any_of", + "terms": [ + { + "condition": "minecraft:match_tool", + "predicate": { + "items": "minecraft:shears" + } + }, + { + "condition": "minecraft:match_tool", + "predicate": { + "predicates": { + "minecraft:enchantments": [ + { + "enchantment": "minecraft:silk_touch", + "levels": { + "min": 1 + } + } + ] + } + } + } + ] + } + }, + { + "block": "floralis:blue_cactus_crop", + "condition": "minecraft:block_state_property", + "properties": { + "age": "5" + } + } + ], + "functions": [ + { + "enchantment": "minecraft:fortune", + "formula": "minecraft:uniform_bonus_count", + "function": "minecraft:apply_bonus", + "parameters": { + "bonusMultiplier": 2 + } + } + ], + "name": "floralis:blue_petals" + } + ], + "rolls": 1.0 + }, + { + "bonus_rolls": 0.0, + "entries": [ + { + "type": "minecraft:item", + "conditions": [ + { + "condition": "minecraft:inverted", + "term": { + "condition": "minecraft:any_of", + "terms": [ + { + "condition": "minecraft:match_tool", + "predicate": { + "items": "minecraft:shears" + } + }, + { + "condition": "minecraft:match_tool", + "predicate": { + "predicates": { + "minecraft:enchantments": [ + { + "enchantment": "minecraft:silk_touch", + "levels": { + "min": 1 + } + } + ] + } + } + } + ] + } + }, + { + "block": "floralis:blue_cactus_crop", + "condition": "minecraft:block_state_property", + "properties": { + "age": "5" + } + } + ], + "functions": [ + { + "enchantment": "minecraft:fortune", + "formula": "minecraft:uniform_bonus_count", + "function": "minecraft:apply_bonus", + "parameters": { + "bonusMultiplier": 2 + } + } + ], + "name": "floralis:plant_fibers" + } + ], + "rolls": 1.0 + }, + { + "bonus_rolls": 0.0, + "entries": [ + { + "type": "minecraft:item", + "conditions": [ + { + "condition": "minecraft:inverted", + "term": { + "condition": "minecraft:any_of", + "terms": [ + { + "condition": "minecraft:match_tool", + "predicate": { + "items": "minecraft:shears" + } + }, + { + "condition": "minecraft:match_tool", + "predicate": { + "predicates": { + "minecraft:enchantments": [ + { + "enchantment": "minecraft:silk_touch", + "levels": { + "min": 1 + } + } + ] + } + } + } + ] + } + }, + { + "condition": "minecraft:inverted", + "term": { + "block": "floralis:blue_cactus_crop", + "condition": "minecraft:block_state_property", + "properties": { + "age": "5" + } + } + } + ], + "name": "floralis:blue_cactus_seeds" + } + ], + "rolls": 1.0 + } + ], + "random_sequence": "floralis:blocks/blue_cactus_crop" +} \ No newline at end of file diff --git a/src/main/resources/data/floralis/loot_tables/blocks/blue_dye_block.json b/src/generated/resources/data/floralis/loot_tables/blocks/blue_dye_block.json similarity index 55% rename from src/main/resources/data/floralis/loot_tables/blocks/blue_dye_block.json rename to src/generated/resources/data/floralis/loot_tables/blocks/blue_dye_block.json index 6e498062..23562c47 100644 --- a/src/main/resources/data/floralis/loot_tables/blocks/blue_dye_block.json +++ b/src/generated/resources/data/floralis/loot_tables/blocks/blue_dye_block.json @@ -2,19 +2,15 @@ "type": "minecraft:block", "pools": [ { - "rolls": 1, - "bonus_rolls": 0, + "bonus_rolls": 0.0, "entries": [ { "type": "minecraft:item", "name": "floralis:blue_dye_block" } ], - "conditions": [ - { - "condition": "minecraft:survives_explosion" - } - ] + "rolls": 1.0 } - ] + ], + "random_sequence": "floralis:blocks/blue_dye_block" } \ No newline at end of file diff --git a/src/generated/resources/data/floralis/loot_tables/blocks/blue_flower.json b/src/generated/resources/data/floralis/loot_tables/blocks/blue_flower.json new file mode 100644 index 00000000..0dfeefef --- /dev/null +++ b/src/generated/resources/data/floralis/loot_tables/blocks/blue_flower.json @@ -0,0 +1,202 @@ +{ + "type": "minecraft:block", + "pools": [ + { + "bonus_rolls": 0.0, + "entries": [ + { + "type": "minecraft:item", + "conditions": [ + { + "condition": "minecraft:any_of", + "terms": [ + { + "condition": "minecraft:match_tool", + "predicate": { + "items": "minecraft:shears" + } + }, + { + "condition": "minecraft:match_tool", + "predicate": { + "predicates": { + "minecraft:enchantments": [ + { + "enchantment": "minecraft:silk_touch", + "levels": { + "min": 1 + } + } + ] + } + } + } + ] + } + ], + "name": "floralis:blue_flower" + } + ], + "rolls": 1.0 + }, + { + "bonus_rolls": 0.0, + "entries": [ + { + "type": "minecraft:item", + "conditions": [ + { + "condition": "minecraft:inverted", + "term": { + "condition": "minecraft:any_of", + "terms": [ + { + "condition": "minecraft:match_tool", + "predicate": { + "items": "minecraft:shears" + } + }, + { + "condition": "minecraft:match_tool", + "predicate": { + "predicates": { + "minecraft:enchantments": [ + { + "enchantment": "minecraft:silk_touch", + "levels": { + "min": 1 + } + } + ] + } + } + } + ] + } + } + ], + "functions": [ + { + "enchantment": "minecraft:fortune", + "formula": "minecraft:uniform_bonus_count", + "function": "minecraft:apply_bonus", + "parameters": { + "bonusMultiplier": 2 + } + }, + { + "add": false, + "count": 2.0, + "function": "minecraft:set_count" + } + ], + "name": "floralis:blue_flower_seeds" + } + ], + "rolls": 1.0 + }, + { + "bonus_rolls": 0.0, + "entries": [ + { + "type": "minecraft:item", + "conditions": [ + { + "condition": "minecraft:inverted", + "term": { + "condition": "minecraft:any_of", + "terms": [ + { + "condition": "minecraft:match_tool", + "predicate": { + "items": "minecraft:shears" + } + }, + { + "condition": "minecraft:match_tool", + "predicate": { + "predicates": { + "minecraft:enchantments": [ + { + "enchantment": "minecraft:silk_touch", + "levels": { + "min": 1 + } + } + ] + } + } + } + ] + } + } + ], + "functions": [ + { + "enchantment": "minecraft:fortune", + "formula": "minecraft:uniform_bonus_count", + "function": "minecraft:apply_bonus", + "parameters": { + "bonusMultiplier": 2 + } + } + ], + "name": "floralis:blue_petals" + } + ], + "rolls": 1.0 + }, + { + "bonus_rolls": 0.0, + "entries": [ + { + "type": "minecraft:item", + "conditions": [ + { + "condition": "minecraft:inverted", + "term": { + "condition": "minecraft:any_of", + "terms": [ + { + "condition": "minecraft:match_tool", + "predicate": { + "items": "minecraft:shears" + } + }, + { + "condition": "minecraft:match_tool", + "predicate": { + "predicates": { + "minecraft:enchantments": [ + { + "enchantment": "minecraft:silk_touch", + "levels": { + "min": 1 + } + } + ] + } + } + } + ] + } + } + ], + "functions": [ + { + "enchantment": "minecraft:fortune", + "formula": "minecraft:uniform_bonus_count", + "function": "minecraft:apply_bonus", + "parameters": { + "bonusMultiplier": 2 + } + } + ], + "name": "floralis:plant_fibers" + } + ], + "rolls": 1.0 + } + ], + "random_sequence": "floralis:blocks/blue_flower" +} \ No newline at end of file diff --git a/src/generated/resources/data/floralis/loot_tables/blocks/blue_flower_crop.json b/src/generated/resources/data/floralis/loot_tables/blocks/blue_flower_crop.json new file mode 100644 index 00000000..4fae1fcf --- /dev/null +++ b/src/generated/resources/data/floralis/loot_tables/blocks/blue_flower_crop.json @@ -0,0 +1,329 @@ +{ + "type": "minecraft:block", + "pools": [ + { + "bonus_rolls": 0.0, + "entries": [ + { + "type": "minecraft:item", + "conditions": [ + { + "condition": "minecraft:any_of", + "terms": [ + { + "condition": "minecraft:match_tool", + "predicate": { + "items": "minecraft:shears" + } + }, + { + "condition": "minecraft:match_tool", + "predicate": { + "predicates": { + "minecraft:enchantments": [ + { + "enchantment": "minecraft:silk_touch", + "levels": { + "min": 1 + } + } + ] + } + } + } + ] + }, + { + "block": "floralis:blue_flower_crop", + "condition": "minecraft:block_state_property", + "properties": { + "age": "5" + } + } + ], + "name": "floralis:blue_flower" + } + ], + "rolls": 1.0 + }, + { + "bonus_rolls": 0.0, + "entries": [ + { + "type": "minecraft:item", + "conditions": [ + { + "condition": "minecraft:any_of", + "terms": [ + { + "condition": "minecraft:match_tool", + "predicate": { + "items": "minecraft:shears" + } + }, + { + "condition": "minecraft:match_tool", + "predicate": { + "predicates": { + "minecraft:enchantments": [ + { + "enchantment": "minecraft:silk_touch", + "levels": { + "min": 1 + } + } + ] + } + } + } + ] + }, + { + "condition": "minecraft:inverted", + "term": { + "block": "floralis:blue_flower_crop", + "condition": "minecraft:block_state_property", + "properties": { + "age": "5" + } + } + } + ], + "name": "floralis:blue_flower_seeds" + } + ], + "rolls": 1.0 + }, + { + "bonus_rolls": 0.0, + "entries": [ + { + "type": "minecraft:item", + "conditions": [ + { + "condition": "minecraft:inverted", + "term": { + "condition": "minecraft:any_of", + "terms": [ + { + "condition": "minecraft:match_tool", + "predicate": { + "items": "minecraft:shears" + } + }, + { + "condition": "minecraft:match_tool", + "predicate": { + "predicates": { + "minecraft:enchantments": [ + { + "enchantment": "minecraft:silk_touch", + "levels": { + "min": 1 + } + } + ] + } + } + } + ] + } + }, + { + "block": "floralis:blue_flower_crop", + "condition": "minecraft:block_state_property", + "properties": { + "age": "5" + } + } + ], + "functions": [ + { + "enchantment": "minecraft:fortune", + "formula": "minecraft:uniform_bonus_count", + "function": "minecraft:apply_bonus", + "parameters": { + "bonusMultiplier": 2 + } + }, + { + "add": false, + "count": 2.0, + "function": "minecraft:set_count" + } + ], + "name": "floralis:blue_flower_seeds" + } + ], + "rolls": 1.0 + }, + { + "bonus_rolls": 0.0, + "entries": [ + { + "type": "minecraft:item", + "conditions": [ + { + "condition": "minecraft:inverted", + "term": { + "condition": "minecraft:any_of", + "terms": [ + { + "condition": "minecraft:match_tool", + "predicate": { + "items": "minecraft:shears" + } + }, + { + "condition": "minecraft:match_tool", + "predicate": { + "predicates": { + "minecraft:enchantments": [ + { + "enchantment": "minecraft:silk_touch", + "levels": { + "min": 1 + } + } + ] + } + } + } + ] + } + }, + { + "block": "floralis:blue_flower_crop", + "condition": "minecraft:block_state_property", + "properties": { + "age": "5" + } + } + ], + "functions": [ + { + "enchantment": "minecraft:fortune", + "formula": "minecraft:uniform_bonus_count", + "function": "minecraft:apply_bonus", + "parameters": { + "bonusMultiplier": 2 + } + } + ], + "name": "floralis:blue_petals" + } + ], + "rolls": 1.0 + }, + { + "bonus_rolls": 0.0, + "entries": [ + { + "type": "minecraft:item", + "conditions": [ + { + "condition": "minecraft:inverted", + "term": { + "condition": "minecraft:any_of", + "terms": [ + { + "condition": "minecraft:match_tool", + "predicate": { + "items": "minecraft:shears" + } + }, + { + "condition": "minecraft:match_tool", + "predicate": { + "predicates": { + "minecraft:enchantments": [ + { + "enchantment": "minecraft:silk_touch", + "levels": { + "min": 1 + } + } + ] + } + } + } + ] + } + }, + { + "block": "floralis:blue_flower_crop", + "condition": "minecraft:block_state_property", + "properties": { + "age": "5" + } + } + ], + "functions": [ + { + "enchantment": "minecraft:fortune", + "formula": "minecraft:uniform_bonus_count", + "function": "minecraft:apply_bonus", + "parameters": { + "bonusMultiplier": 2 + } + } + ], + "name": "floralis:plant_fibers" + } + ], + "rolls": 1.0 + }, + { + "bonus_rolls": 0.0, + "entries": [ + { + "type": "minecraft:item", + "conditions": [ + { + "condition": "minecraft:inverted", + "term": { + "condition": "minecraft:any_of", + "terms": [ + { + "condition": "minecraft:match_tool", + "predicate": { + "items": "minecraft:shears" + } + }, + { + "condition": "minecraft:match_tool", + "predicate": { + "predicates": { + "minecraft:enchantments": [ + { + "enchantment": "minecraft:silk_touch", + "levels": { + "min": 1 + } + } + ] + } + } + } + ] + } + }, + { + "condition": "minecraft:inverted", + "term": { + "block": "floralis:blue_flower_crop", + "condition": "minecraft:block_state_property", + "properties": { + "age": "5" + } + } + } + ], + "name": "floralis:blue_flower_seeds" + } + ], + "rolls": 1.0 + } + ], + "random_sequence": "floralis:blocks/blue_flower_crop" +} \ No newline at end of file diff --git a/src/generated/resources/data/floralis/loot_tables/blocks/brown_cactus.json b/src/generated/resources/data/floralis/loot_tables/blocks/brown_cactus.json new file mode 100644 index 00000000..b0f74207 --- /dev/null +++ b/src/generated/resources/data/floralis/loot_tables/blocks/brown_cactus.json @@ -0,0 +1,202 @@ +{ + "type": "minecraft:block", + "pools": [ + { + "bonus_rolls": 0.0, + "entries": [ + { + "type": "minecraft:item", + "conditions": [ + { + "condition": "minecraft:any_of", + "terms": [ + { + "condition": "minecraft:match_tool", + "predicate": { + "items": "minecraft:shears" + } + }, + { + "condition": "minecraft:match_tool", + "predicate": { + "predicates": { + "minecraft:enchantments": [ + { + "enchantment": "minecraft:silk_touch", + "levels": { + "min": 1 + } + } + ] + } + } + } + ] + } + ], + "name": "floralis:brown_cactus" + } + ], + "rolls": 1.0 + }, + { + "bonus_rolls": 0.0, + "entries": [ + { + "type": "minecraft:item", + "conditions": [ + { + "condition": "minecraft:inverted", + "term": { + "condition": "minecraft:any_of", + "terms": [ + { + "condition": "minecraft:match_tool", + "predicate": { + "items": "minecraft:shears" + } + }, + { + "condition": "minecraft:match_tool", + "predicate": { + "predicates": { + "minecraft:enchantments": [ + { + "enchantment": "minecraft:silk_touch", + "levels": { + "min": 1 + } + } + ] + } + } + } + ] + } + } + ], + "functions": [ + { + "enchantment": "minecraft:fortune", + "formula": "minecraft:uniform_bonus_count", + "function": "minecraft:apply_bonus", + "parameters": { + "bonusMultiplier": 2 + } + }, + { + "add": false, + "count": 2.0, + "function": "minecraft:set_count" + } + ], + "name": "floralis:brown_cactus_seeds" + } + ], + "rolls": 1.0 + }, + { + "bonus_rolls": 0.0, + "entries": [ + { + "type": "minecraft:item", + "conditions": [ + { + "condition": "minecraft:inverted", + "term": { + "condition": "minecraft:any_of", + "terms": [ + { + "condition": "minecraft:match_tool", + "predicate": { + "items": "minecraft:shears" + } + }, + { + "condition": "minecraft:match_tool", + "predicate": { + "predicates": { + "minecraft:enchantments": [ + { + "enchantment": "minecraft:silk_touch", + "levels": { + "min": 1 + } + } + ] + } + } + } + ] + } + } + ], + "functions": [ + { + "enchantment": "minecraft:fortune", + "formula": "minecraft:uniform_bonus_count", + "function": "minecraft:apply_bonus", + "parameters": { + "bonusMultiplier": 2 + } + } + ], + "name": "floralis:brown_petals" + } + ], + "rolls": 1.0 + }, + { + "bonus_rolls": 0.0, + "entries": [ + { + "type": "minecraft:item", + "conditions": [ + { + "condition": "minecraft:inverted", + "term": { + "condition": "minecraft:any_of", + "terms": [ + { + "condition": "minecraft:match_tool", + "predicate": { + "items": "minecraft:shears" + } + }, + { + "condition": "minecraft:match_tool", + "predicate": { + "predicates": { + "minecraft:enchantments": [ + { + "enchantment": "minecraft:silk_touch", + "levels": { + "min": 1 + } + } + ] + } + } + } + ] + } + } + ], + "functions": [ + { + "enchantment": "minecraft:fortune", + "formula": "minecraft:uniform_bonus_count", + "function": "minecraft:apply_bonus", + "parameters": { + "bonusMultiplier": 2 + } + } + ], + "name": "floralis:plant_fibers" + } + ], + "rolls": 1.0 + } + ], + "random_sequence": "floralis:blocks/brown_cactus" +} \ No newline at end of file diff --git a/src/generated/resources/data/floralis/loot_tables/blocks/brown_cactus_crop.json b/src/generated/resources/data/floralis/loot_tables/blocks/brown_cactus_crop.json new file mode 100644 index 00000000..2cf514df --- /dev/null +++ b/src/generated/resources/data/floralis/loot_tables/blocks/brown_cactus_crop.json @@ -0,0 +1,329 @@ +{ + "type": "minecraft:block", + "pools": [ + { + "bonus_rolls": 0.0, + "entries": [ + { + "type": "minecraft:item", + "conditions": [ + { + "condition": "minecraft:any_of", + "terms": [ + { + "condition": "minecraft:match_tool", + "predicate": { + "items": "minecraft:shears" + } + }, + { + "condition": "minecraft:match_tool", + "predicate": { + "predicates": { + "minecraft:enchantments": [ + { + "enchantment": "minecraft:silk_touch", + "levels": { + "min": 1 + } + } + ] + } + } + } + ] + }, + { + "block": "floralis:brown_cactus_crop", + "condition": "minecraft:block_state_property", + "properties": { + "age": "5" + } + } + ], + "name": "floralis:brown_cactus" + } + ], + "rolls": 1.0 + }, + { + "bonus_rolls": 0.0, + "entries": [ + { + "type": "minecraft:item", + "conditions": [ + { + "condition": "minecraft:any_of", + "terms": [ + { + "condition": "minecraft:match_tool", + "predicate": { + "items": "minecraft:shears" + } + }, + { + "condition": "minecraft:match_tool", + "predicate": { + "predicates": { + "minecraft:enchantments": [ + { + "enchantment": "minecraft:silk_touch", + "levels": { + "min": 1 + } + } + ] + } + } + } + ] + }, + { + "condition": "minecraft:inverted", + "term": { + "block": "floralis:brown_cactus_crop", + "condition": "minecraft:block_state_property", + "properties": { + "age": "5" + } + } + } + ], + "name": "floralis:brown_cactus_seeds" + } + ], + "rolls": 1.0 + }, + { + "bonus_rolls": 0.0, + "entries": [ + { + "type": "minecraft:item", + "conditions": [ + { + "condition": "minecraft:inverted", + "term": { + "condition": "minecraft:any_of", + "terms": [ + { + "condition": "minecraft:match_tool", + "predicate": { + "items": "minecraft:shears" + } + }, + { + "condition": "minecraft:match_tool", + "predicate": { + "predicates": { + "minecraft:enchantments": [ + { + "enchantment": "minecraft:silk_touch", + "levels": { + "min": 1 + } + } + ] + } + } + } + ] + } + }, + { + "block": "floralis:brown_cactus_crop", + "condition": "minecraft:block_state_property", + "properties": { + "age": "5" + } + } + ], + "functions": [ + { + "enchantment": "minecraft:fortune", + "formula": "minecraft:uniform_bonus_count", + "function": "minecraft:apply_bonus", + "parameters": { + "bonusMultiplier": 2 + } + }, + { + "add": false, + "count": 2.0, + "function": "minecraft:set_count" + } + ], + "name": "floralis:brown_cactus_seeds" + } + ], + "rolls": 1.0 + }, + { + "bonus_rolls": 0.0, + "entries": [ + { + "type": "minecraft:item", + "conditions": [ + { + "condition": "minecraft:inverted", + "term": { + "condition": "minecraft:any_of", + "terms": [ + { + "condition": "minecraft:match_tool", + "predicate": { + "items": "minecraft:shears" + } + }, + { + "condition": "minecraft:match_tool", + "predicate": { + "predicates": { + "minecraft:enchantments": [ + { + "enchantment": "minecraft:silk_touch", + "levels": { + "min": 1 + } + } + ] + } + } + } + ] + } + }, + { + "block": "floralis:brown_cactus_crop", + "condition": "minecraft:block_state_property", + "properties": { + "age": "5" + } + } + ], + "functions": [ + { + "enchantment": "minecraft:fortune", + "formula": "minecraft:uniform_bonus_count", + "function": "minecraft:apply_bonus", + "parameters": { + "bonusMultiplier": 2 + } + } + ], + "name": "floralis:brown_petals" + } + ], + "rolls": 1.0 + }, + { + "bonus_rolls": 0.0, + "entries": [ + { + "type": "minecraft:item", + "conditions": [ + { + "condition": "minecraft:inverted", + "term": { + "condition": "minecraft:any_of", + "terms": [ + { + "condition": "minecraft:match_tool", + "predicate": { + "items": "minecraft:shears" + } + }, + { + "condition": "minecraft:match_tool", + "predicate": { + "predicates": { + "minecraft:enchantments": [ + { + "enchantment": "minecraft:silk_touch", + "levels": { + "min": 1 + } + } + ] + } + } + } + ] + } + }, + { + "block": "floralis:brown_cactus_crop", + "condition": "minecraft:block_state_property", + "properties": { + "age": "5" + } + } + ], + "functions": [ + { + "enchantment": "minecraft:fortune", + "formula": "minecraft:uniform_bonus_count", + "function": "minecraft:apply_bonus", + "parameters": { + "bonusMultiplier": 2 + } + } + ], + "name": "floralis:plant_fibers" + } + ], + "rolls": 1.0 + }, + { + "bonus_rolls": 0.0, + "entries": [ + { + "type": "minecraft:item", + "conditions": [ + { + "condition": "minecraft:inverted", + "term": { + "condition": "minecraft:any_of", + "terms": [ + { + "condition": "minecraft:match_tool", + "predicate": { + "items": "minecraft:shears" + } + }, + { + "condition": "minecraft:match_tool", + "predicate": { + "predicates": { + "minecraft:enchantments": [ + { + "enchantment": "minecraft:silk_touch", + "levels": { + "min": 1 + } + } + ] + } + } + } + ] + } + }, + { + "condition": "minecraft:inverted", + "term": { + "block": "floralis:brown_cactus_crop", + "condition": "minecraft:block_state_property", + "properties": { + "age": "5" + } + } + } + ], + "name": "floralis:brown_cactus_seeds" + } + ], + "rolls": 1.0 + } + ], + "random_sequence": "floralis:blocks/brown_cactus_crop" +} \ No newline at end of file diff --git a/src/main/resources/data/floralis/loot_tables/blocks/brown_dye_block.json b/src/generated/resources/data/floralis/loot_tables/blocks/brown_dye_block.json similarity index 55% rename from src/main/resources/data/floralis/loot_tables/blocks/brown_dye_block.json rename to src/generated/resources/data/floralis/loot_tables/blocks/brown_dye_block.json index 3ed7f8b0..1a95f5e6 100644 --- a/src/main/resources/data/floralis/loot_tables/blocks/brown_dye_block.json +++ b/src/generated/resources/data/floralis/loot_tables/blocks/brown_dye_block.json @@ -2,19 +2,15 @@ "type": "minecraft:block", "pools": [ { - "rolls": 1, - "bonus_rolls": 0, + "bonus_rolls": 0.0, "entries": [ { "type": "minecraft:item", "name": "floralis:brown_dye_block" } ], - "conditions": [ - { - "condition": "minecraft:survives_explosion" - } - ] + "rolls": 1.0 } - ] + ], + "random_sequence": "floralis:blocks/brown_dye_block" } \ No newline at end of file diff --git a/src/generated/resources/data/floralis/loot_tables/blocks/brown_flower.json b/src/generated/resources/data/floralis/loot_tables/blocks/brown_flower.json new file mode 100644 index 00000000..0e711bf8 --- /dev/null +++ b/src/generated/resources/data/floralis/loot_tables/blocks/brown_flower.json @@ -0,0 +1,202 @@ +{ + "type": "minecraft:block", + "pools": [ + { + "bonus_rolls": 0.0, + "entries": [ + { + "type": "minecraft:item", + "conditions": [ + { + "condition": "minecraft:any_of", + "terms": [ + { + "condition": "minecraft:match_tool", + "predicate": { + "items": "minecraft:shears" + } + }, + { + "condition": "minecraft:match_tool", + "predicate": { + "predicates": { + "minecraft:enchantments": [ + { + "enchantment": "minecraft:silk_touch", + "levels": { + "min": 1 + } + } + ] + } + } + } + ] + } + ], + "name": "floralis:brown_flower" + } + ], + "rolls": 1.0 + }, + { + "bonus_rolls": 0.0, + "entries": [ + { + "type": "minecraft:item", + "conditions": [ + { + "condition": "minecraft:inverted", + "term": { + "condition": "minecraft:any_of", + "terms": [ + { + "condition": "minecraft:match_tool", + "predicate": { + "items": "minecraft:shears" + } + }, + { + "condition": "minecraft:match_tool", + "predicate": { + "predicates": { + "minecraft:enchantments": [ + { + "enchantment": "minecraft:silk_touch", + "levels": { + "min": 1 + } + } + ] + } + } + } + ] + } + } + ], + "functions": [ + { + "enchantment": "minecraft:fortune", + "formula": "minecraft:uniform_bonus_count", + "function": "minecraft:apply_bonus", + "parameters": { + "bonusMultiplier": 2 + } + }, + { + "add": false, + "count": 2.0, + "function": "minecraft:set_count" + } + ], + "name": "floralis:brown_flower_seeds" + } + ], + "rolls": 1.0 + }, + { + "bonus_rolls": 0.0, + "entries": [ + { + "type": "minecraft:item", + "conditions": [ + { + "condition": "minecraft:inverted", + "term": { + "condition": "minecraft:any_of", + "terms": [ + { + "condition": "minecraft:match_tool", + "predicate": { + "items": "minecraft:shears" + } + }, + { + "condition": "minecraft:match_tool", + "predicate": { + "predicates": { + "minecraft:enchantments": [ + { + "enchantment": "minecraft:silk_touch", + "levels": { + "min": 1 + } + } + ] + } + } + } + ] + } + } + ], + "functions": [ + { + "enchantment": "minecraft:fortune", + "formula": "minecraft:uniform_bonus_count", + "function": "minecraft:apply_bonus", + "parameters": { + "bonusMultiplier": 2 + } + } + ], + "name": "floralis:brown_petals" + } + ], + "rolls": 1.0 + }, + { + "bonus_rolls": 0.0, + "entries": [ + { + "type": "minecraft:item", + "conditions": [ + { + "condition": "minecraft:inverted", + "term": { + "condition": "minecraft:any_of", + "terms": [ + { + "condition": "minecraft:match_tool", + "predicate": { + "items": "minecraft:shears" + } + }, + { + "condition": "minecraft:match_tool", + "predicate": { + "predicates": { + "minecraft:enchantments": [ + { + "enchantment": "minecraft:silk_touch", + "levels": { + "min": 1 + } + } + ] + } + } + } + ] + } + } + ], + "functions": [ + { + "enchantment": "minecraft:fortune", + "formula": "minecraft:uniform_bonus_count", + "function": "minecraft:apply_bonus", + "parameters": { + "bonusMultiplier": 2 + } + } + ], + "name": "floralis:plant_fibers" + } + ], + "rolls": 1.0 + } + ], + "random_sequence": "floralis:blocks/brown_flower" +} \ No newline at end of file diff --git a/src/generated/resources/data/floralis/loot_tables/blocks/brown_flower_crop.json b/src/generated/resources/data/floralis/loot_tables/blocks/brown_flower_crop.json new file mode 100644 index 00000000..eff69b00 --- /dev/null +++ b/src/generated/resources/data/floralis/loot_tables/blocks/brown_flower_crop.json @@ -0,0 +1,329 @@ +{ + "type": "minecraft:block", + "pools": [ + { + "bonus_rolls": 0.0, + "entries": [ + { + "type": "minecraft:item", + "conditions": [ + { + "condition": "minecraft:any_of", + "terms": [ + { + "condition": "minecraft:match_tool", + "predicate": { + "items": "minecraft:shears" + } + }, + { + "condition": "minecraft:match_tool", + "predicate": { + "predicates": { + "minecraft:enchantments": [ + { + "enchantment": "minecraft:silk_touch", + "levels": { + "min": 1 + } + } + ] + } + } + } + ] + }, + { + "block": "floralis:brown_flower_crop", + "condition": "minecraft:block_state_property", + "properties": { + "age": "5" + } + } + ], + "name": "floralis:brown_flower" + } + ], + "rolls": 1.0 + }, + { + "bonus_rolls": 0.0, + "entries": [ + { + "type": "minecraft:item", + "conditions": [ + { + "condition": "minecraft:any_of", + "terms": [ + { + "condition": "minecraft:match_tool", + "predicate": { + "items": "minecraft:shears" + } + }, + { + "condition": "minecraft:match_tool", + "predicate": { + "predicates": { + "minecraft:enchantments": [ + { + "enchantment": "minecraft:silk_touch", + "levels": { + "min": 1 + } + } + ] + } + } + } + ] + }, + { + "condition": "minecraft:inverted", + "term": { + "block": "floralis:brown_flower_crop", + "condition": "minecraft:block_state_property", + "properties": { + "age": "5" + } + } + } + ], + "name": "floralis:brown_flower_seeds" + } + ], + "rolls": 1.0 + }, + { + "bonus_rolls": 0.0, + "entries": [ + { + "type": "minecraft:item", + "conditions": [ + { + "condition": "minecraft:inverted", + "term": { + "condition": "minecraft:any_of", + "terms": [ + { + "condition": "minecraft:match_tool", + "predicate": { + "items": "minecraft:shears" + } + }, + { + "condition": "minecraft:match_tool", + "predicate": { + "predicates": { + "minecraft:enchantments": [ + { + "enchantment": "minecraft:silk_touch", + "levels": { + "min": 1 + } + } + ] + } + } + } + ] + } + }, + { + "block": "floralis:brown_flower_crop", + "condition": "minecraft:block_state_property", + "properties": { + "age": "5" + } + } + ], + "functions": [ + { + "enchantment": "minecraft:fortune", + "formula": "minecraft:uniform_bonus_count", + "function": "minecraft:apply_bonus", + "parameters": { + "bonusMultiplier": 2 + } + }, + { + "add": false, + "count": 2.0, + "function": "minecraft:set_count" + } + ], + "name": "floralis:brown_flower_seeds" + } + ], + "rolls": 1.0 + }, + { + "bonus_rolls": 0.0, + "entries": [ + { + "type": "minecraft:item", + "conditions": [ + { + "condition": "minecraft:inverted", + "term": { + "condition": "minecraft:any_of", + "terms": [ + { + "condition": "minecraft:match_tool", + "predicate": { + "items": "minecraft:shears" + } + }, + { + "condition": "minecraft:match_tool", + "predicate": { + "predicates": { + "minecraft:enchantments": [ + { + "enchantment": "minecraft:silk_touch", + "levels": { + "min": 1 + } + } + ] + } + } + } + ] + } + }, + { + "block": "floralis:brown_flower_crop", + "condition": "minecraft:block_state_property", + "properties": { + "age": "5" + } + } + ], + "functions": [ + { + "enchantment": "minecraft:fortune", + "formula": "minecraft:uniform_bonus_count", + "function": "minecraft:apply_bonus", + "parameters": { + "bonusMultiplier": 2 + } + } + ], + "name": "floralis:brown_petals" + } + ], + "rolls": 1.0 + }, + { + "bonus_rolls": 0.0, + "entries": [ + { + "type": "minecraft:item", + "conditions": [ + { + "condition": "minecraft:inverted", + "term": { + "condition": "minecraft:any_of", + "terms": [ + { + "condition": "minecraft:match_tool", + "predicate": { + "items": "minecraft:shears" + } + }, + { + "condition": "minecraft:match_tool", + "predicate": { + "predicates": { + "minecraft:enchantments": [ + { + "enchantment": "minecraft:silk_touch", + "levels": { + "min": 1 + } + } + ] + } + } + } + ] + } + }, + { + "block": "floralis:brown_flower_crop", + "condition": "minecraft:block_state_property", + "properties": { + "age": "5" + } + } + ], + "functions": [ + { + "enchantment": "minecraft:fortune", + "formula": "minecraft:uniform_bonus_count", + "function": "minecraft:apply_bonus", + "parameters": { + "bonusMultiplier": 2 + } + } + ], + "name": "floralis:plant_fibers" + } + ], + "rolls": 1.0 + }, + { + "bonus_rolls": 0.0, + "entries": [ + { + "type": "minecraft:item", + "conditions": [ + { + "condition": "minecraft:inverted", + "term": { + "condition": "minecraft:any_of", + "terms": [ + { + "condition": "minecraft:match_tool", + "predicate": { + "items": "minecraft:shears" + } + }, + { + "condition": "minecraft:match_tool", + "predicate": { + "predicates": { + "minecraft:enchantments": [ + { + "enchantment": "minecraft:silk_touch", + "levels": { + "min": 1 + } + } + ] + } + } + } + ] + } + }, + { + "condition": "minecraft:inverted", + "term": { + "block": "floralis:brown_flower_crop", + "condition": "minecraft:block_state_property", + "properties": { + "age": "5" + } + } + } + ], + "name": "floralis:brown_flower_seeds" + } + ], + "rolls": 1.0 + } + ], + "random_sequence": "floralis:blocks/brown_flower_crop" +} \ No newline at end of file diff --git a/src/generated/resources/data/floralis/loot_tables/blocks/cloched_black_cactus_crop.json b/src/generated/resources/data/floralis/loot_tables/blocks/cloched_black_cactus_crop.json new file mode 100644 index 00000000..690ed63b --- /dev/null +++ b/src/generated/resources/data/floralis/loot_tables/blocks/cloched_black_cactus_crop.json @@ -0,0 +1,4 @@ +{ + "type": "minecraft:block", + "random_sequence": "floralis:blocks/cloched_black_cactus_crop" +} \ No newline at end of file diff --git a/src/generated/resources/data/floralis/loot_tables/blocks/cloched_black_flower_crop.json b/src/generated/resources/data/floralis/loot_tables/blocks/cloched_black_flower_crop.json new file mode 100644 index 00000000..78908e62 --- /dev/null +++ b/src/generated/resources/data/floralis/loot_tables/blocks/cloched_black_flower_crop.json @@ -0,0 +1,4 @@ +{ + "type": "minecraft:block", + "random_sequence": "floralis:blocks/cloched_black_flower_crop" +} \ No newline at end of file diff --git a/src/generated/resources/data/floralis/loot_tables/blocks/cloched_blue_cactus_crop.json b/src/generated/resources/data/floralis/loot_tables/blocks/cloched_blue_cactus_crop.json new file mode 100644 index 00000000..bcc25461 --- /dev/null +++ b/src/generated/resources/data/floralis/loot_tables/blocks/cloched_blue_cactus_crop.json @@ -0,0 +1,4 @@ +{ + "type": "minecraft:block", + "random_sequence": "floralis:blocks/cloched_blue_cactus_crop" +} \ No newline at end of file diff --git a/src/generated/resources/data/floralis/loot_tables/blocks/cloched_blue_flower_crop.json b/src/generated/resources/data/floralis/loot_tables/blocks/cloched_blue_flower_crop.json new file mode 100644 index 00000000..9432a7dc --- /dev/null +++ b/src/generated/resources/data/floralis/loot_tables/blocks/cloched_blue_flower_crop.json @@ -0,0 +1,4 @@ +{ + "type": "minecraft:block", + "random_sequence": "floralis:blocks/cloched_blue_flower_crop" +} \ No newline at end of file diff --git a/src/generated/resources/data/floralis/loot_tables/blocks/cloched_brown_cactus_crop.json b/src/generated/resources/data/floralis/loot_tables/blocks/cloched_brown_cactus_crop.json new file mode 100644 index 00000000..28f23f66 --- /dev/null +++ b/src/generated/resources/data/floralis/loot_tables/blocks/cloched_brown_cactus_crop.json @@ -0,0 +1,4 @@ +{ + "type": "minecraft:block", + "random_sequence": "floralis:blocks/cloched_brown_cactus_crop" +} \ No newline at end of file diff --git a/src/generated/resources/data/floralis/loot_tables/blocks/cloched_brown_flower_crop.json b/src/generated/resources/data/floralis/loot_tables/blocks/cloched_brown_flower_crop.json new file mode 100644 index 00000000..7d4cbefb --- /dev/null +++ b/src/generated/resources/data/floralis/loot_tables/blocks/cloched_brown_flower_crop.json @@ -0,0 +1,4 @@ +{ + "type": "minecraft:block", + "random_sequence": "floralis:blocks/cloched_brown_flower_crop" +} \ No newline at end of file diff --git a/src/generated/resources/data/floralis/loot_tables/blocks/cloched_cyan_cactus_crop.json b/src/generated/resources/data/floralis/loot_tables/blocks/cloched_cyan_cactus_crop.json new file mode 100644 index 00000000..73405921 --- /dev/null +++ b/src/generated/resources/data/floralis/loot_tables/blocks/cloched_cyan_cactus_crop.json @@ -0,0 +1,4 @@ +{ + "type": "minecraft:block", + "random_sequence": "floralis:blocks/cloched_cyan_cactus_crop" +} \ No newline at end of file diff --git a/src/generated/resources/data/floralis/loot_tables/blocks/cloched_cyan_flower_crop.json b/src/generated/resources/data/floralis/loot_tables/blocks/cloched_cyan_flower_crop.json new file mode 100644 index 00000000..7ae088bd --- /dev/null +++ b/src/generated/resources/data/floralis/loot_tables/blocks/cloched_cyan_flower_crop.json @@ -0,0 +1,4 @@ +{ + "type": "minecraft:block", + "random_sequence": "floralis:blocks/cloched_cyan_flower_crop" +} \ No newline at end of file diff --git a/src/generated/resources/data/floralis/loot_tables/blocks/cloched_gray_cactus_crop.json b/src/generated/resources/data/floralis/loot_tables/blocks/cloched_gray_cactus_crop.json new file mode 100644 index 00000000..4d0f0d36 --- /dev/null +++ b/src/generated/resources/data/floralis/loot_tables/blocks/cloched_gray_cactus_crop.json @@ -0,0 +1,4 @@ +{ + "type": "minecraft:block", + "random_sequence": "floralis:blocks/cloched_gray_cactus_crop" +} \ No newline at end of file diff --git a/src/generated/resources/data/floralis/loot_tables/blocks/cloched_gray_flower_crop.json b/src/generated/resources/data/floralis/loot_tables/blocks/cloched_gray_flower_crop.json new file mode 100644 index 00000000..5b5b735c --- /dev/null +++ b/src/generated/resources/data/floralis/loot_tables/blocks/cloched_gray_flower_crop.json @@ -0,0 +1,4 @@ +{ + "type": "minecraft:block", + "random_sequence": "floralis:blocks/cloched_gray_flower_crop" +} \ No newline at end of file diff --git a/src/generated/resources/data/floralis/loot_tables/blocks/cloched_green_cactus_crop.json b/src/generated/resources/data/floralis/loot_tables/blocks/cloched_green_cactus_crop.json new file mode 100644 index 00000000..5a4c4f16 --- /dev/null +++ b/src/generated/resources/data/floralis/loot_tables/blocks/cloched_green_cactus_crop.json @@ -0,0 +1,4 @@ +{ + "type": "minecraft:block", + "random_sequence": "floralis:blocks/cloched_green_cactus_crop" +} \ No newline at end of file diff --git a/src/generated/resources/data/floralis/loot_tables/blocks/cloched_green_flower_crop.json b/src/generated/resources/data/floralis/loot_tables/blocks/cloched_green_flower_crop.json new file mode 100644 index 00000000..948fcf24 --- /dev/null +++ b/src/generated/resources/data/floralis/loot_tables/blocks/cloched_green_flower_crop.json @@ -0,0 +1,4 @@ +{ + "type": "minecraft:block", + "random_sequence": "floralis:blocks/cloched_green_flower_crop" +} \ No newline at end of file diff --git a/src/generated/resources/data/floralis/loot_tables/blocks/cloched_light_blue_cactus_crop.json b/src/generated/resources/data/floralis/loot_tables/blocks/cloched_light_blue_cactus_crop.json new file mode 100644 index 00000000..721e35b7 --- /dev/null +++ b/src/generated/resources/data/floralis/loot_tables/blocks/cloched_light_blue_cactus_crop.json @@ -0,0 +1,4 @@ +{ + "type": "minecraft:block", + "random_sequence": "floralis:blocks/cloched_light_blue_cactus_crop" +} \ No newline at end of file diff --git a/src/generated/resources/data/floralis/loot_tables/blocks/cloched_light_blue_flower_crop.json b/src/generated/resources/data/floralis/loot_tables/blocks/cloched_light_blue_flower_crop.json new file mode 100644 index 00000000..d63660d5 --- /dev/null +++ b/src/generated/resources/data/floralis/loot_tables/blocks/cloched_light_blue_flower_crop.json @@ -0,0 +1,4 @@ +{ + "type": "minecraft:block", + "random_sequence": "floralis:blocks/cloched_light_blue_flower_crop" +} \ No newline at end of file diff --git a/src/generated/resources/data/floralis/loot_tables/blocks/cloched_light_gray_cactus_crop.json b/src/generated/resources/data/floralis/loot_tables/blocks/cloched_light_gray_cactus_crop.json new file mode 100644 index 00000000..a4ca6bac --- /dev/null +++ b/src/generated/resources/data/floralis/loot_tables/blocks/cloched_light_gray_cactus_crop.json @@ -0,0 +1,4 @@ +{ + "type": "minecraft:block", + "random_sequence": "floralis:blocks/cloched_light_gray_cactus_crop" +} \ No newline at end of file diff --git a/src/generated/resources/data/floralis/loot_tables/blocks/cloched_light_gray_flower_crop.json b/src/generated/resources/data/floralis/loot_tables/blocks/cloched_light_gray_flower_crop.json new file mode 100644 index 00000000..208e982c --- /dev/null +++ b/src/generated/resources/data/floralis/loot_tables/blocks/cloched_light_gray_flower_crop.json @@ -0,0 +1,4 @@ +{ + "type": "minecraft:block", + "random_sequence": "floralis:blocks/cloched_light_gray_flower_crop" +} \ No newline at end of file diff --git a/src/generated/resources/data/floralis/loot_tables/blocks/cloched_lime_cactus_crop.json b/src/generated/resources/data/floralis/loot_tables/blocks/cloched_lime_cactus_crop.json new file mode 100644 index 00000000..84d37797 --- /dev/null +++ b/src/generated/resources/data/floralis/loot_tables/blocks/cloched_lime_cactus_crop.json @@ -0,0 +1,4 @@ +{ + "type": "minecraft:block", + "random_sequence": "floralis:blocks/cloched_lime_cactus_crop" +} \ No newline at end of file diff --git a/src/generated/resources/data/floralis/loot_tables/blocks/cloched_lime_flower_crop.json b/src/generated/resources/data/floralis/loot_tables/blocks/cloched_lime_flower_crop.json new file mode 100644 index 00000000..3bf17798 --- /dev/null +++ b/src/generated/resources/data/floralis/loot_tables/blocks/cloched_lime_flower_crop.json @@ -0,0 +1,4 @@ +{ + "type": "minecraft:block", + "random_sequence": "floralis:blocks/cloched_lime_flower_crop" +} \ No newline at end of file diff --git a/src/generated/resources/data/floralis/loot_tables/blocks/cloched_magenta_cactus_crop.json b/src/generated/resources/data/floralis/loot_tables/blocks/cloched_magenta_cactus_crop.json new file mode 100644 index 00000000..882db4b7 --- /dev/null +++ b/src/generated/resources/data/floralis/loot_tables/blocks/cloched_magenta_cactus_crop.json @@ -0,0 +1,4 @@ +{ + "type": "minecraft:block", + "random_sequence": "floralis:blocks/cloched_magenta_cactus_crop" +} \ No newline at end of file diff --git a/src/generated/resources/data/floralis/loot_tables/blocks/cloched_magenta_flower_crop.json b/src/generated/resources/data/floralis/loot_tables/blocks/cloched_magenta_flower_crop.json new file mode 100644 index 00000000..d1af9276 --- /dev/null +++ b/src/generated/resources/data/floralis/loot_tables/blocks/cloched_magenta_flower_crop.json @@ -0,0 +1,4 @@ +{ + "type": "minecraft:block", + "random_sequence": "floralis:blocks/cloched_magenta_flower_crop" +} \ No newline at end of file diff --git a/src/generated/resources/data/floralis/loot_tables/blocks/cloched_orange_cactus_crop.json b/src/generated/resources/data/floralis/loot_tables/blocks/cloched_orange_cactus_crop.json new file mode 100644 index 00000000..1a17c61a --- /dev/null +++ b/src/generated/resources/data/floralis/loot_tables/blocks/cloched_orange_cactus_crop.json @@ -0,0 +1,4 @@ +{ + "type": "minecraft:block", + "random_sequence": "floralis:blocks/cloched_orange_cactus_crop" +} \ No newline at end of file diff --git a/src/generated/resources/data/floralis/loot_tables/blocks/cloched_orange_flower_crop.json b/src/generated/resources/data/floralis/loot_tables/blocks/cloched_orange_flower_crop.json new file mode 100644 index 00000000..02907e5d --- /dev/null +++ b/src/generated/resources/data/floralis/loot_tables/blocks/cloched_orange_flower_crop.json @@ -0,0 +1,4 @@ +{ + "type": "minecraft:block", + "random_sequence": "floralis:blocks/cloched_orange_flower_crop" +} \ No newline at end of file diff --git a/src/generated/resources/data/floralis/loot_tables/blocks/cloched_pink_cactus_crop.json b/src/generated/resources/data/floralis/loot_tables/blocks/cloched_pink_cactus_crop.json new file mode 100644 index 00000000..db3ecd42 --- /dev/null +++ b/src/generated/resources/data/floralis/loot_tables/blocks/cloched_pink_cactus_crop.json @@ -0,0 +1,4 @@ +{ + "type": "minecraft:block", + "random_sequence": "floralis:blocks/cloched_pink_cactus_crop" +} \ No newline at end of file diff --git a/src/generated/resources/data/floralis/loot_tables/blocks/cloched_pink_flower_crop.json b/src/generated/resources/data/floralis/loot_tables/blocks/cloched_pink_flower_crop.json new file mode 100644 index 00000000..48fa0399 --- /dev/null +++ b/src/generated/resources/data/floralis/loot_tables/blocks/cloched_pink_flower_crop.json @@ -0,0 +1,4 @@ +{ + "type": "minecraft:block", + "random_sequence": "floralis:blocks/cloched_pink_flower_crop" +} \ No newline at end of file diff --git a/src/generated/resources/data/floralis/loot_tables/blocks/cloched_purple_cactus_crop.json b/src/generated/resources/data/floralis/loot_tables/blocks/cloched_purple_cactus_crop.json new file mode 100644 index 00000000..54ea433e --- /dev/null +++ b/src/generated/resources/data/floralis/loot_tables/blocks/cloched_purple_cactus_crop.json @@ -0,0 +1,4 @@ +{ + "type": "minecraft:block", + "random_sequence": "floralis:blocks/cloched_purple_cactus_crop" +} \ No newline at end of file diff --git a/src/generated/resources/data/floralis/loot_tables/blocks/cloched_purple_flower_crop.json b/src/generated/resources/data/floralis/loot_tables/blocks/cloched_purple_flower_crop.json new file mode 100644 index 00000000..266722e0 --- /dev/null +++ b/src/generated/resources/data/floralis/loot_tables/blocks/cloched_purple_flower_crop.json @@ -0,0 +1,4 @@ +{ + "type": "minecraft:block", + "random_sequence": "floralis:blocks/cloched_purple_flower_crop" +} \ No newline at end of file diff --git a/src/generated/resources/data/floralis/loot_tables/blocks/cloched_red_cactus_crop.json b/src/generated/resources/data/floralis/loot_tables/blocks/cloched_red_cactus_crop.json new file mode 100644 index 00000000..9d8d3bed --- /dev/null +++ b/src/generated/resources/data/floralis/loot_tables/blocks/cloched_red_cactus_crop.json @@ -0,0 +1,4 @@ +{ + "type": "minecraft:block", + "random_sequence": "floralis:blocks/cloched_red_cactus_crop" +} \ No newline at end of file diff --git a/src/generated/resources/data/floralis/loot_tables/blocks/cloched_red_flower_crop.json b/src/generated/resources/data/floralis/loot_tables/blocks/cloched_red_flower_crop.json new file mode 100644 index 00000000..800b22f9 --- /dev/null +++ b/src/generated/resources/data/floralis/loot_tables/blocks/cloched_red_flower_crop.json @@ -0,0 +1,4 @@ +{ + "type": "minecraft:block", + "random_sequence": "floralis:blocks/cloched_red_flower_crop" +} \ No newline at end of file diff --git a/src/generated/resources/data/floralis/loot_tables/blocks/cloched_white_cactus_crop.json b/src/generated/resources/data/floralis/loot_tables/blocks/cloched_white_cactus_crop.json new file mode 100644 index 00000000..7f1b2271 --- /dev/null +++ b/src/generated/resources/data/floralis/loot_tables/blocks/cloched_white_cactus_crop.json @@ -0,0 +1,4 @@ +{ + "type": "minecraft:block", + "random_sequence": "floralis:blocks/cloched_white_cactus_crop" +} \ No newline at end of file diff --git a/src/generated/resources/data/floralis/loot_tables/blocks/cloched_white_flower_crop.json b/src/generated/resources/data/floralis/loot_tables/blocks/cloched_white_flower_crop.json new file mode 100644 index 00000000..7e0fa0e5 --- /dev/null +++ b/src/generated/resources/data/floralis/loot_tables/blocks/cloched_white_flower_crop.json @@ -0,0 +1,4 @@ +{ + "type": "minecraft:block", + "random_sequence": "floralis:blocks/cloched_white_flower_crop" +} \ No newline at end of file diff --git a/src/generated/resources/data/floralis/loot_tables/blocks/cloched_yellow_cactus_crop.json b/src/generated/resources/data/floralis/loot_tables/blocks/cloched_yellow_cactus_crop.json new file mode 100644 index 00000000..a746212c --- /dev/null +++ b/src/generated/resources/data/floralis/loot_tables/blocks/cloched_yellow_cactus_crop.json @@ -0,0 +1,4 @@ +{ + "type": "minecraft:block", + "random_sequence": "floralis:blocks/cloched_yellow_cactus_crop" +} \ No newline at end of file diff --git a/src/generated/resources/data/floralis/loot_tables/blocks/cloched_yellow_flower_crop.json b/src/generated/resources/data/floralis/loot_tables/blocks/cloched_yellow_flower_crop.json new file mode 100644 index 00000000..da62eb1d --- /dev/null +++ b/src/generated/resources/data/floralis/loot_tables/blocks/cloched_yellow_flower_crop.json @@ -0,0 +1,4 @@ +{ + "type": "minecraft:block", + "random_sequence": "floralis:blocks/cloched_yellow_flower_crop" +} \ No newline at end of file diff --git a/src/generated/resources/data/floralis/loot_tables/blocks/cyan_cactus.json b/src/generated/resources/data/floralis/loot_tables/blocks/cyan_cactus.json new file mode 100644 index 00000000..55154a63 --- /dev/null +++ b/src/generated/resources/data/floralis/loot_tables/blocks/cyan_cactus.json @@ -0,0 +1,202 @@ +{ + "type": "minecraft:block", + "pools": [ + { + "bonus_rolls": 0.0, + "entries": [ + { + "type": "minecraft:item", + "conditions": [ + { + "condition": "minecraft:any_of", + "terms": [ + { + "condition": "minecraft:match_tool", + "predicate": { + "items": "minecraft:shears" + } + }, + { + "condition": "minecraft:match_tool", + "predicate": { + "predicates": { + "minecraft:enchantments": [ + { + "enchantment": "minecraft:silk_touch", + "levels": { + "min": 1 + } + } + ] + } + } + } + ] + } + ], + "name": "floralis:cyan_cactus" + } + ], + "rolls": 1.0 + }, + { + "bonus_rolls": 0.0, + "entries": [ + { + "type": "minecraft:item", + "conditions": [ + { + "condition": "minecraft:inverted", + "term": { + "condition": "minecraft:any_of", + "terms": [ + { + "condition": "minecraft:match_tool", + "predicate": { + "items": "minecraft:shears" + } + }, + { + "condition": "minecraft:match_tool", + "predicate": { + "predicates": { + "minecraft:enchantments": [ + { + "enchantment": "minecraft:silk_touch", + "levels": { + "min": 1 + } + } + ] + } + } + } + ] + } + } + ], + "functions": [ + { + "enchantment": "minecraft:fortune", + "formula": "minecraft:uniform_bonus_count", + "function": "minecraft:apply_bonus", + "parameters": { + "bonusMultiplier": 2 + } + }, + { + "add": false, + "count": 2.0, + "function": "minecraft:set_count" + } + ], + "name": "floralis:cyan_cactus_seeds" + } + ], + "rolls": 1.0 + }, + { + "bonus_rolls": 0.0, + "entries": [ + { + "type": "minecraft:item", + "conditions": [ + { + "condition": "minecraft:inverted", + "term": { + "condition": "minecraft:any_of", + "terms": [ + { + "condition": "minecraft:match_tool", + "predicate": { + "items": "minecraft:shears" + } + }, + { + "condition": "minecraft:match_tool", + "predicate": { + "predicates": { + "minecraft:enchantments": [ + { + "enchantment": "minecraft:silk_touch", + "levels": { + "min": 1 + } + } + ] + } + } + } + ] + } + } + ], + "functions": [ + { + "enchantment": "minecraft:fortune", + "formula": "minecraft:uniform_bonus_count", + "function": "minecraft:apply_bonus", + "parameters": { + "bonusMultiplier": 2 + } + } + ], + "name": "floralis:cyan_petals" + } + ], + "rolls": 1.0 + }, + { + "bonus_rolls": 0.0, + "entries": [ + { + "type": "minecraft:item", + "conditions": [ + { + "condition": "minecraft:inverted", + "term": { + "condition": "minecraft:any_of", + "terms": [ + { + "condition": "minecraft:match_tool", + "predicate": { + "items": "minecraft:shears" + } + }, + { + "condition": "minecraft:match_tool", + "predicate": { + "predicates": { + "minecraft:enchantments": [ + { + "enchantment": "minecraft:silk_touch", + "levels": { + "min": 1 + } + } + ] + } + } + } + ] + } + } + ], + "functions": [ + { + "enchantment": "minecraft:fortune", + "formula": "minecraft:uniform_bonus_count", + "function": "minecraft:apply_bonus", + "parameters": { + "bonusMultiplier": 2 + } + } + ], + "name": "floralis:plant_fibers" + } + ], + "rolls": 1.0 + } + ], + "random_sequence": "floralis:blocks/cyan_cactus" +} \ No newline at end of file diff --git a/src/generated/resources/data/floralis/loot_tables/blocks/cyan_cactus_crop.json b/src/generated/resources/data/floralis/loot_tables/blocks/cyan_cactus_crop.json new file mode 100644 index 00000000..c4fc1973 --- /dev/null +++ b/src/generated/resources/data/floralis/loot_tables/blocks/cyan_cactus_crop.json @@ -0,0 +1,329 @@ +{ + "type": "minecraft:block", + "pools": [ + { + "bonus_rolls": 0.0, + "entries": [ + { + "type": "minecraft:item", + "conditions": [ + { + "condition": "minecraft:any_of", + "terms": [ + { + "condition": "minecraft:match_tool", + "predicate": { + "items": "minecraft:shears" + } + }, + { + "condition": "minecraft:match_tool", + "predicate": { + "predicates": { + "minecraft:enchantments": [ + { + "enchantment": "minecraft:silk_touch", + "levels": { + "min": 1 + } + } + ] + } + } + } + ] + }, + { + "block": "floralis:cyan_cactus_crop", + "condition": "minecraft:block_state_property", + "properties": { + "age": "5" + } + } + ], + "name": "floralis:cyan_cactus" + } + ], + "rolls": 1.0 + }, + { + "bonus_rolls": 0.0, + "entries": [ + { + "type": "minecraft:item", + "conditions": [ + { + "condition": "minecraft:any_of", + "terms": [ + { + "condition": "minecraft:match_tool", + "predicate": { + "items": "minecraft:shears" + } + }, + { + "condition": "minecraft:match_tool", + "predicate": { + "predicates": { + "minecraft:enchantments": [ + { + "enchantment": "minecraft:silk_touch", + "levels": { + "min": 1 + } + } + ] + } + } + } + ] + }, + { + "condition": "minecraft:inverted", + "term": { + "block": "floralis:cyan_cactus_crop", + "condition": "minecraft:block_state_property", + "properties": { + "age": "5" + } + } + } + ], + "name": "floralis:cyan_cactus_seeds" + } + ], + "rolls": 1.0 + }, + { + "bonus_rolls": 0.0, + "entries": [ + { + "type": "minecraft:item", + "conditions": [ + { + "condition": "minecraft:inverted", + "term": { + "condition": "minecraft:any_of", + "terms": [ + { + "condition": "minecraft:match_tool", + "predicate": { + "items": "minecraft:shears" + } + }, + { + "condition": "minecraft:match_tool", + "predicate": { + "predicates": { + "minecraft:enchantments": [ + { + "enchantment": "minecraft:silk_touch", + "levels": { + "min": 1 + } + } + ] + } + } + } + ] + } + }, + { + "block": "floralis:cyan_cactus_crop", + "condition": "minecraft:block_state_property", + "properties": { + "age": "5" + } + } + ], + "functions": [ + { + "enchantment": "minecraft:fortune", + "formula": "minecraft:uniform_bonus_count", + "function": "minecraft:apply_bonus", + "parameters": { + "bonusMultiplier": 2 + } + }, + { + "add": false, + "count": 2.0, + "function": "minecraft:set_count" + } + ], + "name": "floralis:cyan_cactus_seeds" + } + ], + "rolls": 1.0 + }, + { + "bonus_rolls": 0.0, + "entries": [ + { + "type": "minecraft:item", + "conditions": [ + { + "condition": "minecraft:inverted", + "term": { + "condition": "minecraft:any_of", + "terms": [ + { + "condition": "minecraft:match_tool", + "predicate": { + "items": "minecraft:shears" + } + }, + { + "condition": "minecraft:match_tool", + "predicate": { + "predicates": { + "minecraft:enchantments": [ + { + "enchantment": "minecraft:silk_touch", + "levels": { + "min": 1 + } + } + ] + } + } + } + ] + } + }, + { + "block": "floralis:cyan_cactus_crop", + "condition": "minecraft:block_state_property", + "properties": { + "age": "5" + } + } + ], + "functions": [ + { + "enchantment": "minecraft:fortune", + "formula": "minecraft:uniform_bonus_count", + "function": "minecraft:apply_bonus", + "parameters": { + "bonusMultiplier": 2 + } + } + ], + "name": "floralis:cyan_petals" + } + ], + "rolls": 1.0 + }, + { + "bonus_rolls": 0.0, + "entries": [ + { + "type": "minecraft:item", + "conditions": [ + { + "condition": "minecraft:inverted", + "term": { + "condition": "minecraft:any_of", + "terms": [ + { + "condition": "minecraft:match_tool", + "predicate": { + "items": "minecraft:shears" + } + }, + { + "condition": "minecraft:match_tool", + "predicate": { + "predicates": { + "minecraft:enchantments": [ + { + "enchantment": "minecraft:silk_touch", + "levels": { + "min": 1 + } + } + ] + } + } + } + ] + } + }, + { + "block": "floralis:cyan_cactus_crop", + "condition": "minecraft:block_state_property", + "properties": { + "age": "5" + } + } + ], + "functions": [ + { + "enchantment": "minecraft:fortune", + "formula": "minecraft:uniform_bonus_count", + "function": "minecraft:apply_bonus", + "parameters": { + "bonusMultiplier": 2 + } + } + ], + "name": "floralis:plant_fibers" + } + ], + "rolls": 1.0 + }, + { + "bonus_rolls": 0.0, + "entries": [ + { + "type": "minecraft:item", + "conditions": [ + { + "condition": "minecraft:inverted", + "term": { + "condition": "minecraft:any_of", + "terms": [ + { + "condition": "minecraft:match_tool", + "predicate": { + "items": "minecraft:shears" + } + }, + { + "condition": "minecraft:match_tool", + "predicate": { + "predicates": { + "minecraft:enchantments": [ + { + "enchantment": "minecraft:silk_touch", + "levels": { + "min": 1 + } + } + ] + } + } + } + ] + } + }, + { + "condition": "minecraft:inverted", + "term": { + "block": "floralis:cyan_cactus_crop", + "condition": "minecraft:block_state_property", + "properties": { + "age": "5" + } + } + } + ], + "name": "floralis:cyan_cactus_seeds" + } + ], + "rolls": 1.0 + } + ], + "random_sequence": "floralis:blocks/cyan_cactus_crop" +} \ No newline at end of file diff --git a/src/main/resources/data/floralis/loot_tables/blocks/cyan_dye_block.json b/src/generated/resources/data/floralis/loot_tables/blocks/cyan_dye_block.json similarity index 55% rename from src/main/resources/data/floralis/loot_tables/blocks/cyan_dye_block.json rename to src/generated/resources/data/floralis/loot_tables/blocks/cyan_dye_block.json index fac1bbf6..e74b9588 100644 --- a/src/main/resources/data/floralis/loot_tables/blocks/cyan_dye_block.json +++ b/src/generated/resources/data/floralis/loot_tables/blocks/cyan_dye_block.json @@ -2,19 +2,15 @@ "type": "minecraft:block", "pools": [ { - "rolls": 1, - "bonus_rolls": 0, + "bonus_rolls": 0.0, "entries": [ { "type": "minecraft:item", "name": "floralis:cyan_dye_block" } ], - "conditions": [ - { - "condition": "minecraft:survives_explosion" - } - ] + "rolls": 1.0 } - ] + ], + "random_sequence": "floralis:blocks/cyan_dye_block" } \ No newline at end of file diff --git a/src/generated/resources/data/floralis/loot_tables/blocks/cyan_flower.json b/src/generated/resources/data/floralis/loot_tables/blocks/cyan_flower.json new file mode 100644 index 00000000..0a03693e --- /dev/null +++ b/src/generated/resources/data/floralis/loot_tables/blocks/cyan_flower.json @@ -0,0 +1,202 @@ +{ + "type": "minecraft:block", + "pools": [ + { + "bonus_rolls": 0.0, + "entries": [ + { + "type": "minecraft:item", + "conditions": [ + { + "condition": "minecraft:any_of", + "terms": [ + { + "condition": "minecraft:match_tool", + "predicate": { + "items": "minecraft:shears" + } + }, + { + "condition": "minecraft:match_tool", + "predicate": { + "predicates": { + "minecraft:enchantments": [ + { + "enchantment": "minecraft:silk_touch", + "levels": { + "min": 1 + } + } + ] + } + } + } + ] + } + ], + "name": "floralis:cyan_flower" + } + ], + "rolls": 1.0 + }, + { + "bonus_rolls": 0.0, + "entries": [ + { + "type": "minecraft:item", + "conditions": [ + { + "condition": "minecraft:inverted", + "term": { + "condition": "minecraft:any_of", + "terms": [ + { + "condition": "minecraft:match_tool", + "predicate": { + "items": "minecraft:shears" + } + }, + { + "condition": "minecraft:match_tool", + "predicate": { + "predicates": { + "minecraft:enchantments": [ + { + "enchantment": "minecraft:silk_touch", + "levels": { + "min": 1 + } + } + ] + } + } + } + ] + } + } + ], + "functions": [ + { + "enchantment": "minecraft:fortune", + "formula": "minecraft:uniform_bonus_count", + "function": "minecraft:apply_bonus", + "parameters": { + "bonusMultiplier": 2 + } + }, + { + "add": false, + "count": 2.0, + "function": "minecraft:set_count" + } + ], + "name": "floralis:cyan_flower_seeds" + } + ], + "rolls": 1.0 + }, + { + "bonus_rolls": 0.0, + "entries": [ + { + "type": "minecraft:item", + "conditions": [ + { + "condition": "minecraft:inverted", + "term": { + "condition": "minecraft:any_of", + "terms": [ + { + "condition": "minecraft:match_tool", + "predicate": { + "items": "minecraft:shears" + } + }, + { + "condition": "minecraft:match_tool", + "predicate": { + "predicates": { + "minecraft:enchantments": [ + { + "enchantment": "minecraft:silk_touch", + "levels": { + "min": 1 + } + } + ] + } + } + } + ] + } + } + ], + "functions": [ + { + "enchantment": "minecraft:fortune", + "formula": "minecraft:uniform_bonus_count", + "function": "minecraft:apply_bonus", + "parameters": { + "bonusMultiplier": 2 + } + } + ], + "name": "floralis:cyan_petals" + } + ], + "rolls": 1.0 + }, + { + "bonus_rolls": 0.0, + "entries": [ + { + "type": "minecraft:item", + "conditions": [ + { + "condition": "minecraft:inverted", + "term": { + "condition": "minecraft:any_of", + "terms": [ + { + "condition": "minecraft:match_tool", + "predicate": { + "items": "minecraft:shears" + } + }, + { + "condition": "minecraft:match_tool", + "predicate": { + "predicates": { + "minecraft:enchantments": [ + { + "enchantment": "minecraft:silk_touch", + "levels": { + "min": 1 + } + } + ] + } + } + } + ] + } + } + ], + "functions": [ + { + "enchantment": "minecraft:fortune", + "formula": "minecraft:uniform_bonus_count", + "function": "minecraft:apply_bonus", + "parameters": { + "bonusMultiplier": 2 + } + } + ], + "name": "floralis:plant_fibers" + } + ], + "rolls": 1.0 + } + ], + "random_sequence": "floralis:blocks/cyan_flower" +} \ No newline at end of file diff --git a/src/generated/resources/data/floralis/loot_tables/blocks/cyan_flower_crop.json b/src/generated/resources/data/floralis/loot_tables/blocks/cyan_flower_crop.json new file mode 100644 index 00000000..9662643f --- /dev/null +++ b/src/generated/resources/data/floralis/loot_tables/blocks/cyan_flower_crop.json @@ -0,0 +1,329 @@ +{ + "type": "minecraft:block", + "pools": [ + { + "bonus_rolls": 0.0, + "entries": [ + { + "type": "minecraft:item", + "conditions": [ + { + "condition": "minecraft:any_of", + "terms": [ + { + "condition": "minecraft:match_tool", + "predicate": { + "items": "minecraft:shears" + } + }, + { + "condition": "minecraft:match_tool", + "predicate": { + "predicates": { + "minecraft:enchantments": [ + { + "enchantment": "minecraft:silk_touch", + "levels": { + "min": 1 + } + } + ] + } + } + } + ] + }, + { + "block": "floralis:cyan_flower_crop", + "condition": "minecraft:block_state_property", + "properties": { + "age": "5" + } + } + ], + "name": "floralis:cyan_flower" + } + ], + "rolls": 1.0 + }, + { + "bonus_rolls": 0.0, + "entries": [ + { + "type": "minecraft:item", + "conditions": [ + { + "condition": "minecraft:any_of", + "terms": [ + { + "condition": "minecraft:match_tool", + "predicate": { + "items": "minecraft:shears" + } + }, + { + "condition": "minecraft:match_tool", + "predicate": { + "predicates": { + "minecraft:enchantments": [ + { + "enchantment": "minecraft:silk_touch", + "levels": { + "min": 1 + } + } + ] + } + } + } + ] + }, + { + "condition": "minecraft:inverted", + "term": { + "block": "floralis:cyan_flower_crop", + "condition": "minecraft:block_state_property", + "properties": { + "age": "5" + } + } + } + ], + "name": "floralis:cyan_flower_seeds" + } + ], + "rolls": 1.0 + }, + { + "bonus_rolls": 0.0, + "entries": [ + { + "type": "minecraft:item", + "conditions": [ + { + "condition": "minecraft:inverted", + "term": { + "condition": "minecraft:any_of", + "terms": [ + { + "condition": "minecraft:match_tool", + "predicate": { + "items": "minecraft:shears" + } + }, + { + "condition": "minecraft:match_tool", + "predicate": { + "predicates": { + "minecraft:enchantments": [ + { + "enchantment": "minecraft:silk_touch", + "levels": { + "min": 1 + } + } + ] + } + } + } + ] + } + }, + { + "block": "floralis:cyan_flower_crop", + "condition": "minecraft:block_state_property", + "properties": { + "age": "5" + } + } + ], + "functions": [ + { + "enchantment": "minecraft:fortune", + "formula": "minecraft:uniform_bonus_count", + "function": "minecraft:apply_bonus", + "parameters": { + "bonusMultiplier": 2 + } + }, + { + "add": false, + "count": 2.0, + "function": "minecraft:set_count" + } + ], + "name": "floralis:cyan_flower_seeds" + } + ], + "rolls": 1.0 + }, + { + "bonus_rolls": 0.0, + "entries": [ + { + "type": "minecraft:item", + "conditions": [ + { + "condition": "minecraft:inverted", + "term": { + "condition": "minecraft:any_of", + "terms": [ + { + "condition": "minecraft:match_tool", + "predicate": { + "items": "minecraft:shears" + } + }, + { + "condition": "minecraft:match_tool", + "predicate": { + "predicates": { + "minecraft:enchantments": [ + { + "enchantment": "minecraft:silk_touch", + "levels": { + "min": 1 + } + } + ] + } + } + } + ] + } + }, + { + "block": "floralis:cyan_flower_crop", + "condition": "minecraft:block_state_property", + "properties": { + "age": "5" + } + } + ], + "functions": [ + { + "enchantment": "minecraft:fortune", + "formula": "minecraft:uniform_bonus_count", + "function": "minecraft:apply_bonus", + "parameters": { + "bonusMultiplier": 2 + } + } + ], + "name": "floralis:cyan_petals" + } + ], + "rolls": 1.0 + }, + { + "bonus_rolls": 0.0, + "entries": [ + { + "type": "minecraft:item", + "conditions": [ + { + "condition": "minecraft:inverted", + "term": { + "condition": "minecraft:any_of", + "terms": [ + { + "condition": "minecraft:match_tool", + "predicate": { + "items": "minecraft:shears" + } + }, + { + "condition": "minecraft:match_tool", + "predicate": { + "predicates": { + "minecraft:enchantments": [ + { + "enchantment": "minecraft:silk_touch", + "levels": { + "min": 1 + } + } + ] + } + } + } + ] + } + }, + { + "block": "floralis:cyan_flower_crop", + "condition": "minecraft:block_state_property", + "properties": { + "age": "5" + } + } + ], + "functions": [ + { + "enchantment": "minecraft:fortune", + "formula": "minecraft:uniform_bonus_count", + "function": "minecraft:apply_bonus", + "parameters": { + "bonusMultiplier": 2 + } + } + ], + "name": "floralis:plant_fibers" + } + ], + "rolls": 1.0 + }, + { + "bonus_rolls": 0.0, + "entries": [ + { + "type": "minecraft:item", + "conditions": [ + { + "condition": "minecraft:inverted", + "term": { + "condition": "minecraft:any_of", + "terms": [ + { + "condition": "minecraft:match_tool", + "predicate": { + "items": "minecraft:shears" + } + }, + { + "condition": "minecraft:match_tool", + "predicate": { + "predicates": { + "minecraft:enchantments": [ + { + "enchantment": "minecraft:silk_touch", + "levels": { + "min": 1 + } + } + ] + } + } + } + ] + } + }, + { + "condition": "minecraft:inverted", + "term": { + "block": "floralis:cyan_flower_crop", + "condition": "minecraft:block_state_property", + "properties": { + "age": "5" + } + } + } + ], + "name": "floralis:cyan_flower_seeds" + } + ], + "rolls": 1.0 + } + ], + "random_sequence": "floralis:blocks/cyan_flower_crop" +} \ No newline at end of file diff --git a/src/generated/resources/data/floralis/loot_tables/blocks/gray_cactus.json b/src/generated/resources/data/floralis/loot_tables/blocks/gray_cactus.json new file mode 100644 index 00000000..4f582d4c --- /dev/null +++ b/src/generated/resources/data/floralis/loot_tables/blocks/gray_cactus.json @@ -0,0 +1,202 @@ +{ + "type": "minecraft:block", + "pools": [ + { + "bonus_rolls": 0.0, + "entries": [ + { + "type": "minecraft:item", + "conditions": [ + { + "condition": "minecraft:any_of", + "terms": [ + { + "condition": "minecraft:match_tool", + "predicate": { + "items": "minecraft:shears" + } + }, + { + "condition": "minecraft:match_tool", + "predicate": { + "predicates": { + "minecraft:enchantments": [ + { + "enchantment": "minecraft:silk_touch", + "levels": { + "min": 1 + } + } + ] + } + } + } + ] + } + ], + "name": "floralis:gray_cactus" + } + ], + "rolls": 1.0 + }, + { + "bonus_rolls": 0.0, + "entries": [ + { + "type": "minecraft:item", + "conditions": [ + { + "condition": "minecraft:inverted", + "term": { + "condition": "minecraft:any_of", + "terms": [ + { + "condition": "minecraft:match_tool", + "predicate": { + "items": "minecraft:shears" + } + }, + { + "condition": "minecraft:match_tool", + "predicate": { + "predicates": { + "minecraft:enchantments": [ + { + "enchantment": "minecraft:silk_touch", + "levels": { + "min": 1 + } + } + ] + } + } + } + ] + } + } + ], + "functions": [ + { + "enchantment": "minecraft:fortune", + "formula": "minecraft:uniform_bonus_count", + "function": "minecraft:apply_bonus", + "parameters": { + "bonusMultiplier": 2 + } + }, + { + "add": false, + "count": 2.0, + "function": "minecraft:set_count" + } + ], + "name": "floralis:gray_cactus_seeds" + } + ], + "rolls": 1.0 + }, + { + "bonus_rolls": 0.0, + "entries": [ + { + "type": "minecraft:item", + "conditions": [ + { + "condition": "minecraft:inverted", + "term": { + "condition": "minecraft:any_of", + "terms": [ + { + "condition": "minecraft:match_tool", + "predicate": { + "items": "minecraft:shears" + } + }, + { + "condition": "minecraft:match_tool", + "predicate": { + "predicates": { + "minecraft:enchantments": [ + { + "enchantment": "minecraft:silk_touch", + "levels": { + "min": 1 + } + } + ] + } + } + } + ] + } + } + ], + "functions": [ + { + "enchantment": "minecraft:fortune", + "formula": "minecraft:uniform_bonus_count", + "function": "minecraft:apply_bonus", + "parameters": { + "bonusMultiplier": 2 + } + } + ], + "name": "floralis:gray_petals" + } + ], + "rolls": 1.0 + }, + { + "bonus_rolls": 0.0, + "entries": [ + { + "type": "minecraft:item", + "conditions": [ + { + "condition": "minecraft:inverted", + "term": { + "condition": "minecraft:any_of", + "terms": [ + { + "condition": "minecraft:match_tool", + "predicate": { + "items": "minecraft:shears" + } + }, + { + "condition": "minecraft:match_tool", + "predicate": { + "predicates": { + "minecraft:enchantments": [ + { + "enchantment": "minecraft:silk_touch", + "levels": { + "min": 1 + } + } + ] + } + } + } + ] + } + } + ], + "functions": [ + { + "enchantment": "minecraft:fortune", + "formula": "minecraft:uniform_bonus_count", + "function": "minecraft:apply_bonus", + "parameters": { + "bonusMultiplier": 2 + } + } + ], + "name": "floralis:plant_fibers" + } + ], + "rolls": 1.0 + } + ], + "random_sequence": "floralis:blocks/gray_cactus" +} \ No newline at end of file diff --git a/src/generated/resources/data/floralis/loot_tables/blocks/gray_cactus_crop.json b/src/generated/resources/data/floralis/loot_tables/blocks/gray_cactus_crop.json new file mode 100644 index 00000000..1de93f5f --- /dev/null +++ b/src/generated/resources/data/floralis/loot_tables/blocks/gray_cactus_crop.json @@ -0,0 +1,329 @@ +{ + "type": "minecraft:block", + "pools": [ + { + "bonus_rolls": 0.0, + "entries": [ + { + "type": "minecraft:item", + "conditions": [ + { + "condition": "minecraft:any_of", + "terms": [ + { + "condition": "minecraft:match_tool", + "predicate": { + "items": "minecraft:shears" + } + }, + { + "condition": "minecraft:match_tool", + "predicate": { + "predicates": { + "minecraft:enchantments": [ + { + "enchantment": "minecraft:silk_touch", + "levels": { + "min": 1 + } + } + ] + } + } + } + ] + }, + { + "block": "floralis:gray_cactus_crop", + "condition": "minecraft:block_state_property", + "properties": { + "age": "5" + } + } + ], + "name": "floralis:gray_cactus" + } + ], + "rolls": 1.0 + }, + { + "bonus_rolls": 0.0, + "entries": [ + { + "type": "minecraft:item", + "conditions": [ + { + "condition": "minecraft:any_of", + "terms": [ + { + "condition": "minecraft:match_tool", + "predicate": { + "items": "minecraft:shears" + } + }, + { + "condition": "minecraft:match_tool", + "predicate": { + "predicates": { + "minecraft:enchantments": [ + { + "enchantment": "minecraft:silk_touch", + "levels": { + "min": 1 + } + } + ] + } + } + } + ] + }, + { + "condition": "minecraft:inverted", + "term": { + "block": "floralis:gray_cactus_crop", + "condition": "minecraft:block_state_property", + "properties": { + "age": "5" + } + } + } + ], + "name": "floralis:gray_cactus_seeds" + } + ], + "rolls": 1.0 + }, + { + "bonus_rolls": 0.0, + "entries": [ + { + "type": "minecraft:item", + "conditions": [ + { + "condition": "minecraft:inverted", + "term": { + "condition": "minecraft:any_of", + "terms": [ + { + "condition": "minecraft:match_tool", + "predicate": { + "items": "minecraft:shears" + } + }, + { + "condition": "minecraft:match_tool", + "predicate": { + "predicates": { + "minecraft:enchantments": [ + { + "enchantment": "minecraft:silk_touch", + "levels": { + "min": 1 + } + } + ] + } + } + } + ] + } + }, + { + "block": "floralis:gray_cactus_crop", + "condition": "minecraft:block_state_property", + "properties": { + "age": "5" + } + } + ], + "functions": [ + { + "enchantment": "minecraft:fortune", + "formula": "minecraft:uniform_bonus_count", + "function": "minecraft:apply_bonus", + "parameters": { + "bonusMultiplier": 2 + } + }, + { + "add": false, + "count": 2.0, + "function": "minecraft:set_count" + } + ], + "name": "floralis:gray_cactus_seeds" + } + ], + "rolls": 1.0 + }, + { + "bonus_rolls": 0.0, + "entries": [ + { + "type": "minecraft:item", + "conditions": [ + { + "condition": "minecraft:inverted", + "term": { + "condition": "minecraft:any_of", + "terms": [ + { + "condition": "minecraft:match_tool", + "predicate": { + "items": "minecraft:shears" + } + }, + { + "condition": "minecraft:match_tool", + "predicate": { + "predicates": { + "minecraft:enchantments": [ + { + "enchantment": "minecraft:silk_touch", + "levels": { + "min": 1 + } + } + ] + } + } + } + ] + } + }, + { + "block": "floralis:gray_cactus_crop", + "condition": "minecraft:block_state_property", + "properties": { + "age": "5" + } + } + ], + "functions": [ + { + "enchantment": "minecraft:fortune", + "formula": "minecraft:uniform_bonus_count", + "function": "minecraft:apply_bonus", + "parameters": { + "bonusMultiplier": 2 + } + } + ], + "name": "floralis:gray_petals" + } + ], + "rolls": 1.0 + }, + { + "bonus_rolls": 0.0, + "entries": [ + { + "type": "minecraft:item", + "conditions": [ + { + "condition": "minecraft:inverted", + "term": { + "condition": "minecraft:any_of", + "terms": [ + { + "condition": "minecraft:match_tool", + "predicate": { + "items": "minecraft:shears" + } + }, + { + "condition": "minecraft:match_tool", + "predicate": { + "predicates": { + "minecraft:enchantments": [ + { + "enchantment": "minecraft:silk_touch", + "levels": { + "min": 1 + } + } + ] + } + } + } + ] + } + }, + { + "block": "floralis:gray_cactus_crop", + "condition": "minecraft:block_state_property", + "properties": { + "age": "5" + } + } + ], + "functions": [ + { + "enchantment": "minecraft:fortune", + "formula": "minecraft:uniform_bonus_count", + "function": "minecraft:apply_bonus", + "parameters": { + "bonusMultiplier": 2 + } + } + ], + "name": "floralis:plant_fibers" + } + ], + "rolls": 1.0 + }, + { + "bonus_rolls": 0.0, + "entries": [ + { + "type": "minecraft:item", + "conditions": [ + { + "condition": "minecraft:inverted", + "term": { + "condition": "minecraft:any_of", + "terms": [ + { + "condition": "minecraft:match_tool", + "predicate": { + "items": "minecraft:shears" + } + }, + { + "condition": "minecraft:match_tool", + "predicate": { + "predicates": { + "minecraft:enchantments": [ + { + "enchantment": "minecraft:silk_touch", + "levels": { + "min": 1 + } + } + ] + } + } + } + ] + } + }, + { + "condition": "minecraft:inverted", + "term": { + "block": "floralis:gray_cactus_crop", + "condition": "minecraft:block_state_property", + "properties": { + "age": "5" + } + } + } + ], + "name": "floralis:gray_cactus_seeds" + } + ], + "rolls": 1.0 + } + ], + "random_sequence": "floralis:blocks/gray_cactus_crop" +} \ No newline at end of file diff --git a/src/main/resources/data/floralis/loot_tables/blocks/gray_dye_block.json b/src/generated/resources/data/floralis/loot_tables/blocks/gray_dye_block.json similarity index 55% rename from src/main/resources/data/floralis/loot_tables/blocks/gray_dye_block.json rename to src/generated/resources/data/floralis/loot_tables/blocks/gray_dye_block.json index 906076c6..06079c9b 100644 --- a/src/main/resources/data/floralis/loot_tables/blocks/gray_dye_block.json +++ b/src/generated/resources/data/floralis/loot_tables/blocks/gray_dye_block.json @@ -2,19 +2,15 @@ "type": "minecraft:block", "pools": [ { - "rolls": 1, - "bonus_rolls": 0, + "bonus_rolls": 0.0, "entries": [ { "type": "minecraft:item", "name": "floralis:gray_dye_block" } ], - "conditions": [ - { - "condition": "minecraft:survives_explosion" - } - ] + "rolls": 1.0 } - ] + ], + "random_sequence": "floralis:blocks/gray_dye_block" } \ No newline at end of file diff --git a/src/generated/resources/data/floralis/loot_tables/blocks/gray_flower.json b/src/generated/resources/data/floralis/loot_tables/blocks/gray_flower.json new file mode 100644 index 00000000..a92f0a9d --- /dev/null +++ b/src/generated/resources/data/floralis/loot_tables/blocks/gray_flower.json @@ -0,0 +1,202 @@ +{ + "type": "minecraft:block", + "pools": [ + { + "bonus_rolls": 0.0, + "entries": [ + { + "type": "minecraft:item", + "conditions": [ + { + "condition": "minecraft:any_of", + "terms": [ + { + "condition": "minecraft:match_tool", + "predicate": { + "items": "minecraft:shears" + } + }, + { + "condition": "minecraft:match_tool", + "predicate": { + "predicates": { + "minecraft:enchantments": [ + { + "enchantment": "minecraft:silk_touch", + "levels": { + "min": 1 + } + } + ] + } + } + } + ] + } + ], + "name": "floralis:gray_flower" + } + ], + "rolls": 1.0 + }, + { + "bonus_rolls": 0.0, + "entries": [ + { + "type": "minecraft:item", + "conditions": [ + { + "condition": "minecraft:inverted", + "term": { + "condition": "minecraft:any_of", + "terms": [ + { + "condition": "minecraft:match_tool", + "predicate": { + "items": "minecraft:shears" + } + }, + { + "condition": "minecraft:match_tool", + "predicate": { + "predicates": { + "minecraft:enchantments": [ + { + "enchantment": "minecraft:silk_touch", + "levels": { + "min": 1 + } + } + ] + } + } + } + ] + } + } + ], + "functions": [ + { + "enchantment": "minecraft:fortune", + "formula": "minecraft:uniform_bonus_count", + "function": "minecraft:apply_bonus", + "parameters": { + "bonusMultiplier": 2 + } + }, + { + "add": false, + "count": 2.0, + "function": "minecraft:set_count" + } + ], + "name": "floralis:gray_flower_seeds" + } + ], + "rolls": 1.0 + }, + { + "bonus_rolls": 0.0, + "entries": [ + { + "type": "minecraft:item", + "conditions": [ + { + "condition": "minecraft:inverted", + "term": { + "condition": "minecraft:any_of", + "terms": [ + { + "condition": "minecraft:match_tool", + "predicate": { + "items": "minecraft:shears" + } + }, + { + "condition": "minecraft:match_tool", + "predicate": { + "predicates": { + "minecraft:enchantments": [ + { + "enchantment": "minecraft:silk_touch", + "levels": { + "min": 1 + } + } + ] + } + } + } + ] + } + } + ], + "functions": [ + { + "enchantment": "minecraft:fortune", + "formula": "minecraft:uniform_bonus_count", + "function": "minecraft:apply_bonus", + "parameters": { + "bonusMultiplier": 2 + } + } + ], + "name": "floralis:gray_petals" + } + ], + "rolls": 1.0 + }, + { + "bonus_rolls": 0.0, + "entries": [ + { + "type": "minecraft:item", + "conditions": [ + { + "condition": "minecraft:inverted", + "term": { + "condition": "minecraft:any_of", + "terms": [ + { + "condition": "minecraft:match_tool", + "predicate": { + "items": "minecraft:shears" + } + }, + { + "condition": "minecraft:match_tool", + "predicate": { + "predicates": { + "minecraft:enchantments": [ + { + "enchantment": "minecraft:silk_touch", + "levels": { + "min": 1 + } + } + ] + } + } + } + ] + } + } + ], + "functions": [ + { + "enchantment": "minecraft:fortune", + "formula": "minecraft:uniform_bonus_count", + "function": "minecraft:apply_bonus", + "parameters": { + "bonusMultiplier": 2 + } + } + ], + "name": "floralis:plant_fibers" + } + ], + "rolls": 1.0 + } + ], + "random_sequence": "floralis:blocks/gray_flower" +} \ No newline at end of file diff --git a/src/generated/resources/data/floralis/loot_tables/blocks/gray_flower_crop.json b/src/generated/resources/data/floralis/loot_tables/blocks/gray_flower_crop.json new file mode 100644 index 00000000..b9fdc289 --- /dev/null +++ b/src/generated/resources/data/floralis/loot_tables/blocks/gray_flower_crop.json @@ -0,0 +1,329 @@ +{ + "type": "minecraft:block", + "pools": [ + { + "bonus_rolls": 0.0, + "entries": [ + { + "type": "minecraft:item", + "conditions": [ + { + "condition": "minecraft:any_of", + "terms": [ + { + "condition": "minecraft:match_tool", + "predicate": { + "items": "minecraft:shears" + } + }, + { + "condition": "minecraft:match_tool", + "predicate": { + "predicates": { + "minecraft:enchantments": [ + { + "enchantment": "minecraft:silk_touch", + "levels": { + "min": 1 + } + } + ] + } + } + } + ] + }, + { + "block": "floralis:gray_flower_crop", + "condition": "minecraft:block_state_property", + "properties": { + "age": "5" + } + } + ], + "name": "floralis:gray_flower" + } + ], + "rolls": 1.0 + }, + { + "bonus_rolls": 0.0, + "entries": [ + { + "type": "minecraft:item", + "conditions": [ + { + "condition": "minecraft:any_of", + "terms": [ + { + "condition": "minecraft:match_tool", + "predicate": { + "items": "minecraft:shears" + } + }, + { + "condition": "minecraft:match_tool", + "predicate": { + "predicates": { + "minecraft:enchantments": [ + { + "enchantment": "minecraft:silk_touch", + "levels": { + "min": 1 + } + } + ] + } + } + } + ] + }, + { + "condition": "minecraft:inverted", + "term": { + "block": "floralis:gray_flower_crop", + "condition": "minecraft:block_state_property", + "properties": { + "age": "5" + } + } + } + ], + "name": "floralis:gray_flower_seeds" + } + ], + "rolls": 1.0 + }, + { + "bonus_rolls": 0.0, + "entries": [ + { + "type": "minecraft:item", + "conditions": [ + { + "condition": "minecraft:inverted", + "term": { + "condition": "minecraft:any_of", + "terms": [ + { + "condition": "minecraft:match_tool", + "predicate": { + "items": "minecraft:shears" + } + }, + { + "condition": "minecraft:match_tool", + "predicate": { + "predicates": { + "minecraft:enchantments": [ + { + "enchantment": "minecraft:silk_touch", + "levels": { + "min": 1 + } + } + ] + } + } + } + ] + } + }, + { + "block": "floralis:gray_flower_crop", + "condition": "minecraft:block_state_property", + "properties": { + "age": "5" + } + } + ], + "functions": [ + { + "enchantment": "minecraft:fortune", + "formula": "minecraft:uniform_bonus_count", + "function": "minecraft:apply_bonus", + "parameters": { + "bonusMultiplier": 2 + } + }, + { + "add": false, + "count": 2.0, + "function": "minecraft:set_count" + } + ], + "name": "floralis:gray_flower_seeds" + } + ], + "rolls": 1.0 + }, + { + "bonus_rolls": 0.0, + "entries": [ + { + "type": "minecraft:item", + "conditions": [ + { + "condition": "minecraft:inverted", + "term": { + "condition": "minecraft:any_of", + "terms": [ + { + "condition": "minecraft:match_tool", + "predicate": { + "items": "minecraft:shears" + } + }, + { + "condition": "minecraft:match_tool", + "predicate": { + "predicates": { + "minecraft:enchantments": [ + { + "enchantment": "minecraft:silk_touch", + "levels": { + "min": 1 + } + } + ] + } + } + } + ] + } + }, + { + "block": "floralis:gray_flower_crop", + "condition": "minecraft:block_state_property", + "properties": { + "age": "5" + } + } + ], + "functions": [ + { + "enchantment": "minecraft:fortune", + "formula": "minecraft:uniform_bonus_count", + "function": "minecraft:apply_bonus", + "parameters": { + "bonusMultiplier": 2 + } + } + ], + "name": "floralis:gray_petals" + } + ], + "rolls": 1.0 + }, + { + "bonus_rolls": 0.0, + "entries": [ + { + "type": "minecraft:item", + "conditions": [ + { + "condition": "minecraft:inverted", + "term": { + "condition": "minecraft:any_of", + "terms": [ + { + "condition": "minecraft:match_tool", + "predicate": { + "items": "minecraft:shears" + } + }, + { + "condition": "minecraft:match_tool", + "predicate": { + "predicates": { + "minecraft:enchantments": [ + { + "enchantment": "minecraft:silk_touch", + "levels": { + "min": 1 + } + } + ] + } + } + } + ] + } + }, + { + "block": "floralis:gray_flower_crop", + "condition": "minecraft:block_state_property", + "properties": { + "age": "5" + } + } + ], + "functions": [ + { + "enchantment": "minecraft:fortune", + "formula": "minecraft:uniform_bonus_count", + "function": "minecraft:apply_bonus", + "parameters": { + "bonusMultiplier": 2 + } + } + ], + "name": "floralis:plant_fibers" + } + ], + "rolls": 1.0 + }, + { + "bonus_rolls": 0.0, + "entries": [ + { + "type": "minecraft:item", + "conditions": [ + { + "condition": "minecraft:inverted", + "term": { + "condition": "minecraft:any_of", + "terms": [ + { + "condition": "minecraft:match_tool", + "predicate": { + "items": "minecraft:shears" + } + }, + { + "condition": "minecraft:match_tool", + "predicate": { + "predicates": { + "minecraft:enchantments": [ + { + "enchantment": "minecraft:silk_touch", + "levels": { + "min": 1 + } + } + ] + } + } + } + ] + } + }, + { + "condition": "minecraft:inverted", + "term": { + "block": "floralis:gray_flower_crop", + "condition": "minecraft:block_state_property", + "properties": { + "age": "5" + } + } + } + ], + "name": "floralis:gray_flower_seeds" + } + ], + "rolls": 1.0 + } + ], + "random_sequence": "floralis:blocks/gray_flower_crop" +} \ No newline at end of file diff --git a/src/generated/resources/data/floralis/loot_tables/blocks/green_cactus.json b/src/generated/resources/data/floralis/loot_tables/blocks/green_cactus.json new file mode 100644 index 00000000..5c140796 --- /dev/null +++ b/src/generated/resources/data/floralis/loot_tables/blocks/green_cactus.json @@ -0,0 +1,202 @@ +{ + "type": "minecraft:block", + "pools": [ + { + "bonus_rolls": 0.0, + "entries": [ + { + "type": "minecraft:item", + "conditions": [ + { + "condition": "minecraft:any_of", + "terms": [ + { + "condition": "minecraft:match_tool", + "predicate": { + "items": "minecraft:shears" + } + }, + { + "condition": "minecraft:match_tool", + "predicate": { + "predicates": { + "minecraft:enchantments": [ + { + "enchantment": "minecraft:silk_touch", + "levels": { + "min": 1 + } + } + ] + } + } + } + ] + } + ], + "name": "floralis:green_cactus" + } + ], + "rolls": 1.0 + }, + { + "bonus_rolls": 0.0, + "entries": [ + { + "type": "minecraft:item", + "conditions": [ + { + "condition": "minecraft:inverted", + "term": { + "condition": "minecraft:any_of", + "terms": [ + { + "condition": "minecraft:match_tool", + "predicate": { + "items": "minecraft:shears" + } + }, + { + "condition": "minecraft:match_tool", + "predicate": { + "predicates": { + "minecraft:enchantments": [ + { + "enchantment": "minecraft:silk_touch", + "levels": { + "min": 1 + } + } + ] + } + } + } + ] + } + } + ], + "functions": [ + { + "enchantment": "minecraft:fortune", + "formula": "minecraft:uniform_bonus_count", + "function": "minecraft:apply_bonus", + "parameters": { + "bonusMultiplier": 2 + } + }, + { + "add": false, + "count": 2.0, + "function": "minecraft:set_count" + } + ], + "name": "floralis:green_cactus_seeds" + } + ], + "rolls": 1.0 + }, + { + "bonus_rolls": 0.0, + "entries": [ + { + "type": "minecraft:item", + "conditions": [ + { + "condition": "minecraft:inverted", + "term": { + "condition": "minecraft:any_of", + "terms": [ + { + "condition": "minecraft:match_tool", + "predicate": { + "items": "minecraft:shears" + } + }, + { + "condition": "minecraft:match_tool", + "predicate": { + "predicates": { + "minecraft:enchantments": [ + { + "enchantment": "minecraft:silk_touch", + "levels": { + "min": 1 + } + } + ] + } + } + } + ] + } + } + ], + "functions": [ + { + "enchantment": "minecraft:fortune", + "formula": "minecraft:uniform_bonus_count", + "function": "minecraft:apply_bonus", + "parameters": { + "bonusMultiplier": 2 + } + } + ], + "name": "floralis:green_petals" + } + ], + "rolls": 1.0 + }, + { + "bonus_rolls": 0.0, + "entries": [ + { + "type": "minecraft:item", + "conditions": [ + { + "condition": "minecraft:inverted", + "term": { + "condition": "minecraft:any_of", + "terms": [ + { + "condition": "minecraft:match_tool", + "predicate": { + "items": "minecraft:shears" + } + }, + { + "condition": "minecraft:match_tool", + "predicate": { + "predicates": { + "minecraft:enchantments": [ + { + "enchantment": "minecraft:silk_touch", + "levels": { + "min": 1 + } + } + ] + } + } + } + ] + } + } + ], + "functions": [ + { + "enchantment": "minecraft:fortune", + "formula": "minecraft:uniform_bonus_count", + "function": "minecraft:apply_bonus", + "parameters": { + "bonusMultiplier": 2 + } + } + ], + "name": "floralis:plant_fibers" + } + ], + "rolls": 1.0 + } + ], + "random_sequence": "floralis:blocks/green_cactus" +} \ No newline at end of file diff --git a/src/generated/resources/data/floralis/loot_tables/blocks/green_cactus_crop.json b/src/generated/resources/data/floralis/loot_tables/blocks/green_cactus_crop.json new file mode 100644 index 00000000..a7f6596d --- /dev/null +++ b/src/generated/resources/data/floralis/loot_tables/blocks/green_cactus_crop.json @@ -0,0 +1,329 @@ +{ + "type": "minecraft:block", + "pools": [ + { + "bonus_rolls": 0.0, + "entries": [ + { + "type": "minecraft:item", + "conditions": [ + { + "condition": "minecraft:any_of", + "terms": [ + { + "condition": "minecraft:match_tool", + "predicate": { + "items": "minecraft:shears" + } + }, + { + "condition": "minecraft:match_tool", + "predicate": { + "predicates": { + "minecraft:enchantments": [ + { + "enchantment": "minecraft:silk_touch", + "levels": { + "min": 1 + } + } + ] + } + } + } + ] + }, + { + "block": "floralis:green_cactus_crop", + "condition": "minecraft:block_state_property", + "properties": { + "age": "5" + } + } + ], + "name": "floralis:green_cactus" + } + ], + "rolls": 1.0 + }, + { + "bonus_rolls": 0.0, + "entries": [ + { + "type": "minecraft:item", + "conditions": [ + { + "condition": "minecraft:any_of", + "terms": [ + { + "condition": "minecraft:match_tool", + "predicate": { + "items": "minecraft:shears" + } + }, + { + "condition": "minecraft:match_tool", + "predicate": { + "predicates": { + "minecraft:enchantments": [ + { + "enchantment": "minecraft:silk_touch", + "levels": { + "min": 1 + } + } + ] + } + } + } + ] + }, + { + "condition": "minecraft:inverted", + "term": { + "block": "floralis:green_cactus_crop", + "condition": "minecraft:block_state_property", + "properties": { + "age": "5" + } + } + } + ], + "name": "floralis:green_cactus_seeds" + } + ], + "rolls": 1.0 + }, + { + "bonus_rolls": 0.0, + "entries": [ + { + "type": "minecraft:item", + "conditions": [ + { + "condition": "minecraft:inverted", + "term": { + "condition": "minecraft:any_of", + "terms": [ + { + "condition": "minecraft:match_tool", + "predicate": { + "items": "minecraft:shears" + } + }, + { + "condition": "minecraft:match_tool", + "predicate": { + "predicates": { + "minecraft:enchantments": [ + { + "enchantment": "minecraft:silk_touch", + "levels": { + "min": 1 + } + } + ] + } + } + } + ] + } + }, + { + "block": "floralis:green_cactus_crop", + "condition": "minecraft:block_state_property", + "properties": { + "age": "5" + } + } + ], + "functions": [ + { + "enchantment": "minecraft:fortune", + "formula": "minecraft:uniform_bonus_count", + "function": "minecraft:apply_bonus", + "parameters": { + "bonusMultiplier": 2 + } + }, + { + "add": false, + "count": 2.0, + "function": "minecraft:set_count" + } + ], + "name": "floralis:green_cactus_seeds" + } + ], + "rolls": 1.0 + }, + { + "bonus_rolls": 0.0, + "entries": [ + { + "type": "minecraft:item", + "conditions": [ + { + "condition": "minecraft:inverted", + "term": { + "condition": "minecraft:any_of", + "terms": [ + { + "condition": "minecraft:match_tool", + "predicate": { + "items": "minecraft:shears" + } + }, + { + "condition": "minecraft:match_tool", + "predicate": { + "predicates": { + "minecraft:enchantments": [ + { + "enchantment": "minecraft:silk_touch", + "levels": { + "min": 1 + } + } + ] + } + } + } + ] + } + }, + { + "block": "floralis:green_cactus_crop", + "condition": "minecraft:block_state_property", + "properties": { + "age": "5" + } + } + ], + "functions": [ + { + "enchantment": "minecraft:fortune", + "formula": "minecraft:uniform_bonus_count", + "function": "minecraft:apply_bonus", + "parameters": { + "bonusMultiplier": 2 + } + } + ], + "name": "floralis:green_petals" + } + ], + "rolls": 1.0 + }, + { + "bonus_rolls": 0.0, + "entries": [ + { + "type": "minecraft:item", + "conditions": [ + { + "condition": "minecraft:inverted", + "term": { + "condition": "minecraft:any_of", + "terms": [ + { + "condition": "minecraft:match_tool", + "predicate": { + "items": "minecraft:shears" + } + }, + { + "condition": "minecraft:match_tool", + "predicate": { + "predicates": { + "minecraft:enchantments": [ + { + "enchantment": "minecraft:silk_touch", + "levels": { + "min": 1 + } + } + ] + } + } + } + ] + } + }, + { + "block": "floralis:green_cactus_crop", + "condition": "minecraft:block_state_property", + "properties": { + "age": "5" + } + } + ], + "functions": [ + { + "enchantment": "minecraft:fortune", + "formula": "minecraft:uniform_bonus_count", + "function": "minecraft:apply_bonus", + "parameters": { + "bonusMultiplier": 2 + } + } + ], + "name": "floralis:plant_fibers" + } + ], + "rolls": 1.0 + }, + { + "bonus_rolls": 0.0, + "entries": [ + { + "type": "minecraft:item", + "conditions": [ + { + "condition": "minecraft:inverted", + "term": { + "condition": "minecraft:any_of", + "terms": [ + { + "condition": "minecraft:match_tool", + "predicate": { + "items": "minecraft:shears" + } + }, + { + "condition": "minecraft:match_tool", + "predicate": { + "predicates": { + "minecraft:enchantments": [ + { + "enchantment": "minecraft:silk_touch", + "levels": { + "min": 1 + } + } + ] + } + } + } + ] + } + }, + { + "condition": "minecraft:inverted", + "term": { + "block": "floralis:green_cactus_crop", + "condition": "minecraft:block_state_property", + "properties": { + "age": "5" + } + } + } + ], + "name": "floralis:green_cactus_seeds" + } + ], + "rolls": 1.0 + } + ], + "random_sequence": "floralis:blocks/green_cactus_crop" +} \ No newline at end of file diff --git a/src/main/resources/data/floralis/loot_tables/blocks/green_dye_block.json b/src/generated/resources/data/floralis/loot_tables/blocks/green_dye_block.json similarity index 55% rename from src/main/resources/data/floralis/loot_tables/blocks/green_dye_block.json rename to src/generated/resources/data/floralis/loot_tables/blocks/green_dye_block.json index 91c79858..e2bd6bc7 100644 --- a/src/main/resources/data/floralis/loot_tables/blocks/green_dye_block.json +++ b/src/generated/resources/data/floralis/loot_tables/blocks/green_dye_block.json @@ -2,19 +2,15 @@ "type": "minecraft:block", "pools": [ { - "rolls": 1, - "bonus_rolls": 0, + "bonus_rolls": 0.0, "entries": [ { "type": "minecraft:item", "name": "floralis:green_dye_block" } ], - "conditions": [ - { - "condition": "minecraft:survives_explosion" - } - ] + "rolls": 1.0 } - ] + ], + "random_sequence": "floralis:blocks/green_dye_block" } \ No newline at end of file diff --git a/src/generated/resources/data/floralis/loot_tables/blocks/green_flower.json b/src/generated/resources/data/floralis/loot_tables/blocks/green_flower.json new file mode 100644 index 00000000..a48007ec --- /dev/null +++ b/src/generated/resources/data/floralis/loot_tables/blocks/green_flower.json @@ -0,0 +1,202 @@ +{ + "type": "minecraft:block", + "pools": [ + { + "bonus_rolls": 0.0, + "entries": [ + { + "type": "minecraft:item", + "conditions": [ + { + "condition": "minecraft:any_of", + "terms": [ + { + "condition": "minecraft:match_tool", + "predicate": { + "items": "minecraft:shears" + } + }, + { + "condition": "minecraft:match_tool", + "predicate": { + "predicates": { + "minecraft:enchantments": [ + { + "enchantment": "minecraft:silk_touch", + "levels": { + "min": 1 + } + } + ] + } + } + } + ] + } + ], + "name": "floralis:green_flower" + } + ], + "rolls": 1.0 + }, + { + "bonus_rolls": 0.0, + "entries": [ + { + "type": "minecraft:item", + "conditions": [ + { + "condition": "minecraft:inverted", + "term": { + "condition": "minecraft:any_of", + "terms": [ + { + "condition": "minecraft:match_tool", + "predicate": { + "items": "minecraft:shears" + } + }, + { + "condition": "minecraft:match_tool", + "predicate": { + "predicates": { + "minecraft:enchantments": [ + { + "enchantment": "minecraft:silk_touch", + "levels": { + "min": 1 + } + } + ] + } + } + } + ] + } + } + ], + "functions": [ + { + "enchantment": "minecraft:fortune", + "formula": "minecraft:uniform_bonus_count", + "function": "minecraft:apply_bonus", + "parameters": { + "bonusMultiplier": 2 + } + }, + { + "add": false, + "count": 2.0, + "function": "minecraft:set_count" + } + ], + "name": "floralis:green_flower_seeds" + } + ], + "rolls": 1.0 + }, + { + "bonus_rolls": 0.0, + "entries": [ + { + "type": "minecraft:item", + "conditions": [ + { + "condition": "minecraft:inverted", + "term": { + "condition": "minecraft:any_of", + "terms": [ + { + "condition": "minecraft:match_tool", + "predicate": { + "items": "minecraft:shears" + } + }, + { + "condition": "minecraft:match_tool", + "predicate": { + "predicates": { + "minecraft:enchantments": [ + { + "enchantment": "minecraft:silk_touch", + "levels": { + "min": 1 + } + } + ] + } + } + } + ] + } + } + ], + "functions": [ + { + "enchantment": "minecraft:fortune", + "formula": "minecraft:uniform_bonus_count", + "function": "minecraft:apply_bonus", + "parameters": { + "bonusMultiplier": 2 + } + } + ], + "name": "floralis:green_petals" + } + ], + "rolls": 1.0 + }, + { + "bonus_rolls": 0.0, + "entries": [ + { + "type": "minecraft:item", + "conditions": [ + { + "condition": "minecraft:inverted", + "term": { + "condition": "minecraft:any_of", + "terms": [ + { + "condition": "minecraft:match_tool", + "predicate": { + "items": "minecraft:shears" + } + }, + { + "condition": "minecraft:match_tool", + "predicate": { + "predicates": { + "minecraft:enchantments": [ + { + "enchantment": "minecraft:silk_touch", + "levels": { + "min": 1 + } + } + ] + } + } + } + ] + } + } + ], + "functions": [ + { + "enchantment": "minecraft:fortune", + "formula": "minecraft:uniform_bonus_count", + "function": "minecraft:apply_bonus", + "parameters": { + "bonusMultiplier": 2 + } + } + ], + "name": "floralis:plant_fibers" + } + ], + "rolls": 1.0 + } + ], + "random_sequence": "floralis:blocks/green_flower" +} \ No newline at end of file diff --git a/src/generated/resources/data/floralis/loot_tables/blocks/green_flower_crop.json b/src/generated/resources/data/floralis/loot_tables/blocks/green_flower_crop.json new file mode 100644 index 00000000..147b7d74 --- /dev/null +++ b/src/generated/resources/data/floralis/loot_tables/blocks/green_flower_crop.json @@ -0,0 +1,329 @@ +{ + "type": "minecraft:block", + "pools": [ + { + "bonus_rolls": 0.0, + "entries": [ + { + "type": "minecraft:item", + "conditions": [ + { + "condition": "minecraft:any_of", + "terms": [ + { + "condition": "minecraft:match_tool", + "predicate": { + "items": "minecraft:shears" + } + }, + { + "condition": "minecraft:match_tool", + "predicate": { + "predicates": { + "minecraft:enchantments": [ + { + "enchantment": "minecraft:silk_touch", + "levels": { + "min": 1 + } + } + ] + } + } + } + ] + }, + { + "block": "floralis:green_flower_crop", + "condition": "minecraft:block_state_property", + "properties": { + "age": "5" + } + } + ], + "name": "floralis:green_flower" + } + ], + "rolls": 1.0 + }, + { + "bonus_rolls": 0.0, + "entries": [ + { + "type": "minecraft:item", + "conditions": [ + { + "condition": "minecraft:any_of", + "terms": [ + { + "condition": "minecraft:match_tool", + "predicate": { + "items": "minecraft:shears" + } + }, + { + "condition": "minecraft:match_tool", + "predicate": { + "predicates": { + "minecraft:enchantments": [ + { + "enchantment": "minecraft:silk_touch", + "levels": { + "min": 1 + } + } + ] + } + } + } + ] + }, + { + "condition": "minecraft:inverted", + "term": { + "block": "floralis:green_flower_crop", + "condition": "minecraft:block_state_property", + "properties": { + "age": "5" + } + } + } + ], + "name": "floralis:green_flower_seeds" + } + ], + "rolls": 1.0 + }, + { + "bonus_rolls": 0.0, + "entries": [ + { + "type": "minecraft:item", + "conditions": [ + { + "condition": "minecraft:inverted", + "term": { + "condition": "minecraft:any_of", + "terms": [ + { + "condition": "minecraft:match_tool", + "predicate": { + "items": "minecraft:shears" + } + }, + { + "condition": "minecraft:match_tool", + "predicate": { + "predicates": { + "minecraft:enchantments": [ + { + "enchantment": "minecraft:silk_touch", + "levels": { + "min": 1 + } + } + ] + } + } + } + ] + } + }, + { + "block": "floralis:green_flower_crop", + "condition": "minecraft:block_state_property", + "properties": { + "age": "5" + } + } + ], + "functions": [ + { + "enchantment": "minecraft:fortune", + "formula": "minecraft:uniform_bonus_count", + "function": "minecraft:apply_bonus", + "parameters": { + "bonusMultiplier": 2 + } + }, + { + "add": false, + "count": 2.0, + "function": "minecraft:set_count" + } + ], + "name": "floralis:green_flower_seeds" + } + ], + "rolls": 1.0 + }, + { + "bonus_rolls": 0.0, + "entries": [ + { + "type": "minecraft:item", + "conditions": [ + { + "condition": "minecraft:inverted", + "term": { + "condition": "minecraft:any_of", + "terms": [ + { + "condition": "minecraft:match_tool", + "predicate": { + "items": "minecraft:shears" + } + }, + { + "condition": "minecraft:match_tool", + "predicate": { + "predicates": { + "minecraft:enchantments": [ + { + "enchantment": "minecraft:silk_touch", + "levels": { + "min": 1 + } + } + ] + } + } + } + ] + } + }, + { + "block": "floralis:green_flower_crop", + "condition": "minecraft:block_state_property", + "properties": { + "age": "5" + } + } + ], + "functions": [ + { + "enchantment": "minecraft:fortune", + "formula": "minecraft:uniform_bonus_count", + "function": "minecraft:apply_bonus", + "parameters": { + "bonusMultiplier": 2 + } + } + ], + "name": "floralis:green_petals" + } + ], + "rolls": 1.0 + }, + { + "bonus_rolls": 0.0, + "entries": [ + { + "type": "minecraft:item", + "conditions": [ + { + "condition": "minecraft:inverted", + "term": { + "condition": "minecraft:any_of", + "terms": [ + { + "condition": "minecraft:match_tool", + "predicate": { + "items": "minecraft:shears" + } + }, + { + "condition": "minecraft:match_tool", + "predicate": { + "predicates": { + "minecraft:enchantments": [ + { + "enchantment": "minecraft:silk_touch", + "levels": { + "min": 1 + } + } + ] + } + } + } + ] + } + }, + { + "block": "floralis:green_flower_crop", + "condition": "minecraft:block_state_property", + "properties": { + "age": "5" + } + } + ], + "functions": [ + { + "enchantment": "minecraft:fortune", + "formula": "minecraft:uniform_bonus_count", + "function": "minecraft:apply_bonus", + "parameters": { + "bonusMultiplier": 2 + } + } + ], + "name": "floralis:plant_fibers" + } + ], + "rolls": 1.0 + }, + { + "bonus_rolls": 0.0, + "entries": [ + { + "type": "minecraft:item", + "conditions": [ + { + "condition": "minecraft:inverted", + "term": { + "condition": "minecraft:any_of", + "terms": [ + { + "condition": "minecraft:match_tool", + "predicate": { + "items": "minecraft:shears" + } + }, + { + "condition": "minecraft:match_tool", + "predicate": { + "predicates": { + "minecraft:enchantments": [ + { + "enchantment": "minecraft:silk_touch", + "levels": { + "min": 1 + } + } + ] + } + } + } + ] + } + }, + { + "condition": "minecraft:inverted", + "term": { + "block": "floralis:green_flower_crop", + "condition": "minecraft:block_state_property", + "properties": { + "age": "5" + } + } + } + ], + "name": "floralis:green_flower_seeds" + } + ], + "rolls": 1.0 + } + ], + "random_sequence": "floralis:blocks/green_flower_crop" +} \ No newline at end of file diff --git a/src/generated/resources/data/floralis/loot_tables/blocks/light_blue_cactus.json b/src/generated/resources/data/floralis/loot_tables/blocks/light_blue_cactus.json new file mode 100644 index 00000000..34ba4890 --- /dev/null +++ b/src/generated/resources/data/floralis/loot_tables/blocks/light_blue_cactus.json @@ -0,0 +1,202 @@ +{ + "type": "minecraft:block", + "pools": [ + { + "bonus_rolls": 0.0, + "entries": [ + { + "type": "minecraft:item", + "conditions": [ + { + "condition": "minecraft:any_of", + "terms": [ + { + "condition": "minecraft:match_tool", + "predicate": { + "items": "minecraft:shears" + } + }, + { + "condition": "minecraft:match_tool", + "predicate": { + "predicates": { + "minecraft:enchantments": [ + { + "enchantment": "minecraft:silk_touch", + "levels": { + "min": 1 + } + } + ] + } + } + } + ] + } + ], + "name": "floralis:light_blue_cactus" + } + ], + "rolls": 1.0 + }, + { + "bonus_rolls": 0.0, + "entries": [ + { + "type": "minecraft:item", + "conditions": [ + { + "condition": "minecraft:inverted", + "term": { + "condition": "minecraft:any_of", + "terms": [ + { + "condition": "minecraft:match_tool", + "predicate": { + "items": "minecraft:shears" + } + }, + { + "condition": "minecraft:match_tool", + "predicate": { + "predicates": { + "minecraft:enchantments": [ + { + "enchantment": "minecraft:silk_touch", + "levels": { + "min": 1 + } + } + ] + } + } + } + ] + } + } + ], + "functions": [ + { + "enchantment": "minecraft:fortune", + "formula": "minecraft:uniform_bonus_count", + "function": "minecraft:apply_bonus", + "parameters": { + "bonusMultiplier": 2 + } + }, + { + "add": false, + "count": 2.0, + "function": "minecraft:set_count" + } + ], + "name": "floralis:light_blue_cactus_seeds" + } + ], + "rolls": 1.0 + }, + { + "bonus_rolls": 0.0, + "entries": [ + { + "type": "minecraft:item", + "conditions": [ + { + "condition": "minecraft:inverted", + "term": { + "condition": "minecraft:any_of", + "terms": [ + { + "condition": "minecraft:match_tool", + "predicate": { + "items": "minecraft:shears" + } + }, + { + "condition": "minecraft:match_tool", + "predicate": { + "predicates": { + "minecraft:enchantments": [ + { + "enchantment": "minecraft:silk_touch", + "levels": { + "min": 1 + } + } + ] + } + } + } + ] + } + } + ], + "functions": [ + { + "enchantment": "minecraft:fortune", + "formula": "minecraft:uniform_bonus_count", + "function": "minecraft:apply_bonus", + "parameters": { + "bonusMultiplier": 2 + } + } + ], + "name": "floralis:light_blue_petals" + } + ], + "rolls": 1.0 + }, + { + "bonus_rolls": 0.0, + "entries": [ + { + "type": "minecraft:item", + "conditions": [ + { + "condition": "minecraft:inverted", + "term": { + "condition": "minecraft:any_of", + "terms": [ + { + "condition": "minecraft:match_tool", + "predicate": { + "items": "minecraft:shears" + } + }, + { + "condition": "minecraft:match_tool", + "predicate": { + "predicates": { + "minecraft:enchantments": [ + { + "enchantment": "minecraft:silk_touch", + "levels": { + "min": 1 + } + } + ] + } + } + } + ] + } + } + ], + "functions": [ + { + "enchantment": "minecraft:fortune", + "formula": "minecraft:uniform_bonus_count", + "function": "minecraft:apply_bonus", + "parameters": { + "bonusMultiplier": 2 + } + } + ], + "name": "floralis:plant_fibers" + } + ], + "rolls": 1.0 + } + ], + "random_sequence": "floralis:blocks/light_blue_cactus" +} \ No newline at end of file diff --git a/src/generated/resources/data/floralis/loot_tables/blocks/light_blue_cactus_crop.json b/src/generated/resources/data/floralis/loot_tables/blocks/light_blue_cactus_crop.json new file mode 100644 index 00000000..eb8308d0 --- /dev/null +++ b/src/generated/resources/data/floralis/loot_tables/blocks/light_blue_cactus_crop.json @@ -0,0 +1,329 @@ +{ + "type": "minecraft:block", + "pools": [ + { + "bonus_rolls": 0.0, + "entries": [ + { + "type": "minecraft:item", + "conditions": [ + { + "condition": "minecraft:any_of", + "terms": [ + { + "condition": "minecraft:match_tool", + "predicate": { + "items": "minecraft:shears" + } + }, + { + "condition": "minecraft:match_tool", + "predicate": { + "predicates": { + "minecraft:enchantments": [ + { + "enchantment": "minecraft:silk_touch", + "levels": { + "min": 1 + } + } + ] + } + } + } + ] + }, + { + "block": "floralis:light_blue_cactus_crop", + "condition": "minecraft:block_state_property", + "properties": { + "age": "5" + } + } + ], + "name": "floralis:light_blue_cactus" + } + ], + "rolls": 1.0 + }, + { + "bonus_rolls": 0.0, + "entries": [ + { + "type": "minecraft:item", + "conditions": [ + { + "condition": "minecraft:any_of", + "terms": [ + { + "condition": "minecraft:match_tool", + "predicate": { + "items": "minecraft:shears" + } + }, + { + "condition": "minecraft:match_tool", + "predicate": { + "predicates": { + "minecraft:enchantments": [ + { + "enchantment": "minecraft:silk_touch", + "levels": { + "min": 1 + } + } + ] + } + } + } + ] + }, + { + "condition": "minecraft:inverted", + "term": { + "block": "floralis:light_blue_cactus_crop", + "condition": "minecraft:block_state_property", + "properties": { + "age": "5" + } + } + } + ], + "name": "floralis:light_blue_cactus_seeds" + } + ], + "rolls": 1.0 + }, + { + "bonus_rolls": 0.0, + "entries": [ + { + "type": "minecraft:item", + "conditions": [ + { + "condition": "minecraft:inverted", + "term": { + "condition": "minecraft:any_of", + "terms": [ + { + "condition": "minecraft:match_tool", + "predicate": { + "items": "minecraft:shears" + } + }, + { + "condition": "minecraft:match_tool", + "predicate": { + "predicates": { + "minecraft:enchantments": [ + { + "enchantment": "minecraft:silk_touch", + "levels": { + "min": 1 + } + } + ] + } + } + } + ] + } + }, + { + "block": "floralis:light_blue_cactus_crop", + "condition": "minecraft:block_state_property", + "properties": { + "age": "5" + } + } + ], + "functions": [ + { + "enchantment": "minecraft:fortune", + "formula": "minecraft:uniform_bonus_count", + "function": "minecraft:apply_bonus", + "parameters": { + "bonusMultiplier": 2 + } + }, + { + "add": false, + "count": 2.0, + "function": "minecraft:set_count" + } + ], + "name": "floralis:light_blue_cactus_seeds" + } + ], + "rolls": 1.0 + }, + { + "bonus_rolls": 0.0, + "entries": [ + { + "type": "minecraft:item", + "conditions": [ + { + "condition": "minecraft:inverted", + "term": { + "condition": "minecraft:any_of", + "terms": [ + { + "condition": "minecraft:match_tool", + "predicate": { + "items": "minecraft:shears" + } + }, + { + "condition": "minecraft:match_tool", + "predicate": { + "predicates": { + "minecraft:enchantments": [ + { + "enchantment": "minecraft:silk_touch", + "levels": { + "min": 1 + } + } + ] + } + } + } + ] + } + }, + { + "block": "floralis:light_blue_cactus_crop", + "condition": "minecraft:block_state_property", + "properties": { + "age": "5" + } + } + ], + "functions": [ + { + "enchantment": "minecraft:fortune", + "formula": "minecraft:uniform_bonus_count", + "function": "minecraft:apply_bonus", + "parameters": { + "bonusMultiplier": 2 + } + } + ], + "name": "floralis:light_blue_petals" + } + ], + "rolls": 1.0 + }, + { + "bonus_rolls": 0.0, + "entries": [ + { + "type": "minecraft:item", + "conditions": [ + { + "condition": "minecraft:inverted", + "term": { + "condition": "minecraft:any_of", + "terms": [ + { + "condition": "minecraft:match_tool", + "predicate": { + "items": "minecraft:shears" + } + }, + { + "condition": "minecraft:match_tool", + "predicate": { + "predicates": { + "minecraft:enchantments": [ + { + "enchantment": "minecraft:silk_touch", + "levels": { + "min": 1 + } + } + ] + } + } + } + ] + } + }, + { + "block": "floralis:light_blue_cactus_crop", + "condition": "minecraft:block_state_property", + "properties": { + "age": "5" + } + } + ], + "functions": [ + { + "enchantment": "minecraft:fortune", + "formula": "minecraft:uniform_bonus_count", + "function": "minecraft:apply_bonus", + "parameters": { + "bonusMultiplier": 2 + } + } + ], + "name": "floralis:plant_fibers" + } + ], + "rolls": 1.0 + }, + { + "bonus_rolls": 0.0, + "entries": [ + { + "type": "minecraft:item", + "conditions": [ + { + "condition": "minecraft:inverted", + "term": { + "condition": "minecraft:any_of", + "terms": [ + { + "condition": "minecraft:match_tool", + "predicate": { + "items": "minecraft:shears" + } + }, + { + "condition": "minecraft:match_tool", + "predicate": { + "predicates": { + "minecraft:enchantments": [ + { + "enchantment": "minecraft:silk_touch", + "levels": { + "min": 1 + } + } + ] + } + } + } + ] + } + }, + { + "condition": "minecraft:inverted", + "term": { + "block": "floralis:light_blue_cactus_crop", + "condition": "minecraft:block_state_property", + "properties": { + "age": "5" + } + } + } + ], + "name": "floralis:light_blue_cactus_seeds" + } + ], + "rolls": 1.0 + } + ], + "random_sequence": "floralis:blocks/light_blue_cactus_crop" +} \ No newline at end of file diff --git a/src/main/resources/data/floralis/loot_tables/blocks/light_blue_dye_block.json b/src/generated/resources/data/floralis/loot_tables/blocks/light_blue_dye_block.json similarity index 56% rename from src/main/resources/data/floralis/loot_tables/blocks/light_blue_dye_block.json rename to src/generated/resources/data/floralis/loot_tables/blocks/light_blue_dye_block.json index b59b750a..7a7e704d 100644 --- a/src/main/resources/data/floralis/loot_tables/blocks/light_blue_dye_block.json +++ b/src/generated/resources/data/floralis/loot_tables/blocks/light_blue_dye_block.json @@ -2,19 +2,15 @@ "type": "minecraft:block", "pools": [ { - "rolls": 1, - "bonus_rolls": 0, + "bonus_rolls": 0.0, "entries": [ { "type": "minecraft:item", "name": "floralis:light_blue_dye_block" } ], - "conditions": [ - { - "condition": "minecraft:survives_explosion" - } - ] + "rolls": 1.0 } - ] + ], + "random_sequence": "floralis:blocks/light_blue_dye_block" } \ No newline at end of file diff --git a/src/generated/resources/data/floralis/loot_tables/blocks/light_blue_flower.json b/src/generated/resources/data/floralis/loot_tables/blocks/light_blue_flower.json new file mode 100644 index 00000000..c1ea3df5 --- /dev/null +++ b/src/generated/resources/data/floralis/loot_tables/blocks/light_blue_flower.json @@ -0,0 +1,202 @@ +{ + "type": "minecraft:block", + "pools": [ + { + "bonus_rolls": 0.0, + "entries": [ + { + "type": "minecraft:item", + "conditions": [ + { + "condition": "minecraft:any_of", + "terms": [ + { + "condition": "minecraft:match_tool", + "predicate": { + "items": "minecraft:shears" + } + }, + { + "condition": "minecraft:match_tool", + "predicate": { + "predicates": { + "minecraft:enchantments": [ + { + "enchantment": "minecraft:silk_touch", + "levels": { + "min": 1 + } + } + ] + } + } + } + ] + } + ], + "name": "floralis:light_blue_flower" + } + ], + "rolls": 1.0 + }, + { + "bonus_rolls": 0.0, + "entries": [ + { + "type": "minecraft:item", + "conditions": [ + { + "condition": "minecraft:inverted", + "term": { + "condition": "minecraft:any_of", + "terms": [ + { + "condition": "minecraft:match_tool", + "predicate": { + "items": "minecraft:shears" + } + }, + { + "condition": "minecraft:match_tool", + "predicate": { + "predicates": { + "minecraft:enchantments": [ + { + "enchantment": "minecraft:silk_touch", + "levels": { + "min": 1 + } + } + ] + } + } + } + ] + } + } + ], + "functions": [ + { + "enchantment": "minecraft:fortune", + "formula": "minecraft:uniform_bonus_count", + "function": "minecraft:apply_bonus", + "parameters": { + "bonusMultiplier": 2 + } + }, + { + "add": false, + "count": 2.0, + "function": "minecraft:set_count" + } + ], + "name": "floralis:light_blue_flower_seeds" + } + ], + "rolls": 1.0 + }, + { + "bonus_rolls": 0.0, + "entries": [ + { + "type": "minecraft:item", + "conditions": [ + { + "condition": "minecraft:inverted", + "term": { + "condition": "minecraft:any_of", + "terms": [ + { + "condition": "minecraft:match_tool", + "predicate": { + "items": "minecraft:shears" + } + }, + { + "condition": "minecraft:match_tool", + "predicate": { + "predicates": { + "minecraft:enchantments": [ + { + "enchantment": "minecraft:silk_touch", + "levels": { + "min": 1 + } + } + ] + } + } + } + ] + } + } + ], + "functions": [ + { + "enchantment": "minecraft:fortune", + "formula": "minecraft:uniform_bonus_count", + "function": "minecraft:apply_bonus", + "parameters": { + "bonusMultiplier": 2 + } + } + ], + "name": "floralis:light_blue_petals" + } + ], + "rolls": 1.0 + }, + { + "bonus_rolls": 0.0, + "entries": [ + { + "type": "minecraft:item", + "conditions": [ + { + "condition": "minecraft:inverted", + "term": { + "condition": "minecraft:any_of", + "terms": [ + { + "condition": "minecraft:match_tool", + "predicate": { + "items": "minecraft:shears" + } + }, + { + "condition": "minecraft:match_tool", + "predicate": { + "predicates": { + "minecraft:enchantments": [ + { + "enchantment": "minecraft:silk_touch", + "levels": { + "min": 1 + } + } + ] + } + } + } + ] + } + } + ], + "functions": [ + { + "enchantment": "minecraft:fortune", + "formula": "minecraft:uniform_bonus_count", + "function": "minecraft:apply_bonus", + "parameters": { + "bonusMultiplier": 2 + } + } + ], + "name": "floralis:plant_fibers" + } + ], + "rolls": 1.0 + } + ], + "random_sequence": "floralis:blocks/light_blue_flower" +} \ No newline at end of file diff --git a/src/generated/resources/data/floralis/loot_tables/blocks/light_blue_flower_crop.json b/src/generated/resources/data/floralis/loot_tables/blocks/light_blue_flower_crop.json new file mode 100644 index 00000000..fd0f5d38 --- /dev/null +++ b/src/generated/resources/data/floralis/loot_tables/blocks/light_blue_flower_crop.json @@ -0,0 +1,329 @@ +{ + "type": "minecraft:block", + "pools": [ + { + "bonus_rolls": 0.0, + "entries": [ + { + "type": "minecraft:item", + "conditions": [ + { + "condition": "minecraft:any_of", + "terms": [ + { + "condition": "minecraft:match_tool", + "predicate": { + "items": "minecraft:shears" + } + }, + { + "condition": "minecraft:match_tool", + "predicate": { + "predicates": { + "minecraft:enchantments": [ + { + "enchantment": "minecraft:silk_touch", + "levels": { + "min": 1 + } + } + ] + } + } + } + ] + }, + { + "block": "floralis:light_blue_flower_crop", + "condition": "minecraft:block_state_property", + "properties": { + "age": "5" + } + } + ], + "name": "floralis:light_blue_flower" + } + ], + "rolls": 1.0 + }, + { + "bonus_rolls": 0.0, + "entries": [ + { + "type": "minecraft:item", + "conditions": [ + { + "condition": "minecraft:any_of", + "terms": [ + { + "condition": "minecraft:match_tool", + "predicate": { + "items": "minecraft:shears" + } + }, + { + "condition": "minecraft:match_tool", + "predicate": { + "predicates": { + "minecraft:enchantments": [ + { + "enchantment": "minecraft:silk_touch", + "levels": { + "min": 1 + } + } + ] + } + } + } + ] + }, + { + "condition": "minecraft:inverted", + "term": { + "block": "floralis:light_blue_flower_crop", + "condition": "minecraft:block_state_property", + "properties": { + "age": "5" + } + } + } + ], + "name": "floralis:light_blue_flower_seeds" + } + ], + "rolls": 1.0 + }, + { + "bonus_rolls": 0.0, + "entries": [ + { + "type": "minecraft:item", + "conditions": [ + { + "condition": "minecraft:inverted", + "term": { + "condition": "minecraft:any_of", + "terms": [ + { + "condition": "minecraft:match_tool", + "predicate": { + "items": "minecraft:shears" + } + }, + { + "condition": "minecraft:match_tool", + "predicate": { + "predicates": { + "minecraft:enchantments": [ + { + "enchantment": "minecraft:silk_touch", + "levels": { + "min": 1 + } + } + ] + } + } + } + ] + } + }, + { + "block": "floralis:light_blue_flower_crop", + "condition": "minecraft:block_state_property", + "properties": { + "age": "5" + } + } + ], + "functions": [ + { + "enchantment": "minecraft:fortune", + "formula": "minecraft:uniform_bonus_count", + "function": "minecraft:apply_bonus", + "parameters": { + "bonusMultiplier": 2 + } + }, + { + "add": false, + "count": 2.0, + "function": "minecraft:set_count" + } + ], + "name": "floralis:light_blue_flower_seeds" + } + ], + "rolls": 1.0 + }, + { + "bonus_rolls": 0.0, + "entries": [ + { + "type": "minecraft:item", + "conditions": [ + { + "condition": "minecraft:inverted", + "term": { + "condition": "minecraft:any_of", + "terms": [ + { + "condition": "minecraft:match_tool", + "predicate": { + "items": "minecraft:shears" + } + }, + { + "condition": "minecraft:match_tool", + "predicate": { + "predicates": { + "minecraft:enchantments": [ + { + "enchantment": "minecraft:silk_touch", + "levels": { + "min": 1 + } + } + ] + } + } + } + ] + } + }, + { + "block": "floralis:light_blue_flower_crop", + "condition": "minecraft:block_state_property", + "properties": { + "age": "5" + } + } + ], + "functions": [ + { + "enchantment": "minecraft:fortune", + "formula": "minecraft:uniform_bonus_count", + "function": "minecraft:apply_bonus", + "parameters": { + "bonusMultiplier": 2 + } + } + ], + "name": "floralis:light_blue_petals" + } + ], + "rolls": 1.0 + }, + { + "bonus_rolls": 0.0, + "entries": [ + { + "type": "minecraft:item", + "conditions": [ + { + "condition": "minecraft:inverted", + "term": { + "condition": "minecraft:any_of", + "terms": [ + { + "condition": "minecraft:match_tool", + "predicate": { + "items": "minecraft:shears" + } + }, + { + "condition": "minecraft:match_tool", + "predicate": { + "predicates": { + "minecraft:enchantments": [ + { + "enchantment": "minecraft:silk_touch", + "levels": { + "min": 1 + } + } + ] + } + } + } + ] + } + }, + { + "block": "floralis:light_blue_flower_crop", + "condition": "minecraft:block_state_property", + "properties": { + "age": "5" + } + } + ], + "functions": [ + { + "enchantment": "minecraft:fortune", + "formula": "minecraft:uniform_bonus_count", + "function": "minecraft:apply_bonus", + "parameters": { + "bonusMultiplier": 2 + } + } + ], + "name": "floralis:plant_fibers" + } + ], + "rolls": 1.0 + }, + { + "bonus_rolls": 0.0, + "entries": [ + { + "type": "minecraft:item", + "conditions": [ + { + "condition": "minecraft:inverted", + "term": { + "condition": "minecraft:any_of", + "terms": [ + { + "condition": "minecraft:match_tool", + "predicate": { + "items": "minecraft:shears" + } + }, + { + "condition": "minecraft:match_tool", + "predicate": { + "predicates": { + "minecraft:enchantments": [ + { + "enchantment": "minecraft:silk_touch", + "levels": { + "min": 1 + } + } + ] + } + } + } + ] + } + }, + { + "condition": "minecraft:inverted", + "term": { + "block": "floralis:light_blue_flower_crop", + "condition": "minecraft:block_state_property", + "properties": { + "age": "5" + } + } + } + ], + "name": "floralis:light_blue_flower_seeds" + } + ], + "rolls": 1.0 + } + ], + "random_sequence": "floralis:blocks/light_blue_flower_crop" +} \ No newline at end of file diff --git a/src/generated/resources/data/floralis/loot_tables/blocks/light_gray_cactus.json b/src/generated/resources/data/floralis/loot_tables/blocks/light_gray_cactus.json new file mode 100644 index 00000000..e7b68cfd --- /dev/null +++ b/src/generated/resources/data/floralis/loot_tables/blocks/light_gray_cactus.json @@ -0,0 +1,202 @@ +{ + "type": "minecraft:block", + "pools": [ + { + "bonus_rolls": 0.0, + "entries": [ + { + "type": "minecraft:item", + "conditions": [ + { + "condition": "minecraft:any_of", + "terms": [ + { + "condition": "minecraft:match_tool", + "predicate": { + "items": "minecraft:shears" + } + }, + { + "condition": "minecraft:match_tool", + "predicate": { + "predicates": { + "minecraft:enchantments": [ + { + "enchantment": "minecraft:silk_touch", + "levels": { + "min": 1 + } + } + ] + } + } + } + ] + } + ], + "name": "floralis:light_gray_cactus" + } + ], + "rolls": 1.0 + }, + { + "bonus_rolls": 0.0, + "entries": [ + { + "type": "minecraft:item", + "conditions": [ + { + "condition": "minecraft:inverted", + "term": { + "condition": "minecraft:any_of", + "terms": [ + { + "condition": "minecraft:match_tool", + "predicate": { + "items": "minecraft:shears" + } + }, + { + "condition": "minecraft:match_tool", + "predicate": { + "predicates": { + "minecraft:enchantments": [ + { + "enchantment": "minecraft:silk_touch", + "levels": { + "min": 1 + } + } + ] + } + } + } + ] + } + } + ], + "functions": [ + { + "enchantment": "minecraft:fortune", + "formula": "minecraft:uniform_bonus_count", + "function": "minecraft:apply_bonus", + "parameters": { + "bonusMultiplier": 2 + } + }, + { + "add": false, + "count": 2.0, + "function": "minecraft:set_count" + } + ], + "name": "floralis:light_gray_cactus_seeds" + } + ], + "rolls": 1.0 + }, + { + "bonus_rolls": 0.0, + "entries": [ + { + "type": "minecraft:item", + "conditions": [ + { + "condition": "minecraft:inverted", + "term": { + "condition": "minecraft:any_of", + "terms": [ + { + "condition": "minecraft:match_tool", + "predicate": { + "items": "minecraft:shears" + } + }, + { + "condition": "minecraft:match_tool", + "predicate": { + "predicates": { + "minecraft:enchantments": [ + { + "enchantment": "minecraft:silk_touch", + "levels": { + "min": 1 + } + } + ] + } + } + } + ] + } + } + ], + "functions": [ + { + "enchantment": "minecraft:fortune", + "formula": "minecraft:uniform_bonus_count", + "function": "minecraft:apply_bonus", + "parameters": { + "bonusMultiplier": 2 + } + } + ], + "name": "floralis:light_gray_petals" + } + ], + "rolls": 1.0 + }, + { + "bonus_rolls": 0.0, + "entries": [ + { + "type": "minecraft:item", + "conditions": [ + { + "condition": "minecraft:inverted", + "term": { + "condition": "minecraft:any_of", + "terms": [ + { + "condition": "minecraft:match_tool", + "predicate": { + "items": "minecraft:shears" + } + }, + { + "condition": "minecraft:match_tool", + "predicate": { + "predicates": { + "minecraft:enchantments": [ + { + "enchantment": "minecraft:silk_touch", + "levels": { + "min": 1 + } + } + ] + } + } + } + ] + } + } + ], + "functions": [ + { + "enchantment": "minecraft:fortune", + "formula": "minecraft:uniform_bonus_count", + "function": "minecraft:apply_bonus", + "parameters": { + "bonusMultiplier": 2 + } + } + ], + "name": "floralis:plant_fibers" + } + ], + "rolls": 1.0 + } + ], + "random_sequence": "floralis:blocks/light_gray_cactus" +} \ No newline at end of file diff --git a/src/generated/resources/data/floralis/loot_tables/blocks/light_gray_cactus_crop.json b/src/generated/resources/data/floralis/loot_tables/blocks/light_gray_cactus_crop.json new file mode 100644 index 00000000..4e9503ad --- /dev/null +++ b/src/generated/resources/data/floralis/loot_tables/blocks/light_gray_cactus_crop.json @@ -0,0 +1,329 @@ +{ + "type": "minecraft:block", + "pools": [ + { + "bonus_rolls": 0.0, + "entries": [ + { + "type": "minecraft:item", + "conditions": [ + { + "condition": "minecraft:any_of", + "terms": [ + { + "condition": "minecraft:match_tool", + "predicate": { + "items": "minecraft:shears" + } + }, + { + "condition": "minecraft:match_tool", + "predicate": { + "predicates": { + "minecraft:enchantments": [ + { + "enchantment": "minecraft:silk_touch", + "levels": { + "min": 1 + } + } + ] + } + } + } + ] + }, + { + "block": "floralis:light_gray_cactus_crop", + "condition": "minecraft:block_state_property", + "properties": { + "age": "5" + } + } + ], + "name": "floralis:light_gray_cactus" + } + ], + "rolls": 1.0 + }, + { + "bonus_rolls": 0.0, + "entries": [ + { + "type": "minecraft:item", + "conditions": [ + { + "condition": "minecraft:any_of", + "terms": [ + { + "condition": "minecraft:match_tool", + "predicate": { + "items": "minecraft:shears" + } + }, + { + "condition": "minecraft:match_tool", + "predicate": { + "predicates": { + "minecraft:enchantments": [ + { + "enchantment": "minecraft:silk_touch", + "levels": { + "min": 1 + } + } + ] + } + } + } + ] + }, + { + "condition": "minecraft:inverted", + "term": { + "block": "floralis:light_gray_cactus_crop", + "condition": "minecraft:block_state_property", + "properties": { + "age": "5" + } + } + } + ], + "name": "floralis:light_gray_cactus_seeds" + } + ], + "rolls": 1.0 + }, + { + "bonus_rolls": 0.0, + "entries": [ + { + "type": "minecraft:item", + "conditions": [ + { + "condition": "minecraft:inverted", + "term": { + "condition": "minecraft:any_of", + "terms": [ + { + "condition": "minecraft:match_tool", + "predicate": { + "items": "minecraft:shears" + } + }, + { + "condition": "minecraft:match_tool", + "predicate": { + "predicates": { + "minecraft:enchantments": [ + { + "enchantment": "minecraft:silk_touch", + "levels": { + "min": 1 + } + } + ] + } + } + } + ] + } + }, + { + "block": "floralis:light_gray_cactus_crop", + "condition": "minecraft:block_state_property", + "properties": { + "age": "5" + } + } + ], + "functions": [ + { + "enchantment": "minecraft:fortune", + "formula": "minecraft:uniform_bonus_count", + "function": "minecraft:apply_bonus", + "parameters": { + "bonusMultiplier": 2 + } + }, + { + "add": false, + "count": 2.0, + "function": "minecraft:set_count" + } + ], + "name": "floralis:light_gray_cactus_seeds" + } + ], + "rolls": 1.0 + }, + { + "bonus_rolls": 0.0, + "entries": [ + { + "type": "minecraft:item", + "conditions": [ + { + "condition": "minecraft:inverted", + "term": { + "condition": "minecraft:any_of", + "terms": [ + { + "condition": "minecraft:match_tool", + "predicate": { + "items": "minecraft:shears" + } + }, + { + "condition": "minecraft:match_tool", + "predicate": { + "predicates": { + "minecraft:enchantments": [ + { + "enchantment": "minecraft:silk_touch", + "levels": { + "min": 1 + } + } + ] + } + } + } + ] + } + }, + { + "block": "floralis:light_gray_cactus_crop", + "condition": "minecraft:block_state_property", + "properties": { + "age": "5" + } + } + ], + "functions": [ + { + "enchantment": "minecraft:fortune", + "formula": "minecraft:uniform_bonus_count", + "function": "minecraft:apply_bonus", + "parameters": { + "bonusMultiplier": 2 + } + } + ], + "name": "floralis:light_gray_petals" + } + ], + "rolls": 1.0 + }, + { + "bonus_rolls": 0.0, + "entries": [ + { + "type": "minecraft:item", + "conditions": [ + { + "condition": "minecraft:inverted", + "term": { + "condition": "minecraft:any_of", + "terms": [ + { + "condition": "minecraft:match_tool", + "predicate": { + "items": "minecraft:shears" + } + }, + { + "condition": "minecraft:match_tool", + "predicate": { + "predicates": { + "minecraft:enchantments": [ + { + "enchantment": "minecraft:silk_touch", + "levels": { + "min": 1 + } + } + ] + } + } + } + ] + } + }, + { + "block": "floralis:light_gray_cactus_crop", + "condition": "minecraft:block_state_property", + "properties": { + "age": "5" + } + } + ], + "functions": [ + { + "enchantment": "minecraft:fortune", + "formula": "minecraft:uniform_bonus_count", + "function": "minecraft:apply_bonus", + "parameters": { + "bonusMultiplier": 2 + } + } + ], + "name": "floralis:plant_fibers" + } + ], + "rolls": 1.0 + }, + { + "bonus_rolls": 0.0, + "entries": [ + { + "type": "minecraft:item", + "conditions": [ + { + "condition": "minecraft:inverted", + "term": { + "condition": "minecraft:any_of", + "terms": [ + { + "condition": "minecraft:match_tool", + "predicate": { + "items": "minecraft:shears" + } + }, + { + "condition": "minecraft:match_tool", + "predicate": { + "predicates": { + "minecraft:enchantments": [ + { + "enchantment": "minecraft:silk_touch", + "levels": { + "min": 1 + } + } + ] + } + } + } + ] + } + }, + { + "condition": "minecraft:inverted", + "term": { + "block": "floralis:light_gray_cactus_crop", + "condition": "minecraft:block_state_property", + "properties": { + "age": "5" + } + } + } + ], + "name": "floralis:light_gray_cactus_seeds" + } + ], + "rolls": 1.0 + } + ], + "random_sequence": "floralis:blocks/light_gray_cactus_crop" +} \ No newline at end of file diff --git a/src/main/resources/data/floralis/loot_tables/blocks/light_gray_dye_block.json b/src/generated/resources/data/floralis/loot_tables/blocks/light_gray_dye_block.json similarity index 56% rename from src/main/resources/data/floralis/loot_tables/blocks/light_gray_dye_block.json rename to src/generated/resources/data/floralis/loot_tables/blocks/light_gray_dye_block.json index dc7d0f76..dd96f4a9 100644 --- a/src/main/resources/data/floralis/loot_tables/blocks/light_gray_dye_block.json +++ b/src/generated/resources/data/floralis/loot_tables/blocks/light_gray_dye_block.json @@ -2,19 +2,15 @@ "type": "minecraft:block", "pools": [ { - "rolls": 1, - "bonus_rolls": 0, + "bonus_rolls": 0.0, "entries": [ { "type": "minecraft:item", "name": "floralis:light_gray_dye_block" } ], - "conditions": [ - { - "condition": "minecraft:survives_explosion" - } - ] + "rolls": 1.0 } - ] + ], + "random_sequence": "floralis:blocks/light_gray_dye_block" } \ No newline at end of file diff --git a/src/generated/resources/data/floralis/loot_tables/blocks/light_gray_flower.json b/src/generated/resources/data/floralis/loot_tables/blocks/light_gray_flower.json new file mode 100644 index 00000000..b5a2e296 --- /dev/null +++ b/src/generated/resources/data/floralis/loot_tables/blocks/light_gray_flower.json @@ -0,0 +1,202 @@ +{ + "type": "minecraft:block", + "pools": [ + { + "bonus_rolls": 0.0, + "entries": [ + { + "type": "minecraft:item", + "conditions": [ + { + "condition": "minecraft:any_of", + "terms": [ + { + "condition": "minecraft:match_tool", + "predicate": { + "items": "minecraft:shears" + } + }, + { + "condition": "minecraft:match_tool", + "predicate": { + "predicates": { + "minecraft:enchantments": [ + { + "enchantment": "minecraft:silk_touch", + "levels": { + "min": 1 + } + } + ] + } + } + } + ] + } + ], + "name": "floralis:light_gray_flower" + } + ], + "rolls": 1.0 + }, + { + "bonus_rolls": 0.0, + "entries": [ + { + "type": "minecraft:item", + "conditions": [ + { + "condition": "minecraft:inverted", + "term": { + "condition": "minecraft:any_of", + "terms": [ + { + "condition": "minecraft:match_tool", + "predicate": { + "items": "minecraft:shears" + } + }, + { + "condition": "minecraft:match_tool", + "predicate": { + "predicates": { + "minecraft:enchantments": [ + { + "enchantment": "minecraft:silk_touch", + "levels": { + "min": 1 + } + } + ] + } + } + } + ] + } + } + ], + "functions": [ + { + "enchantment": "minecraft:fortune", + "formula": "minecraft:uniform_bonus_count", + "function": "minecraft:apply_bonus", + "parameters": { + "bonusMultiplier": 2 + } + }, + { + "add": false, + "count": 2.0, + "function": "minecraft:set_count" + } + ], + "name": "floralis:light_gray_flower_seeds" + } + ], + "rolls": 1.0 + }, + { + "bonus_rolls": 0.0, + "entries": [ + { + "type": "minecraft:item", + "conditions": [ + { + "condition": "minecraft:inverted", + "term": { + "condition": "minecraft:any_of", + "terms": [ + { + "condition": "minecraft:match_tool", + "predicate": { + "items": "minecraft:shears" + } + }, + { + "condition": "minecraft:match_tool", + "predicate": { + "predicates": { + "minecraft:enchantments": [ + { + "enchantment": "minecraft:silk_touch", + "levels": { + "min": 1 + } + } + ] + } + } + } + ] + } + } + ], + "functions": [ + { + "enchantment": "minecraft:fortune", + "formula": "minecraft:uniform_bonus_count", + "function": "minecraft:apply_bonus", + "parameters": { + "bonusMultiplier": 2 + } + } + ], + "name": "floralis:light_gray_petals" + } + ], + "rolls": 1.0 + }, + { + "bonus_rolls": 0.0, + "entries": [ + { + "type": "minecraft:item", + "conditions": [ + { + "condition": "minecraft:inverted", + "term": { + "condition": "minecraft:any_of", + "terms": [ + { + "condition": "minecraft:match_tool", + "predicate": { + "items": "minecraft:shears" + } + }, + { + "condition": "minecraft:match_tool", + "predicate": { + "predicates": { + "minecraft:enchantments": [ + { + "enchantment": "minecraft:silk_touch", + "levels": { + "min": 1 + } + } + ] + } + } + } + ] + } + } + ], + "functions": [ + { + "enchantment": "minecraft:fortune", + "formula": "minecraft:uniform_bonus_count", + "function": "minecraft:apply_bonus", + "parameters": { + "bonusMultiplier": 2 + } + } + ], + "name": "floralis:plant_fibers" + } + ], + "rolls": 1.0 + } + ], + "random_sequence": "floralis:blocks/light_gray_flower" +} \ No newline at end of file diff --git a/src/generated/resources/data/floralis/loot_tables/blocks/light_gray_flower_crop.json b/src/generated/resources/data/floralis/loot_tables/blocks/light_gray_flower_crop.json new file mode 100644 index 00000000..40dfa3c4 --- /dev/null +++ b/src/generated/resources/data/floralis/loot_tables/blocks/light_gray_flower_crop.json @@ -0,0 +1,329 @@ +{ + "type": "minecraft:block", + "pools": [ + { + "bonus_rolls": 0.0, + "entries": [ + { + "type": "minecraft:item", + "conditions": [ + { + "condition": "minecraft:any_of", + "terms": [ + { + "condition": "minecraft:match_tool", + "predicate": { + "items": "minecraft:shears" + } + }, + { + "condition": "minecraft:match_tool", + "predicate": { + "predicates": { + "minecraft:enchantments": [ + { + "enchantment": "minecraft:silk_touch", + "levels": { + "min": 1 + } + } + ] + } + } + } + ] + }, + { + "block": "floralis:light_gray_flower_crop", + "condition": "minecraft:block_state_property", + "properties": { + "age": "5" + } + } + ], + "name": "floralis:light_gray_flower" + } + ], + "rolls": 1.0 + }, + { + "bonus_rolls": 0.0, + "entries": [ + { + "type": "minecraft:item", + "conditions": [ + { + "condition": "minecraft:any_of", + "terms": [ + { + "condition": "minecraft:match_tool", + "predicate": { + "items": "minecraft:shears" + } + }, + { + "condition": "minecraft:match_tool", + "predicate": { + "predicates": { + "minecraft:enchantments": [ + { + "enchantment": "minecraft:silk_touch", + "levels": { + "min": 1 + } + } + ] + } + } + } + ] + }, + { + "condition": "minecraft:inverted", + "term": { + "block": "floralis:light_gray_flower_crop", + "condition": "minecraft:block_state_property", + "properties": { + "age": "5" + } + } + } + ], + "name": "floralis:light_gray_flower_seeds" + } + ], + "rolls": 1.0 + }, + { + "bonus_rolls": 0.0, + "entries": [ + { + "type": "minecraft:item", + "conditions": [ + { + "condition": "minecraft:inverted", + "term": { + "condition": "minecraft:any_of", + "terms": [ + { + "condition": "minecraft:match_tool", + "predicate": { + "items": "minecraft:shears" + } + }, + { + "condition": "minecraft:match_tool", + "predicate": { + "predicates": { + "minecraft:enchantments": [ + { + "enchantment": "minecraft:silk_touch", + "levels": { + "min": 1 + } + } + ] + } + } + } + ] + } + }, + { + "block": "floralis:light_gray_flower_crop", + "condition": "minecraft:block_state_property", + "properties": { + "age": "5" + } + } + ], + "functions": [ + { + "enchantment": "minecraft:fortune", + "formula": "minecraft:uniform_bonus_count", + "function": "minecraft:apply_bonus", + "parameters": { + "bonusMultiplier": 2 + } + }, + { + "add": false, + "count": 2.0, + "function": "minecraft:set_count" + } + ], + "name": "floralis:light_gray_flower_seeds" + } + ], + "rolls": 1.0 + }, + { + "bonus_rolls": 0.0, + "entries": [ + { + "type": "minecraft:item", + "conditions": [ + { + "condition": "minecraft:inverted", + "term": { + "condition": "minecraft:any_of", + "terms": [ + { + "condition": "minecraft:match_tool", + "predicate": { + "items": "minecraft:shears" + } + }, + { + "condition": "minecraft:match_tool", + "predicate": { + "predicates": { + "minecraft:enchantments": [ + { + "enchantment": "minecraft:silk_touch", + "levels": { + "min": 1 + } + } + ] + } + } + } + ] + } + }, + { + "block": "floralis:light_gray_flower_crop", + "condition": "minecraft:block_state_property", + "properties": { + "age": "5" + } + } + ], + "functions": [ + { + "enchantment": "minecraft:fortune", + "formula": "minecraft:uniform_bonus_count", + "function": "minecraft:apply_bonus", + "parameters": { + "bonusMultiplier": 2 + } + } + ], + "name": "floralis:light_gray_petals" + } + ], + "rolls": 1.0 + }, + { + "bonus_rolls": 0.0, + "entries": [ + { + "type": "minecraft:item", + "conditions": [ + { + "condition": "minecraft:inverted", + "term": { + "condition": "minecraft:any_of", + "terms": [ + { + "condition": "minecraft:match_tool", + "predicate": { + "items": "minecraft:shears" + } + }, + { + "condition": "minecraft:match_tool", + "predicate": { + "predicates": { + "minecraft:enchantments": [ + { + "enchantment": "minecraft:silk_touch", + "levels": { + "min": 1 + } + } + ] + } + } + } + ] + } + }, + { + "block": "floralis:light_gray_flower_crop", + "condition": "minecraft:block_state_property", + "properties": { + "age": "5" + } + } + ], + "functions": [ + { + "enchantment": "minecraft:fortune", + "formula": "minecraft:uniform_bonus_count", + "function": "minecraft:apply_bonus", + "parameters": { + "bonusMultiplier": 2 + } + } + ], + "name": "floralis:plant_fibers" + } + ], + "rolls": 1.0 + }, + { + "bonus_rolls": 0.0, + "entries": [ + { + "type": "minecraft:item", + "conditions": [ + { + "condition": "minecraft:inverted", + "term": { + "condition": "minecraft:any_of", + "terms": [ + { + "condition": "minecraft:match_tool", + "predicate": { + "items": "minecraft:shears" + } + }, + { + "condition": "minecraft:match_tool", + "predicate": { + "predicates": { + "minecraft:enchantments": [ + { + "enchantment": "minecraft:silk_touch", + "levels": { + "min": 1 + } + } + ] + } + } + } + ] + } + }, + { + "condition": "minecraft:inverted", + "term": { + "block": "floralis:light_gray_flower_crop", + "condition": "minecraft:block_state_property", + "properties": { + "age": "5" + } + } + } + ], + "name": "floralis:light_gray_flower_seeds" + } + ], + "rolls": 1.0 + } + ], + "random_sequence": "floralis:blocks/light_gray_flower_crop" +} \ No newline at end of file diff --git a/src/generated/resources/data/floralis/loot_tables/blocks/lime_cactus.json b/src/generated/resources/data/floralis/loot_tables/blocks/lime_cactus.json new file mode 100644 index 00000000..c46da783 --- /dev/null +++ b/src/generated/resources/data/floralis/loot_tables/blocks/lime_cactus.json @@ -0,0 +1,202 @@ +{ + "type": "minecraft:block", + "pools": [ + { + "bonus_rolls": 0.0, + "entries": [ + { + "type": "minecraft:item", + "conditions": [ + { + "condition": "minecraft:any_of", + "terms": [ + { + "condition": "minecraft:match_tool", + "predicate": { + "items": "minecraft:shears" + } + }, + { + "condition": "minecraft:match_tool", + "predicate": { + "predicates": { + "minecraft:enchantments": [ + { + "enchantment": "minecraft:silk_touch", + "levels": { + "min": 1 + } + } + ] + } + } + } + ] + } + ], + "name": "floralis:lime_cactus" + } + ], + "rolls": 1.0 + }, + { + "bonus_rolls": 0.0, + "entries": [ + { + "type": "minecraft:item", + "conditions": [ + { + "condition": "minecraft:inverted", + "term": { + "condition": "minecraft:any_of", + "terms": [ + { + "condition": "minecraft:match_tool", + "predicate": { + "items": "minecraft:shears" + } + }, + { + "condition": "minecraft:match_tool", + "predicate": { + "predicates": { + "minecraft:enchantments": [ + { + "enchantment": "minecraft:silk_touch", + "levels": { + "min": 1 + } + } + ] + } + } + } + ] + } + } + ], + "functions": [ + { + "enchantment": "minecraft:fortune", + "formula": "minecraft:uniform_bonus_count", + "function": "minecraft:apply_bonus", + "parameters": { + "bonusMultiplier": 2 + } + }, + { + "add": false, + "count": 2.0, + "function": "minecraft:set_count" + } + ], + "name": "floralis:lime_cactus_seeds" + } + ], + "rolls": 1.0 + }, + { + "bonus_rolls": 0.0, + "entries": [ + { + "type": "minecraft:item", + "conditions": [ + { + "condition": "minecraft:inverted", + "term": { + "condition": "minecraft:any_of", + "terms": [ + { + "condition": "minecraft:match_tool", + "predicate": { + "items": "minecraft:shears" + } + }, + { + "condition": "minecraft:match_tool", + "predicate": { + "predicates": { + "minecraft:enchantments": [ + { + "enchantment": "minecraft:silk_touch", + "levels": { + "min": 1 + } + } + ] + } + } + } + ] + } + } + ], + "functions": [ + { + "enchantment": "minecraft:fortune", + "formula": "minecraft:uniform_bonus_count", + "function": "minecraft:apply_bonus", + "parameters": { + "bonusMultiplier": 2 + } + } + ], + "name": "floralis:lime_petals" + } + ], + "rolls": 1.0 + }, + { + "bonus_rolls": 0.0, + "entries": [ + { + "type": "minecraft:item", + "conditions": [ + { + "condition": "minecraft:inverted", + "term": { + "condition": "minecraft:any_of", + "terms": [ + { + "condition": "minecraft:match_tool", + "predicate": { + "items": "minecraft:shears" + } + }, + { + "condition": "minecraft:match_tool", + "predicate": { + "predicates": { + "minecraft:enchantments": [ + { + "enchantment": "minecraft:silk_touch", + "levels": { + "min": 1 + } + } + ] + } + } + } + ] + } + } + ], + "functions": [ + { + "enchantment": "minecraft:fortune", + "formula": "minecraft:uniform_bonus_count", + "function": "minecraft:apply_bonus", + "parameters": { + "bonusMultiplier": 2 + } + } + ], + "name": "floralis:plant_fibers" + } + ], + "rolls": 1.0 + } + ], + "random_sequence": "floralis:blocks/lime_cactus" +} \ No newline at end of file diff --git a/src/generated/resources/data/floralis/loot_tables/blocks/lime_cactus_crop.json b/src/generated/resources/data/floralis/loot_tables/blocks/lime_cactus_crop.json new file mode 100644 index 00000000..0c4134d6 --- /dev/null +++ b/src/generated/resources/data/floralis/loot_tables/blocks/lime_cactus_crop.json @@ -0,0 +1,329 @@ +{ + "type": "minecraft:block", + "pools": [ + { + "bonus_rolls": 0.0, + "entries": [ + { + "type": "minecraft:item", + "conditions": [ + { + "condition": "minecraft:any_of", + "terms": [ + { + "condition": "minecraft:match_tool", + "predicate": { + "items": "minecraft:shears" + } + }, + { + "condition": "minecraft:match_tool", + "predicate": { + "predicates": { + "minecraft:enchantments": [ + { + "enchantment": "minecraft:silk_touch", + "levels": { + "min": 1 + } + } + ] + } + } + } + ] + }, + { + "block": "floralis:lime_cactus_crop", + "condition": "minecraft:block_state_property", + "properties": { + "age": "5" + } + } + ], + "name": "floralis:lime_cactus" + } + ], + "rolls": 1.0 + }, + { + "bonus_rolls": 0.0, + "entries": [ + { + "type": "minecraft:item", + "conditions": [ + { + "condition": "minecraft:any_of", + "terms": [ + { + "condition": "minecraft:match_tool", + "predicate": { + "items": "minecraft:shears" + } + }, + { + "condition": "minecraft:match_tool", + "predicate": { + "predicates": { + "minecraft:enchantments": [ + { + "enchantment": "minecraft:silk_touch", + "levels": { + "min": 1 + } + } + ] + } + } + } + ] + }, + { + "condition": "minecraft:inverted", + "term": { + "block": "floralis:lime_cactus_crop", + "condition": "minecraft:block_state_property", + "properties": { + "age": "5" + } + } + } + ], + "name": "floralis:lime_cactus_seeds" + } + ], + "rolls": 1.0 + }, + { + "bonus_rolls": 0.0, + "entries": [ + { + "type": "minecraft:item", + "conditions": [ + { + "condition": "minecraft:inverted", + "term": { + "condition": "minecraft:any_of", + "terms": [ + { + "condition": "minecraft:match_tool", + "predicate": { + "items": "minecraft:shears" + } + }, + { + "condition": "minecraft:match_tool", + "predicate": { + "predicates": { + "minecraft:enchantments": [ + { + "enchantment": "minecraft:silk_touch", + "levels": { + "min": 1 + } + } + ] + } + } + } + ] + } + }, + { + "block": "floralis:lime_cactus_crop", + "condition": "minecraft:block_state_property", + "properties": { + "age": "5" + } + } + ], + "functions": [ + { + "enchantment": "minecraft:fortune", + "formula": "minecraft:uniform_bonus_count", + "function": "minecraft:apply_bonus", + "parameters": { + "bonusMultiplier": 2 + } + }, + { + "add": false, + "count": 2.0, + "function": "minecraft:set_count" + } + ], + "name": "floralis:lime_cactus_seeds" + } + ], + "rolls": 1.0 + }, + { + "bonus_rolls": 0.0, + "entries": [ + { + "type": "minecraft:item", + "conditions": [ + { + "condition": "minecraft:inverted", + "term": { + "condition": "minecraft:any_of", + "terms": [ + { + "condition": "minecraft:match_tool", + "predicate": { + "items": "minecraft:shears" + } + }, + { + "condition": "minecraft:match_tool", + "predicate": { + "predicates": { + "minecraft:enchantments": [ + { + "enchantment": "minecraft:silk_touch", + "levels": { + "min": 1 + } + } + ] + } + } + } + ] + } + }, + { + "block": "floralis:lime_cactus_crop", + "condition": "minecraft:block_state_property", + "properties": { + "age": "5" + } + } + ], + "functions": [ + { + "enchantment": "minecraft:fortune", + "formula": "minecraft:uniform_bonus_count", + "function": "minecraft:apply_bonus", + "parameters": { + "bonusMultiplier": 2 + } + } + ], + "name": "floralis:lime_petals" + } + ], + "rolls": 1.0 + }, + { + "bonus_rolls": 0.0, + "entries": [ + { + "type": "minecraft:item", + "conditions": [ + { + "condition": "minecraft:inverted", + "term": { + "condition": "minecraft:any_of", + "terms": [ + { + "condition": "minecraft:match_tool", + "predicate": { + "items": "minecraft:shears" + } + }, + { + "condition": "minecraft:match_tool", + "predicate": { + "predicates": { + "minecraft:enchantments": [ + { + "enchantment": "minecraft:silk_touch", + "levels": { + "min": 1 + } + } + ] + } + } + } + ] + } + }, + { + "block": "floralis:lime_cactus_crop", + "condition": "minecraft:block_state_property", + "properties": { + "age": "5" + } + } + ], + "functions": [ + { + "enchantment": "minecraft:fortune", + "formula": "minecraft:uniform_bonus_count", + "function": "minecraft:apply_bonus", + "parameters": { + "bonusMultiplier": 2 + } + } + ], + "name": "floralis:plant_fibers" + } + ], + "rolls": 1.0 + }, + { + "bonus_rolls": 0.0, + "entries": [ + { + "type": "minecraft:item", + "conditions": [ + { + "condition": "minecraft:inverted", + "term": { + "condition": "minecraft:any_of", + "terms": [ + { + "condition": "minecraft:match_tool", + "predicate": { + "items": "minecraft:shears" + } + }, + { + "condition": "minecraft:match_tool", + "predicate": { + "predicates": { + "minecraft:enchantments": [ + { + "enchantment": "minecraft:silk_touch", + "levels": { + "min": 1 + } + } + ] + } + } + } + ] + } + }, + { + "condition": "minecraft:inverted", + "term": { + "block": "floralis:lime_cactus_crop", + "condition": "minecraft:block_state_property", + "properties": { + "age": "5" + } + } + } + ], + "name": "floralis:lime_cactus_seeds" + } + ], + "rolls": 1.0 + } + ], + "random_sequence": "floralis:blocks/lime_cactus_crop" +} \ No newline at end of file diff --git a/src/main/resources/data/floralis/loot_tables/blocks/lime_dye_block.json b/src/generated/resources/data/floralis/loot_tables/blocks/lime_dye_block.json similarity index 55% rename from src/main/resources/data/floralis/loot_tables/blocks/lime_dye_block.json rename to src/generated/resources/data/floralis/loot_tables/blocks/lime_dye_block.json index 3a3b8aa1..62a3f4bd 100644 --- a/src/main/resources/data/floralis/loot_tables/blocks/lime_dye_block.json +++ b/src/generated/resources/data/floralis/loot_tables/blocks/lime_dye_block.json @@ -2,19 +2,15 @@ "type": "minecraft:block", "pools": [ { - "rolls": 1, - "bonus_rolls": 0, + "bonus_rolls": 0.0, "entries": [ { "type": "minecraft:item", "name": "floralis:lime_dye_block" } ], - "conditions": [ - { - "condition": "minecraft:survives_explosion" - } - ] + "rolls": 1.0 } - ] + ], + "random_sequence": "floralis:blocks/lime_dye_block" } \ No newline at end of file diff --git a/src/generated/resources/data/floralis/loot_tables/blocks/lime_flower.json b/src/generated/resources/data/floralis/loot_tables/blocks/lime_flower.json new file mode 100644 index 00000000..ab43345e --- /dev/null +++ b/src/generated/resources/data/floralis/loot_tables/blocks/lime_flower.json @@ -0,0 +1,202 @@ +{ + "type": "minecraft:block", + "pools": [ + { + "bonus_rolls": 0.0, + "entries": [ + { + "type": "minecraft:item", + "conditions": [ + { + "condition": "minecraft:any_of", + "terms": [ + { + "condition": "minecraft:match_tool", + "predicate": { + "items": "minecraft:shears" + } + }, + { + "condition": "minecraft:match_tool", + "predicate": { + "predicates": { + "minecraft:enchantments": [ + { + "enchantment": "minecraft:silk_touch", + "levels": { + "min": 1 + } + } + ] + } + } + } + ] + } + ], + "name": "floralis:lime_flower" + } + ], + "rolls": 1.0 + }, + { + "bonus_rolls": 0.0, + "entries": [ + { + "type": "minecraft:item", + "conditions": [ + { + "condition": "minecraft:inverted", + "term": { + "condition": "minecraft:any_of", + "terms": [ + { + "condition": "minecraft:match_tool", + "predicate": { + "items": "minecraft:shears" + } + }, + { + "condition": "minecraft:match_tool", + "predicate": { + "predicates": { + "minecraft:enchantments": [ + { + "enchantment": "minecraft:silk_touch", + "levels": { + "min": 1 + } + } + ] + } + } + } + ] + } + } + ], + "functions": [ + { + "enchantment": "minecraft:fortune", + "formula": "minecraft:uniform_bonus_count", + "function": "minecraft:apply_bonus", + "parameters": { + "bonusMultiplier": 2 + } + }, + { + "add": false, + "count": 2.0, + "function": "minecraft:set_count" + } + ], + "name": "floralis:lime_flower_seeds" + } + ], + "rolls": 1.0 + }, + { + "bonus_rolls": 0.0, + "entries": [ + { + "type": "minecraft:item", + "conditions": [ + { + "condition": "minecraft:inverted", + "term": { + "condition": "minecraft:any_of", + "terms": [ + { + "condition": "minecraft:match_tool", + "predicate": { + "items": "minecraft:shears" + } + }, + { + "condition": "minecraft:match_tool", + "predicate": { + "predicates": { + "minecraft:enchantments": [ + { + "enchantment": "minecraft:silk_touch", + "levels": { + "min": 1 + } + } + ] + } + } + } + ] + } + } + ], + "functions": [ + { + "enchantment": "minecraft:fortune", + "formula": "minecraft:uniform_bonus_count", + "function": "minecraft:apply_bonus", + "parameters": { + "bonusMultiplier": 2 + } + } + ], + "name": "floralis:lime_petals" + } + ], + "rolls": 1.0 + }, + { + "bonus_rolls": 0.0, + "entries": [ + { + "type": "minecraft:item", + "conditions": [ + { + "condition": "minecraft:inverted", + "term": { + "condition": "minecraft:any_of", + "terms": [ + { + "condition": "minecraft:match_tool", + "predicate": { + "items": "minecraft:shears" + } + }, + { + "condition": "minecraft:match_tool", + "predicate": { + "predicates": { + "minecraft:enchantments": [ + { + "enchantment": "minecraft:silk_touch", + "levels": { + "min": 1 + } + } + ] + } + } + } + ] + } + } + ], + "functions": [ + { + "enchantment": "minecraft:fortune", + "formula": "minecraft:uniform_bonus_count", + "function": "minecraft:apply_bonus", + "parameters": { + "bonusMultiplier": 2 + } + } + ], + "name": "floralis:plant_fibers" + } + ], + "rolls": 1.0 + } + ], + "random_sequence": "floralis:blocks/lime_flower" +} \ No newline at end of file diff --git a/src/generated/resources/data/floralis/loot_tables/blocks/lime_flower_crop.json b/src/generated/resources/data/floralis/loot_tables/blocks/lime_flower_crop.json new file mode 100644 index 00000000..a4de92c9 --- /dev/null +++ b/src/generated/resources/data/floralis/loot_tables/blocks/lime_flower_crop.json @@ -0,0 +1,329 @@ +{ + "type": "minecraft:block", + "pools": [ + { + "bonus_rolls": 0.0, + "entries": [ + { + "type": "minecraft:item", + "conditions": [ + { + "condition": "minecraft:any_of", + "terms": [ + { + "condition": "minecraft:match_tool", + "predicate": { + "items": "minecraft:shears" + } + }, + { + "condition": "minecraft:match_tool", + "predicate": { + "predicates": { + "minecraft:enchantments": [ + { + "enchantment": "minecraft:silk_touch", + "levels": { + "min": 1 + } + } + ] + } + } + } + ] + }, + { + "block": "floralis:lime_flower_crop", + "condition": "minecraft:block_state_property", + "properties": { + "age": "5" + } + } + ], + "name": "floralis:lime_flower" + } + ], + "rolls": 1.0 + }, + { + "bonus_rolls": 0.0, + "entries": [ + { + "type": "minecraft:item", + "conditions": [ + { + "condition": "minecraft:any_of", + "terms": [ + { + "condition": "minecraft:match_tool", + "predicate": { + "items": "minecraft:shears" + } + }, + { + "condition": "minecraft:match_tool", + "predicate": { + "predicates": { + "minecraft:enchantments": [ + { + "enchantment": "minecraft:silk_touch", + "levels": { + "min": 1 + } + } + ] + } + } + } + ] + }, + { + "condition": "minecraft:inverted", + "term": { + "block": "floralis:lime_flower_crop", + "condition": "minecraft:block_state_property", + "properties": { + "age": "5" + } + } + } + ], + "name": "floralis:lime_flower_seeds" + } + ], + "rolls": 1.0 + }, + { + "bonus_rolls": 0.0, + "entries": [ + { + "type": "minecraft:item", + "conditions": [ + { + "condition": "minecraft:inverted", + "term": { + "condition": "minecraft:any_of", + "terms": [ + { + "condition": "minecraft:match_tool", + "predicate": { + "items": "minecraft:shears" + } + }, + { + "condition": "minecraft:match_tool", + "predicate": { + "predicates": { + "minecraft:enchantments": [ + { + "enchantment": "minecraft:silk_touch", + "levels": { + "min": 1 + } + } + ] + } + } + } + ] + } + }, + { + "block": "floralis:lime_flower_crop", + "condition": "minecraft:block_state_property", + "properties": { + "age": "5" + } + } + ], + "functions": [ + { + "enchantment": "minecraft:fortune", + "formula": "minecraft:uniform_bonus_count", + "function": "minecraft:apply_bonus", + "parameters": { + "bonusMultiplier": 2 + } + }, + { + "add": false, + "count": 2.0, + "function": "minecraft:set_count" + } + ], + "name": "floralis:lime_flower_seeds" + } + ], + "rolls": 1.0 + }, + { + "bonus_rolls": 0.0, + "entries": [ + { + "type": "minecraft:item", + "conditions": [ + { + "condition": "minecraft:inverted", + "term": { + "condition": "minecraft:any_of", + "terms": [ + { + "condition": "minecraft:match_tool", + "predicate": { + "items": "minecraft:shears" + } + }, + { + "condition": "minecraft:match_tool", + "predicate": { + "predicates": { + "minecraft:enchantments": [ + { + "enchantment": "minecraft:silk_touch", + "levels": { + "min": 1 + } + } + ] + } + } + } + ] + } + }, + { + "block": "floralis:lime_flower_crop", + "condition": "minecraft:block_state_property", + "properties": { + "age": "5" + } + } + ], + "functions": [ + { + "enchantment": "minecraft:fortune", + "formula": "minecraft:uniform_bonus_count", + "function": "minecraft:apply_bonus", + "parameters": { + "bonusMultiplier": 2 + } + } + ], + "name": "floralis:lime_petals" + } + ], + "rolls": 1.0 + }, + { + "bonus_rolls": 0.0, + "entries": [ + { + "type": "minecraft:item", + "conditions": [ + { + "condition": "minecraft:inverted", + "term": { + "condition": "minecraft:any_of", + "terms": [ + { + "condition": "minecraft:match_tool", + "predicate": { + "items": "minecraft:shears" + } + }, + { + "condition": "minecraft:match_tool", + "predicate": { + "predicates": { + "minecraft:enchantments": [ + { + "enchantment": "minecraft:silk_touch", + "levels": { + "min": 1 + } + } + ] + } + } + } + ] + } + }, + { + "block": "floralis:lime_flower_crop", + "condition": "minecraft:block_state_property", + "properties": { + "age": "5" + } + } + ], + "functions": [ + { + "enchantment": "minecraft:fortune", + "formula": "minecraft:uniform_bonus_count", + "function": "minecraft:apply_bonus", + "parameters": { + "bonusMultiplier": 2 + } + } + ], + "name": "floralis:plant_fibers" + } + ], + "rolls": 1.0 + }, + { + "bonus_rolls": 0.0, + "entries": [ + { + "type": "minecraft:item", + "conditions": [ + { + "condition": "minecraft:inverted", + "term": { + "condition": "minecraft:any_of", + "terms": [ + { + "condition": "minecraft:match_tool", + "predicate": { + "items": "minecraft:shears" + } + }, + { + "condition": "minecraft:match_tool", + "predicate": { + "predicates": { + "minecraft:enchantments": [ + { + "enchantment": "minecraft:silk_touch", + "levels": { + "min": 1 + } + } + ] + } + } + } + ] + } + }, + { + "condition": "minecraft:inverted", + "term": { + "block": "floralis:lime_flower_crop", + "condition": "minecraft:block_state_property", + "properties": { + "age": "5" + } + } + } + ], + "name": "floralis:lime_flower_seeds" + } + ], + "rolls": 1.0 + } + ], + "random_sequence": "floralis:blocks/lime_flower_crop" +} \ No newline at end of file diff --git a/src/generated/resources/data/floralis/loot_tables/blocks/magenta_cactus.json b/src/generated/resources/data/floralis/loot_tables/blocks/magenta_cactus.json new file mode 100644 index 00000000..c10ba462 --- /dev/null +++ b/src/generated/resources/data/floralis/loot_tables/blocks/magenta_cactus.json @@ -0,0 +1,202 @@ +{ + "type": "minecraft:block", + "pools": [ + { + "bonus_rolls": 0.0, + "entries": [ + { + "type": "minecraft:item", + "conditions": [ + { + "condition": "minecraft:any_of", + "terms": [ + { + "condition": "minecraft:match_tool", + "predicate": { + "items": "minecraft:shears" + } + }, + { + "condition": "minecraft:match_tool", + "predicate": { + "predicates": { + "minecraft:enchantments": [ + { + "enchantment": "minecraft:silk_touch", + "levels": { + "min": 1 + } + } + ] + } + } + } + ] + } + ], + "name": "floralis:magenta_cactus" + } + ], + "rolls": 1.0 + }, + { + "bonus_rolls": 0.0, + "entries": [ + { + "type": "minecraft:item", + "conditions": [ + { + "condition": "minecraft:inverted", + "term": { + "condition": "minecraft:any_of", + "terms": [ + { + "condition": "minecraft:match_tool", + "predicate": { + "items": "minecraft:shears" + } + }, + { + "condition": "minecraft:match_tool", + "predicate": { + "predicates": { + "minecraft:enchantments": [ + { + "enchantment": "minecraft:silk_touch", + "levels": { + "min": 1 + } + } + ] + } + } + } + ] + } + } + ], + "functions": [ + { + "enchantment": "minecraft:fortune", + "formula": "minecraft:uniform_bonus_count", + "function": "minecraft:apply_bonus", + "parameters": { + "bonusMultiplier": 2 + } + }, + { + "add": false, + "count": 2.0, + "function": "minecraft:set_count" + } + ], + "name": "floralis:magenta_cactus_seeds" + } + ], + "rolls": 1.0 + }, + { + "bonus_rolls": 0.0, + "entries": [ + { + "type": "minecraft:item", + "conditions": [ + { + "condition": "minecraft:inverted", + "term": { + "condition": "minecraft:any_of", + "terms": [ + { + "condition": "minecraft:match_tool", + "predicate": { + "items": "minecraft:shears" + } + }, + { + "condition": "minecraft:match_tool", + "predicate": { + "predicates": { + "minecraft:enchantments": [ + { + "enchantment": "minecraft:silk_touch", + "levels": { + "min": 1 + } + } + ] + } + } + } + ] + } + } + ], + "functions": [ + { + "enchantment": "minecraft:fortune", + "formula": "minecraft:uniform_bonus_count", + "function": "minecraft:apply_bonus", + "parameters": { + "bonusMultiplier": 2 + } + } + ], + "name": "floralis:magenta_petals" + } + ], + "rolls": 1.0 + }, + { + "bonus_rolls": 0.0, + "entries": [ + { + "type": "minecraft:item", + "conditions": [ + { + "condition": "minecraft:inverted", + "term": { + "condition": "minecraft:any_of", + "terms": [ + { + "condition": "minecraft:match_tool", + "predicate": { + "items": "minecraft:shears" + } + }, + { + "condition": "minecraft:match_tool", + "predicate": { + "predicates": { + "minecraft:enchantments": [ + { + "enchantment": "minecraft:silk_touch", + "levels": { + "min": 1 + } + } + ] + } + } + } + ] + } + } + ], + "functions": [ + { + "enchantment": "minecraft:fortune", + "formula": "minecraft:uniform_bonus_count", + "function": "minecraft:apply_bonus", + "parameters": { + "bonusMultiplier": 2 + } + } + ], + "name": "floralis:plant_fibers" + } + ], + "rolls": 1.0 + } + ], + "random_sequence": "floralis:blocks/magenta_cactus" +} \ No newline at end of file diff --git a/src/generated/resources/data/floralis/loot_tables/blocks/magenta_cactus_crop.json b/src/generated/resources/data/floralis/loot_tables/blocks/magenta_cactus_crop.json new file mode 100644 index 00000000..d9cdc308 --- /dev/null +++ b/src/generated/resources/data/floralis/loot_tables/blocks/magenta_cactus_crop.json @@ -0,0 +1,329 @@ +{ + "type": "minecraft:block", + "pools": [ + { + "bonus_rolls": 0.0, + "entries": [ + { + "type": "minecraft:item", + "conditions": [ + { + "condition": "minecraft:any_of", + "terms": [ + { + "condition": "minecraft:match_tool", + "predicate": { + "items": "minecraft:shears" + } + }, + { + "condition": "minecraft:match_tool", + "predicate": { + "predicates": { + "minecraft:enchantments": [ + { + "enchantment": "minecraft:silk_touch", + "levels": { + "min": 1 + } + } + ] + } + } + } + ] + }, + { + "block": "floralis:magenta_cactus_crop", + "condition": "minecraft:block_state_property", + "properties": { + "age": "5" + } + } + ], + "name": "floralis:magenta_cactus" + } + ], + "rolls": 1.0 + }, + { + "bonus_rolls": 0.0, + "entries": [ + { + "type": "minecraft:item", + "conditions": [ + { + "condition": "minecraft:any_of", + "terms": [ + { + "condition": "minecraft:match_tool", + "predicate": { + "items": "minecraft:shears" + } + }, + { + "condition": "minecraft:match_tool", + "predicate": { + "predicates": { + "minecraft:enchantments": [ + { + "enchantment": "minecraft:silk_touch", + "levels": { + "min": 1 + } + } + ] + } + } + } + ] + }, + { + "condition": "minecraft:inverted", + "term": { + "block": "floralis:magenta_cactus_crop", + "condition": "minecraft:block_state_property", + "properties": { + "age": "5" + } + } + } + ], + "name": "floralis:magenta_cactus_seeds" + } + ], + "rolls": 1.0 + }, + { + "bonus_rolls": 0.0, + "entries": [ + { + "type": "minecraft:item", + "conditions": [ + { + "condition": "minecraft:inverted", + "term": { + "condition": "minecraft:any_of", + "terms": [ + { + "condition": "minecraft:match_tool", + "predicate": { + "items": "minecraft:shears" + } + }, + { + "condition": "minecraft:match_tool", + "predicate": { + "predicates": { + "minecraft:enchantments": [ + { + "enchantment": "minecraft:silk_touch", + "levels": { + "min": 1 + } + } + ] + } + } + } + ] + } + }, + { + "block": "floralis:magenta_cactus_crop", + "condition": "minecraft:block_state_property", + "properties": { + "age": "5" + } + } + ], + "functions": [ + { + "enchantment": "minecraft:fortune", + "formula": "minecraft:uniform_bonus_count", + "function": "minecraft:apply_bonus", + "parameters": { + "bonusMultiplier": 2 + } + }, + { + "add": false, + "count": 2.0, + "function": "minecraft:set_count" + } + ], + "name": "floralis:magenta_cactus_seeds" + } + ], + "rolls": 1.0 + }, + { + "bonus_rolls": 0.0, + "entries": [ + { + "type": "minecraft:item", + "conditions": [ + { + "condition": "minecraft:inverted", + "term": { + "condition": "minecraft:any_of", + "terms": [ + { + "condition": "minecraft:match_tool", + "predicate": { + "items": "minecraft:shears" + } + }, + { + "condition": "minecraft:match_tool", + "predicate": { + "predicates": { + "minecraft:enchantments": [ + { + "enchantment": "minecraft:silk_touch", + "levels": { + "min": 1 + } + } + ] + } + } + } + ] + } + }, + { + "block": "floralis:magenta_cactus_crop", + "condition": "minecraft:block_state_property", + "properties": { + "age": "5" + } + } + ], + "functions": [ + { + "enchantment": "minecraft:fortune", + "formula": "minecraft:uniform_bonus_count", + "function": "minecraft:apply_bonus", + "parameters": { + "bonusMultiplier": 2 + } + } + ], + "name": "floralis:magenta_petals" + } + ], + "rolls": 1.0 + }, + { + "bonus_rolls": 0.0, + "entries": [ + { + "type": "minecraft:item", + "conditions": [ + { + "condition": "minecraft:inverted", + "term": { + "condition": "minecraft:any_of", + "terms": [ + { + "condition": "minecraft:match_tool", + "predicate": { + "items": "minecraft:shears" + } + }, + { + "condition": "minecraft:match_tool", + "predicate": { + "predicates": { + "minecraft:enchantments": [ + { + "enchantment": "minecraft:silk_touch", + "levels": { + "min": 1 + } + } + ] + } + } + } + ] + } + }, + { + "block": "floralis:magenta_cactus_crop", + "condition": "minecraft:block_state_property", + "properties": { + "age": "5" + } + } + ], + "functions": [ + { + "enchantment": "minecraft:fortune", + "formula": "minecraft:uniform_bonus_count", + "function": "minecraft:apply_bonus", + "parameters": { + "bonusMultiplier": 2 + } + } + ], + "name": "floralis:plant_fibers" + } + ], + "rolls": 1.0 + }, + { + "bonus_rolls": 0.0, + "entries": [ + { + "type": "minecraft:item", + "conditions": [ + { + "condition": "minecraft:inverted", + "term": { + "condition": "minecraft:any_of", + "terms": [ + { + "condition": "minecraft:match_tool", + "predicate": { + "items": "minecraft:shears" + } + }, + { + "condition": "minecraft:match_tool", + "predicate": { + "predicates": { + "minecraft:enchantments": [ + { + "enchantment": "minecraft:silk_touch", + "levels": { + "min": 1 + } + } + ] + } + } + } + ] + } + }, + { + "condition": "minecraft:inverted", + "term": { + "block": "floralis:magenta_cactus_crop", + "condition": "minecraft:block_state_property", + "properties": { + "age": "5" + } + } + } + ], + "name": "floralis:magenta_cactus_seeds" + } + ], + "rolls": 1.0 + } + ], + "random_sequence": "floralis:blocks/magenta_cactus_crop" +} \ No newline at end of file diff --git a/src/main/resources/data/floralis/loot_tables/blocks/magenta_dye_block.json b/src/generated/resources/data/floralis/loot_tables/blocks/magenta_dye_block.json similarity index 55% rename from src/main/resources/data/floralis/loot_tables/blocks/magenta_dye_block.json rename to src/generated/resources/data/floralis/loot_tables/blocks/magenta_dye_block.json index 7992dc8f..b28249c9 100644 --- a/src/main/resources/data/floralis/loot_tables/blocks/magenta_dye_block.json +++ b/src/generated/resources/data/floralis/loot_tables/blocks/magenta_dye_block.json @@ -2,19 +2,15 @@ "type": "minecraft:block", "pools": [ { - "rolls": 1, - "bonus_rolls": 0, + "bonus_rolls": 0.0, "entries": [ { "type": "minecraft:item", "name": "floralis:magenta_dye_block" } ], - "conditions": [ - { - "condition": "minecraft:survives_explosion" - } - ] + "rolls": 1.0 } - ] + ], + "random_sequence": "floralis:blocks/magenta_dye_block" } \ No newline at end of file diff --git a/src/generated/resources/data/floralis/loot_tables/blocks/magenta_flower.json b/src/generated/resources/data/floralis/loot_tables/blocks/magenta_flower.json new file mode 100644 index 00000000..f09a101b --- /dev/null +++ b/src/generated/resources/data/floralis/loot_tables/blocks/magenta_flower.json @@ -0,0 +1,202 @@ +{ + "type": "minecraft:block", + "pools": [ + { + "bonus_rolls": 0.0, + "entries": [ + { + "type": "minecraft:item", + "conditions": [ + { + "condition": "minecraft:any_of", + "terms": [ + { + "condition": "minecraft:match_tool", + "predicate": { + "items": "minecraft:shears" + } + }, + { + "condition": "minecraft:match_tool", + "predicate": { + "predicates": { + "minecraft:enchantments": [ + { + "enchantment": "minecraft:silk_touch", + "levels": { + "min": 1 + } + } + ] + } + } + } + ] + } + ], + "name": "floralis:magenta_flower" + } + ], + "rolls": 1.0 + }, + { + "bonus_rolls": 0.0, + "entries": [ + { + "type": "minecraft:item", + "conditions": [ + { + "condition": "minecraft:inverted", + "term": { + "condition": "minecraft:any_of", + "terms": [ + { + "condition": "minecraft:match_tool", + "predicate": { + "items": "minecraft:shears" + } + }, + { + "condition": "minecraft:match_tool", + "predicate": { + "predicates": { + "minecraft:enchantments": [ + { + "enchantment": "minecraft:silk_touch", + "levels": { + "min": 1 + } + } + ] + } + } + } + ] + } + } + ], + "functions": [ + { + "enchantment": "minecraft:fortune", + "formula": "minecraft:uniform_bonus_count", + "function": "minecraft:apply_bonus", + "parameters": { + "bonusMultiplier": 2 + } + }, + { + "add": false, + "count": 2.0, + "function": "minecraft:set_count" + } + ], + "name": "floralis:magenta_flower_seeds" + } + ], + "rolls": 1.0 + }, + { + "bonus_rolls": 0.0, + "entries": [ + { + "type": "minecraft:item", + "conditions": [ + { + "condition": "minecraft:inverted", + "term": { + "condition": "minecraft:any_of", + "terms": [ + { + "condition": "minecraft:match_tool", + "predicate": { + "items": "minecraft:shears" + } + }, + { + "condition": "minecraft:match_tool", + "predicate": { + "predicates": { + "minecraft:enchantments": [ + { + "enchantment": "minecraft:silk_touch", + "levels": { + "min": 1 + } + } + ] + } + } + } + ] + } + } + ], + "functions": [ + { + "enchantment": "minecraft:fortune", + "formula": "minecraft:uniform_bonus_count", + "function": "minecraft:apply_bonus", + "parameters": { + "bonusMultiplier": 2 + } + } + ], + "name": "floralis:magenta_petals" + } + ], + "rolls": 1.0 + }, + { + "bonus_rolls": 0.0, + "entries": [ + { + "type": "minecraft:item", + "conditions": [ + { + "condition": "minecraft:inverted", + "term": { + "condition": "minecraft:any_of", + "terms": [ + { + "condition": "minecraft:match_tool", + "predicate": { + "items": "minecraft:shears" + } + }, + { + "condition": "minecraft:match_tool", + "predicate": { + "predicates": { + "minecraft:enchantments": [ + { + "enchantment": "minecraft:silk_touch", + "levels": { + "min": 1 + } + } + ] + } + } + } + ] + } + } + ], + "functions": [ + { + "enchantment": "minecraft:fortune", + "formula": "minecraft:uniform_bonus_count", + "function": "minecraft:apply_bonus", + "parameters": { + "bonusMultiplier": 2 + } + } + ], + "name": "floralis:plant_fibers" + } + ], + "rolls": 1.0 + } + ], + "random_sequence": "floralis:blocks/magenta_flower" +} \ No newline at end of file diff --git a/src/generated/resources/data/floralis/loot_tables/blocks/magenta_flower_crop.json b/src/generated/resources/data/floralis/loot_tables/blocks/magenta_flower_crop.json new file mode 100644 index 00000000..24948882 --- /dev/null +++ b/src/generated/resources/data/floralis/loot_tables/blocks/magenta_flower_crop.json @@ -0,0 +1,329 @@ +{ + "type": "minecraft:block", + "pools": [ + { + "bonus_rolls": 0.0, + "entries": [ + { + "type": "minecraft:item", + "conditions": [ + { + "condition": "minecraft:any_of", + "terms": [ + { + "condition": "minecraft:match_tool", + "predicate": { + "items": "minecraft:shears" + } + }, + { + "condition": "minecraft:match_tool", + "predicate": { + "predicates": { + "minecraft:enchantments": [ + { + "enchantment": "minecraft:silk_touch", + "levels": { + "min": 1 + } + } + ] + } + } + } + ] + }, + { + "block": "floralis:magenta_flower_crop", + "condition": "minecraft:block_state_property", + "properties": { + "age": "5" + } + } + ], + "name": "floralis:magenta_flower" + } + ], + "rolls": 1.0 + }, + { + "bonus_rolls": 0.0, + "entries": [ + { + "type": "minecraft:item", + "conditions": [ + { + "condition": "minecraft:any_of", + "terms": [ + { + "condition": "minecraft:match_tool", + "predicate": { + "items": "minecraft:shears" + } + }, + { + "condition": "minecraft:match_tool", + "predicate": { + "predicates": { + "minecraft:enchantments": [ + { + "enchantment": "minecraft:silk_touch", + "levels": { + "min": 1 + } + } + ] + } + } + } + ] + }, + { + "condition": "minecraft:inverted", + "term": { + "block": "floralis:magenta_flower_crop", + "condition": "minecraft:block_state_property", + "properties": { + "age": "5" + } + } + } + ], + "name": "floralis:magenta_flower_seeds" + } + ], + "rolls": 1.0 + }, + { + "bonus_rolls": 0.0, + "entries": [ + { + "type": "minecraft:item", + "conditions": [ + { + "condition": "minecraft:inverted", + "term": { + "condition": "minecraft:any_of", + "terms": [ + { + "condition": "minecraft:match_tool", + "predicate": { + "items": "minecraft:shears" + } + }, + { + "condition": "minecraft:match_tool", + "predicate": { + "predicates": { + "minecraft:enchantments": [ + { + "enchantment": "minecraft:silk_touch", + "levels": { + "min": 1 + } + } + ] + } + } + } + ] + } + }, + { + "block": "floralis:magenta_flower_crop", + "condition": "minecraft:block_state_property", + "properties": { + "age": "5" + } + } + ], + "functions": [ + { + "enchantment": "minecraft:fortune", + "formula": "minecraft:uniform_bonus_count", + "function": "minecraft:apply_bonus", + "parameters": { + "bonusMultiplier": 2 + } + }, + { + "add": false, + "count": 2.0, + "function": "minecraft:set_count" + } + ], + "name": "floralis:magenta_flower_seeds" + } + ], + "rolls": 1.0 + }, + { + "bonus_rolls": 0.0, + "entries": [ + { + "type": "minecraft:item", + "conditions": [ + { + "condition": "minecraft:inverted", + "term": { + "condition": "minecraft:any_of", + "terms": [ + { + "condition": "minecraft:match_tool", + "predicate": { + "items": "minecraft:shears" + } + }, + { + "condition": "minecraft:match_tool", + "predicate": { + "predicates": { + "minecraft:enchantments": [ + { + "enchantment": "minecraft:silk_touch", + "levels": { + "min": 1 + } + } + ] + } + } + } + ] + } + }, + { + "block": "floralis:magenta_flower_crop", + "condition": "minecraft:block_state_property", + "properties": { + "age": "5" + } + } + ], + "functions": [ + { + "enchantment": "minecraft:fortune", + "formula": "minecraft:uniform_bonus_count", + "function": "minecraft:apply_bonus", + "parameters": { + "bonusMultiplier": 2 + } + } + ], + "name": "floralis:magenta_petals" + } + ], + "rolls": 1.0 + }, + { + "bonus_rolls": 0.0, + "entries": [ + { + "type": "minecraft:item", + "conditions": [ + { + "condition": "minecraft:inverted", + "term": { + "condition": "minecraft:any_of", + "terms": [ + { + "condition": "minecraft:match_tool", + "predicate": { + "items": "minecraft:shears" + } + }, + { + "condition": "minecraft:match_tool", + "predicate": { + "predicates": { + "minecraft:enchantments": [ + { + "enchantment": "minecraft:silk_touch", + "levels": { + "min": 1 + } + } + ] + } + } + } + ] + } + }, + { + "block": "floralis:magenta_flower_crop", + "condition": "minecraft:block_state_property", + "properties": { + "age": "5" + } + } + ], + "functions": [ + { + "enchantment": "minecraft:fortune", + "formula": "minecraft:uniform_bonus_count", + "function": "minecraft:apply_bonus", + "parameters": { + "bonusMultiplier": 2 + } + } + ], + "name": "floralis:plant_fibers" + } + ], + "rolls": 1.0 + }, + { + "bonus_rolls": 0.0, + "entries": [ + { + "type": "minecraft:item", + "conditions": [ + { + "condition": "minecraft:inverted", + "term": { + "condition": "minecraft:any_of", + "terms": [ + { + "condition": "minecraft:match_tool", + "predicate": { + "items": "minecraft:shears" + } + }, + { + "condition": "minecraft:match_tool", + "predicate": { + "predicates": { + "minecraft:enchantments": [ + { + "enchantment": "minecraft:silk_touch", + "levels": { + "min": 1 + } + } + ] + } + } + } + ] + } + }, + { + "condition": "minecraft:inverted", + "term": { + "block": "floralis:magenta_flower_crop", + "condition": "minecraft:block_state_property", + "properties": { + "age": "5" + } + } + } + ], + "name": "floralis:magenta_flower_seeds" + } + ], + "rolls": 1.0 + } + ], + "random_sequence": "floralis:blocks/magenta_flower_crop" +} \ No newline at end of file diff --git a/src/generated/resources/data/floralis/loot_tables/blocks/orange_cactus.json b/src/generated/resources/data/floralis/loot_tables/blocks/orange_cactus.json new file mode 100644 index 00000000..8baf73ba --- /dev/null +++ b/src/generated/resources/data/floralis/loot_tables/blocks/orange_cactus.json @@ -0,0 +1,202 @@ +{ + "type": "minecraft:block", + "pools": [ + { + "bonus_rolls": 0.0, + "entries": [ + { + "type": "minecraft:item", + "conditions": [ + { + "condition": "minecraft:any_of", + "terms": [ + { + "condition": "minecraft:match_tool", + "predicate": { + "items": "minecraft:shears" + } + }, + { + "condition": "minecraft:match_tool", + "predicate": { + "predicates": { + "minecraft:enchantments": [ + { + "enchantment": "minecraft:silk_touch", + "levels": { + "min": 1 + } + } + ] + } + } + } + ] + } + ], + "name": "floralis:orange_cactus" + } + ], + "rolls": 1.0 + }, + { + "bonus_rolls": 0.0, + "entries": [ + { + "type": "minecraft:item", + "conditions": [ + { + "condition": "minecraft:inverted", + "term": { + "condition": "minecraft:any_of", + "terms": [ + { + "condition": "minecraft:match_tool", + "predicate": { + "items": "minecraft:shears" + } + }, + { + "condition": "minecraft:match_tool", + "predicate": { + "predicates": { + "minecraft:enchantments": [ + { + "enchantment": "minecraft:silk_touch", + "levels": { + "min": 1 + } + } + ] + } + } + } + ] + } + } + ], + "functions": [ + { + "enchantment": "minecraft:fortune", + "formula": "minecraft:uniform_bonus_count", + "function": "minecraft:apply_bonus", + "parameters": { + "bonusMultiplier": 2 + } + }, + { + "add": false, + "count": 2.0, + "function": "minecraft:set_count" + } + ], + "name": "floralis:orange_cactus_seeds" + } + ], + "rolls": 1.0 + }, + { + "bonus_rolls": 0.0, + "entries": [ + { + "type": "minecraft:item", + "conditions": [ + { + "condition": "minecraft:inverted", + "term": { + "condition": "minecraft:any_of", + "terms": [ + { + "condition": "minecraft:match_tool", + "predicate": { + "items": "minecraft:shears" + } + }, + { + "condition": "minecraft:match_tool", + "predicate": { + "predicates": { + "minecraft:enchantments": [ + { + "enchantment": "minecraft:silk_touch", + "levels": { + "min": 1 + } + } + ] + } + } + } + ] + } + } + ], + "functions": [ + { + "enchantment": "minecraft:fortune", + "formula": "minecraft:uniform_bonus_count", + "function": "minecraft:apply_bonus", + "parameters": { + "bonusMultiplier": 2 + } + } + ], + "name": "floralis:orange_petals" + } + ], + "rolls": 1.0 + }, + { + "bonus_rolls": 0.0, + "entries": [ + { + "type": "minecraft:item", + "conditions": [ + { + "condition": "minecraft:inverted", + "term": { + "condition": "minecraft:any_of", + "terms": [ + { + "condition": "minecraft:match_tool", + "predicate": { + "items": "minecraft:shears" + } + }, + { + "condition": "minecraft:match_tool", + "predicate": { + "predicates": { + "minecraft:enchantments": [ + { + "enchantment": "minecraft:silk_touch", + "levels": { + "min": 1 + } + } + ] + } + } + } + ] + } + } + ], + "functions": [ + { + "enchantment": "minecraft:fortune", + "formula": "minecraft:uniform_bonus_count", + "function": "minecraft:apply_bonus", + "parameters": { + "bonusMultiplier": 2 + } + } + ], + "name": "floralis:plant_fibers" + } + ], + "rolls": 1.0 + } + ], + "random_sequence": "floralis:blocks/orange_cactus" +} \ No newline at end of file diff --git a/src/generated/resources/data/floralis/loot_tables/blocks/orange_cactus_crop.json b/src/generated/resources/data/floralis/loot_tables/blocks/orange_cactus_crop.json new file mode 100644 index 00000000..b1c58752 --- /dev/null +++ b/src/generated/resources/data/floralis/loot_tables/blocks/orange_cactus_crop.json @@ -0,0 +1,329 @@ +{ + "type": "minecraft:block", + "pools": [ + { + "bonus_rolls": 0.0, + "entries": [ + { + "type": "minecraft:item", + "conditions": [ + { + "condition": "minecraft:any_of", + "terms": [ + { + "condition": "minecraft:match_tool", + "predicate": { + "items": "minecraft:shears" + } + }, + { + "condition": "minecraft:match_tool", + "predicate": { + "predicates": { + "minecraft:enchantments": [ + { + "enchantment": "minecraft:silk_touch", + "levels": { + "min": 1 + } + } + ] + } + } + } + ] + }, + { + "block": "floralis:orange_cactus_crop", + "condition": "minecraft:block_state_property", + "properties": { + "age": "5" + } + } + ], + "name": "floralis:orange_cactus" + } + ], + "rolls": 1.0 + }, + { + "bonus_rolls": 0.0, + "entries": [ + { + "type": "minecraft:item", + "conditions": [ + { + "condition": "minecraft:any_of", + "terms": [ + { + "condition": "minecraft:match_tool", + "predicate": { + "items": "minecraft:shears" + } + }, + { + "condition": "minecraft:match_tool", + "predicate": { + "predicates": { + "minecraft:enchantments": [ + { + "enchantment": "minecraft:silk_touch", + "levels": { + "min": 1 + } + } + ] + } + } + } + ] + }, + { + "condition": "minecraft:inverted", + "term": { + "block": "floralis:orange_cactus_crop", + "condition": "minecraft:block_state_property", + "properties": { + "age": "5" + } + } + } + ], + "name": "floralis:orange_cactus_seeds" + } + ], + "rolls": 1.0 + }, + { + "bonus_rolls": 0.0, + "entries": [ + { + "type": "minecraft:item", + "conditions": [ + { + "condition": "minecraft:inverted", + "term": { + "condition": "minecraft:any_of", + "terms": [ + { + "condition": "minecraft:match_tool", + "predicate": { + "items": "minecraft:shears" + } + }, + { + "condition": "minecraft:match_tool", + "predicate": { + "predicates": { + "minecraft:enchantments": [ + { + "enchantment": "minecraft:silk_touch", + "levels": { + "min": 1 + } + } + ] + } + } + } + ] + } + }, + { + "block": "floralis:orange_cactus_crop", + "condition": "minecraft:block_state_property", + "properties": { + "age": "5" + } + } + ], + "functions": [ + { + "enchantment": "minecraft:fortune", + "formula": "minecraft:uniform_bonus_count", + "function": "minecraft:apply_bonus", + "parameters": { + "bonusMultiplier": 2 + } + }, + { + "add": false, + "count": 2.0, + "function": "minecraft:set_count" + } + ], + "name": "floralis:orange_cactus_seeds" + } + ], + "rolls": 1.0 + }, + { + "bonus_rolls": 0.0, + "entries": [ + { + "type": "minecraft:item", + "conditions": [ + { + "condition": "minecraft:inverted", + "term": { + "condition": "minecraft:any_of", + "terms": [ + { + "condition": "minecraft:match_tool", + "predicate": { + "items": "minecraft:shears" + } + }, + { + "condition": "minecraft:match_tool", + "predicate": { + "predicates": { + "minecraft:enchantments": [ + { + "enchantment": "minecraft:silk_touch", + "levels": { + "min": 1 + } + } + ] + } + } + } + ] + } + }, + { + "block": "floralis:orange_cactus_crop", + "condition": "minecraft:block_state_property", + "properties": { + "age": "5" + } + } + ], + "functions": [ + { + "enchantment": "minecraft:fortune", + "formula": "minecraft:uniform_bonus_count", + "function": "minecraft:apply_bonus", + "parameters": { + "bonusMultiplier": 2 + } + } + ], + "name": "floralis:orange_petals" + } + ], + "rolls": 1.0 + }, + { + "bonus_rolls": 0.0, + "entries": [ + { + "type": "minecraft:item", + "conditions": [ + { + "condition": "minecraft:inverted", + "term": { + "condition": "minecraft:any_of", + "terms": [ + { + "condition": "minecraft:match_tool", + "predicate": { + "items": "minecraft:shears" + } + }, + { + "condition": "minecraft:match_tool", + "predicate": { + "predicates": { + "minecraft:enchantments": [ + { + "enchantment": "minecraft:silk_touch", + "levels": { + "min": 1 + } + } + ] + } + } + } + ] + } + }, + { + "block": "floralis:orange_cactus_crop", + "condition": "minecraft:block_state_property", + "properties": { + "age": "5" + } + } + ], + "functions": [ + { + "enchantment": "minecraft:fortune", + "formula": "minecraft:uniform_bonus_count", + "function": "minecraft:apply_bonus", + "parameters": { + "bonusMultiplier": 2 + } + } + ], + "name": "floralis:plant_fibers" + } + ], + "rolls": 1.0 + }, + { + "bonus_rolls": 0.0, + "entries": [ + { + "type": "minecraft:item", + "conditions": [ + { + "condition": "minecraft:inverted", + "term": { + "condition": "minecraft:any_of", + "terms": [ + { + "condition": "minecraft:match_tool", + "predicate": { + "items": "minecraft:shears" + } + }, + { + "condition": "minecraft:match_tool", + "predicate": { + "predicates": { + "minecraft:enchantments": [ + { + "enchantment": "minecraft:silk_touch", + "levels": { + "min": 1 + } + } + ] + } + } + } + ] + } + }, + { + "condition": "minecraft:inverted", + "term": { + "block": "floralis:orange_cactus_crop", + "condition": "minecraft:block_state_property", + "properties": { + "age": "5" + } + } + } + ], + "name": "floralis:orange_cactus_seeds" + } + ], + "rolls": 1.0 + } + ], + "random_sequence": "floralis:blocks/orange_cactus_crop" +} \ No newline at end of file diff --git a/src/main/resources/data/floralis/loot_tables/blocks/orange_dye_block.json b/src/generated/resources/data/floralis/loot_tables/blocks/orange_dye_block.json similarity index 55% rename from src/main/resources/data/floralis/loot_tables/blocks/orange_dye_block.json rename to src/generated/resources/data/floralis/loot_tables/blocks/orange_dye_block.json index 8a415581..451d4a69 100644 --- a/src/main/resources/data/floralis/loot_tables/blocks/orange_dye_block.json +++ b/src/generated/resources/data/floralis/loot_tables/blocks/orange_dye_block.json @@ -2,19 +2,15 @@ "type": "minecraft:block", "pools": [ { - "rolls": 1, - "bonus_rolls": 0, + "bonus_rolls": 0.0, "entries": [ { "type": "minecraft:item", "name": "floralis:orange_dye_block" } ], - "conditions": [ - { - "condition": "minecraft:survives_explosion" - } - ] + "rolls": 1.0 } - ] + ], + "random_sequence": "floralis:blocks/orange_dye_block" } \ No newline at end of file diff --git a/src/generated/resources/data/floralis/loot_tables/blocks/orange_flower.json b/src/generated/resources/data/floralis/loot_tables/blocks/orange_flower.json new file mode 100644 index 00000000..289ba9bc --- /dev/null +++ b/src/generated/resources/data/floralis/loot_tables/blocks/orange_flower.json @@ -0,0 +1,202 @@ +{ + "type": "minecraft:block", + "pools": [ + { + "bonus_rolls": 0.0, + "entries": [ + { + "type": "minecraft:item", + "conditions": [ + { + "condition": "minecraft:any_of", + "terms": [ + { + "condition": "minecraft:match_tool", + "predicate": { + "items": "minecraft:shears" + } + }, + { + "condition": "minecraft:match_tool", + "predicate": { + "predicates": { + "minecraft:enchantments": [ + { + "enchantment": "minecraft:silk_touch", + "levels": { + "min": 1 + } + } + ] + } + } + } + ] + } + ], + "name": "floralis:orange_flower" + } + ], + "rolls": 1.0 + }, + { + "bonus_rolls": 0.0, + "entries": [ + { + "type": "minecraft:item", + "conditions": [ + { + "condition": "minecraft:inverted", + "term": { + "condition": "minecraft:any_of", + "terms": [ + { + "condition": "minecraft:match_tool", + "predicate": { + "items": "minecraft:shears" + } + }, + { + "condition": "minecraft:match_tool", + "predicate": { + "predicates": { + "minecraft:enchantments": [ + { + "enchantment": "minecraft:silk_touch", + "levels": { + "min": 1 + } + } + ] + } + } + } + ] + } + } + ], + "functions": [ + { + "enchantment": "minecraft:fortune", + "formula": "minecraft:uniform_bonus_count", + "function": "minecraft:apply_bonus", + "parameters": { + "bonusMultiplier": 2 + } + }, + { + "add": false, + "count": 2.0, + "function": "minecraft:set_count" + } + ], + "name": "floralis:orange_flower_seeds" + } + ], + "rolls": 1.0 + }, + { + "bonus_rolls": 0.0, + "entries": [ + { + "type": "minecraft:item", + "conditions": [ + { + "condition": "minecraft:inverted", + "term": { + "condition": "minecraft:any_of", + "terms": [ + { + "condition": "minecraft:match_tool", + "predicate": { + "items": "minecraft:shears" + } + }, + { + "condition": "minecraft:match_tool", + "predicate": { + "predicates": { + "minecraft:enchantments": [ + { + "enchantment": "minecraft:silk_touch", + "levels": { + "min": 1 + } + } + ] + } + } + } + ] + } + } + ], + "functions": [ + { + "enchantment": "minecraft:fortune", + "formula": "minecraft:uniform_bonus_count", + "function": "minecraft:apply_bonus", + "parameters": { + "bonusMultiplier": 2 + } + } + ], + "name": "floralis:orange_petals" + } + ], + "rolls": 1.0 + }, + { + "bonus_rolls": 0.0, + "entries": [ + { + "type": "minecraft:item", + "conditions": [ + { + "condition": "minecraft:inverted", + "term": { + "condition": "minecraft:any_of", + "terms": [ + { + "condition": "minecraft:match_tool", + "predicate": { + "items": "minecraft:shears" + } + }, + { + "condition": "minecraft:match_tool", + "predicate": { + "predicates": { + "minecraft:enchantments": [ + { + "enchantment": "minecraft:silk_touch", + "levels": { + "min": 1 + } + } + ] + } + } + } + ] + } + } + ], + "functions": [ + { + "enchantment": "minecraft:fortune", + "formula": "minecraft:uniform_bonus_count", + "function": "minecraft:apply_bonus", + "parameters": { + "bonusMultiplier": 2 + } + } + ], + "name": "floralis:plant_fibers" + } + ], + "rolls": 1.0 + } + ], + "random_sequence": "floralis:blocks/orange_flower" +} \ No newline at end of file diff --git a/src/generated/resources/data/floralis/loot_tables/blocks/orange_flower_crop.json b/src/generated/resources/data/floralis/loot_tables/blocks/orange_flower_crop.json new file mode 100644 index 00000000..78c98bfc --- /dev/null +++ b/src/generated/resources/data/floralis/loot_tables/blocks/orange_flower_crop.json @@ -0,0 +1,329 @@ +{ + "type": "minecraft:block", + "pools": [ + { + "bonus_rolls": 0.0, + "entries": [ + { + "type": "minecraft:item", + "conditions": [ + { + "condition": "minecraft:any_of", + "terms": [ + { + "condition": "minecraft:match_tool", + "predicate": { + "items": "minecraft:shears" + } + }, + { + "condition": "minecraft:match_tool", + "predicate": { + "predicates": { + "minecraft:enchantments": [ + { + "enchantment": "minecraft:silk_touch", + "levels": { + "min": 1 + } + } + ] + } + } + } + ] + }, + { + "block": "floralis:orange_flower_crop", + "condition": "minecraft:block_state_property", + "properties": { + "age": "5" + } + } + ], + "name": "floralis:orange_flower" + } + ], + "rolls": 1.0 + }, + { + "bonus_rolls": 0.0, + "entries": [ + { + "type": "minecraft:item", + "conditions": [ + { + "condition": "minecraft:any_of", + "terms": [ + { + "condition": "minecraft:match_tool", + "predicate": { + "items": "minecraft:shears" + } + }, + { + "condition": "minecraft:match_tool", + "predicate": { + "predicates": { + "minecraft:enchantments": [ + { + "enchantment": "minecraft:silk_touch", + "levels": { + "min": 1 + } + } + ] + } + } + } + ] + }, + { + "condition": "minecraft:inverted", + "term": { + "block": "floralis:orange_flower_crop", + "condition": "minecraft:block_state_property", + "properties": { + "age": "5" + } + } + } + ], + "name": "floralis:orange_flower_seeds" + } + ], + "rolls": 1.0 + }, + { + "bonus_rolls": 0.0, + "entries": [ + { + "type": "minecraft:item", + "conditions": [ + { + "condition": "minecraft:inverted", + "term": { + "condition": "minecraft:any_of", + "terms": [ + { + "condition": "minecraft:match_tool", + "predicate": { + "items": "minecraft:shears" + } + }, + { + "condition": "minecraft:match_tool", + "predicate": { + "predicates": { + "minecraft:enchantments": [ + { + "enchantment": "minecraft:silk_touch", + "levels": { + "min": 1 + } + } + ] + } + } + } + ] + } + }, + { + "block": "floralis:orange_flower_crop", + "condition": "minecraft:block_state_property", + "properties": { + "age": "5" + } + } + ], + "functions": [ + { + "enchantment": "minecraft:fortune", + "formula": "minecraft:uniform_bonus_count", + "function": "minecraft:apply_bonus", + "parameters": { + "bonusMultiplier": 2 + } + }, + { + "add": false, + "count": 2.0, + "function": "minecraft:set_count" + } + ], + "name": "floralis:orange_flower_seeds" + } + ], + "rolls": 1.0 + }, + { + "bonus_rolls": 0.0, + "entries": [ + { + "type": "minecraft:item", + "conditions": [ + { + "condition": "minecraft:inverted", + "term": { + "condition": "minecraft:any_of", + "terms": [ + { + "condition": "minecraft:match_tool", + "predicate": { + "items": "minecraft:shears" + } + }, + { + "condition": "minecraft:match_tool", + "predicate": { + "predicates": { + "minecraft:enchantments": [ + { + "enchantment": "minecraft:silk_touch", + "levels": { + "min": 1 + } + } + ] + } + } + } + ] + } + }, + { + "block": "floralis:orange_flower_crop", + "condition": "minecraft:block_state_property", + "properties": { + "age": "5" + } + } + ], + "functions": [ + { + "enchantment": "minecraft:fortune", + "formula": "minecraft:uniform_bonus_count", + "function": "minecraft:apply_bonus", + "parameters": { + "bonusMultiplier": 2 + } + } + ], + "name": "floralis:orange_petals" + } + ], + "rolls": 1.0 + }, + { + "bonus_rolls": 0.0, + "entries": [ + { + "type": "minecraft:item", + "conditions": [ + { + "condition": "minecraft:inverted", + "term": { + "condition": "minecraft:any_of", + "terms": [ + { + "condition": "minecraft:match_tool", + "predicate": { + "items": "minecraft:shears" + } + }, + { + "condition": "minecraft:match_tool", + "predicate": { + "predicates": { + "minecraft:enchantments": [ + { + "enchantment": "minecraft:silk_touch", + "levels": { + "min": 1 + } + } + ] + } + } + } + ] + } + }, + { + "block": "floralis:orange_flower_crop", + "condition": "minecraft:block_state_property", + "properties": { + "age": "5" + } + } + ], + "functions": [ + { + "enchantment": "minecraft:fortune", + "formula": "minecraft:uniform_bonus_count", + "function": "minecraft:apply_bonus", + "parameters": { + "bonusMultiplier": 2 + } + } + ], + "name": "floralis:plant_fibers" + } + ], + "rolls": 1.0 + }, + { + "bonus_rolls": 0.0, + "entries": [ + { + "type": "minecraft:item", + "conditions": [ + { + "condition": "minecraft:inverted", + "term": { + "condition": "minecraft:any_of", + "terms": [ + { + "condition": "minecraft:match_tool", + "predicate": { + "items": "minecraft:shears" + } + }, + { + "condition": "minecraft:match_tool", + "predicate": { + "predicates": { + "minecraft:enchantments": [ + { + "enchantment": "minecraft:silk_touch", + "levels": { + "min": 1 + } + } + ] + } + } + } + ] + } + }, + { + "condition": "minecraft:inverted", + "term": { + "block": "floralis:orange_flower_crop", + "condition": "minecraft:block_state_property", + "properties": { + "age": "5" + } + } + } + ], + "name": "floralis:orange_flower_seeds" + } + ], + "rolls": 1.0 + } + ], + "random_sequence": "floralis:blocks/orange_flower_crop" +} \ No newline at end of file diff --git a/src/generated/resources/data/floralis/loot_tables/blocks/pink_cactus.json b/src/generated/resources/data/floralis/loot_tables/blocks/pink_cactus.json new file mode 100644 index 00000000..c84d92d6 --- /dev/null +++ b/src/generated/resources/data/floralis/loot_tables/blocks/pink_cactus.json @@ -0,0 +1,202 @@ +{ + "type": "minecraft:block", + "pools": [ + { + "bonus_rolls": 0.0, + "entries": [ + { + "type": "minecraft:item", + "conditions": [ + { + "condition": "minecraft:any_of", + "terms": [ + { + "condition": "minecraft:match_tool", + "predicate": { + "items": "minecraft:shears" + } + }, + { + "condition": "minecraft:match_tool", + "predicate": { + "predicates": { + "minecraft:enchantments": [ + { + "enchantment": "minecraft:silk_touch", + "levels": { + "min": 1 + } + } + ] + } + } + } + ] + } + ], + "name": "floralis:pink_cactus" + } + ], + "rolls": 1.0 + }, + { + "bonus_rolls": 0.0, + "entries": [ + { + "type": "minecraft:item", + "conditions": [ + { + "condition": "minecraft:inverted", + "term": { + "condition": "minecraft:any_of", + "terms": [ + { + "condition": "minecraft:match_tool", + "predicate": { + "items": "minecraft:shears" + } + }, + { + "condition": "minecraft:match_tool", + "predicate": { + "predicates": { + "minecraft:enchantments": [ + { + "enchantment": "minecraft:silk_touch", + "levels": { + "min": 1 + } + } + ] + } + } + } + ] + } + } + ], + "functions": [ + { + "enchantment": "minecraft:fortune", + "formula": "minecraft:uniform_bonus_count", + "function": "minecraft:apply_bonus", + "parameters": { + "bonusMultiplier": 2 + } + }, + { + "add": false, + "count": 2.0, + "function": "minecraft:set_count" + } + ], + "name": "floralis:pink_cactus_seeds" + } + ], + "rolls": 1.0 + }, + { + "bonus_rolls": 0.0, + "entries": [ + { + "type": "minecraft:item", + "conditions": [ + { + "condition": "minecraft:inverted", + "term": { + "condition": "minecraft:any_of", + "terms": [ + { + "condition": "minecraft:match_tool", + "predicate": { + "items": "minecraft:shears" + } + }, + { + "condition": "minecraft:match_tool", + "predicate": { + "predicates": { + "minecraft:enchantments": [ + { + "enchantment": "minecraft:silk_touch", + "levels": { + "min": 1 + } + } + ] + } + } + } + ] + } + } + ], + "functions": [ + { + "enchantment": "minecraft:fortune", + "formula": "minecraft:uniform_bonus_count", + "function": "minecraft:apply_bonus", + "parameters": { + "bonusMultiplier": 2 + } + } + ], + "name": "floralis:pink_petals" + } + ], + "rolls": 1.0 + }, + { + "bonus_rolls": 0.0, + "entries": [ + { + "type": "minecraft:item", + "conditions": [ + { + "condition": "minecraft:inverted", + "term": { + "condition": "minecraft:any_of", + "terms": [ + { + "condition": "minecraft:match_tool", + "predicate": { + "items": "minecraft:shears" + } + }, + { + "condition": "minecraft:match_tool", + "predicate": { + "predicates": { + "minecraft:enchantments": [ + { + "enchantment": "minecraft:silk_touch", + "levels": { + "min": 1 + } + } + ] + } + } + } + ] + } + } + ], + "functions": [ + { + "enchantment": "minecraft:fortune", + "formula": "minecraft:uniform_bonus_count", + "function": "minecraft:apply_bonus", + "parameters": { + "bonusMultiplier": 2 + } + } + ], + "name": "floralis:plant_fibers" + } + ], + "rolls": 1.0 + } + ], + "random_sequence": "floralis:blocks/pink_cactus" +} \ No newline at end of file diff --git a/src/generated/resources/data/floralis/loot_tables/blocks/pink_cactus_crop.json b/src/generated/resources/data/floralis/loot_tables/blocks/pink_cactus_crop.json new file mode 100644 index 00000000..981c4ccb --- /dev/null +++ b/src/generated/resources/data/floralis/loot_tables/blocks/pink_cactus_crop.json @@ -0,0 +1,329 @@ +{ + "type": "minecraft:block", + "pools": [ + { + "bonus_rolls": 0.0, + "entries": [ + { + "type": "minecraft:item", + "conditions": [ + { + "condition": "minecraft:any_of", + "terms": [ + { + "condition": "minecraft:match_tool", + "predicate": { + "items": "minecraft:shears" + } + }, + { + "condition": "minecraft:match_tool", + "predicate": { + "predicates": { + "minecraft:enchantments": [ + { + "enchantment": "minecraft:silk_touch", + "levels": { + "min": 1 + } + } + ] + } + } + } + ] + }, + { + "block": "floralis:pink_cactus_crop", + "condition": "minecraft:block_state_property", + "properties": { + "age": "5" + } + } + ], + "name": "floralis:pink_cactus" + } + ], + "rolls": 1.0 + }, + { + "bonus_rolls": 0.0, + "entries": [ + { + "type": "minecraft:item", + "conditions": [ + { + "condition": "minecraft:any_of", + "terms": [ + { + "condition": "minecraft:match_tool", + "predicate": { + "items": "minecraft:shears" + } + }, + { + "condition": "minecraft:match_tool", + "predicate": { + "predicates": { + "minecraft:enchantments": [ + { + "enchantment": "minecraft:silk_touch", + "levels": { + "min": 1 + } + } + ] + } + } + } + ] + }, + { + "condition": "minecraft:inverted", + "term": { + "block": "floralis:pink_cactus_crop", + "condition": "minecraft:block_state_property", + "properties": { + "age": "5" + } + } + } + ], + "name": "floralis:pink_cactus_seeds" + } + ], + "rolls": 1.0 + }, + { + "bonus_rolls": 0.0, + "entries": [ + { + "type": "minecraft:item", + "conditions": [ + { + "condition": "minecraft:inverted", + "term": { + "condition": "minecraft:any_of", + "terms": [ + { + "condition": "minecraft:match_tool", + "predicate": { + "items": "minecraft:shears" + } + }, + { + "condition": "minecraft:match_tool", + "predicate": { + "predicates": { + "minecraft:enchantments": [ + { + "enchantment": "minecraft:silk_touch", + "levels": { + "min": 1 + } + } + ] + } + } + } + ] + } + }, + { + "block": "floralis:pink_cactus_crop", + "condition": "minecraft:block_state_property", + "properties": { + "age": "5" + } + } + ], + "functions": [ + { + "enchantment": "minecraft:fortune", + "formula": "minecraft:uniform_bonus_count", + "function": "minecraft:apply_bonus", + "parameters": { + "bonusMultiplier": 2 + } + }, + { + "add": false, + "count": 2.0, + "function": "minecraft:set_count" + } + ], + "name": "floralis:pink_cactus_seeds" + } + ], + "rolls": 1.0 + }, + { + "bonus_rolls": 0.0, + "entries": [ + { + "type": "minecraft:item", + "conditions": [ + { + "condition": "minecraft:inverted", + "term": { + "condition": "minecraft:any_of", + "terms": [ + { + "condition": "minecraft:match_tool", + "predicate": { + "items": "minecraft:shears" + } + }, + { + "condition": "minecraft:match_tool", + "predicate": { + "predicates": { + "minecraft:enchantments": [ + { + "enchantment": "minecraft:silk_touch", + "levels": { + "min": 1 + } + } + ] + } + } + } + ] + } + }, + { + "block": "floralis:pink_cactus_crop", + "condition": "minecraft:block_state_property", + "properties": { + "age": "5" + } + } + ], + "functions": [ + { + "enchantment": "minecraft:fortune", + "formula": "minecraft:uniform_bonus_count", + "function": "minecraft:apply_bonus", + "parameters": { + "bonusMultiplier": 2 + } + } + ], + "name": "floralis:pink_petals" + } + ], + "rolls": 1.0 + }, + { + "bonus_rolls": 0.0, + "entries": [ + { + "type": "minecraft:item", + "conditions": [ + { + "condition": "minecraft:inverted", + "term": { + "condition": "minecraft:any_of", + "terms": [ + { + "condition": "minecraft:match_tool", + "predicate": { + "items": "minecraft:shears" + } + }, + { + "condition": "minecraft:match_tool", + "predicate": { + "predicates": { + "minecraft:enchantments": [ + { + "enchantment": "minecraft:silk_touch", + "levels": { + "min": 1 + } + } + ] + } + } + } + ] + } + }, + { + "block": "floralis:pink_cactus_crop", + "condition": "minecraft:block_state_property", + "properties": { + "age": "5" + } + } + ], + "functions": [ + { + "enchantment": "minecraft:fortune", + "formula": "minecraft:uniform_bonus_count", + "function": "minecraft:apply_bonus", + "parameters": { + "bonusMultiplier": 2 + } + } + ], + "name": "floralis:plant_fibers" + } + ], + "rolls": 1.0 + }, + { + "bonus_rolls": 0.0, + "entries": [ + { + "type": "minecraft:item", + "conditions": [ + { + "condition": "minecraft:inverted", + "term": { + "condition": "minecraft:any_of", + "terms": [ + { + "condition": "minecraft:match_tool", + "predicate": { + "items": "minecraft:shears" + } + }, + { + "condition": "minecraft:match_tool", + "predicate": { + "predicates": { + "minecraft:enchantments": [ + { + "enchantment": "minecraft:silk_touch", + "levels": { + "min": 1 + } + } + ] + } + } + } + ] + } + }, + { + "condition": "minecraft:inverted", + "term": { + "block": "floralis:pink_cactus_crop", + "condition": "minecraft:block_state_property", + "properties": { + "age": "5" + } + } + } + ], + "name": "floralis:pink_cactus_seeds" + } + ], + "rolls": 1.0 + } + ], + "random_sequence": "floralis:blocks/pink_cactus_crop" +} \ No newline at end of file diff --git a/src/main/resources/data/floralis/loot_tables/blocks/pink_dye_block.json b/src/generated/resources/data/floralis/loot_tables/blocks/pink_dye_block.json similarity index 55% rename from src/main/resources/data/floralis/loot_tables/blocks/pink_dye_block.json rename to src/generated/resources/data/floralis/loot_tables/blocks/pink_dye_block.json index 7879daa7..f0ea9413 100644 --- a/src/main/resources/data/floralis/loot_tables/blocks/pink_dye_block.json +++ b/src/generated/resources/data/floralis/loot_tables/blocks/pink_dye_block.json @@ -2,19 +2,15 @@ "type": "minecraft:block", "pools": [ { - "rolls": 1, - "bonus_rolls": 0, + "bonus_rolls": 0.0, "entries": [ { "type": "minecraft:item", "name": "floralis:pink_dye_block" } ], - "conditions": [ - { - "condition": "minecraft:survives_explosion" - } - ] + "rolls": 1.0 } - ] + ], + "random_sequence": "floralis:blocks/pink_dye_block" } \ No newline at end of file diff --git a/src/generated/resources/data/floralis/loot_tables/blocks/pink_flower.json b/src/generated/resources/data/floralis/loot_tables/blocks/pink_flower.json new file mode 100644 index 00000000..80085f6d --- /dev/null +++ b/src/generated/resources/data/floralis/loot_tables/blocks/pink_flower.json @@ -0,0 +1,202 @@ +{ + "type": "minecraft:block", + "pools": [ + { + "bonus_rolls": 0.0, + "entries": [ + { + "type": "minecraft:item", + "conditions": [ + { + "condition": "minecraft:any_of", + "terms": [ + { + "condition": "minecraft:match_tool", + "predicate": { + "items": "minecraft:shears" + } + }, + { + "condition": "minecraft:match_tool", + "predicate": { + "predicates": { + "minecraft:enchantments": [ + { + "enchantment": "minecraft:silk_touch", + "levels": { + "min": 1 + } + } + ] + } + } + } + ] + } + ], + "name": "floralis:pink_flower" + } + ], + "rolls": 1.0 + }, + { + "bonus_rolls": 0.0, + "entries": [ + { + "type": "minecraft:item", + "conditions": [ + { + "condition": "minecraft:inverted", + "term": { + "condition": "minecraft:any_of", + "terms": [ + { + "condition": "minecraft:match_tool", + "predicate": { + "items": "minecraft:shears" + } + }, + { + "condition": "minecraft:match_tool", + "predicate": { + "predicates": { + "minecraft:enchantments": [ + { + "enchantment": "minecraft:silk_touch", + "levels": { + "min": 1 + } + } + ] + } + } + } + ] + } + } + ], + "functions": [ + { + "enchantment": "minecraft:fortune", + "formula": "minecraft:uniform_bonus_count", + "function": "minecraft:apply_bonus", + "parameters": { + "bonusMultiplier": 2 + } + }, + { + "add": false, + "count": 2.0, + "function": "minecraft:set_count" + } + ], + "name": "floralis:pink_flower_seeds" + } + ], + "rolls": 1.0 + }, + { + "bonus_rolls": 0.0, + "entries": [ + { + "type": "minecraft:item", + "conditions": [ + { + "condition": "minecraft:inverted", + "term": { + "condition": "minecraft:any_of", + "terms": [ + { + "condition": "minecraft:match_tool", + "predicate": { + "items": "minecraft:shears" + } + }, + { + "condition": "minecraft:match_tool", + "predicate": { + "predicates": { + "minecraft:enchantments": [ + { + "enchantment": "minecraft:silk_touch", + "levels": { + "min": 1 + } + } + ] + } + } + } + ] + } + } + ], + "functions": [ + { + "enchantment": "minecraft:fortune", + "formula": "minecraft:uniform_bonus_count", + "function": "minecraft:apply_bonus", + "parameters": { + "bonusMultiplier": 2 + } + } + ], + "name": "floralis:pink_petals" + } + ], + "rolls": 1.0 + }, + { + "bonus_rolls": 0.0, + "entries": [ + { + "type": "minecraft:item", + "conditions": [ + { + "condition": "minecraft:inverted", + "term": { + "condition": "minecraft:any_of", + "terms": [ + { + "condition": "minecraft:match_tool", + "predicate": { + "items": "minecraft:shears" + } + }, + { + "condition": "minecraft:match_tool", + "predicate": { + "predicates": { + "minecraft:enchantments": [ + { + "enchantment": "minecraft:silk_touch", + "levels": { + "min": 1 + } + } + ] + } + } + } + ] + } + } + ], + "functions": [ + { + "enchantment": "minecraft:fortune", + "formula": "minecraft:uniform_bonus_count", + "function": "minecraft:apply_bonus", + "parameters": { + "bonusMultiplier": 2 + } + } + ], + "name": "floralis:plant_fibers" + } + ], + "rolls": 1.0 + } + ], + "random_sequence": "floralis:blocks/pink_flower" +} \ No newline at end of file diff --git a/src/generated/resources/data/floralis/loot_tables/blocks/pink_flower_crop.json b/src/generated/resources/data/floralis/loot_tables/blocks/pink_flower_crop.json new file mode 100644 index 00000000..005f01bc --- /dev/null +++ b/src/generated/resources/data/floralis/loot_tables/blocks/pink_flower_crop.json @@ -0,0 +1,329 @@ +{ + "type": "minecraft:block", + "pools": [ + { + "bonus_rolls": 0.0, + "entries": [ + { + "type": "minecraft:item", + "conditions": [ + { + "condition": "minecraft:any_of", + "terms": [ + { + "condition": "minecraft:match_tool", + "predicate": { + "items": "minecraft:shears" + } + }, + { + "condition": "minecraft:match_tool", + "predicate": { + "predicates": { + "minecraft:enchantments": [ + { + "enchantment": "minecraft:silk_touch", + "levels": { + "min": 1 + } + } + ] + } + } + } + ] + }, + { + "block": "floralis:pink_flower_crop", + "condition": "minecraft:block_state_property", + "properties": { + "age": "5" + } + } + ], + "name": "floralis:pink_flower" + } + ], + "rolls": 1.0 + }, + { + "bonus_rolls": 0.0, + "entries": [ + { + "type": "minecraft:item", + "conditions": [ + { + "condition": "minecraft:any_of", + "terms": [ + { + "condition": "minecraft:match_tool", + "predicate": { + "items": "minecraft:shears" + } + }, + { + "condition": "minecraft:match_tool", + "predicate": { + "predicates": { + "minecraft:enchantments": [ + { + "enchantment": "minecraft:silk_touch", + "levels": { + "min": 1 + } + } + ] + } + } + } + ] + }, + { + "condition": "minecraft:inverted", + "term": { + "block": "floralis:pink_flower_crop", + "condition": "minecraft:block_state_property", + "properties": { + "age": "5" + } + } + } + ], + "name": "floralis:pink_flower_seeds" + } + ], + "rolls": 1.0 + }, + { + "bonus_rolls": 0.0, + "entries": [ + { + "type": "minecraft:item", + "conditions": [ + { + "condition": "minecraft:inverted", + "term": { + "condition": "minecraft:any_of", + "terms": [ + { + "condition": "minecraft:match_tool", + "predicate": { + "items": "minecraft:shears" + } + }, + { + "condition": "minecraft:match_tool", + "predicate": { + "predicates": { + "minecraft:enchantments": [ + { + "enchantment": "minecraft:silk_touch", + "levels": { + "min": 1 + } + } + ] + } + } + } + ] + } + }, + { + "block": "floralis:pink_flower_crop", + "condition": "minecraft:block_state_property", + "properties": { + "age": "5" + } + } + ], + "functions": [ + { + "enchantment": "minecraft:fortune", + "formula": "minecraft:uniform_bonus_count", + "function": "minecraft:apply_bonus", + "parameters": { + "bonusMultiplier": 2 + } + }, + { + "add": false, + "count": 2.0, + "function": "minecraft:set_count" + } + ], + "name": "floralis:pink_flower_seeds" + } + ], + "rolls": 1.0 + }, + { + "bonus_rolls": 0.0, + "entries": [ + { + "type": "minecraft:item", + "conditions": [ + { + "condition": "minecraft:inverted", + "term": { + "condition": "minecraft:any_of", + "terms": [ + { + "condition": "minecraft:match_tool", + "predicate": { + "items": "minecraft:shears" + } + }, + { + "condition": "minecraft:match_tool", + "predicate": { + "predicates": { + "minecraft:enchantments": [ + { + "enchantment": "minecraft:silk_touch", + "levels": { + "min": 1 + } + } + ] + } + } + } + ] + } + }, + { + "block": "floralis:pink_flower_crop", + "condition": "minecraft:block_state_property", + "properties": { + "age": "5" + } + } + ], + "functions": [ + { + "enchantment": "minecraft:fortune", + "formula": "minecraft:uniform_bonus_count", + "function": "minecraft:apply_bonus", + "parameters": { + "bonusMultiplier": 2 + } + } + ], + "name": "floralis:pink_petals" + } + ], + "rolls": 1.0 + }, + { + "bonus_rolls": 0.0, + "entries": [ + { + "type": "minecraft:item", + "conditions": [ + { + "condition": "minecraft:inverted", + "term": { + "condition": "minecraft:any_of", + "terms": [ + { + "condition": "minecraft:match_tool", + "predicate": { + "items": "minecraft:shears" + } + }, + { + "condition": "minecraft:match_tool", + "predicate": { + "predicates": { + "minecraft:enchantments": [ + { + "enchantment": "minecraft:silk_touch", + "levels": { + "min": 1 + } + } + ] + } + } + } + ] + } + }, + { + "block": "floralis:pink_flower_crop", + "condition": "minecraft:block_state_property", + "properties": { + "age": "5" + } + } + ], + "functions": [ + { + "enchantment": "minecraft:fortune", + "formula": "minecraft:uniform_bonus_count", + "function": "minecraft:apply_bonus", + "parameters": { + "bonusMultiplier": 2 + } + } + ], + "name": "floralis:plant_fibers" + } + ], + "rolls": 1.0 + }, + { + "bonus_rolls": 0.0, + "entries": [ + { + "type": "minecraft:item", + "conditions": [ + { + "condition": "minecraft:inverted", + "term": { + "condition": "minecraft:any_of", + "terms": [ + { + "condition": "minecraft:match_tool", + "predicate": { + "items": "minecraft:shears" + } + }, + { + "condition": "minecraft:match_tool", + "predicate": { + "predicates": { + "minecraft:enchantments": [ + { + "enchantment": "minecraft:silk_touch", + "levels": { + "min": 1 + } + } + ] + } + } + } + ] + } + }, + { + "condition": "minecraft:inverted", + "term": { + "block": "floralis:pink_flower_crop", + "condition": "minecraft:block_state_property", + "properties": { + "age": "5" + } + } + } + ], + "name": "floralis:pink_flower_seeds" + } + ], + "rolls": 1.0 + } + ], + "random_sequence": "floralis:blocks/pink_flower_crop" +} \ No newline at end of file diff --git a/src/main/resources/data/floralis/loot_tables/blocks/plant_fibers_block.json b/src/generated/resources/data/floralis/loot_tables/blocks/plant_fibers_block.json similarity index 55% rename from src/main/resources/data/floralis/loot_tables/blocks/plant_fibers_block.json rename to src/generated/resources/data/floralis/loot_tables/blocks/plant_fibers_block.json index a77cac1a..0a2e5954 100644 --- a/src/main/resources/data/floralis/loot_tables/blocks/plant_fibers_block.json +++ b/src/generated/resources/data/floralis/loot_tables/blocks/plant_fibers_block.json @@ -2,19 +2,15 @@ "type": "minecraft:block", "pools": [ { - "rolls": 1, - "bonus_rolls": 0, + "bonus_rolls": 0.0, "entries": [ { "type": "minecraft:item", "name": "floralis:plant_fibers_block" } ], - "conditions": [ - { - "condition": "minecraft:survives_explosion" - } - ] + "rolls": 1.0 } - ] + ], + "random_sequence": "floralis:blocks/plant_fibers_block" } \ No newline at end of file diff --git a/src/main/resources/data/floralis/loot_tables/blocks/potted_black_cactus.json b/src/generated/resources/data/floralis/loot_tables/blocks/potted_black_cactus.json similarity index 52% rename from src/main/resources/data/floralis/loot_tables/blocks/potted_black_cactus.json rename to src/generated/resources/data/floralis/loot_tables/blocks/potted_black_cactus.json index fcb60468..9f634d68 100644 --- a/src/main/resources/data/floralis/loot_tables/blocks/potted_black_cactus.json +++ b/src/generated/resources/data/floralis/loot_tables/blocks/potted_black_cactus.json @@ -2,34 +2,25 @@ "type": "minecraft:block", "pools": [ { - "rolls": 1, - "bonus_rolls": 0, + "bonus_rolls": 0.0, "entries": [ { "type": "minecraft:item", - "name": "minecraft:flower_pot" + "name": "floralis:black_cactus" } ], - "conditions": [ - { - "condition": "minecraft:survives_explosion" - } - ] + "rolls": 1.0 }, { - "rolls": 1, - "bonus_rolls": 0, + "bonus_rolls": 0.0, "entries": [ { "type": "minecraft:item", - "name": "floralis:black_cactus" + "name": "minecraft:flower_pot" } ], - "conditions": [ - { - "condition": "minecraft:survives_explosion" - } - ] + "rolls": 1.0 } - ] + ], + "random_sequence": "floralis:blocks/potted_black_cactus" } \ No newline at end of file diff --git a/src/main/resources/data/floralis/loot_tables/blocks/potted_black_flower.json b/src/generated/resources/data/floralis/loot_tables/blocks/potted_black_flower.json similarity index 52% rename from src/main/resources/data/floralis/loot_tables/blocks/potted_black_flower.json rename to src/generated/resources/data/floralis/loot_tables/blocks/potted_black_flower.json index d00c766b..ac866f77 100644 --- a/src/main/resources/data/floralis/loot_tables/blocks/potted_black_flower.json +++ b/src/generated/resources/data/floralis/loot_tables/blocks/potted_black_flower.json @@ -2,34 +2,25 @@ "type": "minecraft:block", "pools": [ { - "rolls": 1, - "bonus_rolls": 0, + "bonus_rolls": 0.0, "entries": [ { "type": "minecraft:item", - "name": "minecraft:flower_pot" + "name": "floralis:black_flower" } ], - "conditions": [ - { - "condition": "minecraft:survives_explosion" - } - ] + "rolls": 1.0 }, { - "rolls": 1, - "bonus_rolls": 0, + "bonus_rolls": 0.0, "entries": [ { "type": "minecraft:item", - "name": "floralis:black_flower" + "name": "minecraft:flower_pot" } ], - "conditions": [ - { - "condition": "minecraft:survives_explosion" - } - ] + "rolls": 1.0 } - ] + ], + "random_sequence": "floralis:blocks/potted_black_flower" } \ No newline at end of file diff --git a/src/main/resources/data/floralis/loot_tables/blocks/potted_blue_cactus.json b/src/generated/resources/data/floralis/loot_tables/blocks/potted_blue_cactus.json similarity index 51% rename from src/main/resources/data/floralis/loot_tables/blocks/potted_blue_cactus.json rename to src/generated/resources/data/floralis/loot_tables/blocks/potted_blue_cactus.json index 2611679d..8f45862b 100644 --- a/src/main/resources/data/floralis/loot_tables/blocks/potted_blue_cactus.json +++ b/src/generated/resources/data/floralis/loot_tables/blocks/potted_blue_cactus.json @@ -2,34 +2,25 @@ "type": "minecraft:block", "pools": [ { - "rolls": 1, - "bonus_rolls": 0, + "bonus_rolls": 0.0, "entries": [ { "type": "minecraft:item", - "name": "minecraft:flower_pot" + "name": "floralis:blue_cactus" } ], - "conditions": [ - { - "condition": "minecraft:survives_explosion" - } - ] + "rolls": 1.0 }, { - "rolls": 1, - "bonus_rolls": 0, + "bonus_rolls": 0.0, "entries": [ { "type": "minecraft:item", - "name": "floralis:blue_cactus" + "name": "minecraft:flower_pot" } ], - "conditions": [ - { - "condition": "minecraft:survives_explosion" - } - ] + "rolls": 1.0 } - ] + ], + "random_sequence": "floralis:blocks/potted_blue_cactus" } \ No newline at end of file diff --git a/src/main/resources/data/floralis/loot_tables/blocks/potted_blue_flower.json b/src/generated/resources/data/floralis/loot_tables/blocks/potted_blue_flower.json similarity index 51% rename from src/main/resources/data/floralis/loot_tables/blocks/potted_blue_flower.json rename to src/generated/resources/data/floralis/loot_tables/blocks/potted_blue_flower.json index 8eaa1be7..b27b4804 100644 --- a/src/main/resources/data/floralis/loot_tables/blocks/potted_blue_flower.json +++ b/src/generated/resources/data/floralis/loot_tables/blocks/potted_blue_flower.json @@ -2,34 +2,25 @@ "type": "minecraft:block", "pools": [ { - "rolls": 1, - "bonus_rolls": 0, + "bonus_rolls": 0.0, "entries": [ { "type": "minecraft:item", - "name": "minecraft:flower_pot" + "name": "floralis:blue_flower" } ], - "conditions": [ - { - "condition": "minecraft:survives_explosion" - } - ] + "rolls": 1.0 }, { - "rolls": 1, - "bonus_rolls": 0, + "bonus_rolls": 0.0, "entries": [ { "type": "minecraft:item", - "name": "floralis:blue_flower" + "name": "minecraft:flower_pot" } ], - "conditions": [ - { - "condition": "minecraft:survives_explosion" - } - ] + "rolls": 1.0 } - ] + ], + "random_sequence": "floralis:blocks/potted_blue_flower" } \ No newline at end of file diff --git a/src/main/resources/data/floralis/loot_tables/blocks/potted_brown_cactus.json b/src/generated/resources/data/floralis/loot_tables/blocks/potted_brown_cactus.json similarity index 52% rename from src/main/resources/data/floralis/loot_tables/blocks/potted_brown_cactus.json rename to src/generated/resources/data/floralis/loot_tables/blocks/potted_brown_cactus.json index 40f90094..86c46dfe 100644 --- a/src/main/resources/data/floralis/loot_tables/blocks/potted_brown_cactus.json +++ b/src/generated/resources/data/floralis/loot_tables/blocks/potted_brown_cactus.json @@ -2,34 +2,25 @@ "type": "minecraft:block", "pools": [ { - "rolls": 1, - "bonus_rolls": 0, + "bonus_rolls": 0.0, "entries": [ { "type": "minecraft:item", - "name": "minecraft:flower_pot" + "name": "floralis:brown_cactus" } ], - "conditions": [ - { - "condition": "minecraft:survives_explosion" - } - ] + "rolls": 1.0 }, { - "rolls": 1, - "bonus_rolls": 0, + "bonus_rolls": 0.0, "entries": [ { "type": "minecraft:item", - "name": "floralis:brown_cactus" + "name": "minecraft:flower_pot" } ], - "conditions": [ - { - "condition": "minecraft:survives_explosion" - } - ] + "rolls": 1.0 } - ] + ], + "random_sequence": "floralis:blocks/potted_brown_cactus" } \ No newline at end of file diff --git a/src/main/resources/data/floralis/loot_tables/blocks/potted_brown_flower.json b/src/generated/resources/data/floralis/loot_tables/blocks/potted_brown_flower.json similarity index 52% rename from src/main/resources/data/floralis/loot_tables/blocks/potted_brown_flower.json rename to src/generated/resources/data/floralis/loot_tables/blocks/potted_brown_flower.json index 6c5e597c..7a2f519d 100644 --- a/src/main/resources/data/floralis/loot_tables/blocks/potted_brown_flower.json +++ b/src/generated/resources/data/floralis/loot_tables/blocks/potted_brown_flower.json @@ -2,34 +2,25 @@ "type": "minecraft:block", "pools": [ { - "rolls": 1, - "bonus_rolls": 0, + "bonus_rolls": 0.0, "entries": [ { "type": "minecraft:item", - "name": "minecraft:flower_pot" + "name": "floralis:brown_flower" } ], - "conditions": [ - { - "condition": "minecraft:survives_explosion" - } - ] + "rolls": 1.0 }, { - "rolls": 1, - "bonus_rolls": 0, + "bonus_rolls": 0.0, "entries": [ { "type": "minecraft:item", - "name": "floralis:brown_flower" + "name": "minecraft:flower_pot" } ], - "conditions": [ - { - "condition": "minecraft:survives_explosion" - } - ] + "rolls": 1.0 } - ] + ], + "random_sequence": "floralis:blocks/potted_brown_flower" } \ No newline at end of file diff --git a/src/main/resources/data/floralis/loot_tables/blocks/potted_cyan_cactus.json b/src/generated/resources/data/floralis/loot_tables/blocks/potted_cyan_cactus.json similarity index 51% rename from src/main/resources/data/floralis/loot_tables/blocks/potted_cyan_cactus.json rename to src/generated/resources/data/floralis/loot_tables/blocks/potted_cyan_cactus.json index f1bf767d..f6d3c231 100644 --- a/src/main/resources/data/floralis/loot_tables/blocks/potted_cyan_cactus.json +++ b/src/generated/resources/data/floralis/loot_tables/blocks/potted_cyan_cactus.json @@ -2,34 +2,25 @@ "type": "minecraft:block", "pools": [ { - "rolls": 1, - "bonus_rolls": 0, + "bonus_rolls": 0.0, "entries": [ { "type": "minecraft:item", - "name": "minecraft:flower_pot" + "name": "floralis:cyan_cactus" } ], - "conditions": [ - { - "condition": "minecraft:survives_explosion" - } - ] + "rolls": 1.0 }, { - "rolls": 1, - "bonus_rolls": 0, + "bonus_rolls": 0.0, "entries": [ { "type": "minecraft:item", - "name": "floralis:cyan_cactus" + "name": "minecraft:flower_pot" } ], - "conditions": [ - { - "condition": "minecraft:survives_explosion" - } - ] + "rolls": 1.0 } - ] + ], + "random_sequence": "floralis:blocks/potted_cyan_cactus" } \ No newline at end of file diff --git a/src/main/resources/data/floralis/loot_tables/blocks/potted_cyan_flower.json b/src/generated/resources/data/floralis/loot_tables/blocks/potted_cyan_flower.json similarity index 51% rename from src/main/resources/data/floralis/loot_tables/blocks/potted_cyan_flower.json rename to src/generated/resources/data/floralis/loot_tables/blocks/potted_cyan_flower.json index 6bf1c0c0..c348046d 100644 --- a/src/main/resources/data/floralis/loot_tables/blocks/potted_cyan_flower.json +++ b/src/generated/resources/data/floralis/loot_tables/blocks/potted_cyan_flower.json @@ -2,34 +2,25 @@ "type": "minecraft:block", "pools": [ { - "rolls": 1, - "bonus_rolls": 0, + "bonus_rolls": 0.0, "entries": [ { "type": "minecraft:item", - "name": "minecraft:flower_pot" + "name": "floralis:cyan_flower" } ], - "conditions": [ - { - "condition": "minecraft:survives_explosion" - } - ] + "rolls": 1.0 }, { - "rolls": 1, - "bonus_rolls": 0, + "bonus_rolls": 0.0, "entries": [ { "type": "minecraft:item", - "name": "floralis:cyan_flower" + "name": "minecraft:flower_pot" } ], - "conditions": [ - { - "condition": "minecraft:survives_explosion" - } - ] + "rolls": 1.0 } - ] + ], + "random_sequence": "floralis:blocks/potted_cyan_flower" } \ No newline at end of file diff --git a/src/main/resources/data/floralis/loot_tables/blocks/potted_gray_cactus.json b/src/generated/resources/data/floralis/loot_tables/blocks/potted_gray_cactus.json similarity index 51% rename from src/main/resources/data/floralis/loot_tables/blocks/potted_gray_cactus.json rename to src/generated/resources/data/floralis/loot_tables/blocks/potted_gray_cactus.json index 1b7ad7a6..b7e58d73 100644 --- a/src/main/resources/data/floralis/loot_tables/blocks/potted_gray_cactus.json +++ b/src/generated/resources/data/floralis/loot_tables/blocks/potted_gray_cactus.json @@ -2,34 +2,25 @@ "type": "minecraft:block", "pools": [ { - "rolls": 1, - "bonus_rolls": 0, + "bonus_rolls": 0.0, "entries": [ { "type": "minecraft:item", - "name": "minecraft:flower_pot" + "name": "floralis:gray_cactus" } ], - "conditions": [ - { - "condition": "minecraft:survives_explosion" - } - ] + "rolls": 1.0 }, { - "rolls": 1, - "bonus_rolls": 0, + "bonus_rolls": 0.0, "entries": [ { "type": "minecraft:item", - "name": "floralis:gray_cactus" + "name": "minecraft:flower_pot" } ], - "conditions": [ - { - "condition": "minecraft:survives_explosion" - } - ] + "rolls": 1.0 } - ] + ], + "random_sequence": "floralis:blocks/potted_gray_cactus" } \ No newline at end of file diff --git a/src/main/resources/data/floralis/loot_tables/blocks/potted_gray_flower.json b/src/generated/resources/data/floralis/loot_tables/blocks/potted_gray_flower.json similarity index 51% rename from src/main/resources/data/floralis/loot_tables/blocks/potted_gray_flower.json rename to src/generated/resources/data/floralis/loot_tables/blocks/potted_gray_flower.json index 101ec4af..092ebdfc 100644 --- a/src/main/resources/data/floralis/loot_tables/blocks/potted_gray_flower.json +++ b/src/generated/resources/data/floralis/loot_tables/blocks/potted_gray_flower.json @@ -2,34 +2,25 @@ "type": "minecraft:block", "pools": [ { - "rolls": 1, - "bonus_rolls": 0, + "bonus_rolls": 0.0, "entries": [ { "type": "minecraft:item", - "name": "minecraft:flower_pot" + "name": "floralis:gray_flower" } ], - "conditions": [ - { - "condition": "minecraft:survives_explosion" - } - ] + "rolls": 1.0 }, { - "rolls": 1, - "bonus_rolls": 0, + "bonus_rolls": 0.0, "entries": [ { "type": "minecraft:item", - "name": "floralis:gray_flower" + "name": "minecraft:flower_pot" } ], - "conditions": [ - { - "condition": "minecraft:survives_explosion" - } - ] + "rolls": 1.0 } - ] + ], + "random_sequence": "floralis:blocks/potted_gray_flower" } \ No newline at end of file diff --git a/src/main/resources/data/floralis/loot_tables/blocks/potted_green_cactus.json b/src/generated/resources/data/floralis/loot_tables/blocks/potted_green_cactus.json similarity index 52% rename from src/main/resources/data/floralis/loot_tables/blocks/potted_green_cactus.json rename to src/generated/resources/data/floralis/loot_tables/blocks/potted_green_cactus.json index b7ac3006..d4a4de0f 100644 --- a/src/main/resources/data/floralis/loot_tables/blocks/potted_green_cactus.json +++ b/src/generated/resources/data/floralis/loot_tables/blocks/potted_green_cactus.json @@ -2,34 +2,25 @@ "type": "minecraft:block", "pools": [ { - "rolls": 1, - "bonus_rolls": 0, + "bonus_rolls": 0.0, "entries": [ { "type": "minecraft:item", - "name": "minecraft:flower_pot" + "name": "floralis:green_cactus" } ], - "conditions": [ - { - "condition": "minecraft:survives_explosion" - } - ] + "rolls": 1.0 }, { - "rolls": 1, - "bonus_rolls": 0, + "bonus_rolls": 0.0, "entries": [ { "type": "minecraft:item", - "name": "floralis:green_cactus" + "name": "minecraft:flower_pot" } ], - "conditions": [ - { - "condition": "minecraft:survives_explosion" - } - ] + "rolls": 1.0 } - ] + ], + "random_sequence": "floralis:blocks/potted_green_cactus" } \ No newline at end of file diff --git a/src/main/resources/data/floralis/loot_tables/blocks/potted_green_flower.json b/src/generated/resources/data/floralis/loot_tables/blocks/potted_green_flower.json similarity index 52% rename from src/main/resources/data/floralis/loot_tables/blocks/potted_green_flower.json rename to src/generated/resources/data/floralis/loot_tables/blocks/potted_green_flower.json index cf4fedfd..34643b53 100644 --- a/src/main/resources/data/floralis/loot_tables/blocks/potted_green_flower.json +++ b/src/generated/resources/data/floralis/loot_tables/blocks/potted_green_flower.json @@ -2,34 +2,25 @@ "type": "minecraft:block", "pools": [ { - "rolls": 1, - "bonus_rolls": 0, + "bonus_rolls": 0.0, "entries": [ { "type": "minecraft:item", - "name": "minecraft:flower_pot" + "name": "floralis:green_flower" } ], - "conditions": [ - { - "condition": "minecraft:survives_explosion" - } - ] + "rolls": 1.0 }, { - "rolls": 1, - "bonus_rolls": 0, + "bonus_rolls": 0.0, "entries": [ { "type": "minecraft:item", - "name": "floralis:green_flower" + "name": "minecraft:flower_pot" } ], - "conditions": [ - { - "condition": "minecraft:survives_explosion" - } - ] + "rolls": 1.0 } - ] + ], + "random_sequence": "floralis:blocks/potted_green_flower" } \ No newline at end of file diff --git a/src/main/resources/data/floralis/loot_tables/blocks/potted_light_blue_cactus.json b/src/generated/resources/data/floralis/loot_tables/blocks/potted_light_blue_cactus.json similarity index 52% rename from src/main/resources/data/floralis/loot_tables/blocks/potted_light_blue_cactus.json rename to src/generated/resources/data/floralis/loot_tables/blocks/potted_light_blue_cactus.json index a53e26fc..246dd163 100644 --- a/src/main/resources/data/floralis/loot_tables/blocks/potted_light_blue_cactus.json +++ b/src/generated/resources/data/floralis/loot_tables/blocks/potted_light_blue_cactus.json @@ -2,34 +2,25 @@ "type": "minecraft:block", "pools": [ { - "rolls": 1, - "bonus_rolls": 0, + "bonus_rolls": 0.0, "entries": [ { "type": "minecraft:item", - "name": "minecraft:flower_pot" + "name": "floralis:light_blue_cactus" } ], - "conditions": [ - { - "condition": "minecraft:survives_explosion" - } - ] + "rolls": 1.0 }, { - "rolls": 1, - "bonus_rolls": 0, + "bonus_rolls": 0.0, "entries": [ { "type": "minecraft:item", - "name": "floralis:light_blue_cactus" + "name": "minecraft:flower_pot" } ], - "conditions": [ - { - "condition": "minecraft:survives_explosion" - } - ] + "rolls": 1.0 } - ] + ], + "random_sequence": "floralis:blocks/potted_light_blue_cactus" } \ No newline at end of file diff --git a/src/main/resources/data/floralis/loot_tables/blocks/potted_light_blue_flower.json b/src/generated/resources/data/floralis/loot_tables/blocks/potted_light_blue_flower.json similarity index 52% rename from src/main/resources/data/floralis/loot_tables/blocks/potted_light_blue_flower.json rename to src/generated/resources/data/floralis/loot_tables/blocks/potted_light_blue_flower.json index 489ce144..81cb0b64 100644 --- a/src/main/resources/data/floralis/loot_tables/blocks/potted_light_blue_flower.json +++ b/src/generated/resources/data/floralis/loot_tables/blocks/potted_light_blue_flower.json @@ -2,34 +2,25 @@ "type": "minecraft:block", "pools": [ { - "rolls": 1, - "bonus_rolls": 0, + "bonus_rolls": 0.0, "entries": [ { "type": "minecraft:item", - "name": "minecraft:flower_pot" + "name": "floralis:light_blue_flower" } ], - "conditions": [ - { - "condition": "minecraft:survives_explosion" - } - ] + "rolls": 1.0 }, { - "rolls": 1, - "bonus_rolls": 0, + "bonus_rolls": 0.0, "entries": [ { "type": "minecraft:item", - "name": "floralis:light_blue_flower" + "name": "minecraft:flower_pot" } ], - "conditions": [ - { - "condition": "minecraft:survives_explosion" - } - ] + "rolls": 1.0 } - ] + ], + "random_sequence": "floralis:blocks/potted_light_blue_flower" } \ No newline at end of file diff --git a/src/main/resources/data/floralis/loot_tables/blocks/potted_light_gray_cactus.json b/src/generated/resources/data/floralis/loot_tables/blocks/potted_light_gray_cactus.json similarity index 52% rename from src/main/resources/data/floralis/loot_tables/blocks/potted_light_gray_cactus.json rename to src/generated/resources/data/floralis/loot_tables/blocks/potted_light_gray_cactus.json index 34f867c0..f04f92d3 100644 --- a/src/main/resources/data/floralis/loot_tables/blocks/potted_light_gray_cactus.json +++ b/src/generated/resources/data/floralis/loot_tables/blocks/potted_light_gray_cactus.json @@ -2,34 +2,25 @@ "type": "minecraft:block", "pools": [ { - "rolls": 1, - "bonus_rolls": 0, + "bonus_rolls": 0.0, "entries": [ { "type": "minecraft:item", - "name": "minecraft:flower_pot" + "name": "floralis:light_gray_cactus" } ], - "conditions": [ - { - "condition": "minecraft:survives_explosion" - } - ] + "rolls": 1.0 }, { - "rolls": 1, - "bonus_rolls": 0, + "bonus_rolls": 0.0, "entries": [ { "type": "minecraft:item", - "name": "floralis:light_gray_cactus" + "name": "minecraft:flower_pot" } ], - "conditions": [ - { - "condition": "minecraft:survives_explosion" - } - ] + "rolls": 1.0 } - ] + ], + "random_sequence": "floralis:blocks/potted_light_gray_cactus" } \ No newline at end of file diff --git a/src/main/resources/data/floralis/loot_tables/blocks/potted_light_gray_flower.json b/src/generated/resources/data/floralis/loot_tables/blocks/potted_light_gray_flower.json similarity index 52% rename from src/main/resources/data/floralis/loot_tables/blocks/potted_light_gray_flower.json rename to src/generated/resources/data/floralis/loot_tables/blocks/potted_light_gray_flower.json index e48038cb..c1ee9ac4 100644 --- a/src/main/resources/data/floralis/loot_tables/blocks/potted_light_gray_flower.json +++ b/src/generated/resources/data/floralis/loot_tables/blocks/potted_light_gray_flower.json @@ -2,34 +2,25 @@ "type": "minecraft:block", "pools": [ { - "rolls": 1, - "bonus_rolls": 0, + "bonus_rolls": 0.0, "entries": [ { "type": "minecraft:item", - "name": "minecraft:flower_pot" + "name": "floralis:light_gray_flower" } ], - "conditions": [ - { - "condition": "minecraft:survives_explosion" - } - ] + "rolls": 1.0 }, { - "rolls": 1, - "bonus_rolls": 0, + "bonus_rolls": 0.0, "entries": [ { "type": "minecraft:item", - "name": "floralis:light_gray_flower" + "name": "minecraft:flower_pot" } ], - "conditions": [ - { - "condition": "minecraft:survives_explosion" - } - ] + "rolls": 1.0 } - ] + ], + "random_sequence": "floralis:blocks/potted_light_gray_flower" } \ No newline at end of file diff --git a/src/main/resources/data/floralis/loot_tables/blocks/potted_lime_cactus.json b/src/generated/resources/data/floralis/loot_tables/blocks/potted_lime_cactus.json similarity index 51% rename from src/main/resources/data/floralis/loot_tables/blocks/potted_lime_cactus.json rename to src/generated/resources/data/floralis/loot_tables/blocks/potted_lime_cactus.json index 8d9e17e0..ff243aa3 100644 --- a/src/main/resources/data/floralis/loot_tables/blocks/potted_lime_cactus.json +++ b/src/generated/resources/data/floralis/loot_tables/blocks/potted_lime_cactus.json @@ -2,34 +2,25 @@ "type": "minecraft:block", "pools": [ { - "rolls": 1, - "bonus_rolls": 0, + "bonus_rolls": 0.0, "entries": [ { "type": "minecraft:item", - "name": "minecraft:flower_pot" + "name": "floralis:lime_cactus" } ], - "conditions": [ - { - "condition": "minecraft:survives_explosion" - } - ] + "rolls": 1.0 }, { - "rolls": 1, - "bonus_rolls": 0, + "bonus_rolls": 0.0, "entries": [ { "type": "minecraft:item", - "name": "floralis:lime_cactus" + "name": "minecraft:flower_pot" } ], - "conditions": [ - { - "condition": "minecraft:survives_explosion" - } - ] + "rolls": 1.0 } - ] + ], + "random_sequence": "floralis:blocks/potted_lime_cactus" } \ No newline at end of file diff --git a/src/main/resources/data/floralis/loot_tables/blocks/potted_lime_flower.json b/src/generated/resources/data/floralis/loot_tables/blocks/potted_lime_flower.json similarity index 51% rename from src/main/resources/data/floralis/loot_tables/blocks/potted_lime_flower.json rename to src/generated/resources/data/floralis/loot_tables/blocks/potted_lime_flower.json index c81d4138..73a44d36 100644 --- a/src/main/resources/data/floralis/loot_tables/blocks/potted_lime_flower.json +++ b/src/generated/resources/data/floralis/loot_tables/blocks/potted_lime_flower.json @@ -2,34 +2,25 @@ "type": "minecraft:block", "pools": [ { - "rolls": 1, - "bonus_rolls": 0, + "bonus_rolls": 0.0, "entries": [ { "type": "minecraft:item", - "name": "minecraft:flower_pot" + "name": "floralis:lime_flower" } ], - "conditions": [ - { - "condition": "minecraft:survives_explosion" - } - ] + "rolls": 1.0 }, { - "rolls": 1, - "bonus_rolls": 0, + "bonus_rolls": 0.0, "entries": [ { "type": "minecraft:item", - "name": "floralis:lime_flower" + "name": "minecraft:flower_pot" } ], - "conditions": [ - { - "condition": "minecraft:survives_explosion" - } - ] + "rolls": 1.0 } - ] + ], + "random_sequence": "floralis:blocks/potted_lime_flower" } \ No newline at end of file diff --git a/src/main/resources/data/floralis/loot_tables/blocks/potted_magenta_cactus.json b/src/generated/resources/data/floralis/loot_tables/blocks/potted_magenta_cactus.json similarity index 52% rename from src/main/resources/data/floralis/loot_tables/blocks/potted_magenta_cactus.json rename to src/generated/resources/data/floralis/loot_tables/blocks/potted_magenta_cactus.json index b01caa30..48f46b03 100644 --- a/src/main/resources/data/floralis/loot_tables/blocks/potted_magenta_cactus.json +++ b/src/generated/resources/data/floralis/loot_tables/blocks/potted_magenta_cactus.json @@ -2,34 +2,25 @@ "type": "minecraft:block", "pools": [ { - "rolls": 1, - "bonus_rolls": 0, + "bonus_rolls": 0.0, "entries": [ { "type": "minecraft:item", - "name": "minecraft:flower_pot" + "name": "floralis:magenta_cactus" } ], - "conditions": [ - { - "condition": "minecraft:survives_explosion" - } - ] + "rolls": 1.0 }, { - "rolls": 1, - "bonus_rolls": 0, + "bonus_rolls": 0.0, "entries": [ { "type": "minecraft:item", - "name": "floralis:magenta_cactus" + "name": "minecraft:flower_pot" } ], - "conditions": [ - { - "condition": "minecraft:survives_explosion" - } - ] + "rolls": 1.0 } - ] + ], + "random_sequence": "floralis:blocks/potted_magenta_cactus" } \ No newline at end of file diff --git a/src/main/resources/data/floralis/loot_tables/blocks/potted_magenta_flower.json b/src/generated/resources/data/floralis/loot_tables/blocks/potted_magenta_flower.json similarity index 52% rename from src/main/resources/data/floralis/loot_tables/blocks/potted_magenta_flower.json rename to src/generated/resources/data/floralis/loot_tables/blocks/potted_magenta_flower.json index bf4ac634..365e444e 100644 --- a/src/main/resources/data/floralis/loot_tables/blocks/potted_magenta_flower.json +++ b/src/generated/resources/data/floralis/loot_tables/blocks/potted_magenta_flower.json @@ -2,34 +2,25 @@ "type": "minecraft:block", "pools": [ { - "rolls": 1, - "bonus_rolls": 0, + "bonus_rolls": 0.0, "entries": [ { "type": "minecraft:item", - "name": "minecraft:flower_pot" + "name": "floralis:magenta_flower" } ], - "conditions": [ - { - "condition": "minecraft:survives_explosion" - } - ] + "rolls": 1.0 }, { - "rolls": 1, - "bonus_rolls": 0, + "bonus_rolls": 0.0, "entries": [ { "type": "minecraft:item", - "name": "floralis:magenta_flower" + "name": "minecraft:flower_pot" } ], - "conditions": [ - { - "condition": "minecraft:survives_explosion" - } - ] + "rolls": 1.0 } - ] + ], + "random_sequence": "floralis:blocks/potted_magenta_flower" } \ No newline at end of file diff --git a/src/main/resources/data/floralis/loot_tables/blocks/potted_orange_cactus.json b/src/generated/resources/data/floralis/loot_tables/blocks/potted_orange_cactus.json similarity index 52% rename from src/main/resources/data/floralis/loot_tables/blocks/potted_orange_cactus.json rename to src/generated/resources/data/floralis/loot_tables/blocks/potted_orange_cactus.json index a59afebd..1550e8b3 100644 --- a/src/main/resources/data/floralis/loot_tables/blocks/potted_orange_cactus.json +++ b/src/generated/resources/data/floralis/loot_tables/blocks/potted_orange_cactus.json @@ -2,34 +2,25 @@ "type": "minecraft:block", "pools": [ { - "rolls": 1, - "bonus_rolls": 0, + "bonus_rolls": 0.0, "entries": [ { "type": "minecraft:item", - "name": "minecraft:flower_pot" + "name": "floralis:orange_cactus" } ], - "conditions": [ - { - "condition": "minecraft:survives_explosion" - } - ] + "rolls": 1.0 }, { - "rolls": 1, - "bonus_rolls": 0, + "bonus_rolls": 0.0, "entries": [ { "type": "minecraft:item", - "name": "floralis:orange_cactus" + "name": "minecraft:flower_pot" } ], - "conditions": [ - { - "condition": "minecraft:survives_explosion" - } - ] + "rolls": 1.0 } - ] + ], + "random_sequence": "floralis:blocks/potted_orange_cactus" } \ No newline at end of file diff --git a/src/main/resources/data/floralis/loot_tables/blocks/potted_orange_flower.json b/src/generated/resources/data/floralis/loot_tables/blocks/potted_orange_flower.json similarity index 52% rename from src/main/resources/data/floralis/loot_tables/blocks/potted_orange_flower.json rename to src/generated/resources/data/floralis/loot_tables/blocks/potted_orange_flower.json index 72afe07d..0eda9537 100644 --- a/src/main/resources/data/floralis/loot_tables/blocks/potted_orange_flower.json +++ b/src/generated/resources/data/floralis/loot_tables/blocks/potted_orange_flower.json @@ -2,34 +2,25 @@ "type": "minecraft:block", "pools": [ { - "rolls": 1, - "bonus_rolls": 0, + "bonus_rolls": 0.0, "entries": [ { "type": "minecraft:item", - "name": "minecraft:flower_pot" + "name": "floralis:orange_flower" } ], - "conditions": [ - { - "condition": "minecraft:survives_explosion" - } - ] + "rolls": 1.0 }, { - "rolls": 1, - "bonus_rolls": 0, + "bonus_rolls": 0.0, "entries": [ { "type": "minecraft:item", - "name": "floralis:orange_flower" + "name": "minecraft:flower_pot" } ], - "conditions": [ - { - "condition": "minecraft:survives_explosion" - } - ] + "rolls": 1.0 } - ] + ], + "random_sequence": "floralis:blocks/potted_orange_flower" } \ No newline at end of file diff --git a/src/main/resources/data/floralis/loot_tables/blocks/potted_pink_cactus.json b/src/generated/resources/data/floralis/loot_tables/blocks/potted_pink_cactus.json similarity index 51% rename from src/main/resources/data/floralis/loot_tables/blocks/potted_pink_cactus.json rename to src/generated/resources/data/floralis/loot_tables/blocks/potted_pink_cactus.json index a2f1784f..2697defc 100644 --- a/src/main/resources/data/floralis/loot_tables/blocks/potted_pink_cactus.json +++ b/src/generated/resources/data/floralis/loot_tables/blocks/potted_pink_cactus.json @@ -2,34 +2,25 @@ "type": "minecraft:block", "pools": [ { - "rolls": 1, - "bonus_rolls": 0, + "bonus_rolls": 0.0, "entries": [ { "type": "minecraft:item", - "name": "minecraft:flower_pot" + "name": "floralis:pink_cactus" } ], - "conditions": [ - { - "condition": "minecraft:survives_explosion" - } - ] + "rolls": 1.0 }, { - "rolls": 1, - "bonus_rolls": 0, + "bonus_rolls": 0.0, "entries": [ { "type": "minecraft:item", - "name": "floralis:pink_cactus" + "name": "minecraft:flower_pot" } ], - "conditions": [ - { - "condition": "minecraft:survives_explosion" - } - ] + "rolls": 1.0 } - ] + ], + "random_sequence": "floralis:blocks/potted_pink_cactus" } \ No newline at end of file diff --git a/src/main/resources/data/floralis/loot_tables/blocks/potted_pink_flower.json b/src/generated/resources/data/floralis/loot_tables/blocks/potted_pink_flower.json similarity index 51% rename from src/main/resources/data/floralis/loot_tables/blocks/potted_pink_flower.json rename to src/generated/resources/data/floralis/loot_tables/blocks/potted_pink_flower.json index f3ba9118..e50527c0 100644 --- a/src/main/resources/data/floralis/loot_tables/blocks/potted_pink_flower.json +++ b/src/generated/resources/data/floralis/loot_tables/blocks/potted_pink_flower.json @@ -2,34 +2,25 @@ "type": "minecraft:block", "pools": [ { - "rolls": 1, - "bonus_rolls": 0, + "bonus_rolls": 0.0, "entries": [ { "type": "minecraft:item", - "name": "minecraft:flower_pot" + "name": "floralis:pink_flower" } ], - "conditions": [ - { - "condition": "minecraft:survives_explosion" - } - ] + "rolls": 1.0 }, { - "rolls": 1, - "bonus_rolls": 0, + "bonus_rolls": 0.0, "entries": [ { "type": "minecraft:item", - "name": "floralis:pink_flower" + "name": "minecraft:flower_pot" } ], - "conditions": [ - { - "condition": "minecraft:survives_explosion" - } - ] + "rolls": 1.0 } - ] + ], + "random_sequence": "floralis:blocks/potted_pink_flower" } \ No newline at end of file diff --git a/src/main/resources/data/floralis/loot_tables/blocks/potted_purple_cactus.json b/src/generated/resources/data/floralis/loot_tables/blocks/potted_purple_cactus.json similarity index 52% rename from src/main/resources/data/floralis/loot_tables/blocks/potted_purple_cactus.json rename to src/generated/resources/data/floralis/loot_tables/blocks/potted_purple_cactus.json index 4943a694..78b74842 100644 --- a/src/main/resources/data/floralis/loot_tables/blocks/potted_purple_cactus.json +++ b/src/generated/resources/data/floralis/loot_tables/blocks/potted_purple_cactus.json @@ -2,34 +2,25 @@ "type": "minecraft:block", "pools": [ { - "rolls": 1, - "bonus_rolls": 0, + "bonus_rolls": 0.0, "entries": [ { "type": "minecraft:item", - "name": "minecraft:flower_pot" + "name": "floralis:purple_cactus" } ], - "conditions": [ - { - "condition": "minecraft:survives_explosion" - } - ] + "rolls": 1.0 }, { - "rolls": 1, - "bonus_rolls": 0, + "bonus_rolls": 0.0, "entries": [ { "type": "minecraft:item", - "name": "floralis:purple_cactus" + "name": "minecraft:flower_pot" } ], - "conditions": [ - { - "condition": "minecraft:survives_explosion" - } - ] + "rolls": 1.0 } - ] + ], + "random_sequence": "floralis:blocks/potted_purple_cactus" } \ No newline at end of file diff --git a/src/main/resources/data/floralis/loot_tables/blocks/potted_purple_flower.json b/src/generated/resources/data/floralis/loot_tables/blocks/potted_purple_flower.json similarity index 52% rename from src/main/resources/data/floralis/loot_tables/blocks/potted_purple_flower.json rename to src/generated/resources/data/floralis/loot_tables/blocks/potted_purple_flower.json index bb9fb179..5468223b 100644 --- a/src/main/resources/data/floralis/loot_tables/blocks/potted_purple_flower.json +++ b/src/generated/resources/data/floralis/loot_tables/blocks/potted_purple_flower.json @@ -2,34 +2,25 @@ "type": "minecraft:block", "pools": [ { - "rolls": 1, - "bonus_rolls": 0, + "bonus_rolls": 0.0, "entries": [ { "type": "minecraft:item", - "name": "minecraft:flower_pot" + "name": "floralis:purple_flower" } ], - "conditions": [ - { - "condition": "minecraft:survives_explosion" - } - ] + "rolls": 1.0 }, { - "rolls": 1, - "bonus_rolls": 0, + "bonus_rolls": 0.0, "entries": [ { "type": "minecraft:item", - "name": "floralis:purple_flower" + "name": "minecraft:flower_pot" } ], - "conditions": [ - { - "condition": "minecraft:survives_explosion" - } - ] + "rolls": 1.0 } - ] + ], + "random_sequence": "floralis:blocks/potted_purple_flower" } \ No newline at end of file diff --git a/src/main/resources/data/floralis/loot_tables/blocks/potted_red_cactus.json b/src/generated/resources/data/floralis/loot_tables/blocks/potted_red_cactus.json similarity index 51% rename from src/main/resources/data/floralis/loot_tables/blocks/potted_red_cactus.json rename to src/generated/resources/data/floralis/loot_tables/blocks/potted_red_cactus.json index ebc8cc37..145a0237 100644 --- a/src/main/resources/data/floralis/loot_tables/blocks/potted_red_cactus.json +++ b/src/generated/resources/data/floralis/loot_tables/blocks/potted_red_cactus.json @@ -2,34 +2,25 @@ "type": "minecraft:block", "pools": [ { - "rolls": 1, - "bonus_rolls": 0, + "bonus_rolls": 0.0, "entries": [ { "type": "minecraft:item", - "name": "minecraft:flower_pot" + "name": "floralis:red_cactus" } ], - "conditions": [ - { - "condition": "minecraft:survives_explosion" - } - ] + "rolls": 1.0 }, { - "rolls": 1, - "bonus_rolls": 0, + "bonus_rolls": 0.0, "entries": [ { "type": "minecraft:item", - "name": "floralis:red_cactus" + "name": "minecraft:flower_pot" } ], - "conditions": [ - { - "condition": "minecraft:survives_explosion" - } - ] + "rolls": 1.0 } - ] + ], + "random_sequence": "floralis:blocks/potted_red_cactus" } \ No newline at end of file diff --git a/src/main/resources/data/floralis/loot_tables/blocks/potted_red_flower.json b/src/generated/resources/data/floralis/loot_tables/blocks/potted_red_flower.json similarity index 51% rename from src/main/resources/data/floralis/loot_tables/blocks/potted_red_flower.json rename to src/generated/resources/data/floralis/loot_tables/blocks/potted_red_flower.json index 05126b27..a9882e13 100644 --- a/src/main/resources/data/floralis/loot_tables/blocks/potted_red_flower.json +++ b/src/generated/resources/data/floralis/loot_tables/blocks/potted_red_flower.json @@ -2,34 +2,25 @@ "type": "minecraft:block", "pools": [ { - "rolls": 1, - "bonus_rolls": 0, + "bonus_rolls": 0.0, "entries": [ { "type": "minecraft:item", - "name": "minecraft:flower_pot" + "name": "floralis:red_flower" } ], - "conditions": [ - { - "condition": "minecraft:survives_explosion" - } - ] + "rolls": 1.0 }, { - "rolls": 1, - "bonus_rolls": 0, + "bonus_rolls": 0.0, "entries": [ { "type": "minecraft:item", - "name": "floralis:red_flower" + "name": "minecraft:flower_pot" } ], - "conditions": [ - { - "condition": "minecraft:survives_explosion" - } - ] + "rolls": 1.0 } - ] + ], + "random_sequence": "floralis:blocks/potted_red_flower" } \ No newline at end of file diff --git a/src/main/resources/data/floralis/loot_tables/blocks/potted_white_cactus.json b/src/generated/resources/data/floralis/loot_tables/blocks/potted_white_cactus.json similarity index 52% rename from src/main/resources/data/floralis/loot_tables/blocks/potted_white_cactus.json rename to src/generated/resources/data/floralis/loot_tables/blocks/potted_white_cactus.json index 2c3e1858..2e0c5156 100644 --- a/src/main/resources/data/floralis/loot_tables/blocks/potted_white_cactus.json +++ b/src/generated/resources/data/floralis/loot_tables/blocks/potted_white_cactus.json @@ -2,34 +2,25 @@ "type": "minecraft:block", "pools": [ { - "rolls": 1, - "bonus_rolls": 0, + "bonus_rolls": 0.0, "entries": [ { "type": "minecraft:item", - "name": "minecraft:flower_pot" + "name": "floralis:white_cactus" } ], - "conditions": [ - { - "condition": "minecraft:survives_explosion" - } - ] + "rolls": 1.0 }, { - "rolls": 1, - "bonus_rolls": 0, + "bonus_rolls": 0.0, "entries": [ { "type": "minecraft:item", - "name": "floralis:white_cactus" + "name": "minecraft:flower_pot" } ], - "conditions": [ - { - "condition": "minecraft:survives_explosion" - } - ] + "rolls": 1.0 } - ] + ], + "random_sequence": "floralis:blocks/potted_white_cactus" } \ No newline at end of file diff --git a/src/main/resources/data/floralis/loot_tables/blocks/potted_white_flower.json b/src/generated/resources/data/floralis/loot_tables/blocks/potted_white_flower.json similarity index 52% rename from src/main/resources/data/floralis/loot_tables/blocks/potted_white_flower.json rename to src/generated/resources/data/floralis/loot_tables/blocks/potted_white_flower.json index e03be688..3661d132 100644 --- a/src/main/resources/data/floralis/loot_tables/blocks/potted_white_flower.json +++ b/src/generated/resources/data/floralis/loot_tables/blocks/potted_white_flower.json @@ -2,34 +2,25 @@ "type": "minecraft:block", "pools": [ { - "rolls": 1, - "bonus_rolls": 0, + "bonus_rolls": 0.0, "entries": [ { "type": "minecraft:item", - "name": "minecraft:flower_pot" + "name": "floralis:white_flower" } ], - "conditions": [ - { - "condition": "minecraft:survives_explosion" - } - ] + "rolls": 1.0 }, { - "rolls": 1, - "bonus_rolls": 0, + "bonus_rolls": 0.0, "entries": [ { "type": "minecraft:item", - "name": "floralis:white_flower" + "name": "minecraft:flower_pot" } ], - "conditions": [ - { - "condition": "minecraft:survives_explosion" - } - ] + "rolls": 1.0 } - ] + ], + "random_sequence": "floralis:blocks/potted_white_flower" } \ No newline at end of file diff --git a/src/main/resources/data/floralis/loot_tables/blocks/potted_yellow_cactus.json b/src/generated/resources/data/floralis/loot_tables/blocks/potted_yellow_cactus.json similarity index 52% rename from src/main/resources/data/floralis/loot_tables/blocks/potted_yellow_cactus.json rename to src/generated/resources/data/floralis/loot_tables/blocks/potted_yellow_cactus.json index 99e1243a..1b27466a 100644 --- a/src/main/resources/data/floralis/loot_tables/blocks/potted_yellow_cactus.json +++ b/src/generated/resources/data/floralis/loot_tables/blocks/potted_yellow_cactus.json @@ -2,34 +2,25 @@ "type": "minecraft:block", "pools": [ { - "rolls": 1, - "bonus_rolls": 0, + "bonus_rolls": 0.0, "entries": [ { "type": "minecraft:item", - "name": "minecraft:flower_pot" + "name": "floralis:yellow_cactus" } ], - "conditions": [ - { - "condition": "minecraft:survives_explosion" - } - ] + "rolls": 1.0 }, { - "rolls": 1, - "bonus_rolls": 0, + "bonus_rolls": 0.0, "entries": [ { "type": "minecraft:item", - "name": "floralis:yellow_cactus" + "name": "minecraft:flower_pot" } ], - "conditions": [ - { - "condition": "minecraft:survives_explosion" - } - ] + "rolls": 1.0 } - ] + ], + "random_sequence": "floralis:blocks/potted_yellow_cactus" } \ No newline at end of file diff --git a/src/main/resources/data/floralis/loot_tables/blocks/potted_yellow_flower.json b/src/generated/resources/data/floralis/loot_tables/blocks/potted_yellow_flower.json similarity index 52% rename from src/main/resources/data/floralis/loot_tables/blocks/potted_yellow_flower.json rename to src/generated/resources/data/floralis/loot_tables/blocks/potted_yellow_flower.json index babf8d49..c04a5b36 100644 --- a/src/main/resources/data/floralis/loot_tables/blocks/potted_yellow_flower.json +++ b/src/generated/resources/data/floralis/loot_tables/blocks/potted_yellow_flower.json @@ -2,34 +2,25 @@ "type": "minecraft:block", "pools": [ { - "rolls": 1, - "bonus_rolls": 0, + "bonus_rolls": 0.0, "entries": [ { "type": "minecraft:item", - "name": "minecraft:flower_pot" + "name": "floralis:yellow_flower" } ], - "conditions": [ - { - "condition": "minecraft:survives_explosion" - } - ] + "rolls": 1.0 }, { - "rolls": 1, - "bonus_rolls": 0, + "bonus_rolls": 0.0, "entries": [ { "type": "minecraft:item", - "name": "floralis:yellow_flower" + "name": "minecraft:flower_pot" } ], - "conditions": [ - { - "condition": "minecraft:survives_explosion" - } - ] + "rolls": 1.0 } - ] + ], + "random_sequence": "floralis:blocks/potted_yellow_flower" } \ No newline at end of file diff --git a/src/generated/resources/data/floralis/loot_tables/blocks/purple_cactus.json b/src/generated/resources/data/floralis/loot_tables/blocks/purple_cactus.json new file mode 100644 index 00000000..6cf21b1c --- /dev/null +++ b/src/generated/resources/data/floralis/loot_tables/blocks/purple_cactus.json @@ -0,0 +1,202 @@ +{ + "type": "minecraft:block", + "pools": [ + { + "bonus_rolls": 0.0, + "entries": [ + { + "type": "minecraft:item", + "conditions": [ + { + "condition": "minecraft:any_of", + "terms": [ + { + "condition": "minecraft:match_tool", + "predicate": { + "items": "minecraft:shears" + } + }, + { + "condition": "minecraft:match_tool", + "predicate": { + "predicates": { + "minecraft:enchantments": [ + { + "enchantment": "minecraft:silk_touch", + "levels": { + "min": 1 + } + } + ] + } + } + } + ] + } + ], + "name": "floralis:purple_cactus" + } + ], + "rolls": 1.0 + }, + { + "bonus_rolls": 0.0, + "entries": [ + { + "type": "minecraft:item", + "conditions": [ + { + "condition": "minecraft:inverted", + "term": { + "condition": "minecraft:any_of", + "terms": [ + { + "condition": "minecraft:match_tool", + "predicate": { + "items": "minecraft:shears" + } + }, + { + "condition": "minecraft:match_tool", + "predicate": { + "predicates": { + "minecraft:enchantments": [ + { + "enchantment": "minecraft:silk_touch", + "levels": { + "min": 1 + } + } + ] + } + } + } + ] + } + } + ], + "functions": [ + { + "enchantment": "minecraft:fortune", + "formula": "minecraft:uniform_bonus_count", + "function": "minecraft:apply_bonus", + "parameters": { + "bonusMultiplier": 2 + } + }, + { + "add": false, + "count": 2.0, + "function": "minecraft:set_count" + } + ], + "name": "floralis:purple_cactus_seeds" + } + ], + "rolls": 1.0 + }, + { + "bonus_rolls": 0.0, + "entries": [ + { + "type": "minecraft:item", + "conditions": [ + { + "condition": "minecraft:inverted", + "term": { + "condition": "minecraft:any_of", + "terms": [ + { + "condition": "minecraft:match_tool", + "predicate": { + "items": "minecraft:shears" + } + }, + { + "condition": "minecraft:match_tool", + "predicate": { + "predicates": { + "minecraft:enchantments": [ + { + "enchantment": "minecraft:silk_touch", + "levels": { + "min": 1 + } + } + ] + } + } + } + ] + } + } + ], + "functions": [ + { + "enchantment": "minecraft:fortune", + "formula": "minecraft:uniform_bonus_count", + "function": "minecraft:apply_bonus", + "parameters": { + "bonusMultiplier": 2 + } + } + ], + "name": "floralis:purple_petals" + } + ], + "rolls": 1.0 + }, + { + "bonus_rolls": 0.0, + "entries": [ + { + "type": "minecraft:item", + "conditions": [ + { + "condition": "minecraft:inverted", + "term": { + "condition": "minecraft:any_of", + "terms": [ + { + "condition": "minecraft:match_tool", + "predicate": { + "items": "minecraft:shears" + } + }, + { + "condition": "minecraft:match_tool", + "predicate": { + "predicates": { + "minecraft:enchantments": [ + { + "enchantment": "minecraft:silk_touch", + "levels": { + "min": 1 + } + } + ] + } + } + } + ] + } + } + ], + "functions": [ + { + "enchantment": "minecraft:fortune", + "formula": "minecraft:uniform_bonus_count", + "function": "minecraft:apply_bonus", + "parameters": { + "bonusMultiplier": 2 + } + } + ], + "name": "floralis:plant_fibers" + } + ], + "rolls": 1.0 + } + ], + "random_sequence": "floralis:blocks/purple_cactus" +} \ No newline at end of file diff --git a/src/generated/resources/data/floralis/loot_tables/blocks/purple_cactus_crop.json b/src/generated/resources/data/floralis/loot_tables/blocks/purple_cactus_crop.json new file mode 100644 index 00000000..09287837 --- /dev/null +++ b/src/generated/resources/data/floralis/loot_tables/blocks/purple_cactus_crop.json @@ -0,0 +1,329 @@ +{ + "type": "minecraft:block", + "pools": [ + { + "bonus_rolls": 0.0, + "entries": [ + { + "type": "minecraft:item", + "conditions": [ + { + "condition": "minecraft:any_of", + "terms": [ + { + "condition": "minecraft:match_tool", + "predicate": { + "items": "minecraft:shears" + } + }, + { + "condition": "minecraft:match_tool", + "predicate": { + "predicates": { + "minecraft:enchantments": [ + { + "enchantment": "minecraft:silk_touch", + "levels": { + "min": 1 + } + } + ] + } + } + } + ] + }, + { + "block": "floralis:purple_cactus_crop", + "condition": "minecraft:block_state_property", + "properties": { + "age": "5" + } + } + ], + "name": "floralis:purple_cactus" + } + ], + "rolls": 1.0 + }, + { + "bonus_rolls": 0.0, + "entries": [ + { + "type": "minecraft:item", + "conditions": [ + { + "condition": "minecraft:any_of", + "terms": [ + { + "condition": "minecraft:match_tool", + "predicate": { + "items": "minecraft:shears" + } + }, + { + "condition": "minecraft:match_tool", + "predicate": { + "predicates": { + "minecraft:enchantments": [ + { + "enchantment": "minecraft:silk_touch", + "levels": { + "min": 1 + } + } + ] + } + } + } + ] + }, + { + "condition": "minecraft:inverted", + "term": { + "block": "floralis:purple_cactus_crop", + "condition": "minecraft:block_state_property", + "properties": { + "age": "5" + } + } + } + ], + "name": "floralis:purple_cactus_seeds" + } + ], + "rolls": 1.0 + }, + { + "bonus_rolls": 0.0, + "entries": [ + { + "type": "minecraft:item", + "conditions": [ + { + "condition": "minecraft:inverted", + "term": { + "condition": "minecraft:any_of", + "terms": [ + { + "condition": "minecraft:match_tool", + "predicate": { + "items": "minecraft:shears" + } + }, + { + "condition": "minecraft:match_tool", + "predicate": { + "predicates": { + "minecraft:enchantments": [ + { + "enchantment": "minecraft:silk_touch", + "levels": { + "min": 1 + } + } + ] + } + } + } + ] + } + }, + { + "block": "floralis:purple_cactus_crop", + "condition": "minecraft:block_state_property", + "properties": { + "age": "5" + } + } + ], + "functions": [ + { + "enchantment": "minecraft:fortune", + "formula": "minecraft:uniform_bonus_count", + "function": "minecraft:apply_bonus", + "parameters": { + "bonusMultiplier": 2 + } + }, + { + "add": false, + "count": 2.0, + "function": "minecraft:set_count" + } + ], + "name": "floralis:purple_cactus_seeds" + } + ], + "rolls": 1.0 + }, + { + "bonus_rolls": 0.0, + "entries": [ + { + "type": "minecraft:item", + "conditions": [ + { + "condition": "minecraft:inverted", + "term": { + "condition": "minecraft:any_of", + "terms": [ + { + "condition": "minecraft:match_tool", + "predicate": { + "items": "minecraft:shears" + } + }, + { + "condition": "minecraft:match_tool", + "predicate": { + "predicates": { + "minecraft:enchantments": [ + { + "enchantment": "minecraft:silk_touch", + "levels": { + "min": 1 + } + } + ] + } + } + } + ] + } + }, + { + "block": "floralis:purple_cactus_crop", + "condition": "minecraft:block_state_property", + "properties": { + "age": "5" + } + } + ], + "functions": [ + { + "enchantment": "minecraft:fortune", + "formula": "minecraft:uniform_bonus_count", + "function": "minecraft:apply_bonus", + "parameters": { + "bonusMultiplier": 2 + } + } + ], + "name": "floralis:purple_petals" + } + ], + "rolls": 1.0 + }, + { + "bonus_rolls": 0.0, + "entries": [ + { + "type": "minecraft:item", + "conditions": [ + { + "condition": "minecraft:inverted", + "term": { + "condition": "minecraft:any_of", + "terms": [ + { + "condition": "minecraft:match_tool", + "predicate": { + "items": "minecraft:shears" + } + }, + { + "condition": "minecraft:match_tool", + "predicate": { + "predicates": { + "minecraft:enchantments": [ + { + "enchantment": "minecraft:silk_touch", + "levels": { + "min": 1 + } + } + ] + } + } + } + ] + } + }, + { + "block": "floralis:purple_cactus_crop", + "condition": "minecraft:block_state_property", + "properties": { + "age": "5" + } + } + ], + "functions": [ + { + "enchantment": "minecraft:fortune", + "formula": "minecraft:uniform_bonus_count", + "function": "minecraft:apply_bonus", + "parameters": { + "bonusMultiplier": 2 + } + } + ], + "name": "floralis:plant_fibers" + } + ], + "rolls": 1.0 + }, + { + "bonus_rolls": 0.0, + "entries": [ + { + "type": "minecraft:item", + "conditions": [ + { + "condition": "minecraft:inverted", + "term": { + "condition": "minecraft:any_of", + "terms": [ + { + "condition": "minecraft:match_tool", + "predicate": { + "items": "minecraft:shears" + } + }, + { + "condition": "minecraft:match_tool", + "predicate": { + "predicates": { + "minecraft:enchantments": [ + { + "enchantment": "minecraft:silk_touch", + "levels": { + "min": 1 + } + } + ] + } + } + } + ] + } + }, + { + "condition": "minecraft:inverted", + "term": { + "block": "floralis:purple_cactus_crop", + "condition": "minecraft:block_state_property", + "properties": { + "age": "5" + } + } + } + ], + "name": "floralis:purple_cactus_seeds" + } + ], + "rolls": 1.0 + } + ], + "random_sequence": "floralis:blocks/purple_cactus_crop" +} \ No newline at end of file diff --git a/src/main/resources/data/floralis/loot_tables/blocks/purple_dye_block.json b/src/generated/resources/data/floralis/loot_tables/blocks/purple_dye_block.json similarity index 55% rename from src/main/resources/data/floralis/loot_tables/blocks/purple_dye_block.json rename to src/generated/resources/data/floralis/loot_tables/blocks/purple_dye_block.json index 60882001..1bc4199d 100644 --- a/src/main/resources/data/floralis/loot_tables/blocks/purple_dye_block.json +++ b/src/generated/resources/data/floralis/loot_tables/blocks/purple_dye_block.json @@ -2,19 +2,15 @@ "type": "minecraft:block", "pools": [ { - "rolls": 1, - "bonus_rolls": 0, + "bonus_rolls": 0.0, "entries": [ { "type": "minecraft:item", "name": "floralis:purple_dye_block" } ], - "conditions": [ - { - "condition": "minecraft:survives_explosion" - } - ] + "rolls": 1.0 } - ] + ], + "random_sequence": "floralis:blocks/purple_dye_block" } \ No newline at end of file diff --git a/src/generated/resources/data/floralis/loot_tables/blocks/purple_flower.json b/src/generated/resources/data/floralis/loot_tables/blocks/purple_flower.json new file mode 100644 index 00000000..7799bce2 --- /dev/null +++ b/src/generated/resources/data/floralis/loot_tables/blocks/purple_flower.json @@ -0,0 +1,202 @@ +{ + "type": "minecraft:block", + "pools": [ + { + "bonus_rolls": 0.0, + "entries": [ + { + "type": "minecraft:item", + "conditions": [ + { + "condition": "minecraft:any_of", + "terms": [ + { + "condition": "minecraft:match_tool", + "predicate": { + "items": "minecraft:shears" + } + }, + { + "condition": "minecraft:match_tool", + "predicate": { + "predicates": { + "minecraft:enchantments": [ + { + "enchantment": "minecraft:silk_touch", + "levels": { + "min": 1 + } + } + ] + } + } + } + ] + } + ], + "name": "floralis:purple_flower" + } + ], + "rolls": 1.0 + }, + { + "bonus_rolls": 0.0, + "entries": [ + { + "type": "minecraft:item", + "conditions": [ + { + "condition": "minecraft:inverted", + "term": { + "condition": "minecraft:any_of", + "terms": [ + { + "condition": "minecraft:match_tool", + "predicate": { + "items": "minecraft:shears" + } + }, + { + "condition": "minecraft:match_tool", + "predicate": { + "predicates": { + "minecraft:enchantments": [ + { + "enchantment": "minecraft:silk_touch", + "levels": { + "min": 1 + } + } + ] + } + } + } + ] + } + } + ], + "functions": [ + { + "enchantment": "minecraft:fortune", + "formula": "minecraft:uniform_bonus_count", + "function": "minecraft:apply_bonus", + "parameters": { + "bonusMultiplier": 2 + } + }, + { + "add": false, + "count": 2.0, + "function": "minecraft:set_count" + } + ], + "name": "floralis:purple_flower_seeds" + } + ], + "rolls": 1.0 + }, + { + "bonus_rolls": 0.0, + "entries": [ + { + "type": "minecraft:item", + "conditions": [ + { + "condition": "minecraft:inverted", + "term": { + "condition": "minecraft:any_of", + "terms": [ + { + "condition": "minecraft:match_tool", + "predicate": { + "items": "minecraft:shears" + } + }, + { + "condition": "minecraft:match_tool", + "predicate": { + "predicates": { + "minecraft:enchantments": [ + { + "enchantment": "minecraft:silk_touch", + "levels": { + "min": 1 + } + } + ] + } + } + } + ] + } + } + ], + "functions": [ + { + "enchantment": "minecraft:fortune", + "formula": "minecraft:uniform_bonus_count", + "function": "minecraft:apply_bonus", + "parameters": { + "bonusMultiplier": 2 + } + } + ], + "name": "floralis:purple_petals" + } + ], + "rolls": 1.0 + }, + { + "bonus_rolls": 0.0, + "entries": [ + { + "type": "minecraft:item", + "conditions": [ + { + "condition": "minecraft:inverted", + "term": { + "condition": "minecraft:any_of", + "terms": [ + { + "condition": "minecraft:match_tool", + "predicate": { + "items": "minecraft:shears" + } + }, + { + "condition": "minecraft:match_tool", + "predicate": { + "predicates": { + "minecraft:enchantments": [ + { + "enchantment": "minecraft:silk_touch", + "levels": { + "min": 1 + } + } + ] + } + } + } + ] + } + } + ], + "functions": [ + { + "enchantment": "minecraft:fortune", + "formula": "minecraft:uniform_bonus_count", + "function": "minecraft:apply_bonus", + "parameters": { + "bonusMultiplier": 2 + } + } + ], + "name": "floralis:plant_fibers" + } + ], + "rolls": 1.0 + } + ], + "random_sequence": "floralis:blocks/purple_flower" +} \ No newline at end of file diff --git a/src/generated/resources/data/floralis/loot_tables/blocks/purple_flower_crop.json b/src/generated/resources/data/floralis/loot_tables/blocks/purple_flower_crop.json new file mode 100644 index 00000000..e057ee76 --- /dev/null +++ b/src/generated/resources/data/floralis/loot_tables/blocks/purple_flower_crop.json @@ -0,0 +1,329 @@ +{ + "type": "minecraft:block", + "pools": [ + { + "bonus_rolls": 0.0, + "entries": [ + { + "type": "minecraft:item", + "conditions": [ + { + "condition": "minecraft:any_of", + "terms": [ + { + "condition": "minecraft:match_tool", + "predicate": { + "items": "minecraft:shears" + } + }, + { + "condition": "minecraft:match_tool", + "predicate": { + "predicates": { + "minecraft:enchantments": [ + { + "enchantment": "minecraft:silk_touch", + "levels": { + "min": 1 + } + } + ] + } + } + } + ] + }, + { + "block": "floralis:purple_flower_crop", + "condition": "minecraft:block_state_property", + "properties": { + "age": "5" + } + } + ], + "name": "floralis:purple_flower" + } + ], + "rolls": 1.0 + }, + { + "bonus_rolls": 0.0, + "entries": [ + { + "type": "minecraft:item", + "conditions": [ + { + "condition": "minecraft:any_of", + "terms": [ + { + "condition": "minecraft:match_tool", + "predicate": { + "items": "minecraft:shears" + } + }, + { + "condition": "minecraft:match_tool", + "predicate": { + "predicates": { + "minecraft:enchantments": [ + { + "enchantment": "minecraft:silk_touch", + "levels": { + "min": 1 + } + } + ] + } + } + } + ] + }, + { + "condition": "minecraft:inverted", + "term": { + "block": "floralis:purple_flower_crop", + "condition": "minecraft:block_state_property", + "properties": { + "age": "5" + } + } + } + ], + "name": "floralis:purple_flower_seeds" + } + ], + "rolls": 1.0 + }, + { + "bonus_rolls": 0.0, + "entries": [ + { + "type": "minecraft:item", + "conditions": [ + { + "condition": "minecraft:inverted", + "term": { + "condition": "minecraft:any_of", + "terms": [ + { + "condition": "minecraft:match_tool", + "predicate": { + "items": "minecraft:shears" + } + }, + { + "condition": "minecraft:match_tool", + "predicate": { + "predicates": { + "minecraft:enchantments": [ + { + "enchantment": "minecraft:silk_touch", + "levels": { + "min": 1 + } + } + ] + } + } + } + ] + } + }, + { + "block": "floralis:purple_flower_crop", + "condition": "minecraft:block_state_property", + "properties": { + "age": "5" + } + } + ], + "functions": [ + { + "enchantment": "minecraft:fortune", + "formula": "minecraft:uniform_bonus_count", + "function": "minecraft:apply_bonus", + "parameters": { + "bonusMultiplier": 2 + } + }, + { + "add": false, + "count": 2.0, + "function": "minecraft:set_count" + } + ], + "name": "floralis:purple_flower_seeds" + } + ], + "rolls": 1.0 + }, + { + "bonus_rolls": 0.0, + "entries": [ + { + "type": "minecraft:item", + "conditions": [ + { + "condition": "minecraft:inverted", + "term": { + "condition": "minecraft:any_of", + "terms": [ + { + "condition": "minecraft:match_tool", + "predicate": { + "items": "minecraft:shears" + } + }, + { + "condition": "minecraft:match_tool", + "predicate": { + "predicates": { + "minecraft:enchantments": [ + { + "enchantment": "minecraft:silk_touch", + "levels": { + "min": 1 + } + } + ] + } + } + } + ] + } + }, + { + "block": "floralis:purple_flower_crop", + "condition": "minecraft:block_state_property", + "properties": { + "age": "5" + } + } + ], + "functions": [ + { + "enchantment": "minecraft:fortune", + "formula": "minecraft:uniform_bonus_count", + "function": "minecraft:apply_bonus", + "parameters": { + "bonusMultiplier": 2 + } + } + ], + "name": "floralis:purple_petals" + } + ], + "rolls": 1.0 + }, + { + "bonus_rolls": 0.0, + "entries": [ + { + "type": "minecraft:item", + "conditions": [ + { + "condition": "minecraft:inverted", + "term": { + "condition": "minecraft:any_of", + "terms": [ + { + "condition": "minecraft:match_tool", + "predicate": { + "items": "minecraft:shears" + } + }, + { + "condition": "minecraft:match_tool", + "predicate": { + "predicates": { + "minecraft:enchantments": [ + { + "enchantment": "minecraft:silk_touch", + "levels": { + "min": 1 + } + } + ] + } + } + } + ] + } + }, + { + "block": "floralis:purple_flower_crop", + "condition": "minecraft:block_state_property", + "properties": { + "age": "5" + } + } + ], + "functions": [ + { + "enchantment": "minecraft:fortune", + "formula": "minecraft:uniform_bonus_count", + "function": "minecraft:apply_bonus", + "parameters": { + "bonusMultiplier": 2 + } + } + ], + "name": "floralis:plant_fibers" + } + ], + "rolls": 1.0 + }, + { + "bonus_rolls": 0.0, + "entries": [ + { + "type": "minecraft:item", + "conditions": [ + { + "condition": "minecraft:inverted", + "term": { + "condition": "minecraft:any_of", + "terms": [ + { + "condition": "minecraft:match_tool", + "predicate": { + "items": "minecraft:shears" + } + }, + { + "condition": "minecraft:match_tool", + "predicate": { + "predicates": { + "minecraft:enchantments": [ + { + "enchantment": "minecraft:silk_touch", + "levels": { + "min": 1 + } + } + ] + } + } + } + ] + } + }, + { + "condition": "minecraft:inverted", + "term": { + "block": "floralis:purple_flower_crop", + "condition": "minecraft:block_state_property", + "properties": { + "age": "5" + } + } + } + ], + "name": "floralis:purple_flower_seeds" + } + ], + "rolls": 1.0 + } + ], + "random_sequence": "floralis:blocks/purple_flower_crop" +} \ No newline at end of file diff --git a/src/generated/resources/data/floralis/loot_tables/blocks/red_cactus.json b/src/generated/resources/data/floralis/loot_tables/blocks/red_cactus.json new file mode 100644 index 00000000..68cc96d2 --- /dev/null +++ b/src/generated/resources/data/floralis/loot_tables/blocks/red_cactus.json @@ -0,0 +1,202 @@ +{ + "type": "minecraft:block", + "pools": [ + { + "bonus_rolls": 0.0, + "entries": [ + { + "type": "minecraft:item", + "conditions": [ + { + "condition": "minecraft:any_of", + "terms": [ + { + "condition": "minecraft:match_tool", + "predicate": { + "items": "minecraft:shears" + } + }, + { + "condition": "minecraft:match_tool", + "predicate": { + "predicates": { + "minecraft:enchantments": [ + { + "enchantment": "minecraft:silk_touch", + "levels": { + "min": 1 + } + } + ] + } + } + } + ] + } + ], + "name": "floralis:red_cactus" + } + ], + "rolls": 1.0 + }, + { + "bonus_rolls": 0.0, + "entries": [ + { + "type": "minecraft:item", + "conditions": [ + { + "condition": "minecraft:inverted", + "term": { + "condition": "minecraft:any_of", + "terms": [ + { + "condition": "minecraft:match_tool", + "predicate": { + "items": "minecraft:shears" + } + }, + { + "condition": "minecraft:match_tool", + "predicate": { + "predicates": { + "minecraft:enchantments": [ + { + "enchantment": "minecraft:silk_touch", + "levels": { + "min": 1 + } + } + ] + } + } + } + ] + } + } + ], + "functions": [ + { + "enchantment": "minecraft:fortune", + "formula": "minecraft:uniform_bonus_count", + "function": "minecraft:apply_bonus", + "parameters": { + "bonusMultiplier": 2 + } + }, + { + "add": false, + "count": 2.0, + "function": "minecraft:set_count" + } + ], + "name": "floralis:red_cactus_seeds" + } + ], + "rolls": 1.0 + }, + { + "bonus_rolls": 0.0, + "entries": [ + { + "type": "minecraft:item", + "conditions": [ + { + "condition": "minecraft:inverted", + "term": { + "condition": "minecraft:any_of", + "terms": [ + { + "condition": "minecraft:match_tool", + "predicate": { + "items": "minecraft:shears" + } + }, + { + "condition": "minecraft:match_tool", + "predicate": { + "predicates": { + "minecraft:enchantments": [ + { + "enchantment": "minecraft:silk_touch", + "levels": { + "min": 1 + } + } + ] + } + } + } + ] + } + } + ], + "functions": [ + { + "enchantment": "minecraft:fortune", + "formula": "minecraft:uniform_bonus_count", + "function": "minecraft:apply_bonus", + "parameters": { + "bonusMultiplier": 2 + } + } + ], + "name": "floralis:red_petals" + } + ], + "rolls": 1.0 + }, + { + "bonus_rolls": 0.0, + "entries": [ + { + "type": "minecraft:item", + "conditions": [ + { + "condition": "minecraft:inverted", + "term": { + "condition": "minecraft:any_of", + "terms": [ + { + "condition": "minecraft:match_tool", + "predicate": { + "items": "minecraft:shears" + } + }, + { + "condition": "minecraft:match_tool", + "predicate": { + "predicates": { + "minecraft:enchantments": [ + { + "enchantment": "minecraft:silk_touch", + "levels": { + "min": 1 + } + } + ] + } + } + } + ] + } + } + ], + "functions": [ + { + "enchantment": "minecraft:fortune", + "formula": "minecraft:uniform_bonus_count", + "function": "minecraft:apply_bonus", + "parameters": { + "bonusMultiplier": 2 + } + } + ], + "name": "floralis:plant_fibers" + } + ], + "rolls": 1.0 + } + ], + "random_sequence": "floralis:blocks/red_cactus" +} \ No newline at end of file diff --git a/src/generated/resources/data/floralis/loot_tables/blocks/red_cactus_crop.json b/src/generated/resources/data/floralis/loot_tables/blocks/red_cactus_crop.json new file mode 100644 index 00000000..b54263e9 --- /dev/null +++ b/src/generated/resources/data/floralis/loot_tables/blocks/red_cactus_crop.json @@ -0,0 +1,329 @@ +{ + "type": "minecraft:block", + "pools": [ + { + "bonus_rolls": 0.0, + "entries": [ + { + "type": "minecraft:item", + "conditions": [ + { + "condition": "minecraft:any_of", + "terms": [ + { + "condition": "minecraft:match_tool", + "predicate": { + "items": "minecraft:shears" + } + }, + { + "condition": "minecraft:match_tool", + "predicate": { + "predicates": { + "minecraft:enchantments": [ + { + "enchantment": "minecraft:silk_touch", + "levels": { + "min": 1 + } + } + ] + } + } + } + ] + }, + { + "block": "floralis:red_cactus_crop", + "condition": "minecraft:block_state_property", + "properties": { + "age": "5" + } + } + ], + "name": "floralis:red_cactus" + } + ], + "rolls": 1.0 + }, + { + "bonus_rolls": 0.0, + "entries": [ + { + "type": "minecraft:item", + "conditions": [ + { + "condition": "minecraft:any_of", + "terms": [ + { + "condition": "minecraft:match_tool", + "predicate": { + "items": "minecraft:shears" + } + }, + { + "condition": "minecraft:match_tool", + "predicate": { + "predicates": { + "minecraft:enchantments": [ + { + "enchantment": "minecraft:silk_touch", + "levels": { + "min": 1 + } + } + ] + } + } + } + ] + }, + { + "condition": "minecraft:inverted", + "term": { + "block": "floralis:red_cactus_crop", + "condition": "minecraft:block_state_property", + "properties": { + "age": "5" + } + } + } + ], + "name": "floralis:red_cactus_seeds" + } + ], + "rolls": 1.0 + }, + { + "bonus_rolls": 0.0, + "entries": [ + { + "type": "minecraft:item", + "conditions": [ + { + "condition": "minecraft:inverted", + "term": { + "condition": "minecraft:any_of", + "terms": [ + { + "condition": "minecraft:match_tool", + "predicate": { + "items": "minecraft:shears" + } + }, + { + "condition": "minecraft:match_tool", + "predicate": { + "predicates": { + "minecraft:enchantments": [ + { + "enchantment": "minecraft:silk_touch", + "levels": { + "min": 1 + } + } + ] + } + } + } + ] + } + }, + { + "block": "floralis:red_cactus_crop", + "condition": "minecraft:block_state_property", + "properties": { + "age": "5" + } + } + ], + "functions": [ + { + "enchantment": "minecraft:fortune", + "formula": "minecraft:uniform_bonus_count", + "function": "minecraft:apply_bonus", + "parameters": { + "bonusMultiplier": 2 + } + }, + { + "add": false, + "count": 2.0, + "function": "minecraft:set_count" + } + ], + "name": "floralis:red_cactus_seeds" + } + ], + "rolls": 1.0 + }, + { + "bonus_rolls": 0.0, + "entries": [ + { + "type": "minecraft:item", + "conditions": [ + { + "condition": "minecraft:inverted", + "term": { + "condition": "minecraft:any_of", + "terms": [ + { + "condition": "minecraft:match_tool", + "predicate": { + "items": "minecraft:shears" + } + }, + { + "condition": "minecraft:match_tool", + "predicate": { + "predicates": { + "minecraft:enchantments": [ + { + "enchantment": "minecraft:silk_touch", + "levels": { + "min": 1 + } + } + ] + } + } + } + ] + } + }, + { + "block": "floralis:red_cactus_crop", + "condition": "minecraft:block_state_property", + "properties": { + "age": "5" + } + } + ], + "functions": [ + { + "enchantment": "minecraft:fortune", + "formula": "minecraft:uniform_bonus_count", + "function": "minecraft:apply_bonus", + "parameters": { + "bonusMultiplier": 2 + } + } + ], + "name": "floralis:red_petals" + } + ], + "rolls": 1.0 + }, + { + "bonus_rolls": 0.0, + "entries": [ + { + "type": "minecraft:item", + "conditions": [ + { + "condition": "minecraft:inverted", + "term": { + "condition": "minecraft:any_of", + "terms": [ + { + "condition": "minecraft:match_tool", + "predicate": { + "items": "minecraft:shears" + } + }, + { + "condition": "minecraft:match_tool", + "predicate": { + "predicates": { + "minecraft:enchantments": [ + { + "enchantment": "minecraft:silk_touch", + "levels": { + "min": 1 + } + } + ] + } + } + } + ] + } + }, + { + "block": "floralis:red_cactus_crop", + "condition": "minecraft:block_state_property", + "properties": { + "age": "5" + } + } + ], + "functions": [ + { + "enchantment": "minecraft:fortune", + "formula": "minecraft:uniform_bonus_count", + "function": "minecraft:apply_bonus", + "parameters": { + "bonusMultiplier": 2 + } + } + ], + "name": "floralis:plant_fibers" + } + ], + "rolls": 1.0 + }, + { + "bonus_rolls": 0.0, + "entries": [ + { + "type": "minecraft:item", + "conditions": [ + { + "condition": "minecraft:inverted", + "term": { + "condition": "minecraft:any_of", + "terms": [ + { + "condition": "minecraft:match_tool", + "predicate": { + "items": "minecraft:shears" + } + }, + { + "condition": "minecraft:match_tool", + "predicate": { + "predicates": { + "minecraft:enchantments": [ + { + "enchantment": "minecraft:silk_touch", + "levels": { + "min": 1 + } + } + ] + } + } + } + ] + } + }, + { + "condition": "minecraft:inverted", + "term": { + "block": "floralis:red_cactus_crop", + "condition": "minecraft:block_state_property", + "properties": { + "age": "5" + } + } + } + ], + "name": "floralis:red_cactus_seeds" + } + ], + "rolls": 1.0 + } + ], + "random_sequence": "floralis:blocks/red_cactus_crop" +} \ No newline at end of file diff --git a/src/main/resources/data/floralis/loot_tables/blocks/red_dye_block.json b/src/generated/resources/data/floralis/loot_tables/blocks/red_dye_block.json similarity index 55% rename from src/main/resources/data/floralis/loot_tables/blocks/red_dye_block.json rename to src/generated/resources/data/floralis/loot_tables/blocks/red_dye_block.json index 62f6f8cb..e901dcab 100644 --- a/src/main/resources/data/floralis/loot_tables/blocks/red_dye_block.json +++ b/src/generated/resources/data/floralis/loot_tables/blocks/red_dye_block.json @@ -2,19 +2,15 @@ "type": "minecraft:block", "pools": [ { - "rolls": 1, - "bonus_rolls": 0, + "bonus_rolls": 0.0, "entries": [ { "type": "minecraft:item", "name": "floralis:red_dye_block" } ], - "conditions": [ - { - "condition": "minecraft:survives_explosion" - } - ] + "rolls": 1.0 } - ] + ], + "random_sequence": "floralis:blocks/red_dye_block" } \ No newline at end of file diff --git a/src/generated/resources/data/floralis/loot_tables/blocks/red_flower.json b/src/generated/resources/data/floralis/loot_tables/blocks/red_flower.json new file mode 100644 index 00000000..f0a6ecb7 --- /dev/null +++ b/src/generated/resources/data/floralis/loot_tables/blocks/red_flower.json @@ -0,0 +1,202 @@ +{ + "type": "minecraft:block", + "pools": [ + { + "bonus_rolls": 0.0, + "entries": [ + { + "type": "minecraft:item", + "conditions": [ + { + "condition": "minecraft:any_of", + "terms": [ + { + "condition": "minecraft:match_tool", + "predicate": { + "items": "minecraft:shears" + } + }, + { + "condition": "minecraft:match_tool", + "predicate": { + "predicates": { + "minecraft:enchantments": [ + { + "enchantment": "minecraft:silk_touch", + "levels": { + "min": 1 + } + } + ] + } + } + } + ] + } + ], + "name": "floralis:red_flower" + } + ], + "rolls": 1.0 + }, + { + "bonus_rolls": 0.0, + "entries": [ + { + "type": "minecraft:item", + "conditions": [ + { + "condition": "minecraft:inverted", + "term": { + "condition": "minecraft:any_of", + "terms": [ + { + "condition": "minecraft:match_tool", + "predicate": { + "items": "minecraft:shears" + } + }, + { + "condition": "minecraft:match_tool", + "predicate": { + "predicates": { + "minecraft:enchantments": [ + { + "enchantment": "minecraft:silk_touch", + "levels": { + "min": 1 + } + } + ] + } + } + } + ] + } + } + ], + "functions": [ + { + "enchantment": "minecraft:fortune", + "formula": "minecraft:uniform_bonus_count", + "function": "minecraft:apply_bonus", + "parameters": { + "bonusMultiplier": 2 + } + }, + { + "add": false, + "count": 2.0, + "function": "minecraft:set_count" + } + ], + "name": "floralis:red_flower_seeds" + } + ], + "rolls": 1.0 + }, + { + "bonus_rolls": 0.0, + "entries": [ + { + "type": "minecraft:item", + "conditions": [ + { + "condition": "minecraft:inverted", + "term": { + "condition": "minecraft:any_of", + "terms": [ + { + "condition": "minecraft:match_tool", + "predicate": { + "items": "minecraft:shears" + } + }, + { + "condition": "minecraft:match_tool", + "predicate": { + "predicates": { + "minecraft:enchantments": [ + { + "enchantment": "minecraft:silk_touch", + "levels": { + "min": 1 + } + } + ] + } + } + } + ] + } + } + ], + "functions": [ + { + "enchantment": "minecraft:fortune", + "formula": "minecraft:uniform_bonus_count", + "function": "minecraft:apply_bonus", + "parameters": { + "bonusMultiplier": 2 + } + } + ], + "name": "floralis:red_petals" + } + ], + "rolls": 1.0 + }, + { + "bonus_rolls": 0.0, + "entries": [ + { + "type": "minecraft:item", + "conditions": [ + { + "condition": "minecraft:inverted", + "term": { + "condition": "minecraft:any_of", + "terms": [ + { + "condition": "minecraft:match_tool", + "predicate": { + "items": "minecraft:shears" + } + }, + { + "condition": "minecraft:match_tool", + "predicate": { + "predicates": { + "minecraft:enchantments": [ + { + "enchantment": "minecraft:silk_touch", + "levels": { + "min": 1 + } + } + ] + } + } + } + ] + } + } + ], + "functions": [ + { + "enchantment": "minecraft:fortune", + "formula": "minecraft:uniform_bonus_count", + "function": "minecraft:apply_bonus", + "parameters": { + "bonusMultiplier": 2 + } + } + ], + "name": "floralis:plant_fibers" + } + ], + "rolls": 1.0 + } + ], + "random_sequence": "floralis:blocks/red_flower" +} \ No newline at end of file diff --git a/src/generated/resources/data/floralis/loot_tables/blocks/red_flower_crop.json b/src/generated/resources/data/floralis/loot_tables/blocks/red_flower_crop.json new file mode 100644 index 00000000..34387c6e --- /dev/null +++ b/src/generated/resources/data/floralis/loot_tables/blocks/red_flower_crop.json @@ -0,0 +1,329 @@ +{ + "type": "minecraft:block", + "pools": [ + { + "bonus_rolls": 0.0, + "entries": [ + { + "type": "minecraft:item", + "conditions": [ + { + "condition": "minecraft:any_of", + "terms": [ + { + "condition": "minecraft:match_tool", + "predicate": { + "items": "minecraft:shears" + } + }, + { + "condition": "minecraft:match_tool", + "predicate": { + "predicates": { + "minecraft:enchantments": [ + { + "enchantment": "minecraft:silk_touch", + "levels": { + "min": 1 + } + } + ] + } + } + } + ] + }, + { + "block": "floralis:red_flower_crop", + "condition": "minecraft:block_state_property", + "properties": { + "age": "5" + } + } + ], + "name": "floralis:red_flower" + } + ], + "rolls": 1.0 + }, + { + "bonus_rolls": 0.0, + "entries": [ + { + "type": "minecraft:item", + "conditions": [ + { + "condition": "minecraft:any_of", + "terms": [ + { + "condition": "minecraft:match_tool", + "predicate": { + "items": "minecraft:shears" + } + }, + { + "condition": "minecraft:match_tool", + "predicate": { + "predicates": { + "minecraft:enchantments": [ + { + "enchantment": "minecraft:silk_touch", + "levels": { + "min": 1 + } + } + ] + } + } + } + ] + }, + { + "condition": "minecraft:inverted", + "term": { + "block": "floralis:red_flower_crop", + "condition": "minecraft:block_state_property", + "properties": { + "age": "5" + } + } + } + ], + "name": "floralis:red_flower_seeds" + } + ], + "rolls": 1.0 + }, + { + "bonus_rolls": 0.0, + "entries": [ + { + "type": "minecraft:item", + "conditions": [ + { + "condition": "minecraft:inverted", + "term": { + "condition": "minecraft:any_of", + "terms": [ + { + "condition": "minecraft:match_tool", + "predicate": { + "items": "minecraft:shears" + } + }, + { + "condition": "minecraft:match_tool", + "predicate": { + "predicates": { + "minecraft:enchantments": [ + { + "enchantment": "minecraft:silk_touch", + "levels": { + "min": 1 + } + } + ] + } + } + } + ] + } + }, + { + "block": "floralis:red_flower_crop", + "condition": "minecraft:block_state_property", + "properties": { + "age": "5" + } + } + ], + "functions": [ + { + "enchantment": "minecraft:fortune", + "formula": "minecraft:uniform_bonus_count", + "function": "minecraft:apply_bonus", + "parameters": { + "bonusMultiplier": 2 + } + }, + { + "add": false, + "count": 2.0, + "function": "minecraft:set_count" + } + ], + "name": "floralis:red_flower_seeds" + } + ], + "rolls": 1.0 + }, + { + "bonus_rolls": 0.0, + "entries": [ + { + "type": "minecraft:item", + "conditions": [ + { + "condition": "minecraft:inverted", + "term": { + "condition": "minecraft:any_of", + "terms": [ + { + "condition": "minecraft:match_tool", + "predicate": { + "items": "minecraft:shears" + } + }, + { + "condition": "minecraft:match_tool", + "predicate": { + "predicates": { + "minecraft:enchantments": [ + { + "enchantment": "minecraft:silk_touch", + "levels": { + "min": 1 + } + } + ] + } + } + } + ] + } + }, + { + "block": "floralis:red_flower_crop", + "condition": "minecraft:block_state_property", + "properties": { + "age": "5" + } + } + ], + "functions": [ + { + "enchantment": "minecraft:fortune", + "formula": "minecraft:uniform_bonus_count", + "function": "minecraft:apply_bonus", + "parameters": { + "bonusMultiplier": 2 + } + } + ], + "name": "floralis:red_petals" + } + ], + "rolls": 1.0 + }, + { + "bonus_rolls": 0.0, + "entries": [ + { + "type": "minecraft:item", + "conditions": [ + { + "condition": "minecraft:inverted", + "term": { + "condition": "minecraft:any_of", + "terms": [ + { + "condition": "minecraft:match_tool", + "predicate": { + "items": "minecraft:shears" + } + }, + { + "condition": "minecraft:match_tool", + "predicate": { + "predicates": { + "minecraft:enchantments": [ + { + "enchantment": "minecraft:silk_touch", + "levels": { + "min": 1 + } + } + ] + } + } + } + ] + } + }, + { + "block": "floralis:red_flower_crop", + "condition": "minecraft:block_state_property", + "properties": { + "age": "5" + } + } + ], + "functions": [ + { + "enchantment": "minecraft:fortune", + "formula": "minecraft:uniform_bonus_count", + "function": "minecraft:apply_bonus", + "parameters": { + "bonusMultiplier": 2 + } + } + ], + "name": "floralis:plant_fibers" + } + ], + "rolls": 1.0 + }, + { + "bonus_rolls": 0.0, + "entries": [ + { + "type": "minecraft:item", + "conditions": [ + { + "condition": "minecraft:inverted", + "term": { + "condition": "minecraft:any_of", + "terms": [ + { + "condition": "minecraft:match_tool", + "predicate": { + "items": "minecraft:shears" + } + }, + { + "condition": "minecraft:match_tool", + "predicate": { + "predicates": { + "minecraft:enchantments": [ + { + "enchantment": "minecraft:silk_touch", + "levels": { + "min": 1 + } + } + ] + } + } + } + ] + } + }, + { + "condition": "minecraft:inverted", + "term": { + "block": "floralis:red_flower_crop", + "condition": "minecraft:block_state_property", + "properties": { + "age": "5" + } + } + } + ], + "name": "floralis:red_flower_seeds" + } + ], + "rolls": 1.0 + } + ], + "random_sequence": "floralis:blocks/red_flower_crop" +} \ No newline at end of file diff --git a/src/generated/resources/data/floralis/loot_tables/blocks/white_cactus.json b/src/generated/resources/data/floralis/loot_tables/blocks/white_cactus.json new file mode 100644 index 00000000..4ff33a08 --- /dev/null +++ b/src/generated/resources/data/floralis/loot_tables/blocks/white_cactus.json @@ -0,0 +1,202 @@ +{ + "type": "minecraft:block", + "pools": [ + { + "bonus_rolls": 0.0, + "entries": [ + { + "type": "minecraft:item", + "conditions": [ + { + "condition": "minecraft:any_of", + "terms": [ + { + "condition": "minecraft:match_tool", + "predicate": { + "items": "minecraft:shears" + } + }, + { + "condition": "minecraft:match_tool", + "predicate": { + "predicates": { + "minecraft:enchantments": [ + { + "enchantment": "minecraft:silk_touch", + "levels": { + "min": 1 + } + } + ] + } + } + } + ] + } + ], + "name": "floralis:white_cactus" + } + ], + "rolls": 1.0 + }, + { + "bonus_rolls": 0.0, + "entries": [ + { + "type": "minecraft:item", + "conditions": [ + { + "condition": "minecraft:inverted", + "term": { + "condition": "minecraft:any_of", + "terms": [ + { + "condition": "minecraft:match_tool", + "predicate": { + "items": "minecraft:shears" + } + }, + { + "condition": "minecraft:match_tool", + "predicate": { + "predicates": { + "minecraft:enchantments": [ + { + "enchantment": "minecraft:silk_touch", + "levels": { + "min": 1 + } + } + ] + } + } + } + ] + } + } + ], + "functions": [ + { + "enchantment": "minecraft:fortune", + "formula": "minecraft:uniform_bonus_count", + "function": "minecraft:apply_bonus", + "parameters": { + "bonusMultiplier": 2 + } + }, + { + "add": false, + "count": 2.0, + "function": "minecraft:set_count" + } + ], + "name": "floralis:white_cactus_seeds" + } + ], + "rolls": 1.0 + }, + { + "bonus_rolls": 0.0, + "entries": [ + { + "type": "minecraft:item", + "conditions": [ + { + "condition": "minecraft:inverted", + "term": { + "condition": "minecraft:any_of", + "terms": [ + { + "condition": "minecraft:match_tool", + "predicate": { + "items": "minecraft:shears" + } + }, + { + "condition": "minecraft:match_tool", + "predicate": { + "predicates": { + "minecraft:enchantments": [ + { + "enchantment": "minecraft:silk_touch", + "levels": { + "min": 1 + } + } + ] + } + } + } + ] + } + } + ], + "functions": [ + { + "enchantment": "minecraft:fortune", + "formula": "minecraft:uniform_bonus_count", + "function": "minecraft:apply_bonus", + "parameters": { + "bonusMultiplier": 2 + } + } + ], + "name": "floralis:white_petals" + } + ], + "rolls": 1.0 + }, + { + "bonus_rolls": 0.0, + "entries": [ + { + "type": "minecraft:item", + "conditions": [ + { + "condition": "minecraft:inverted", + "term": { + "condition": "minecraft:any_of", + "terms": [ + { + "condition": "minecraft:match_tool", + "predicate": { + "items": "minecraft:shears" + } + }, + { + "condition": "minecraft:match_tool", + "predicate": { + "predicates": { + "minecraft:enchantments": [ + { + "enchantment": "minecraft:silk_touch", + "levels": { + "min": 1 + } + } + ] + } + } + } + ] + } + } + ], + "functions": [ + { + "enchantment": "minecraft:fortune", + "formula": "minecraft:uniform_bonus_count", + "function": "minecraft:apply_bonus", + "parameters": { + "bonusMultiplier": 2 + } + } + ], + "name": "floralis:plant_fibers" + } + ], + "rolls": 1.0 + } + ], + "random_sequence": "floralis:blocks/white_cactus" +} \ No newline at end of file diff --git a/src/generated/resources/data/floralis/loot_tables/blocks/white_cactus_crop.json b/src/generated/resources/data/floralis/loot_tables/blocks/white_cactus_crop.json new file mode 100644 index 00000000..2a0503c4 --- /dev/null +++ b/src/generated/resources/data/floralis/loot_tables/blocks/white_cactus_crop.json @@ -0,0 +1,329 @@ +{ + "type": "minecraft:block", + "pools": [ + { + "bonus_rolls": 0.0, + "entries": [ + { + "type": "minecraft:item", + "conditions": [ + { + "condition": "minecraft:any_of", + "terms": [ + { + "condition": "minecraft:match_tool", + "predicate": { + "items": "minecraft:shears" + } + }, + { + "condition": "minecraft:match_tool", + "predicate": { + "predicates": { + "minecraft:enchantments": [ + { + "enchantment": "minecraft:silk_touch", + "levels": { + "min": 1 + } + } + ] + } + } + } + ] + }, + { + "block": "floralis:white_cactus_crop", + "condition": "minecraft:block_state_property", + "properties": { + "age": "5" + } + } + ], + "name": "floralis:white_cactus" + } + ], + "rolls": 1.0 + }, + { + "bonus_rolls": 0.0, + "entries": [ + { + "type": "minecraft:item", + "conditions": [ + { + "condition": "minecraft:any_of", + "terms": [ + { + "condition": "minecraft:match_tool", + "predicate": { + "items": "minecraft:shears" + } + }, + { + "condition": "minecraft:match_tool", + "predicate": { + "predicates": { + "minecraft:enchantments": [ + { + "enchantment": "minecraft:silk_touch", + "levels": { + "min": 1 + } + } + ] + } + } + } + ] + }, + { + "condition": "minecraft:inverted", + "term": { + "block": "floralis:white_cactus_crop", + "condition": "minecraft:block_state_property", + "properties": { + "age": "5" + } + } + } + ], + "name": "floralis:white_cactus_seeds" + } + ], + "rolls": 1.0 + }, + { + "bonus_rolls": 0.0, + "entries": [ + { + "type": "minecraft:item", + "conditions": [ + { + "condition": "minecraft:inverted", + "term": { + "condition": "minecraft:any_of", + "terms": [ + { + "condition": "minecraft:match_tool", + "predicate": { + "items": "minecraft:shears" + } + }, + { + "condition": "minecraft:match_tool", + "predicate": { + "predicates": { + "minecraft:enchantments": [ + { + "enchantment": "minecraft:silk_touch", + "levels": { + "min": 1 + } + } + ] + } + } + } + ] + } + }, + { + "block": "floralis:white_cactus_crop", + "condition": "minecraft:block_state_property", + "properties": { + "age": "5" + } + } + ], + "functions": [ + { + "enchantment": "minecraft:fortune", + "formula": "minecraft:uniform_bonus_count", + "function": "minecraft:apply_bonus", + "parameters": { + "bonusMultiplier": 2 + } + }, + { + "add": false, + "count": 2.0, + "function": "minecraft:set_count" + } + ], + "name": "floralis:white_cactus_seeds" + } + ], + "rolls": 1.0 + }, + { + "bonus_rolls": 0.0, + "entries": [ + { + "type": "minecraft:item", + "conditions": [ + { + "condition": "minecraft:inverted", + "term": { + "condition": "minecraft:any_of", + "terms": [ + { + "condition": "minecraft:match_tool", + "predicate": { + "items": "minecraft:shears" + } + }, + { + "condition": "minecraft:match_tool", + "predicate": { + "predicates": { + "minecraft:enchantments": [ + { + "enchantment": "minecraft:silk_touch", + "levels": { + "min": 1 + } + } + ] + } + } + } + ] + } + }, + { + "block": "floralis:white_cactus_crop", + "condition": "minecraft:block_state_property", + "properties": { + "age": "5" + } + } + ], + "functions": [ + { + "enchantment": "minecraft:fortune", + "formula": "minecraft:uniform_bonus_count", + "function": "minecraft:apply_bonus", + "parameters": { + "bonusMultiplier": 2 + } + } + ], + "name": "floralis:white_petals" + } + ], + "rolls": 1.0 + }, + { + "bonus_rolls": 0.0, + "entries": [ + { + "type": "minecraft:item", + "conditions": [ + { + "condition": "minecraft:inverted", + "term": { + "condition": "minecraft:any_of", + "terms": [ + { + "condition": "minecraft:match_tool", + "predicate": { + "items": "minecraft:shears" + } + }, + { + "condition": "minecraft:match_tool", + "predicate": { + "predicates": { + "minecraft:enchantments": [ + { + "enchantment": "minecraft:silk_touch", + "levels": { + "min": 1 + } + } + ] + } + } + } + ] + } + }, + { + "block": "floralis:white_cactus_crop", + "condition": "minecraft:block_state_property", + "properties": { + "age": "5" + } + } + ], + "functions": [ + { + "enchantment": "minecraft:fortune", + "formula": "minecraft:uniform_bonus_count", + "function": "minecraft:apply_bonus", + "parameters": { + "bonusMultiplier": 2 + } + } + ], + "name": "floralis:plant_fibers" + } + ], + "rolls": 1.0 + }, + { + "bonus_rolls": 0.0, + "entries": [ + { + "type": "minecraft:item", + "conditions": [ + { + "condition": "minecraft:inverted", + "term": { + "condition": "minecraft:any_of", + "terms": [ + { + "condition": "minecraft:match_tool", + "predicate": { + "items": "minecraft:shears" + } + }, + { + "condition": "minecraft:match_tool", + "predicate": { + "predicates": { + "minecraft:enchantments": [ + { + "enchantment": "minecraft:silk_touch", + "levels": { + "min": 1 + } + } + ] + } + } + } + ] + } + }, + { + "condition": "minecraft:inverted", + "term": { + "block": "floralis:white_cactus_crop", + "condition": "minecraft:block_state_property", + "properties": { + "age": "5" + } + } + } + ], + "name": "floralis:white_cactus_seeds" + } + ], + "rolls": 1.0 + } + ], + "random_sequence": "floralis:blocks/white_cactus_crop" +} \ No newline at end of file diff --git a/src/main/resources/data/floralis/loot_tables/blocks/white_dye_block.json b/src/generated/resources/data/floralis/loot_tables/blocks/white_dye_block.json similarity index 55% rename from src/main/resources/data/floralis/loot_tables/blocks/white_dye_block.json rename to src/generated/resources/data/floralis/loot_tables/blocks/white_dye_block.json index fe4ac7c7..69f4a070 100644 --- a/src/main/resources/data/floralis/loot_tables/blocks/white_dye_block.json +++ b/src/generated/resources/data/floralis/loot_tables/blocks/white_dye_block.json @@ -2,19 +2,15 @@ "type": "minecraft:block", "pools": [ { - "rolls": 1, - "bonus_rolls": 0, + "bonus_rolls": 0.0, "entries": [ { "type": "minecraft:item", "name": "floralis:white_dye_block" } ], - "conditions": [ - { - "condition": "minecraft:survives_explosion" - } - ] + "rolls": 1.0 } - ] + ], + "random_sequence": "floralis:blocks/white_dye_block" } \ No newline at end of file diff --git a/src/generated/resources/data/floralis/loot_tables/blocks/white_flower.json b/src/generated/resources/data/floralis/loot_tables/blocks/white_flower.json new file mode 100644 index 00000000..32d0bb17 --- /dev/null +++ b/src/generated/resources/data/floralis/loot_tables/blocks/white_flower.json @@ -0,0 +1,202 @@ +{ + "type": "minecraft:block", + "pools": [ + { + "bonus_rolls": 0.0, + "entries": [ + { + "type": "minecraft:item", + "conditions": [ + { + "condition": "minecraft:any_of", + "terms": [ + { + "condition": "minecraft:match_tool", + "predicate": { + "items": "minecraft:shears" + } + }, + { + "condition": "minecraft:match_tool", + "predicate": { + "predicates": { + "minecraft:enchantments": [ + { + "enchantment": "minecraft:silk_touch", + "levels": { + "min": 1 + } + } + ] + } + } + } + ] + } + ], + "name": "floralis:white_flower" + } + ], + "rolls": 1.0 + }, + { + "bonus_rolls": 0.0, + "entries": [ + { + "type": "minecraft:item", + "conditions": [ + { + "condition": "minecraft:inverted", + "term": { + "condition": "minecraft:any_of", + "terms": [ + { + "condition": "minecraft:match_tool", + "predicate": { + "items": "minecraft:shears" + } + }, + { + "condition": "minecraft:match_tool", + "predicate": { + "predicates": { + "minecraft:enchantments": [ + { + "enchantment": "minecraft:silk_touch", + "levels": { + "min": 1 + } + } + ] + } + } + } + ] + } + } + ], + "functions": [ + { + "enchantment": "minecraft:fortune", + "formula": "minecraft:uniform_bonus_count", + "function": "minecraft:apply_bonus", + "parameters": { + "bonusMultiplier": 2 + } + }, + { + "add": false, + "count": 2.0, + "function": "minecraft:set_count" + } + ], + "name": "floralis:white_flower_seeds" + } + ], + "rolls": 1.0 + }, + { + "bonus_rolls": 0.0, + "entries": [ + { + "type": "minecraft:item", + "conditions": [ + { + "condition": "minecraft:inverted", + "term": { + "condition": "minecraft:any_of", + "terms": [ + { + "condition": "minecraft:match_tool", + "predicate": { + "items": "minecraft:shears" + } + }, + { + "condition": "minecraft:match_tool", + "predicate": { + "predicates": { + "minecraft:enchantments": [ + { + "enchantment": "minecraft:silk_touch", + "levels": { + "min": 1 + } + } + ] + } + } + } + ] + } + } + ], + "functions": [ + { + "enchantment": "minecraft:fortune", + "formula": "minecraft:uniform_bonus_count", + "function": "minecraft:apply_bonus", + "parameters": { + "bonusMultiplier": 2 + } + } + ], + "name": "floralis:white_petals" + } + ], + "rolls": 1.0 + }, + { + "bonus_rolls": 0.0, + "entries": [ + { + "type": "minecraft:item", + "conditions": [ + { + "condition": "minecraft:inverted", + "term": { + "condition": "minecraft:any_of", + "terms": [ + { + "condition": "minecraft:match_tool", + "predicate": { + "items": "minecraft:shears" + } + }, + { + "condition": "minecraft:match_tool", + "predicate": { + "predicates": { + "minecraft:enchantments": [ + { + "enchantment": "minecraft:silk_touch", + "levels": { + "min": 1 + } + } + ] + } + } + } + ] + } + } + ], + "functions": [ + { + "enchantment": "minecraft:fortune", + "formula": "minecraft:uniform_bonus_count", + "function": "minecraft:apply_bonus", + "parameters": { + "bonusMultiplier": 2 + } + } + ], + "name": "floralis:plant_fibers" + } + ], + "rolls": 1.0 + } + ], + "random_sequence": "floralis:blocks/white_flower" +} \ No newline at end of file diff --git a/src/generated/resources/data/floralis/loot_tables/blocks/white_flower_crop.json b/src/generated/resources/data/floralis/loot_tables/blocks/white_flower_crop.json new file mode 100644 index 00000000..93089083 --- /dev/null +++ b/src/generated/resources/data/floralis/loot_tables/blocks/white_flower_crop.json @@ -0,0 +1,329 @@ +{ + "type": "minecraft:block", + "pools": [ + { + "bonus_rolls": 0.0, + "entries": [ + { + "type": "minecraft:item", + "conditions": [ + { + "condition": "minecraft:any_of", + "terms": [ + { + "condition": "minecraft:match_tool", + "predicate": { + "items": "minecraft:shears" + } + }, + { + "condition": "minecraft:match_tool", + "predicate": { + "predicates": { + "minecraft:enchantments": [ + { + "enchantment": "minecraft:silk_touch", + "levels": { + "min": 1 + } + } + ] + } + } + } + ] + }, + { + "block": "floralis:white_flower_crop", + "condition": "minecraft:block_state_property", + "properties": { + "age": "5" + } + } + ], + "name": "floralis:white_flower" + } + ], + "rolls": 1.0 + }, + { + "bonus_rolls": 0.0, + "entries": [ + { + "type": "minecraft:item", + "conditions": [ + { + "condition": "minecraft:any_of", + "terms": [ + { + "condition": "minecraft:match_tool", + "predicate": { + "items": "minecraft:shears" + } + }, + { + "condition": "minecraft:match_tool", + "predicate": { + "predicates": { + "minecraft:enchantments": [ + { + "enchantment": "minecraft:silk_touch", + "levels": { + "min": 1 + } + } + ] + } + } + } + ] + }, + { + "condition": "minecraft:inverted", + "term": { + "block": "floralis:white_flower_crop", + "condition": "minecraft:block_state_property", + "properties": { + "age": "5" + } + } + } + ], + "name": "floralis:white_flower_seeds" + } + ], + "rolls": 1.0 + }, + { + "bonus_rolls": 0.0, + "entries": [ + { + "type": "minecraft:item", + "conditions": [ + { + "condition": "minecraft:inverted", + "term": { + "condition": "minecraft:any_of", + "terms": [ + { + "condition": "minecraft:match_tool", + "predicate": { + "items": "minecraft:shears" + } + }, + { + "condition": "minecraft:match_tool", + "predicate": { + "predicates": { + "minecraft:enchantments": [ + { + "enchantment": "minecraft:silk_touch", + "levels": { + "min": 1 + } + } + ] + } + } + } + ] + } + }, + { + "block": "floralis:white_flower_crop", + "condition": "minecraft:block_state_property", + "properties": { + "age": "5" + } + } + ], + "functions": [ + { + "enchantment": "minecraft:fortune", + "formula": "minecraft:uniform_bonus_count", + "function": "minecraft:apply_bonus", + "parameters": { + "bonusMultiplier": 2 + } + }, + { + "add": false, + "count": 2.0, + "function": "minecraft:set_count" + } + ], + "name": "floralis:white_flower_seeds" + } + ], + "rolls": 1.0 + }, + { + "bonus_rolls": 0.0, + "entries": [ + { + "type": "minecraft:item", + "conditions": [ + { + "condition": "minecraft:inverted", + "term": { + "condition": "minecraft:any_of", + "terms": [ + { + "condition": "minecraft:match_tool", + "predicate": { + "items": "minecraft:shears" + } + }, + { + "condition": "minecraft:match_tool", + "predicate": { + "predicates": { + "minecraft:enchantments": [ + { + "enchantment": "minecraft:silk_touch", + "levels": { + "min": 1 + } + } + ] + } + } + } + ] + } + }, + { + "block": "floralis:white_flower_crop", + "condition": "minecraft:block_state_property", + "properties": { + "age": "5" + } + } + ], + "functions": [ + { + "enchantment": "minecraft:fortune", + "formula": "minecraft:uniform_bonus_count", + "function": "minecraft:apply_bonus", + "parameters": { + "bonusMultiplier": 2 + } + } + ], + "name": "floralis:white_petals" + } + ], + "rolls": 1.0 + }, + { + "bonus_rolls": 0.0, + "entries": [ + { + "type": "minecraft:item", + "conditions": [ + { + "condition": "minecraft:inverted", + "term": { + "condition": "minecraft:any_of", + "terms": [ + { + "condition": "minecraft:match_tool", + "predicate": { + "items": "minecraft:shears" + } + }, + { + "condition": "minecraft:match_tool", + "predicate": { + "predicates": { + "minecraft:enchantments": [ + { + "enchantment": "minecraft:silk_touch", + "levels": { + "min": 1 + } + } + ] + } + } + } + ] + } + }, + { + "block": "floralis:white_flower_crop", + "condition": "minecraft:block_state_property", + "properties": { + "age": "5" + } + } + ], + "functions": [ + { + "enchantment": "minecraft:fortune", + "formula": "minecraft:uniform_bonus_count", + "function": "minecraft:apply_bonus", + "parameters": { + "bonusMultiplier": 2 + } + } + ], + "name": "floralis:plant_fibers" + } + ], + "rolls": 1.0 + }, + { + "bonus_rolls": 0.0, + "entries": [ + { + "type": "minecraft:item", + "conditions": [ + { + "condition": "minecraft:inverted", + "term": { + "condition": "minecraft:any_of", + "terms": [ + { + "condition": "minecraft:match_tool", + "predicate": { + "items": "minecraft:shears" + } + }, + { + "condition": "minecraft:match_tool", + "predicate": { + "predicates": { + "minecraft:enchantments": [ + { + "enchantment": "minecraft:silk_touch", + "levels": { + "min": 1 + } + } + ] + } + } + } + ] + } + }, + { + "condition": "minecraft:inverted", + "term": { + "block": "floralis:white_flower_crop", + "condition": "minecraft:block_state_property", + "properties": { + "age": "5" + } + } + } + ], + "name": "floralis:white_flower_seeds" + } + ], + "rolls": 1.0 + } + ], + "random_sequence": "floralis:blocks/white_flower_crop" +} \ No newline at end of file diff --git a/src/generated/resources/data/floralis/loot_tables/blocks/yellow_cactus.json b/src/generated/resources/data/floralis/loot_tables/blocks/yellow_cactus.json new file mode 100644 index 00000000..578146d6 --- /dev/null +++ b/src/generated/resources/data/floralis/loot_tables/blocks/yellow_cactus.json @@ -0,0 +1,202 @@ +{ + "type": "minecraft:block", + "pools": [ + { + "bonus_rolls": 0.0, + "entries": [ + { + "type": "minecraft:item", + "conditions": [ + { + "condition": "minecraft:any_of", + "terms": [ + { + "condition": "minecraft:match_tool", + "predicate": { + "items": "minecraft:shears" + } + }, + { + "condition": "minecraft:match_tool", + "predicate": { + "predicates": { + "minecraft:enchantments": [ + { + "enchantment": "minecraft:silk_touch", + "levels": { + "min": 1 + } + } + ] + } + } + } + ] + } + ], + "name": "floralis:yellow_cactus" + } + ], + "rolls": 1.0 + }, + { + "bonus_rolls": 0.0, + "entries": [ + { + "type": "minecraft:item", + "conditions": [ + { + "condition": "minecraft:inverted", + "term": { + "condition": "minecraft:any_of", + "terms": [ + { + "condition": "minecraft:match_tool", + "predicate": { + "items": "minecraft:shears" + } + }, + { + "condition": "minecraft:match_tool", + "predicate": { + "predicates": { + "minecraft:enchantments": [ + { + "enchantment": "minecraft:silk_touch", + "levels": { + "min": 1 + } + } + ] + } + } + } + ] + } + } + ], + "functions": [ + { + "enchantment": "minecraft:fortune", + "formula": "minecraft:uniform_bonus_count", + "function": "minecraft:apply_bonus", + "parameters": { + "bonusMultiplier": 2 + } + }, + { + "add": false, + "count": 2.0, + "function": "minecraft:set_count" + } + ], + "name": "floralis:yellow_cactus_seeds" + } + ], + "rolls": 1.0 + }, + { + "bonus_rolls": 0.0, + "entries": [ + { + "type": "minecraft:item", + "conditions": [ + { + "condition": "minecraft:inverted", + "term": { + "condition": "minecraft:any_of", + "terms": [ + { + "condition": "minecraft:match_tool", + "predicate": { + "items": "minecraft:shears" + } + }, + { + "condition": "minecraft:match_tool", + "predicate": { + "predicates": { + "minecraft:enchantments": [ + { + "enchantment": "minecraft:silk_touch", + "levels": { + "min": 1 + } + } + ] + } + } + } + ] + } + } + ], + "functions": [ + { + "enchantment": "minecraft:fortune", + "formula": "minecraft:uniform_bonus_count", + "function": "minecraft:apply_bonus", + "parameters": { + "bonusMultiplier": 2 + } + } + ], + "name": "floralis:yellow_petals" + } + ], + "rolls": 1.0 + }, + { + "bonus_rolls": 0.0, + "entries": [ + { + "type": "minecraft:item", + "conditions": [ + { + "condition": "minecraft:inverted", + "term": { + "condition": "minecraft:any_of", + "terms": [ + { + "condition": "minecraft:match_tool", + "predicate": { + "items": "minecraft:shears" + } + }, + { + "condition": "minecraft:match_tool", + "predicate": { + "predicates": { + "minecraft:enchantments": [ + { + "enchantment": "minecraft:silk_touch", + "levels": { + "min": 1 + } + } + ] + } + } + } + ] + } + } + ], + "functions": [ + { + "enchantment": "minecraft:fortune", + "formula": "minecraft:uniform_bonus_count", + "function": "minecraft:apply_bonus", + "parameters": { + "bonusMultiplier": 2 + } + } + ], + "name": "floralis:plant_fibers" + } + ], + "rolls": 1.0 + } + ], + "random_sequence": "floralis:blocks/yellow_cactus" +} \ No newline at end of file diff --git a/src/generated/resources/data/floralis/loot_tables/blocks/yellow_cactus_crop.json b/src/generated/resources/data/floralis/loot_tables/blocks/yellow_cactus_crop.json new file mode 100644 index 00000000..fb799714 --- /dev/null +++ b/src/generated/resources/data/floralis/loot_tables/blocks/yellow_cactus_crop.json @@ -0,0 +1,329 @@ +{ + "type": "minecraft:block", + "pools": [ + { + "bonus_rolls": 0.0, + "entries": [ + { + "type": "minecraft:item", + "conditions": [ + { + "condition": "minecraft:any_of", + "terms": [ + { + "condition": "minecraft:match_tool", + "predicate": { + "items": "minecraft:shears" + } + }, + { + "condition": "minecraft:match_tool", + "predicate": { + "predicates": { + "minecraft:enchantments": [ + { + "enchantment": "minecraft:silk_touch", + "levels": { + "min": 1 + } + } + ] + } + } + } + ] + }, + { + "block": "floralis:yellow_cactus_crop", + "condition": "minecraft:block_state_property", + "properties": { + "age": "5" + } + } + ], + "name": "floralis:yellow_cactus" + } + ], + "rolls": 1.0 + }, + { + "bonus_rolls": 0.0, + "entries": [ + { + "type": "minecraft:item", + "conditions": [ + { + "condition": "minecraft:any_of", + "terms": [ + { + "condition": "minecraft:match_tool", + "predicate": { + "items": "minecraft:shears" + } + }, + { + "condition": "minecraft:match_tool", + "predicate": { + "predicates": { + "minecraft:enchantments": [ + { + "enchantment": "minecraft:silk_touch", + "levels": { + "min": 1 + } + } + ] + } + } + } + ] + }, + { + "condition": "minecraft:inverted", + "term": { + "block": "floralis:yellow_cactus_crop", + "condition": "minecraft:block_state_property", + "properties": { + "age": "5" + } + } + } + ], + "name": "floralis:yellow_cactus_seeds" + } + ], + "rolls": 1.0 + }, + { + "bonus_rolls": 0.0, + "entries": [ + { + "type": "minecraft:item", + "conditions": [ + { + "condition": "minecraft:inverted", + "term": { + "condition": "minecraft:any_of", + "terms": [ + { + "condition": "minecraft:match_tool", + "predicate": { + "items": "minecraft:shears" + } + }, + { + "condition": "minecraft:match_tool", + "predicate": { + "predicates": { + "minecraft:enchantments": [ + { + "enchantment": "minecraft:silk_touch", + "levels": { + "min": 1 + } + } + ] + } + } + } + ] + } + }, + { + "block": "floralis:yellow_cactus_crop", + "condition": "minecraft:block_state_property", + "properties": { + "age": "5" + } + } + ], + "functions": [ + { + "enchantment": "minecraft:fortune", + "formula": "minecraft:uniform_bonus_count", + "function": "minecraft:apply_bonus", + "parameters": { + "bonusMultiplier": 2 + } + }, + { + "add": false, + "count": 2.0, + "function": "minecraft:set_count" + } + ], + "name": "floralis:yellow_cactus_seeds" + } + ], + "rolls": 1.0 + }, + { + "bonus_rolls": 0.0, + "entries": [ + { + "type": "minecraft:item", + "conditions": [ + { + "condition": "minecraft:inverted", + "term": { + "condition": "minecraft:any_of", + "terms": [ + { + "condition": "minecraft:match_tool", + "predicate": { + "items": "minecraft:shears" + } + }, + { + "condition": "minecraft:match_tool", + "predicate": { + "predicates": { + "minecraft:enchantments": [ + { + "enchantment": "minecraft:silk_touch", + "levels": { + "min": 1 + } + } + ] + } + } + } + ] + } + }, + { + "block": "floralis:yellow_cactus_crop", + "condition": "minecraft:block_state_property", + "properties": { + "age": "5" + } + } + ], + "functions": [ + { + "enchantment": "minecraft:fortune", + "formula": "minecraft:uniform_bonus_count", + "function": "minecraft:apply_bonus", + "parameters": { + "bonusMultiplier": 2 + } + } + ], + "name": "floralis:yellow_petals" + } + ], + "rolls": 1.0 + }, + { + "bonus_rolls": 0.0, + "entries": [ + { + "type": "minecraft:item", + "conditions": [ + { + "condition": "minecraft:inverted", + "term": { + "condition": "minecraft:any_of", + "terms": [ + { + "condition": "minecraft:match_tool", + "predicate": { + "items": "minecraft:shears" + } + }, + { + "condition": "minecraft:match_tool", + "predicate": { + "predicates": { + "minecraft:enchantments": [ + { + "enchantment": "minecraft:silk_touch", + "levels": { + "min": 1 + } + } + ] + } + } + } + ] + } + }, + { + "block": "floralis:yellow_cactus_crop", + "condition": "minecraft:block_state_property", + "properties": { + "age": "5" + } + } + ], + "functions": [ + { + "enchantment": "minecraft:fortune", + "formula": "minecraft:uniform_bonus_count", + "function": "minecraft:apply_bonus", + "parameters": { + "bonusMultiplier": 2 + } + } + ], + "name": "floralis:plant_fibers" + } + ], + "rolls": 1.0 + }, + { + "bonus_rolls": 0.0, + "entries": [ + { + "type": "minecraft:item", + "conditions": [ + { + "condition": "minecraft:inverted", + "term": { + "condition": "minecraft:any_of", + "terms": [ + { + "condition": "minecraft:match_tool", + "predicate": { + "items": "minecraft:shears" + } + }, + { + "condition": "minecraft:match_tool", + "predicate": { + "predicates": { + "minecraft:enchantments": [ + { + "enchantment": "minecraft:silk_touch", + "levels": { + "min": 1 + } + } + ] + } + } + } + ] + } + }, + { + "condition": "minecraft:inverted", + "term": { + "block": "floralis:yellow_cactus_crop", + "condition": "minecraft:block_state_property", + "properties": { + "age": "5" + } + } + } + ], + "name": "floralis:yellow_cactus_seeds" + } + ], + "rolls": 1.0 + } + ], + "random_sequence": "floralis:blocks/yellow_cactus_crop" +} \ No newline at end of file diff --git a/src/main/resources/data/floralis/loot_tables/blocks/yellow_dye_block.json b/src/generated/resources/data/floralis/loot_tables/blocks/yellow_dye_block.json similarity index 55% rename from src/main/resources/data/floralis/loot_tables/blocks/yellow_dye_block.json rename to src/generated/resources/data/floralis/loot_tables/blocks/yellow_dye_block.json index 10719459..55b1839a 100644 --- a/src/main/resources/data/floralis/loot_tables/blocks/yellow_dye_block.json +++ b/src/generated/resources/data/floralis/loot_tables/blocks/yellow_dye_block.json @@ -2,19 +2,15 @@ "type": "minecraft:block", "pools": [ { - "rolls": 1, - "bonus_rolls": 0, + "bonus_rolls": 0.0, "entries": [ { "type": "minecraft:item", "name": "floralis:yellow_dye_block" } ], - "conditions": [ - { - "condition": "minecraft:survives_explosion" - } - ] + "rolls": 1.0 } - ] + ], + "random_sequence": "floralis:blocks/yellow_dye_block" } \ No newline at end of file diff --git a/src/generated/resources/data/floralis/loot_tables/blocks/yellow_flower.json b/src/generated/resources/data/floralis/loot_tables/blocks/yellow_flower.json new file mode 100644 index 00000000..ba6f1a7c --- /dev/null +++ b/src/generated/resources/data/floralis/loot_tables/blocks/yellow_flower.json @@ -0,0 +1,202 @@ +{ + "type": "minecraft:block", + "pools": [ + { + "bonus_rolls": 0.0, + "entries": [ + { + "type": "minecraft:item", + "conditions": [ + { + "condition": "minecraft:any_of", + "terms": [ + { + "condition": "minecraft:match_tool", + "predicate": { + "items": "minecraft:shears" + } + }, + { + "condition": "minecraft:match_tool", + "predicate": { + "predicates": { + "minecraft:enchantments": [ + { + "enchantment": "minecraft:silk_touch", + "levels": { + "min": 1 + } + } + ] + } + } + } + ] + } + ], + "name": "floralis:yellow_flower" + } + ], + "rolls": 1.0 + }, + { + "bonus_rolls": 0.0, + "entries": [ + { + "type": "minecraft:item", + "conditions": [ + { + "condition": "minecraft:inverted", + "term": { + "condition": "minecraft:any_of", + "terms": [ + { + "condition": "minecraft:match_tool", + "predicate": { + "items": "minecraft:shears" + } + }, + { + "condition": "minecraft:match_tool", + "predicate": { + "predicates": { + "minecraft:enchantments": [ + { + "enchantment": "minecraft:silk_touch", + "levels": { + "min": 1 + } + } + ] + } + } + } + ] + } + } + ], + "functions": [ + { + "enchantment": "minecraft:fortune", + "formula": "minecraft:uniform_bonus_count", + "function": "minecraft:apply_bonus", + "parameters": { + "bonusMultiplier": 2 + } + }, + { + "add": false, + "count": 2.0, + "function": "minecraft:set_count" + } + ], + "name": "floralis:yellow_flower_seeds" + } + ], + "rolls": 1.0 + }, + { + "bonus_rolls": 0.0, + "entries": [ + { + "type": "minecraft:item", + "conditions": [ + { + "condition": "minecraft:inverted", + "term": { + "condition": "minecraft:any_of", + "terms": [ + { + "condition": "minecraft:match_tool", + "predicate": { + "items": "minecraft:shears" + } + }, + { + "condition": "minecraft:match_tool", + "predicate": { + "predicates": { + "minecraft:enchantments": [ + { + "enchantment": "minecraft:silk_touch", + "levels": { + "min": 1 + } + } + ] + } + } + } + ] + } + } + ], + "functions": [ + { + "enchantment": "minecraft:fortune", + "formula": "minecraft:uniform_bonus_count", + "function": "minecraft:apply_bonus", + "parameters": { + "bonusMultiplier": 2 + } + } + ], + "name": "floralis:yellow_petals" + } + ], + "rolls": 1.0 + }, + { + "bonus_rolls": 0.0, + "entries": [ + { + "type": "minecraft:item", + "conditions": [ + { + "condition": "minecraft:inverted", + "term": { + "condition": "minecraft:any_of", + "terms": [ + { + "condition": "minecraft:match_tool", + "predicate": { + "items": "minecraft:shears" + } + }, + { + "condition": "minecraft:match_tool", + "predicate": { + "predicates": { + "minecraft:enchantments": [ + { + "enchantment": "minecraft:silk_touch", + "levels": { + "min": 1 + } + } + ] + } + } + } + ] + } + } + ], + "functions": [ + { + "enchantment": "minecraft:fortune", + "formula": "minecraft:uniform_bonus_count", + "function": "minecraft:apply_bonus", + "parameters": { + "bonusMultiplier": 2 + } + } + ], + "name": "floralis:plant_fibers" + } + ], + "rolls": 1.0 + } + ], + "random_sequence": "floralis:blocks/yellow_flower" +} \ No newline at end of file diff --git a/src/generated/resources/data/floralis/loot_tables/blocks/yellow_flower_crop.json b/src/generated/resources/data/floralis/loot_tables/blocks/yellow_flower_crop.json new file mode 100644 index 00000000..4fd61211 --- /dev/null +++ b/src/generated/resources/data/floralis/loot_tables/blocks/yellow_flower_crop.json @@ -0,0 +1,329 @@ +{ + "type": "minecraft:block", + "pools": [ + { + "bonus_rolls": 0.0, + "entries": [ + { + "type": "minecraft:item", + "conditions": [ + { + "condition": "minecraft:any_of", + "terms": [ + { + "condition": "minecraft:match_tool", + "predicate": { + "items": "minecraft:shears" + } + }, + { + "condition": "minecraft:match_tool", + "predicate": { + "predicates": { + "minecraft:enchantments": [ + { + "enchantment": "minecraft:silk_touch", + "levels": { + "min": 1 + } + } + ] + } + } + } + ] + }, + { + "block": "floralis:yellow_flower_crop", + "condition": "minecraft:block_state_property", + "properties": { + "age": "5" + } + } + ], + "name": "floralis:yellow_flower" + } + ], + "rolls": 1.0 + }, + { + "bonus_rolls": 0.0, + "entries": [ + { + "type": "minecraft:item", + "conditions": [ + { + "condition": "minecraft:any_of", + "terms": [ + { + "condition": "minecraft:match_tool", + "predicate": { + "items": "minecraft:shears" + } + }, + { + "condition": "minecraft:match_tool", + "predicate": { + "predicates": { + "minecraft:enchantments": [ + { + "enchantment": "minecraft:silk_touch", + "levels": { + "min": 1 + } + } + ] + } + } + } + ] + }, + { + "condition": "minecraft:inverted", + "term": { + "block": "floralis:yellow_flower_crop", + "condition": "minecraft:block_state_property", + "properties": { + "age": "5" + } + } + } + ], + "name": "floralis:yellow_flower_seeds" + } + ], + "rolls": 1.0 + }, + { + "bonus_rolls": 0.0, + "entries": [ + { + "type": "minecraft:item", + "conditions": [ + { + "condition": "minecraft:inverted", + "term": { + "condition": "minecraft:any_of", + "terms": [ + { + "condition": "minecraft:match_tool", + "predicate": { + "items": "minecraft:shears" + } + }, + { + "condition": "minecraft:match_tool", + "predicate": { + "predicates": { + "minecraft:enchantments": [ + { + "enchantment": "minecraft:silk_touch", + "levels": { + "min": 1 + } + } + ] + } + } + } + ] + } + }, + { + "block": "floralis:yellow_flower_crop", + "condition": "minecraft:block_state_property", + "properties": { + "age": "5" + } + } + ], + "functions": [ + { + "enchantment": "minecraft:fortune", + "formula": "minecraft:uniform_bonus_count", + "function": "minecraft:apply_bonus", + "parameters": { + "bonusMultiplier": 2 + } + }, + { + "add": false, + "count": 2.0, + "function": "minecraft:set_count" + } + ], + "name": "floralis:yellow_flower_seeds" + } + ], + "rolls": 1.0 + }, + { + "bonus_rolls": 0.0, + "entries": [ + { + "type": "minecraft:item", + "conditions": [ + { + "condition": "minecraft:inverted", + "term": { + "condition": "minecraft:any_of", + "terms": [ + { + "condition": "minecraft:match_tool", + "predicate": { + "items": "minecraft:shears" + } + }, + { + "condition": "minecraft:match_tool", + "predicate": { + "predicates": { + "minecraft:enchantments": [ + { + "enchantment": "minecraft:silk_touch", + "levels": { + "min": 1 + } + } + ] + } + } + } + ] + } + }, + { + "block": "floralis:yellow_flower_crop", + "condition": "minecraft:block_state_property", + "properties": { + "age": "5" + } + } + ], + "functions": [ + { + "enchantment": "minecraft:fortune", + "formula": "minecraft:uniform_bonus_count", + "function": "minecraft:apply_bonus", + "parameters": { + "bonusMultiplier": 2 + } + } + ], + "name": "floralis:yellow_petals" + } + ], + "rolls": 1.0 + }, + { + "bonus_rolls": 0.0, + "entries": [ + { + "type": "minecraft:item", + "conditions": [ + { + "condition": "minecraft:inverted", + "term": { + "condition": "minecraft:any_of", + "terms": [ + { + "condition": "minecraft:match_tool", + "predicate": { + "items": "minecraft:shears" + } + }, + { + "condition": "minecraft:match_tool", + "predicate": { + "predicates": { + "minecraft:enchantments": [ + { + "enchantment": "minecraft:silk_touch", + "levels": { + "min": 1 + } + } + ] + } + } + } + ] + } + }, + { + "block": "floralis:yellow_flower_crop", + "condition": "minecraft:block_state_property", + "properties": { + "age": "5" + } + } + ], + "functions": [ + { + "enchantment": "minecraft:fortune", + "formula": "minecraft:uniform_bonus_count", + "function": "minecraft:apply_bonus", + "parameters": { + "bonusMultiplier": 2 + } + } + ], + "name": "floralis:plant_fibers" + } + ], + "rolls": 1.0 + }, + { + "bonus_rolls": 0.0, + "entries": [ + { + "type": "minecraft:item", + "conditions": [ + { + "condition": "minecraft:inverted", + "term": { + "condition": "minecraft:any_of", + "terms": [ + { + "condition": "minecraft:match_tool", + "predicate": { + "items": "minecraft:shears" + } + }, + { + "condition": "minecraft:match_tool", + "predicate": { + "predicates": { + "minecraft:enchantments": [ + { + "enchantment": "minecraft:silk_touch", + "levels": { + "min": 1 + } + } + ] + } + } + } + ] + } + }, + { + "condition": "minecraft:inverted", + "term": { + "block": "floralis:yellow_flower_crop", + "condition": "minecraft:block_state_property", + "properties": { + "age": "5" + } + } + } + ], + "name": "floralis:yellow_flower_seeds" + } + ], + "rolls": 1.0 + } + ], + "random_sequence": "floralis:blocks/yellow_flower_crop" +} \ No newline at end of file diff --git a/src/generated/resources/data/floralis/neoforge/biome_modifier/black_cactus.json b/src/generated/resources/data/floralis/neoforge/biome_modifier/black_cactus.json new file mode 100644 index 00000000..1b0989e5 --- /dev/null +++ b/src/generated/resources/data/floralis/neoforge/biome_modifier/black_cactus.json @@ -0,0 +1,6 @@ +{ + "type": "neoforge:add_features", + "biomes": "#floralis:has_cactus", + "features": "floralis:black_cactus", + "step": "vegetal_decoration" +} \ No newline at end of file diff --git a/src/main/resources/data/floralis/neoforge/biome_modifier/black_flower.json b/src/generated/resources/data/floralis/neoforge/biome_modifier/black_flower.json similarity index 55% rename from src/main/resources/data/floralis/neoforge/biome_modifier/black_flower.json rename to src/generated/resources/data/floralis/neoforge/biome_modifier/black_flower.json index a5b67780..6869742f 100644 --- a/src/main/resources/data/floralis/neoforge/biome_modifier/black_flower.json +++ b/src/generated/resources/data/floralis/neoforge/biome_modifier/black_flower.json @@ -1,6 +1,6 @@ { + "type": "neoforge:add_features", "biomes": "#minecraft:is_overworld", "features": "floralis:black_flower", - "step": "vegetal_decoration", - "type": "neoforge:add_features" + "step": "vegetal_decoration" } \ No newline at end of file diff --git a/src/generated/resources/data/floralis/neoforge/biome_modifier/blue_cactus.json b/src/generated/resources/data/floralis/neoforge/biome_modifier/blue_cactus.json new file mode 100644 index 00000000..75052aca --- /dev/null +++ b/src/generated/resources/data/floralis/neoforge/biome_modifier/blue_cactus.json @@ -0,0 +1,6 @@ +{ + "type": "neoforge:add_features", + "biomes": "#floralis:has_cactus", + "features": "floralis:blue_cactus", + "step": "vegetal_decoration" +} \ No newline at end of file diff --git a/src/main/resources/data/floralis/neoforge/biome_modifier/blue_flower.json b/src/generated/resources/data/floralis/neoforge/biome_modifier/blue_flower.json similarity index 54% rename from src/main/resources/data/floralis/neoforge/biome_modifier/blue_flower.json rename to src/generated/resources/data/floralis/neoforge/biome_modifier/blue_flower.json index ec4ea4e4..cbf44b5b 100644 --- a/src/main/resources/data/floralis/neoforge/biome_modifier/blue_flower.json +++ b/src/generated/resources/data/floralis/neoforge/biome_modifier/blue_flower.json @@ -1,6 +1,6 @@ { + "type": "neoforge:add_features", "biomes": "#minecraft:is_overworld", "features": "floralis:blue_flower", - "step": "vegetal_decoration", - "type": "neoforge:add_features" + "step": "vegetal_decoration" } \ No newline at end of file diff --git a/src/generated/resources/data/floralis/neoforge/biome_modifier/brown_cactus.json b/src/generated/resources/data/floralis/neoforge/biome_modifier/brown_cactus.json new file mode 100644 index 00000000..ede4fb22 --- /dev/null +++ b/src/generated/resources/data/floralis/neoforge/biome_modifier/brown_cactus.json @@ -0,0 +1,6 @@ +{ + "type": "neoforge:add_features", + "biomes": "#floralis:has_cactus", + "features": "floralis:brown_cactus", + "step": "vegetal_decoration" +} \ No newline at end of file diff --git a/src/main/resources/data/floralis/neoforge/biome_modifier/brown_flower.json b/src/generated/resources/data/floralis/neoforge/biome_modifier/brown_flower.json similarity index 55% rename from src/main/resources/data/floralis/neoforge/biome_modifier/brown_flower.json rename to src/generated/resources/data/floralis/neoforge/biome_modifier/brown_flower.json index 819b7e2c..9a3756cc 100644 --- a/src/main/resources/data/floralis/neoforge/biome_modifier/brown_flower.json +++ b/src/generated/resources/data/floralis/neoforge/biome_modifier/brown_flower.json @@ -1,6 +1,6 @@ { + "type": "neoforge:add_features", "biomes": "#minecraft:is_overworld", "features": "floralis:brown_flower", - "step": "vegetal_decoration", - "type": "neoforge:add_features" + "step": "vegetal_decoration" } \ No newline at end of file diff --git a/src/generated/resources/data/floralis/neoforge/biome_modifier/cyan_cactus.json b/src/generated/resources/data/floralis/neoforge/biome_modifier/cyan_cactus.json new file mode 100644 index 00000000..df9958a8 --- /dev/null +++ b/src/generated/resources/data/floralis/neoforge/biome_modifier/cyan_cactus.json @@ -0,0 +1,6 @@ +{ + "type": "neoforge:add_features", + "biomes": "#floralis:has_cactus", + "features": "floralis:cyan_cactus", + "step": "vegetal_decoration" +} \ No newline at end of file diff --git a/src/main/resources/data/floralis/neoforge/biome_modifier/cyan_flower.json b/src/generated/resources/data/floralis/neoforge/biome_modifier/cyan_flower.json similarity index 54% rename from src/main/resources/data/floralis/neoforge/biome_modifier/cyan_flower.json rename to src/generated/resources/data/floralis/neoforge/biome_modifier/cyan_flower.json index 46d4bb13..824c6827 100644 --- a/src/main/resources/data/floralis/neoforge/biome_modifier/cyan_flower.json +++ b/src/generated/resources/data/floralis/neoforge/biome_modifier/cyan_flower.json @@ -1,6 +1,6 @@ { + "type": "neoforge:add_features", "biomes": "#minecraft:is_overworld", "features": "floralis:cyan_flower", - "step": "vegetal_decoration", - "type": "neoforge:add_features" + "step": "vegetal_decoration" } \ No newline at end of file diff --git a/src/generated/resources/data/floralis/neoforge/biome_modifier/gray_cactus.json b/src/generated/resources/data/floralis/neoforge/biome_modifier/gray_cactus.json new file mode 100644 index 00000000..770b0aee --- /dev/null +++ b/src/generated/resources/data/floralis/neoforge/biome_modifier/gray_cactus.json @@ -0,0 +1,6 @@ +{ + "type": "neoforge:add_features", + "biomes": "#floralis:has_cactus", + "features": "floralis:gray_cactus", + "step": "vegetal_decoration" +} \ No newline at end of file diff --git a/src/main/resources/data/floralis/neoforge/biome_modifier/gray_flower.json b/src/generated/resources/data/floralis/neoforge/biome_modifier/gray_flower.json similarity index 54% rename from src/main/resources/data/floralis/neoforge/biome_modifier/gray_flower.json rename to src/generated/resources/data/floralis/neoforge/biome_modifier/gray_flower.json index d32cc842..efa51cd1 100644 --- a/src/main/resources/data/floralis/neoforge/biome_modifier/gray_flower.json +++ b/src/generated/resources/data/floralis/neoforge/biome_modifier/gray_flower.json @@ -1,6 +1,6 @@ { + "type": "neoforge:add_features", "biomes": "#minecraft:is_overworld", "features": "floralis:gray_flower", - "step": "vegetal_decoration", - "type": "neoforge:add_features" + "step": "vegetal_decoration" } \ No newline at end of file diff --git a/src/generated/resources/data/floralis/neoforge/biome_modifier/green_cactus.json b/src/generated/resources/data/floralis/neoforge/biome_modifier/green_cactus.json new file mode 100644 index 00000000..a107cfc7 --- /dev/null +++ b/src/generated/resources/data/floralis/neoforge/biome_modifier/green_cactus.json @@ -0,0 +1,6 @@ +{ + "type": "neoforge:add_features", + "biomes": "#floralis:has_cactus", + "features": "floralis:green_cactus", + "step": "vegetal_decoration" +} \ No newline at end of file diff --git a/src/main/resources/data/floralis/neoforge/biome_modifier/green_flower.json b/src/generated/resources/data/floralis/neoforge/biome_modifier/green_flower.json similarity index 55% rename from src/main/resources/data/floralis/neoforge/biome_modifier/green_flower.json rename to src/generated/resources/data/floralis/neoforge/biome_modifier/green_flower.json index e08daf60..39c3eed3 100644 --- a/src/main/resources/data/floralis/neoforge/biome_modifier/green_flower.json +++ b/src/generated/resources/data/floralis/neoforge/biome_modifier/green_flower.json @@ -1,6 +1,6 @@ { + "type": "neoforge:add_features", "biomes": "#minecraft:is_overworld", "features": "floralis:green_flower", - "step": "vegetal_decoration", - "type": "neoforge:add_features" + "step": "vegetal_decoration" } \ No newline at end of file diff --git a/src/generated/resources/data/floralis/neoforge/biome_modifier/light_blue_cactus.json b/src/generated/resources/data/floralis/neoforge/biome_modifier/light_blue_cactus.json new file mode 100644 index 00000000..f9677d30 --- /dev/null +++ b/src/generated/resources/data/floralis/neoforge/biome_modifier/light_blue_cactus.json @@ -0,0 +1,6 @@ +{ + "type": "neoforge:add_features", + "biomes": "#floralis:has_cactus", + "features": "floralis:light_blue_cactus", + "step": "vegetal_decoration" +} \ No newline at end of file diff --git a/src/main/resources/data/floralis/neoforge/biome_modifier/light_blue_flower.json b/src/generated/resources/data/floralis/neoforge/biome_modifier/light_blue_flower.json similarity index 56% rename from src/main/resources/data/floralis/neoforge/biome_modifier/light_blue_flower.json rename to src/generated/resources/data/floralis/neoforge/biome_modifier/light_blue_flower.json index 786a0cd4..e2f452c0 100644 --- a/src/main/resources/data/floralis/neoforge/biome_modifier/light_blue_flower.json +++ b/src/generated/resources/data/floralis/neoforge/biome_modifier/light_blue_flower.json @@ -1,6 +1,6 @@ { + "type": "neoforge:add_features", "biomes": "#minecraft:is_overworld", "features": "floralis:light_blue_flower", - "step": "vegetal_decoration", - "type": "neoforge:add_features" + "step": "vegetal_decoration" } \ No newline at end of file diff --git a/src/generated/resources/data/floralis/neoforge/biome_modifier/light_gray_cactus.json b/src/generated/resources/data/floralis/neoforge/biome_modifier/light_gray_cactus.json new file mode 100644 index 00000000..426e52d2 --- /dev/null +++ b/src/generated/resources/data/floralis/neoforge/biome_modifier/light_gray_cactus.json @@ -0,0 +1,6 @@ +{ + "type": "neoforge:add_features", + "biomes": "#floralis:has_cactus", + "features": "floralis:light_gray_cactus", + "step": "vegetal_decoration" +} \ No newline at end of file diff --git a/src/main/resources/data/floralis/neoforge/biome_modifier/light_gray_flower.json b/src/generated/resources/data/floralis/neoforge/biome_modifier/light_gray_flower.json similarity index 56% rename from src/main/resources/data/floralis/neoforge/biome_modifier/light_gray_flower.json rename to src/generated/resources/data/floralis/neoforge/biome_modifier/light_gray_flower.json index fdc4ce4b..70805067 100644 --- a/src/main/resources/data/floralis/neoforge/biome_modifier/light_gray_flower.json +++ b/src/generated/resources/data/floralis/neoforge/biome_modifier/light_gray_flower.json @@ -1,6 +1,6 @@ { + "type": "neoforge:add_features", "biomes": "#minecraft:is_overworld", "features": "floralis:light_gray_flower", - "step": "vegetal_decoration", - "type": "neoforge:add_features" + "step": "vegetal_decoration" } \ No newline at end of file diff --git a/src/generated/resources/data/floralis/neoforge/biome_modifier/lime_cactus.json b/src/generated/resources/data/floralis/neoforge/biome_modifier/lime_cactus.json new file mode 100644 index 00000000..0a8f5e3c --- /dev/null +++ b/src/generated/resources/data/floralis/neoforge/biome_modifier/lime_cactus.json @@ -0,0 +1,6 @@ +{ + "type": "neoforge:add_features", + "biomes": "#floralis:has_cactus", + "features": "floralis:lime_cactus", + "step": "vegetal_decoration" +} \ No newline at end of file diff --git a/src/main/resources/data/floralis/neoforge/biome_modifier/lime_flower.json b/src/generated/resources/data/floralis/neoforge/biome_modifier/lime_flower.json similarity index 54% rename from src/main/resources/data/floralis/neoforge/biome_modifier/lime_flower.json rename to src/generated/resources/data/floralis/neoforge/biome_modifier/lime_flower.json index d63dcc0d..9584ca25 100644 --- a/src/main/resources/data/floralis/neoforge/biome_modifier/lime_flower.json +++ b/src/generated/resources/data/floralis/neoforge/biome_modifier/lime_flower.json @@ -1,6 +1,6 @@ { + "type": "neoforge:add_features", "biomes": "#minecraft:is_overworld", "features": "floralis:lime_flower", - "step": "vegetal_decoration", - "type": "neoforge:add_features" + "step": "vegetal_decoration" } \ No newline at end of file diff --git a/src/generated/resources/data/floralis/neoforge/biome_modifier/magenta_cactus.json b/src/generated/resources/data/floralis/neoforge/biome_modifier/magenta_cactus.json new file mode 100644 index 00000000..29d18f02 --- /dev/null +++ b/src/generated/resources/data/floralis/neoforge/biome_modifier/magenta_cactus.json @@ -0,0 +1,6 @@ +{ + "type": "neoforge:add_features", + "biomes": "#floralis:has_cactus", + "features": "floralis:magenta_cactus", + "step": "vegetal_decoration" +} \ No newline at end of file diff --git a/src/main/resources/data/floralis/neoforge/biome_modifier/magenta_flower.json b/src/generated/resources/data/floralis/neoforge/biome_modifier/magenta_flower.json similarity index 55% rename from src/main/resources/data/floralis/neoforge/biome_modifier/magenta_flower.json rename to src/generated/resources/data/floralis/neoforge/biome_modifier/magenta_flower.json index d3d8db82..5275dd4d 100644 --- a/src/main/resources/data/floralis/neoforge/biome_modifier/magenta_flower.json +++ b/src/generated/resources/data/floralis/neoforge/biome_modifier/magenta_flower.json @@ -1,6 +1,6 @@ { + "type": "neoforge:add_features", "biomes": "#minecraft:is_overworld", "features": "floralis:magenta_flower", - "step": "vegetal_decoration", - "type": "neoforge:add_features" + "step": "vegetal_decoration" } \ No newline at end of file diff --git a/src/generated/resources/data/floralis/neoforge/biome_modifier/orange_cactus.json b/src/generated/resources/data/floralis/neoforge/biome_modifier/orange_cactus.json new file mode 100644 index 00000000..9a0fbb4c --- /dev/null +++ b/src/generated/resources/data/floralis/neoforge/biome_modifier/orange_cactus.json @@ -0,0 +1,6 @@ +{ + "type": "neoforge:add_features", + "biomes": "#floralis:has_cactus", + "features": "floralis:orange_cactus", + "step": "vegetal_decoration" +} \ No newline at end of file diff --git a/src/main/resources/data/floralis/neoforge/biome_modifier/orange_flower.json b/src/generated/resources/data/floralis/neoforge/biome_modifier/orange_flower.json similarity index 55% rename from src/main/resources/data/floralis/neoforge/biome_modifier/orange_flower.json rename to src/generated/resources/data/floralis/neoforge/biome_modifier/orange_flower.json index 8c652faf..50a92f8a 100644 --- a/src/main/resources/data/floralis/neoforge/biome_modifier/orange_flower.json +++ b/src/generated/resources/data/floralis/neoforge/biome_modifier/orange_flower.json @@ -1,6 +1,6 @@ { + "type": "neoforge:add_features", "biomes": "#minecraft:is_overworld", "features": "floralis:orange_flower", - "step": "vegetal_decoration", - "type": "neoforge:add_features" + "step": "vegetal_decoration" } \ No newline at end of file diff --git a/src/generated/resources/data/floralis/neoforge/biome_modifier/pink_cactus.json b/src/generated/resources/data/floralis/neoforge/biome_modifier/pink_cactus.json new file mode 100644 index 00000000..bb990d55 --- /dev/null +++ b/src/generated/resources/data/floralis/neoforge/biome_modifier/pink_cactus.json @@ -0,0 +1,6 @@ +{ + "type": "neoforge:add_features", + "biomes": "#floralis:has_cactus", + "features": "floralis:pink_cactus", + "step": "vegetal_decoration" +} \ No newline at end of file diff --git a/src/main/resources/data/floralis/neoforge/biome_modifier/pink_flower.json b/src/generated/resources/data/floralis/neoforge/biome_modifier/pink_flower.json similarity index 54% rename from src/main/resources/data/floralis/neoforge/biome_modifier/pink_flower.json rename to src/generated/resources/data/floralis/neoforge/biome_modifier/pink_flower.json index 64b41913..fdd9dda6 100644 --- a/src/main/resources/data/floralis/neoforge/biome_modifier/pink_flower.json +++ b/src/generated/resources/data/floralis/neoforge/biome_modifier/pink_flower.json @@ -1,6 +1,6 @@ { + "type": "neoforge:add_features", "biomes": "#minecraft:is_overworld", "features": "floralis:pink_flower", - "step": "vegetal_decoration", - "type": "neoforge:add_features" + "step": "vegetal_decoration" } \ No newline at end of file diff --git a/src/generated/resources/data/floralis/neoforge/biome_modifier/purple_cactus.json b/src/generated/resources/data/floralis/neoforge/biome_modifier/purple_cactus.json new file mode 100644 index 00000000..b8efef29 --- /dev/null +++ b/src/generated/resources/data/floralis/neoforge/biome_modifier/purple_cactus.json @@ -0,0 +1,6 @@ +{ + "type": "neoforge:add_features", + "biomes": "#floralis:has_cactus", + "features": "floralis:purple_cactus", + "step": "vegetal_decoration" +} \ No newline at end of file diff --git a/src/main/resources/data/floralis/neoforge/biome_modifier/purple_flower.json b/src/generated/resources/data/floralis/neoforge/biome_modifier/purple_flower.json similarity index 55% rename from src/main/resources/data/floralis/neoforge/biome_modifier/purple_flower.json rename to src/generated/resources/data/floralis/neoforge/biome_modifier/purple_flower.json index ac43be43..3e5b419e 100644 --- a/src/main/resources/data/floralis/neoforge/biome_modifier/purple_flower.json +++ b/src/generated/resources/data/floralis/neoforge/biome_modifier/purple_flower.json @@ -1,6 +1,6 @@ { + "type": "neoforge:add_features", "biomes": "#minecraft:is_overworld", "features": "floralis:purple_flower", - "step": "vegetal_decoration", - "type": "neoforge:add_features" + "step": "vegetal_decoration" } \ No newline at end of file diff --git a/src/generated/resources/data/floralis/neoforge/biome_modifier/red_cactus.json b/src/generated/resources/data/floralis/neoforge/biome_modifier/red_cactus.json new file mode 100644 index 00000000..a054ea2f --- /dev/null +++ b/src/generated/resources/data/floralis/neoforge/biome_modifier/red_cactus.json @@ -0,0 +1,6 @@ +{ + "type": "neoforge:add_features", + "biomes": "#floralis:has_cactus", + "features": "floralis:red_cactus", + "step": "vegetal_decoration" +} \ No newline at end of file diff --git a/src/main/resources/data/floralis/neoforge/biome_modifier/red_flower.json b/src/generated/resources/data/floralis/neoforge/biome_modifier/red_flower.json similarity index 54% rename from src/main/resources/data/floralis/neoforge/biome_modifier/red_flower.json rename to src/generated/resources/data/floralis/neoforge/biome_modifier/red_flower.json index b5cd5913..08538f91 100644 --- a/src/main/resources/data/floralis/neoforge/biome_modifier/red_flower.json +++ b/src/generated/resources/data/floralis/neoforge/biome_modifier/red_flower.json @@ -1,6 +1,6 @@ { + "type": "neoforge:add_features", "biomes": "#minecraft:is_overworld", "features": "floralis:red_flower", - "step": "vegetal_decoration", - "type": "neoforge:add_features" + "step": "vegetal_decoration" } \ No newline at end of file diff --git a/src/generated/resources/data/floralis/neoforge/biome_modifier/white_cactus.json b/src/generated/resources/data/floralis/neoforge/biome_modifier/white_cactus.json new file mode 100644 index 00000000..f40c49af --- /dev/null +++ b/src/generated/resources/data/floralis/neoforge/biome_modifier/white_cactus.json @@ -0,0 +1,6 @@ +{ + "type": "neoforge:add_features", + "biomes": "#floralis:has_cactus", + "features": "floralis:white_cactus", + "step": "vegetal_decoration" +} \ No newline at end of file diff --git a/src/main/resources/data/floralis/neoforge/biome_modifier/white_flower.json b/src/generated/resources/data/floralis/neoforge/biome_modifier/white_flower.json similarity index 55% rename from src/main/resources/data/floralis/neoforge/biome_modifier/white_flower.json rename to src/generated/resources/data/floralis/neoforge/biome_modifier/white_flower.json index 34c1b77e..34936d94 100644 --- a/src/main/resources/data/floralis/neoforge/biome_modifier/white_flower.json +++ b/src/generated/resources/data/floralis/neoforge/biome_modifier/white_flower.json @@ -1,6 +1,6 @@ { + "type": "neoforge:add_features", "biomes": "#minecraft:is_overworld", "features": "floralis:white_flower", - "step": "vegetal_decoration", - "type": "neoforge:add_features" + "step": "vegetal_decoration" } \ No newline at end of file diff --git a/src/generated/resources/data/floralis/neoforge/biome_modifier/yellow_cactus.json b/src/generated/resources/data/floralis/neoforge/biome_modifier/yellow_cactus.json new file mode 100644 index 00000000..5e9a9635 --- /dev/null +++ b/src/generated/resources/data/floralis/neoforge/biome_modifier/yellow_cactus.json @@ -0,0 +1,6 @@ +{ + "type": "neoforge:add_features", + "biomes": "#floralis:has_cactus", + "features": "floralis:yellow_cactus", + "step": "vegetal_decoration" +} \ No newline at end of file diff --git a/src/main/resources/data/floralis/neoforge/biome_modifier/yellow_flower.json b/src/generated/resources/data/floralis/neoforge/biome_modifier/yellow_flower.json similarity index 55% rename from src/main/resources/data/floralis/neoforge/biome_modifier/yellow_flower.json rename to src/generated/resources/data/floralis/neoforge/biome_modifier/yellow_flower.json index d543862e..bb642657 100644 --- a/src/main/resources/data/floralis/neoforge/biome_modifier/yellow_flower.json +++ b/src/generated/resources/data/floralis/neoforge/biome_modifier/yellow_flower.json @@ -1,6 +1,6 @@ { + "type": "neoforge:add_features", "biomes": "#minecraft:is_overworld", "features": "floralis:yellow_flower", - "step": "vegetal_decoration", - "type": "neoforge:add_features" + "step": "vegetal_decoration" } \ No newline at end of file diff --git a/src/generated/resources/data/floralis/recipes/black_dye_block_from_black_dye.json b/src/generated/resources/data/floralis/recipes/black_dye_block_from_black_dye.json new file mode 100644 index 00000000..170373e9 --- /dev/null +++ b/src/generated/resources/data/floralis/recipes/black_dye_block_from_black_dye.json @@ -0,0 +1,37 @@ +{ + "type": "minecraft:crafting_shapeless", + "category": "misc", + "ingredients": [ + { + "item": "minecraft:black_dye" + }, + { + "item": "minecraft:black_dye" + }, + { + "item": "minecraft:black_dye" + }, + { + "item": "minecraft:black_dye" + }, + { + "item": "minecraft:black_dye" + }, + { + "item": "minecraft:black_dye" + }, + { + "item": "minecraft:black_dye" + }, + { + "item": "minecraft:black_dye" + }, + { + "item": "minecraft:black_dye" + } + ], + "result": { + "count": 1, + "id": "floralis:black_dye_block" + } +} \ No newline at end of file diff --git a/src/main/resources/data/floralis/recipes/crafting/black_dye_block_decompressing.json b/src/generated/resources/data/floralis/recipes/black_dye_from_black_dye_block.json similarity index 66% rename from src/main/resources/data/floralis/recipes/crafting/black_dye_block_decompressing.json rename to src/generated/resources/data/floralis/recipes/black_dye_from_black_dye_block.json index 243550c7..59af7afd 100644 --- a/src/main/resources/data/floralis/recipes/crafting/black_dye_block_decompressing.json +++ b/src/generated/resources/data/floralis/recipes/black_dye_from_black_dye_block.json @@ -1,12 +1,13 @@ { "type": "minecraft:crafting_shapeless", + "category": "misc", "ingredients": [ { "item": "floralis:black_dye_block" } ], "result": { - "item": "minecraft:black_dye", - "count": 9 + "count": 9, + "id": "minecraft:black_dye" } } \ No newline at end of file diff --git a/src/main/resources/data/floralis/recipes/smelting/black_dye.json b/src/generated/resources/data/floralis/recipes/black_dye_from_smelting_black_petals.json similarity index 51% rename from src/main/resources/data/floralis/recipes/smelting/black_dye.json rename to src/generated/resources/data/floralis/recipes/black_dye_from_smelting_black_petals.json index 3a01f65e..9802c786 100644 --- a/src/main/resources/data/floralis/recipes/smelting/black_dye.json +++ b/src/generated/resources/data/floralis/recipes/black_dye_from_smelting_black_petals.json @@ -1,9 +1,13 @@ { "type": "minecraft:smelting", + "category": "misc", + "cookingtime": 200, + "experience": 0.1, "ingredient": { "item": "floralis:black_petals" }, - "result": "minecraft:black_dye", - "experience": 0.1, - "cookingtime": 200 + "result": { + "count": 1, + "id": "minecraft:black_dye" + } } \ No newline at end of file diff --git a/src/generated/resources/data/floralis/recipes/blue_dye_block_from_blue_dye.json b/src/generated/resources/data/floralis/recipes/blue_dye_block_from_blue_dye.json new file mode 100644 index 00000000..85b5233d --- /dev/null +++ b/src/generated/resources/data/floralis/recipes/blue_dye_block_from_blue_dye.json @@ -0,0 +1,37 @@ +{ + "type": "minecraft:crafting_shapeless", + "category": "misc", + "ingredients": [ + { + "item": "minecraft:blue_dye" + }, + { + "item": "minecraft:blue_dye" + }, + { + "item": "minecraft:blue_dye" + }, + { + "item": "minecraft:blue_dye" + }, + { + "item": "minecraft:blue_dye" + }, + { + "item": "minecraft:blue_dye" + }, + { + "item": "minecraft:blue_dye" + }, + { + "item": "minecraft:blue_dye" + }, + { + "item": "minecraft:blue_dye" + } + ], + "result": { + "count": 1, + "id": "floralis:blue_dye_block" + } +} \ No newline at end of file diff --git a/src/main/resources/data/floralis/recipes/crafting/blue_dye_block_decompressing.json b/src/generated/resources/data/floralis/recipes/blue_dye_from_blue_dye_block.json similarity index 66% rename from src/main/resources/data/floralis/recipes/crafting/blue_dye_block_decompressing.json rename to src/generated/resources/data/floralis/recipes/blue_dye_from_blue_dye_block.json index 30cd46f8..8545a6c2 100644 --- a/src/main/resources/data/floralis/recipes/crafting/blue_dye_block_decompressing.json +++ b/src/generated/resources/data/floralis/recipes/blue_dye_from_blue_dye_block.json @@ -1,12 +1,13 @@ { "type": "minecraft:crafting_shapeless", + "category": "misc", "ingredients": [ { "item": "floralis:blue_dye_block" } ], "result": { - "item": "minecraft:blue_dye", - "count": 9 + "count": 9, + "id": "minecraft:blue_dye" } } \ No newline at end of file diff --git a/src/main/resources/data/floralis/recipes/smelting/blue_dye.json b/src/generated/resources/data/floralis/recipes/blue_dye_from_smelting_blue_petals.json similarity index 51% rename from src/main/resources/data/floralis/recipes/smelting/blue_dye.json rename to src/generated/resources/data/floralis/recipes/blue_dye_from_smelting_blue_petals.json index 6c8f7326..bba19992 100644 --- a/src/main/resources/data/floralis/recipes/smelting/blue_dye.json +++ b/src/generated/resources/data/floralis/recipes/blue_dye_from_smelting_blue_petals.json @@ -1,9 +1,13 @@ { "type": "minecraft:smelting", + "category": "misc", + "cookingtime": 200, + "experience": 0.1, "ingredient": { "item": "floralis:blue_petals" }, - "result": "minecraft:blue_dye", - "experience": 0.1, - "cookingtime": 200 + "result": { + "count": 1, + "id": "minecraft:blue_dye" + } } \ No newline at end of file diff --git a/src/generated/resources/data/floralis/recipes/brown_dye_block_from_brown_dye.json b/src/generated/resources/data/floralis/recipes/brown_dye_block_from_brown_dye.json new file mode 100644 index 00000000..1e3dbe46 --- /dev/null +++ b/src/generated/resources/data/floralis/recipes/brown_dye_block_from_brown_dye.json @@ -0,0 +1,37 @@ +{ + "type": "minecraft:crafting_shapeless", + "category": "misc", + "ingredients": [ + { + "item": "minecraft:brown_dye" + }, + { + "item": "minecraft:brown_dye" + }, + { + "item": "minecraft:brown_dye" + }, + { + "item": "minecraft:brown_dye" + }, + { + "item": "minecraft:brown_dye" + }, + { + "item": "minecraft:brown_dye" + }, + { + "item": "minecraft:brown_dye" + }, + { + "item": "minecraft:brown_dye" + }, + { + "item": "minecraft:brown_dye" + } + ], + "result": { + "count": 1, + "id": "floralis:brown_dye_block" + } +} \ No newline at end of file diff --git a/src/main/resources/data/floralis/recipes/crafting/brown_dye_block_decompressing.json b/src/generated/resources/data/floralis/recipes/brown_dye_from_brown_dye_block.json similarity index 66% rename from src/main/resources/data/floralis/recipes/crafting/brown_dye_block_decompressing.json rename to src/generated/resources/data/floralis/recipes/brown_dye_from_brown_dye_block.json index 76b70995..dc458175 100644 --- a/src/main/resources/data/floralis/recipes/crafting/brown_dye_block_decompressing.json +++ b/src/generated/resources/data/floralis/recipes/brown_dye_from_brown_dye_block.json @@ -1,12 +1,13 @@ { "type": "minecraft:crafting_shapeless", + "category": "misc", "ingredients": [ { "item": "floralis:brown_dye_block" } ], "result": { - "item": "minecraft:brown_dye", - "count": 9 + "count": 9, + "id": "minecraft:brown_dye" } } \ No newline at end of file diff --git a/src/main/resources/data/floralis/recipes/smelting/brown_dye.json b/src/generated/resources/data/floralis/recipes/brown_dye_from_smelting_brown_petals.json similarity index 51% rename from src/main/resources/data/floralis/recipes/smelting/brown_dye.json rename to src/generated/resources/data/floralis/recipes/brown_dye_from_smelting_brown_petals.json index 6252c5f6..c51a5d09 100644 --- a/src/main/resources/data/floralis/recipes/smelting/brown_dye.json +++ b/src/generated/resources/data/floralis/recipes/brown_dye_from_smelting_brown_petals.json @@ -1,9 +1,13 @@ { "type": "minecraft:smelting", + "category": "misc", + "cookingtime": 200, + "experience": 0.1, "ingredient": { "item": "floralis:brown_petals" }, - "result": "minecraft:brown_dye", - "experience": 0.1, - "cookingtime": 200 + "result": { + "count": 1, + "id": "minecraft:brown_dye" + } } \ No newline at end of file diff --git a/src/generated/resources/data/floralis/recipes/cyan_dye_block_from_cyan_dye.json b/src/generated/resources/data/floralis/recipes/cyan_dye_block_from_cyan_dye.json new file mode 100644 index 00000000..0868a1d2 --- /dev/null +++ b/src/generated/resources/data/floralis/recipes/cyan_dye_block_from_cyan_dye.json @@ -0,0 +1,37 @@ +{ + "type": "minecraft:crafting_shapeless", + "category": "misc", + "ingredients": [ + { + "item": "minecraft:cyan_dye" + }, + { + "item": "minecraft:cyan_dye" + }, + { + "item": "minecraft:cyan_dye" + }, + { + "item": "minecraft:cyan_dye" + }, + { + "item": "minecraft:cyan_dye" + }, + { + "item": "minecraft:cyan_dye" + }, + { + "item": "minecraft:cyan_dye" + }, + { + "item": "minecraft:cyan_dye" + }, + { + "item": "minecraft:cyan_dye" + } + ], + "result": { + "count": 1, + "id": "floralis:cyan_dye_block" + } +} \ No newline at end of file diff --git a/src/main/resources/data/floralis/recipes/crafting/cyan_dye_block_decompressing.json b/src/generated/resources/data/floralis/recipes/cyan_dye_from_cyan_dye_block.json similarity index 66% rename from src/main/resources/data/floralis/recipes/crafting/cyan_dye_block_decompressing.json rename to src/generated/resources/data/floralis/recipes/cyan_dye_from_cyan_dye_block.json index 088c461a..367e436b 100644 --- a/src/main/resources/data/floralis/recipes/crafting/cyan_dye_block_decompressing.json +++ b/src/generated/resources/data/floralis/recipes/cyan_dye_from_cyan_dye_block.json @@ -1,12 +1,13 @@ { "type": "minecraft:crafting_shapeless", + "category": "misc", "ingredients": [ { "item": "floralis:cyan_dye_block" } ], "result": { - "item": "minecraft:cyan_dye", - "count": 9 + "count": 9, + "id": "minecraft:cyan_dye" } } \ No newline at end of file diff --git a/src/main/resources/data/floralis/recipes/smelting/cyan_dye.json b/src/generated/resources/data/floralis/recipes/cyan_dye_from_smelting_cyan_petals.json similarity index 51% rename from src/main/resources/data/floralis/recipes/smelting/cyan_dye.json rename to src/generated/resources/data/floralis/recipes/cyan_dye_from_smelting_cyan_petals.json index 87e1f9df..d66884ee 100644 --- a/src/main/resources/data/floralis/recipes/smelting/cyan_dye.json +++ b/src/generated/resources/data/floralis/recipes/cyan_dye_from_smelting_cyan_petals.json @@ -1,9 +1,13 @@ { "type": "minecraft:smelting", + "category": "misc", + "cookingtime": 200, + "experience": 0.1, "ingredient": { "item": "floralis:cyan_petals" }, - "result": "minecraft:cyan_dye", - "experience": 0.1, - "cookingtime": 200 + "result": { + "count": 1, + "id": "minecraft:cyan_dye" + } } \ No newline at end of file diff --git a/src/generated/resources/data/floralis/recipes/gray_dye_block_from_gray_dye.json b/src/generated/resources/data/floralis/recipes/gray_dye_block_from_gray_dye.json new file mode 100644 index 00000000..14dc59e9 --- /dev/null +++ b/src/generated/resources/data/floralis/recipes/gray_dye_block_from_gray_dye.json @@ -0,0 +1,37 @@ +{ + "type": "minecraft:crafting_shapeless", + "category": "misc", + "ingredients": [ + { + "item": "minecraft:gray_dye" + }, + { + "item": "minecraft:gray_dye" + }, + { + "item": "minecraft:gray_dye" + }, + { + "item": "minecraft:gray_dye" + }, + { + "item": "minecraft:gray_dye" + }, + { + "item": "minecraft:gray_dye" + }, + { + "item": "minecraft:gray_dye" + }, + { + "item": "minecraft:gray_dye" + }, + { + "item": "minecraft:gray_dye" + } + ], + "result": { + "count": 1, + "id": "floralis:gray_dye_block" + } +} \ No newline at end of file diff --git a/src/main/resources/data/floralis/recipes/crafting/gray_dye_block_decompressing.json b/src/generated/resources/data/floralis/recipes/gray_dye_from_gray_dye_block.json similarity index 66% rename from src/main/resources/data/floralis/recipes/crafting/gray_dye_block_decompressing.json rename to src/generated/resources/data/floralis/recipes/gray_dye_from_gray_dye_block.json index f02625cc..f900d7af 100644 --- a/src/main/resources/data/floralis/recipes/crafting/gray_dye_block_decompressing.json +++ b/src/generated/resources/data/floralis/recipes/gray_dye_from_gray_dye_block.json @@ -1,12 +1,13 @@ { "type": "minecraft:crafting_shapeless", + "category": "misc", "ingredients": [ { "item": "floralis:gray_dye_block" } ], "result": { - "item": "minecraft:gray_dye", - "count": 9 + "count": 9, + "id": "minecraft:gray_dye" } } \ No newline at end of file diff --git a/src/main/resources/data/floralis/recipes/smelting/gray_dye.json b/src/generated/resources/data/floralis/recipes/gray_dye_from_smelting_gray_petals.json similarity index 51% rename from src/main/resources/data/floralis/recipes/smelting/gray_dye.json rename to src/generated/resources/data/floralis/recipes/gray_dye_from_smelting_gray_petals.json index a1808bd6..10500418 100644 --- a/src/main/resources/data/floralis/recipes/smelting/gray_dye.json +++ b/src/generated/resources/data/floralis/recipes/gray_dye_from_smelting_gray_petals.json @@ -1,9 +1,13 @@ { "type": "minecraft:smelting", + "category": "misc", + "cookingtime": 200, + "experience": 0.1, "ingredient": { "item": "floralis:gray_petals" }, - "result": "minecraft:gray_dye", - "experience": 0.1, - "cookingtime": 200 + "result": { + "count": 1, + "id": "minecraft:gray_dye" + } } \ No newline at end of file diff --git a/src/generated/resources/data/floralis/recipes/green_dye_block_from_green_dye.json b/src/generated/resources/data/floralis/recipes/green_dye_block_from_green_dye.json new file mode 100644 index 00000000..a383eadf --- /dev/null +++ b/src/generated/resources/data/floralis/recipes/green_dye_block_from_green_dye.json @@ -0,0 +1,37 @@ +{ + "type": "minecraft:crafting_shapeless", + "category": "misc", + "ingredients": [ + { + "item": "minecraft:green_dye" + }, + { + "item": "minecraft:green_dye" + }, + { + "item": "minecraft:green_dye" + }, + { + "item": "minecraft:green_dye" + }, + { + "item": "minecraft:green_dye" + }, + { + "item": "minecraft:green_dye" + }, + { + "item": "minecraft:green_dye" + }, + { + "item": "minecraft:green_dye" + }, + { + "item": "minecraft:green_dye" + } + ], + "result": { + "count": 1, + "id": "floralis:green_dye_block" + } +} \ No newline at end of file diff --git a/src/main/resources/data/floralis/recipes/crafting/green_dye_block_decompressing.json b/src/generated/resources/data/floralis/recipes/green_dye_from_green_dye_block.json similarity index 66% rename from src/main/resources/data/floralis/recipes/crafting/green_dye_block_decompressing.json rename to src/generated/resources/data/floralis/recipes/green_dye_from_green_dye_block.json index 89491268..28531d7a 100644 --- a/src/main/resources/data/floralis/recipes/crafting/green_dye_block_decompressing.json +++ b/src/generated/resources/data/floralis/recipes/green_dye_from_green_dye_block.json @@ -1,12 +1,13 @@ { "type": "minecraft:crafting_shapeless", + "category": "misc", "ingredients": [ { "item": "floralis:green_dye_block" } ], "result": { - "item": "minecraft:green_dye", - "count": 9 + "count": 9, + "id": "minecraft:green_dye" } } \ No newline at end of file diff --git a/src/main/resources/data/floralis/recipes/smelting/green_dye.json b/src/generated/resources/data/floralis/recipes/green_dye_from_smelting_green_petals.json similarity index 51% rename from src/main/resources/data/floralis/recipes/smelting/green_dye.json rename to src/generated/resources/data/floralis/recipes/green_dye_from_smelting_green_petals.json index 1b22c27e..e83955dc 100644 --- a/src/main/resources/data/floralis/recipes/smelting/green_dye.json +++ b/src/generated/resources/data/floralis/recipes/green_dye_from_smelting_green_petals.json @@ -1,9 +1,13 @@ { "type": "minecraft:smelting", + "category": "misc", + "cookingtime": 200, + "experience": 0.1, "ingredient": { "item": "floralis:green_petals" }, - "result": "minecraft:green_dye", - "experience": 0.1, - "cookingtime": 200 + "result": { + "count": 1, + "id": "minecraft:green_dye" + } } \ No newline at end of file diff --git a/src/generated/resources/data/floralis/recipes/light_blue_dye_block_from_light_blue_dye.json b/src/generated/resources/data/floralis/recipes/light_blue_dye_block_from_light_blue_dye.json new file mode 100644 index 00000000..2a1751fc --- /dev/null +++ b/src/generated/resources/data/floralis/recipes/light_blue_dye_block_from_light_blue_dye.json @@ -0,0 +1,37 @@ +{ + "type": "minecraft:crafting_shapeless", + "category": "misc", + "ingredients": [ + { + "item": "minecraft:light_blue_dye" + }, + { + "item": "minecraft:light_blue_dye" + }, + { + "item": "minecraft:light_blue_dye" + }, + { + "item": "minecraft:light_blue_dye" + }, + { + "item": "minecraft:light_blue_dye" + }, + { + "item": "minecraft:light_blue_dye" + }, + { + "item": "minecraft:light_blue_dye" + }, + { + "item": "minecraft:light_blue_dye" + }, + { + "item": "minecraft:light_blue_dye" + } + ], + "result": { + "count": 1, + "id": "floralis:light_blue_dye_block" + } +} \ No newline at end of file diff --git a/src/main/resources/data/floralis/recipes/crafting/light_blue_dye_block_decompressing.json b/src/generated/resources/data/floralis/recipes/light_blue_dye_from_light_blue_dye_block.json similarity index 65% rename from src/main/resources/data/floralis/recipes/crafting/light_blue_dye_block_decompressing.json rename to src/generated/resources/data/floralis/recipes/light_blue_dye_from_light_blue_dye_block.json index 42ae2fe5..f2198e12 100644 --- a/src/main/resources/data/floralis/recipes/crafting/light_blue_dye_block_decompressing.json +++ b/src/generated/resources/data/floralis/recipes/light_blue_dye_from_light_blue_dye_block.json @@ -1,12 +1,13 @@ { "type": "minecraft:crafting_shapeless", + "category": "misc", "ingredients": [ { "item": "floralis:light_blue_dye_block" } ], "result": { - "item": "minecraft:light_blue_dye", - "count": 9 + "count": 9, + "id": "minecraft:light_blue_dye" } } \ No newline at end of file diff --git a/src/main/resources/data/floralis/recipes/smelting/light_blue_dye.json b/src/generated/resources/data/floralis/recipes/light_blue_dye_from_smelting_light_blue_petals.json similarity index 51% rename from src/main/resources/data/floralis/recipes/smelting/light_blue_dye.json rename to src/generated/resources/data/floralis/recipes/light_blue_dye_from_smelting_light_blue_petals.json index 62c0762c..fbbd9b91 100644 --- a/src/main/resources/data/floralis/recipes/smelting/light_blue_dye.json +++ b/src/generated/resources/data/floralis/recipes/light_blue_dye_from_smelting_light_blue_petals.json @@ -1,9 +1,13 @@ { "type": "minecraft:smelting", + "category": "misc", + "cookingtime": 200, + "experience": 0.1, "ingredient": { "item": "floralis:light_blue_petals" }, - "result": "minecraft:light_blue_dye", - "experience": 0.1, - "cookingtime": 200 + "result": { + "count": 1, + "id": "minecraft:light_blue_dye" + } } \ No newline at end of file diff --git a/src/generated/resources/data/floralis/recipes/light_gray_dye_block_from_light_gray_dye.json b/src/generated/resources/data/floralis/recipes/light_gray_dye_block_from_light_gray_dye.json new file mode 100644 index 00000000..73382cdc --- /dev/null +++ b/src/generated/resources/data/floralis/recipes/light_gray_dye_block_from_light_gray_dye.json @@ -0,0 +1,37 @@ +{ + "type": "minecraft:crafting_shapeless", + "category": "misc", + "ingredients": [ + { + "item": "minecraft:light_gray_dye" + }, + { + "item": "minecraft:light_gray_dye" + }, + { + "item": "minecraft:light_gray_dye" + }, + { + "item": "minecraft:light_gray_dye" + }, + { + "item": "minecraft:light_gray_dye" + }, + { + "item": "minecraft:light_gray_dye" + }, + { + "item": "minecraft:light_gray_dye" + }, + { + "item": "minecraft:light_gray_dye" + }, + { + "item": "minecraft:light_gray_dye" + } + ], + "result": { + "count": 1, + "id": "floralis:light_gray_dye_block" + } +} \ No newline at end of file diff --git a/src/main/resources/data/floralis/recipes/crafting/light_gray_dye_block_decompressing.json b/src/generated/resources/data/floralis/recipes/light_gray_dye_from_light_gray_dye_block.json similarity index 65% rename from src/main/resources/data/floralis/recipes/crafting/light_gray_dye_block_decompressing.json rename to src/generated/resources/data/floralis/recipes/light_gray_dye_from_light_gray_dye_block.json index 55865486..3c10dffc 100644 --- a/src/main/resources/data/floralis/recipes/crafting/light_gray_dye_block_decompressing.json +++ b/src/generated/resources/data/floralis/recipes/light_gray_dye_from_light_gray_dye_block.json @@ -1,12 +1,13 @@ { "type": "minecraft:crafting_shapeless", + "category": "misc", "ingredients": [ { "item": "floralis:light_gray_dye_block" } ], "result": { - "item": "minecraft:light_gray_dye", - "count": 9 + "count": 9, + "id": "minecraft:light_gray_dye" } } \ No newline at end of file diff --git a/src/main/resources/data/floralis/recipes/smelting/light_gray_dye.json b/src/generated/resources/data/floralis/recipes/light_gray_dye_from_smelting_light_gray_petals.json similarity index 51% rename from src/main/resources/data/floralis/recipes/smelting/light_gray_dye.json rename to src/generated/resources/data/floralis/recipes/light_gray_dye_from_smelting_light_gray_petals.json index d4ca4db0..a662bb1d 100644 --- a/src/main/resources/data/floralis/recipes/smelting/light_gray_dye.json +++ b/src/generated/resources/data/floralis/recipes/light_gray_dye_from_smelting_light_gray_petals.json @@ -1,9 +1,13 @@ { "type": "minecraft:smelting", + "category": "misc", + "cookingtime": 200, + "experience": 0.1, "ingredient": { "item": "floralis:light_gray_petals" }, - "result": "minecraft:light_gray_dye", - "experience": 0.1, - "cookingtime": 200 + "result": { + "count": 1, + "id": "minecraft:light_gray_dye" + } } \ No newline at end of file diff --git a/src/generated/resources/data/floralis/recipes/lime_dye_block_from_lime_dye.json b/src/generated/resources/data/floralis/recipes/lime_dye_block_from_lime_dye.json new file mode 100644 index 00000000..9fff9792 --- /dev/null +++ b/src/generated/resources/data/floralis/recipes/lime_dye_block_from_lime_dye.json @@ -0,0 +1,37 @@ +{ + "type": "minecraft:crafting_shapeless", + "category": "misc", + "ingredients": [ + { + "item": "minecraft:lime_dye" + }, + { + "item": "minecraft:lime_dye" + }, + { + "item": "minecraft:lime_dye" + }, + { + "item": "minecraft:lime_dye" + }, + { + "item": "minecraft:lime_dye" + }, + { + "item": "minecraft:lime_dye" + }, + { + "item": "minecraft:lime_dye" + }, + { + "item": "minecraft:lime_dye" + }, + { + "item": "minecraft:lime_dye" + } + ], + "result": { + "count": 1, + "id": "floralis:lime_dye_block" + } +} \ No newline at end of file diff --git a/src/main/resources/data/floralis/recipes/crafting/lime_dye_block_decompressing.json b/src/generated/resources/data/floralis/recipes/lime_dye_from_lime_dye_block.json similarity index 66% rename from src/main/resources/data/floralis/recipes/crafting/lime_dye_block_decompressing.json rename to src/generated/resources/data/floralis/recipes/lime_dye_from_lime_dye_block.json index aa6c88d0..72e16bc2 100644 --- a/src/main/resources/data/floralis/recipes/crafting/lime_dye_block_decompressing.json +++ b/src/generated/resources/data/floralis/recipes/lime_dye_from_lime_dye_block.json @@ -1,12 +1,13 @@ { "type": "minecraft:crafting_shapeless", + "category": "misc", "ingredients": [ { "item": "floralis:lime_dye_block" } ], "result": { - "item": "minecraft:lime_dye", - "count": 9 + "count": 9, + "id": "minecraft:lime_dye" } } \ No newline at end of file diff --git a/src/main/resources/data/floralis/recipes/smelting/lime_dye.json b/src/generated/resources/data/floralis/recipes/lime_dye_from_smelting_lime_petals.json similarity index 51% rename from src/main/resources/data/floralis/recipes/smelting/lime_dye.json rename to src/generated/resources/data/floralis/recipes/lime_dye_from_smelting_lime_petals.json index 4c9e6442..408ec693 100644 --- a/src/main/resources/data/floralis/recipes/smelting/lime_dye.json +++ b/src/generated/resources/data/floralis/recipes/lime_dye_from_smelting_lime_petals.json @@ -1,9 +1,13 @@ { "type": "minecraft:smelting", + "category": "misc", + "cookingtime": 200, + "experience": 0.1, "ingredient": { "item": "floralis:lime_petals" }, - "result": "minecraft:lime_dye", - "experience": 0.1, - "cookingtime": 200 + "result": { + "count": 1, + "id": "minecraft:lime_dye" + } } \ No newline at end of file diff --git a/src/generated/resources/data/floralis/recipes/magenta_dye_block_from_magenta_dye.json b/src/generated/resources/data/floralis/recipes/magenta_dye_block_from_magenta_dye.json new file mode 100644 index 00000000..d88b1235 --- /dev/null +++ b/src/generated/resources/data/floralis/recipes/magenta_dye_block_from_magenta_dye.json @@ -0,0 +1,37 @@ +{ + "type": "minecraft:crafting_shapeless", + "category": "misc", + "ingredients": [ + { + "item": "minecraft:magenta_dye" + }, + { + "item": "minecraft:magenta_dye" + }, + { + "item": "minecraft:magenta_dye" + }, + { + "item": "minecraft:magenta_dye" + }, + { + "item": "minecraft:magenta_dye" + }, + { + "item": "minecraft:magenta_dye" + }, + { + "item": "minecraft:magenta_dye" + }, + { + "item": "minecraft:magenta_dye" + }, + { + "item": "minecraft:magenta_dye" + } + ], + "result": { + "count": 1, + "id": "floralis:magenta_dye_block" + } +} \ No newline at end of file diff --git a/src/main/resources/data/floralis/recipes/crafting/magenta_dye_block_decompressing.json b/src/generated/resources/data/floralis/recipes/magenta_dye_from_magenta_dye_block.json similarity index 66% rename from src/main/resources/data/floralis/recipes/crafting/magenta_dye_block_decompressing.json rename to src/generated/resources/data/floralis/recipes/magenta_dye_from_magenta_dye_block.json index 036953e6..f2a5901d 100644 --- a/src/main/resources/data/floralis/recipes/crafting/magenta_dye_block_decompressing.json +++ b/src/generated/resources/data/floralis/recipes/magenta_dye_from_magenta_dye_block.json @@ -1,12 +1,13 @@ { "type": "minecraft:crafting_shapeless", + "category": "misc", "ingredients": [ { "item": "floralis:magenta_dye_block" } ], "result": { - "item": "minecraft:magenta_dye", - "count": 9 + "count": 9, + "id": "minecraft:magenta_dye" } } \ No newline at end of file diff --git a/src/main/resources/data/floralis/recipes/smelting/magenta_dye.json b/src/generated/resources/data/floralis/recipes/magenta_dye_from_smelting_magenta_petals.json similarity index 51% rename from src/main/resources/data/floralis/recipes/smelting/magenta_dye.json rename to src/generated/resources/data/floralis/recipes/magenta_dye_from_smelting_magenta_petals.json index f5280de2..27c910a5 100644 --- a/src/main/resources/data/floralis/recipes/smelting/magenta_dye.json +++ b/src/generated/resources/data/floralis/recipes/magenta_dye_from_smelting_magenta_petals.json @@ -1,9 +1,13 @@ { "type": "minecraft:smelting", + "category": "misc", + "cookingtime": 200, + "experience": 0.1, "ingredient": { "item": "floralis:magenta_petals" }, - "result": "minecraft:magenta_dye", - "experience": 0.1, - "cookingtime": 200 + "result": { + "count": 1, + "id": "minecraft:magenta_dye" + } } \ No newline at end of file diff --git a/src/generated/resources/data/floralis/recipes/orange_dye_block_from_orange_dye.json b/src/generated/resources/data/floralis/recipes/orange_dye_block_from_orange_dye.json new file mode 100644 index 00000000..af3ff1ce --- /dev/null +++ b/src/generated/resources/data/floralis/recipes/orange_dye_block_from_orange_dye.json @@ -0,0 +1,37 @@ +{ + "type": "minecraft:crafting_shapeless", + "category": "misc", + "ingredients": [ + { + "item": "minecraft:orange_dye" + }, + { + "item": "minecraft:orange_dye" + }, + { + "item": "minecraft:orange_dye" + }, + { + "item": "minecraft:orange_dye" + }, + { + "item": "minecraft:orange_dye" + }, + { + "item": "minecraft:orange_dye" + }, + { + "item": "minecraft:orange_dye" + }, + { + "item": "minecraft:orange_dye" + }, + { + "item": "minecraft:orange_dye" + } + ], + "result": { + "count": 1, + "id": "floralis:orange_dye_block" + } +} \ No newline at end of file diff --git a/src/main/resources/data/floralis/recipes/crafting/orange_dye_block_decompressing.json b/src/generated/resources/data/floralis/recipes/orange_dye_from_orange_dye_block.json similarity index 66% rename from src/main/resources/data/floralis/recipes/crafting/orange_dye_block_decompressing.json rename to src/generated/resources/data/floralis/recipes/orange_dye_from_orange_dye_block.json index 11566d6f..58c1d789 100644 --- a/src/main/resources/data/floralis/recipes/crafting/orange_dye_block_decompressing.json +++ b/src/generated/resources/data/floralis/recipes/orange_dye_from_orange_dye_block.json @@ -1,12 +1,13 @@ { "type": "minecraft:crafting_shapeless", + "category": "misc", "ingredients": [ { "item": "floralis:orange_dye_block" } ], "result": { - "item": "minecraft:orange_dye", - "count": 9 + "count": 9, + "id": "minecraft:orange_dye" } } \ No newline at end of file diff --git a/src/main/resources/data/floralis/recipes/smelting/orange_dye.json b/src/generated/resources/data/floralis/recipes/orange_dye_from_smelting_orange_petals.json similarity index 51% rename from src/main/resources/data/floralis/recipes/smelting/orange_dye.json rename to src/generated/resources/data/floralis/recipes/orange_dye_from_smelting_orange_petals.json index 7c023ac4..0efbdc81 100644 --- a/src/main/resources/data/floralis/recipes/smelting/orange_dye.json +++ b/src/generated/resources/data/floralis/recipes/orange_dye_from_smelting_orange_petals.json @@ -1,9 +1,13 @@ { "type": "minecraft:smelting", + "category": "misc", + "cookingtime": 200, + "experience": 0.1, "ingredient": { "item": "floralis:orange_petals" }, - "result": "minecraft:orange_dye", - "experience": 0.1, - "cookingtime": 200 + "result": { + "count": 1, + "id": "minecraft:orange_dye" + } } \ No newline at end of file diff --git a/src/generated/resources/data/floralis/recipes/pink_dye_block_from_pink_dye.json b/src/generated/resources/data/floralis/recipes/pink_dye_block_from_pink_dye.json new file mode 100644 index 00000000..984a782a --- /dev/null +++ b/src/generated/resources/data/floralis/recipes/pink_dye_block_from_pink_dye.json @@ -0,0 +1,37 @@ +{ + "type": "minecraft:crafting_shapeless", + "category": "misc", + "ingredients": [ + { + "item": "minecraft:pink_dye" + }, + { + "item": "minecraft:pink_dye" + }, + { + "item": "minecraft:pink_dye" + }, + { + "item": "minecraft:pink_dye" + }, + { + "item": "minecraft:pink_dye" + }, + { + "item": "minecraft:pink_dye" + }, + { + "item": "minecraft:pink_dye" + }, + { + "item": "minecraft:pink_dye" + }, + { + "item": "minecraft:pink_dye" + } + ], + "result": { + "count": 1, + "id": "floralis:pink_dye_block" + } +} \ No newline at end of file diff --git a/src/main/resources/data/floralis/recipes/crafting/pink_dye_block_decompressing.json b/src/generated/resources/data/floralis/recipes/pink_dye_from_pink_dye_block.json similarity index 66% rename from src/main/resources/data/floralis/recipes/crafting/pink_dye_block_decompressing.json rename to src/generated/resources/data/floralis/recipes/pink_dye_from_pink_dye_block.json index 9a3e460b..86bfac7a 100644 --- a/src/main/resources/data/floralis/recipes/crafting/pink_dye_block_decompressing.json +++ b/src/generated/resources/data/floralis/recipes/pink_dye_from_pink_dye_block.json @@ -1,12 +1,13 @@ { "type": "minecraft:crafting_shapeless", + "category": "misc", "ingredients": [ { "item": "floralis:pink_dye_block" } ], "result": { - "item": "minecraft:pink_dye", - "count": 9 + "count": 9, + "id": "minecraft:pink_dye" } } \ No newline at end of file diff --git a/src/main/resources/data/floralis/recipes/smelting/pink_dye.json b/src/generated/resources/data/floralis/recipes/pink_dye_from_smelting_pink_petals.json similarity index 51% rename from src/main/resources/data/floralis/recipes/smelting/pink_dye.json rename to src/generated/resources/data/floralis/recipes/pink_dye_from_smelting_pink_petals.json index eb0e8a03..a36c17be 100644 --- a/src/main/resources/data/floralis/recipes/smelting/pink_dye.json +++ b/src/generated/resources/data/floralis/recipes/pink_dye_from_smelting_pink_petals.json @@ -1,9 +1,13 @@ { "type": "minecraft:smelting", + "category": "misc", + "cookingtime": 200, + "experience": 0.1, "ingredient": { "item": "floralis:pink_petals" }, - "result": "minecraft:pink_dye", - "experience": 0.1, - "cookingtime": 200 + "result": { + "count": 1, + "id": "minecraft:pink_dye" + } } \ No newline at end of file diff --git a/src/generated/resources/data/floralis/recipes/plant_fibers_block_from_plant_fibers.json b/src/generated/resources/data/floralis/recipes/plant_fibers_block_from_plant_fibers.json new file mode 100644 index 00000000..0514cba9 --- /dev/null +++ b/src/generated/resources/data/floralis/recipes/plant_fibers_block_from_plant_fibers.json @@ -0,0 +1,37 @@ +{ + "type": "minecraft:crafting_shapeless", + "category": "misc", + "ingredients": [ + { + "item": "floralis:plant_fibers" + }, + { + "item": "floralis:plant_fibers" + }, + { + "item": "floralis:plant_fibers" + }, + { + "item": "floralis:plant_fibers" + }, + { + "item": "floralis:plant_fibers" + }, + { + "item": "floralis:plant_fibers" + }, + { + "item": "floralis:plant_fibers" + }, + { + "item": "floralis:plant_fibers" + }, + { + "item": "floralis:plant_fibers" + } + ], + "result": { + "count": 1, + "id": "floralis:plant_fibers_block" + } +} \ No newline at end of file diff --git a/src/main/resources/data/floralis/recipes/crafting/plant_fibers_block_decompressing.json b/src/generated/resources/data/floralis/recipes/plant_fibers_from_plant_fibers_block.json similarity index 66% rename from src/main/resources/data/floralis/recipes/crafting/plant_fibers_block_decompressing.json rename to src/generated/resources/data/floralis/recipes/plant_fibers_from_plant_fibers_block.json index a862172a..3fd7a2a1 100644 --- a/src/main/resources/data/floralis/recipes/crafting/plant_fibers_block_decompressing.json +++ b/src/generated/resources/data/floralis/recipes/plant_fibers_from_plant_fibers_block.json @@ -1,12 +1,13 @@ { "type": "minecraft:crafting_shapeless", + "category": "misc", "ingredients": [ { "item": "floralis:plant_fibers_block" } ], "result": { - "item": "floralis:plant_fibers", - "count": 9 + "count": 9, + "id": "floralis:plant_fibers" } } \ No newline at end of file diff --git a/src/generated/resources/data/floralis/recipes/purple_dye_block_from_purple_dye.json b/src/generated/resources/data/floralis/recipes/purple_dye_block_from_purple_dye.json new file mode 100644 index 00000000..88a36ffe --- /dev/null +++ b/src/generated/resources/data/floralis/recipes/purple_dye_block_from_purple_dye.json @@ -0,0 +1,37 @@ +{ + "type": "minecraft:crafting_shapeless", + "category": "misc", + "ingredients": [ + { + "item": "minecraft:purple_dye" + }, + { + "item": "minecraft:purple_dye" + }, + { + "item": "minecraft:purple_dye" + }, + { + "item": "minecraft:purple_dye" + }, + { + "item": "minecraft:purple_dye" + }, + { + "item": "minecraft:purple_dye" + }, + { + "item": "minecraft:purple_dye" + }, + { + "item": "minecraft:purple_dye" + }, + { + "item": "minecraft:purple_dye" + } + ], + "result": { + "count": 1, + "id": "floralis:purple_dye_block" + } +} \ No newline at end of file diff --git a/src/main/resources/data/floralis/recipes/crafting/purple_dye_block_decompressing.json b/src/generated/resources/data/floralis/recipes/purple_dye_from_purple_dye_block.json similarity index 66% rename from src/main/resources/data/floralis/recipes/crafting/purple_dye_block_decompressing.json rename to src/generated/resources/data/floralis/recipes/purple_dye_from_purple_dye_block.json index 0ac87d56..f6b7a20b 100644 --- a/src/main/resources/data/floralis/recipes/crafting/purple_dye_block_decompressing.json +++ b/src/generated/resources/data/floralis/recipes/purple_dye_from_purple_dye_block.json @@ -1,12 +1,13 @@ { "type": "minecraft:crafting_shapeless", + "category": "misc", "ingredients": [ { "item": "floralis:purple_dye_block" } ], "result": { - "item": "minecraft:purple_dye", - "count": 9 + "count": 9, + "id": "minecraft:purple_dye" } } \ No newline at end of file diff --git a/src/main/resources/data/floralis/recipes/smelting/purple_dye.json b/src/generated/resources/data/floralis/recipes/purple_dye_from_smelting_purple_petals.json similarity index 51% rename from src/main/resources/data/floralis/recipes/smelting/purple_dye.json rename to src/generated/resources/data/floralis/recipes/purple_dye_from_smelting_purple_petals.json index 77dfc560..bd2229c1 100644 --- a/src/main/resources/data/floralis/recipes/smelting/purple_dye.json +++ b/src/generated/resources/data/floralis/recipes/purple_dye_from_smelting_purple_petals.json @@ -1,9 +1,13 @@ { "type": "minecraft:smelting", + "category": "misc", + "cookingtime": 200, + "experience": 0.1, "ingredient": { "item": "floralis:purple_petals" }, - "result": "minecraft:purple_dye", - "experience": 0.1, - "cookingtime": 200 + "result": { + "count": 1, + "id": "minecraft:purple_dye" + } } \ No newline at end of file diff --git a/src/generated/resources/data/floralis/recipes/red_dye_block_from_red_dye.json b/src/generated/resources/data/floralis/recipes/red_dye_block_from_red_dye.json new file mode 100644 index 00000000..49466444 --- /dev/null +++ b/src/generated/resources/data/floralis/recipes/red_dye_block_from_red_dye.json @@ -0,0 +1,37 @@ +{ + "type": "minecraft:crafting_shapeless", + "category": "misc", + "ingredients": [ + { + "item": "minecraft:red_dye" + }, + { + "item": "minecraft:red_dye" + }, + { + "item": "minecraft:red_dye" + }, + { + "item": "minecraft:red_dye" + }, + { + "item": "minecraft:red_dye" + }, + { + "item": "minecraft:red_dye" + }, + { + "item": "minecraft:red_dye" + }, + { + "item": "minecraft:red_dye" + }, + { + "item": "minecraft:red_dye" + } + ], + "result": { + "count": 1, + "id": "floralis:red_dye_block" + } +} \ No newline at end of file diff --git a/src/main/resources/data/floralis/recipes/crafting/red_dye_block_decompressing.json b/src/generated/resources/data/floralis/recipes/red_dye_from_red_dye_block.json similarity index 66% rename from src/main/resources/data/floralis/recipes/crafting/red_dye_block_decompressing.json rename to src/generated/resources/data/floralis/recipes/red_dye_from_red_dye_block.json index 0dc97391..9e15d9ed 100644 --- a/src/main/resources/data/floralis/recipes/crafting/red_dye_block_decompressing.json +++ b/src/generated/resources/data/floralis/recipes/red_dye_from_red_dye_block.json @@ -1,12 +1,13 @@ { "type": "minecraft:crafting_shapeless", + "category": "misc", "ingredients": [ { "item": "floralis:red_dye_block" } ], "result": { - "item": "minecraft:red_dye", - "count": 9 + "count": 9, + "id": "minecraft:red_dye" } } \ No newline at end of file diff --git a/src/main/resources/data/floralis/recipes/smelting/red_dye.json b/src/generated/resources/data/floralis/recipes/red_dye_from_smelting_red_petals.json similarity index 51% rename from src/main/resources/data/floralis/recipes/smelting/red_dye.json rename to src/generated/resources/data/floralis/recipes/red_dye_from_smelting_red_petals.json index 59f85166..c4e373f5 100644 --- a/src/main/resources/data/floralis/recipes/smelting/red_dye.json +++ b/src/generated/resources/data/floralis/recipes/red_dye_from_smelting_red_petals.json @@ -1,9 +1,13 @@ { "type": "minecraft:smelting", + "category": "misc", + "cookingtime": 200, + "experience": 0.1, "ingredient": { "item": "floralis:red_petals" }, - "result": "minecraft:red_dye", - "experience": 0.1, - "cookingtime": 200 + "result": { + "count": 1, + "id": "minecraft:red_dye" + } } \ No newline at end of file diff --git a/src/generated/resources/data/floralis/recipes/white_dye_block_from_white_dye.json b/src/generated/resources/data/floralis/recipes/white_dye_block_from_white_dye.json new file mode 100644 index 00000000..9ee15492 --- /dev/null +++ b/src/generated/resources/data/floralis/recipes/white_dye_block_from_white_dye.json @@ -0,0 +1,37 @@ +{ + "type": "minecraft:crafting_shapeless", + "category": "misc", + "ingredients": [ + { + "item": "minecraft:white_dye" + }, + { + "item": "minecraft:white_dye" + }, + { + "item": "minecraft:white_dye" + }, + { + "item": "minecraft:white_dye" + }, + { + "item": "minecraft:white_dye" + }, + { + "item": "minecraft:white_dye" + }, + { + "item": "minecraft:white_dye" + }, + { + "item": "minecraft:white_dye" + }, + { + "item": "minecraft:white_dye" + } + ], + "result": { + "count": 1, + "id": "floralis:white_dye_block" + } +} \ No newline at end of file diff --git a/src/main/resources/data/floralis/recipes/smelting/white_dye.json b/src/generated/resources/data/floralis/recipes/white_dye_from_smelting_white_petals.json similarity index 51% rename from src/main/resources/data/floralis/recipes/smelting/white_dye.json rename to src/generated/resources/data/floralis/recipes/white_dye_from_smelting_white_petals.json index bf9231d8..044a1611 100644 --- a/src/main/resources/data/floralis/recipes/smelting/white_dye.json +++ b/src/generated/resources/data/floralis/recipes/white_dye_from_smelting_white_petals.json @@ -1,9 +1,13 @@ { "type": "minecraft:smelting", + "category": "misc", + "cookingtime": 200, + "experience": 0.1, "ingredient": { "item": "floralis:white_petals" }, - "result": "minecraft:white_dye", - "experience": 0.1, - "cookingtime": 200 + "result": { + "count": 1, + "id": "minecraft:white_dye" + } } \ No newline at end of file diff --git a/src/main/resources/data/floralis/recipes/crafting/white_dye_block_decompressing.json b/src/generated/resources/data/floralis/recipes/white_dye_from_white_dye_block.json similarity index 66% rename from src/main/resources/data/floralis/recipes/crafting/white_dye_block_decompressing.json rename to src/generated/resources/data/floralis/recipes/white_dye_from_white_dye_block.json index 5c7bd574..512bebd6 100644 --- a/src/main/resources/data/floralis/recipes/crafting/white_dye_block_decompressing.json +++ b/src/generated/resources/data/floralis/recipes/white_dye_from_white_dye_block.json @@ -1,12 +1,13 @@ { "type": "minecraft:crafting_shapeless", + "category": "misc", "ingredients": [ { "item": "floralis:white_dye_block" } ], "result": { - "item": "minecraft:white_dye", - "count": 9 + "count": 9, + "id": "minecraft:white_dye" } } \ No newline at end of file diff --git a/src/generated/resources/data/floralis/recipes/yellow_dye_block_from_yellow_dye.json b/src/generated/resources/data/floralis/recipes/yellow_dye_block_from_yellow_dye.json new file mode 100644 index 00000000..8c8bd194 --- /dev/null +++ b/src/generated/resources/data/floralis/recipes/yellow_dye_block_from_yellow_dye.json @@ -0,0 +1,37 @@ +{ + "type": "minecraft:crafting_shapeless", + "category": "misc", + "ingredients": [ + { + "item": "minecraft:yellow_dye" + }, + { + "item": "minecraft:yellow_dye" + }, + { + "item": "minecraft:yellow_dye" + }, + { + "item": "minecraft:yellow_dye" + }, + { + "item": "minecraft:yellow_dye" + }, + { + "item": "minecraft:yellow_dye" + }, + { + "item": "minecraft:yellow_dye" + }, + { + "item": "minecraft:yellow_dye" + }, + { + "item": "minecraft:yellow_dye" + } + ], + "result": { + "count": 1, + "id": "floralis:yellow_dye_block" + } +} \ No newline at end of file diff --git a/src/main/resources/data/floralis/recipes/smelting/yellow_dye.json b/src/generated/resources/data/floralis/recipes/yellow_dye_from_smelting_yellow_petals.json similarity index 51% rename from src/main/resources/data/floralis/recipes/smelting/yellow_dye.json rename to src/generated/resources/data/floralis/recipes/yellow_dye_from_smelting_yellow_petals.json index 626d3347..d002f6c7 100644 --- a/src/main/resources/data/floralis/recipes/smelting/yellow_dye.json +++ b/src/generated/resources/data/floralis/recipes/yellow_dye_from_smelting_yellow_petals.json @@ -1,9 +1,13 @@ { "type": "minecraft:smelting", + "category": "misc", + "cookingtime": 200, + "experience": 0.1, "ingredient": { "item": "floralis:yellow_petals" }, - "result": "minecraft:yellow_dye", - "experience": 0.1, - "cookingtime": 200 + "result": { + "count": 1, + "id": "minecraft:yellow_dye" + } } \ No newline at end of file diff --git a/src/main/resources/data/floralis/recipes/crafting/yellow_dye_block_decompressing.json b/src/generated/resources/data/floralis/recipes/yellow_dye_from_yellow_dye_block.json similarity index 66% rename from src/main/resources/data/floralis/recipes/crafting/yellow_dye_block_decompressing.json rename to src/generated/resources/data/floralis/recipes/yellow_dye_from_yellow_dye_block.json index 24713352..107bac8e 100644 --- a/src/main/resources/data/floralis/recipes/crafting/yellow_dye_block_decompressing.json +++ b/src/generated/resources/data/floralis/recipes/yellow_dye_from_yellow_dye_block.json @@ -1,12 +1,13 @@ { "type": "minecraft:crafting_shapeless", + "category": "misc", "ingredients": [ { "item": "floralis:yellow_dye_block" } ], "result": { - "item": "minecraft:yellow_dye", - "count": 9 + "count": 9, + "id": "minecraft:yellow_dye" } } \ No newline at end of file diff --git a/src/generated/resources/data/floralis/tags/worldgen/biome/has_cactus.json b/src/generated/resources/data/floralis/tags/worldgen/biome/has_cactus.json new file mode 100644 index 00000000..7dc20e5d --- /dev/null +++ b/src/generated/resources/data/floralis/tags/worldgen/biome/has_cactus.json @@ -0,0 +1,8 @@ +{ + "values": [ + "minecraft:badlands", + "minecraft:eroded_badlands", + "minecraft:wooded_badlands", + "minecraft:desert" + ] +} \ No newline at end of file diff --git a/src/main/resources/data/floralis/worldgen/configured_feature/black_cactus.json b/src/generated/resources/data/floralis/worldgen/configured_feature/black_cactus.json similarity index 52% rename from src/main/resources/data/floralis/worldgen/configured_feature/black_cactus.json rename to src/generated/resources/data/floralis/worldgen/configured_feature/black_cactus.json index 61204834..7bc33686 100644 --- a/src/main/resources/data/floralis/worldgen/configured_feature/black_cactus.json +++ b/src/generated/resources/data/floralis/worldgen/configured_feature/black_cactus.json @@ -1,9 +1,6 @@ { "type": "minecraft:random_patch", "config": { - "tries": 64, - "xz_spread": 4, - "y_spread": 4, "feature": { "feature": { "type": "minecraft:simple_block", @@ -20,11 +17,28 @@ { "type": "minecraft:block_predicate_filter", "predicate": { - "type": "minecraft:matching_blocks", - "blocks": "minecraft:air" + "type": "minecraft:all_of", + "predicates": [ + { + "type": "minecraft:matching_block_tag", + "offset": [ + 0, + -1, + 0 + ], + "tag": "minecraft:sand" + }, + { + "type": "minecraft:matching_blocks", + "blocks": "minecraft:air" + } + ] } } ] - } + }, + "tries": 64, + "xz_spread": 4, + "y_spread": 4 } } \ No newline at end of file diff --git a/src/main/resources/data/floralis/worldgen/configured_feature/black_flower.json b/src/generated/resources/data/floralis/worldgen/configured_feature/black_flower.json similarity index 52% rename from src/main/resources/data/floralis/worldgen/configured_feature/black_flower.json rename to src/generated/resources/data/floralis/worldgen/configured_feature/black_flower.json index 5b1995b7..52ad950f 100644 --- a/src/main/resources/data/floralis/worldgen/configured_feature/black_flower.json +++ b/src/generated/resources/data/floralis/worldgen/configured_feature/black_flower.json @@ -1,9 +1,6 @@ { "type": "minecraft:random_patch", "config": { - "tries": 64, - "xz_spread": 4, - "y_spread": 4, "feature": { "feature": { "type": "minecraft:simple_block", @@ -20,11 +17,28 @@ { "type": "minecraft:block_predicate_filter", "predicate": { - "type": "minecraft:matching_blocks", - "blocks": "minecraft:air" + "type": "minecraft:all_of", + "predicates": [ + { + "type": "minecraft:matching_block_tag", + "offset": [ + 0, + -1, + 0 + ], + "tag": "minecraft:dirt" + }, + { + "type": "minecraft:matching_blocks", + "blocks": "minecraft:air" + } + ] } } ] - } + }, + "tries": 64, + "xz_spread": 4, + "y_spread": 4 } } \ No newline at end of file diff --git a/src/main/resources/data/floralis/worldgen/configured_feature/blue_cactus.json b/src/generated/resources/data/floralis/worldgen/configured_feature/blue_cactus.json similarity index 52% rename from src/main/resources/data/floralis/worldgen/configured_feature/blue_cactus.json rename to src/generated/resources/data/floralis/worldgen/configured_feature/blue_cactus.json index 463a1ad0..7acab9ba 100644 --- a/src/main/resources/data/floralis/worldgen/configured_feature/blue_cactus.json +++ b/src/generated/resources/data/floralis/worldgen/configured_feature/blue_cactus.json @@ -1,9 +1,6 @@ { "type": "minecraft:random_patch", "config": { - "tries": 64, - "xz_spread": 4, - "y_spread": 4, "feature": { "feature": { "type": "minecraft:simple_block", @@ -20,11 +17,28 @@ { "type": "minecraft:block_predicate_filter", "predicate": { - "type": "minecraft:matching_blocks", - "blocks": "minecraft:air" + "type": "minecraft:all_of", + "predicates": [ + { + "type": "minecraft:matching_block_tag", + "offset": [ + 0, + -1, + 0 + ], + "tag": "minecraft:sand" + }, + { + "type": "minecraft:matching_blocks", + "blocks": "minecraft:air" + } + ] } } ] - } + }, + "tries": 64, + "xz_spread": 4, + "y_spread": 4 } } \ No newline at end of file diff --git a/src/main/resources/data/floralis/worldgen/configured_feature/blue_flower.json b/src/generated/resources/data/floralis/worldgen/configured_feature/blue_flower.json similarity index 52% rename from src/main/resources/data/floralis/worldgen/configured_feature/blue_flower.json rename to src/generated/resources/data/floralis/worldgen/configured_feature/blue_flower.json index 9a5355f8..31d8b8b4 100644 --- a/src/main/resources/data/floralis/worldgen/configured_feature/blue_flower.json +++ b/src/generated/resources/data/floralis/worldgen/configured_feature/blue_flower.json @@ -1,9 +1,6 @@ { "type": "minecraft:random_patch", "config": { - "tries": 64, - "xz_spread": 4, - "y_spread": 4, "feature": { "feature": { "type": "minecraft:simple_block", @@ -20,11 +17,28 @@ { "type": "minecraft:block_predicate_filter", "predicate": { - "type": "minecraft:matching_blocks", - "blocks": "minecraft:air" + "type": "minecraft:all_of", + "predicates": [ + { + "type": "minecraft:matching_block_tag", + "offset": [ + 0, + -1, + 0 + ], + "tag": "minecraft:dirt" + }, + { + "type": "minecraft:matching_blocks", + "blocks": "minecraft:air" + } + ] } } ] - } + }, + "tries": 64, + "xz_spread": 4, + "y_spread": 4 } } \ No newline at end of file diff --git a/src/main/resources/data/floralis/worldgen/configured_feature/brown_cactus.json b/src/generated/resources/data/floralis/worldgen/configured_feature/brown_cactus.json similarity index 52% rename from src/main/resources/data/floralis/worldgen/configured_feature/brown_cactus.json rename to src/generated/resources/data/floralis/worldgen/configured_feature/brown_cactus.json index 892fc40e..8d3e9a08 100644 --- a/src/main/resources/data/floralis/worldgen/configured_feature/brown_cactus.json +++ b/src/generated/resources/data/floralis/worldgen/configured_feature/brown_cactus.json @@ -1,9 +1,6 @@ { "type": "minecraft:random_patch", "config": { - "tries": 64, - "xz_spread": 4, - "y_spread": 4, "feature": { "feature": { "type": "minecraft:simple_block", @@ -20,11 +17,28 @@ { "type": "minecraft:block_predicate_filter", "predicate": { - "type": "minecraft:matching_blocks", - "blocks": "minecraft:air" + "type": "minecraft:all_of", + "predicates": [ + { + "type": "minecraft:matching_block_tag", + "offset": [ + 0, + -1, + 0 + ], + "tag": "minecraft:sand" + }, + { + "type": "minecraft:matching_blocks", + "blocks": "minecraft:air" + } + ] } } ] - } + }, + "tries": 64, + "xz_spread": 4, + "y_spread": 4 } } \ No newline at end of file diff --git a/src/main/resources/data/floralis/worldgen/configured_feature/brown_flower.json b/src/generated/resources/data/floralis/worldgen/configured_feature/brown_flower.json similarity index 52% rename from src/main/resources/data/floralis/worldgen/configured_feature/brown_flower.json rename to src/generated/resources/data/floralis/worldgen/configured_feature/brown_flower.json index b2397911..4603688d 100644 --- a/src/main/resources/data/floralis/worldgen/configured_feature/brown_flower.json +++ b/src/generated/resources/data/floralis/worldgen/configured_feature/brown_flower.json @@ -1,9 +1,6 @@ { "type": "minecraft:random_patch", "config": { - "tries": 64, - "xz_spread": 4, - "y_spread": 4, "feature": { "feature": { "type": "minecraft:simple_block", @@ -20,11 +17,28 @@ { "type": "minecraft:block_predicate_filter", "predicate": { - "type": "minecraft:matching_blocks", - "blocks": "minecraft:air" + "type": "minecraft:all_of", + "predicates": [ + { + "type": "minecraft:matching_block_tag", + "offset": [ + 0, + -1, + 0 + ], + "tag": "minecraft:dirt" + }, + { + "type": "minecraft:matching_blocks", + "blocks": "minecraft:air" + } + ] } } ] - } + }, + "tries": 64, + "xz_spread": 4, + "y_spread": 4 } } \ No newline at end of file diff --git a/src/main/resources/data/floralis/worldgen/configured_feature/cyan_cactus.json b/src/generated/resources/data/floralis/worldgen/configured_feature/cyan_cactus.json similarity index 52% rename from src/main/resources/data/floralis/worldgen/configured_feature/cyan_cactus.json rename to src/generated/resources/data/floralis/worldgen/configured_feature/cyan_cactus.json index bc645fa0..cd65334d 100644 --- a/src/main/resources/data/floralis/worldgen/configured_feature/cyan_cactus.json +++ b/src/generated/resources/data/floralis/worldgen/configured_feature/cyan_cactus.json @@ -1,9 +1,6 @@ { "type": "minecraft:random_patch", "config": { - "tries": 64, - "xz_spread": 4, - "y_spread": 4, "feature": { "feature": { "type": "minecraft:simple_block", @@ -20,11 +17,28 @@ { "type": "minecraft:block_predicate_filter", "predicate": { - "type": "minecraft:matching_blocks", - "blocks": "minecraft:air" + "type": "minecraft:all_of", + "predicates": [ + { + "type": "minecraft:matching_block_tag", + "offset": [ + 0, + -1, + 0 + ], + "tag": "minecraft:sand" + }, + { + "type": "minecraft:matching_blocks", + "blocks": "minecraft:air" + } + ] } } ] - } + }, + "tries": 64, + "xz_spread": 4, + "y_spread": 4 } } \ No newline at end of file diff --git a/src/main/resources/data/floralis/worldgen/configured_feature/cyan_flower.json b/src/generated/resources/data/floralis/worldgen/configured_feature/cyan_flower.json similarity index 52% rename from src/main/resources/data/floralis/worldgen/configured_feature/cyan_flower.json rename to src/generated/resources/data/floralis/worldgen/configured_feature/cyan_flower.json index a0a36bf7..216c8e58 100644 --- a/src/main/resources/data/floralis/worldgen/configured_feature/cyan_flower.json +++ b/src/generated/resources/data/floralis/worldgen/configured_feature/cyan_flower.json @@ -1,9 +1,6 @@ { "type": "minecraft:random_patch", "config": { - "tries": 64, - "xz_spread": 4, - "y_spread": 4, "feature": { "feature": { "type": "minecraft:simple_block", @@ -20,11 +17,28 @@ { "type": "minecraft:block_predicate_filter", "predicate": { - "type": "minecraft:matching_blocks", - "blocks": "minecraft:air" + "type": "minecraft:all_of", + "predicates": [ + { + "type": "minecraft:matching_block_tag", + "offset": [ + 0, + -1, + 0 + ], + "tag": "minecraft:dirt" + }, + { + "type": "minecraft:matching_blocks", + "blocks": "minecraft:air" + } + ] } } ] - } + }, + "tries": 64, + "xz_spread": 4, + "y_spread": 4 } } \ No newline at end of file diff --git a/src/main/resources/data/floralis/worldgen/configured_feature/gray_cactus.json b/src/generated/resources/data/floralis/worldgen/configured_feature/gray_cactus.json similarity index 52% rename from src/main/resources/data/floralis/worldgen/configured_feature/gray_cactus.json rename to src/generated/resources/data/floralis/worldgen/configured_feature/gray_cactus.json index c74b6325..f22f226c 100644 --- a/src/main/resources/data/floralis/worldgen/configured_feature/gray_cactus.json +++ b/src/generated/resources/data/floralis/worldgen/configured_feature/gray_cactus.json @@ -1,9 +1,6 @@ { "type": "minecraft:random_patch", "config": { - "tries": 64, - "xz_spread": 4, - "y_spread": 4, "feature": { "feature": { "type": "minecraft:simple_block", @@ -20,11 +17,28 @@ { "type": "minecraft:block_predicate_filter", "predicate": { - "type": "minecraft:matching_blocks", - "blocks": "minecraft:air" + "type": "minecraft:all_of", + "predicates": [ + { + "type": "minecraft:matching_block_tag", + "offset": [ + 0, + -1, + 0 + ], + "tag": "minecraft:sand" + }, + { + "type": "minecraft:matching_blocks", + "blocks": "minecraft:air" + } + ] } } ] - } + }, + "tries": 64, + "xz_spread": 4, + "y_spread": 4 } } \ No newline at end of file diff --git a/src/main/resources/data/floralis/worldgen/configured_feature/gray_flower.json b/src/generated/resources/data/floralis/worldgen/configured_feature/gray_flower.json similarity index 52% rename from src/main/resources/data/floralis/worldgen/configured_feature/gray_flower.json rename to src/generated/resources/data/floralis/worldgen/configured_feature/gray_flower.json index 3622c777..1ea5ae6f 100644 --- a/src/main/resources/data/floralis/worldgen/configured_feature/gray_flower.json +++ b/src/generated/resources/data/floralis/worldgen/configured_feature/gray_flower.json @@ -1,9 +1,6 @@ { "type": "minecraft:random_patch", "config": { - "tries": 64, - "xz_spread": 4, - "y_spread": 4, "feature": { "feature": { "type": "minecraft:simple_block", @@ -20,11 +17,28 @@ { "type": "minecraft:block_predicate_filter", "predicate": { - "type": "minecraft:matching_blocks", - "blocks": "minecraft:air" + "type": "minecraft:all_of", + "predicates": [ + { + "type": "minecraft:matching_block_tag", + "offset": [ + 0, + -1, + 0 + ], + "tag": "minecraft:dirt" + }, + { + "type": "minecraft:matching_blocks", + "blocks": "minecraft:air" + } + ] } } ] - } + }, + "tries": 64, + "xz_spread": 4, + "y_spread": 4 } } \ No newline at end of file diff --git a/src/main/resources/data/floralis/worldgen/configured_feature/green_cactus.json b/src/generated/resources/data/floralis/worldgen/configured_feature/green_cactus.json similarity index 52% rename from src/main/resources/data/floralis/worldgen/configured_feature/green_cactus.json rename to src/generated/resources/data/floralis/worldgen/configured_feature/green_cactus.json index 964479f3..f270092c 100644 --- a/src/main/resources/data/floralis/worldgen/configured_feature/green_cactus.json +++ b/src/generated/resources/data/floralis/worldgen/configured_feature/green_cactus.json @@ -1,9 +1,6 @@ { "type": "minecraft:random_patch", "config": { - "tries": 64, - "xz_spread": 4, - "y_spread": 4, "feature": { "feature": { "type": "minecraft:simple_block", @@ -20,11 +17,28 @@ { "type": "minecraft:block_predicate_filter", "predicate": { - "type": "minecraft:matching_blocks", - "blocks": "minecraft:air" + "type": "minecraft:all_of", + "predicates": [ + { + "type": "minecraft:matching_block_tag", + "offset": [ + 0, + -1, + 0 + ], + "tag": "minecraft:sand" + }, + { + "type": "minecraft:matching_blocks", + "blocks": "minecraft:air" + } + ] } } ] - } + }, + "tries": 64, + "xz_spread": 4, + "y_spread": 4 } } \ No newline at end of file diff --git a/src/main/resources/data/floralis/worldgen/configured_feature/green_flower.json b/src/generated/resources/data/floralis/worldgen/configured_feature/green_flower.json similarity index 52% rename from src/main/resources/data/floralis/worldgen/configured_feature/green_flower.json rename to src/generated/resources/data/floralis/worldgen/configured_feature/green_flower.json index 42348f99..4baabd68 100644 --- a/src/main/resources/data/floralis/worldgen/configured_feature/green_flower.json +++ b/src/generated/resources/data/floralis/worldgen/configured_feature/green_flower.json @@ -1,9 +1,6 @@ { "type": "minecraft:random_patch", "config": { - "tries": 64, - "xz_spread": 4, - "y_spread": 4, "feature": { "feature": { "type": "minecraft:simple_block", @@ -20,11 +17,28 @@ { "type": "minecraft:block_predicate_filter", "predicate": { - "type": "minecraft:matching_blocks", - "blocks": "minecraft:air" + "type": "minecraft:all_of", + "predicates": [ + { + "type": "minecraft:matching_block_tag", + "offset": [ + 0, + -1, + 0 + ], + "tag": "minecraft:dirt" + }, + { + "type": "minecraft:matching_blocks", + "blocks": "minecraft:air" + } + ] } } ] - } + }, + "tries": 64, + "xz_spread": 4, + "y_spread": 4 } } \ No newline at end of file diff --git a/src/main/resources/data/floralis/worldgen/configured_feature/light_blue_cactus.json b/src/generated/resources/data/floralis/worldgen/configured_feature/light_blue_cactus.json similarity index 52% rename from src/main/resources/data/floralis/worldgen/configured_feature/light_blue_cactus.json rename to src/generated/resources/data/floralis/worldgen/configured_feature/light_blue_cactus.json index 1393262b..e499bb51 100644 --- a/src/main/resources/data/floralis/worldgen/configured_feature/light_blue_cactus.json +++ b/src/generated/resources/data/floralis/worldgen/configured_feature/light_blue_cactus.json @@ -1,9 +1,6 @@ { "type": "minecraft:random_patch", "config": { - "tries": 64, - "xz_spread": 4, - "y_spread": 4, "feature": { "feature": { "type": "minecraft:simple_block", @@ -20,11 +17,28 @@ { "type": "minecraft:block_predicate_filter", "predicate": { - "type": "minecraft:matching_blocks", - "blocks": "minecraft:air" + "type": "minecraft:all_of", + "predicates": [ + { + "type": "minecraft:matching_block_tag", + "offset": [ + 0, + -1, + 0 + ], + "tag": "minecraft:sand" + }, + { + "type": "minecraft:matching_blocks", + "blocks": "minecraft:air" + } + ] } } ] - } + }, + "tries": 64, + "xz_spread": 4, + "y_spread": 4 } } \ No newline at end of file diff --git a/src/main/resources/data/floralis/worldgen/configured_feature/light_blue_flower.json b/src/generated/resources/data/floralis/worldgen/configured_feature/light_blue_flower.json similarity index 52% rename from src/main/resources/data/floralis/worldgen/configured_feature/light_blue_flower.json rename to src/generated/resources/data/floralis/worldgen/configured_feature/light_blue_flower.json index 029fcec1..104dd7c6 100644 --- a/src/main/resources/data/floralis/worldgen/configured_feature/light_blue_flower.json +++ b/src/generated/resources/data/floralis/worldgen/configured_feature/light_blue_flower.json @@ -1,9 +1,6 @@ { "type": "minecraft:random_patch", "config": { - "tries": 64, - "xz_spread": 4, - "y_spread": 4, "feature": { "feature": { "type": "minecraft:simple_block", @@ -20,11 +17,28 @@ { "type": "minecraft:block_predicate_filter", "predicate": { - "type": "minecraft:matching_blocks", - "blocks": "minecraft:air" + "type": "minecraft:all_of", + "predicates": [ + { + "type": "minecraft:matching_block_tag", + "offset": [ + 0, + -1, + 0 + ], + "tag": "minecraft:dirt" + }, + { + "type": "minecraft:matching_blocks", + "blocks": "minecraft:air" + } + ] } } ] - } + }, + "tries": 64, + "xz_spread": 4, + "y_spread": 4 } } \ No newline at end of file diff --git a/src/main/resources/data/floralis/worldgen/configured_feature/light_gray_cactus.json b/src/generated/resources/data/floralis/worldgen/configured_feature/light_gray_cactus.json similarity index 52% rename from src/main/resources/data/floralis/worldgen/configured_feature/light_gray_cactus.json rename to src/generated/resources/data/floralis/worldgen/configured_feature/light_gray_cactus.json index 204fd960..d49f1edd 100644 --- a/src/main/resources/data/floralis/worldgen/configured_feature/light_gray_cactus.json +++ b/src/generated/resources/data/floralis/worldgen/configured_feature/light_gray_cactus.json @@ -1,9 +1,6 @@ { "type": "minecraft:random_patch", "config": { - "tries": 64, - "xz_spread": 4, - "y_spread": 4, "feature": { "feature": { "type": "minecraft:simple_block", @@ -20,11 +17,28 @@ { "type": "minecraft:block_predicate_filter", "predicate": { - "type": "minecraft:matching_blocks", - "blocks": "minecraft:air" + "type": "minecraft:all_of", + "predicates": [ + { + "type": "minecraft:matching_block_tag", + "offset": [ + 0, + -1, + 0 + ], + "tag": "minecraft:sand" + }, + { + "type": "minecraft:matching_blocks", + "blocks": "minecraft:air" + } + ] } } ] - } + }, + "tries": 64, + "xz_spread": 4, + "y_spread": 4 } } \ No newline at end of file diff --git a/src/main/resources/data/floralis/worldgen/configured_feature/light_gray_flower.json b/src/generated/resources/data/floralis/worldgen/configured_feature/light_gray_flower.json similarity index 52% rename from src/main/resources/data/floralis/worldgen/configured_feature/light_gray_flower.json rename to src/generated/resources/data/floralis/worldgen/configured_feature/light_gray_flower.json index 33af3bb2..c4353952 100644 --- a/src/main/resources/data/floralis/worldgen/configured_feature/light_gray_flower.json +++ b/src/generated/resources/data/floralis/worldgen/configured_feature/light_gray_flower.json @@ -1,9 +1,6 @@ { "type": "minecraft:random_patch", "config": { - "tries": 64, - "xz_spread": 4, - "y_spread": 4, "feature": { "feature": { "type": "minecraft:simple_block", @@ -20,11 +17,28 @@ { "type": "minecraft:block_predicate_filter", "predicate": { - "type": "minecraft:matching_blocks", - "blocks": "minecraft:air" + "type": "minecraft:all_of", + "predicates": [ + { + "type": "minecraft:matching_block_tag", + "offset": [ + 0, + -1, + 0 + ], + "tag": "minecraft:dirt" + }, + { + "type": "minecraft:matching_blocks", + "blocks": "minecraft:air" + } + ] } } ] - } + }, + "tries": 64, + "xz_spread": 4, + "y_spread": 4 } } \ No newline at end of file diff --git a/src/main/resources/data/floralis/worldgen/configured_feature/lime_cactus.json b/src/generated/resources/data/floralis/worldgen/configured_feature/lime_cactus.json similarity index 52% rename from src/main/resources/data/floralis/worldgen/configured_feature/lime_cactus.json rename to src/generated/resources/data/floralis/worldgen/configured_feature/lime_cactus.json index 4cd2cc73..acc6b186 100644 --- a/src/main/resources/data/floralis/worldgen/configured_feature/lime_cactus.json +++ b/src/generated/resources/data/floralis/worldgen/configured_feature/lime_cactus.json @@ -1,9 +1,6 @@ { "type": "minecraft:random_patch", "config": { - "tries": 64, - "xz_spread": 4, - "y_spread": 4, "feature": { "feature": { "type": "minecraft:simple_block", @@ -20,11 +17,28 @@ { "type": "minecraft:block_predicate_filter", "predicate": { - "type": "minecraft:matching_blocks", - "blocks": "minecraft:air" + "type": "minecraft:all_of", + "predicates": [ + { + "type": "minecraft:matching_block_tag", + "offset": [ + 0, + -1, + 0 + ], + "tag": "minecraft:sand" + }, + { + "type": "minecraft:matching_blocks", + "blocks": "minecraft:air" + } + ] } } ] - } + }, + "tries": 64, + "xz_spread": 4, + "y_spread": 4 } } \ No newline at end of file diff --git a/src/main/resources/data/floralis/worldgen/configured_feature/lime_flower.json b/src/generated/resources/data/floralis/worldgen/configured_feature/lime_flower.json similarity index 52% rename from src/main/resources/data/floralis/worldgen/configured_feature/lime_flower.json rename to src/generated/resources/data/floralis/worldgen/configured_feature/lime_flower.json index 1505df3b..021f0a5f 100644 --- a/src/main/resources/data/floralis/worldgen/configured_feature/lime_flower.json +++ b/src/generated/resources/data/floralis/worldgen/configured_feature/lime_flower.json @@ -1,9 +1,6 @@ { "type": "minecraft:random_patch", "config": { - "tries": 64, - "xz_spread": 4, - "y_spread": 4, "feature": { "feature": { "type": "minecraft:simple_block", @@ -20,11 +17,28 @@ { "type": "minecraft:block_predicate_filter", "predicate": { - "type": "minecraft:matching_blocks", - "blocks": "minecraft:air" + "type": "minecraft:all_of", + "predicates": [ + { + "type": "minecraft:matching_block_tag", + "offset": [ + 0, + -1, + 0 + ], + "tag": "minecraft:dirt" + }, + { + "type": "minecraft:matching_blocks", + "blocks": "minecraft:air" + } + ] } } ] - } + }, + "tries": 64, + "xz_spread": 4, + "y_spread": 4 } } \ No newline at end of file diff --git a/src/main/resources/data/floralis/worldgen/configured_feature/magenta_cactus.json b/src/generated/resources/data/floralis/worldgen/configured_feature/magenta_cactus.json similarity index 52% rename from src/main/resources/data/floralis/worldgen/configured_feature/magenta_cactus.json rename to src/generated/resources/data/floralis/worldgen/configured_feature/magenta_cactus.json index f778207d..52aada6a 100644 --- a/src/main/resources/data/floralis/worldgen/configured_feature/magenta_cactus.json +++ b/src/generated/resources/data/floralis/worldgen/configured_feature/magenta_cactus.json @@ -1,9 +1,6 @@ { "type": "minecraft:random_patch", "config": { - "tries": 64, - "xz_spread": 4, - "y_spread": 4, "feature": { "feature": { "type": "minecraft:simple_block", @@ -20,11 +17,28 @@ { "type": "minecraft:block_predicate_filter", "predicate": { - "type": "minecraft:matching_blocks", - "blocks": "minecraft:air" + "type": "minecraft:all_of", + "predicates": [ + { + "type": "minecraft:matching_block_tag", + "offset": [ + 0, + -1, + 0 + ], + "tag": "minecraft:sand" + }, + { + "type": "minecraft:matching_blocks", + "blocks": "minecraft:air" + } + ] } } ] - } + }, + "tries": 64, + "xz_spread": 4, + "y_spread": 4 } } \ No newline at end of file diff --git a/src/main/resources/data/floralis/worldgen/configured_feature/magenta_flower.json b/src/generated/resources/data/floralis/worldgen/configured_feature/magenta_flower.json similarity index 52% rename from src/main/resources/data/floralis/worldgen/configured_feature/magenta_flower.json rename to src/generated/resources/data/floralis/worldgen/configured_feature/magenta_flower.json index bf67f81a..c695a23f 100644 --- a/src/main/resources/data/floralis/worldgen/configured_feature/magenta_flower.json +++ b/src/generated/resources/data/floralis/worldgen/configured_feature/magenta_flower.json @@ -1,9 +1,6 @@ { "type": "minecraft:random_patch", "config": { - "tries": 64, - "xz_spread": 4, - "y_spread": 4, "feature": { "feature": { "type": "minecraft:simple_block", @@ -20,11 +17,28 @@ { "type": "minecraft:block_predicate_filter", "predicate": { - "type": "minecraft:matching_blocks", - "blocks": "minecraft:air" + "type": "minecraft:all_of", + "predicates": [ + { + "type": "minecraft:matching_block_tag", + "offset": [ + 0, + -1, + 0 + ], + "tag": "minecraft:dirt" + }, + { + "type": "minecraft:matching_blocks", + "blocks": "minecraft:air" + } + ] } } ] - } + }, + "tries": 64, + "xz_spread": 4, + "y_spread": 4 } } \ No newline at end of file diff --git a/src/main/resources/data/floralis/worldgen/configured_feature/orange_cactus.json b/src/generated/resources/data/floralis/worldgen/configured_feature/orange_cactus.json similarity index 52% rename from src/main/resources/data/floralis/worldgen/configured_feature/orange_cactus.json rename to src/generated/resources/data/floralis/worldgen/configured_feature/orange_cactus.json index 22f4cefa..1a0cccda 100644 --- a/src/main/resources/data/floralis/worldgen/configured_feature/orange_cactus.json +++ b/src/generated/resources/data/floralis/worldgen/configured_feature/orange_cactus.json @@ -1,9 +1,6 @@ { "type": "minecraft:random_patch", "config": { - "tries": 64, - "xz_spread": 4, - "y_spread": 4, "feature": { "feature": { "type": "minecraft:simple_block", @@ -20,11 +17,28 @@ { "type": "minecraft:block_predicate_filter", "predicate": { - "type": "minecraft:matching_blocks", - "blocks": "minecraft:air" + "type": "minecraft:all_of", + "predicates": [ + { + "type": "minecraft:matching_block_tag", + "offset": [ + 0, + -1, + 0 + ], + "tag": "minecraft:sand" + }, + { + "type": "minecraft:matching_blocks", + "blocks": "minecraft:air" + } + ] } } ] - } + }, + "tries": 64, + "xz_spread": 4, + "y_spread": 4 } } \ No newline at end of file diff --git a/src/main/resources/data/floralis/worldgen/configured_feature/orange_flower.json b/src/generated/resources/data/floralis/worldgen/configured_feature/orange_flower.json similarity index 52% rename from src/main/resources/data/floralis/worldgen/configured_feature/orange_flower.json rename to src/generated/resources/data/floralis/worldgen/configured_feature/orange_flower.json index 15cc3f34..4e84a9a4 100644 --- a/src/main/resources/data/floralis/worldgen/configured_feature/orange_flower.json +++ b/src/generated/resources/data/floralis/worldgen/configured_feature/orange_flower.json @@ -1,9 +1,6 @@ { "type": "minecraft:random_patch", "config": { - "tries": 64, - "xz_spread": 4, - "y_spread": 4, "feature": { "feature": { "type": "minecraft:simple_block", @@ -20,11 +17,28 @@ { "type": "minecraft:block_predicate_filter", "predicate": { - "type": "minecraft:matching_blocks", - "blocks": "minecraft:air" + "type": "minecraft:all_of", + "predicates": [ + { + "type": "minecraft:matching_block_tag", + "offset": [ + 0, + -1, + 0 + ], + "tag": "minecraft:dirt" + }, + { + "type": "minecraft:matching_blocks", + "blocks": "minecraft:air" + } + ] } } ] - } + }, + "tries": 64, + "xz_spread": 4, + "y_spread": 4 } } \ No newline at end of file diff --git a/src/main/resources/data/floralis/worldgen/configured_feature/pink_cactus.json b/src/generated/resources/data/floralis/worldgen/configured_feature/pink_cactus.json similarity index 52% rename from src/main/resources/data/floralis/worldgen/configured_feature/pink_cactus.json rename to src/generated/resources/data/floralis/worldgen/configured_feature/pink_cactus.json index d3106829..421dc614 100644 --- a/src/main/resources/data/floralis/worldgen/configured_feature/pink_cactus.json +++ b/src/generated/resources/data/floralis/worldgen/configured_feature/pink_cactus.json @@ -1,9 +1,6 @@ { "type": "minecraft:random_patch", "config": { - "tries": 64, - "xz_spread": 4, - "y_spread": 4, "feature": { "feature": { "type": "minecraft:simple_block", @@ -20,11 +17,28 @@ { "type": "minecraft:block_predicate_filter", "predicate": { - "type": "minecraft:matching_blocks", - "blocks": "minecraft:air" + "type": "minecraft:all_of", + "predicates": [ + { + "type": "minecraft:matching_block_tag", + "offset": [ + 0, + -1, + 0 + ], + "tag": "minecraft:sand" + }, + { + "type": "minecraft:matching_blocks", + "blocks": "minecraft:air" + } + ] } } ] - } + }, + "tries": 64, + "xz_spread": 4, + "y_spread": 4 } } \ No newline at end of file diff --git a/src/main/resources/data/floralis/worldgen/configured_feature/pink_flower.json b/src/generated/resources/data/floralis/worldgen/configured_feature/pink_flower.json similarity index 52% rename from src/main/resources/data/floralis/worldgen/configured_feature/pink_flower.json rename to src/generated/resources/data/floralis/worldgen/configured_feature/pink_flower.json index 61560edb..e524f27e 100644 --- a/src/main/resources/data/floralis/worldgen/configured_feature/pink_flower.json +++ b/src/generated/resources/data/floralis/worldgen/configured_feature/pink_flower.json @@ -1,9 +1,6 @@ { "type": "minecraft:random_patch", "config": { - "tries": 64, - "xz_spread": 4, - "y_spread": 4, "feature": { "feature": { "type": "minecraft:simple_block", @@ -20,11 +17,28 @@ { "type": "minecraft:block_predicate_filter", "predicate": { - "type": "minecraft:matching_blocks", - "blocks": "minecraft:air" + "type": "minecraft:all_of", + "predicates": [ + { + "type": "minecraft:matching_block_tag", + "offset": [ + 0, + -1, + 0 + ], + "tag": "minecraft:dirt" + }, + { + "type": "minecraft:matching_blocks", + "blocks": "minecraft:air" + } + ] } } ] - } + }, + "tries": 64, + "xz_spread": 4, + "y_spread": 4 } } \ No newline at end of file diff --git a/src/main/resources/data/floralis/worldgen/configured_feature/purple_cactus.json b/src/generated/resources/data/floralis/worldgen/configured_feature/purple_cactus.json similarity index 52% rename from src/main/resources/data/floralis/worldgen/configured_feature/purple_cactus.json rename to src/generated/resources/data/floralis/worldgen/configured_feature/purple_cactus.json index bead80d2..00c6023b 100644 --- a/src/main/resources/data/floralis/worldgen/configured_feature/purple_cactus.json +++ b/src/generated/resources/data/floralis/worldgen/configured_feature/purple_cactus.json @@ -1,9 +1,6 @@ { "type": "minecraft:random_patch", "config": { - "tries": 64, - "xz_spread": 4, - "y_spread": 4, "feature": { "feature": { "type": "minecraft:simple_block", @@ -20,11 +17,28 @@ { "type": "minecraft:block_predicate_filter", "predicate": { - "type": "minecraft:matching_blocks", - "blocks": "minecraft:air" + "type": "minecraft:all_of", + "predicates": [ + { + "type": "minecraft:matching_block_tag", + "offset": [ + 0, + -1, + 0 + ], + "tag": "minecraft:sand" + }, + { + "type": "minecraft:matching_blocks", + "blocks": "minecraft:air" + } + ] } } ] - } + }, + "tries": 64, + "xz_spread": 4, + "y_spread": 4 } } \ No newline at end of file diff --git a/src/main/resources/data/floralis/worldgen/configured_feature/purple_flower.json b/src/generated/resources/data/floralis/worldgen/configured_feature/purple_flower.json similarity index 52% rename from src/main/resources/data/floralis/worldgen/configured_feature/purple_flower.json rename to src/generated/resources/data/floralis/worldgen/configured_feature/purple_flower.json index 6ce3ec04..01c5395c 100644 --- a/src/main/resources/data/floralis/worldgen/configured_feature/purple_flower.json +++ b/src/generated/resources/data/floralis/worldgen/configured_feature/purple_flower.json @@ -1,9 +1,6 @@ { "type": "minecraft:random_patch", "config": { - "tries": 64, - "xz_spread": 4, - "y_spread": 4, "feature": { "feature": { "type": "minecraft:simple_block", @@ -20,11 +17,28 @@ { "type": "minecraft:block_predicate_filter", "predicate": { - "type": "minecraft:matching_blocks", - "blocks": "minecraft:air" + "type": "minecraft:all_of", + "predicates": [ + { + "type": "minecraft:matching_block_tag", + "offset": [ + 0, + -1, + 0 + ], + "tag": "minecraft:dirt" + }, + { + "type": "minecraft:matching_blocks", + "blocks": "minecraft:air" + } + ] } } ] - } + }, + "tries": 64, + "xz_spread": 4, + "y_spread": 4 } } \ No newline at end of file diff --git a/src/main/resources/data/floralis/worldgen/configured_feature/red_cactus.json b/src/generated/resources/data/floralis/worldgen/configured_feature/red_cactus.json similarity index 52% rename from src/main/resources/data/floralis/worldgen/configured_feature/red_cactus.json rename to src/generated/resources/data/floralis/worldgen/configured_feature/red_cactus.json index 9ed48e06..bad5bc66 100644 --- a/src/main/resources/data/floralis/worldgen/configured_feature/red_cactus.json +++ b/src/generated/resources/data/floralis/worldgen/configured_feature/red_cactus.json @@ -1,9 +1,6 @@ { "type": "minecraft:random_patch", "config": { - "tries": 64, - "xz_spread": 4, - "y_spread": 4, "feature": { "feature": { "type": "minecraft:simple_block", @@ -20,11 +17,28 @@ { "type": "minecraft:block_predicate_filter", "predicate": { - "type": "minecraft:matching_blocks", - "blocks": "minecraft:air" + "type": "minecraft:all_of", + "predicates": [ + { + "type": "minecraft:matching_block_tag", + "offset": [ + 0, + -1, + 0 + ], + "tag": "minecraft:sand" + }, + { + "type": "minecraft:matching_blocks", + "blocks": "minecraft:air" + } + ] } } ] - } + }, + "tries": 64, + "xz_spread": 4, + "y_spread": 4 } } \ No newline at end of file diff --git a/src/main/resources/data/floralis/worldgen/configured_feature/red_flower.json b/src/generated/resources/data/floralis/worldgen/configured_feature/red_flower.json similarity index 52% rename from src/main/resources/data/floralis/worldgen/configured_feature/red_flower.json rename to src/generated/resources/data/floralis/worldgen/configured_feature/red_flower.json index fb3442c7..d838a7cb 100644 --- a/src/main/resources/data/floralis/worldgen/configured_feature/red_flower.json +++ b/src/generated/resources/data/floralis/worldgen/configured_feature/red_flower.json @@ -1,9 +1,6 @@ { "type": "minecraft:random_patch", "config": { - "tries": 64, - "xz_spread": 4, - "y_spread": 4, "feature": { "feature": { "type": "minecraft:simple_block", @@ -20,11 +17,28 @@ { "type": "minecraft:block_predicate_filter", "predicate": { - "type": "minecraft:matching_blocks", - "blocks": "minecraft:air" + "type": "minecraft:all_of", + "predicates": [ + { + "type": "minecraft:matching_block_tag", + "offset": [ + 0, + -1, + 0 + ], + "tag": "minecraft:dirt" + }, + { + "type": "minecraft:matching_blocks", + "blocks": "minecraft:air" + } + ] } } ] - } + }, + "tries": 64, + "xz_spread": 4, + "y_spread": 4 } } \ No newline at end of file diff --git a/src/main/resources/data/floralis/worldgen/configured_feature/white_cactus.json b/src/generated/resources/data/floralis/worldgen/configured_feature/white_cactus.json similarity index 52% rename from src/main/resources/data/floralis/worldgen/configured_feature/white_cactus.json rename to src/generated/resources/data/floralis/worldgen/configured_feature/white_cactus.json index 4ed89a3a..65df1392 100644 --- a/src/main/resources/data/floralis/worldgen/configured_feature/white_cactus.json +++ b/src/generated/resources/data/floralis/worldgen/configured_feature/white_cactus.json @@ -1,9 +1,6 @@ { "type": "minecraft:random_patch", "config": { - "tries": 64, - "xz_spread": 4, - "y_spread": 4, "feature": { "feature": { "type": "minecraft:simple_block", @@ -20,11 +17,28 @@ { "type": "minecraft:block_predicate_filter", "predicate": { - "type": "minecraft:matching_blocks", - "blocks": "minecraft:air" + "type": "minecraft:all_of", + "predicates": [ + { + "type": "minecraft:matching_block_tag", + "offset": [ + 0, + -1, + 0 + ], + "tag": "minecraft:sand" + }, + { + "type": "minecraft:matching_blocks", + "blocks": "minecraft:air" + } + ] } } ] - } + }, + "tries": 64, + "xz_spread": 4, + "y_spread": 4 } } \ No newline at end of file diff --git a/src/main/resources/data/floralis/worldgen/configured_feature/white_flower.json b/src/generated/resources/data/floralis/worldgen/configured_feature/white_flower.json similarity index 52% rename from src/main/resources/data/floralis/worldgen/configured_feature/white_flower.json rename to src/generated/resources/data/floralis/worldgen/configured_feature/white_flower.json index 13b742d3..4045ac13 100644 --- a/src/main/resources/data/floralis/worldgen/configured_feature/white_flower.json +++ b/src/generated/resources/data/floralis/worldgen/configured_feature/white_flower.json @@ -1,9 +1,6 @@ { "type": "minecraft:random_patch", "config": { - "tries": 64, - "xz_spread": 4, - "y_spread": 4, "feature": { "feature": { "type": "minecraft:simple_block", @@ -20,11 +17,28 @@ { "type": "minecraft:block_predicate_filter", "predicate": { - "type": "minecraft:matching_blocks", - "blocks": "minecraft:air" + "type": "minecraft:all_of", + "predicates": [ + { + "type": "minecraft:matching_block_tag", + "offset": [ + 0, + -1, + 0 + ], + "tag": "minecraft:dirt" + }, + { + "type": "minecraft:matching_blocks", + "blocks": "minecraft:air" + } + ] } } ] - } + }, + "tries": 64, + "xz_spread": 4, + "y_spread": 4 } } \ No newline at end of file diff --git a/src/main/resources/data/floralis/worldgen/configured_feature/yellow_cactus.json b/src/generated/resources/data/floralis/worldgen/configured_feature/yellow_cactus.json similarity index 52% rename from src/main/resources/data/floralis/worldgen/configured_feature/yellow_cactus.json rename to src/generated/resources/data/floralis/worldgen/configured_feature/yellow_cactus.json index 9c07f248..8d62425a 100644 --- a/src/main/resources/data/floralis/worldgen/configured_feature/yellow_cactus.json +++ b/src/generated/resources/data/floralis/worldgen/configured_feature/yellow_cactus.json @@ -1,9 +1,6 @@ { "type": "minecraft:random_patch", "config": { - "tries": 64, - "xz_spread": 4, - "y_spread": 4, "feature": { "feature": { "type": "minecraft:simple_block", @@ -20,11 +17,28 @@ { "type": "minecraft:block_predicate_filter", "predicate": { - "type": "minecraft:matching_blocks", - "blocks": "minecraft:air" + "type": "minecraft:all_of", + "predicates": [ + { + "type": "minecraft:matching_block_tag", + "offset": [ + 0, + -1, + 0 + ], + "tag": "minecraft:sand" + }, + { + "type": "minecraft:matching_blocks", + "blocks": "minecraft:air" + } + ] } } ] - } + }, + "tries": 64, + "xz_spread": 4, + "y_spread": 4 } } \ No newline at end of file diff --git a/src/main/resources/data/floralis/worldgen/configured_feature/yellow_flower.json b/src/generated/resources/data/floralis/worldgen/configured_feature/yellow_flower.json similarity index 52% rename from src/main/resources/data/floralis/worldgen/configured_feature/yellow_flower.json rename to src/generated/resources/data/floralis/worldgen/configured_feature/yellow_flower.json index 6e4c1c73..648e35f1 100644 --- a/src/main/resources/data/floralis/worldgen/configured_feature/yellow_flower.json +++ b/src/generated/resources/data/floralis/worldgen/configured_feature/yellow_flower.json @@ -1,9 +1,6 @@ { "type": "minecraft:random_patch", "config": { - "tries": 64, - "xz_spread": 4, - "y_spread": 4, "feature": { "feature": { "type": "minecraft:simple_block", @@ -20,11 +17,28 @@ { "type": "minecraft:block_predicate_filter", "predicate": { - "type": "minecraft:matching_blocks", - "blocks": "minecraft:air" + "type": "minecraft:all_of", + "predicates": [ + { + "type": "minecraft:matching_block_tag", + "offset": [ + 0, + -1, + 0 + ], + "tag": "minecraft:dirt" + }, + { + "type": "minecraft:matching_blocks", + "blocks": "minecraft:air" + } + ] } } ] - } + }, + "tries": 64, + "xz_spread": 4, + "y_spread": 4 } } \ No newline at end of file diff --git a/src/generated/resources/data/floralis/worldgen/placed_feature/black_cactus.json b/src/generated/resources/data/floralis/worldgen/placed_feature/black_cactus.json new file mode 100644 index 00000000..cc647be7 --- /dev/null +++ b/src/generated/resources/data/floralis/worldgen/placed_feature/black_cactus.json @@ -0,0 +1,37 @@ +{ + "feature": "floralis:black_cactus", + "placement": [ + { + "type": "minecraft:rarity_filter", + "chance": 256 + }, + { + "type": "minecraft:in_square" + }, + { + "type": "minecraft:heightmap", + "heightmap": "MOTION_BLOCKING" + }, + { + "type": "minecraft:environment_scan", + "allowed_search_condition": { + "type": "minecraft:matching_blocks", + "blocks": "minecraft:air" + }, + "direction_of_search": "down", + "max_steps": 16, + "target_condition": { + "type": "minecraft:matching_block_tag", + "tag": "minecraft:sand" + } + }, + { + "type": "minecraft:random_offset", + "xz_spread": 0, + "y_spread": 1 + }, + { + "type": "minecraft:biome" + } + ] +} \ No newline at end of file diff --git a/src/generated/resources/data/floralis/worldgen/placed_feature/black_flower.json b/src/generated/resources/data/floralis/worldgen/placed_feature/black_flower.json new file mode 100644 index 00000000..87dfb28c --- /dev/null +++ b/src/generated/resources/data/floralis/worldgen/placed_feature/black_flower.json @@ -0,0 +1,37 @@ +{ + "feature": "floralis:black_flower", + "placement": [ + { + "type": "minecraft:rarity_filter", + "chance": 256 + }, + { + "type": "minecraft:in_square" + }, + { + "type": "minecraft:heightmap", + "heightmap": "MOTION_BLOCKING" + }, + { + "type": "minecraft:environment_scan", + "allowed_search_condition": { + "type": "minecraft:matching_blocks", + "blocks": "minecraft:air" + }, + "direction_of_search": "down", + "max_steps": 16, + "target_condition": { + "type": "minecraft:matching_block_tag", + "tag": "minecraft:dirt" + } + }, + { + "type": "minecraft:random_offset", + "xz_spread": 0, + "y_spread": 1 + }, + { + "type": "minecraft:biome" + } + ] +} \ No newline at end of file diff --git a/src/generated/resources/data/floralis/worldgen/placed_feature/blue_cactus.json b/src/generated/resources/data/floralis/worldgen/placed_feature/blue_cactus.json new file mode 100644 index 00000000..8710769e --- /dev/null +++ b/src/generated/resources/data/floralis/worldgen/placed_feature/blue_cactus.json @@ -0,0 +1,37 @@ +{ + "feature": "floralis:blue_cactus", + "placement": [ + { + "type": "minecraft:rarity_filter", + "chance": 256 + }, + { + "type": "minecraft:in_square" + }, + { + "type": "minecraft:heightmap", + "heightmap": "MOTION_BLOCKING" + }, + { + "type": "minecraft:environment_scan", + "allowed_search_condition": { + "type": "minecraft:matching_blocks", + "blocks": "minecraft:air" + }, + "direction_of_search": "down", + "max_steps": 16, + "target_condition": { + "type": "minecraft:matching_block_tag", + "tag": "minecraft:sand" + } + }, + { + "type": "minecraft:random_offset", + "xz_spread": 0, + "y_spread": 1 + }, + { + "type": "minecraft:biome" + } + ] +} \ No newline at end of file diff --git a/src/generated/resources/data/floralis/worldgen/placed_feature/blue_flower.json b/src/generated/resources/data/floralis/worldgen/placed_feature/blue_flower.json new file mode 100644 index 00000000..028f6757 --- /dev/null +++ b/src/generated/resources/data/floralis/worldgen/placed_feature/blue_flower.json @@ -0,0 +1,37 @@ +{ + "feature": "floralis:blue_flower", + "placement": [ + { + "type": "minecraft:rarity_filter", + "chance": 256 + }, + { + "type": "minecraft:in_square" + }, + { + "type": "minecraft:heightmap", + "heightmap": "MOTION_BLOCKING" + }, + { + "type": "minecraft:environment_scan", + "allowed_search_condition": { + "type": "minecraft:matching_blocks", + "blocks": "minecraft:air" + }, + "direction_of_search": "down", + "max_steps": 16, + "target_condition": { + "type": "minecraft:matching_block_tag", + "tag": "minecraft:dirt" + } + }, + { + "type": "minecraft:random_offset", + "xz_spread": 0, + "y_spread": 1 + }, + { + "type": "minecraft:biome" + } + ] +} \ No newline at end of file diff --git a/src/generated/resources/data/floralis/worldgen/placed_feature/brown_cactus.json b/src/generated/resources/data/floralis/worldgen/placed_feature/brown_cactus.json new file mode 100644 index 00000000..288237d1 --- /dev/null +++ b/src/generated/resources/data/floralis/worldgen/placed_feature/brown_cactus.json @@ -0,0 +1,37 @@ +{ + "feature": "floralis:brown_cactus", + "placement": [ + { + "type": "minecraft:rarity_filter", + "chance": 256 + }, + { + "type": "minecraft:in_square" + }, + { + "type": "minecraft:heightmap", + "heightmap": "MOTION_BLOCKING" + }, + { + "type": "minecraft:environment_scan", + "allowed_search_condition": { + "type": "minecraft:matching_blocks", + "blocks": "minecraft:air" + }, + "direction_of_search": "down", + "max_steps": 16, + "target_condition": { + "type": "minecraft:matching_block_tag", + "tag": "minecraft:sand" + } + }, + { + "type": "minecraft:random_offset", + "xz_spread": 0, + "y_spread": 1 + }, + { + "type": "minecraft:biome" + } + ] +} \ No newline at end of file diff --git a/src/generated/resources/data/floralis/worldgen/placed_feature/brown_flower.json b/src/generated/resources/data/floralis/worldgen/placed_feature/brown_flower.json new file mode 100644 index 00000000..74aeb7b2 --- /dev/null +++ b/src/generated/resources/data/floralis/worldgen/placed_feature/brown_flower.json @@ -0,0 +1,37 @@ +{ + "feature": "floralis:brown_flower", + "placement": [ + { + "type": "minecraft:rarity_filter", + "chance": 256 + }, + { + "type": "minecraft:in_square" + }, + { + "type": "minecraft:heightmap", + "heightmap": "MOTION_BLOCKING" + }, + { + "type": "minecraft:environment_scan", + "allowed_search_condition": { + "type": "minecraft:matching_blocks", + "blocks": "minecraft:air" + }, + "direction_of_search": "down", + "max_steps": 16, + "target_condition": { + "type": "minecraft:matching_block_tag", + "tag": "minecraft:dirt" + } + }, + { + "type": "minecraft:random_offset", + "xz_spread": 0, + "y_spread": 1 + }, + { + "type": "minecraft:biome" + } + ] +} \ No newline at end of file diff --git a/src/generated/resources/data/floralis/worldgen/placed_feature/cyan_cactus.json b/src/generated/resources/data/floralis/worldgen/placed_feature/cyan_cactus.json new file mode 100644 index 00000000..75893651 --- /dev/null +++ b/src/generated/resources/data/floralis/worldgen/placed_feature/cyan_cactus.json @@ -0,0 +1,37 @@ +{ + "feature": "floralis:cyan_cactus", + "placement": [ + { + "type": "minecraft:rarity_filter", + "chance": 256 + }, + { + "type": "minecraft:in_square" + }, + { + "type": "minecraft:heightmap", + "heightmap": "MOTION_BLOCKING" + }, + { + "type": "minecraft:environment_scan", + "allowed_search_condition": { + "type": "minecraft:matching_blocks", + "blocks": "minecraft:air" + }, + "direction_of_search": "down", + "max_steps": 16, + "target_condition": { + "type": "minecraft:matching_block_tag", + "tag": "minecraft:sand" + } + }, + { + "type": "minecraft:random_offset", + "xz_spread": 0, + "y_spread": 1 + }, + { + "type": "minecraft:biome" + } + ] +} \ No newline at end of file diff --git a/src/generated/resources/data/floralis/worldgen/placed_feature/cyan_flower.json b/src/generated/resources/data/floralis/worldgen/placed_feature/cyan_flower.json new file mode 100644 index 00000000..c27959ed --- /dev/null +++ b/src/generated/resources/data/floralis/worldgen/placed_feature/cyan_flower.json @@ -0,0 +1,37 @@ +{ + "feature": "floralis:cyan_flower", + "placement": [ + { + "type": "minecraft:rarity_filter", + "chance": 256 + }, + { + "type": "minecraft:in_square" + }, + { + "type": "minecraft:heightmap", + "heightmap": "MOTION_BLOCKING" + }, + { + "type": "minecraft:environment_scan", + "allowed_search_condition": { + "type": "minecraft:matching_blocks", + "blocks": "minecraft:air" + }, + "direction_of_search": "down", + "max_steps": 16, + "target_condition": { + "type": "minecraft:matching_block_tag", + "tag": "minecraft:dirt" + } + }, + { + "type": "minecraft:random_offset", + "xz_spread": 0, + "y_spread": 1 + }, + { + "type": "minecraft:biome" + } + ] +} \ No newline at end of file diff --git a/src/generated/resources/data/floralis/worldgen/placed_feature/gray_cactus.json b/src/generated/resources/data/floralis/worldgen/placed_feature/gray_cactus.json new file mode 100644 index 00000000..64a3cdba --- /dev/null +++ b/src/generated/resources/data/floralis/worldgen/placed_feature/gray_cactus.json @@ -0,0 +1,37 @@ +{ + "feature": "floralis:gray_cactus", + "placement": [ + { + "type": "minecraft:rarity_filter", + "chance": 256 + }, + { + "type": "minecraft:in_square" + }, + { + "type": "minecraft:heightmap", + "heightmap": "MOTION_BLOCKING" + }, + { + "type": "minecraft:environment_scan", + "allowed_search_condition": { + "type": "minecraft:matching_blocks", + "blocks": "minecraft:air" + }, + "direction_of_search": "down", + "max_steps": 16, + "target_condition": { + "type": "minecraft:matching_block_tag", + "tag": "minecraft:sand" + } + }, + { + "type": "minecraft:random_offset", + "xz_spread": 0, + "y_spread": 1 + }, + { + "type": "minecraft:biome" + } + ] +} \ No newline at end of file diff --git a/src/generated/resources/data/floralis/worldgen/placed_feature/gray_flower.json b/src/generated/resources/data/floralis/worldgen/placed_feature/gray_flower.json new file mode 100644 index 00000000..24abf01f --- /dev/null +++ b/src/generated/resources/data/floralis/worldgen/placed_feature/gray_flower.json @@ -0,0 +1,37 @@ +{ + "feature": "floralis:gray_flower", + "placement": [ + { + "type": "minecraft:rarity_filter", + "chance": 256 + }, + { + "type": "minecraft:in_square" + }, + { + "type": "minecraft:heightmap", + "heightmap": "MOTION_BLOCKING" + }, + { + "type": "minecraft:environment_scan", + "allowed_search_condition": { + "type": "minecraft:matching_blocks", + "blocks": "minecraft:air" + }, + "direction_of_search": "down", + "max_steps": 16, + "target_condition": { + "type": "minecraft:matching_block_tag", + "tag": "minecraft:dirt" + } + }, + { + "type": "minecraft:random_offset", + "xz_spread": 0, + "y_spread": 1 + }, + { + "type": "minecraft:biome" + } + ] +} \ No newline at end of file diff --git a/src/generated/resources/data/floralis/worldgen/placed_feature/green_cactus.json b/src/generated/resources/data/floralis/worldgen/placed_feature/green_cactus.json new file mode 100644 index 00000000..9be08503 --- /dev/null +++ b/src/generated/resources/data/floralis/worldgen/placed_feature/green_cactus.json @@ -0,0 +1,37 @@ +{ + "feature": "floralis:green_cactus", + "placement": [ + { + "type": "minecraft:rarity_filter", + "chance": 256 + }, + { + "type": "minecraft:in_square" + }, + { + "type": "minecraft:heightmap", + "heightmap": "MOTION_BLOCKING" + }, + { + "type": "minecraft:environment_scan", + "allowed_search_condition": { + "type": "minecraft:matching_blocks", + "blocks": "minecraft:air" + }, + "direction_of_search": "down", + "max_steps": 16, + "target_condition": { + "type": "minecraft:matching_block_tag", + "tag": "minecraft:sand" + } + }, + { + "type": "minecraft:random_offset", + "xz_spread": 0, + "y_spread": 1 + }, + { + "type": "minecraft:biome" + } + ] +} \ No newline at end of file diff --git a/src/generated/resources/data/floralis/worldgen/placed_feature/green_flower.json b/src/generated/resources/data/floralis/worldgen/placed_feature/green_flower.json new file mode 100644 index 00000000..6baffa25 --- /dev/null +++ b/src/generated/resources/data/floralis/worldgen/placed_feature/green_flower.json @@ -0,0 +1,37 @@ +{ + "feature": "floralis:green_flower", + "placement": [ + { + "type": "minecraft:rarity_filter", + "chance": 256 + }, + { + "type": "minecraft:in_square" + }, + { + "type": "minecraft:heightmap", + "heightmap": "MOTION_BLOCKING" + }, + { + "type": "minecraft:environment_scan", + "allowed_search_condition": { + "type": "minecraft:matching_blocks", + "blocks": "minecraft:air" + }, + "direction_of_search": "down", + "max_steps": 16, + "target_condition": { + "type": "minecraft:matching_block_tag", + "tag": "minecraft:dirt" + } + }, + { + "type": "minecraft:random_offset", + "xz_spread": 0, + "y_spread": 1 + }, + { + "type": "minecraft:biome" + } + ] +} \ No newline at end of file diff --git a/src/generated/resources/data/floralis/worldgen/placed_feature/light_blue_cactus.json b/src/generated/resources/data/floralis/worldgen/placed_feature/light_blue_cactus.json new file mode 100644 index 00000000..ffb96032 --- /dev/null +++ b/src/generated/resources/data/floralis/worldgen/placed_feature/light_blue_cactus.json @@ -0,0 +1,37 @@ +{ + "feature": "floralis:light_blue_cactus", + "placement": [ + { + "type": "minecraft:rarity_filter", + "chance": 256 + }, + { + "type": "minecraft:in_square" + }, + { + "type": "minecraft:heightmap", + "heightmap": "MOTION_BLOCKING" + }, + { + "type": "minecraft:environment_scan", + "allowed_search_condition": { + "type": "minecraft:matching_blocks", + "blocks": "minecraft:air" + }, + "direction_of_search": "down", + "max_steps": 16, + "target_condition": { + "type": "minecraft:matching_block_tag", + "tag": "minecraft:sand" + } + }, + { + "type": "minecraft:random_offset", + "xz_spread": 0, + "y_spread": 1 + }, + { + "type": "minecraft:biome" + } + ] +} \ No newline at end of file diff --git a/src/generated/resources/data/floralis/worldgen/placed_feature/light_blue_flower.json b/src/generated/resources/data/floralis/worldgen/placed_feature/light_blue_flower.json new file mode 100644 index 00000000..2c969e12 --- /dev/null +++ b/src/generated/resources/data/floralis/worldgen/placed_feature/light_blue_flower.json @@ -0,0 +1,37 @@ +{ + "feature": "floralis:light_blue_flower", + "placement": [ + { + "type": "minecraft:rarity_filter", + "chance": 256 + }, + { + "type": "minecraft:in_square" + }, + { + "type": "minecraft:heightmap", + "heightmap": "MOTION_BLOCKING" + }, + { + "type": "minecraft:environment_scan", + "allowed_search_condition": { + "type": "minecraft:matching_blocks", + "blocks": "minecraft:air" + }, + "direction_of_search": "down", + "max_steps": 16, + "target_condition": { + "type": "minecraft:matching_block_tag", + "tag": "minecraft:dirt" + } + }, + { + "type": "minecraft:random_offset", + "xz_spread": 0, + "y_spread": 1 + }, + { + "type": "minecraft:biome" + } + ] +} \ No newline at end of file diff --git a/src/generated/resources/data/floralis/worldgen/placed_feature/light_gray_cactus.json b/src/generated/resources/data/floralis/worldgen/placed_feature/light_gray_cactus.json new file mode 100644 index 00000000..2a57ae4a --- /dev/null +++ b/src/generated/resources/data/floralis/worldgen/placed_feature/light_gray_cactus.json @@ -0,0 +1,37 @@ +{ + "feature": "floralis:light_gray_cactus", + "placement": [ + { + "type": "minecraft:rarity_filter", + "chance": 256 + }, + { + "type": "minecraft:in_square" + }, + { + "type": "minecraft:heightmap", + "heightmap": "MOTION_BLOCKING" + }, + { + "type": "minecraft:environment_scan", + "allowed_search_condition": { + "type": "minecraft:matching_blocks", + "blocks": "minecraft:air" + }, + "direction_of_search": "down", + "max_steps": 16, + "target_condition": { + "type": "minecraft:matching_block_tag", + "tag": "minecraft:sand" + } + }, + { + "type": "minecraft:random_offset", + "xz_spread": 0, + "y_spread": 1 + }, + { + "type": "minecraft:biome" + } + ] +} \ No newline at end of file diff --git a/src/generated/resources/data/floralis/worldgen/placed_feature/light_gray_flower.json b/src/generated/resources/data/floralis/worldgen/placed_feature/light_gray_flower.json new file mode 100644 index 00000000..c3d73b55 --- /dev/null +++ b/src/generated/resources/data/floralis/worldgen/placed_feature/light_gray_flower.json @@ -0,0 +1,37 @@ +{ + "feature": "floralis:light_gray_flower", + "placement": [ + { + "type": "minecraft:rarity_filter", + "chance": 256 + }, + { + "type": "minecraft:in_square" + }, + { + "type": "minecraft:heightmap", + "heightmap": "MOTION_BLOCKING" + }, + { + "type": "minecraft:environment_scan", + "allowed_search_condition": { + "type": "minecraft:matching_blocks", + "blocks": "minecraft:air" + }, + "direction_of_search": "down", + "max_steps": 16, + "target_condition": { + "type": "minecraft:matching_block_tag", + "tag": "minecraft:dirt" + } + }, + { + "type": "minecraft:random_offset", + "xz_spread": 0, + "y_spread": 1 + }, + { + "type": "minecraft:biome" + } + ] +} \ No newline at end of file diff --git a/src/generated/resources/data/floralis/worldgen/placed_feature/lime_cactus.json b/src/generated/resources/data/floralis/worldgen/placed_feature/lime_cactus.json new file mode 100644 index 00000000..e10e7e15 --- /dev/null +++ b/src/generated/resources/data/floralis/worldgen/placed_feature/lime_cactus.json @@ -0,0 +1,37 @@ +{ + "feature": "floralis:lime_cactus", + "placement": [ + { + "type": "minecraft:rarity_filter", + "chance": 256 + }, + { + "type": "minecraft:in_square" + }, + { + "type": "minecraft:heightmap", + "heightmap": "MOTION_BLOCKING" + }, + { + "type": "minecraft:environment_scan", + "allowed_search_condition": { + "type": "minecraft:matching_blocks", + "blocks": "minecraft:air" + }, + "direction_of_search": "down", + "max_steps": 16, + "target_condition": { + "type": "minecraft:matching_block_tag", + "tag": "minecraft:sand" + } + }, + { + "type": "minecraft:random_offset", + "xz_spread": 0, + "y_spread": 1 + }, + { + "type": "minecraft:biome" + } + ] +} \ No newline at end of file diff --git a/src/generated/resources/data/floralis/worldgen/placed_feature/lime_flower.json b/src/generated/resources/data/floralis/worldgen/placed_feature/lime_flower.json new file mode 100644 index 00000000..9d824081 --- /dev/null +++ b/src/generated/resources/data/floralis/worldgen/placed_feature/lime_flower.json @@ -0,0 +1,37 @@ +{ + "feature": "floralis:lime_flower", + "placement": [ + { + "type": "minecraft:rarity_filter", + "chance": 256 + }, + { + "type": "minecraft:in_square" + }, + { + "type": "minecraft:heightmap", + "heightmap": "MOTION_BLOCKING" + }, + { + "type": "minecraft:environment_scan", + "allowed_search_condition": { + "type": "minecraft:matching_blocks", + "blocks": "minecraft:air" + }, + "direction_of_search": "down", + "max_steps": 16, + "target_condition": { + "type": "minecraft:matching_block_tag", + "tag": "minecraft:dirt" + } + }, + { + "type": "minecraft:random_offset", + "xz_spread": 0, + "y_spread": 1 + }, + { + "type": "minecraft:biome" + } + ] +} \ No newline at end of file diff --git a/src/generated/resources/data/floralis/worldgen/placed_feature/magenta_cactus.json b/src/generated/resources/data/floralis/worldgen/placed_feature/magenta_cactus.json new file mode 100644 index 00000000..2a98520d --- /dev/null +++ b/src/generated/resources/data/floralis/worldgen/placed_feature/magenta_cactus.json @@ -0,0 +1,37 @@ +{ + "feature": "floralis:magenta_cactus", + "placement": [ + { + "type": "minecraft:rarity_filter", + "chance": 256 + }, + { + "type": "minecraft:in_square" + }, + { + "type": "minecraft:heightmap", + "heightmap": "MOTION_BLOCKING" + }, + { + "type": "minecraft:environment_scan", + "allowed_search_condition": { + "type": "minecraft:matching_blocks", + "blocks": "minecraft:air" + }, + "direction_of_search": "down", + "max_steps": 16, + "target_condition": { + "type": "minecraft:matching_block_tag", + "tag": "minecraft:sand" + } + }, + { + "type": "minecraft:random_offset", + "xz_spread": 0, + "y_spread": 1 + }, + { + "type": "minecraft:biome" + } + ] +} \ No newline at end of file diff --git a/src/generated/resources/data/floralis/worldgen/placed_feature/magenta_flower.json b/src/generated/resources/data/floralis/worldgen/placed_feature/magenta_flower.json new file mode 100644 index 00000000..cbf2cb0e --- /dev/null +++ b/src/generated/resources/data/floralis/worldgen/placed_feature/magenta_flower.json @@ -0,0 +1,37 @@ +{ + "feature": "floralis:magenta_flower", + "placement": [ + { + "type": "minecraft:rarity_filter", + "chance": 256 + }, + { + "type": "minecraft:in_square" + }, + { + "type": "minecraft:heightmap", + "heightmap": "MOTION_BLOCKING" + }, + { + "type": "minecraft:environment_scan", + "allowed_search_condition": { + "type": "minecraft:matching_blocks", + "blocks": "minecraft:air" + }, + "direction_of_search": "down", + "max_steps": 16, + "target_condition": { + "type": "minecraft:matching_block_tag", + "tag": "minecraft:dirt" + } + }, + { + "type": "minecraft:random_offset", + "xz_spread": 0, + "y_spread": 1 + }, + { + "type": "minecraft:biome" + } + ] +} \ No newline at end of file diff --git a/src/generated/resources/data/floralis/worldgen/placed_feature/orange_cactus.json b/src/generated/resources/data/floralis/worldgen/placed_feature/orange_cactus.json new file mode 100644 index 00000000..b3d58122 --- /dev/null +++ b/src/generated/resources/data/floralis/worldgen/placed_feature/orange_cactus.json @@ -0,0 +1,37 @@ +{ + "feature": "floralis:orange_cactus", + "placement": [ + { + "type": "minecraft:rarity_filter", + "chance": 256 + }, + { + "type": "minecraft:in_square" + }, + { + "type": "minecraft:heightmap", + "heightmap": "MOTION_BLOCKING" + }, + { + "type": "minecraft:environment_scan", + "allowed_search_condition": { + "type": "minecraft:matching_blocks", + "blocks": "minecraft:air" + }, + "direction_of_search": "down", + "max_steps": 16, + "target_condition": { + "type": "minecraft:matching_block_tag", + "tag": "minecraft:sand" + } + }, + { + "type": "minecraft:random_offset", + "xz_spread": 0, + "y_spread": 1 + }, + { + "type": "minecraft:biome" + } + ] +} \ No newline at end of file diff --git a/src/generated/resources/data/floralis/worldgen/placed_feature/orange_flower.json b/src/generated/resources/data/floralis/worldgen/placed_feature/orange_flower.json new file mode 100644 index 00000000..98ed41ac --- /dev/null +++ b/src/generated/resources/data/floralis/worldgen/placed_feature/orange_flower.json @@ -0,0 +1,37 @@ +{ + "feature": "floralis:orange_flower", + "placement": [ + { + "type": "minecraft:rarity_filter", + "chance": 256 + }, + { + "type": "minecraft:in_square" + }, + { + "type": "minecraft:heightmap", + "heightmap": "MOTION_BLOCKING" + }, + { + "type": "minecraft:environment_scan", + "allowed_search_condition": { + "type": "minecraft:matching_blocks", + "blocks": "minecraft:air" + }, + "direction_of_search": "down", + "max_steps": 16, + "target_condition": { + "type": "minecraft:matching_block_tag", + "tag": "minecraft:dirt" + } + }, + { + "type": "minecraft:random_offset", + "xz_spread": 0, + "y_spread": 1 + }, + { + "type": "minecraft:biome" + } + ] +} \ No newline at end of file diff --git a/src/generated/resources/data/floralis/worldgen/placed_feature/pink_cactus.json b/src/generated/resources/data/floralis/worldgen/placed_feature/pink_cactus.json new file mode 100644 index 00000000..e12ec0e6 --- /dev/null +++ b/src/generated/resources/data/floralis/worldgen/placed_feature/pink_cactus.json @@ -0,0 +1,37 @@ +{ + "feature": "floralis:pink_cactus", + "placement": [ + { + "type": "minecraft:rarity_filter", + "chance": 256 + }, + { + "type": "minecraft:in_square" + }, + { + "type": "minecraft:heightmap", + "heightmap": "MOTION_BLOCKING" + }, + { + "type": "minecraft:environment_scan", + "allowed_search_condition": { + "type": "minecraft:matching_blocks", + "blocks": "minecraft:air" + }, + "direction_of_search": "down", + "max_steps": 16, + "target_condition": { + "type": "minecraft:matching_block_tag", + "tag": "minecraft:sand" + } + }, + { + "type": "minecraft:random_offset", + "xz_spread": 0, + "y_spread": 1 + }, + { + "type": "minecraft:biome" + } + ] +} \ No newline at end of file diff --git a/src/generated/resources/data/floralis/worldgen/placed_feature/pink_flower.json b/src/generated/resources/data/floralis/worldgen/placed_feature/pink_flower.json new file mode 100644 index 00000000..c5e28b17 --- /dev/null +++ b/src/generated/resources/data/floralis/worldgen/placed_feature/pink_flower.json @@ -0,0 +1,37 @@ +{ + "feature": "floralis:pink_flower", + "placement": [ + { + "type": "minecraft:rarity_filter", + "chance": 256 + }, + { + "type": "minecraft:in_square" + }, + { + "type": "minecraft:heightmap", + "heightmap": "MOTION_BLOCKING" + }, + { + "type": "minecraft:environment_scan", + "allowed_search_condition": { + "type": "minecraft:matching_blocks", + "blocks": "minecraft:air" + }, + "direction_of_search": "down", + "max_steps": 16, + "target_condition": { + "type": "minecraft:matching_block_tag", + "tag": "minecraft:dirt" + } + }, + { + "type": "minecraft:random_offset", + "xz_spread": 0, + "y_spread": 1 + }, + { + "type": "minecraft:biome" + } + ] +} \ No newline at end of file diff --git a/src/generated/resources/data/floralis/worldgen/placed_feature/purple_cactus.json b/src/generated/resources/data/floralis/worldgen/placed_feature/purple_cactus.json new file mode 100644 index 00000000..08f90c96 --- /dev/null +++ b/src/generated/resources/data/floralis/worldgen/placed_feature/purple_cactus.json @@ -0,0 +1,37 @@ +{ + "feature": "floralis:purple_cactus", + "placement": [ + { + "type": "minecraft:rarity_filter", + "chance": 256 + }, + { + "type": "minecraft:in_square" + }, + { + "type": "minecraft:heightmap", + "heightmap": "MOTION_BLOCKING" + }, + { + "type": "minecraft:environment_scan", + "allowed_search_condition": { + "type": "minecraft:matching_blocks", + "blocks": "minecraft:air" + }, + "direction_of_search": "down", + "max_steps": 16, + "target_condition": { + "type": "minecraft:matching_block_tag", + "tag": "minecraft:sand" + } + }, + { + "type": "minecraft:random_offset", + "xz_spread": 0, + "y_spread": 1 + }, + { + "type": "minecraft:biome" + } + ] +} \ No newline at end of file diff --git a/src/generated/resources/data/floralis/worldgen/placed_feature/purple_flower.json b/src/generated/resources/data/floralis/worldgen/placed_feature/purple_flower.json new file mode 100644 index 00000000..ac44c7a7 --- /dev/null +++ b/src/generated/resources/data/floralis/worldgen/placed_feature/purple_flower.json @@ -0,0 +1,37 @@ +{ + "feature": "floralis:purple_flower", + "placement": [ + { + "type": "minecraft:rarity_filter", + "chance": 256 + }, + { + "type": "minecraft:in_square" + }, + { + "type": "minecraft:heightmap", + "heightmap": "MOTION_BLOCKING" + }, + { + "type": "minecraft:environment_scan", + "allowed_search_condition": { + "type": "minecraft:matching_blocks", + "blocks": "minecraft:air" + }, + "direction_of_search": "down", + "max_steps": 16, + "target_condition": { + "type": "minecraft:matching_block_tag", + "tag": "minecraft:dirt" + } + }, + { + "type": "minecraft:random_offset", + "xz_spread": 0, + "y_spread": 1 + }, + { + "type": "minecraft:biome" + } + ] +} \ No newline at end of file diff --git a/src/generated/resources/data/floralis/worldgen/placed_feature/red_cactus.json b/src/generated/resources/data/floralis/worldgen/placed_feature/red_cactus.json new file mode 100644 index 00000000..aa41e990 --- /dev/null +++ b/src/generated/resources/data/floralis/worldgen/placed_feature/red_cactus.json @@ -0,0 +1,37 @@ +{ + "feature": "floralis:red_cactus", + "placement": [ + { + "type": "minecraft:rarity_filter", + "chance": 256 + }, + { + "type": "minecraft:in_square" + }, + { + "type": "minecraft:heightmap", + "heightmap": "MOTION_BLOCKING" + }, + { + "type": "minecraft:environment_scan", + "allowed_search_condition": { + "type": "minecraft:matching_blocks", + "blocks": "minecraft:air" + }, + "direction_of_search": "down", + "max_steps": 16, + "target_condition": { + "type": "minecraft:matching_block_tag", + "tag": "minecraft:sand" + } + }, + { + "type": "minecraft:random_offset", + "xz_spread": 0, + "y_spread": 1 + }, + { + "type": "minecraft:biome" + } + ] +} \ No newline at end of file diff --git a/src/generated/resources/data/floralis/worldgen/placed_feature/red_flower.json b/src/generated/resources/data/floralis/worldgen/placed_feature/red_flower.json new file mode 100644 index 00000000..14fdfe58 --- /dev/null +++ b/src/generated/resources/data/floralis/worldgen/placed_feature/red_flower.json @@ -0,0 +1,37 @@ +{ + "feature": "floralis:red_flower", + "placement": [ + { + "type": "minecraft:rarity_filter", + "chance": 256 + }, + { + "type": "minecraft:in_square" + }, + { + "type": "minecraft:heightmap", + "heightmap": "MOTION_BLOCKING" + }, + { + "type": "minecraft:environment_scan", + "allowed_search_condition": { + "type": "minecraft:matching_blocks", + "blocks": "minecraft:air" + }, + "direction_of_search": "down", + "max_steps": 16, + "target_condition": { + "type": "minecraft:matching_block_tag", + "tag": "minecraft:dirt" + } + }, + { + "type": "minecraft:random_offset", + "xz_spread": 0, + "y_spread": 1 + }, + { + "type": "minecraft:biome" + } + ] +} \ No newline at end of file diff --git a/src/generated/resources/data/floralis/worldgen/placed_feature/white_cactus.json b/src/generated/resources/data/floralis/worldgen/placed_feature/white_cactus.json new file mode 100644 index 00000000..bf6a0820 --- /dev/null +++ b/src/generated/resources/data/floralis/worldgen/placed_feature/white_cactus.json @@ -0,0 +1,37 @@ +{ + "feature": "floralis:white_cactus", + "placement": [ + { + "type": "minecraft:rarity_filter", + "chance": 256 + }, + { + "type": "minecraft:in_square" + }, + { + "type": "minecraft:heightmap", + "heightmap": "MOTION_BLOCKING" + }, + { + "type": "minecraft:environment_scan", + "allowed_search_condition": { + "type": "minecraft:matching_blocks", + "blocks": "minecraft:air" + }, + "direction_of_search": "down", + "max_steps": 16, + "target_condition": { + "type": "minecraft:matching_block_tag", + "tag": "minecraft:sand" + } + }, + { + "type": "minecraft:random_offset", + "xz_spread": 0, + "y_spread": 1 + }, + { + "type": "minecraft:biome" + } + ] +} \ No newline at end of file diff --git a/src/generated/resources/data/floralis/worldgen/placed_feature/white_flower.json b/src/generated/resources/data/floralis/worldgen/placed_feature/white_flower.json new file mode 100644 index 00000000..bad1f23f --- /dev/null +++ b/src/generated/resources/data/floralis/worldgen/placed_feature/white_flower.json @@ -0,0 +1,37 @@ +{ + "feature": "floralis:white_flower", + "placement": [ + { + "type": "minecraft:rarity_filter", + "chance": 256 + }, + { + "type": "minecraft:in_square" + }, + { + "type": "minecraft:heightmap", + "heightmap": "MOTION_BLOCKING" + }, + { + "type": "minecraft:environment_scan", + "allowed_search_condition": { + "type": "minecraft:matching_blocks", + "blocks": "minecraft:air" + }, + "direction_of_search": "down", + "max_steps": 16, + "target_condition": { + "type": "minecraft:matching_block_tag", + "tag": "minecraft:dirt" + } + }, + { + "type": "minecraft:random_offset", + "xz_spread": 0, + "y_spread": 1 + }, + { + "type": "minecraft:biome" + } + ] +} \ No newline at end of file diff --git a/src/generated/resources/data/floralis/worldgen/placed_feature/yellow_cactus.json b/src/generated/resources/data/floralis/worldgen/placed_feature/yellow_cactus.json new file mode 100644 index 00000000..6098dfc3 --- /dev/null +++ b/src/generated/resources/data/floralis/worldgen/placed_feature/yellow_cactus.json @@ -0,0 +1,37 @@ +{ + "feature": "floralis:yellow_cactus", + "placement": [ + { + "type": "minecraft:rarity_filter", + "chance": 256 + }, + { + "type": "minecraft:in_square" + }, + { + "type": "minecraft:heightmap", + "heightmap": "MOTION_BLOCKING" + }, + { + "type": "minecraft:environment_scan", + "allowed_search_condition": { + "type": "minecraft:matching_blocks", + "blocks": "minecraft:air" + }, + "direction_of_search": "down", + "max_steps": 16, + "target_condition": { + "type": "minecraft:matching_block_tag", + "tag": "minecraft:sand" + } + }, + { + "type": "minecraft:random_offset", + "xz_spread": 0, + "y_spread": 1 + }, + { + "type": "minecraft:biome" + } + ] +} \ No newline at end of file diff --git a/src/generated/resources/data/floralis/worldgen/placed_feature/yellow_flower.json b/src/generated/resources/data/floralis/worldgen/placed_feature/yellow_flower.json new file mode 100644 index 00000000..ebd9a6b1 --- /dev/null +++ b/src/generated/resources/data/floralis/worldgen/placed_feature/yellow_flower.json @@ -0,0 +1,37 @@ +{ + "feature": "floralis:yellow_flower", + "placement": [ + { + "type": "minecraft:rarity_filter", + "chance": 256 + }, + { + "type": "minecraft:in_square" + }, + { + "type": "minecraft:heightmap", + "heightmap": "MOTION_BLOCKING" + }, + { + "type": "minecraft:environment_scan", + "allowed_search_condition": { + "type": "minecraft:matching_blocks", + "blocks": "minecraft:air" + }, + "direction_of_search": "down", + "max_steps": 16, + "target_condition": { + "type": "minecraft:matching_block_tag", + "tag": "minecraft:dirt" + } + }, + { + "type": "minecraft:random_offset", + "xz_spread": 0, + "y_spread": 1 + }, + { + "type": "minecraft:biome" + } + ] +} \ No newline at end of file diff --git a/src/main/resources/data/industrialforegoing/tags/items/bioreactor.json b/src/generated/resources/data/industrialforegoing/tags/items/bioreactor.json similarity index 85% rename from src/main/resources/data/industrialforegoing/tags/items/bioreactor.json rename to src/generated/resources/data/industrialforegoing/tags/items/bioreactor.json index 881a19dd..79e3e469 100644 --- a/src/main/resources/data/industrialforegoing/tags/items/bioreactor.json +++ b/src/generated/resources/data/industrialforegoing/tags/items/bioreactor.json @@ -1,22 +1,21 @@ { - "replace": false, "values": [ - "floralis:plant_fibers", "floralis:white_petals", + "floralis:light_gray_petals", + "floralis:gray_petals", + "floralis:black_petals", + "floralis:brown_petals", + "floralis:red_petals", "floralis:orange_petals", - "floralis:magenta_petals", - "floralis:light_blue_petals", "floralis:yellow_petals", "floralis:lime_petals", - "floralis:pink_petals", - "floralis:gray_petals", - "floralis:light_gray_petals", + "floralis:green_petals", "floralis:cyan_petals", - "floralis:purple_petals", + "floralis:light_blue_petals", "floralis:blue_petals", - "floralis:brown_petals", - "floralis:green_petals", - "floralis:red_petals", - "floralis:black_petals" + "floralis:purple_petals", + "floralis:magenta_petals", + "floralis:pink_petals", + "floralis:plant_fibers" ] } \ No newline at end of file diff --git a/src/main/resources/data/minecraft/tags/blocks/crops.json b/src/generated/resources/data/minecraft/tags/blocks/crops.json similarity index 98% rename from src/main/resources/data/minecraft/tags/blocks/crops.json rename to src/generated/resources/data/minecraft/tags/blocks/crops.json index b6878e54..4cc44ec9 100644 --- a/src/main/resources/data/minecraft/tags/blocks/crops.json +++ b/src/generated/resources/data/minecraft/tags/blocks/crops.json @@ -1,5 +1,4 @@ { - "replace": false, "values": [ "floralis:white_flower_crop", "floralis:light_gray_flower_crop", diff --git a/src/main/resources/data/minecraft/tags/blocks/flower_pots.json b/src/generated/resources/data/minecraft/tags/blocks/flower_pots.json similarity index 98% rename from src/main/resources/data/minecraft/tags/blocks/flower_pots.json rename to src/generated/resources/data/minecraft/tags/blocks/flower_pots.json index 32aeeb3f..b9975841 100644 --- a/src/main/resources/data/minecraft/tags/blocks/flower_pots.json +++ b/src/generated/resources/data/minecraft/tags/blocks/flower_pots.json @@ -1,5 +1,4 @@ { - "replace": false, "values": [ "floralis:potted_white_flower", "floralis:potted_light_gray_flower", diff --git a/src/main/resources/data/minecraft/tags/blocks/mineable/hoe.json b/src/generated/resources/data/minecraft/tags/blocks/mineable/hoe.json similarity index 73% rename from src/main/resources/data/minecraft/tags/blocks/mineable/hoe.json rename to src/generated/resources/data/minecraft/tags/blocks/mineable/hoe.json index 180965c4..a157c974 100644 --- a/src/main/resources/data/minecraft/tags/blocks/mineable/hoe.json +++ b/src/generated/resources/data/minecraft/tags/blocks/mineable/hoe.json @@ -1,5 +1,4 @@ { - "replace": false, "values": [ "floralis:plant_fibers_block" ] diff --git a/src/main/resources/data/minecraft/tags/blocks/mineable/shovel.json b/src/generated/resources/data/minecraft/tags/blocks/mineable/shovel.json similarity index 96% rename from src/main/resources/data/minecraft/tags/blocks/mineable/shovel.json rename to src/generated/resources/data/minecraft/tags/blocks/mineable/shovel.json index 83c61040..50d2ddb3 100644 --- a/src/main/resources/data/minecraft/tags/blocks/mineable/shovel.json +++ b/src/generated/resources/data/minecraft/tags/blocks/mineable/shovel.json @@ -1,5 +1,4 @@ { - "replace": false, "values": [ "floralis:white_dye_block", "floralis:light_gray_dye_block", diff --git a/src/main/resources/data/minecraft/tags/blocks/small_flowers.json b/src/generated/resources/data/minecraft/tags/blocks/small_flowers.json similarity index 97% rename from src/main/resources/data/minecraft/tags/blocks/small_flowers.json rename to src/generated/resources/data/minecraft/tags/blocks/small_flowers.json index 05322149..2a487b20 100644 --- a/src/main/resources/data/minecraft/tags/blocks/small_flowers.json +++ b/src/generated/resources/data/minecraft/tags/blocks/small_flowers.json @@ -1,5 +1,4 @@ { - "replace": false, "values": [ "floralis:white_flower", "floralis:light_gray_flower", diff --git a/src/main/resources/data/minecraft/tags/items/small_flowers.json b/src/generated/resources/data/minecraft/tags/items/small_flowers.json similarity index 97% rename from src/main/resources/data/minecraft/tags/items/small_flowers.json rename to src/generated/resources/data/minecraft/tags/items/small_flowers.json index 05322149..2a487b20 100644 --- a/src/main/resources/data/minecraft/tags/items/small_flowers.json +++ b/src/generated/resources/data/minecraft/tags/items/small_flowers.json @@ -1,5 +1,4 @@ { - "replace": false, "values": [ "floralis:white_flower", "floralis:light_gray_flower", diff --git a/src/generated/resources/data/neoforge/data_maps/item/compostables.json b/src/generated/resources/data/neoforge/data_maps/item/compostables.json new file mode 100644 index 00000000..ea482c7e --- /dev/null +++ b/src/generated/resources/data/neoforge/data_maps/item/compostables.json @@ -0,0 +1,250 @@ +{ + "values": { + "floralis:black_cactus": { + "chance": 0.65 + }, + "floralis:black_cactus_seeds": { + "chance": 0.3 + }, + "floralis:black_flower": { + "chance": 0.65 + }, + "floralis:black_flower_seeds": { + "chance": 0.3 + }, + "floralis:black_petals": { + "chance": 0.3 + }, + "floralis:blue_cactus": { + "chance": 0.65 + }, + "floralis:blue_cactus_seeds": { + "chance": 0.3 + }, + "floralis:blue_flower": { + "chance": 0.65 + }, + "floralis:blue_flower_seeds": { + "chance": 0.3 + }, + "floralis:blue_petals": { + "chance": 0.3 + }, + "floralis:brown_cactus": { + "chance": 0.65 + }, + "floralis:brown_cactus_seeds": { + "chance": 0.3 + }, + "floralis:brown_flower": { + "chance": 0.65 + }, + "floralis:brown_flower_seeds": { + "chance": 0.3 + }, + "floralis:brown_petals": { + "chance": 0.3 + }, + "floralis:cyan_cactus": { + "chance": 0.65 + }, + "floralis:cyan_cactus_seeds": { + "chance": 0.3 + }, + "floralis:cyan_flower": { + "chance": 0.65 + }, + "floralis:cyan_flower_seeds": { + "chance": 0.3 + }, + "floralis:cyan_petals": { + "chance": 0.3 + }, + "floralis:gray_cactus": { + "chance": 0.65 + }, + "floralis:gray_cactus_seeds": { + "chance": 0.3 + }, + "floralis:gray_flower": { + "chance": 0.65 + }, + "floralis:gray_flower_seeds": { + "chance": 0.3 + }, + "floralis:gray_petals": { + "chance": 0.3 + }, + "floralis:green_cactus": { + "chance": 0.65 + }, + "floralis:green_cactus_seeds": { + "chance": 0.3 + }, + "floralis:green_flower": { + "chance": 0.65 + }, + "floralis:green_flower_seeds": { + "chance": 0.3 + }, + "floralis:green_petals": { + "chance": 0.3 + }, + "floralis:light_blue_cactus": { + "chance": 0.65 + }, + "floralis:light_blue_cactus_seeds": { + "chance": 0.3 + }, + "floralis:light_blue_flower": { + "chance": 0.65 + }, + "floralis:light_blue_flower_seeds": { + "chance": 0.3 + }, + "floralis:light_blue_petals": { + "chance": 0.3 + }, + "floralis:light_gray_cactus": { + "chance": 0.65 + }, + "floralis:light_gray_cactus_seeds": { + "chance": 0.3 + }, + "floralis:light_gray_flower": { + "chance": 0.65 + }, + "floralis:light_gray_flower_seeds": { + "chance": 0.3 + }, + "floralis:light_gray_petals": { + "chance": 0.3 + }, + "floralis:lime_cactus": { + "chance": 0.65 + }, + "floralis:lime_cactus_seeds": { + "chance": 0.3 + }, + "floralis:lime_flower": { + "chance": 0.65 + }, + "floralis:lime_flower_seeds": { + "chance": 0.3 + }, + "floralis:lime_petals": { + "chance": 0.3 + }, + "floralis:magenta_cactus": { + "chance": 0.65 + }, + "floralis:magenta_cactus_seeds": { + "chance": 0.3 + }, + "floralis:magenta_flower": { + "chance": 0.65 + }, + "floralis:magenta_flower_seeds": { + "chance": 0.3 + }, + "floralis:magenta_petals": { + "chance": 0.3 + }, + "floralis:orange_cactus": { + "chance": 0.65 + }, + "floralis:orange_cactus_seeds": { + "chance": 0.3 + }, + "floralis:orange_flower": { + "chance": 0.65 + }, + "floralis:orange_flower_seeds": { + "chance": 0.3 + }, + "floralis:orange_petals": { + "chance": 0.3 + }, + "floralis:pink_cactus": { + "chance": 0.65 + }, + "floralis:pink_cactus_seeds": { + "chance": 0.3 + }, + "floralis:pink_flower": { + "chance": 0.65 + }, + "floralis:pink_flower_seeds": { + "chance": 0.3 + }, + "floralis:pink_petals": { + "chance": 0.3 + }, + "floralis:plant_fibers": { + "chance": 0.3 + }, + "floralis:plant_fibers_block": { + "chance": 0.85 + }, + "floralis:purple_cactus": { + "chance": 0.65 + }, + "floralis:purple_cactus_seeds": { + "chance": 0.3 + }, + "floralis:purple_flower": { + "chance": 0.65 + }, + "floralis:purple_flower_seeds": { + "chance": 0.3 + }, + "floralis:purple_petals": { + "chance": 0.3 + }, + "floralis:red_cactus": { + "chance": 0.65 + }, + "floralis:red_cactus_seeds": { + "chance": 0.3 + }, + "floralis:red_flower": { + "chance": 0.65 + }, + "floralis:red_flower_seeds": { + "chance": 0.3 + }, + "floralis:red_petals": { + "chance": 0.3 + }, + "floralis:white_cactus": { + "chance": 0.65 + }, + "floralis:white_cactus_seeds": { + "chance": 0.3 + }, + "floralis:white_flower": { + "chance": 0.65 + }, + "floralis:white_flower_seeds": { + "chance": 0.3 + }, + "floralis:white_petals": { + "chance": 0.3 + }, + "floralis:yellow_cactus": { + "chance": 0.65 + }, + "floralis:yellow_cactus_seeds": { + "chance": 0.3 + }, + "floralis:yellow_flower": { + "chance": 0.65 + }, + "floralis:yellow_flower_seeds": { + "chance": 0.3 + }, + "floralis:yellow_petals": { + "chance": 0.3 + } + } +} \ No newline at end of file diff --git a/src/main/java/com/luxtracon/floralis/Floralis.java b/src/main/java/com/luxtracon/floralis/Floralis.java index 77c897ed..dfd62ba0 100644 --- a/src/main/java/com/luxtracon/floralis/Floralis.java +++ b/src/main/java/com/luxtracon/floralis/Floralis.java @@ -1,63 +1,33 @@ 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.*; +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.neoforged.bus.api.SubscribeEvent; -import net.neoforged.fml.DistExecutor; +import net.neoforged.bus.api.IEventBus; import net.neoforged.fml.common.Mod; -import net.neoforged.fml.event.lifecycle.FMLCommonSetupEvent; -import net.neoforged.fml.event.lifecycle.FMLLoadCompleteEvent; -import net.neoforged.fml.javafmlmod.FMLJavaModLoadingContext; -import net.neoforged.neoforge.common.NeoForge; -import net.neoforged.neoforge.event.BuildCreativeModeTabContentsEvent; -import net.neoforged.neoforge.event.server.ServerAboutToStartEvent; -import net.neoforged.neoforge.event.village.VillagerTradesEvent; + +import javax.annotation.Nonnull; @SuppressWarnings("unused") -@Mod(FloralisConstant.ID) +@Mod(FloralisConstants.FLORALIS) public class Floralis { - public CommonProxy proxy = DistExecutor.safeRunForDist(() -> ClientProxy::new, () -> CommonProxy::new); - - public Floralis() { - var eventBus = FMLJavaModLoadingContext.get().getModEventBus(); - - eventBus.addListener(this::onCreativeModeTabRegister); - eventBus.addListener(this::onFMLCommonSetup); - eventBus.addListener(this::onFMLLoadComplete); + public Floralis(@Nonnull IEventBus pBus) { + pBus.addListener(ClientProxy::onCreativeModeTabRegister); + pBus.addListener(CommonProxy::onFMLCommonSetup); + pBus.addListener(CommonProxy::onGatherData); FloralisConfig.registerClientConfig(); FloralisConfig.registerCommonConfig(); FloralisConfig.registerServerConfig(); - FloralisBlocks.BLOCKS.register(eventBus); - FloralisCreativeModeTabs.CREATIVE_MODE_TABS.register(eventBus); - FloralisItems.ITEMS.register(eventBus); - - NeoForge.EVENT_BUS.register(this); - } - - public void onCreativeModeTabRegister(BuildCreativeModeTabContentsEvent pEvent) { - this.proxy.onCreativeModeTabRegister(pEvent); - } - - public void onFMLCommonSetup(FMLCommonSetupEvent pEvent) { - this.proxy.onFMLCommonSetup(pEvent); - } - - public void onFMLLoadComplete(FMLLoadCompleteEvent pEvent) { - this.proxy.onFMLLoadComplete(pEvent); - } - - @SubscribeEvent - public void onServerAboutToStart(ServerAboutToStartEvent pEvent) { - this.proxy.onServerAboutToStart(pEvent); - } - - @SubscribeEvent - public void onVillagerTrades(VillagerTradesEvent pEvent) { - this.proxy.onVillagerTrades(pEvent); + FloralisBlocks.BLOCKS.register(pBus); + FloralisCreativeModeTabs.CREATIVE_MODE_TABS.register(pBus); + FloralisItems.ITEMS.register(pBus); } } diff --git a/src/main/java/com/luxtracon/floralis/block/CactusCropBlock.java b/src/main/java/com/luxtracon/floralis/block/CactusCropBlock.java index b5e32a62..5ed342ad 100644 --- a/src/main/java/com/luxtracon/floralis/block/CactusCropBlock.java +++ b/src/main/java/com/luxtracon/floralis/block/CactusCropBlock.java @@ -18,7 +18,7 @@ import net.minecraft.world.level.block.state.BlockState; import net.minecraft.world.level.block.state.StateDefinition; import net.minecraft.world.level.block.state.properties.IntegerProperty; -import net.minecraft.world.level.pathfinder.BlockPathTypes; +import net.minecraft.world.level.pathfinder.PathType; import net.minecraft.world.phys.shapes.CollisionContext; import net.minecraft.world.phys.shapes.VoxelShape; @@ -28,7 +28,6 @@ import javax.annotation.Nullable; import javax.annotation.ParametersAreNonnullByDefault; -@SuppressWarnings("deprecation") @MethodsReturnNonnullByDefault @ParametersAreNonnullByDefault @@ -83,8 +82,8 @@ public void entityInside(BlockState pState, Level pLevel, BlockPos pPos, Entity } @Override - public BlockPathTypes getBlockPathType(BlockState pState, BlockGetter pLevel, BlockPos pPos, @Nullable Mob pMob) { - return this.getAge(pState) >= 3 ? BlockPathTypes.DAMAGE_OTHER : BlockPathTypes.WALKABLE; + public PathType getBlockPathType(BlockState pState, BlockGetter pLevel, BlockPos pPos, @Nullable Mob pMob) { + return this.getAge(pState) >= 3 ? PathType.DAMAGE_OTHER : PathType.WALKABLE; } @Override @@ -103,9 +102,8 @@ public ItemLike getBaseSeedId() { } @Override - @Nullable public PlantType getPlantType(BlockGetter pLevel, BlockPos pPos) { - return this.mayPlaceOn(pLevel.getBlockState(pPos.below()), pLevel, pPos) ? PlantType.DESERT : null; + return PlantType.DESERT; } @Override diff --git a/src/main/java/com/luxtracon/floralis/block/CactusPlantBlock.java b/src/main/java/com/luxtracon/floralis/block/CactusPlantBlock.java index 03b76415..58ebfe1e 100644 --- a/src/main/java/com/luxtracon/floralis/block/CactusPlantBlock.java +++ b/src/main/java/com/luxtracon/floralis/block/CactusPlantBlock.java @@ -17,14 +17,13 @@ import net.minecraft.world.level.block.Blocks; import net.minecraft.world.level.block.BushBlock; import net.minecraft.world.level.block.state.BlockState; -import net.minecraft.world.level.pathfinder.BlockPathTypes; +import net.minecraft.world.level.pathfinder.PathType; import net.minecraft.world.phys.shapes.CollisionContext; import net.minecraft.world.phys.shapes.VoxelShape; import javax.annotation.Nullable; import javax.annotation.ParametersAreNonnullByDefault; -@SuppressWarnings("deprecation") @MethodsReturnNonnullByDefault @ParametersAreNonnullByDefault @@ -67,8 +66,8 @@ public void entityInside(BlockState pState, Level pLevel, BlockPos pPos, Entity } @Override - public BlockPathTypes getBlockPathType(BlockState pState, BlockGetter pLevel, BlockPos pPos, @Nullable Mob pMob) { - return BlockPathTypes.DAMAGE_OTHER; + public PathType getBlockPathType(BlockState pState, BlockGetter pLevel, BlockPos pPos, @Nullable Mob pMob) { + return PathType.DAMAGE_OTHER; } @Override diff --git a/src/main/java/com/luxtracon/floralis/block/CactusPotBlock.java b/src/main/java/com/luxtracon/floralis/block/CactusPotBlock.java index 1a360b11..d8d4128a 100644 --- a/src/main/java/com/luxtracon/floralis/block/CactusPotBlock.java +++ b/src/main/java/com/luxtracon/floralis/block/CactusPotBlock.java @@ -8,14 +8,13 @@ import net.minecraft.world.level.block.Block; import net.minecraft.world.level.block.FlowerPotBlock; import net.minecraft.world.level.block.state.BlockState; -import net.minecraft.world.level.pathfinder.BlockPathTypes; +import net.minecraft.world.level.pathfinder.PathType; import java.util.function.Supplier; import javax.annotation.Nullable; import javax.annotation.ParametersAreNonnullByDefault; -@SuppressWarnings("deprecation") @ParametersAreNonnullByDefault public class CactusPotBlock extends FlowerPotBlock { @@ -29,7 +28,7 @@ public void entityInside(BlockState pState, Level pLevel, BlockPos pPos, Entity } @Override - public BlockPathTypes getBlockPathType(BlockState pState, BlockGetter pLevel, BlockPos pPos, @Nullable Mob pMob) { - return BlockPathTypes.DAMAGE_OTHER; + public PathType getBlockPathType(BlockState pState, BlockGetter pLevel, BlockPos pPos, @Nullable Mob pMob) { + return PathType.DAMAGE_OTHER; } } diff --git a/src/main/java/com/luxtracon/floralis/block/FlowerPlantBlock.java b/src/main/java/com/luxtracon/floralis/block/FlowerPlantBlock.java index 6cd2c9aa..d3bc0b92 100644 --- a/src/main/java/com/luxtracon/floralis/block/FlowerPlantBlock.java +++ b/src/main/java/com/luxtracon/floralis/block/FlowerPlantBlock.java @@ -18,7 +18,6 @@ import javax.annotation.ParametersAreNonnullByDefault; -@SuppressWarnings("deprecation") @MethodsReturnNonnullByDefault @ParametersAreNonnullByDefault diff --git a/src/main/java/com/luxtracon/floralis/registry/FloralisConfig.java b/src/main/java/com/luxtracon/floralis/config/FloralisConfig.java similarity index 83% rename from src/main/java/com/luxtracon/floralis/registry/FloralisConfig.java rename to src/main/java/com/luxtracon/floralis/config/FloralisConfig.java index 3297e965..e09a32f7 100644 --- a/src/main/java/com/luxtracon/floralis/registry/FloralisConfig.java +++ b/src/main/java/com/luxtracon/floralis/config/FloralisConfig.java @@ -1,4 +1,4 @@ -package com.luxtracon.floralis.registry; +package com.luxtracon.floralis.config; import net.neoforged.fml.ModLoadingContext; import net.neoforged.fml.config.ModConfig; @@ -14,7 +14,7 @@ public class FloralisConfig { public static void registerClientConfig() { var builder = new ModConfigSpec.Builder(); - ModLoadingContext.get().registerConfig(ModConfig.Type.CLIENT, builder.build()); + ModLoadingContext.get().getActiveContainer().registerConfig(ModConfig.Type.CLIENT, builder.build()); } public static void registerCommonConfig() { @@ -30,12 +30,12 @@ public static void registerCommonConfig() { builder.pop(); - ModLoadingContext.get().registerConfig(ModConfig.Type.COMMON, builder.build()); + ModLoadingContext.get().getActiveContainer().registerConfig(ModConfig.Type.COMMON, builder.build()); } public static void registerServerConfig() { var builder = new ModConfigSpec.Builder(); - ModLoadingContext.get().registerConfig(ModConfig.Type.SERVER, builder.build()); + 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 new file mode 100644 index 00000000..4ed8510a --- /dev/null +++ b/src/main/java/com/luxtracon/floralis/data/FloralisBiomeModifiers.java @@ -0,0 +1,96 @@ +package com.luxtracon.floralis.data; + +import com.luxtracon.floralis.data.features.FloralisPlacedFeatures; +import com.luxtracon.floralis.data.tags.FloralisBiomeTags; +import com.luxtracon.floralis.registry.FloralisConstants; + +import net.minecraft.core.HolderSet; +import net.minecraft.core.registries.Registries; +import net.minecraft.data.worldgen.BootstrapContext; +import net.minecraft.resources.ResourceKey; +import net.minecraft.resources.ResourceLocation; +import net.minecraft.tags.BiomeTags; +import net.minecraft.world.level.levelgen.GenerationStep; + +import net.neoforged.neoforge.common.world.BiomeModifier; +import net.neoforged.neoforge.common.world.BiomeModifiers; +import net.neoforged.neoforge.registries.NeoForgeRegistries; + +import javax.annotation.ParametersAreNonnullByDefault; + +@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_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 void bootstrap(BootstrapContext pContext) { + var biomes = pContext.lookup(Registries.BIOME); + var features = pContext.lookup(Registries.PLACED_FEATURE); + + pContext.register(FloralisBiomeModifiers.WHITE_FLOWER, new BiomeModifiers.AddFeaturesBiomeModifier(biomes.getOrThrow(BiomeTags.IS_OVERWORLD), HolderSet.direct(features.getOrThrow(FloralisPlacedFeatures.WHITE_FLOWER)), GenerationStep.Decoration.VEGETAL_DECORATION)); + pContext.register(FloralisBiomeModifiers.LIGHT_GRAY_FLOWER, new BiomeModifiers.AddFeaturesBiomeModifier(biomes.getOrThrow(BiomeTags.IS_OVERWORLD), HolderSet.direct(features.getOrThrow(FloralisPlacedFeatures.LIGHT_GRAY_FLOWER)), GenerationStep.Decoration.VEGETAL_DECORATION)); + pContext.register(FloralisBiomeModifiers.GRAY_FLOWER, new BiomeModifiers.AddFeaturesBiomeModifier(biomes.getOrThrow(BiomeTags.IS_OVERWORLD), HolderSet.direct(features.getOrThrow(FloralisPlacedFeatures.GRAY_FLOWER)), GenerationStep.Decoration.VEGETAL_DECORATION)); + pContext.register(FloralisBiomeModifiers.BLACK_FLOWER, new BiomeModifiers.AddFeaturesBiomeModifier(biomes.getOrThrow(BiomeTags.IS_OVERWORLD), HolderSet.direct(features.getOrThrow(FloralisPlacedFeatures.BLACK_FLOWER)), GenerationStep.Decoration.VEGETAL_DECORATION)); + pContext.register(FloralisBiomeModifiers.BROWN_FLOWER, new BiomeModifiers.AddFeaturesBiomeModifier(biomes.getOrThrow(BiomeTags.IS_OVERWORLD), HolderSet.direct(features.getOrThrow(FloralisPlacedFeatures.BROWN_FLOWER)), GenerationStep.Decoration.VEGETAL_DECORATION)); + pContext.register(FloralisBiomeModifiers.RED_FLOWER, new BiomeModifiers.AddFeaturesBiomeModifier(biomes.getOrThrow(BiomeTags.IS_OVERWORLD), HolderSet.direct(features.getOrThrow(FloralisPlacedFeatures.RED_FLOWER)), GenerationStep.Decoration.VEGETAL_DECORATION)); + pContext.register(FloralisBiomeModifiers.ORANGE_FLOWER, new BiomeModifiers.AddFeaturesBiomeModifier(biomes.getOrThrow(BiomeTags.IS_OVERWORLD), HolderSet.direct(features.getOrThrow(FloralisPlacedFeatures.ORANGE_FLOWER)), GenerationStep.Decoration.VEGETAL_DECORATION)); + pContext.register(FloralisBiomeModifiers.YELLOW_FLOWER, new BiomeModifiers.AddFeaturesBiomeModifier(biomes.getOrThrow(BiomeTags.IS_OVERWORLD), HolderSet.direct(features.getOrThrow(FloralisPlacedFeatures.YELLOW_FLOWER)), GenerationStep.Decoration.VEGETAL_DECORATION)); + pContext.register(FloralisBiomeModifiers.LIME_FLOWER, new BiomeModifiers.AddFeaturesBiomeModifier(biomes.getOrThrow(BiomeTags.IS_OVERWORLD), HolderSet.direct(features.getOrThrow(FloralisPlacedFeatures.LIME_FLOWER)), GenerationStep.Decoration.VEGETAL_DECORATION)); + pContext.register(FloralisBiomeModifiers.GREEN_FLOWER, new BiomeModifiers.AddFeaturesBiomeModifier(biomes.getOrThrow(BiomeTags.IS_OVERWORLD), HolderSet.direct(features.getOrThrow(FloralisPlacedFeatures.GREEN_FLOWER)), GenerationStep.Decoration.VEGETAL_DECORATION)); + pContext.register(FloralisBiomeModifiers.CYAN_FLOWER, new BiomeModifiers.AddFeaturesBiomeModifier(biomes.getOrThrow(BiomeTags.IS_OVERWORLD), HolderSet.direct(features.getOrThrow(FloralisPlacedFeatures.CYAN_FLOWER)), GenerationStep.Decoration.VEGETAL_DECORATION)); + pContext.register(FloralisBiomeModifiers.LIGHT_BLUE_FLOWER, new BiomeModifiers.AddFeaturesBiomeModifier(biomes.getOrThrow(BiomeTags.IS_OVERWORLD), HolderSet.direct(features.getOrThrow(FloralisPlacedFeatures.LIGHT_BLUE_FLOWER)), GenerationStep.Decoration.VEGETAL_DECORATION)); + pContext.register(FloralisBiomeModifiers.BLUE_FLOWER, new BiomeModifiers.AddFeaturesBiomeModifier(biomes.getOrThrow(BiomeTags.IS_OVERWORLD), HolderSet.direct(features.getOrThrow(FloralisPlacedFeatures.BLUE_FLOWER)), GenerationStep.Decoration.VEGETAL_DECORATION)); + pContext.register(FloralisBiomeModifiers.PURPLE_FLOWER, new BiomeModifiers.AddFeaturesBiomeModifier(biomes.getOrThrow(BiomeTags.IS_OVERWORLD), HolderSet.direct(features.getOrThrow(FloralisPlacedFeatures.PURPLE_FLOWER)), GenerationStep.Decoration.VEGETAL_DECORATION)); + pContext.register(FloralisBiomeModifiers.MAGENTA_FLOWER, new BiomeModifiers.AddFeaturesBiomeModifier(biomes.getOrThrow(BiomeTags.IS_OVERWORLD), HolderSet.direct(features.getOrThrow(FloralisPlacedFeatures.MAGENTA_FLOWER)), GenerationStep.Decoration.VEGETAL_DECORATION)); + pContext.register(FloralisBiomeModifiers.PINK_FLOWER, new BiomeModifiers.AddFeaturesBiomeModifier(biomes.getOrThrow(BiomeTags.IS_OVERWORLD), HolderSet.direct(features.getOrThrow(FloralisPlacedFeatures.PINK_FLOWER)), GenerationStep.Decoration.VEGETAL_DECORATION)); + + pContext.register(FloralisBiomeModifiers.WHITE_CACTUS, new BiomeModifiers.AddFeaturesBiomeModifier(biomes.getOrThrow(FloralisBiomeTags.HAS_CACTUS), HolderSet.direct(features.getOrThrow(FloralisPlacedFeatures.WHITE_CACTUS)), GenerationStep.Decoration.VEGETAL_DECORATION)); + pContext.register(FloralisBiomeModifiers.LIGHT_GRAY_CACTUS, new BiomeModifiers.AddFeaturesBiomeModifier(biomes.getOrThrow(FloralisBiomeTags.HAS_CACTUS), HolderSet.direct(features.getOrThrow(FloralisPlacedFeatures.LIGHT_GRAY_CACTUS)), GenerationStep.Decoration.VEGETAL_DECORATION)); + pContext.register(FloralisBiomeModifiers.GRAY_CACTUS, new BiomeModifiers.AddFeaturesBiomeModifier(biomes.getOrThrow(FloralisBiomeTags.HAS_CACTUS), HolderSet.direct(features.getOrThrow(FloralisPlacedFeatures.GRAY_CACTUS)), GenerationStep.Decoration.VEGETAL_DECORATION)); + pContext.register(FloralisBiomeModifiers.BLACK_CACTUS, new BiomeModifiers.AddFeaturesBiomeModifier(biomes.getOrThrow(FloralisBiomeTags.HAS_CACTUS), HolderSet.direct(features.getOrThrow(FloralisPlacedFeatures.BLACK_CACTUS)), GenerationStep.Decoration.VEGETAL_DECORATION)); + pContext.register(FloralisBiomeModifiers.BROWN_CACTUS, new BiomeModifiers.AddFeaturesBiomeModifier(biomes.getOrThrow(FloralisBiomeTags.HAS_CACTUS), HolderSet.direct(features.getOrThrow(FloralisPlacedFeatures.BROWN_CACTUS)), GenerationStep.Decoration.VEGETAL_DECORATION)); + pContext.register(FloralisBiomeModifiers.RED_CACTUS, new BiomeModifiers.AddFeaturesBiomeModifier(biomes.getOrThrow(FloralisBiomeTags.HAS_CACTUS), HolderSet.direct(features.getOrThrow(FloralisPlacedFeatures.RED_CACTUS)), GenerationStep.Decoration.VEGETAL_DECORATION)); + pContext.register(FloralisBiomeModifiers.ORANGE_CACTUS, new BiomeModifiers.AddFeaturesBiomeModifier(biomes.getOrThrow(FloralisBiomeTags.HAS_CACTUS), HolderSet.direct(features.getOrThrow(FloralisPlacedFeatures.ORANGE_CACTUS)), GenerationStep.Decoration.VEGETAL_DECORATION)); + pContext.register(FloralisBiomeModifiers.YELLOW_CACTUS, new BiomeModifiers.AddFeaturesBiomeModifier(biomes.getOrThrow(FloralisBiomeTags.HAS_CACTUS), HolderSet.direct(features.getOrThrow(FloralisPlacedFeatures.YELLOW_CACTUS)), GenerationStep.Decoration.VEGETAL_DECORATION)); + pContext.register(FloralisBiomeModifiers.LIME_CACTUS, new BiomeModifiers.AddFeaturesBiomeModifier(biomes.getOrThrow(FloralisBiomeTags.HAS_CACTUS), HolderSet.direct(features.getOrThrow(FloralisPlacedFeatures.LIME_CACTUS)), GenerationStep.Decoration.VEGETAL_DECORATION)); + pContext.register(FloralisBiomeModifiers.GREEN_CACTUS, new BiomeModifiers.AddFeaturesBiomeModifier(biomes.getOrThrow(FloralisBiomeTags.HAS_CACTUS), HolderSet.direct(features.getOrThrow(FloralisPlacedFeatures.GREEN_CACTUS)), GenerationStep.Decoration.VEGETAL_DECORATION)); + pContext.register(FloralisBiomeModifiers.CYAN_CACTUS, new BiomeModifiers.AddFeaturesBiomeModifier(biomes.getOrThrow(FloralisBiomeTags.HAS_CACTUS), HolderSet.direct(features.getOrThrow(FloralisPlacedFeatures.CYAN_CACTUS)), GenerationStep.Decoration.VEGETAL_DECORATION)); + pContext.register(FloralisBiomeModifiers.LIGHT_BLUE_CACTUS, new BiomeModifiers.AddFeaturesBiomeModifier(biomes.getOrThrow(FloralisBiomeTags.HAS_CACTUS), HolderSet.direct(features.getOrThrow(FloralisPlacedFeatures.LIGHT_BLUE_CACTUS)), GenerationStep.Decoration.VEGETAL_DECORATION)); + pContext.register(FloralisBiomeModifiers.BLUE_CACTUS, new BiomeModifiers.AddFeaturesBiomeModifier(biomes.getOrThrow(FloralisBiomeTags.HAS_CACTUS), HolderSet.direct(features.getOrThrow(FloralisPlacedFeatures.BLUE_CACTUS)), GenerationStep.Decoration.VEGETAL_DECORATION)); + pContext.register(FloralisBiomeModifiers.PURPLE_CACTUS, new BiomeModifiers.AddFeaturesBiomeModifier(biomes.getOrThrow(FloralisBiomeTags.HAS_CACTUS), HolderSet.direct(features.getOrThrow(FloralisPlacedFeatures.PURPLE_CACTUS)), GenerationStep.Decoration.VEGETAL_DECORATION)); + pContext.register(FloralisBiomeModifiers.MAGENTA_CACTUS, new BiomeModifiers.AddFeaturesBiomeModifier(biomes.getOrThrow(FloralisBiomeTags.HAS_CACTUS), HolderSet.direct(features.getOrThrow(FloralisPlacedFeatures.MAGENTA_CACTUS)), GenerationStep.Decoration.VEGETAL_DECORATION)); + pContext.register(FloralisBiomeModifiers.PINK_CACTUS, new BiomeModifiers.AddFeaturesBiomeModifier(biomes.getOrThrow(FloralisBiomeTags.HAS_CACTUS), HolderSet.direct(features.getOrThrow(FloralisPlacedFeatures.PINK_CACTUS)), GenerationStep.Decoration.VEGETAL_DECORATION)); + } +} diff --git a/src/main/java/com/luxtracon/floralis/data/FloralisBuiltinEntries.java b/src/main/java/com/luxtracon/floralis/data/FloralisBuiltinEntries.java new file mode 100644 index 00000000..a75afe55 --- /dev/null +++ b/src/main/java/com/luxtracon/floralis/data/FloralisBuiltinEntries.java @@ -0,0 +1,16 @@ +package com.luxtracon.floralis.data; + +import net.minecraft.core.HolderLookup; +import net.minecraft.core.RegistrySetBuilder; +import net.minecraft.data.PackOutput; + +import net.neoforged.neoforge.common.data.DatapackBuiltinEntriesProvider; + +import java.util.Set; +import java.util.concurrent.CompletableFuture; + +public class FloralisBuiltinEntries extends DatapackBuiltinEntriesProvider { + public FloralisBuiltinEntries(PackOutput pOutput, CompletableFuture pProvider, RegistrySetBuilder pBuilder, String pId) { + super(pOutput, pProvider, pBuilder, Set.of(pId)); + } +} diff --git a/src/main/java/com/luxtracon/floralis/data/FloralisDataMaps.java b/src/main/java/com/luxtracon/floralis/data/FloralisDataMaps.java new file mode 100644 index 00000000..a6f97cbf --- /dev/null +++ b/src/main/java/com/luxtracon/floralis/data/FloralisDataMaps.java @@ -0,0 +1,116 @@ +package com.luxtracon.floralis.data; + +import com.luxtracon.floralis.registry.FloralisItems; + +import net.minecraft.core.HolderLookup; +import net.minecraft.core.registries.BuiltInRegistries; +import net.minecraft.data.PackOutput; +import net.minecraft.world.item.Item; + +import net.neoforged.neoforge.common.data.DataMapProvider; +import net.neoforged.neoforge.registries.datamaps.builtin.Compostable; +import net.neoforged.neoforge.registries.datamaps.builtin.NeoForgeDataMaps; + +import java.util.concurrent.CompletableFuture; + +public class FloralisDataMaps extends DataMapProvider { + public FloralisDataMaps(PackOutput pOutput, CompletableFuture pProvider) { + super(pOutput, pProvider); + } + + @Override + public void gather() { + this.compostables(FloralisItems.PLANT_FIBERS_BLOCK.get(), 0.85F); + + this.compostables(FloralisItems.WHITE_FLOWER.get(), 0.65F); + this.compostables(FloralisItems.LIGHT_GRAY_FLOWER.get(), 0.65F); + this.compostables(FloralisItems.GRAY_FLOWER.get(), 0.65F); + this.compostables(FloralisItems.BLACK_FLOWER.get(), 0.65F); + this.compostables(FloralisItems.BROWN_FLOWER.get(), 0.65F); + this.compostables(FloralisItems.RED_FLOWER.get(), 0.65F); + this.compostables(FloralisItems.ORANGE_FLOWER.get(), 0.65F); + this.compostables(FloralisItems.YELLOW_FLOWER.get(), 0.65F); + this.compostables(FloralisItems.LIME_FLOWER.get(), 0.65F); + this.compostables(FloralisItems.GREEN_FLOWER.get(), 0.65F); + this.compostables(FloralisItems.CYAN_FLOWER.get(), 0.65F); + this.compostables(FloralisItems.LIGHT_BLUE_FLOWER.get(), 0.65F); + this.compostables(FloralisItems.BLUE_FLOWER.get(), 0.65F); + this.compostables(FloralisItems.PURPLE_FLOWER.get(), 0.65F); + this.compostables(FloralisItems.MAGENTA_FLOWER.get(), 0.65F); + this.compostables(FloralisItems.PINK_FLOWER.get(), 0.65F); + + this.compostables(FloralisItems.WHITE_CACTUS.get(), 0.65F); + this.compostables(FloralisItems.LIGHT_GRAY_CACTUS.get(), 0.65F); + this.compostables(FloralisItems.GRAY_CACTUS.get(), 0.65F); + this.compostables(FloralisItems.BLACK_CACTUS.get(), 0.65F); + this.compostables(FloralisItems.BROWN_CACTUS.get(), 0.65F); + this.compostables(FloralisItems.RED_CACTUS.get(), 0.65F); + this.compostables(FloralisItems.ORANGE_CACTUS.get(), 0.65F); + this.compostables(FloralisItems.YELLOW_CACTUS.get(), 0.65F); + this.compostables(FloralisItems.LIME_CACTUS.get(), 0.65F); + this.compostables(FloralisItems.GREEN_CACTUS.get(), 0.65F); + this.compostables(FloralisItems.CYAN_CACTUS.get(), 0.65F); + this.compostables(FloralisItems.LIGHT_BLUE_CACTUS.get(), 0.65F); + this.compostables(FloralisItems.BLUE_CACTUS.get(), 0.65F); + this.compostables(FloralisItems.PURPLE_CACTUS.get(), 0.65F); + this.compostables(FloralisItems.MAGENTA_CACTUS.get(), 0.65F); + this.compostables(FloralisItems.PINK_CACTUS.get(), 0.65F); + + this.compostables(FloralisItems.WHITE_FLOWER_SEEDS.get(), 0.3F); + this.compostables(FloralisItems.LIGHT_GRAY_FLOWER_SEEDS.get(), 0.3F); + this.compostables(FloralisItems.GRAY_FLOWER_SEEDS.get(), 0.3F); + this.compostables(FloralisItems.BLACK_FLOWER_SEEDS.get(), 0.3F); + this.compostables(FloralisItems.BROWN_FLOWER_SEEDS.get(), 0.3F); + this.compostables(FloralisItems.RED_FLOWER_SEEDS.get(), 0.3F); + this.compostables(FloralisItems.ORANGE_FLOWER_SEEDS.get(), 0.3F); + this.compostables(FloralisItems.YELLOW_FLOWER_SEEDS.get(), 0.3F); + this.compostables(FloralisItems.LIME_FLOWER_SEEDS.get(), 0.3F); + this.compostables(FloralisItems.GREEN_FLOWER_SEEDS.get(), 0.3F); + this.compostables(FloralisItems.CYAN_FLOWER_SEEDS.get(), 0.3F); + this.compostables(FloralisItems.LIGHT_BLUE_FLOWER_SEEDS.get(), 0.3F); + this.compostables(FloralisItems.BLUE_FLOWER_SEEDS.get(), 0.3F); + this.compostables(FloralisItems.PURPLE_FLOWER_SEEDS.get(), 0.3F); + this.compostables(FloralisItems.MAGENTA_FLOWER_SEEDS.get(), 0.3F); + this.compostables(FloralisItems.PINK_FLOWER_SEEDS.get(), 0.3F); + + this.compostables(FloralisItems.WHITE_CACTUS_SEEDS.get(), 0.3F); + this.compostables(FloralisItems.LIGHT_GRAY_CACTUS_SEEDS.get(), 0.3F); + this.compostables(FloralisItems.GRAY_CACTUS_SEEDS.get(), 0.3F); + this.compostables(FloralisItems.BLACK_CACTUS_SEEDS.get(), 0.3F); + this.compostables(FloralisItems.BROWN_CACTUS_SEEDS.get(), 0.3F); + this.compostables(FloralisItems.RED_CACTUS_SEEDS.get(), 0.3F); + this.compostables(FloralisItems.ORANGE_CACTUS_SEEDS.get(), 0.3F); + this.compostables(FloralisItems.YELLOW_CACTUS_SEEDS.get(), 0.3F); + this.compostables(FloralisItems.LIME_CACTUS_SEEDS.get(), 0.3F); + this.compostables(FloralisItems.GREEN_CACTUS_SEEDS.get(), 0.3F); + this.compostables(FloralisItems.CYAN_CACTUS_SEEDS.get(), 0.3F); + this.compostables(FloralisItems.LIGHT_BLUE_CACTUS_SEEDS.get(), 0.3F); + this.compostables(FloralisItems.BLUE_CACTUS_SEEDS.get(), 0.3F); + this.compostables(FloralisItems.PURPLE_CACTUS_SEEDS.get(), 0.3F); + this.compostables(FloralisItems.MAGENTA_CACTUS_SEEDS.get(), 0.3F); + this.compostables(FloralisItems.PINK_CACTUS_SEEDS.get(), 0.3F); + + this.compostables(FloralisItems.WHITE_PETALS.get(), 0.3F); + this.compostables(FloralisItems.LIGHT_GRAY_PETALS.get(), 0.3F); + this.compostables(FloralisItems.GRAY_PETALS.get(), 0.3F); + this.compostables(FloralisItems.BLACK_PETALS.get(), 0.3F); + this.compostables(FloralisItems.BROWN_PETALS.get(), 0.3F); + this.compostables(FloralisItems.RED_PETALS.get(), 0.3F); + this.compostables(FloralisItems.ORANGE_PETALS.get(), 0.3F); + this.compostables(FloralisItems.YELLOW_PETALS.get(), 0.3F); + this.compostables(FloralisItems.LIME_PETALS.get(), 0.3F); + this.compostables(FloralisItems.GREEN_PETALS.get(), 0.3F); + this.compostables(FloralisItems.CYAN_PETALS.get(), 0.3F); + this.compostables(FloralisItems.LIGHT_BLUE_PETALS.get(), 0.3F); + this.compostables(FloralisItems.BLUE_PETALS.get(), 0.3F); + this.compostables(FloralisItems.PURPLE_PETALS.get(), 0.3F); + this.compostables(FloralisItems.MAGENTA_PETALS.get(), 0.3F); + this.compostables(FloralisItems.PINK_PETALS.get(), 0.3F); + + this.compostables(FloralisItems.PLANT_FIBERS.get(), 0.3F); + } + + public void compostables(Item pItem, float pChance) { + this.builder(NeoForgeDataMaps.COMPOSTABLES).add(BuiltInRegistries.ITEM.getKey(pItem), new Compostable(pChance), false); + } +} diff --git a/src/main/java/com/luxtracon/floralis/data/FloralisRecipes.java b/src/main/java/com/luxtracon/floralis/data/FloralisRecipes.java new file mode 100644 index 00000000..c69e2edf --- /dev/null +++ b/src/main/java/com/luxtracon/floralis/data/FloralisRecipes.java @@ -0,0 +1,83 @@ +package com.luxtracon.floralis.data; + +import com.luxtracon.floralis.registry.FloralisConstants; +import com.luxtracon.floralis.registry.FloralisItems; + +import net.minecraft.core.HolderLookup; +import net.minecraft.data.PackOutput; +import net.minecraft.data.recipes.*; +import net.minecraft.world.item.Item; +import net.minecraft.world.item.Items; +import net.minecraft.world.item.crafting.Ingredient; + +import java.util.concurrent.CompletableFuture; + +import javax.annotation.ParametersAreNonnullByDefault; + +@ParametersAreNonnullByDefault + +public class FloralisRecipes extends RecipeProvider { + public FloralisRecipes(PackOutput pOutput, CompletableFuture pProvider) { + super(pOutput, pProvider); + } + + @Override + protected void buildRecipes(RecipeOutput pOutput) { + this.craftingRecipe(pOutput, FloralisItems.WHITE_DYE_BLOCK.get(), Items.WHITE_DYE); + this.craftingRecipe(pOutput, FloralisItems.LIGHT_GRAY_DYE_BLOCK.get(), Items.LIGHT_GRAY_DYE); + this.craftingRecipe(pOutput, FloralisItems.GRAY_DYE_BLOCK.get(), Items.GRAY_DYE); + this.craftingRecipe(pOutput, FloralisItems.BLACK_DYE_BLOCK.get(), Items.BLACK_DYE); + this.craftingRecipe(pOutput, FloralisItems.BROWN_DYE_BLOCK.get(), Items.BROWN_DYE); + this.craftingRecipe(pOutput, FloralisItems.RED_DYE_BLOCK.get(), Items.RED_DYE); + this.craftingRecipe(pOutput, FloralisItems.ORANGE_DYE_BLOCK.get(), Items.ORANGE_DYE); + this.craftingRecipe(pOutput, FloralisItems.YELLOW_DYE_BLOCK.get(), Items.YELLOW_DYE); + this.craftingRecipe(pOutput, FloralisItems.LIME_DYE_BLOCK.get(), Items.LIME_DYE); + this.craftingRecipe(pOutput, FloralisItems.GREEN_DYE_BLOCK.get(), Items.GREEN_DYE); + this.craftingRecipe(pOutput, FloralisItems.CYAN_DYE_BLOCK.get(), Items.CYAN_DYE); + this.craftingRecipe(pOutput, FloralisItems.LIGHT_BLUE_DYE_BLOCK.get(), Items.LIGHT_BLUE_DYE); + this.craftingRecipe(pOutput, FloralisItems.BLUE_DYE_BLOCK.get(), Items.BLUE_DYE); + this.craftingRecipe(pOutput, FloralisItems.PURPLE_DYE_BLOCK.get(), Items.PURPLE_DYE); + this.craftingRecipe(pOutput, FloralisItems.MAGENTA_DYE_BLOCK.get(), Items.MAGENTA_DYE); + this.craftingRecipe(pOutput, FloralisItems.PINK_DYE_BLOCK.get(), Items.PINK_DYE); + + this.craftingRecipe(pOutput, FloralisItems.PLANT_FIBERS_BLOCK.get(), FloralisItems.PLANT_FIBERS.get()); + + this.smeltingRecipe(pOutput, FloralisItems.WHITE_PETALS.get(), Items.WHITE_DYE, 0.1F, 200); + this.smeltingRecipe(pOutput, FloralisItems.LIGHT_GRAY_PETALS.get(), Items.LIGHT_GRAY_DYE, 0.1F, 200); + this.smeltingRecipe(pOutput, FloralisItems.GRAY_PETALS.get(), Items.GRAY_DYE, 0.1F, 200); + this.smeltingRecipe(pOutput, FloralisItems.BLACK_PETALS.get(), Items.BLACK_DYE, 0.1F, 200); + this.smeltingRecipe(pOutput, FloralisItems.BROWN_PETALS.get(), Items.BROWN_DYE, 0.1F, 200); + this.smeltingRecipe(pOutput, FloralisItems.RED_PETALS.get(), Items.RED_DYE, 0.1F, 200); + this.smeltingRecipe(pOutput, FloralisItems.ORANGE_PETALS.get(), Items.ORANGE_DYE, 0.1F, 200); + this.smeltingRecipe(pOutput, FloralisItems.YELLOW_PETALS.get(), Items.YELLOW_DYE, 0.1F, 200); + this.smeltingRecipe(pOutput, FloralisItems.LIME_PETALS.get(), Items.LIME_DYE, 0.1F, 200); + this.smeltingRecipe(pOutput, FloralisItems.GREEN_PETALS.get(), Items.GREEN_DYE, 0.1F, 200); + this.smeltingRecipe(pOutput, FloralisItems.CYAN_PETALS.get(), Items.CYAN_DYE, 0.1F, 200); + this.smeltingRecipe(pOutput, FloralisItems.LIGHT_BLUE_PETALS.get(), Items.LIGHT_BLUE_DYE, 0.1F, 200); + this.smeltingRecipe(pOutput, FloralisItems.BLUE_PETALS.get(), Items.BLUE_DYE, 0.1F, 200); + this.smeltingRecipe(pOutput, FloralisItems.PURPLE_PETALS.get(), Items.PURPLE_DYE, 0.1F, 200); + this.smeltingRecipe(pOutput, FloralisItems.MAGENTA_PETALS.get(), Items.MAGENTA_DYE, 0.1F, 200); + this.smeltingRecipe(pOutput, FloralisItems.PINK_PETALS.get(), Items.PINK_DYE, 0.1F, 200); + } + + public void craftingRecipe(RecipeOutput pOutput, Item pBlock, Item pItem) { + ShapelessRecipeBuilder + .shapeless(RecipeCategory.MISC, pBlock, 1) + .requires(pItem, 9) + .unlockedBy(RecipeProvider.getHasName(pItem), RecipeProvider.has(pItem)) + .save(pOutput, FloralisConstants.FLORALIS + ":" + RecipeProvider.getItemName(pBlock) + "_" + "from" + "_" + RecipeProvider.getItemName(pItem)); + + ShapelessRecipeBuilder + .shapeless(RecipeCategory.MISC, pItem, 9) + .requires(pBlock, 1) + .unlockedBy(RecipeProvider.getHasName(pBlock), RecipeProvider.has(pBlock)) + .save(pOutput, FloralisConstants.FLORALIS + ":" + RecipeProvider.getItemName(pItem) + "_" + "from" + "_" + RecipeProvider.getItemName(pBlock)); + } + + public void smeltingRecipe(RecipeOutput pOutput, Item pResource, Item pResult, float pExperience, int pTime) { + SimpleCookingRecipeBuilder + .smelting(Ingredient.of(pResource), RecipeCategory.MISC, pResult, pExperience, pTime) + .unlockedBy(RecipeProvider.getHasName(pResource), RecipeProvider.has(pResource)) + .save(pOutput, FloralisConstants.FLORALIS + ":" + RecipeProvider.getItemName(pResult) + "_" + "from" + "_" + "smelting" + "_" + RecipeProvider.getItemName(pResource)); + } +} diff --git a/src/main/java/com/luxtracon/floralis/data/FloralisRegistrySetBuilder.java b/src/main/java/com/luxtracon/floralis/data/FloralisRegistrySetBuilder.java new file mode 100644 index 00000000..ea694c5b --- /dev/null +++ b/src/main/java/com/luxtracon/floralis/data/FloralisRegistrySetBuilder.java @@ -0,0 +1,15 @@ +package com.luxtracon.floralis.data; + +import com.luxtracon.floralis.data.features.FloralisConfiguredFeatures; +import com.luxtracon.floralis.data.features.FloralisPlacedFeatures; + +import net.minecraft.core.RegistrySetBuilder; +import net.minecraft.core.registries.Registries; + +import net.neoforged.neoforge.registries.NeoForgeRegistries; + +public class FloralisRegistrySetBuilder extends RegistrySetBuilder { + public FloralisRegistrySetBuilder() { + this.add(NeoForgeRegistries.Keys.BIOME_MODIFIERS, FloralisBiomeModifiers::bootstrap).add(Registries.CONFIGURED_FEATURE, FloralisConfiguredFeatures::bootstrap).add(Registries.PLACED_FEATURE, FloralisPlacedFeatures::bootstrap); + } +} diff --git a/src/main/java/com/luxtracon/floralis/data/features/FloralisConfiguredFeatures.java b/src/main/java/com/luxtracon/floralis/data/features/FloralisConfiguredFeatures.java new file mode 100644 index 00000000..1fdca09f --- /dev/null +++ b/src/main/java/com/luxtracon/floralis/data/features/FloralisConfiguredFeatures.java @@ -0,0 +1,101 @@ +package com.luxtracon.floralis.data.features; + +import com.luxtracon.floralis.registry.FloralisBlocks; +import com.luxtracon.floralis.registry.FloralisConstants; + +import net.minecraft.MethodsReturnNonnullByDefault; +import net.minecraft.core.Direction; +import net.minecraft.core.registries.Registries; +import net.minecraft.data.worldgen.BootstrapContext; +import net.minecraft.data.worldgen.placement.PlacementUtils; +import net.minecraft.resources.ResourceKey; +import net.minecraft.resources.ResourceLocation; +import net.minecraft.tags.BlockTags; +import net.minecraft.world.level.block.Blocks; +import net.minecraft.world.level.levelgen.blockpredicates.BlockPredicate; +import net.minecraft.world.level.levelgen.feature.ConfiguredFeature; +import net.minecraft.world.level.levelgen.feature.Feature; +import net.minecraft.world.level.levelgen.feature.configurations.RandomPatchConfiguration; +import net.minecraft.world.level.levelgen.feature.configurations.SimpleBlockConfiguration; +import net.minecraft.world.level.levelgen.feature.stateproviders.BlockStateProvider; + +import javax.annotation.ParametersAreNonnullByDefault; + +@MethodsReturnNonnullByDefault +@ParametersAreNonnullByDefault + +public class FloralisConfiguredFeatures { + public static final ResourceKey> WHITE_FLOWER = FloralisConfiguredFeatures.registerKey("white_flower"); + public static final ResourceKey> LIGHT_GRAY_FLOWER = FloralisConfiguredFeatures.registerKey("light_gray_flower"); + public static final ResourceKey> GRAY_FLOWER = FloralisConfiguredFeatures.registerKey("gray_flower"); + public static final ResourceKey> BLACK_FLOWER = FloralisConfiguredFeatures.registerKey("black_flower"); + public static final ResourceKey> BROWN_FLOWER = FloralisConfiguredFeatures.registerKey("brown_flower"); + public static final ResourceKey> RED_FLOWER = FloralisConfiguredFeatures.registerKey("red_flower"); + public static final ResourceKey> ORANGE_FLOWER = FloralisConfiguredFeatures.registerKey("orange_flower"); + public static final ResourceKey> YELLOW_FLOWER = FloralisConfiguredFeatures.registerKey("yellow_flower"); + public static final ResourceKey> LIME_FLOWER = FloralisConfiguredFeatures.registerKey("lime_flower"); + public static final ResourceKey> GREEN_FLOWER = FloralisConfiguredFeatures.registerKey("green_flower"); + public static final ResourceKey> CYAN_FLOWER = FloralisConfiguredFeatures.registerKey("cyan_flower"); + public static final ResourceKey> LIGHT_BLUE_FLOWER = FloralisConfiguredFeatures.registerKey("light_blue_flower"); + public static final ResourceKey> BLUE_FLOWER = FloralisConfiguredFeatures.registerKey("blue_flower"); + public static final ResourceKey> PURPLE_FLOWER = FloralisConfiguredFeatures.registerKey("purple_flower"); + public static final ResourceKey> MAGENTA_FLOWER = FloralisConfiguredFeatures.registerKey("magenta_flower"); + public static final ResourceKey> PINK_FLOWER = FloralisConfiguredFeatures.registerKey("pink_flower"); + + public static final ResourceKey> WHITE_CACTUS = FloralisConfiguredFeatures.registerKey("white_cactus"); + public static final ResourceKey> LIGHT_GRAY_CACTUS = FloralisConfiguredFeatures.registerKey("light_gray_cactus"); + public static final ResourceKey> GRAY_CACTUS = FloralisConfiguredFeatures.registerKey("gray_cactus"); + public static final ResourceKey> BLACK_CACTUS = FloralisConfiguredFeatures.registerKey("black_cactus"); + public static final ResourceKey> BROWN_CACTUS = FloralisConfiguredFeatures.registerKey("brown_cactus"); + public static final ResourceKey> RED_CACTUS = FloralisConfiguredFeatures.registerKey("red_cactus"); + public static final ResourceKey> ORANGE_CACTUS = FloralisConfiguredFeatures.registerKey("orange_cactus"); + public static final ResourceKey> YELLOW_CACTUS = FloralisConfiguredFeatures.registerKey("yellow_cactus"); + public static final ResourceKey> LIME_CACTUS = FloralisConfiguredFeatures.registerKey("lime_cactus"); + public static final ResourceKey> GREEN_CACTUS = FloralisConfiguredFeatures.registerKey("green_cactus"); + public static final ResourceKey> CYAN_CACTUS = FloralisConfiguredFeatures.registerKey("cyan_cactus"); + public static final ResourceKey> LIGHT_BLUE_CACTUS = FloralisConfiguredFeatures.registerKey("light_blue_cactus"); + public static final ResourceKey> BLUE_CACTUS = FloralisConfiguredFeatures.registerKey("blue_cactus"); + public static final ResourceKey> PURPLE_CACTUS = FloralisConfiguredFeatures.registerKey("purple_cactus"); + public static final ResourceKey> MAGENTA_CACTUS = FloralisConfiguredFeatures.registerKey("magenta_cactus"); + public static final ResourceKey> PINK_CACTUS = FloralisConfiguredFeatures.registerKey("pink_cactus"); + + public static void bootstrap(BootstrapContext> pContext) { + pContext.register(FloralisConfiguredFeatures.WHITE_FLOWER, new ConfiguredFeature<>(Feature.RANDOM_PATCH, new RandomPatchConfiguration(64, 4, 4, PlacementUtils.filtered(Feature.SIMPLE_BLOCK, new SimpleBlockConfiguration(BlockStateProvider.simple(FloralisBlocks.WHITE_FLOWER.get())), BlockPredicate.allOf(BlockPredicate.matchesTag(Direction.DOWN.getNormal(), BlockTags.DIRT), BlockPredicate.matchesBlocks(Blocks.AIR)))))); + pContext.register(FloralisConfiguredFeatures.LIGHT_GRAY_FLOWER, new ConfiguredFeature<>(Feature.RANDOM_PATCH, new RandomPatchConfiguration(64, 4, 4, PlacementUtils.filtered(Feature.SIMPLE_BLOCK, new SimpleBlockConfiguration(BlockStateProvider.simple(FloralisBlocks.LIGHT_GRAY_FLOWER.get())), BlockPredicate.allOf(BlockPredicate.matchesTag(Direction.DOWN.getNormal(), BlockTags.DIRT), BlockPredicate.matchesBlocks(Blocks.AIR)))))); + pContext.register(FloralisConfiguredFeatures.GRAY_FLOWER, new ConfiguredFeature<>(Feature.RANDOM_PATCH, new RandomPatchConfiguration(64, 4, 4, PlacementUtils.filtered(Feature.SIMPLE_BLOCK, new SimpleBlockConfiguration(BlockStateProvider.simple(FloralisBlocks.GRAY_FLOWER.get())), BlockPredicate.allOf(BlockPredicate.matchesTag(Direction.DOWN.getNormal(), BlockTags.DIRT), BlockPredicate.matchesBlocks(Blocks.AIR)))))); + pContext.register(FloralisConfiguredFeatures.BLACK_FLOWER, new ConfiguredFeature<>(Feature.RANDOM_PATCH, new RandomPatchConfiguration(64, 4, 4, PlacementUtils.filtered(Feature.SIMPLE_BLOCK, new SimpleBlockConfiguration(BlockStateProvider.simple(FloralisBlocks.BLACK_FLOWER.get())), BlockPredicate.allOf(BlockPredicate.matchesTag(Direction.DOWN.getNormal(), BlockTags.DIRT), BlockPredicate.matchesBlocks(Blocks.AIR)))))); + pContext.register(FloralisConfiguredFeatures.BROWN_FLOWER, new ConfiguredFeature<>(Feature.RANDOM_PATCH, new RandomPatchConfiguration(64, 4, 4, PlacementUtils.filtered(Feature.SIMPLE_BLOCK, new SimpleBlockConfiguration(BlockStateProvider.simple(FloralisBlocks.BROWN_FLOWER.get())), BlockPredicate.allOf(BlockPredicate.matchesTag(Direction.DOWN.getNormal(), BlockTags.DIRT), BlockPredicate.matchesBlocks(Blocks.AIR)))))); + pContext.register(FloralisConfiguredFeatures.RED_FLOWER, new ConfiguredFeature<>(Feature.RANDOM_PATCH, new RandomPatchConfiguration(64, 4, 4, PlacementUtils.filtered(Feature.SIMPLE_BLOCK, new SimpleBlockConfiguration(BlockStateProvider.simple(FloralisBlocks.RED_FLOWER.get())), BlockPredicate.allOf(BlockPredicate.matchesTag(Direction.DOWN.getNormal(), BlockTags.DIRT), BlockPredicate.matchesBlocks(Blocks.AIR)))))); + pContext.register(FloralisConfiguredFeatures.ORANGE_FLOWER, new ConfiguredFeature<>(Feature.RANDOM_PATCH, new RandomPatchConfiguration(64, 4, 4, PlacementUtils.filtered(Feature.SIMPLE_BLOCK, new SimpleBlockConfiguration(BlockStateProvider.simple(FloralisBlocks.ORANGE_FLOWER.get())), BlockPredicate.allOf(BlockPredicate.matchesTag(Direction.DOWN.getNormal(), BlockTags.DIRT), BlockPredicate.matchesBlocks(Blocks.AIR)))))); + pContext.register(FloralisConfiguredFeatures.YELLOW_FLOWER, new ConfiguredFeature<>(Feature.RANDOM_PATCH, new RandomPatchConfiguration(64, 4, 4, PlacementUtils.filtered(Feature.SIMPLE_BLOCK, new SimpleBlockConfiguration(BlockStateProvider.simple(FloralisBlocks.YELLOW_FLOWER.get())), BlockPredicate.allOf(BlockPredicate.matchesTag(Direction.DOWN.getNormal(), BlockTags.DIRT), BlockPredicate.matchesBlocks(Blocks.AIR)))))); + pContext.register(FloralisConfiguredFeatures.LIME_FLOWER, new ConfiguredFeature<>(Feature.RANDOM_PATCH, new RandomPatchConfiguration(64, 4, 4, PlacementUtils.filtered(Feature.SIMPLE_BLOCK, new SimpleBlockConfiguration(BlockStateProvider.simple(FloralisBlocks.LIME_FLOWER.get())), BlockPredicate.allOf(BlockPredicate.matchesTag(Direction.DOWN.getNormal(), BlockTags.DIRT), BlockPredicate.matchesBlocks(Blocks.AIR)))))); + pContext.register(FloralisConfiguredFeatures.GREEN_FLOWER, new ConfiguredFeature<>(Feature.RANDOM_PATCH, new RandomPatchConfiguration(64, 4, 4, PlacementUtils.filtered(Feature.SIMPLE_BLOCK, new SimpleBlockConfiguration(BlockStateProvider.simple(FloralisBlocks.GREEN_FLOWER.get())), BlockPredicate.allOf(BlockPredicate.matchesTag(Direction.DOWN.getNormal(), BlockTags.DIRT), BlockPredicate.matchesBlocks(Blocks.AIR)))))); + pContext.register(FloralisConfiguredFeatures.CYAN_FLOWER, new ConfiguredFeature<>(Feature.RANDOM_PATCH, new RandomPatchConfiguration(64, 4, 4, PlacementUtils.filtered(Feature.SIMPLE_BLOCK, new SimpleBlockConfiguration(BlockStateProvider.simple(FloralisBlocks.CYAN_FLOWER.get())), BlockPredicate.allOf(BlockPredicate.matchesTag(Direction.DOWN.getNormal(), BlockTags.DIRT), BlockPredicate.matchesBlocks(Blocks.AIR)))))); + pContext.register(FloralisConfiguredFeatures.LIGHT_BLUE_FLOWER, new ConfiguredFeature<>(Feature.RANDOM_PATCH, new RandomPatchConfiguration(64, 4, 4, PlacementUtils.filtered(Feature.SIMPLE_BLOCK, new SimpleBlockConfiguration(BlockStateProvider.simple(FloralisBlocks.LIGHT_BLUE_FLOWER.get())), BlockPredicate.allOf(BlockPredicate.matchesTag(Direction.DOWN.getNormal(), BlockTags.DIRT), BlockPredicate.matchesBlocks(Blocks.AIR)))))); + pContext.register(FloralisConfiguredFeatures.BLUE_FLOWER, new ConfiguredFeature<>(Feature.RANDOM_PATCH, new RandomPatchConfiguration(64, 4, 4, PlacementUtils.filtered(Feature.SIMPLE_BLOCK, new SimpleBlockConfiguration(BlockStateProvider.simple(FloralisBlocks.BLUE_FLOWER.get())), BlockPredicate.allOf(BlockPredicate.matchesTag(Direction.DOWN.getNormal(), BlockTags.DIRT), BlockPredicate.matchesBlocks(Blocks.AIR)))))); + pContext.register(FloralisConfiguredFeatures.PURPLE_FLOWER, new ConfiguredFeature<>(Feature.RANDOM_PATCH, new RandomPatchConfiguration(64, 4, 4, PlacementUtils.filtered(Feature.SIMPLE_BLOCK, new SimpleBlockConfiguration(BlockStateProvider.simple(FloralisBlocks.PURPLE_FLOWER.get())), BlockPredicate.allOf(BlockPredicate.matchesTag(Direction.DOWN.getNormal(), BlockTags.DIRT), BlockPredicate.matchesBlocks(Blocks.AIR)))))); + pContext.register(FloralisConfiguredFeatures.MAGENTA_FLOWER, new ConfiguredFeature<>(Feature.RANDOM_PATCH, new RandomPatchConfiguration(64, 4, 4, PlacementUtils.filtered(Feature.SIMPLE_BLOCK, new SimpleBlockConfiguration(BlockStateProvider.simple(FloralisBlocks.MAGENTA_FLOWER.get())), BlockPredicate.allOf(BlockPredicate.matchesTag(Direction.DOWN.getNormal(), BlockTags.DIRT), BlockPredicate.matchesBlocks(Blocks.AIR)))))); + pContext.register(FloralisConfiguredFeatures.PINK_FLOWER, new ConfiguredFeature<>(Feature.RANDOM_PATCH, new RandomPatchConfiguration(64, 4, 4, PlacementUtils.filtered(Feature.SIMPLE_BLOCK, new SimpleBlockConfiguration(BlockStateProvider.simple(FloralisBlocks.PINK_FLOWER.get())), BlockPredicate.allOf(BlockPredicate.matchesTag(Direction.DOWN.getNormal(), BlockTags.DIRT), BlockPredicate.matchesBlocks(Blocks.AIR)))))); + + pContext.register(FloralisConfiguredFeatures.WHITE_CACTUS, new ConfiguredFeature<>(Feature.RANDOM_PATCH, new RandomPatchConfiguration(64, 4, 4, PlacementUtils.filtered(Feature.SIMPLE_BLOCK, new SimpleBlockConfiguration(BlockStateProvider.simple(FloralisBlocks.WHITE_CACTUS.get())), BlockPredicate.allOf(BlockPredicate.matchesTag(Direction.DOWN.getNormal(), BlockTags.SAND), BlockPredicate.matchesBlocks(Blocks.AIR)))))); + pContext.register(FloralisConfiguredFeatures.LIGHT_GRAY_CACTUS, new ConfiguredFeature<>(Feature.RANDOM_PATCH, new RandomPatchConfiguration(64, 4, 4, PlacementUtils.filtered(Feature.SIMPLE_BLOCK, new SimpleBlockConfiguration(BlockStateProvider.simple(FloralisBlocks.LIGHT_GRAY_CACTUS.get())), BlockPredicate.allOf(BlockPredicate.matchesTag(Direction.DOWN.getNormal(), BlockTags.SAND), BlockPredicate.matchesBlocks(Blocks.AIR)))))); + pContext.register(FloralisConfiguredFeatures.GRAY_CACTUS, new ConfiguredFeature<>(Feature.RANDOM_PATCH, new RandomPatchConfiguration(64, 4, 4, PlacementUtils.filtered(Feature.SIMPLE_BLOCK, new SimpleBlockConfiguration(BlockStateProvider.simple(FloralisBlocks.GRAY_CACTUS.get())), BlockPredicate.allOf(BlockPredicate.matchesTag(Direction.DOWN.getNormal(), BlockTags.SAND), BlockPredicate.matchesBlocks(Blocks.AIR)))))); + pContext.register(FloralisConfiguredFeatures.BLACK_CACTUS, new ConfiguredFeature<>(Feature.RANDOM_PATCH, new RandomPatchConfiguration(64, 4, 4, PlacementUtils.filtered(Feature.SIMPLE_BLOCK, new SimpleBlockConfiguration(BlockStateProvider.simple(FloralisBlocks.BLACK_CACTUS.get())), BlockPredicate.allOf(BlockPredicate.matchesTag(Direction.DOWN.getNormal(), BlockTags.SAND), BlockPredicate.matchesBlocks(Blocks.AIR)))))); + pContext.register(FloralisConfiguredFeatures.BROWN_CACTUS, new ConfiguredFeature<>(Feature.RANDOM_PATCH, new RandomPatchConfiguration(64, 4, 4, PlacementUtils.filtered(Feature.SIMPLE_BLOCK, new SimpleBlockConfiguration(BlockStateProvider.simple(FloralisBlocks.BROWN_CACTUS.get())), BlockPredicate.allOf(BlockPredicate.matchesTag(Direction.DOWN.getNormal(), BlockTags.SAND), BlockPredicate.matchesBlocks(Blocks.AIR)))))); + pContext.register(FloralisConfiguredFeatures.RED_CACTUS, new ConfiguredFeature<>(Feature.RANDOM_PATCH, new RandomPatchConfiguration(64, 4, 4, PlacementUtils.filtered(Feature.SIMPLE_BLOCK, new SimpleBlockConfiguration(BlockStateProvider.simple(FloralisBlocks.RED_CACTUS.get())), BlockPredicate.allOf(BlockPredicate.matchesTag(Direction.DOWN.getNormal(), BlockTags.SAND), BlockPredicate.matchesBlocks(Blocks.AIR)))))); + pContext.register(FloralisConfiguredFeatures.ORANGE_CACTUS, new ConfiguredFeature<>(Feature.RANDOM_PATCH, new RandomPatchConfiguration(64, 4, 4, PlacementUtils.filtered(Feature.SIMPLE_BLOCK, new SimpleBlockConfiguration(BlockStateProvider.simple(FloralisBlocks.ORANGE_CACTUS.get())), BlockPredicate.allOf(BlockPredicate.matchesTag(Direction.DOWN.getNormal(), BlockTags.SAND), BlockPredicate.matchesBlocks(Blocks.AIR)))))); + pContext.register(FloralisConfiguredFeatures.YELLOW_CACTUS, new ConfiguredFeature<>(Feature.RANDOM_PATCH, new RandomPatchConfiguration(64, 4, 4, PlacementUtils.filtered(Feature.SIMPLE_BLOCK, new SimpleBlockConfiguration(BlockStateProvider.simple(FloralisBlocks.YELLOW_CACTUS.get())), BlockPredicate.allOf(BlockPredicate.matchesTag(Direction.DOWN.getNormal(), BlockTags.SAND), BlockPredicate.matchesBlocks(Blocks.AIR)))))); + pContext.register(FloralisConfiguredFeatures.LIME_CACTUS, new ConfiguredFeature<>(Feature.RANDOM_PATCH, new RandomPatchConfiguration(64, 4, 4, PlacementUtils.filtered(Feature.SIMPLE_BLOCK, new SimpleBlockConfiguration(BlockStateProvider.simple(FloralisBlocks.LIME_CACTUS.get())), BlockPredicate.allOf(BlockPredicate.matchesTag(Direction.DOWN.getNormal(), BlockTags.SAND), BlockPredicate.matchesBlocks(Blocks.AIR)))))); + pContext.register(FloralisConfiguredFeatures.GREEN_CACTUS, new ConfiguredFeature<>(Feature.RANDOM_PATCH, new RandomPatchConfiguration(64, 4, 4, PlacementUtils.filtered(Feature.SIMPLE_BLOCK, new SimpleBlockConfiguration(BlockStateProvider.simple(FloralisBlocks.GREEN_CACTUS.get())), BlockPredicate.allOf(BlockPredicate.matchesTag(Direction.DOWN.getNormal(), BlockTags.SAND), BlockPredicate.matchesBlocks(Blocks.AIR)))))); + pContext.register(FloralisConfiguredFeatures.CYAN_CACTUS, new ConfiguredFeature<>(Feature.RANDOM_PATCH, new RandomPatchConfiguration(64, 4, 4, PlacementUtils.filtered(Feature.SIMPLE_BLOCK, new SimpleBlockConfiguration(BlockStateProvider.simple(FloralisBlocks.CYAN_CACTUS.get())), BlockPredicate.allOf(BlockPredicate.matchesTag(Direction.DOWN.getNormal(), BlockTags.SAND), BlockPredicate.matchesBlocks(Blocks.AIR)))))); + pContext.register(FloralisConfiguredFeatures.LIGHT_BLUE_CACTUS, new ConfiguredFeature<>(Feature.RANDOM_PATCH, new RandomPatchConfiguration(64, 4, 4, PlacementUtils.filtered(Feature.SIMPLE_BLOCK, new SimpleBlockConfiguration(BlockStateProvider.simple(FloralisBlocks.LIGHT_BLUE_CACTUS.get())), BlockPredicate.allOf(BlockPredicate.matchesTag(Direction.DOWN.getNormal(), BlockTags.SAND), BlockPredicate.matchesBlocks(Blocks.AIR)))))); + pContext.register(FloralisConfiguredFeatures.BLUE_CACTUS, new ConfiguredFeature<>(Feature.RANDOM_PATCH, new RandomPatchConfiguration(64, 4, 4, PlacementUtils.filtered(Feature.SIMPLE_BLOCK, new SimpleBlockConfiguration(BlockStateProvider.simple(FloralisBlocks.BLUE_CACTUS.get())), BlockPredicate.allOf(BlockPredicate.matchesTag(Direction.DOWN.getNormal(), BlockTags.SAND), BlockPredicate.matchesBlocks(Blocks.AIR)))))); + pContext.register(FloralisConfiguredFeatures.PURPLE_CACTUS, new ConfiguredFeature<>(Feature.RANDOM_PATCH, new RandomPatchConfiguration(64, 4, 4, PlacementUtils.filtered(Feature.SIMPLE_BLOCK, new SimpleBlockConfiguration(BlockStateProvider.simple(FloralisBlocks.PURPLE_CACTUS.get())), BlockPredicate.allOf(BlockPredicate.matchesTag(Direction.DOWN.getNormal(), BlockTags.SAND), BlockPredicate.matchesBlocks(Blocks.AIR)))))); + pContext.register(FloralisConfiguredFeatures.MAGENTA_CACTUS, new ConfiguredFeature<>(Feature.RANDOM_PATCH, new RandomPatchConfiguration(64, 4, 4, PlacementUtils.filtered(Feature.SIMPLE_BLOCK, new SimpleBlockConfiguration(BlockStateProvider.simple(FloralisBlocks.MAGENTA_CACTUS.get())), BlockPredicate.allOf(BlockPredicate.matchesTag(Direction.DOWN.getNormal(), BlockTags.SAND), BlockPredicate.matchesBlocks(Blocks.AIR)))))); + pContext.register(FloralisConfiguredFeatures.PINK_CACTUS, new ConfiguredFeature<>(Feature.RANDOM_PATCH, new RandomPatchConfiguration(64, 4, 4, PlacementUtils.filtered(Feature.SIMPLE_BLOCK, new SimpleBlockConfiguration(BlockStateProvider.simple(FloralisBlocks.PINK_CACTUS.get())), BlockPredicate.allOf(BlockPredicate.matchesTag(Direction.DOWN.getNormal(), BlockTags.SAND), BlockPredicate.matchesBlocks(Blocks.AIR)))))); + } + + public static ResourceKey> registerKey(String pName) { + return ResourceKey.create(Registries.CONFIGURED_FEATURE, new ResourceLocation(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 new file mode 100644 index 00000000..a3fb94e6 --- /dev/null +++ b/src/main/java/com/luxtracon/floralis/data/features/FloralisPlacedFeatures.java @@ -0,0 +1,101 @@ +package com.luxtracon.floralis.data.features; + +import com.luxtracon.floralis.registry.FloralisConstants; + +import net.minecraft.MethodsReturnNonnullByDefault; +import net.minecraft.core.Direction; +import net.minecraft.core.registries.Registries; +import net.minecraft.data.worldgen.BootstrapContext; +import net.minecraft.data.worldgen.placement.PlacementUtils; +import net.minecraft.resources.ResourceKey; +import net.minecraft.resources.ResourceLocation; +import net.minecraft.tags.BlockTags; +import net.minecraft.util.valueproviders.ConstantInt; +import net.minecraft.world.level.block.Blocks; +import net.minecraft.world.level.levelgen.blockpredicates.BlockPredicate; +import net.minecraft.world.level.levelgen.placement.*; + +import java.util.List; + +import javax.annotation.ParametersAreNonnullByDefault; + +@MethodsReturnNonnullByDefault +@ParametersAreNonnullByDefault + +public class FloralisPlacedFeatures { + public static final ResourceKey WHITE_FLOWER = FloralisPlacedFeatures.registerKey("white_flower"); + public static final ResourceKey LIGHT_GRAY_FLOWER = FloralisPlacedFeatures.registerKey("light_gray_flower"); + public static final ResourceKey GRAY_FLOWER = FloralisPlacedFeatures.registerKey("gray_flower"); + public static final ResourceKey BLACK_FLOWER = FloralisPlacedFeatures.registerKey("black_flower"); + public static final ResourceKey BROWN_FLOWER = FloralisPlacedFeatures.registerKey("brown_flower"); + public static final ResourceKey RED_FLOWER = FloralisPlacedFeatures.registerKey("red_flower"); + public static final ResourceKey ORANGE_FLOWER = FloralisPlacedFeatures.registerKey("orange_flower"); + public static final ResourceKey YELLOW_FLOWER = FloralisPlacedFeatures.registerKey("yellow_flower"); + public static final ResourceKey LIME_FLOWER = FloralisPlacedFeatures.registerKey("lime_flower"); + public static final ResourceKey GREEN_FLOWER = FloralisPlacedFeatures.registerKey("green_flower"); + public static final ResourceKey CYAN_FLOWER = FloralisPlacedFeatures.registerKey("cyan_flower"); + public static final ResourceKey LIGHT_BLUE_FLOWER = FloralisPlacedFeatures.registerKey("light_blue_flower"); + public static final ResourceKey BLUE_FLOWER = FloralisPlacedFeatures.registerKey("blue_flower"); + public static final ResourceKey PURPLE_FLOWER = FloralisPlacedFeatures.registerKey("purple_flower"); + public static final ResourceKey MAGENTA_FLOWER = FloralisPlacedFeatures.registerKey("magenta_flower"); + public static final ResourceKey PINK_FLOWER = FloralisPlacedFeatures.registerKey("pink_flower"); + + public static final ResourceKey WHITE_CACTUS = FloralisPlacedFeatures.registerKey("white_cactus"); + public static final ResourceKey LIGHT_GRAY_CACTUS = FloralisPlacedFeatures.registerKey("light_gray_cactus"); + public static final ResourceKey GRAY_CACTUS = FloralisPlacedFeatures.registerKey("gray_cactus"); + public static final ResourceKey BLACK_CACTUS = FloralisPlacedFeatures.registerKey("black_cactus"); + public static final ResourceKey BROWN_CACTUS = FloralisPlacedFeatures.registerKey("brown_cactus"); + public static final ResourceKey RED_CACTUS = FloralisPlacedFeatures.registerKey("red_cactus"); + public static final ResourceKey ORANGE_CACTUS = FloralisPlacedFeatures.registerKey("orange_cactus"); + public static final ResourceKey YELLOW_CACTUS = FloralisPlacedFeatures.registerKey("yellow_cactus"); + public static final ResourceKey LIME_CACTUS = FloralisPlacedFeatures.registerKey("lime_cactus"); + public static final ResourceKey GREEN_CACTUS = FloralisPlacedFeatures.registerKey("green_cactus"); + public static final ResourceKey CYAN_CACTUS = FloralisPlacedFeatures.registerKey("cyan_cactus"); + public static final ResourceKey LIGHT_BLUE_CACTUS = FloralisPlacedFeatures.registerKey("light_blue_cactus"); + public static final ResourceKey BLUE_CACTUS = FloralisPlacedFeatures.registerKey("blue_cactus"); + public static final ResourceKey PURPLE_CACTUS = FloralisPlacedFeatures.registerKey("purple_cactus"); + public static final ResourceKey MAGENTA_CACTUS = FloralisPlacedFeatures.registerKey("magenta_cactus"); + public static final ResourceKey PINK_CACTUS = FloralisPlacedFeatures.registerKey("pink_cactus"); + + public static void bootstrap(BootstrapContext pContext) { + var configuredFeatures = pContext.lookup(Registries.CONFIGURED_FEATURE); + + pContext.register(FloralisPlacedFeatures.WHITE_FLOWER, new PlacedFeature(configuredFeatures.getOrThrow(FloralisConfiguredFeatures.WHITE_FLOWER), List.of(RarityFilter.onAverageOnceEvery(256), InSquarePlacement.spread(), PlacementUtils.HEIGHTMAP, EnvironmentScanPlacement.scanningFor(Direction.DOWN, BlockPredicate.matchesTag(BlockTags.DIRT), BlockPredicate.matchesBlocks(Blocks.AIR), 16), RandomOffsetPlacement.vertical(ConstantInt.of(1)), BiomeFilter.biome()))); + pContext.register(FloralisPlacedFeatures.LIGHT_GRAY_FLOWER, new PlacedFeature(configuredFeatures.getOrThrow(FloralisConfiguredFeatures.LIGHT_GRAY_FLOWER), List.of(RarityFilter.onAverageOnceEvery(256), InSquarePlacement.spread(), PlacementUtils.HEIGHTMAP, EnvironmentScanPlacement.scanningFor(Direction.DOWN, BlockPredicate.matchesTag(BlockTags.DIRT), BlockPredicate.matchesBlocks(Blocks.AIR), 16), RandomOffsetPlacement.vertical(ConstantInt.of(1)), BiomeFilter.biome()))); + pContext.register(FloralisPlacedFeatures.GRAY_FLOWER, new PlacedFeature(configuredFeatures.getOrThrow(FloralisConfiguredFeatures.GRAY_FLOWER), List.of(RarityFilter.onAverageOnceEvery(256), InSquarePlacement.spread(), PlacementUtils.HEIGHTMAP, EnvironmentScanPlacement.scanningFor(Direction.DOWN, BlockPredicate.matchesTag(BlockTags.DIRT), BlockPredicate.matchesBlocks(Blocks.AIR), 16), RandomOffsetPlacement.vertical(ConstantInt.of(1)), BiomeFilter.biome()))); + pContext.register(FloralisPlacedFeatures.BLACK_FLOWER, new PlacedFeature(configuredFeatures.getOrThrow(FloralisConfiguredFeatures.BLACK_FLOWER), List.of(RarityFilter.onAverageOnceEvery(256), InSquarePlacement.spread(), PlacementUtils.HEIGHTMAP, EnvironmentScanPlacement.scanningFor(Direction.DOWN, BlockPredicate.matchesTag(BlockTags.DIRT), BlockPredicate.matchesBlocks(Blocks.AIR), 16), RandomOffsetPlacement.vertical(ConstantInt.of(1)), BiomeFilter.biome()))); + pContext.register(FloralisPlacedFeatures.BROWN_FLOWER, new PlacedFeature(configuredFeatures.getOrThrow(FloralisConfiguredFeatures.BROWN_FLOWER), List.of(RarityFilter.onAverageOnceEvery(256), InSquarePlacement.spread(), PlacementUtils.HEIGHTMAP, EnvironmentScanPlacement.scanningFor(Direction.DOWN, BlockPredicate.matchesTag(BlockTags.DIRT), BlockPredicate.matchesBlocks(Blocks.AIR), 16), RandomOffsetPlacement.vertical(ConstantInt.of(1)), BiomeFilter.biome()))); + pContext.register(FloralisPlacedFeatures.RED_FLOWER, new PlacedFeature(configuredFeatures.getOrThrow(FloralisConfiguredFeatures.RED_FLOWER), List.of(RarityFilter.onAverageOnceEvery(256), InSquarePlacement.spread(), PlacementUtils.HEIGHTMAP, EnvironmentScanPlacement.scanningFor(Direction.DOWN, BlockPredicate.matchesTag(BlockTags.DIRT), BlockPredicate.matchesBlocks(Blocks.AIR), 16), RandomOffsetPlacement.vertical(ConstantInt.of(1)), BiomeFilter.biome()))); + pContext.register(FloralisPlacedFeatures.ORANGE_FLOWER, new PlacedFeature(configuredFeatures.getOrThrow(FloralisConfiguredFeatures.ORANGE_FLOWER), List.of(RarityFilter.onAverageOnceEvery(256), InSquarePlacement.spread(), PlacementUtils.HEIGHTMAP, EnvironmentScanPlacement.scanningFor(Direction.DOWN, BlockPredicate.matchesTag(BlockTags.DIRT), BlockPredicate.matchesBlocks(Blocks.AIR), 16), RandomOffsetPlacement.vertical(ConstantInt.of(1)), BiomeFilter.biome()))); + pContext.register(FloralisPlacedFeatures.YELLOW_FLOWER, new PlacedFeature(configuredFeatures.getOrThrow(FloralisConfiguredFeatures.YELLOW_FLOWER), List.of(RarityFilter.onAverageOnceEvery(256), InSquarePlacement.spread(), PlacementUtils.HEIGHTMAP, EnvironmentScanPlacement.scanningFor(Direction.DOWN, BlockPredicate.matchesTag(BlockTags.DIRT), BlockPredicate.matchesBlocks(Blocks.AIR), 16), RandomOffsetPlacement.vertical(ConstantInt.of(1)), BiomeFilter.biome()))); + pContext.register(FloralisPlacedFeatures.LIME_FLOWER, new PlacedFeature(configuredFeatures.getOrThrow(FloralisConfiguredFeatures.LIME_FLOWER), List.of(RarityFilter.onAverageOnceEvery(256), InSquarePlacement.spread(), PlacementUtils.HEIGHTMAP, EnvironmentScanPlacement.scanningFor(Direction.DOWN, BlockPredicate.matchesTag(BlockTags.DIRT), BlockPredicate.matchesBlocks(Blocks.AIR), 16), RandomOffsetPlacement.vertical(ConstantInt.of(1)), BiomeFilter.biome()))); + pContext.register(FloralisPlacedFeatures.GREEN_FLOWER, new PlacedFeature(configuredFeatures.getOrThrow(FloralisConfiguredFeatures.GREEN_FLOWER), List.of(RarityFilter.onAverageOnceEvery(256), InSquarePlacement.spread(), PlacementUtils.HEIGHTMAP, EnvironmentScanPlacement.scanningFor(Direction.DOWN, BlockPredicate.matchesTag(BlockTags.DIRT), BlockPredicate.matchesBlocks(Blocks.AIR), 16), RandomOffsetPlacement.vertical(ConstantInt.of(1)), BiomeFilter.biome()))); + pContext.register(FloralisPlacedFeatures.CYAN_FLOWER, new PlacedFeature(configuredFeatures.getOrThrow(FloralisConfiguredFeatures.CYAN_FLOWER), List.of(RarityFilter.onAverageOnceEvery(256), InSquarePlacement.spread(), PlacementUtils.HEIGHTMAP, EnvironmentScanPlacement.scanningFor(Direction.DOWN, BlockPredicate.matchesTag(BlockTags.DIRT), BlockPredicate.matchesBlocks(Blocks.AIR), 16), RandomOffsetPlacement.vertical(ConstantInt.of(1)), BiomeFilter.biome()))); + pContext.register(FloralisPlacedFeatures.LIGHT_BLUE_FLOWER, new PlacedFeature(configuredFeatures.getOrThrow(FloralisConfiguredFeatures.LIGHT_BLUE_FLOWER), List.of(RarityFilter.onAverageOnceEvery(256), InSquarePlacement.spread(), PlacementUtils.HEIGHTMAP, EnvironmentScanPlacement.scanningFor(Direction.DOWN, BlockPredicate.matchesTag(BlockTags.DIRT), BlockPredicate.matchesBlocks(Blocks.AIR), 16), RandomOffsetPlacement.vertical(ConstantInt.of(1)), BiomeFilter.biome()))); + pContext.register(FloralisPlacedFeatures.BLUE_FLOWER, new PlacedFeature(configuredFeatures.getOrThrow(FloralisConfiguredFeatures.BLUE_FLOWER), List.of(RarityFilter.onAverageOnceEvery(256), InSquarePlacement.spread(), PlacementUtils.HEIGHTMAP, EnvironmentScanPlacement.scanningFor(Direction.DOWN, BlockPredicate.matchesTag(BlockTags.DIRT), BlockPredicate.matchesBlocks(Blocks.AIR), 16), RandomOffsetPlacement.vertical(ConstantInt.of(1)), BiomeFilter.biome()))); + pContext.register(FloralisPlacedFeatures.PURPLE_FLOWER, new PlacedFeature(configuredFeatures.getOrThrow(FloralisConfiguredFeatures.PURPLE_FLOWER), List.of(RarityFilter.onAverageOnceEvery(256), InSquarePlacement.spread(), PlacementUtils.HEIGHTMAP, EnvironmentScanPlacement.scanningFor(Direction.DOWN, BlockPredicate.matchesTag(BlockTags.DIRT), BlockPredicate.matchesBlocks(Blocks.AIR), 16), RandomOffsetPlacement.vertical(ConstantInt.of(1)), BiomeFilter.biome()))); + pContext.register(FloralisPlacedFeatures.MAGENTA_FLOWER, new PlacedFeature(configuredFeatures.getOrThrow(FloralisConfiguredFeatures.MAGENTA_FLOWER), List.of(RarityFilter.onAverageOnceEvery(256), InSquarePlacement.spread(), PlacementUtils.HEIGHTMAP, EnvironmentScanPlacement.scanningFor(Direction.DOWN, BlockPredicate.matchesTag(BlockTags.DIRT), BlockPredicate.matchesBlocks(Blocks.AIR), 16), RandomOffsetPlacement.vertical(ConstantInt.of(1)), BiomeFilter.biome()))); + pContext.register(FloralisPlacedFeatures.PINK_FLOWER, new PlacedFeature(configuredFeatures.getOrThrow(FloralisConfiguredFeatures.PINK_FLOWER), List.of(RarityFilter.onAverageOnceEvery(256), InSquarePlacement.spread(), PlacementUtils.HEIGHTMAP, EnvironmentScanPlacement.scanningFor(Direction.DOWN, BlockPredicate.matchesTag(BlockTags.DIRT), BlockPredicate.matchesBlocks(Blocks.AIR), 16), RandomOffsetPlacement.vertical(ConstantInt.of(1)), BiomeFilter.biome()))); + + pContext.register(FloralisPlacedFeatures.WHITE_CACTUS, new PlacedFeature(configuredFeatures.getOrThrow(FloralisConfiguredFeatures.WHITE_CACTUS), List.of(RarityFilter.onAverageOnceEvery(256), InSquarePlacement.spread(), PlacementUtils.HEIGHTMAP, EnvironmentScanPlacement.scanningFor(Direction.DOWN, BlockPredicate.matchesTag(BlockTags.SAND), BlockPredicate.matchesBlocks(Blocks.AIR), 16), RandomOffsetPlacement.vertical(ConstantInt.of(1)), BiomeFilter.biome()))); + pContext.register(FloralisPlacedFeatures.LIGHT_GRAY_CACTUS, new PlacedFeature(configuredFeatures.getOrThrow(FloralisConfiguredFeatures.LIGHT_GRAY_CACTUS), List.of(RarityFilter.onAverageOnceEvery(256), InSquarePlacement.spread(), PlacementUtils.HEIGHTMAP, EnvironmentScanPlacement.scanningFor(Direction.DOWN, BlockPredicate.matchesTag(BlockTags.SAND), BlockPredicate.matchesBlocks(Blocks.AIR), 16), RandomOffsetPlacement.vertical(ConstantInt.of(1)), BiomeFilter.biome()))); + pContext.register(FloralisPlacedFeatures.GRAY_CACTUS, new PlacedFeature(configuredFeatures.getOrThrow(FloralisConfiguredFeatures.GRAY_CACTUS), List.of(RarityFilter.onAverageOnceEvery(256), InSquarePlacement.spread(), PlacementUtils.HEIGHTMAP, EnvironmentScanPlacement.scanningFor(Direction.DOWN, BlockPredicate.matchesTag(BlockTags.SAND), BlockPredicate.matchesBlocks(Blocks.AIR), 16), RandomOffsetPlacement.vertical(ConstantInt.of(1)), BiomeFilter.biome()))); + pContext.register(FloralisPlacedFeatures.BLACK_CACTUS, new PlacedFeature(configuredFeatures.getOrThrow(FloralisConfiguredFeatures.BLACK_CACTUS), List.of(RarityFilter.onAverageOnceEvery(256), InSquarePlacement.spread(), PlacementUtils.HEIGHTMAP, EnvironmentScanPlacement.scanningFor(Direction.DOWN, BlockPredicate.matchesTag(BlockTags.SAND), BlockPredicate.matchesBlocks(Blocks.AIR), 16), RandomOffsetPlacement.vertical(ConstantInt.of(1)), BiomeFilter.biome()))); + pContext.register(FloralisPlacedFeatures.BROWN_CACTUS, new PlacedFeature(configuredFeatures.getOrThrow(FloralisConfiguredFeatures.BROWN_CACTUS), List.of(RarityFilter.onAverageOnceEvery(256), InSquarePlacement.spread(), PlacementUtils.HEIGHTMAP, EnvironmentScanPlacement.scanningFor(Direction.DOWN, BlockPredicate.matchesTag(BlockTags.SAND), BlockPredicate.matchesBlocks(Blocks.AIR), 16), RandomOffsetPlacement.vertical(ConstantInt.of(1)), BiomeFilter.biome()))); + pContext.register(FloralisPlacedFeatures.RED_CACTUS, new PlacedFeature(configuredFeatures.getOrThrow(FloralisConfiguredFeatures.RED_CACTUS), List.of(RarityFilter.onAverageOnceEvery(256), InSquarePlacement.spread(), PlacementUtils.HEIGHTMAP, EnvironmentScanPlacement.scanningFor(Direction.DOWN, BlockPredicate.matchesTag(BlockTags.SAND), BlockPredicate.matchesBlocks(Blocks.AIR), 16), RandomOffsetPlacement.vertical(ConstantInt.of(1)), BiomeFilter.biome()))); + pContext.register(FloralisPlacedFeatures.ORANGE_CACTUS, new PlacedFeature(configuredFeatures.getOrThrow(FloralisConfiguredFeatures.ORANGE_CACTUS), List.of(RarityFilter.onAverageOnceEvery(256), InSquarePlacement.spread(), PlacementUtils.HEIGHTMAP, EnvironmentScanPlacement.scanningFor(Direction.DOWN, BlockPredicate.matchesTag(BlockTags.SAND), BlockPredicate.matchesBlocks(Blocks.AIR), 16), RandomOffsetPlacement.vertical(ConstantInt.of(1)), BiomeFilter.biome()))); + pContext.register(FloralisPlacedFeatures.YELLOW_CACTUS, new PlacedFeature(configuredFeatures.getOrThrow(FloralisConfiguredFeatures.YELLOW_CACTUS), List.of(RarityFilter.onAverageOnceEvery(256), InSquarePlacement.spread(), PlacementUtils.HEIGHTMAP, EnvironmentScanPlacement.scanningFor(Direction.DOWN, BlockPredicate.matchesTag(BlockTags.SAND), BlockPredicate.matchesBlocks(Blocks.AIR), 16), RandomOffsetPlacement.vertical(ConstantInt.of(1)), BiomeFilter.biome()))); + pContext.register(FloralisPlacedFeatures.LIME_CACTUS, new PlacedFeature(configuredFeatures.getOrThrow(FloralisConfiguredFeatures.LIME_CACTUS), List.of(RarityFilter.onAverageOnceEvery(256), InSquarePlacement.spread(), PlacementUtils.HEIGHTMAP, EnvironmentScanPlacement.scanningFor(Direction.DOWN, BlockPredicate.matchesTag(BlockTags.SAND), BlockPredicate.matchesBlocks(Blocks.AIR), 16), RandomOffsetPlacement.vertical(ConstantInt.of(1)), BiomeFilter.biome()))); + pContext.register(FloralisPlacedFeatures.GREEN_CACTUS, new PlacedFeature(configuredFeatures.getOrThrow(FloralisConfiguredFeatures.GREEN_CACTUS), List.of(RarityFilter.onAverageOnceEvery(256), InSquarePlacement.spread(), PlacementUtils.HEIGHTMAP, EnvironmentScanPlacement.scanningFor(Direction.DOWN, BlockPredicate.matchesTag(BlockTags.SAND), BlockPredicate.matchesBlocks(Blocks.AIR), 16), RandomOffsetPlacement.vertical(ConstantInt.of(1)), BiomeFilter.biome()))); + pContext.register(FloralisPlacedFeatures.CYAN_CACTUS, new PlacedFeature(configuredFeatures.getOrThrow(FloralisConfiguredFeatures.CYAN_CACTUS), List.of(RarityFilter.onAverageOnceEvery(256), InSquarePlacement.spread(), PlacementUtils.HEIGHTMAP, EnvironmentScanPlacement.scanningFor(Direction.DOWN, BlockPredicate.matchesTag(BlockTags.SAND), BlockPredicate.matchesBlocks(Blocks.AIR), 16), RandomOffsetPlacement.vertical(ConstantInt.of(1)), BiomeFilter.biome()))); + pContext.register(FloralisPlacedFeatures.LIGHT_BLUE_CACTUS, new PlacedFeature(configuredFeatures.getOrThrow(FloralisConfiguredFeatures.LIGHT_BLUE_CACTUS), List.of(RarityFilter.onAverageOnceEvery(256), InSquarePlacement.spread(), PlacementUtils.HEIGHTMAP, EnvironmentScanPlacement.scanningFor(Direction.DOWN, BlockPredicate.matchesTag(BlockTags.SAND), BlockPredicate.matchesBlocks(Blocks.AIR), 16), RandomOffsetPlacement.vertical(ConstantInt.of(1)), BiomeFilter.biome()))); + pContext.register(FloralisPlacedFeatures.BLUE_CACTUS, new PlacedFeature(configuredFeatures.getOrThrow(FloralisConfiguredFeatures.BLUE_CACTUS), List.of(RarityFilter.onAverageOnceEvery(256), InSquarePlacement.spread(), PlacementUtils.HEIGHTMAP, EnvironmentScanPlacement.scanningFor(Direction.DOWN, BlockPredicate.matchesTag(BlockTags.SAND), BlockPredicate.matchesBlocks(Blocks.AIR), 16), RandomOffsetPlacement.vertical(ConstantInt.of(1)), BiomeFilter.biome()))); + pContext.register(FloralisPlacedFeatures.PURPLE_CACTUS, new PlacedFeature(configuredFeatures.getOrThrow(FloralisConfiguredFeatures.PURPLE_CACTUS), List.of(RarityFilter.onAverageOnceEvery(256), InSquarePlacement.spread(), PlacementUtils.HEIGHTMAP, EnvironmentScanPlacement.scanningFor(Direction.DOWN, BlockPredicate.matchesTag(BlockTags.SAND), BlockPredicate.matchesBlocks(Blocks.AIR), 16), RandomOffsetPlacement.vertical(ConstantInt.of(1)), BiomeFilter.biome()))); + pContext.register(FloralisPlacedFeatures.MAGENTA_CACTUS, new PlacedFeature(configuredFeatures.getOrThrow(FloralisConfiguredFeatures.MAGENTA_CACTUS), List.of(RarityFilter.onAverageOnceEvery(256), InSquarePlacement.spread(), PlacementUtils.HEIGHTMAP, EnvironmentScanPlacement.scanningFor(Direction.DOWN, BlockPredicate.matchesTag(BlockTags.SAND), BlockPredicate.matchesBlocks(Blocks.AIR), 16), RandomOffsetPlacement.vertical(ConstantInt.of(1)), BiomeFilter.biome()))); + pContext.register(FloralisPlacedFeatures.PINK_CACTUS, new PlacedFeature(configuredFeatures.getOrThrow(FloralisConfiguredFeatures.PINK_CACTUS), List.of(RarityFilter.onAverageOnceEvery(256), InSquarePlacement.spread(), PlacementUtils.HEIGHTMAP, EnvironmentScanPlacement.scanningFor(Direction.DOWN, BlockPredicate.matchesTag(BlockTags.SAND), BlockPredicate.matchesBlocks(Blocks.AIR), 16), RandomOffsetPlacement.vertical(ConstantInt.of(1)), BiomeFilter.biome()))); + } + + public static ResourceKey registerKey(String pName) { + return ResourceKey.create(Registries.PLACED_FEATURE, new ResourceLocation(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 new file mode 100644 index 00000000..0efbcdb4 --- /dev/null +++ b/src/main/java/com/luxtracon/floralis/data/loot/FloralisBlockLoot.java @@ -0,0 +1,231 @@ +package com.luxtracon.floralis.data.loot; + +import com.luxtracon.floralis.registry.FloralisBlockStateProperties; +import com.luxtracon.floralis.registry.FloralisBlocks; +import com.luxtracon.floralis.registry.FloralisItems; + +import net.minecraft.MethodsReturnNonnullByDefault; +import net.minecraft.advancements.critereon.*; +import net.minecraft.data.loot.BlockLootSubProvider; +import net.minecraft.world.flag.FeatureFlags; +import net.minecraft.world.item.Item; +import net.minecraft.world.item.Items; +import net.minecraft.world.item.enchantment.Enchantments; +import net.minecraft.world.level.block.Block; +import net.minecraft.world.level.block.Blocks; +import net.minecraft.world.level.storage.loot.LootPool; +import net.minecraft.world.level.storage.loot.LootTable; +import net.minecraft.world.level.storage.loot.entries.LootItem; +import net.minecraft.world.level.storage.loot.functions.ApplyBonusCount; +import net.minecraft.world.level.storage.loot.functions.SetItemCountFunction; +import net.minecraft.world.level.storage.loot.predicates.LootItemBlockStatePropertyCondition; +import net.minecraft.world.level.storage.loot.predicates.LootItemCondition; +import net.minecraft.world.level.storage.loot.predicates.MatchTool; +import net.minecraft.world.level.storage.loot.providers.number.ConstantValue; + +import net.neoforged.neoforge.registries.DeferredHolder; + +import java.util.List; +import java.util.Set; +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()); + } + + @Override + public void generate() { + this.dropThis(FloralisBlocks.WHITE_DYE_BLOCK.get()); + this.dropThis(FloralisBlocks.LIGHT_GRAY_DYE_BLOCK.get()); + this.dropThis(FloralisBlocks.GRAY_DYE_BLOCK.get()); + this.dropThis(FloralisBlocks.BLACK_DYE_BLOCK.get()); + this.dropThis(FloralisBlocks.BROWN_DYE_BLOCK.get()); + this.dropThis(FloralisBlocks.RED_DYE_BLOCK.get()); + this.dropThis(FloralisBlocks.ORANGE_DYE_BLOCK.get()); + this.dropThis(FloralisBlocks.YELLOW_DYE_BLOCK.get()); + this.dropThis(FloralisBlocks.LIME_DYE_BLOCK.get()); + this.dropThis(FloralisBlocks.GREEN_DYE_BLOCK.get()); + this.dropThis(FloralisBlocks.CYAN_DYE_BLOCK.get()); + this.dropThis(FloralisBlocks.LIGHT_BLUE_DYE_BLOCK.get()); + this.dropThis(FloralisBlocks.BLUE_DYE_BLOCK.get()); + this.dropThis(FloralisBlocks.PURPLE_DYE_BLOCK.get()); + this.dropThis(FloralisBlocks.MAGENTA_DYE_BLOCK.get()); + this.dropThis(FloralisBlocks.PINK_DYE_BLOCK.get()); + + this.dropThis(FloralisBlocks.PLANT_FIBERS_BLOCK.get()); + + this.dropSeed(FloralisBlocks.WHITE_FLOWER.get(), FloralisItems.WHITE_FLOWER_SEEDS.get(), FloralisItems.WHITE_PETALS.get()); + this.dropSeed(FloralisBlocks.LIGHT_GRAY_FLOWER.get(), FloralisItems.LIGHT_GRAY_FLOWER_SEEDS.get(), FloralisItems.LIGHT_GRAY_PETALS.get()); + this.dropSeed(FloralisBlocks.GRAY_FLOWER.get(), FloralisItems.GRAY_FLOWER_SEEDS.get(), FloralisItems.GRAY_PETALS.get()); + this.dropSeed(FloralisBlocks.BLACK_FLOWER.get(), FloralisItems.BLACK_FLOWER_SEEDS.get(), FloralisItems.BLACK_PETALS.get()); + this.dropSeed(FloralisBlocks.BROWN_FLOWER.get(), FloralisItems.BROWN_FLOWER_SEEDS.get(), FloralisItems.BROWN_PETALS.get()); + this.dropSeed(FloralisBlocks.RED_FLOWER.get(), FloralisItems.RED_FLOWER_SEEDS.get(), FloralisItems.RED_PETALS.get()); + this.dropSeed(FloralisBlocks.ORANGE_FLOWER.get(), FloralisItems.ORANGE_FLOWER_SEEDS.get(), FloralisItems.ORANGE_PETALS.get()); + this.dropSeed(FloralisBlocks.YELLOW_FLOWER.get(), FloralisItems.YELLOW_FLOWER_SEEDS.get(), FloralisItems.YELLOW_PETALS.get()); + this.dropSeed(FloralisBlocks.LIME_FLOWER.get(), FloralisItems.LIME_FLOWER_SEEDS.get(), FloralisItems.LIME_PETALS.get()); + this.dropSeed(FloralisBlocks.GREEN_FLOWER.get(), FloralisItems.GREEN_FLOWER_SEEDS.get(), FloralisItems.GREEN_PETALS.get()); + this.dropSeed(FloralisBlocks.CYAN_FLOWER.get(), FloralisItems.CYAN_FLOWER_SEEDS.get(), FloralisItems.CYAN_PETALS.get()); + this.dropSeed(FloralisBlocks.LIGHT_BLUE_FLOWER.get(), FloralisItems.LIGHT_BLUE_FLOWER_SEEDS.get(), FloralisItems.LIGHT_BLUE_PETALS.get()); + this.dropSeed(FloralisBlocks.BLUE_FLOWER.get(), FloralisItems.BLUE_FLOWER_SEEDS.get(), FloralisItems.BLUE_PETALS.get()); + this.dropSeed(FloralisBlocks.PURPLE_FLOWER.get(), FloralisItems.PURPLE_FLOWER_SEEDS.get(), FloralisItems.PURPLE_PETALS.get()); + this.dropSeed(FloralisBlocks.MAGENTA_FLOWER.get(), FloralisItems.MAGENTA_FLOWER_SEEDS.get(), FloralisItems.MAGENTA_PETALS.get()); + this.dropSeed(FloralisBlocks.PINK_FLOWER.get(), FloralisItems.PINK_FLOWER_SEEDS.get(), FloralisItems.PINK_PETALS.get()); + + this.dropSeed(FloralisBlocks.WHITE_CACTUS.get(), FloralisItems.WHITE_CACTUS_SEEDS.get(), FloralisItems.WHITE_PETALS.get()); + this.dropSeed(FloralisBlocks.LIGHT_GRAY_CACTUS.get(), FloralisItems.LIGHT_GRAY_CACTUS_SEEDS.get(), FloralisItems.LIGHT_GRAY_PETALS.get()); + this.dropSeed(FloralisBlocks.GRAY_CACTUS.get(), FloralisItems.GRAY_CACTUS_SEEDS.get(), FloralisItems.GRAY_PETALS.get()); + this.dropSeed(FloralisBlocks.BLACK_CACTUS.get(), FloralisItems.BLACK_CACTUS_SEEDS.get(), FloralisItems.BLACK_PETALS.get()); + this.dropSeed(FloralisBlocks.BROWN_CACTUS.get(), FloralisItems.BROWN_CACTUS_SEEDS.get(), FloralisItems.BROWN_PETALS.get()); + this.dropSeed(FloralisBlocks.RED_CACTUS.get(), FloralisItems.RED_CACTUS_SEEDS.get(), FloralisItems.RED_PETALS.get()); + this.dropSeed(FloralisBlocks.ORANGE_CACTUS.get(), FloralisItems.ORANGE_CACTUS_SEEDS.get(), FloralisItems.ORANGE_PETALS.get()); + this.dropSeed(FloralisBlocks.YELLOW_CACTUS.get(), FloralisItems.YELLOW_CACTUS_SEEDS.get(), FloralisItems.YELLOW_PETALS.get()); + this.dropSeed(FloralisBlocks.LIME_CACTUS.get(), FloralisItems.LIME_CACTUS_SEEDS.get(), FloralisItems.LIME_PETALS.get()); + this.dropSeed(FloralisBlocks.GREEN_CACTUS.get(), FloralisItems.GREEN_CACTUS_SEEDS.get(), FloralisItems.GREEN_PETALS.get()); + this.dropSeed(FloralisBlocks.CYAN_CACTUS.get(), FloralisItems.CYAN_CACTUS_SEEDS.get(), FloralisItems.CYAN_PETALS.get()); + this.dropSeed(FloralisBlocks.LIGHT_BLUE_CACTUS.get(), FloralisItems.LIGHT_BLUE_CACTUS_SEEDS.get(), FloralisItems.LIGHT_BLUE_PETALS.get()); + this.dropSeed(FloralisBlocks.BLUE_CACTUS.get(), FloralisItems.BLUE_CACTUS_SEEDS.get(), FloralisItems.BLUE_PETALS.get()); + this.dropSeed(FloralisBlocks.PURPLE_CACTUS.get(), FloralisItems.PURPLE_CACTUS_SEEDS.get(), FloralisItems.PURPLE_PETALS.get()); + this.dropSeed(FloralisBlocks.MAGENTA_CACTUS.get(), FloralisItems.MAGENTA_CACTUS_SEEDS.get(), FloralisItems.MAGENTA_PETALS.get()); + this.dropSeed(FloralisBlocks.PINK_CACTUS.get(), FloralisItems.PINK_CACTUS_SEEDS.get(), FloralisItems.PINK_PETALS.get()); + + this.dropCrop(FloralisBlocks.WHITE_FLOWER_CROP.get(), FloralisItems.WHITE_FLOWER.get(), FloralisItems.WHITE_FLOWER_SEEDS.get(), FloralisItems.WHITE_PETALS.get()); + this.dropCrop(FloralisBlocks.LIGHT_GRAY_FLOWER_CROP.get(), FloralisItems.LIGHT_GRAY_FLOWER.get(), FloralisItems.LIGHT_GRAY_FLOWER_SEEDS.get(), FloralisItems.LIGHT_GRAY_PETALS.get()); + this.dropCrop(FloralisBlocks.GRAY_FLOWER_CROP.get(), FloralisItems.GRAY_FLOWER.get(), FloralisItems.GRAY_FLOWER_SEEDS.get(), FloralisItems.GRAY_PETALS.get()); + this.dropCrop(FloralisBlocks.BLACK_FLOWER_CROP.get(), FloralisItems.BLACK_FLOWER.get(), FloralisItems.BLACK_FLOWER_SEEDS.get(), FloralisItems.BLACK_PETALS.get()); + this.dropCrop(FloralisBlocks.BROWN_FLOWER_CROP.get(), FloralisItems.BROWN_FLOWER.get(), FloralisItems.BROWN_FLOWER_SEEDS.get(), FloralisItems.BROWN_PETALS.get()); + this.dropCrop(FloralisBlocks.RED_FLOWER_CROP.get(), FloralisItems.RED_FLOWER.get(), FloralisItems.RED_FLOWER_SEEDS.get(), FloralisItems.RED_PETALS.get()); + this.dropCrop(FloralisBlocks.ORANGE_FLOWER_CROP.get(), FloralisItems.ORANGE_FLOWER.get(), FloralisItems.ORANGE_FLOWER_SEEDS.get(), FloralisItems.ORANGE_PETALS.get()); + this.dropCrop(FloralisBlocks.YELLOW_FLOWER_CROP.get(), FloralisItems.YELLOW_FLOWER.get(), FloralisItems.YELLOW_FLOWER_SEEDS.get(), FloralisItems.YELLOW_PETALS.get()); + this.dropCrop(FloralisBlocks.LIME_FLOWER_CROP.get(), FloralisItems.LIME_FLOWER.get(), FloralisItems.LIME_FLOWER_SEEDS.get(), FloralisItems.LIME_PETALS.get()); + this.dropCrop(FloralisBlocks.GREEN_FLOWER_CROP.get(), FloralisItems.GREEN_FLOWER.get(), FloralisItems.GREEN_FLOWER_SEEDS.get(), FloralisItems.GREEN_PETALS.get()); + this.dropCrop(FloralisBlocks.CYAN_FLOWER_CROP.get(), FloralisItems.CYAN_FLOWER.get(), FloralisItems.CYAN_FLOWER_SEEDS.get(), FloralisItems.CYAN_PETALS.get()); + this.dropCrop(FloralisBlocks.LIGHT_BLUE_FLOWER_CROP.get(), FloralisItems.LIGHT_BLUE_FLOWER.get(), FloralisItems.LIGHT_BLUE_FLOWER_SEEDS.get(), FloralisItems.LIGHT_BLUE_PETALS.get()); + this.dropCrop(FloralisBlocks.BLUE_FLOWER_CROP.get(), FloralisItems.BLUE_FLOWER.get(), FloralisItems.BLUE_FLOWER_SEEDS.get(), FloralisItems.BLUE_PETALS.get()); + this.dropCrop(FloralisBlocks.PURPLE_FLOWER_CROP.get(), FloralisItems.PURPLE_FLOWER.get(), FloralisItems.PURPLE_FLOWER_SEEDS.get(), FloralisItems.PURPLE_PETALS.get()); + this.dropCrop(FloralisBlocks.MAGENTA_FLOWER_CROP.get(), FloralisItems.MAGENTA_FLOWER.get(), FloralisItems.MAGENTA_FLOWER_SEEDS.get(), FloralisItems.MAGENTA_PETALS.get()); + this.dropCrop(FloralisBlocks.PINK_FLOWER_CROP.get(), FloralisItems.PINK_FLOWER.get(), FloralisItems.PINK_FLOWER_SEEDS.get(), FloralisItems.PINK_PETALS.get()); + + this.dropCrop(FloralisBlocks.WHITE_CACTUS_CROP.get(), FloralisItems.WHITE_CACTUS.get(), FloralisItems.WHITE_CACTUS_SEEDS.get(), FloralisItems.WHITE_PETALS.get()); + this.dropCrop(FloralisBlocks.LIGHT_GRAY_CACTUS_CROP.get(), FloralisItems.LIGHT_GRAY_CACTUS.get(), FloralisItems.LIGHT_GRAY_CACTUS_SEEDS.get(), FloralisItems.LIGHT_GRAY_PETALS.get()); + this.dropCrop(FloralisBlocks.GRAY_CACTUS_CROP.get(), FloralisItems.GRAY_CACTUS.get(), FloralisItems.GRAY_CACTUS_SEEDS.get(), FloralisItems.GRAY_PETALS.get()); + this.dropCrop(FloralisBlocks.BLACK_CACTUS_CROP.get(), FloralisItems.BLACK_CACTUS.get(), FloralisItems.BLACK_CACTUS_SEEDS.get(), FloralisItems.BLACK_PETALS.get()); + this.dropCrop(FloralisBlocks.BROWN_CACTUS_CROP.get(), FloralisItems.BROWN_CACTUS.get(), FloralisItems.BROWN_CACTUS_SEEDS.get(), FloralisItems.BROWN_PETALS.get()); + this.dropCrop(FloralisBlocks.RED_CACTUS_CROP.get(), FloralisItems.RED_CACTUS.get(), FloralisItems.RED_CACTUS_SEEDS.get(), FloralisItems.RED_PETALS.get()); + this.dropCrop(FloralisBlocks.ORANGE_CACTUS_CROP.get(), FloralisItems.ORANGE_CACTUS.get(), FloralisItems.ORANGE_CACTUS_SEEDS.get(), FloralisItems.ORANGE_PETALS.get()); + this.dropCrop(FloralisBlocks.YELLOW_CACTUS_CROP.get(), FloralisItems.YELLOW_CACTUS.get(), FloralisItems.YELLOW_CACTUS_SEEDS.get(), FloralisItems.YELLOW_PETALS.get()); + this.dropCrop(FloralisBlocks.LIME_CACTUS_CROP.get(), FloralisItems.LIME_CACTUS.get(), FloralisItems.LIME_CACTUS_SEEDS.get(), FloralisItems.LIME_PETALS.get()); + this.dropCrop(FloralisBlocks.GREEN_CACTUS_CROP.get(), FloralisItems.GREEN_CACTUS.get(), FloralisItems.GREEN_CACTUS_SEEDS.get(), FloralisItems.GREEN_PETALS.get()); + this.dropCrop(FloralisBlocks.CYAN_CACTUS_CROP.get(), FloralisItems.CYAN_CACTUS.get(), FloralisItems.CYAN_CACTUS_SEEDS.get(), FloralisItems.CYAN_PETALS.get()); + this.dropCrop(FloralisBlocks.LIGHT_BLUE_CACTUS_CROP.get(), FloralisItems.LIGHT_BLUE_CACTUS.get(), FloralisItems.LIGHT_BLUE_CACTUS_SEEDS.get(), FloralisItems.LIGHT_BLUE_PETALS.get()); + this.dropCrop(FloralisBlocks.BLUE_CACTUS_CROP.get(), FloralisItems.BLUE_CACTUS.get(), FloralisItems.BLUE_CACTUS_SEEDS.get(), FloralisItems.BLUE_PETALS.get()); + this.dropCrop(FloralisBlocks.PURPLE_CACTUS_CROP.get(), FloralisItems.PURPLE_CACTUS.get(), FloralisItems.PURPLE_CACTUS_SEEDS.get(), FloralisItems.PURPLE_PETALS.get()); + this.dropCrop(FloralisBlocks.MAGENTA_CACTUS_CROP.get(), FloralisItems.MAGENTA_CACTUS.get(), FloralisItems.MAGENTA_CACTUS_SEEDS.get(), FloralisItems.MAGENTA_PETALS.get()); + this.dropCrop(FloralisBlocks.PINK_CACTUS_CROP.get(), FloralisItems.PINK_CACTUS.get(), FloralisItems.PINK_CACTUS_SEEDS.get(), FloralisItems.PINK_PETALS.get()); + + this.dropPots(FloralisBlocks.POTTED_WHITE_FLOWER.get(), FloralisItems.WHITE_FLOWER.get()); + this.dropPots(FloralisBlocks.POTTED_LIGHT_GRAY_FLOWER.get(), FloralisItems.LIGHT_GRAY_FLOWER.get()); + this.dropPots(FloralisBlocks.POTTED_GRAY_FLOWER.get(), FloralisItems.GRAY_FLOWER.get()); + this.dropPots(FloralisBlocks.POTTED_BLACK_FLOWER.get(), FloralisItems.BLACK_FLOWER.get()); + this.dropPots(FloralisBlocks.POTTED_BROWN_FLOWER.get(), FloralisItems.BROWN_FLOWER.get()); + this.dropPots(FloralisBlocks.POTTED_RED_FLOWER.get(), FloralisItems.RED_FLOWER.get()); + this.dropPots(FloralisBlocks.POTTED_ORANGE_FLOWER.get(), FloralisItems.ORANGE_FLOWER.get()); + this.dropPots(FloralisBlocks.POTTED_YELLOW_FLOWER.get(), FloralisItems.YELLOW_FLOWER.get()); + this.dropPots(FloralisBlocks.POTTED_LIME_FLOWER.get(), FloralisItems.LIME_FLOWER.get()); + this.dropPots(FloralisBlocks.POTTED_GREEN_FLOWER.get(), FloralisItems.GREEN_FLOWER.get()); + this.dropPots(FloralisBlocks.POTTED_CYAN_FLOWER.get(), FloralisItems.CYAN_FLOWER.get()); + this.dropPots(FloralisBlocks.POTTED_LIGHT_BLUE_FLOWER.get(), FloralisItems.LIGHT_BLUE_FLOWER.get()); + this.dropPots(FloralisBlocks.POTTED_BLUE_FLOWER.get(), FloralisItems.BLUE_FLOWER.get()); + this.dropPots(FloralisBlocks.POTTED_PURPLE_FLOWER.get(), FloralisItems.PURPLE_FLOWER.get()); + this.dropPots(FloralisBlocks.POTTED_MAGENTA_FLOWER.get(), FloralisItems.MAGENTA_FLOWER.get()); + this.dropPots(FloralisBlocks.POTTED_PINK_FLOWER.get(), FloralisItems.PINK_FLOWER.get()); + + this.dropPots(FloralisBlocks.POTTED_WHITE_CACTUS.get(), FloralisItems.WHITE_CACTUS.get()); + this.dropPots(FloralisBlocks.POTTED_LIGHT_GRAY_CACTUS.get(), FloralisItems.LIGHT_GRAY_CACTUS.get()); + this.dropPots(FloralisBlocks.POTTED_GRAY_CACTUS.get(), FloralisItems.GRAY_CACTUS.get()); + this.dropPots(FloralisBlocks.POTTED_BLACK_CACTUS.get(), FloralisItems.BLACK_CACTUS.get()); + this.dropPots(FloralisBlocks.POTTED_BROWN_CACTUS.get(), FloralisItems.BROWN_CACTUS.get()); + this.dropPots(FloralisBlocks.POTTED_RED_CACTUS.get(), FloralisItems.RED_CACTUS.get()); + this.dropPots(FloralisBlocks.POTTED_ORANGE_CACTUS.get(), FloralisItems.ORANGE_CACTUS.get()); + this.dropPots(FloralisBlocks.POTTED_YELLOW_CACTUS.get(), FloralisItems.YELLOW_CACTUS.get()); + this.dropPots(FloralisBlocks.POTTED_LIME_CACTUS.get(), FloralisItems.LIME_CACTUS.get()); + this.dropPots(FloralisBlocks.POTTED_GREEN_CACTUS.get(), FloralisItems.GREEN_CACTUS.get()); + this.dropPots(FloralisBlocks.POTTED_CYAN_CACTUS.get(), FloralisItems.CYAN_CACTUS.get()); + this.dropPots(FloralisBlocks.POTTED_LIGHT_BLUE_CACTUS.get(), FloralisItems.LIGHT_BLUE_CACTUS.get()); + this.dropPots(FloralisBlocks.POTTED_BLUE_CACTUS.get(), FloralisItems.BLUE_CACTUS.get()); + this.dropPots(FloralisBlocks.POTTED_PURPLE_CACTUS.get(), FloralisItems.PURPLE_CACTUS.get()); + this.dropPots(FloralisBlocks.POTTED_MAGENTA_CACTUS.get(), FloralisItems.MAGENTA_CACTUS.get()); + this.dropPots(FloralisBlocks.POTTED_PINK_CACTUS.get(), FloralisItems.PINK_CACTUS.get()); + + this.dropNone(FloralisBlocks.CLOCHED_WHITE_FLOWER_CROP.get()); + this.dropNone(FloralisBlocks.CLOCHED_LIGHT_GRAY_FLOWER_CROP.get()); + this.dropNone(FloralisBlocks.CLOCHED_GRAY_FLOWER_CROP.get()); + this.dropNone(FloralisBlocks.CLOCHED_BLACK_FLOWER_CROP.get()); + this.dropNone(FloralisBlocks.CLOCHED_BROWN_FLOWER_CROP.get()); + this.dropNone(FloralisBlocks.CLOCHED_RED_FLOWER_CROP.get()); + this.dropNone(FloralisBlocks.CLOCHED_ORANGE_FLOWER_CROP.get()); + this.dropNone(FloralisBlocks.CLOCHED_YELLOW_FLOWER_CROP.get()); + this.dropNone(FloralisBlocks.CLOCHED_LIME_FLOWER_CROP.get()); + this.dropNone(FloralisBlocks.CLOCHED_GREEN_FLOWER_CROP.get()); + this.dropNone(FloralisBlocks.CLOCHED_CYAN_FLOWER_CROP.get()); + this.dropNone(FloralisBlocks.CLOCHED_LIGHT_BLUE_FLOWER_CROP.get()); + this.dropNone(FloralisBlocks.CLOCHED_BLUE_FLOWER_CROP.get()); + this.dropNone(FloralisBlocks.CLOCHED_PURPLE_FLOWER_CROP.get()); + this.dropNone(FloralisBlocks.CLOCHED_MAGENTA_FLOWER_CROP.get()); + this.dropNone(FloralisBlocks.CLOCHED_PINK_FLOWER_CROP.get()); + + this.dropNone(FloralisBlocks.CLOCHED_WHITE_CACTUS_CROP.get()); + this.dropNone(FloralisBlocks.CLOCHED_LIGHT_GRAY_CACTUS_CROP.get()); + this.dropNone(FloralisBlocks.CLOCHED_GRAY_CACTUS_CROP.get()); + this.dropNone(FloralisBlocks.CLOCHED_BLACK_CACTUS_CROP.get()); + this.dropNone(FloralisBlocks.CLOCHED_BROWN_CACTUS_CROP.get()); + this.dropNone(FloralisBlocks.CLOCHED_RED_CACTUS_CROP.get()); + this.dropNone(FloralisBlocks.CLOCHED_ORANGE_CACTUS_CROP.get()); + this.dropNone(FloralisBlocks.CLOCHED_YELLOW_CACTUS_CROP.get()); + this.dropNone(FloralisBlocks.CLOCHED_LIME_CACTUS_CROP.get()); + this.dropNone(FloralisBlocks.CLOCHED_GREEN_CACTUS_CROP.get()); + this.dropNone(FloralisBlocks.CLOCHED_CYAN_CACTUS_CROP.get()); + this.dropNone(FloralisBlocks.CLOCHED_LIGHT_BLUE_CACTUS_CROP.get()); + this.dropNone(FloralisBlocks.CLOCHED_BLUE_CACTUS_CROP.get()); + this.dropNone(FloralisBlocks.CLOCHED_PURPLE_CACTUS_CROP.get()); + this.dropNone(FloralisBlocks.CLOCHED_MAGENTA_CACTUS_CROP.get()); + this.dropNone(FloralisBlocks.CLOCHED_PINK_CACTUS_CROP.get()); + } + + public void dropThis(Block pBlock) { + this.add(pBlock, LootTable.lootTable().withPool(LootPool.lootPool().add(LootItem.lootTableItem(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))))); + } + + 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())))); + } + + public void dropPots(Block pBlock, Item pItem) { + this.add(pBlock, LootTable.lootTable().withPool(LootPool.lootPool().add(LootItem.lootTableItem(pItem))).withPool(LootPool.lootPool().add(LootItem.lootTableItem(Blocks.FLOWER_POT)))); + } + + public void dropNone(Block pBlock) { + this.add(pBlock, LootTable.lootTable()); + } + + @Override + public Iterable getKnownBlocks() { + return FloralisBlocks.BLOCKS.getEntries().stream().map(DeferredHolder::value).collect(Collectors.toList()); + } +} diff --git a/src/main/java/com/luxtracon/floralis/data/loot/FloralisLoot.java b/src/main/java/com/luxtracon/floralis/data/loot/FloralisLoot.java new file mode 100644 index 00000000..ed0ca1b2 --- /dev/null +++ b/src/main/java/com/luxtracon/floralis/data/loot/FloralisLoot.java @@ -0,0 +1,16 @@ +package com.luxtracon.floralis.data.loot; + +import net.minecraft.core.HolderLookup; +import net.minecraft.data.PackOutput; +import net.minecraft.data.loot.LootTableProvider; +import net.minecraft.world.level.storage.loot.parameters.LootContextParamSets; + +import java.util.List; +import java.util.Set; +import java.util.concurrent.CompletableFuture; + +public class FloralisLoot extends LootTableProvider { + public FloralisLoot(PackOutput pOutput, CompletableFuture pProvider) { + super(pOutput, Set.of(), List.of(new LootTableProvider.SubProviderEntry(FloralisBlockLoot::new, LootContextParamSets.BLOCK)), pProvider); + } +} diff --git a/src/main/java/com/luxtracon/floralis/data/tags/FloralisBiomeTags.java b/src/main/java/com/luxtracon/floralis/data/tags/FloralisBiomeTags.java new file mode 100644 index 00000000..6190411f --- /dev/null +++ b/src/main/java/com/luxtracon/floralis/data/tags/FloralisBiomeTags.java @@ -0,0 +1,60 @@ +package com.luxtracon.floralis.data.tags; + +import com.luxtracon.floralis.registry.FloralisConstants; + +import net.minecraft.MethodsReturnNonnullByDefault; +import net.minecraft.core.HolderLookup; +import net.minecraft.core.registries.Registries; +import net.minecraft.data.PackOutput; +import net.minecraft.data.tags.BiomeTagsProvider; +import net.minecraft.resources.ResourceLocation; +import net.minecraft.tags.TagKey; +import net.minecraft.world.level.biome.Biome; +import net.minecraft.world.level.biome.Biomes; + +import net.neoforged.neoforge.common.data.ExistingFileHelper; + +import java.util.concurrent.CompletableFuture; + +import javax.annotation.ParametersAreNonnullByDefault; + +@SuppressWarnings("unused") +@MethodsReturnNonnullByDefault +@ParametersAreNonnullByDefault + +public class FloralisBiomeTags extends BiomeTagsProvider { + public static final TagKey HAS_CACTUS = FloralisBiomeTags.floralisTag("has_cactus"); + + public FloralisBiomeTags(PackOutput pOutput, CompletableFuture pProvider, String pId, ExistingFileHelper pHelper) { + super(pOutput, pProvider, pId, pHelper); + } + + @Override + public void addTags(HolderLookup.Provider pProvider) { + this.tag(FloralisBiomeTags.HAS_CACTUS) + .add(Biomes.BADLANDS) + .add(Biomes.ERODED_BADLANDS) + .add(Biomes.WOODED_BADLANDS) + .add(Biomes.DESERT); + } + + public static TagKey bind(String pName) { + return TagKey.create(Registries.BIOME, new ResourceLocation(pName)); + } + + public static TagKey cTag(String pName) { + return FloralisBiomeTags.bind(FloralisConstants.C + ":" + pName); + } + + public static TagKey floralisTag(String pName) { + return FloralisBiomeTags.bind(FloralisConstants.FLORALIS + ":" + pName); + } + + public static TagKey neoforgeTag(String pName) { + return FloralisBiomeTags.bind(FloralisConstants.NEOFORGE + ":" + pName); + } + + public static TagKey industrialforegoingTag(String pName) { + return FloralisBiomeTags.bind(FloralisConstants.INDUSTRIALFOREGOING + ":" + 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 new file mode 100644 index 00000000..83fd3002 --- /dev/null +++ b/src/main/java/com/luxtracon/floralis/data/tags/FloralisBlockTags.java @@ -0,0 +1,196 @@ +package com.luxtracon.floralis.data.tags; + +import com.luxtracon.floralis.registry.FloralisBlocks; +import com.luxtracon.floralis.registry.FloralisConstants; + +import net.minecraft.MethodsReturnNonnullByDefault; +import net.minecraft.core.HolderLookup; +import net.minecraft.core.registries.Registries; +import net.minecraft.data.PackOutput; +import net.minecraft.resources.ResourceLocation; +import net.minecraft.tags.BlockTags; +import net.minecraft.tags.TagKey; +import net.minecraft.world.level.block.Block; + +import net.neoforged.neoforge.common.Tags; +import net.neoforged.neoforge.common.data.BlockTagsProvider; +import net.neoforged.neoforge.common.data.ExistingFileHelper; + +import java.util.concurrent.CompletableFuture; + +import javax.annotation.ParametersAreNonnullByDefault; + +@SuppressWarnings("unused") +@MethodsReturnNonnullByDefault +@ParametersAreNonnullByDefault + +public class FloralisBlockTags extends BlockTagsProvider { + public FloralisBlockTags(PackOutput output, CompletableFuture lookupProvider, String modId, ExistingFileHelper existingFileHelper) { + super(output, lookupProvider, modId, existingFileHelper); + } + + @Override + protected void addTags(HolderLookup.Provider pProvider) { + this.tag(BlockTags.MINEABLE_WITH_SHOVEL) + .add(FloralisBlocks.WHITE_DYE_BLOCK.get()) + .add(FloralisBlocks.LIGHT_GRAY_DYE_BLOCK.get()) + .add(FloralisBlocks.GRAY_DYE_BLOCK.get()) + .add(FloralisBlocks.BLACK_DYE_BLOCK.get()) + .add(FloralisBlocks.BROWN_DYE_BLOCK.get()) + .add(FloralisBlocks.RED_DYE_BLOCK.get()) + .add(FloralisBlocks.ORANGE_DYE_BLOCK.get()) + .add(FloralisBlocks.YELLOW_DYE_BLOCK.get()) + .add(FloralisBlocks.LIME_DYE_BLOCK.get()) + .add(FloralisBlocks.GREEN_DYE_BLOCK.get()) + .add(FloralisBlocks.CYAN_DYE_BLOCK.get()) + .add(FloralisBlocks.LIGHT_BLUE_DYE_BLOCK.get()) + .add(FloralisBlocks.BLUE_DYE_BLOCK.get()) + .add(FloralisBlocks.PURPLE_DYE_BLOCK.get()) + .add(FloralisBlocks.MAGENTA_DYE_BLOCK.get()) + .add(FloralisBlocks.PINK_DYE_BLOCK.get()); + + this.tag(Tags.Blocks.STORAGE_BLOCKS) + .add(FloralisBlocks.WHITE_DYE_BLOCK.get()) + .add(FloralisBlocks.LIGHT_GRAY_DYE_BLOCK.get()) + .add(FloralisBlocks.GRAY_DYE_BLOCK.get()) + .add(FloralisBlocks.BLACK_DYE_BLOCK.get()) + .add(FloralisBlocks.BROWN_DYE_BLOCK.get()) + .add(FloralisBlocks.RED_DYE_BLOCK.get()) + .add(FloralisBlocks.ORANGE_DYE_BLOCK.get()) + .add(FloralisBlocks.YELLOW_DYE_BLOCK.get()) + .add(FloralisBlocks.LIME_DYE_BLOCK.get()) + .add(FloralisBlocks.GREEN_DYE_BLOCK.get()) + .add(FloralisBlocks.CYAN_DYE_BLOCK.get()) + .add(FloralisBlocks.LIGHT_BLUE_DYE_BLOCK.get()) + .add(FloralisBlocks.BLUE_DYE_BLOCK.get()) + .add(FloralisBlocks.PURPLE_DYE_BLOCK.get()) + .add(FloralisBlocks.MAGENTA_DYE_BLOCK.get()) + .add(FloralisBlocks.PINK_DYE_BLOCK.get()) + .add(FloralisBlocks.PLANT_FIBERS_BLOCK.get()); + + this.tag(BlockTags.MINEABLE_WITH_HOE) + .add(FloralisBlocks.PLANT_FIBERS_BLOCK.get()); + + this.tag(BlockTags.SMALL_FLOWERS) + .add(FloralisBlocks.WHITE_FLOWER.get()) + .add(FloralisBlocks.LIGHT_GRAY_FLOWER.get()) + .add(FloralisBlocks.GRAY_FLOWER.get()) + .add(FloralisBlocks.BLACK_FLOWER.get()) + .add(FloralisBlocks.BROWN_FLOWER.get()) + .add(FloralisBlocks.RED_FLOWER.get()) + .add(FloralisBlocks.ORANGE_FLOWER.get()) + .add(FloralisBlocks.YELLOW_FLOWER.get()) + .add(FloralisBlocks.LIME_FLOWER.get()) + .add(FloralisBlocks.GREEN_FLOWER.get()) + .add(FloralisBlocks.CYAN_FLOWER.get()) + .add(FloralisBlocks.LIGHT_BLUE_FLOWER.get()) + .add(FloralisBlocks.BLUE_FLOWER.get()) + .add(FloralisBlocks.PURPLE_FLOWER.get()) + .add(FloralisBlocks.MAGENTA_FLOWER.get()) + .add(FloralisBlocks.PINK_FLOWER.get()) + .add(FloralisBlocks.WHITE_CACTUS.get()) + .add(FloralisBlocks.LIGHT_GRAY_CACTUS.get()) + .add(FloralisBlocks.GRAY_CACTUS.get()) + .add(FloralisBlocks.BLACK_CACTUS.get()) + .add(FloralisBlocks.BROWN_CACTUS.get()) + .add(FloralisBlocks.RED_CACTUS.get()) + .add(FloralisBlocks.ORANGE_CACTUS.get()) + .add(FloralisBlocks.YELLOW_CACTUS.get()) + .add(FloralisBlocks.LIME_CACTUS.get()) + .add(FloralisBlocks.GREEN_CACTUS.get()) + .add(FloralisBlocks.CYAN_CACTUS.get()) + .add(FloralisBlocks.LIGHT_BLUE_CACTUS.get()) + .add(FloralisBlocks.BLUE_CACTUS.get()) + .add(FloralisBlocks.PURPLE_CACTUS.get()) + .add(FloralisBlocks.MAGENTA_CACTUS.get()) + .add(FloralisBlocks.PINK_CACTUS.get()); + + this.tag(BlockTags.CROPS) + .add(FloralisBlocks.WHITE_FLOWER_CROP.get()) + .add(FloralisBlocks.LIGHT_GRAY_FLOWER_CROP.get()) + .add(FloralisBlocks.GRAY_FLOWER_CROP.get()) + .add(FloralisBlocks.BLACK_FLOWER_CROP.get()) + .add(FloralisBlocks.BROWN_FLOWER_CROP.get()) + .add(FloralisBlocks.RED_FLOWER_CROP.get()) + .add(FloralisBlocks.ORANGE_FLOWER_CROP.get()) + .add(FloralisBlocks.YELLOW_FLOWER_CROP.get()) + .add(FloralisBlocks.LIME_FLOWER_CROP.get()) + .add(FloralisBlocks.GREEN_FLOWER_CROP.get()) + .add(FloralisBlocks.CYAN_FLOWER_CROP.get()) + .add(FloralisBlocks.LIGHT_BLUE_FLOWER_CROP.get()) + .add(FloralisBlocks.BLUE_FLOWER_CROP.get()) + .add(FloralisBlocks.PURPLE_FLOWER_CROP.get()) + .add(FloralisBlocks.MAGENTA_FLOWER_CROP.get()) + .add(FloralisBlocks.PINK_FLOWER_CROP.get()) + .add(FloralisBlocks.WHITE_CACTUS_CROP.get()) + .add(FloralisBlocks.LIGHT_GRAY_CACTUS_CROP.get()) + .add(FloralisBlocks.GRAY_CACTUS_CROP.get()) + .add(FloralisBlocks.BLACK_CACTUS_CROP.get()) + .add(FloralisBlocks.BROWN_CACTUS_CROP.get()) + .add(FloralisBlocks.RED_CACTUS_CROP.get()) + .add(FloralisBlocks.ORANGE_CACTUS_CROP.get()) + .add(FloralisBlocks.YELLOW_CACTUS_CROP.get()) + .add(FloralisBlocks.LIME_CACTUS_CROP.get()) + .add(FloralisBlocks.GREEN_CACTUS_CROP.get()) + .add(FloralisBlocks.CYAN_CACTUS_CROP.get()) + .add(FloralisBlocks.LIGHT_BLUE_CACTUS_CROP.get()) + .add(FloralisBlocks.BLUE_CACTUS_CROP.get()) + .add(FloralisBlocks.PURPLE_CACTUS_CROP.get()) + .add(FloralisBlocks.MAGENTA_CACTUS_CROP.get()) + .add(FloralisBlocks.PINK_CACTUS_CROP.get()); + + this.tag(BlockTags.FLOWER_POTS) + .add(FloralisBlocks.POTTED_WHITE_FLOWER.get()) + .add(FloralisBlocks.POTTED_LIGHT_GRAY_FLOWER.get()) + .add(FloralisBlocks.POTTED_GRAY_FLOWER.get()) + .add(FloralisBlocks.POTTED_BLACK_FLOWER.get()) + .add(FloralisBlocks.POTTED_BROWN_FLOWER.get()) + .add(FloralisBlocks.POTTED_RED_FLOWER.get()) + .add(FloralisBlocks.POTTED_ORANGE_FLOWER.get()) + .add(FloralisBlocks.POTTED_YELLOW_FLOWER.get()) + .add(FloralisBlocks.POTTED_LIME_FLOWER.get()) + .add(FloralisBlocks.POTTED_GREEN_FLOWER.get()) + .add(FloralisBlocks.POTTED_CYAN_FLOWER.get()) + .add(FloralisBlocks.POTTED_LIGHT_BLUE_FLOWER.get()) + .add(FloralisBlocks.POTTED_BLUE_FLOWER.get()) + .add(FloralisBlocks.POTTED_PURPLE_FLOWER.get()) + .add(FloralisBlocks.POTTED_MAGENTA_FLOWER.get()) + .add(FloralisBlocks.POTTED_PINK_FLOWER.get()) + .add(FloralisBlocks.POTTED_WHITE_CACTUS.get()) + .add(FloralisBlocks.POTTED_LIGHT_GRAY_CACTUS.get()) + .add(FloralisBlocks.POTTED_GRAY_CACTUS.get()) + .add(FloralisBlocks.POTTED_BLACK_CACTUS.get()) + .add(FloralisBlocks.POTTED_BROWN_CACTUS.get()) + .add(FloralisBlocks.POTTED_RED_CACTUS.get()) + .add(FloralisBlocks.POTTED_ORANGE_CACTUS.get()) + .add(FloralisBlocks.POTTED_YELLOW_CACTUS.get()) + .add(FloralisBlocks.POTTED_LIME_CACTUS.get()) + .add(FloralisBlocks.POTTED_GREEN_CACTUS.get()) + .add(FloralisBlocks.POTTED_CYAN_CACTUS.get()) + .add(FloralisBlocks.POTTED_LIGHT_BLUE_CACTUS.get()) + .add(FloralisBlocks.POTTED_BLUE_CACTUS.get()) + .add(FloralisBlocks.POTTED_PURPLE_CACTUS.get()) + .add(FloralisBlocks.POTTED_MAGENTA_CACTUS.get()) + .add(FloralisBlocks.POTTED_PINK_CACTUS.get()); + } + + public static TagKey bind(String pName) { + return TagKey.create(Registries.BLOCK, new ResourceLocation(pName)); + } + + public static TagKey cTag(String pName) { + return FloralisBlockTags.bind(FloralisConstants.C + ":" + pName); + } + + public static TagKey floralisTag(String pName) { + return FloralisBlockTags.bind(FloralisConstants.FLORALIS + ":" + pName); + } + + public static TagKey neoforgeTag(String pName) { + return FloralisBlockTags.bind(FloralisConstants.NEOFORGE + ":" + pName); + } + + public static TagKey industrialforegoingTag(String pName) { + return FloralisBlockTags.bind(FloralisConstants.INDUSTRIALFOREGOING + ":" + 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 new file mode 100644 index 00000000..1e743260 --- /dev/null +++ b/src/main/java/com/luxtracon/floralis/data/tags/FloralisItemTags.java @@ -0,0 +1,168 @@ +package com.luxtracon.floralis.data.tags; + +import com.luxtracon.floralis.registry.FloralisConstants; +import com.luxtracon.floralis.registry.FloralisItems; + +import net.minecraft.MethodsReturnNonnullByDefault; +import net.minecraft.core.HolderLookup; +import net.minecraft.core.registries.Registries; +import net.minecraft.data.PackOutput; +import net.minecraft.data.tags.ItemTagsProvider; +import net.minecraft.resources.ResourceLocation; +import net.minecraft.tags.ItemTags; +import net.minecraft.tags.TagKey; +import net.minecraft.world.item.Item; +import net.minecraft.world.level.block.Block; + +import net.neoforged.neoforge.common.Tags; +import net.neoforged.neoforge.common.data.ExistingFileHelper; + +import java.util.concurrent.CompletableFuture; + +import javax.annotation.ParametersAreNonnullByDefault; + +@SuppressWarnings("unused") +@MethodsReturnNonnullByDefault +@ParametersAreNonnullByDefault + +public class FloralisItemTags extends ItemTagsProvider { + public static final TagKey FERTILIZER = FloralisItemTags.cTag("fertilizer"); + + public static final TagKey BIOREACTOR = FloralisItemTags.industrialforegoingTag("bioreactor"); + + public FloralisItemTags(PackOutput pOutput, CompletableFuture pProvider, CompletableFuture> pTags, String pId, ExistingFileHelper pHelper) { + super(pOutput, pProvider, pTags, pId, pHelper); + } + + @Override + protected void addTags(HolderLookup.Provider pProvider) { + this.tag(Tags.Items.STORAGE_BLOCKS) + .add(FloralisItems.WHITE_DYE_BLOCK.get()) + .add(FloralisItems.LIGHT_GRAY_DYE_BLOCK.get()) + .add(FloralisItems.GRAY_DYE_BLOCK.get()) + .add(FloralisItems.BLACK_DYE_BLOCK.get()) + .add(FloralisItems.BROWN_DYE_BLOCK.get()) + .add(FloralisItems.RED_DYE_BLOCK.get()) + .add(FloralisItems.ORANGE_DYE_BLOCK.get()) + .add(FloralisItems.YELLOW_DYE_BLOCK.get()) + .add(FloralisItems.LIME_DYE_BLOCK.get()) + .add(FloralisItems.GREEN_DYE_BLOCK.get()) + .add(FloralisItems.CYAN_DYE_BLOCK.get()) + .add(FloralisItems.LIGHT_BLUE_DYE_BLOCK.get()) + .add(FloralisItems.BLUE_DYE_BLOCK.get()) + .add(FloralisItems.PURPLE_DYE_BLOCK.get()) + .add(FloralisItems.MAGENTA_DYE_BLOCK.get()) + .add(FloralisItems.PINK_DYE_BLOCK.get()) + .add(FloralisItems.PLANT_FIBERS_BLOCK.get()); + + this.tag(ItemTags.SMALL_FLOWERS) + .add(FloralisItems.WHITE_FLOWER.get()) + .add(FloralisItems.LIGHT_GRAY_FLOWER.get()) + .add(FloralisItems.GRAY_FLOWER.get()) + .add(FloralisItems.BLACK_FLOWER.get()) + .add(FloralisItems.BROWN_FLOWER.get()) + .add(FloralisItems.RED_FLOWER.get()) + .add(FloralisItems.ORANGE_FLOWER.get()) + .add(FloralisItems.YELLOW_FLOWER.get()) + .add(FloralisItems.LIME_FLOWER.get()) + .add(FloralisItems.GREEN_FLOWER.get()) + .add(FloralisItems.CYAN_FLOWER.get()) + .add(FloralisItems.LIGHT_BLUE_FLOWER.get()) + .add(FloralisItems.BLUE_FLOWER.get()) + .add(FloralisItems.PURPLE_FLOWER.get()) + .add(FloralisItems.MAGENTA_FLOWER.get()) + .add(FloralisItems.PINK_FLOWER.get()) + .add(FloralisItems.WHITE_CACTUS.get()) + .add(FloralisItems.LIGHT_GRAY_CACTUS.get()) + .add(FloralisItems.GRAY_CACTUS.get()) + .add(FloralisItems.BLACK_CACTUS.get()) + .add(FloralisItems.BROWN_CACTUS.get()) + .add(FloralisItems.RED_CACTUS.get()) + .add(FloralisItems.ORANGE_CACTUS.get()) + .add(FloralisItems.YELLOW_CACTUS.get()) + .add(FloralisItems.LIME_CACTUS.get()) + .add(FloralisItems.GREEN_CACTUS.get()) + .add(FloralisItems.CYAN_CACTUS.get()) + .add(FloralisItems.LIGHT_BLUE_CACTUS.get()) + .add(FloralisItems.BLUE_CACTUS.get()) + .add(FloralisItems.PURPLE_CACTUS.get()) + .add(FloralisItems.MAGENTA_CACTUS.get()) + .add(FloralisItems.PINK_CACTUS.get()); + + this.tag(Tags.Items.SEEDS) + .add(FloralisItems.WHITE_FLOWER_SEEDS.get()) + .add(FloralisItems.LIGHT_GRAY_FLOWER_SEEDS.get()) + .add(FloralisItems.GRAY_FLOWER_SEEDS.get()) + .add(FloralisItems.BLACK_FLOWER_SEEDS.get()) + .add(FloralisItems.BROWN_FLOWER_SEEDS.get()) + .add(FloralisItems.RED_FLOWER_SEEDS.get()) + .add(FloralisItems.ORANGE_FLOWER_SEEDS.get()) + .add(FloralisItems.YELLOW_FLOWER_SEEDS.get()) + .add(FloralisItems.LIME_FLOWER_SEEDS.get()) + .add(FloralisItems.GREEN_FLOWER_SEEDS.get()) + .add(FloralisItems.CYAN_FLOWER_SEEDS.get()) + .add(FloralisItems.LIGHT_BLUE_FLOWER_SEEDS.get()) + .add(FloralisItems.BLUE_FLOWER_SEEDS.get()) + .add(FloralisItems.PURPLE_FLOWER_SEEDS.get()) + .add(FloralisItems.MAGENTA_FLOWER_SEEDS.get()) + .add(FloralisItems.PINK_FLOWER_SEEDS.get()) + .add(FloralisItems.WHITE_CACTUS_SEEDS.get()) + .add(FloralisItems.LIGHT_GRAY_CACTUS_SEEDS.get()) + .add(FloralisItems.GRAY_CACTUS_SEEDS.get()) + .add(FloralisItems.BLACK_CACTUS_SEEDS.get()) + .add(FloralisItems.BROWN_CACTUS_SEEDS.get()) + .add(FloralisItems.RED_CACTUS_SEEDS.get()) + .add(FloralisItems.ORANGE_CACTUS_SEEDS.get()) + .add(FloralisItems.YELLOW_CACTUS_SEEDS.get()) + .add(FloralisItems.LIME_CACTUS_SEEDS.get()) + .add(FloralisItems.GREEN_CACTUS_SEEDS.get()) + .add(FloralisItems.CYAN_CACTUS_SEEDS.get()) + .add(FloralisItems.LIGHT_BLUE_CACTUS_SEEDS.get()) + .add(FloralisItems.BLUE_CACTUS_SEEDS.get()) + .add(FloralisItems.PURPLE_CACTUS_SEEDS.get()) + .add(FloralisItems.MAGENTA_CACTUS_SEEDS.get()) + .add(FloralisItems.PINK_CACTUS_SEEDS.get()); + + this.tag(FloralisItemTags.BIOREACTOR) + .add(FloralisItems.WHITE_PETALS.get()) + .add(FloralisItems.LIGHT_GRAY_PETALS.get()) + .add(FloralisItems.GRAY_PETALS.get()) + .add(FloralisItems.BLACK_PETALS.get()) + .add(FloralisItems.BROWN_PETALS.get()) + .add(FloralisItems.RED_PETALS.get()) + .add(FloralisItems.ORANGE_PETALS.get()) + .add(FloralisItems.YELLOW_PETALS.get()) + .add(FloralisItems.LIME_PETALS.get()) + .add(FloralisItems.GREEN_PETALS.get()) + .add(FloralisItems.CYAN_PETALS.get()) + .add(FloralisItems.LIGHT_BLUE_PETALS.get()) + .add(FloralisItems.BLUE_PETALS.get()) + .add(FloralisItems.PURPLE_PETALS.get()) + .add(FloralisItems.MAGENTA_PETALS.get()) + .add(FloralisItems.PINK_PETALS.get()) + .add(FloralisItems.PLANT_FIBERS.get()); + + this.tag(FloralisItemTags.FERTILIZER) + .add(FloralisItems.PLANT_FIBERS.get()); + } + + public static TagKey bind(String pName) { + return TagKey.create(Registries.ITEM, new ResourceLocation(pName)); + } + + public static TagKey cTag(String pName) { + return FloralisItemTags.bind(FloralisConstants.C + ":" + pName); + } + + public static TagKey floralisTag(String pName) { + return FloralisItemTags.bind(FloralisConstants.FLORALIS + ":" + pName); + } + + public static TagKey neoforgeTag(String pName) { + return FloralisItemTags.bind(FloralisConstants.NEOFORGE + ":" + pName); + } + + public static TagKey industrialforegoingTag(String pName) { + return FloralisItemTags.bind(FloralisConstants.INDUSTRIALFOREGOING + ":" + pName); + } +} diff --git a/src/main/java/com/luxtracon/floralis/item/PlantFibersItem.java b/src/main/java/com/luxtracon/floralis/item/PlantFibersItem.java index 29d764b8..b10e6b78 100644 --- a/src/main/java/com/luxtracon/floralis/item/PlantFibersItem.java +++ b/src/main/java/com/luxtracon/floralis/item/PlantFibersItem.java @@ -1,17 +1,15 @@ package com.luxtracon.floralis.item; -import com.luxtracon.floralis.registry.FloralisConstant; +import com.luxtracon.floralis.registry.FloralisConstants; import net.minecraft.ChatFormatting; import net.minecraft.network.chat.Component; import net.minecraft.world.item.BoneMealItem; import net.minecraft.world.item.ItemStack; import net.minecraft.world.item.TooltipFlag; -import net.minecraft.world.level.Level; import java.util.List; -import javax.annotation.Nullable; import javax.annotation.ParametersAreNonnullByDefault; @ParametersAreNonnullByDefault @@ -22,7 +20,7 @@ public PlantFibersItem(Properties pProperties) { } @Override - public void appendHoverText(ItemStack pStack, @Nullable Level pLevel, List pTooltipComponents, TooltipFlag pIsAdvanced) { - pTooltipComponents.add(Component.translatable("tip." + FloralisConstant.ID + ".plant_fibers").withStyle(ChatFormatting.GRAY)); + public void appendHoverText(ItemStack pStack, TooltipContext pContext, List pList, TooltipFlag pFlag) { + pList.add(Component.translatable("tip" + "." + FloralisConstants.FLORALIS + "." + "plant_fibers").withStyle(ChatFormatting.GRAY)); } } diff --git a/src/main/java/com/luxtracon/floralis/proxy/ClientProxy.java b/src/main/java/com/luxtracon/floralis/proxy/ClientProxy.java index 786f0151..87f1ed7a 100644 --- a/src/main/java/com/luxtracon/floralis/proxy/ClientProxy.java +++ b/src/main/java/com/luxtracon/floralis/proxy/ClientProxy.java @@ -1,6 +1,7 @@ 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; @@ -9,24 +10,24 @@ import net.minecraft.world.level.GrassColor; import net.minecraft.world.level.block.Block; -import net.neoforged.fml.event.lifecycle.FMLCommonSetupEvent; +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 net.neoforged.neoforge.event.server.ServerAboutToStartEvent; -import net.neoforged.neoforge.event.village.VillagerTradesEvent; import javax.annotation.ParametersAreNonnullByDefault; -@SuppressWarnings("deprecation") +@SuppressWarnings("deprecation, unused") @ParametersAreNonnullByDefault -public class ClientProxy extends CommonProxy { +@EventBusSubscriber(bus = EventBusSubscriber.Bus.MOD, modid = FloralisConstants.FLORALIS, value = Dist.CLIENT) +public class ClientProxy { public ClientProxy() { } - @Override - public void onCreativeModeTabRegister(BuildCreativeModeTabContentsEvent pEvent) { + 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()); @@ -136,127 +137,112 @@ public void onCreativeModeTabRegister(BuildCreativeModeTabContentsEvent pEvent) } } - @Override - public void onFMLCommonSetup(FMLCommonSetupEvent pEvent) { - super.onFMLCommonSetup(pEvent); + @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()); } - @Override - public void onFMLLoadComplete(FMLLoadCompleteEvent pEvent) { - this.blockColor(FloralisBlocks.WHITE_FLOWER.get()); - this.blockColor(FloralisBlocks.LIGHT_GRAY_FLOWER.get()); - this.blockColor(FloralisBlocks.GRAY_FLOWER.get()); - this.blockColor(FloralisBlocks.BLACK_FLOWER.get()); - this.blockColor(FloralisBlocks.BROWN_FLOWER.get()); - this.blockColor(FloralisBlocks.RED_FLOWER.get()); - this.blockColor(FloralisBlocks.ORANGE_FLOWER.get()); - this.blockColor(FloralisBlocks.YELLOW_FLOWER.get()); - this.blockColor(FloralisBlocks.LIME_FLOWER.get()); - this.blockColor(FloralisBlocks.GREEN_FLOWER.get()); - this.blockColor(FloralisBlocks.CYAN_FLOWER.get()); - this.blockColor(FloralisBlocks.LIGHT_BLUE_FLOWER.get()); - this.blockColor(FloralisBlocks.BLUE_FLOWER.get()); - this.blockColor(FloralisBlocks.PURPLE_FLOWER.get()); - this.blockColor(FloralisBlocks.MAGENTA_FLOWER.get()); - this.blockColor(FloralisBlocks.PINK_FLOWER.get()); - - this.blockColor(FloralisBlocks.WHITE_CACTUS.get()); - this.blockColor(FloralisBlocks.LIGHT_GRAY_CACTUS.get()); - this.blockColor(FloralisBlocks.GRAY_CACTUS.get()); - this.blockColor(FloralisBlocks.BLACK_CACTUS.get()); - this.blockColor(FloralisBlocks.BROWN_CACTUS.get()); - this.blockColor(FloralisBlocks.RED_CACTUS.get()); - this.blockColor(FloralisBlocks.ORANGE_CACTUS.get()); - this.blockColor(FloralisBlocks.YELLOW_CACTUS.get()); - this.blockColor(FloralisBlocks.LIME_CACTUS.get()); - this.blockColor(FloralisBlocks.GREEN_CACTUS.get()); - this.blockColor(FloralisBlocks.CYAN_CACTUS.get()); - this.blockColor(FloralisBlocks.LIGHT_BLUE_CACTUS.get()); - this.blockColor(FloralisBlocks.BLUE_CACTUS.get()); - this.blockColor(FloralisBlocks.PURPLE_CACTUS.get()); - this.blockColor(FloralisBlocks.MAGENTA_CACTUS.get()); - this.blockColor(FloralisBlocks.PINK_CACTUS.get()); - - this.blockColor(FloralisBlocks.POTTED_WHITE_FLOWER.get()); - this.blockColor(FloralisBlocks.POTTED_LIGHT_GRAY_FLOWER.get()); - this.blockColor(FloralisBlocks.POTTED_GRAY_FLOWER.get()); - this.blockColor(FloralisBlocks.POTTED_BLACK_FLOWER.get()); - this.blockColor(FloralisBlocks.POTTED_BROWN_FLOWER.get()); - this.blockColor(FloralisBlocks.POTTED_RED_FLOWER.get()); - this.blockColor(FloralisBlocks.POTTED_ORANGE_FLOWER.get()); - this.blockColor(FloralisBlocks.POTTED_YELLOW_FLOWER.get()); - this.blockColor(FloralisBlocks.POTTED_LIME_FLOWER.get()); - this.blockColor(FloralisBlocks.POTTED_GREEN_FLOWER.get()); - this.blockColor(FloralisBlocks.POTTED_CYAN_FLOWER.get()); - this.blockColor(FloralisBlocks.POTTED_LIGHT_BLUE_FLOWER.get()); - this.blockColor(FloralisBlocks.POTTED_BLUE_FLOWER.get()); - this.blockColor(FloralisBlocks.POTTED_PURPLE_FLOWER.get()); - this.blockColor(FloralisBlocks.POTTED_MAGENTA_FLOWER.get()); - this.blockColor(FloralisBlocks.POTTED_PINK_FLOWER.get()); - - this.blockColor(FloralisBlocks.POTTED_WHITE_CACTUS.get()); - this.blockColor(FloralisBlocks.POTTED_LIGHT_GRAY_CACTUS.get()); - this.blockColor(FloralisBlocks.POTTED_GRAY_CACTUS.get()); - this.blockColor(FloralisBlocks.POTTED_BLACK_CACTUS.get()); - this.blockColor(FloralisBlocks.POTTED_BROWN_CACTUS.get()); - this.blockColor(FloralisBlocks.POTTED_RED_CACTUS.get()); - this.blockColor(FloralisBlocks.POTTED_ORANGE_CACTUS.get()); - this.blockColor(FloralisBlocks.POTTED_YELLOW_CACTUS.get()); - this.blockColor(FloralisBlocks.POTTED_LIME_CACTUS.get()); - this.blockColor(FloralisBlocks.POTTED_GREEN_CACTUS.get()); - this.blockColor(FloralisBlocks.POTTED_CYAN_CACTUS.get()); - this.blockColor(FloralisBlocks.POTTED_LIGHT_BLUE_CACTUS.get()); - this.blockColor(FloralisBlocks.POTTED_BLUE_CACTUS.get()); - this.blockColor(FloralisBlocks.POTTED_PURPLE_CACTUS.get()); - this.blockColor(FloralisBlocks.POTTED_MAGENTA_CACTUS.get()); - this.blockColor(FloralisBlocks.POTTED_PINK_CACTUS.get()); - - this.blockColor(FloralisBlocks.WHITE_FLOWER_CROP.get()); - this.blockColor(FloralisBlocks.LIGHT_GRAY_FLOWER_CROP.get()); - this.blockColor(FloralisBlocks.GRAY_FLOWER_CROP.get()); - this.blockColor(FloralisBlocks.BLACK_FLOWER_CROP.get()); - this.blockColor(FloralisBlocks.BROWN_FLOWER_CROP.get()); - this.blockColor(FloralisBlocks.RED_FLOWER_CROP.get()); - this.blockColor(FloralisBlocks.ORANGE_FLOWER_CROP.get()); - this.blockColor(FloralisBlocks.YELLOW_FLOWER_CROP.get()); - this.blockColor(FloralisBlocks.LIME_FLOWER_CROP.get()); - this.blockColor(FloralisBlocks.GREEN_FLOWER_CROP.get()); - this.blockColor(FloralisBlocks.CYAN_FLOWER_CROP.get()); - this.blockColor(FloralisBlocks.LIGHT_BLUE_FLOWER_CROP.get()); - this.blockColor(FloralisBlocks.BLUE_FLOWER_CROP.get()); - this.blockColor(FloralisBlocks.PURPLE_FLOWER_CROP.get()); - this.blockColor(FloralisBlocks.MAGENTA_FLOWER_CROP.get()); - this.blockColor(FloralisBlocks.PINK_FLOWER_CROP.get()); - - this.blockColor(FloralisBlocks.WHITE_CACTUS_CROP.get()); - this.blockColor(FloralisBlocks.LIGHT_GRAY_CACTUS_CROP.get()); - this.blockColor(FloralisBlocks.GRAY_CACTUS_CROP.get()); - this.blockColor(FloralisBlocks.BLACK_CACTUS_CROP.get()); - this.blockColor(FloralisBlocks.BROWN_CACTUS_CROP.get()); - this.blockColor(FloralisBlocks.RED_CACTUS_CROP.get()); - this.blockColor(FloralisBlocks.ORANGE_CACTUS_CROP.get()); - this.blockColor(FloralisBlocks.YELLOW_CACTUS_CROP.get()); - this.blockColor(FloralisBlocks.LIME_CACTUS_CROP.get()); - this.blockColor(FloralisBlocks.GREEN_CACTUS_CROP.get()); - this.blockColor(FloralisBlocks.CYAN_CACTUS_CROP.get()); - this.blockColor(FloralisBlocks.LIGHT_BLUE_CACTUS_CROP.get()); - this.blockColor(FloralisBlocks.BLUE_CACTUS_CROP.get()); - this.blockColor(FloralisBlocks.PURPLE_CACTUS_CROP.get()); - this.blockColor(FloralisBlocks.MAGENTA_CACTUS_CROP.get()); - this.blockColor(FloralisBlocks.PINK_CACTUS_CROP.get()); - } - - @Override - public void onServerAboutToStart(ServerAboutToStartEvent pEvent) { - super.onServerAboutToStart(pEvent); - } - - @Override - public void onVillagerTrades(VillagerTradesEvent pEvent) { - super.onVillagerTrades(pEvent); - } - - public void blockColor(Block pBlock) { + 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 index 2c3dd7ca..b897f375 100644 --- a/src/main/java/com/luxtracon/floralis/proxy/CommonProxy.java +++ b/src/main/java/com/luxtracon/floralis/proxy/CommonProxy.java @@ -2,8 +2,16 @@ import com.google.common.collect.ImmutableMap; -import com.luxtracon.floralis.registry.FloralisCompostables; -import com.luxtracon.floralis.registry.FloralisConfig; +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; @@ -24,9 +32,10 @@ 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.fml.event.lifecycle.FMLLoadCompleteEvent; -import net.neoforged.neoforge.event.BuildCreativeModeTabContentsEvent; +import net.neoforged.neoforge.data.event.GatherDataEvent; import net.neoforged.neoforge.event.server.ServerAboutToStartEvent; import net.neoforged.neoforge.event.village.VillagerTradesEvent; @@ -35,39 +44,52 @@ import javax.annotation.ParametersAreNonnullByDefault; +@SuppressWarnings("unused") @ParametersAreNonnullByDefault +@EventBusSubscriber(modid = FloralisConstants.FLORALIS) public class CommonProxy { public CommonProxy() { } - public void onCreativeModeTabRegister(BuildCreativeModeTabContentsEvent pEvent) { - - } - - public void onFMLCommonSetup(FMLCommonSetupEvent pEvent) { - pEvent.enqueueWork(FloralisCompostables::setup); + public static void onFMLCommonSetup(FMLCommonSetupEvent pEvent) { pEvent.enqueueWork(FloralisPottables::setup); } - public void onFMLLoadComplete(FMLLoadCompleteEvent pEvent) { - + 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)); } - public void onServerAboutToStart(ServerAboutToStartEvent pEvent) { + @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(); - this.addPieceToPool(processorList, templatePool, "floralis:village/desert/houses/farm", new ResourceLocation("minecraft:village/desert/houses"), FloralisConfig.DESERT_FARM.get()); - this.addPieceToPool(processorList, templatePool, "floralis:village/plains/houses/farm", new ResourceLocation("minecraft:village/plains/houses"), FloralisConfig.PLAINS_FARM.get()); - this.addPieceToPool(processorList, templatePool, "floralis:village/savanna/houses/farm", new ResourceLocation("minecraft:village/savanna/houses"), FloralisConfig.SAVANNA_FARM.get()); - this.addPieceToPool(processorList, templatePool, "floralis:village/snowy/houses/farm", new ResourceLocation("minecraft:village/snowy/houses"), FloralisConfig.SNOWY_FARM.get()); - this.addPieceToPool(processorList, templatePool, "floralis:village/taiga/houses/farm", new ResourceLocation("minecraft:village/taiga/houses"), FloralisConfig.TAIGA_FARM.get()); + 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()); } - public void onVillagerTrades(VillagerTradesEvent pEvent) { + @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()))); @@ -105,7 +127,7 @@ public void onVillagerTrades(VillagerTradesEvent pEvent) { } } - public void addPieceToPool(Registry pStructureProcessorList, Registry pStructureTemplatePool, String pPiece, ResourceLocation pPool, int pWeight) { + 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; diff --git a/src/main/java/com/luxtracon/floralis/registry/FloralisBlocks.java b/src/main/java/com/luxtracon/floralis/registry/FloralisBlocks.java index 84930faf..71d14190 100644 --- a/src/main/java/com/luxtracon/floralis/registry/FloralisBlocks.java +++ b/src/main/java/com/luxtracon/floralis/registry/FloralisBlocks.java @@ -17,11 +17,10 @@ import java.util.function.Supplier; -@SuppressWarnings("unused") @MethodsReturnNonnullByDefault public class FloralisBlocks { - public static final DeferredRegister BLOCKS = DeferredRegister.create(Registries.BLOCK, FloralisConstant.ID); + public static final DeferredRegister BLOCKS = DeferredRegister.create(Registries.BLOCK, FloralisConstants.FLORALIS); public static final Supplier WHITE_DYE_BLOCK = FloralisBlocks.BLOCKS.register("white_dye_block", () -> new DyeBlock(FloralisBlocks.propertiesDyeBlock(MapColor.SNOW))); public static final Supplier LIGHT_GRAY_DYE_BLOCK = FloralisBlocks.BLOCKS.register("light_gray_dye_block", () -> new DyeBlock(FloralisBlocks.propertiesDyeBlock(MapColor.COLOR_LIGHT_GRAY))); diff --git a/src/main/java/com/luxtracon/floralis/registry/FloralisCompostables.java b/src/main/java/com/luxtracon/floralis/registry/FloralisCompostables.java deleted file mode 100644 index 629d7417..00000000 --- a/src/main/java/com/luxtracon/floralis/registry/FloralisCompostables.java +++ /dev/null @@ -1,96 +0,0 @@ -package com.luxtracon.floralis.registry; - -import net.minecraft.world.level.block.ComposterBlock; - -public class FloralisCompostables { - public static void setup() { - ComposterBlock.COMPOSTABLES.put(FloralisItems.PLANT_FIBERS_BLOCK.get(), 0.85F); - - ComposterBlock.COMPOSTABLES.put(FloralisItems.WHITE_FLOWER.get(), 0.65F); - ComposterBlock.COMPOSTABLES.put(FloralisItems.LIGHT_GRAY_FLOWER.get(), 0.65F); - ComposterBlock.COMPOSTABLES.put(FloralisItems.GRAY_FLOWER.get(), 0.65F); - ComposterBlock.COMPOSTABLES.put(FloralisItems.BLACK_FLOWER.get(), 0.65F); - ComposterBlock.COMPOSTABLES.put(FloralisItems.BROWN_FLOWER.get(), 0.65F); - ComposterBlock.COMPOSTABLES.put(FloralisItems.RED_FLOWER.get(), 0.65F); - ComposterBlock.COMPOSTABLES.put(FloralisItems.ORANGE_FLOWER.get(), 0.65F); - ComposterBlock.COMPOSTABLES.put(FloralisItems.YELLOW_FLOWER.get(), 0.65F); - ComposterBlock.COMPOSTABLES.put(FloralisItems.LIME_FLOWER.get(), 0.65F); - ComposterBlock.COMPOSTABLES.put(FloralisItems.GREEN_FLOWER.get(), 0.65F); - ComposterBlock.COMPOSTABLES.put(FloralisItems.CYAN_FLOWER.get(), 0.65F); - ComposterBlock.COMPOSTABLES.put(FloralisItems.LIGHT_BLUE_FLOWER.get(), 0.65F); - ComposterBlock.COMPOSTABLES.put(FloralisItems.BLUE_FLOWER.get(), 0.65F); - ComposterBlock.COMPOSTABLES.put(FloralisItems.PURPLE_FLOWER.get(), 0.65F); - ComposterBlock.COMPOSTABLES.put(FloralisItems.MAGENTA_FLOWER.get(), 0.65F); - ComposterBlock.COMPOSTABLES.put(FloralisItems.PINK_FLOWER.get(), 0.65F); - - ComposterBlock.COMPOSTABLES.put(FloralisItems.WHITE_CACTUS.get(), 0.65F); - ComposterBlock.COMPOSTABLES.put(FloralisItems.LIGHT_GRAY_CACTUS.get(), 0.65F); - ComposterBlock.COMPOSTABLES.put(FloralisItems.GRAY_CACTUS.get(), 0.65F); - ComposterBlock.COMPOSTABLES.put(FloralisItems.BLACK_CACTUS.get(), 0.65F); - ComposterBlock.COMPOSTABLES.put(FloralisItems.BROWN_CACTUS.get(), 0.65F); - ComposterBlock.COMPOSTABLES.put(FloralisItems.RED_CACTUS.get(), 0.65F); - ComposterBlock.COMPOSTABLES.put(FloralisItems.ORANGE_CACTUS.get(), 0.65F); - ComposterBlock.COMPOSTABLES.put(FloralisItems.YELLOW_CACTUS.get(), 0.65F); - ComposterBlock.COMPOSTABLES.put(FloralisItems.LIME_CACTUS.get(), 0.65F); - ComposterBlock.COMPOSTABLES.put(FloralisItems.GREEN_CACTUS.get(), 0.65F); - ComposterBlock.COMPOSTABLES.put(FloralisItems.CYAN_CACTUS.get(), 0.65F); - ComposterBlock.COMPOSTABLES.put(FloralisItems.LIGHT_BLUE_CACTUS.get(), 0.65F); - ComposterBlock.COMPOSTABLES.put(FloralisItems.BLUE_CACTUS.get(), 0.65F); - ComposterBlock.COMPOSTABLES.put(FloralisItems.PURPLE_CACTUS.get(), 0.65F); - ComposterBlock.COMPOSTABLES.put(FloralisItems.MAGENTA_CACTUS.get(), 0.65F); - ComposterBlock.COMPOSTABLES.put(FloralisItems.PINK_CACTUS.get(), 0.65F); - - ComposterBlock.COMPOSTABLES.put(FloralisItems.WHITE_FLOWER_SEEDS.get(), 0.3F); - ComposterBlock.COMPOSTABLES.put(FloralisItems.LIGHT_GRAY_FLOWER_SEEDS.get(), 0.3F); - ComposterBlock.COMPOSTABLES.put(FloralisItems.GRAY_FLOWER_SEEDS.get(), 0.3F); - ComposterBlock.COMPOSTABLES.put(FloralisItems.BLACK_FLOWER_SEEDS.get(), 0.3F); - ComposterBlock.COMPOSTABLES.put(FloralisItems.BROWN_FLOWER_SEEDS.get(), 0.3F); - ComposterBlock.COMPOSTABLES.put(FloralisItems.RED_FLOWER_SEEDS.get(), 0.3F); - ComposterBlock.COMPOSTABLES.put(FloralisItems.ORANGE_FLOWER_SEEDS.get(), 0.3F); - ComposterBlock.COMPOSTABLES.put(FloralisItems.YELLOW_FLOWER_SEEDS.get(), 0.3F); - ComposterBlock.COMPOSTABLES.put(FloralisItems.LIME_FLOWER_SEEDS.get(), 0.3F); - ComposterBlock.COMPOSTABLES.put(FloralisItems.GREEN_FLOWER_SEEDS.get(), 0.3F); - ComposterBlock.COMPOSTABLES.put(FloralisItems.CYAN_FLOWER_SEEDS.get(), 0.3F); - ComposterBlock.COMPOSTABLES.put(FloralisItems.LIGHT_BLUE_FLOWER_SEEDS.get(), 0.3F); - ComposterBlock.COMPOSTABLES.put(FloralisItems.BLUE_FLOWER_SEEDS.get(), 0.3F); - ComposterBlock.COMPOSTABLES.put(FloralisItems.PURPLE_FLOWER_SEEDS.get(), 0.3F); - ComposterBlock.COMPOSTABLES.put(FloralisItems.MAGENTA_FLOWER_SEEDS.get(), 0.3F); - ComposterBlock.COMPOSTABLES.put(FloralisItems.PINK_FLOWER_SEEDS.get(), 0.3F); - - ComposterBlock.COMPOSTABLES.put(FloralisItems.WHITE_CACTUS_SEEDS.get(), 0.3F); - ComposterBlock.COMPOSTABLES.put(FloralisItems.LIGHT_GRAY_CACTUS_SEEDS.get(), 0.3F); - ComposterBlock.COMPOSTABLES.put(FloralisItems.GRAY_CACTUS_SEEDS.get(), 0.3F); - ComposterBlock.COMPOSTABLES.put(FloralisItems.BLACK_CACTUS_SEEDS.get(), 0.3F); - ComposterBlock.COMPOSTABLES.put(FloralisItems.BROWN_CACTUS_SEEDS.get(), 0.3F); - ComposterBlock.COMPOSTABLES.put(FloralisItems.RED_CACTUS_SEEDS.get(), 0.3F); - ComposterBlock.COMPOSTABLES.put(FloralisItems.ORANGE_CACTUS_SEEDS.get(), 0.3F); - ComposterBlock.COMPOSTABLES.put(FloralisItems.YELLOW_CACTUS_SEEDS.get(), 0.3F); - ComposterBlock.COMPOSTABLES.put(FloralisItems.LIME_CACTUS_SEEDS.get(), 0.3F); - ComposterBlock.COMPOSTABLES.put(FloralisItems.GREEN_CACTUS_SEEDS.get(), 0.3F); - ComposterBlock.COMPOSTABLES.put(FloralisItems.CYAN_CACTUS_SEEDS.get(), 0.3F); - ComposterBlock.COMPOSTABLES.put(FloralisItems.LIGHT_BLUE_CACTUS_SEEDS.get(), 0.3F); - ComposterBlock.COMPOSTABLES.put(FloralisItems.BLUE_CACTUS_SEEDS.get(), 0.3F); - ComposterBlock.COMPOSTABLES.put(FloralisItems.PURPLE_CACTUS_SEEDS.get(), 0.3F); - ComposterBlock.COMPOSTABLES.put(FloralisItems.MAGENTA_CACTUS_SEEDS.get(), 0.3F); - ComposterBlock.COMPOSTABLES.put(FloralisItems.PINK_CACTUS_SEEDS.get(), 0.3F); - - ComposterBlock.COMPOSTABLES.put(FloralisItems.WHITE_PETALS.get(), 0.3F); - ComposterBlock.COMPOSTABLES.put(FloralisItems.LIGHT_GRAY_PETALS.get(), 0.3F); - ComposterBlock.COMPOSTABLES.put(FloralisItems.GRAY_PETALS.get(), 0.3F); - ComposterBlock.COMPOSTABLES.put(FloralisItems.BLACK_PETALS.get(), 0.3F); - ComposterBlock.COMPOSTABLES.put(FloralisItems.BROWN_PETALS.get(), 0.3F); - ComposterBlock.COMPOSTABLES.put(FloralisItems.RED_PETALS.get(), 0.3F); - ComposterBlock.COMPOSTABLES.put(FloralisItems.ORANGE_PETALS.get(), 0.3F); - ComposterBlock.COMPOSTABLES.put(FloralisItems.YELLOW_PETALS.get(), 0.3F); - ComposterBlock.COMPOSTABLES.put(FloralisItems.LIME_PETALS.get(), 0.3F); - ComposterBlock.COMPOSTABLES.put(FloralisItems.GREEN_PETALS.get(), 0.3F); - ComposterBlock.COMPOSTABLES.put(FloralisItems.CYAN_PETALS.get(), 0.3F); - ComposterBlock.COMPOSTABLES.put(FloralisItems.LIGHT_BLUE_PETALS.get(), 0.3F); - ComposterBlock.COMPOSTABLES.put(FloralisItems.BLUE_PETALS.get(), 0.3F); - ComposterBlock.COMPOSTABLES.put(FloralisItems.PURPLE_PETALS.get(), 0.3F); - ComposterBlock.COMPOSTABLES.put(FloralisItems.MAGENTA_PETALS.get(), 0.3F); - ComposterBlock.COMPOSTABLES.put(FloralisItems.PINK_PETALS.get(), 0.3F); - - ComposterBlock.COMPOSTABLES.put(FloralisItems.PLANT_FIBERS.get(), 0.3F); - } -} diff --git a/src/main/java/com/luxtracon/floralis/registry/FloralisConstant.java b/src/main/java/com/luxtracon/floralis/registry/FloralisConstant.java deleted file mode 100644 index 18935df5..00000000 --- a/src/main/java/com/luxtracon/floralis/registry/FloralisConstant.java +++ /dev/null @@ -1,5 +0,0 @@ -package com.luxtracon.floralis.registry; - -public class FloralisConstant { - public static final String ID = "floralis"; -} \ No newline at end of file diff --git a/src/main/java/com/luxtracon/floralis/registry/FloralisConstants.java b/src/main/java/com/luxtracon/floralis/registry/FloralisConstants.java new file mode 100644 index 00000000..ae9d4674 --- /dev/null +++ b/src/main/java/com/luxtracon/floralis/registry/FloralisConstants.java @@ -0,0 +1,8 @@ +package com.luxtracon.floralis.registry; + +public class FloralisConstants { + public static final String C = "c"; + public static final String FLORALIS = "floralis"; + public static final String NEOFORGE = "neoforge"; + public static final String INDUSTRIALFOREGOING = "industrialforegoing"; +} diff --git a/src/main/java/com/luxtracon/floralis/registry/FloralisCreativeModeTabs.java b/src/main/java/com/luxtracon/floralis/registry/FloralisCreativeModeTabs.java index a38450ef..4df97d32 100644 --- a/src/main/java/com/luxtracon/floralis/registry/FloralisCreativeModeTabs.java +++ b/src/main/java/com/luxtracon/floralis/registry/FloralisCreativeModeTabs.java @@ -11,7 +11,7 @@ import java.util.function.Supplier; public class FloralisCreativeModeTabs { - public static final DeferredRegister CREATIVE_MODE_TABS = DeferredRegister.create(Registries.CREATIVE_MODE_TAB, FloralisConstant.ID); + public static final DeferredRegister CREATIVE_MODE_TABS = DeferredRegister.create(Registries.CREATIVE_MODE_TAB, FloralisConstants.FLORALIS); - public static final Supplier FLORALIS = FloralisCreativeModeTabs.CREATIVE_MODE_TABS.register("floralis", () -> CreativeModeTab.builder().icon(() -> new ItemStack(FloralisItems.PURPLE_CACTUS.get())).title(Component.translatable("tab." + FloralisConstant.ID + ".item_group")).withSearchBar().withTabsBefore(CreativeModeTabs.SPAWN_EGGS).build()); + public static final Supplier FLORALIS = FloralisCreativeModeTabs.CREATIVE_MODE_TABS.register(FloralisConstants.FLORALIS, () -> CreativeModeTab.builder().icon(() -> new ItemStack(FloralisItems.PURPLE_CACTUS.get())).title(Component.translatable("tab" + "." + FloralisConstants.FLORALIS + "." + "item_group")).withSearchBar().withTabsBefore(CreativeModeTabs.SPAWN_EGGS).build()); } diff --git a/src/main/java/com/luxtracon/floralis/registry/FloralisItems.java b/src/main/java/com/luxtracon/floralis/registry/FloralisItems.java index 8a43204f..d679ea97 100644 --- a/src/main/java/com/luxtracon/floralis/registry/FloralisItems.java +++ b/src/main/java/com/luxtracon/floralis/registry/FloralisItems.java @@ -12,7 +12,7 @@ import java.util.function.Supplier; public class FloralisItems { - public static final DeferredRegister ITEMS = DeferredRegister.create(Registries.ITEM, FloralisConstant.ID); + public static final DeferredRegister ITEMS = DeferredRegister.create(Registries.ITEM, FloralisConstants.FLORALIS); public static final Supplier WHITE_DYE_BLOCK = FloralisItems.ITEMS.register("white_dye_block", () -> new BlockItem(FloralisBlocks.WHITE_DYE_BLOCK.get(), new Item.Properties())); public static final Supplier LIGHT_GRAY_DYE_BLOCK = FloralisItems.ITEMS.register("light_gray_dye_block", () -> new BlockItem(FloralisBlocks.LIGHT_GRAY_DYE_BLOCK.get(), new Item.Properties())); diff --git a/src/main/java/com/luxtracon/floralis/trade/EmeraldsForItemsTrade.java b/src/main/java/com/luxtracon/floralis/trade/EmeraldsForItemsTrade.java index 35d04573..2dfbe5df 100644 --- a/src/main/java/com/luxtracon/floralis/trade/EmeraldsForItemsTrade.java +++ b/src/main/java/com/luxtracon/floralis/trade/EmeraldsForItemsTrade.java @@ -8,6 +8,7 @@ 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; @@ -25,6 +26,6 @@ public EmeraldsForItemsTrade(Map pMap) { @Override public MerchantOffer getOffer(Entity pTrader, RandomSource pRandom) { - return pTrader instanceof VillagerDataHolder ? new MerchantOffer(new ItemStack(this.map.get(((VillagerDataHolder) pTrader).getVillagerData().getType()), 64), new ItemStack(Items.EMERALD, 1), 12, 2, 0.05F) : null; + 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 index 507117d2..aa438e35 100644 --- a/src/main/java/com/luxtracon/floralis/trade/ItemsForEmeraldsTrade.java +++ b/src/main/java/com/luxtracon/floralis/trade/ItemsForEmeraldsTrade.java @@ -5,6 +5,7 @@ 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; @@ -20,6 +21,6 @@ public ItemsForEmeraldsTrade(ItemStack pStack) { @Override public MerchantOffer getOffer(Entity pTrader, RandomSource pRandom) { - return new MerchantOffer(new ItemStack(Items.EMERALD, 1), new ItemStack(this.stack.getItem(), 16), 12, 1, 0.05F); + 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/mods.toml b/src/main/resources/META-INF/neoforge.mods.toml similarity index 97% rename from src/main/resources/META-INF/mods.toml rename to src/main/resources/META-INF/neoforge.mods.toml index a68bca32..3a042e0b 100644 --- a/src/main/resources/META-INF/mods.toml +++ b/src/main/resources/META-INF/neoforge.mods.toml @@ -1,4 +1,4 @@ -# This is an example mods.toml file. It contains the data relating to the loading mods. +# This is an example neoforge.mods.toml file. It contains the data relating to the loading mods. # There are several mandatory fields (#mandatory), and many more that are optional (#optional). # The overall format is standard TOML format, v0.5.0. # Note that there are a couple of TOML lists in this file. @@ -6,7 +6,7 @@ # The name of the mod loader type to load - for regular FML @Mod mods it should be javafml modLoader="javafml" #mandatory -# A version range to match for said mod loader - for regular FML @Mod it will be the the FML version. This is currently 47. +# A version range to match for said mod loader - for regular FML @Mod it will be the FML version. This is currently 2. loaderVersion="${loader_version_range}" #mandatory # The license for you mod. This is mandatory metadata and allows for easier comprehension of your redistributive properties. diff --git a/src/main/resources/data/floralis/loot_tables/blocks/black_cactus.json b/src/main/resources/data/floralis/loot_tables/blocks/black_cactus.json deleted file mode 100644 index f8d228c1..00000000 --- a/src/main/resources/data/floralis/loot_tables/blocks/black_cactus.json +++ /dev/null @@ -1,225 +0,0 @@ -{ - "type": "minecraft:block", - "pools": [ - { - "rolls": 1, - "bonus_rolls": 0, - "entries": [ - { - "type": "minecraft:alternatives", - "children": [ - { - "type": "minecraft:item", - "conditions": [ - { - "condition": "minecraft:any_of", - "terms": [ - { - "condition": "minecraft:match_tool", - "predicate": { - "items": [ - "minecraft:shears" - ] - } - }, - { - "condition": "minecraft:match_tool", - "predicate": { - "enchantments": [ - { - "enchantment": "minecraft:silk_touch", - "levels": { - "min": 1 - } - } - ] - } - } - ] - } - ], - "name": "floralis:black_cactus" - } - ] - } - ] - }, - { - "rolls": 1, - "bonus_rolls": 0, - "entries": [ - { - "type": "minecraft:item", - "functions": [ - { - "function": "minecraft:set_count", - "count": 1, - "add": false - }, - { - "function": "minecraft:explosion_decay" - }, - { - "function": "minecraft:apply_bonus", - "enchantment": "minecraft:fortune", - "formula": "minecraft:uniform_bonus_count", - "parameters": { - "bonusMultiplier": 1 - } - } - ], - "name": "floralis:plant_fibers" - } - ], - "conditions": [ - { - "condition": "minecraft:inverted", - "term": { - "condition": "minecraft:any_of", - "terms": [ - { - "condition": "minecraft:match_tool", - "predicate": { - "items": [ - "minecraft:shears" - ] - } - }, - { - "condition": "minecraft:match_tool", - "predicate": { - "enchantments": [ - { - "enchantment": "minecraft:silk_touch", - "levels": { - "min": 1 - } - } - ] - } - } - ] - } - } - ] - }, - { - "rolls": 1, - "bonus_rolls": 0, - "entries": [ - { - "type": "minecraft:item", - "functions": [ - { - "function": "minecraft:set_count", - "count": 1, - "add": false - }, - { - "function": "minecraft:explosion_decay" - }, - { - "function": "minecraft:apply_bonus", - "enchantment": "minecraft:fortune", - "formula": "minecraft:uniform_bonus_count", - "parameters": { - "bonusMultiplier": 1 - } - } - ], - "name": "floralis:black_petals" - } - ], - "conditions": [ - { - "condition": "minecraft:inverted", - "term": { - "condition": "minecraft:any_of", - "terms": [ - { - "condition": "minecraft:match_tool", - "predicate": { - "items": [ - "minecraft:shears" - ] - } - }, - { - "condition": "minecraft:match_tool", - "predicate": { - "enchantments": [ - { - "enchantment": "minecraft:silk_touch", - "levels": { - "min": 1 - } - } - ] - } - } - ] - } - } - ] - }, - { - "rolls": 1, - "bonus_rolls": 0, - "entries": [ - { - "type": "minecraft:item", - "functions": [ - { - "function": "minecraft:set_count", - "count": 2, - "add": false - }, - { - "function": "minecraft:explosion_decay" - }, - { - "function": "minecraft:apply_bonus", - "enchantment": "minecraft:fortune", - "formula": "minecraft:uniform_bonus_count", - "parameters": { - "bonusMultiplier": 1 - } - } - ], - "name": "floralis:black_cactus_seeds" - } - ], - "conditions": [ - { - "condition": "minecraft:inverted", - "term": { - "condition": "minecraft:any_of", - "terms": [ - { - "condition": "minecraft:match_tool", - "predicate": { - "items": [ - "minecraft:shears" - ] - } - }, - { - "condition": "minecraft:match_tool", - "predicate": { - "enchantments": [ - { - "enchantment": "minecraft:silk_touch", - "levels": { - "min": 1 - } - } - ] - } - } - ] - } - } - ] - } - ] -} \ No newline at end of file diff --git a/src/main/resources/data/floralis/loot_tables/blocks/black_cactus_crop.json b/src/main/resources/data/floralis/loot_tables/blocks/black_cactus_crop.json deleted file mode 100644 index 7f78a4ae..00000000 --- a/src/main/resources/data/floralis/loot_tables/blocks/black_cactus_crop.json +++ /dev/null @@ -1,550 +0,0 @@ -{ - "type": "minecraft:block", - "pools": [ - { - "rolls": 1, - "bonus_rolls": 0, - "entries": [ - { - "type": "minecraft:alternatives", - "children": [ - { - "type": "minecraft:item", - "conditions": [ - { - "condition": "minecraft:block_state_property", - "block": "floralis:black_cactus_crop", - "properties": { - "age": "5" - } - }, - { - "condition": "minecraft:any_of", - "terms": [ - { - "condition": "minecraft:match_tool", - "predicate": { - "items": [ - "minecraft:shears" - ] - } - }, - { - "condition": "minecraft:match_tool", - "predicate": { - "enchantments": [ - { - "enchantment": "minecraft:silk_touch", - "levels": { - "min": 1 - } - } - ] - } - } - ] - } - ], - "name": "floralis:black_cactus" - }, - { - "type": "minecraft:item", - "conditions": [ - { - "condition": "minecraft:any_of", - "terms": [ - { - "condition": "minecraft:match_tool", - "predicate": { - "items": [ - "minecraft:shears" - ] - } - }, - { - "condition": "minecraft:match_tool", - "predicate": { - "enchantments": [ - { - "enchantment": "minecraft:silk_touch", - "levels": { - "min": 1 - } - } - ] - } - } - ] - } - ], - "name": "floralis:black_cactus_seeds" - } - ] - } - ] - }, - { - "rolls": 1, - "bonus_rolls": 0, - "entries": [ - { - "type": "minecraft:item", - "functions": [ - { - "function": "minecraft:set_count", - "count": 1, - "add": false - }, - { - "function": "minecraft:explosion_decay" - }, - { - "function": "minecraft:apply_bonus", - "enchantment": "minecraft:fortune", - "formula": "minecraft:uniform_bonus_count", - "parameters": { - "bonusMultiplier": 1 - } - } - ], - "name": "floralis:plant_fibers" - } - ], - "conditions": [ - { - "condition": "minecraft:block_state_property", - "block": "floralis:black_cactus_crop", - "properties": { - "age": "5" - } - }, - { - "condition": "minecraft:inverted", - "term": { - "condition": "minecraft:any_of", - "terms": [ - { - "condition": "minecraft:match_tool", - "predicate": { - "items": [ - "minecraft:shears" - ] - } - }, - { - "condition": "minecraft:match_tool", - "predicate": { - "enchantments": [ - { - "enchantment": "minecraft:silk_touch", - "levels": { - "min": 1 - } - } - ] - } - } - ] - } - } - ] - }, - { - "rolls": 1, - "bonus_rolls": 0, - "entries": [ - { - "type": "minecraft:item", - "functions": [ - { - "function": "minecraft:set_count", - "count": 1, - "add": false - }, - { - "function": "minecraft:explosion_decay" - }, - { - "function": "minecraft:apply_bonus", - "enchantment": "minecraft:fortune", - "formula": "minecraft:uniform_bonus_count", - "parameters": { - "bonusMultiplier": 1 - } - } - ], - "name": "floralis:black_petals" - } - ], - "conditions": [ - { - "condition": "minecraft:block_state_property", - "block": "floralis:black_cactus_crop", - "properties": { - "age": "5" - } - }, - { - "condition": "minecraft:inverted", - "term": { - "condition": "minecraft:any_of", - "terms": [ - { - "condition": "minecraft:match_tool", - "predicate": { - "items": [ - "minecraft:shears" - ] - } - }, - { - "condition": "minecraft:match_tool", - "predicate": { - "enchantments": [ - { - "enchantment": "minecraft:silk_touch", - "levels": { - "min": 1 - } - } - ] - } - } - ] - } - } - ] - }, - { - "rolls": 1, - "bonus_rolls": 0, - "entries": [ - { - "type": "minecraft:item", - "functions": [ - { - "function": "minecraft:set_count", - "count": 2, - "add": false - }, - { - "function": "minecraft:explosion_decay" - }, - { - "function": "minecraft:apply_bonus", - "enchantment": "minecraft:fortune", - "formula": "minecraft:uniform_bonus_count", - "parameters": { - "bonusMultiplier": 1 - } - } - ], - "name": "floralis:black_cactus_seeds" - } - ], - "conditions": [ - { - "condition": "minecraft:block_state_property", - "block": "floralis:black_cactus_crop", - "properties": { - "age": "5" - } - }, - { - "condition": "minecraft:inverted", - "term": { - "condition": "minecraft:any_of", - "terms": [ - { - "condition": "minecraft:match_tool", - "predicate": { - "items": [ - "minecraft:shears" - ] - } - }, - { - "condition": "minecraft:match_tool", - "predicate": { - "enchantments": [ - { - "enchantment": "minecraft:silk_touch", - "levels": { - "min": 1 - } - } - ] - } - } - ] - } - } - ] - }, - { - "rolls": 1, - "bonus_rolls": 0, - "entries": [ - { - "type": "minecraft:item", - "functions": [ - { - "function": "minecraft:explosion_decay" - } - ], - "name": "floralis:black_cactus_seeds" - } - ], - "conditions": [ - { - "condition": "minecraft:block_state_property", - "block": "floralis:black_cactus_crop", - "properties": { - "age": "4" - } - }, - { - "condition": "minecraft:inverted", - "term": { - "condition": "minecraft:any_of", - "terms": [ - { - "condition": "minecraft:match_tool", - "predicate": { - "items": [ - "minecraft:shears" - ] - } - }, - { - "condition": "minecraft:match_tool", - "predicate": { - "enchantments": [ - { - "enchantment": "minecraft:silk_touch", - "levels": { - "min": 1 - } - } - ] - } - } - ] - } - } - ] - }, - { - "rolls": 1, - "bonus_rolls": 0, - "entries": [ - { - "type": "minecraft:item", - "functions": [ - { - "function": "minecraft:explosion_decay" - } - ], - "name": "floralis:black_cactus_seeds" - } - ], - "conditions": [ - { - "condition": "minecraft:block_state_property", - "block": "floralis:black_cactus_crop", - "properties": { - "age": "3" - } - }, - { - "condition": "minecraft:inverted", - "term": { - "condition": "minecraft:any_of", - "terms": [ - { - "condition": "minecraft:match_tool", - "predicate": { - "items": [ - "minecraft:shears" - ] - } - }, - { - "condition": "minecraft:match_tool", - "predicate": { - "enchantments": [ - { - "enchantment": "minecraft:silk_touch", - "levels": { - "min": 1 - } - } - ] - } - } - ] - } - } - ] - }, - { - "rolls": 1, - "bonus_rolls": 0, - "entries": [ - { - "type": "minecraft:item", - "functions": [ - { - "function": "minecraft:explosion_decay" - } - ], - "name": "floralis:black_cactus_seeds" - } - ], - "conditions": [ - { - "condition": "minecraft:block_state_property", - "block": "floralis:black_cactus_crop", - "properties": { - "age": "2" - } - }, - { - "condition": "minecraft:inverted", - "term": { - "condition": "minecraft:any_of", - "terms": [ - { - "condition": "minecraft:match_tool", - "predicate": { - "items": [ - "minecraft:shears" - ] - } - }, - { - "condition": "minecraft:match_tool", - "predicate": { - "enchantments": [ - { - "enchantment": "minecraft:silk_touch", - "levels": { - "min": 1 - } - } - ] - } - } - ] - } - } - ] - }, - { - "rolls": 1, - "bonus_rolls": 0, - "entries": [ - { - "type": "minecraft:item", - "functions": [ - { - "function": "minecraft:explosion_decay" - } - ], - "name": "floralis:black_cactus_seeds" - } - ], - "conditions": [ - { - "condition": "minecraft:block_state_property", - "block": "floralis:black_cactus_crop", - "properties": { - "age": "1" - } - }, - { - "condition": "minecraft:inverted", - "term": { - "condition": "minecraft:any_of", - "terms": [ - { - "condition": "minecraft:match_tool", - "predicate": { - "items": [ - "minecraft:shears" - ] - } - }, - { - "condition": "minecraft:match_tool", - "predicate": { - "enchantments": [ - { - "enchantment": "minecraft:silk_touch", - "levels": { - "min": 1 - } - } - ] - } - } - ] - } - } - ] - }, - { - "rolls": 1, - "bonus_rolls": 0, - "entries": [ - { - "type": "minecraft:item", - "functions": [ - { - "function": "minecraft:explosion_decay" - } - ], - "name": "floralis:black_cactus_seeds" - } - ], - "conditions": [ - { - "condition": "minecraft:block_state_property", - "block": "floralis:black_cactus_crop", - "properties": { - "age": "0" - } - }, - { - "condition": "minecraft:inverted", - "term": { - "condition": "minecraft:any_of", - "terms": [ - { - "condition": "minecraft:match_tool", - "predicate": { - "items": [ - "minecraft:shears" - ] - } - }, - { - "condition": "minecraft:match_tool", - "predicate": { - "enchantments": [ - { - "enchantment": "minecraft:silk_touch", - "levels": { - "min": 1 - } - } - ] - } - } - ] - } - } - ] - } - ] -} \ No newline at end of file diff --git a/src/main/resources/data/floralis/loot_tables/blocks/black_flower.json b/src/main/resources/data/floralis/loot_tables/blocks/black_flower.json deleted file mode 100644 index 21facf15..00000000 --- a/src/main/resources/data/floralis/loot_tables/blocks/black_flower.json +++ /dev/null @@ -1,225 +0,0 @@ -{ - "type": "minecraft:block", - "pools": [ - { - "rolls": 1, - "bonus_rolls": 0, - "entries": [ - { - "type": "minecraft:alternatives", - "children": [ - { - "type": "minecraft:item", - "conditions": [ - { - "condition": "minecraft:any_of", - "terms": [ - { - "condition": "minecraft:match_tool", - "predicate": { - "items": [ - "minecraft:shears" - ] - } - }, - { - "condition": "minecraft:match_tool", - "predicate": { - "enchantments": [ - { - "enchantment": "minecraft:silk_touch", - "levels": { - "min": 1 - } - } - ] - } - } - ] - } - ], - "name": "floralis:black_flower" - } - ] - } - ] - }, - { - "rolls": 1, - "bonus_rolls": 0, - "entries": [ - { - "type": "minecraft:item", - "functions": [ - { - "function": "minecraft:set_count", - "count": 1, - "add": false - }, - { - "function": "minecraft:explosion_decay" - }, - { - "function": "minecraft:apply_bonus", - "enchantment": "minecraft:fortune", - "formula": "minecraft:uniform_bonus_count", - "parameters": { - "bonusMultiplier": 1 - } - } - ], - "name": "floralis:plant_fibers" - } - ], - "conditions": [ - { - "condition": "minecraft:inverted", - "term": { - "condition": "minecraft:any_of", - "terms": [ - { - "condition": "minecraft:match_tool", - "predicate": { - "items": [ - "minecraft:shears" - ] - } - }, - { - "condition": "minecraft:match_tool", - "predicate": { - "enchantments": [ - { - "enchantment": "minecraft:silk_touch", - "levels": { - "min": 1 - } - } - ] - } - } - ] - } - } - ] - }, - { - "rolls": 1, - "bonus_rolls": 0, - "entries": [ - { - "type": "minecraft:item", - "functions": [ - { - "function": "minecraft:set_count", - "count": 1, - "add": false - }, - { - "function": "minecraft:explosion_decay" - }, - { - "function": "minecraft:apply_bonus", - "enchantment": "minecraft:fortune", - "formula": "minecraft:uniform_bonus_count", - "parameters": { - "bonusMultiplier": 1 - } - } - ], - "name": "floralis:black_petals" - } - ], - "conditions": [ - { - "condition": "minecraft:inverted", - "term": { - "condition": "minecraft:any_of", - "terms": [ - { - "condition": "minecraft:match_tool", - "predicate": { - "items": [ - "minecraft:shears" - ] - } - }, - { - "condition": "minecraft:match_tool", - "predicate": { - "enchantments": [ - { - "enchantment": "minecraft:silk_touch", - "levels": { - "min": 1 - } - } - ] - } - } - ] - } - } - ] - }, - { - "rolls": 1, - "bonus_rolls": 0, - "entries": [ - { - "type": "minecraft:item", - "functions": [ - { - "function": "minecraft:set_count", - "count": 2, - "add": false - }, - { - "function": "minecraft:explosion_decay" - }, - { - "function": "minecraft:apply_bonus", - "enchantment": "minecraft:fortune", - "formula": "minecraft:uniform_bonus_count", - "parameters": { - "bonusMultiplier": 1 - } - } - ], - "name": "floralis:black_flower_seeds" - } - ], - "conditions": [ - { - "condition": "minecraft:inverted", - "term": { - "condition": "minecraft:any_of", - "terms": [ - { - "condition": "minecraft:match_tool", - "predicate": { - "items": [ - "minecraft:shears" - ] - } - }, - { - "condition": "minecraft:match_tool", - "predicate": { - "enchantments": [ - { - "enchantment": "minecraft:silk_touch", - "levels": { - "min": 1 - } - } - ] - } - } - ] - } - } - ] - } - ] -} \ No newline at end of file diff --git a/src/main/resources/data/floralis/loot_tables/blocks/black_flower_crop.json b/src/main/resources/data/floralis/loot_tables/blocks/black_flower_crop.json deleted file mode 100644 index 69367205..00000000 --- a/src/main/resources/data/floralis/loot_tables/blocks/black_flower_crop.json +++ /dev/null @@ -1,550 +0,0 @@ -{ - "type": "minecraft:block", - "pools": [ - { - "rolls": 1, - "bonus_rolls": 0, - "entries": [ - { - "type": "minecraft:alternatives", - "children": [ - { - "type": "minecraft:item", - "conditions": [ - { - "condition": "minecraft:block_state_property", - "block": "floralis:black_flower_crop", - "properties": { - "age": "5" - } - }, - { - "condition": "minecraft:any_of", - "terms": [ - { - "condition": "minecraft:match_tool", - "predicate": { - "items": [ - "minecraft:shears" - ] - } - }, - { - "condition": "minecraft:match_tool", - "predicate": { - "enchantments": [ - { - "enchantment": "minecraft:silk_touch", - "levels": { - "min": 1 - } - } - ] - } - } - ] - } - ], - "name": "floralis:black_flower" - }, - { - "type": "minecraft:item", - "conditions": [ - { - "condition": "minecraft:any_of", - "terms": [ - { - "condition": "minecraft:match_tool", - "predicate": { - "items": [ - "minecraft:shears" - ] - } - }, - { - "condition": "minecraft:match_tool", - "predicate": { - "enchantments": [ - { - "enchantment": "minecraft:silk_touch", - "levels": { - "min": 1 - } - } - ] - } - } - ] - } - ], - "name": "floralis:black_flower_seeds" - } - ] - } - ] - }, - { - "rolls": 1, - "bonus_rolls": 0, - "entries": [ - { - "type": "minecraft:item", - "functions": [ - { - "function": "minecraft:set_count", - "count": 1, - "add": false - }, - { - "function": "minecraft:explosion_decay" - }, - { - "function": "minecraft:apply_bonus", - "enchantment": "minecraft:fortune", - "formula": "minecraft:uniform_bonus_count", - "parameters": { - "bonusMultiplier": 1 - } - } - ], - "name": "floralis:plant_fibers" - } - ], - "conditions": [ - { - "condition": "minecraft:block_state_property", - "block": "floralis:black_flower_crop", - "properties": { - "age": "5" - } - }, - { - "condition": "minecraft:inverted", - "term": { - "condition": "minecraft:any_of", - "terms": [ - { - "condition": "minecraft:match_tool", - "predicate": { - "items": [ - "minecraft:shears" - ] - } - }, - { - "condition": "minecraft:match_tool", - "predicate": { - "enchantments": [ - { - "enchantment": "minecraft:silk_touch", - "levels": { - "min": 1 - } - } - ] - } - } - ] - } - } - ] - }, - { - "rolls": 1, - "bonus_rolls": 0, - "entries": [ - { - "type": "minecraft:item", - "functions": [ - { - "function": "minecraft:set_count", - "count": 1, - "add": false - }, - { - "function": "minecraft:explosion_decay" - }, - { - "function": "minecraft:apply_bonus", - "enchantment": "minecraft:fortune", - "formula": "minecraft:uniform_bonus_count", - "parameters": { - "bonusMultiplier": 1 - } - } - ], - "name": "floralis:black_petals" - } - ], - "conditions": [ - { - "condition": "minecraft:block_state_property", - "block": "floralis:black_flower_crop", - "properties": { - "age": "5" - } - }, - { - "condition": "minecraft:inverted", - "term": { - "condition": "minecraft:any_of", - "terms": [ - { - "condition": "minecraft:match_tool", - "predicate": { - "items": [ - "minecraft:shears" - ] - } - }, - { - "condition": "minecraft:match_tool", - "predicate": { - "enchantments": [ - { - "enchantment": "minecraft:silk_touch", - "levels": { - "min": 1 - } - } - ] - } - } - ] - } - } - ] - }, - { - "rolls": 1, - "bonus_rolls": 0, - "entries": [ - { - "type": "minecraft:item", - "functions": [ - { - "function": "minecraft:set_count", - "count": 2, - "add": false - }, - { - "function": "minecraft:explosion_decay" - }, - { - "function": "minecraft:apply_bonus", - "enchantment": "minecraft:fortune", - "formula": "minecraft:uniform_bonus_count", - "parameters": { - "bonusMultiplier": 1 - } - } - ], - "name": "floralis:black_flower_seeds" - } - ], - "conditions": [ - { - "condition": "minecraft:block_state_property", - "block": "floralis:black_flower_crop", - "properties": { - "age": "5" - } - }, - { - "condition": "minecraft:inverted", - "term": { - "condition": "minecraft:any_of", - "terms": [ - { - "condition": "minecraft:match_tool", - "predicate": { - "items": [ - "minecraft:shears" - ] - } - }, - { - "condition": "minecraft:match_tool", - "predicate": { - "enchantments": [ - { - "enchantment": "minecraft:silk_touch", - "levels": { - "min": 1 - } - } - ] - } - } - ] - } - } - ] - }, - { - "rolls": 1, - "bonus_rolls": 0, - "entries": [ - { - "type": "minecraft:item", - "functions": [ - { - "function": "minecraft:explosion_decay" - } - ], - "name": "floralis:black_flower_seeds" - } - ], - "conditions": [ - { - "condition": "minecraft:block_state_property", - "block": "floralis:black_flower_crop", - "properties": { - "age": "4" - } - }, - { - "condition": "minecraft:inverted", - "term": { - "condition": "minecraft:any_of", - "terms": [ - { - "condition": "minecraft:match_tool", - "predicate": { - "items": [ - "minecraft:shears" - ] - } - }, - { - "condition": "minecraft:match_tool", - "predicate": { - "enchantments": [ - { - "enchantment": "minecraft:silk_touch", - "levels": { - "min": 1 - } - } - ] - } - } - ] - } - } - ] - }, - { - "rolls": 1, - "bonus_rolls": 0, - "entries": [ - { - "type": "minecraft:item", - "functions": [ - { - "function": "minecraft:explosion_decay" - } - ], - "name": "floralis:black_flower_seeds" - } - ], - "conditions": [ - { - "condition": "minecraft:block_state_property", - "block": "floralis:black_flower_crop", - "properties": { - "age": "3" - } - }, - { - "condition": "minecraft:inverted", - "term": { - "condition": "minecraft:any_of", - "terms": [ - { - "condition": "minecraft:match_tool", - "predicate": { - "items": [ - "minecraft:shears" - ] - } - }, - { - "condition": "minecraft:match_tool", - "predicate": { - "enchantments": [ - { - "enchantment": "minecraft:silk_touch", - "levels": { - "min": 1 - } - } - ] - } - } - ] - } - } - ] - }, - { - "rolls": 1, - "bonus_rolls": 0, - "entries": [ - { - "type": "minecraft:item", - "functions": [ - { - "function": "minecraft:explosion_decay" - } - ], - "name": "floralis:black_flower_seeds" - } - ], - "conditions": [ - { - "condition": "minecraft:block_state_property", - "block": "floralis:black_flower_crop", - "properties": { - "age": "2" - } - }, - { - "condition": "minecraft:inverted", - "term": { - "condition": "minecraft:any_of", - "terms": [ - { - "condition": "minecraft:match_tool", - "predicate": { - "items": [ - "minecraft:shears" - ] - } - }, - { - "condition": "minecraft:match_tool", - "predicate": { - "enchantments": [ - { - "enchantment": "minecraft:silk_touch", - "levels": { - "min": 1 - } - } - ] - } - } - ] - } - } - ] - }, - { - "rolls": 1, - "bonus_rolls": 0, - "entries": [ - { - "type": "minecraft:item", - "functions": [ - { - "function": "minecraft:explosion_decay" - } - ], - "name": "floralis:black_flower_seeds" - } - ], - "conditions": [ - { - "condition": "minecraft:block_state_property", - "block": "floralis:black_flower_crop", - "properties": { - "age": "1" - } - }, - { - "condition": "minecraft:inverted", - "term": { - "condition": "minecraft:any_of", - "terms": [ - { - "condition": "minecraft:match_tool", - "predicate": { - "items": [ - "minecraft:shears" - ] - } - }, - { - "condition": "minecraft:match_tool", - "predicate": { - "enchantments": [ - { - "enchantment": "minecraft:silk_touch", - "levels": { - "min": 1 - } - } - ] - } - } - ] - } - } - ] - }, - { - "rolls": 1, - "bonus_rolls": 0, - "entries": [ - { - "type": "minecraft:item", - "functions": [ - { - "function": "minecraft:explosion_decay" - } - ], - "name": "floralis:black_flower_seeds" - } - ], - "conditions": [ - { - "condition": "minecraft:block_state_property", - "block": "floralis:black_flower_crop", - "properties": { - "age": "0" - } - }, - { - "condition": "minecraft:inverted", - "term": { - "condition": "minecraft:any_of", - "terms": [ - { - "condition": "minecraft:match_tool", - "predicate": { - "items": [ - "minecraft:shears" - ] - } - }, - { - "condition": "minecraft:match_tool", - "predicate": { - "enchantments": [ - { - "enchantment": "minecraft:silk_touch", - "levels": { - "min": 1 - } - } - ] - } - } - ] - } - } - ] - } - ] -} \ No newline at end of file diff --git a/src/main/resources/data/floralis/loot_tables/blocks/blue_cactus.json b/src/main/resources/data/floralis/loot_tables/blocks/blue_cactus.json deleted file mode 100644 index 680944f6..00000000 --- a/src/main/resources/data/floralis/loot_tables/blocks/blue_cactus.json +++ /dev/null @@ -1,225 +0,0 @@ -{ - "type": "minecraft:block", - "pools": [ - { - "rolls": 1, - "bonus_rolls": 0, - "entries": [ - { - "type": "minecraft:alternatives", - "children": [ - { - "type": "minecraft:item", - "conditions": [ - { - "condition": "minecraft:any_of", - "terms": [ - { - "condition": "minecraft:match_tool", - "predicate": { - "items": [ - "minecraft:shears" - ] - } - }, - { - "condition": "minecraft:match_tool", - "predicate": { - "enchantments": [ - { - "enchantment": "minecraft:silk_touch", - "levels": { - "min": 1 - } - } - ] - } - } - ] - } - ], - "name": "floralis:blue_cactus" - } - ] - } - ] - }, - { - "rolls": 1, - "bonus_rolls": 0, - "entries": [ - { - "type": "minecraft:item", - "functions": [ - { - "function": "minecraft:set_count", - "count": 1, - "add": false - }, - { - "function": "minecraft:explosion_decay" - }, - { - "function": "minecraft:apply_bonus", - "enchantment": "minecraft:fortune", - "formula": "minecraft:uniform_bonus_count", - "parameters": { - "bonusMultiplier": 1 - } - } - ], - "name": "floralis:plant_fibers" - } - ], - "conditions": [ - { - "condition": "minecraft:inverted", - "term": { - "condition": "minecraft:any_of", - "terms": [ - { - "condition": "minecraft:match_tool", - "predicate": { - "items": [ - "minecraft:shears" - ] - } - }, - { - "condition": "minecraft:match_tool", - "predicate": { - "enchantments": [ - { - "enchantment": "minecraft:silk_touch", - "levels": { - "min": 1 - } - } - ] - } - } - ] - } - } - ] - }, - { - "rolls": 1, - "bonus_rolls": 0, - "entries": [ - { - "type": "minecraft:item", - "functions": [ - { - "function": "minecraft:set_count", - "count": 1, - "add": false - }, - { - "function": "minecraft:explosion_decay" - }, - { - "function": "minecraft:apply_bonus", - "enchantment": "minecraft:fortune", - "formula": "minecraft:uniform_bonus_count", - "parameters": { - "bonusMultiplier": 1 - } - } - ], - "name": "floralis:blue_petals" - } - ], - "conditions": [ - { - "condition": "minecraft:inverted", - "term": { - "condition": "minecraft:any_of", - "terms": [ - { - "condition": "minecraft:match_tool", - "predicate": { - "items": [ - "minecraft:shears" - ] - } - }, - { - "condition": "minecraft:match_tool", - "predicate": { - "enchantments": [ - { - "enchantment": "minecraft:silk_touch", - "levels": { - "min": 1 - } - } - ] - } - } - ] - } - } - ] - }, - { - "rolls": 1, - "bonus_rolls": 0, - "entries": [ - { - "type": "minecraft:item", - "functions": [ - { - "function": "minecraft:set_count", - "count": 2, - "add": false - }, - { - "function": "minecraft:explosion_decay" - }, - { - "function": "minecraft:apply_bonus", - "enchantment": "minecraft:fortune", - "formula": "minecraft:uniform_bonus_count", - "parameters": { - "bonusMultiplier": 1 - } - } - ], - "name": "floralis:blue_cactus_seeds" - } - ], - "conditions": [ - { - "condition": "minecraft:inverted", - "term": { - "condition": "minecraft:any_of", - "terms": [ - { - "condition": "minecraft:match_tool", - "predicate": { - "items": [ - "minecraft:shears" - ] - } - }, - { - "condition": "minecraft:match_tool", - "predicate": { - "enchantments": [ - { - "enchantment": "minecraft:silk_touch", - "levels": { - "min": 1 - } - } - ] - } - } - ] - } - } - ] - } - ] -} \ No newline at end of file diff --git a/src/main/resources/data/floralis/loot_tables/blocks/blue_cactus_crop.json b/src/main/resources/data/floralis/loot_tables/blocks/blue_cactus_crop.json deleted file mode 100644 index 66d6ec4f..00000000 --- a/src/main/resources/data/floralis/loot_tables/blocks/blue_cactus_crop.json +++ /dev/null @@ -1,550 +0,0 @@ -{ - "type": "minecraft:block", - "pools": [ - { - "rolls": 1, - "bonus_rolls": 0, - "entries": [ - { - "type": "minecraft:alternatives", - "children": [ - { - "type": "minecraft:item", - "conditions": [ - { - "condition": "minecraft:block_state_property", - "block": "floralis:blue_cactus_crop", - "properties": { - "age": "5" - } - }, - { - "condition": "minecraft:any_of", - "terms": [ - { - "condition": "minecraft:match_tool", - "predicate": { - "items": [ - "minecraft:shears" - ] - } - }, - { - "condition": "minecraft:match_tool", - "predicate": { - "enchantments": [ - { - "enchantment": "minecraft:silk_touch", - "levels": { - "min": 1 - } - } - ] - } - } - ] - } - ], - "name": "floralis:blue_cactus" - }, - { - "type": "minecraft:item", - "conditions": [ - { - "condition": "minecraft:any_of", - "terms": [ - { - "condition": "minecraft:match_tool", - "predicate": { - "items": [ - "minecraft:shears" - ] - } - }, - { - "condition": "minecraft:match_tool", - "predicate": { - "enchantments": [ - { - "enchantment": "minecraft:silk_touch", - "levels": { - "min": 1 - } - } - ] - } - } - ] - } - ], - "name": "floralis:blue_cactus_seeds" - } - ] - } - ] - }, - { - "rolls": 1, - "bonus_rolls": 0, - "entries": [ - { - "type": "minecraft:item", - "functions": [ - { - "function": "minecraft:set_count", - "count": 1, - "add": false - }, - { - "function": "minecraft:explosion_decay" - }, - { - "function": "minecraft:apply_bonus", - "enchantment": "minecraft:fortune", - "formula": "minecraft:uniform_bonus_count", - "parameters": { - "bonusMultiplier": 1 - } - } - ], - "name": "floralis:plant_fibers" - } - ], - "conditions": [ - { - "condition": "minecraft:block_state_property", - "block": "floralis:blue_cactus_crop", - "properties": { - "age": "5" - } - }, - { - "condition": "minecraft:inverted", - "term": { - "condition": "minecraft:any_of", - "terms": [ - { - "condition": "minecraft:match_tool", - "predicate": { - "items": [ - "minecraft:shears" - ] - } - }, - { - "condition": "minecraft:match_tool", - "predicate": { - "enchantments": [ - { - "enchantment": "minecraft:silk_touch", - "levels": { - "min": 1 - } - } - ] - } - } - ] - } - } - ] - }, - { - "rolls": 1, - "bonus_rolls": 0, - "entries": [ - { - "type": "minecraft:item", - "functions": [ - { - "function": "minecraft:set_count", - "count": 1, - "add": false - }, - { - "function": "minecraft:explosion_decay" - }, - { - "function": "minecraft:apply_bonus", - "enchantment": "minecraft:fortune", - "formula": "minecraft:uniform_bonus_count", - "parameters": { - "bonusMultiplier": 1 - } - } - ], - "name": "floralis:blue_petals" - } - ], - "conditions": [ - { - "condition": "minecraft:block_state_property", - "block": "floralis:blue_cactus_crop", - "properties": { - "age": "5" - } - }, - { - "condition": "minecraft:inverted", - "term": { - "condition": "minecraft:any_of", - "terms": [ - { - "condition": "minecraft:match_tool", - "predicate": { - "items": [ - "minecraft:shears" - ] - } - }, - { - "condition": "minecraft:match_tool", - "predicate": { - "enchantments": [ - { - "enchantment": "minecraft:silk_touch", - "levels": { - "min": 1 - } - } - ] - } - } - ] - } - } - ] - }, - { - "rolls": 1, - "bonus_rolls": 0, - "entries": [ - { - "type": "minecraft:item", - "functions": [ - { - "function": "minecraft:set_count", - "count": 2, - "add": false - }, - { - "function": "minecraft:explosion_decay" - }, - { - "function": "minecraft:apply_bonus", - "enchantment": "minecraft:fortune", - "formula": "minecraft:uniform_bonus_count", - "parameters": { - "bonusMultiplier": 1 - } - } - ], - "name": "floralis:blue_cactus_seeds" - } - ], - "conditions": [ - { - "condition": "minecraft:block_state_property", - "block": "floralis:blue_cactus_crop", - "properties": { - "age": "5" - } - }, - { - "condition": "minecraft:inverted", - "term": { - "condition": "minecraft:any_of", - "terms": [ - { - "condition": "minecraft:match_tool", - "predicate": { - "items": [ - "minecraft:shears" - ] - } - }, - { - "condition": "minecraft:match_tool", - "predicate": { - "enchantments": [ - { - "enchantment": "minecraft:silk_touch", - "levels": { - "min": 1 - } - } - ] - } - } - ] - } - } - ] - }, - { - "rolls": 1, - "bonus_rolls": 0, - "entries": [ - { - "type": "minecraft:item", - "functions": [ - { - "function": "minecraft:explosion_decay" - } - ], - "name": "floralis:blue_cactus_seeds" - } - ], - "conditions": [ - { - "condition": "minecraft:block_state_property", - "block": "floralis:blue_cactus_crop", - "properties": { - "age": "4" - } - }, - { - "condition": "minecraft:inverted", - "term": { - "condition": "minecraft:any_of", - "terms": [ - { - "condition": "minecraft:match_tool", - "predicate": { - "items": [ - "minecraft:shears" - ] - } - }, - { - "condition": "minecraft:match_tool", - "predicate": { - "enchantments": [ - { - "enchantment": "minecraft:silk_touch", - "levels": { - "min": 1 - } - } - ] - } - } - ] - } - } - ] - }, - { - "rolls": 1, - "bonus_rolls": 0, - "entries": [ - { - "type": "minecraft:item", - "functions": [ - { - "function": "minecraft:explosion_decay" - } - ], - "name": "floralis:blue_cactus_seeds" - } - ], - "conditions": [ - { - "condition": "minecraft:block_state_property", - "block": "floralis:blue_cactus_crop", - "properties": { - "age": "3" - } - }, - { - "condition": "minecraft:inverted", - "term": { - "condition": "minecraft:any_of", - "terms": [ - { - "condition": "minecraft:match_tool", - "predicate": { - "items": [ - "minecraft:shears" - ] - } - }, - { - "condition": "minecraft:match_tool", - "predicate": { - "enchantments": [ - { - "enchantment": "minecraft:silk_touch", - "levels": { - "min": 1 - } - } - ] - } - } - ] - } - } - ] - }, - { - "rolls": 1, - "bonus_rolls": 0, - "entries": [ - { - "type": "minecraft:item", - "functions": [ - { - "function": "minecraft:explosion_decay" - } - ], - "name": "floralis:blue_cactus_seeds" - } - ], - "conditions": [ - { - "condition": "minecraft:block_state_property", - "block": "floralis:blue_cactus_crop", - "properties": { - "age": "2" - } - }, - { - "condition": "minecraft:inverted", - "term": { - "condition": "minecraft:any_of", - "terms": [ - { - "condition": "minecraft:match_tool", - "predicate": { - "items": [ - "minecraft:shears" - ] - } - }, - { - "condition": "minecraft:match_tool", - "predicate": { - "enchantments": [ - { - "enchantment": "minecraft:silk_touch", - "levels": { - "min": 1 - } - } - ] - } - } - ] - } - } - ] - }, - { - "rolls": 1, - "bonus_rolls": 0, - "entries": [ - { - "type": "minecraft:item", - "functions": [ - { - "function": "minecraft:explosion_decay" - } - ], - "name": "floralis:blue_cactus_seeds" - } - ], - "conditions": [ - { - "condition": "minecraft:block_state_property", - "block": "floralis:blue_cactus_crop", - "properties": { - "age": "1" - } - }, - { - "condition": "minecraft:inverted", - "term": { - "condition": "minecraft:any_of", - "terms": [ - { - "condition": "minecraft:match_tool", - "predicate": { - "items": [ - "minecraft:shears" - ] - } - }, - { - "condition": "minecraft:match_tool", - "predicate": { - "enchantments": [ - { - "enchantment": "minecraft:silk_touch", - "levels": { - "min": 1 - } - } - ] - } - } - ] - } - } - ] - }, - { - "rolls": 1, - "bonus_rolls": 0, - "entries": [ - { - "type": "minecraft:item", - "functions": [ - { - "function": "minecraft:explosion_decay" - } - ], - "name": "floralis:blue_cactus_seeds" - } - ], - "conditions": [ - { - "condition": "minecraft:block_state_property", - "block": "floralis:blue_cactus_crop", - "properties": { - "age": "0" - } - }, - { - "condition": "minecraft:inverted", - "term": { - "condition": "minecraft:any_of", - "terms": [ - { - "condition": "minecraft:match_tool", - "predicate": { - "items": [ - "minecraft:shears" - ] - } - }, - { - "condition": "minecraft:match_tool", - "predicate": { - "enchantments": [ - { - "enchantment": "minecraft:silk_touch", - "levels": { - "min": 1 - } - } - ] - } - } - ] - } - } - ] - } - ] -} \ No newline at end of file diff --git a/src/main/resources/data/floralis/loot_tables/blocks/blue_flower.json b/src/main/resources/data/floralis/loot_tables/blocks/blue_flower.json deleted file mode 100644 index dddc7bbf..00000000 --- a/src/main/resources/data/floralis/loot_tables/blocks/blue_flower.json +++ /dev/null @@ -1,225 +0,0 @@ -{ - "type": "minecraft:block", - "pools": [ - { - "rolls": 1, - "bonus_rolls": 0, - "entries": [ - { - "type": "minecraft:alternatives", - "children": [ - { - "type": "minecraft:item", - "conditions": [ - { - "condition": "minecraft:any_of", - "terms": [ - { - "condition": "minecraft:match_tool", - "predicate": { - "items": [ - "minecraft:shears" - ] - } - }, - { - "condition": "minecraft:match_tool", - "predicate": { - "enchantments": [ - { - "enchantment": "minecraft:silk_touch", - "levels": { - "min": 1 - } - } - ] - } - } - ] - } - ], - "name": "floralis:blue_flower" - } - ] - } - ] - }, - { - "rolls": 1, - "bonus_rolls": 0, - "entries": [ - { - "type": "minecraft:item", - "functions": [ - { - "function": "minecraft:set_count", - "count": 1, - "add": false - }, - { - "function": "minecraft:explosion_decay" - }, - { - "function": "minecraft:apply_bonus", - "enchantment": "minecraft:fortune", - "formula": "minecraft:uniform_bonus_count", - "parameters": { - "bonusMultiplier": 1 - } - } - ], - "name": "floralis:plant_fibers" - } - ], - "conditions": [ - { - "condition": "minecraft:inverted", - "term": { - "condition": "minecraft:any_of", - "terms": [ - { - "condition": "minecraft:match_tool", - "predicate": { - "items": [ - "minecraft:shears" - ] - } - }, - { - "condition": "minecraft:match_tool", - "predicate": { - "enchantments": [ - { - "enchantment": "minecraft:silk_touch", - "levels": { - "min": 1 - } - } - ] - } - } - ] - } - } - ] - }, - { - "rolls": 1, - "bonus_rolls": 0, - "entries": [ - { - "type": "minecraft:item", - "functions": [ - { - "function": "minecraft:set_count", - "count": 1, - "add": false - }, - { - "function": "minecraft:explosion_decay" - }, - { - "function": "minecraft:apply_bonus", - "enchantment": "minecraft:fortune", - "formula": "minecraft:uniform_bonus_count", - "parameters": { - "bonusMultiplier": 1 - } - } - ], - "name": "floralis:blue_petals" - } - ], - "conditions": [ - { - "condition": "minecraft:inverted", - "term": { - "condition": "minecraft:any_of", - "terms": [ - { - "condition": "minecraft:match_tool", - "predicate": { - "items": [ - "minecraft:shears" - ] - } - }, - { - "condition": "minecraft:match_tool", - "predicate": { - "enchantments": [ - { - "enchantment": "minecraft:silk_touch", - "levels": { - "min": 1 - } - } - ] - } - } - ] - } - } - ] - }, - { - "rolls": 1, - "bonus_rolls": 0, - "entries": [ - { - "type": "minecraft:item", - "functions": [ - { - "function": "minecraft:set_count", - "count": 2, - "add": false - }, - { - "function": "minecraft:explosion_decay" - }, - { - "function": "minecraft:apply_bonus", - "enchantment": "minecraft:fortune", - "formula": "minecraft:uniform_bonus_count", - "parameters": { - "bonusMultiplier": 1 - } - } - ], - "name": "floralis:blue_flower_seeds" - } - ], - "conditions": [ - { - "condition": "minecraft:inverted", - "term": { - "condition": "minecraft:any_of", - "terms": [ - { - "condition": "minecraft:match_tool", - "predicate": { - "items": [ - "minecraft:shears" - ] - } - }, - { - "condition": "minecraft:match_tool", - "predicate": { - "enchantments": [ - { - "enchantment": "minecraft:silk_touch", - "levels": { - "min": 1 - } - } - ] - } - } - ] - } - } - ] - } - ] -} \ No newline at end of file diff --git a/src/main/resources/data/floralis/loot_tables/blocks/blue_flower_crop.json b/src/main/resources/data/floralis/loot_tables/blocks/blue_flower_crop.json deleted file mode 100644 index ad3a3565..00000000 --- a/src/main/resources/data/floralis/loot_tables/blocks/blue_flower_crop.json +++ /dev/null @@ -1,550 +0,0 @@ -{ - "type": "minecraft:block", - "pools": [ - { - "rolls": 1, - "bonus_rolls": 0, - "entries": [ - { - "type": "minecraft:alternatives", - "children": [ - { - "type": "minecraft:item", - "conditions": [ - { - "condition": "minecraft:block_state_property", - "block": "floralis:blue_flower_crop", - "properties": { - "age": "5" - } - }, - { - "condition": "minecraft:any_of", - "terms": [ - { - "condition": "minecraft:match_tool", - "predicate": { - "items": [ - "minecraft:shears" - ] - } - }, - { - "condition": "minecraft:match_tool", - "predicate": { - "enchantments": [ - { - "enchantment": "minecraft:silk_touch", - "levels": { - "min": 1 - } - } - ] - } - } - ] - } - ], - "name": "floralis:blue_flower" - }, - { - "type": "minecraft:item", - "conditions": [ - { - "condition": "minecraft:any_of", - "terms": [ - { - "condition": "minecraft:match_tool", - "predicate": { - "items": [ - "minecraft:shears" - ] - } - }, - { - "condition": "minecraft:match_tool", - "predicate": { - "enchantments": [ - { - "enchantment": "minecraft:silk_touch", - "levels": { - "min": 1 - } - } - ] - } - } - ] - } - ], - "name": "floralis:blue_flower_seeds" - } - ] - } - ] - }, - { - "rolls": 1, - "bonus_rolls": 0, - "entries": [ - { - "type": "minecraft:item", - "functions": [ - { - "function": "minecraft:set_count", - "count": 1, - "add": false - }, - { - "function": "minecraft:explosion_decay" - }, - { - "function": "minecraft:apply_bonus", - "enchantment": "minecraft:fortune", - "formula": "minecraft:uniform_bonus_count", - "parameters": { - "bonusMultiplier": 1 - } - } - ], - "name": "floralis:plant_fibers" - } - ], - "conditions": [ - { - "condition": "minecraft:block_state_property", - "block": "floralis:blue_flower_crop", - "properties": { - "age": "5" - } - }, - { - "condition": "minecraft:inverted", - "term": { - "condition": "minecraft:any_of", - "terms": [ - { - "condition": "minecraft:match_tool", - "predicate": { - "items": [ - "minecraft:shears" - ] - } - }, - { - "condition": "minecraft:match_tool", - "predicate": { - "enchantments": [ - { - "enchantment": "minecraft:silk_touch", - "levels": { - "min": 1 - } - } - ] - } - } - ] - } - } - ] - }, - { - "rolls": 1, - "bonus_rolls": 0, - "entries": [ - { - "type": "minecraft:item", - "functions": [ - { - "function": "minecraft:set_count", - "count": 1, - "add": false - }, - { - "function": "minecraft:explosion_decay" - }, - { - "function": "minecraft:apply_bonus", - "enchantment": "minecraft:fortune", - "formula": "minecraft:uniform_bonus_count", - "parameters": { - "bonusMultiplier": 1 - } - } - ], - "name": "floralis:blue_petals" - } - ], - "conditions": [ - { - "condition": "minecraft:block_state_property", - "block": "floralis:blue_flower_crop", - "properties": { - "age": "5" - } - }, - { - "condition": "minecraft:inverted", - "term": { - "condition": "minecraft:any_of", - "terms": [ - { - "condition": "minecraft:match_tool", - "predicate": { - "items": [ - "minecraft:shears" - ] - } - }, - { - "condition": "minecraft:match_tool", - "predicate": { - "enchantments": [ - { - "enchantment": "minecraft:silk_touch", - "levels": { - "min": 1 - } - } - ] - } - } - ] - } - } - ] - }, - { - "rolls": 1, - "bonus_rolls": 0, - "entries": [ - { - "type": "minecraft:item", - "functions": [ - { - "function": "minecraft:set_count", - "count": 2, - "add": false - }, - { - "function": "minecraft:explosion_decay" - }, - { - "function": "minecraft:apply_bonus", - "enchantment": "minecraft:fortune", - "formula": "minecraft:uniform_bonus_count", - "parameters": { - "bonusMultiplier": 1 - } - } - ], - "name": "floralis:blue_flower_seeds" - } - ], - "conditions": [ - { - "condition": "minecraft:block_state_property", - "block": "floralis:blue_flower_crop", - "properties": { - "age": "5" - } - }, - { - "condition": "minecraft:inverted", - "term": { - "condition": "minecraft:any_of", - "terms": [ - { - "condition": "minecraft:match_tool", - "predicate": { - "items": [ - "minecraft:shears" - ] - } - }, - { - "condition": "minecraft:match_tool", - "predicate": { - "enchantments": [ - { - "enchantment": "minecraft:silk_touch", - "levels": { - "min": 1 - } - } - ] - } - } - ] - } - } - ] - }, - { - "rolls": 1, - "bonus_rolls": 0, - "entries": [ - { - "type": "minecraft:item", - "functions": [ - { - "function": "minecraft:explosion_decay" - } - ], - "name": "floralis:blue_flower_seeds" - } - ], - "conditions": [ - { - "condition": "minecraft:block_state_property", - "block": "floralis:blue_flower_crop", - "properties": { - "age": "4" - } - }, - { - "condition": "minecraft:inverted", - "term": { - "condition": "minecraft:any_of", - "terms": [ - { - "condition": "minecraft:match_tool", - "predicate": { - "items": [ - "minecraft:shears" - ] - } - }, - { - "condition": "minecraft:match_tool", - "predicate": { - "enchantments": [ - { - "enchantment": "minecraft:silk_touch", - "levels": { - "min": 1 - } - } - ] - } - } - ] - } - } - ] - }, - { - "rolls": 1, - "bonus_rolls": 0, - "entries": [ - { - "type": "minecraft:item", - "functions": [ - { - "function": "minecraft:explosion_decay" - } - ], - "name": "floralis:blue_flower_seeds" - } - ], - "conditions": [ - { - "condition": "minecraft:block_state_property", - "block": "floralis:blue_flower_crop", - "properties": { - "age": "3" - } - }, - { - "condition": "minecraft:inverted", - "term": { - "condition": "minecraft:any_of", - "terms": [ - { - "condition": "minecraft:match_tool", - "predicate": { - "items": [ - "minecraft:shears" - ] - } - }, - { - "condition": "minecraft:match_tool", - "predicate": { - "enchantments": [ - { - "enchantment": "minecraft:silk_touch", - "levels": { - "min": 1 - } - } - ] - } - } - ] - } - } - ] - }, - { - "rolls": 1, - "bonus_rolls": 0, - "entries": [ - { - "type": "minecraft:item", - "functions": [ - { - "function": "minecraft:explosion_decay" - } - ], - "name": "floralis:blue_flower_seeds" - } - ], - "conditions": [ - { - "condition": "minecraft:block_state_property", - "block": "floralis:blue_flower_crop", - "properties": { - "age": "2" - } - }, - { - "condition": "minecraft:inverted", - "term": { - "condition": "minecraft:any_of", - "terms": [ - { - "condition": "minecraft:match_tool", - "predicate": { - "items": [ - "minecraft:shears" - ] - } - }, - { - "condition": "minecraft:match_tool", - "predicate": { - "enchantments": [ - { - "enchantment": "minecraft:silk_touch", - "levels": { - "min": 1 - } - } - ] - } - } - ] - } - } - ] - }, - { - "rolls": 1, - "bonus_rolls": 0, - "entries": [ - { - "type": "minecraft:item", - "functions": [ - { - "function": "minecraft:explosion_decay" - } - ], - "name": "floralis:blue_flower_seeds" - } - ], - "conditions": [ - { - "condition": "minecraft:block_state_property", - "block": "floralis:blue_flower_crop", - "properties": { - "age": "1" - } - }, - { - "condition": "minecraft:inverted", - "term": { - "condition": "minecraft:any_of", - "terms": [ - { - "condition": "minecraft:match_tool", - "predicate": { - "items": [ - "minecraft:shears" - ] - } - }, - { - "condition": "minecraft:match_tool", - "predicate": { - "enchantments": [ - { - "enchantment": "minecraft:silk_touch", - "levels": { - "min": 1 - } - } - ] - } - } - ] - } - } - ] - }, - { - "rolls": 1, - "bonus_rolls": 0, - "entries": [ - { - "type": "minecraft:item", - "functions": [ - { - "function": "minecraft:explosion_decay" - } - ], - "name": "floralis:blue_flower_seeds" - } - ], - "conditions": [ - { - "condition": "minecraft:block_state_property", - "block": "floralis:blue_flower_crop", - "properties": { - "age": "0" - } - }, - { - "condition": "minecraft:inverted", - "term": { - "condition": "minecraft:any_of", - "terms": [ - { - "condition": "minecraft:match_tool", - "predicate": { - "items": [ - "minecraft:shears" - ] - } - }, - { - "condition": "minecraft:match_tool", - "predicate": { - "enchantments": [ - { - "enchantment": "minecraft:silk_touch", - "levels": { - "min": 1 - } - } - ] - } - } - ] - } - } - ] - } - ] -} \ No newline at end of file diff --git a/src/main/resources/data/floralis/loot_tables/blocks/brown_cactus.json b/src/main/resources/data/floralis/loot_tables/blocks/brown_cactus.json deleted file mode 100644 index ed205cb4..00000000 --- a/src/main/resources/data/floralis/loot_tables/blocks/brown_cactus.json +++ /dev/null @@ -1,225 +0,0 @@ -{ - "type": "minecraft:block", - "pools": [ - { - "rolls": 1, - "bonus_rolls": 0, - "entries": [ - { - "type": "minecraft:alternatives", - "children": [ - { - "type": "minecraft:item", - "conditions": [ - { - "condition": "minecraft:any_of", - "terms": [ - { - "condition": "minecraft:match_tool", - "predicate": { - "items": [ - "minecraft:shears" - ] - } - }, - { - "condition": "minecraft:match_tool", - "predicate": { - "enchantments": [ - { - "enchantment": "minecraft:silk_touch", - "levels": { - "min": 1 - } - } - ] - } - } - ] - } - ], - "name": "floralis:brown_cactus" - } - ] - } - ] - }, - { - "rolls": 1, - "bonus_rolls": 0, - "entries": [ - { - "type": "minecraft:item", - "functions": [ - { - "function": "minecraft:set_count", - "count": 1, - "add": false - }, - { - "function": "minecraft:explosion_decay" - }, - { - "function": "minecraft:apply_bonus", - "enchantment": "minecraft:fortune", - "formula": "minecraft:uniform_bonus_count", - "parameters": { - "bonusMultiplier": 1 - } - } - ], - "name": "floralis:plant_fibers" - } - ], - "conditions": [ - { - "condition": "minecraft:inverted", - "term": { - "condition": "minecraft:any_of", - "terms": [ - { - "condition": "minecraft:match_tool", - "predicate": { - "items": [ - "minecraft:shears" - ] - } - }, - { - "condition": "minecraft:match_tool", - "predicate": { - "enchantments": [ - { - "enchantment": "minecraft:silk_touch", - "levels": { - "min": 1 - } - } - ] - } - } - ] - } - } - ] - }, - { - "rolls": 1, - "bonus_rolls": 0, - "entries": [ - { - "type": "minecraft:item", - "functions": [ - { - "function": "minecraft:set_count", - "count": 1, - "add": false - }, - { - "function": "minecraft:explosion_decay" - }, - { - "function": "minecraft:apply_bonus", - "enchantment": "minecraft:fortune", - "formula": "minecraft:uniform_bonus_count", - "parameters": { - "bonusMultiplier": 1 - } - } - ], - "name": "floralis:brown_petals" - } - ], - "conditions": [ - { - "condition": "minecraft:inverted", - "term": { - "condition": "minecraft:any_of", - "terms": [ - { - "condition": "minecraft:match_tool", - "predicate": { - "items": [ - "minecraft:shears" - ] - } - }, - { - "condition": "minecraft:match_tool", - "predicate": { - "enchantments": [ - { - "enchantment": "minecraft:silk_touch", - "levels": { - "min": 1 - } - } - ] - } - } - ] - } - } - ] - }, - { - "rolls": 1, - "bonus_rolls": 0, - "entries": [ - { - "type": "minecraft:item", - "functions": [ - { - "function": "minecraft:set_count", - "count": 2, - "add": false - }, - { - "function": "minecraft:explosion_decay" - }, - { - "function": "minecraft:apply_bonus", - "enchantment": "minecraft:fortune", - "formula": "minecraft:uniform_bonus_count", - "parameters": { - "bonusMultiplier": 1 - } - } - ], - "name": "floralis:brown_cactus_seeds" - } - ], - "conditions": [ - { - "condition": "minecraft:inverted", - "term": { - "condition": "minecraft:any_of", - "terms": [ - { - "condition": "minecraft:match_tool", - "predicate": { - "items": [ - "minecraft:shears" - ] - } - }, - { - "condition": "minecraft:match_tool", - "predicate": { - "enchantments": [ - { - "enchantment": "minecraft:silk_touch", - "levels": { - "min": 1 - } - } - ] - } - } - ] - } - } - ] - } - ] -} \ No newline at end of file diff --git a/src/main/resources/data/floralis/loot_tables/blocks/brown_cactus_crop.json b/src/main/resources/data/floralis/loot_tables/blocks/brown_cactus_crop.json deleted file mode 100644 index 522ef0f2..00000000 --- a/src/main/resources/data/floralis/loot_tables/blocks/brown_cactus_crop.json +++ /dev/null @@ -1,550 +0,0 @@ -{ - "type": "minecraft:block", - "pools": [ - { - "rolls": 1, - "bonus_rolls": 0, - "entries": [ - { - "type": "minecraft:alternatives", - "children": [ - { - "type": "minecraft:item", - "conditions": [ - { - "condition": "minecraft:block_state_property", - "block": "floralis:brown_cactus_crop", - "properties": { - "age": "5" - } - }, - { - "condition": "minecraft:any_of", - "terms": [ - { - "condition": "minecraft:match_tool", - "predicate": { - "items": [ - "minecraft:shears" - ] - } - }, - { - "condition": "minecraft:match_tool", - "predicate": { - "enchantments": [ - { - "enchantment": "minecraft:silk_touch", - "levels": { - "min": 1 - } - } - ] - } - } - ] - } - ], - "name": "floralis:brown_cactus" - }, - { - "type": "minecraft:item", - "conditions": [ - { - "condition": "minecraft:any_of", - "terms": [ - { - "condition": "minecraft:match_tool", - "predicate": { - "items": [ - "minecraft:shears" - ] - } - }, - { - "condition": "minecraft:match_tool", - "predicate": { - "enchantments": [ - { - "enchantment": "minecraft:silk_touch", - "levels": { - "min": 1 - } - } - ] - } - } - ] - } - ], - "name": "floralis:brown_cactus_seeds" - } - ] - } - ] - }, - { - "rolls": 1, - "bonus_rolls": 0, - "entries": [ - { - "type": "minecraft:item", - "functions": [ - { - "function": "minecraft:set_count", - "count": 1, - "add": false - }, - { - "function": "minecraft:explosion_decay" - }, - { - "function": "minecraft:apply_bonus", - "enchantment": "minecraft:fortune", - "formula": "minecraft:uniform_bonus_count", - "parameters": { - "bonusMultiplier": 1 - } - } - ], - "name": "floralis:plant_fibers" - } - ], - "conditions": [ - { - "condition": "minecraft:block_state_property", - "block": "floralis:brown_cactus_crop", - "properties": { - "age": "5" - } - }, - { - "condition": "minecraft:inverted", - "term": { - "condition": "minecraft:any_of", - "terms": [ - { - "condition": "minecraft:match_tool", - "predicate": { - "items": [ - "minecraft:shears" - ] - } - }, - { - "condition": "minecraft:match_tool", - "predicate": { - "enchantments": [ - { - "enchantment": "minecraft:silk_touch", - "levels": { - "min": 1 - } - } - ] - } - } - ] - } - } - ] - }, - { - "rolls": 1, - "bonus_rolls": 0, - "entries": [ - { - "type": "minecraft:item", - "functions": [ - { - "function": "minecraft:set_count", - "count": 1, - "add": false - }, - { - "function": "minecraft:explosion_decay" - }, - { - "function": "minecraft:apply_bonus", - "enchantment": "minecraft:fortune", - "formula": "minecraft:uniform_bonus_count", - "parameters": { - "bonusMultiplier": 1 - } - } - ], - "name": "floralis:brown_petals" - } - ], - "conditions": [ - { - "condition": "minecraft:block_state_property", - "block": "floralis:brown_cactus_crop", - "properties": { - "age": "5" - } - }, - { - "condition": "minecraft:inverted", - "term": { - "condition": "minecraft:any_of", - "terms": [ - { - "condition": "minecraft:match_tool", - "predicate": { - "items": [ - "minecraft:shears" - ] - } - }, - { - "condition": "minecraft:match_tool", - "predicate": { - "enchantments": [ - { - "enchantment": "minecraft:silk_touch", - "levels": { - "min": 1 - } - } - ] - } - } - ] - } - } - ] - }, - { - "rolls": 1, - "bonus_rolls": 0, - "entries": [ - { - "type": "minecraft:item", - "functions": [ - { - "function": "minecraft:set_count", - "count": 2, - "add": false - }, - { - "function": "minecraft:explosion_decay" - }, - { - "function": "minecraft:apply_bonus", - "enchantment": "minecraft:fortune", - "formula": "minecraft:uniform_bonus_count", - "parameters": { - "bonusMultiplier": 1 - } - } - ], - "name": "floralis:brown_cactus_seeds" - } - ], - "conditions": [ - { - "condition": "minecraft:block_state_property", - "block": "floralis:brown_cactus_crop", - "properties": { - "age": "5" - } - }, - { - "condition": "minecraft:inverted", - "term": { - "condition": "minecraft:any_of", - "terms": [ - { - "condition": "minecraft:match_tool", - "predicate": { - "items": [ - "minecraft:shears" - ] - } - }, - { - "condition": "minecraft:match_tool", - "predicate": { - "enchantments": [ - { - "enchantment": "minecraft:silk_touch", - "levels": { - "min": 1 - } - } - ] - } - } - ] - } - } - ] - }, - { - "rolls": 1, - "bonus_rolls": 0, - "entries": [ - { - "type": "minecraft:item", - "functions": [ - { - "function": "minecraft:explosion_decay" - } - ], - "name": "floralis:brown_cactus_seeds" - } - ], - "conditions": [ - { - "condition": "minecraft:block_state_property", - "block": "floralis:brown_cactus_crop", - "properties": { - "age": "4" - } - }, - { - "condition": "minecraft:inverted", - "term": { - "condition": "minecraft:any_of", - "terms": [ - { - "condition": "minecraft:match_tool", - "predicate": { - "items": [ - "minecraft:shears" - ] - } - }, - { - "condition": "minecraft:match_tool", - "predicate": { - "enchantments": [ - { - "enchantment": "minecraft:silk_touch", - "levels": { - "min": 1 - } - } - ] - } - } - ] - } - } - ] - }, - { - "rolls": 1, - "bonus_rolls": 0, - "entries": [ - { - "type": "minecraft:item", - "functions": [ - { - "function": "minecraft:explosion_decay" - } - ], - "name": "floralis:brown_cactus_seeds" - } - ], - "conditions": [ - { - "condition": "minecraft:block_state_property", - "block": "floralis:brown_cactus_crop", - "properties": { - "age": "3" - } - }, - { - "condition": "minecraft:inverted", - "term": { - "condition": "minecraft:any_of", - "terms": [ - { - "condition": "minecraft:match_tool", - "predicate": { - "items": [ - "minecraft:shears" - ] - } - }, - { - "condition": "minecraft:match_tool", - "predicate": { - "enchantments": [ - { - "enchantment": "minecraft:silk_touch", - "levels": { - "min": 1 - } - } - ] - } - } - ] - } - } - ] - }, - { - "rolls": 1, - "bonus_rolls": 0, - "entries": [ - { - "type": "minecraft:item", - "functions": [ - { - "function": "minecraft:explosion_decay" - } - ], - "name": "floralis:brown_cactus_seeds" - } - ], - "conditions": [ - { - "condition": "minecraft:block_state_property", - "block": "floralis:brown_cactus_crop", - "properties": { - "age": "2" - } - }, - { - "condition": "minecraft:inverted", - "term": { - "condition": "minecraft:any_of", - "terms": [ - { - "condition": "minecraft:match_tool", - "predicate": { - "items": [ - "minecraft:shears" - ] - } - }, - { - "condition": "minecraft:match_tool", - "predicate": { - "enchantments": [ - { - "enchantment": "minecraft:silk_touch", - "levels": { - "min": 1 - } - } - ] - } - } - ] - } - } - ] - }, - { - "rolls": 1, - "bonus_rolls": 0, - "entries": [ - { - "type": "minecraft:item", - "functions": [ - { - "function": "minecraft:explosion_decay" - } - ], - "name": "floralis:brown_cactus_seeds" - } - ], - "conditions": [ - { - "condition": "minecraft:block_state_property", - "block": "floralis:brown_cactus_crop", - "properties": { - "age": "1" - } - }, - { - "condition": "minecraft:inverted", - "term": { - "condition": "minecraft:any_of", - "terms": [ - { - "condition": "minecraft:match_tool", - "predicate": { - "items": [ - "minecraft:shears" - ] - } - }, - { - "condition": "minecraft:match_tool", - "predicate": { - "enchantments": [ - { - "enchantment": "minecraft:silk_touch", - "levels": { - "min": 1 - } - } - ] - } - } - ] - } - } - ] - }, - { - "rolls": 1, - "bonus_rolls": 0, - "entries": [ - { - "type": "minecraft:item", - "functions": [ - { - "function": "minecraft:explosion_decay" - } - ], - "name": "floralis:brown_cactus_seeds" - } - ], - "conditions": [ - { - "condition": "minecraft:block_state_property", - "block": "floralis:brown_cactus_crop", - "properties": { - "age": "0" - } - }, - { - "condition": "minecraft:inverted", - "term": { - "condition": "minecraft:any_of", - "terms": [ - { - "condition": "minecraft:match_tool", - "predicate": { - "items": [ - "minecraft:shears" - ] - } - }, - { - "condition": "minecraft:match_tool", - "predicate": { - "enchantments": [ - { - "enchantment": "minecraft:silk_touch", - "levels": { - "min": 1 - } - } - ] - } - } - ] - } - } - ] - } - ] -} \ No newline at end of file diff --git a/src/main/resources/data/floralis/loot_tables/blocks/brown_flower.json b/src/main/resources/data/floralis/loot_tables/blocks/brown_flower.json deleted file mode 100644 index d39833be..00000000 --- a/src/main/resources/data/floralis/loot_tables/blocks/brown_flower.json +++ /dev/null @@ -1,225 +0,0 @@ -{ - "type": "minecraft:block", - "pools": [ - { - "rolls": 1, - "bonus_rolls": 0, - "entries": [ - { - "type": "minecraft:alternatives", - "children": [ - { - "type": "minecraft:item", - "conditions": [ - { - "condition": "minecraft:any_of", - "terms": [ - { - "condition": "minecraft:match_tool", - "predicate": { - "items": [ - "minecraft:shears" - ] - } - }, - { - "condition": "minecraft:match_tool", - "predicate": { - "enchantments": [ - { - "enchantment": "minecraft:silk_touch", - "levels": { - "min": 1 - } - } - ] - } - } - ] - } - ], - "name": "floralis:brown_flower" - } - ] - } - ] - }, - { - "rolls": 1, - "bonus_rolls": 0, - "entries": [ - { - "type": "minecraft:item", - "functions": [ - { - "function": "minecraft:set_count", - "count": 1, - "add": false - }, - { - "function": "minecraft:explosion_decay" - }, - { - "function": "minecraft:apply_bonus", - "enchantment": "minecraft:fortune", - "formula": "minecraft:uniform_bonus_count", - "parameters": { - "bonusMultiplier": 1 - } - } - ], - "name": "floralis:plant_fibers" - } - ], - "conditions": [ - { - "condition": "minecraft:inverted", - "term": { - "condition": "minecraft:any_of", - "terms": [ - { - "condition": "minecraft:match_tool", - "predicate": { - "items": [ - "minecraft:shears" - ] - } - }, - { - "condition": "minecraft:match_tool", - "predicate": { - "enchantments": [ - { - "enchantment": "minecraft:silk_touch", - "levels": { - "min": 1 - } - } - ] - } - } - ] - } - } - ] - }, - { - "rolls": 1, - "bonus_rolls": 0, - "entries": [ - { - "type": "minecraft:item", - "functions": [ - { - "function": "minecraft:set_count", - "count": 1, - "add": false - }, - { - "function": "minecraft:explosion_decay" - }, - { - "function": "minecraft:apply_bonus", - "enchantment": "minecraft:fortune", - "formula": "minecraft:uniform_bonus_count", - "parameters": { - "bonusMultiplier": 1 - } - } - ], - "name": "floralis:brown_petals" - } - ], - "conditions": [ - { - "condition": "minecraft:inverted", - "term": { - "condition": "minecraft:any_of", - "terms": [ - { - "condition": "minecraft:match_tool", - "predicate": { - "items": [ - "minecraft:shears" - ] - } - }, - { - "condition": "minecraft:match_tool", - "predicate": { - "enchantments": [ - { - "enchantment": "minecraft:silk_touch", - "levels": { - "min": 1 - } - } - ] - } - } - ] - } - } - ] - }, - { - "rolls": 1, - "bonus_rolls": 0, - "entries": [ - { - "type": "minecraft:item", - "functions": [ - { - "function": "minecraft:set_count", - "count": 2, - "add": false - }, - { - "function": "minecraft:explosion_decay" - }, - { - "function": "minecraft:apply_bonus", - "enchantment": "minecraft:fortune", - "formula": "minecraft:uniform_bonus_count", - "parameters": { - "bonusMultiplier": 1 - } - } - ], - "name": "floralis:brown_flower_seeds" - } - ], - "conditions": [ - { - "condition": "minecraft:inverted", - "term": { - "condition": "minecraft:any_of", - "terms": [ - { - "condition": "minecraft:match_tool", - "predicate": { - "items": [ - "minecraft:shears" - ] - } - }, - { - "condition": "minecraft:match_tool", - "predicate": { - "enchantments": [ - { - "enchantment": "minecraft:silk_touch", - "levels": { - "min": 1 - } - } - ] - } - } - ] - } - } - ] - } - ] -} \ No newline at end of file diff --git a/src/main/resources/data/floralis/loot_tables/blocks/brown_flower_crop.json b/src/main/resources/data/floralis/loot_tables/blocks/brown_flower_crop.json deleted file mode 100644 index 0c777a1c..00000000 --- a/src/main/resources/data/floralis/loot_tables/blocks/brown_flower_crop.json +++ /dev/null @@ -1,550 +0,0 @@ -{ - "type": "minecraft:block", - "pools": [ - { - "rolls": 1, - "bonus_rolls": 0, - "entries": [ - { - "type": "minecraft:alternatives", - "children": [ - { - "type": "minecraft:item", - "conditions": [ - { - "condition": "minecraft:block_state_property", - "block": "floralis:brown_flower_crop", - "properties": { - "age": "5" - } - }, - { - "condition": "minecraft:any_of", - "terms": [ - { - "condition": "minecraft:match_tool", - "predicate": { - "items": [ - "minecraft:shears" - ] - } - }, - { - "condition": "minecraft:match_tool", - "predicate": { - "enchantments": [ - { - "enchantment": "minecraft:silk_touch", - "levels": { - "min": 1 - } - } - ] - } - } - ] - } - ], - "name": "floralis:brown_flower" - }, - { - "type": "minecraft:item", - "conditions": [ - { - "condition": "minecraft:any_of", - "terms": [ - { - "condition": "minecraft:match_tool", - "predicate": { - "items": [ - "minecraft:shears" - ] - } - }, - { - "condition": "minecraft:match_tool", - "predicate": { - "enchantments": [ - { - "enchantment": "minecraft:silk_touch", - "levels": { - "min": 1 - } - } - ] - } - } - ] - } - ], - "name": "floralis:brown_flower_seeds" - } - ] - } - ] - }, - { - "rolls": 1, - "bonus_rolls": 0, - "entries": [ - { - "type": "minecraft:item", - "functions": [ - { - "function": "minecraft:set_count", - "count": 1, - "add": false - }, - { - "function": "minecraft:explosion_decay" - }, - { - "function": "minecraft:apply_bonus", - "enchantment": "minecraft:fortune", - "formula": "minecraft:uniform_bonus_count", - "parameters": { - "bonusMultiplier": 1 - } - } - ], - "name": "floralis:plant_fibers" - } - ], - "conditions": [ - { - "condition": "minecraft:block_state_property", - "block": "floralis:brown_flower_crop", - "properties": { - "age": "5" - } - }, - { - "condition": "minecraft:inverted", - "term": { - "condition": "minecraft:any_of", - "terms": [ - { - "condition": "minecraft:match_tool", - "predicate": { - "items": [ - "minecraft:shears" - ] - } - }, - { - "condition": "minecraft:match_tool", - "predicate": { - "enchantments": [ - { - "enchantment": "minecraft:silk_touch", - "levels": { - "min": 1 - } - } - ] - } - } - ] - } - } - ] - }, - { - "rolls": 1, - "bonus_rolls": 0, - "entries": [ - { - "type": "minecraft:item", - "functions": [ - { - "function": "minecraft:set_count", - "count": 1, - "add": false - }, - { - "function": "minecraft:explosion_decay" - }, - { - "function": "minecraft:apply_bonus", - "enchantment": "minecraft:fortune", - "formula": "minecraft:uniform_bonus_count", - "parameters": { - "bonusMultiplier": 1 - } - } - ], - "name": "floralis:brown_petals" - } - ], - "conditions": [ - { - "condition": "minecraft:block_state_property", - "block": "floralis:brown_flower_crop", - "properties": { - "age": "5" - } - }, - { - "condition": "minecraft:inverted", - "term": { - "condition": "minecraft:any_of", - "terms": [ - { - "condition": "minecraft:match_tool", - "predicate": { - "items": [ - "minecraft:shears" - ] - } - }, - { - "condition": "minecraft:match_tool", - "predicate": { - "enchantments": [ - { - "enchantment": "minecraft:silk_touch", - "levels": { - "min": 1 - } - } - ] - } - } - ] - } - } - ] - }, - { - "rolls": 1, - "bonus_rolls": 0, - "entries": [ - { - "type": "minecraft:item", - "functions": [ - { - "function": "minecraft:set_count", - "count": 2, - "add": false - }, - { - "function": "minecraft:explosion_decay" - }, - { - "function": "minecraft:apply_bonus", - "enchantment": "minecraft:fortune", - "formula": "minecraft:uniform_bonus_count", - "parameters": { - "bonusMultiplier": 1 - } - } - ], - "name": "floralis:brown_flower_seeds" - } - ], - "conditions": [ - { - "condition": "minecraft:block_state_property", - "block": "floralis:brown_flower_crop", - "properties": { - "age": "5" - } - }, - { - "condition": "minecraft:inverted", - "term": { - "condition": "minecraft:any_of", - "terms": [ - { - "condition": "minecraft:match_tool", - "predicate": { - "items": [ - "minecraft:shears" - ] - } - }, - { - "condition": "minecraft:match_tool", - "predicate": { - "enchantments": [ - { - "enchantment": "minecraft:silk_touch", - "levels": { - "min": 1 - } - } - ] - } - } - ] - } - } - ] - }, - { - "rolls": 1, - "bonus_rolls": 0, - "entries": [ - { - "type": "minecraft:item", - "functions": [ - { - "function": "minecraft:explosion_decay" - } - ], - "name": "floralis:brown_flower_seeds" - } - ], - "conditions": [ - { - "condition": "minecraft:block_state_property", - "block": "floralis:brown_flower_crop", - "properties": { - "age": "4" - } - }, - { - "condition": "minecraft:inverted", - "term": { - "condition": "minecraft:any_of", - "terms": [ - { - "condition": "minecraft:match_tool", - "predicate": { - "items": [ - "minecraft:shears" - ] - } - }, - { - "condition": "minecraft:match_tool", - "predicate": { - "enchantments": [ - { - "enchantment": "minecraft:silk_touch", - "levels": { - "min": 1 - } - } - ] - } - } - ] - } - } - ] - }, - { - "rolls": 1, - "bonus_rolls": 0, - "entries": [ - { - "type": "minecraft:item", - "functions": [ - { - "function": "minecraft:explosion_decay" - } - ], - "name": "floralis:brown_flower_seeds" - } - ], - "conditions": [ - { - "condition": "minecraft:block_state_property", - "block": "floralis:brown_flower_crop", - "properties": { - "age": "3" - } - }, - { - "condition": "minecraft:inverted", - "term": { - "condition": "minecraft:any_of", - "terms": [ - { - "condition": "minecraft:match_tool", - "predicate": { - "items": [ - "minecraft:shears" - ] - } - }, - { - "condition": "minecraft:match_tool", - "predicate": { - "enchantments": [ - { - "enchantment": "minecraft:silk_touch", - "levels": { - "min": 1 - } - } - ] - } - } - ] - } - } - ] - }, - { - "rolls": 1, - "bonus_rolls": 0, - "entries": [ - { - "type": "minecraft:item", - "functions": [ - { - "function": "minecraft:explosion_decay" - } - ], - "name": "floralis:brown_flower_seeds" - } - ], - "conditions": [ - { - "condition": "minecraft:block_state_property", - "block": "floralis:brown_flower_crop", - "properties": { - "age": "2" - } - }, - { - "condition": "minecraft:inverted", - "term": { - "condition": "minecraft:any_of", - "terms": [ - { - "condition": "minecraft:match_tool", - "predicate": { - "items": [ - "minecraft:shears" - ] - } - }, - { - "condition": "minecraft:match_tool", - "predicate": { - "enchantments": [ - { - "enchantment": "minecraft:silk_touch", - "levels": { - "min": 1 - } - } - ] - } - } - ] - } - } - ] - }, - { - "rolls": 1, - "bonus_rolls": 0, - "entries": [ - { - "type": "minecraft:item", - "functions": [ - { - "function": "minecraft:explosion_decay" - } - ], - "name": "floralis:brown_flower_seeds" - } - ], - "conditions": [ - { - "condition": "minecraft:block_state_property", - "block": "floralis:brown_flower_crop", - "properties": { - "age": "1" - } - }, - { - "condition": "minecraft:inverted", - "term": { - "condition": "minecraft:any_of", - "terms": [ - { - "condition": "minecraft:match_tool", - "predicate": { - "items": [ - "minecraft:shears" - ] - } - }, - { - "condition": "minecraft:match_tool", - "predicate": { - "enchantments": [ - { - "enchantment": "minecraft:silk_touch", - "levels": { - "min": 1 - } - } - ] - } - } - ] - } - } - ] - }, - { - "rolls": 1, - "bonus_rolls": 0, - "entries": [ - { - "type": "minecraft:item", - "functions": [ - { - "function": "minecraft:explosion_decay" - } - ], - "name": "floralis:brown_flower_seeds" - } - ], - "conditions": [ - { - "condition": "minecraft:block_state_property", - "block": "floralis:brown_flower_crop", - "properties": { - "age": "0" - } - }, - { - "condition": "minecraft:inverted", - "term": { - "condition": "minecraft:any_of", - "terms": [ - { - "condition": "minecraft:match_tool", - "predicate": { - "items": [ - "minecraft:shears" - ] - } - }, - { - "condition": "minecraft:match_tool", - "predicate": { - "enchantments": [ - { - "enchantment": "minecraft:silk_touch", - "levels": { - "min": 1 - } - } - ] - } - } - ] - } - } - ] - } - ] -} \ No newline at end of file diff --git a/src/main/resources/data/floralis/loot_tables/blocks/cyan_cactus.json b/src/main/resources/data/floralis/loot_tables/blocks/cyan_cactus.json deleted file mode 100644 index baec3ad5..00000000 --- a/src/main/resources/data/floralis/loot_tables/blocks/cyan_cactus.json +++ /dev/null @@ -1,225 +0,0 @@ -{ - "type": "minecraft:block", - "pools": [ - { - "rolls": 1, - "bonus_rolls": 0, - "entries": [ - { - "type": "minecraft:alternatives", - "children": [ - { - "type": "minecraft:item", - "conditions": [ - { - "condition": "minecraft:any_of", - "terms": [ - { - "condition": "minecraft:match_tool", - "predicate": { - "items": [ - "minecraft:shears" - ] - } - }, - { - "condition": "minecraft:match_tool", - "predicate": { - "enchantments": [ - { - "enchantment": "minecraft:silk_touch", - "levels": { - "min": 1 - } - } - ] - } - } - ] - } - ], - "name": "floralis:cyan_cactus" - } - ] - } - ] - }, - { - "rolls": 1, - "bonus_rolls": 0, - "entries": [ - { - "type": "minecraft:item", - "functions": [ - { - "function": "minecraft:set_count", - "count": 1, - "add": false - }, - { - "function": "minecraft:explosion_decay" - }, - { - "function": "minecraft:apply_bonus", - "enchantment": "minecraft:fortune", - "formula": "minecraft:uniform_bonus_count", - "parameters": { - "bonusMultiplier": 1 - } - } - ], - "name": "floralis:plant_fibers" - } - ], - "conditions": [ - { - "condition": "minecraft:inverted", - "term": { - "condition": "minecraft:any_of", - "terms": [ - { - "condition": "minecraft:match_tool", - "predicate": { - "items": [ - "minecraft:shears" - ] - } - }, - { - "condition": "minecraft:match_tool", - "predicate": { - "enchantments": [ - { - "enchantment": "minecraft:silk_touch", - "levels": { - "min": 1 - } - } - ] - } - } - ] - } - } - ] - }, - { - "rolls": 1, - "bonus_rolls": 0, - "entries": [ - { - "type": "minecraft:item", - "functions": [ - { - "function": "minecraft:set_count", - "count": 1, - "add": false - }, - { - "function": "minecraft:explosion_decay" - }, - { - "function": "minecraft:apply_bonus", - "enchantment": "minecraft:fortune", - "formula": "minecraft:uniform_bonus_count", - "parameters": { - "bonusMultiplier": 1 - } - } - ], - "name": "floralis:cyan_petals" - } - ], - "conditions": [ - { - "condition": "minecraft:inverted", - "term": { - "condition": "minecraft:any_of", - "terms": [ - { - "condition": "minecraft:match_tool", - "predicate": { - "items": [ - "minecraft:shears" - ] - } - }, - { - "condition": "minecraft:match_tool", - "predicate": { - "enchantments": [ - { - "enchantment": "minecraft:silk_touch", - "levels": { - "min": 1 - } - } - ] - } - } - ] - } - } - ] - }, - { - "rolls": 1, - "bonus_rolls": 0, - "entries": [ - { - "type": "minecraft:item", - "functions": [ - { - "function": "minecraft:set_count", - "count": 2, - "add": false - }, - { - "function": "minecraft:explosion_decay" - }, - { - "function": "minecraft:apply_bonus", - "enchantment": "minecraft:fortune", - "formula": "minecraft:uniform_bonus_count", - "parameters": { - "bonusMultiplier": 1 - } - } - ], - "name": "floralis:cyan_cactus_seeds" - } - ], - "conditions": [ - { - "condition": "minecraft:inverted", - "term": { - "condition": "minecraft:any_of", - "terms": [ - { - "condition": "minecraft:match_tool", - "predicate": { - "items": [ - "minecraft:shears" - ] - } - }, - { - "condition": "minecraft:match_tool", - "predicate": { - "enchantments": [ - { - "enchantment": "minecraft:silk_touch", - "levels": { - "min": 1 - } - } - ] - } - } - ] - } - } - ] - } - ] -} \ No newline at end of file diff --git a/src/main/resources/data/floralis/loot_tables/blocks/cyan_cactus_crop.json b/src/main/resources/data/floralis/loot_tables/blocks/cyan_cactus_crop.json deleted file mode 100644 index e9c4e60a..00000000 --- a/src/main/resources/data/floralis/loot_tables/blocks/cyan_cactus_crop.json +++ /dev/null @@ -1,550 +0,0 @@ -{ - "type": "minecraft:block", - "pools": [ - { - "rolls": 1, - "bonus_rolls": 0, - "entries": [ - { - "type": "minecraft:alternatives", - "children": [ - { - "type": "minecraft:item", - "conditions": [ - { - "condition": "minecraft:block_state_property", - "block": "floralis:cyan_cactus_crop", - "properties": { - "age": "5" - } - }, - { - "condition": "minecraft:any_of", - "terms": [ - { - "condition": "minecraft:match_tool", - "predicate": { - "items": [ - "minecraft:shears" - ] - } - }, - { - "condition": "minecraft:match_tool", - "predicate": { - "enchantments": [ - { - "enchantment": "minecraft:silk_touch", - "levels": { - "min": 1 - } - } - ] - } - } - ] - } - ], - "name": "floralis:cyan_cactus" - }, - { - "type": "minecraft:item", - "conditions": [ - { - "condition": "minecraft:any_of", - "terms": [ - { - "condition": "minecraft:match_tool", - "predicate": { - "items": [ - "minecraft:shears" - ] - } - }, - { - "condition": "minecraft:match_tool", - "predicate": { - "enchantments": [ - { - "enchantment": "minecraft:silk_touch", - "levels": { - "min": 1 - } - } - ] - } - } - ] - } - ], - "name": "floralis:cyan_cactus_seeds" - } - ] - } - ] - }, - { - "rolls": 1, - "bonus_rolls": 0, - "entries": [ - { - "type": "minecraft:item", - "functions": [ - { - "function": "minecraft:set_count", - "count": 1, - "add": false - }, - { - "function": "minecraft:explosion_decay" - }, - { - "function": "minecraft:apply_bonus", - "enchantment": "minecraft:fortune", - "formula": "minecraft:uniform_bonus_count", - "parameters": { - "bonusMultiplier": 1 - } - } - ], - "name": "floralis:plant_fibers" - } - ], - "conditions": [ - { - "condition": "minecraft:block_state_property", - "block": "floralis:cyan_cactus_crop", - "properties": { - "age": "5" - } - }, - { - "condition": "minecraft:inverted", - "term": { - "condition": "minecraft:any_of", - "terms": [ - { - "condition": "minecraft:match_tool", - "predicate": { - "items": [ - "minecraft:shears" - ] - } - }, - { - "condition": "minecraft:match_tool", - "predicate": { - "enchantments": [ - { - "enchantment": "minecraft:silk_touch", - "levels": { - "min": 1 - } - } - ] - } - } - ] - } - } - ] - }, - { - "rolls": 1, - "bonus_rolls": 0, - "entries": [ - { - "type": "minecraft:item", - "functions": [ - { - "function": "minecraft:set_count", - "count": 1, - "add": false - }, - { - "function": "minecraft:explosion_decay" - }, - { - "function": "minecraft:apply_bonus", - "enchantment": "minecraft:fortune", - "formula": "minecraft:uniform_bonus_count", - "parameters": { - "bonusMultiplier": 1 - } - } - ], - "name": "floralis:cyan_petals" - } - ], - "conditions": [ - { - "condition": "minecraft:block_state_property", - "block": "floralis:cyan_cactus_crop", - "properties": { - "age": "5" - } - }, - { - "condition": "minecraft:inverted", - "term": { - "condition": "minecraft:any_of", - "terms": [ - { - "condition": "minecraft:match_tool", - "predicate": { - "items": [ - "minecraft:shears" - ] - } - }, - { - "condition": "minecraft:match_tool", - "predicate": { - "enchantments": [ - { - "enchantment": "minecraft:silk_touch", - "levels": { - "min": 1 - } - } - ] - } - } - ] - } - } - ] - }, - { - "rolls": 1, - "bonus_rolls": 0, - "entries": [ - { - "type": "minecraft:item", - "functions": [ - { - "function": "minecraft:set_count", - "count": 2, - "add": false - }, - { - "function": "minecraft:explosion_decay" - }, - { - "function": "minecraft:apply_bonus", - "enchantment": "minecraft:fortune", - "formula": "minecraft:uniform_bonus_count", - "parameters": { - "bonusMultiplier": 1 - } - } - ], - "name": "floralis:cyan_cactus_seeds" - } - ], - "conditions": [ - { - "condition": "minecraft:block_state_property", - "block": "floralis:cyan_cactus_crop", - "properties": { - "age": "5" - } - }, - { - "condition": "minecraft:inverted", - "term": { - "condition": "minecraft:any_of", - "terms": [ - { - "condition": "minecraft:match_tool", - "predicate": { - "items": [ - "minecraft:shears" - ] - } - }, - { - "condition": "minecraft:match_tool", - "predicate": { - "enchantments": [ - { - "enchantment": "minecraft:silk_touch", - "levels": { - "min": 1 - } - } - ] - } - } - ] - } - } - ] - }, - { - "rolls": 1, - "bonus_rolls": 0, - "entries": [ - { - "type": "minecraft:item", - "functions": [ - { - "function": "minecraft:explosion_decay" - } - ], - "name": "floralis:cyan_cactus_seeds" - } - ], - "conditions": [ - { - "condition": "minecraft:block_state_property", - "block": "floralis:cyan_cactus_crop", - "properties": { - "age": "4" - } - }, - { - "condition": "minecraft:inverted", - "term": { - "condition": "minecraft:any_of", - "terms": [ - { - "condition": "minecraft:match_tool", - "predicate": { - "items": [ - "minecraft:shears" - ] - } - }, - { - "condition": "minecraft:match_tool", - "predicate": { - "enchantments": [ - { - "enchantment": "minecraft:silk_touch", - "levels": { - "min": 1 - } - } - ] - } - } - ] - } - } - ] - }, - { - "rolls": 1, - "bonus_rolls": 0, - "entries": [ - { - "type": "minecraft:item", - "functions": [ - { - "function": "minecraft:explosion_decay" - } - ], - "name": "floralis:cyan_cactus_seeds" - } - ], - "conditions": [ - { - "condition": "minecraft:block_state_property", - "block": "floralis:cyan_cactus_crop", - "properties": { - "age": "3" - } - }, - { - "condition": "minecraft:inverted", - "term": { - "condition": "minecraft:any_of", - "terms": [ - { - "condition": "minecraft:match_tool", - "predicate": { - "items": [ - "minecraft:shears" - ] - } - }, - { - "condition": "minecraft:match_tool", - "predicate": { - "enchantments": [ - { - "enchantment": "minecraft:silk_touch", - "levels": { - "min": 1 - } - } - ] - } - } - ] - } - } - ] - }, - { - "rolls": 1, - "bonus_rolls": 0, - "entries": [ - { - "type": "minecraft:item", - "functions": [ - { - "function": "minecraft:explosion_decay" - } - ], - "name": "floralis:cyan_cactus_seeds" - } - ], - "conditions": [ - { - "condition": "minecraft:block_state_property", - "block": "floralis:cyan_cactus_crop", - "properties": { - "age": "2" - } - }, - { - "condition": "minecraft:inverted", - "term": { - "condition": "minecraft:any_of", - "terms": [ - { - "condition": "minecraft:match_tool", - "predicate": { - "items": [ - "minecraft:shears" - ] - } - }, - { - "condition": "minecraft:match_tool", - "predicate": { - "enchantments": [ - { - "enchantment": "minecraft:silk_touch", - "levels": { - "min": 1 - } - } - ] - } - } - ] - } - } - ] - }, - { - "rolls": 1, - "bonus_rolls": 0, - "entries": [ - { - "type": "minecraft:item", - "functions": [ - { - "function": "minecraft:explosion_decay" - } - ], - "name": "floralis:cyan_cactus_seeds" - } - ], - "conditions": [ - { - "condition": "minecraft:block_state_property", - "block": "floralis:cyan_cactus_crop", - "properties": { - "age": "1" - } - }, - { - "condition": "minecraft:inverted", - "term": { - "condition": "minecraft:any_of", - "terms": [ - { - "condition": "minecraft:match_tool", - "predicate": { - "items": [ - "minecraft:shears" - ] - } - }, - { - "condition": "minecraft:match_tool", - "predicate": { - "enchantments": [ - { - "enchantment": "minecraft:silk_touch", - "levels": { - "min": 1 - } - } - ] - } - } - ] - } - } - ] - }, - { - "rolls": 1, - "bonus_rolls": 0, - "entries": [ - { - "type": "minecraft:item", - "functions": [ - { - "function": "minecraft:explosion_decay" - } - ], - "name": "floralis:cyan_cactus_seeds" - } - ], - "conditions": [ - { - "condition": "minecraft:block_state_property", - "block": "floralis:cyan_cactus_crop", - "properties": { - "age": "0" - } - }, - { - "condition": "minecraft:inverted", - "term": { - "condition": "minecraft:any_of", - "terms": [ - { - "condition": "minecraft:match_tool", - "predicate": { - "items": [ - "minecraft:shears" - ] - } - }, - { - "condition": "minecraft:match_tool", - "predicate": { - "enchantments": [ - { - "enchantment": "minecraft:silk_touch", - "levels": { - "min": 1 - } - } - ] - } - } - ] - } - } - ] - } - ] -} \ No newline at end of file diff --git a/src/main/resources/data/floralis/loot_tables/blocks/cyan_flower.json b/src/main/resources/data/floralis/loot_tables/blocks/cyan_flower.json deleted file mode 100644 index 723d1edd..00000000 --- a/src/main/resources/data/floralis/loot_tables/blocks/cyan_flower.json +++ /dev/null @@ -1,225 +0,0 @@ -{ - "type": "minecraft:block", - "pools": [ - { - "rolls": 1, - "bonus_rolls": 0, - "entries": [ - { - "type": "minecraft:alternatives", - "children": [ - { - "type": "minecraft:item", - "conditions": [ - { - "condition": "minecraft:any_of", - "terms": [ - { - "condition": "minecraft:match_tool", - "predicate": { - "items": [ - "minecraft:shears" - ] - } - }, - { - "condition": "minecraft:match_tool", - "predicate": { - "enchantments": [ - { - "enchantment": "minecraft:silk_touch", - "levels": { - "min": 1 - } - } - ] - } - } - ] - } - ], - "name": "floralis:cyan_flower" - } - ] - } - ] - }, - { - "rolls": 1, - "bonus_rolls": 0, - "entries": [ - { - "type": "minecraft:item", - "functions": [ - { - "function": "minecraft:set_count", - "count": 1, - "add": false - }, - { - "function": "minecraft:explosion_decay" - }, - { - "function": "minecraft:apply_bonus", - "enchantment": "minecraft:fortune", - "formula": "minecraft:uniform_bonus_count", - "parameters": { - "bonusMultiplier": 1 - } - } - ], - "name": "floralis:plant_fibers" - } - ], - "conditions": [ - { - "condition": "minecraft:inverted", - "term": { - "condition": "minecraft:any_of", - "terms": [ - { - "condition": "minecraft:match_tool", - "predicate": { - "items": [ - "minecraft:shears" - ] - } - }, - { - "condition": "minecraft:match_tool", - "predicate": { - "enchantments": [ - { - "enchantment": "minecraft:silk_touch", - "levels": { - "min": 1 - } - } - ] - } - } - ] - } - } - ] - }, - { - "rolls": 1, - "bonus_rolls": 0, - "entries": [ - { - "type": "minecraft:item", - "functions": [ - { - "function": "minecraft:set_count", - "count": 1, - "add": false - }, - { - "function": "minecraft:explosion_decay" - }, - { - "function": "minecraft:apply_bonus", - "enchantment": "minecraft:fortune", - "formula": "minecraft:uniform_bonus_count", - "parameters": { - "bonusMultiplier": 1 - } - } - ], - "name": "floralis:cyan_petals" - } - ], - "conditions": [ - { - "condition": "minecraft:inverted", - "term": { - "condition": "minecraft:any_of", - "terms": [ - { - "condition": "minecraft:match_tool", - "predicate": { - "items": [ - "minecraft:shears" - ] - } - }, - { - "condition": "minecraft:match_tool", - "predicate": { - "enchantments": [ - { - "enchantment": "minecraft:silk_touch", - "levels": { - "min": 1 - } - } - ] - } - } - ] - } - } - ] - }, - { - "rolls": 1, - "bonus_rolls": 0, - "entries": [ - { - "type": "minecraft:item", - "functions": [ - { - "function": "minecraft:set_count", - "count": 2, - "add": false - }, - { - "function": "minecraft:explosion_decay" - }, - { - "function": "minecraft:apply_bonus", - "enchantment": "minecraft:fortune", - "formula": "minecraft:uniform_bonus_count", - "parameters": { - "bonusMultiplier": 1 - } - } - ], - "name": "floralis:cyan_flower_seeds" - } - ], - "conditions": [ - { - "condition": "minecraft:inverted", - "term": { - "condition": "minecraft:any_of", - "terms": [ - { - "condition": "minecraft:match_tool", - "predicate": { - "items": [ - "minecraft:shears" - ] - } - }, - { - "condition": "minecraft:match_tool", - "predicate": { - "enchantments": [ - { - "enchantment": "minecraft:silk_touch", - "levels": { - "min": 1 - } - } - ] - } - } - ] - } - } - ] - } - ] -} \ No newline at end of file diff --git a/src/main/resources/data/floralis/loot_tables/blocks/cyan_flower_crop.json b/src/main/resources/data/floralis/loot_tables/blocks/cyan_flower_crop.json deleted file mode 100644 index 8b2a8b35..00000000 --- a/src/main/resources/data/floralis/loot_tables/blocks/cyan_flower_crop.json +++ /dev/null @@ -1,550 +0,0 @@ -{ - "type": "minecraft:block", - "pools": [ - { - "rolls": 1, - "bonus_rolls": 0, - "entries": [ - { - "type": "minecraft:alternatives", - "children": [ - { - "type": "minecraft:item", - "conditions": [ - { - "condition": "minecraft:block_state_property", - "block": "floralis:cyan_flower_crop", - "properties": { - "age": "5" - } - }, - { - "condition": "minecraft:any_of", - "terms": [ - { - "condition": "minecraft:match_tool", - "predicate": { - "items": [ - "minecraft:shears" - ] - } - }, - { - "condition": "minecraft:match_tool", - "predicate": { - "enchantments": [ - { - "enchantment": "minecraft:silk_touch", - "levels": { - "min": 1 - } - } - ] - } - } - ] - } - ], - "name": "floralis:cyan_flower" - }, - { - "type": "minecraft:item", - "conditions": [ - { - "condition": "minecraft:any_of", - "terms": [ - { - "condition": "minecraft:match_tool", - "predicate": { - "items": [ - "minecraft:shears" - ] - } - }, - { - "condition": "minecraft:match_tool", - "predicate": { - "enchantments": [ - { - "enchantment": "minecraft:silk_touch", - "levels": { - "min": 1 - } - } - ] - } - } - ] - } - ], - "name": "floralis:cyan_flower_seeds" - } - ] - } - ] - }, - { - "rolls": 1, - "bonus_rolls": 0, - "entries": [ - { - "type": "minecraft:item", - "functions": [ - { - "function": "minecraft:set_count", - "count": 1, - "add": false - }, - { - "function": "minecraft:explosion_decay" - }, - { - "function": "minecraft:apply_bonus", - "enchantment": "minecraft:fortune", - "formula": "minecraft:uniform_bonus_count", - "parameters": { - "bonusMultiplier": 1 - } - } - ], - "name": "floralis:plant_fibers" - } - ], - "conditions": [ - { - "condition": "minecraft:block_state_property", - "block": "floralis:cyan_flower_crop", - "properties": { - "age": "5" - } - }, - { - "condition": "minecraft:inverted", - "term": { - "condition": "minecraft:any_of", - "terms": [ - { - "condition": "minecraft:match_tool", - "predicate": { - "items": [ - "minecraft:shears" - ] - } - }, - { - "condition": "minecraft:match_tool", - "predicate": { - "enchantments": [ - { - "enchantment": "minecraft:silk_touch", - "levels": { - "min": 1 - } - } - ] - } - } - ] - } - } - ] - }, - { - "rolls": 1, - "bonus_rolls": 0, - "entries": [ - { - "type": "minecraft:item", - "functions": [ - { - "function": "minecraft:set_count", - "count": 1, - "add": false - }, - { - "function": "minecraft:explosion_decay" - }, - { - "function": "minecraft:apply_bonus", - "enchantment": "minecraft:fortune", - "formula": "minecraft:uniform_bonus_count", - "parameters": { - "bonusMultiplier": 1 - } - } - ], - "name": "floralis:cyan_petals" - } - ], - "conditions": [ - { - "condition": "minecraft:block_state_property", - "block": "floralis:cyan_flower_crop", - "properties": { - "age": "5" - } - }, - { - "condition": "minecraft:inverted", - "term": { - "condition": "minecraft:any_of", - "terms": [ - { - "condition": "minecraft:match_tool", - "predicate": { - "items": [ - "minecraft:shears" - ] - } - }, - { - "condition": "minecraft:match_tool", - "predicate": { - "enchantments": [ - { - "enchantment": "minecraft:silk_touch", - "levels": { - "min": 1 - } - } - ] - } - } - ] - } - } - ] - }, - { - "rolls": 1, - "bonus_rolls": 0, - "entries": [ - { - "type": "minecraft:item", - "functions": [ - { - "function": "minecraft:set_count", - "count": 2, - "add": false - }, - { - "function": "minecraft:explosion_decay" - }, - { - "function": "minecraft:apply_bonus", - "enchantment": "minecraft:fortune", - "formula": "minecraft:uniform_bonus_count", - "parameters": { - "bonusMultiplier": 1 - } - } - ], - "name": "floralis:cyan_flower_seeds" - } - ], - "conditions": [ - { - "condition": "minecraft:block_state_property", - "block": "floralis:cyan_flower_crop", - "properties": { - "age": "5" - } - }, - { - "condition": "minecraft:inverted", - "term": { - "condition": "minecraft:any_of", - "terms": [ - { - "condition": "minecraft:match_tool", - "predicate": { - "items": [ - "minecraft:shears" - ] - } - }, - { - "condition": "minecraft:match_tool", - "predicate": { - "enchantments": [ - { - "enchantment": "minecraft:silk_touch", - "levels": { - "min": 1 - } - } - ] - } - } - ] - } - } - ] - }, - { - "rolls": 1, - "bonus_rolls": 0, - "entries": [ - { - "type": "minecraft:item", - "functions": [ - { - "function": "minecraft:explosion_decay" - } - ], - "name": "floralis:cyan_flower_seeds" - } - ], - "conditions": [ - { - "condition": "minecraft:block_state_property", - "block": "floralis:cyan_flower_crop", - "properties": { - "age": "4" - } - }, - { - "condition": "minecraft:inverted", - "term": { - "condition": "minecraft:any_of", - "terms": [ - { - "condition": "minecraft:match_tool", - "predicate": { - "items": [ - "minecraft:shears" - ] - } - }, - { - "condition": "minecraft:match_tool", - "predicate": { - "enchantments": [ - { - "enchantment": "minecraft:silk_touch", - "levels": { - "min": 1 - } - } - ] - } - } - ] - } - } - ] - }, - { - "rolls": 1, - "bonus_rolls": 0, - "entries": [ - { - "type": "minecraft:item", - "functions": [ - { - "function": "minecraft:explosion_decay" - } - ], - "name": "floralis:cyan_flower_seeds" - } - ], - "conditions": [ - { - "condition": "minecraft:block_state_property", - "block": "floralis:cyan_flower_crop", - "properties": { - "age": "3" - } - }, - { - "condition": "minecraft:inverted", - "term": { - "condition": "minecraft:any_of", - "terms": [ - { - "condition": "minecraft:match_tool", - "predicate": { - "items": [ - "minecraft:shears" - ] - } - }, - { - "condition": "minecraft:match_tool", - "predicate": { - "enchantments": [ - { - "enchantment": "minecraft:silk_touch", - "levels": { - "min": 1 - } - } - ] - } - } - ] - } - } - ] - }, - { - "rolls": 1, - "bonus_rolls": 0, - "entries": [ - { - "type": "minecraft:item", - "functions": [ - { - "function": "minecraft:explosion_decay" - } - ], - "name": "floralis:cyan_flower_seeds" - } - ], - "conditions": [ - { - "condition": "minecraft:block_state_property", - "block": "floralis:cyan_flower_crop", - "properties": { - "age": "2" - } - }, - { - "condition": "minecraft:inverted", - "term": { - "condition": "minecraft:any_of", - "terms": [ - { - "condition": "minecraft:match_tool", - "predicate": { - "items": [ - "minecraft:shears" - ] - } - }, - { - "condition": "minecraft:match_tool", - "predicate": { - "enchantments": [ - { - "enchantment": "minecraft:silk_touch", - "levels": { - "min": 1 - } - } - ] - } - } - ] - } - } - ] - }, - { - "rolls": 1, - "bonus_rolls": 0, - "entries": [ - { - "type": "minecraft:item", - "functions": [ - { - "function": "minecraft:explosion_decay" - } - ], - "name": "floralis:cyan_flower_seeds" - } - ], - "conditions": [ - { - "condition": "minecraft:block_state_property", - "block": "floralis:cyan_flower_crop", - "properties": { - "age": "1" - } - }, - { - "condition": "minecraft:inverted", - "term": { - "condition": "minecraft:any_of", - "terms": [ - { - "condition": "minecraft:match_tool", - "predicate": { - "items": [ - "minecraft:shears" - ] - } - }, - { - "condition": "minecraft:match_tool", - "predicate": { - "enchantments": [ - { - "enchantment": "minecraft:silk_touch", - "levels": { - "min": 1 - } - } - ] - } - } - ] - } - } - ] - }, - { - "rolls": 1, - "bonus_rolls": 0, - "entries": [ - { - "type": "minecraft:item", - "functions": [ - { - "function": "minecraft:explosion_decay" - } - ], - "name": "floralis:cyan_flower_seeds" - } - ], - "conditions": [ - { - "condition": "minecraft:block_state_property", - "block": "floralis:cyan_flower_crop", - "properties": { - "age": "0" - } - }, - { - "condition": "minecraft:inverted", - "term": { - "condition": "minecraft:any_of", - "terms": [ - { - "condition": "minecraft:match_tool", - "predicate": { - "items": [ - "minecraft:shears" - ] - } - }, - { - "condition": "minecraft:match_tool", - "predicate": { - "enchantments": [ - { - "enchantment": "minecraft:silk_touch", - "levels": { - "min": 1 - } - } - ] - } - } - ] - } - } - ] - } - ] -} \ No newline at end of file diff --git a/src/main/resources/data/floralis/loot_tables/blocks/gray_cactus.json b/src/main/resources/data/floralis/loot_tables/blocks/gray_cactus.json deleted file mode 100644 index e98da4bc..00000000 --- a/src/main/resources/data/floralis/loot_tables/blocks/gray_cactus.json +++ /dev/null @@ -1,225 +0,0 @@ -{ - "type": "minecraft:block", - "pools": [ - { - "rolls": 1, - "bonus_rolls": 0, - "entries": [ - { - "type": "minecraft:alternatives", - "children": [ - { - "type": "minecraft:item", - "conditions": [ - { - "condition": "minecraft:any_of", - "terms": [ - { - "condition": "minecraft:match_tool", - "predicate": { - "items": [ - "minecraft:shears" - ] - } - }, - { - "condition": "minecraft:match_tool", - "predicate": { - "enchantments": [ - { - "enchantment": "minecraft:silk_touch", - "levels": { - "min": 1 - } - } - ] - } - } - ] - } - ], - "name": "floralis:gray_cactus" - } - ] - } - ] - }, - { - "rolls": 1, - "bonus_rolls": 0, - "entries": [ - { - "type": "minecraft:item", - "functions": [ - { - "function": "minecraft:set_count", - "count": 1, - "add": false - }, - { - "function": "minecraft:explosion_decay" - }, - { - "function": "minecraft:apply_bonus", - "enchantment": "minecraft:fortune", - "formula": "minecraft:uniform_bonus_count", - "parameters": { - "bonusMultiplier": 1 - } - } - ], - "name": "floralis:plant_fibers" - } - ], - "conditions": [ - { - "condition": "minecraft:inverted", - "term": { - "condition": "minecraft:any_of", - "terms": [ - { - "condition": "minecraft:match_tool", - "predicate": { - "items": [ - "minecraft:shears" - ] - } - }, - { - "condition": "minecraft:match_tool", - "predicate": { - "enchantments": [ - { - "enchantment": "minecraft:silk_touch", - "levels": { - "min": 1 - } - } - ] - } - } - ] - } - } - ] - }, - { - "rolls": 1, - "bonus_rolls": 0, - "entries": [ - { - "type": "minecraft:item", - "functions": [ - { - "function": "minecraft:set_count", - "count": 1, - "add": false - }, - { - "function": "minecraft:explosion_decay" - }, - { - "function": "minecraft:apply_bonus", - "enchantment": "minecraft:fortune", - "formula": "minecraft:uniform_bonus_count", - "parameters": { - "bonusMultiplier": 1 - } - } - ], - "name": "floralis:gray_petals" - } - ], - "conditions": [ - { - "condition": "minecraft:inverted", - "term": { - "condition": "minecraft:any_of", - "terms": [ - { - "condition": "minecraft:match_tool", - "predicate": { - "items": [ - "minecraft:shears" - ] - } - }, - { - "condition": "minecraft:match_tool", - "predicate": { - "enchantments": [ - { - "enchantment": "minecraft:silk_touch", - "levels": { - "min": 1 - } - } - ] - } - } - ] - } - } - ] - }, - { - "rolls": 1, - "bonus_rolls": 0, - "entries": [ - { - "type": "minecraft:item", - "functions": [ - { - "function": "minecraft:set_count", - "count": 2, - "add": false - }, - { - "function": "minecraft:explosion_decay" - }, - { - "function": "minecraft:apply_bonus", - "enchantment": "minecraft:fortune", - "formula": "minecraft:uniform_bonus_count", - "parameters": { - "bonusMultiplier": 1 - } - } - ], - "name": "floralis:gray_cactus_seeds" - } - ], - "conditions": [ - { - "condition": "minecraft:inverted", - "term": { - "condition": "minecraft:any_of", - "terms": [ - { - "condition": "minecraft:match_tool", - "predicate": { - "items": [ - "minecraft:shears" - ] - } - }, - { - "condition": "minecraft:match_tool", - "predicate": { - "enchantments": [ - { - "enchantment": "minecraft:silk_touch", - "levels": { - "min": 1 - } - } - ] - } - } - ] - } - } - ] - } - ] -} \ No newline at end of file diff --git a/src/main/resources/data/floralis/loot_tables/blocks/gray_cactus_crop.json b/src/main/resources/data/floralis/loot_tables/blocks/gray_cactus_crop.json deleted file mode 100644 index b6624ae9..00000000 --- a/src/main/resources/data/floralis/loot_tables/blocks/gray_cactus_crop.json +++ /dev/null @@ -1,550 +0,0 @@ -{ - "type": "minecraft:block", - "pools": [ - { - "rolls": 1, - "bonus_rolls": 0, - "entries": [ - { - "type": "minecraft:alternatives", - "children": [ - { - "type": "minecraft:item", - "conditions": [ - { - "condition": "minecraft:block_state_property", - "block": "floralis:gray_cactus_crop", - "properties": { - "age": "5" - } - }, - { - "condition": "minecraft:any_of", - "terms": [ - { - "condition": "minecraft:match_tool", - "predicate": { - "items": [ - "minecraft:shears" - ] - } - }, - { - "condition": "minecraft:match_tool", - "predicate": { - "enchantments": [ - { - "enchantment": "minecraft:silk_touch", - "levels": { - "min": 1 - } - } - ] - } - } - ] - } - ], - "name": "floralis:gray_cactus" - }, - { - "type": "minecraft:item", - "conditions": [ - { - "condition": "minecraft:any_of", - "terms": [ - { - "condition": "minecraft:match_tool", - "predicate": { - "items": [ - "minecraft:shears" - ] - } - }, - { - "condition": "minecraft:match_tool", - "predicate": { - "enchantments": [ - { - "enchantment": "minecraft:silk_touch", - "levels": { - "min": 1 - } - } - ] - } - } - ] - } - ], - "name": "floralis:gray_cactus_seeds" - } - ] - } - ] - }, - { - "rolls": 1, - "bonus_rolls": 0, - "entries": [ - { - "type": "minecraft:item", - "functions": [ - { - "function": "minecraft:set_count", - "count": 1, - "add": false - }, - { - "function": "minecraft:explosion_decay" - }, - { - "function": "minecraft:apply_bonus", - "enchantment": "minecraft:fortune", - "formula": "minecraft:uniform_bonus_count", - "parameters": { - "bonusMultiplier": 1 - } - } - ], - "name": "floralis:plant_fibers" - } - ], - "conditions": [ - { - "condition": "minecraft:block_state_property", - "block": "floralis:gray_cactus_crop", - "properties": { - "age": "5" - } - }, - { - "condition": "minecraft:inverted", - "term": { - "condition": "minecraft:any_of", - "terms": [ - { - "condition": "minecraft:match_tool", - "predicate": { - "items": [ - "minecraft:shears" - ] - } - }, - { - "condition": "minecraft:match_tool", - "predicate": { - "enchantments": [ - { - "enchantment": "minecraft:silk_touch", - "levels": { - "min": 1 - } - } - ] - } - } - ] - } - } - ] - }, - { - "rolls": 1, - "bonus_rolls": 0, - "entries": [ - { - "type": "minecraft:item", - "functions": [ - { - "function": "minecraft:set_count", - "count": 1, - "add": false - }, - { - "function": "minecraft:explosion_decay" - }, - { - "function": "minecraft:apply_bonus", - "enchantment": "minecraft:fortune", - "formula": "minecraft:uniform_bonus_count", - "parameters": { - "bonusMultiplier": 1 - } - } - ], - "name": "floralis:gray_petals" - } - ], - "conditions": [ - { - "condition": "minecraft:block_state_property", - "block": "floralis:gray_cactus_crop", - "properties": { - "age": "5" - } - }, - { - "condition": "minecraft:inverted", - "term": { - "condition": "minecraft:any_of", - "terms": [ - { - "condition": "minecraft:match_tool", - "predicate": { - "items": [ - "minecraft:shears" - ] - } - }, - { - "condition": "minecraft:match_tool", - "predicate": { - "enchantments": [ - { - "enchantment": "minecraft:silk_touch", - "levels": { - "min": 1 - } - } - ] - } - } - ] - } - } - ] - }, - { - "rolls": 1, - "bonus_rolls": 0, - "entries": [ - { - "type": "minecraft:item", - "functions": [ - { - "function": "minecraft:set_count", - "count": 2, - "add": false - }, - { - "function": "minecraft:explosion_decay" - }, - { - "function": "minecraft:apply_bonus", - "enchantment": "minecraft:fortune", - "formula": "minecraft:uniform_bonus_count", - "parameters": { - "bonusMultiplier": 1 - } - } - ], - "name": "floralis:gray_cactus_seeds" - } - ], - "conditions": [ - { - "condition": "minecraft:block_state_property", - "block": "floralis:gray_cactus_crop", - "properties": { - "age": "5" - } - }, - { - "condition": "minecraft:inverted", - "term": { - "condition": "minecraft:any_of", - "terms": [ - { - "condition": "minecraft:match_tool", - "predicate": { - "items": [ - "minecraft:shears" - ] - } - }, - { - "condition": "minecraft:match_tool", - "predicate": { - "enchantments": [ - { - "enchantment": "minecraft:silk_touch", - "levels": { - "min": 1 - } - } - ] - } - } - ] - } - } - ] - }, - { - "rolls": 1, - "bonus_rolls": 0, - "entries": [ - { - "type": "minecraft:item", - "functions": [ - { - "function": "minecraft:explosion_decay" - } - ], - "name": "floralis:gray_cactus_seeds" - } - ], - "conditions": [ - { - "condition": "minecraft:block_state_property", - "block": "floralis:gray_cactus_crop", - "properties": { - "age": "4" - } - }, - { - "condition": "minecraft:inverted", - "term": { - "condition": "minecraft:any_of", - "terms": [ - { - "condition": "minecraft:match_tool", - "predicate": { - "items": [ - "minecraft:shears" - ] - } - }, - { - "condition": "minecraft:match_tool", - "predicate": { - "enchantments": [ - { - "enchantment": "minecraft:silk_touch", - "levels": { - "min": 1 - } - } - ] - } - } - ] - } - } - ] - }, - { - "rolls": 1, - "bonus_rolls": 0, - "entries": [ - { - "type": "minecraft:item", - "functions": [ - { - "function": "minecraft:explosion_decay" - } - ], - "name": "floralis:gray_cactus_seeds" - } - ], - "conditions": [ - { - "condition": "minecraft:block_state_property", - "block": "floralis:gray_cactus_crop", - "properties": { - "age": "3" - } - }, - { - "condition": "minecraft:inverted", - "term": { - "condition": "minecraft:any_of", - "terms": [ - { - "condition": "minecraft:match_tool", - "predicate": { - "items": [ - "minecraft:shears" - ] - } - }, - { - "condition": "minecraft:match_tool", - "predicate": { - "enchantments": [ - { - "enchantment": "minecraft:silk_touch", - "levels": { - "min": 1 - } - } - ] - } - } - ] - } - } - ] - }, - { - "rolls": 1, - "bonus_rolls": 0, - "entries": [ - { - "type": "minecraft:item", - "functions": [ - { - "function": "minecraft:explosion_decay" - } - ], - "name": "floralis:gray_cactus_seeds" - } - ], - "conditions": [ - { - "condition": "minecraft:block_state_property", - "block": "floralis:gray_cactus_crop", - "properties": { - "age": "2" - } - }, - { - "condition": "minecraft:inverted", - "term": { - "condition": "minecraft:any_of", - "terms": [ - { - "condition": "minecraft:match_tool", - "predicate": { - "items": [ - "minecraft:shears" - ] - } - }, - { - "condition": "minecraft:match_tool", - "predicate": { - "enchantments": [ - { - "enchantment": "minecraft:silk_touch", - "levels": { - "min": 1 - } - } - ] - } - } - ] - } - } - ] - }, - { - "rolls": 1, - "bonus_rolls": 0, - "entries": [ - { - "type": "minecraft:item", - "functions": [ - { - "function": "minecraft:explosion_decay" - } - ], - "name": "floralis:gray_cactus_seeds" - } - ], - "conditions": [ - { - "condition": "minecraft:block_state_property", - "block": "floralis:gray_cactus_crop", - "properties": { - "age": "1" - } - }, - { - "condition": "minecraft:inverted", - "term": { - "condition": "minecraft:any_of", - "terms": [ - { - "condition": "minecraft:match_tool", - "predicate": { - "items": [ - "minecraft:shears" - ] - } - }, - { - "condition": "minecraft:match_tool", - "predicate": { - "enchantments": [ - { - "enchantment": "minecraft:silk_touch", - "levels": { - "min": 1 - } - } - ] - } - } - ] - } - } - ] - }, - { - "rolls": 1, - "bonus_rolls": 0, - "entries": [ - { - "type": "minecraft:item", - "functions": [ - { - "function": "minecraft:explosion_decay" - } - ], - "name": "floralis:gray_cactus_seeds" - } - ], - "conditions": [ - { - "condition": "minecraft:block_state_property", - "block": "floralis:gray_cactus_crop", - "properties": { - "age": "0" - } - }, - { - "condition": "minecraft:inverted", - "term": { - "condition": "minecraft:any_of", - "terms": [ - { - "condition": "minecraft:match_tool", - "predicate": { - "items": [ - "minecraft:shears" - ] - } - }, - { - "condition": "minecraft:match_tool", - "predicate": { - "enchantments": [ - { - "enchantment": "minecraft:silk_touch", - "levels": { - "min": 1 - } - } - ] - } - } - ] - } - } - ] - } - ] -} \ No newline at end of file diff --git a/src/main/resources/data/floralis/loot_tables/blocks/gray_flower.json b/src/main/resources/data/floralis/loot_tables/blocks/gray_flower.json deleted file mode 100644 index fbbba2db..00000000 --- a/src/main/resources/data/floralis/loot_tables/blocks/gray_flower.json +++ /dev/null @@ -1,225 +0,0 @@ -{ - "type": "minecraft:block", - "pools": [ - { - "rolls": 1, - "bonus_rolls": 0, - "entries": [ - { - "type": "minecraft:alternatives", - "children": [ - { - "type": "minecraft:item", - "conditions": [ - { - "condition": "minecraft:any_of", - "terms": [ - { - "condition": "minecraft:match_tool", - "predicate": { - "items": [ - "minecraft:shears" - ] - } - }, - { - "condition": "minecraft:match_tool", - "predicate": { - "enchantments": [ - { - "enchantment": "minecraft:silk_touch", - "levels": { - "min": 1 - } - } - ] - } - } - ] - } - ], - "name": "floralis:gray_flower" - } - ] - } - ] - }, - { - "rolls": 1, - "bonus_rolls": 0, - "entries": [ - { - "type": "minecraft:item", - "functions": [ - { - "function": "minecraft:set_count", - "count": 1, - "add": false - }, - { - "function": "minecraft:explosion_decay" - }, - { - "function": "minecraft:apply_bonus", - "enchantment": "minecraft:fortune", - "formula": "minecraft:uniform_bonus_count", - "parameters": { - "bonusMultiplier": 1 - } - } - ], - "name": "floralis:plant_fibers" - } - ], - "conditions": [ - { - "condition": "minecraft:inverted", - "term": { - "condition": "minecraft:any_of", - "terms": [ - { - "condition": "minecraft:match_tool", - "predicate": { - "items": [ - "minecraft:shears" - ] - } - }, - { - "condition": "minecraft:match_tool", - "predicate": { - "enchantments": [ - { - "enchantment": "minecraft:silk_touch", - "levels": { - "min": 1 - } - } - ] - } - } - ] - } - } - ] - }, - { - "rolls": 1, - "bonus_rolls": 0, - "entries": [ - { - "type": "minecraft:item", - "functions": [ - { - "function": "minecraft:set_count", - "count": 1, - "add": false - }, - { - "function": "minecraft:explosion_decay" - }, - { - "function": "minecraft:apply_bonus", - "enchantment": "minecraft:fortune", - "formula": "minecraft:uniform_bonus_count", - "parameters": { - "bonusMultiplier": 1 - } - } - ], - "name": "floralis:gray_petals" - } - ], - "conditions": [ - { - "condition": "minecraft:inverted", - "term": { - "condition": "minecraft:any_of", - "terms": [ - { - "condition": "minecraft:match_tool", - "predicate": { - "items": [ - "minecraft:shears" - ] - } - }, - { - "condition": "minecraft:match_tool", - "predicate": { - "enchantments": [ - { - "enchantment": "minecraft:silk_touch", - "levels": { - "min": 1 - } - } - ] - } - } - ] - } - } - ] - }, - { - "rolls": 1, - "bonus_rolls": 0, - "entries": [ - { - "type": "minecraft:item", - "functions": [ - { - "function": "minecraft:set_count", - "count": 2, - "add": false - }, - { - "function": "minecraft:explosion_decay" - }, - { - "function": "minecraft:apply_bonus", - "enchantment": "minecraft:fortune", - "formula": "minecraft:uniform_bonus_count", - "parameters": { - "bonusMultiplier": 1 - } - } - ], - "name": "floralis:gray_flower_seeds" - } - ], - "conditions": [ - { - "condition": "minecraft:inverted", - "term": { - "condition": "minecraft:any_of", - "terms": [ - { - "condition": "minecraft:match_tool", - "predicate": { - "items": [ - "minecraft:shears" - ] - } - }, - { - "condition": "minecraft:match_tool", - "predicate": { - "enchantments": [ - { - "enchantment": "minecraft:silk_touch", - "levels": { - "min": 1 - } - } - ] - } - } - ] - } - } - ] - } - ] -} \ No newline at end of file diff --git a/src/main/resources/data/floralis/loot_tables/blocks/gray_flower_crop.json b/src/main/resources/data/floralis/loot_tables/blocks/gray_flower_crop.json deleted file mode 100644 index 32cc6ab4..00000000 --- a/src/main/resources/data/floralis/loot_tables/blocks/gray_flower_crop.json +++ /dev/null @@ -1,550 +0,0 @@ -{ - "type": "minecraft:block", - "pools": [ - { - "rolls": 1, - "bonus_rolls": 0, - "entries": [ - { - "type": "minecraft:alternatives", - "children": [ - { - "type": "minecraft:item", - "conditions": [ - { - "condition": "minecraft:block_state_property", - "block": "floralis:gray_flower_crop", - "properties": { - "age": "5" - } - }, - { - "condition": "minecraft:any_of", - "terms": [ - { - "condition": "minecraft:match_tool", - "predicate": { - "items": [ - "minecraft:shears" - ] - } - }, - { - "condition": "minecraft:match_tool", - "predicate": { - "enchantments": [ - { - "enchantment": "minecraft:silk_touch", - "levels": { - "min": 1 - } - } - ] - } - } - ] - } - ], - "name": "floralis:gray_flower" - }, - { - "type": "minecraft:item", - "conditions": [ - { - "condition": "minecraft:any_of", - "terms": [ - { - "condition": "minecraft:match_tool", - "predicate": { - "items": [ - "minecraft:shears" - ] - } - }, - { - "condition": "minecraft:match_tool", - "predicate": { - "enchantments": [ - { - "enchantment": "minecraft:silk_touch", - "levels": { - "min": 1 - } - } - ] - } - } - ] - } - ], - "name": "floralis:gray_flower_seeds" - } - ] - } - ] - }, - { - "rolls": 1, - "bonus_rolls": 0, - "entries": [ - { - "type": "minecraft:item", - "functions": [ - { - "function": "minecraft:set_count", - "count": 1, - "add": false - }, - { - "function": "minecraft:explosion_decay" - }, - { - "function": "minecraft:apply_bonus", - "enchantment": "minecraft:fortune", - "formula": "minecraft:uniform_bonus_count", - "parameters": { - "bonusMultiplier": 1 - } - } - ], - "name": "floralis:plant_fibers" - } - ], - "conditions": [ - { - "condition": "minecraft:block_state_property", - "block": "floralis:gray_flower_crop", - "properties": { - "age": "5" - } - }, - { - "condition": "minecraft:inverted", - "term": { - "condition": "minecraft:any_of", - "terms": [ - { - "condition": "minecraft:match_tool", - "predicate": { - "items": [ - "minecraft:shears" - ] - } - }, - { - "condition": "minecraft:match_tool", - "predicate": { - "enchantments": [ - { - "enchantment": "minecraft:silk_touch", - "levels": { - "min": 1 - } - } - ] - } - } - ] - } - } - ] - }, - { - "rolls": 1, - "bonus_rolls": 0, - "entries": [ - { - "type": "minecraft:item", - "functions": [ - { - "function": "minecraft:set_count", - "count": 1, - "add": false - }, - { - "function": "minecraft:explosion_decay" - }, - { - "function": "minecraft:apply_bonus", - "enchantment": "minecraft:fortune", - "formula": "minecraft:uniform_bonus_count", - "parameters": { - "bonusMultiplier": 1 - } - } - ], - "name": "floralis:gray_petals" - } - ], - "conditions": [ - { - "condition": "minecraft:block_state_property", - "block": "floralis:gray_flower_crop", - "properties": { - "age": "5" - } - }, - { - "condition": "minecraft:inverted", - "term": { - "condition": "minecraft:any_of", - "terms": [ - { - "condition": "minecraft:match_tool", - "predicate": { - "items": [ - "minecraft:shears" - ] - } - }, - { - "condition": "minecraft:match_tool", - "predicate": { - "enchantments": [ - { - "enchantment": "minecraft:silk_touch", - "levels": { - "min": 1 - } - } - ] - } - } - ] - } - } - ] - }, - { - "rolls": 1, - "bonus_rolls": 0, - "entries": [ - { - "type": "minecraft:item", - "functions": [ - { - "function": "minecraft:set_count", - "count": 2, - "add": false - }, - { - "function": "minecraft:explosion_decay" - }, - { - "function": "minecraft:apply_bonus", - "enchantment": "minecraft:fortune", - "formula": "minecraft:uniform_bonus_count", - "parameters": { - "bonusMultiplier": 1 - } - } - ], - "name": "floralis:gray_flower_seeds" - } - ], - "conditions": [ - { - "condition": "minecraft:block_state_property", - "block": "floralis:gray_flower_crop", - "properties": { - "age": "5" - } - }, - { - "condition": "minecraft:inverted", - "term": { - "condition": "minecraft:any_of", - "terms": [ - { - "condition": "minecraft:match_tool", - "predicate": { - "items": [ - "minecraft:shears" - ] - } - }, - { - "condition": "minecraft:match_tool", - "predicate": { - "enchantments": [ - { - "enchantment": "minecraft:silk_touch", - "levels": { - "min": 1 - } - } - ] - } - } - ] - } - } - ] - }, - { - "rolls": 1, - "bonus_rolls": 0, - "entries": [ - { - "type": "minecraft:item", - "functions": [ - { - "function": "minecraft:explosion_decay" - } - ], - "name": "floralis:gray_flower_seeds" - } - ], - "conditions": [ - { - "condition": "minecraft:block_state_property", - "block": "floralis:gray_flower_crop", - "properties": { - "age": "4" - } - }, - { - "condition": "minecraft:inverted", - "term": { - "condition": "minecraft:any_of", - "terms": [ - { - "condition": "minecraft:match_tool", - "predicate": { - "items": [ - "minecraft:shears" - ] - } - }, - { - "condition": "minecraft:match_tool", - "predicate": { - "enchantments": [ - { - "enchantment": "minecraft:silk_touch", - "levels": { - "min": 1 - } - } - ] - } - } - ] - } - } - ] - }, - { - "rolls": 1, - "bonus_rolls": 0, - "entries": [ - { - "type": "minecraft:item", - "functions": [ - { - "function": "minecraft:explosion_decay" - } - ], - "name": "floralis:gray_flower_seeds" - } - ], - "conditions": [ - { - "condition": "minecraft:block_state_property", - "block": "floralis:gray_flower_crop", - "properties": { - "age": "3" - } - }, - { - "condition": "minecraft:inverted", - "term": { - "condition": "minecraft:any_of", - "terms": [ - { - "condition": "minecraft:match_tool", - "predicate": { - "items": [ - "minecraft:shears" - ] - } - }, - { - "condition": "minecraft:match_tool", - "predicate": { - "enchantments": [ - { - "enchantment": "minecraft:silk_touch", - "levels": { - "min": 1 - } - } - ] - } - } - ] - } - } - ] - }, - { - "rolls": 1, - "bonus_rolls": 0, - "entries": [ - { - "type": "minecraft:item", - "functions": [ - { - "function": "minecraft:explosion_decay" - } - ], - "name": "floralis:gray_flower_seeds" - } - ], - "conditions": [ - { - "condition": "minecraft:block_state_property", - "block": "floralis:gray_flower_crop", - "properties": { - "age": "2" - } - }, - { - "condition": "minecraft:inverted", - "term": { - "condition": "minecraft:any_of", - "terms": [ - { - "condition": "minecraft:match_tool", - "predicate": { - "items": [ - "minecraft:shears" - ] - } - }, - { - "condition": "minecraft:match_tool", - "predicate": { - "enchantments": [ - { - "enchantment": "minecraft:silk_touch", - "levels": { - "min": 1 - } - } - ] - } - } - ] - } - } - ] - }, - { - "rolls": 1, - "bonus_rolls": 0, - "entries": [ - { - "type": "minecraft:item", - "functions": [ - { - "function": "minecraft:explosion_decay" - } - ], - "name": "floralis:gray_flower_seeds" - } - ], - "conditions": [ - { - "condition": "minecraft:block_state_property", - "block": "floralis:gray_flower_crop", - "properties": { - "age": "1" - } - }, - { - "condition": "minecraft:inverted", - "term": { - "condition": "minecraft:any_of", - "terms": [ - { - "condition": "minecraft:match_tool", - "predicate": { - "items": [ - "minecraft:shears" - ] - } - }, - { - "condition": "minecraft:match_tool", - "predicate": { - "enchantments": [ - { - "enchantment": "minecraft:silk_touch", - "levels": { - "min": 1 - } - } - ] - } - } - ] - } - } - ] - }, - { - "rolls": 1, - "bonus_rolls": 0, - "entries": [ - { - "type": "minecraft:item", - "functions": [ - { - "function": "minecraft:explosion_decay" - } - ], - "name": "floralis:gray_flower_seeds" - } - ], - "conditions": [ - { - "condition": "minecraft:block_state_property", - "block": "floralis:gray_flower_crop", - "properties": { - "age": "0" - } - }, - { - "condition": "minecraft:inverted", - "term": { - "condition": "minecraft:any_of", - "terms": [ - { - "condition": "minecraft:match_tool", - "predicate": { - "items": [ - "minecraft:shears" - ] - } - }, - { - "condition": "minecraft:match_tool", - "predicate": { - "enchantments": [ - { - "enchantment": "minecraft:silk_touch", - "levels": { - "min": 1 - } - } - ] - } - } - ] - } - } - ] - } - ] -} \ No newline at end of file diff --git a/src/main/resources/data/floralis/loot_tables/blocks/green_cactus.json b/src/main/resources/data/floralis/loot_tables/blocks/green_cactus.json deleted file mode 100644 index d143d21c..00000000 --- a/src/main/resources/data/floralis/loot_tables/blocks/green_cactus.json +++ /dev/null @@ -1,225 +0,0 @@ -{ - "type": "minecraft:block", - "pools": [ - { - "rolls": 1, - "bonus_rolls": 0, - "entries": [ - { - "type": "minecraft:alternatives", - "children": [ - { - "type": "minecraft:item", - "conditions": [ - { - "condition": "minecraft:any_of", - "terms": [ - { - "condition": "minecraft:match_tool", - "predicate": { - "items": [ - "minecraft:shears" - ] - } - }, - { - "condition": "minecraft:match_tool", - "predicate": { - "enchantments": [ - { - "enchantment": "minecraft:silk_touch", - "levels": { - "min": 1 - } - } - ] - } - } - ] - } - ], - "name": "floralis:green_cactus" - } - ] - } - ] - }, - { - "rolls": 1, - "bonus_rolls": 0, - "entries": [ - { - "type": "minecraft:item", - "functions": [ - { - "function": "minecraft:set_count", - "count": 1, - "add": false - }, - { - "function": "minecraft:explosion_decay" - }, - { - "function": "minecraft:apply_bonus", - "enchantment": "minecraft:fortune", - "formula": "minecraft:uniform_bonus_count", - "parameters": { - "bonusMultiplier": 1 - } - } - ], - "name": "floralis:plant_fibers" - } - ], - "conditions": [ - { - "condition": "minecraft:inverted", - "term": { - "condition": "minecraft:any_of", - "terms": [ - { - "condition": "minecraft:match_tool", - "predicate": { - "items": [ - "minecraft:shears" - ] - } - }, - { - "condition": "minecraft:match_tool", - "predicate": { - "enchantments": [ - { - "enchantment": "minecraft:silk_touch", - "levels": { - "min": 1 - } - } - ] - } - } - ] - } - } - ] - }, - { - "rolls": 1, - "bonus_rolls": 0, - "entries": [ - { - "type": "minecraft:item", - "functions": [ - { - "function": "minecraft:set_count", - "count": 1, - "add": false - }, - { - "function": "minecraft:explosion_decay" - }, - { - "function": "minecraft:apply_bonus", - "enchantment": "minecraft:fortune", - "formula": "minecraft:uniform_bonus_count", - "parameters": { - "bonusMultiplier": 1 - } - } - ], - "name": "floralis:green_petals" - } - ], - "conditions": [ - { - "condition": "minecraft:inverted", - "term": { - "condition": "minecraft:any_of", - "terms": [ - { - "condition": "minecraft:match_tool", - "predicate": { - "items": [ - "minecraft:shears" - ] - } - }, - { - "condition": "minecraft:match_tool", - "predicate": { - "enchantments": [ - { - "enchantment": "minecraft:silk_touch", - "levels": { - "min": 1 - } - } - ] - } - } - ] - } - } - ] - }, - { - "rolls": 1, - "bonus_rolls": 0, - "entries": [ - { - "type": "minecraft:item", - "functions": [ - { - "function": "minecraft:set_count", - "count": 2, - "add": false - }, - { - "function": "minecraft:explosion_decay" - }, - { - "function": "minecraft:apply_bonus", - "enchantment": "minecraft:fortune", - "formula": "minecraft:uniform_bonus_count", - "parameters": { - "bonusMultiplier": 1 - } - } - ], - "name": "floralis:green_cactus_seeds" - } - ], - "conditions": [ - { - "condition": "minecraft:inverted", - "term": { - "condition": "minecraft:any_of", - "terms": [ - { - "condition": "minecraft:match_tool", - "predicate": { - "items": [ - "minecraft:shears" - ] - } - }, - { - "condition": "minecraft:match_tool", - "predicate": { - "enchantments": [ - { - "enchantment": "minecraft:silk_touch", - "levels": { - "min": 1 - } - } - ] - } - } - ] - } - } - ] - } - ] -} \ No newline at end of file diff --git a/src/main/resources/data/floralis/loot_tables/blocks/green_cactus_crop.json b/src/main/resources/data/floralis/loot_tables/blocks/green_cactus_crop.json deleted file mode 100644 index 3961a385..00000000 --- a/src/main/resources/data/floralis/loot_tables/blocks/green_cactus_crop.json +++ /dev/null @@ -1,550 +0,0 @@ -{ - "type": "minecraft:block", - "pools": [ - { - "rolls": 1, - "bonus_rolls": 0, - "entries": [ - { - "type": "minecraft:alternatives", - "children": [ - { - "type": "minecraft:item", - "conditions": [ - { - "condition": "minecraft:block_state_property", - "block": "floralis:green_cactus_crop", - "properties": { - "age": "5" - } - }, - { - "condition": "minecraft:any_of", - "terms": [ - { - "condition": "minecraft:match_tool", - "predicate": { - "items": [ - "minecraft:shears" - ] - } - }, - { - "condition": "minecraft:match_tool", - "predicate": { - "enchantments": [ - { - "enchantment": "minecraft:silk_touch", - "levels": { - "min": 1 - } - } - ] - } - } - ] - } - ], - "name": "floralis:green_cactus" - }, - { - "type": "minecraft:item", - "conditions": [ - { - "condition": "minecraft:any_of", - "terms": [ - { - "condition": "minecraft:match_tool", - "predicate": { - "items": [ - "minecraft:shears" - ] - } - }, - { - "condition": "minecraft:match_tool", - "predicate": { - "enchantments": [ - { - "enchantment": "minecraft:silk_touch", - "levels": { - "min": 1 - } - } - ] - } - } - ] - } - ], - "name": "floralis:green_cactus_seeds" - } - ] - } - ] - }, - { - "rolls": 1, - "bonus_rolls": 0, - "entries": [ - { - "type": "minecraft:item", - "functions": [ - { - "function": "minecraft:set_count", - "count": 1, - "add": false - }, - { - "function": "minecraft:explosion_decay" - }, - { - "function": "minecraft:apply_bonus", - "enchantment": "minecraft:fortune", - "formula": "minecraft:uniform_bonus_count", - "parameters": { - "bonusMultiplier": 1 - } - } - ], - "name": "floralis:plant_fibers" - } - ], - "conditions": [ - { - "condition": "minecraft:block_state_property", - "block": "floralis:green_cactus_crop", - "properties": { - "age": "5" - } - }, - { - "condition": "minecraft:inverted", - "term": { - "condition": "minecraft:any_of", - "terms": [ - { - "condition": "minecraft:match_tool", - "predicate": { - "items": [ - "minecraft:shears" - ] - } - }, - { - "condition": "minecraft:match_tool", - "predicate": { - "enchantments": [ - { - "enchantment": "minecraft:silk_touch", - "levels": { - "min": 1 - } - } - ] - } - } - ] - } - } - ] - }, - { - "rolls": 1, - "bonus_rolls": 0, - "entries": [ - { - "type": "minecraft:item", - "functions": [ - { - "function": "minecraft:set_count", - "count": 1, - "add": false - }, - { - "function": "minecraft:explosion_decay" - }, - { - "function": "minecraft:apply_bonus", - "enchantment": "minecraft:fortune", - "formula": "minecraft:uniform_bonus_count", - "parameters": { - "bonusMultiplier": 1 - } - } - ], - "name": "floralis:green_petals" - } - ], - "conditions": [ - { - "condition": "minecraft:block_state_property", - "block": "floralis:green_cactus_crop", - "properties": { - "age": "5" - } - }, - { - "condition": "minecraft:inverted", - "term": { - "condition": "minecraft:any_of", - "terms": [ - { - "condition": "minecraft:match_tool", - "predicate": { - "items": [ - "minecraft:shears" - ] - } - }, - { - "condition": "minecraft:match_tool", - "predicate": { - "enchantments": [ - { - "enchantment": "minecraft:silk_touch", - "levels": { - "min": 1 - } - } - ] - } - } - ] - } - } - ] - }, - { - "rolls": 1, - "bonus_rolls": 0, - "entries": [ - { - "type": "minecraft:item", - "functions": [ - { - "function": "minecraft:set_count", - "count": 2, - "add": false - }, - { - "function": "minecraft:explosion_decay" - }, - { - "function": "minecraft:apply_bonus", - "enchantment": "minecraft:fortune", - "formula": "minecraft:uniform_bonus_count", - "parameters": { - "bonusMultiplier": 1 - } - } - ], - "name": "floralis:green_cactus_seeds" - } - ], - "conditions": [ - { - "condition": "minecraft:block_state_property", - "block": "floralis:green_cactus_crop", - "properties": { - "age": "5" - } - }, - { - "condition": "minecraft:inverted", - "term": { - "condition": "minecraft:any_of", - "terms": [ - { - "condition": "minecraft:match_tool", - "predicate": { - "items": [ - "minecraft:shears" - ] - } - }, - { - "condition": "minecraft:match_tool", - "predicate": { - "enchantments": [ - { - "enchantment": "minecraft:silk_touch", - "levels": { - "min": 1 - } - } - ] - } - } - ] - } - } - ] - }, - { - "rolls": 1, - "bonus_rolls": 0, - "entries": [ - { - "type": "minecraft:item", - "functions": [ - { - "function": "minecraft:explosion_decay" - } - ], - "name": "floralis:green_cactus_seeds" - } - ], - "conditions": [ - { - "condition": "minecraft:block_state_property", - "block": "floralis:green_cactus_crop", - "properties": { - "age": "4" - } - }, - { - "condition": "minecraft:inverted", - "term": { - "condition": "minecraft:any_of", - "terms": [ - { - "condition": "minecraft:match_tool", - "predicate": { - "items": [ - "minecraft:shears" - ] - } - }, - { - "condition": "minecraft:match_tool", - "predicate": { - "enchantments": [ - { - "enchantment": "minecraft:silk_touch", - "levels": { - "min": 1 - } - } - ] - } - } - ] - } - } - ] - }, - { - "rolls": 1, - "bonus_rolls": 0, - "entries": [ - { - "type": "minecraft:item", - "functions": [ - { - "function": "minecraft:explosion_decay" - } - ], - "name": "floralis:green_cactus_seeds" - } - ], - "conditions": [ - { - "condition": "minecraft:block_state_property", - "block": "floralis:green_cactus_crop", - "properties": { - "age": "3" - } - }, - { - "condition": "minecraft:inverted", - "term": { - "condition": "minecraft:any_of", - "terms": [ - { - "condition": "minecraft:match_tool", - "predicate": { - "items": [ - "minecraft:shears" - ] - } - }, - { - "condition": "minecraft:match_tool", - "predicate": { - "enchantments": [ - { - "enchantment": "minecraft:silk_touch", - "levels": { - "min": 1 - } - } - ] - } - } - ] - } - } - ] - }, - { - "rolls": 1, - "bonus_rolls": 0, - "entries": [ - { - "type": "minecraft:item", - "functions": [ - { - "function": "minecraft:explosion_decay" - } - ], - "name": "floralis:green_cactus_seeds" - } - ], - "conditions": [ - { - "condition": "minecraft:block_state_property", - "block": "floralis:green_cactus_crop", - "properties": { - "age": "2" - } - }, - { - "condition": "minecraft:inverted", - "term": { - "condition": "minecraft:any_of", - "terms": [ - { - "condition": "minecraft:match_tool", - "predicate": { - "items": [ - "minecraft:shears" - ] - } - }, - { - "condition": "minecraft:match_tool", - "predicate": { - "enchantments": [ - { - "enchantment": "minecraft:silk_touch", - "levels": { - "min": 1 - } - } - ] - } - } - ] - } - } - ] - }, - { - "rolls": 1, - "bonus_rolls": 0, - "entries": [ - { - "type": "minecraft:item", - "functions": [ - { - "function": "minecraft:explosion_decay" - } - ], - "name": "floralis:green_cactus_seeds" - } - ], - "conditions": [ - { - "condition": "minecraft:block_state_property", - "block": "floralis:green_cactus_crop", - "properties": { - "age": "1" - } - }, - { - "condition": "minecraft:inverted", - "term": { - "condition": "minecraft:any_of", - "terms": [ - { - "condition": "minecraft:match_tool", - "predicate": { - "items": [ - "minecraft:shears" - ] - } - }, - { - "condition": "minecraft:match_tool", - "predicate": { - "enchantments": [ - { - "enchantment": "minecraft:silk_touch", - "levels": { - "min": 1 - } - } - ] - } - } - ] - } - } - ] - }, - { - "rolls": 1, - "bonus_rolls": 0, - "entries": [ - { - "type": "minecraft:item", - "functions": [ - { - "function": "minecraft:explosion_decay" - } - ], - "name": "floralis:green_cactus_seeds" - } - ], - "conditions": [ - { - "condition": "minecraft:block_state_property", - "block": "floralis:green_cactus_crop", - "properties": { - "age": "0" - } - }, - { - "condition": "minecraft:inverted", - "term": { - "condition": "minecraft:any_of", - "terms": [ - { - "condition": "minecraft:match_tool", - "predicate": { - "items": [ - "minecraft:shears" - ] - } - }, - { - "condition": "minecraft:match_tool", - "predicate": { - "enchantments": [ - { - "enchantment": "minecraft:silk_touch", - "levels": { - "min": 1 - } - } - ] - } - } - ] - } - } - ] - } - ] -} \ No newline at end of file diff --git a/src/main/resources/data/floralis/loot_tables/blocks/green_flower.json b/src/main/resources/data/floralis/loot_tables/blocks/green_flower.json deleted file mode 100644 index ef11fbcb..00000000 --- a/src/main/resources/data/floralis/loot_tables/blocks/green_flower.json +++ /dev/null @@ -1,225 +0,0 @@ -{ - "type": "minecraft:block", - "pools": [ - { - "rolls": 1, - "bonus_rolls": 0, - "entries": [ - { - "type": "minecraft:alternatives", - "children": [ - { - "type": "minecraft:item", - "conditions": [ - { - "condition": "minecraft:any_of", - "terms": [ - { - "condition": "minecraft:match_tool", - "predicate": { - "items": [ - "minecraft:shears" - ] - } - }, - { - "condition": "minecraft:match_tool", - "predicate": { - "enchantments": [ - { - "enchantment": "minecraft:silk_touch", - "levels": { - "min": 1 - } - } - ] - } - } - ] - } - ], - "name": "floralis:green_flower" - } - ] - } - ] - }, - { - "rolls": 1, - "bonus_rolls": 0, - "entries": [ - { - "type": "minecraft:item", - "functions": [ - { - "function": "minecraft:set_count", - "count": 1, - "add": false - }, - { - "function": "minecraft:explosion_decay" - }, - { - "function": "minecraft:apply_bonus", - "enchantment": "minecraft:fortune", - "formula": "minecraft:uniform_bonus_count", - "parameters": { - "bonusMultiplier": 1 - } - } - ], - "name": "floralis:plant_fibers" - } - ], - "conditions": [ - { - "condition": "minecraft:inverted", - "term": { - "condition": "minecraft:any_of", - "terms": [ - { - "condition": "minecraft:match_tool", - "predicate": { - "items": [ - "minecraft:shears" - ] - } - }, - { - "condition": "minecraft:match_tool", - "predicate": { - "enchantments": [ - { - "enchantment": "minecraft:silk_touch", - "levels": { - "min": 1 - } - } - ] - } - } - ] - } - } - ] - }, - { - "rolls": 1, - "bonus_rolls": 0, - "entries": [ - { - "type": "minecraft:item", - "functions": [ - { - "function": "minecraft:set_count", - "count": 1, - "add": false - }, - { - "function": "minecraft:explosion_decay" - }, - { - "function": "minecraft:apply_bonus", - "enchantment": "minecraft:fortune", - "formula": "minecraft:uniform_bonus_count", - "parameters": { - "bonusMultiplier": 1 - } - } - ], - "name": "floralis:green_petals" - } - ], - "conditions": [ - { - "condition": "minecraft:inverted", - "term": { - "condition": "minecraft:any_of", - "terms": [ - { - "condition": "minecraft:match_tool", - "predicate": { - "items": [ - "minecraft:shears" - ] - } - }, - { - "condition": "minecraft:match_tool", - "predicate": { - "enchantments": [ - { - "enchantment": "minecraft:silk_touch", - "levels": { - "min": 1 - } - } - ] - } - } - ] - } - } - ] - }, - { - "rolls": 1, - "bonus_rolls": 0, - "entries": [ - { - "type": "minecraft:item", - "functions": [ - { - "function": "minecraft:set_count", - "count": 2, - "add": false - }, - { - "function": "minecraft:explosion_decay" - }, - { - "function": "minecraft:apply_bonus", - "enchantment": "minecraft:fortune", - "formula": "minecraft:uniform_bonus_count", - "parameters": { - "bonusMultiplier": 1 - } - } - ], - "name": "floralis:green_flower_seeds" - } - ], - "conditions": [ - { - "condition": "minecraft:inverted", - "term": { - "condition": "minecraft:any_of", - "terms": [ - { - "condition": "minecraft:match_tool", - "predicate": { - "items": [ - "minecraft:shears" - ] - } - }, - { - "condition": "minecraft:match_tool", - "predicate": { - "enchantments": [ - { - "enchantment": "minecraft:silk_touch", - "levels": { - "min": 1 - } - } - ] - } - } - ] - } - } - ] - } - ] -} \ No newline at end of file diff --git a/src/main/resources/data/floralis/loot_tables/blocks/green_flower_crop.json b/src/main/resources/data/floralis/loot_tables/blocks/green_flower_crop.json deleted file mode 100644 index c943d7ff..00000000 --- a/src/main/resources/data/floralis/loot_tables/blocks/green_flower_crop.json +++ /dev/null @@ -1,550 +0,0 @@ -{ - "type": "minecraft:block", - "pools": [ - { - "rolls": 1, - "bonus_rolls": 0, - "entries": [ - { - "type": "minecraft:alternatives", - "children": [ - { - "type": "minecraft:item", - "conditions": [ - { - "condition": "minecraft:block_state_property", - "block": "floralis:green_flower_crop", - "properties": { - "age": "5" - } - }, - { - "condition": "minecraft:any_of", - "terms": [ - { - "condition": "minecraft:match_tool", - "predicate": { - "items": [ - "minecraft:shears" - ] - } - }, - { - "condition": "minecraft:match_tool", - "predicate": { - "enchantments": [ - { - "enchantment": "minecraft:silk_touch", - "levels": { - "min": 1 - } - } - ] - } - } - ] - } - ], - "name": "floralis:green_flower" - }, - { - "type": "minecraft:item", - "conditions": [ - { - "condition": "minecraft:any_of", - "terms": [ - { - "condition": "minecraft:match_tool", - "predicate": { - "items": [ - "minecraft:shears" - ] - } - }, - { - "condition": "minecraft:match_tool", - "predicate": { - "enchantments": [ - { - "enchantment": "minecraft:silk_touch", - "levels": { - "min": 1 - } - } - ] - } - } - ] - } - ], - "name": "floralis:green_flower_seeds" - } - ] - } - ] - }, - { - "rolls": 1, - "bonus_rolls": 0, - "entries": [ - { - "type": "minecraft:item", - "functions": [ - { - "function": "minecraft:set_count", - "count": 1, - "add": false - }, - { - "function": "minecraft:explosion_decay" - }, - { - "function": "minecraft:apply_bonus", - "enchantment": "minecraft:fortune", - "formula": "minecraft:uniform_bonus_count", - "parameters": { - "bonusMultiplier": 1 - } - } - ], - "name": "floralis:plant_fibers" - } - ], - "conditions": [ - { - "condition": "minecraft:block_state_property", - "block": "floralis:green_flower_crop", - "properties": { - "age": "5" - } - }, - { - "condition": "minecraft:inverted", - "term": { - "condition": "minecraft:any_of", - "terms": [ - { - "condition": "minecraft:match_tool", - "predicate": { - "items": [ - "minecraft:shears" - ] - } - }, - { - "condition": "minecraft:match_tool", - "predicate": { - "enchantments": [ - { - "enchantment": "minecraft:silk_touch", - "levels": { - "min": 1 - } - } - ] - } - } - ] - } - } - ] - }, - { - "rolls": 1, - "bonus_rolls": 0, - "entries": [ - { - "type": "minecraft:item", - "functions": [ - { - "function": "minecraft:set_count", - "count": 1, - "add": false - }, - { - "function": "minecraft:explosion_decay" - }, - { - "function": "minecraft:apply_bonus", - "enchantment": "minecraft:fortune", - "formula": "minecraft:uniform_bonus_count", - "parameters": { - "bonusMultiplier": 1 - } - } - ], - "name": "floralis:green_petals" - } - ], - "conditions": [ - { - "condition": "minecraft:block_state_property", - "block": "floralis:green_flower_crop", - "properties": { - "age": "5" - } - }, - { - "condition": "minecraft:inverted", - "term": { - "condition": "minecraft:any_of", - "terms": [ - { - "condition": "minecraft:match_tool", - "predicate": { - "items": [ - "minecraft:shears" - ] - } - }, - { - "condition": "minecraft:match_tool", - "predicate": { - "enchantments": [ - { - "enchantment": "minecraft:silk_touch", - "levels": { - "min": 1 - } - } - ] - } - } - ] - } - } - ] - }, - { - "rolls": 1, - "bonus_rolls": 0, - "entries": [ - { - "type": "minecraft:item", - "functions": [ - { - "function": "minecraft:set_count", - "count": 2, - "add": false - }, - { - "function": "minecraft:explosion_decay" - }, - { - "function": "minecraft:apply_bonus", - "enchantment": "minecraft:fortune", - "formula": "minecraft:uniform_bonus_count", - "parameters": { - "bonusMultiplier": 1 - } - } - ], - "name": "floralis:green_flower_seeds" - } - ], - "conditions": [ - { - "condition": "minecraft:block_state_property", - "block": "floralis:green_flower_crop", - "properties": { - "age": "5" - } - }, - { - "condition": "minecraft:inverted", - "term": { - "condition": "minecraft:any_of", - "terms": [ - { - "condition": "minecraft:match_tool", - "predicate": { - "items": [ - "minecraft:shears" - ] - } - }, - { - "condition": "minecraft:match_tool", - "predicate": { - "enchantments": [ - { - "enchantment": "minecraft:silk_touch", - "levels": { - "min": 1 - } - } - ] - } - } - ] - } - } - ] - }, - { - "rolls": 1, - "bonus_rolls": 0, - "entries": [ - { - "type": "minecraft:item", - "functions": [ - { - "function": "minecraft:explosion_decay" - } - ], - "name": "floralis:green_flower_seeds" - } - ], - "conditions": [ - { - "condition": "minecraft:block_state_property", - "block": "floralis:green_flower_crop", - "properties": { - "age": "4" - } - }, - { - "condition": "minecraft:inverted", - "term": { - "condition": "minecraft:any_of", - "terms": [ - { - "condition": "minecraft:match_tool", - "predicate": { - "items": [ - "minecraft:shears" - ] - } - }, - { - "condition": "minecraft:match_tool", - "predicate": { - "enchantments": [ - { - "enchantment": "minecraft:silk_touch", - "levels": { - "min": 1 - } - } - ] - } - } - ] - } - } - ] - }, - { - "rolls": 1, - "bonus_rolls": 0, - "entries": [ - { - "type": "minecraft:item", - "functions": [ - { - "function": "minecraft:explosion_decay" - } - ], - "name": "floralis:green_flower_seeds" - } - ], - "conditions": [ - { - "condition": "minecraft:block_state_property", - "block": "floralis:green_flower_crop", - "properties": { - "age": "3" - } - }, - { - "condition": "minecraft:inverted", - "term": { - "condition": "minecraft:any_of", - "terms": [ - { - "condition": "minecraft:match_tool", - "predicate": { - "items": [ - "minecraft:shears" - ] - } - }, - { - "condition": "minecraft:match_tool", - "predicate": { - "enchantments": [ - { - "enchantment": "minecraft:silk_touch", - "levels": { - "min": 1 - } - } - ] - } - } - ] - } - } - ] - }, - { - "rolls": 1, - "bonus_rolls": 0, - "entries": [ - { - "type": "minecraft:item", - "functions": [ - { - "function": "minecraft:explosion_decay" - } - ], - "name": "floralis:green_flower_seeds" - } - ], - "conditions": [ - { - "condition": "minecraft:block_state_property", - "block": "floralis:green_flower_crop", - "properties": { - "age": "2" - } - }, - { - "condition": "minecraft:inverted", - "term": { - "condition": "minecraft:any_of", - "terms": [ - { - "condition": "minecraft:match_tool", - "predicate": { - "items": [ - "minecraft:shears" - ] - } - }, - { - "condition": "minecraft:match_tool", - "predicate": { - "enchantments": [ - { - "enchantment": "minecraft:silk_touch", - "levels": { - "min": 1 - } - } - ] - } - } - ] - } - } - ] - }, - { - "rolls": 1, - "bonus_rolls": 0, - "entries": [ - { - "type": "minecraft:item", - "functions": [ - { - "function": "minecraft:explosion_decay" - } - ], - "name": "floralis:green_flower_seeds" - } - ], - "conditions": [ - { - "condition": "minecraft:block_state_property", - "block": "floralis:green_flower_crop", - "properties": { - "age": "1" - } - }, - { - "condition": "minecraft:inverted", - "term": { - "condition": "minecraft:any_of", - "terms": [ - { - "condition": "minecraft:match_tool", - "predicate": { - "items": [ - "minecraft:shears" - ] - } - }, - { - "condition": "minecraft:match_tool", - "predicate": { - "enchantments": [ - { - "enchantment": "minecraft:silk_touch", - "levels": { - "min": 1 - } - } - ] - } - } - ] - } - } - ] - }, - { - "rolls": 1, - "bonus_rolls": 0, - "entries": [ - { - "type": "minecraft:item", - "functions": [ - { - "function": "minecraft:explosion_decay" - } - ], - "name": "floralis:green_flower_seeds" - } - ], - "conditions": [ - { - "condition": "minecraft:block_state_property", - "block": "floralis:green_flower_crop", - "properties": { - "age": "0" - } - }, - { - "condition": "minecraft:inverted", - "term": { - "condition": "minecraft:any_of", - "terms": [ - { - "condition": "minecraft:match_tool", - "predicate": { - "items": [ - "minecraft:shears" - ] - } - }, - { - "condition": "minecraft:match_tool", - "predicate": { - "enchantments": [ - { - "enchantment": "minecraft:silk_touch", - "levels": { - "min": 1 - } - } - ] - } - } - ] - } - } - ] - } - ] -} \ No newline at end of file diff --git a/src/main/resources/data/floralis/loot_tables/blocks/light_blue_cactus.json b/src/main/resources/data/floralis/loot_tables/blocks/light_blue_cactus.json deleted file mode 100644 index 14c60e96..00000000 --- a/src/main/resources/data/floralis/loot_tables/blocks/light_blue_cactus.json +++ /dev/null @@ -1,225 +0,0 @@ -{ - "type": "minecraft:block", - "pools": [ - { - "rolls": 1, - "bonus_rolls": 0, - "entries": [ - { - "type": "minecraft:alternatives", - "children": [ - { - "type": "minecraft:item", - "conditions": [ - { - "condition": "minecraft:any_of", - "terms": [ - { - "condition": "minecraft:match_tool", - "predicate": { - "items": [ - "minecraft:shears" - ] - } - }, - { - "condition": "minecraft:match_tool", - "predicate": { - "enchantments": [ - { - "enchantment": "minecraft:silk_touch", - "levels": { - "min": 1 - } - } - ] - } - } - ] - } - ], - "name": "floralis:light_blue_cactus" - } - ] - } - ] - }, - { - "rolls": 1, - "bonus_rolls": 0, - "entries": [ - { - "type": "minecraft:item", - "functions": [ - { - "function": "minecraft:set_count", - "count": 1, - "add": false - }, - { - "function": "minecraft:explosion_decay" - }, - { - "function": "minecraft:apply_bonus", - "enchantment": "minecraft:fortune", - "formula": "minecraft:uniform_bonus_count", - "parameters": { - "bonusMultiplier": 1 - } - } - ], - "name": "floralis:plant_fibers" - } - ], - "conditions": [ - { - "condition": "minecraft:inverted", - "term": { - "condition": "minecraft:any_of", - "terms": [ - { - "condition": "minecraft:match_tool", - "predicate": { - "items": [ - "minecraft:shears" - ] - } - }, - { - "condition": "minecraft:match_tool", - "predicate": { - "enchantments": [ - { - "enchantment": "minecraft:silk_touch", - "levels": { - "min": 1 - } - } - ] - } - } - ] - } - } - ] - }, - { - "rolls": 1, - "bonus_rolls": 0, - "entries": [ - { - "type": "minecraft:item", - "functions": [ - { - "function": "minecraft:set_count", - "count": 1, - "add": false - }, - { - "function": "minecraft:explosion_decay" - }, - { - "function": "minecraft:apply_bonus", - "enchantment": "minecraft:fortune", - "formula": "minecraft:uniform_bonus_count", - "parameters": { - "bonusMultiplier": 1 - } - } - ], - "name": "floralis:light_blue_petals" - } - ], - "conditions": [ - { - "condition": "minecraft:inverted", - "term": { - "condition": "minecraft:any_of", - "terms": [ - { - "condition": "minecraft:match_tool", - "predicate": { - "items": [ - "minecraft:shears" - ] - } - }, - { - "condition": "minecraft:match_tool", - "predicate": { - "enchantments": [ - { - "enchantment": "minecraft:silk_touch", - "levels": { - "min": 1 - } - } - ] - } - } - ] - } - } - ] - }, - { - "rolls": 1, - "bonus_rolls": 0, - "entries": [ - { - "type": "minecraft:item", - "functions": [ - { - "function": "minecraft:set_count", - "count": 2, - "add": false - }, - { - "function": "minecraft:explosion_decay" - }, - { - "function": "minecraft:apply_bonus", - "enchantment": "minecraft:fortune", - "formula": "minecraft:uniform_bonus_count", - "parameters": { - "bonusMultiplier": 1 - } - } - ], - "name": "floralis:light_blue_cactus_seeds" - } - ], - "conditions": [ - { - "condition": "minecraft:inverted", - "term": { - "condition": "minecraft:any_of", - "terms": [ - { - "condition": "minecraft:match_tool", - "predicate": { - "items": [ - "minecraft:shears" - ] - } - }, - { - "condition": "minecraft:match_tool", - "predicate": { - "enchantments": [ - { - "enchantment": "minecraft:silk_touch", - "levels": { - "min": 1 - } - } - ] - } - } - ] - } - } - ] - } - ] -} \ No newline at end of file diff --git a/src/main/resources/data/floralis/loot_tables/blocks/light_blue_cactus_crop.json b/src/main/resources/data/floralis/loot_tables/blocks/light_blue_cactus_crop.json deleted file mode 100644 index 47b1fbe5..00000000 --- a/src/main/resources/data/floralis/loot_tables/blocks/light_blue_cactus_crop.json +++ /dev/null @@ -1,550 +0,0 @@ -{ - "type": "minecraft:block", - "pools": [ - { - "rolls": 1, - "bonus_rolls": 0, - "entries": [ - { - "type": "minecraft:alternatives", - "children": [ - { - "type": "minecraft:item", - "conditions": [ - { - "condition": "minecraft:block_state_property", - "block": "floralis:light_blue_cactus_crop", - "properties": { - "age": "5" - } - }, - { - "condition": "minecraft:any_of", - "terms": [ - { - "condition": "minecraft:match_tool", - "predicate": { - "items": [ - "minecraft:shears" - ] - } - }, - { - "condition": "minecraft:match_tool", - "predicate": { - "enchantments": [ - { - "enchantment": "minecraft:silk_touch", - "levels": { - "min": 1 - } - } - ] - } - } - ] - } - ], - "name": "floralis:light_blue_cactus" - }, - { - "type": "minecraft:item", - "conditions": [ - { - "condition": "minecraft:any_of", - "terms": [ - { - "condition": "minecraft:match_tool", - "predicate": { - "items": [ - "minecraft:shears" - ] - } - }, - { - "condition": "minecraft:match_tool", - "predicate": { - "enchantments": [ - { - "enchantment": "minecraft:silk_touch", - "levels": { - "min": 1 - } - } - ] - } - } - ] - } - ], - "name": "floralis:light_blue_cactus_seeds" - } - ] - } - ] - }, - { - "rolls": 1, - "bonus_rolls": 0, - "entries": [ - { - "type": "minecraft:item", - "functions": [ - { - "function": "minecraft:set_count", - "count": 1, - "add": false - }, - { - "function": "minecraft:explosion_decay" - }, - { - "function": "minecraft:apply_bonus", - "enchantment": "minecraft:fortune", - "formula": "minecraft:uniform_bonus_count", - "parameters": { - "bonusMultiplier": 1 - } - } - ], - "name": "floralis:plant_fibers" - } - ], - "conditions": [ - { - "condition": "minecraft:block_state_property", - "block": "floralis:light_blue_cactus_crop", - "properties": { - "age": "5" - } - }, - { - "condition": "minecraft:inverted", - "term": { - "condition": "minecraft:any_of", - "terms": [ - { - "condition": "minecraft:match_tool", - "predicate": { - "items": [ - "minecraft:shears" - ] - } - }, - { - "condition": "minecraft:match_tool", - "predicate": { - "enchantments": [ - { - "enchantment": "minecraft:silk_touch", - "levels": { - "min": 1 - } - } - ] - } - } - ] - } - } - ] - }, - { - "rolls": 1, - "bonus_rolls": 0, - "entries": [ - { - "type": "minecraft:item", - "functions": [ - { - "function": "minecraft:set_count", - "count": 1, - "add": false - }, - { - "function": "minecraft:explosion_decay" - }, - { - "function": "minecraft:apply_bonus", - "enchantment": "minecraft:fortune", - "formula": "minecraft:uniform_bonus_count", - "parameters": { - "bonusMultiplier": 1 - } - } - ], - "name": "floralis:light_blue_petals" - } - ], - "conditions": [ - { - "condition": "minecraft:block_state_property", - "block": "floralis:light_blue_cactus_crop", - "properties": { - "age": "5" - } - }, - { - "condition": "minecraft:inverted", - "term": { - "condition": "minecraft:any_of", - "terms": [ - { - "condition": "minecraft:match_tool", - "predicate": { - "items": [ - "minecraft:shears" - ] - } - }, - { - "condition": "minecraft:match_tool", - "predicate": { - "enchantments": [ - { - "enchantment": "minecraft:silk_touch", - "levels": { - "min": 1 - } - } - ] - } - } - ] - } - } - ] - }, - { - "rolls": 1, - "bonus_rolls": 0, - "entries": [ - { - "type": "minecraft:item", - "functions": [ - { - "function": "minecraft:set_count", - "count": 2, - "add": false - }, - { - "function": "minecraft:explosion_decay" - }, - { - "function": "minecraft:apply_bonus", - "enchantment": "minecraft:fortune", - "formula": "minecraft:uniform_bonus_count", - "parameters": { - "bonusMultiplier": 1 - } - } - ], - "name": "floralis:light_blue_cactus_seeds" - } - ], - "conditions": [ - { - "condition": "minecraft:block_state_property", - "block": "floralis:light_blue_cactus_crop", - "properties": { - "age": "5" - } - }, - { - "condition": "minecraft:inverted", - "term": { - "condition": "minecraft:any_of", - "terms": [ - { - "condition": "minecraft:match_tool", - "predicate": { - "items": [ - "minecraft:shears" - ] - } - }, - { - "condition": "minecraft:match_tool", - "predicate": { - "enchantments": [ - { - "enchantment": "minecraft:silk_touch", - "levels": { - "min": 1 - } - } - ] - } - } - ] - } - } - ] - }, - { - "rolls": 1, - "bonus_rolls": 0, - "entries": [ - { - "type": "minecraft:item", - "functions": [ - { - "function": "minecraft:explosion_decay" - } - ], - "name": "floralis:light_blue_cactus_seeds" - } - ], - "conditions": [ - { - "condition": "minecraft:block_state_property", - "block": "floralis:light_blue_cactus_crop", - "properties": { - "age": "4" - } - }, - { - "condition": "minecraft:inverted", - "term": { - "condition": "minecraft:any_of", - "terms": [ - { - "condition": "minecraft:match_tool", - "predicate": { - "items": [ - "minecraft:shears" - ] - } - }, - { - "condition": "minecraft:match_tool", - "predicate": { - "enchantments": [ - { - "enchantment": "minecraft:silk_touch", - "levels": { - "min": 1 - } - } - ] - } - } - ] - } - } - ] - }, - { - "rolls": 1, - "bonus_rolls": 0, - "entries": [ - { - "type": "minecraft:item", - "functions": [ - { - "function": "minecraft:explosion_decay" - } - ], - "name": "floralis:light_blue_cactus_seeds" - } - ], - "conditions": [ - { - "condition": "minecraft:block_state_property", - "block": "floralis:light_blue_cactus_crop", - "properties": { - "age": "3" - } - }, - { - "condition": "minecraft:inverted", - "term": { - "condition": "minecraft:any_of", - "terms": [ - { - "condition": "minecraft:match_tool", - "predicate": { - "items": [ - "minecraft:shears" - ] - } - }, - { - "condition": "minecraft:match_tool", - "predicate": { - "enchantments": [ - { - "enchantment": "minecraft:silk_touch", - "levels": { - "min": 1 - } - } - ] - } - } - ] - } - } - ] - }, - { - "rolls": 1, - "bonus_rolls": 0, - "entries": [ - { - "type": "minecraft:item", - "functions": [ - { - "function": "minecraft:explosion_decay" - } - ], - "name": "floralis:light_blue_cactus_seeds" - } - ], - "conditions": [ - { - "condition": "minecraft:block_state_property", - "block": "floralis:light_blue_cactus_crop", - "properties": { - "age": "2" - } - }, - { - "condition": "minecraft:inverted", - "term": { - "condition": "minecraft:any_of", - "terms": [ - { - "condition": "minecraft:match_tool", - "predicate": { - "items": [ - "minecraft:shears" - ] - } - }, - { - "condition": "minecraft:match_tool", - "predicate": { - "enchantments": [ - { - "enchantment": "minecraft:silk_touch", - "levels": { - "min": 1 - } - } - ] - } - } - ] - } - } - ] - }, - { - "rolls": 1, - "bonus_rolls": 0, - "entries": [ - { - "type": "minecraft:item", - "functions": [ - { - "function": "minecraft:explosion_decay" - } - ], - "name": "floralis:light_blue_cactus_seeds" - } - ], - "conditions": [ - { - "condition": "minecraft:block_state_property", - "block": "floralis:light_blue_cactus_crop", - "properties": { - "age": "1" - } - }, - { - "condition": "minecraft:inverted", - "term": { - "condition": "minecraft:any_of", - "terms": [ - { - "condition": "minecraft:match_tool", - "predicate": { - "items": [ - "minecraft:shears" - ] - } - }, - { - "condition": "minecraft:match_tool", - "predicate": { - "enchantments": [ - { - "enchantment": "minecraft:silk_touch", - "levels": { - "min": 1 - } - } - ] - } - } - ] - } - } - ] - }, - { - "rolls": 1, - "bonus_rolls": 0, - "entries": [ - { - "type": "minecraft:item", - "functions": [ - { - "function": "minecraft:explosion_decay" - } - ], - "name": "floralis:light_blue_cactus_seeds" - } - ], - "conditions": [ - { - "condition": "minecraft:block_state_property", - "block": "floralis:light_blue_cactus_crop", - "properties": { - "age": "0" - } - }, - { - "condition": "minecraft:inverted", - "term": { - "condition": "minecraft:any_of", - "terms": [ - { - "condition": "minecraft:match_tool", - "predicate": { - "items": [ - "minecraft:shears" - ] - } - }, - { - "condition": "minecraft:match_tool", - "predicate": { - "enchantments": [ - { - "enchantment": "minecraft:silk_touch", - "levels": { - "min": 1 - } - } - ] - } - } - ] - } - } - ] - } - ] -} \ No newline at end of file diff --git a/src/main/resources/data/floralis/loot_tables/blocks/light_blue_flower.json b/src/main/resources/data/floralis/loot_tables/blocks/light_blue_flower.json deleted file mode 100644 index edacb3bc..00000000 --- a/src/main/resources/data/floralis/loot_tables/blocks/light_blue_flower.json +++ /dev/null @@ -1,225 +0,0 @@ -{ - "type": "minecraft:block", - "pools": [ - { - "rolls": 1, - "bonus_rolls": 0, - "entries": [ - { - "type": "minecraft:alternatives", - "children": [ - { - "type": "minecraft:item", - "conditions": [ - { - "condition": "minecraft:any_of", - "terms": [ - { - "condition": "minecraft:match_tool", - "predicate": { - "items": [ - "minecraft:shears" - ] - } - }, - { - "condition": "minecraft:match_tool", - "predicate": { - "enchantments": [ - { - "enchantment": "minecraft:silk_touch", - "levels": { - "min": 1 - } - } - ] - } - } - ] - } - ], - "name": "floralis:light_blue_flower" - } - ] - } - ] - }, - { - "rolls": 1, - "bonus_rolls": 0, - "entries": [ - { - "type": "minecraft:item", - "functions": [ - { - "function": "minecraft:set_count", - "count": 1, - "add": false - }, - { - "function": "minecraft:explosion_decay" - }, - { - "function": "minecraft:apply_bonus", - "enchantment": "minecraft:fortune", - "formula": "minecraft:uniform_bonus_count", - "parameters": { - "bonusMultiplier": 1 - } - } - ], - "name": "floralis:plant_fibers" - } - ], - "conditions": [ - { - "condition": "minecraft:inverted", - "term": { - "condition": "minecraft:any_of", - "terms": [ - { - "condition": "minecraft:match_tool", - "predicate": { - "items": [ - "minecraft:shears" - ] - } - }, - { - "condition": "minecraft:match_tool", - "predicate": { - "enchantments": [ - { - "enchantment": "minecraft:silk_touch", - "levels": { - "min": 1 - } - } - ] - } - } - ] - } - } - ] - }, - { - "rolls": 1, - "bonus_rolls": 0, - "entries": [ - { - "type": "minecraft:item", - "functions": [ - { - "function": "minecraft:set_count", - "count": 1, - "add": false - }, - { - "function": "minecraft:explosion_decay" - }, - { - "function": "minecraft:apply_bonus", - "enchantment": "minecraft:fortune", - "formula": "minecraft:uniform_bonus_count", - "parameters": { - "bonusMultiplier": 1 - } - } - ], - "name": "floralis:light_blue_petals" - } - ], - "conditions": [ - { - "condition": "minecraft:inverted", - "term": { - "condition": "minecraft:any_of", - "terms": [ - { - "condition": "minecraft:match_tool", - "predicate": { - "items": [ - "minecraft:shears" - ] - } - }, - { - "condition": "minecraft:match_tool", - "predicate": { - "enchantments": [ - { - "enchantment": "minecraft:silk_touch", - "levels": { - "min": 1 - } - } - ] - } - } - ] - } - } - ] - }, - { - "rolls": 1, - "bonus_rolls": 0, - "entries": [ - { - "type": "minecraft:item", - "functions": [ - { - "function": "minecraft:set_count", - "count": 2, - "add": false - }, - { - "function": "minecraft:explosion_decay" - }, - { - "function": "minecraft:apply_bonus", - "enchantment": "minecraft:fortune", - "formula": "minecraft:uniform_bonus_count", - "parameters": { - "bonusMultiplier": 1 - } - } - ], - "name": "floralis:light_blue_flower_seeds" - } - ], - "conditions": [ - { - "condition": "minecraft:inverted", - "term": { - "condition": "minecraft:any_of", - "terms": [ - { - "condition": "minecraft:match_tool", - "predicate": { - "items": [ - "minecraft:shears" - ] - } - }, - { - "condition": "minecraft:match_tool", - "predicate": { - "enchantments": [ - { - "enchantment": "minecraft:silk_touch", - "levels": { - "min": 1 - } - } - ] - } - } - ] - } - } - ] - } - ] -} \ No newline at end of file diff --git a/src/main/resources/data/floralis/loot_tables/blocks/light_blue_flower_crop.json b/src/main/resources/data/floralis/loot_tables/blocks/light_blue_flower_crop.json deleted file mode 100644 index 6849dfcb..00000000 --- a/src/main/resources/data/floralis/loot_tables/blocks/light_blue_flower_crop.json +++ /dev/null @@ -1,550 +0,0 @@ -{ - "type": "minecraft:block", - "pools": [ - { - "rolls": 1, - "bonus_rolls": 0, - "entries": [ - { - "type": "minecraft:alternatives", - "children": [ - { - "type": "minecraft:item", - "conditions": [ - { - "condition": "minecraft:block_state_property", - "block": "floralis:light_blue_flower_crop", - "properties": { - "age": "5" - } - }, - { - "condition": "minecraft:any_of", - "terms": [ - { - "condition": "minecraft:match_tool", - "predicate": { - "items": [ - "minecraft:shears" - ] - } - }, - { - "condition": "minecraft:match_tool", - "predicate": { - "enchantments": [ - { - "enchantment": "minecraft:silk_touch", - "levels": { - "min": 1 - } - } - ] - } - } - ] - } - ], - "name": "floralis:light_blue_flower" - }, - { - "type": "minecraft:item", - "conditions": [ - { - "condition": "minecraft:any_of", - "terms": [ - { - "condition": "minecraft:match_tool", - "predicate": { - "items": [ - "minecraft:shears" - ] - } - }, - { - "condition": "minecraft:match_tool", - "predicate": { - "enchantments": [ - { - "enchantment": "minecraft:silk_touch", - "levels": { - "min": 1 - } - } - ] - } - } - ] - } - ], - "name": "floralis:light_blue_flower_seeds" - } - ] - } - ] - }, - { - "rolls": 1, - "bonus_rolls": 0, - "entries": [ - { - "type": "minecraft:item", - "functions": [ - { - "function": "minecraft:set_count", - "count": 1, - "add": false - }, - { - "function": "minecraft:explosion_decay" - }, - { - "function": "minecraft:apply_bonus", - "enchantment": "minecraft:fortune", - "formula": "minecraft:uniform_bonus_count", - "parameters": { - "bonusMultiplier": 1 - } - } - ], - "name": "floralis:plant_fibers" - } - ], - "conditions": [ - { - "condition": "minecraft:block_state_property", - "block": "floralis:light_blue_flower_crop", - "properties": { - "age": "5" - } - }, - { - "condition": "minecraft:inverted", - "term": { - "condition": "minecraft:any_of", - "terms": [ - { - "condition": "minecraft:match_tool", - "predicate": { - "items": [ - "minecraft:shears" - ] - } - }, - { - "condition": "minecraft:match_tool", - "predicate": { - "enchantments": [ - { - "enchantment": "minecraft:silk_touch", - "levels": { - "min": 1 - } - } - ] - } - } - ] - } - } - ] - }, - { - "rolls": 1, - "bonus_rolls": 0, - "entries": [ - { - "type": "minecraft:item", - "functions": [ - { - "function": "minecraft:set_count", - "count": 1, - "add": false - }, - { - "function": "minecraft:explosion_decay" - }, - { - "function": "minecraft:apply_bonus", - "enchantment": "minecraft:fortune", - "formula": "minecraft:uniform_bonus_count", - "parameters": { - "bonusMultiplier": 1 - } - } - ], - "name": "floralis:light_blue_petals" - } - ], - "conditions": [ - { - "condition": "minecraft:block_state_property", - "block": "floralis:light_blue_flower_crop", - "properties": { - "age": "5" - } - }, - { - "condition": "minecraft:inverted", - "term": { - "condition": "minecraft:any_of", - "terms": [ - { - "condition": "minecraft:match_tool", - "predicate": { - "items": [ - "minecraft:shears" - ] - } - }, - { - "condition": "minecraft:match_tool", - "predicate": { - "enchantments": [ - { - "enchantment": "minecraft:silk_touch", - "levels": { - "min": 1 - } - } - ] - } - } - ] - } - } - ] - }, - { - "rolls": 1, - "bonus_rolls": 0, - "entries": [ - { - "type": "minecraft:item", - "functions": [ - { - "function": "minecraft:set_count", - "count": 2, - "add": false - }, - { - "function": "minecraft:explosion_decay" - }, - { - "function": "minecraft:apply_bonus", - "enchantment": "minecraft:fortune", - "formula": "minecraft:uniform_bonus_count", - "parameters": { - "bonusMultiplier": 1 - } - } - ], - "name": "floralis:light_blue_flower_seeds" - } - ], - "conditions": [ - { - "condition": "minecraft:block_state_property", - "block": "floralis:light_blue_flower_crop", - "properties": { - "age": "5" - } - }, - { - "condition": "minecraft:inverted", - "term": { - "condition": "minecraft:any_of", - "terms": [ - { - "condition": "minecraft:match_tool", - "predicate": { - "items": [ - "minecraft:shears" - ] - } - }, - { - "condition": "minecraft:match_tool", - "predicate": { - "enchantments": [ - { - "enchantment": "minecraft:silk_touch", - "levels": { - "min": 1 - } - } - ] - } - } - ] - } - } - ] - }, - { - "rolls": 1, - "bonus_rolls": 0, - "entries": [ - { - "type": "minecraft:item", - "functions": [ - { - "function": "minecraft:explosion_decay" - } - ], - "name": "floralis:light_blue_flower_seeds" - } - ], - "conditions": [ - { - "condition": "minecraft:block_state_property", - "block": "floralis:light_blue_flower_crop", - "properties": { - "age": "4" - } - }, - { - "condition": "minecraft:inverted", - "term": { - "condition": "minecraft:any_of", - "terms": [ - { - "condition": "minecraft:match_tool", - "predicate": { - "items": [ - "minecraft:shears" - ] - } - }, - { - "condition": "minecraft:match_tool", - "predicate": { - "enchantments": [ - { - "enchantment": "minecraft:silk_touch", - "levels": { - "min": 1 - } - } - ] - } - } - ] - } - } - ] - }, - { - "rolls": 1, - "bonus_rolls": 0, - "entries": [ - { - "type": "minecraft:item", - "functions": [ - { - "function": "minecraft:explosion_decay" - } - ], - "name": "floralis:light_blue_flower_seeds" - } - ], - "conditions": [ - { - "condition": "minecraft:block_state_property", - "block": "floralis:light_blue_flower_crop", - "properties": { - "age": "3" - } - }, - { - "condition": "minecraft:inverted", - "term": { - "condition": "minecraft:any_of", - "terms": [ - { - "condition": "minecraft:match_tool", - "predicate": { - "items": [ - "minecraft:shears" - ] - } - }, - { - "condition": "minecraft:match_tool", - "predicate": { - "enchantments": [ - { - "enchantment": "minecraft:silk_touch", - "levels": { - "min": 1 - } - } - ] - } - } - ] - } - } - ] - }, - { - "rolls": 1, - "bonus_rolls": 0, - "entries": [ - { - "type": "minecraft:item", - "functions": [ - { - "function": "minecraft:explosion_decay" - } - ], - "name": "floralis:light_blue_flower_seeds" - } - ], - "conditions": [ - { - "condition": "minecraft:block_state_property", - "block": "floralis:light_blue_flower_crop", - "properties": { - "age": "2" - } - }, - { - "condition": "minecraft:inverted", - "term": { - "condition": "minecraft:any_of", - "terms": [ - { - "condition": "minecraft:match_tool", - "predicate": { - "items": [ - "minecraft:shears" - ] - } - }, - { - "condition": "minecraft:match_tool", - "predicate": { - "enchantments": [ - { - "enchantment": "minecraft:silk_touch", - "levels": { - "min": 1 - } - } - ] - } - } - ] - } - } - ] - }, - { - "rolls": 1, - "bonus_rolls": 0, - "entries": [ - { - "type": "minecraft:item", - "functions": [ - { - "function": "minecraft:explosion_decay" - } - ], - "name": "floralis:light_blue_flower_seeds" - } - ], - "conditions": [ - { - "condition": "minecraft:block_state_property", - "block": "floralis:light_blue_flower_crop", - "properties": { - "age": "1" - } - }, - { - "condition": "minecraft:inverted", - "term": { - "condition": "minecraft:any_of", - "terms": [ - { - "condition": "minecraft:match_tool", - "predicate": { - "items": [ - "minecraft:shears" - ] - } - }, - { - "condition": "minecraft:match_tool", - "predicate": { - "enchantments": [ - { - "enchantment": "minecraft:silk_touch", - "levels": { - "min": 1 - } - } - ] - } - } - ] - } - } - ] - }, - { - "rolls": 1, - "bonus_rolls": 0, - "entries": [ - { - "type": "minecraft:item", - "functions": [ - { - "function": "minecraft:explosion_decay" - } - ], - "name": "floralis:light_blue_flower_seeds" - } - ], - "conditions": [ - { - "condition": "minecraft:block_state_property", - "block": "floralis:light_blue_flower_crop", - "properties": { - "age": "0" - } - }, - { - "condition": "minecraft:inverted", - "term": { - "condition": "minecraft:any_of", - "terms": [ - { - "condition": "minecraft:match_tool", - "predicate": { - "items": [ - "minecraft:shears" - ] - } - }, - { - "condition": "minecraft:match_tool", - "predicate": { - "enchantments": [ - { - "enchantment": "minecraft:silk_touch", - "levels": { - "min": 1 - } - } - ] - } - } - ] - } - } - ] - } - ] -} \ No newline at end of file diff --git a/src/main/resources/data/floralis/loot_tables/blocks/light_gray_cactus.json b/src/main/resources/data/floralis/loot_tables/blocks/light_gray_cactus.json deleted file mode 100644 index 9c264064..00000000 --- a/src/main/resources/data/floralis/loot_tables/blocks/light_gray_cactus.json +++ /dev/null @@ -1,225 +0,0 @@ -{ - "type": "minecraft:block", - "pools": [ - { - "rolls": 1, - "bonus_rolls": 0, - "entries": [ - { - "type": "minecraft:alternatives", - "children": [ - { - "type": "minecraft:item", - "conditions": [ - { - "condition": "minecraft:any_of", - "terms": [ - { - "condition": "minecraft:match_tool", - "predicate": { - "items": [ - "minecraft:shears" - ] - } - }, - { - "condition": "minecraft:match_tool", - "predicate": { - "enchantments": [ - { - "enchantment": "minecraft:silk_touch", - "levels": { - "min": 1 - } - } - ] - } - } - ] - } - ], - "name": "floralis:light_gray_cactus" - } - ] - } - ] - }, - { - "rolls": 1, - "bonus_rolls": 0, - "entries": [ - { - "type": "minecraft:item", - "functions": [ - { - "function": "minecraft:set_count", - "count": 1, - "add": false - }, - { - "function": "minecraft:explosion_decay" - }, - { - "function": "minecraft:apply_bonus", - "enchantment": "minecraft:fortune", - "formula": "minecraft:uniform_bonus_count", - "parameters": { - "bonusMultiplier": 1 - } - } - ], - "name": "floralis:plant_fibers" - } - ], - "conditions": [ - { - "condition": "minecraft:inverted", - "term": { - "condition": "minecraft:any_of", - "terms": [ - { - "condition": "minecraft:match_tool", - "predicate": { - "items": [ - "minecraft:shears" - ] - } - }, - { - "condition": "minecraft:match_tool", - "predicate": { - "enchantments": [ - { - "enchantment": "minecraft:silk_touch", - "levels": { - "min": 1 - } - } - ] - } - } - ] - } - } - ] - }, - { - "rolls": 1, - "bonus_rolls": 0, - "entries": [ - { - "type": "minecraft:item", - "functions": [ - { - "function": "minecraft:set_count", - "count": 1, - "add": false - }, - { - "function": "minecraft:explosion_decay" - }, - { - "function": "minecraft:apply_bonus", - "enchantment": "minecraft:fortune", - "formula": "minecraft:uniform_bonus_count", - "parameters": { - "bonusMultiplier": 1 - } - } - ], - "name": "floralis:light_gray_petals" - } - ], - "conditions": [ - { - "condition": "minecraft:inverted", - "term": { - "condition": "minecraft:any_of", - "terms": [ - { - "condition": "minecraft:match_tool", - "predicate": { - "items": [ - "minecraft:shears" - ] - } - }, - { - "condition": "minecraft:match_tool", - "predicate": { - "enchantments": [ - { - "enchantment": "minecraft:silk_touch", - "levels": { - "min": 1 - } - } - ] - } - } - ] - } - } - ] - }, - { - "rolls": 1, - "bonus_rolls": 0, - "entries": [ - { - "type": "minecraft:item", - "functions": [ - { - "function": "minecraft:set_count", - "count": 2, - "add": false - }, - { - "function": "minecraft:explosion_decay" - }, - { - "function": "minecraft:apply_bonus", - "enchantment": "minecraft:fortune", - "formula": "minecraft:uniform_bonus_count", - "parameters": { - "bonusMultiplier": 1 - } - } - ], - "name": "floralis:light_gray_cactus_seeds" - } - ], - "conditions": [ - { - "condition": "minecraft:inverted", - "term": { - "condition": "minecraft:any_of", - "terms": [ - { - "condition": "minecraft:match_tool", - "predicate": { - "items": [ - "minecraft:shears" - ] - } - }, - { - "condition": "minecraft:match_tool", - "predicate": { - "enchantments": [ - { - "enchantment": "minecraft:silk_touch", - "levels": { - "min": 1 - } - } - ] - } - } - ] - } - } - ] - } - ] -} \ No newline at end of file diff --git a/src/main/resources/data/floralis/loot_tables/blocks/light_gray_cactus_crop.json b/src/main/resources/data/floralis/loot_tables/blocks/light_gray_cactus_crop.json deleted file mode 100644 index 4f7654d3..00000000 --- a/src/main/resources/data/floralis/loot_tables/blocks/light_gray_cactus_crop.json +++ /dev/null @@ -1,550 +0,0 @@ -{ - "type": "minecraft:block", - "pools": [ - { - "rolls": 1, - "bonus_rolls": 0, - "entries": [ - { - "type": "minecraft:alternatives", - "children": [ - { - "type": "minecraft:item", - "conditions": [ - { - "condition": "minecraft:block_state_property", - "block": "floralis:light_gray_cactus_crop", - "properties": { - "age": "5" - } - }, - { - "condition": "minecraft:any_of", - "terms": [ - { - "condition": "minecraft:match_tool", - "predicate": { - "items": [ - "minecraft:shears" - ] - } - }, - { - "condition": "minecraft:match_tool", - "predicate": { - "enchantments": [ - { - "enchantment": "minecraft:silk_touch", - "levels": { - "min": 1 - } - } - ] - } - } - ] - } - ], - "name": "floralis:light_gray_cactus" - }, - { - "type": "minecraft:item", - "conditions": [ - { - "condition": "minecraft:any_of", - "terms": [ - { - "condition": "minecraft:match_tool", - "predicate": { - "items": [ - "minecraft:shears" - ] - } - }, - { - "condition": "minecraft:match_tool", - "predicate": { - "enchantments": [ - { - "enchantment": "minecraft:silk_touch", - "levels": { - "min": 1 - } - } - ] - } - } - ] - } - ], - "name": "floralis:light_gray_cactus_seeds" - } - ] - } - ] - }, - { - "rolls": 1, - "bonus_rolls": 0, - "entries": [ - { - "type": "minecraft:item", - "functions": [ - { - "function": "minecraft:set_count", - "count": 1, - "add": false - }, - { - "function": "minecraft:explosion_decay" - }, - { - "function": "minecraft:apply_bonus", - "enchantment": "minecraft:fortune", - "formula": "minecraft:uniform_bonus_count", - "parameters": { - "bonusMultiplier": 1 - } - } - ], - "name": "floralis:plant_fibers" - } - ], - "conditions": [ - { - "condition": "minecraft:block_state_property", - "block": "floralis:light_gray_cactus_crop", - "properties": { - "age": "5" - } - }, - { - "condition": "minecraft:inverted", - "term": { - "condition": "minecraft:any_of", - "terms": [ - { - "condition": "minecraft:match_tool", - "predicate": { - "items": [ - "minecraft:shears" - ] - } - }, - { - "condition": "minecraft:match_tool", - "predicate": { - "enchantments": [ - { - "enchantment": "minecraft:silk_touch", - "levels": { - "min": 1 - } - } - ] - } - } - ] - } - } - ] - }, - { - "rolls": 1, - "bonus_rolls": 0, - "entries": [ - { - "type": "minecraft:item", - "functions": [ - { - "function": "minecraft:set_count", - "count": 1, - "add": false - }, - { - "function": "minecraft:explosion_decay" - }, - { - "function": "minecraft:apply_bonus", - "enchantment": "minecraft:fortune", - "formula": "minecraft:uniform_bonus_count", - "parameters": { - "bonusMultiplier": 1 - } - } - ], - "name": "floralis:light_gray_petals" - } - ], - "conditions": [ - { - "condition": "minecraft:block_state_property", - "block": "floralis:light_gray_cactus_crop", - "properties": { - "age": "5" - } - }, - { - "condition": "minecraft:inverted", - "term": { - "condition": "minecraft:any_of", - "terms": [ - { - "condition": "minecraft:match_tool", - "predicate": { - "items": [ - "minecraft:shears" - ] - } - }, - { - "condition": "minecraft:match_tool", - "predicate": { - "enchantments": [ - { - "enchantment": "minecraft:silk_touch", - "levels": { - "min": 1 - } - } - ] - } - } - ] - } - } - ] - }, - { - "rolls": 1, - "bonus_rolls": 0, - "entries": [ - { - "type": "minecraft:item", - "functions": [ - { - "function": "minecraft:set_count", - "count": 2, - "add": false - }, - { - "function": "minecraft:explosion_decay" - }, - { - "function": "minecraft:apply_bonus", - "enchantment": "minecraft:fortune", - "formula": "minecraft:uniform_bonus_count", - "parameters": { - "bonusMultiplier": 1 - } - } - ], - "name": "floralis:light_gray_cactus_seeds" - } - ], - "conditions": [ - { - "condition": "minecraft:block_state_property", - "block": "floralis:light_gray_cactus_crop", - "properties": { - "age": "5" - } - }, - { - "condition": "minecraft:inverted", - "term": { - "condition": "minecraft:any_of", - "terms": [ - { - "condition": "minecraft:match_tool", - "predicate": { - "items": [ - "minecraft:shears" - ] - } - }, - { - "condition": "minecraft:match_tool", - "predicate": { - "enchantments": [ - { - "enchantment": "minecraft:silk_touch", - "levels": { - "min": 1 - } - } - ] - } - } - ] - } - } - ] - }, - { - "rolls": 1, - "bonus_rolls": 0, - "entries": [ - { - "type": "minecraft:item", - "functions": [ - { - "function": "minecraft:explosion_decay" - } - ], - "name": "floralis:light_gray_cactus_seeds" - } - ], - "conditions": [ - { - "condition": "minecraft:block_state_property", - "block": "floralis:light_gray_cactus_crop", - "properties": { - "age": "4" - } - }, - { - "condition": "minecraft:inverted", - "term": { - "condition": "minecraft:any_of", - "terms": [ - { - "condition": "minecraft:match_tool", - "predicate": { - "items": [ - "minecraft:shears" - ] - } - }, - { - "condition": "minecraft:match_tool", - "predicate": { - "enchantments": [ - { - "enchantment": "minecraft:silk_touch", - "levels": { - "min": 1 - } - } - ] - } - } - ] - } - } - ] - }, - { - "rolls": 1, - "bonus_rolls": 0, - "entries": [ - { - "type": "minecraft:item", - "functions": [ - { - "function": "minecraft:explosion_decay" - } - ], - "name": "floralis:light_gray_cactus_seeds" - } - ], - "conditions": [ - { - "condition": "minecraft:block_state_property", - "block": "floralis:light_gray_cactus_crop", - "properties": { - "age": "3" - } - }, - { - "condition": "minecraft:inverted", - "term": { - "condition": "minecraft:any_of", - "terms": [ - { - "condition": "minecraft:match_tool", - "predicate": { - "items": [ - "minecraft:shears" - ] - } - }, - { - "condition": "minecraft:match_tool", - "predicate": { - "enchantments": [ - { - "enchantment": "minecraft:silk_touch", - "levels": { - "min": 1 - } - } - ] - } - } - ] - } - } - ] - }, - { - "rolls": 1, - "bonus_rolls": 0, - "entries": [ - { - "type": "minecraft:item", - "functions": [ - { - "function": "minecraft:explosion_decay" - } - ], - "name": "floralis:light_gray_cactus_seeds" - } - ], - "conditions": [ - { - "condition": "minecraft:block_state_property", - "block": "floralis:light_gray_cactus_crop", - "properties": { - "age": "2" - } - }, - { - "condition": "minecraft:inverted", - "term": { - "condition": "minecraft:any_of", - "terms": [ - { - "condition": "minecraft:match_tool", - "predicate": { - "items": [ - "minecraft:shears" - ] - } - }, - { - "condition": "minecraft:match_tool", - "predicate": { - "enchantments": [ - { - "enchantment": "minecraft:silk_touch", - "levels": { - "min": 1 - } - } - ] - } - } - ] - } - } - ] - }, - { - "rolls": 1, - "bonus_rolls": 0, - "entries": [ - { - "type": "minecraft:item", - "functions": [ - { - "function": "minecraft:explosion_decay" - } - ], - "name": "floralis:light_gray_cactus_seeds" - } - ], - "conditions": [ - { - "condition": "minecraft:block_state_property", - "block": "floralis:light_gray_cactus_crop", - "properties": { - "age": "1" - } - }, - { - "condition": "minecraft:inverted", - "term": { - "condition": "minecraft:any_of", - "terms": [ - { - "condition": "minecraft:match_tool", - "predicate": { - "items": [ - "minecraft:shears" - ] - } - }, - { - "condition": "minecraft:match_tool", - "predicate": { - "enchantments": [ - { - "enchantment": "minecraft:silk_touch", - "levels": { - "min": 1 - } - } - ] - } - } - ] - } - } - ] - }, - { - "rolls": 1, - "bonus_rolls": 0, - "entries": [ - { - "type": "minecraft:item", - "functions": [ - { - "function": "minecraft:explosion_decay" - } - ], - "name": "floralis:light_gray_cactus_seeds" - } - ], - "conditions": [ - { - "condition": "minecraft:block_state_property", - "block": "floralis:light_gray_cactus_crop", - "properties": { - "age": "0" - } - }, - { - "condition": "minecraft:inverted", - "term": { - "condition": "minecraft:any_of", - "terms": [ - { - "condition": "minecraft:match_tool", - "predicate": { - "items": [ - "minecraft:shears" - ] - } - }, - { - "condition": "minecraft:match_tool", - "predicate": { - "enchantments": [ - { - "enchantment": "minecraft:silk_touch", - "levels": { - "min": 1 - } - } - ] - } - } - ] - } - } - ] - } - ] -} \ No newline at end of file diff --git a/src/main/resources/data/floralis/loot_tables/blocks/light_gray_flower.json b/src/main/resources/data/floralis/loot_tables/blocks/light_gray_flower.json deleted file mode 100644 index 35dc9dfb..00000000 --- a/src/main/resources/data/floralis/loot_tables/blocks/light_gray_flower.json +++ /dev/null @@ -1,225 +0,0 @@ -{ - "type": "minecraft:block", - "pools": [ - { - "rolls": 1, - "bonus_rolls": 0, - "entries": [ - { - "type": "minecraft:alternatives", - "children": [ - { - "type": "minecraft:item", - "conditions": [ - { - "condition": "minecraft:any_of", - "terms": [ - { - "condition": "minecraft:match_tool", - "predicate": { - "items": [ - "minecraft:shears" - ] - } - }, - { - "condition": "minecraft:match_tool", - "predicate": { - "enchantments": [ - { - "enchantment": "minecraft:silk_touch", - "levels": { - "min": 1 - } - } - ] - } - } - ] - } - ], - "name": "floralis:light_gray_flower" - } - ] - } - ] - }, - { - "rolls": 1, - "bonus_rolls": 0, - "entries": [ - { - "type": "minecraft:item", - "functions": [ - { - "function": "minecraft:set_count", - "count": 1, - "add": false - }, - { - "function": "minecraft:explosion_decay" - }, - { - "function": "minecraft:apply_bonus", - "enchantment": "minecraft:fortune", - "formula": "minecraft:uniform_bonus_count", - "parameters": { - "bonusMultiplier": 1 - } - } - ], - "name": "floralis:plant_fibers" - } - ], - "conditions": [ - { - "condition": "minecraft:inverted", - "term": { - "condition": "minecraft:any_of", - "terms": [ - { - "condition": "minecraft:match_tool", - "predicate": { - "items": [ - "minecraft:shears" - ] - } - }, - { - "condition": "minecraft:match_tool", - "predicate": { - "enchantments": [ - { - "enchantment": "minecraft:silk_touch", - "levels": { - "min": 1 - } - } - ] - } - } - ] - } - } - ] - }, - { - "rolls": 1, - "bonus_rolls": 0, - "entries": [ - { - "type": "minecraft:item", - "functions": [ - { - "function": "minecraft:set_count", - "count": 1, - "add": false - }, - { - "function": "minecraft:explosion_decay" - }, - { - "function": "minecraft:apply_bonus", - "enchantment": "minecraft:fortune", - "formula": "minecraft:uniform_bonus_count", - "parameters": { - "bonusMultiplier": 1 - } - } - ], - "name": "floralis:light_gray_petals" - } - ], - "conditions": [ - { - "condition": "minecraft:inverted", - "term": { - "condition": "minecraft:any_of", - "terms": [ - { - "condition": "minecraft:match_tool", - "predicate": { - "items": [ - "minecraft:shears" - ] - } - }, - { - "condition": "minecraft:match_tool", - "predicate": { - "enchantments": [ - { - "enchantment": "minecraft:silk_touch", - "levels": { - "min": 1 - } - } - ] - } - } - ] - } - } - ] - }, - { - "rolls": 1, - "bonus_rolls": 0, - "entries": [ - { - "type": "minecraft:item", - "functions": [ - { - "function": "minecraft:set_count", - "count": 2, - "add": false - }, - { - "function": "minecraft:explosion_decay" - }, - { - "function": "minecraft:apply_bonus", - "enchantment": "minecraft:fortune", - "formula": "minecraft:uniform_bonus_count", - "parameters": { - "bonusMultiplier": 1 - } - } - ], - "name": "floralis:light_gray_flower_seeds" - } - ], - "conditions": [ - { - "condition": "minecraft:inverted", - "term": { - "condition": "minecraft:any_of", - "terms": [ - { - "condition": "minecraft:match_tool", - "predicate": { - "items": [ - "minecraft:shears" - ] - } - }, - { - "condition": "minecraft:match_tool", - "predicate": { - "enchantments": [ - { - "enchantment": "minecraft:silk_touch", - "levels": { - "min": 1 - } - } - ] - } - } - ] - } - } - ] - } - ] -} \ No newline at end of file diff --git a/src/main/resources/data/floralis/loot_tables/blocks/light_gray_flower_crop.json b/src/main/resources/data/floralis/loot_tables/blocks/light_gray_flower_crop.json deleted file mode 100644 index 6144fe7a..00000000 --- a/src/main/resources/data/floralis/loot_tables/blocks/light_gray_flower_crop.json +++ /dev/null @@ -1,550 +0,0 @@ -{ - "type": "minecraft:block", - "pools": [ - { - "rolls": 1, - "bonus_rolls": 0, - "entries": [ - { - "type": "minecraft:alternatives", - "children": [ - { - "type": "minecraft:item", - "conditions": [ - { - "condition": "minecraft:block_state_property", - "block": "floralis:light_gray_flower_crop", - "properties": { - "age": "5" - } - }, - { - "condition": "minecraft:any_of", - "terms": [ - { - "condition": "minecraft:match_tool", - "predicate": { - "items": [ - "minecraft:shears" - ] - } - }, - { - "condition": "minecraft:match_tool", - "predicate": { - "enchantments": [ - { - "enchantment": "minecraft:silk_touch", - "levels": { - "min": 1 - } - } - ] - } - } - ] - } - ], - "name": "floralis:light_gray_flower" - }, - { - "type": "minecraft:item", - "conditions": [ - { - "condition": "minecraft:any_of", - "terms": [ - { - "condition": "minecraft:match_tool", - "predicate": { - "items": [ - "minecraft:shears" - ] - } - }, - { - "condition": "minecraft:match_tool", - "predicate": { - "enchantments": [ - { - "enchantment": "minecraft:silk_touch", - "levels": { - "min": 1 - } - } - ] - } - } - ] - } - ], - "name": "floralis:light_gray_flower_seeds" - } - ] - } - ] - }, - { - "rolls": 1, - "bonus_rolls": 0, - "entries": [ - { - "type": "minecraft:item", - "functions": [ - { - "function": "minecraft:set_count", - "count": 1, - "add": false - }, - { - "function": "minecraft:explosion_decay" - }, - { - "function": "minecraft:apply_bonus", - "enchantment": "minecraft:fortune", - "formula": "minecraft:uniform_bonus_count", - "parameters": { - "bonusMultiplier": 1 - } - } - ], - "name": "floralis:plant_fibers" - } - ], - "conditions": [ - { - "condition": "minecraft:block_state_property", - "block": "floralis:light_gray_flower_crop", - "properties": { - "age": "5" - } - }, - { - "condition": "minecraft:inverted", - "term": { - "condition": "minecraft:any_of", - "terms": [ - { - "condition": "minecraft:match_tool", - "predicate": { - "items": [ - "minecraft:shears" - ] - } - }, - { - "condition": "minecraft:match_tool", - "predicate": { - "enchantments": [ - { - "enchantment": "minecraft:silk_touch", - "levels": { - "min": 1 - } - } - ] - } - } - ] - } - } - ] - }, - { - "rolls": 1, - "bonus_rolls": 0, - "entries": [ - { - "type": "minecraft:item", - "functions": [ - { - "function": "minecraft:set_count", - "count": 1, - "add": false - }, - { - "function": "minecraft:explosion_decay" - }, - { - "function": "minecraft:apply_bonus", - "enchantment": "minecraft:fortune", - "formula": "minecraft:uniform_bonus_count", - "parameters": { - "bonusMultiplier": 1 - } - } - ], - "name": "floralis:light_gray_petals" - } - ], - "conditions": [ - { - "condition": "minecraft:block_state_property", - "block": "floralis:light_gray_flower_crop", - "properties": { - "age": "5" - } - }, - { - "condition": "minecraft:inverted", - "term": { - "condition": "minecraft:any_of", - "terms": [ - { - "condition": "minecraft:match_tool", - "predicate": { - "items": [ - "minecraft:shears" - ] - } - }, - { - "condition": "minecraft:match_tool", - "predicate": { - "enchantments": [ - { - "enchantment": "minecraft:silk_touch", - "levels": { - "min": 1 - } - } - ] - } - } - ] - } - } - ] - }, - { - "rolls": 1, - "bonus_rolls": 0, - "entries": [ - { - "type": "minecraft:item", - "functions": [ - { - "function": "minecraft:set_count", - "count": 2, - "add": false - }, - { - "function": "minecraft:explosion_decay" - }, - { - "function": "minecraft:apply_bonus", - "enchantment": "minecraft:fortune", - "formula": "minecraft:uniform_bonus_count", - "parameters": { - "bonusMultiplier": 1 - } - } - ], - "name": "floralis:light_gray_flower_seeds" - } - ], - "conditions": [ - { - "condition": "minecraft:block_state_property", - "block": "floralis:light_gray_flower_crop", - "properties": { - "age": "5" - } - }, - { - "condition": "minecraft:inverted", - "term": { - "condition": "minecraft:any_of", - "terms": [ - { - "condition": "minecraft:match_tool", - "predicate": { - "items": [ - "minecraft:shears" - ] - } - }, - { - "condition": "minecraft:match_tool", - "predicate": { - "enchantments": [ - { - "enchantment": "minecraft:silk_touch", - "levels": { - "min": 1 - } - } - ] - } - } - ] - } - } - ] - }, - { - "rolls": 1, - "bonus_rolls": 0, - "entries": [ - { - "type": "minecraft:item", - "functions": [ - { - "function": "minecraft:explosion_decay" - } - ], - "name": "floralis:light_gray_flower_seeds" - } - ], - "conditions": [ - { - "condition": "minecraft:block_state_property", - "block": "floralis:light_gray_flower_crop", - "properties": { - "age": "4" - } - }, - { - "condition": "minecraft:inverted", - "term": { - "condition": "minecraft:any_of", - "terms": [ - { - "condition": "minecraft:match_tool", - "predicate": { - "items": [ - "minecraft:shears" - ] - } - }, - { - "condition": "minecraft:match_tool", - "predicate": { - "enchantments": [ - { - "enchantment": "minecraft:silk_touch", - "levels": { - "min": 1 - } - } - ] - } - } - ] - } - } - ] - }, - { - "rolls": 1, - "bonus_rolls": 0, - "entries": [ - { - "type": "minecraft:item", - "functions": [ - { - "function": "minecraft:explosion_decay" - } - ], - "name": "floralis:light_gray_flower_seeds" - } - ], - "conditions": [ - { - "condition": "minecraft:block_state_property", - "block": "floralis:light_gray_flower_crop", - "properties": { - "age": "3" - } - }, - { - "condition": "minecraft:inverted", - "term": { - "condition": "minecraft:any_of", - "terms": [ - { - "condition": "minecraft:match_tool", - "predicate": { - "items": [ - "minecraft:shears" - ] - } - }, - { - "condition": "minecraft:match_tool", - "predicate": { - "enchantments": [ - { - "enchantment": "minecraft:silk_touch", - "levels": { - "min": 1 - } - } - ] - } - } - ] - } - } - ] - }, - { - "rolls": 1, - "bonus_rolls": 0, - "entries": [ - { - "type": "minecraft:item", - "functions": [ - { - "function": "minecraft:explosion_decay" - } - ], - "name": "floralis:light_gray_flower_seeds" - } - ], - "conditions": [ - { - "condition": "minecraft:block_state_property", - "block": "floralis:light_gray_flower_crop", - "properties": { - "age": "2" - } - }, - { - "condition": "minecraft:inverted", - "term": { - "condition": "minecraft:any_of", - "terms": [ - { - "condition": "minecraft:match_tool", - "predicate": { - "items": [ - "minecraft:shears" - ] - } - }, - { - "condition": "minecraft:match_tool", - "predicate": { - "enchantments": [ - { - "enchantment": "minecraft:silk_touch", - "levels": { - "min": 1 - } - } - ] - } - } - ] - } - } - ] - }, - { - "rolls": 1, - "bonus_rolls": 0, - "entries": [ - { - "type": "minecraft:item", - "functions": [ - { - "function": "minecraft:explosion_decay" - } - ], - "name": "floralis:light_gray_flower_seeds" - } - ], - "conditions": [ - { - "condition": "minecraft:block_state_property", - "block": "floralis:light_gray_flower_crop", - "properties": { - "age": "1" - } - }, - { - "condition": "minecraft:inverted", - "term": { - "condition": "minecraft:any_of", - "terms": [ - { - "condition": "minecraft:match_tool", - "predicate": { - "items": [ - "minecraft:shears" - ] - } - }, - { - "condition": "minecraft:match_tool", - "predicate": { - "enchantments": [ - { - "enchantment": "minecraft:silk_touch", - "levels": { - "min": 1 - } - } - ] - } - } - ] - } - } - ] - }, - { - "rolls": 1, - "bonus_rolls": 0, - "entries": [ - { - "type": "minecraft:item", - "functions": [ - { - "function": "minecraft:explosion_decay" - } - ], - "name": "floralis:light_gray_flower_seeds" - } - ], - "conditions": [ - { - "condition": "minecraft:block_state_property", - "block": "floralis:light_gray_flower_crop", - "properties": { - "age": "0" - } - }, - { - "condition": "minecraft:inverted", - "term": { - "condition": "minecraft:any_of", - "terms": [ - { - "condition": "minecraft:match_tool", - "predicate": { - "items": [ - "minecraft:shears" - ] - } - }, - { - "condition": "minecraft:match_tool", - "predicate": { - "enchantments": [ - { - "enchantment": "minecraft:silk_touch", - "levels": { - "min": 1 - } - } - ] - } - } - ] - } - } - ] - } - ] -} \ No newline at end of file diff --git a/src/main/resources/data/floralis/loot_tables/blocks/lime_cactus.json b/src/main/resources/data/floralis/loot_tables/blocks/lime_cactus.json deleted file mode 100644 index 6b61005d..00000000 --- a/src/main/resources/data/floralis/loot_tables/blocks/lime_cactus.json +++ /dev/null @@ -1,225 +0,0 @@ -{ - "type": "minecraft:block", - "pools": [ - { - "rolls": 1, - "bonus_rolls": 0, - "entries": [ - { - "type": "minecraft:alternatives", - "children": [ - { - "type": "minecraft:item", - "conditions": [ - { - "condition": "minecraft:any_of", - "terms": [ - { - "condition": "minecraft:match_tool", - "predicate": { - "items": [ - "minecraft:shears" - ] - } - }, - { - "condition": "minecraft:match_tool", - "predicate": { - "enchantments": [ - { - "enchantment": "minecraft:silk_touch", - "levels": { - "min": 1 - } - } - ] - } - } - ] - } - ], - "name": "floralis:lime_cactus" - } - ] - } - ] - }, - { - "rolls": 1, - "bonus_rolls": 0, - "entries": [ - { - "type": "minecraft:item", - "functions": [ - { - "function": "minecraft:set_count", - "count": 1, - "add": false - }, - { - "function": "minecraft:explosion_decay" - }, - { - "function": "minecraft:apply_bonus", - "enchantment": "minecraft:fortune", - "formula": "minecraft:uniform_bonus_count", - "parameters": { - "bonusMultiplier": 1 - } - } - ], - "name": "floralis:plant_fibers" - } - ], - "conditions": [ - { - "condition": "minecraft:inverted", - "term": { - "condition": "minecraft:any_of", - "terms": [ - { - "condition": "minecraft:match_tool", - "predicate": { - "items": [ - "minecraft:shears" - ] - } - }, - { - "condition": "minecraft:match_tool", - "predicate": { - "enchantments": [ - { - "enchantment": "minecraft:silk_touch", - "levels": { - "min": 1 - } - } - ] - } - } - ] - } - } - ] - }, - { - "rolls": 1, - "bonus_rolls": 0, - "entries": [ - { - "type": "minecraft:item", - "functions": [ - { - "function": "minecraft:set_count", - "count": 1, - "add": false - }, - { - "function": "minecraft:explosion_decay" - }, - { - "function": "minecraft:apply_bonus", - "enchantment": "minecraft:fortune", - "formula": "minecraft:uniform_bonus_count", - "parameters": { - "bonusMultiplier": 1 - } - } - ], - "name": "floralis:lime_petals" - } - ], - "conditions": [ - { - "condition": "minecraft:inverted", - "term": { - "condition": "minecraft:any_of", - "terms": [ - { - "condition": "minecraft:match_tool", - "predicate": { - "items": [ - "minecraft:shears" - ] - } - }, - { - "condition": "minecraft:match_tool", - "predicate": { - "enchantments": [ - { - "enchantment": "minecraft:silk_touch", - "levels": { - "min": 1 - } - } - ] - } - } - ] - } - } - ] - }, - { - "rolls": 1, - "bonus_rolls": 0, - "entries": [ - { - "type": "minecraft:item", - "functions": [ - { - "function": "minecraft:set_count", - "count": 2, - "add": false - }, - { - "function": "minecraft:explosion_decay" - }, - { - "function": "minecraft:apply_bonus", - "enchantment": "minecraft:fortune", - "formula": "minecraft:uniform_bonus_count", - "parameters": { - "bonusMultiplier": 1 - } - } - ], - "name": "floralis:lime_cactus_seeds" - } - ], - "conditions": [ - { - "condition": "minecraft:inverted", - "term": { - "condition": "minecraft:any_of", - "terms": [ - { - "condition": "minecraft:match_tool", - "predicate": { - "items": [ - "minecraft:shears" - ] - } - }, - { - "condition": "minecraft:match_tool", - "predicate": { - "enchantments": [ - { - "enchantment": "minecraft:silk_touch", - "levels": { - "min": 1 - } - } - ] - } - } - ] - } - } - ] - } - ] -} \ No newline at end of file diff --git a/src/main/resources/data/floralis/loot_tables/blocks/lime_cactus_crop.json b/src/main/resources/data/floralis/loot_tables/blocks/lime_cactus_crop.json deleted file mode 100644 index 1697d3b4..00000000 --- a/src/main/resources/data/floralis/loot_tables/blocks/lime_cactus_crop.json +++ /dev/null @@ -1,550 +0,0 @@ -{ - "type": "minecraft:block", - "pools": [ - { - "rolls": 1, - "bonus_rolls": 0, - "entries": [ - { - "type": "minecraft:alternatives", - "children": [ - { - "type": "minecraft:item", - "conditions": [ - { - "condition": "minecraft:block_state_property", - "block": "floralis:lime_cactus_crop", - "properties": { - "age": "5" - } - }, - { - "condition": "minecraft:any_of", - "terms": [ - { - "condition": "minecraft:match_tool", - "predicate": { - "items": [ - "minecraft:shears" - ] - } - }, - { - "condition": "minecraft:match_tool", - "predicate": { - "enchantments": [ - { - "enchantment": "minecraft:silk_touch", - "levels": { - "min": 1 - } - } - ] - } - } - ] - } - ], - "name": "floralis:lime_cactus" - }, - { - "type": "minecraft:item", - "conditions": [ - { - "condition": "minecraft:any_of", - "terms": [ - { - "condition": "minecraft:match_tool", - "predicate": { - "items": [ - "minecraft:shears" - ] - } - }, - { - "condition": "minecraft:match_tool", - "predicate": { - "enchantments": [ - { - "enchantment": "minecraft:silk_touch", - "levels": { - "min": 1 - } - } - ] - } - } - ] - } - ], - "name": "floralis:lime_cactus_seeds" - } - ] - } - ] - }, - { - "rolls": 1, - "bonus_rolls": 0, - "entries": [ - { - "type": "minecraft:item", - "functions": [ - { - "function": "minecraft:set_count", - "count": 1, - "add": false - }, - { - "function": "minecraft:explosion_decay" - }, - { - "function": "minecraft:apply_bonus", - "enchantment": "minecraft:fortune", - "formula": "minecraft:uniform_bonus_count", - "parameters": { - "bonusMultiplier": 1 - } - } - ], - "name": "floralis:plant_fibers" - } - ], - "conditions": [ - { - "condition": "minecraft:block_state_property", - "block": "floralis:lime_cactus_crop", - "properties": { - "age": "5" - } - }, - { - "condition": "minecraft:inverted", - "term": { - "condition": "minecraft:any_of", - "terms": [ - { - "condition": "minecraft:match_tool", - "predicate": { - "items": [ - "minecraft:shears" - ] - } - }, - { - "condition": "minecraft:match_tool", - "predicate": { - "enchantments": [ - { - "enchantment": "minecraft:silk_touch", - "levels": { - "min": 1 - } - } - ] - } - } - ] - } - } - ] - }, - { - "rolls": 1, - "bonus_rolls": 0, - "entries": [ - { - "type": "minecraft:item", - "functions": [ - { - "function": "minecraft:set_count", - "count": 1, - "add": false - }, - { - "function": "minecraft:explosion_decay" - }, - { - "function": "minecraft:apply_bonus", - "enchantment": "minecraft:fortune", - "formula": "minecraft:uniform_bonus_count", - "parameters": { - "bonusMultiplier": 1 - } - } - ], - "name": "floralis:lime_petals" - } - ], - "conditions": [ - { - "condition": "minecraft:block_state_property", - "block": "floralis:lime_cactus_crop", - "properties": { - "age": "5" - } - }, - { - "condition": "minecraft:inverted", - "term": { - "condition": "minecraft:any_of", - "terms": [ - { - "condition": "minecraft:match_tool", - "predicate": { - "items": [ - "minecraft:shears" - ] - } - }, - { - "condition": "minecraft:match_tool", - "predicate": { - "enchantments": [ - { - "enchantment": "minecraft:silk_touch", - "levels": { - "min": 1 - } - } - ] - } - } - ] - } - } - ] - }, - { - "rolls": 1, - "bonus_rolls": 0, - "entries": [ - { - "type": "minecraft:item", - "functions": [ - { - "function": "minecraft:set_count", - "count": 2, - "add": false - }, - { - "function": "minecraft:explosion_decay" - }, - { - "function": "minecraft:apply_bonus", - "enchantment": "minecraft:fortune", - "formula": "minecraft:uniform_bonus_count", - "parameters": { - "bonusMultiplier": 1 - } - } - ], - "name": "floralis:lime_cactus_seeds" - } - ], - "conditions": [ - { - "condition": "minecraft:block_state_property", - "block": "floralis:lime_cactus_crop", - "properties": { - "age": "5" - } - }, - { - "condition": "minecraft:inverted", - "term": { - "condition": "minecraft:any_of", - "terms": [ - { - "condition": "minecraft:match_tool", - "predicate": { - "items": [ - "minecraft:shears" - ] - } - }, - { - "condition": "minecraft:match_tool", - "predicate": { - "enchantments": [ - { - "enchantment": "minecraft:silk_touch", - "levels": { - "min": 1 - } - } - ] - } - } - ] - } - } - ] - }, - { - "rolls": 1, - "bonus_rolls": 0, - "entries": [ - { - "type": "minecraft:item", - "functions": [ - { - "function": "minecraft:explosion_decay" - } - ], - "name": "floralis:lime_cactus_seeds" - } - ], - "conditions": [ - { - "condition": "minecraft:block_state_property", - "block": "floralis:lime_cactus_crop", - "properties": { - "age": "4" - } - }, - { - "condition": "minecraft:inverted", - "term": { - "condition": "minecraft:any_of", - "terms": [ - { - "condition": "minecraft:match_tool", - "predicate": { - "items": [ - "minecraft:shears" - ] - } - }, - { - "condition": "minecraft:match_tool", - "predicate": { - "enchantments": [ - { - "enchantment": "minecraft:silk_touch", - "levels": { - "min": 1 - } - } - ] - } - } - ] - } - } - ] - }, - { - "rolls": 1, - "bonus_rolls": 0, - "entries": [ - { - "type": "minecraft:item", - "functions": [ - { - "function": "minecraft:explosion_decay" - } - ], - "name": "floralis:lime_cactus_seeds" - } - ], - "conditions": [ - { - "condition": "minecraft:block_state_property", - "block": "floralis:lime_cactus_crop", - "properties": { - "age": "3" - } - }, - { - "condition": "minecraft:inverted", - "term": { - "condition": "minecraft:any_of", - "terms": [ - { - "condition": "minecraft:match_tool", - "predicate": { - "items": [ - "minecraft:shears" - ] - } - }, - { - "condition": "minecraft:match_tool", - "predicate": { - "enchantments": [ - { - "enchantment": "minecraft:silk_touch", - "levels": { - "min": 1 - } - } - ] - } - } - ] - } - } - ] - }, - { - "rolls": 1, - "bonus_rolls": 0, - "entries": [ - { - "type": "minecraft:item", - "functions": [ - { - "function": "minecraft:explosion_decay" - } - ], - "name": "floralis:lime_cactus_seeds" - } - ], - "conditions": [ - { - "condition": "minecraft:block_state_property", - "block": "floralis:lime_cactus_crop", - "properties": { - "age": "2" - } - }, - { - "condition": "minecraft:inverted", - "term": { - "condition": "minecraft:any_of", - "terms": [ - { - "condition": "minecraft:match_tool", - "predicate": { - "items": [ - "minecraft:shears" - ] - } - }, - { - "condition": "minecraft:match_tool", - "predicate": { - "enchantments": [ - { - "enchantment": "minecraft:silk_touch", - "levels": { - "min": 1 - } - } - ] - } - } - ] - } - } - ] - }, - { - "rolls": 1, - "bonus_rolls": 0, - "entries": [ - { - "type": "minecraft:item", - "functions": [ - { - "function": "minecraft:explosion_decay" - } - ], - "name": "floralis:lime_cactus_seeds" - } - ], - "conditions": [ - { - "condition": "minecraft:block_state_property", - "block": "floralis:lime_cactus_crop", - "properties": { - "age": "1" - } - }, - { - "condition": "minecraft:inverted", - "term": { - "condition": "minecraft:any_of", - "terms": [ - { - "condition": "minecraft:match_tool", - "predicate": { - "items": [ - "minecraft:shears" - ] - } - }, - { - "condition": "minecraft:match_tool", - "predicate": { - "enchantments": [ - { - "enchantment": "minecraft:silk_touch", - "levels": { - "min": 1 - } - } - ] - } - } - ] - } - } - ] - }, - { - "rolls": 1, - "bonus_rolls": 0, - "entries": [ - { - "type": "minecraft:item", - "functions": [ - { - "function": "minecraft:explosion_decay" - } - ], - "name": "floralis:lime_cactus_seeds" - } - ], - "conditions": [ - { - "condition": "minecraft:block_state_property", - "block": "floralis:lime_cactus_crop", - "properties": { - "age": "0" - } - }, - { - "condition": "minecraft:inverted", - "term": { - "condition": "minecraft:any_of", - "terms": [ - { - "condition": "minecraft:match_tool", - "predicate": { - "items": [ - "minecraft:shears" - ] - } - }, - { - "condition": "minecraft:match_tool", - "predicate": { - "enchantments": [ - { - "enchantment": "minecraft:silk_touch", - "levels": { - "min": 1 - } - } - ] - } - } - ] - } - } - ] - } - ] -} \ No newline at end of file diff --git a/src/main/resources/data/floralis/loot_tables/blocks/lime_flower.json b/src/main/resources/data/floralis/loot_tables/blocks/lime_flower.json deleted file mode 100644 index 0a45c2d6..00000000 --- a/src/main/resources/data/floralis/loot_tables/blocks/lime_flower.json +++ /dev/null @@ -1,225 +0,0 @@ -{ - "type": "minecraft:block", - "pools": [ - { - "rolls": 1, - "bonus_rolls": 0, - "entries": [ - { - "type": "minecraft:alternatives", - "children": [ - { - "type": "minecraft:item", - "conditions": [ - { - "condition": "minecraft:any_of", - "terms": [ - { - "condition": "minecraft:match_tool", - "predicate": { - "items": [ - "minecraft:shears" - ] - } - }, - { - "condition": "minecraft:match_tool", - "predicate": { - "enchantments": [ - { - "enchantment": "minecraft:silk_touch", - "levels": { - "min": 1 - } - } - ] - } - } - ] - } - ], - "name": "floralis:lime_flower" - } - ] - } - ] - }, - { - "rolls": 1, - "bonus_rolls": 0, - "entries": [ - { - "type": "minecraft:item", - "functions": [ - { - "function": "minecraft:set_count", - "count": 1, - "add": false - }, - { - "function": "minecraft:explosion_decay" - }, - { - "function": "minecraft:apply_bonus", - "enchantment": "minecraft:fortune", - "formula": "minecraft:uniform_bonus_count", - "parameters": { - "bonusMultiplier": 1 - } - } - ], - "name": "floralis:plant_fibers" - } - ], - "conditions": [ - { - "condition": "minecraft:inverted", - "term": { - "condition": "minecraft:any_of", - "terms": [ - { - "condition": "minecraft:match_tool", - "predicate": { - "items": [ - "minecraft:shears" - ] - } - }, - { - "condition": "minecraft:match_tool", - "predicate": { - "enchantments": [ - { - "enchantment": "minecraft:silk_touch", - "levels": { - "min": 1 - } - } - ] - } - } - ] - } - } - ] - }, - { - "rolls": 1, - "bonus_rolls": 0, - "entries": [ - { - "type": "minecraft:item", - "functions": [ - { - "function": "minecraft:set_count", - "count": 1, - "add": false - }, - { - "function": "minecraft:explosion_decay" - }, - { - "function": "minecraft:apply_bonus", - "enchantment": "minecraft:fortune", - "formula": "minecraft:uniform_bonus_count", - "parameters": { - "bonusMultiplier": 1 - } - } - ], - "name": "floralis:lime_petals" - } - ], - "conditions": [ - { - "condition": "minecraft:inverted", - "term": { - "condition": "minecraft:any_of", - "terms": [ - { - "condition": "minecraft:match_tool", - "predicate": { - "items": [ - "minecraft:shears" - ] - } - }, - { - "condition": "minecraft:match_tool", - "predicate": { - "enchantments": [ - { - "enchantment": "minecraft:silk_touch", - "levels": { - "min": 1 - } - } - ] - } - } - ] - } - } - ] - }, - { - "rolls": 1, - "bonus_rolls": 0, - "entries": [ - { - "type": "minecraft:item", - "functions": [ - { - "function": "minecraft:set_count", - "count": 2, - "add": false - }, - { - "function": "minecraft:explosion_decay" - }, - { - "function": "minecraft:apply_bonus", - "enchantment": "minecraft:fortune", - "formula": "minecraft:uniform_bonus_count", - "parameters": { - "bonusMultiplier": 1 - } - } - ], - "name": "floralis:lime_flower_seeds" - } - ], - "conditions": [ - { - "condition": "minecraft:inverted", - "term": { - "condition": "minecraft:any_of", - "terms": [ - { - "condition": "minecraft:match_tool", - "predicate": { - "items": [ - "minecraft:shears" - ] - } - }, - { - "condition": "minecraft:match_tool", - "predicate": { - "enchantments": [ - { - "enchantment": "minecraft:silk_touch", - "levels": { - "min": 1 - } - } - ] - } - } - ] - } - } - ] - } - ] -} \ No newline at end of file diff --git a/src/main/resources/data/floralis/loot_tables/blocks/lime_flower_crop.json b/src/main/resources/data/floralis/loot_tables/blocks/lime_flower_crop.json deleted file mode 100644 index 0a29cb1c..00000000 --- a/src/main/resources/data/floralis/loot_tables/blocks/lime_flower_crop.json +++ /dev/null @@ -1,550 +0,0 @@ -{ - "type": "minecraft:block", - "pools": [ - { - "rolls": 1, - "bonus_rolls": 0, - "entries": [ - { - "type": "minecraft:alternatives", - "children": [ - { - "type": "minecraft:item", - "conditions": [ - { - "condition": "minecraft:block_state_property", - "block": "floralis:lime_flower_crop", - "properties": { - "age": "5" - } - }, - { - "condition": "minecraft:any_of", - "terms": [ - { - "condition": "minecraft:match_tool", - "predicate": { - "items": [ - "minecraft:shears" - ] - } - }, - { - "condition": "minecraft:match_tool", - "predicate": { - "enchantments": [ - { - "enchantment": "minecraft:silk_touch", - "levels": { - "min": 1 - } - } - ] - } - } - ] - } - ], - "name": "floralis:lime_flower" - }, - { - "type": "minecraft:item", - "conditions": [ - { - "condition": "minecraft:any_of", - "terms": [ - { - "condition": "minecraft:match_tool", - "predicate": { - "items": [ - "minecraft:shears" - ] - } - }, - { - "condition": "minecraft:match_tool", - "predicate": { - "enchantments": [ - { - "enchantment": "minecraft:silk_touch", - "levels": { - "min": 1 - } - } - ] - } - } - ] - } - ], - "name": "floralis:lime_flower_seeds" - } - ] - } - ] - }, - { - "rolls": 1, - "bonus_rolls": 0, - "entries": [ - { - "type": "minecraft:item", - "functions": [ - { - "function": "minecraft:set_count", - "count": 1, - "add": false - }, - { - "function": "minecraft:explosion_decay" - }, - { - "function": "minecraft:apply_bonus", - "enchantment": "minecraft:fortune", - "formula": "minecraft:uniform_bonus_count", - "parameters": { - "bonusMultiplier": 1 - } - } - ], - "name": "floralis:plant_fibers" - } - ], - "conditions": [ - { - "condition": "minecraft:block_state_property", - "block": "floralis:lime_flower_crop", - "properties": { - "age": "5" - } - }, - { - "condition": "minecraft:inverted", - "term": { - "condition": "minecraft:any_of", - "terms": [ - { - "condition": "minecraft:match_tool", - "predicate": { - "items": [ - "minecraft:shears" - ] - } - }, - { - "condition": "minecraft:match_tool", - "predicate": { - "enchantments": [ - { - "enchantment": "minecraft:silk_touch", - "levels": { - "min": 1 - } - } - ] - } - } - ] - } - } - ] - }, - { - "rolls": 1, - "bonus_rolls": 0, - "entries": [ - { - "type": "minecraft:item", - "functions": [ - { - "function": "minecraft:set_count", - "count": 1, - "add": false - }, - { - "function": "minecraft:explosion_decay" - }, - { - "function": "minecraft:apply_bonus", - "enchantment": "minecraft:fortune", - "formula": "minecraft:uniform_bonus_count", - "parameters": { - "bonusMultiplier": 1 - } - } - ], - "name": "floralis:lime_petals" - } - ], - "conditions": [ - { - "condition": "minecraft:block_state_property", - "block": "floralis:lime_flower_crop", - "properties": { - "age": "5" - } - }, - { - "condition": "minecraft:inverted", - "term": { - "condition": "minecraft:any_of", - "terms": [ - { - "condition": "minecraft:match_tool", - "predicate": { - "items": [ - "minecraft:shears" - ] - } - }, - { - "condition": "minecraft:match_tool", - "predicate": { - "enchantments": [ - { - "enchantment": "minecraft:silk_touch", - "levels": { - "min": 1 - } - } - ] - } - } - ] - } - } - ] - }, - { - "rolls": 1, - "bonus_rolls": 0, - "entries": [ - { - "type": "minecraft:item", - "functions": [ - { - "function": "minecraft:set_count", - "count": 2, - "add": false - }, - { - "function": "minecraft:explosion_decay" - }, - { - "function": "minecraft:apply_bonus", - "enchantment": "minecraft:fortune", - "formula": "minecraft:uniform_bonus_count", - "parameters": { - "bonusMultiplier": 1 - } - } - ], - "name": "floralis:lime_flower_seeds" - } - ], - "conditions": [ - { - "condition": "minecraft:block_state_property", - "block": "floralis:lime_flower_crop", - "properties": { - "age": "5" - } - }, - { - "condition": "minecraft:inverted", - "term": { - "condition": "minecraft:any_of", - "terms": [ - { - "condition": "minecraft:match_tool", - "predicate": { - "items": [ - "minecraft:shears" - ] - } - }, - { - "condition": "minecraft:match_tool", - "predicate": { - "enchantments": [ - { - "enchantment": "minecraft:silk_touch", - "levels": { - "min": 1 - } - } - ] - } - } - ] - } - } - ] - }, - { - "rolls": 1, - "bonus_rolls": 0, - "entries": [ - { - "type": "minecraft:item", - "functions": [ - { - "function": "minecraft:explosion_decay" - } - ], - "name": "floralis:lime_flower_seeds" - } - ], - "conditions": [ - { - "condition": "minecraft:block_state_property", - "block": "floralis:lime_flower_crop", - "properties": { - "age": "4" - } - }, - { - "condition": "minecraft:inverted", - "term": { - "condition": "minecraft:any_of", - "terms": [ - { - "condition": "minecraft:match_tool", - "predicate": { - "items": [ - "minecraft:shears" - ] - } - }, - { - "condition": "minecraft:match_tool", - "predicate": { - "enchantments": [ - { - "enchantment": "minecraft:silk_touch", - "levels": { - "min": 1 - } - } - ] - } - } - ] - } - } - ] - }, - { - "rolls": 1, - "bonus_rolls": 0, - "entries": [ - { - "type": "minecraft:item", - "functions": [ - { - "function": "minecraft:explosion_decay" - } - ], - "name": "floralis:lime_flower_seeds" - } - ], - "conditions": [ - { - "condition": "minecraft:block_state_property", - "block": "floralis:lime_flower_crop", - "properties": { - "age": "3" - } - }, - { - "condition": "minecraft:inverted", - "term": { - "condition": "minecraft:any_of", - "terms": [ - { - "condition": "minecraft:match_tool", - "predicate": { - "items": [ - "minecraft:shears" - ] - } - }, - { - "condition": "minecraft:match_tool", - "predicate": { - "enchantments": [ - { - "enchantment": "minecraft:silk_touch", - "levels": { - "min": 1 - } - } - ] - } - } - ] - } - } - ] - }, - { - "rolls": 1, - "bonus_rolls": 0, - "entries": [ - { - "type": "minecraft:item", - "functions": [ - { - "function": "minecraft:explosion_decay" - } - ], - "name": "floralis:lime_flower_seeds" - } - ], - "conditions": [ - { - "condition": "minecraft:block_state_property", - "block": "floralis:lime_flower_crop", - "properties": { - "age": "2" - } - }, - { - "condition": "minecraft:inverted", - "term": { - "condition": "minecraft:any_of", - "terms": [ - { - "condition": "minecraft:match_tool", - "predicate": { - "items": [ - "minecraft:shears" - ] - } - }, - { - "condition": "minecraft:match_tool", - "predicate": { - "enchantments": [ - { - "enchantment": "minecraft:silk_touch", - "levels": { - "min": 1 - } - } - ] - } - } - ] - } - } - ] - }, - { - "rolls": 1, - "bonus_rolls": 0, - "entries": [ - { - "type": "minecraft:item", - "functions": [ - { - "function": "minecraft:explosion_decay" - } - ], - "name": "floralis:lime_flower_seeds" - } - ], - "conditions": [ - { - "condition": "minecraft:block_state_property", - "block": "floralis:lime_flower_crop", - "properties": { - "age": "1" - } - }, - { - "condition": "minecraft:inverted", - "term": { - "condition": "minecraft:any_of", - "terms": [ - { - "condition": "minecraft:match_tool", - "predicate": { - "items": [ - "minecraft:shears" - ] - } - }, - { - "condition": "minecraft:match_tool", - "predicate": { - "enchantments": [ - { - "enchantment": "minecraft:silk_touch", - "levels": { - "min": 1 - } - } - ] - } - } - ] - } - } - ] - }, - { - "rolls": 1, - "bonus_rolls": 0, - "entries": [ - { - "type": "minecraft:item", - "functions": [ - { - "function": "minecraft:explosion_decay" - } - ], - "name": "floralis:lime_flower_seeds" - } - ], - "conditions": [ - { - "condition": "minecraft:block_state_property", - "block": "floralis:lime_flower_crop", - "properties": { - "age": "0" - } - }, - { - "condition": "minecraft:inverted", - "term": { - "condition": "minecraft:any_of", - "terms": [ - { - "condition": "minecraft:match_tool", - "predicate": { - "items": [ - "minecraft:shears" - ] - } - }, - { - "condition": "minecraft:match_tool", - "predicate": { - "enchantments": [ - { - "enchantment": "minecraft:silk_touch", - "levels": { - "min": 1 - } - } - ] - } - } - ] - } - } - ] - } - ] -} \ No newline at end of file diff --git a/src/main/resources/data/floralis/loot_tables/blocks/magenta_cactus.json b/src/main/resources/data/floralis/loot_tables/blocks/magenta_cactus.json deleted file mode 100644 index 564773a9..00000000 --- a/src/main/resources/data/floralis/loot_tables/blocks/magenta_cactus.json +++ /dev/null @@ -1,225 +0,0 @@ -{ - "type": "minecraft:block", - "pools": [ - { - "rolls": 1, - "bonus_rolls": 0, - "entries": [ - { - "type": "minecraft:alternatives", - "children": [ - { - "type": "minecraft:item", - "conditions": [ - { - "condition": "minecraft:any_of", - "terms": [ - { - "condition": "minecraft:match_tool", - "predicate": { - "items": [ - "minecraft:shears" - ] - } - }, - { - "condition": "minecraft:match_tool", - "predicate": { - "enchantments": [ - { - "enchantment": "minecraft:silk_touch", - "levels": { - "min": 1 - } - } - ] - } - } - ] - } - ], - "name": "floralis:magenta_cactus" - } - ] - } - ] - }, - { - "rolls": 1, - "bonus_rolls": 0, - "entries": [ - { - "type": "minecraft:item", - "functions": [ - { - "function": "minecraft:set_count", - "count": 1, - "add": false - }, - { - "function": "minecraft:explosion_decay" - }, - { - "function": "minecraft:apply_bonus", - "enchantment": "minecraft:fortune", - "formula": "minecraft:uniform_bonus_count", - "parameters": { - "bonusMultiplier": 1 - } - } - ], - "name": "floralis:plant_fibers" - } - ], - "conditions": [ - { - "condition": "minecraft:inverted", - "term": { - "condition": "minecraft:any_of", - "terms": [ - { - "condition": "minecraft:match_tool", - "predicate": { - "items": [ - "minecraft:shears" - ] - } - }, - { - "condition": "minecraft:match_tool", - "predicate": { - "enchantments": [ - { - "enchantment": "minecraft:silk_touch", - "levels": { - "min": 1 - } - } - ] - } - } - ] - } - } - ] - }, - { - "rolls": 1, - "bonus_rolls": 0, - "entries": [ - { - "type": "minecraft:item", - "functions": [ - { - "function": "minecraft:set_count", - "count": 1, - "add": false - }, - { - "function": "minecraft:explosion_decay" - }, - { - "function": "minecraft:apply_bonus", - "enchantment": "minecraft:fortune", - "formula": "minecraft:uniform_bonus_count", - "parameters": { - "bonusMultiplier": 1 - } - } - ], - "name": "floralis:magenta_petals" - } - ], - "conditions": [ - { - "condition": "minecraft:inverted", - "term": { - "condition": "minecraft:any_of", - "terms": [ - { - "condition": "minecraft:match_tool", - "predicate": { - "items": [ - "minecraft:shears" - ] - } - }, - { - "condition": "minecraft:match_tool", - "predicate": { - "enchantments": [ - { - "enchantment": "minecraft:silk_touch", - "levels": { - "min": 1 - } - } - ] - } - } - ] - } - } - ] - }, - { - "rolls": 1, - "bonus_rolls": 0, - "entries": [ - { - "type": "minecraft:item", - "functions": [ - { - "function": "minecraft:set_count", - "count": 2, - "add": false - }, - { - "function": "minecraft:explosion_decay" - }, - { - "function": "minecraft:apply_bonus", - "enchantment": "minecraft:fortune", - "formula": "minecraft:uniform_bonus_count", - "parameters": { - "bonusMultiplier": 1 - } - } - ], - "name": "floralis:magenta_cactus_seeds" - } - ], - "conditions": [ - { - "condition": "minecraft:inverted", - "term": { - "condition": "minecraft:any_of", - "terms": [ - { - "condition": "minecraft:match_tool", - "predicate": { - "items": [ - "minecraft:shears" - ] - } - }, - { - "condition": "minecraft:match_tool", - "predicate": { - "enchantments": [ - { - "enchantment": "minecraft:silk_touch", - "levels": { - "min": 1 - } - } - ] - } - } - ] - } - } - ] - } - ] -} \ No newline at end of file diff --git a/src/main/resources/data/floralis/loot_tables/blocks/magenta_cactus_crop.json b/src/main/resources/data/floralis/loot_tables/blocks/magenta_cactus_crop.json deleted file mode 100644 index 477d7835..00000000 --- a/src/main/resources/data/floralis/loot_tables/blocks/magenta_cactus_crop.json +++ /dev/null @@ -1,550 +0,0 @@ -{ - "type": "minecraft:block", - "pools": [ - { - "rolls": 1, - "bonus_rolls": 0, - "entries": [ - { - "type": "minecraft:alternatives", - "children": [ - { - "type": "minecraft:item", - "conditions": [ - { - "condition": "minecraft:block_state_property", - "block": "floralis:magenta_cactus_crop", - "properties": { - "age": "5" - } - }, - { - "condition": "minecraft:any_of", - "terms": [ - { - "condition": "minecraft:match_tool", - "predicate": { - "items": [ - "minecraft:shears" - ] - } - }, - { - "condition": "minecraft:match_tool", - "predicate": { - "enchantments": [ - { - "enchantment": "minecraft:silk_touch", - "levels": { - "min": 1 - } - } - ] - } - } - ] - } - ], - "name": "floralis:magenta_cactus" - }, - { - "type": "minecraft:item", - "conditions": [ - { - "condition": "minecraft:any_of", - "terms": [ - { - "condition": "minecraft:match_tool", - "predicate": { - "items": [ - "minecraft:shears" - ] - } - }, - { - "condition": "minecraft:match_tool", - "predicate": { - "enchantments": [ - { - "enchantment": "minecraft:silk_touch", - "levels": { - "min": 1 - } - } - ] - } - } - ] - } - ], - "name": "floralis:magenta_cactus_seeds" - } - ] - } - ] - }, - { - "rolls": 1, - "bonus_rolls": 0, - "entries": [ - { - "type": "minecraft:item", - "functions": [ - { - "function": "minecraft:set_count", - "count": 1, - "add": false - }, - { - "function": "minecraft:explosion_decay" - }, - { - "function": "minecraft:apply_bonus", - "enchantment": "minecraft:fortune", - "formula": "minecraft:uniform_bonus_count", - "parameters": { - "bonusMultiplier": 1 - } - } - ], - "name": "floralis:plant_fibers" - } - ], - "conditions": [ - { - "condition": "minecraft:block_state_property", - "block": "floralis:magenta_cactus_crop", - "properties": { - "age": "5" - } - }, - { - "condition": "minecraft:inverted", - "term": { - "condition": "minecraft:any_of", - "terms": [ - { - "condition": "minecraft:match_tool", - "predicate": { - "items": [ - "minecraft:shears" - ] - } - }, - { - "condition": "minecraft:match_tool", - "predicate": { - "enchantments": [ - { - "enchantment": "minecraft:silk_touch", - "levels": { - "min": 1 - } - } - ] - } - } - ] - } - } - ] - }, - { - "rolls": 1, - "bonus_rolls": 0, - "entries": [ - { - "type": "minecraft:item", - "functions": [ - { - "function": "minecraft:set_count", - "count": 1, - "add": false - }, - { - "function": "minecraft:explosion_decay" - }, - { - "function": "minecraft:apply_bonus", - "enchantment": "minecraft:fortune", - "formula": "minecraft:uniform_bonus_count", - "parameters": { - "bonusMultiplier": 1 - } - } - ], - "name": "floralis:magenta_petals" - } - ], - "conditions": [ - { - "condition": "minecraft:block_state_property", - "block": "floralis:magenta_cactus_crop", - "properties": { - "age": "5" - } - }, - { - "condition": "minecraft:inverted", - "term": { - "condition": "minecraft:any_of", - "terms": [ - { - "condition": "minecraft:match_tool", - "predicate": { - "items": [ - "minecraft:shears" - ] - } - }, - { - "condition": "minecraft:match_tool", - "predicate": { - "enchantments": [ - { - "enchantment": "minecraft:silk_touch", - "levels": { - "min": 1 - } - } - ] - } - } - ] - } - } - ] - }, - { - "rolls": 1, - "bonus_rolls": 0, - "entries": [ - { - "type": "minecraft:item", - "functions": [ - { - "function": "minecraft:set_count", - "count": 2, - "add": false - }, - { - "function": "minecraft:explosion_decay" - }, - { - "function": "minecraft:apply_bonus", - "enchantment": "minecraft:fortune", - "formula": "minecraft:uniform_bonus_count", - "parameters": { - "bonusMultiplier": 1 - } - } - ], - "name": "floralis:magenta_cactus_seeds" - } - ], - "conditions": [ - { - "condition": "minecraft:block_state_property", - "block": "floralis:magenta_cactus_crop", - "properties": { - "age": "5" - } - }, - { - "condition": "minecraft:inverted", - "term": { - "condition": "minecraft:any_of", - "terms": [ - { - "condition": "minecraft:match_tool", - "predicate": { - "items": [ - "minecraft:shears" - ] - } - }, - { - "condition": "minecraft:match_tool", - "predicate": { - "enchantments": [ - { - "enchantment": "minecraft:silk_touch", - "levels": { - "min": 1 - } - } - ] - } - } - ] - } - } - ] - }, - { - "rolls": 1, - "bonus_rolls": 0, - "entries": [ - { - "type": "minecraft:item", - "functions": [ - { - "function": "minecraft:explosion_decay" - } - ], - "name": "floralis:magenta_cactus_seeds" - } - ], - "conditions": [ - { - "condition": "minecraft:block_state_property", - "block": "floralis:magenta_cactus_crop", - "properties": { - "age": "4" - } - }, - { - "condition": "minecraft:inverted", - "term": { - "condition": "minecraft:any_of", - "terms": [ - { - "condition": "minecraft:match_tool", - "predicate": { - "items": [ - "minecraft:shears" - ] - } - }, - { - "condition": "minecraft:match_tool", - "predicate": { - "enchantments": [ - { - "enchantment": "minecraft:silk_touch", - "levels": { - "min": 1 - } - } - ] - } - } - ] - } - } - ] - }, - { - "rolls": 1, - "bonus_rolls": 0, - "entries": [ - { - "type": "minecraft:item", - "functions": [ - { - "function": "minecraft:explosion_decay" - } - ], - "name": "floralis:magenta_cactus_seeds" - } - ], - "conditions": [ - { - "condition": "minecraft:block_state_property", - "block": "floralis:magenta_cactus_crop", - "properties": { - "age": "3" - } - }, - { - "condition": "minecraft:inverted", - "term": { - "condition": "minecraft:any_of", - "terms": [ - { - "condition": "minecraft:match_tool", - "predicate": { - "items": [ - "minecraft:shears" - ] - } - }, - { - "condition": "minecraft:match_tool", - "predicate": { - "enchantments": [ - { - "enchantment": "minecraft:silk_touch", - "levels": { - "min": 1 - } - } - ] - } - } - ] - } - } - ] - }, - { - "rolls": 1, - "bonus_rolls": 0, - "entries": [ - { - "type": "minecraft:item", - "functions": [ - { - "function": "minecraft:explosion_decay" - } - ], - "name": "floralis:magenta_cactus_seeds" - } - ], - "conditions": [ - { - "condition": "minecraft:block_state_property", - "block": "floralis:magenta_cactus_crop", - "properties": { - "age": "2" - } - }, - { - "condition": "minecraft:inverted", - "term": { - "condition": "minecraft:any_of", - "terms": [ - { - "condition": "minecraft:match_tool", - "predicate": { - "items": [ - "minecraft:shears" - ] - } - }, - { - "condition": "minecraft:match_tool", - "predicate": { - "enchantments": [ - { - "enchantment": "minecraft:silk_touch", - "levels": { - "min": 1 - } - } - ] - } - } - ] - } - } - ] - }, - { - "rolls": 1, - "bonus_rolls": 0, - "entries": [ - { - "type": "minecraft:item", - "functions": [ - { - "function": "minecraft:explosion_decay" - } - ], - "name": "floralis:magenta_cactus_seeds" - } - ], - "conditions": [ - { - "condition": "minecraft:block_state_property", - "block": "floralis:magenta_cactus_crop", - "properties": { - "age": "1" - } - }, - { - "condition": "minecraft:inverted", - "term": { - "condition": "minecraft:any_of", - "terms": [ - { - "condition": "minecraft:match_tool", - "predicate": { - "items": [ - "minecraft:shears" - ] - } - }, - { - "condition": "minecraft:match_tool", - "predicate": { - "enchantments": [ - { - "enchantment": "minecraft:silk_touch", - "levels": { - "min": 1 - } - } - ] - } - } - ] - } - } - ] - }, - { - "rolls": 1, - "bonus_rolls": 0, - "entries": [ - { - "type": "minecraft:item", - "functions": [ - { - "function": "minecraft:explosion_decay" - } - ], - "name": "floralis:magenta_cactus_seeds" - } - ], - "conditions": [ - { - "condition": "minecraft:block_state_property", - "block": "floralis:magenta_cactus_crop", - "properties": { - "age": "0" - } - }, - { - "condition": "minecraft:inverted", - "term": { - "condition": "minecraft:any_of", - "terms": [ - { - "condition": "minecraft:match_tool", - "predicate": { - "items": [ - "minecraft:shears" - ] - } - }, - { - "condition": "minecraft:match_tool", - "predicate": { - "enchantments": [ - { - "enchantment": "minecraft:silk_touch", - "levels": { - "min": 1 - } - } - ] - } - } - ] - } - } - ] - } - ] -} \ No newline at end of file diff --git a/src/main/resources/data/floralis/loot_tables/blocks/magenta_flower.json b/src/main/resources/data/floralis/loot_tables/blocks/magenta_flower.json deleted file mode 100644 index b3a7c70a..00000000 --- a/src/main/resources/data/floralis/loot_tables/blocks/magenta_flower.json +++ /dev/null @@ -1,225 +0,0 @@ -{ - "type": "minecraft:block", - "pools": [ - { - "rolls": 1, - "bonus_rolls": 0, - "entries": [ - { - "type": "minecraft:alternatives", - "children": [ - { - "type": "minecraft:item", - "conditions": [ - { - "condition": "minecraft:any_of", - "terms": [ - { - "condition": "minecraft:match_tool", - "predicate": { - "items": [ - "minecraft:shears" - ] - } - }, - { - "condition": "minecraft:match_tool", - "predicate": { - "enchantments": [ - { - "enchantment": "minecraft:silk_touch", - "levels": { - "min": 1 - } - } - ] - } - } - ] - } - ], - "name": "floralis:magenta_flower" - } - ] - } - ] - }, - { - "rolls": 1, - "bonus_rolls": 0, - "entries": [ - { - "type": "minecraft:item", - "functions": [ - { - "function": "minecraft:set_count", - "count": 1, - "add": false - }, - { - "function": "minecraft:explosion_decay" - }, - { - "function": "minecraft:apply_bonus", - "enchantment": "minecraft:fortune", - "formula": "minecraft:uniform_bonus_count", - "parameters": { - "bonusMultiplier": 1 - } - } - ], - "name": "floralis:plant_fibers" - } - ], - "conditions": [ - { - "condition": "minecraft:inverted", - "term": { - "condition": "minecraft:any_of", - "terms": [ - { - "condition": "minecraft:match_tool", - "predicate": { - "items": [ - "minecraft:shears" - ] - } - }, - { - "condition": "minecraft:match_tool", - "predicate": { - "enchantments": [ - { - "enchantment": "minecraft:silk_touch", - "levels": { - "min": 1 - } - } - ] - } - } - ] - } - } - ] - }, - { - "rolls": 1, - "bonus_rolls": 0, - "entries": [ - { - "type": "minecraft:item", - "functions": [ - { - "function": "minecraft:set_count", - "count": 1, - "add": false - }, - { - "function": "minecraft:explosion_decay" - }, - { - "function": "minecraft:apply_bonus", - "enchantment": "minecraft:fortune", - "formula": "minecraft:uniform_bonus_count", - "parameters": { - "bonusMultiplier": 1 - } - } - ], - "name": "floralis:magenta_petals" - } - ], - "conditions": [ - { - "condition": "minecraft:inverted", - "term": { - "condition": "minecraft:any_of", - "terms": [ - { - "condition": "minecraft:match_tool", - "predicate": { - "items": [ - "minecraft:shears" - ] - } - }, - { - "condition": "minecraft:match_tool", - "predicate": { - "enchantments": [ - { - "enchantment": "minecraft:silk_touch", - "levels": { - "min": 1 - } - } - ] - } - } - ] - } - } - ] - }, - { - "rolls": 1, - "bonus_rolls": 0, - "entries": [ - { - "type": "minecraft:item", - "functions": [ - { - "function": "minecraft:set_count", - "count": 2, - "add": false - }, - { - "function": "minecraft:explosion_decay" - }, - { - "function": "minecraft:apply_bonus", - "enchantment": "minecraft:fortune", - "formula": "minecraft:uniform_bonus_count", - "parameters": { - "bonusMultiplier": 1 - } - } - ], - "name": "floralis:magenta_flower_seeds" - } - ], - "conditions": [ - { - "condition": "minecraft:inverted", - "term": { - "condition": "minecraft:any_of", - "terms": [ - { - "condition": "minecraft:match_tool", - "predicate": { - "items": [ - "minecraft:shears" - ] - } - }, - { - "condition": "minecraft:match_tool", - "predicate": { - "enchantments": [ - { - "enchantment": "minecraft:silk_touch", - "levels": { - "min": 1 - } - } - ] - } - } - ] - } - } - ] - } - ] -} \ No newline at end of file diff --git a/src/main/resources/data/floralis/loot_tables/blocks/magenta_flower_crop.json b/src/main/resources/data/floralis/loot_tables/blocks/magenta_flower_crop.json deleted file mode 100644 index 67e9936b..00000000 --- a/src/main/resources/data/floralis/loot_tables/blocks/magenta_flower_crop.json +++ /dev/null @@ -1,550 +0,0 @@ -{ - "type": "minecraft:block", - "pools": [ - { - "rolls": 1, - "bonus_rolls": 0, - "entries": [ - { - "type": "minecraft:alternatives", - "children": [ - { - "type": "minecraft:item", - "conditions": [ - { - "condition": "minecraft:block_state_property", - "block": "floralis:magenta_flower_crop", - "properties": { - "age": "5" - } - }, - { - "condition": "minecraft:any_of", - "terms": [ - { - "condition": "minecraft:match_tool", - "predicate": { - "items": [ - "minecraft:shears" - ] - } - }, - { - "condition": "minecraft:match_tool", - "predicate": { - "enchantments": [ - { - "enchantment": "minecraft:silk_touch", - "levels": { - "min": 1 - } - } - ] - } - } - ] - } - ], - "name": "floralis:magenta_flower" - }, - { - "type": "minecraft:item", - "conditions": [ - { - "condition": "minecraft:any_of", - "terms": [ - { - "condition": "minecraft:match_tool", - "predicate": { - "items": [ - "minecraft:shears" - ] - } - }, - { - "condition": "minecraft:match_tool", - "predicate": { - "enchantments": [ - { - "enchantment": "minecraft:silk_touch", - "levels": { - "min": 1 - } - } - ] - } - } - ] - } - ], - "name": "floralis:magenta_flower_seeds" - } - ] - } - ] - }, - { - "rolls": 1, - "bonus_rolls": 0, - "entries": [ - { - "type": "minecraft:item", - "functions": [ - { - "function": "minecraft:set_count", - "count": 1, - "add": false - }, - { - "function": "minecraft:explosion_decay" - }, - { - "function": "minecraft:apply_bonus", - "enchantment": "minecraft:fortune", - "formula": "minecraft:uniform_bonus_count", - "parameters": { - "bonusMultiplier": 1 - } - } - ], - "name": "floralis:plant_fibers" - } - ], - "conditions": [ - { - "condition": "minecraft:block_state_property", - "block": "floralis:magenta_flower_crop", - "properties": { - "age": "5" - } - }, - { - "condition": "minecraft:inverted", - "term": { - "condition": "minecraft:any_of", - "terms": [ - { - "condition": "minecraft:match_tool", - "predicate": { - "items": [ - "minecraft:shears" - ] - } - }, - { - "condition": "minecraft:match_tool", - "predicate": { - "enchantments": [ - { - "enchantment": "minecraft:silk_touch", - "levels": { - "min": 1 - } - } - ] - } - } - ] - } - } - ] - }, - { - "rolls": 1, - "bonus_rolls": 0, - "entries": [ - { - "type": "minecraft:item", - "functions": [ - { - "function": "minecraft:set_count", - "count": 1, - "add": false - }, - { - "function": "minecraft:explosion_decay" - }, - { - "function": "minecraft:apply_bonus", - "enchantment": "minecraft:fortune", - "formula": "minecraft:uniform_bonus_count", - "parameters": { - "bonusMultiplier": 1 - } - } - ], - "name": "floralis:magenta_petals" - } - ], - "conditions": [ - { - "condition": "minecraft:block_state_property", - "block": "floralis:magenta_flower_crop", - "properties": { - "age": "5" - } - }, - { - "condition": "minecraft:inverted", - "term": { - "condition": "minecraft:any_of", - "terms": [ - { - "condition": "minecraft:match_tool", - "predicate": { - "items": [ - "minecraft:shears" - ] - } - }, - { - "condition": "minecraft:match_tool", - "predicate": { - "enchantments": [ - { - "enchantment": "minecraft:silk_touch", - "levels": { - "min": 1 - } - } - ] - } - } - ] - } - } - ] - }, - { - "rolls": 1, - "bonus_rolls": 0, - "entries": [ - { - "type": "minecraft:item", - "functions": [ - { - "function": "minecraft:set_count", - "count": 2, - "add": false - }, - { - "function": "minecraft:explosion_decay" - }, - { - "function": "minecraft:apply_bonus", - "enchantment": "minecraft:fortune", - "formula": "minecraft:uniform_bonus_count", - "parameters": { - "bonusMultiplier": 1 - } - } - ], - "name": "floralis:magenta_flower_seeds" - } - ], - "conditions": [ - { - "condition": "minecraft:block_state_property", - "block": "floralis:magenta_flower_crop", - "properties": { - "age": "5" - } - }, - { - "condition": "minecraft:inverted", - "term": { - "condition": "minecraft:any_of", - "terms": [ - { - "condition": "minecraft:match_tool", - "predicate": { - "items": [ - "minecraft:shears" - ] - } - }, - { - "condition": "minecraft:match_tool", - "predicate": { - "enchantments": [ - { - "enchantment": "minecraft:silk_touch", - "levels": { - "min": 1 - } - } - ] - } - } - ] - } - } - ] - }, - { - "rolls": 1, - "bonus_rolls": 0, - "entries": [ - { - "type": "minecraft:item", - "functions": [ - { - "function": "minecraft:explosion_decay" - } - ], - "name": "floralis:magenta_flower_seeds" - } - ], - "conditions": [ - { - "condition": "minecraft:block_state_property", - "block": "floralis:magenta_flower_crop", - "properties": { - "age": "4" - } - }, - { - "condition": "minecraft:inverted", - "term": { - "condition": "minecraft:any_of", - "terms": [ - { - "condition": "minecraft:match_tool", - "predicate": { - "items": [ - "minecraft:shears" - ] - } - }, - { - "condition": "minecraft:match_tool", - "predicate": { - "enchantments": [ - { - "enchantment": "minecraft:silk_touch", - "levels": { - "min": 1 - } - } - ] - } - } - ] - } - } - ] - }, - { - "rolls": 1, - "bonus_rolls": 0, - "entries": [ - { - "type": "minecraft:item", - "functions": [ - { - "function": "minecraft:explosion_decay" - } - ], - "name": "floralis:magenta_flower_seeds" - } - ], - "conditions": [ - { - "condition": "minecraft:block_state_property", - "block": "floralis:magenta_flower_crop", - "properties": { - "age": "3" - } - }, - { - "condition": "minecraft:inverted", - "term": { - "condition": "minecraft:any_of", - "terms": [ - { - "condition": "minecraft:match_tool", - "predicate": { - "items": [ - "minecraft:shears" - ] - } - }, - { - "condition": "minecraft:match_tool", - "predicate": { - "enchantments": [ - { - "enchantment": "minecraft:silk_touch", - "levels": { - "min": 1 - } - } - ] - } - } - ] - } - } - ] - }, - { - "rolls": 1, - "bonus_rolls": 0, - "entries": [ - { - "type": "minecraft:item", - "functions": [ - { - "function": "minecraft:explosion_decay" - } - ], - "name": "floralis:magenta_flower_seeds" - } - ], - "conditions": [ - { - "condition": "minecraft:block_state_property", - "block": "floralis:magenta_flower_crop", - "properties": { - "age": "2" - } - }, - { - "condition": "minecraft:inverted", - "term": { - "condition": "minecraft:any_of", - "terms": [ - { - "condition": "minecraft:match_tool", - "predicate": { - "items": [ - "minecraft:shears" - ] - } - }, - { - "condition": "minecraft:match_tool", - "predicate": { - "enchantments": [ - { - "enchantment": "minecraft:silk_touch", - "levels": { - "min": 1 - } - } - ] - } - } - ] - } - } - ] - }, - { - "rolls": 1, - "bonus_rolls": 0, - "entries": [ - { - "type": "minecraft:item", - "functions": [ - { - "function": "minecraft:explosion_decay" - } - ], - "name": "floralis:magenta_flower_seeds" - } - ], - "conditions": [ - { - "condition": "minecraft:block_state_property", - "block": "floralis:magenta_flower_crop", - "properties": { - "age": "1" - } - }, - { - "condition": "minecraft:inverted", - "term": { - "condition": "minecraft:any_of", - "terms": [ - { - "condition": "minecraft:match_tool", - "predicate": { - "items": [ - "minecraft:shears" - ] - } - }, - { - "condition": "minecraft:match_tool", - "predicate": { - "enchantments": [ - { - "enchantment": "minecraft:silk_touch", - "levels": { - "min": 1 - } - } - ] - } - } - ] - } - } - ] - }, - { - "rolls": 1, - "bonus_rolls": 0, - "entries": [ - { - "type": "minecraft:item", - "functions": [ - { - "function": "minecraft:explosion_decay" - } - ], - "name": "floralis:magenta_flower_seeds" - } - ], - "conditions": [ - { - "condition": "minecraft:block_state_property", - "block": "floralis:magenta_flower_crop", - "properties": { - "age": "0" - } - }, - { - "condition": "minecraft:inverted", - "term": { - "condition": "minecraft:any_of", - "terms": [ - { - "condition": "minecraft:match_tool", - "predicate": { - "items": [ - "minecraft:shears" - ] - } - }, - { - "condition": "minecraft:match_tool", - "predicate": { - "enchantments": [ - { - "enchantment": "minecraft:silk_touch", - "levels": { - "min": 1 - } - } - ] - } - } - ] - } - } - ] - } - ] -} \ No newline at end of file diff --git a/src/main/resources/data/floralis/loot_tables/blocks/orange_cactus.json b/src/main/resources/data/floralis/loot_tables/blocks/orange_cactus.json deleted file mode 100644 index 107ce1be..00000000 --- a/src/main/resources/data/floralis/loot_tables/blocks/orange_cactus.json +++ /dev/null @@ -1,225 +0,0 @@ -{ - "type": "minecraft:block", - "pools": [ - { - "rolls": 1, - "bonus_rolls": 0, - "entries": [ - { - "type": "minecraft:alternatives", - "children": [ - { - "type": "minecraft:item", - "conditions": [ - { - "condition": "minecraft:any_of", - "terms": [ - { - "condition": "minecraft:match_tool", - "predicate": { - "items": [ - "minecraft:shears" - ] - } - }, - { - "condition": "minecraft:match_tool", - "predicate": { - "enchantments": [ - { - "enchantment": "minecraft:silk_touch", - "levels": { - "min": 1 - } - } - ] - } - } - ] - } - ], - "name": "floralis:orange_cactus" - } - ] - } - ] - }, - { - "rolls": 1, - "bonus_rolls": 0, - "entries": [ - { - "type": "minecraft:item", - "functions": [ - { - "function": "minecraft:set_count", - "count": 1, - "add": false - }, - { - "function": "minecraft:explosion_decay" - }, - { - "function": "minecraft:apply_bonus", - "enchantment": "minecraft:fortune", - "formula": "minecraft:uniform_bonus_count", - "parameters": { - "bonusMultiplier": 1 - } - } - ], - "name": "floralis:plant_fibers" - } - ], - "conditions": [ - { - "condition": "minecraft:inverted", - "term": { - "condition": "minecraft:any_of", - "terms": [ - { - "condition": "minecraft:match_tool", - "predicate": { - "items": [ - "minecraft:shears" - ] - } - }, - { - "condition": "minecraft:match_tool", - "predicate": { - "enchantments": [ - { - "enchantment": "minecraft:silk_touch", - "levels": { - "min": 1 - } - } - ] - } - } - ] - } - } - ] - }, - { - "rolls": 1, - "bonus_rolls": 0, - "entries": [ - { - "type": "minecraft:item", - "functions": [ - { - "function": "minecraft:set_count", - "count": 1, - "add": false - }, - { - "function": "minecraft:explosion_decay" - }, - { - "function": "minecraft:apply_bonus", - "enchantment": "minecraft:fortune", - "formula": "minecraft:uniform_bonus_count", - "parameters": { - "bonusMultiplier": 1 - } - } - ], - "name": "floralis:orange_petals" - } - ], - "conditions": [ - { - "condition": "minecraft:inverted", - "term": { - "condition": "minecraft:any_of", - "terms": [ - { - "condition": "minecraft:match_tool", - "predicate": { - "items": [ - "minecraft:shears" - ] - } - }, - { - "condition": "minecraft:match_tool", - "predicate": { - "enchantments": [ - { - "enchantment": "minecraft:silk_touch", - "levels": { - "min": 1 - } - } - ] - } - } - ] - } - } - ] - }, - { - "rolls": 1, - "bonus_rolls": 0, - "entries": [ - { - "type": "minecraft:item", - "functions": [ - { - "function": "minecraft:set_count", - "count": 2, - "add": false - }, - { - "function": "minecraft:explosion_decay" - }, - { - "function": "minecraft:apply_bonus", - "enchantment": "minecraft:fortune", - "formula": "minecraft:uniform_bonus_count", - "parameters": { - "bonusMultiplier": 1 - } - } - ], - "name": "floralis:orange_cactus_seeds" - } - ], - "conditions": [ - { - "condition": "minecraft:inverted", - "term": { - "condition": "minecraft:any_of", - "terms": [ - { - "condition": "minecraft:match_tool", - "predicate": { - "items": [ - "minecraft:shears" - ] - } - }, - { - "condition": "minecraft:match_tool", - "predicate": { - "enchantments": [ - { - "enchantment": "minecraft:silk_touch", - "levels": { - "min": 1 - } - } - ] - } - } - ] - } - } - ] - } - ] -} \ No newline at end of file diff --git a/src/main/resources/data/floralis/loot_tables/blocks/orange_cactus_crop.json b/src/main/resources/data/floralis/loot_tables/blocks/orange_cactus_crop.json deleted file mode 100644 index 1f314c70..00000000 --- a/src/main/resources/data/floralis/loot_tables/blocks/orange_cactus_crop.json +++ /dev/null @@ -1,550 +0,0 @@ -{ - "type": "minecraft:block", - "pools": [ - { - "rolls": 1, - "bonus_rolls": 0, - "entries": [ - { - "type": "minecraft:alternatives", - "children": [ - { - "type": "minecraft:item", - "conditions": [ - { - "condition": "minecraft:block_state_property", - "block": "floralis:orange_cactus_crop", - "properties": { - "age": "5" - } - }, - { - "condition": "minecraft:any_of", - "terms": [ - { - "condition": "minecraft:match_tool", - "predicate": { - "items": [ - "minecraft:shears" - ] - } - }, - { - "condition": "minecraft:match_tool", - "predicate": { - "enchantments": [ - { - "enchantment": "minecraft:silk_touch", - "levels": { - "min": 1 - } - } - ] - } - } - ] - } - ], - "name": "floralis:orange_cactus" - }, - { - "type": "minecraft:item", - "conditions": [ - { - "condition": "minecraft:any_of", - "terms": [ - { - "condition": "minecraft:match_tool", - "predicate": { - "items": [ - "minecraft:shears" - ] - } - }, - { - "condition": "minecraft:match_tool", - "predicate": { - "enchantments": [ - { - "enchantment": "minecraft:silk_touch", - "levels": { - "min": 1 - } - } - ] - } - } - ] - } - ], - "name": "floralis:orange_cactus_seeds" - } - ] - } - ] - }, - { - "rolls": 1, - "bonus_rolls": 0, - "entries": [ - { - "type": "minecraft:item", - "functions": [ - { - "function": "minecraft:set_count", - "count": 1, - "add": false - }, - { - "function": "minecraft:explosion_decay" - }, - { - "function": "minecraft:apply_bonus", - "enchantment": "minecraft:fortune", - "formula": "minecraft:uniform_bonus_count", - "parameters": { - "bonusMultiplier": 1 - } - } - ], - "name": "floralis:plant_fibers" - } - ], - "conditions": [ - { - "condition": "minecraft:block_state_property", - "block": "floralis:orange_cactus_crop", - "properties": { - "age": "5" - } - }, - { - "condition": "minecraft:inverted", - "term": { - "condition": "minecraft:any_of", - "terms": [ - { - "condition": "minecraft:match_tool", - "predicate": { - "items": [ - "minecraft:shears" - ] - } - }, - { - "condition": "minecraft:match_tool", - "predicate": { - "enchantments": [ - { - "enchantment": "minecraft:silk_touch", - "levels": { - "min": 1 - } - } - ] - } - } - ] - } - } - ] - }, - { - "rolls": 1, - "bonus_rolls": 0, - "entries": [ - { - "type": "minecraft:item", - "functions": [ - { - "function": "minecraft:set_count", - "count": 1, - "add": false - }, - { - "function": "minecraft:explosion_decay" - }, - { - "function": "minecraft:apply_bonus", - "enchantment": "minecraft:fortune", - "formula": "minecraft:uniform_bonus_count", - "parameters": { - "bonusMultiplier": 1 - } - } - ], - "name": "floralis:orange_petals" - } - ], - "conditions": [ - { - "condition": "minecraft:block_state_property", - "block": "floralis:orange_cactus_crop", - "properties": { - "age": "5" - } - }, - { - "condition": "minecraft:inverted", - "term": { - "condition": "minecraft:any_of", - "terms": [ - { - "condition": "minecraft:match_tool", - "predicate": { - "items": [ - "minecraft:shears" - ] - } - }, - { - "condition": "minecraft:match_tool", - "predicate": { - "enchantments": [ - { - "enchantment": "minecraft:silk_touch", - "levels": { - "min": 1 - } - } - ] - } - } - ] - } - } - ] - }, - { - "rolls": 1, - "bonus_rolls": 0, - "entries": [ - { - "type": "minecraft:item", - "functions": [ - { - "function": "minecraft:set_count", - "count": 2, - "add": false - }, - { - "function": "minecraft:explosion_decay" - }, - { - "function": "minecraft:apply_bonus", - "enchantment": "minecraft:fortune", - "formula": "minecraft:uniform_bonus_count", - "parameters": { - "bonusMultiplier": 1 - } - } - ], - "name": "floralis:orange_cactus_seeds" - } - ], - "conditions": [ - { - "condition": "minecraft:block_state_property", - "block": "floralis:orange_cactus_crop", - "properties": { - "age": "5" - } - }, - { - "condition": "minecraft:inverted", - "term": { - "condition": "minecraft:any_of", - "terms": [ - { - "condition": "minecraft:match_tool", - "predicate": { - "items": [ - "minecraft:shears" - ] - } - }, - { - "condition": "minecraft:match_tool", - "predicate": { - "enchantments": [ - { - "enchantment": "minecraft:silk_touch", - "levels": { - "min": 1 - } - } - ] - } - } - ] - } - } - ] - }, - { - "rolls": 1, - "bonus_rolls": 0, - "entries": [ - { - "type": "minecraft:item", - "functions": [ - { - "function": "minecraft:explosion_decay" - } - ], - "name": "floralis:orange_cactus_seeds" - } - ], - "conditions": [ - { - "condition": "minecraft:block_state_property", - "block": "floralis:orange_cactus_crop", - "properties": { - "age": "4" - } - }, - { - "condition": "minecraft:inverted", - "term": { - "condition": "minecraft:any_of", - "terms": [ - { - "condition": "minecraft:match_tool", - "predicate": { - "items": [ - "minecraft:shears" - ] - } - }, - { - "condition": "minecraft:match_tool", - "predicate": { - "enchantments": [ - { - "enchantment": "minecraft:silk_touch", - "levels": { - "min": 1 - } - } - ] - } - } - ] - } - } - ] - }, - { - "rolls": 1, - "bonus_rolls": 0, - "entries": [ - { - "type": "minecraft:item", - "functions": [ - { - "function": "minecraft:explosion_decay" - } - ], - "name": "floralis:orange_cactus_seeds" - } - ], - "conditions": [ - { - "condition": "minecraft:block_state_property", - "block": "floralis:orange_cactus_crop", - "properties": { - "age": "3" - } - }, - { - "condition": "minecraft:inverted", - "term": { - "condition": "minecraft:any_of", - "terms": [ - { - "condition": "minecraft:match_tool", - "predicate": { - "items": [ - "minecraft:shears" - ] - } - }, - { - "condition": "minecraft:match_tool", - "predicate": { - "enchantments": [ - { - "enchantment": "minecraft:silk_touch", - "levels": { - "min": 1 - } - } - ] - } - } - ] - } - } - ] - }, - { - "rolls": 1, - "bonus_rolls": 0, - "entries": [ - { - "type": "minecraft:item", - "functions": [ - { - "function": "minecraft:explosion_decay" - } - ], - "name": "floralis:orange_cactus_seeds" - } - ], - "conditions": [ - { - "condition": "minecraft:block_state_property", - "block": "floralis:orange_cactus_crop", - "properties": { - "age": "2" - } - }, - { - "condition": "minecraft:inverted", - "term": { - "condition": "minecraft:any_of", - "terms": [ - { - "condition": "minecraft:match_tool", - "predicate": { - "items": [ - "minecraft:shears" - ] - } - }, - { - "condition": "minecraft:match_tool", - "predicate": { - "enchantments": [ - { - "enchantment": "minecraft:silk_touch", - "levels": { - "min": 1 - } - } - ] - } - } - ] - } - } - ] - }, - { - "rolls": 1, - "bonus_rolls": 0, - "entries": [ - { - "type": "minecraft:item", - "functions": [ - { - "function": "minecraft:explosion_decay" - } - ], - "name": "floralis:orange_cactus_seeds" - } - ], - "conditions": [ - { - "condition": "minecraft:block_state_property", - "block": "floralis:orange_cactus_crop", - "properties": { - "age": "1" - } - }, - { - "condition": "minecraft:inverted", - "term": { - "condition": "minecraft:any_of", - "terms": [ - { - "condition": "minecraft:match_tool", - "predicate": { - "items": [ - "minecraft:shears" - ] - } - }, - { - "condition": "minecraft:match_tool", - "predicate": { - "enchantments": [ - { - "enchantment": "minecraft:silk_touch", - "levels": { - "min": 1 - } - } - ] - } - } - ] - } - } - ] - }, - { - "rolls": 1, - "bonus_rolls": 0, - "entries": [ - { - "type": "minecraft:item", - "functions": [ - { - "function": "minecraft:explosion_decay" - } - ], - "name": "floralis:orange_cactus_seeds" - } - ], - "conditions": [ - { - "condition": "minecraft:block_state_property", - "block": "floralis:orange_cactus_crop", - "properties": { - "age": "0" - } - }, - { - "condition": "minecraft:inverted", - "term": { - "condition": "minecraft:any_of", - "terms": [ - { - "condition": "minecraft:match_tool", - "predicate": { - "items": [ - "minecraft:shears" - ] - } - }, - { - "condition": "minecraft:match_tool", - "predicate": { - "enchantments": [ - { - "enchantment": "minecraft:silk_touch", - "levels": { - "min": 1 - } - } - ] - } - } - ] - } - } - ] - } - ] -} \ No newline at end of file diff --git a/src/main/resources/data/floralis/loot_tables/blocks/orange_flower.json b/src/main/resources/data/floralis/loot_tables/blocks/orange_flower.json deleted file mode 100644 index 3a675cd7..00000000 --- a/src/main/resources/data/floralis/loot_tables/blocks/orange_flower.json +++ /dev/null @@ -1,225 +0,0 @@ -{ - "type": "minecraft:block", - "pools": [ - { - "rolls": 1, - "bonus_rolls": 0, - "entries": [ - { - "type": "minecraft:alternatives", - "children": [ - { - "type": "minecraft:item", - "conditions": [ - { - "condition": "minecraft:any_of", - "terms": [ - { - "condition": "minecraft:match_tool", - "predicate": { - "items": [ - "minecraft:shears" - ] - } - }, - { - "condition": "minecraft:match_tool", - "predicate": { - "enchantments": [ - { - "enchantment": "minecraft:silk_touch", - "levels": { - "min": 1 - } - } - ] - } - } - ] - } - ], - "name": "floralis:orange_flower" - } - ] - } - ] - }, - { - "rolls": 1, - "bonus_rolls": 0, - "entries": [ - { - "type": "minecraft:item", - "functions": [ - { - "function": "minecraft:set_count", - "count": 1, - "add": false - }, - { - "function": "minecraft:explosion_decay" - }, - { - "function": "minecraft:apply_bonus", - "enchantment": "minecraft:fortune", - "formula": "minecraft:uniform_bonus_count", - "parameters": { - "bonusMultiplier": 1 - } - } - ], - "name": "floralis:plant_fibers" - } - ], - "conditions": [ - { - "condition": "minecraft:inverted", - "term": { - "condition": "minecraft:any_of", - "terms": [ - { - "condition": "minecraft:match_tool", - "predicate": { - "items": [ - "minecraft:shears" - ] - } - }, - { - "condition": "minecraft:match_tool", - "predicate": { - "enchantments": [ - { - "enchantment": "minecraft:silk_touch", - "levels": { - "min": 1 - } - } - ] - } - } - ] - } - } - ] - }, - { - "rolls": 1, - "bonus_rolls": 0, - "entries": [ - { - "type": "minecraft:item", - "functions": [ - { - "function": "minecraft:set_count", - "count": 1, - "add": false - }, - { - "function": "minecraft:explosion_decay" - }, - { - "function": "minecraft:apply_bonus", - "enchantment": "minecraft:fortune", - "formula": "minecraft:uniform_bonus_count", - "parameters": { - "bonusMultiplier": 1 - } - } - ], - "name": "floralis:orange_petals" - } - ], - "conditions": [ - { - "condition": "minecraft:inverted", - "term": { - "condition": "minecraft:any_of", - "terms": [ - { - "condition": "minecraft:match_tool", - "predicate": { - "items": [ - "minecraft:shears" - ] - } - }, - { - "condition": "minecraft:match_tool", - "predicate": { - "enchantments": [ - { - "enchantment": "minecraft:silk_touch", - "levels": { - "min": 1 - } - } - ] - } - } - ] - } - } - ] - }, - { - "rolls": 1, - "bonus_rolls": 0, - "entries": [ - { - "type": "minecraft:item", - "functions": [ - { - "function": "minecraft:set_count", - "count": 2, - "add": false - }, - { - "function": "minecraft:explosion_decay" - }, - { - "function": "minecraft:apply_bonus", - "enchantment": "minecraft:fortune", - "formula": "minecraft:uniform_bonus_count", - "parameters": { - "bonusMultiplier": 1 - } - } - ], - "name": "floralis:orange_flower_seeds" - } - ], - "conditions": [ - { - "condition": "minecraft:inverted", - "term": { - "condition": "minecraft:any_of", - "terms": [ - { - "condition": "minecraft:match_tool", - "predicate": { - "items": [ - "minecraft:shears" - ] - } - }, - { - "condition": "minecraft:match_tool", - "predicate": { - "enchantments": [ - { - "enchantment": "minecraft:silk_touch", - "levels": { - "min": 1 - } - } - ] - } - } - ] - } - } - ] - } - ] -} \ No newline at end of file diff --git a/src/main/resources/data/floralis/loot_tables/blocks/orange_flower_crop.json b/src/main/resources/data/floralis/loot_tables/blocks/orange_flower_crop.json deleted file mode 100644 index 7ec50fb6..00000000 --- a/src/main/resources/data/floralis/loot_tables/blocks/orange_flower_crop.json +++ /dev/null @@ -1,550 +0,0 @@ -{ - "type": "minecraft:block", - "pools": [ - { - "rolls": 1, - "bonus_rolls": 0, - "entries": [ - { - "type": "minecraft:alternatives", - "children": [ - { - "type": "minecraft:item", - "conditions": [ - { - "condition": "minecraft:block_state_property", - "block": "floralis:orange_flower_crop", - "properties": { - "age": "5" - } - }, - { - "condition": "minecraft:any_of", - "terms": [ - { - "condition": "minecraft:match_tool", - "predicate": { - "items": [ - "minecraft:shears" - ] - } - }, - { - "condition": "minecraft:match_tool", - "predicate": { - "enchantments": [ - { - "enchantment": "minecraft:silk_touch", - "levels": { - "min": 1 - } - } - ] - } - } - ] - } - ], - "name": "floralis:orange_flower" - }, - { - "type": "minecraft:item", - "conditions": [ - { - "condition": "minecraft:any_of", - "terms": [ - { - "condition": "minecraft:match_tool", - "predicate": { - "items": [ - "minecraft:shears" - ] - } - }, - { - "condition": "minecraft:match_tool", - "predicate": { - "enchantments": [ - { - "enchantment": "minecraft:silk_touch", - "levels": { - "min": 1 - } - } - ] - } - } - ] - } - ], - "name": "floralis:orange_flower_seeds" - } - ] - } - ] - }, - { - "rolls": 1, - "bonus_rolls": 0, - "entries": [ - { - "type": "minecraft:item", - "functions": [ - { - "function": "minecraft:set_count", - "count": 1, - "add": false - }, - { - "function": "minecraft:explosion_decay" - }, - { - "function": "minecraft:apply_bonus", - "enchantment": "minecraft:fortune", - "formula": "minecraft:uniform_bonus_count", - "parameters": { - "bonusMultiplier": 1 - } - } - ], - "name": "floralis:plant_fibers" - } - ], - "conditions": [ - { - "condition": "minecraft:block_state_property", - "block": "floralis:orange_flower_crop", - "properties": { - "age": "5" - } - }, - { - "condition": "minecraft:inverted", - "term": { - "condition": "minecraft:any_of", - "terms": [ - { - "condition": "minecraft:match_tool", - "predicate": { - "items": [ - "minecraft:shears" - ] - } - }, - { - "condition": "minecraft:match_tool", - "predicate": { - "enchantments": [ - { - "enchantment": "minecraft:silk_touch", - "levels": { - "min": 1 - } - } - ] - } - } - ] - } - } - ] - }, - { - "rolls": 1, - "bonus_rolls": 0, - "entries": [ - { - "type": "minecraft:item", - "functions": [ - { - "function": "minecraft:set_count", - "count": 1, - "add": false - }, - { - "function": "minecraft:explosion_decay" - }, - { - "function": "minecraft:apply_bonus", - "enchantment": "minecraft:fortune", - "formula": "minecraft:uniform_bonus_count", - "parameters": { - "bonusMultiplier": 1 - } - } - ], - "name": "floralis:orange_petals" - } - ], - "conditions": [ - { - "condition": "minecraft:block_state_property", - "block": "floralis:orange_flower_crop", - "properties": { - "age": "5" - } - }, - { - "condition": "minecraft:inverted", - "term": { - "condition": "minecraft:any_of", - "terms": [ - { - "condition": "minecraft:match_tool", - "predicate": { - "items": [ - "minecraft:shears" - ] - } - }, - { - "condition": "minecraft:match_tool", - "predicate": { - "enchantments": [ - { - "enchantment": "minecraft:silk_touch", - "levels": { - "min": 1 - } - } - ] - } - } - ] - } - } - ] - }, - { - "rolls": 1, - "bonus_rolls": 0, - "entries": [ - { - "type": "minecraft:item", - "functions": [ - { - "function": "minecraft:set_count", - "count": 2, - "add": false - }, - { - "function": "minecraft:explosion_decay" - }, - { - "function": "minecraft:apply_bonus", - "enchantment": "minecraft:fortune", - "formula": "minecraft:uniform_bonus_count", - "parameters": { - "bonusMultiplier": 1 - } - } - ], - "name": "floralis:orange_flower_seeds" - } - ], - "conditions": [ - { - "condition": "minecraft:block_state_property", - "block": "floralis:orange_flower_crop", - "properties": { - "age": "5" - } - }, - { - "condition": "minecraft:inverted", - "term": { - "condition": "minecraft:any_of", - "terms": [ - { - "condition": "minecraft:match_tool", - "predicate": { - "items": [ - "minecraft:shears" - ] - } - }, - { - "condition": "minecraft:match_tool", - "predicate": { - "enchantments": [ - { - "enchantment": "minecraft:silk_touch", - "levels": { - "min": 1 - } - } - ] - } - } - ] - } - } - ] - }, - { - "rolls": 1, - "bonus_rolls": 0, - "entries": [ - { - "type": "minecraft:item", - "functions": [ - { - "function": "minecraft:explosion_decay" - } - ], - "name": "floralis:orange_flower_seeds" - } - ], - "conditions": [ - { - "condition": "minecraft:block_state_property", - "block": "floralis:orange_flower_crop", - "properties": { - "age": "4" - } - }, - { - "condition": "minecraft:inverted", - "term": { - "condition": "minecraft:any_of", - "terms": [ - { - "condition": "minecraft:match_tool", - "predicate": { - "items": [ - "minecraft:shears" - ] - } - }, - { - "condition": "minecraft:match_tool", - "predicate": { - "enchantments": [ - { - "enchantment": "minecraft:silk_touch", - "levels": { - "min": 1 - } - } - ] - } - } - ] - } - } - ] - }, - { - "rolls": 1, - "bonus_rolls": 0, - "entries": [ - { - "type": "minecraft:item", - "functions": [ - { - "function": "minecraft:explosion_decay" - } - ], - "name": "floralis:orange_flower_seeds" - } - ], - "conditions": [ - { - "condition": "minecraft:block_state_property", - "block": "floralis:orange_flower_crop", - "properties": { - "age": "3" - } - }, - { - "condition": "minecraft:inverted", - "term": { - "condition": "minecraft:any_of", - "terms": [ - { - "condition": "minecraft:match_tool", - "predicate": { - "items": [ - "minecraft:shears" - ] - } - }, - { - "condition": "minecraft:match_tool", - "predicate": { - "enchantments": [ - { - "enchantment": "minecraft:silk_touch", - "levels": { - "min": 1 - } - } - ] - } - } - ] - } - } - ] - }, - { - "rolls": 1, - "bonus_rolls": 0, - "entries": [ - { - "type": "minecraft:item", - "functions": [ - { - "function": "minecraft:explosion_decay" - } - ], - "name": "floralis:orange_flower_seeds" - } - ], - "conditions": [ - { - "condition": "minecraft:block_state_property", - "block": "floralis:orange_flower_crop", - "properties": { - "age": "2" - } - }, - { - "condition": "minecraft:inverted", - "term": { - "condition": "minecraft:any_of", - "terms": [ - { - "condition": "minecraft:match_tool", - "predicate": { - "items": [ - "minecraft:shears" - ] - } - }, - { - "condition": "minecraft:match_tool", - "predicate": { - "enchantments": [ - { - "enchantment": "minecraft:silk_touch", - "levels": { - "min": 1 - } - } - ] - } - } - ] - } - } - ] - }, - { - "rolls": 1, - "bonus_rolls": 0, - "entries": [ - { - "type": "minecraft:item", - "functions": [ - { - "function": "minecraft:explosion_decay" - } - ], - "name": "floralis:orange_flower_seeds" - } - ], - "conditions": [ - { - "condition": "minecraft:block_state_property", - "block": "floralis:orange_flower_crop", - "properties": { - "age": "1" - } - }, - { - "condition": "minecraft:inverted", - "term": { - "condition": "minecraft:any_of", - "terms": [ - { - "condition": "minecraft:match_tool", - "predicate": { - "items": [ - "minecraft:shears" - ] - } - }, - { - "condition": "minecraft:match_tool", - "predicate": { - "enchantments": [ - { - "enchantment": "minecraft:silk_touch", - "levels": { - "min": 1 - } - } - ] - } - } - ] - } - } - ] - }, - { - "rolls": 1, - "bonus_rolls": 0, - "entries": [ - { - "type": "minecraft:item", - "functions": [ - { - "function": "minecraft:explosion_decay" - } - ], - "name": "floralis:orange_flower_seeds" - } - ], - "conditions": [ - { - "condition": "minecraft:block_state_property", - "block": "floralis:orange_flower_crop", - "properties": { - "age": "0" - } - }, - { - "condition": "minecraft:inverted", - "term": { - "condition": "minecraft:any_of", - "terms": [ - { - "condition": "minecraft:match_tool", - "predicate": { - "items": [ - "minecraft:shears" - ] - } - }, - { - "condition": "minecraft:match_tool", - "predicate": { - "enchantments": [ - { - "enchantment": "minecraft:silk_touch", - "levels": { - "min": 1 - } - } - ] - } - } - ] - } - } - ] - } - ] -} \ No newline at end of file diff --git a/src/main/resources/data/floralis/loot_tables/blocks/pink_cactus.json b/src/main/resources/data/floralis/loot_tables/blocks/pink_cactus.json deleted file mode 100644 index f67c7954..00000000 --- a/src/main/resources/data/floralis/loot_tables/blocks/pink_cactus.json +++ /dev/null @@ -1,225 +0,0 @@ -{ - "type": "minecraft:block", - "pools": [ - { - "rolls": 1, - "bonus_rolls": 0, - "entries": [ - { - "type": "minecraft:alternatives", - "children": [ - { - "type": "minecraft:item", - "conditions": [ - { - "condition": "minecraft:any_of", - "terms": [ - { - "condition": "minecraft:match_tool", - "predicate": { - "items": [ - "minecraft:shears" - ] - } - }, - { - "condition": "minecraft:match_tool", - "predicate": { - "enchantments": [ - { - "enchantment": "minecraft:silk_touch", - "levels": { - "min": 1 - } - } - ] - } - } - ] - } - ], - "name": "floralis:pink_cactus" - } - ] - } - ] - }, - { - "rolls": 1, - "bonus_rolls": 0, - "entries": [ - { - "type": "minecraft:item", - "functions": [ - { - "function": "minecraft:set_count", - "count": 1, - "add": false - }, - { - "function": "minecraft:explosion_decay" - }, - { - "function": "minecraft:apply_bonus", - "enchantment": "minecraft:fortune", - "formula": "minecraft:uniform_bonus_count", - "parameters": { - "bonusMultiplier": 1 - } - } - ], - "name": "floralis:plant_fibers" - } - ], - "conditions": [ - { - "condition": "minecraft:inverted", - "term": { - "condition": "minecraft:any_of", - "terms": [ - { - "condition": "minecraft:match_tool", - "predicate": { - "items": [ - "minecraft:shears" - ] - } - }, - { - "condition": "minecraft:match_tool", - "predicate": { - "enchantments": [ - { - "enchantment": "minecraft:silk_touch", - "levels": { - "min": 1 - } - } - ] - } - } - ] - } - } - ] - }, - { - "rolls": 1, - "bonus_rolls": 0, - "entries": [ - { - "type": "minecraft:item", - "functions": [ - { - "function": "minecraft:set_count", - "count": 1, - "add": false - }, - { - "function": "minecraft:explosion_decay" - }, - { - "function": "minecraft:apply_bonus", - "enchantment": "minecraft:fortune", - "formula": "minecraft:uniform_bonus_count", - "parameters": { - "bonusMultiplier": 1 - } - } - ], - "name": "floralis:pink_petals" - } - ], - "conditions": [ - { - "condition": "minecraft:inverted", - "term": { - "condition": "minecraft:any_of", - "terms": [ - { - "condition": "minecraft:match_tool", - "predicate": { - "items": [ - "minecraft:shears" - ] - } - }, - { - "condition": "minecraft:match_tool", - "predicate": { - "enchantments": [ - { - "enchantment": "minecraft:silk_touch", - "levels": { - "min": 1 - } - } - ] - } - } - ] - } - } - ] - }, - { - "rolls": 1, - "bonus_rolls": 0, - "entries": [ - { - "type": "minecraft:item", - "functions": [ - { - "function": "minecraft:set_count", - "count": 2, - "add": false - }, - { - "function": "minecraft:explosion_decay" - }, - { - "function": "minecraft:apply_bonus", - "enchantment": "minecraft:fortune", - "formula": "minecraft:uniform_bonus_count", - "parameters": { - "bonusMultiplier": 1 - } - } - ], - "name": "floralis:pink_cactus_seeds" - } - ], - "conditions": [ - { - "condition": "minecraft:inverted", - "term": { - "condition": "minecraft:any_of", - "terms": [ - { - "condition": "minecraft:match_tool", - "predicate": { - "items": [ - "minecraft:shears" - ] - } - }, - { - "condition": "minecraft:match_tool", - "predicate": { - "enchantments": [ - { - "enchantment": "minecraft:silk_touch", - "levels": { - "min": 1 - } - } - ] - } - } - ] - } - } - ] - } - ] -} \ No newline at end of file diff --git a/src/main/resources/data/floralis/loot_tables/blocks/pink_cactus_crop.json b/src/main/resources/data/floralis/loot_tables/blocks/pink_cactus_crop.json deleted file mode 100644 index e347f8a0..00000000 --- a/src/main/resources/data/floralis/loot_tables/blocks/pink_cactus_crop.json +++ /dev/null @@ -1,550 +0,0 @@ -{ - "type": "minecraft:block", - "pools": [ - { - "rolls": 1, - "bonus_rolls": 0, - "entries": [ - { - "type": "minecraft:alternatives", - "children": [ - { - "type": "minecraft:item", - "conditions": [ - { - "condition": "minecraft:block_state_property", - "block": "floralis:pink_cactus_crop", - "properties": { - "age": "5" - } - }, - { - "condition": "minecraft:any_of", - "terms": [ - { - "condition": "minecraft:match_tool", - "predicate": { - "items": [ - "minecraft:shears" - ] - } - }, - { - "condition": "minecraft:match_tool", - "predicate": { - "enchantments": [ - { - "enchantment": "minecraft:silk_touch", - "levels": { - "min": 1 - } - } - ] - } - } - ] - } - ], - "name": "floralis:pink_cactus" - }, - { - "type": "minecraft:item", - "conditions": [ - { - "condition": "minecraft:any_of", - "terms": [ - { - "condition": "minecraft:match_tool", - "predicate": { - "items": [ - "minecraft:shears" - ] - } - }, - { - "condition": "minecraft:match_tool", - "predicate": { - "enchantments": [ - { - "enchantment": "minecraft:silk_touch", - "levels": { - "min": 1 - } - } - ] - } - } - ] - } - ], - "name": "floralis:pink_cactus_seeds" - } - ] - } - ] - }, - { - "rolls": 1, - "bonus_rolls": 0, - "entries": [ - { - "type": "minecraft:item", - "functions": [ - { - "function": "minecraft:set_count", - "count": 1, - "add": false - }, - { - "function": "minecraft:explosion_decay" - }, - { - "function": "minecraft:apply_bonus", - "enchantment": "minecraft:fortune", - "formula": "minecraft:uniform_bonus_count", - "parameters": { - "bonusMultiplier": 1 - } - } - ], - "name": "floralis:plant_fibers" - } - ], - "conditions": [ - { - "condition": "minecraft:block_state_property", - "block": "floralis:pink_cactus_crop", - "properties": { - "age": "5" - } - }, - { - "condition": "minecraft:inverted", - "term": { - "condition": "minecraft:any_of", - "terms": [ - { - "condition": "minecraft:match_tool", - "predicate": { - "items": [ - "minecraft:shears" - ] - } - }, - { - "condition": "minecraft:match_tool", - "predicate": { - "enchantments": [ - { - "enchantment": "minecraft:silk_touch", - "levels": { - "min": 1 - } - } - ] - } - } - ] - } - } - ] - }, - { - "rolls": 1, - "bonus_rolls": 0, - "entries": [ - { - "type": "minecraft:item", - "functions": [ - { - "function": "minecraft:set_count", - "count": 1, - "add": false - }, - { - "function": "minecraft:explosion_decay" - }, - { - "function": "minecraft:apply_bonus", - "enchantment": "minecraft:fortune", - "formula": "minecraft:uniform_bonus_count", - "parameters": { - "bonusMultiplier": 1 - } - } - ], - "name": "floralis:pink_petals" - } - ], - "conditions": [ - { - "condition": "minecraft:block_state_property", - "block": "floralis:pink_cactus_crop", - "properties": { - "age": "5" - } - }, - { - "condition": "minecraft:inverted", - "term": { - "condition": "minecraft:any_of", - "terms": [ - { - "condition": "minecraft:match_tool", - "predicate": { - "items": [ - "minecraft:shears" - ] - } - }, - { - "condition": "minecraft:match_tool", - "predicate": { - "enchantments": [ - { - "enchantment": "minecraft:silk_touch", - "levels": { - "min": 1 - } - } - ] - } - } - ] - } - } - ] - }, - { - "rolls": 1, - "bonus_rolls": 0, - "entries": [ - { - "type": "minecraft:item", - "functions": [ - { - "function": "minecraft:set_count", - "count": 2, - "add": false - }, - { - "function": "minecraft:explosion_decay" - }, - { - "function": "minecraft:apply_bonus", - "enchantment": "minecraft:fortune", - "formula": "minecraft:uniform_bonus_count", - "parameters": { - "bonusMultiplier": 1 - } - } - ], - "name": "floralis:pink_cactus_seeds" - } - ], - "conditions": [ - { - "condition": "minecraft:block_state_property", - "block": "floralis:pink_cactus_crop", - "properties": { - "age": "5" - } - }, - { - "condition": "minecraft:inverted", - "term": { - "condition": "minecraft:any_of", - "terms": [ - { - "condition": "minecraft:match_tool", - "predicate": { - "items": [ - "minecraft:shears" - ] - } - }, - { - "condition": "minecraft:match_tool", - "predicate": { - "enchantments": [ - { - "enchantment": "minecraft:silk_touch", - "levels": { - "min": 1 - } - } - ] - } - } - ] - } - } - ] - }, - { - "rolls": 1, - "bonus_rolls": 0, - "entries": [ - { - "type": "minecraft:item", - "functions": [ - { - "function": "minecraft:explosion_decay" - } - ], - "name": "floralis:pink_cactus_seeds" - } - ], - "conditions": [ - { - "condition": "minecraft:block_state_property", - "block": "floralis:pink_cactus_crop", - "properties": { - "age": "4" - } - }, - { - "condition": "minecraft:inverted", - "term": { - "condition": "minecraft:any_of", - "terms": [ - { - "condition": "minecraft:match_tool", - "predicate": { - "items": [ - "minecraft:shears" - ] - } - }, - { - "condition": "minecraft:match_tool", - "predicate": { - "enchantments": [ - { - "enchantment": "minecraft:silk_touch", - "levels": { - "min": 1 - } - } - ] - } - } - ] - } - } - ] - }, - { - "rolls": 1, - "bonus_rolls": 0, - "entries": [ - { - "type": "minecraft:item", - "functions": [ - { - "function": "minecraft:explosion_decay" - } - ], - "name": "floralis:pink_cactus_seeds" - } - ], - "conditions": [ - { - "condition": "minecraft:block_state_property", - "block": "floralis:pink_cactus_crop", - "properties": { - "age": "3" - } - }, - { - "condition": "minecraft:inverted", - "term": { - "condition": "minecraft:any_of", - "terms": [ - { - "condition": "minecraft:match_tool", - "predicate": { - "items": [ - "minecraft:shears" - ] - } - }, - { - "condition": "minecraft:match_tool", - "predicate": { - "enchantments": [ - { - "enchantment": "minecraft:silk_touch", - "levels": { - "min": 1 - } - } - ] - } - } - ] - } - } - ] - }, - { - "rolls": 1, - "bonus_rolls": 0, - "entries": [ - { - "type": "minecraft:item", - "functions": [ - { - "function": "minecraft:explosion_decay" - } - ], - "name": "floralis:pink_cactus_seeds" - } - ], - "conditions": [ - { - "condition": "minecraft:block_state_property", - "block": "floralis:pink_cactus_crop", - "properties": { - "age": "2" - } - }, - { - "condition": "minecraft:inverted", - "term": { - "condition": "minecraft:any_of", - "terms": [ - { - "condition": "minecraft:match_tool", - "predicate": { - "items": [ - "minecraft:shears" - ] - } - }, - { - "condition": "minecraft:match_tool", - "predicate": { - "enchantments": [ - { - "enchantment": "minecraft:silk_touch", - "levels": { - "min": 1 - } - } - ] - } - } - ] - } - } - ] - }, - { - "rolls": 1, - "bonus_rolls": 0, - "entries": [ - { - "type": "minecraft:item", - "functions": [ - { - "function": "minecraft:explosion_decay" - } - ], - "name": "floralis:pink_cactus_seeds" - } - ], - "conditions": [ - { - "condition": "minecraft:block_state_property", - "block": "floralis:pink_cactus_crop", - "properties": { - "age": "1" - } - }, - { - "condition": "minecraft:inverted", - "term": { - "condition": "minecraft:any_of", - "terms": [ - { - "condition": "minecraft:match_tool", - "predicate": { - "items": [ - "minecraft:shears" - ] - } - }, - { - "condition": "minecraft:match_tool", - "predicate": { - "enchantments": [ - { - "enchantment": "minecraft:silk_touch", - "levels": { - "min": 1 - } - } - ] - } - } - ] - } - } - ] - }, - { - "rolls": 1, - "bonus_rolls": 0, - "entries": [ - { - "type": "minecraft:item", - "functions": [ - { - "function": "minecraft:explosion_decay" - } - ], - "name": "floralis:pink_cactus_seeds" - } - ], - "conditions": [ - { - "condition": "minecraft:block_state_property", - "block": "floralis:pink_cactus_crop", - "properties": { - "age": "0" - } - }, - { - "condition": "minecraft:inverted", - "term": { - "condition": "minecraft:any_of", - "terms": [ - { - "condition": "minecraft:match_tool", - "predicate": { - "items": [ - "minecraft:shears" - ] - } - }, - { - "condition": "minecraft:match_tool", - "predicate": { - "enchantments": [ - { - "enchantment": "minecraft:silk_touch", - "levels": { - "min": 1 - } - } - ] - } - } - ] - } - } - ] - } - ] -} \ No newline at end of file diff --git a/src/main/resources/data/floralis/loot_tables/blocks/pink_flower.json b/src/main/resources/data/floralis/loot_tables/blocks/pink_flower.json deleted file mode 100644 index a2d7898f..00000000 --- a/src/main/resources/data/floralis/loot_tables/blocks/pink_flower.json +++ /dev/null @@ -1,225 +0,0 @@ -{ - "type": "minecraft:block", - "pools": [ - { - "rolls": 1, - "bonus_rolls": 0, - "entries": [ - { - "type": "minecraft:alternatives", - "children": [ - { - "type": "minecraft:item", - "conditions": [ - { - "condition": "minecraft:any_of", - "terms": [ - { - "condition": "minecraft:match_tool", - "predicate": { - "items": [ - "minecraft:shears" - ] - } - }, - { - "condition": "minecraft:match_tool", - "predicate": { - "enchantments": [ - { - "enchantment": "minecraft:silk_touch", - "levels": { - "min": 1 - } - } - ] - } - } - ] - } - ], - "name": "floralis:pink_flower" - } - ] - } - ] - }, - { - "rolls": 1, - "bonus_rolls": 0, - "entries": [ - { - "type": "minecraft:item", - "functions": [ - { - "function": "minecraft:set_count", - "count": 1, - "add": false - }, - { - "function": "minecraft:explosion_decay" - }, - { - "function": "minecraft:apply_bonus", - "enchantment": "minecraft:fortune", - "formula": "minecraft:uniform_bonus_count", - "parameters": { - "bonusMultiplier": 1 - } - } - ], - "name": "floralis:plant_fibers" - } - ], - "conditions": [ - { - "condition": "minecraft:inverted", - "term": { - "condition": "minecraft:any_of", - "terms": [ - { - "condition": "minecraft:match_tool", - "predicate": { - "items": [ - "minecraft:shears" - ] - } - }, - { - "condition": "minecraft:match_tool", - "predicate": { - "enchantments": [ - { - "enchantment": "minecraft:silk_touch", - "levels": { - "min": 1 - } - } - ] - } - } - ] - } - } - ] - }, - { - "rolls": 1, - "bonus_rolls": 0, - "entries": [ - { - "type": "minecraft:item", - "functions": [ - { - "function": "minecraft:set_count", - "count": 1, - "add": false - }, - { - "function": "minecraft:explosion_decay" - }, - { - "function": "minecraft:apply_bonus", - "enchantment": "minecraft:fortune", - "formula": "minecraft:uniform_bonus_count", - "parameters": { - "bonusMultiplier": 1 - } - } - ], - "name": "floralis:pink_petals" - } - ], - "conditions": [ - { - "condition": "minecraft:inverted", - "term": { - "condition": "minecraft:any_of", - "terms": [ - { - "condition": "minecraft:match_tool", - "predicate": { - "items": [ - "minecraft:shears" - ] - } - }, - { - "condition": "minecraft:match_tool", - "predicate": { - "enchantments": [ - { - "enchantment": "minecraft:silk_touch", - "levels": { - "min": 1 - } - } - ] - } - } - ] - } - } - ] - }, - { - "rolls": 1, - "bonus_rolls": 0, - "entries": [ - { - "type": "minecraft:item", - "functions": [ - { - "function": "minecraft:set_count", - "count": 2, - "add": false - }, - { - "function": "minecraft:explosion_decay" - }, - { - "function": "minecraft:apply_bonus", - "enchantment": "minecraft:fortune", - "formula": "minecraft:uniform_bonus_count", - "parameters": { - "bonusMultiplier": 1 - } - } - ], - "name": "floralis:pink_flower_seeds" - } - ], - "conditions": [ - { - "condition": "minecraft:inverted", - "term": { - "condition": "minecraft:any_of", - "terms": [ - { - "condition": "minecraft:match_tool", - "predicate": { - "items": [ - "minecraft:shears" - ] - } - }, - { - "condition": "minecraft:match_tool", - "predicate": { - "enchantments": [ - { - "enchantment": "minecraft:silk_touch", - "levels": { - "min": 1 - } - } - ] - } - } - ] - } - } - ] - } - ] -} \ No newline at end of file diff --git a/src/main/resources/data/floralis/loot_tables/blocks/pink_flower_crop.json b/src/main/resources/data/floralis/loot_tables/blocks/pink_flower_crop.json deleted file mode 100644 index fc47e4af..00000000 --- a/src/main/resources/data/floralis/loot_tables/blocks/pink_flower_crop.json +++ /dev/null @@ -1,550 +0,0 @@ -{ - "type": "minecraft:block", - "pools": [ - { - "rolls": 1, - "bonus_rolls": 0, - "entries": [ - { - "type": "minecraft:alternatives", - "children": [ - { - "type": "minecraft:item", - "conditions": [ - { - "condition": "minecraft:block_state_property", - "block": "floralis:pink_flower_crop", - "properties": { - "age": "5" - } - }, - { - "condition": "minecraft:any_of", - "terms": [ - { - "condition": "minecraft:match_tool", - "predicate": { - "items": [ - "minecraft:shears" - ] - } - }, - { - "condition": "minecraft:match_tool", - "predicate": { - "enchantments": [ - { - "enchantment": "minecraft:silk_touch", - "levels": { - "min": 1 - } - } - ] - } - } - ] - } - ], - "name": "floralis:pink_flower" - }, - { - "type": "minecraft:item", - "conditions": [ - { - "condition": "minecraft:any_of", - "terms": [ - { - "condition": "minecraft:match_tool", - "predicate": { - "items": [ - "minecraft:shears" - ] - } - }, - { - "condition": "minecraft:match_tool", - "predicate": { - "enchantments": [ - { - "enchantment": "minecraft:silk_touch", - "levels": { - "min": 1 - } - } - ] - } - } - ] - } - ], - "name": "floralis:pink_flower_seeds" - } - ] - } - ] - }, - { - "rolls": 1, - "bonus_rolls": 0, - "entries": [ - { - "type": "minecraft:item", - "functions": [ - { - "function": "minecraft:set_count", - "count": 1, - "add": false - }, - { - "function": "minecraft:explosion_decay" - }, - { - "function": "minecraft:apply_bonus", - "enchantment": "minecraft:fortune", - "formula": "minecraft:uniform_bonus_count", - "parameters": { - "bonusMultiplier": 1 - } - } - ], - "name": "floralis:plant_fibers" - } - ], - "conditions": [ - { - "condition": "minecraft:block_state_property", - "block": "floralis:pink_flower_crop", - "properties": { - "age": "5" - } - }, - { - "condition": "minecraft:inverted", - "term": { - "condition": "minecraft:any_of", - "terms": [ - { - "condition": "minecraft:match_tool", - "predicate": { - "items": [ - "minecraft:shears" - ] - } - }, - { - "condition": "minecraft:match_tool", - "predicate": { - "enchantments": [ - { - "enchantment": "minecraft:silk_touch", - "levels": { - "min": 1 - } - } - ] - } - } - ] - } - } - ] - }, - { - "rolls": 1, - "bonus_rolls": 0, - "entries": [ - { - "type": "minecraft:item", - "functions": [ - { - "function": "minecraft:set_count", - "count": 1, - "add": false - }, - { - "function": "minecraft:explosion_decay" - }, - { - "function": "minecraft:apply_bonus", - "enchantment": "minecraft:fortune", - "formula": "minecraft:uniform_bonus_count", - "parameters": { - "bonusMultiplier": 1 - } - } - ], - "name": "floralis:pink_petals" - } - ], - "conditions": [ - { - "condition": "minecraft:block_state_property", - "block": "floralis:pink_flower_crop", - "properties": { - "age": "5" - } - }, - { - "condition": "minecraft:inverted", - "term": { - "condition": "minecraft:any_of", - "terms": [ - { - "condition": "minecraft:match_tool", - "predicate": { - "items": [ - "minecraft:shears" - ] - } - }, - { - "condition": "minecraft:match_tool", - "predicate": { - "enchantments": [ - { - "enchantment": "minecraft:silk_touch", - "levels": { - "min": 1 - } - } - ] - } - } - ] - } - } - ] - }, - { - "rolls": 1, - "bonus_rolls": 0, - "entries": [ - { - "type": "minecraft:item", - "functions": [ - { - "function": "minecraft:set_count", - "count": 2, - "add": false - }, - { - "function": "minecraft:explosion_decay" - }, - { - "function": "minecraft:apply_bonus", - "enchantment": "minecraft:fortune", - "formula": "minecraft:uniform_bonus_count", - "parameters": { - "bonusMultiplier": 1 - } - } - ], - "name": "floralis:pink_flower_seeds" - } - ], - "conditions": [ - { - "condition": "minecraft:block_state_property", - "block": "floralis:pink_flower_crop", - "properties": { - "age": "5" - } - }, - { - "condition": "minecraft:inverted", - "term": { - "condition": "minecraft:any_of", - "terms": [ - { - "condition": "minecraft:match_tool", - "predicate": { - "items": [ - "minecraft:shears" - ] - } - }, - { - "condition": "minecraft:match_tool", - "predicate": { - "enchantments": [ - { - "enchantment": "minecraft:silk_touch", - "levels": { - "min": 1 - } - } - ] - } - } - ] - } - } - ] - }, - { - "rolls": 1, - "bonus_rolls": 0, - "entries": [ - { - "type": "minecraft:item", - "functions": [ - { - "function": "minecraft:explosion_decay" - } - ], - "name": "floralis:pink_flower_seeds" - } - ], - "conditions": [ - { - "condition": "minecraft:block_state_property", - "block": "floralis:pink_flower_crop", - "properties": { - "age": "4" - } - }, - { - "condition": "minecraft:inverted", - "term": { - "condition": "minecraft:any_of", - "terms": [ - { - "condition": "minecraft:match_tool", - "predicate": { - "items": [ - "minecraft:shears" - ] - } - }, - { - "condition": "minecraft:match_tool", - "predicate": { - "enchantments": [ - { - "enchantment": "minecraft:silk_touch", - "levels": { - "min": 1 - } - } - ] - } - } - ] - } - } - ] - }, - { - "rolls": 1, - "bonus_rolls": 0, - "entries": [ - { - "type": "minecraft:item", - "functions": [ - { - "function": "minecraft:explosion_decay" - } - ], - "name": "floralis:pink_flower_seeds" - } - ], - "conditions": [ - { - "condition": "minecraft:block_state_property", - "block": "floralis:pink_flower_crop", - "properties": { - "age": "3" - } - }, - { - "condition": "minecraft:inverted", - "term": { - "condition": "minecraft:any_of", - "terms": [ - { - "condition": "minecraft:match_tool", - "predicate": { - "items": [ - "minecraft:shears" - ] - } - }, - { - "condition": "minecraft:match_tool", - "predicate": { - "enchantments": [ - { - "enchantment": "minecraft:silk_touch", - "levels": { - "min": 1 - } - } - ] - } - } - ] - } - } - ] - }, - { - "rolls": 1, - "bonus_rolls": 0, - "entries": [ - { - "type": "minecraft:item", - "functions": [ - { - "function": "minecraft:explosion_decay" - } - ], - "name": "floralis:pink_flower_seeds" - } - ], - "conditions": [ - { - "condition": "minecraft:block_state_property", - "block": "floralis:pink_flower_crop", - "properties": { - "age": "2" - } - }, - { - "condition": "minecraft:inverted", - "term": { - "condition": "minecraft:any_of", - "terms": [ - { - "condition": "minecraft:match_tool", - "predicate": { - "items": [ - "minecraft:shears" - ] - } - }, - { - "condition": "minecraft:match_tool", - "predicate": { - "enchantments": [ - { - "enchantment": "minecraft:silk_touch", - "levels": { - "min": 1 - } - } - ] - } - } - ] - } - } - ] - }, - { - "rolls": 1, - "bonus_rolls": 0, - "entries": [ - { - "type": "minecraft:item", - "functions": [ - { - "function": "minecraft:explosion_decay" - } - ], - "name": "floralis:pink_flower_seeds" - } - ], - "conditions": [ - { - "condition": "minecraft:block_state_property", - "block": "floralis:pink_flower_crop", - "properties": { - "age": "1" - } - }, - { - "condition": "minecraft:inverted", - "term": { - "condition": "minecraft:any_of", - "terms": [ - { - "condition": "minecraft:match_tool", - "predicate": { - "items": [ - "minecraft:shears" - ] - } - }, - { - "condition": "minecraft:match_tool", - "predicate": { - "enchantments": [ - { - "enchantment": "minecraft:silk_touch", - "levels": { - "min": 1 - } - } - ] - } - } - ] - } - } - ] - }, - { - "rolls": 1, - "bonus_rolls": 0, - "entries": [ - { - "type": "minecraft:item", - "functions": [ - { - "function": "minecraft:explosion_decay" - } - ], - "name": "floralis:pink_flower_seeds" - } - ], - "conditions": [ - { - "condition": "minecraft:block_state_property", - "block": "floralis:pink_flower_crop", - "properties": { - "age": "0" - } - }, - { - "condition": "minecraft:inverted", - "term": { - "condition": "minecraft:any_of", - "terms": [ - { - "condition": "minecraft:match_tool", - "predicate": { - "items": [ - "minecraft:shears" - ] - } - }, - { - "condition": "minecraft:match_tool", - "predicate": { - "enchantments": [ - { - "enchantment": "minecraft:silk_touch", - "levels": { - "min": 1 - } - } - ] - } - } - ] - } - } - ] - } - ] -} \ No newline at end of file diff --git a/src/main/resources/data/floralis/loot_tables/blocks/purple_cactus.json b/src/main/resources/data/floralis/loot_tables/blocks/purple_cactus.json deleted file mode 100644 index 69bee6bd..00000000 --- a/src/main/resources/data/floralis/loot_tables/blocks/purple_cactus.json +++ /dev/null @@ -1,225 +0,0 @@ -{ - "type": "minecraft:block", - "pools": [ - { - "rolls": 1, - "bonus_rolls": 0, - "entries": [ - { - "type": "minecraft:alternatives", - "children": [ - { - "type": "minecraft:item", - "conditions": [ - { - "condition": "minecraft:any_of", - "terms": [ - { - "condition": "minecraft:match_tool", - "predicate": { - "items": [ - "minecraft:shears" - ] - } - }, - { - "condition": "minecraft:match_tool", - "predicate": { - "enchantments": [ - { - "enchantment": "minecraft:silk_touch", - "levels": { - "min": 1 - } - } - ] - } - } - ] - } - ], - "name": "floralis:purple_cactus" - } - ] - } - ] - }, - { - "rolls": 1, - "bonus_rolls": 0, - "entries": [ - { - "type": "minecraft:item", - "functions": [ - { - "function": "minecraft:set_count", - "count": 1, - "add": false - }, - { - "function": "minecraft:explosion_decay" - }, - { - "function": "minecraft:apply_bonus", - "enchantment": "minecraft:fortune", - "formula": "minecraft:uniform_bonus_count", - "parameters": { - "bonusMultiplier": 1 - } - } - ], - "name": "floralis:plant_fibers" - } - ], - "conditions": [ - { - "condition": "minecraft:inverted", - "term": { - "condition": "minecraft:any_of", - "terms": [ - { - "condition": "minecraft:match_tool", - "predicate": { - "items": [ - "minecraft:shears" - ] - } - }, - { - "condition": "minecraft:match_tool", - "predicate": { - "enchantments": [ - { - "enchantment": "minecraft:silk_touch", - "levels": { - "min": 1 - } - } - ] - } - } - ] - } - } - ] - }, - { - "rolls": 1, - "bonus_rolls": 0, - "entries": [ - { - "type": "minecraft:item", - "functions": [ - { - "function": "minecraft:set_count", - "count": 1, - "add": false - }, - { - "function": "minecraft:explosion_decay" - }, - { - "function": "minecraft:apply_bonus", - "enchantment": "minecraft:fortune", - "formula": "minecraft:uniform_bonus_count", - "parameters": { - "bonusMultiplier": 1 - } - } - ], - "name": "floralis:purple_petals" - } - ], - "conditions": [ - { - "condition": "minecraft:inverted", - "term": { - "condition": "minecraft:any_of", - "terms": [ - { - "condition": "minecraft:match_tool", - "predicate": { - "items": [ - "minecraft:shears" - ] - } - }, - { - "condition": "minecraft:match_tool", - "predicate": { - "enchantments": [ - { - "enchantment": "minecraft:silk_touch", - "levels": { - "min": 1 - } - } - ] - } - } - ] - } - } - ] - }, - { - "rolls": 1, - "bonus_rolls": 0, - "entries": [ - { - "type": "minecraft:item", - "functions": [ - { - "function": "minecraft:set_count", - "count": 2, - "add": false - }, - { - "function": "minecraft:explosion_decay" - }, - { - "function": "minecraft:apply_bonus", - "enchantment": "minecraft:fortune", - "formula": "minecraft:uniform_bonus_count", - "parameters": { - "bonusMultiplier": 1 - } - } - ], - "name": "floralis:purple_cactus_seeds" - } - ], - "conditions": [ - { - "condition": "minecraft:inverted", - "term": { - "condition": "minecraft:any_of", - "terms": [ - { - "condition": "minecraft:match_tool", - "predicate": { - "items": [ - "minecraft:shears" - ] - } - }, - { - "condition": "minecraft:match_tool", - "predicate": { - "enchantments": [ - { - "enchantment": "minecraft:silk_touch", - "levels": { - "min": 1 - } - } - ] - } - } - ] - } - } - ] - } - ] -} \ No newline at end of file diff --git a/src/main/resources/data/floralis/loot_tables/blocks/purple_cactus_crop.json b/src/main/resources/data/floralis/loot_tables/blocks/purple_cactus_crop.json deleted file mode 100644 index 434de246..00000000 --- a/src/main/resources/data/floralis/loot_tables/blocks/purple_cactus_crop.json +++ /dev/null @@ -1,550 +0,0 @@ -{ - "type": "minecraft:block", - "pools": [ - { - "rolls": 1, - "bonus_rolls": 0, - "entries": [ - { - "type": "minecraft:alternatives", - "children": [ - { - "type": "minecraft:item", - "conditions": [ - { - "condition": "minecraft:block_state_property", - "block": "floralis:purple_cactus_crop", - "properties": { - "age": "5" - } - }, - { - "condition": "minecraft:any_of", - "terms": [ - { - "condition": "minecraft:match_tool", - "predicate": { - "items": [ - "minecraft:shears" - ] - } - }, - { - "condition": "minecraft:match_tool", - "predicate": { - "enchantments": [ - { - "enchantment": "minecraft:silk_touch", - "levels": { - "min": 1 - } - } - ] - } - } - ] - } - ], - "name": "floralis:purple_cactus" - }, - { - "type": "minecraft:item", - "conditions": [ - { - "condition": "minecraft:any_of", - "terms": [ - { - "condition": "minecraft:match_tool", - "predicate": { - "items": [ - "minecraft:shears" - ] - } - }, - { - "condition": "minecraft:match_tool", - "predicate": { - "enchantments": [ - { - "enchantment": "minecraft:silk_touch", - "levels": { - "min": 1 - } - } - ] - } - } - ] - } - ], - "name": "floralis:purple_cactus_seeds" - } - ] - } - ] - }, - { - "rolls": 1, - "bonus_rolls": 0, - "entries": [ - { - "type": "minecraft:item", - "functions": [ - { - "function": "minecraft:set_count", - "count": 1, - "add": false - }, - { - "function": "minecraft:explosion_decay" - }, - { - "function": "minecraft:apply_bonus", - "enchantment": "minecraft:fortune", - "formula": "minecraft:uniform_bonus_count", - "parameters": { - "bonusMultiplier": 1 - } - } - ], - "name": "floralis:plant_fibers" - } - ], - "conditions": [ - { - "condition": "minecraft:block_state_property", - "block": "floralis:purple_cactus_crop", - "properties": { - "age": "5" - } - }, - { - "condition": "minecraft:inverted", - "term": { - "condition": "minecraft:any_of", - "terms": [ - { - "condition": "minecraft:match_tool", - "predicate": { - "items": [ - "minecraft:shears" - ] - } - }, - { - "condition": "minecraft:match_tool", - "predicate": { - "enchantments": [ - { - "enchantment": "minecraft:silk_touch", - "levels": { - "min": 1 - } - } - ] - } - } - ] - } - } - ] - }, - { - "rolls": 1, - "bonus_rolls": 0, - "entries": [ - { - "type": "minecraft:item", - "functions": [ - { - "function": "minecraft:set_count", - "count": 1, - "add": false - }, - { - "function": "minecraft:explosion_decay" - }, - { - "function": "minecraft:apply_bonus", - "enchantment": "minecraft:fortune", - "formula": "minecraft:uniform_bonus_count", - "parameters": { - "bonusMultiplier": 1 - } - } - ], - "name": "floralis:purple_petals" - } - ], - "conditions": [ - { - "condition": "minecraft:block_state_property", - "block": "floralis:purple_cactus_crop", - "properties": { - "age": "5" - } - }, - { - "condition": "minecraft:inverted", - "term": { - "condition": "minecraft:any_of", - "terms": [ - { - "condition": "minecraft:match_tool", - "predicate": { - "items": [ - "minecraft:shears" - ] - } - }, - { - "condition": "minecraft:match_tool", - "predicate": { - "enchantments": [ - { - "enchantment": "minecraft:silk_touch", - "levels": { - "min": 1 - } - } - ] - } - } - ] - } - } - ] - }, - { - "rolls": 1, - "bonus_rolls": 0, - "entries": [ - { - "type": "minecraft:item", - "functions": [ - { - "function": "minecraft:set_count", - "count": 2, - "add": false - }, - { - "function": "minecraft:explosion_decay" - }, - { - "function": "minecraft:apply_bonus", - "enchantment": "minecraft:fortune", - "formula": "minecraft:uniform_bonus_count", - "parameters": { - "bonusMultiplier": 1 - } - } - ], - "name": "floralis:purple_cactus_seeds" - } - ], - "conditions": [ - { - "condition": "minecraft:block_state_property", - "block": "floralis:purple_cactus_crop", - "properties": { - "age": "5" - } - }, - { - "condition": "minecraft:inverted", - "term": { - "condition": "minecraft:any_of", - "terms": [ - { - "condition": "minecraft:match_tool", - "predicate": { - "items": [ - "minecraft:shears" - ] - } - }, - { - "condition": "minecraft:match_tool", - "predicate": { - "enchantments": [ - { - "enchantment": "minecraft:silk_touch", - "levels": { - "min": 1 - } - } - ] - } - } - ] - } - } - ] - }, - { - "rolls": 1, - "bonus_rolls": 0, - "entries": [ - { - "type": "minecraft:item", - "functions": [ - { - "function": "minecraft:explosion_decay" - } - ], - "name": "floralis:purple_cactus_seeds" - } - ], - "conditions": [ - { - "condition": "minecraft:block_state_property", - "block": "floralis:purple_cactus_crop", - "properties": { - "age": "4" - } - }, - { - "condition": "minecraft:inverted", - "term": { - "condition": "minecraft:any_of", - "terms": [ - { - "condition": "minecraft:match_tool", - "predicate": { - "items": [ - "minecraft:shears" - ] - } - }, - { - "condition": "minecraft:match_tool", - "predicate": { - "enchantments": [ - { - "enchantment": "minecraft:silk_touch", - "levels": { - "min": 1 - } - } - ] - } - } - ] - } - } - ] - }, - { - "rolls": 1, - "bonus_rolls": 0, - "entries": [ - { - "type": "minecraft:item", - "functions": [ - { - "function": "minecraft:explosion_decay" - } - ], - "name": "floralis:purple_cactus_seeds" - } - ], - "conditions": [ - { - "condition": "minecraft:block_state_property", - "block": "floralis:purple_cactus_crop", - "properties": { - "age": "3" - } - }, - { - "condition": "minecraft:inverted", - "term": { - "condition": "minecraft:any_of", - "terms": [ - { - "condition": "minecraft:match_tool", - "predicate": { - "items": [ - "minecraft:shears" - ] - } - }, - { - "condition": "minecraft:match_tool", - "predicate": { - "enchantments": [ - { - "enchantment": "minecraft:silk_touch", - "levels": { - "min": 1 - } - } - ] - } - } - ] - } - } - ] - }, - { - "rolls": 1, - "bonus_rolls": 0, - "entries": [ - { - "type": "minecraft:item", - "functions": [ - { - "function": "minecraft:explosion_decay" - } - ], - "name": "floralis:purple_cactus_seeds" - } - ], - "conditions": [ - { - "condition": "minecraft:block_state_property", - "block": "floralis:purple_cactus_crop", - "properties": { - "age": "2" - } - }, - { - "condition": "minecraft:inverted", - "term": { - "condition": "minecraft:any_of", - "terms": [ - { - "condition": "minecraft:match_tool", - "predicate": { - "items": [ - "minecraft:shears" - ] - } - }, - { - "condition": "minecraft:match_tool", - "predicate": { - "enchantments": [ - { - "enchantment": "minecraft:silk_touch", - "levels": { - "min": 1 - } - } - ] - } - } - ] - } - } - ] - }, - { - "rolls": 1, - "bonus_rolls": 0, - "entries": [ - { - "type": "minecraft:item", - "functions": [ - { - "function": "minecraft:explosion_decay" - } - ], - "name": "floralis:purple_cactus_seeds" - } - ], - "conditions": [ - { - "condition": "minecraft:block_state_property", - "block": "floralis:purple_cactus_crop", - "properties": { - "age": "1" - } - }, - { - "condition": "minecraft:inverted", - "term": { - "condition": "minecraft:any_of", - "terms": [ - { - "condition": "minecraft:match_tool", - "predicate": { - "items": [ - "minecraft:shears" - ] - } - }, - { - "condition": "minecraft:match_tool", - "predicate": { - "enchantments": [ - { - "enchantment": "minecraft:silk_touch", - "levels": { - "min": 1 - } - } - ] - } - } - ] - } - } - ] - }, - { - "rolls": 1, - "bonus_rolls": 0, - "entries": [ - { - "type": "minecraft:item", - "functions": [ - { - "function": "minecraft:explosion_decay" - } - ], - "name": "floralis:purple_cactus_seeds" - } - ], - "conditions": [ - { - "condition": "minecraft:block_state_property", - "block": "floralis:purple_cactus_crop", - "properties": { - "age": "0" - } - }, - { - "condition": "minecraft:inverted", - "term": { - "condition": "minecraft:any_of", - "terms": [ - { - "condition": "minecraft:match_tool", - "predicate": { - "items": [ - "minecraft:shears" - ] - } - }, - { - "condition": "minecraft:match_tool", - "predicate": { - "enchantments": [ - { - "enchantment": "minecraft:silk_touch", - "levels": { - "min": 1 - } - } - ] - } - } - ] - } - } - ] - } - ] -} \ No newline at end of file diff --git a/src/main/resources/data/floralis/loot_tables/blocks/purple_flower.json b/src/main/resources/data/floralis/loot_tables/blocks/purple_flower.json deleted file mode 100644 index d54d829e..00000000 --- a/src/main/resources/data/floralis/loot_tables/blocks/purple_flower.json +++ /dev/null @@ -1,225 +0,0 @@ -{ - "type": "minecraft:block", - "pools": [ - { - "rolls": 1, - "bonus_rolls": 0, - "entries": [ - { - "type": "minecraft:alternatives", - "children": [ - { - "type": "minecraft:item", - "conditions": [ - { - "condition": "minecraft:any_of", - "terms": [ - { - "condition": "minecraft:match_tool", - "predicate": { - "items": [ - "minecraft:shears" - ] - } - }, - { - "condition": "minecraft:match_tool", - "predicate": { - "enchantments": [ - { - "enchantment": "minecraft:silk_touch", - "levels": { - "min": 1 - } - } - ] - } - } - ] - } - ], - "name": "floralis:purple_flower" - } - ] - } - ] - }, - { - "rolls": 1, - "bonus_rolls": 0, - "entries": [ - { - "type": "minecraft:item", - "functions": [ - { - "function": "minecraft:set_count", - "count": 1, - "add": false - }, - { - "function": "minecraft:explosion_decay" - }, - { - "function": "minecraft:apply_bonus", - "enchantment": "minecraft:fortune", - "formula": "minecraft:uniform_bonus_count", - "parameters": { - "bonusMultiplier": 1 - } - } - ], - "name": "floralis:plant_fibers" - } - ], - "conditions": [ - { - "condition": "minecraft:inverted", - "term": { - "condition": "minecraft:any_of", - "terms": [ - { - "condition": "minecraft:match_tool", - "predicate": { - "items": [ - "minecraft:shears" - ] - } - }, - { - "condition": "minecraft:match_tool", - "predicate": { - "enchantments": [ - { - "enchantment": "minecraft:silk_touch", - "levels": { - "min": 1 - } - } - ] - } - } - ] - } - } - ] - }, - { - "rolls": 1, - "bonus_rolls": 0, - "entries": [ - { - "type": "minecraft:item", - "functions": [ - { - "function": "minecraft:set_count", - "count": 1, - "add": false - }, - { - "function": "minecraft:explosion_decay" - }, - { - "function": "minecraft:apply_bonus", - "enchantment": "minecraft:fortune", - "formula": "minecraft:uniform_bonus_count", - "parameters": { - "bonusMultiplier": 1 - } - } - ], - "name": "floralis:purple_petals" - } - ], - "conditions": [ - { - "condition": "minecraft:inverted", - "term": { - "condition": "minecraft:any_of", - "terms": [ - { - "condition": "minecraft:match_tool", - "predicate": { - "items": [ - "minecraft:shears" - ] - } - }, - { - "condition": "minecraft:match_tool", - "predicate": { - "enchantments": [ - { - "enchantment": "minecraft:silk_touch", - "levels": { - "min": 1 - } - } - ] - } - } - ] - } - } - ] - }, - { - "rolls": 1, - "bonus_rolls": 0, - "entries": [ - { - "type": "minecraft:item", - "functions": [ - { - "function": "minecraft:set_count", - "count": 2, - "add": false - }, - { - "function": "minecraft:explosion_decay" - }, - { - "function": "minecraft:apply_bonus", - "enchantment": "minecraft:fortune", - "formula": "minecraft:uniform_bonus_count", - "parameters": { - "bonusMultiplier": 1 - } - } - ], - "name": "floralis:purple_flower_seeds" - } - ], - "conditions": [ - { - "condition": "minecraft:inverted", - "term": { - "condition": "minecraft:any_of", - "terms": [ - { - "condition": "minecraft:match_tool", - "predicate": { - "items": [ - "minecraft:shears" - ] - } - }, - { - "condition": "minecraft:match_tool", - "predicate": { - "enchantments": [ - { - "enchantment": "minecraft:silk_touch", - "levels": { - "min": 1 - } - } - ] - } - } - ] - } - } - ] - } - ] -} \ No newline at end of file diff --git a/src/main/resources/data/floralis/loot_tables/blocks/purple_flower_crop.json b/src/main/resources/data/floralis/loot_tables/blocks/purple_flower_crop.json deleted file mode 100644 index a8925f4d..00000000 --- a/src/main/resources/data/floralis/loot_tables/blocks/purple_flower_crop.json +++ /dev/null @@ -1,550 +0,0 @@ -{ - "type": "minecraft:block", - "pools": [ - { - "rolls": 1, - "bonus_rolls": 0, - "entries": [ - { - "type": "minecraft:alternatives", - "children": [ - { - "type": "minecraft:item", - "conditions": [ - { - "condition": "minecraft:block_state_property", - "block": "floralis:purple_flower_crop", - "properties": { - "age": "5" - } - }, - { - "condition": "minecraft:any_of", - "terms": [ - { - "condition": "minecraft:match_tool", - "predicate": { - "items": [ - "minecraft:shears" - ] - } - }, - { - "condition": "minecraft:match_tool", - "predicate": { - "enchantments": [ - { - "enchantment": "minecraft:silk_touch", - "levels": { - "min": 1 - } - } - ] - } - } - ] - } - ], - "name": "floralis:purple_flower" - }, - { - "type": "minecraft:item", - "conditions": [ - { - "condition": "minecraft:any_of", - "terms": [ - { - "condition": "minecraft:match_tool", - "predicate": { - "items": [ - "minecraft:shears" - ] - } - }, - { - "condition": "minecraft:match_tool", - "predicate": { - "enchantments": [ - { - "enchantment": "minecraft:silk_touch", - "levels": { - "min": 1 - } - } - ] - } - } - ] - } - ], - "name": "floralis:purple_flower_seeds" - } - ] - } - ] - }, - { - "rolls": 1, - "bonus_rolls": 0, - "entries": [ - { - "type": "minecraft:item", - "functions": [ - { - "function": "minecraft:set_count", - "count": 1, - "add": false - }, - { - "function": "minecraft:explosion_decay" - }, - { - "function": "minecraft:apply_bonus", - "enchantment": "minecraft:fortune", - "formula": "minecraft:uniform_bonus_count", - "parameters": { - "bonusMultiplier": 1 - } - } - ], - "name": "floralis:plant_fibers" - } - ], - "conditions": [ - { - "condition": "minecraft:block_state_property", - "block": "floralis:purple_flower_crop", - "properties": { - "age": "5" - } - }, - { - "condition": "minecraft:inverted", - "term": { - "condition": "minecraft:any_of", - "terms": [ - { - "condition": "minecraft:match_tool", - "predicate": { - "items": [ - "minecraft:shears" - ] - } - }, - { - "condition": "minecraft:match_tool", - "predicate": { - "enchantments": [ - { - "enchantment": "minecraft:silk_touch", - "levels": { - "min": 1 - } - } - ] - } - } - ] - } - } - ] - }, - { - "rolls": 1, - "bonus_rolls": 0, - "entries": [ - { - "type": "minecraft:item", - "functions": [ - { - "function": "minecraft:set_count", - "count": 1, - "add": false - }, - { - "function": "minecraft:explosion_decay" - }, - { - "function": "minecraft:apply_bonus", - "enchantment": "minecraft:fortune", - "formula": "minecraft:uniform_bonus_count", - "parameters": { - "bonusMultiplier": 1 - } - } - ], - "name": "floralis:purple_petals" - } - ], - "conditions": [ - { - "condition": "minecraft:block_state_property", - "block": "floralis:purple_flower_crop", - "properties": { - "age": "5" - } - }, - { - "condition": "minecraft:inverted", - "term": { - "condition": "minecraft:any_of", - "terms": [ - { - "condition": "minecraft:match_tool", - "predicate": { - "items": [ - "minecraft:shears" - ] - } - }, - { - "condition": "minecraft:match_tool", - "predicate": { - "enchantments": [ - { - "enchantment": "minecraft:silk_touch", - "levels": { - "min": 1 - } - } - ] - } - } - ] - } - } - ] - }, - { - "rolls": 1, - "bonus_rolls": 0, - "entries": [ - { - "type": "minecraft:item", - "functions": [ - { - "function": "minecraft:set_count", - "count": 2, - "add": false - }, - { - "function": "minecraft:explosion_decay" - }, - { - "function": "minecraft:apply_bonus", - "enchantment": "minecraft:fortune", - "formula": "minecraft:uniform_bonus_count", - "parameters": { - "bonusMultiplier": 1 - } - } - ], - "name": "floralis:purple_flower_seeds" - } - ], - "conditions": [ - { - "condition": "minecraft:block_state_property", - "block": "floralis:purple_flower_crop", - "properties": { - "age": "5" - } - }, - { - "condition": "minecraft:inverted", - "term": { - "condition": "minecraft:any_of", - "terms": [ - { - "condition": "minecraft:match_tool", - "predicate": { - "items": [ - "minecraft:shears" - ] - } - }, - { - "condition": "minecraft:match_tool", - "predicate": { - "enchantments": [ - { - "enchantment": "minecraft:silk_touch", - "levels": { - "min": 1 - } - } - ] - } - } - ] - } - } - ] - }, - { - "rolls": 1, - "bonus_rolls": 0, - "entries": [ - { - "type": "minecraft:item", - "functions": [ - { - "function": "minecraft:explosion_decay" - } - ], - "name": "floralis:purple_flower_seeds" - } - ], - "conditions": [ - { - "condition": "minecraft:block_state_property", - "block": "floralis:purple_flower_crop", - "properties": { - "age": "4" - } - }, - { - "condition": "minecraft:inverted", - "term": { - "condition": "minecraft:any_of", - "terms": [ - { - "condition": "minecraft:match_tool", - "predicate": { - "items": [ - "minecraft:shears" - ] - } - }, - { - "condition": "minecraft:match_tool", - "predicate": { - "enchantments": [ - { - "enchantment": "minecraft:silk_touch", - "levels": { - "min": 1 - } - } - ] - } - } - ] - } - } - ] - }, - { - "rolls": 1, - "bonus_rolls": 0, - "entries": [ - { - "type": "minecraft:item", - "functions": [ - { - "function": "minecraft:explosion_decay" - } - ], - "name": "floralis:purple_flower_seeds" - } - ], - "conditions": [ - { - "condition": "minecraft:block_state_property", - "block": "floralis:purple_flower_crop", - "properties": { - "age": "3" - } - }, - { - "condition": "minecraft:inverted", - "term": { - "condition": "minecraft:any_of", - "terms": [ - { - "condition": "minecraft:match_tool", - "predicate": { - "items": [ - "minecraft:shears" - ] - } - }, - { - "condition": "minecraft:match_tool", - "predicate": { - "enchantments": [ - { - "enchantment": "minecraft:silk_touch", - "levels": { - "min": 1 - } - } - ] - } - } - ] - } - } - ] - }, - { - "rolls": 1, - "bonus_rolls": 0, - "entries": [ - { - "type": "minecraft:item", - "functions": [ - { - "function": "minecraft:explosion_decay" - } - ], - "name": "floralis:purple_flower_seeds" - } - ], - "conditions": [ - { - "condition": "minecraft:block_state_property", - "block": "floralis:purple_flower_crop", - "properties": { - "age": "2" - } - }, - { - "condition": "minecraft:inverted", - "term": { - "condition": "minecraft:any_of", - "terms": [ - { - "condition": "minecraft:match_tool", - "predicate": { - "items": [ - "minecraft:shears" - ] - } - }, - { - "condition": "minecraft:match_tool", - "predicate": { - "enchantments": [ - { - "enchantment": "minecraft:silk_touch", - "levels": { - "min": 1 - } - } - ] - } - } - ] - } - } - ] - }, - { - "rolls": 1, - "bonus_rolls": 0, - "entries": [ - { - "type": "minecraft:item", - "functions": [ - { - "function": "minecraft:explosion_decay" - } - ], - "name": "floralis:purple_flower_seeds" - } - ], - "conditions": [ - { - "condition": "minecraft:block_state_property", - "block": "floralis:purple_flower_crop", - "properties": { - "age": "1" - } - }, - { - "condition": "minecraft:inverted", - "term": { - "condition": "minecraft:any_of", - "terms": [ - { - "condition": "minecraft:match_tool", - "predicate": { - "items": [ - "minecraft:shears" - ] - } - }, - { - "condition": "minecraft:match_tool", - "predicate": { - "enchantments": [ - { - "enchantment": "minecraft:silk_touch", - "levels": { - "min": 1 - } - } - ] - } - } - ] - } - } - ] - }, - { - "rolls": 1, - "bonus_rolls": 0, - "entries": [ - { - "type": "minecraft:item", - "functions": [ - { - "function": "minecraft:explosion_decay" - } - ], - "name": "floralis:purple_flower_seeds" - } - ], - "conditions": [ - { - "condition": "minecraft:block_state_property", - "block": "floralis:purple_flower_crop", - "properties": { - "age": "0" - } - }, - { - "condition": "minecraft:inverted", - "term": { - "condition": "minecraft:any_of", - "terms": [ - { - "condition": "minecraft:match_tool", - "predicate": { - "items": [ - "minecraft:shears" - ] - } - }, - { - "condition": "minecraft:match_tool", - "predicate": { - "enchantments": [ - { - "enchantment": "minecraft:silk_touch", - "levels": { - "min": 1 - } - } - ] - } - } - ] - } - } - ] - } - ] -} \ No newline at end of file diff --git a/src/main/resources/data/floralis/loot_tables/blocks/red_cactus.json b/src/main/resources/data/floralis/loot_tables/blocks/red_cactus.json deleted file mode 100644 index 2c0112e0..00000000 --- a/src/main/resources/data/floralis/loot_tables/blocks/red_cactus.json +++ /dev/null @@ -1,225 +0,0 @@ -{ - "type": "minecraft:block", - "pools": [ - { - "rolls": 1, - "bonus_rolls": 0, - "entries": [ - { - "type": "minecraft:alternatives", - "children": [ - { - "type": "minecraft:item", - "conditions": [ - { - "condition": "minecraft:any_of", - "terms": [ - { - "condition": "minecraft:match_tool", - "predicate": { - "items": [ - "minecraft:shears" - ] - } - }, - { - "condition": "minecraft:match_tool", - "predicate": { - "enchantments": [ - { - "enchantment": "minecraft:silk_touch", - "levels": { - "min": 1 - } - } - ] - } - } - ] - } - ], - "name": "floralis:red_cactus" - } - ] - } - ] - }, - { - "rolls": 1, - "bonus_rolls": 0, - "entries": [ - { - "type": "minecraft:item", - "functions": [ - { - "function": "minecraft:set_count", - "count": 1, - "add": false - }, - { - "function": "minecraft:explosion_decay" - }, - { - "function": "minecraft:apply_bonus", - "enchantment": "minecraft:fortune", - "formula": "minecraft:uniform_bonus_count", - "parameters": { - "bonusMultiplier": 1 - } - } - ], - "name": "floralis:plant_fibers" - } - ], - "conditions": [ - { - "condition": "minecraft:inverted", - "term": { - "condition": "minecraft:any_of", - "terms": [ - { - "condition": "minecraft:match_tool", - "predicate": { - "items": [ - "minecraft:shears" - ] - } - }, - { - "condition": "minecraft:match_tool", - "predicate": { - "enchantments": [ - { - "enchantment": "minecraft:silk_touch", - "levels": { - "min": 1 - } - } - ] - } - } - ] - } - } - ] - }, - { - "rolls": 1, - "bonus_rolls": 0, - "entries": [ - { - "type": "minecraft:item", - "functions": [ - { - "function": "minecraft:set_count", - "count": 1, - "add": false - }, - { - "function": "minecraft:explosion_decay" - }, - { - "function": "minecraft:apply_bonus", - "enchantment": "minecraft:fortune", - "formula": "minecraft:uniform_bonus_count", - "parameters": { - "bonusMultiplier": 1 - } - } - ], - "name": "floralis:red_petals" - } - ], - "conditions": [ - { - "condition": "minecraft:inverted", - "term": { - "condition": "minecraft:any_of", - "terms": [ - { - "condition": "minecraft:match_tool", - "predicate": { - "items": [ - "minecraft:shears" - ] - } - }, - { - "condition": "minecraft:match_tool", - "predicate": { - "enchantments": [ - { - "enchantment": "minecraft:silk_touch", - "levels": { - "min": 1 - } - } - ] - } - } - ] - } - } - ] - }, - { - "rolls": 1, - "bonus_rolls": 0, - "entries": [ - { - "type": "minecraft:item", - "functions": [ - { - "function": "minecraft:set_count", - "count": 2, - "add": false - }, - { - "function": "minecraft:explosion_decay" - }, - { - "function": "minecraft:apply_bonus", - "enchantment": "minecraft:fortune", - "formula": "minecraft:uniform_bonus_count", - "parameters": { - "bonusMultiplier": 1 - } - } - ], - "name": "floralis:red_cactus_seeds" - } - ], - "conditions": [ - { - "condition": "minecraft:inverted", - "term": { - "condition": "minecraft:any_of", - "terms": [ - { - "condition": "minecraft:match_tool", - "predicate": { - "items": [ - "minecraft:shears" - ] - } - }, - { - "condition": "minecraft:match_tool", - "predicate": { - "enchantments": [ - { - "enchantment": "minecraft:silk_touch", - "levels": { - "min": 1 - } - } - ] - } - } - ] - } - } - ] - } - ] -} \ No newline at end of file diff --git a/src/main/resources/data/floralis/loot_tables/blocks/red_cactus_crop.json b/src/main/resources/data/floralis/loot_tables/blocks/red_cactus_crop.json deleted file mode 100644 index f8a6f41e..00000000 --- a/src/main/resources/data/floralis/loot_tables/blocks/red_cactus_crop.json +++ /dev/null @@ -1,550 +0,0 @@ -{ - "type": "minecraft:block", - "pools": [ - { - "rolls": 1, - "bonus_rolls": 0, - "entries": [ - { - "type": "minecraft:alternatives", - "children": [ - { - "type": "minecraft:item", - "conditions": [ - { - "condition": "minecraft:block_state_property", - "block": "floralis:red_cactus_crop", - "properties": { - "age": "5" - } - }, - { - "condition": "minecraft:any_of", - "terms": [ - { - "condition": "minecraft:match_tool", - "predicate": { - "items": [ - "minecraft:shears" - ] - } - }, - { - "condition": "minecraft:match_tool", - "predicate": { - "enchantments": [ - { - "enchantment": "minecraft:silk_touch", - "levels": { - "min": 1 - } - } - ] - } - } - ] - } - ], - "name": "floralis:red_cactus" - }, - { - "type": "minecraft:item", - "conditions": [ - { - "condition": "minecraft:any_of", - "terms": [ - { - "condition": "minecraft:match_tool", - "predicate": { - "items": [ - "minecraft:shears" - ] - } - }, - { - "condition": "minecraft:match_tool", - "predicate": { - "enchantments": [ - { - "enchantment": "minecraft:silk_touch", - "levels": { - "min": 1 - } - } - ] - } - } - ] - } - ], - "name": "floralis:red_cactus_seeds" - } - ] - } - ] - }, - { - "rolls": 1, - "bonus_rolls": 0, - "entries": [ - { - "type": "minecraft:item", - "functions": [ - { - "function": "minecraft:set_count", - "count": 1, - "add": false - }, - { - "function": "minecraft:explosion_decay" - }, - { - "function": "minecraft:apply_bonus", - "enchantment": "minecraft:fortune", - "formula": "minecraft:uniform_bonus_count", - "parameters": { - "bonusMultiplier": 1 - } - } - ], - "name": "floralis:plant_fibers" - } - ], - "conditions": [ - { - "condition": "minecraft:block_state_property", - "block": "floralis:red_cactus_crop", - "properties": { - "age": "5" - } - }, - { - "condition": "minecraft:inverted", - "term": { - "condition": "minecraft:any_of", - "terms": [ - { - "condition": "minecraft:match_tool", - "predicate": { - "items": [ - "minecraft:shears" - ] - } - }, - { - "condition": "minecraft:match_tool", - "predicate": { - "enchantments": [ - { - "enchantment": "minecraft:silk_touch", - "levels": { - "min": 1 - } - } - ] - } - } - ] - } - } - ] - }, - { - "rolls": 1, - "bonus_rolls": 0, - "entries": [ - { - "type": "minecraft:item", - "functions": [ - { - "function": "minecraft:set_count", - "count": 1, - "add": false - }, - { - "function": "minecraft:explosion_decay" - }, - { - "function": "minecraft:apply_bonus", - "enchantment": "minecraft:fortune", - "formula": "minecraft:uniform_bonus_count", - "parameters": { - "bonusMultiplier": 1 - } - } - ], - "name": "floralis:red_petals" - } - ], - "conditions": [ - { - "condition": "minecraft:block_state_property", - "block": "floralis:red_cactus_crop", - "properties": { - "age": "5" - } - }, - { - "condition": "minecraft:inverted", - "term": { - "condition": "minecraft:any_of", - "terms": [ - { - "condition": "minecraft:match_tool", - "predicate": { - "items": [ - "minecraft:shears" - ] - } - }, - { - "condition": "minecraft:match_tool", - "predicate": { - "enchantments": [ - { - "enchantment": "minecraft:silk_touch", - "levels": { - "min": 1 - } - } - ] - } - } - ] - } - } - ] - }, - { - "rolls": 1, - "bonus_rolls": 0, - "entries": [ - { - "type": "minecraft:item", - "functions": [ - { - "function": "minecraft:set_count", - "count": 2, - "add": false - }, - { - "function": "minecraft:explosion_decay" - }, - { - "function": "minecraft:apply_bonus", - "enchantment": "minecraft:fortune", - "formula": "minecraft:uniform_bonus_count", - "parameters": { - "bonusMultiplier": 1 - } - } - ], - "name": "floralis:red_cactus_seeds" - } - ], - "conditions": [ - { - "condition": "minecraft:block_state_property", - "block": "floralis:red_cactus_crop", - "properties": { - "age": "5" - } - }, - { - "condition": "minecraft:inverted", - "term": { - "condition": "minecraft:any_of", - "terms": [ - { - "condition": "minecraft:match_tool", - "predicate": { - "items": [ - "minecraft:shears" - ] - } - }, - { - "condition": "minecraft:match_tool", - "predicate": { - "enchantments": [ - { - "enchantment": "minecraft:silk_touch", - "levels": { - "min": 1 - } - } - ] - } - } - ] - } - } - ] - }, - { - "rolls": 1, - "bonus_rolls": 0, - "entries": [ - { - "type": "minecraft:item", - "functions": [ - { - "function": "minecraft:explosion_decay" - } - ], - "name": "floralis:red_cactus_seeds" - } - ], - "conditions": [ - { - "condition": "minecraft:block_state_property", - "block": "floralis:red_cactus_crop", - "properties": { - "age": "4" - } - }, - { - "condition": "minecraft:inverted", - "term": { - "condition": "minecraft:any_of", - "terms": [ - { - "condition": "minecraft:match_tool", - "predicate": { - "items": [ - "minecraft:shears" - ] - } - }, - { - "condition": "minecraft:match_tool", - "predicate": { - "enchantments": [ - { - "enchantment": "minecraft:silk_touch", - "levels": { - "min": 1 - } - } - ] - } - } - ] - } - } - ] - }, - { - "rolls": 1, - "bonus_rolls": 0, - "entries": [ - { - "type": "minecraft:item", - "functions": [ - { - "function": "minecraft:explosion_decay" - } - ], - "name": "floralis:red_cactus_seeds" - } - ], - "conditions": [ - { - "condition": "minecraft:block_state_property", - "block": "floralis:red_cactus_crop", - "properties": { - "age": "3" - } - }, - { - "condition": "minecraft:inverted", - "term": { - "condition": "minecraft:any_of", - "terms": [ - { - "condition": "minecraft:match_tool", - "predicate": { - "items": [ - "minecraft:shears" - ] - } - }, - { - "condition": "minecraft:match_tool", - "predicate": { - "enchantments": [ - { - "enchantment": "minecraft:silk_touch", - "levels": { - "min": 1 - } - } - ] - } - } - ] - } - } - ] - }, - { - "rolls": 1, - "bonus_rolls": 0, - "entries": [ - { - "type": "minecraft:item", - "functions": [ - { - "function": "minecraft:explosion_decay" - } - ], - "name": "floralis:red_cactus_seeds" - } - ], - "conditions": [ - { - "condition": "minecraft:block_state_property", - "block": "floralis:red_cactus_crop", - "properties": { - "age": "2" - } - }, - { - "condition": "minecraft:inverted", - "term": { - "condition": "minecraft:any_of", - "terms": [ - { - "condition": "minecraft:match_tool", - "predicate": { - "items": [ - "minecraft:shears" - ] - } - }, - { - "condition": "minecraft:match_tool", - "predicate": { - "enchantments": [ - { - "enchantment": "minecraft:silk_touch", - "levels": { - "min": 1 - } - } - ] - } - } - ] - } - } - ] - }, - { - "rolls": 1, - "bonus_rolls": 0, - "entries": [ - { - "type": "minecraft:item", - "functions": [ - { - "function": "minecraft:explosion_decay" - } - ], - "name": "floralis:red_cactus_seeds" - } - ], - "conditions": [ - { - "condition": "minecraft:block_state_property", - "block": "floralis:red_cactus_crop", - "properties": { - "age": "1" - } - }, - { - "condition": "minecraft:inverted", - "term": { - "condition": "minecraft:any_of", - "terms": [ - { - "condition": "minecraft:match_tool", - "predicate": { - "items": [ - "minecraft:shears" - ] - } - }, - { - "condition": "minecraft:match_tool", - "predicate": { - "enchantments": [ - { - "enchantment": "minecraft:silk_touch", - "levels": { - "min": 1 - } - } - ] - } - } - ] - } - } - ] - }, - { - "rolls": 1, - "bonus_rolls": 0, - "entries": [ - { - "type": "minecraft:item", - "functions": [ - { - "function": "minecraft:explosion_decay" - } - ], - "name": "floralis:red_cactus_seeds" - } - ], - "conditions": [ - { - "condition": "minecraft:block_state_property", - "block": "floralis:red_cactus_crop", - "properties": { - "age": "0" - } - }, - { - "condition": "minecraft:inverted", - "term": { - "condition": "minecraft:any_of", - "terms": [ - { - "condition": "minecraft:match_tool", - "predicate": { - "items": [ - "minecraft:shears" - ] - } - }, - { - "condition": "minecraft:match_tool", - "predicate": { - "enchantments": [ - { - "enchantment": "minecraft:silk_touch", - "levels": { - "min": 1 - } - } - ] - } - } - ] - } - } - ] - } - ] -} \ No newline at end of file diff --git a/src/main/resources/data/floralis/loot_tables/blocks/red_flower.json b/src/main/resources/data/floralis/loot_tables/blocks/red_flower.json deleted file mode 100644 index 7b8b23c1..00000000 --- a/src/main/resources/data/floralis/loot_tables/blocks/red_flower.json +++ /dev/null @@ -1,225 +0,0 @@ -{ - "type": "minecraft:block", - "pools": [ - { - "rolls": 1, - "bonus_rolls": 0, - "entries": [ - { - "type": "minecraft:alternatives", - "children": [ - { - "type": "minecraft:item", - "conditions": [ - { - "condition": "minecraft:any_of", - "terms": [ - { - "condition": "minecraft:match_tool", - "predicate": { - "items": [ - "minecraft:shears" - ] - } - }, - { - "condition": "minecraft:match_tool", - "predicate": { - "enchantments": [ - { - "enchantment": "minecraft:silk_touch", - "levels": { - "min": 1 - } - } - ] - } - } - ] - } - ], - "name": "floralis:red_flower" - } - ] - } - ] - }, - { - "rolls": 1, - "bonus_rolls": 0, - "entries": [ - { - "type": "minecraft:item", - "functions": [ - { - "function": "minecraft:set_count", - "count": 1, - "add": false - }, - { - "function": "minecraft:explosion_decay" - }, - { - "function": "minecraft:apply_bonus", - "enchantment": "minecraft:fortune", - "formula": "minecraft:uniform_bonus_count", - "parameters": { - "bonusMultiplier": 1 - } - } - ], - "name": "floralis:plant_fibers" - } - ], - "conditions": [ - { - "condition": "minecraft:inverted", - "term": { - "condition": "minecraft:any_of", - "terms": [ - { - "condition": "minecraft:match_tool", - "predicate": { - "items": [ - "minecraft:shears" - ] - } - }, - { - "condition": "minecraft:match_tool", - "predicate": { - "enchantments": [ - { - "enchantment": "minecraft:silk_touch", - "levels": { - "min": 1 - } - } - ] - } - } - ] - } - } - ] - }, - { - "rolls": 1, - "bonus_rolls": 0, - "entries": [ - { - "type": "minecraft:item", - "functions": [ - { - "function": "minecraft:set_count", - "count": 1, - "add": false - }, - { - "function": "minecraft:explosion_decay" - }, - { - "function": "minecraft:apply_bonus", - "enchantment": "minecraft:fortune", - "formula": "minecraft:uniform_bonus_count", - "parameters": { - "bonusMultiplier": 1 - } - } - ], - "name": "floralis:red_petals" - } - ], - "conditions": [ - { - "condition": "minecraft:inverted", - "term": { - "condition": "minecraft:any_of", - "terms": [ - { - "condition": "minecraft:match_tool", - "predicate": { - "items": [ - "minecraft:shears" - ] - } - }, - { - "condition": "minecraft:match_tool", - "predicate": { - "enchantments": [ - { - "enchantment": "minecraft:silk_touch", - "levels": { - "min": 1 - } - } - ] - } - } - ] - } - } - ] - }, - { - "rolls": 1, - "bonus_rolls": 0, - "entries": [ - { - "type": "minecraft:item", - "functions": [ - { - "function": "minecraft:set_count", - "count": 2, - "add": false - }, - { - "function": "minecraft:explosion_decay" - }, - { - "function": "minecraft:apply_bonus", - "enchantment": "minecraft:fortune", - "formula": "minecraft:uniform_bonus_count", - "parameters": { - "bonusMultiplier": 1 - } - } - ], - "name": "floralis:red_flower_seeds" - } - ], - "conditions": [ - { - "condition": "minecraft:inverted", - "term": { - "condition": "minecraft:any_of", - "terms": [ - { - "condition": "minecraft:match_tool", - "predicate": { - "items": [ - "minecraft:shears" - ] - } - }, - { - "condition": "minecraft:match_tool", - "predicate": { - "enchantments": [ - { - "enchantment": "minecraft:silk_touch", - "levels": { - "min": 1 - } - } - ] - } - } - ] - } - } - ] - } - ] -} \ No newline at end of file diff --git a/src/main/resources/data/floralis/loot_tables/blocks/red_flower_crop.json b/src/main/resources/data/floralis/loot_tables/blocks/red_flower_crop.json deleted file mode 100644 index cf804af2..00000000 --- a/src/main/resources/data/floralis/loot_tables/blocks/red_flower_crop.json +++ /dev/null @@ -1,550 +0,0 @@ -{ - "type": "minecraft:block", - "pools": [ - { - "rolls": 1, - "bonus_rolls": 0, - "entries": [ - { - "type": "minecraft:alternatives", - "children": [ - { - "type": "minecraft:item", - "conditions": [ - { - "condition": "minecraft:block_state_property", - "block": "floralis:red_flower_crop", - "properties": { - "age": "5" - } - }, - { - "condition": "minecraft:any_of", - "terms": [ - { - "condition": "minecraft:match_tool", - "predicate": { - "items": [ - "minecraft:shears" - ] - } - }, - { - "condition": "minecraft:match_tool", - "predicate": { - "enchantments": [ - { - "enchantment": "minecraft:silk_touch", - "levels": { - "min": 1 - } - } - ] - } - } - ] - } - ], - "name": "floralis:red_flower" - }, - { - "type": "minecraft:item", - "conditions": [ - { - "condition": "minecraft:any_of", - "terms": [ - { - "condition": "minecraft:match_tool", - "predicate": { - "items": [ - "minecraft:shears" - ] - } - }, - { - "condition": "minecraft:match_tool", - "predicate": { - "enchantments": [ - { - "enchantment": "minecraft:silk_touch", - "levels": { - "min": 1 - } - } - ] - } - } - ] - } - ], - "name": "floralis:red_flower_seeds" - } - ] - } - ] - }, - { - "rolls": 1, - "bonus_rolls": 0, - "entries": [ - { - "type": "minecraft:item", - "functions": [ - { - "function": "minecraft:set_count", - "count": 1, - "add": false - }, - { - "function": "minecraft:explosion_decay" - }, - { - "function": "minecraft:apply_bonus", - "enchantment": "minecraft:fortune", - "formula": "minecraft:uniform_bonus_count", - "parameters": { - "bonusMultiplier": 1 - } - } - ], - "name": "floralis:plant_fibers" - } - ], - "conditions": [ - { - "condition": "minecraft:block_state_property", - "block": "floralis:red_flower_crop", - "properties": { - "age": "5" - } - }, - { - "condition": "minecraft:inverted", - "term": { - "condition": "minecraft:any_of", - "terms": [ - { - "condition": "minecraft:match_tool", - "predicate": { - "items": [ - "minecraft:shears" - ] - } - }, - { - "condition": "minecraft:match_tool", - "predicate": { - "enchantments": [ - { - "enchantment": "minecraft:silk_touch", - "levels": { - "min": 1 - } - } - ] - } - } - ] - } - } - ] - }, - { - "rolls": 1, - "bonus_rolls": 0, - "entries": [ - { - "type": "minecraft:item", - "functions": [ - { - "function": "minecraft:set_count", - "count": 1, - "add": false - }, - { - "function": "minecraft:explosion_decay" - }, - { - "function": "minecraft:apply_bonus", - "enchantment": "minecraft:fortune", - "formula": "minecraft:uniform_bonus_count", - "parameters": { - "bonusMultiplier": 1 - } - } - ], - "name": "floralis:red_petals" - } - ], - "conditions": [ - { - "condition": "minecraft:block_state_property", - "block": "floralis:red_flower_crop", - "properties": { - "age": "5" - } - }, - { - "condition": "minecraft:inverted", - "term": { - "condition": "minecraft:any_of", - "terms": [ - { - "condition": "minecraft:match_tool", - "predicate": { - "items": [ - "minecraft:shears" - ] - } - }, - { - "condition": "minecraft:match_tool", - "predicate": { - "enchantments": [ - { - "enchantment": "minecraft:silk_touch", - "levels": { - "min": 1 - } - } - ] - } - } - ] - } - } - ] - }, - { - "rolls": 1, - "bonus_rolls": 0, - "entries": [ - { - "type": "minecraft:item", - "functions": [ - { - "function": "minecraft:set_count", - "count": 2, - "add": false - }, - { - "function": "minecraft:explosion_decay" - }, - { - "function": "minecraft:apply_bonus", - "enchantment": "minecraft:fortune", - "formula": "minecraft:uniform_bonus_count", - "parameters": { - "bonusMultiplier": 1 - } - } - ], - "name": "floralis:red_flower_seeds" - } - ], - "conditions": [ - { - "condition": "minecraft:block_state_property", - "block": "floralis:red_flower_crop", - "properties": { - "age": "5" - } - }, - { - "condition": "minecraft:inverted", - "term": { - "condition": "minecraft:any_of", - "terms": [ - { - "condition": "minecraft:match_tool", - "predicate": { - "items": [ - "minecraft:shears" - ] - } - }, - { - "condition": "minecraft:match_tool", - "predicate": { - "enchantments": [ - { - "enchantment": "minecraft:silk_touch", - "levels": { - "min": 1 - } - } - ] - } - } - ] - } - } - ] - }, - { - "rolls": 1, - "bonus_rolls": 0, - "entries": [ - { - "type": "minecraft:item", - "functions": [ - { - "function": "minecraft:explosion_decay" - } - ], - "name": "floralis:red_flower_seeds" - } - ], - "conditions": [ - { - "condition": "minecraft:block_state_property", - "block": "floralis:red_flower_crop", - "properties": { - "age": "4" - } - }, - { - "condition": "minecraft:inverted", - "term": { - "condition": "minecraft:any_of", - "terms": [ - { - "condition": "minecraft:match_tool", - "predicate": { - "items": [ - "minecraft:shears" - ] - } - }, - { - "condition": "minecraft:match_tool", - "predicate": { - "enchantments": [ - { - "enchantment": "minecraft:silk_touch", - "levels": { - "min": 1 - } - } - ] - } - } - ] - } - } - ] - }, - { - "rolls": 1, - "bonus_rolls": 0, - "entries": [ - { - "type": "minecraft:item", - "functions": [ - { - "function": "minecraft:explosion_decay" - } - ], - "name": "floralis:red_flower_seeds" - } - ], - "conditions": [ - { - "condition": "minecraft:block_state_property", - "block": "floralis:red_flower_crop", - "properties": { - "age": "3" - } - }, - { - "condition": "minecraft:inverted", - "term": { - "condition": "minecraft:any_of", - "terms": [ - { - "condition": "minecraft:match_tool", - "predicate": { - "items": [ - "minecraft:shears" - ] - } - }, - { - "condition": "minecraft:match_tool", - "predicate": { - "enchantments": [ - { - "enchantment": "minecraft:silk_touch", - "levels": { - "min": 1 - } - } - ] - } - } - ] - } - } - ] - }, - { - "rolls": 1, - "bonus_rolls": 0, - "entries": [ - { - "type": "minecraft:item", - "functions": [ - { - "function": "minecraft:explosion_decay" - } - ], - "name": "floralis:red_flower_seeds" - } - ], - "conditions": [ - { - "condition": "minecraft:block_state_property", - "block": "floralis:red_flower_crop", - "properties": { - "age": "2" - } - }, - { - "condition": "minecraft:inverted", - "term": { - "condition": "minecraft:any_of", - "terms": [ - { - "condition": "minecraft:match_tool", - "predicate": { - "items": [ - "minecraft:shears" - ] - } - }, - { - "condition": "minecraft:match_tool", - "predicate": { - "enchantments": [ - { - "enchantment": "minecraft:silk_touch", - "levels": { - "min": 1 - } - } - ] - } - } - ] - } - } - ] - }, - { - "rolls": 1, - "bonus_rolls": 0, - "entries": [ - { - "type": "minecraft:item", - "functions": [ - { - "function": "minecraft:explosion_decay" - } - ], - "name": "floralis:red_flower_seeds" - } - ], - "conditions": [ - { - "condition": "minecraft:block_state_property", - "block": "floralis:red_flower_crop", - "properties": { - "age": "1" - } - }, - { - "condition": "minecraft:inverted", - "term": { - "condition": "minecraft:any_of", - "terms": [ - { - "condition": "minecraft:match_tool", - "predicate": { - "items": [ - "minecraft:shears" - ] - } - }, - { - "condition": "minecraft:match_tool", - "predicate": { - "enchantments": [ - { - "enchantment": "minecraft:silk_touch", - "levels": { - "min": 1 - } - } - ] - } - } - ] - } - } - ] - }, - { - "rolls": 1, - "bonus_rolls": 0, - "entries": [ - { - "type": "minecraft:item", - "functions": [ - { - "function": "minecraft:explosion_decay" - } - ], - "name": "floralis:red_flower_seeds" - } - ], - "conditions": [ - { - "condition": "minecraft:block_state_property", - "block": "floralis:red_flower_crop", - "properties": { - "age": "0" - } - }, - { - "condition": "minecraft:inverted", - "term": { - "condition": "minecraft:any_of", - "terms": [ - { - "condition": "minecraft:match_tool", - "predicate": { - "items": [ - "minecraft:shears" - ] - } - }, - { - "condition": "minecraft:match_tool", - "predicate": { - "enchantments": [ - { - "enchantment": "minecraft:silk_touch", - "levels": { - "min": 1 - } - } - ] - } - } - ] - } - } - ] - } - ] -} \ No newline at end of file diff --git a/src/main/resources/data/floralis/loot_tables/blocks/white_cactus.json b/src/main/resources/data/floralis/loot_tables/blocks/white_cactus.json deleted file mode 100644 index b4049ecc..00000000 --- a/src/main/resources/data/floralis/loot_tables/blocks/white_cactus.json +++ /dev/null @@ -1,225 +0,0 @@ -{ - "type": "minecraft:block", - "pools": [ - { - "rolls": 1, - "bonus_rolls": 0, - "entries": [ - { - "type": "minecraft:alternatives", - "children": [ - { - "type": "minecraft:item", - "conditions": [ - { - "condition": "minecraft:any_of", - "terms": [ - { - "condition": "minecraft:match_tool", - "predicate": { - "items": [ - "minecraft:shears" - ] - } - }, - { - "condition": "minecraft:match_tool", - "predicate": { - "enchantments": [ - { - "enchantment": "minecraft:silk_touch", - "levels": { - "min": 1 - } - } - ] - } - } - ] - } - ], - "name": "floralis:white_cactus" - } - ] - } - ] - }, - { - "rolls": 1, - "bonus_rolls": 0, - "entries": [ - { - "type": "minecraft:item", - "functions": [ - { - "function": "minecraft:set_count", - "count": 1, - "add": false - }, - { - "function": "minecraft:explosion_decay" - }, - { - "function": "minecraft:apply_bonus", - "enchantment": "minecraft:fortune", - "formula": "minecraft:uniform_bonus_count", - "parameters": { - "bonusMultiplier": 1 - } - } - ], - "name": "floralis:plant_fibers" - } - ], - "conditions": [ - { - "condition": "minecraft:inverted", - "term": { - "condition": "minecraft:any_of", - "terms": [ - { - "condition": "minecraft:match_tool", - "predicate": { - "items": [ - "minecraft:shears" - ] - } - }, - { - "condition": "minecraft:match_tool", - "predicate": { - "enchantments": [ - { - "enchantment": "minecraft:silk_touch", - "levels": { - "min": 1 - } - } - ] - } - } - ] - } - } - ] - }, - { - "rolls": 1, - "bonus_rolls": 0, - "entries": [ - { - "type": "minecraft:item", - "functions": [ - { - "function": "minecraft:set_count", - "count": 1, - "add": false - }, - { - "function": "minecraft:explosion_decay" - }, - { - "function": "minecraft:apply_bonus", - "enchantment": "minecraft:fortune", - "formula": "minecraft:uniform_bonus_count", - "parameters": { - "bonusMultiplier": 1 - } - } - ], - "name": "floralis:white_petals" - } - ], - "conditions": [ - { - "condition": "minecraft:inverted", - "term": { - "condition": "minecraft:any_of", - "terms": [ - { - "condition": "minecraft:match_tool", - "predicate": { - "items": [ - "minecraft:shears" - ] - } - }, - { - "condition": "minecraft:match_tool", - "predicate": { - "enchantments": [ - { - "enchantment": "minecraft:silk_touch", - "levels": { - "min": 1 - } - } - ] - } - } - ] - } - } - ] - }, - { - "rolls": 1, - "bonus_rolls": 0, - "entries": [ - { - "type": "minecraft:item", - "functions": [ - { - "function": "minecraft:set_count", - "count": 2, - "add": false - }, - { - "function": "minecraft:explosion_decay" - }, - { - "function": "minecraft:apply_bonus", - "enchantment": "minecraft:fortune", - "formula": "minecraft:uniform_bonus_count", - "parameters": { - "bonusMultiplier": 1 - } - } - ], - "name": "floralis:white_cactus_seeds" - } - ], - "conditions": [ - { - "condition": "minecraft:inverted", - "term": { - "condition": "minecraft:any_of", - "terms": [ - { - "condition": "minecraft:match_tool", - "predicate": { - "items": [ - "minecraft:shears" - ] - } - }, - { - "condition": "minecraft:match_tool", - "predicate": { - "enchantments": [ - { - "enchantment": "minecraft:silk_touch", - "levels": { - "min": 1 - } - } - ] - } - } - ] - } - } - ] - } - ] -} \ No newline at end of file diff --git a/src/main/resources/data/floralis/loot_tables/blocks/white_cactus_crop.json b/src/main/resources/data/floralis/loot_tables/blocks/white_cactus_crop.json deleted file mode 100644 index 62810da0..00000000 --- a/src/main/resources/data/floralis/loot_tables/blocks/white_cactus_crop.json +++ /dev/null @@ -1,550 +0,0 @@ -{ - "type": "minecraft:block", - "pools": [ - { - "rolls": 1, - "bonus_rolls": 0, - "entries": [ - { - "type": "minecraft:alternatives", - "children": [ - { - "type": "minecraft:item", - "conditions": [ - { - "condition": "minecraft:block_state_property", - "block": "floralis:white_cactus_crop", - "properties": { - "age": "5" - } - }, - { - "condition": "minecraft:any_of", - "terms": [ - { - "condition": "minecraft:match_tool", - "predicate": { - "items": [ - "minecraft:shears" - ] - } - }, - { - "condition": "minecraft:match_tool", - "predicate": { - "enchantments": [ - { - "enchantment": "minecraft:silk_touch", - "levels": { - "min": 1 - } - } - ] - } - } - ] - } - ], - "name": "floralis:white_cactus" - }, - { - "type": "minecraft:item", - "conditions": [ - { - "condition": "minecraft:any_of", - "terms": [ - { - "condition": "minecraft:match_tool", - "predicate": { - "items": [ - "minecraft:shears" - ] - } - }, - { - "condition": "minecraft:match_tool", - "predicate": { - "enchantments": [ - { - "enchantment": "minecraft:silk_touch", - "levels": { - "min": 1 - } - } - ] - } - } - ] - } - ], - "name": "floralis:white_cactus_seeds" - } - ] - } - ] - }, - { - "rolls": 1, - "bonus_rolls": 0, - "entries": [ - { - "type": "minecraft:item", - "functions": [ - { - "function": "minecraft:set_count", - "count": 1, - "add": false - }, - { - "function": "minecraft:explosion_decay" - }, - { - "function": "minecraft:apply_bonus", - "enchantment": "minecraft:fortune", - "formula": "minecraft:uniform_bonus_count", - "parameters": { - "bonusMultiplier": 1 - } - } - ], - "name": "floralis:plant_fibers" - } - ], - "conditions": [ - { - "condition": "minecraft:block_state_property", - "block": "floralis:white_cactus_crop", - "properties": { - "age": "5" - } - }, - { - "condition": "minecraft:inverted", - "term": { - "condition": "minecraft:any_of", - "terms": [ - { - "condition": "minecraft:match_tool", - "predicate": { - "items": [ - "minecraft:shears" - ] - } - }, - { - "condition": "minecraft:match_tool", - "predicate": { - "enchantments": [ - { - "enchantment": "minecraft:silk_touch", - "levels": { - "min": 1 - } - } - ] - } - } - ] - } - } - ] - }, - { - "rolls": 1, - "bonus_rolls": 0, - "entries": [ - { - "type": "minecraft:item", - "functions": [ - { - "function": "minecraft:set_count", - "count": 1, - "add": false - }, - { - "function": "minecraft:explosion_decay" - }, - { - "function": "minecraft:apply_bonus", - "enchantment": "minecraft:fortune", - "formula": "minecraft:uniform_bonus_count", - "parameters": { - "bonusMultiplier": 1 - } - } - ], - "name": "floralis:white_petals" - } - ], - "conditions": [ - { - "condition": "minecraft:block_state_property", - "block": "floralis:white_cactus_crop", - "properties": { - "age": "5" - } - }, - { - "condition": "minecraft:inverted", - "term": { - "condition": "minecraft:any_of", - "terms": [ - { - "condition": "minecraft:match_tool", - "predicate": { - "items": [ - "minecraft:shears" - ] - } - }, - { - "condition": "minecraft:match_tool", - "predicate": { - "enchantments": [ - { - "enchantment": "minecraft:silk_touch", - "levels": { - "min": 1 - } - } - ] - } - } - ] - } - } - ] - }, - { - "rolls": 1, - "bonus_rolls": 0, - "entries": [ - { - "type": "minecraft:item", - "functions": [ - { - "function": "minecraft:set_count", - "count": 2, - "add": false - }, - { - "function": "minecraft:explosion_decay" - }, - { - "function": "minecraft:apply_bonus", - "enchantment": "minecraft:fortune", - "formula": "minecraft:uniform_bonus_count", - "parameters": { - "bonusMultiplier": 1 - } - } - ], - "name": "floralis:white_cactus_seeds" - } - ], - "conditions": [ - { - "condition": "minecraft:block_state_property", - "block": "floralis:white_cactus_crop", - "properties": { - "age": "5" - } - }, - { - "condition": "minecraft:inverted", - "term": { - "condition": "minecraft:any_of", - "terms": [ - { - "condition": "minecraft:match_tool", - "predicate": { - "items": [ - "minecraft:shears" - ] - } - }, - { - "condition": "minecraft:match_tool", - "predicate": { - "enchantments": [ - { - "enchantment": "minecraft:silk_touch", - "levels": { - "min": 1 - } - } - ] - } - } - ] - } - } - ] - }, - { - "rolls": 1, - "bonus_rolls": 0, - "entries": [ - { - "type": "minecraft:item", - "functions": [ - { - "function": "minecraft:explosion_decay" - } - ], - "name": "floralis:white_cactus_seeds" - } - ], - "conditions": [ - { - "condition": "minecraft:block_state_property", - "block": "floralis:white_cactus_crop", - "properties": { - "age": "4" - } - }, - { - "condition": "minecraft:inverted", - "term": { - "condition": "minecraft:any_of", - "terms": [ - { - "condition": "minecraft:match_tool", - "predicate": { - "items": [ - "minecraft:shears" - ] - } - }, - { - "condition": "minecraft:match_tool", - "predicate": { - "enchantments": [ - { - "enchantment": "minecraft:silk_touch", - "levels": { - "min": 1 - } - } - ] - } - } - ] - } - } - ] - }, - { - "rolls": 1, - "bonus_rolls": 0, - "entries": [ - { - "type": "minecraft:item", - "functions": [ - { - "function": "minecraft:explosion_decay" - } - ], - "name": "floralis:white_cactus_seeds" - } - ], - "conditions": [ - { - "condition": "minecraft:block_state_property", - "block": "floralis:white_cactus_crop", - "properties": { - "age": "3" - } - }, - { - "condition": "minecraft:inverted", - "term": { - "condition": "minecraft:any_of", - "terms": [ - { - "condition": "minecraft:match_tool", - "predicate": { - "items": [ - "minecraft:shears" - ] - } - }, - { - "condition": "minecraft:match_tool", - "predicate": { - "enchantments": [ - { - "enchantment": "minecraft:silk_touch", - "levels": { - "min": 1 - } - } - ] - } - } - ] - } - } - ] - }, - { - "rolls": 1, - "bonus_rolls": 0, - "entries": [ - { - "type": "minecraft:item", - "functions": [ - { - "function": "minecraft:explosion_decay" - } - ], - "name": "floralis:white_cactus_seeds" - } - ], - "conditions": [ - { - "condition": "minecraft:block_state_property", - "block": "floralis:white_cactus_crop", - "properties": { - "age": "2" - } - }, - { - "condition": "minecraft:inverted", - "term": { - "condition": "minecraft:any_of", - "terms": [ - { - "condition": "minecraft:match_tool", - "predicate": { - "items": [ - "minecraft:shears" - ] - } - }, - { - "condition": "minecraft:match_tool", - "predicate": { - "enchantments": [ - { - "enchantment": "minecraft:silk_touch", - "levels": { - "min": 1 - } - } - ] - } - } - ] - } - } - ] - }, - { - "rolls": 1, - "bonus_rolls": 0, - "entries": [ - { - "type": "minecraft:item", - "functions": [ - { - "function": "minecraft:explosion_decay" - } - ], - "name": "floralis:white_cactus_seeds" - } - ], - "conditions": [ - { - "condition": "minecraft:block_state_property", - "block": "floralis:white_cactus_crop", - "properties": { - "age": "1" - } - }, - { - "condition": "minecraft:inverted", - "term": { - "condition": "minecraft:any_of", - "terms": [ - { - "condition": "minecraft:match_tool", - "predicate": { - "items": [ - "minecraft:shears" - ] - } - }, - { - "condition": "minecraft:match_tool", - "predicate": { - "enchantments": [ - { - "enchantment": "minecraft:silk_touch", - "levels": { - "min": 1 - } - } - ] - } - } - ] - } - } - ] - }, - { - "rolls": 1, - "bonus_rolls": 0, - "entries": [ - { - "type": "minecraft:item", - "functions": [ - { - "function": "minecraft:explosion_decay" - } - ], - "name": "floralis:white_cactus_seeds" - } - ], - "conditions": [ - { - "condition": "minecraft:block_state_property", - "block": "floralis:white_cactus_crop", - "properties": { - "age": "0" - } - }, - { - "condition": "minecraft:inverted", - "term": { - "condition": "minecraft:any_of", - "terms": [ - { - "condition": "minecraft:match_tool", - "predicate": { - "items": [ - "minecraft:shears" - ] - } - }, - { - "condition": "minecraft:match_tool", - "predicate": { - "enchantments": [ - { - "enchantment": "minecraft:silk_touch", - "levels": { - "min": 1 - } - } - ] - } - } - ] - } - } - ] - } - ] -} \ No newline at end of file diff --git a/src/main/resources/data/floralis/loot_tables/blocks/white_flower.json b/src/main/resources/data/floralis/loot_tables/blocks/white_flower.json deleted file mode 100644 index 6edaabfe..00000000 --- a/src/main/resources/data/floralis/loot_tables/blocks/white_flower.json +++ /dev/null @@ -1,225 +0,0 @@ -{ - "type": "minecraft:block", - "pools": [ - { - "rolls": 1, - "bonus_rolls": 0, - "entries": [ - { - "type": "minecraft:alternatives", - "children": [ - { - "type": "minecraft:item", - "conditions": [ - { - "condition": "minecraft:any_of", - "terms": [ - { - "condition": "minecraft:match_tool", - "predicate": { - "items": [ - "minecraft:shears" - ] - } - }, - { - "condition": "minecraft:match_tool", - "predicate": { - "enchantments": [ - { - "enchantment": "minecraft:silk_touch", - "levels": { - "min": 1 - } - } - ] - } - } - ] - } - ], - "name": "floralis:white_flower" - } - ] - } - ] - }, - { - "rolls": 1, - "bonus_rolls": 0, - "entries": [ - { - "type": "minecraft:item", - "functions": [ - { - "function": "minecraft:set_count", - "count": 1, - "add": false - }, - { - "function": "minecraft:explosion_decay" - }, - { - "function": "minecraft:apply_bonus", - "enchantment": "minecraft:fortune", - "formula": "minecraft:uniform_bonus_count", - "parameters": { - "bonusMultiplier": 1 - } - } - ], - "name": "floralis:plant_fibers" - } - ], - "conditions": [ - { - "condition": "minecraft:inverted", - "term": { - "condition": "minecraft:any_of", - "terms": [ - { - "condition": "minecraft:match_tool", - "predicate": { - "items": [ - "minecraft:shears" - ] - } - }, - { - "condition": "minecraft:match_tool", - "predicate": { - "enchantments": [ - { - "enchantment": "minecraft:silk_touch", - "levels": { - "min": 1 - } - } - ] - } - } - ] - } - } - ] - }, - { - "rolls": 1, - "bonus_rolls": 0, - "entries": [ - { - "type": "minecraft:item", - "functions": [ - { - "function": "minecraft:set_count", - "count": 1, - "add": false - }, - { - "function": "minecraft:explosion_decay" - }, - { - "function": "minecraft:apply_bonus", - "enchantment": "minecraft:fortune", - "formula": "minecraft:uniform_bonus_count", - "parameters": { - "bonusMultiplier": 1 - } - } - ], - "name": "floralis:white_petals" - } - ], - "conditions": [ - { - "condition": "minecraft:inverted", - "term": { - "condition": "minecraft:any_of", - "terms": [ - { - "condition": "minecraft:match_tool", - "predicate": { - "items": [ - "minecraft:shears" - ] - } - }, - { - "condition": "minecraft:match_tool", - "predicate": { - "enchantments": [ - { - "enchantment": "minecraft:silk_touch", - "levels": { - "min": 1 - } - } - ] - } - } - ] - } - } - ] - }, - { - "rolls": 1, - "bonus_rolls": 0, - "entries": [ - { - "type": "minecraft:item", - "functions": [ - { - "function": "minecraft:set_count", - "count": 2, - "add": false - }, - { - "function": "minecraft:explosion_decay" - }, - { - "function": "minecraft:apply_bonus", - "enchantment": "minecraft:fortune", - "formula": "minecraft:uniform_bonus_count", - "parameters": { - "bonusMultiplier": 1 - } - } - ], - "name": "floralis:white_flower_seeds" - } - ], - "conditions": [ - { - "condition": "minecraft:inverted", - "term": { - "condition": "minecraft:any_of", - "terms": [ - { - "condition": "minecraft:match_tool", - "predicate": { - "items": [ - "minecraft:shears" - ] - } - }, - { - "condition": "minecraft:match_tool", - "predicate": { - "enchantments": [ - { - "enchantment": "minecraft:silk_touch", - "levels": { - "min": 1 - } - } - ] - } - } - ] - } - } - ] - } - ] -} \ No newline at end of file diff --git a/src/main/resources/data/floralis/loot_tables/blocks/white_flower_crop.json b/src/main/resources/data/floralis/loot_tables/blocks/white_flower_crop.json deleted file mode 100644 index 2b668b88..00000000 --- a/src/main/resources/data/floralis/loot_tables/blocks/white_flower_crop.json +++ /dev/null @@ -1,550 +0,0 @@ -{ - "type": "minecraft:block", - "pools": [ - { - "rolls": 1, - "bonus_rolls": 0, - "entries": [ - { - "type": "minecraft:alternatives", - "children": [ - { - "type": "minecraft:item", - "conditions": [ - { - "condition": "minecraft:block_state_property", - "block": "floralis:white_flower_crop", - "properties": { - "age": "5" - } - }, - { - "condition": "minecraft:any_of", - "terms": [ - { - "condition": "minecraft:match_tool", - "predicate": { - "items": [ - "minecraft:shears" - ] - } - }, - { - "condition": "minecraft:match_tool", - "predicate": { - "enchantments": [ - { - "enchantment": "minecraft:silk_touch", - "levels": { - "min": 1 - } - } - ] - } - } - ] - } - ], - "name": "floralis:white_flower" - }, - { - "type": "minecraft:item", - "conditions": [ - { - "condition": "minecraft:any_of", - "terms": [ - { - "condition": "minecraft:match_tool", - "predicate": { - "items": [ - "minecraft:shears" - ] - } - }, - { - "condition": "minecraft:match_tool", - "predicate": { - "enchantments": [ - { - "enchantment": "minecraft:silk_touch", - "levels": { - "min": 1 - } - } - ] - } - } - ] - } - ], - "name": "floralis:white_flower_seeds" - } - ] - } - ] - }, - { - "rolls": 1, - "bonus_rolls": 0, - "entries": [ - { - "type": "minecraft:item", - "functions": [ - { - "function": "minecraft:set_count", - "count": 1, - "add": false - }, - { - "function": "minecraft:explosion_decay" - }, - { - "function": "minecraft:apply_bonus", - "enchantment": "minecraft:fortune", - "formula": "minecraft:uniform_bonus_count", - "parameters": { - "bonusMultiplier": 1 - } - } - ], - "name": "floralis:plant_fibers" - } - ], - "conditions": [ - { - "condition": "minecraft:block_state_property", - "block": "floralis:white_flower_crop", - "properties": { - "age": "5" - } - }, - { - "condition": "minecraft:inverted", - "term": { - "condition": "minecraft:any_of", - "terms": [ - { - "condition": "minecraft:match_tool", - "predicate": { - "items": [ - "minecraft:shears" - ] - } - }, - { - "condition": "minecraft:match_tool", - "predicate": { - "enchantments": [ - { - "enchantment": "minecraft:silk_touch", - "levels": { - "min": 1 - } - } - ] - } - } - ] - } - } - ] - }, - { - "rolls": 1, - "bonus_rolls": 0, - "entries": [ - { - "type": "minecraft:item", - "functions": [ - { - "function": "minecraft:set_count", - "count": 1, - "add": false - }, - { - "function": "minecraft:explosion_decay" - }, - { - "function": "minecraft:apply_bonus", - "enchantment": "minecraft:fortune", - "formula": "minecraft:uniform_bonus_count", - "parameters": { - "bonusMultiplier": 1 - } - } - ], - "name": "floralis:white_petals" - } - ], - "conditions": [ - { - "condition": "minecraft:block_state_property", - "block": "floralis:white_flower_crop", - "properties": { - "age": "5" - } - }, - { - "condition": "minecraft:inverted", - "term": { - "condition": "minecraft:any_of", - "terms": [ - { - "condition": "minecraft:match_tool", - "predicate": { - "items": [ - "minecraft:shears" - ] - } - }, - { - "condition": "minecraft:match_tool", - "predicate": { - "enchantments": [ - { - "enchantment": "minecraft:silk_touch", - "levels": { - "min": 1 - } - } - ] - } - } - ] - } - } - ] - }, - { - "rolls": 1, - "bonus_rolls": 0, - "entries": [ - { - "type": "minecraft:item", - "functions": [ - { - "function": "minecraft:set_count", - "count": 2, - "add": false - }, - { - "function": "minecraft:explosion_decay" - }, - { - "function": "minecraft:apply_bonus", - "enchantment": "minecraft:fortune", - "formula": "minecraft:uniform_bonus_count", - "parameters": { - "bonusMultiplier": 1 - } - } - ], - "name": "floralis:white_flower_seeds" - } - ], - "conditions": [ - { - "condition": "minecraft:block_state_property", - "block": "floralis:white_flower_crop", - "properties": { - "age": "5" - } - }, - { - "condition": "minecraft:inverted", - "term": { - "condition": "minecraft:any_of", - "terms": [ - { - "condition": "minecraft:match_tool", - "predicate": { - "items": [ - "minecraft:shears" - ] - } - }, - { - "condition": "minecraft:match_tool", - "predicate": { - "enchantments": [ - { - "enchantment": "minecraft:silk_touch", - "levels": { - "min": 1 - } - } - ] - } - } - ] - } - } - ] - }, - { - "rolls": 1, - "bonus_rolls": 0, - "entries": [ - { - "type": "minecraft:item", - "functions": [ - { - "function": "minecraft:explosion_decay" - } - ], - "name": "floralis:white_flower_seeds" - } - ], - "conditions": [ - { - "condition": "minecraft:block_state_property", - "block": "floralis:white_flower_crop", - "properties": { - "age": "4" - } - }, - { - "condition": "minecraft:inverted", - "term": { - "condition": "minecraft:any_of", - "terms": [ - { - "condition": "minecraft:match_tool", - "predicate": { - "items": [ - "minecraft:shears" - ] - } - }, - { - "condition": "minecraft:match_tool", - "predicate": { - "enchantments": [ - { - "enchantment": "minecraft:silk_touch", - "levels": { - "min": 1 - } - } - ] - } - } - ] - } - } - ] - }, - { - "rolls": 1, - "bonus_rolls": 0, - "entries": [ - { - "type": "minecraft:item", - "functions": [ - { - "function": "minecraft:explosion_decay" - } - ], - "name": "floralis:white_flower_seeds" - } - ], - "conditions": [ - { - "condition": "minecraft:block_state_property", - "block": "floralis:white_flower_crop", - "properties": { - "age": "3" - } - }, - { - "condition": "minecraft:inverted", - "term": { - "condition": "minecraft:any_of", - "terms": [ - { - "condition": "minecraft:match_tool", - "predicate": { - "items": [ - "minecraft:shears" - ] - } - }, - { - "condition": "minecraft:match_tool", - "predicate": { - "enchantments": [ - { - "enchantment": "minecraft:silk_touch", - "levels": { - "min": 1 - } - } - ] - } - } - ] - } - } - ] - }, - { - "rolls": 1, - "bonus_rolls": 0, - "entries": [ - { - "type": "minecraft:item", - "functions": [ - { - "function": "minecraft:explosion_decay" - } - ], - "name": "floralis:white_flower_seeds" - } - ], - "conditions": [ - { - "condition": "minecraft:block_state_property", - "block": "floralis:white_flower_crop", - "properties": { - "age": "2" - } - }, - { - "condition": "minecraft:inverted", - "term": { - "condition": "minecraft:any_of", - "terms": [ - { - "condition": "minecraft:match_tool", - "predicate": { - "items": [ - "minecraft:shears" - ] - } - }, - { - "condition": "minecraft:match_tool", - "predicate": { - "enchantments": [ - { - "enchantment": "minecraft:silk_touch", - "levels": { - "min": 1 - } - } - ] - } - } - ] - } - } - ] - }, - { - "rolls": 1, - "bonus_rolls": 0, - "entries": [ - { - "type": "minecraft:item", - "functions": [ - { - "function": "minecraft:explosion_decay" - } - ], - "name": "floralis:white_flower_seeds" - } - ], - "conditions": [ - { - "condition": "minecraft:block_state_property", - "block": "floralis:white_flower_crop", - "properties": { - "age": "1" - } - }, - { - "condition": "minecraft:inverted", - "term": { - "condition": "minecraft:any_of", - "terms": [ - { - "condition": "minecraft:match_tool", - "predicate": { - "items": [ - "minecraft:shears" - ] - } - }, - { - "condition": "minecraft:match_tool", - "predicate": { - "enchantments": [ - { - "enchantment": "minecraft:silk_touch", - "levels": { - "min": 1 - } - } - ] - } - } - ] - } - } - ] - }, - { - "rolls": 1, - "bonus_rolls": 0, - "entries": [ - { - "type": "minecraft:item", - "functions": [ - { - "function": "minecraft:explosion_decay" - } - ], - "name": "floralis:white_flower_seeds" - } - ], - "conditions": [ - { - "condition": "minecraft:block_state_property", - "block": "floralis:white_flower_crop", - "properties": { - "age": "0" - } - }, - { - "condition": "minecraft:inverted", - "term": { - "condition": "minecraft:any_of", - "terms": [ - { - "condition": "minecraft:match_tool", - "predicate": { - "items": [ - "minecraft:shears" - ] - } - }, - { - "condition": "minecraft:match_tool", - "predicate": { - "enchantments": [ - { - "enchantment": "minecraft:silk_touch", - "levels": { - "min": 1 - } - } - ] - } - } - ] - } - } - ] - } - ] -} \ No newline at end of file diff --git a/src/main/resources/data/floralis/loot_tables/blocks/yellow_cactus.json b/src/main/resources/data/floralis/loot_tables/blocks/yellow_cactus.json deleted file mode 100644 index 221340da..00000000 --- a/src/main/resources/data/floralis/loot_tables/blocks/yellow_cactus.json +++ /dev/null @@ -1,225 +0,0 @@ -{ - "type": "minecraft:block", - "pools": [ - { - "rolls": 1, - "bonus_rolls": 0, - "entries": [ - { - "type": "minecraft:alternatives", - "children": [ - { - "type": "minecraft:item", - "conditions": [ - { - "condition": "minecraft:any_of", - "terms": [ - { - "condition": "minecraft:match_tool", - "predicate": { - "items": [ - "minecraft:shears" - ] - } - }, - { - "condition": "minecraft:match_tool", - "predicate": { - "enchantments": [ - { - "enchantment": "minecraft:silk_touch", - "levels": { - "min": 1 - } - } - ] - } - } - ] - } - ], - "name": "floralis:yellow_cactus" - } - ] - } - ] - }, - { - "rolls": 1, - "bonus_rolls": 0, - "entries": [ - { - "type": "minecraft:item", - "functions": [ - { - "function": "minecraft:set_count", - "count": 1, - "add": false - }, - { - "function": "minecraft:explosion_decay" - }, - { - "function": "minecraft:apply_bonus", - "enchantment": "minecraft:fortune", - "formula": "minecraft:uniform_bonus_count", - "parameters": { - "bonusMultiplier": 1 - } - } - ], - "name": "floralis:plant_fibers" - } - ], - "conditions": [ - { - "condition": "minecraft:inverted", - "term": { - "condition": "minecraft:any_of", - "terms": [ - { - "condition": "minecraft:match_tool", - "predicate": { - "items": [ - "minecraft:shears" - ] - } - }, - { - "condition": "minecraft:match_tool", - "predicate": { - "enchantments": [ - { - "enchantment": "minecraft:silk_touch", - "levels": { - "min": 1 - } - } - ] - } - } - ] - } - } - ] - }, - { - "rolls": 1, - "bonus_rolls": 0, - "entries": [ - { - "type": "minecraft:item", - "functions": [ - { - "function": "minecraft:set_count", - "count": 1, - "add": false - }, - { - "function": "minecraft:explosion_decay" - }, - { - "function": "minecraft:apply_bonus", - "enchantment": "minecraft:fortune", - "formula": "minecraft:uniform_bonus_count", - "parameters": { - "bonusMultiplier": 1 - } - } - ], - "name": "floralis:yellow_petals" - } - ], - "conditions": [ - { - "condition": "minecraft:inverted", - "term": { - "condition": "minecraft:any_of", - "terms": [ - { - "condition": "minecraft:match_tool", - "predicate": { - "items": [ - "minecraft:shears" - ] - } - }, - { - "condition": "minecraft:match_tool", - "predicate": { - "enchantments": [ - { - "enchantment": "minecraft:silk_touch", - "levels": { - "min": 1 - } - } - ] - } - } - ] - } - } - ] - }, - { - "rolls": 1, - "bonus_rolls": 0, - "entries": [ - { - "type": "minecraft:item", - "functions": [ - { - "function": "minecraft:set_count", - "count": 2, - "add": false - }, - { - "function": "minecraft:explosion_decay" - }, - { - "function": "minecraft:apply_bonus", - "enchantment": "minecraft:fortune", - "formula": "minecraft:uniform_bonus_count", - "parameters": { - "bonusMultiplier": 1 - } - } - ], - "name": "floralis:yellow_cactus_seeds" - } - ], - "conditions": [ - { - "condition": "minecraft:inverted", - "term": { - "condition": "minecraft:any_of", - "terms": [ - { - "condition": "minecraft:match_tool", - "predicate": { - "items": [ - "minecraft:shears" - ] - } - }, - { - "condition": "minecraft:match_tool", - "predicate": { - "enchantments": [ - { - "enchantment": "minecraft:silk_touch", - "levels": { - "min": 1 - } - } - ] - } - } - ] - } - } - ] - } - ] -} \ No newline at end of file diff --git a/src/main/resources/data/floralis/loot_tables/blocks/yellow_cactus_crop.json b/src/main/resources/data/floralis/loot_tables/blocks/yellow_cactus_crop.json deleted file mode 100644 index e41e06cc..00000000 --- a/src/main/resources/data/floralis/loot_tables/blocks/yellow_cactus_crop.json +++ /dev/null @@ -1,550 +0,0 @@ -{ - "type": "minecraft:block", - "pools": [ - { - "rolls": 1, - "bonus_rolls": 0, - "entries": [ - { - "type": "minecraft:alternatives", - "children": [ - { - "type": "minecraft:item", - "conditions": [ - { - "condition": "minecraft:block_state_property", - "block": "floralis:yellow_cactus_crop", - "properties": { - "age": "5" - } - }, - { - "condition": "minecraft:any_of", - "terms": [ - { - "condition": "minecraft:match_tool", - "predicate": { - "items": [ - "minecraft:shears" - ] - } - }, - { - "condition": "minecraft:match_tool", - "predicate": { - "enchantments": [ - { - "enchantment": "minecraft:silk_touch", - "levels": { - "min": 1 - } - } - ] - } - } - ] - } - ], - "name": "floralis:yellow_cactus" - }, - { - "type": "minecraft:item", - "conditions": [ - { - "condition": "minecraft:any_of", - "terms": [ - { - "condition": "minecraft:match_tool", - "predicate": { - "items": [ - "minecraft:shears" - ] - } - }, - { - "condition": "minecraft:match_tool", - "predicate": { - "enchantments": [ - { - "enchantment": "minecraft:silk_touch", - "levels": { - "min": 1 - } - } - ] - } - } - ] - } - ], - "name": "floralis:yellow_cactus_seeds" - } - ] - } - ] - }, - { - "rolls": 1, - "bonus_rolls": 0, - "entries": [ - { - "type": "minecraft:item", - "functions": [ - { - "function": "minecraft:set_count", - "count": 1, - "add": false - }, - { - "function": "minecraft:explosion_decay" - }, - { - "function": "minecraft:apply_bonus", - "enchantment": "minecraft:fortune", - "formula": "minecraft:uniform_bonus_count", - "parameters": { - "bonusMultiplier": 1 - } - } - ], - "name": "floralis:plant_fibers" - } - ], - "conditions": [ - { - "condition": "minecraft:block_state_property", - "block": "floralis:yellow_cactus_crop", - "properties": { - "age": "5" - } - }, - { - "condition": "minecraft:inverted", - "term": { - "condition": "minecraft:any_of", - "terms": [ - { - "condition": "minecraft:match_tool", - "predicate": { - "items": [ - "minecraft:shears" - ] - } - }, - { - "condition": "minecraft:match_tool", - "predicate": { - "enchantments": [ - { - "enchantment": "minecraft:silk_touch", - "levels": { - "min": 1 - } - } - ] - } - } - ] - } - } - ] - }, - { - "rolls": 1, - "bonus_rolls": 0, - "entries": [ - { - "type": "minecraft:item", - "functions": [ - { - "function": "minecraft:set_count", - "count": 1, - "add": false - }, - { - "function": "minecraft:explosion_decay" - }, - { - "function": "minecraft:apply_bonus", - "enchantment": "minecraft:fortune", - "formula": "minecraft:uniform_bonus_count", - "parameters": { - "bonusMultiplier": 1 - } - } - ], - "name": "floralis:yellow_petals" - } - ], - "conditions": [ - { - "condition": "minecraft:block_state_property", - "block": "floralis:yellow_cactus_crop", - "properties": { - "age": "5" - } - }, - { - "condition": "minecraft:inverted", - "term": { - "condition": "minecraft:any_of", - "terms": [ - { - "condition": "minecraft:match_tool", - "predicate": { - "items": [ - "minecraft:shears" - ] - } - }, - { - "condition": "minecraft:match_tool", - "predicate": { - "enchantments": [ - { - "enchantment": "minecraft:silk_touch", - "levels": { - "min": 1 - } - } - ] - } - } - ] - } - } - ] - }, - { - "rolls": 1, - "bonus_rolls": 0, - "entries": [ - { - "type": "minecraft:item", - "functions": [ - { - "function": "minecraft:set_count", - "count": 2, - "add": false - }, - { - "function": "minecraft:explosion_decay" - }, - { - "function": "minecraft:apply_bonus", - "enchantment": "minecraft:fortune", - "formula": "minecraft:uniform_bonus_count", - "parameters": { - "bonusMultiplier": 1 - } - } - ], - "name": "floralis:yellow_cactus_seeds" - } - ], - "conditions": [ - { - "condition": "minecraft:block_state_property", - "block": "floralis:yellow_cactus_crop", - "properties": { - "age": "5" - } - }, - { - "condition": "minecraft:inverted", - "term": { - "condition": "minecraft:any_of", - "terms": [ - { - "condition": "minecraft:match_tool", - "predicate": { - "items": [ - "minecraft:shears" - ] - } - }, - { - "condition": "minecraft:match_tool", - "predicate": { - "enchantments": [ - { - "enchantment": "minecraft:silk_touch", - "levels": { - "min": 1 - } - } - ] - } - } - ] - } - } - ] - }, - { - "rolls": 1, - "bonus_rolls": 0, - "entries": [ - { - "type": "minecraft:item", - "functions": [ - { - "function": "minecraft:explosion_decay" - } - ], - "name": "floralis:yellow_cactus_seeds" - } - ], - "conditions": [ - { - "condition": "minecraft:block_state_property", - "block": "floralis:yellow_cactus_crop", - "properties": { - "age": "4" - } - }, - { - "condition": "minecraft:inverted", - "term": { - "condition": "minecraft:any_of", - "terms": [ - { - "condition": "minecraft:match_tool", - "predicate": { - "items": [ - "minecraft:shears" - ] - } - }, - { - "condition": "minecraft:match_tool", - "predicate": { - "enchantments": [ - { - "enchantment": "minecraft:silk_touch", - "levels": { - "min": 1 - } - } - ] - } - } - ] - } - } - ] - }, - { - "rolls": 1, - "bonus_rolls": 0, - "entries": [ - { - "type": "minecraft:item", - "functions": [ - { - "function": "minecraft:explosion_decay" - } - ], - "name": "floralis:yellow_cactus_seeds" - } - ], - "conditions": [ - { - "condition": "minecraft:block_state_property", - "block": "floralis:yellow_cactus_crop", - "properties": { - "age": "3" - } - }, - { - "condition": "minecraft:inverted", - "term": { - "condition": "minecraft:any_of", - "terms": [ - { - "condition": "minecraft:match_tool", - "predicate": { - "items": [ - "minecraft:shears" - ] - } - }, - { - "condition": "minecraft:match_tool", - "predicate": { - "enchantments": [ - { - "enchantment": "minecraft:silk_touch", - "levels": { - "min": 1 - } - } - ] - } - } - ] - } - } - ] - }, - { - "rolls": 1, - "bonus_rolls": 0, - "entries": [ - { - "type": "minecraft:item", - "functions": [ - { - "function": "minecraft:explosion_decay" - } - ], - "name": "floralis:yellow_cactus_seeds" - } - ], - "conditions": [ - { - "condition": "minecraft:block_state_property", - "block": "floralis:yellow_cactus_crop", - "properties": { - "age": "2" - } - }, - { - "condition": "minecraft:inverted", - "term": { - "condition": "minecraft:any_of", - "terms": [ - { - "condition": "minecraft:match_tool", - "predicate": { - "items": [ - "minecraft:shears" - ] - } - }, - { - "condition": "minecraft:match_tool", - "predicate": { - "enchantments": [ - { - "enchantment": "minecraft:silk_touch", - "levels": { - "min": 1 - } - } - ] - } - } - ] - } - } - ] - }, - { - "rolls": 1, - "bonus_rolls": 0, - "entries": [ - { - "type": "minecraft:item", - "functions": [ - { - "function": "minecraft:explosion_decay" - } - ], - "name": "floralis:yellow_cactus_seeds" - } - ], - "conditions": [ - { - "condition": "minecraft:block_state_property", - "block": "floralis:yellow_cactus_crop", - "properties": { - "age": "1" - } - }, - { - "condition": "minecraft:inverted", - "term": { - "condition": "minecraft:any_of", - "terms": [ - { - "condition": "minecraft:match_tool", - "predicate": { - "items": [ - "minecraft:shears" - ] - } - }, - { - "condition": "minecraft:match_tool", - "predicate": { - "enchantments": [ - { - "enchantment": "minecraft:silk_touch", - "levels": { - "min": 1 - } - } - ] - } - } - ] - } - } - ] - }, - { - "rolls": 1, - "bonus_rolls": 0, - "entries": [ - { - "type": "minecraft:item", - "functions": [ - { - "function": "minecraft:explosion_decay" - } - ], - "name": "floralis:yellow_cactus_seeds" - } - ], - "conditions": [ - { - "condition": "minecraft:block_state_property", - "block": "floralis:yellow_cactus_crop", - "properties": { - "age": "0" - } - }, - { - "condition": "minecraft:inverted", - "term": { - "condition": "minecraft:any_of", - "terms": [ - { - "condition": "minecraft:match_tool", - "predicate": { - "items": [ - "minecraft:shears" - ] - } - }, - { - "condition": "minecraft:match_tool", - "predicate": { - "enchantments": [ - { - "enchantment": "minecraft:silk_touch", - "levels": { - "min": 1 - } - } - ] - } - } - ] - } - } - ] - } - ] -} \ No newline at end of file diff --git a/src/main/resources/data/floralis/loot_tables/blocks/yellow_flower.json b/src/main/resources/data/floralis/loot_tables/blocks/yellow_flower.json deleted file mode 100644 index 14e39c07..00000000 --- a/src/main/resources/data/floralis/loot_tables/blocks/yellow_flower.json +++ /dev/null @@ -1,225 +0,0 @@ -{ - "type": "minecraft:block", - "pools": [ - { - "rolls": 1, - "bonus_rolls": 0, - "entries": [ - { - "type": "minecraft:alternatives", - "children": [ - { - "type": "minecraft:item", - "conditions": [ - { - "condition": "minecraft:any_of", - "terms": [ - { - "condition": "minecraft:match_tool", - "predicate": { - "items": [ - "minecraft:shears" - ] - } - }, - { - "condition": "minecraft:match_tool", - "predicate": { - "enchantments": [ - { - "enchantment": "minecraft:silk_touch", - "levels": { - "min": 1 - } - } - ] - } - } - ] - } - ], - "name": "floralis:yellow_flower" - } - ] - } - ] - }, - { - "rolls": 1, - "bonus_rolls": 0, - "entries": [ - { - "type": "minecraft:item", - "functions": [ - { - "function": "minecraft:set_count", - "count": 1, - "add": false - }, - { - "function": "minecraft:explosion_decay" - }, - { - "function": "minecraft:apply_bonus", - "enchantment": "minecraft:fortune", - "formula": "minecraft:uniform_bonus_count", - "parameters": { - "bonusMultiplier": 1 - } - } - ], - "name": "floralis:plant_fibers" - } - ], - "conditions": [ - { - "condition": "minecraft:inverted", - "term": { - "condition": "minecraft:any_of", - "terms": [ - { - "condition": "minecraft:match_tool", - "predicate": { - "items": [ - "minecraft:shears" - ] - } - }, - { - "condition": "minecraft:match_tool", - "predicate": { - "enchantments": [ - { - "enchantment": "minecraft:silk_touch", - "levels": { - "min": 1 - } - } - ] - } - } - ] - } - } - ] - }, - { - "rolls": 1, - "bonus_rolls": 0, - "entries": [ - { - "type": "minecraft:item", - "functions": [ - { - "function": "minecraft:set_count", - "count": 1, - "add": false - }, - { - "function": "minecraft:explosion_decay" - }, - { - "function": "minecraft:apply_bonus", - "enchantment": "minecraft:fortune", - "formula": "minecraft:uniform_bonus_count", - "parameters": { - "bonusMultiplier": 1 - } - } - ], - "name": "floralis:yellow_petals" - } - ], - "conditions": [ - { - "condition": "minecraft:inverted", - "term": { - "condition": "minecraft:any_of", - "terms": [ - { - "condition": "minecraft:match_tool", - "predicate": { - "items": [ - "minecraft:shears" - ] - } - }, - { - "condition": "minecraft:match_tool", - "predicate": { - "enchantments": [ - { - "enchantment": "minecraft:silk_touch", - "levels": { - "min": 1 - } - } - ] - } - } - ] - } - } - ] - }, - { - "rolls": 1, - "bonus_rolls": 0, - "entries": [ - { - "type": "minecraft:item", - "functions": [ - { - "function": "minecraft:set_count", - "count": 2, - "add": false - }, - { - "function": "minecraft:explosion_decay" - }, - { - "function": "minecraft:apply_bonus", - "enchantment": "minecraft:fortune", - "formula": "minecraft:uniform_bonus_count", - "parameters": { - "bonusMultiplier": 1 - } - } - ], - "name": "floralis:yellow_flower_seeds" - } - ], - "conditions": [ - { - "condition": "minecraft:inverted", - "term": { - "condition": "minecraft:any_of", - "terms": [ - { - "condition": "minecraft:match_tool", - "predicate": { - "items": [ - "minecraft:shears" - ] - } - }, - { - "condition": "minecraft:match_tool", - "predicate": { - "enchantments": [ - { - "enchantment": "minecraft:silk_touch", - "levels": { - "min": 1 - } - } - ] - } - } - ] - } - } - ] - } - ] -} \ No newline at end of file diff --git a/src/main/resources/data/floralis/loot_tables/blocks/yellow_flower_crop.json b/src/main/resources/data/floralis/loot_tables/blocks/yellow_flower_crop.json deleted file mode 100644 index ac8209ef..00000000 --- a/src/main/resources/data/floralis/loot_tables/blocks/yellow_flower_crop.json +++ /dev/null @@ -1,550 +0,0 @@ -{ - "type": "minecraft:block", - "pools": [ - { - "rolls": 1, - "bonus_rolls": 0, - "entries": [ - { - "type": "minecraft:alternatives", - "children": [ - { - "type": "minecraft:item", - "conditions": [ - { - "condition": "minecraft:block_state_property", - "block": "floralis:yellow_flower_crop", - "properties": { - "age": "5" - } - }, - { - "condition": "minecraft:any_of", - "terms": [ - { - "condition": "minecraft:match_tool", - "predicate": { - "items": [ - "minecraft:shears" - ] - } - }, - { - "condition": "minecraft:match_tool", - "predicate": { - "enchantments": [ - { - "enchantment": "minecraft:silk_touch", - "levels": { - "min": 1 - } - } - ] - } - } - ] - } - ], - "name": "floralis:yellow_flower" - }, - { - "type": "minecraft:item", - "conditions": [ - { - "condition": "minecraft:any_of", - "terms": [ - { - "condition": "minecraft:match_tool", - "predicate": { - "items": [ - "minecraft:shears" - ] - } - }, - { - "condition": "minecraft:match_tool", - "predicate": { - "enchantments": [ - { - "enchantment": "minecraft:silk_touch", - "levels": { - "min": 1 - } - } - ] - } - } - ] - } - ], - "name": "floralis:yellow_flower_seeds" - } - ] - } - ] - }, - { - "rolls": 1, - "bonus_rolls": 0, - "entries": [ - { - "type": "minecraft:item", - "functions": [ - { - "function": "minecraft:set_count", - "count": 1, - "add": false - }, - { - "function": "minecraft:explosion_decay" - }, - { - "function": "minecraft:apply_bonus", - "enchantment": "minecraft:fortune", - "formula": "minecraft:uniform_bonus_count", - "parameters": { - "bonusMultiplier": 1 - } - } - ], - "name": "floralis:plant_fibers" - } - ], - "conditions": [ - { - "condition": "minecraft:block_state_property", - "block": "floralis:yellow_flower_crop", - "properties": { - "age": "5" - } - }, - { - "condition": "minecraft:inverted", - "term": { - "condition": "minecraft:any_of", - "terms": [ - { - "condition": "minecraft:match_tool", - "predicate": { - "items": [ - "minecraft:shears" - ] - } - }, - { - "condition": "minecraft:match_tool", - "predicate": { - "enchantments": [ - { - "enchantment": "minecraft:silk_touch", - "levels": { - "min": 1 - } - } - ] - } - } - ] - } - } - ] - }, - { - "rolls": 1, - "bonus_rolls": 0, - "entries": [ - { - "type": "minecraft:item", - "functions": [ - { - "function": "minecraft:set_count", - "count": 1, - "add": false - }, - { - "function": "minecraft:explosion_decay" - }, - { - "function": "minecraft:apply_bonus", - "enchantment": "minecraft:fortune", - "formula": "minecraft:uniform_bonus_count", - "parameters": { - "bonusMultiplier": 1 - } - } - ], - "name": "floralis:yellow_petals" - } - ], - "conditions": [ - { - "condition": "minecraft:block_state_property", - "block": "floralis:yellow_flower_crop", - "properties": { - "age": "5" - } - }, - { - "condition": "minecraft:inverted", - "term": { - "condition": "minecraft:any_of", - "terms": [ - { - "condition": "minecraft:match_tool", - "predicate": { - "items": [ - "minecraft:shears" - ] - } - }, - { - "condition": "minecraft:match_tool", - "predicate": { - "enchantments": [ - { - "enchantment": "minecraft:silk_touch", - "levels": { - "min": 1 - } - } - ] - } - } - ] - } - } - ] - }, - { - "rolls": 1, - "bonus_rolls": 0, - "entries": [ - { - "type": "minecraft:item", - "functions": [ - { - "function": "minecraft:set_count", - "count": 2, - "add": false - }, - { - "function": "minecraft:explosion_decay" - }, - { - "function": "minecraft:apply_bonus", - "enchantment": "minecraft:fortune", - "formula": "minecraft:uniform_bonus_count", - "parameters": { - "bonusMultiplier": 1 - } - } - ], - "name": "floralis:yellow_flower_seeds" - } - ], - "conditions": [ - { - "condition": "minecraft:block_state_property", - "block": "floralis:yellow_flower_crop", - "properties": { - "age": "5" - } - }, - { - "condition": "minecraft:inverted", - "term": { - "condition": "minecraft:any_of", - "terms": [ - { - "condition": "minecraft:match_tool", - "predicate": { - "items": [ - "minecraft:shears" - ] - } - }, - { - "condition": "minecraft:match_tool", - "predicate": { - "enchantments": [ - { - "enchantment": "minecraft:silk_touch", - "levels": { - "min": 1 - } - } - ] - } - } - ] - } - } - ] - }, - { - "rolls": 1, - "bonus_rolls": 0, - "entries": [ - { - "type": "minecraft:item", - "functions": [ - { - "function": "minecraft:explosion_decay" - } - ], - "name": "floralis:yellow_flower_seeds" - } - ], - "conditions": [ - { - "condition": "minecraft:block_state_property", - "block": "floralis:yellow_flower_crop", - "properties": { - "age": "4" - } - }, - { - "condition": "minecraft:inverted", - "term": { - "condition": "minecraft:any_of", - "terms": [ - { - "condition": "minecraft:match_tool", - "predicate": { - "items": [ - "minecraft:shears" - ] - } - }, - { - "condition": "minecraft:match_tool", - "predicate": { - "enchantments": [ - { - "enchantment": "minecraft:silk_touch", - "levels": { - "min": 1 - } - } - ] - } - } - ] - } - } - ] - }, - { - "rolls": 1, - "bonus_rolls": 0, - "entries": [ - { - "type": "minecraft:item", - "functions": [ - { - "function": "minecraft:explosion_decay" - } - ], - "name": "floralis:yellow_flower_seeds" - } - ], - "conditions": [ - { - "condition": "minecraft:block_state_property", - "block": "floralis:yellow_flower_crop", - "properties": { - "age": "3" - } - }, - { - "condition": "minecraft:inverted", - "term": { - "condition": "minecraft:any_of", - "terms": [ - { - "condition": "minecraft:match_tool", - "predicate": { - "items": [ - "minecraft:shears" - ] - } - }, - { - "condition": "minecraft:match_tool", - "predicate": { - "enchantments": [ - { - "enchantment": "minecraft:silk_touch", - "levels": { - "min": 1 - } - } - ] - } - } - ] - } - } - ] - }, - { - "rolls": 1, - "bonus_rolls": 0, - "entries": [ - { - "type": "minecraft:item", - "functions": [ - { - "function": "minecraft:explosion_decay" - } - ], - "name": "floralis:yellow_flower_seeds" - } - ], - "conditions": [ - { - "condition": "minecraft:block_state_property", - "block": "floralis:yellow_flower_crop", - "properties": { - "age": "2" - } - }, - { - "condition": "minecraft:inverted", - "term": { - "condition": "minecraft:any_of", - "terms": [ - { - "condition": "minecraft:match_tool", - "predicate": { - "items": [ - "minecraft:shears" - ] - } - }, - { - "condition": "minecraft:match_tool", - "predicate": { - "enchantments": [ - { - "enchantment": "minecraft:silk_touch", - "levels": { - "min": 1 - } - } - ] - } - } - ] - } - } - ] - }, - { - "rolls": 1, - "bonus_rolls": 0, - "entries": [ - { - "type": "minecraft:item", - "functions": [ - { - "function": "minecraft:explosion_decay" - } - ], - "name": "floralis:yellow_flower_seeds" - } - ], - "conditions": [ - { - "condition": "minecraft:block_state_property", - "block": "floralis:yellow_flower_crop", - "properties": { - "age": "1" - } - }, - { - "condition": "minecraft:inverted", - "term": { - "condition": "minecraft:any_of", - "terms": [ - { - "condition": "minecraft:match_tool", - "predicate": { - "items": [ - "minecraft:shears" - ] - } - }, - { - "condition": "minecraft:match_tool", - "predicate": { - "enchantments": [ - { - "enchantment": "minecraft:silk_touch", - "levels": { - "min": 1 - } - } - ] - } - } - ] - } - } - ] - }, - { - "rolls": 1, - "bonus_rolls": 0, - "entries": [ - { - "type": "minecraft:item", - "functions": [ - { - "function": "minecraft:explosion_decay" - } - ], - "name": "floralis:yellow_flower_seeds" - } - ], - "conditions": [ - { - "condition": "minecraft:block_state_property", - "block": "floralis:yellow_flower_crop", - "properties": { - "age": "0" - } - }, - { - "condition": "minecraft:inverted", - "term": { - "condition": "minecraft:any_of", - "terms": [ - { - "condition": "minecraft:match_tool", - "predicate": { - "items": [ - "minecraft:shears" - ] - } - }, - { - "condition": "minecraft:match_tool", - "predicate": { - "enchantments": [ - { - "enchantment": "minecraft:silk_touch", - "levels": { - "min": 1 - } - } - ] - } - } - ] - } - } - ] - } - ] -} \ No newline at end of file diff --git a/src/main/resources/data/floralis/neoforge/biome_modifier/black_cactus.json b/src/main/resources/data/floralis/neoforge/biome_modifier/black_cactus.json deleted file mode 100644 index c754405b..00000000 --- a/src/main/resources/data/floralis/neoforge/biome_modifier/black_cactus.json +++ /dev/null @@ -1,11 +0,0 @@ -{ - "biomes": [ - "minecraft:badlands", - "minecraft:desert", - "minecraft:eroded_badlands", - "minecraft:wooded_badlands" - ], - "features": "floralis:black_cactus", - "step": "vegetal_decoration", - "type": "neoforge:add_features" -} \ No newline at end of file diff --git a/src/main/resources/data/floralis/neoforge/biome_modifier/blue_cactus.json b/src/main/resources/data/floralis/neoforge/biome_modifier/blue_cactus.json deleted file mode 100644 index d3404f94..00000000 --- a/src/main/resources/data/floralis/neoforge/biome_modifier/blue_cactus.json +++ /dev/null @@ -1,11 +0,0 @@ -{ - "biomes": [ - "minecraft:badlands", - "minecraft:desert", - "minecraft:eroded_badlands", - "minecraft:wooded_badlands" - ], - "features": "floralis:blue_cactus", - "step": "vegetal_decoration", - "type": "neoforge:add_features" -} \ No newline at end of file diff --git a/src/main/resources/data/floralis/neoforge/biome_modifier/brown_cactus.json b/src/main/resources/data/floralis/neoforge/biome_modifier/brown_cactus.json deleted file mode 100644 index 76bb2a81..00000000 --- a/src/main/resources/data/floralis/neoforge/biome_modifier/brown_cactus.json +++ /dev/null @@ -1,11 +0,0 @@ -{ - "biomes": [ - "minecraft:badlands", - "minecraft:desert", - "minecraft:eroded_badlands", - "minecraft:wooded_badlands" - ], - "features": "floralis:brown_cactus", - "step": "vegetal_decoration", - "type": "neoforge:add_features" -} \ No newline at end of file diff --git a/src/main/resources/data/floralis/neoforge/biome_modifier/cyan_cactus.json b/src/main/resources/data/floralis/neoforge/biome_modifier/cyan_cactus.json deleted file mode 100644 index fcbb8849..00000000 --- a/src/main/resources/data/floralis/neoforge/biome_modifier/cyan_cactus.json +++ /dev/null @@ -1,11 +0,0 @@ -{ - "biomes": [ - "minecraft:badlands", - "minecraft:desert", - "minecraft:eroded_badlands", - "minecraft:wooded_badlands" - ], - "features": "floralis:cyan_cactus", - "step": "vegetal_decoration", - "type": "neoforge:add_features" -} \ No newline at end of file diff --git a/src/main/resources/data/floralis/neoforge/biome_modifier/gray_cactus.json b/src/main/resources/data/floralis/neoforge/biome_modifier/gray_cactus.json deleted file mode 100644 index 8155c9ff..00000000 --- a/src/main/resources/data/floralis/neoforge/biome_modifier/gray_cactus.json +++ /dev/null @@ -1,11 +0,0 @@ -{ - "biomes": [ - "minecraft:badlands", - "minecraft:desert", - "minecraft:eroded_badlands", - "minecraft:wooded_badlands" - ], - "features": "floralis:gray_cactus", - "step": "vegetal_decoration", - "type": "neoforge:add_features" -} \ No newline at end of file diff --git a/src/main/resources/data/floralis/neoforge/biome_modifier/green_cactus.json b/src/main/resources/data/floralis/neoforge/biome_modifier/green_cactus.json deleted file mode 100644 index b45684e2..00000000 --- a/src/main/resources/data/floralis/neoforge/biome_modifier/green_cactus.json +++ /dev/null @@ -1,11 +0,0 @@ -{ - "biomes": [ - "minecraft:badlands", - "minecraft:desert", - "minecraft:eroded_badlands", - "minecraft:wooded_badlands" - ], - "features": "floralis:green_cactus", - "step": "vegetal_decoration", - "type": "neoforge:add_features" -} \ No newline at end of file diff --git a/src/main/resources/data/floralis/neoforge/biome_modifier/light_blue_cactus.json b/src/main/resources/data/floralis/neoforge/biome_modifier/light_blue_cactus.json deleted file mode 100644 index df6923a1..00000000 --- a/src/main/resources/data/floralis/neoforge/biome_modifier/light_blue_cactus.json +++ /dev/null @@ -1,11 +0,0 @@ -{ - "biomes": [ - "minecraft:badlands", - "minecraft:desert", - "minecraft:eroded_badlands", - "minecraft:wooded_badlands" - ], - "features": "floralis:light_blue_cactus", - "step": "vegetal_decoration", - "type": "neoforge:add_features" -} \ No newline at end of file diff --git a/src/main/resources/data/floralis/neoforge/biome_modifier/light_gray_cactus.json b/src/main/resources/data/floralis/neoforge/biome_modifier/light_gray_cactus.json deleted file mode 100644 index 9a19d751..00000000 --- a/src/main/resources/data/floralis/neoforge/biome_modifier/light_gray_cactus.json +++ /dev/null @@ -1,11 +0,0 @@ -{ - "biomes": [ - "minecraft:badlands", - "minecraft:desert", - "minecraft:eroded_badlands", - "minecraft:wooded_badlands" - ], - "features": "floralis:light_gray_cactus", - "step": "vegetal_decoration", - "type": "neoforge:add_features" -} \ No newline at end of file diff --git a/src/main/resources/data/floralis/neoforge/biome_modifier/lime_cactus.json b/src/main/resources/data/floralis/neoforge/biome_modifier/lime_cactus.json deleted file mode 100644 index 9a7631bf..00000000 --- a/src/main/resources/data/floralis/neoforge/biome_modifier/lime_cactus.json +++ /dev/null @@ -1,11 +0,0 @@ -{ - "biomes": [ - "minecraft:badlands", - "minecraft:desert", - "minecraft:eroded_badlands", - "minecraft:wooded_badlands" - ], - "features": "floralis:lime_cactus", - "step": "vegetal_decoration", - "type": "neoforge:add_features" -} \ No newline at end of file diff --git a/src/main/resources/data/floralis/neoforge/biome_modifier/magenta_cactus.json b/src/main/resources/data/floralis/neoforge/biome_modifier/magenta_cactus.json deleted file mode 100644 index cf7ff2e1..00000000 --- a/src/main/resources/data/floralis/neoforge/biome_modifier/magenta_cactus.json +++ /dev/null @@ -1,11 +0,0 @@ -{ - "biomes": [ - "minecraft:badlands", - "minecraft:desert", - "minecraft:eroded_badlands", - "minecraft:wooded_badlands" - ], - "features": "floralis:magenta_cactus", - "step": "vegetal_decoration", - "type": "neoforge:add_features" -} \ No newline at end of file diff --git a/src/main/resources/data/floralis/neoforge/biome_modifier/orange_cactus.json b/src/main/resources/data/floralis/neoforge/biome_modifier/orange_cactus.json deleted file mode 100644 index 023ee9a2..00000000 --- a/src/main/resources/data/floralis/neoforge/biome_modifier/orange_cactus.json +++ /dev/null @@ -1,11 +0,0 @@ -{ - "biomes": [ - "minecraft:badlands", - "minecraft:desert", - "minecraft:eroded_badlands", - "minecraft:wooded_badlands" - ], - "features": "floralis:orange_cactus", - "step": "vegetal_decoration", - "type": "neoforge:add_features" -} \ No newline at end of file diff --git a/src/main/resources/data/floralis/neoforge/biome_modifier/pink_cactus.json b/src/main/resources/data/floralis/neoforge/biome_modifier/pink_cactus.json deleted file mode 100644 index dc66e597..00000000 --- a/src/main/resources/data/floralis/neoforge/biome_modifier/pink_cactus.json +++ /dev/null @@ -1,11 +0,0 @@ -{ - "biomes": [ - "minecraft:badlands", - "minecraft:desert", - "minecraft:eroded_badlands", - "minecraft:wooded_badlands" - ], - "features": "floralis:pink_cactus", - "step": "vegetal_decoration", - "type": "neoforge:add_features" -} \ No newline at end of file diff --git a/src/main/resources/data/floralis/neoforge/biome_modifier/purple_cactus.json b/src/main/resources/data/floralis/neoforge/biome_modifier/purple_cactus.json deleted file mode 100644 index e37f248b..00000000 --- a/src/main/resources/data/floralis/neoforge/biome_modifier/purple_cactus.json +++ /dev/null @@ -1,11 +0,0 @@ -{ - "biomes": [ - "minecraft:badlands", - "minecraft:desert", - "minecraft:eroded_badlands", - "minecraft:wooded_badlands" - ], - "features": "floralis:purple_cactus", - "step": "vegetal_decoration", - "type": "neoforge:add_features" -} \ No newline at end of file diff --git a/src/main/resources/data/floralis/neoforge/biome_modifier/red_cactus.json b/src/main/resources/data/floralis/neoforge/biome_modifier/red_cactus.json deleted file mode 100644 index dec597cb..00000000 --- a/src/main/resources/data/floralis/neoforge/biome_modifier/red_cactus.json +++ /dev/null @@ -1,11 +0,0 @@ -{ - "biomes": [ - "minecraft:badlands", - "minecraft:desert", - "minecraft:eroded_badlands", - "minecraft:wooded_badlands" - ], - "features": "floralis:red_cactus", - "step": "vegetal_decoration", - "type": "neoforge:add_features" -} \ No newline at end of file diff --git a/src/main/resources/data/floralis/neoforge/biome_modifier/white_cactus.json b/src/main/resources/data/floralis/neoforge/biome_modifier/white_cactus.json deleted file mode 100644 index 1faa1e7b..00000000 --- a/src/main/resources/data/floralis/neoforge/biome_modifier/white_cactus.json +++ /dev/null @@ -1,11 +0,0 @@ -{ - "biomes": [ - "minecraft:badlands", - "minecraft:desert", - "minecraft:eroded_badlands", - "minecraft:wooded_badlands" - ], - "features": "floralis:white_cactus", - "step": "vegetal_decoration", - "type": "neoforge:add_features" -} \ No newline at end of file diff --git a/src/main/resources/data/floralis/neoforge/biome_modifier/yellow_cactus.json b/src/main/resources/data/floralis/neoforge/biome_modifier/yellow_cactus.json deleted file mode 100644 index 79a00d27..00000000 --- a/src/main/resources/data/floralis/neoforge/biome_modifier/yellow_cactus.json +++ /dev/null @@ -1,11 +0,0 @@ -{ - "biomes": [ - "minecraft:badlands", - "minecraft:desert", - "minecraft:eroded_badlands", - "minecraft:wooded_badlands" - ], - "features": "floralis:yellow_cactus", - "step": "vegetal_decoration", - "type": "neoforge:add_features" -} \ No newline at end of file diff --git a/src/main/resources/data/floralis/recipes/crafting/black_dye_block_compressing.json b/src/main/resources/data/floralis/recipes/crafting/black_dye_block_compressing.json deleted file mode 100644 index 990d4e56..00000000 --- a/src/main/resources/data/floralis/recipes/crafting/black_dye_block_compressing.json +++ /dev/null @@ -1,16 +0,0 @@ -{ - "type": "minecraft:crafting_shaped", - "pattern": [ - "XXX", - "XXX", - "XXX" - ], - "key": { - "X": { - "item": "minecraft:black_dye" - } - }, - "result": { - "item": "floralis:black_dye_block" - } -} \ No newline at end of file diff --git a/src/main/resources/data/floralis/recipes/crafting/blue_dye_block_compressing.json b/src/main/resources/data/floralis/recipes/crafting/blue_dye_block_compressing.json deleted file mode 100644 index 84b3d5ea..00000000 --- a/src/main/resources/data/floralis/recipes/crafting/blue_dye_block_compressing.json +++ /dev/null @@ -1,16 +0,0 @@ -{ - "type": "minecraft:crafting_shaped", - "pattern": [ - "XXX", - "XXX", - "XXX" - ], - "key": { - "X": { - "item": "minecraft:blue_dye" - } - }, - "result": { - "item": "floralis:blue_dye_block" - } -} \ No newline at end of file diff --git a/src/main/resources/data/floralis/recipes/crafting/brown_dye_block_compressing.json b/src/main/resources/data/floralis/recipes/crafting/brown_dye_block_compressing.json deleted file mode 100644 index 202149d6..00000000 --- a/src/main/resources/data/floralis/recipes/crafting/brown_dye_block_compressing.json +++ /dev/null @@ -1,16 +0,0 @@ -{ - "type": "minecraft:crafting_shaped", - "pattern": [ - "XXX", - "XXX", - "XXX" - ], - "key": { - "X": { - "item": "minecraft:brown_dye" - } - }, - "result": { - "item": "floralis:brown_dye_block" - } -} \ No newline at end of file diff --git a/src/main/resources/data/floralis/recipes/crafting/cyan_dye_block_compressing.json b/src/main/resources/data/floralis/recipes/crafting/cyan_dye_block_compressing.json deleted file mode 100644 index 5a69cfe8..00000000 --- a/src/main/resources/data/floralis/recipes/crafting/cyan_dye_block_compressing.json +++ /dev/null @@ -1,16 +0,0 @@ -{ - "type": "minecraft:crafting_shaped", - "pattern": [ - "XXX", - "XXX", - "XXX" - ], - "key": { - "X": { - "item": "minecraft:cyan_dye" - } - }, - "result": { - "item": "floralis:cyan_dye_block" - } -} \ No newline at end of file diff --git a/src/main/resources/data/floralis/recipes/crafting/gray_dye_block_compressing.json b/src/main/resources/data/floralis/recipes/crafting/gray_dye_block_compressing.json deleted file mode 100644 index c0aab6ae..00000000 --- a/src/main/resources/data/floralis/recipes/crafting/gray_dye_block_compressing.json +++ /dev/null @@ -1,16 +0,0 @@ -{ - "type": "minecraft:crafting_shaped", - "pattern": [ - "XXX", - "XXX", - "XXX" - ], - "key": { - "X": { - "item": "minecraft:gray_dye" - } - }, - "result": { - "item": "floralis:gray_dye_block" - } -} \ No newline at end of file diff --git a/src/main/resources/data/floralis/recipes/crafting/green_dye_block_compressing.json b/src/main/resources/data/floralis/recipes/crafting/green_dye_block_compressing.json deleted file mode 100644 index 131464b9..00000000 --- a/src/main/resources/data/floralis/recipes/crafting/green_dye_block_compressing.json +++ /dev/null @@ -1,16 +0,0 @@ -{ - "type": "minecraft:crafting_shaped", - "pattern": [ - "XXX", - "XXX", - "XXX" - ], - "key": { - "X": { - "item": "minecraft:green_dye" - } - }, - "result": { - "item": "floralis:green_dye_block" - } -} \ No newline at end of file diff --git a/src/main/resources/data/floralis/recipes/crafting/light_blue_dye_block_compressing.json b/src/main/resources/data/floralis/recipes/crafting/light_blue_dye_block_compressing.json deleted file mode 100644 index dfc0db09..00000000 --- a/src/main/resources/data/floralis/recipes/crafting/light_blue_dye_block_compressing.json +++ /dev/null @@ -1,16 +0,0 @@ -{ - "type": "minecraft:crafting_shaped", - "pattern": [ - "XXX", - "XXX", - "XXX" - ], - "key": { - "X": { - "item": "minecraft:light_blue_dye" - } - }, - "result": { - "item": "floralis:light_blue_dye_block" - } -} \ No newline at end of file diff --git a/src/main/resources/data/floralis/recipes/crafting/light_gray_dye_block_compressing.json b/src/main/resources/data/floralis/recipes/crafting/light_gray_dye_block_compressing.json deleted file mode 100644 index 31d577a2..00000000 --- a/src/main/resources/data/floralis/recipes/crafting/light_gray_dye_block_compressing.json +++ /dev/null @@ -1,16 +0,0 @@ -{ - "type": "minecraft:crafting_shaped", - "pattern": [ - "XXX", - "XXX", - "XXX" - ], - "key": { - "X": { - "item": "minecraft:light_gray_dye" - } - }, - "result": { - "item": "floralis:light_gray_dye_block" - } -} \ No newline at end of file diff --git a/src/main/resources/data/floralis/recipes/crafting/lime_dye_block_compressing.json b/src/main/resources/data/floralis/recipes/crafting/lime_dye_block_compressing.json deleted file mode 100644 index 4ed82494..00000000 --- a/src/main/resources/data/floralis/recipes/crafting/lime_dye_block_compressing.json +++ /dev/null @@ -1,16 +0,0 @@ -{ - "type": "minecraft:crafting_shaped", - "pattern": [ - "XXX", - "XXX", - "XXX" - ], - "key": { - "X": { - "item": "minecraft:lime_dye" - } - }, - "result": { - "item": "floralis:lime_dye_block" - } -} \ No newline at end of file diff --git a/src/main/resources/data/floralis/recipes/crafting/magenta_dye_block_compressing.json b/src/main/resources/data/floralis/recipes/crafting/magenta_dye_block_compressing.json deleted file mode 100644 index 29c245ab..00000000 --- a/src/main/resources/data/floralis/recipes/crafting/magenta_dye_block_compressing.json +++ /dev/null @@ -1,16 +0,0 @@ -{ - "type": "minecraft:crafting_shaped", - "pattern": [ - "XXX", - "XXX", - "XXX" - ], - "key": { - "X": { - "item": "minecraft:magenta_dye" - } - }, - "result": { - "item": "floralis:magenta_dye_block" - } -} \ No newline at end of file diff --git a/src/main/resources/data/floralis/recipes/crafting/orange_dye_block_compressing.json b/src/main/resources/data/floralis/recipes/crafting/orange_dye_block_compressing.json deleted file mode 100644 index 358e72b8..00000000 --- a/src/main/resources/data/floralis/recipes/crafting/orange_dye_block_compressing.json +++ /dev/null @@ -1,16 +0,0 @@ -{ - "type": "minecraft:crafting_shaped", - "pattern": [ - "XXX", - "XXX", - "XXX" - ], - "key": { - "X": { - "item": "minecraft:orange_dye" - } - }, - "result": { - "item": "floralis:orange_dye_block" - } -} \ No newline at end of file diff --git a/src/main/resources/data/floralis/recipes/crafting/pink_dye_block_compressing.json b/src/main/resources/data/floralis/recipes/crafting/pink_dye_block_compressing.json deleted file mode 100644 index f282ab91..00000000 --- a/src/main/resources/data/floralis/recipes/crafting/pink_dye_block_compressing.json +++ /dev/null @@ -1,16 +0,0 @@ -{ - "type": "minecraft:crafting_shaped", - "pattern": [ - "XXX", - "XXX", - "XXX" - ], - "key": { - "X": { - "item": "minecraft:pink_dye" - } - }, - "result": { - "item": "floralis:pink_dye_block" - } -} \ No newline at end of file diff --git a/src/main/resources/data/floralis/recipes/crafting/plant_fibers_block_compressing.json b/src/main/resources/data/floralis/recipes/crafting/plant_fibers_block_compressing.json deleted file mode 100644 index bade031a..00000000 --- a/src/main/resources/data/floralis/recipes/crafting/plant_fibers_block_compressing.json +++ /dev/null @@ -1,16 +0,0 @@ -{ - "type": "minecraft:crafting_shaped", - "pattern": [ - "XXX", - "XXX", - "XXX" - ], - "key": { - "X": { - "item": "floralis:plant_fibers" - } - }, - "result": { - "item": "floralis:plant_fibers_block" - } -} \ No newline at end of file diff --git a/src/main/resources/data/floralis/recipes/crafting/purple_dye_block_compressing.json b/src/main/resources/data/floralis/recipes/crafting/purple_dye_block_compressing.json deleted file mode 100644 index 2748ba06..00000000 --- a/src/main/resources/data/floralis/recipes/crafting/purple_dye_block_compressing.json +++ /dev/null @@ -1,16 +0,0 @@ -{ - "type": "minecraft:crafting_shaped", - "pattern": [ - "XXX", - "XXX", - "XXX" - ], - "key": { - "X": { - "item": "minecraft:purple_dye" - } - }, - "result": { - "item": "floralis:purple_dye_block" - } -} \ No newline at end of file diff --git a/src/main/resources/data/floralis/recipes/crafting/red_dye_block_compressing.json b/src/main/resources/data/floralis/recipes/crafting/red_dye_block_compressing.json deleted file mode 100644 index b394280d..00000000 --- a/src/main/resources/data/floralis/recipes/crafting/red_dye_block_compressing.json +++ /dev/null @@ -1,16 +0,0 @@ -{ - "type": "minecraft:crafting_shaped", - "pattern": [ - "XXX", - "XXX", - "XXX" - ], - "key": { - "X": { - "item": "minecraft:red_dye" - } - }, - "result": { - "item": "floralis:red_dye_block" - } -} \ No newline at end of file diff --git a/src/main/resources/data/floralis/recipes/crafting/white_dye_block_compressing.json b/src/main/resources/data/floralis/recipes/crafting/white_dye_block_compressing.json deleted file mode 100644 index 7324495c..00000000 --- a/src/main/resources/data/floralis/recipes/crafting/white_dye_block_compressing.json +++ /dev/null @@ -1,16 +0,0 @@ -{ - "type": "minecraft:crafting_shaped", - "pattern": [ - "XXX", - "XXX", - "XXX" - ], - "key": { - "X": { - "item": "minecraft:white_dye" - } - }, - "result": { - "item": "floralis:white_dye_block" - } -} \ No newline at end of file diff --git a/src/main/resources/data/floralis/recipes/crafting/yellow_dye_block_compressing.json b/src/main/resources/data/floralis/recipes/crafting/yellow_dye_block_compressing.json deleted file mode 100644 index e850162f..00000000 --- a/src/main/resources/data/floralis/recipes/crafting/yellow_dye_block_compressing.json +++ /dev/null @@ -1,16 +0,0 @@ -{ - "type": "minecraft:crafting_shaped", - "pattern": [ - "XXX", - "XXX", - "XXX" - ], - "key": { - "X": { - "item": "minecraft:yellow_dye" - } - }, - "result": { - "item": "floralis:yellow_dye_block" - } -} \ No newline at end of file diff --git a/src/main/resources/data/floralis/worldgen/placed_feature/black_cactus.json b/src/main/resources/data/floralis/worldgen/placed_feature/black_cactus.json deleted file mode 100644 index e3439248..00000000 --- a/src/main/resources/data/floralis/worldgen/placed_feature/black_cactus.json +++ /dev/null @@ -1,19 +0,0 @@ -{ - "feature": "floralis:black_cactus", - "placement": [ - { - "type": "minecraft:rarity_filter", - "chance": 256 - }, - { - "type": "minecraft:in_square" - }, - { - "type": "minecraft:heightmap", - "heightmap": "MOTION_BLOCKING" - }, - { - "type": "minecraft:biome" - } - ] -} diff --git a/src/main/resources/data/floralis/worldgen/placed_feature/black_flower.json b/src/main/resources/data/floralis/worldgen/placed_feature/black_flower.json deleted file mode 100644 index 97bcb75f..00000000 --- a/src/main/resources/data/floralis/worldgen/placed_feature/black_flower.json +++ /dev/null @@ -1,19 +0,0 @@ -{ - "feature": "floralis:black_flower", - "placement": [ - { - "type": "minecraft:rarity_filter", - "chance": 256 - }, - { - "type": "minecraft:in_square" - }, - { - "type": "minecraft:heightmap", - "heightmap": "MOTION_BLOCKING" - }, - { - "type": "minecraft:biome" - } - ] -} diff --git a/src/main/resources/data/floralis/worldgen/placed_feature/blue_cactus.json b/src/main/resources/data/floralis/worldgen/placed_feature/blue_cactus.json deleted file mode 100644 index 0d2c4bab..00000000 --- a/src/main/resources/data/floralis/worldgen/placed_feature/blue_cactus.json +++ /dev/null @@ -1,19 +0,0 @@ -{ - "feature": "floralis:blue_cactus", - "placement": [ - { - "type": "minecraft:rarity_filter", - "chance": 256 - }, - { - "type": "minecraft:in_square" - }, - { - "type": "minecraft:heightmap", - "heightmap": "MOTION_BLOCKING" - }, - { - "type": "minecraft:biome" - } - ] -} diff --git a/src/main/resources/data/floralis/worldgen/placed_feature/blue_flower.json b/src/main/resources/data/floralis/worldgen/placed_feature/blue_flower.json deleted file mode 100644 index 461d74b2..00000000 --- a/src/main/resources/data/floralis/worldgen/placed_feature/blue_flower.json +++ /dev/null @@ -1,19 +0,0 @@ -{ - "feature": "floralis:blue_flower", - "placement": [ - { - "type": "minecraft:rarity_filter", - "chance": 256 - }, - { - "type": "minecraft:in_square" - }, - { - "type": "minecraft:heightmap", - "heightmap": "MOTION_BLOCKING" - }, - { - "type": "minecraft:biome" - } - ] -} diff --git a/src/main/resources/data/floralis/worldgen/placed_feature/brown_cactus.json b/src/main/resources/data/floralis/worldgen/placed_feature/brown_cactus.json deleted file mode 100644 index f6b9bab8..00000000 --- a/src/main/resources/data/floralis/worldgen/placed_feature/brown_cactus.json +++ /dev/null @@ -1,19 +0,0 @@ -{ - "feature": "floralis:brown_cactus", - "placement": [ - { - "type": "minecraft:rarity_filter", - "chance": 256 - }, - { - "type": "minecraft:in_square" - }, - { - "type": "minecraft:heightmap", - "heightmap": "MOTION_BLOCKING" - }, - { - "type": "minecraft:biome" - } - ] -} diff --git a/src/main/resources/data/floralis/worldgen/placed_feature/brown_flower.json b/src/main/resources/data/floralis/worldgen/placed_feature/brown_flower.json deleted file mode 100644 index a40dcee7..00000000 --- a/src/main/resources/data/floralis/worldgen/placed_feature/brown_flower.json +++ /dev/null @@ -1,19 +0,0 @@ -{ - "feature": "floralis:brown_flower", - "placement": [ - { - "type": "minecraft:rarity_filter", - "chance": 256 - }, - { - "type": "minecraft:in_square" - }, - { - "type": "minecraft:heightmap", - "heightmap": "MOTION_BLOCKING" - }, - { - "type": "minecraft:biome" - } - ] -} diff --git a/src/main/resources/data/floralis/worldgen/placed_feature/cyan_cactus.json b/src/main/resources/data/floralis/worldgen/placed_feature/cyan_cactus.json deleted file mode 100644 index 9192ad71..00000000 --- a/src/main/resources/data/floralis/worldgen/placed_feature/cyan_cactus.json +++ /dev/null @@ -1,19 +0,0 @@ -{ - "feature": "floralis:cyan_cactus", - "placement": [ - { - "type": "minecraft:rarity_filter", - "chance": 256 - }, - { - "type": "minecraft:in_square" - }, - { - "type": "minecraft:heightmap", - "heightmap": "MOTION_BLOCKING" - }, - { - "type": "minecraft:biome" - } - ] -} diff --git a/src/main/resources/data/floralis/worldgen/placed_feature/cyan_flower.json b/src/main/resources/data/floralis/worldgen/placed_feature/cyan_flower.json deleted file mode 100644 index 1e4432cb..00000000 --- a/src/main/resources/data/floralis/worldgen/placed_feature/cyan_flower.json +++ /dev/null @@ -1,19 +0,0 @@ -{ - "feature": "floralis:cyan_flower", - "placement": [ - { - "type": "minecraft:rarity_filter", - "chance": 256 - }, - { - "type": "minecraft:in_square" - }, - { - "type": "minecraft:heightmap", - "heightmap": "MOTION_BLOCKING" - }, - { - "type": "minecraft:biome" - } - ] -} diff --git a/src/main/resources/data/floralis/worldgen/placed_feature/gray_cactus.json b/src/main/resources/data/floralis/worldgen/placed_feature/gray_cactus.json deleted file mode 100644 index 04794a2d..00000000 --- a/src/main/resources/data/floralis/worldgen/placed_feature/gray_cactus.json +++ /dev/null @@ -1,19 +0,0 @@ -{ - "feature": "floralis:gray_cactus", - "placement": [ - { - "type": "minecraft:rarity_filter", - "chance": 256 - }, - { - "type": "minecraft:in_square" - }, - { - "type": "minecraft:heightmap", - "heightmap": "MOTION_BLOCKING" - }, - { - "type": "minecraft:biome" - } - ] -} diff --git a/src/main/resources/data/floralis/worldgen/placed_feature/gray_flower.json b/src/main/resources/data/floralis/worldgen/placed_feature/gray_flower.json deleted file mode 100644 index d1cee8a8..00000000 --- a/src/main/resources/data/floralis/worldgen/placed_feature/gray_flower.json +++ /dev/null @@ -1,19 +0,0 @@ -{ - "feature": "floralis:gray_flower", - "placement": [ - { - "type": "minecraft:rarity_filter", - "chance": 256 - }, - { - "type": "minecraft:in_square" - }, - { - "type": "minecraft:heightmap", - "heightmap": "MOTION_BLOCKING" - }, - { - "type": "minecraft:biome" - } - ] -} diff --git a/src/main/resources/data/floralis/worldgen/placed_feature/green_cactus.json b/src/main/resources/data/floralis/worldgen/placed_feature/green_cactus.json deleted file mode 100644 index f335dbc3..00000000 --- a/src/main/resources/data/floralis/worldgen/placed_feature/green_cactus.json +++ /dev/null @@ -1,19 +0,0 @@ -{ - "feature": "floralis:green_cactus", - "placement": [ - { - "type": "minecraft:rarity_filter", - "chance": 256 - }, - { - "type": "minecraft:in_square" - }, - { - "type": "minecraft:heightmap", - "heightmap": "MOTION_BLOCKING" - }, - { - "type": "minecraft:biome" - } - ] -} diff --git a/src/main/resources/data/floralis/worldgen/placed_feature/green_flower.json b/src/main/resources/data/floralis/worldgen/placed_feature/green_flower.json deleted file mode 100644 index 15170476..00000000 --- a/src/main/resources/data/floralis/worldgen/placed_feature/green_flower.json +++ /dev/null @@ -1,19 +0,0 @@ -{ - "feature": "floralis:green_flower", - "placement": [ - { - "type": "minecraft:rarity_filter", - "chance": 256 - }, - { - "type": "minecraft:in_square" - }, - { - "type": "minecraft:heightmap", - "heightmap": "MOTION_BLOCKING" - }, - { - "type": "minecraft:biome" - } - ] -} diff --git a/src/main/resources/data/floralis/worldgen/placed_feature/light_blue_cactus.json b/src/main/resources/data/floralis/worldgen/placed_feature/light_blue_cactus.json deleted file mode 100644 index ba0522da..00000000 --- a/src/main/resources/data/floralis/worldgen/placed_feature/light_blue_cactus.json +++ /dev/null @@ -1,19 +0,0 @@ -{ - "feature": "floralis:light_blue_cactus", - "placement": [ - { - "type": "minecraft:rarity_filter", - "chance": 256 - }, - { - "type": "minecraft:in_square" - }, - { - "type": "minecraft:heightmap", - "heightmap": "MOTION_BLOCKING" - }, - { - "type": "minecraft:biome" - } - ] -} diff --git a/src/main/resources/data/floralis/worldgen/placed_feature/light_blue_flower.json b/src/main/resources/data/floralis/worldgen/placed_feature/light_blue_flower.json deleted file mode 100644 index 7cf96e8b..00000000 --- a/src/main/resources/data/floralis/worldgen/placed_feature/light_blue_flower.json +++ /dev/null @@ -1,19 +0,0 @@ -{ - "feature": "floralis:light_blue_flower", - "placement": [ - { - "type": "minecraft:rarity_filter", - "chance": 256 - }, - { - "type": "minecraft:in_square" - }, - { - "type": "minecraft:heightmap", - "heightmap": "MOTION_BLOCKING" - }, - { - "type": "minecraft:biome" - } - ] -} diff --git a/src/main/resources/data/floralis/worldgen/placed_feature/light_gray_cactus.json b/src/main/resources/data/floralis/worldgen/placed_feature/light_gray_cactus.json deleted file mode 100644 index 313fda89..00000000 --- a/src/main/resources/data/floralis/worldgen/placed_feature/light_gray_cactus.json +++ /dev/null @@ -1,19 +0,0 @@ -{ - "feature": "floralis:light_gray_cactus", - "placement": [ - { - "type": "minecraft:rarity_filter", - "chance": 256 - }, - { - "type": "minecraft:in_square" - }, - { - "type": "minecraft:heightmap", - "heightmap": "MOTION_BLOCKING" - }, - { - "type": "minecraft:biome" - } - ] -} diff --git a/src/main/resources/data/floralis/worldgen/placed_feature/light_gray_flower.json b/src/main/resources/data/floralis/worldgen/placed_feature/light_gray_flower.json deleted file mode 100644 index 4b3e3f43..00000000 --- a/src/main/resources/data/floralis/worldgen/placed_feature/light_gray_flower.json +++ /dev/null @@ -1,19 +0,0 @@ -{ - "feature": "floralis:light_gray_flower", - "placement": [ - { - "type": "minecraft:rarity_filter", - "chance": 256 - }, - { - "type": "minecraft:in_square" - }, - { - "type": "minecraft:heightmap", - "heightmap": "MOTION_BLOCKING" - }, - { - "type": "minecraft:biome" - } - ] -} diff --git a/src/main/resources/data/floralis/worldgen/placed_feature/lime_cactus.json b/src/main/resources/data/floralis/worldgen/placed_feature/lime_cactus.json deleted file mode 100644 index 7388dfb8..00000000 --- a/src/main/resources/data/floralis/worldgen/placed_feature/lime_cactus.json +++ /dev/null @@ -1,19 +0,0 @@ -{ - "feature": "floralis:lime_cactus", - "placement": [ - { - "type": "minecraft:rarity_filter", - "chance": 256 - }, - { - "type": "minecraft:in_square" - }, - { - "type": "minecraft:heightmap", - "heightmap": "MOTION_BLOCKING" - }, - { - "type": "minecraft:biome" - } - ] -} diff --git a/src/main/resources/data/floralis/worldgen/placed_feature/lime_flower.json b/src/main/resources/data/floralis/worldgen/placed_feature/lime_flower.json deleted file mode 100644 index 86f0e876..00000000 --- a/src/main/resources/data/floralis/worldgen/placed_feature/lime_flower.json +++ /dev/null @@ -1,19 +0,0 @@ -{ - "feature": "floralis:lime_flower", - "placement": [ - { - "type": "minecraft:rarity_filter", - "chance": 256 - }, - { - "type": "minecraft:in_square" - }, - { - "type": "minecraft:heightmap", - "heightmap": "MOTION_BLOCKING" - }, - { - "type": "minecraft:biome" - } - ] -} diff --git a/src/main/resources/data/floralis/worldgen/placed_feature/magenta_cactus.json b/src/main/resources/data/floralis/worldgen/placed_feature/magenta_cactus.json deleted file mode 100644 index 1d00f6fe..00000000 --- a/src/main/resources/data/floralis/worldgen/placed_feature/magenta_cactus.json +++ /dev/null @@ -1,19 +0,0 @@ -{ - "feature": "floralis:magenta_cactus", - "placement": [ - { - "type": "minecraft:rarity_filter", - "chance": 256 - }, - { - "type": "minecraft:in_square" - }, - { - "type": "minecraft:heightmap", - "heightmap": "MOTION_BLOCKING" - }, - { - "type": "minecraft:biome" - } - ] -} diff --git a/src/main/resources/data/floralis/worldgen/placed_feature/magenta_flower.json b/src/main/resources/data/floralis/worldgen/placed_feature/magenta_flower.json deleted file mode 100644 index 626dd89f..00000000 --- a/src/main/resources/data/floralis/worldgen/placed_feature/magenta_flower.json +++ /dev/null @@ -1,19 +0,0 @@ -{ - "feature": "floralis:magenta_flower", - "placement": [ - { - "type": "minecraft:rarity_filter", - "chance": 256 - }, - { - "type": "minecraft:in_square" - }, - { - "type": "minecraft:heightmap", - "heightmap": "MOTION_BLOCKING" - }, - { - "type": "minecraft:biome" - } - ] -} diff --git a/src/main/resources/data/floralis/worldgen/placed_feature/orange_cactus.json b/src/main/resources/data/floralis/worldgen/placed_feature/orange_cactus.json deleted file mode 100644 index 32a4c4a7..00000000 --- a/src/main/resources/data/floralis/worldgen/placed_feature/orange_cactus.json +++ /dev/null @@ -1,19 +0,0 @@ -{ - "feature": "floralis:orange_cactus", - "placement": [ - { - "type": "minecraft:rarity_filter", - "chance": 256 - }, - { - "type": "minecraft:in_square" - }, - { - "type": "minecraft:heightmap", - "heightmap": "MOTION_BLOCKING" - }, - { - "type": "minecraft:biome" - } - ] -} diff --git a/src/main/resources/data/floralis/worldgen/placed_feature/orange_flower.json b/src/main/resources/data/floralis/worldgen/placed_feature/orange_flower.json deleted file mode 100644 index 88eb7aac..00000000 --- a/src/main/resources/data/floralis/worldgen/placed_feature/orange_flower.json +++ /dev/null @@ -1,19 +0,0 @@ -{ - "feature": "floralis:orange_flower", - "placement": [ - { - "type": "minecraft:rarity_filter", - "chance": 256 - }, - { - "type": "minecraft:in_square" - }, - { - "type": "minecraft:heightmap", - "heightmap": "MOTION_BLOCKING" - }, - { - "type": "minecraft:biome" - } - ] -} diff --git a/src/main/resources/data/floralis/worldgen/placed_feature/pink_cactus.json b/src/main/resources/data/floralis/worldgen/placed_feature/pink_cactus.json deleted file mode 100644 index 1a5dc73f..00000000 --- a/src/main/resources/data/floralis/worldgen/placed_feature/pink_cactus.json +++ /dev/null @@ -1,19 +0,0 @@ -{ - "feature": "floralis:pink_cactus", - "placement": [ - { - "type": "minecraft:rarity_filter", - "chance": 256 - }, - { - "type": "minecraft:in_square" - }, - { - "type": "minecraft:heightmap", - "heightmap": "MOTION_BLOCKING" - }, - { - "type": "minecraft:biome" - } - ] -} diff --git a/src/main/resources/data/floralis/worldgen/placed_feature/pink_flower.json b/src/main/resources/data/floralis/worldgen/placed_feature/pink_flower.json deleted file mode 100644 index 0f6cc66e..00000000 --- a/src/main/resources/data/floralis/worldgen/placed_feature/pink_flower.json +++ /dev/null @@ -1,19 +0,0 @@ -{ - "feature": "floralis:pink_flower", - "placement": [ - { - "type": "minecraft:rarity_filter", - "chance": 256 - }, - { - "type": "minecraft:in_square" - }, - { - "type": "minecraft:heightmap", - "heightmap": "MOTION_BLOCKING" - }, - { - "type": "minecraft:biome" - } - ] -} diff --git a/src/main/resources/data/floralis/worldgen/placed_feature/purple_cactus.json b/src/main/resources/data/floralis/worldgen/placed_feature/purple_cactus.json deleted file mode 100644 index a27f01b3..00000000 --- a/src/main/resources/data/floralis/worldgen/placed_feature/purple_cactus.json +++ /dev/null @@ -1,19 +0,0 @@ -{ - "feature": "floralis:purple_cactus", - "placement": [ - { - "type": "minecraft:rarity_filter", - "chance": 256 - }, - { - "type": "minecraft:in_square" - }, - { - "type": "minecraft:heightmap", - "heightmap": "MOTION_BLOCKING" - }, - { - "type": "minecraft:biome" - } - ] -} diff --git a/src/main/resources/data/floralis/worldgen/placed_feature/purple_flower.json b/src/main/resources/data/floralis/worldgen/placed_feature/purple_flower.json deleted file mode 100644 index a30c5265..00000000 --- a/src/main/resources/data/floralis/worldgen/placed_feature/purple_flower.json +++ /dev/null @@ -1,19 +0,0 @@ -{ - "feature": "floralis:purple_flower", - "placement": [ - { - "type": "minecraft:rarity_filter", - "chance": 256 - }, - { - "type": "minecraft:in_square" - }, - { - "type": "minecraft:heightmap", - "heightmap": "MOTION_BLOCKING" - }, - { - "type": "minecraft:biome" - } - ] -} diff --git a/src/main/resources/data/floralis/worldgen/placed_feature/red_cactus.json b/src/main/resources/data/floralis/worldgen/placed_feature/red_cactus.json deleted file mode 100644 index 4d8ef031..00000000 --- a/src/main/resources/data/floralis/worldgen/placed_feature/red_cactus.json +++ /dev/null @@ -1,19 +0,0 @@ -{ - "feature": "floralis:red_cactus", - "placement": [ - { - "type": "minecraft:rarity_filter", - "chance": 256 - }, - { - "type": "minecraft:in_square" - }, - { - "type": "minecraft:heightmap", - "heightmap": "MOTION_BLOCKING" - }, - { - "type": "minecraft:biome" - } - ] -} diff --git a/src/main/resources/data/floralis/worldgen/placed_feature/red_flower.json b/src/main/resources/data/floralis/worldgen/placed_feature/red_flower.json deleted file mode 100644 index f1382098..00000000 --- a/src/main/resources/data/floralis/worldgen/placed_feature/red_flower.json +++ /dev/null @@ -1,19 +0,0 @@ -{ - "feature": "floralis:red_flower", - "placement": [ - { - "type": "minecraft:rarity_filter", - "chance": 256 - }, - { - "type": "minecraft:in_square" - }, - { - "type": "minecraft:heightmap", - "heightmap": "MOTION_BLOCKING" - }, - { - "type": "minecraft:biome" - } - ] -} diff --git a/src/main/resources/data/floralis/worldgen/placed_feature/white_cactus.json b/src/main/resources/data/floralis/worldgen/placed_feature/white_cactus.json deleted file mode 100644 index f4758198..00000000 --- a/src/main/resources/data/floralis/worldgen/placed_feature/white_cactus.json +++ /dev/null @@ -1,19 +0,0 @@ -{ - "feature": "floralis:white_cactus", - "placement": [ - { - "type": "minecraft:rarity_filter", - "chance": 256 - }, - { - "type": "minecraft:in_square" - }, - { - "type": "minecraft:heightmap", - "heightmap": "MOTION_BLOCKING" - }, - { - "type": "minecraft:biome" - } - ] -} diff --git a/src/main/resources/data/floralis/worldgen/placed_feature/white_flower.json b/src/main/resources/data/floralis/worldgen/placed_feature/white_flower.json deleted file mode 100644 index 7cbfbbf0..00000000 --- a/src/main/resources/data/floralis/worldgen/placed_feature/white_flower.json +++ /dev/null @@ -1,19 +0,0 @@ -{ - "feature": "floralis:white_flower", - "placement": [ - { - "type": "minecraft:rarity_filter", - "chance": 256 - }, - { - "type": "minecraft:in_square" - }, - { - "type": "minecraft:heightmap", - "heightmap": "MOTION_BLOCKING" - }, - { - "type": "minecraft:biome" - } - ] -} diff --git a/src/main/resources/data/floralis/worldgen/placed_feature/yellow_cactus.json b/src/main/resources/data/floralis/worldgen/placed_feature/yellow_cactus.json deleted file mode 100644 index c9a91b48..00000000 --- a/src/main/resources/data/floralis/worldgen/placed_feature/yellow_cactus.json +++ /dev/null @@ -1,19 +0,0 @@ -{ - "feature": "floralis:yellow_cactus", - "placement": [ - { - "type": "minecraft:rarity_filter", - "chance": 256 - }, - { - "type": "minecraft:in_square" - }, - { - "type": "minecraft:heightmap", - "heightmap": "MOTION_BLOCKING" - }, - { - "type": "minecraft:biome" - } - ] -} diff --git a/src/main/resources/data/floralis/worldgen/placed_feature/yellow_flower.json b/src/main/resources/data/floralis/worldgen/placed_feature/yellow_flower.json deleted file mode 100644 index f001ec05..00000000 --- a/src/main/resources/data/floralis/worldgen/placed_feature/yellow_flower.json +++ /dev/null @@ -1,19 +0,0 @@ -{ - "feature": "floralis:yellow_flower", - "placement": [ - { - "type": "minecraft:rarity_filter", - "chance": 256 - }, - { - "type": "minecraft:in_square" - }, - { - "type": "minecraft:heightmap", - "heightmap": "MOTION_BLOCKING" - }, - { - "type": "minecraft:biome" - } - ] -} diff --git a/src/main/resources/data/immersiveengineering/recipes/cloche/black_cactus.json b/src/main/resources/data/immersiveengineering/recipes/cloche/black_cactus.json index 9857dec4..b6df6da2 100644 --- a/src/main/resources/data/immersiveengineering/recipes/cloche/black_cactus.json +++ b/src/main/resources/data/immersiveengineering/recipes/cloche/black_cactus.json @@ -19,7 +19,7 @@ } ], "soil": { - "tag": "forge:sand" + "tag": "c:sands" }, "time": 480 } \ No newline at end of file diff --git a/src/main/resources/data/immersiveengineering/recipes/cloche/black_cactus_crop.json b/src/main/resources/data/immersiveengineering/recipes/cloche/black_cactus_crop.json index 72ce50e0..22d290d8 100644 --- a/src/main/resources/data/immersiveengineering/recipes/cloche/black_cactus_crop.json +++ b/src/main/resources/data/immersiveengineering/recipes/cloche/black_cactus_crop.json @@ -28,7 +28,7 @@ } ], "soil": { - "tag": "forge:sand" + "tag": "c:sands" }, "time": 800 } \ No newline at end of file diff --git a/src/main/resources/data/immersiveengineering/recipes/cloche/blue_cactus.json b/src/main/resources/data/immersiveengineering/recipes/cloche/blue_cactus.json index 63a98b2d..38577a5a 100644 --- a/src/main/resources/data/immersiveengineering/recipes/cloche/blue_cactus.json +++ b/src/main/resources/data/immersiveengineering/recipes/cloche/blue_cactus.json @@ -19,7 +19,7 @@ } ], "soil": { - "tag": "forge:sand" + "tag": "c:sands" }, "time": 480 } \ No newline at end of file diff --git a/src/main/resources/data/immersiveengineering/recipes/cloche/blue_cactus_crop.json b/src/main/resources/data/immersiveengineering/recipes/cloche/blue_cactus_crop.json index 006e7b66..9a42c0a8 100644 --- a/src/main/resources/data/immersiveengineering/recipes/cloche/blue_cactus_crop.json +++ b/src/main/resources/data/immersiveengineering/recipes/cloche/blue_cactus_crop.json @@ -28,7 +28,7 @@ } ], "soil": { - "tag": "forge:sand" + "tag": "c:sands" }, "time": 800 } \ No newline at end of file diff --git a/src/main/resources/data/immersiveengineering/recipes/cloche/brown_cactus.json b/src/main/resources/data/immersiveengineering/recipes/cloche/brown_cactus.json index b2707e13..e1874ec4 100644 --- a/src/main/resources/data/immersiveengineering/recipes/cloche/brown_cactus.json +++ b/src/main/resources/data/immersiveengineering/recipes/cloche/brown_cactus.json @@ -19,7 +19,7 @@ } ], "soil": { - "tag": "forge:sand" + "tag": "c:sands" }, "time": 480 } \ No newline at end of file diff --git a/src/main/resources/data/immersiveengineering/recipes/cloche/brown_cactus_crop.json b/src/main/resources/data/immersiveengineering/recipes/cloche/brown_cactus_crop.json index 6f6823c6..46c5e05b 100644 --- a/src/main/resources/data/immersiveengineering/recipes/cloche/brown_cactus_crop.json +++ b/src/main/resources/data/immersiveengineering/recipes/cloche/brown_cactus_crop.json @@ -28,7 +28,7 @@ } ], "soil": { - "tag": "forge:sand" + "tag": "c:sands" }, "time": 800 } \ No newline at end of file diff --git a/src/main/resources/data/immersiveengineering/recipes/cloche/cyan_cactus.json b/src/main/resources/data/immersiveengineering/recipes/cloche/cyan_cactus.json index 0dfb7cd8..b3be1a29 100644 --- a/src/main/resources/data/immersiveengineering/recipes/cloche/cyan_cactus.json +++ b/src/main/resources/data/immersiveengineering/recipes/cloche/cyan_cactus.json @@ -19,7 +19,7 @@ } ], "soil": { - "tag": "forge:sand" + "tag": "c:sands" }, "time": 480 } \ No newline at end of file diff --git a/src/main/resources/data/immersiveengineering/recipes/cloche/cyan_cactus_crop.json b/src/main/resources/data/immersiveengineering/recipes/cloche/cyan_cactus_crop.json index 02c179ff..494a740f 100644 --- a/src/main/resources/data/immersiveengineering/recipes/cloche/cyan_cactus_crop.json +++ b/src/main/resources/data/immersiveengineering/recipes/cloche/cyan_cactus_crop.json @@ -28,7 +28,7 @@ } ], "soil": { - "tag": "forge:sand" + "tag": "c:sands" }, "time": 800 } \ No newline at end of file diff --git a/src/main/resources/data/immersiveengineering/recipes/cloche/gray_cactus.json b/src/main/resources/data/immersiveengineering/recipes/cloche/gray_cactus.json index 0797b525..e8000d4d 100644 --- a/src/main/resources/data/immersiveengineering/recipes/cloche/gray_cactus.json +++ b/src/main/resources/data/immersiveengineering/recipes/cloche/gray_cactus.json @@ -19,7 +19,7 @@ } ], "soil": { - "tag": "forge:sand" + "tag": "c:sands" }, "time": 480 } \ No newline at end of file diff --git a/src/main/resources/data/immersiveengineering/recipes/cloche/gray_cactus_crop.json b/src/main/resources/data/immersiveengineering/recipes/cloche/gray_cactus_crop.json index 7c7c57c6..a86cc701 100644 --- a/src/main/resources/data/immersiveengineering/recipes/cloche/gray_cactus_crop.json +++ b/src/main/resources/data/immersiveengineering/recipes/cloche/gray_cactus_crop.json @@ -28,7 +28,7 @@ } ], "soil": { - "tag": "forge:sand" + "tag": "c:sands" }, "time": 800 } \ No newline at end of file diff --git a/src/main/resources/data/immersiveengineering/recipes/cloche/green_cactus.json b/src/main/resources/data/immersiveengineering/recipes/cloche/green_cactus.json index ba39f54d..e09a83f5 100644 --- a/src/main/resources/data/immersiveengineering/recipes/cloche/green_cactus.json +++ b/src/main/resources/data/immersiveengineering/recipes/cloche/green_cactus.json @@ -19,7 +19,7 @@ } ], "soil": { - "tag": "forge:sand" + "tag": "c:sands" }, "time": 480 } \ No newline at end of file diff --git a/src/main/resources/data/immersiveengineering/recipes/cloche/green_cactus_crop.json b/src/main/resources/data/immersiveengineering/recipes/cloche/green_cactus_crop.json index 565dc3a4..ff14b1fe 100644 --- a/src/main/resources/data/immersiveengineering/recipes/cloche/green_cactus_crop.json +++ b/src/main/resources/data/immersiveengineering/recipes/cloche/green_cactus_crop.json @@ -28,7 +28,7 @@ } ], "soil": { - "tag": "forge:sand" + "tag": "c:sands" }, "time": 800 } \ No newline at end of file diff --git a/src/main/resources/data/immersiveengineering/recipes/cloche/light_blue_cactus.json b/src/main/resources/data/immersiveengineering/recipes/cloche/light_blue_cactus.json index e1ef64a0..53c7877f 100644 --- a/src/main/resources/data/immersiveengineering/recipes/cloche/light_blue_cactus.json +++ b/src/main/resources/data/immersiveengineering/recipes/cloche/light_blue_cactus.json @@ -19,7 +19,7 @@ } ], "soil": { - "tag": "forge:sand" + "tag": "c:sands" }, "time": 480 } \ No newline at end of file diff --git a/src/main/resources/data/immersiveengineering/recipes/cloche/light_blue_cactus_crop.json b/src/main/resources/data/immersiveengineering/recipes/cloche/light_blue_cactus_crop.json index 37b301e5..52268bc4 100644 --- a/src/main/resources/data/immersiveengineering/recipes/cloche/light_blue_cactus_crop.json +++ b/src/main/resources/data/immersiveengineering/recipes/cloche/light_blue_cactus_crop.json @@ -28,7 +28,7 @@ } ], "soil": { - "tag": "forge:sand" + "tag": "c:sands" }, "time": 800 } \ No newline at end of file diff --git a/src/main/resources/data/immersiveengineering/recipes/cloche/light_gray_cactus.json b/src/main/resources/data/immersiveengineering/recipes/cloche/light_gray_cactus.json index 91567ecd..5445e4bf 100644 --- a/src/main/resources/data/immersiveengineering/recipes/cloche/light_gray_cactus.json +++ b/src/main/resources/data/immersiveengineering/recipes/cloche/light_gray_cactus.json @@ -19,7 +19,7 @@ } ], "soil": { - "tag": "forge:sand" + "tag": "c:sands" }, "time": 480 } \ No newline at end of file diff --git a/src/main/resources/data/immersiveengineering/recipes/cloche/light_gray_cactus_crop.json b/src/main/resources/data/immersiveengineering/recipes/cloche/light_gray_cactus_crop.json index b04faa3e..4f4edcbc 100644 --- a/src/main/resources/data/immersiveengineering/recipes/cloche/light_gray_cactus_crop.json +++ b/src/main/resources/data/immersiveengineering/recipes/cloche/light_gray_cactus_crop.json @@ -28,7 +28,7 @@ } ], "soil": { - "tag": "forge:sand" + "tag": "c:sands" }, "time": 800 } \ No newline at end of file diff --git a/src/main/resources/data/immersiveengineering/recipes/cloche/lime_cactus.json b/src/main/resources/data/immersiveengineering/recipes/cloche/lime_cactus.json index 37922255..abbb3487 100644 --- a/src/main/resources/data/immersiveengineering/recipes/cloche/lime_cactus.json +++ b/src/main/resources/data/immersiveengineering/recipes/cloche/lime_cactus.json @@ -19,7 +19,7 @@ } ], "soil": { - "tag": "forge:sand" + "tag": "c:sands" }, "time": 480 } \ No newline at end of file diff --git a/src/main/resources/data/immersiveengineering/recipes/cloche/lime_cactus_crop.json b/src/main/resources/data/immersiveengineering/recipes/cloche/lime_cactus_crop.json index 68f1a602..ed82a212 100644 --- a/src/main/resources/data/immersiveengineering/recipes/cloche/lime_cactus_crop.json +++ b/src/main/resources/data/immersiveengineering/recipes/cloche/lime_cactus_crop.json @@ -28,7 +28,7 @@ } ], "soil": { - "tag": "forge:sand" + "tag": "c:sands" }, "time": 800 } \ No newline at end of file diff --git a/src/main/resources/data/immersiveengineering/recipes/cloche/magenta_cactus.json b/src/main/resources/data/immersiveengineering/recipes/cloche/magenta_cactus.json index 624f1932..747e5429 100644 --- a/src/main/resources/data/immersiveengineering/recipes/cloche/magenta_cactus.json +++ b/src/main/resources/data/immersiveengineering/recipes/cloche/magenta_cactus.json @@ -19,7 +19,7 @@ } ], "soil": { - "tag": "forge:sand" + "tag": "c:sands" }, "time": 480 } \ No newline at end of file diff --git a/src/main/resources/data/immersiveengineering/recipes/cloche/magenta_cactus_crop.json b/src/main/resources/data/immersiveengineering/recipes/cloche/magenta_cactus_crop.json index 56adc709..11cbd65e 100644 --- a/src/main/resources/data/immersiveengineering/recipes/cloche/magenta_cactus_crop.json +++ b/src/main/resources/data/immersiveengineering/recipes/cloche/magenta_cactus_crop.json @@ -28,7 +28,7 @@ } ], "soil": { - "tag": "forge:sand" + "tag": "c:sands" }, "time": 800 } \ No newline at end of file diff --git a/src/main/resources/data/immersiveengineering/recipes/cloche/orange_cactus.json b/src/main/resources/data/immersiveengineering/recipes/cloche/orange_cactus.json index fdbf0723..274858e2 100644 --- a/src/main/resources/data/immersiveengineering/recipes/cloche/orange_cactus.json +++ b/src/main/resources/data/immersiveengineering/recipes/cloche/orange_cactus.json @@ -19,7 +19,7 @@ } ], "soil": { - "tag": "forge:sand" + "tag": "c:sands" }, "time": 480 } \ No newline at end of file diff --git a/src/main/resources/data/immersiveengineering/recipes/cloche/orange_cactus_crop.json b/src/main/resources/data/immersiveengineering/recipes/cloche/orange_cactus_crop.json index 58abbd1c..de4a4cfe 100644 --- a/src/main/resources/data/immersiveengineering/recipes/cloche/orange_cactus_crop.json +++ b/src/main/resources/data/immersiveengineering/recipes/cloche/orange_cactus_crop.json @@ -28,7 +28,7 @@ } ], "soil": { - "tag": "forge:sand" + "tag": "c:sands" }, "time": 800 } \ No newline at end of file diff --git a/src/main/resources/data/immersiveengineering/recipes/cloche/pink_cactus.json b/src/main/resources/data/immersiveengineering/recipes/cloche/pink_cactus.json index c571eac3..ca0e07d9 100644 --- a/src/main/resources/data/immersiveengineering/recipes/cloche/pink_cactus.json +++ b/src/main/resources/data/immersiveengineering/recipes/cloche/pink_cactus.json @@ -19,7 +19,7 @@ } ], "soil": { - "tag": "forge:sand" + "tag": "c:sands" }, "time": 480 } \ No newline at end of file diff --git a/src/main/resources/data/immersiveengineering/recipes/cloche/pink_cactus_crop.json b/src/main/resources/data/immersiveengineering/recipes/cloche/pink_cactus_crop.json index f44efcbd..1d33f37b 100644 --- a/src/main/resources/data/immersiveengineering/recipes/cloche/pink_cactus_crop.json +++ b/src/main/resources/data/immersiveengineering/recipes/cloche/pink_cactus_crop.json @@ -28,7 +28,7 @@ } ], "soil": { - "tag": "forge:sand" + "tag": "c:sands" }, "time": 800 } \ No newline at end of file diff --git a/src/main/resources/data/immersiveengineering/recipes/cloche/purple_cactus.json b/src/main/resources/data/immersiveengineering/recipes/cloche/purple_cactus.json index 30de7513..5cb82c9c 100644 --- a/src/main/resources/data/immersiveengineering/recipes/cloche/purple_cactus.json +++ b/src/main/resources/data/immersiveengineering/recipes/cloche/purple_cactus.json @@ -19,7 +19,7 @@ } ], "soil": { - "tag": "forge:sand" + "tag": "c:sands" }, "time": 480 } \ No newline at end of file diff --git a/src/main/resources/data/immersiveengineering/recipes/cloche/purple_cactus_crop.json b/src/main/resources/data/immersiveengineering/recipes/cloche/purple_cactus_crop.json index cb158ec6..3ec85988 100644 --- a/src/main/resources/data/immersiveengineering/recipes/cloche/purple_cactus_crop.json +++ b/src/main/resources/data/immersiveengineering/recipes/cloche/purple_cactus_crop.json @@ -28,7 +28,7 @@ } ], "soil": { - "tag": "forge:sand" + "tag": "c:sands" }, "time": 800 } \ No newline at end of file diff --git a/src/main/resources/data/immersiveengineering/recipes/cloche/red_cactus.json b/src/main/resources/data/immersiveengineering/recipes/cloche/red_cactus.json index 474ecfbf..0a000a2d 100644 --- a/src/main/resources/data/immersiveengineering/recipes/cloche/red_cactus.json +++ b/src/main/resources/data/immersiveengineering/recipes/cloche/red_cactus.json @@ -19,7 +19,7 @@ } ], "soil": { - "tag": "forge:sand" + "tag": "c:sands" }, "time": 480 } \ No newline at end of file diff --git a/src/main/resources/data/immersiveengineering/recipes/cloche/red_cactus_crop.json b/src/main/resources/data/immersiveengineering/recipes/cloche/red_cactus_crop.json index 17de3675..2b2342a3 100644 --- a/src/main/resources/data/immersiveengineering/recipes/cloche/red_cactus_crop.json +++ b/src/main/resources/data/immersiveengineering/recipes/cloche/red_cactus_crop.json @@ -28,7 +28,7 @@ } ], "soil": { - "tag": "forge:sand" + "tag": "c:sands" }, "time": 800 } \ No newline at end of file diff --git a/src/main/resources/data/immersiveengineering/recipes/cloche/white_cactus.json b/src/main/resources/data/immersiveengineering/recipes/cloche/white_cactus.json index e40a2071..da34db1e 100644 --- a/src/main/resources/data/immersiveengineering/recipes/cloche/white_cactus.json +++ b/src/main/resources/data/immersiveengineering/recipes/cloche/white_cactus.json @@ -19,7 +19,7 @@ } ], "soil": { - "tag": "forge:sand" + "tag": "c:sands" }, "time": 480 } \ No newline at end of file diff --git a/src/main/resources/data/immersiveengineering/recipes/cloche/white_cactus_crop.json b/src/main/resources/data/immersiveengineering/recipes/cloche/white_cactus_crop.json index 74122281..a71f19ff 100644 --- a/src/main/resources/data/immersiveengineering/recipes/cloche/white_cactus_crop.json +++ b/src/main/resources/data/immersiveengineering/recipes/cloche/white_cactus_crop.json @@ -28,7 +28,7 @@ } ], "soil": { - "tag": "forge:sand" + "tag": "c:sands" }, "time": 800 } \ No newline at end of file diff --git a/src/main/resources/data/immersiveengineering/recipes/cloche/yellow_cactus.json b/src/main/resources/data/immersiveengineering/recipes/cloche/yellow_cactus.json index 8987d794..f10181ce 100644 --- a/src/main/resources/data/immersiveengineering/recipes/cloche/yellow_cactus.json +++ b/src/main/resources/data/immersiveengineering/recipes/cloche/yellow_cactus.json @@ -19,7 +19,7 @@ } ], "soil": { - "tag": "forge:sand" + "tag": "c:sands" }, "time": 480 } \ No newline at end of file diff --git a/src/main/resources/data/immersiveengineering/recipes/cloche/yellow_cactus_crop.json b/src/main/resources/data/immersiveengineering/recipes/cloche/yellow_cactus_crop.json index e6d07188..50a82444 100644 --- a/src/main/resources/data/immersiveengineering/recipes/cloche/yellow_cactus_crop.json +++ b/src/main/resources/data/immersiveengineering/recipes/cloche/yellow_cactus_crop.json @@ -28,7 +28,7 @@ } ], "soil": { - "tag": "forge:sand" + "tag": "c:sands" }, "time": 800 } \ No newline at end of file