diff --git a/.gitignore b/.gitignore index d46346a6..b57e8b3b 100644 --- a/.gitignore +++ b/.gitignore @@ -12,6 +12,7 @@ /classes /bin/ /run/ +/run-data/ /logs *.classpath @@ -20,4 +21,4 @@ *.launch .settings/org.eclipse.jdt.core.prefs *.prefs -.cache \ No newline at end of file +.cache diff --git a/build.gradle b/build.gradle index 574cb621..4df38c84 100644 --- a/build.gradle +++ b/build.gradle @@ -83,6 +83,9 @@ minecraft { source sourceSets.main } } + + property 'mixin.env.remapRefMap', 'true' + property 'mixin.env.refMapRemappingFile', "${projectDir}/build/createSrgToMcp/output.srg" } client { @@ -146,7 +149,7 @@ dependencies { // If the group id is "net.minecraft" and the artifact id is one of ["client", "server", "joined"], // then special handling is done to allow a setup of a vanilla dependency without the use of an external repository. minecraft "net.minecraftforge:forge:${minecraft_version}-${forge_version}" - + // Example mod dependency with JEI - using fg.deobf() ensures the dependency is remapped to your development mappings // The JEI API is declared for compile time use, while the full JEI artifact is used at runtime compileOnly fg.deobf("mezz.jei:jei-${minecraft_version}-common-api:${jei_version}") @@ -155,7 +158,7 @@ dependencies { runtimeOnly fg.deobf("top.theillusivec4.curios:curios-forge:${curios_version}") compileOnly fg.deobf("top.theillusivec4.curios:curios-forge:${curios_version}:api") - + compileOnly fg.deobf("vazkii.patchouli:Patchouli:${patchouli_version}:api") runtimeOnly fg.deobf("vazkii.patchouli:Patchouli:${patchouli_version}") diff --git a/src/generated/resources/data/minecraft/tags/blocks/mineable/axe.json b/src/generated/resources/data/minecraft/tags/blocks/mineable/axe.json deleted file mode 100644 index dba422d1..00000000 --- a/src/generated/resources/data/minecraft/tags/blocks/mineable/axe.json +++ /dev/null @@ -1,15 +0,0 @@ -{ - "values": [ - "naturesaura:ancient_bark", - "naturesaura:ancient_log", - "naturesaura:ancient_planks", - "naturesaura:ancient_slab", - "naturesaura:ancient_stairs", - "naturesaura:auto_crafter", - "naturesaura:flower_generator", - "naturesaura:nether_wart_mushroom", - "naturesaura:oak_generator", - "naturesaura:offering_table", - "naturesaura:wood_stand" - ] -} \ No newline at end of file diff --git a/src/generated/resources/data/minecraft/tags/blocks/mineable/pickaxe.json b/src/generated/resources/data/minecraft/tags/blocks/mineable/pickaxe.json deleted file mode 100644 index 347917f8..00000000 --- a/src/generated/resources/data/minecraft/tags/blocks/mineable/pickaxe.json +++ /dev/null @@ -1,49 +0,0 @@ -{ - "values": [ - "naturesaura:animal_container", - "naturesaura:animal_generator", - "naturesaura:animal_spawner", - "naturesaura:aura_detector", - "naturesaura:aura_timer", - "naturesaura:blast_furnace_booster", - "naturesaura:chorus_generator", - "naturesaura:chunk_loader", - "naturesaura:conversion_catalyst", - "naturesaura:crushing_catalyst", - "naturesaura:depth_ingot_block", - "naturesaura:ender_crate", - "naturesaura:field_creator", - "naturesaura:firework_generator", - "naturesaura:furnace_heater", - "naturesaura:generator_limit_remover", - "naturesaura:gold_brick", - "naturesaura:gold_nether_brick", - "naturesaura:grated_chute", - "naturesaura:hopper_upgrade", - "naturesaura:infused_brick", - "naturesaura:infused_brick_slab", - "naturesaura:infused_brick_stairs", - "naturesaura:infused_iron_block", - "naturesaura:infused_slab", - "naturesaura:infused_stairs", - "naturesaura:infused_stone", - "naturesaura:item_distributor", - "naturesaura:lower_limiter", - "naturesaura:moss_generator", - "naturesaura:nature_altar", - "naturesaura:nether_grass", - "naturesaura:pickup_stopper", - "naturesaura:placer", - "naturesaura:potion_generator", - "naturesaura:powder_placer", - "naturesaura:projectile_generator", - "naturesaura:rf_converter", - "naturesaura:sky_ingot_block", - "naturesaura:snow_creator", - "naturesaura:spawn_lamp", - "naturesaura:spring", - "naturesaura:tainted_gold_block", - "naturesaura:time_changer", - "naturesaura:weather_changer" - ] -} \ No newline at end of file diff --git a/src/generated/resources/data/forge/tags/items/tools/axes.json b/src/generated/resources/data/minecraft/tags/items/axes.json similarity index 100% rename from src/generated/resources/data/forge/tags/items/tools/axes.json rename to src/generated/resources/data/minecraft/tags/items/axes.json diff --git a/src/generated/resources/data/forge/tags/items/tools/hoes.json b/src/generated/resources/data/minecraft/tags/items/hoes.json similarity index 100% rename from src/generated/resources/data/forge/tags/items/tools/hoes.json rename to src/generated/resources/data/minecraft/tags/items/hoes.json diff --git a/src/generated/resources/data/forge/tags/items/tools/pickaxes.json b/src/generated/resources/data/minecraft/tags/items/pickaxes.json similarity index 100% rename from src/generated/resources/data/forge/tags/items/tools/pickaxes.json rename to src/generated/resources/data/minecraft/tags/items/pickaxes.json diff --git a/src/generated/resources/data/forge/tags/items/tools/shovels.json b/src/generated/resources/data/minecraft/tags/items/shovels.json similarity index 100% rename from src/generated/resources/data/forge/tags/items/tools/shovels.json rename to src/generated/resources/data/minecraft/tags/items/shovels.json diff --git a/src/generated/resources/data/forge/tags/items/tools/swords.json b/src/generated/resources/data/minecraft/tags/items/swords.json similarity index 100% rename from src/generated/resources/data/forge/tags/items/tools/swords.json rename to src/generated/resources/data/minecraft/tags/items/swords.json diff --git a/src/generated/resources/data/naturesaura/loot_tables/blocks/ancient_bark.json b/src/generated/resources/data/naturesaura/loot_tables/blocks/ancient_bark.json index e6dafdca..0e040ce9 100644 --- a/src/generated/resources/data/naturesaura/loot_tables/blocks/ancient_bark.json +++ b/src/generated/resources/data/naturesaura/loot_tables/blocks/ancient_bark.json @@ -16,5 +16,6 @@ ], "rolls": 1.0 } - ] + ], + "random_sequence": "naturesaura:blocks/ancient_bark" } \ No newline at end of file diff --git a/src/generated/resources/data/naturesaura/loot_tables/blocks/ancient_leaves.json b/src/generated/resources/data/naturesaura/loot_tables/blocks/ancient_leaves.json index c2b294ea..2e4efaca 100644 --- a/src/generated/resources/data/naturesaura/loot_tables/blocks/ancient_leaves.json +++ b/src/generated/resources/data/naturesaura/loot_tables/blocks/ancient_leaves.json @@ -26,5 +26,6 @@ ], "rolls": 1.0 } - ] + ], + "random_sequence": "naturesaura:blocks/ancient_leaves" } \ No newline at end of file diff --git a/src/generated/resources/data/naturesaura/loot_tables/blocks/ancient_log.json b/src/generated/resources/data/naturesaura/loot_tables/blocks/ancient_log.json index 80f844fa..057b05d9 100644 --- a/src/generated/resources/data/naturesaura/loot_tables/blocks/ancient_log.json +++ b/src/generated/resources/data/naturesaura/loot_tables/blocks/ancient_log.json @@ -16,5 +16,6 @@ ], "rolls": 1.0 } - ] + ], + "random_sequence": "naturesaura:blocks/ancient_log" } \ No newline at end of file diff --git a/src/generated/resources/data/naturesaura/loot_tables/blocks/ancient_planks.json b/src/generated/resources/data/naturesaura/loot_tables/blocks/ancient_planks.json index fef8f7cd..2ea4f1c1 100644 --- a/src/generated/resources/data/naturesaura/loot_tables/blocks/ancient_planks.json +++ b/src/generated/resources/data/naturesaura/loot_tables/blocks/ancient_planks.json @@ -16,5 +16,6 @@ ], "rolls": 1.0 } - ] + ], + "random_sequence": "naturesaura:blocks/ancient_planks" } \ No newline at end of file diff --git a/src/generated/resources/data/naturesaura/loot_tables/blocks/ancient_sapling.json b/src/generated/resources/data/naturesaura/loot_tables/blocks/ancient_sapling.json index 2cc4a01e..e1710527 100644 --- a/src/generated/resources/data/naturesaura/loot_tables/blocks/ancient_sapling.json +++ b/src/generated/resources/data/naturesaura/loot_tables/blocks/ancient_sapling.json @@ -16,5 +16,6 @@ ], "rolls": 1.0 } - ] + ], + "random_sequence": "naturesaura:blocks/ancient_sapling" } \ No newline at end of file diff --git a/src/generated/resources/data/naturesaura/loot_tables/blocks/ancient_slab.json b/src/generated/resources/data/naturesaura/loot_tables/blocks/ancient_slab.json index f2543c6f..e4cd9094 100644 --- a/src/generated/resources/data/naturesaura/loot_tables/blocks/ancient_slab.json +++ b/src/generated/resources/data/naturesaura/loot_tables/blocks/ancient_slab.json @@ -30,5 +30,6 @@ ], "rolls": 1.0 } - ] + ], + "random_sequence": "naturesaura:blocks/ancient_slab" } \ No newline at end of file diff --git a/src/generated/resources/data/naturesaura/loot_tables/blocks/ancient_stairs.json b/src/generated/resources/data/naturesaura/loot_tables/blocks/ancient_stairs.json index 46c95bdc..d0569831 100644 --- a/src/generated/resources/data/naturesaura/loot_tables/blocks/ancient_stairs.json +++ b/src/generated/resources/data/naturesaura/loot_tables/blocks/ancient_stairs.json @@ -16,5 +16,6 @@ ], "rolls": 1.0 } - ] + ], + "random_sequence": "naturesaura:blocks/ancient_stairs" } \ No newline at end of file diff --git a/src/generated/resources/data/naturesaura/loot_tables/blocks/animal_container.json b/src/generated/resources/data/naturesaura/loot_tables/blocks/animal_container.json index 7b9a73ae..2e129bf9 100644 --- a/src/generated/resources/data/naturesaura/loot_tables/blocks/animal_container.json +++ b/src/generated/resources/data/naturesaura/loot_tables/blocks/animal_container.json @@ -16,5 +16,6 @@ ], "rolls": 1.0 } - ] + ], + "random_sequence": "naturesaura:blocks/animal_container" } \ No newline at end of file diff --git a/src/generated/resources/data/naturesaura/loot_tables/blocks/animal_generator.json b/src/generated/resources/data/naturesaura/loot_tables/blocks/animal_generator.json index 6aeb0579..1acc25f6 100644 --- a/src/generated/resources/data/naturesaura/loot_tables/blocks/animal_generator.json +++ b/src/generated/resources/data/naturesaura/loot_tables/blocks/animal_generator.json @@ -16,5 +16,6 @@ ], "rolls": 1.0 } - ] + ], + "random_sequence": "naturesaura:blocks/animal_generator" } \ No newline at end of file diff --git a/src/generated/resources/data/naturesaura/loot_tables/blocks/animal_spawner.json b/src/generated/resources/data/naturesaura/loot_tables/blocks/animal_spawner.json index 6ec4e70c..346f5e51 100644 --- a/src/generated/resources/data/naturesaura/loot_tables/blocks/animal_spawner.json +++ b/src/generated/resources/data/naturesaura/loot_tables/blocks/animal_spawner.json @@ -16,5 +16,6 @@ ], "rolls": 1.0 } - ] + ], + "random_sequence": "naturesaura:blocks/animal_spawner" } \ No newline at end of file diff --git a/src/generated/resources/data/naturesaura/loot_tables/blocks/aura_bloom.json b/src/generated/resources/data/naturesaura/loot_tables/blocks/aura_bloom.json index b916ceb9..2360613b 100644 --- a/src/generated/resources/data/naturesaura/loot_tables/blocks/aura_bloom.json +++ b/src/generated/resources/data/naturesaura/loot_tables/blocks/aura_bloom.json @@ -16,5 +16,6 @@ ], "rolls": 1.0 } - ] + ], + "random_sequence": "naturesaura:blocks/aura_bloom" } \ No newline at end of file diff --git a/src/generated/resources/data/naturesaura/loot_tables/blocks/aura_cactus.json b/src/generated/resources/data/naturesaura/loot_tables/blocks/aura_cactus.json index 779c24bd..58744bc5 100644 --- a/src/generated/resources/data/naturesaura/loot_tables/blocks/aura_cactus.json +++ b/src/generated/resources/data/naturesaura/loot_tables/blocks/aura_cactus.json @@ -16,5 +16,6 @@ ], "rolls": 1.0 } - ] + ], + "random_sequence": "naturesaura:blocks/aura_cactus" } \ No newline at end of file diff --git a/src/generated/resources/data/naturesaura/loot_tables/blocks/aura_detector.json b/src/generated/resources/data/naturesaura/loot_tables/blocks/aura_detector.json index 21c29033..f5b4f96f 100644 --- a/src/generated/resources/data/naturesaura/loot_tables/blocks/aura_detector.json +++ b/src/generated/resources/data/naturesaura/loot_tables/blocks/aura_detector.json @@ -16,5 +16,6 @@ ], "rolls": 1.0 } - ] + ], + "random_sequence": "naturesaura:blocks/aura_detector" } \ No newline at end of file diff --git a/src/generated/resources/data/naturesaura/loot_tables/blocks/aura_mushroom.json b/src/generated/resources/data/naturesaura/loot_tables/blocks/aura_mushroom.json index 28a28b42..1f6f2d8e 100644 --- a/src/generated/resources/data/naturesaura/loot_tables/blocks/aura_mushroom.json +++ b/src/generated/resources/data/naturesaura/loot_tables/blocks/aura_mushroom.json @@ -16,5 +16,6 @@ ], "rolls": 1.0 } - ] + ], + "random_sequence": "naturesaura:blocks/aura_mushroom" } \ No newline at end of file diff --git a/src/generated/resources/data/naturesaura/loot_tables/blocks/aura_timer.json b/src/generated/resources/data/naturesaura/loot_tables/blocks/aura_timer.json index 40ede75e..f1c0b746 100644 --- a/src/generated/resources/data/naturesaura/loot_tables/blocks/aura_timer.json +++ b/src/generated/resources/data/naturesaura/loot_tables/blocks/aura_timer.json @@ -16,5 +16,6 @@ ], "rolls": 1.0 } - ] + ], + "random_sequence": "naturesaura:blocks/aura_timer" } \ No newline at end of file diff --git a/src/generated/resources/data/naturesaura/loot_tables/blocks/auto_crafter.json b/src/generated/resources/data/naturesaura/loot_tables/blocks/auto_crafter.json index 1d0b1ddc..b64e7a8b 100644 --- a/src/generated/resources/data/naturesaura/loot_tables/blocks/auto_crafter.json +++ b/src/generated/resources/data/naturesaura/loot_tables/blocks/auto_crafter.json @@ -16,5 +16,6 @@ ], "rolls": 1.0 } - ] + ], + "random_sequence": "naturesaura:blocks/auto_crafter" } \ No newline at end of file diff --git a/src/generated/resources/data/naturesaura/loot_tables/blocks/blast_furnace_booster.json b/src/generated/resources/data/naturesaura/loot_tables/blocks/blast_furnace_booster.json index bdb41966..a530635e 100644 --- a/src/generated/resources/data/naturesaura/loot_tables/blocks/blast_furnace_booster.json +++ b/src/generated/resources/data/naturesaura/loot_tables/blocks/blast_furnace_booster.json @@ -16,5 +16,6 @@ ], "rolls": 1.0 } - ] + ], + "random_sequence": "naturesaura:blocks/blast_furnace_booster" } \ No newline at end of file diff --git a/src/generated/resources/data/naturesaura/loot_tables/blocks/chorus_generator.json b/src/generated/resources/data/naturesaura/loot_tables/blocks/chorus_generator.json index 4b739d84..a11156b0 100644 --- a/src/generated/resources/data/naturesaura/loot_tables/blocks/chorus_generator.json +++ b/src/generated/resources/data/naturesaura/loot_tables/blocks/chorus_generator.json @@ -16,5 +16,6 @@ ], "rolls": 1.0 } - ] + ], + "random_sequence": "naturesaura:blocks/chorus_generator" } \ No newline at end of file diff --git a/src/generated/resources/data/naturesaura/loot_tables/blocks/chunk_loader.json b/src/generated/resources/data/naturesaura/loot_tables/blocks/chunk_loader.json index 500bb390..028f7cf7 100644 --- a/src/generated/resources/data/naturesaura/loot_tables/blocks/chunk_loader.json +++ b/src/generated/resources/data/naturesaura/loot_tables/blocks/chunk_loader.json @@ -16,5 +16,6 @@ ], "rolls": 1.0 } - ] + ], + "random_sequence": "naturesaura:blocks/chunk_loader" } \ No newline at end of file diff --git a/src/generated/resources/data/naturesaura/loot_tables/blocks/conversion_catalyst.json b/src/generated/resources/data/naturesaura/loot_tables/blocks/conversion_catalyst.json index d3a6b045..4e7e230a 100644 --- a/src/generated/resources/data/naturesaura/loot_tables/blocks/conversion_catalyst.json +++ b/src/generated/resources/data/naturesaura/loot_tables/blocks/conversion_catalyst.json @@ -16,5 +16,6 @@ ], "rolls": 1.0 } - ] + ], + "random_sequence": "naturesaura:blocks/conversion_catalyst" } \ No newline at end of file diff --git a/src/generated/resources/data/naturesaura/loot_tables/blocks/crimson_aura_mushroom.json b/src/generated/resources/data/naturesaura/loot_tables/blocks/crimson_aura_mushroom.json index c5da10b3..3c5ad39e 100644 --- a/src/generated/resources/data/naturesaura/loot_tables/blocks/crimson_aura_mushroom.json +++ b/src/generated/resources/data/naturesaura/loot_tables/blocks/crimson_aura_mushroom.json @@ -16,5 +16,6 @@ ], "rolls": 1.0 } - ] + ], + "random_sequence": "naturesaura:blocks/crimson_aura_mushroom" } \ No newline at end of file diff --git a/src/generated/resources/data/naturesaura/loot_tables/blocks/crushing_catalyst.json b/src/generated/resources/data/naturesaura/loot_tables/blocks/crushing_catalyst.json index d22723fb..c46cad2b 100644 --- a/src/generated/resources/data/naturesaura/loot_tables/blocks/crushing_catalyst.json +++ b/src/generated/resources/data/naturesaura/loot_tables/blocks/crushing_catalyst.json @@ -16,5 +16,6 @@ ], "rolls": 1.0 } - ] + ], + "random_sequence": "naturesaura:blocks/crushing_catalyst" } \ No newline at end of file diff --git a/src/generated/resources/data/naturesaura/loot_tables/blocks/decayed_leaves.json b/src/generated/resources/data/naturesaura/loot_tables/blocks/decayed_leaves.json index f57dfc11..11897e2e 100644 --- a/src/generated/resources/data/naturesaura/loot_tables/blocks/decayed_leaves.json +++ b/src/generated/resources/data/naturesaura/loot_tables/blocks/decayed_leaves.json @@ -26,5 +26,6 @@ ], "rolls": 1.0 } - ] + ], + "random_sequence": "naturesaura:blocks/decayed_leaves" } \ No newline at end of file diff --git a/src/generated/resources/data/naturesaura/loot_tables/blocks/depth_ingot_block.json b/src/generated/resources/data/naturesaura/loot_tables/blocks/depth_ingot_block.json index 4e02915c..2d4fae94 100644 --- a/src/generated/resources/data/naturesaura/loot_tables/blocks/depth_ingot_block.json +++ b/src/generated/resources/data/naturesaura/loot_tables/blocks/depth_ingot_block.json @@ -16,5 +16,6 @@ ], "rolls": 1.0 } - ] + ], + "random_sequence": "naturesaura:blocks/depth_ingot_block" } \ No newline at end of file diff --git a/src/generated/resources/data/naturesaura/loot_tables/blocks/dimension_rail_end.json b/src/generated/resources/data/naturesaura/loot_tables/blocks/dimension_rail_end.json index aa2db254..1ef649df 100644 --- a/src/generated/resources/data/naturesaura/loot_tables/blocks/dimension_rail_end.json +++ b/src/generated/resources/data/naturesaura/loot_tables/blocks/dimension_rail_end.json @@ -16,5 +16,6 @@ ], "rolls": 1.0 } - ] + ], + "random_sequence": "naturesaura:blocks/dimension_rail_end" } \ No newline at end of file diff --git a/src/generated/resources/data/naturesaura/loot_tables/blocks/dimension_rail_nether.json b/src/generated/resources/data/naturesaura/loot_tables/blocks/dimension_rail_nether.json index bba34e54..567532ff 100644 --- a/src/generated/resources/data/naturesaura/loot_tables/blocks/dimension_rail_nether.json +++ b/src/generated/resources/data/naturesaura/loot_tables/blocks/dimension_rail_nether.json @@ -16,5 +16,6 @@ ], "rolls": 1.0 } - ] + ], + "random_sequence": "naturesaura:blocks/dimension_rail_nether" } \ No newline at end of file diff --git a/src/generated/resources/data/naturesaura/loot_tables/blocks/dimension_rail_overworld.json b/src/generated/resources/data/naturesaura/loot_tables/blocks/dimension_rail_overworld.json index ce588b83..6cd45c90 100644 --- a/src/generated/resources/data/naturesaura/loot_tables/blocks/dimension_rail_overworld.json +++ b/src/generated/resources/data/naturesaura/loot_tables/blocks/dimension_rail_overworld.json @@ -16,5 +16,6 @@ ], "rolls": 1.0 } - ] + ], + "random_sequence": "naturesaura:blocks/dimension_rail_overworld" } \ No newline at end of file diff --git a/src/generated/resources/data/naturesaura/loot_tables/blocks/end_flower.json b/src/generated/resources/data/naturesaura/loot_tables/blocks/end_flower.json index ec59aabb..104f118c 100644 --- a/src/generated/resources/data/naturesaura/loot_tables/blocks/end_flower.json +++ b/src/generated/resources/data/naturesaura/loot_tables/blocks/end_flower.json @@ -16,5 +16,6 @@ ], "rolls": 1.0 } - ] + ], + "random_sequence": "naturesaura:blocks/end_flower" } \ No newline at end of file diff --git a/src/generated/resources/data/naturesaura/loot_tables/blocks/ender_crate.json b/src/generated/resources/data/naturesaura/loot_tables/blocks/ender_crate.json index eb9420f8..33277152 100644 --- a/src/generated/resources/data/naturesaura/loot_tables/blocks/ender_crate.json +++ b/src/generated/resources/data/naturesaura/loot_tables/blocks/ender_crate.json @@ -16,5 +16,6 @@ ], "rolls": 1.0 } - ] + ], + "random_sequence": "naturesaura:blocks/ender_crate" } \ No newline at end of file diff --git a/src/generated/resources/data/naturesaura/loot_tables/blocks/field_creator.json b/src/generated/resources/data/naturesaura/loot_tables/blocks/field_creator.json index 84b87c21..8e51bf4a 100644 --- a/src/generated/resources/data/naturesaura/loot_tables/blocks/field_creator.json +++ b/src/generated/resources/data/naturesaura/loot_tables/blocks/field_creator.json @@ -16,5 +16,6 @@ ], "rolls": 1.0 } - ] + ], + "random_sequence": "naturesaura:blocks/field_creator" } \ No newline at end of file diff --git a/src/generated/resources/data/naturesaura/loot_tables/blocks/firework_generator.json b/src/generated/resources/data/naturesaura/loot_tables/blocks/firework_generator.json index 32a2ad3a..0a05e6a7 100644 --- a/src/generated/resources/data/naturesaura/loot_tables/blocks/firework_generator.json +++ b/src/generated/resources/data/naturesaura/loot_tables/blocks/firework_generator.json @@ -16,5 +16,6 @@ ], "rolls": 1.0 } - ] + ], + "random_sequence": "naturesaura:blocks/firework_generator" } \ No newline at end of file diff --git a/src/generated/resources/data/naturesaura/loot_tables/blocks/flower_generator.json b/src/generated/resources/data/naturesaura/loot_tables/blocks/flower_generator.json index 4d1c4eb0..df844dd7 100644 --- a/src/generated/resources/data/naturesaura/loot_tables/blocks/flower_generator.json +++ b/src/generated/resources/data/naturesaura/loot_tables/blocks/flower_generator.json @@ -16,5 +16,6 @@ ], "rolls": 1.0 } - ] + ], + "random_sequence": "naturesaura:blocks/flower_generator" } \ No newline at end of file diff --git a/src/generated/resources/data/naturesaura/loot_tables/blocks/furnace_heater.json b/src/generated/resources/data/naturesaura/loot_tables/blocks/furnace_heater.json index 1820f593..e06ef0a3 100644 --- a/src/generated/resources/data/naturesaura/loot_tables/blocks/furnace_heater.json +++ b/src/generated/resources/data/naturesaura/loot_tables/blocks/furnace_heater.json @@ -16,5 +16,6 @@ ], "rolls": 1.0 } - ] + ], + "random_sequence": "naturesaura:blocks/furnace_heater" } \ No newline at end of file diff --git a/src/generated/resources/data/naturesaura/loot_tables/blocks/generator_limit_remover.json b/src/generated/resources/data/naturesaura/loot_tables/blocks/generator_limit_remover.json index 68766ef6..62d6b175 100644 --- a/src/generated/resources/data/naturesaura/loot_tables/blocks/generator_limit_remover.json +++ b/src/generated/resources/data/naturesaura/loot_tables/blocks/generator_limit_remover.json @@ -16,5 +16,6 @@ ], "rolls": 1.0 } - ] + ], + "random_sequence": "naturesaura:blocks/generator_limit_remover" } \ No newline at end of file diff --git a/src/generated/resources/data/naturesaura/loot_tables/blocks/gold_brick.json b/src/generated/resources/data/naturesaura/loot_tables/blocks/gold_brick.json index 3e22e427..e5175417 100644 --- a/src/generated/resources/data/naturesaura/loot_tables/blocks/gold_brick.json +++ b/src/generated/resources/data/naturesaura/loot_tables/blocks/gold_brick.json @@ -16,5 +16,6 @@ ], "rolls": 1.0 } - ] + ], + "random_sequence": "naturesaura:blocks/gold_brick" } \ No newline at end of file diff --git a/src/generated/resources/data/naturesaura/loot_tables/blocks/gold_nether_brick.json b/src/generated/resources/data/naturesaura/loot_tables/blocks/gold_nether_brick.json index 975ac53a..647a0b89 100644 --- a/src/generated/resources/data/naturesaura/loot_tables/blocks/gold_nether_brick.json +++ b/src/generated/resources/data/naturesaura/loot_tables/blocks/gold_nether_brick.json @@ -16,5 +16,6 @@ ], "rolls": 1.0 } - ] + ], + "random_sequence": "naturesaura:blocks/gold_nether_brick" } \ No newline at end of file diff --git a/src/generated/resources/data/naturesaura/loot_tables/blocks/gold_powder.json b/src/generated/resources/data/naturesaura/loot_tables/blocks/gold_powder.json index 676d322a..29fbb2fa 100644 --- a/src/generated/resources/data/naturesaura/loot_tables/blocks/gold_powder.json +++ b/src/generated/resources/data/naturesaura/loot_tables/blocks/gold_powder.json @@ -16,5 +16,6 @@ ], "rolls": 1.0 } - ] + ], + "random_sequence": "naturesaura:blocks/gold_powder" } \ No newline at end of file diff --git a/src/generated/resources/data/naturesaura/loot_tables/blocks/golden_leaves.json b/src/generated/resources/data/naturesaura/loot_tables/blocks/golden_leaves.json index b08b4687..b14c089d 100644 --- a/src/generated/resources/data/naturesaura/loot_tables/blocks/golden_leaves.json +++ b/src/generated/resources/data/naturesaura/loot_tables/blocks/golden_leaves.json @@ -29,5 +29,6 @@ ], "rolls": 1.0 } - ] + ], + "random_sequence": "naturesaura:blocks/golden_leaves" } \ No newline at end of file diff --git a/src/generated/resources/data/naturesaura/loot_tables/blocks/grated_chute.json b/src/generated/resources/data/naturesaura/loot_tables/blocks/grated_chute.json index 7eaa42ed..2cf03228 100644 --- a/src/generated/resources/data/naturesaura/loot_tables/blocks/grated_chute.json +++ b/src/generated/resources/data/naturesaura/loot_tables/blocks/grated_chute.json @@ -16,5 +16,6 @@ ], "rolls": 1.0 } - ] + ], + "random_sequence": "naturesaura:blocks/grated_chute" } \ No newline at end of file diff --git a/src/generated/resources/data/naturesaura/loot_tables/blocks/hopper_upgrade.json b/src/generated/resources/data/naturesaura/loot_tables/blocks/hopper_upgrade.json index 042c8263..fd3a0517 100644 --- a/src/generated/resources/data/naturesaura/loot_tables/blocks/hopper_upgrade.json +++ b/src/generated/resources/data/naturesaura/loot_tables/blocks/hopper_upgrade.json @@ -16,5 +16,6 @@ ], "rolls": 1.0 } - ] + ], + "random_sequence": "naturesaura:blocks/hopper_upgrade" } \ No newline at end of file diff --git a/src/generated/resources/data/naturesaura/loot_tables/blocks/infused_brick.json b/src/generated/resources/data/naturesaura/loot_tables/blocks/infused_brick.json index c9f0ece9..022e9a1a 100644 --- a/src/generated/resources/data/naturesaura/loot_tables/blocks/infused_brick.json +++ b/src/generated/resources/data/naturesaura/loot_tables/blocks/infused_brick.json @@ -16,5 +16,6 @@ ], "rolls": 1.0 } - ] + ], + "random_sequence": "naturesaura:blocks/infused_brick" } \ No newline at end of file diff --git a/src/generated/resources/data/naturesaura/loot_tables/blocks/infused_brick_slab.json b/src/generated/resources/data/naturesaura/loot_tables/blocks/infused_brick_slab.json index 6332f446..dfe756a9 100644 --- a/src/generated/resources/data/naturesaura/loot_tables/blocks/infused_brick_slab.json +++ b/src/generated/resources/data/naturesaura/loot_tables/blocks/infused_brick_slab.json @@ -30,5 +30,6 @@ ], "rolls": 1.0 } - ] + ], + "random_sequence": "naturesaura:blocks/infused_brick_slab" } \ No newline at end of file diff --git a/src/generated/resources/data/naturesaura/loot_tables/blocks/infused_brick_stairs.json b/src/generated/resources/data/naturesaura/loot_tables/blocks/infused_brick_stairs.json index 667d61f6..453c3fd4 100644 --- a/src/generated/resources/data/naturesaura/loot_tables/blocks/infused_brick_stairs.json +++ b/src/generated/resources/data/naturesaura/loot_tables/blocks/infused_brick_stairs.json @@ -16,5 +16,6 @@ ], "rolls": 1.0 } - ] + ], + "random_sequence": "naturesaura:blocks/infused_brick_stairs" } \ No newline at end of file diff --git a/src/generated/resources/data/naturesaura/loot_tables/blocks/infused_iron_block.json b/src/generated/resources/data/naturesaura/loot_tables/blocks/infused_iron_block.json index c589b107..a54ba958 100644 --- a/src/generated/resources/data/naturesaura/loot_tables/blocks/infused_iron_block.json +++ b/src/generated/resources/data/naturesaura/loot_tables/blocks/infused_iron_block.json @@ -16,5 +16,6 @@ ], "rolls": 1.0 } - ] + ], + "random_sequence": "naturesaura:blocks/infused_iron_block" } \ No newline at end of file diff --git a/src/generated/resources/data/naturesaura/loot_tables/blocks/infused_slab.json b/src/generated/resources/data/naturesaura/loot_tables/blocks/infused_slab.json index eff6ff82..5a594e45 100644 --- a/src/generated/resources/data/naturesaura/loot_tables/blocks/infused_slab.json +++ b/src/generated/resources/data/naturesaura/loot_tables/blocks/infused_slab.json @@ -30,5 +30,6 @@ ], "rolls": 1.0 } - ] + ], + "random_sequence": "naturesaura:blocks/infused_slab" } \ No newline at end of file diff --git a/src/generated/resources/data/naturesaura/loot_tables/blocks/infused_stairs.json b/src/generated/resources/data/naturesaura/loot_tables/blocks/infused_stairs.json index e91f09e8..c5ce1316 100644 --- a/src/generated/resources/data/naturesaura/loot_tables/blocks/infused_stairs.json +++ b/src/generated/resources/data/naturesaura/loot_tables/blocks/infused_stairs.json @@ -16,5 +16,6 @@ ], "rolls": 1.0 } - ] + ], + "random_sequence": "naturesaura:blocks/infused_stairs" } \ No newline at end of file diff --git a/src/generated/resources/data/naturesaura/loot_tables/blocks/infused_stone.json b/src/generated/resources/data/naturesaura/loot_tables/blocks/infused_stone.json index f771aba8..ad4ad4be 100644 --- a/src/generated/resources/data/naturesaura/loot_tables/blocks/infused_stone.json +++ b/src/generated/resources/data/naturesaura/loot_tables/blocks/infused_stone.json @@ -16,5 +16,6 @@ ], "rolls": 1.0 } - ] + ], + "random_sequence": "naturesaura:blocks/infused_stone" } \ No newline at end of file diff --git a/src/generated/resources/data/naturesaura/loot_tables/blocks/item_distributor.json b/src/generated/resources/data/naturesaura/loot_tables/blocks/item_distributor.json index fcefd336..14038de5 100644 --- a/src/generated/resources/data/naturesaura/loot_tables/blocks/item_distributor.json +++ b/src/generated/resources/data/naturesaura/loot_tables/blocks/item_distributor.json @@ -16,5 +16,6 @@ ], "rolls": 1.0 } - ] + ], + "random_sequence": "naturesaura:blocks/item_distributor" } \ No newline at end of file diff --git a/src/generated/resources/data/naturesaura/loot_tables/blocks/light.json b/src/generated/resources/data/naturesaura/loot_tables/blocks/light.json index 38fe9914..49f1b732 100644 --- a/src/generated/resources/data/naturesaura/loot_tables/blocks/light.json +++ b/src/generated/resources/data/naturesaura/loot_tables/blocks/light.json @@ -16,5 +16,6 @@ ], "rolls": 1.0 } - ] + ], + "random_sequence": "naturesaura:blocks/light" } \ No newline at end of file diff --git a/src/generated/resources/data/naturesaura/loot_tables/blocks/lower_limiter.json b/src/generated/resources/data/naturesaura/loot_tables/blocks/lower_limiter.json index 6497b732..09dbfd90 100644 --- a/src/generated/resources/data/naturesaura/loot_tables/blocks/lower_limiter.json +++ b/src/generated/resources/data/naturesaura/loot_tables/blocks/lower_limiter.json @@ -16,5 +16,6 @@ ], "rolls": 1.0 } - ] + ], + "random_sequence": "naturesaura:blocks/lower_limiter" } \ No newline at end of file diff --git a/src/generated/resources/data/naturesaura/loot_tables/blocks/moss_generator.json b/src/generated/resources/data/naturesaura/loot_tables/blocks/moss_generator.json index d8e67167..dad2666f 100644 --- a/src/generated/resources/data/naturesaura/loot_tables/blocks/moss_generator.json +++ b/src/generated/resources/data/naturesaura/loot_tables/blocks/moss_generator.json @@ -16,5 +16,6 @@ ], "rolls": 1.0 } - ] + ], + "random_sequence": "naturesaura:blocks/moss_generator" } \ No newline at end of file diff --git a/src/generated/resources/data/naturesaura/loot_tables/blocks/nature_altar.json b/src/generated/resources/data/naturesaura/loot_tables/blocks/nature_altar.json index ad3e458d..7b78d130 100644 --- a/src/generated/resources/data/naturesaura/loot_tables/blocks/nature_altar.json +++ b/src/generated/resources/data/naturesaura/loot_tables/blocks/nature_altar.json @@ -16,5 +16,6 @@ ], "rolls": 1.0 } - ] + ], + "random_sequence": "naturesaura:blocks/nature_altar" } \ No newline at end of file diff --git a/src/generated/resources/data/naturesaura/loot_tables/blocks/nether_grass.json b/src/generated/resources/data/naturesaura/loot_tables/blocks/nether_grass.json index e9d40aa1..98b88ecb 100644 --- a/src/generated/resources/data/naturesaura/loot_tables/blocks/nether_grass.json +++ b/src/generated/resources/data/naturesaura/loot_tables/blocks/nether_grass.json @@ -11,30 +11,17 @@ "type": "minecraft:item", "conditions": [ { - "condition": "minecraft:alternative", - "terms": [ - { - "condition": "minecraft:match_tool", - "predicate": { - "items": [ - "minecraft:shears" - ] + "condition": "minecraft:match_tool", + "predicate": { + "enchantments": [ + { + "enchantment": "minecraft:silk_touch", + "levels": { + "min": 1 + } } - }, - { - "condition": "minecraft:match_tool", - "predicate": { - "enchantments": [ - { - "enchantment": "minecraft:silk_touch", - "levels": { - "min": 1 - } - } - ] - } - } - ] + ] + } } ], "name": "naturesaura:nether_grass" @@ -48,5 +35,6 @@ ], "rolls": 1.0 } - ] + ], + "random_sequence": "naturesaura:blocks/nether_grass" } \ No newline at end of file diff --git a/src/generated/resources/data/naturesaura/loot_tables/blocks/nether_wart_mushroom.json b/src/generated/resources/data/naturesaura/loot_tables/blocks/nether_wart_mushroom.json index 8d6575e2..7a3b9e06 100644 --- a/src/generated/resources/data/naturesaura/loot_tables/blocks/nether_wart_mushroom.json +++ b/src/generated/resources/data/naturesaura/loot_tables/blocks/nether_wart_mushroom.json @@ -11,30 +11,17 @@ "type": "minecraft:item", "conditions": [ { - "condition": "minecraft:alternative", - "terms": [ - { - "condition": "minecraft:match_tool", - "predicate": { - "items": [ - "minecraft:shears" - ] + "condition": "minecraft:match_tool", + "predicate": { + "enchantments": [ + { + "enchantment": "minecraft:silk_touch", + "levels": { + "min": 1 + } } - }, - { - "condition": "minecraft:match_tool", - "predicate": { - "enchantments": [ - { - "enchantment": "minecraft:silk_touch", - "levels": { - "min": 1 - } - } - ] - } - } - ] + ] + } } ], "name": "naturesaura:nether_wart_mushroom" @@ -59,5 +46,6 @@ ], "rolls": 1.0 } - ] + ], + "random_sequence": "naturesaura:blocks/nether_wart_mushroom" } \ No newline at end of file diff --git a/src/generated/resources/data/naturesaura/loot_tables/blocks/oak_generator.json b/src/generated/resources/data/naturesaura/loot_tables/blocks/oak_generator.json index 4febda35..09082129 100644 --- a/src/generated/resources/data/naturesaura/loot_tables/blocks/oak_generator.json +++ b/src/generated/resources/data/naturesaura/loot_tables/blocks/oak_generator.json @@ -16,5 +16,6 @@ ], "rolls": 1.0 } - ] + ], + "random_sequence": "naturesaura:blocks/oak_generator" } \ No newline at end of file diff --git a/src/generated/resources/data/naturesaura/loot_tables/blocks/offering_table.json b/src/generated/resources/data/naturesaura/loot_tables/blocks/offering_table.json index 90762319..d5d37cea 100644 --- a/src/generated/resources/data/naturesaura/loot_tables/blocks/offering_table.json +++ b/src/generated/resources/data/naturesaura/loot_tables/blocks/offering_table.json @@ -16,5 +16,6 @@ ], "rolls": 1.0 } - ] + ], + "random_sequence": "naturesaura:blocks/offering_table" } \ No newline at end of file diff --git a/src/generated/resources/data/naturesaura/loot_tables/blocks/pickup_stopper.json b/src/generated/resources/data/naturesaura/loot_tables/blocks/pickup_stopper.json index d50a170f..540a6e68 100644 --- a/src/generated/resources/data/naturesaura/loot_tables/blocks/pickup_stopper.json +++ b/src/generated/resources/data/naturesaura/loot_tables/blocks/pickup_stopper.json @@ -16,5 +16,6 @@ ], "rolls": 1.0 } - ] + ], + "random_sequence": "naturesaura:blocks/pickup_stopper" } \ No newline at end of file diff --git a/src/generated/resources/data/naturesaura/loot_tables/blocks/placer.json b/src/generated/resources/data/naturesaura/loot_tables/blocks/placer.json index bf5b07c4..45ead6e4 100644 --- a/src/generated/resources/data/naturesaura/loot_tables/blocks/placer.json +++ b/src/generated/resources/data/naturesaura/loot_tables/blocks/placer.json @@ -16,5 +16,6 @@ ], "rolls": 1.0 } - ] + ], + "random_sequence": "naturesaura:blocks/placer" } \ No newline at end of file diff --git a/src/generated/resources/data/naturesaura/loot_tables/blocks/potion_generator.json b/src/generated/resources/data/naturesaura/loot_tables/blocks/potion_generator.json index f7887376..2f567f49 100644 --- a/src/generated/resources/data/naturesaura/loot_tables/blocks/potion_generator.json +++ b/src/generated/resources/data/naturesaura/loot_tables/blocks/potion_generator.json @@ -16,5 +16,6 @@ ], "rolls": 1.0 } - ] + ], + "random_sequence": "naturesaura:blocks/potion_generator" } \ No newline at end of file diff --git a/src/generated/resources/data/naturesaura/loot_tables/blocks/potted_aura_bloom.json b/src/generated/resources/data/naturesaura/loot_tables/blocks/potted_aura_bloom.json index e60344ed..337f82c0 100644 --- a/src/generated/resources/data/naturesaura/loot_tables/blocks/potted_aura_bloom.json +++ b/src/generated/resources/data/naturesaura/loot_tables/blocks/potted_aura_bloom.json @@ -26,10 +26,11 @@ "entries": [ { "type": "minecraft:item", - "name": "naturesaura:aura_bloom" + "name": "minecraft:air" } ], "rolls": 1.0 } - ] + ], + "random_sequence": "naturesaura:blocks/potted_aura_bloom" } \ No newline at end of file diff --git a/src/generated/resources/data/naturesaura/loot_tables/blocks/potted_aura_cactus.json b/src/generated/resources/data/naturesaura/loot_tables/blocks/potted_aura_cactus.json index 92e0009f..e736606c 100644 --- a/src/generated/resources/data/naturesaura/loot_tables/blocks/potted_aura_cactus.json +++ b/src/generated/resources/data/naturesaura/loot_tables/blocks/potted_aura_cactus.json @@ -26,10 +26,11 @@ "entries": [ { "type": "minecraft:item", - "name": "naturesaura:aura_cactus" + "name": "minecraft:air" } ], "rolls": 1.0 } - ] + ], + "random_sequence": "naturesaura:blocks/potted_aura_cactus" } \ No newline at end of file diff --git a/src/generated/resources/data/naturesaura/loot_tables/blocks/potted_aura_mushroom.json b/src/generated/resources/data/naturesaura/loot_tables/blocks/potted_aura_mushroom.json index 52a46d79..8d2d7f3e 100644 --- a/src/generated/resources/data/naturesaura/loot_tables/blocks/potted_aura_mushroom.json +++ b/src/generated/resources/data/naturesaura/loot_tables/blocks/potted_aura_mushroom.json @@ -26,10 +26,11 @@ "entries": [ { "type": "minecraft:item", - "name": "naturesaura:aura_mushroom" + "name": "minecraft:air" } ], "rolls": 1.0 } - ] + ], + "random_sequence": "naturesaura:blocks/potted_aura_mushroom" } \ No newline at end of file diff --git a/src/generated/resources/data/naturesaura/loot_tables/blocks/potted_crimson_aura_mushroom.json b/src/generated/resources/data/naturesaura/loot_tables/blocks/potted_crimson_aura_mushroom.json index 653f6e7a..5a520e0d 100644 --- a/src/generated/resources/data/naturesaura/loot_tables/blocks/potted_crimson_aura_mushroom.json +++ b/src/generated/resources/data/naturesaura/loot_tables/blocks/potted_crimson_aura_mushroom.json @@ -26,10 +26,11 @@ "entries": [ { "type": "minecraft:item", - "name": "naturesaura:crimson_aura_mushroom" + "name": "minecraft:air" } ], "rolls": 1.0 } - ] + ], + "random_sequence": "naturesaura:blocks/potted_crimson_aura_mushroom" } \ No newline at end of file diff --git a/src/generated/resources/data/naturesaura/loot_tables/blocks/potted_warped_aura_mushroom.json b/src/generated/resources/data/naturesaura/loot_tables/blocks/potted_warped_aura_mushroom.json index 3b8f8f28..16202fd1 100644 --- a/src/generated/resources/data/naturesaura/loot_tables/blocks/potted_warped_aura_mushroom.json +++ b/src/generated/resources/data/naturesaura/loot_tables/blocks/potted_warped_aura_mushroom.json @@ -26,10 +26,11 @@ "entries": [ { "type": "minecraft:item", - "name": "naturesaura:warped_aura_mushroom" + "name": "minecraft:air" } ], "rolls": 1.0 } - ] + ], + "random_sequence": "naturesaura:blocks/potted_warped_aura_mushroom" } \ No newline at end of file diff --git a/src/generated/resources/data/naturesaura/loot_tables/blocks/powder_placer.json b/src/generated/resources/data/naturesaura/loot_tables/blocks/powder_placer.json index d2616781..43e7128a 100644 --- a/src/generated/resources/data/naturesaura/loot_tables/blocks/powder_placer.json +++ b/src/generated/resources/data/naturesaura/loot_tables/blocks/powder_placer.json @@ -16,5 +16,6 @@ ], "rolls": 1.0 } - ] + ], + "random_sequence": "naturesaura:blocks/powder_placer" } \ No newline at end of file diff --git a/src/generated/resources/data/naturesaura/loot_tables/blocks/projectile_generator.json b/src/generated/resources/data/naturesaura/loot_tables/blocks/projectile_generator.json index 8b09486a..d5d17aa9 100644 --- a/src/generated/resources/data/naturesaura/loot_tables/blocks/projectile_generator.json +++ b/src/generated/resources/data/naturesaura/loot_tables/blocks/projectile_generator.json @@ -16,5 +16,6 @@ ], "rolls": 1.0 } - ] + ], + "random_sequence": "naturesaura:blocks/projectile_generator" } \ No newline at end of file diff --git a/src/generated/resources/data/naturesaura/loot_tables/blocks/rf_converter.json b/src/generated/resources/data/naturesaura/loot_tables/blocks/rf_converter.json index 0be0549e..ebfc85b3 100644 --- a/src/generated/resources/data/naturesaura/loot_tables/blocks/rf_converter.json +++ b/src/generated/resources/data/naturesaura/loot_tables/blocks/rf_converter.json @@ -16,5 +16,6 @@ ], "rolls": 1.0 } - ] + ], + "random_sequence": "naturesaura:blocks/rf_converter" } \ No newline at end of file diff --git a/src/generated/resources/data/naturesaura/loot_tables/blocks/sky_ingot_block.json b/src/generated/resources/data/naturesaura/loot_tables/blocks/sky_ingot_block.json index af9270d5..361e32f3 100644 --- a/src/generated/resources/data/naturesaura/loot_tables/blocks/sky_ingot_block.json +++ b/src/generated/resources/data/naturesaura/loot_tables/blocks/sky_ingot_block.json @@ -16,5 +16,6 @@ ], "rolls": 1.0 } - ] + ], + "random_sequence": "naturesaura:blocks/sky_ingot_block" } \ No newline at end of file diff --git a/src/generated/resources/data/naturesaura/loot_tables/blocks/slime_split_generator.json b/src/generated/resources/data/naturesaura/loot_tables/blocks/slime_split_generator.json index 1e48cd32..8ca414ec 100644 --- a/src/generated/resources/data/naturesaura/loot_tables/blocks/slime_split_generator.json +++ b/src/generated/resources/data/naturesaura/loot_tables/blocks/slime_split_generator.json @@ -16,5 +16,6 @@ ], "rolls": 1.0 } - ] + ], + "random_sequence": "naturesaura:blocks/slime_split_generator" } \ No newline at end of file diff --git a/src/generated/resources/data/naturesaura/loot_tables/blocks/snow_creator.json b/src/generated/resources/data/naturesaura/loot_tables/blocks/snow_creator.json index eaf2a751..815448a0 100644 --- a/src/generated/resources/data/naturesaura/loot_tables/blocks/snow_creator.json +++ b/src/generated/resources/data/naturesaura/loot_tables/blocks/snow_creator.json @@ -16,5 +16,6 @@ ], "rolls": 1.0 } - ] + ], + "random_sequence": "naturesaura:blocks/snow_creator" } \ No newline at end of file diff --git a/src/generated/resources/data/naturesaura/loot_tables/blocks/spawn_lamp.json b/src/generated/resources/data/naturesaura/loot_tables/blocks/spawn_lamp.json index 3ac3c69e..98c9b887 100644 --- a/src/generated/resources/data/naturesaura/loot_tables/blocks/spawn_lamp.json +++ b/src/generated/resources/data/naturesaura/loot_tables/blocks/spawn_lamp.json @@ -16,5 +16,6 @@ ], "rolls": 1.0 } - ] + ], + "random_sequence": "naturesaura:blocks/spawn_lamp" } \ No newline at end of file diff --git a/src/generated/resources/data/naturesaura/loot_tables/blocks/spring.json b/src/generated/resources/data/naturesaura/loot_tables/blocks/spring.json index 004609ce..ea5c89cc 100644 --- a/src/generated/resources/data/naturesaura/loot_tables/blocks/spring.json +++ b/src/generated/resources/data/naturesaura/loot_tables/blocks/spring.json @@ -16,5 +16,6 @@ ], "rolls": 1.0 } - ] + ], + "random_sequence": "naturesaura:blocks/spring" } \ No newline at end of file diff --git a/src/generated/resources/data/naturesaura/loot_tables/blocks/tainted_gold_block.json b/src/generated/resources/data/naturesaura/loot_tables/blocks/tainted_gold_block.json index f07247a6..e59f0879 100644 --- a/src/generated/resources/data/naturesaura/loot_tables/blocks/tainted_gold_block.json +++ b/src/generated/resources/data/naturesaura/loot_tables/blocks/tainted_gold_block.json @@ -16,5 +16,6 @@ ], "rolls": 1.0 } - ] + ], + "random_sequence": "naturesaura:blocks/tainted_gold_block" } \ No newline at end of file diff --git a/src/generated/resources/data/naturesaura/loot_tables/blocks/time_changer.json b/src/generated/resources/data/naturesaura/loot_tables/blocks/time_changer.json index c5d9e301..6e7014be 100644 --- a/src/generated/resources/data/naturesaura/loot_tables/blocks/time_changer.json +++ b/src/generated/resources/data/naturesaura/loot_tables/blocks/time_changer.json @@ -16,5 +16,6 @@ ], "rolls": 1.0 } - ] + ], + "random_sequence": "naturesaura:blocks/time_changer" } \ No newline at end of file diff --git a/src/generated/resources/data/naturesaura/loot_tables/blocks/warped_aura_mushroom.json b/src/generated/resources/data/naturesaura/loot_tables/blocks/warped_aura_mushroom.json index 561e7c98..7a8b4418 100644 --- a/src/generated/resources/data/naturesaura/loot_tables/blocks/warped_aura_mushroom.json +++ b/src/generated/resources/data/naturesaura/loot_tables/blocks/warped_aura_mushroom.json @@ -16,5 +16,6 @@ ], "rolls": 1.0 } - ] + ], + "random_sequence": "naturesaura:blocks/warped_aura_mushroom" } \ No newline at end of file diff --git a/src/generated/resources/data/naturesaura/loot_tables/blocks/weather_changer.json b/src/generated/resources/data/naturesaura/loot_tables/blocks/weather_changer.json index 7f1056b4..e80780ed 100644 --- a/src/generated/resources/data/naturesaura/loot_tables/blocks/weather_changer.json +++ b/src/generated/resources/data/naturesaura/loot_tables/blocks/weather_changer.json @@ -16,5 +16,6 @@ ], "rolls": 1.0 } - ] + ], + "random_sequence": "naturesaura:blocks/weather_changer" } \ No newline at end of file diff --git a/src/generated/resources/data/naturesaura/loot_tables/blocks/wood_stand.json b/src/generated/resources/data/naturesaura/loot_tables/blocks/wood_stand.json index 653cd289..c47ed721 100644 --- a/src/generated/resources/data/naturesaura/loot_tables/blocks/wood_stand.json +++ b/src/generated/resources/data/naturesaura/loot_tables/blocks/wood_stand.json @@ -16,5 +16,6 @@ ], "rolls": 1.0 } - ] + ], + "random_sequence": "naturesaura:blocks/wood_stand" } \ No newline at end of file diff --git a/src/main/java/de/ellpeck/naturesaura/data/BlockLootProvider.java b/src/main/java/de/ellpeck/naturesaura/data/BlockLootProvider.java index 84cc3394..efa06c0e 100644 --- a/src/main/java/de/ellpeck/naturesaura/data/BlockLootProvider.java +++ b/src/main/java/de/ellpeck/naturesaura/data/BlockLootProvider.java @@ -1,7 +1,5 @@ package de.ellpeck.naturesaura.data; -import com.google.gson.Gson; -import com.google.gson.GsonBuilder; import de.ellpeck.naturesaura.blocks.BlockFlowerPot; import de.ellpeck.naturesaura.blocks.BlockGoldenLeaves; import de.ellpeck.naturesaura.blocks.ModBlocks; @@ -9,114 +7,51 @@ import de.ellpeck.naturesaura.blocks.Slab; import de.ellpeck.naturesaura.items.ModItems; import de.ellpeck.naturesaura.reg.ModRegistry; import net.minecraft.advancements.critereon.StatePropertiesPredicate; -import net.minecraft.data.CachedOutput; -import net.minecraft.data.DataGenerator; -import net.minecraft.data.DataProvider; -import net.minecraft.data.loot.BlockLoot; -import net.minecraft.resources.ResourceLocation; +import net.minecraft.data.loot.BlockLootSubProvider; +import net.minecraft.world.flag.FeatureFlags; import net.minecraft.world.item.Items; import net.minecraft.world.level.block.Block; import net.minecraft.world.level.block.Blocks; -import net.minecraft.world.level.block.FlowerPotBlock; import net.minecraft.world.level.storage.loot.LootPool; import net.minecraft.world.level.storage.loot.LootTable; -import net.minecraft.world.level.storage.loot.LootTables; import net.minecraft.world.level.storage.loot.entries.LootItem; -import net.minecraft.world.level.storage.loot.entries.LootPoolEntryContainer; import net.minecraft.world.level.storage.loot.functions.SetItemCountFunction; -import net.minecraft.world.level.storage.loot.parameters.LootContextParamSets; -import net.minecraft.world.level.storage.loot.predicates.ConditionUserBuilder; import net.minecraft.world.level.storage.loot.predicates.LootItemBlockStatePropertyCondition; import net.minecraft.world.level.storage.loot.predicates.LootItemRandomChanceCondition; import net.minecraft.world.level.storage.loot.providers.number.ConstantValue; import net.minecraft.world.level.storage.loot.providers.number.UniformGenerator; -import net.minecraftforge.registries.ForgeRegistries; -import javax.annotation.Nonnull; -import java.io.IOException; -import java.nio.file.Path; -import java.util.HashMap; -import java.util.Map; -import java.util.function.Function; +import java.util.Set; -public class BlockLootProvider implements DataProvider { +public class BlockLootProvider extends BlockLootSubProvider { - private static final Gson GSON = new GsonBuilder().setPrettyPrinting().create(); - private final DataGenerator generator; - private final Map> lootFunctions = new HashMap<>(); - - public BlockLootProvider(DataGenerator generator) { - this.generator = generator; + public BlockLootProvider() { + super(Set.of(), FeatureFlags.REGISTRY.allFlags()); + } + @Override + protected void generate() { for (var item : ModRegistry.ALL_ITEMS) { if (!(item instanceof Block block)) continue; if (block instanceof Slab) { - this.lootFunctions.put(block, LootTableHooks::genSlab); + this.add(block, this::createSlabItemTable); } else if (block instanceof BlockFlowerPot) { - this.lootFunctions.put(block, LootTableHooks::genFlowerPot); + this.add(block, this::createPotFlowerItemTable); } else { - this.lootFunctions.put(block, LootTableHooks::genRegular); + this.dropSelf(block); } } - this.lootFunctions.put(ModBlocks.ANCIENT_LEAVES, LootTableHooks::genSilkOnly); - this.lootFunctions.put(ModBlocks.DECAYED_LEAVES, LootTableHooks::genSilkOnly); - this.lootFunctions.put(ModBlocks.GOLDEN_LEAVES, b -> LootTable.lootTable().withPool(LootPool.lootPool().setRolls(ConstantValue.exactly(1)).add(LootTableHooks.survivesExplosion(b, LootItem.lootTableItem(ModItems.GOLD_LEAF)).when(LootItemBlockStatePropertyCondition.hasBlockStateProperties(b).setProperties(StatePropertiesPredicate.Builder.properties().hasProperty(BlockGoldenLeaves.STAGE, BlockGoldenLeaves.HIGHEST_STAGE)))).when(LootItemRandomChanceCondition.randomChance(0.75F)))); - this.lootFunctions.put(ModBlocks.NETHER_WART_MUSHROOM, b -> LootTableHooks.genSilkOr(b, LootItem.lootTableItem(Items.NETHER_WART).apply(SetItemCountFunction.setCount(UniformGenerator.between(1, 2))))); - this.lootFunctions.put(ModBlocks.NETHER_GRASS, b -> LootTableHooks.genSilkOr(b, LootItem.lootTableItem(Blocks.NETHERRACK))); - } - - private static Path getPath(Path root, ResourceLocation res) { - return root.resolve("data/" + res.getNamespace() + "/loot_tables/blocks/" + res.getPath() + ".json"); + this.add(ModBlocks.ANCIENT_LEAVES, BlockLootProvider::createSilkTouchOnlyTable); + this.add(ModBlocks.DECAYED_LEAVES, BlockLootProvider::createSilkTouchOnlyTable); + this.add(ModBlocks.GOLDEN_LEAVES, b -> LootTable.lootTable().withPool(LootPool.lootPool().setRolls(ConstantValue.exactly(1)).add(this.applyExplosionCondition(b, LootItem.lootTableItem(ModItems.GOLD_LEAF)).when(LootItemBlockStatePropertyCondition.hasBlockStateProperties(b).setProperties(StatePropertiesPredicate.Builder.properties().hasProperty(BlockGoldenLeaves.STAGE, BlockGoldenLeaves.HIGHEST_STAGE)))).when(LootItemRandomChanceCondition.randomChance(0.75F)))); + this.add(ModBlocks.NETHER_WART_MUSHROOM, b -> BlockLootSubProvider.createSilkTouchDispatchTable(b, LootItem.lootTableItem(Items.NETHER_WART).apply(SetItemCountFunction.setCount(UniformGenerator.between(1, 2))))); + this.add(ModBlocks.NETHER_GRASS, b -> BlockLootSubProvider.createSilkTouchDispatchTable(b, LootItem.lootTableItem(Blocks.NETHERRACK))); } @Override - public void run(CachedOutput cache) throws IOException { - for (var function : this.lootFunctions.entrySet()) { - var block = function.getKey(); - var func = function.getValue(); - var table = func.apply(block).setParamSet(LootContextParamSets.BLOCK).build(); - var path = BlockLootProvider.getPath(this.generator.getOutputFolder(), ForgeRegistries.BLOCKS.getKey(block)); - DataProvider.saveStable(cache, LootTables.serialize(table), path); - } + protected Iterable getKnownBlocks() { + return ModRegistry.ALL_ITEMS.stream().filter(i -> i instanceof Block).map(i -> (Block) i).toList(); } - - @Nonnull - @Override - public String getName() { - return "Nature's Aura Loot"; - } - - // What a mess - private static class LootTableHooks extends BlockLoot { - - public static LootTable.Builder genLeaves(Block block, Block drop) { - return BlockLoot.createLeavesDrops(block, drop, 0.05F, 0.0625F, 0.083333336F, 0.1F); - } - - public static LootTable.Builder genSlab(Block block) { - return BlockLoot.createSlabItemTable(block); - } - - public static LootTable.Builder genRegular(Block block) { - return BlockLoot.createSingleItemTable(block); - } - - public static LootTable.Builder genSilkOnly(Block block) { - return BlockLoot.createSilkTouchOnlyTable(block); - } - - public static LootTable.Builder genSilkOr(Block block, LootPoolEntryContainer.Builder builder) { - return BlockLoot.createSilkTouchOrShearsDispatchTable(block, builder); - } - - public static LootTable.Builder genFlowerPot(Block block) { - return BlockLoot.createPotFlowerItemTable(((FlowerPotBlock) block).getContent()); - } - - public static > T survivesExplosion(Block block, ConditionUserBuilder then) { - return BlockLoot.applyExplosionCondition(block, then); - } - } -} \ No newline at end of file +} diff --git a/src/main/java/de/ellpeck/naturesaura/data/BlockStateGenerator.java b/src/main/java/de/ellpeck/naturesaura/data/BlockStateGenerator.java index 1777cce8..da7f2be8 100644 --- a/src/main/java/de/ellpeck/naturesaura/data/BlockStateGenerator.java +++ b/src/main/java/de/ellpeck/naturesaura/data/BlockStateGenerator.java @@ -3,15 +3,15 @@ package de.ellpeck.naturesaura.data; import de.ellpeck.naturesaura.NaturesAura; import de.ellpeck.naturesaura.reg.ICustomBlockState; import de.ellpeck.naturesaura.reg.ModRegistry; -import net.minecraft.data.DataGenerator; +import net.minecraft.data.PackOutput; import net.minecraft.world.level.block.Block; import net.minecraftforge.client.model.generators.BlockStateProvider; import net.minecraftforge.common.data.ExistingFileHelper; public class BlockStateGenerator extends BlockStateProvider { - public BlockStateGenerator(DataGenerator gen, ExistingFileHelper exFileHelper) { - super(gen, NaturesAura.MOD_ID, exFileHelper); + public BlockStateGenerator(PackOutput output, ExistingFileHelper exFileHelper) { + super(output, NaturesAura.MOD_ID, exFileHelper); } @Override diff --git a/src/main/java/de/ellpeck/naturesaura/data/BlockTagProvider.java b/src/main/java/de/ellpeck/naturesaura/data/BlockTagProvider.java index f54cad32..12e77f4d 100644 --- a/src/main/java/de/ellpeck/naturesaura/data/BlockTagProvider.java +++ b/src/main/java/de/ellpeck/naturesaura/data/BlockTagProvider.java @@ -4,18 +4,19 @@ import de.ellpeck.naturesaura.NaturesAura; import de.ellpeck.naturesaura.blocks.ModBlocks; import de.ellpeck.naturesaura.reg.IModItem; import de.ellpeck.naturesaura.reg.ModRegistry; -import net.minecraft.data.DataGenerator; -import net.minecraft.data.tags.BlockTagsProvider; +import net.minecraft.core.HolderLookup; +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.minecraft.world.level.block.Blocks; -import net.minecraft.world.level.material.Material; +import net.minecraftforge.common.data.BlockTagsProvider; import net.minecraftforge.common.data.ExistingFileHelper; import org.jetbrains.annotations.Nullable; import java.util.Comparator; +import java.util.concurrent.CompletableFuture; public class BlockTagProvider extends BlockTagsProvider { @@ -24,12 +25,12 @@ public class BlockTagProvider extends BlockTagsProvider { public static final TagKey ALTAR_GOLD_BRICK = BlockTags.create(new ResourceLocation(NaturesAura.MOD_ID, "altar_gold_brick")); public static final TagKey ALTAR_FANCY_BRICK = BlockTags.create(new ResourceLocation(NaturesAura.MOD_ID, "altar_fancy_brick")); - public BlockTagProvider(DataGenerator gen, @Nullable ExistingFileHelper existingFileHelper) { - super(gen, NaturesAura.MOD_ID, existingFileHelper); + public BlockTagProvider(PackOutput output, CompletableFuture lookupProvider, @Nullable ExistingFileHelper existingFileHelper) { + super(output, lookupProvider, NaturesAura.MOD_ID, existingFileHelper); } @Override - protected void addTags() { + protected void addTags(HolderLookup.Provider provider) { this.tag(BlockTags.LOGS).add(ModBlocks.ANCIENT_LOG, ModBlocks.ANCIENT_BARK); this.tag(BlockTags.PLANKS).add(ModBlocks.ANCIENT_PLANKS); this.tag(BlockTags.STAIRS).add(ModBlocks.ANCIENT_STAIRS, ModBlocks.INFUSED_BRICK_STAIRS, ModBlocks.INFUSED_STAIRS); @@ -45,12 +46,13 @@ public class BlockTagProvider extends BlockTagsProvider { // sort these so that they don't change the json every time we run data (because it's a set) ModRegistry.ALL_ITEMS.stream().sorted(Comparator.comparing(IModItem::getBaseName)).filter(i -> i instanceof Block).map(i -> (Block) i).forEach(b -> { - var material = b.defaultBlockState().getMaterial(); + // TODO figure out what to do about materials for mineability + /*var material = b.defaultBlockState().getMaterial(); if (material == Material.STONE || material == Material.METAL) { this.tag(BlockTags.MINEABLE_WITH_PICKAXE).add(b); } else if (material == Material.WOOD) { this.tag(BlockTags.MINEABLE_WITH_AXE).add(b); - } + }*/ }); } } diff --git a/src/main/java/de/ellpeck/naturesaura/data/ItemModelGenerator.java b/src/main/java/de/ellpeck/naturesaura/data/ItemModelGenerator.java index 2af6a0e1..5bc43ef2 100644 --- a/src/main/java/de/ellpeck/naturesaura/data/ItemModelGenerator.java +++ b/src/main/java/de/ellpeck/naturesaura/data/ItemModelGenerator.java @@ -4,7 +4,7 @@ import de.ellpeck.naturesaura.NaturesAura; import de.ellpeck.naturesaura.reg.ICustomItemModel; import de.ellpeck.naturesaura.reg.INoItemBlock; import de.ellpeck.naturesaura.reg.ModRegistry; -import net.minecraft.data.DataGenerator; +import net.minecraft.data.PackOutput; import net.minecraft.world.item.Item; import net.minecraft.world.level.block.Block; import net.minecraftforge.client.model.generators.ItemModelProvider; @@ -12,8 +12,8 @@ import net.minecraftforge.common.data.ExistingFileHelper; public class ItemModelGenerator extends ItemModelProvider { - public ItemModelGenerator(DataGenerator generator, ExistingFileHelper existingFileHelper) { - super(generator, NaturesAura.MOD_ID, existingFileHelper); + public ItemModelGenerator(PackOutput output, ExistingFileHelper existingFileHelper) { + super(output, NaturesAura.MOD_ID, existingFileHelper); } @Override diff --git a/src/main/java/de/ellpeck/naturesaura/data/ItemTagProvider.java b/src/main/java/de/ellpeck/naturesaura/data/ItemTagProvider.java index dc3c13cd..e8d55cae 100644 --- a/src/main/java/de/ellpeck/naturesaura/data/ItemTagProvider.java +++ b/src/main/java/de/ellpeck/naturesaura/data/ItemTagProvider.java @@ -6,27 +6,29 @@ import de.ellpeck.naturesaura.items.ModItems; import de.ellpeck.naturesaura.items.tools.*; import de.ellpeck.naturesaura.reg.IModItem; import de.ellpeck.naturesaura.reg.ModRegistry; -import net.minecraft.data.DataGenerator; -import net.minecraft.data.tags.BlockTagsProvider; +import net.minecraft.core.HolderLookup; +import net.minecraft.data.PackOutput; import net.minecraft.data.tags.IntrinsicHolderTagsProvider; import net.minecraft.data.tags.ItemTagsProvider; import net.minecraft.tags.BlockTags; 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.minecraftforge.common.Tags; import net.minecraftforge.common.data.ExistingFileHelper; import java.util.Comparator; +import java.util.concurrent.CompletableFuture; public class ItemTagProvider extends ItemTagsProvider { - public ItemTagProvider(DataGenerator generatorIn, BlockTagsProvider blockTagProvider, ExistingFileHelper helper) { - super(generatorIn, blockTagProvider, NaturesAura.MOD_ID, helper); + public ItemTagProvider(PackOutput output, CompletableFuture lookupProvider, CompletableFuture> blockTagProvider, ExistingFileHelper existingFileHelper) { + super(output, lookupProvider, blockTagProvider, NaturesAura.MOD_ID, existingFileHelper); } @Override - protected void addTags() { + protected void addTags(HolderLookup.Provider provider) { this.copy(BlockTags.LOGS, ItemTags.LOGS); this.copy(BlockTags.PLANKS, ItemTags.PLANKS); this.copy(BlockTags.STAIRS, ItemTags.STAIRS); diff --git a/src/main/java/de/ellpeck/naturesaura/data/ModData.java b/src/main/java/de/ellpeck/naturesaura/data/ModData.java index 114686f5..9840fc2e 100644 --- a/src/main/java/de/ellpeck/naturesaura/data/ModData.java +++ b/src/main/java/de/ellpeck/naturesaura/data/ModData.java @@ -1,21 +1,29 @@ package de.ellpeck.naturesaura.data; +import net.minecraft.data.loot.LootTableProvider; +import net.minecraft.world.level.storage.loot.parameters.LootContextParamSets; import net.minecraftforge.data.event.GatherDataEvent; import net.minecraftforge.eventbus.api.SubscribeEvent; import net.minecraftforge.fml.common.Mod; +import java.util.List; +import java.util.Set; + @Mod.EventBusSubscriber(bus = Mod.EventBusSubscriber.Bus.MOD) public final class ModData { @SubscribeEvent public static void gatherData(GatherDataEvent event) { - var generator = event.getGenerator(); - var ex = event.getExistingFileHelper(); - var blockTags = new BlockTagProvider(generator, ex); - generator.addProvider(event.includeServer(), blockTags); - generator.addProvider(event.includeServer(), new ItemTagProvider(generator, blockTags, ex)); - generator.addProvider(event.includeServer(), new BlockLootProvider(generator)); - generator.addProvider(event.includeServer(), new BlockStateGenerator(generator, ex)); - generator.addProvider(event.includeServer(), new ItemModelGenerator(generator, ex)); + var gen = event.getGenerator(); + var out = gen.getPackOutput(); + var lookup = event.getLookupProvider(); + var existing = event.getExistingFileHelper(); + + var blockTags = new BlockTagProvider(out, lookup, existing); + gen.addProvider(event.includeServer(), blockTags); + gen.addProvider(event.includeServer(), new ItemTagProvider(out, lookup, blockTags.contentsGetter(), existing)); + gen.addProvider(event.includeServer(), new LootTableProvider(out, Set.of(), List.of(new LootTableProvider.SubProviderEntry(BlockLootProvider::new, LootContextParamSets.BLOCK)))); + gen.addProvider(event.includeServer(), new BlockStateGenerator(out, existing)); + gen.addProvider(event.includeServer(), new ItemModelGenerator(out, existing)); } }