diff --git a/src/main/resources/data/overdrive_that_matters/structure/laboratory/arena/arena_a.nbt b/src/main/resources/data/overdrive_that_matters/structure/laboratory/arena/arena_a.nbt index 19fdc72e8..a54afa81b 100644 Binary files a/src/main/resources/data/overdrive_that_matters/structure/laboratory/arena/arena_a.nbt and b/src/main/resources/data/overdrive_that_matters/structure/laboratory/arena/arena_a.nbt differ diff --git a/src/main/resources/data/overdrive_that_matters/structure/laboratory/crates/materials.nbt b/src/main/resources/data/overdrive_that_matters/structure/laboratory/crates/materials.nbt new file mode 100644 index 000000000..34cd5a0ab Binary files /dev/null and b/src/main/resources/data/overdrive_that_matters/structure/laboratory/crates/materials.nbt differ diff --git a/src/main/resources/data/overdrive_that_matters/structure/laboratory/crates/modules.nbt b/src/main/resources/data/overdrive_that_matters/structure/laboratory/crates/modules.nbt new file mode 100644 index 000000000..e80bc4ca4 Binary files /dev/null and b/src/main/resources/data/overdrive_that_matters/structure/laboratory/crates/modules.nbt differ diff --git a/src/main/resources/data/overdrive_that_matters/structure/laboratory/crossroads/crossroad_a.nbt b/src/main/resources/data/overdrive_that_matters/structure/laboratory/crossroads/crossroad_a.nbt index 4373959ce..c9587b6e3 100644 Binary files a/src/main/resources/data/overdrive_that_matters/structure/laboratory/crossroads/crossroad_a.nbt and b/src/main/resources/data/overdrive_that_matters/structure/laboratory/crossroads/crossroad_a.nbt differ diff --git a/src/main/resources/data/overdrive_that_matters/structure/laboratory/entrance/entrance_a.nbt b/src/main/resources/data/overdrive_that_matters/structure/laboratory/entrance/entrance_a.nbt index 3d9e2e89e..74d49de42 100644 Binary files a/src/main/resources/data/overdrive_that_matters/structure/laboratory/entrance/entrance_a.nbt and b/src/main/resources/data/overdrive_that_matters/structure/laboratory/entrance/entrance_a.nbt differ diff --git a/src/main/resources/data/overdrive_that_matters/structure/laboratory/halls/center/center_a.nbt b/src/main/resources/data/overdrive_that_matters/structure/laboratory/halls/center/center_a.nbt index 626420512..049bfb566 100644 Binary files a/src/main/resources/data/overdrive_that_matters/structure/laboratory/halls/center/center_a.nbt and b/src/main/resources/data/overdrive_that_matters/structure/laboratory/halls/center/center_a.nbt differ diff --git a/src/main/resources/data/overdrive_that_matters/structure/laboratory/halls/hall1/hall_damaged.nbt b/src/main/resources/data/overdrive_that_matters/structure/laboratory/halls/hall1/hall_damaged.nbt index cdab54c03..12a8c041d 100644 Binary files a/src/main/resources/data/overdrive_that_matters/structure/laboratory/halls/hall1/hall_damaged.nbt and b/src/main/resources/data/overdrive_that_matters/structure/laboratory/halls/hall1/hall_damaged.nbt differ diff --git a/src/main/resources/data/overdrive_that_matters/structure/laboratory/halls/hall1/hall_overgrown.nbt b/src/main/resources/data/overdrive_that_matters/structure/laboratory/halls/hall1/hall_overgrown.nbt index d535146dd..4a70a6f59 100644 Binary files a/src/main/resources/data/overdrive_that_matters/structure/laboratory/halls/hall1/hall_overgrown.nbt and b/src/main/resources/data/overdrive_that_matters/structure/laboratory/halls/hall1/hall_overgrown.nbt differ diff --git a/src/main/resources/data/overdrive_that_matters/structure/laboratory/intersections/car_portal.nbt b/src/main/resources/data/overdrive_that_matters/structure/laboratory/intersections/car_portal.nbt index 67a7a20d0..2f22c5d8d 100644 Binary files a/src/main/resources/data/overdrive_that_matters/structure/laboratory/intersections/car_portal.nbt and b/src/main/resources/data/overdrive_that_matters/structure/laboratory/intersections/car_portal.nbt differ diff --git a/src/main/resources/data/overdrive_that_matters/structure/laboratory/intersections/corridor_rooms.nbt b/src/main/resources/data/overdrive_that_matters/structure/laboratory/intersections/corridor_rooms.nbt new file mode 100644 index 000000000..16dea8829 Binary files /dev/null and b/src/main/resources/data/overdrive_that_matters/structure/laboratory/intersections/corridor_rooms.nbt differ diff --git a/src/main/resources/data/overdrive_that_matters/structure/laboratory/intersections/lava.nbt b/src/main/resources/data/overdrive_that_matters/structure/laboratory/intersections/lava.nbt index c9f367aef..1a420728b 100644 Binary files a/src/main/resources/data/overdrive_that_matters/structure/laboratory/intersections/lava.nbt and b/src/main/resources/data/overdrive_that_matters/structure/laboratory/intersections/lava.nbt differ diff --git a/src/main/resources/data/overdrive_that_matters/structure/laboratory/intersections/overpass.nbt b/src/main/resources/data/overdrive_that_matters/structure/laboratory/intersections/overpass.nbt index d55574c02..aefa46082 100644 Binary files a/src/main/resources/data/overdrive_that_matters/structure/laboratory/intersections/overpass.nbt and b/src/main/resources/data/overdrive_that_matters/structure/laboratory/intersections/overpass.nbt differ diff --git a/src/main/resources/data/overdrive_that_matters/structure/laboratory/intersections/stairs_a.nbt b/src/main/resources/data/overdrive_that_matters/structure/laboratory/intersections/stairs_a.nbt index 74677794e..ae0879747 100644 Binary files a/src/main/resources/data/overdrive_that_matters/structure/laboratory/intersections/stairs_a.nbt and b/src/main/resources/data/overdrive_that_matters/structure/laboratory/intersections/stairs_a.nbt differ diff --git a/src/main/resources/data/overdrive_that_matters/structure/laboratory/intersections/stairs_b.nbt b/src/main/resources/data/overdrive_that_matters/structure/laboratory/intersections/stairs_b.nbt index 8460cf935..5644bed01 100644 Binary files a/src/main/resources/data/overdrive_that_matters/structure/laboratory/intersections/stairs_b.nbt and b/src/main/resources/data/overdrive_that_matters/structure/laboratory/intersections/stairs_b.nbt differ diff --git a/src/main/resources/data/overdrive_that_matters/structure/laboratory/intersections/stairs_straight.nbt b/src/main/resources/data/overdrive_that_matters/structure/laboratory/intersections/stairs_straight.nbt new file mode 100644 index 000000000..e0154485e Binary files /dev/null and b/src/main/resources/data/overdrive_that_matters/structure/laboratory/intersections/stairs_straight.nbt differ diff --git a/src/main/resources/data/overdrive_that_matters/structure/laboratory/intersections/turn_a.nbt b/src/main/resources/data/overdrive_that_matters/structure/laboratory/intersections/turn_a.nbt index 08f2bc419..da6075b44 100644 Binary files a/src/main/resources/data/overdrive_that_matters/structure/laboratory/intersections/turn_a.nbt and b/src/main/resources/data/overdrive_that_matters/structure/laboratory/intersections/turn_a.nbt differ diff --git a/src/main/resources/data/overdrive_that_matters/structure/laboratory/rooms/office_a.nbt b/src/main/resources/data/overdrive_that_matters/structure/laboratory/rooms/office_a.nbt index 28af8efa8..eac7c3932 100644 Binary files a/src/main/resources/data/overdrive_that_matters/structure/laboratory/rooms/office_a.nbt and b/src/main/resources/data/overdrive_that_matters/structure/laboratory/rooms/office_a.nbt differ diff --git a/src/main/resources/data/overdrive_that_matters/structure/laboratory/rooms/office_b.nbt b/src/main/resources/data/overdrive_that_matters/structure/laboratory/rooms/office_b.nbt index 58ce67cff..5b28a5221 100644 Binary files a/src/main/resources/data/overdrive_that_matters/structure/laboratory/rooms/office_b.nbt and b/src/main/resources/data/overdrive_that_matters/structure/laboratory/rooms/office_b.nbt differ diff --git a/src/main/resources/data/overdrive_that_matters/structure/laboratory/rooms/reactor.nbt b/src/main/resources/data/overdrive_that_matters/structure/laboratory/rooms/reactor.nbt index 8e7925c3a..9b973a434 100644 Binary files a/src/main/resources/data/overdrive_that_matters/structure/laboratory/rooms/reactor.nbt and b/src/main/resources/data/overdrive_that_matters/structure/laboratory/rooms/reactor.nbt differ diff --git a/src/main/resources/data/overdrive_that_matters/structure/laboratory/rooms/stairs_arena.nbt b/src/main/resources/data/overdrive_that_matters/structure/laboratory/rooms/stairs_arena.nbt new file mode 100644 index 000000000..fd8324415 Binary files /dev/null and b/src/main/resources/data/overdrive_that_matters/structure/laboratory/rooms/stairs_arena.nbt differ diff --git a/src/main/resources/data/overdrive_that_matters/structure/laboratory/rooms/vertical_a.nbt b/src/main/resources/data/overdrive_that_matters/structure/laboratory/rooms/vertical_a.nbt index 95524ec58..5268770b4 100644 Binary files a/src/main/resources/data/overdrive_that_matters/structure/laboratory/rooms/vertical_a.nbt and b/src/main/resources/data/overdrive_that_matters/structure/laboratory/rooms/vertical_a.nbt differ diff --git a/src/main/resources/data/overdrive_that_matters/worldgen/template_pool/laboratory/crates.json b/src/main/resources/data/overdrive_that_matters/worldgen/template_pool/laboratory/crates.json new file mode 100644 index 000000000..5315d6c90 --- /dev/null +++ b/src/main/resources/data/overdrive_that_matters/worldgen/template_pool/laboratory/crates.json @@ -0,0 +1,30 @@ +{ +"name": "overdrive_that_matters:lab_fallback", + "elements": [ + { + "element": { + "element_type": "minecraft:single_pool_element", + "location": "overdrive_that_matters:laboratory/crates/materials", + "processors": "minecraft:empty", + "projection": "rigid" + }, + "weight": 3 + }, + { + "element": { + "element_type": "minecraft:single_pool_element", + "location": "overdrive_that_matters:laboratory/crates/modules", + "processors": "minecraft:empty", + "projection": "rigid" + }, + "weight": 1 + }, + { + "element": { + "element_type": "minecraft:empty_pool_element" + }, + "weight": 3 + } + ], + "fallback": "minecraft:empty" +} \ No newline at end of file diff --git a/src/main/resources/data/overdrive_that_matters/worldgen/template_pool/laboratory/intersections.json b/src/main/resources/data/overdrive_that_matters/worldgen/template_pool/laboratory/intersections.json index 7245b9adb..c635e0bbf 100644 --- a/src/main/resources/data/overdrive_that_matters/worldgen/template_pool/laboratory/intersections.json +++ b/src/main/resources/data/overdrive_that_matters/worldgen/template_pool/laboratory/intersections.json @@ -54,6 +54,24 @@ "projection": "rigid" }, "weight": 2 + }, + { + "element": { + "element_type": "minecraft:single_pool_element", + "location": "overdrive_that_matters:laboratory/intersections/stairs_straight", + "processors": "overdrive_that_matters:laboratory_weathering", + "projection": "rigid" + }, + "weight": 3 + }, + { + "element": { + "element_type": "minecraft:single_pool_element", + "location": "overdrive_that_matters:laboratory/intersections/corridor_rooms", + "processors": "overdrive_that_matters:laboratory_weathering", + "projection": "rigid" + }, + "weight": 3 } ], "fallback": "overdrive_that_matters:laboratory/fallback_pool" diff --git a/src/main/resources/data/overdrive_that_matters/worldgen/template_pool/laboratory/rooms.json b/src/main/resources/data/overdrive_that_matters/worldgen/template_pool/laboratory/rooms.json index 5dbab6f42..7a180eda2 100644 --- a/src/main/resources/data/overdrive_that_matters/worldgen/template_pool/laboratory/rooms.json +++ b/src/main/resources/data/overdrive_that_matters/worldgen/template_pool/laboratory/rooms.json @@ -8,7 +8,7 @@ "processors": "overdrive_that_matters:laboratory_weathering", "projection": "rigid" }, - "weight": 1 + "weight": 2 }, { "element": { @@ -18,6 +18,15 @@ "projection": "rigid" }, "weight": 2 + }, + { + "element": { + "element_type": "minecraft:single_pool_element", + "location": "overdrive_that_matters:laboratory/rooms/stairs_arena", + "processors": "overdrive_that_matters:laboratory_weathering", + "projection": "rigid" + }, + "weight": 2 }, { "element": { @@ -26,7 +35,7 @@ "processors": "overdrive_that_matters:laboratory_weathering", "projection": "rigid" }, - "weight": 1 + "weight": 2 }, { "element": { @@ -35,7 +44,7 @@ "processors": "overdrive_that_matters:laboratory_weathering", "projection": "rigid" }, - "weight": 2 + "weight": 1 } ], "fallback": "overdrive_that_matters:laboratory/fallback_pool"