New Catacombs Pieces By Wiggle

CHANGELOG.md

@@ -3,8 +3,8 @@ Thank you!
 Put the changelog BELOW the dashes. ANYTHING ABOVE IS IGNORED
 hi
 -----------------
-- Added 27 new rooms for the Catacombs.
-- Chains new generate more commonly in Catacombs.
+- Added 42 new rooms for Catacombs.
+- Chains now generate more commonly in Catacombs.
 - Fixed a vanilla bug where Powered Rails, Activator Rails, and Detector Rails wouldn't rotate properly in structure generation.
 - Cracked and Chiseled Purpur Blocks can now be broken faster with a pickaxe. ([#10](https://github.com/FrozenBlock/TrailierTales/issues/10))
 - Fixed a crash where modded boats that aren't implemented the same way as vanilla cause a crash. ([#9](https://github.com/FrozenBlock/TrailierTales/issues/9))

src/main/generated/data/trailiertales/worldgen/template_pool/catacombs/corridor_connector.json

@@ -792,6 +792,15 @@
       },
       "weight": 2
     },
+    {
+      "element": {
+        "element_type": "minecraft:single_pool_element",
+        "location": "trailiertales:catacombs/tomb/corridor_pit",
+        "processors": "trailiertales:catacombs_tomb",
+        "projection": "rigid"
+      },
+      "weight": 2
+    },
     {
       "element": {
         "element_type": "minecraft:single_pool_element",
@@ -999,6 +1008,15 @@
       },
       "weight": 2
     },
+    {
+      "element": {
+        "element_type": "minecraft:single_pool_element",
+        "location": "trailiertales:catacombs/tomb/hallway",
+        "processors": "trailiertales:catacombs_tomb",
+        "projection": "rigid"
+      },
+      "weight": 2
+    },
     {
       "element": {
         "element_type": "minecraft:single_pool_element",
@@ -1116,6 +1134,15 @@
       },
       "weight": 2
     },
+    {
+      "element": {
+        "element_type": "minecraft:single_pool_element",
+        "location": "trailiertales:catacombs/tomb/layered4",
+        "processors": "trailiertales:catacombs_tomb",
+        "projection": "rigid"
+      },
+      "weight": 2
+    },
     {
       "element": {
         "element_type": "minecraft:single_pool_element",
@@ -1164,7 +1191,7 @@
     {
       "element": {
         "element_type": "minecraft:single_pool_element",
-        "location": "trailiertales:catacombs/tomb/mob_delivery",
+        "location": "trailiertales:catacombs/tomb/mob_delivery1",
         "processors": "trailiertales:catacombs_mineshaft",
         "projection": "rigid"
       },
@@ -1173,7 +1200,34 @@
     {
       "element": {
         "element_type": "minecraft:single_pool_element",
-        "location": "trailiertales:catacombs/tomb/mob_drop",
+        "location": "trailiertales:catacombs/tomb/mob_delivery2",
+        "processors": "trailiertales:catacombs_tomb",
+        "projection": "rigid"
+      },
+      "weight": 2
+    },
+    {
+      "element": {
+        "element_type": "minecraft:single_pool_element",
+        "location": "trailiertales:catacombs/tomb/mob_delivery3",
+        "processors": "trailiertales:catacombs_tomb",
+        "projection": "rigid"
+      },
+      "weight": 2
+    },
+    {
+      "element": {
+        "element_type": "minecraft:single_pool_element",
+        "location": "trailiertales:catacombs/tomb/mob_drop1",
+        "processors": "trailiertales:catacombs_tomb",
+        "projection": "rigid"
+      },
+      "weight": 2
+    },
+    {
+      "element": {
+        "element_type": "minecraft:single_pool_element",
+        "location": "trailiertales:catacombs/tomb/mob_drop2",
         "processors": "trailiertales:catacombs_tomb",
         "projection": "rigid"
       },
@@ -1278,6 +1332,15 @@
       },
       "weight": 2
     },
+    {
+      "element": {
+        "element_type": "minecraft:single_pool_element",
+        "location": "trailiertales:catacombs/tomb/ritual_flood",
+        "processors": "trailiertales:catacombs_tomb",
+        "projection": "rigid"
+      },
+      "weight": 2
+    },
     {
       "element": {
         "element_type": "minecraft:single_pool_element",
@@ -1449,6 +1512,15 @@
       },
       "weight": 2
     },
+    {
+      "element": {
+        "element_type": "minecraft:single_pool_element",
+        "location": "trailiertales:catacombs/tomb/small_fancy_tomb11",
+        "processors": "trailiertales:catacombs_tomb",
+        "projection": "rigid"
+      },
+      "weight": 2
+    },
     {
       "element": {
         "element_type": "minecraft:single_pool_element",
@@ -1584,6 +1656,15 @@
       },
       "weight": 2
     },
+    {
+      "element": {
+        "element_type": "minecraft:single_pool_element",
+        "location": "trailiertales:catacombs/tomb/waterworks",
+        "processors": "trailiertales:catacombs_tomb",
+        "projection": "rigid"
+      },
+      "weight": 2
+    },
     {
       "element": {
         "element_type": "minecraft:single_pool_element",
@@ -1602,6 +1683,15 @@
       },
       "weight": 1
     },
+    {
+      "element": {
+        "element_type": "minecraft:single_pool_element",
+        "location": "trailiertales:catacombs/corridor/gallery",
+        "processors": "trailiertales:catacombs_corridor",
+        "projection": "rigid"
+      },
+      "weight": 1
+    },
     {
       "element": {
         "element_type": "minecraft:single_pool_element",

src/main/generated/data/trailiertales/worldgen/template_pool/catacombs/small_room.json

@@ -234,6 +234,42 @@
       },
       "weight": 1
     },
+    {
+      "element": {
+        "element_type": "minecraft:single_pool_element",
+        "location": "trailiertales:catacombs/room/generic20",
+        "processors": "trailiertales:catacombs_small_room",
+        "projection": "rigid"
+      },
+      "weight": 1
+    },
+    {
+      "element": {
+        "element_type": "minecraft:single_pool_element",
+        "location": "trailiertales:catacombs/room/generic21",
+        "processors": "trailiertales:catacombs_small_room",
+        "projection": "rigid"
+      },
+      "weight": 1
+    },
+    {
+      "element": {
+        "element_type": "minecraft:single_pool_element",
+        "location": "trailiertales:catacombs/room/generic22",
+        "processors": "trailiertales:catacombs_small_room",
+        "projection": "rigid"
+      },
+      "weight": 1
+    },
+    {
+      "element": {
+        "element_type": "minecraft:single_pool_element",
+        "location": "trailiertales:catacombs/room/generic23",
+        "processors": "trailiertales:catacombs_small_room",
+        "projection": "rigid"
+      },
+      "weight": 1
+    },
     {
       "element": {
         "element_type": "minecraft:single_pool_element",
@@ -270,6 +306,15 @@
       },
       "weight": 1
     },
+    {
+      "element": {
+        "element_type": "minecraft:single_pool_element",
+        "location": "trailiertales:catacombs/room/mine3",
+        "processors": "trailiertales:catacombs_small_room",
+        "projection": "rigid"
+      },
+      "weight": 1
+    },
     {
       "element": {
         "element_type": "minecraft:single_pool_element",
@@ -369,6 +414,24 @@
       },
       "weight": 1
     },
+    {
+      "element": {
+        "element_type": "minecraft:single_pool_element",
+        "location": "trailiertales:catacombs/room/terracotta",
+        "processors": "trailiertales:catacombs_small_room",
+        "projection": "rigid"
+      },
+      "weight": 1
+    },
+    {
+      "element": {
+        "element_type": "minecraft:single_pool_element",
+        "location": "trailiertales:catacombs/room/tnt_lever",
+        "processors": "trailiertales:catacombs_small_room",
+        "projection": "rigid"
+      },
+      "weight": 1
+    },
     {
       "element": {
         "element_type": "minecraft:single_pool_element",

src/main/java/net/frozenblock/trailiertales/TTPreLoadConstants.java

@@ -6,7 +6,7 @@
 
 public class TTPreLoadConstants {
 	public static final String MOD_ID = "trailiertales";
-	public static final boolean STRUCTURE_BUILDING_MODE = false; // Only enable this while building structures.
+	public static final boolean STRUCTURE_BUILDING_MODE = true; // Only enable this while building structures.
 
 	@Contract(pure = true)
 	public static @NotNull Path configPath(String name, boolean json5) {

src/main/java/net/frozenblock/trailiertales/worldgen/structure/datagen/CatacombsGenerator.java

@@ -265,6 +265,7 @@ public static void bootstrapTemplatePool(@NotNull BootstrapContext<StructureTemp
 					Pair.of(StructurePoolElement.single(string("tomb/collapsed"), tomb), 2),
 					Pair.of(StructurePoolElement.single(string("tomb/collapsed_mob_drop"), tomb), 2),
 					Pair.of(StructurePoolElement.single(string("tomb/construction"), tomb), 2),
+					Pair.of(StructurePoolElement.single(string("tomb/corridor_pit"), tomb), 2),
 					Pair.of(StructurePoolElement.single(string("tomb/courtyard1"), tomb), 2),
 					Pair.of(StructurePoolElement.single(string("tomb/courtyard2"), tomb), 2),
 					Pair.of(StructurePoolElement.single(string("tomb/cradle"), tomb), 2),
@@ -288,6 +289,7 @@ public static void bootstrapTemplatePool(@NotNull BootstrapContext<StructureTemp
 					Pair.of(StructurePoolElement.single(string("tomb/gravel_trap2"), tomb), 2),
 					Pair.of(StructurePoolElement.single(string("tomb/gravel_trap3"), tomb), 2),
 					Pair.of(StructurePoolElement.single(string("tomb/hall_drop"), tomb), 2),
+					Pair.of(StructurePoolElement.single(string("tomb/hallway"), tomb), 2),
 					Pair.of(StructurePoolElement.single(string("tomb/hidden_lever"), tomb), 2),
 					Pair.of(StructurePoolElement.single(string("tomb/hidden_room"), tomb), 2),
 					Pair.of(StructurePoolElement.single(string("tomb/hidden_tomb"), tomb), 2),
@@ -301,13 +303,17 @@ public static void bootstrapTemplatePool(@NotNull BootstrapContext<StructureTemp
 					Pair.of(StructurePoolElement.single(string("tomb/layered1"), tomb), 2),
 					Pair.of(StructurePoolElement.single(string("tomb/layered2"), tomb), 2),
 					Pair.of(StructurePoolElement.single(string("tomb/layered3"), tomb), 2),
+					Pair.of(StructurePoolElement.single(string("tomb/layered4"), tomb), 2),
 					Pair.of(StructurePoolElement.single(string("tomb/layered_mob_drop"), tomb), 2),
 					Pair.of(StructurePoolElement.single(string("tomb/maze"), tomb), 2),
 					Pair.of(StructurePoolElement.single(string("tomb/maze_mob_drop"), tomb), 2),
 					Pair.of(StructurePoolElement.single(string("tomb/maze_rooms"), tomb), 2),
 					Pair.of(StructurePoolElement.single(string("tomb/mineshaft"), mineshaft), 2),
-					Pair.of(StructurePoolElement.single(string("tomb/mob_delivery"), mineshaft), 2),
-					Pair.of(StructurePoolElement.single(string("tomb/mob_drop"), tomb), 2),
+					Pair.of(StructurePoolElement.single(string("tomb/mob_delivery1"), mineshaft), 2),
+					Pair.of(StructurePoolElement.single(string("tomb/mob_delivery2"), tomb), 2),
+					Pair.of(StructurePoolElement.single(string("tomb/mob_delivery3"), tomb), 2),
+					Pair.of(StructurePoolElement.single(string("tomb/mob_drop1"), tomb), 2),
+					Pair.of(StructurePoolElement.single(string("tomb/mob_drop2"), tomb), 2),
 					Pair.of(StructurePoolElement.single(string("tomb/pick_a_lever"), tomb), 1),
 					Pair.of(StructurePoolElement.single(string("tomb/pick_a_pot"), tomb), 1),
 					Pair.of(StructurePoolElement.single(string("tomb/poison_trap"), tomb), 2),
@@ -319,6 +325,7 @@ public static void bootstrapTemplatePool(@NotNull BootstrapContext<StructureTemp
 					Pair.of(StructurePoolElement.single(string("tomb/ramp"), tomb), 2),
 					Pair.of(StructurePoolElement.single(string("tomb/ramp_mob_drop"), tomb), 2),
 					Pair.of(StructurePoolElement.single(string("tomb/ritual"), tomb), 2),
+					Pair.of(StructurePoolElement.single(string("tomb/ritual_flood"), tomb), 2),
 					Pair.of(StructurePoolElement.single(string("tomb/ruined_path_dripstone"), tomb), 2),
 					Pair.of(StructurePoolElement.single(string("tomb/ruins"), tomb), 2),
 					Pair.of(StructurePoolElement.single(string("tomb/secret_room"), tomb), 2),
@@ -338,6 +345,7 @@ public static void bootstrapTemplatePool(@NotNull BootstrapContext<StructureTemp
 					Pair.of(StructurePoolElement.single(string("tomb/small_fancy_tomb8"), tomb), 2),
 					Pair.of(StructurePoolElement.single(string("tomb/small_fancy_tomb9"), tomb), 2),
 					Pair.of(StructurePoolElement.single(string("tomb/small_fancy_tomb10"), tomb), 2),
+					Pair.of(StructurePoolElement.single(string("tomb/small_fancy_tomb11"), tomb), 2),
 					Pair.of(StructurePoolElement.single(string("tomb/small_split_sides"), tomb), 2),
 					Pair.of(StructurePoolElement.single(string("tomb/statue"), tomb), 2),
 					Pair.of(StructurePoolElement.single(string("tomb/statue_waterfalls"), tomb), 2),
@@ -353,9 +361,11 @@ public static void bootstrapTemplatePool(@NotNull BootstrapContext<StructureTemp
 					Pair.of(StructurePoolElement.single(string("tomb/two_chest_doors"), tomb), 2),
 					Pair.of(StructurePoolElement.single(string("tomb/two_story"), tomb), 2),
 					Pair.of(StructurePoolElement.single(string("tomb/two_story_gravel_trap"), tomb), 2),
+					Pair.of(StructurePoolElement.single(string("tomb/waterworks"), tomb), 2),
 					Pair.of(StructurePoolElement.single(string("tomb/winding_stairs"), tomb), 2),
 
 					Pair.of(StructurePoolElement.single(string("corridor/small_gallery"), corridor), 1),
+					Pair.of(StructurePoolElement.single(string("corridor/gallery"), corridor), 1),
 
 					Pair.of(StructurePoolElement.single(string("corridor/connector_dripstone_trap"), corridor), 4),
 					Pair.of(StructurePoolElement.single(string("corridor/connector_lava_trap"), corridor), 4)
@@ -428,10 +438,15 @@ public static void bootstrapTemplatePool(@NotNull BootstrapContext<StructureTemp
 					Pair.of(StructurePoolElement.single(string("room/generic17"), smallRoom), 1),
 					Pair.of(StructurePoolElement.single(string("room/generic18"), smallRoom), 1),
 					Pair.of(StructurePoolElement.single(string("room/generic19"), smallRoom), 1),
+					Pair.of(StructurePoolElement.single(string("room/generic20"), smallRoom), 1),
+					Pair.of(StructurePoolElement.single(string("room/generic21"), smallRoom), 1),
+					Pair.of(StructurePoolElement.single(string("room/generic22"), smallRoom), 1),
+					Pair.of(StructurePoolElement.single(string("room/generic23"), smallRoom), 1),
 					Pair.of(StructurePoolElement.single(string("room/jail"), smallRoom), 1),
 					Pair.of(StructurePoolElement.single(string("room/kitchen"), smallRoom), 1),
 					Pair.of(StructurePoolElement.single(string("room/mine1"), smallRoom), 1),
 					Pair.of(StructurePoolElement.single(string("room/mine2"), smallRoom), 1),
+					Pair.of(StructurePoolElement.single(string("room/mine3"), smallRoom), 1),
 					Pair.of(StructurePoolElement.single(string("room/pillars"), smallRoom), 1),
 					Pair.of(StructurePoolElement.single(string("room/portal"), smallRoom), 1),
 					Pair.of(StructurePoolElement.single(string("room/pot_making"), smallRoom), 1),
@@ -443,6 +458,8 @@ public static void bootstrapTemplatePool(@NotNull BootstrapContext<StructureTemp
 					Pair.of(StructurePoolElement.single(string("room/ritual6"), smallRoom), 1),
 					Pair.of(StructurePoolElement.single(string("room/ritual7"), smallRoom), 1),
 					Pair.of(StructurePoolElement.single(string("room/storage"), smallRoom), 1),
+					Pair.of(StructurePoolElement.single(string("room/terracotta"), smallRoom), 1),
+					Pair.of(StructurePoolElement.single(string("room/tnt_lever"), smallRoom), 1),
 					Pair.of(StructurePoolElement.single(string("room/wither_ritual"), smallRoom), 1)
 				),
 				StructureTemplatePool.Projection.RIGID