From 5438c0138cb8e016b97a32d0bce51b12b0988f39 Mon Sep 17 00:00:00 2001 From: catter1 <63272345+catter1@users.noreply.github.com> Date: Thu, 7 Dec 2023 23:10:50 +0100 Subject: [PATCH] Updated to version 2.4.10 --- .../processor_list/village/desert/road.json | 193 +++++++++------- .../village/fortified/road.json | 207 +++++++++++------- data/c/worldgen/structure_icons.json | 72 +++--- .../{underground => regular}/witchhut_01.nbt | Bin .../biome/has_structure/witch_hut.json | 6 +- .../processor_list/village/desert/road.json | 193 +++++++++------- .../village/fortified/road.json | 207 +++++++++++------- .../{underground => }/witch_hut.json | 13 +- .../worldgen/structure_set/regular.json | 15 ++ .../worldgen/structure_set/underground.json | 4 - .../{underground => regular}/witch_hut.json | 2 +- 11 files changed, 549 insertions(+), 363 deletions(-) rename data/terralith/structures/{underground => regular}/witchhut_01.nbt (100%) rename data/terralith/worldgen/structure/{underground => }/witch_hut.json (52%) create mode 100644 data/terralith/worldgen/structure_set/regular.json rename data/terralith/worldgen/template_pool/{underground => regular}/witch_hut.json (82%) diff --git a/1-20-3-overlay/data/terralith/worldgen/processor_list/village/desert/road.json b/1-20-3-overlay/data/terralith/worldgen/processor_list/village/desert/road.json index e0413886..a5c8e2da 100644 --- a/1-20-3-overlay/data/terralith/worldgen/processor_list/village/desert/road.json +++ b/1-20-3-overlay/data/terralith/worldgen/processor_list/village/desert/road.json @@ -1,78 +1,123 @@ { - "processors": [ - { - "processor_type": "minecraft:rule", - "rules": [ + "processors": [ { - "input_predicate": { - "predicate_type": "minecraft:always_true" - }, - "location_predicate": { - "block": "minecraft:tall_grass", - "predicate_type": "minecraft:block_match" - }, - "output_state": { - "Name": "minecraft:air" - } - }, - { - "input_predicate": { - "predicate_type": "minecraft:always_true" - }, - "location_predicate": { - "block": "minecraft:short_grass", - "predicate_type": "minecraft:block_match" - }, - "output_state": { - "Name": "minecraft:air" - } - }, - { - "input_predicate": { - "block": "minecraft:deepslate", - "predicate_type": "minecraft:random_block_match", - "probability": 0.05 - }, - "location_predicate": { - "block": "minecraft:grass_block", - "predicate_type": "minecraft:block_match" - }, - "output_state": { - "Name": "minecraft:cobbled_deepslate" - } - }, - { - "input_predicate": { - "block": "minecraft:deepslate", - "predicate_type": "minecraft:random_block_match", - "probability": 0.3 - }, - "location_predicate": { - "block": "minecraft:grass_block", - "predicate_type": "minecraft:block_match" - }, - "output_state": { - "Name": "minecraft:basalt", - "Properties": { - "axis": "y" - } - } - }, - { - "input_predicate": { - "block": "minecraft:deepslate", - "predicate_type": "minecraft:random_block_match", - "probability": 0.02 - }, - "location_predicate": { - "block": "minecraft:grass_block", - "predicate_type": "minecraft:block_match" - }, - "output_state": { - "Name": "minecraft:smooth_basalt" - } + "processor_type": "minecraft:rule", + "rules": [ + { + "input_predicate": { + "predicate_type": "minecraft:always_true" + }, + "location_predicate": { + "block": "minecraft:tall_grass", + "predicate_type": "minecraft:block_match" + }, + "output_state": { + "Name": "minecraft:air" + } + }, + { + "input_predicate": { + "predicate_type": "minecraft:always_true" + }, + "location_predicate": { + "block": "minecraft:short_grass", + "predicate_type": "minecraft:block_match" + }, + "output_state": { + "Name": "minecraft:air" + } + }, + { + "input_predicate": { + "block": "minecraft:dirt", + "predicate_type": "minecraft:block_match" + }, + "location_predicate": { + "block": "minecraft:water", + "predicate_type": "minecraft:block_match" + }, + "output_state": { + "Name": "minecraft:water", + "Properties": { + "level": "0" + } + } + }, + { + "input_predicate": { + "block": "minecraft:grass_block", + "predicate_type": "minecraft:block_match" + }, + "location_predicate": { + "block": "minecraft:water", + "predicate_type": "minecraft:block_match" + }, + "output_state": { + "Name": "minecraft:water", + "Properties": { + "level": "0" + } + } + }, + { + "input_predicate": { + "block": "minecraft:deepslate", + "predicate_type": "minecraft:block_match" + }, + "location_predicate": { + "block": "minecraft:water", + "predicate_type": "minecraft:block_match" + }, + "output_state": { + "Name": "minecraft:spruce_planks" + } + }, + { + "input_predicate": { + "block": "minecraft:deepslate", + "predicate_type": "minecraft:random_block_match", + "probability": 0.05 + }, + "location_predicate": { + "block": "minecraft:grass_block", + "predicate_type": "minecraft:block_match" + }, + "output_state": { + "Name": "minecraft:cobbled_deepslate" + } + }, + { + "input_predicate": { + "block": "minecraft:deepslate", + "predicate_type": "minecraft:random_block_match", + "probability": 0.3 + }, + "location_predicate": { + "block": "minecraft:grass_block", + "predicate_type": "minecraft:block_match" + }, + "output_state": { + "Name": "minecraft:basalt", + "Properties": { + "axis": "y" + } + } + }, + { + "input_predicate": { + "block": "minecraft:deepslate", + "predicate_type": "minecraft:random_block_match", + "probability": 0.02 + }, + "location_predicate": { + "block": "minecraft:grass_block", + "predicate_type": "minecraft:block_match" + }, + "output_state": { + "Name": "minecraft:smooth_basalt" + } + } + ] } - ] - } - ] + ] } \ No newline at end of file diff --git a/1-20-3-overlay/data/terralith/worldgen/processor_list/village/fortified/road.json b/1-20-3-overlay/data/terralith/worldgen/processor_list/village/fortified/road.json index ac5d84e7..9e8d701d 100644 --- a/1-20-3-overlay/data/terralith/worldgen/processor_list/village/fortified/road.json +++ b/1-20-3-overlay/data/terralith/worldgen/processor_list/village/fortified/road.json @@ -1,87 +1,132 @@ { - "processors": [ - { - "processor_type": "minecraft:rule", - "rules": [ + "processors": [ { - "location_predicate": { - "predicate_type": "minecraft:block_match", - "block": "minecraft:tall_grass" - }, - "input_predicate": { - "predicate_type": "minecraft:always_true" - }, - "output_state": { - "Name": "minecraft:air" - } + "processor_type": "minecraft:rule", + "rules": [ + { + "location_predicate": { + "predicate_type": "minecraft:block_match", + "block": "minecraft:tall_grass" + }, + "input_predicate": { + "predicate_type": "minecraft:always_true" + }, + "output_state": { + "Name": "minecraft:air" + } + }, + { + "location_predicate": { + "predicate_type": "minecraft:block_match", + "block": "minecraft:short_grass" + }, + "input_predicate": { + "predicate_type": "minecraft:always_true" + }, + "output_state": { + "Name": "minecraft:air" + } + }, + { + "input_predicate": { + "block": "minecraft:dirt", + "predicate_type": "minecraft:block_match" + }, + "location_predicate": { + "block": "minecraft:water", + "predicate_type": "minecraft:block_match" + }, + "output_state": { + "Name": "minecraft:water", + "Properties": { + "level": "0" + } + } + }, + { + "input_predicate": { + "block": "minecraft:grass_block", + "predicate_type": "minecraft:block_match" + }, + "location_predicate": { + "block": "minecraft:water", + "predicate_type": "minecraft:block_match" + }, + "output_state": { + "Name": "minecraft:water", + "Properties": { + "level": "0" + } + } + }, + { + "input_predicate": { + "block": "minecraft:deepslate", + "predicate_type": "minecraft:block_match" + }, + "location_predicate": { + "block": "minecraft:water", + "predicate_type": "minecraft:block_match" + }, + "output_state": { + "Name": "minecraft:spruce_planks" + } + }, + { + "location_predicate": { + "predicate_type": "minecraft:block_match", + "block": "minecraft:grass_block" + }, + "input_predicate": { + "predicate_type": "minecraft:random_block_match", + "block": "minecraft:deepslate", + "probability": 0.05 + }, + "output_state": { + "Name": "minecraft:cobbled_deepslate" + } + }, + { + "location_predicate": { + "predicate_type": "minecraft:block_match", + "block": "minecraft:grass_block" + }, + "input_predicate": { + "predicate_type": "minecraft:random_block_match", + "block": "minecraft:deepslate", + "probability": 0.3 + }, + "output_state": { + "Name": "minecraft:basalt", + "Properties": { + "axis": "y" + } + } + }, + { + "location_predicate": { + "predicate_type": "minecraft:block_match", + "block": "minecraft:grass_block" + }, + "input_predicate": { + "predicate_type": "minecraft:random_block_match", + "block": "minecraft:deepslate", + "probability": 0.02 + }, + "output_state": { + "Name": "minecraft:smooth_basalt" + } + } + ] }, { - "location_predicate": { - "predicate_type": "minecraft:block_match", - "block": "minecraft:short_grass" - }, - "input_predicate": { - "predicate_type": "minecraft:always_true" - }, - "output_state": { - "Name": "minecraft:air" - } - }, - { - "location_predicate": { - "predicate_type": "minecraft:block_match", - "block": "minecraft:grass_block" - }, - "input_predicate": { - "predicate_type": "minecraft:random_block_match", - "block": "minecraft:deepslate", - "probability": 0.05 - }, - "output_state": { - "Name": "minecraft:cobbled_deepslate" - } - }, - { - "location_predicate": { - "predicate_type": "minecraft:block_match", - "block": "minecraft:grass_block" - }, - "input_predicate": { - "predicate_type": "minecraft:random_block_match", - "block": "minecraft:deepslate", - "probability": 0.3 - }, - "output_state": { - "Name": "minecraft:basalt", - "Properties": { - "axis": "y" + "__comment": "This prevents loading of the pack on pre-1.20 versions.", + "processor_type": "minecraft:capped", + "limit": 1, + "delegate": { + "processor_type": "minecraft:rule", + "rules": [] } - } - }, - { - "location_predicate": { - "predicate_type": "minecraft:block_match", - "block": "minecraft:grass_block" - }, - "input_predicate": { - "predicate_type": "minecraft:random_block_match", - "block": "minecraft:deepslate", - "probability": 0.02 - }, - "output_state": { - "Name": "minecraft:smooth_basalt" - } } - ] - }, - { - "__comment": "This prevents loading of the pack on pre-1.20 versions.", - "processor_type": "minecraft:capped", - "limit": 1, - "delegate": { - "processor_type": "minecraft:rule", - "rules": [] - } - } - ] -} + ] +} \ No newline at end of file diff --git a/data/c/worldgen/structure_icons.json b/data/c/worldgen/structure_icons.json index 2c18e1dd..28554e51 100644 --- a/data/c/worldgen/structure_icons.json +++ b/data/c/worldgen/structure_icons.json @@ -1,38 +1,38 @@ { - "terralith:fortified_desert_village": { - "item": "minecraft:sandstone_stairs" - }, - "terralith:fortified_village": { - "item": "minecraft:stone_brick_stairs" - }, - "terralith:glacial_hut": { - "item": "minecraft:candle" - }, - "terralith:spire": { - "item": "minecraft:blue_ice" - }, - "terralith:underground/frosted_dungeon": { - "item": "minecraft:polished_deepslate" - }, - "terralith:underground/giant_bee_hive": { - "item": "minecraft:honeycomb_block" - }, - "terralith:underground/mining_outpost": { - "item": "minecraft:iron_pickaxe" - }, - "terralith:underground/oak_cabin": { - "item": "minecraft:moss_block" - }, - "terralith:underground/old_refinery": { - "item": "minecraft:iron_ore" - }, - "terralith:underground/sunken_tower": { - "item": "minecraft:stripped_spruce_log" - }, - "terralith:underground/witch_hut": { - "item": "minecraft:brown_mushroom" - }, - "terralith:underground_cabin": { - "item": "minecraft:moss_block" - } + "terralith:fortified_desert_village": { + "item": "minecraft:sandstone_stairs" + }, + "terralith:fortified_village": { + "item": "minecraft:stone_brick_stairs" + }, + "terralith:glacial_hut": { + "item": "minecraft:candle" + }, + "terralith:spire": { + "item": "minecraft:blue_ice" + }, + "terralith:witch_hut": { + "item": "minecraft:brown_mushroom" + }, + "terralith:underground/frosted_dungeon": { + "item": "minecraft:polished_deepslate" + }, + "terralith:underground/giant_bee_hive": { + "item": "minecraft:honeycomb_block" + }, + "terralith:underground/mining_outpost": { + "item": "minecraft:iron_pickaxe" + }, + "terralith:underground/oak_cabin": { + "item": "minecraft:moss_block" + }, + "terralith:underground/old_refinery": { + "item": "minecraft:iron_ore" + }, + "terralith:underground/sunken_tower": { + "item": "minecraft:stripped_spruce_log" + }, + "terralith:underground_cabin": { + "item": "minecraft:moss_block" + } } \ No newline at end of file diff --git a/data/terralith/structures/underground/witchhut_01.nbt b/data/terralith/structures/regular/witchhut_01.nbt similarity index 100% rename from data/terralith/structures/underground/witchhut_01.nbt rename to data/terralith/structures/regular/witchhut_01.nbt diff --git a/data/terralith/tags/worldgen/biome/has_structure/witch_hut.json b/data/terralith/tags/worldgen/biome/has_structure/witch_hut.json index 85c0592f..4a77b974 100644 --- a/data/terralith/tags/worldgen/biome/has_structure/witch_hut.json +++ b/data/terralith/tags/worldgen/biome/has_structure/witch_hut.json @@ -1,8 +1,8 @@ { "replace": false, "values": [ - "lush_caves", - "terralith:cave/underground_jungle", - "terralith:cave/fungal_caves" + "terralith:orchid_swamp", + "terralith:ice_marsh", + "minecraft:swamp" ] } \ No newline at end of file diff --git a/data/terralith/worldgen/processor_list/village/desert/road.json b/data/terralith/worldgen/processor_list/village/desert/road.json index 5fb3de58..fadbfd35 100644 --- a/data/terralith/worldgen/processor_list/village/desert/road.json +++ b/data/terralith/worldgen/processor_list/village/desert/road.json @@ -1,78 +1,123 @@ { - "processors": [ - { - "processor_type": "minecraft:rule", - "rules": [ + "processors": [ { - "input_predicate": { - "predicate_type": "minecraft:always_true" - }, - "location_predicate": { - "block": "minecraft:tall_grass", - "predicate_type": "minecraft:block_match" - }, - "output_state": { - "Name": "minecraft:air" - } - }, - { - "input_predicate": { - "predicate_type": "minecraft:always_true" - }, - "location_predicate": { - "block": "minecraft:grass", - "predicate_type": "minecraft:block_match" - }, - "output_state": { - "Name": "minecraft:air" - } - }, - { - "input_predicate": { - "block": "minecraft:deepslate", - "predicate_type": "minecraft:random_block_match", - "probability": 0.05 - }, - "location_predicate": { - "block": "minecraft:grass_block", - "predicate_type": "minecraft:block_match" - }, - "output_state": { - "Name": "minecraft:cobbled_deepslate" - } - }, - { - "input_predicate": { - "block": "minecraft:deepslate", - "predicate_type": "minecraft:random_block_match", - "probability": 0.3 - }, - "location_predicate": { - "block": "minecraft:grass_block", - "predicate_type": "minecraft:block_match" - }, - "output_state": { - "Name": "minecraft:basalt", - "Properties": { - "axis": "y" - } - } - }, - { - "input_predicate": { - "block": "minecraft:deepslate", - "predicate_type": "minecraft:random_block_match", - "probability": 0.02 - }, - "location_predicate": { - "block": "minecraft:grass_block", - "predicate_type": "minecraft:block_match" - }, - "output_state": { - "Name": "minecraft:smooth_basalt" - } + "processor_type": "minecraft:rule", + "rules": [ + { + "input_predicate": { + "predicate_type": "minecraft:always_true" + }, + "location_predicate": { + "block": "minecraft:tall_grass", + "predicate_type": "minecraft:block_match" + }, + "output_state": { + "Name": "minecraft:air" + } + }, + { + "input_predicate": { + "predicate_type": "minecraft:always_true" + }, + "location_predicate": { + "block": "minecraft:grass", + "predicate_type": "minecraft:block_match" + }, + "output_state": { + "Name": "minecraft:air" + } + }, + { + "input_predicate": { + "block": "minecraft:dirt", + "predicate_type": "minecraft:block_match" + }, + "location_predicate": { + "block": "minecraft:water", + "predicate_type": "minecraft:block_match" + }, + "output_state": { + "Name": "minecraft:water", + "Properties": { + "level": "0" + } + } + }, + { + "input_predicate": { + "block": "minecraft:grass_block", + "predicate_type": "minecraft:block_match" + }, + "location_predicate": { + "block": "minecraft:water", + "predicate_type": "minecraft:block_match" + }, + "output_state": { + "Name": "minecraft:water", + "Properties": { + "level": "0" + } + } + }, + { + "input_predicate": { + "block": "minecraft:deepslate", + "predicate_type": "minecraft:block_match" + }, + "location_predicate": { + "block": "minecraft:water", + "predicate_type": "minecraft:block_match" + }, + "output_state": { + "Name": "minecraft:spruce_planks" + } + }, + { + "input_predicate": { + "block": "minecraft:deepslate", + "predicate_type": "minecraft:random_block_match", + "probability": 0.05 + }, + "location_predicate": { + "block": "minecraft:grass_block", + "predicate_type": "minecraft:block_match" + }, + "output_state": { + "Name": "minecraft:cobbled_deepslate" + } + }, + { + "input_predicate": { + "block": "minecraft:deepslate", + "predicate_type": "minecraft:random_block_match", + "probability": 0.3 + }, + "location_predicate": { + "block": "minecraft:grass_block", + "predicate_type": "minecraft:block_match" + }, + "output_state": { + "Name": "minecraft:basalt", + "Properties": { + "axis": "y" + } + } + }, + { + "input_predicate": { + "block": "minecraft:deepslate", + "predicate_type": "minecraft:random_block_match", + "probability": 0.02 + }, + "location_predicate": { + "block": "minecraft:grass_block", + "predicate_type": "minecraft:block_match" + }, + "output_state": { + "Name": "minecraft:smooth_basalt" + } + } + ] } - ] - } - ] + ] } \ No newline at end of file diff --git a/data/terralith/worldgen/processor_list/village/fortified/road.json b/data/terralith/worldgen/processor_list/village/fortified/road.json index 04274952..f4b9fb12 100644 --- a/data/terralith/worldgen/processor_list/village/fortified/road.json +++ b/data/terralith/worldgen/processor_list/village/fortified/road.json @@ -1,87 +1,132 @@ { - "processors": [ - { - "processor_type": "minecraft:rule", - "rules": [ + "processors": [ { - "location_predicate": { - "predicate_type": "minecraft:block_match", - "block": "minecraft:tall_grass" - }, - "input_predicate": { - "predicate_type": "minecraft:always_true" - }, - "output_state": { - "Name": "minecraft:air" - } + "processor_type": "minecraft:rule", + "rules": [ + { + "location_predicate": { + "predicate_type": "minecraft:block_match", + "block": "minecraft:tall_grass" + }, + "input_predicate": { + "predicate_type": "minecraft:always_true" + }, + "output_state": { + "Name": "minecraft:air" + } + }, + { + "location_predicate": { + "predicate_type": "minecraft:block_match", + "block": "minecraft:grass" + }, + "input_predicate": { + "predicate_type": "minecraft:always_true" + }, + "output_state": { + "Name": "minecraft:air" + } + }, + { + "input_predicate": { + "block": "minecraft:dirt", + "predicate_type": "minecraft:block_match" + }, + "location_predicate": { + "block": "minecraft:water", + "predicate_type": "minecraft:block_match" + }, + "output_state": { + "Name": "minecraft:water", + "Properties": { + "level": "0" + } + } + }, + { + "input_predicate": { + "block": "minecraft:grass_block", + "predicate_type": "minecraft:block_match" + }, + "location_predicate": { + "block": "minecraft:water", + "predicate_type": "minecraft:block_match" + }, + "output_state": { + "Name": "minecraft:water", + "Properties": { + "level": "0" + } + } + }, + { + "input_predicate": { + "block": "minecraft:deepslate", + "predicate_type": "minecraft:block_match" + }, + "location_predicate": { + "block": "minecraft:water", + "predicate_type": "minecraft:block_match" + }, + "output_state": { + "Name": "minecraft:spruce_planks" + } + }, + { + "location_predicate": { + "predicate_type": "minecraft:block_match", + "block": "minecraft:grass_block" + }, + "input_predicate": { + "predicate_type": "minecraft:random_block_match", + "block": "minecraft:deepslate", + "probability": 0.05 + }, + "output_state": { + "Name": "minecraft:cobbled_deepslate" + } + }, + { + "location_predicate": { + "predicate_type": "minecraft:block_match", + "block": "minecraft:grass_block" + }, + "input_predicate": { + "predicate_type": "minecraft:random_block_match", + "block": "minecraft:deepslate", + "probability": 0.3 + }, + "output_state": { + "Name": "minecraft:basalt", + "Properties": { + "axis": "y" + } + } + }, + { + "location_predicate": { + "predicate_type": "minecraft:block_match", + "block": "minecraft:grass_block" + }, + "input_predicate": { + "predicate_type": "minecraft:random_block_match", + "block": "minecraft:deepslate", + "probability": 0.02 + }, + "output_state": { + "Name": "minecraft:smooth_basalt" + } + } + ] }, { - "location_predicate": { - "predicate_type": "minecraft:block_match", - "block": "minecraft:grass" - }, - "input_predicate": { - "predicate_type": "minecraft:always_true" - }, - "output_state": { - "Name": "minecraft:air" - } - }, - { - "location_predicate": { - "predicate_type": "minecraft:block_match", - "block": "minecraft:grass_block" - }, - "input_predicate": { - "predicate_type": "minecraft:random_block_match", - "block": "minecraft:deepslate", - "probability": 0.05 - }, - "output_state": { - "Name": "minecraft:cobbled_deepslate" - } - }, - { - "location_predicate": { - "predicate_type": "minecraft:block_match", - "block": "minecraft:grass_block" - }, - "input_predicate": { - "predicate_type": "minecraft:random_block_match", - "block": "minecraft:deepslate", - "probability": 0.3 - }, - "output_state": { - "Name": "minecraft:basalt", - "Properties": { - "axis": "y" + "__comment": "This prevents loading of the pack on pre-1.20 versions.", + "processor_type": "minecraft:capped", + "limit": 1, + "delegate": { + "processor_type": "minecraft:rule", + "rules": [] } - } - }, - { - "location_predicate": { - "predicate_type": "minecraft:block_match", - "block": "minecraft:grass_block" - }, - "input_predicate": { - "predicate_type": "minecraft:random_block_match", - "block": "minecraft:deepslate", - "probability": 0.02 - }, - "output_state": { - "Name": "minecraft:smooth_basalt" - } } - ] - }, - { - "__comment": "This prevents loading of the pack on pre-1.20 versions.", - "processor_type": "minecraft:capped", - "limit": 1, - "delegate": { - "processor_type": "minecraft:rule", - "rules": [] - } - } - ] -} + ] +} \ No newline at end of file diff --git a/data/terralith/worldgen/structure/underground/witch_hut.json b/data/terralith/worldgen/structure/witch_hut.json similarity index 52% rename from data/terralith/worldgen/structure/underground/witch_hut.json rename to data/terralith/worldgen/structure/witch_hut.json index f950cfdd..06fd8705 100644 --- a/data/terralith/worldgen/structure/underground/witch_hut.json +++ b/data/terralith/worldgen/structure/witch_hut.json @@ -2,19 +2,14 @@ "type": "minecraft:jigsaw", "biomes": "#terralith:has_structure/witch_hut", "max_distance_from_center": 80, + "project_start_to_heightmap": "WORLD_SURFACE_WG", "size": 6, "spawn_overrides": {}, "start_height": { - "type": "minecraft:uniform", - "min_inclusive": { - "absolute": -40 - }, - "max_inclusive": { - "absolute": 40 - } + "absolute": 0 }, - "start_pool": "terralith:underground/witch_hut", + "start_pool": "terralith:regular/witch_hut", "step": "surface_structures", - "terrain_adaptation": "beard_box", + "terrain_adaptation": "beard_thin", "use_expansion_hack": false } \ No newline at end of file diff --git a/data/terralith/worldgen/structure_set/regular.json b/data/terralith/worldgen/structure_set/regular.json new file mode 100644 index 00000000..0640c32a --- /dev/null +++ b/data/terralith/worldgen/structure_set/regular.json @@ -0,0 +1,15 @@ +{ + "structures": [ + { + "structure": "terralith:witch_hut", + "weight": 1 + } + ], + "placement": { + "type": "minecraft:random_spread", + "salt": 235890235372, + "spacing": 20, + "separation": 12 + } + } + \ No newline at end of file diff --git a/data/terralith/worldgen/structure_set/underground.json b/data/terralith/worldgen/structure_set/underground.json index 08beecb1..c7e5d4ac 100644 --- a/data/terralith/worldgen/structure_set/underground.json +++ b/data/terralith/worldgen/structure_set/underground.json @@ -19,10 +19,6 @@ { "structure": "terralith:underground/sunken_tower", "weight": 5 - }, - { - "structure": "terralith:underground/witch_hut", - "weight": 4 } ], "placement": { diff --git a/data/terralith/worldgen/template_pool/underground/witch_hut.json b/data/terralith/worldgen/template_pool/regular/witch_hut.json similarity index 82% rename from data/terralith/worldgen/template_pool/underground/witch_hut.json rename to data/terralith/worldgen/template_pool/regular/witch_hut.json index d8306663..bc47bfaf 100644 --- a/data/terralith/worldgen/template_pool/underground/witch_hut.json +++ b/data/terralith/worldgen/template_pool/regular/witch_hut.json @@ -3,7 +3,7 @@ { "element": { "element_type": "minecraft:single_pool_element", - "location": "terralith:underground/witchhut_01", + "location": "terralith:regular/witchhut_01", "processors": "minecraft:empty", "projection": "rigid" },