diff --git a/src/main/resources/data/overdrive_that_matters/structures/laboratory/center/lab_arena_0.nbt b/src/main/resources/data/overdrive_that_matters/structures/laboratory/center/lab_arena_0.nbt index f3f70d3dd..91e1743a4 100644 Binary files a/src/main/resources/data/overdrive_that_matters/structures/laboratory/center/lab_arena_0.nbt and b/src/main/resources/data/overdrive_that_matters/structures/laboratory/center/lab_arena_0.nbt differ diff --git a/src/main/resources/data/overdrive_that_matters/structures/laboratory/center/lab_arena_1.nbt b/src/main/resources/data/overdrive_that_matters/structures/laboratory/center/lab_arena_1.nbt new file mode 100644 index 000000000..dc8d66ccb Binary files /dev/null and b/src/main/resources/data/overdrive_that_matters/structures/laboratory/center/lab_arena_1.nbt differ diff --git a/src/main/resources/data/overdrive_that_matters/structures/laboratory/corridor_end.nbt b/src/main/resources/data/overdrive_that_matters/structures/laboratory/corridor_end.nbt deleted file mode 100644 index aef8121d1..000000000 Binary files a/src/main/resources/data/overdrive_that_matters/structures/laboratory/corridor_end.nbt and /dev/null differ diff --git a/src/main/resources/data/overdrive_that_matters/structures/laboratory/dead_end.nbt b/src/main/resources/data/overdrive_that_matters/structures/laboratory/dead_end.nbt new file mode 100644 index 000000000..80a839063 Binary files /dev/null and b/src/main/resources/data/overdrive_that_matters/structures/laboratory/dead_end.nbt differ diff --git a/src/main/resources/data/overdrive_that_matters/structures/laboratory/main/corridor_0.nbt b/src/main/resources/data/overdrive_that_matters/structures/laboratory/main/corridor_0.nbt index 8009cc63a..2aabd6086 100644 Binary files a/src/main/resources/data/overdrive_that_matters/structures/laboratory/main/corridor_0.nbt and b/src/main/resources/data/overdrive_that_matters/structures/laboratory/main/corridor_0.nbt differ diff --git a/src/main/resources/data/overdrive_that_matters/structures/laboratory/main/corridor_1.nbt b/src/main/resources/data/overdrive_that_matters/structures/laboratory/main/corridor_1.nbt index 309cc93e9..5a592b1b6 100644 Binary files a/src/main/resources/data/overdrive_that_matters/structures/laboratory/main/corridor_1.nbt and b/src/main/resources/data/overdrive_that_matters/structures/laboratory/main/corridor_1.nbt differ diff --git a/src/main/resources/data/overdrive_that_matters/structures/laboratory/main/corridor_room_0.nbt b/src/main/resources/data/overdrive_that_matters/structures/laboratory/main/corridor_room_0.nbt new file mode 100644 index 000000000..f6933f512 Binary files /dev/null and b/src/main/resources/data/overdrive_that_matters/structures/laboratory/main/corridor_room_0.nbt differ diff --git a/src/main/resources/data/overdrive_that_matters/structures/laboratory/main/corridor_stairs_0.nbt b/src/main/resources/data/overdrive_that_matters/structures/laboratory/main/corridor_stairs_0.nbt new file mode 100644 index 000000000..f0a1e8f1b Binary files /dev/null and b/src/main/resources/data/overdrive_that_matters/structures/laboratory/main/corridor_stairs_0.nbt differ diff --git a/src/main/resources/data/overdrive_that_matters/structures/laboratory/main/generator_room_0.nbt b/src/main/resources/data/overdrive_that_matters/structures/laboratory/main/generator_room_0.nbt index d402a4b12..be5743718 100644 Binary files a/src/main/resources/data/overdrive_that_matters/structures/laboratory/main/generator_room_0.nbt and b/src/main/resources/data/overdrive_that_matters/structures/laboratory/main/generator_room_0.nbt differ diff --git a/src/main/resources/data/overdrive_that_matters/worldgen/structure/laboratory.json b/src/main/resources/data/overdrive_that_matters/worldgen/structure/laboratory.json index af63b6142..193c4560e 100644 --- a/src/main/resources/data/overdrive_that_matters/worldgen/structure/laboratory.json +++ b/src/main/resources/data/overdrive_that_matters/worldgen/structure/laboratory.json @@ -3,7 +3,6 @@ "biomes": "#overdrive_that_matters:laboratory", "max_distance_from_center": 100, "size": 7, - "project_start_to_heightmap": "WORLD_SURFACE_WG", "start_height": { "absolute": -13 }, diff --git a/src/main/resources/data/overdrive_that_matters/worldgen/template_pool/laboratory/center.json b/src/main/resources/data/overdrive_that_matters/worldgen/template_pool/laboratory/center.json index 1fb6ab9f4..a1755480b 100644 --- a/src/main/resources/data/overdrive_that_matters/worldgen/template_pool/laboratory/center.json +++ b/src/main/resources/data/overdrive_that_matters/worldgen/template_pool/laboratory/center.json @@ -1,6 +1,5 @@ { - "name": "overdrive_that_matters:center_top", - "fallback": "minecraft:empty", + "name": "overdrive_that_matters:center", "elements": [ { "element": { @@ -8,8 +7,18 @@ "location": "overdrive_that_matters:laboratory/center/lab_arena_0", "processors": "minecraft:empty", "projection": "rigid" + }, + "weight": 1 + }, + { + "element": { + "element_type": "minecraft:single_pool_element", + "location": "overdrive_that_matters:laboratory/center/lab_arena_1", + "processors": "minecraft:empty", + "projection": "rigid" }, "weight": 1 } - ] + ], + "fallback": "minecraft:empty" } \ No newline at end of file diff --git a/src/main/resources/data/overdrive_that_matters/worldgen/template_pool/laboratory/fallback_pool.json b/src/main/resources/data/overdrive_that_matters/worldgen/template_pool/laboratory/fallback_pool.json new file mode 100644 index 000000000..0a49ae437 --- /dev/null +++ b/src/main/resources/data/overdrive_that_matters/worldgen/template_pool/laboratory/fallback_pool.json @@ -0,0 +1,15 @@ +{ +"name": "overdrive_that_matters:lab_fallback", + "elements": [ + { + "element": { + "element_type": "minecraft:single_pool_element", + "location": "overdrive_that_matters:laboratory/dead_end", + "processors": "minecraft:empty", + "projection": "rigid" + }, + "weight": 1 + } + ], + "fallback": "minecraft:empty" +} \ No newline at end of file diff --git a/src/main/resources/data/overdrive_that_matters/worldgen/template_pool/laboratory/main.json b/src/main/resources/data/overdrive_that_matters/worldgen/template_pool/laboratory/main.json index 3d5f840e6..02e63ee92 100644 --- a/src/main/resources/data/overdrive_that_matters/worldgen/template_pool/laboratory/main.json +++ b/src/main/resources/data/overdrive_that_matters/worldgen/template_pool/laboratory/main.json @@ -1,6 +1,5 @@ { - "name": "overdrive_that_matters:rooms", - "fallback": "minecraft:empty", + "name": "overdrive_that_matters:main", "elements": [ { "element": { @@ -36,12 +35,12 @@ "processors": "minecraft:empty", "projection": "rigid" }, - "weight": 4 + "weight": 3 }, { "element": { "element_type": "minecraft:single_pool_element", - "location": "overdrive_that_matters:laboratory/main/generator_room_0", + "location": "overdrive_that_matters:laboratory/main/corridor_room_0", "processors": "minecraft:empty", "projection": "rigid" }, @@ -50,11 +49,30 @@ { "element": { "element_type": "minecraft:single_pool_element", - "location": "overdrive_that_matters:laboratory/main/portal_room_0", + "location": "overdrive_that_matters:laboratory/main/corridor_stairs_0", "processors": "minecraft:empty", "projection": "rigid" }, "weight": 2 + }, + { + "element": { + "element_type": "minecraft:single_pool_element", + "location": "overdrive_that_matters:laboratory/main/generator_room_0", + "processors": "minecraft:empty", + "projection": "rigid" + }, + "weight": 2 + }, + { + "element": { + "element_type": "minecraft:single_pool_element", + "location": "overdrive_that_matters:laboratory/main/portal_room_0", + "processors": "minecraft:empty", + "projection": "rigid" + }, + "weight": 1 } - ] + ], + "fallback": "overdrive_that_matters:laboratory/fallback_pool" } \ No newline at end of file