Fix #33: crash with Blockus and Promenade combined.

LambdAurora · Sep 30, 2022 · fc1cff5 · fc1cff5
1 parent 831641a
commit fc1cff5
Show file tree

Hide file tree

Showing 3 changed files with 11 additions and 6 deletions.
diff --git a/CHANGELOG.md b/CHANGELOG.md
@@ -28,4 +28,9 @@
 
 - Fixed screen handler types not being initialized correctly on dedicated servers.
 
+### 1.0.0-beta.8
+
+- Fixed Painter's Palette 4th tool slot not being serialized ([#34](https://github.com/LambdAurora/AurorasDecorations/issues/34)).
+- Fixed startup crash with Blockus and Promenade combined ([#33](https://github.com/LambdAurora/AurorasDecorations/issues/33)).
+
 [EMI]: https://modrinth.com/mod/emi "EMI Modrinth page"
diff --git a/gradle.properties b/gradle.properties
@@ -2,13 +2,13 @@ org.gradle.jvmargs=-Xmx1G
 
 # Quilt properties
 minecraft_version=1.19.2
-quilt_mappings=12
+quilt_mappings=14
 loader_version=0.17.4
-fabric_api_version=4.0.0-beta.10+0.60.0
-qsl_version=3.0.0-beta.15
+fabric_api_version=4.0.0-beta.13+0.62.0
+qsl_version=3.0.0-beta.16
 
 # Mod properties
-mod_version=1.0.0-beta.7
+mod_version=1.0.0-beta.8
 maven_group=dev.lambdaurora
 archives_base_name=aurorasdecorations
 modrinth_id=GOqAnOfW

diff --git a/src/main/java/dev/lambdaurora/aurorasdeco/resource/Datagen.java b/src/main/java/dev/lambdaurora/aurorasdeco/resource/Datagen.java
@@ -335,7 +335,7 @@ public static void registerWoodcuttingRecipesForBlockVariants(Block block) {
 
 			tryRegisterWoodcuttingRecipeFor(block, basePath, "wood", 1, "building_blocks");
 
-			if (QuiltLoader.isModLoaded("blockus")) {
+			if (QuiltLoader.isModLoaded("blockus") && blockId.getNamespace().equals("blockus")) {
 				tryRegisterWoodcuttingRecipeFor(block, "blockus", basePath,
 						"small_logs", 1, "building_blocks");
 			}
@@ -346,7 +346,7 @@ public static void registerWoodcuttingRecipesForBlockVariants(Block block) {
 			basePath += separator;
 
 			tryRegisterWoodcuttingRecipeFor(block, basePath, "hyphae", 1, "building_blocks");
-			if (QuiltLoader.isModLoaded("blockus")) {
+			if (QuiltLoader.isModLoaded("blockus") && blockId.getNamespace().equals("blockus")) {
 				tryRegisterWoodcuttingRecipeFor(block, "blockus", basePath,
 						"small_stems", 1, "building_blocks");
 			}