Fix cardinal-components-chunk causing chunk corruption

fixes #193
fixes #188

Author: Pyrofab

cardinal-components-chunk/src/main/java/org/ladysnake/cca/mixin/chunk/common/MixinSerializedChunk.java

@@ -51,8 +51,11 @@ public abstract class MixinSerializedChunk {
     private static void fromNbt(HeightLimitView world, DynamicRegistryManager registryManager, NbtCompound nbt, CallbackInfoReturnable<SerializedChunk> cir) {
         MixinSerializedChunk ret = (MixinSerializedChunk) (Object) cir.getReturnValue();
         if (ret != null) {
-            ret.cca$serializedComponents = new NbtCompound();
-            ret.cca$serializedComponents.put(AbstractComponentContainer.NBT_KEY, nbt.get(AbstractComponentContainer.NBT_KEY));
+            NbtElement nbtComponents = nbt.get(AbstractComponentContainer.NBT_KEY);
+            if (nbtComponents != null) {
+                ret.cca$serializedComponents = new NbtCompound();
+                ret.cca$serializedComponents.put(AbstractComponentContainer.NBT_KEY, nbtComponents);
+            }
         }
     }
 
@@ -84,8 +87,11 @@ private static void fromChunk(ServerWorld world, Chunk chunk, CallbackInfoReturn
     @Inject(method = "serialize", at = @At("RETURN"))
     private void serialize(CallbackInfoReturnable<NbtCompound> cir) {
         if (cca$serializedComponents != null) {
-            NbtCompound ret = cir.getReturnValue();
-            ret.put(AbstractComponentContainer.NBT_KEY, cca$serializedComponents.get(AbstractComponentContainer.NBT_KEY));
+            NbtElement nbtComponents = cca$serializedComponents.get(AbstractComponentContainer.NBT_KEY);
+            if (nbtComponents != null) {
+                NbtCompound ret = cir.getReturnValue();
+                ret.put(AbstractComponentContainer.NBT_KEY, nbtComponents);
+            }
         }
     }
 }

changelog.md

@@ -1,3 +1,10 @@
+------------------------------------------------------
+Version 6.2.1
+------------------------------------------------------
+**Fixes**
+- Fixed issue in chunk module causing save failures when no mod actually used said module
+  - apologies for the potential damage in world saves - remember to do regular backups when using mods, and especially when adding new mods or updating across Minecraft versions
+
 ------------------------------------------------------
 Version 6.2.0
 ------------------------------------------------------

gradle.properties

@@ -13,11 +13,11 @@ fabric_api_version=0.110.5+1.21.4
 elmendorf_version=0.13.0
 
 #Publishing
-mod_version = 6.2.0
+mod_version = 6.2.1
 curseforge_id = 318449
 modrinth_id = K01OU20C
-curseforge_versions = 1.21.2; 1.21.3
-modrinth_versions = 1.21.2; 1.21.3
+curseforge_versions = 1.21.2; 1.21.3; 1.21.4
+modrinth_versions = 1.21.2; 1.21.3; 1.21.4
 release_type = release
 display_name = Cardinal-Components-API
 owners = Ladysnake