From 1db88f8d0664b405f65d63052b9c53c0bbb3ed11 Mon Sep 17 00:00:00 2001 From: Frank Date: Wed, 14 Jun 2023 13:15:42 +0200 Subject: [PATCH] Regenerated Datapack --- .../advancements/all_the_biomes.json | 60 ++++++++--------- .../data/betterend/advancements/hammer.json | 4 +- .../advancements/terminite_anvil.json | 2 +- ...ssium_anvil.json => thallasium_anvil.json} | 8 +-- .../advancements/thallasium_armor.json | 2 +- ...ssium_plate.json => thallasium_plate.json} | 10 +-- .../advancements/thallasium_tool_head.json | 2 +- .../placed_feature/village_chorus.json | 22 +++++++ .../processor_list/crying_10_percent.json | 22 +++++++ .../worldgen/structure/megalake.json | 2 +- .../worldgen/structure/megalake_small.json | 2 +- .../template_pool/village/houses.json | 9 +++ .../village/street_decorations.json | 64 ++++++++++++++++++- 13 files changed, 162 insertions(+), 47 deletions(-) rename src/main/generated/data/betterend/advancements/{thalassium_anvil.json => thallasium_anvil.json} (75%) rename src/main/generated/data/betterend/advancements/{thalassium_plate.json => thallasium_plate.json} (71%) create mode 100644 src/main/generated/data/betterend/worldgen/placed_feature/village_chorus.json create mode 100644 src/main/generated/data/betterend/worldgen/processor_list/crying_10_percent.json diff --git a/src/main/generated/data/betterend/advancements/all_the_biomes.json b/src/main/generated/data/betterend/advancements/all_the_biomes.json index 11d80559..11a08452 100644 --- a/src/main/generated/data/betterend/advancements/all_the_biomes.json +++ b/src/main/generated/data/betterend/advancements/all_the_biomes.json @@ -420,37 +420,40 @@ }, "requirements": [ [ - "betterend:umbrella_jungle" + "betterend:empty_smaragdant_cave" ], [ "betterend:megalake_grove" ], [ - "betterend:neon_oasis" + "betterend:foggy_mushroomland" ], [ - "betterend:megalake" - ], - [ - "betterend:chorus_forest" + "betterend:ice_starfield" ], [ "betterend:dry_shrubland" ], [ - "betterend:empty_aurora_cave" - ], - [ - "betterend:dragon_graveyards" + "betterend:umbrella_jungle" ], [ "betterend:lush_aurora_cave" ], [ - "betterend:empty_smaragdant_cave" + "betterend:chorus_forest" ], [ - "betterend:dust_wastelands" + "betterend:shadow_forest" + ], + [ + "betterend:megalake" + ], + [ + "betterend:glowing_grasslands" + ], + [ + "betterend:painted_mountains" ], [ "betterend:empty_end_cave" @@ -461,38 +464,35 @@ [ "betterend:umbra_valley" ], - [ - "betterend:ice_starfield" - ], - [ - "betterend:sulphur_springs" - ], - [ - "betterend:amber_land" - ], [ "betterend:lush_smaragdant_cave" ], - [ - "betterend:foggy_mushroomland" - ], - [ - "betterend:glowing_grasslands" - ], [ "betterend:blossoming_spires" ], + [ + "betterend:crystal_mountains" + ], [ "betterend:jade_cave" ], [ - "betterend:shadow_forest" + "betterend:empty_aurora_cave" ], [ - "betterend:painted_mountains" + "betterend:amber_land" ], [ - "betterend:crystal_mountains" + "betterend:sulphur_springs" + ], + [ + "betterend:dust_wastelands" + ], + [ + "betterend:dragon_graveyards" + ], + [ + "betterend:neon_oasis" ] ], "rewards": { diff --git a/src/main/generated/data/betterend/advancements/hammer.json b/src/main/generated/data/betterend/advancements/hammer.json index 0c7702c5..4ac7d41f 100644 --- a/src/main/generated/data/betterend/advancements/hammer.json +++ b/src/main/generated/data/betterend/advancements/hammer.json @@ -25,7 +25,7 @@ }, "trigger": "minecraft:inventory_changed" }, - "got_thalassium_hammer": { + "got_thallasium_hammer": { "conditions": { "items": [ { @@ -57,7 +57,7 @@ "requirements": [ [ "got_diamond_hammer", - "got_thalassium_hammer", + "got_thallasium_hammer", "got_terminite_hammer" ] ], diff --git a/src/main/generated/data/betterend/advancements/terminite_anvil.json b/src/main/generated/data/betterend/advancements/terminite_anvil.json index ed6ba080..328dd6ad 100644 --- a/src/main/generated/data/betterend/advancements/terminite_anvil.json +++ b/src/main/generated/data/betterend/advancements/terminite_anvil.json @@ -1,5 +1,5 @@ { - "parent": "betterend:thalassium_anvil", + "parent": "betterend:thallasium_anvil", "criteria": { "got_terminite_anvil": { "conditions": { diff --git a/src/main/generated/data/betterend/advancements/thalassium_anvil.json b/src/main/generated/data/betterend/advancements/thallasium_anvil.json similarity index 75% rename from src/main/generated/data/betterend/advancements/thalassium_anvil.json rename to src/main/generated/data/betterend/advancements/thallasium_anvil.json index d2e1a326..651ee85d 100644 --- a/src/main/generated/data/betterend/advancements/thalassium_anvil.json +++ b/src/main/generated/data/betterend/advancements/thallasium_anvil.json @@ -1,7 +1,7 @@ { "parent": "betterend:hammer", "criteria": { - "got_thalassium_anvil": { + "got_thallasium_anvil": { "conditions": { "items": [ { @@ -17,7 +17,7 @@ "display": { "announce_to_chat": true, "description": { - "translate": "advancements.betterend.thalassium_anvil.description" + "translate": "advancements.betterend.thallasium_anvil.description" }, "frame": "task", "hidden": false, @@ -26,12 +26,12 @@ }, "show_toast": true, "title": { - "translate": "advancements.betterend.thalassium_anvil.title" + "translate": "advancements.betterend.thallasium_anvil.title" } }, "requirements": [ [ - "got_thalassium_anvil" + "got_thallasium_anvil" ] ], "sends_telemetry_event": false diff --git a/src/main/generated/data/betterend/advancements/thallasium_armor.json b/src/main/generated/data/betterend/advancements/thallasium_armor.json index 100289e0..b10969e2 100644 --- a/src/main/generated/data/betterend/advancements/thallasium_armor.json +++ b/src/main/generated/data/betterend/advancements/thallasium_armor.json @@ -1,5 +1,5 @@ { - "parent": "betterend:thalassium_plate", + "parent": "betterend:thallasium_plate", "criteria": { "got_thallasium_boots": { "conditions": { diff --git a/src/main/generated/data/betterend/advancements/thalassium_plate.json b/src/main/generated/data/betterend/advancements/thallasium_plate.json similarity index 71% rename from src/main/generated/data/betterend/advancements/thalassium_plate.json rename to src/main/generated/data/betterend/advancements/thallasium_plate.json index b091ecdc..d9099a05 100644 --- a/src/main/generated/data/betterend/advancements/thalassium_plate.json +++ b/src/main/generated/data/betterend/advancements/thallasium_plate.json @@ -1,7 +1,7 @@ { - "parent": "betterend:thalassium_anvil", + "parent": "betterend:thallasium_anvil", "criteria": { - "got_thalassium_plate": { + "got_thallasium_plate": { "conditions": { "items": [ { @@ -17,7 +17,7 @@ "display": { "announce_to_chat": true, "description": { - "translate": "advancements.betterend.thalassium_plate.description" + "translate": "advancements.betterend.thallasium_plate.description" }, "frame": "task", "hidden": false, @@ -26,12 +26,12 @@ }, "show_toast": true, "title": { - "translate": "advancements.betterend.thalassium_plate.title" + "translate": "advancements.betterend.thallasium_plate.title" } }, "requirements": [ [ - "got_thalassium_plate" + "got_thallasium_plate" ] ], "sends_telemetry_event": false diff --git a/src/main/generated/data/betterend/advancements/thallasium_tool_head.json b/src/main/generated/data/betterend/advancements/thallasium_tool_head.json index a2bfad48..9983c8a2 100644 --- a/src/main/generated/data/betterend/advancements/thallasium_tool_head.json +++ b/src/main/generated/data/betterend/advancements/thallasium_tool_head.json @@ -1,5 +1,5 @@ { - "parent": "betterend:thalassium_anvil", + "parent": "betterend:thallasium_anvil", "criteria": { "got_thallasium_axe_head": { "conditions": { diff --git a/src/main/generated/data/betterend/worldgen/placed_feature/village_chorus.json b/src/main/generated/data/betterend/worldgen/placed_feature/village_chorus.json new file mode 100644 index 00000000..871bb77d --- /dev/null +++ b/src/main/generated/data/betterend/worldgen/placed_feature/village_chorus.json @@ -0,0 +1,22 @@ +{ + "feature": "minecraft:chorus_plant", + "placement": [ + { + "type": "minecraft:block_predicate_filter", + "predicate": { + "type": "minecraft:would_survive", + "state": { + "Name": "minecraft:chorus_plant", + "Properties": { + "down": "false", + "east": "false", + "north": "false", + "south": "false", + "up": "false", + "west": "false" + } + } + } + } + ] +} \ No newline at end of file diff --git a/src/main/generated/data/betterend/worldgen/processor_list/crying_10_percent.json b/src/main/generated/data/betterend/worldgen/processor_list/crying_10_percent.json new file mode 100644 index 00000000..74521e22 --- /dev/null +++ b/src/main/generated/data/betterend/worldgen/processor_list/crying_10_percent.json @@ -0,0 +1,22 @@ +{ + "processors": [ + { + "processor_type": "minecraft:rule", + "rules": [ + { + "input_predicate": { + "block": "minecraft:obsidian", + "predicate_type": "minecraft:random_block_match", + "probability": 0.1 + }, + "location_predicate": { + "predicate_type": "minecraft:always_true" + }, + "output_state": { + "Name": "minecraft:crying_obsidian" + } + } + ] + } + ] +} \ No newline at end of file diff --git a/src/main/generated/data/betterend/worldgen/structure/megalake.json b/src/main/generated/data/betterend/worldgen/structure/megalake.json index 735b346c..c98917d2 100644 --- a/src/main/generated/data/betterend/worldgen/structure/megalake.json +++ b/src/main/generated/data/betterend/worldgen/structure/megalake.json @@ -2,5 +2,5 @@ "type": "betterend:megalake", "biomes": "#betterend:has_structure/megalake", "spawn_overrides": {}, - "step": "raw_generation" + "step": "lakes" } \ No newline at end of file diff --git a/src/main/generated/data/betterend/worldgen/structure/megalake_small.json b/src/main/generated/data/betterend/worldgen/structure/megalake_small.json index 39fc6c53..4fa5681b 100644 --- a/src/main/generated/data/betterend/worldgen/structure/megalake_small.json +++ b/src/main/generated/data/betterend/worldgen/structure/megalake_small.json @@ -2,5 +2,5 @@ "type": "betterend:megalake_small", "biomes": "#betterend:has_structure/megalake_small", "spawn_overrides": {}, - "step": "raw_generation" + "step": "lakes" } \ No newline at end of file diff --git a/src/main/generated/data/betterend/worldgen/template_pool/village/houses.json b/src/main/generated/data/betterend/worldgen/template_pool/village/houses.json index f46af042..9c2174fa 100644 --- a/src/main/generated/data/betterend/worldgen/template_pool/village/houses.json +++ b/src/main/generated/data/betterend/worldgen/template_pool/village/houses.json @@ -212,6 +212,15 @@ "projection": "rigid" }, "weight": 1 + }, + { + "element": { + "element_type": "bclib:single_end_pool_element", + "location": "betterend:village/street_decoration/work_01", + "processors": "betterend:end_street", + "projection": "rigid" + }, + "weight": 1 } ], "fallback": "betterend:village/terminators" diff --git a/src/main/generated/data/betterend/worldgen/template_pool/village/street_decorations.json b/src/main/generated/data/betterend/worldgen/template_pool/village/street_decorations.json index 42efc147..a307a5de 100644 --- a/src/main/generated/data/betterend/worldgen/template_pool/village/street_decorations.json +++ b/src/main/generated/data/betterend/worldgen/template_pool/village/street_decorations.json @@ -13,7 +13,7 @@ "processors": "minecraft:empty", "projection": "rigid" }, - "weight": 2 + "weight": 4 }, { "element": { @@ -22,7 +22,69 @@ "processors": "minecraft:empty", "projection": "rigid" }, + "weight": 2 + }, + { + "element": { + "element_type": "bclib:single_end_pool_element", + "location": "betterend:village/street_decoration/lamp_06", + "processors": "minecraft:empty", + "projection": "rigid" + }, + "weight": 3 + }, + { + "element": { + "element_type": "bclib:single_end_pool_element", + "location": "betterend:village/street_decoration/obsidian_01", + "processors": "betterend:crying_10_percent", + "projection": "rigid" + }, + "weight": 2 + }, + { + "element": { + "element_type": "bclib:single_end_pool_element", + "location": "betterend:village/street_decoration/obsidian_02", + "processors": "betterend:crying_10_percent", + "projection": "rigid" + }, + "weight": 3 + }, + { + "element": { + "element_type": "bclib:single_end_pool_element", + "location": "betterend:village/street_decoration/obsidian_03", + "processors": "betterend:crying_10_percent", + "projection": "rigid" + }, + "weight": 2 + }, + { + "element": { + "element_type": "bclib:single_end_pool_element", + "location": "betterend:village/street_decoration/obsidian_04", + "processors": "betterend:crying_10_percent", + "projection": "rigid" + }, + "weight": 2 + }, + { + "element": { + "element_type": "bclib:single_end_pool_element", + "location": "betterend:village/street_decoration/obsidian_05", + "processors": "betterend:crying_10_percent", + "projection": "rigid" + }, "weight": 1 + }, + { + "element": { + "element_type": "minecraft:feature_pool_element", + "feature": "betterend:village_chorus", + "projection": "rigid" + }, + "weight": 2 } ], "fallback": "betterend:village/terminators"