Merge pull request #224 from farpo/patch-scoreboard-writing

Patch scoreboard not getting written

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<ScoreboardState.Packed> wrapCodec(Function<RecordCodecBuild
             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());
+    }
 }

gradle.properties

@@ -15,7 +15,7 @@ elmendorf_version=0.16.0
 immersive_portals_version=v6.0.3-mc1.21.1
 
 #Publishing
-mod_version = 7.3.0
+mod_version = 7.3.1
 curseforge_id = 318449
 modrinth_id = K01OU20C
 curseforge_versions = 1.21.11

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

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