Fix crash in scoreboard module, closes #199

Author: Pyrofab

cardinal-components-scoreboard/src/main/java/org/ladysnake/cca/mixin/scoreboard/MixinPackedScoreboardState.java

@@ -37,32 +37,33 @@
 import org.spongepowered.asm.mixin.Unique;
 import org.spongepowered.asm.mixin.injection.At;
 
+import java.util.Optional;
 import java.util.function.Function;
 
 @Mixin(ScoreboardState.Packed.class)
 public abstract class MixinPackedScoreboardState implements CcaPackedState {
     @Unique
-    private @Nullable NbtCompound cca$serializedComponents;
+    private Optional<NbtCompound> cca$serializedComponents;
 
     @Override
     public @Nullable NbtCompound cca$getSerializedComponents() {
-        return this.cca$serializedComponents;
+        return this.cca$serializedComponents.orElse(null);
     }
 
     @Override
     public void cca$setSerializedComponents(@Nullable NbtCompound nbt) {
-        this.cca$serializedComponents = nbt;
+        this.cca$serializedComponents = Optional.ofNullable(nbt);
     }
 
-    @WrapOperation(method = "<clinit>", at = @At(value = "INVOKE", target = "Lcom/mojang/serialization/codecs/RecordCodecBuilder;create(Ljava/util/function/Function;)Lcom/mojang/serialization/Codec;"))
+    @WrapOperation(method = "<clinit>", at = @At(value = "INVOKE", target = "Lcom/mojang/serialization/codecs/RecordCodecBuilder;create(Ljava/util/function/Function;)Lcom/mojang/serialization/Codec;", remap = false))
     private static Codec<ScoreboardState.Packed> wrapCodec(Function<RecordCodecBuilder.Instance<ScoreboardState.Packed>, ? extends App<RecordCodecBuilder.Mu<ScoreboardState.Packed>, ScoreboardState.Packed>> builder, Operation<Codec<ScoreboardState.Packed>> original) {
         Codec<ScoreboardState.Packed> baseCodec = original.call(builder);
         MapCodec<ScoreboardState.Packed> baseMapCodec = baseCodec instanceof MapCodec.MapCodecCodec<ScoreboardState.Packed>(
             MapCodec<ScoreboardState.Packed> codec
         ) ? codec : MapCodec.assumeMapUnsafe(baseCodec);
         return RecordCodecBuilder.create(instance -> instance.group(
             baseMapCodec.forGetter(state -> state),
-            NbtCompound.CODEC.fieldOf(AbstractComponentContainer.NBT_KEY).forGetter(state -> ((MixinPackedScoreboardState) (Object) state).cca$serializedComponents)
+            NbtCompound.CODEC.optionalFieldOf(AbstractComponentContainer.NBT_KEY).forGetter(state -> ((MixinPackedScoreboardState) (Object) state).cca$serializedComponents)
         ).apply(instance, (packed, nbtCompound) -> {
             ((MixinPackedScoreboardState) (Object) packed).cca$serializedComponents = nbtCompound;
             return packed;

cardinal-components-scoreboard/src/main/java/org/ladysnake/cca/mixin/scoreboard/MixinPackedTeam.java

@@ -37,32 +37,33 @@
 import org.spongepowered.asm.mixin.Unique;
 import org.spongepowered.asm.mixin.injection.At;
 
+import java.util.Optional;
 import java.util.function.Function;
 
 @Mixin(Team.Packed.class)
 public abstract class MixinPackedTeam implements CcaPackedState {
     @Unique
-    private @Nullable NbtCompound cca$serializedComponents;
+    private Optional<NbtCompound> cca$serializedComponents;
 
     @Override
     public @Nullable NbtCompound cca$getSerializedComponents() {
-        return this.cca$serializedComponents;
+        return this.cca$serializedComponents.orElse(null);
     }
 
     @Override
     public void cca$setSerializedComponents(@Nullable NbtCompound nbt) {
-        this.cca$serializedComponents = nbt;
+        this.cca$serializedComponents = Optional.ofNullable(nbt);
     }
 
-    @WrapOperation(method = "<clinit>", at = @At(value = "INVOKE", target = "Lcom/mojang/serialization/codecs/RecordCodecBuilder;create(Ljava/util/function/Function;)Lcom/mojang/serialization/Codec;"))
+    @WrapOperation(method = "<clinit>", at = @At(value = "INVOKE", target = "Lcom/mojang/serialization/codecs/RecordCodecBuilder;create(Ljava/util/function/Function;)Lcom/mojang/serialization/Codec;", remap = false))
     private static Codec<Team.Packed> wrapCodec(Function<RecordCodecBuilder.Instance<Team.Packed>, ? extends App<RecordCodecBuilder.Mu<Team.Packed>, Team.Packed>> builder, Operation<Codec<Team.Packed>> original) {
         Codec<Team.Packed> baseCodec = original.call(builder);
         MapCodec<Team.Packed> baseMapCodec = baseCodec instanceof MapCodec.MapCodecCodec<Team.Packed>(
             MapCodec<Team.Packed> codec
         ) ? codec : MapCodec.assumeMapUnsafe(baseCodec);
         return RecordCodecBuilder.create(instance -> instance.group(
             baseMapCodec.forGetter(state -> state),
-            NbtCompound.CODEC.fieldOf(AbstractComponentContainer.NBT_KEY).forGetter(state -> ((MixinPackedTeam) (Object) state).cca$serializedComponents)
+            NbtCompound.CODEC.optionalFieldOf(AbstractComponentContainer.NBT_KEY).forGetter(state -> ((MixinPackedTeam) (Object) state).cca$serializedComponents)
         ).apply(instance, (packed, nbtCompound) -> {
             ((MixinPackedTeam) (Object) packed).cca$serializedComponents = nbtCompound;
             return packed;

changelog.md

@@ -1,3 +1,9 @@
+------------------------------------------------------
+Version 6.3.1
+------------------------------------------------------
+**Fixes**
+- Fixed crash in scoreboard module when no mod saved any data using it
+
 ------------------------------------------------------
 Version 6.3.0
 ------------------------------------------------------

gradle.properties

@@ -15,7 +15,7 @@ elmendorf_version=0.15.0
 immersive_portals_version=v6.0.3-mc1.21.1
 
 #Publishing
-mod_version = 6.3.0
+mod_version = 6.3.1
 curseforge_id = 318449
 modrinth_id = K01OU20C
 curseforge_versions = 1.21.5