Merge branch '1.21' into 26.1

Author: Pyrofab

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

@@ -22,6 +22,7 @@
  */
 package org.ladysnake.cca.mixin.scoreboard;
 
+import com.llamalad7.mixinextras.injector.wrapmethod.WrapMethod;
 import com.llamalad7.mixinextras.injector.wrapoperation.Operation;
 import com.llamalad7.mixinextras.injector.wrapoperation.WrapOperation;
 import com.mojang.datafixers.kinds.App;
@@ -37,6 +38,7 @@
 import org.spongepowered.asm.mixin.Unique;
 import org.spongepowered.asm.mixin.injection.At;
 
+import java.util.Objects;
 import java.util.Optional;
 import java.util.function.Function;
 
@@ -69,4 +71,11 @@ private static Codec<ScoreboardSaveData.Packed> wrapCodec(Function<RecordCodecBu
             return packed;
         }));
     }
+
+    @WrapMethod(method = "equals")
+    private boolean patchEquals(Object object, Operation<Boolean> original) {
+        return original.call(object)
+            && object instanceof CcaPackedState otherState
+            && Objects.equals(cca$getSerializedComponents(), otherState.cca$getSerializedComponents());
+    }
 }

changelog.md

@@ -6,6 +6,12 @@ Updated to 26.1-snapshot-9
 **Removed**
 - Components attached to a `LevelData` object (using the `cardinal-components-level` module) can no longer use dynamic registries in serialization (vanilla limitation)
 
+------------------------------------------------------
+Version 7.3.1
+------------------------------------------------------
+**Fixes**
+- Fixed a serialization issue in `cardinal-components-scoreboard` (thanks *farpo* and *AmyMialee* !)
+
 ------------------------------------------------------
 Version 7.3.0
 ------------------------------------------------------

src/testmod/java/org/ladysnake/componenttest/content/VitaCommand.java

@@ -50,6 +50,12 @@ public static void register(CommandDispatcher<CommandSourceStack> dispatcher) {
                             return 1;
                         })
                     )
+                    .then(Commands.literal("serverwide")
+                        .executes(commandContext -> {
+                            Vita.get(commandContext.getSource().getServer().getScoreboard()).setVitality(IntegerArgumentType.getInteger(commandContext, "amount"));
+                            commandContext.getSource().sendSuccess(() -> Component.literal("success!"), false);
+                            return 1;
+                        }))
                 )
             )
             .then(Commands.literal("get")