Laboratory rebuild WIP + decorative computer model

src/main/resources/assets/overdrive_that_matters/models/block/decorative/computer_terminal.json

@@ -0,0 +1,57 @@
+{
+	"credit": "Made with Blockbench",
+	"texture_size": [32, 32],
+	"textures": {
+		"0": "overdrive_that_matters:block/decorative/computer_base",
+		"1": "overdrive_that_matters:block/decorative/computer_screen",
+		"particle": "overdrive_that_matters:block/decorative/computer_base"
+	},
+	"elements": [
+		{
+			"from": [1, 0, 1],
+			"to": [15, 2, 15],
+			"faces": {
+				"north": {"uv": [0, 7, 7, 8], "texture": "#0"},
+				"east": {"uv": [0, 7, 7, 8], "texture": "#0"},
+				"south": {"uv": [0, 7, 7, 8], "texture": "#0"},
+				"west": {"uv": [0, 7, 7, 8], "texture": "#0"},
+				"up": {"uv": [0, 8, 7, 15], "texture": "#0"},
+				"down": {"uv": [0, 0, 7, 7], "texture": "#0"}
+			}
+		},
+		{
+			"from": [1, 2, 5],
+			"to": [15, 5, 15],
+			"faces": {
+				"north": {"uv": [7, 5, 14, 6.5], "texture": "#0"},
+				"east": {"uv": [8.5, 6.5, 13.5, 8], "texture": "#0"},
+				"south": {"uv": [7, 8, 14, 9.5], "texture": "#0"},
+				"west": {"uv": [7.5, 6.5, 12.5, 8], "texture": "#0"},
+				"up": {"uv": [7, 0, 14, 5], "rotation": 180, "texture": "#0"}
+			}
+		},
+		{
+			"from": [2, 5, 4],
+			"to": [14, 15, 14],
+			"faces": {
+				"north": {"uv": [0, 5, 6, 10], "texture": "#1"},
+				"east": {"uv": [6, 5, 11, 10], "texture": "#1"},
+				"south": {"uv": [6, 0, 12, 5], "texture": "#1"},
+				"west": {"uv": [6, 5, 11, 10], "texture": "#1"},
+				"up": {"uv": [0, 0, 6, 5], "rotation": 180, "texture": "#1"},
+				"down": {"uv": [0, 10, 6, 15], "rotation": 180, "texture": "#1"}
+			}
+		},
+		{
+			"from": [3, 8, 14],
+			"to": [13, 14, 15],
+			"faces": {
+				"east": {"uv": [10.5, 10, 11, 13], "texture": "#1"},
+				"south": {"uv": [6, 10, 11, 13], "texture": "#1"},
+				"west": {"uv": [6, 10, 6.5, 13], "texture": "#1"},
+				"up": {"uv": [6, 10, 11, 10.5], "texture": "#1"},
+				"down": {"uv": [6, 12.5, 11, 13], "texture": "#1"}
+			}
+		}
+	]
+}

src/main/resources/data/overdrive_that_matters/worldgen/structure/laboratory.json

@@ -5,7 +5,7 @@
   "size": 7,
   "project_start_to_heightmap": "WORLD_SURFACE_WG",
   "start_height": {
-	  "absolute": 0
+    "absolute": -13
   },
   "spawn_overrides": {
     "monster": {
@@ -21,7 +21,7 @@
     }
   },
   "start_jigsaw_name": "overdrive_that_matters:laboratory_anchor",
-  "start_pool": "overdrive_that_matters:laboratory/center_top",
+  "start_pool": "overdrive_that_matters:laboratory/center",
   "step": "underground_decoration",
   "terrain_adaption": "bury",
   "use_expansion_hack": false

src/main/resources/data/overdrive_that_matters/worldgen/structure_set/laboratory.json

@@ -1,9 +1,9 @@
 {
   "placement": {
     "type": "minecraft:random_spread",
-    "salt": 20083232,
+    "salt": 20803232,
     "separation": 8,
-    "spacing": 500
+    "spacing": 24
   },
   "structures": [
     {

src/main/resources/data/overdrive_that_matters/worldgen/template_pool/laboratory/center.json

@@ -1,11 +1,11 @@
 {
-  "name": "overdrive_that_matters:corridor_end",
+  "name": "overdrive_that_matters:center_top",
   "fallback": "minecraft:empty",
   "elements": [
 	 {
       "element": {
 		"element_type": "minecraft:single_pool_element",
-		"location": "overdrive_that_matters:laboratory/corridor_end",
+		"location": "overdrive_that_matters:laboratory/center/lab_arena_0",
         "processors": "minecraft:empty",
 		"projection": "rigid"
       },

src/main/resources/data/overdrive_that_matters/worldgen/template_pool/laboratory/center_bottom.json

@@ -1,24 +0,0 @@
-{
-  "name": "overdrive_that_matters:center_bottom",
-  "fallback": "minecraft:empty",
-  "elements": [
-	 {
-      "element": {
-		"element_type": "minecraft:single_pool_element",
-		"location": "overdrive_that_matters:laboratory/center/bottom/lab_elevator_bottom_a",
-        "processors": "minecraft:empty",
-		"projection": "rigid"
-      },
-	  "weight": 1
-    },
-	{
-      "element": {
-		"element_type": "minecraft:single_pool_element",
-		"location": "overdrive_that_matters:laboratory/center/bottom/lab_elevator_bottom_b",
-        "processors": "minecraft:empty",
-		"projection": "rigid"
-      },
-	  "weight": 1
-    }
-  ]
-}

src/main/resources/data/overdrive_that_matters/worldgen/template_pool/laboratory/center_top.json

@@ -1,24 +0,0 @@
-{
-  "name": "overdrive_that_matters:center_top",
-  "fallback": "minecraft:empty",
-  "elements": [
-	 {
-      "element": {
-		"element_type": "minecraft:single_pool_element",
-		"location": "overdrive_that_matters:laboratory/center/top/lab_elevator_top_a",
-        "processors": "minecraft:empty",
-		"projection": "rigid"
-      },
-	  "weight": 1
-    },
-	{
-      "element": {
-		"element_type": "minecraft:single_pool_element",
-		"location": "overdrive_that_matters:laboratory/center/top/lab_elevator_top_b",
-        "processors": "minecraft:empty",
-		"projection": "rigid"
-      },
-	  "weight": 1
-    }
-  ]
-}

src/main/resources/data/overdrive_that_matters/worldgen/template_pool/laboratory/corridors.json

@@ -1,78 +0,0 @@
-{
-  "name": "overdrive_that_matters:corridors",
-  "fallback": "minecraft:empty",
-  "elements": [
-    {
-      "element": {
-		"element_type": "minecraft:single_pool_element",
-		"location": "overdrive_that_matters:laboratory/corridors/corridor_a",
-        "processors": "minecraft:empty",
-		"projection": "rigid"
-      },
-	  "weight": 3
-    },
-	 {
-      "element": {
-		"element_type": "minecraft:single_pool_element",
-		"location": "overdrive_that_matters:laboratory/corridors/corridor_b",
-        "processors": "minecraft:empty",
-		"projection": "rigid"
-      },
-	  "weight": 3
-    },
-	{
-      "element": {
-		"element_type": "minecraft:single_pool_element",
-		"location": "overdrive_that_matters:laboratory/corridors/corridor_c",
-        "processors": "minecraft:empty",
-		"projection": "rigid"
-      },
-	  "weight": 2
-    },
-	{
-      "element": {
-		"element_type": "minecraft:single_pool_element",
-		"location": "overdrive_that_matters:laboratory/corridors/corridor_turn_a",
-        "processors": "minecraft:empty",
-		"projection": "rigid"
-      },
-	  "weight": 2
-    },
-	{
-      "element": {
-		"element_type": "minecraft:single_pool_element",
-		"location": "overdrive_that_matters:laboratory/corridors/corridor_turn_a_room",
-        "processors": "minecraft:empty",
-		"projection": "rigid"
-      },
-	  "weight": 1
-    },
-	{
-      "element": {
-		"element_type": "minecraft:single_pool_element",
-		"location": "overdrive_that_matters:laboratory/corridors/corridor_t",
-        "processors": "minecraft:empty",
-		"projection": "rigid"
-      },
-	  "weight": 2
-    },
-	{
-      "element": {
-		"element_type": "minecraft:single_pool_element",
-		"location": "overdrive_that_matters:laboratory/corridors/corridor_cross",
-        "processors": "minecraft:empty",
-		"projection": "rigid"
-      },
-	  "weight": 1
-    },
-	 {
-      "element": {
-		"element_type": "minecraft:single_pool_element",
-		"location": "overdrive_that_matters:laboratory/corridors/corridor_storage_a",
-        "processors": "minecraft:empty",
-		"projection": "rigid"
-      },
-	  "weight": 2
-    }
-  ]
-}

src/main/resources/data/overdrive_that_matters/worldgen/template_pool/laboratory/main.json

@@ -0,0 +1,60 @@
+{
+  "name": "overdrive_that_matters:rooms",
+  "fallback": "minecraft:empty",
+  "elements": [
+	{
+      "element": {
+		"element_type": "minecraft:single_pool_element",
+		"location": "overdrive_that_matters:laboratory/main/corridor_0",
+        "processors": "minecraft:empty",
+		"projection": "rigid"
+      },
+	  "weight": 4
+    },
+	{
+      "element": {
+		"element_type": "minecraft:single_pool_element",
+		"location": "overdrive_that_matters:laboratory/main/corridor_1",
+        "processors": "minecraft:empty",
+		"projection": "rigid"
+      },
+	  "weight": 4
+    },
+	{
+      "element": {
+		"element_type": "minecraft:single_pool_element",
+		"location": "overdrive_that_matters:laboratory/main/corridor_turn_0",
+        "processors": "minecraft:empty",
+		"projection": "rigid"
+      },
+	  "weight": 4
+    },
+	{
+      "element": {
+		"element_type": "minecraft:single_pool_element",
+		"location": "overdrive_that_matters:laboratory/main/corrior_t_0",
+        "processors": "minecraft:empty",
+		"projection": "rigid"
+      },
+	  "weight": 4
+    },
+	{
+      "element": {
+		"element_type": "minecraft:single_pool_element",
+		"location": "overdrive_that_matters:laboratory/main/generator_room_0",
+        "processors": "minecraft:empty",
+		"projection": "rigid"
+      },
+	  "weight": 3
+    },
+	{
+      "element": {
+		"element_type": "minecraft:single_pool_element",
+		"location": "overdrive_that_matters:laboratory/main/portal_room_0",
+        "processors": "minecraft:empty",
+		"projection": "rigid"
+      },
+	  "weight": 2
+    }
+  ]
+}

src/main/resources/data/overdrive_that_matters/worldgen/template_pool/laboratory/rooms.json

@@ -1,96 +0,0 @@
-{
-  "name": "overdrive_that_matters:rooms",
-  "fallback": "minecraft:empty",
-  "elements": [
-    {
-      "element": {
-		"element_type": "minecraft:single_pool_element",
-		"location": "overdrive_that_matters:laboratory/rooms/lab_chamber_a",
-        "processors": "minecraft:empty",
-		"projection": "rigid"
-      },
-	  "weight": 4
-    },
-	{
-      "element": {
-		"element_type": "minecraft:single_pool_element",
-		"location": "overdrive_that_matters:laboratory/rooms/lab_chamber_b",
-        "processors": "minecraft:empty",
-		"projection": "rigid"
-      },
-	  "weight": 2
-    },
-	 {
-      "element": {
-		"element_type": "minecraft:single_pool_element",
-		"location": "overdrive_that_matters:laboratory/rooms/generator_room",
-        "processors": "minecraft:empty",
-		"projection": "rigid"
-      },
-	  "weight": 3
-    },
-	{
-      "element": {
-		"element_type": "minecraft:single_pool_element",
-		"location": "overdrive_that_matters:laboratory/corridors/corridor_turn_a",
-        "processors": "minecraft:empty",
-		"projection": "rigid"
-      },
-	  "weight": 3
-    },
-	{
-      "element": {
-		"element_type": "minecraft:single_pool_element",
-		"location": "overdrive_that_matters:laboratory/corridors/corridor_turn_a_room",
-        "processors": "minecraft:empty",
-		"projection": "rigid"
-      },
-	  "weight": 3
-    },
-	{
-      "element": {
-		"element_type": "minecraft:single_pool_element",
-		"location": "overdrive_that_matters:laboratory/corridors/corridor_t",
-        "processors": "minecraft:empty",
-		"projection": "rigid"
-      },
-	  "weight": 3
-    },
-	{
-      "element": {
-		"element_type": "minecraft:single_pool_element",
-		"location": "overdrive_that_matters:laboratory/corridors/corridor_cross",
-        "processors": "minecraft:empty",
-		"projection": "rigid"
-      },
-	  "weight": 2
-    },
-	{
-      "element": {
-		"element_type": "minecraft:single_pool_element",
-		"location": "overdrive_that_matters:laboratory/rooms/mech_bay",
-        "processors": "minecraft:empty",
-		"projection": "rigid"
-      },
-	  "weight": 1
-    },
-	{
-      "element": {
-		"element_type": "minecraft:single_pool_element",
-		"location": "overdrive_that_matters:laboratory/rooms/misc_a",
-        "processors": "minecraft:empty",
-		"projection": "rigid"
-      },
-	  "weight": 3
-    },
-	{
-      "element": {
-		"element_type": "minecraft:single_pool_element",
-		"location": "overdrive_that_matters:laboratory/rooms/office_a",
-        "processors": "minecraft:empty",
-		"projection": "rigid"
-      },
-	  "weight": 3
-    }
-  ]
-}