Merge remote-tracking branch 'origin/1.20.2' into 1.20.2

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
   },

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"
 }

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"
+}

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"
 }