bug fixes & more catacombs chains

FrozenBlock · Nov 22, 2024 · 6b78ac9 · 6b78ac9
1 parent 81a2ed9
commit 6b78ac9
Show file tree

Hide file tree

Showing 12 changed files with 35 additions and 18 deletions.
diff --git a/CHANGELOG.md b/CHANGELOG.md
@@ -0,0 +1,11 @@
+Please clear changelog after each release.
+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.
+- 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))
+- Removed the leftover `TRAILIER TALES` subtitle from the main menu.
diff --git a/CHANGELOG.txt b/CHANGELOG.txt
diff --git a/src/main/generated/data/trailiertales/worldgen/template_pool/catacombs/decoration/chain.json b/src/main/generated/data/trailiertales/worldgen/template_pool/catacombs/decoration/chain.json
@@ -4,7 +4,7 @@
       "element": {
         "element_type": "minecraft:empty_pool_element"
       },
-      "weight": 80
+      "weight": 60
     },
     {
       "element": {

diff --git a/...ain/generated/data/trailiertales/worldgen/template_pool/catacombs/decoration/chain_1.json b/...ain/generated/data/trailiertales/worldgen/template_pool/catacombs/decoration/chain_1.json
@@ -4,7 +4,7 @@
       "element": {
         "element_type": "minecraft:empty_pool_element"
       },
-      "weight": 80
+      "weight": 60
     },
     {
       "element": {

diff --git a/...ain/generated/data/trailiertales/worldgen/template_pool/catacombs/decoration/chain_2.json b/...ain/generated/data/trailiertales/worldgen/template_pool/catacombs/decoration/chain_2.json
@@ -4,7 +4,7 @@
       "element": {
         "element_type": "minecraft:empty_pool_element"
       },
-      "weight": 80
+      "weight": 60
     },
     {
       "element": {

diff --git a/...ain/generated/data/trailiertales/worldgen/template_pool/catacombs/decoration/chain_3.json b/...ain/generated/data/trailiertales/worldgen/template_pool/catacombs/decoration/chain_3.json
@@ -4,7 +4,7 @@
       "element": {
         "element_type": "minecraft:empty_pool_element"
       },
-      "weight": 80
+      "weight": 60
     },
     {
       "element": {

diff --git a/...ain/generated/data/trailiertales/worldgen/template_pool/catacombs/decoration/chain_4.json b/...ain/generated/data/trailiertales/worldgen/template_pool/catacombs/decoration/chain_4.json
@@ -4,7 +4,7 @@
       "element": {
         "element_type": "minecraft:empty_pool_element"
       },
-      "weight": 80
+      "weight": 60
     },
     {
       "element": {

diff --git a/src/main/java/net/frozenblock/trailiertales/TTConstants.java b/src/main/java/net/frozenblock/trailiertales/TTConstants.java
@@ -78,6 +78,14 @@ public static void stopMeasuring(Object object) {
 		return ResourceLocation.fromNamespaceAndPath(MOD_ID, path);
 	}
 
+	public static @NotNull ResourceLocation idOrDefault(String path, String fallback) {
+		try {
+			return id(path);
+		} catch (IllegalArgumentException ignored) {
+			return id(fallback);
+		}
+	}
+
 	@Contract("_ -> new")
 	public static @NotNull ResourceLocation vanillaId(String path) {
 		return ResourceLocation.withDefaultNamespace(path);

diff --git a/src/main/java/net/frozenblock/trailiertales/datagen/tag/TTBlockTagProvider.java b/src/main/java/net/frozenblock/trailiertales/datagen/tag/TTBlockTagProvider.java
@@ -126,6 +126,8 @@ protected void addTags(@NotNull HolderLookup.Provider arg) {
 			.add(TTBlocks.CHORAL_END_STONE_BRICK_SLAB)
 			.add(TTBlocks.CHORAL_END_STONE_BRICK_WALL)
 
+			.add(TTBlocks.CRACKED_PURPUR_BLOCK)
+			.add(TTBlocks.CHISELED_PURPUR_BLOCK)
 			.add(TTBlocks.PURPUR_WALL)
 
 			.add(TTBlocks.SURVEYOR);

diff --git a/src/main/java/net/frozenblock/trailiertales/mixin/client/boat/BoatRendererMixin.java b/src/main/java/net/frozenblock/trailiertales/mixin/client/boat/BoatRendererMixin.java
@@ -53,7 +53,10 @@ protected BoatRendererMixin(EntityRendererProvider.Context ctx) {
 	@Contract("_ -> new")
 	@Unique
 	private static @NotNull ResourceLocation trailierTales$getBannerBaseTextureLocation(Boat.@NotNull Type type) {
-		return TTConstants.id("textures/entity/boat_banner_base/" + type.getName() + ".png");
+		return TTConstants.idOrDefault(
+			"textures/entity/boat_banner_base/" + type.getName() + ".png",
+			"textures/entity/boat_banner_base/oak.png"
+		);
 	}
 
 	@ModifyExpressionValue(

diff --git a/...ain/java/net/frozenblock/trailiertales/worldgen/structure/datagen/CatacombsGenerator.java b/...ain/java/net/frozenblock/trailiertales/worldgen/structure/datagen/CatacombsGenerator.java
@@ -455,7 +455,7 @@ public static void bootstrapTemplatePool(@NotNull BootstrapContext<StructureTemp
 			new StructureTemplatePool(
 				empty,
 				ImmutableList.of(
-					Pair.of(StructurePoolElement.empty(), 80),
+					Pair.of(StructurePoolElement.empty(), 60),
 					Pair.of(StructurePoolElement.single(string("decoration/chain/chain_1")), 1),
 					Pair.of(StructurePoolElement.single(string("decoration/chain/chain_2")), 1),
 					Pair.of(StructurePoolElement.single(string("decoration/chain/chain_3")), 1),
@@ -472,7 +472,7 @@ public static void bootstrapTemplatePool(@NotNull BootstrapContext<StructureTemp
 			new StructureTemplatePool(
 				empty,
 				ImmutableList.of(
-					Pair.of(StructurePoolElement.empty(), 80),
+					Pair.of(StructurePoolElement.empty(), 60),
 					Pair.of(StructurePoolElement.single(string("decoration/chain/chain_1")), 1),
 					Pair.of(StructurePoolElement.single(string("decoration/chain/chain_2")), 1),
 					Pair.of(StructurePoolElement.single(string("decoration/chain/chain_3")), 1),
@@ -488,7 +488,7 @@ public static void bootstrapTemplatePool(@NotNull BootstrapContext<StructureTemp
 			new StructureTemplatePool(
 				empty,
 				ImmutableList.of(
-					Pair.of(StructurePoolElement.empty(), 80),
+					Pair.of(StructurePoolElement.empty(), 60),
 					Pair.of(StructurePoolElement.single(string("decoration/chain/chain_1")), 1),
 					Pair.of(StructurePoolElement.single(string("decoration/chain/chain_2")), 1),
 					Pair.of(StructurePoolElement.single(string("decoration/chain/chain_3")), 1)
@@ -503,7 +503,7 @@ public static void bootstrapTemplatePool(@NotNull BootstrapContext<StructureTemp
 			new StructureTemplatePool(
 				empty,
 				ImmutableList.of(
-					Pair.of(StructurePoolElement.empty(), 80),
+					Pair.of(StructurePoolElement.empty(), 60),
 					Pair.of(StructurePoolElement.single(string("decoration/chain/chain_1")), 1),
 					Pair.of(StructurePoolElement.single(string("decoration/chain/chain_2")), 1)
 				),
@@ -517,7 +517,7 @@ public static void bootstrapTemplatePool(@NotNull BootstrapContext<StructureTemp
 			new StructureTemplatePool(
 				empty,
 				ImmutableList.of(
-					Pair.of(StructurePoolElement.empty(), 80),
+					Pair.of(StructurePoolElement.empty(), 60),
 					Pair.of(StructurePoolElement.single(string("decoration/chain/chain_1")), 1)
 				),
 				StructureTemplatePool.Projection.RIGID

diff --git a/src/main/resources/assets/minecraft/textures/gui/title/edition.png b/src/main/resources/assets/minecraft/textures/gui/title/edition.png