update to 1.21.11

Pyrofab · Pyrofab · commit 7e699c24bfcb · 2025-12-10T09:23:42.000+01:00
diff --git a/build.gradle.kts b/build.gradle.kts
@@ -4,7 +4,7 @@ import net.fabricmc.loom.task.RemapJarTask
 import java.net.URI
 
 plugins {
-    id("fabric-loom") version "1.12.0-alpha.25"
+    id("fabric-loom") version "1.13.3"
     id("io.github.ladysnake.chenille") version "0.15.0"
     id("org.cadixdev.licenser") version "0.6.1"
 }
diff --git a/cardinal-components-entity/src/main/java/org/ladysnake/cca/api/v3/entity/RespawnCopyStrategy.java b/cardinal-components-entity/src/main/java/org/ladysnake/cca/api/v3/entity/RespawnCopyStrategy.java
@@ -28,7 +28,7 @@
 import net.minecraft.storage.NbtWriteView;
 import net.minecraft.util.ErrorReporter;
 import net.minecraft.util.Identifier;
-import net.minecraft.world.GameRules;
+import net.minecraft.world.rule.GameRules;
 import org.ladysnake.cca.api.v3.component.Component;
 import org.ladysnake.cca.api.v3.component.ComponentKey;
 import org.ladysnake.cca.api.v3.component.CopyableComponent;
diff --git a/cardinal-components-entity/src/main/java/org/ladysnake/cca/api/v3/entity/RespawnableComponent.java b/cardinal-components-entity/src/main/java/org/ladysnake/cca/api/v3/entity/RespawnableComponent.java
@@ -26,7 +26,7 @@
 import net.minecraft.storage.NbtReadView;
 import net.minecraft.storage.NbtWriteView;
 import net.minecraft.util.ErrorReporter;
-import net.minecraft.world.GameRules;
+import net.minecraft.world.rule.GameRules;
 import org.jetbrains.annotations.ApiStatus;
 import org.jetbrains.annotations.Contract;
 import org.ladysnake.cca.api.v3.component.Component;
diff --git a/cardinal-components-entity/src/main/java/org/ladysnake/cca/internal/entity/CardinalComponentsEntity.java b/cardinal-components-entity/src/main/java/org/ladysnake/cca/internal/entity/CardinalComponentsEntity.java
@@ -39,7 +39,7 @@
 import net.minecraft.registry.RegistryWrapper;
 import net.minecraft.server.network.ServerPlayerEntity;
 import net.minecraft.util.Identifier;
-import net.minecraft.world.GameRules;
+import net.minecraft.world.rule.GameRules;
 import org.ladysnake.cca.api.v3.component.Component;
 import org.ladysnake.cca.api.v3.component.ComponentKey;
 import org.ladysnake.cca.api.v3.component.ComponentProvider;
@@ -119,7 +119,7 @@ private static void copyData(LivingEntity original, LivingEntity clone, EntityCo
     }
 
     private static void copyData(ServerPlayerEntity original, ServerPlayerEntity clone, boolean lossless) {
-        boolean keepInventory = original.getEntityWorld().getGameRules().getBoolean(GameRules.KEEP_INVENTORY) || clone.isSpectator();
+        boolean keepInventory = original.getEntityWorld().getGameRules().getValue(GameRules.KEEP_INVENTORY) || clone.isSpectator();
         Set<ComponentKey<?>> keys = ((ComponentProvider) original).getComponentContainer().keys();
 
         for (ComponentKey<?> key : keys) {
diff --git a/cardinal-components-scoreboard/src/main/java/org/ladysnake/cca/mixin/scoreboard/MixinPackedScoreboardState.java b/cardinal-components-scoreboard/src/main/java/org/ladysnake/cca/mixin/scoreboard/MixinPackedScoreboardState.java
@@ -43,7 +43,7 @@
 @Mixin(ScoreboardState.Packed.class)
 public abstract class MixinPackedScoreboardState implements CcaPackedState {
     @Unique
-    private Optional<NbtCompound> cca$serializedComponents;
+    private Optional<NbtCompound> cca$serializedComponents = Optional.empty();
 
     @Override
     public @Nullable NbtCompound cca$getSerializedComponents() {
diff --git a/cardinal-components-scoreboard/src/main/java/org/ladysnake/cca/mixin/scoreboard/MixinScoreboardState.java b/cardinal-components-scoreboard/src/main/java/org/ladysnake/cca/mixin/scoreboard/MixinScoreboardState.java
diff --git a/cardinal-components-scoreboard/src/main/java/org/ladysnake/cca/mixin/scoreboard/MixinServerScoreboard.java b/cardinal-components-scoreboard/src/main/java/org/ladysnake/cca/mixin/scoreboard/MixinServerScoreboard.java
@@ -26,6 +26,7 @@
 import net.minecraft.nbt.NbtCompound;
 import net.minecraft.network.RegistryByteBuf;
 import net.minecraft.scoreboard.Scoreboard;
+import net.minecraft.scoreboard.ScoreboardState;
 import net.minecraft.scoreboard.ServerScoreboard;
 import net.minecraft.scoreboard.Team;
 import net.minecraft.server.MinecraftServer;
@@ -34,6 +35,7 @@
 import net.minecraft.util.ErrorReporter;
 import org.ladysnake.cca.api.v3.component.ComponentKey;
 import org.ladysnake.cca.api.v3.component.ComponentProvider;
+import org.ladysnake.cca.api.v3.component.TransientComponent;
 import org.ladysnake.cca.api.v3.component.sync.AutoSyncedComponent;
 import org.ladysnake.cca.api.v3.scoreboard.TeamAddCallback;
 import org.ladysnake.cca.internal.base.ComponentUpdatePayload;
@@ -48,6 +50,7 @@
 import org.spongepowered.asm.mixin.Unique;
 import org.spongepowered.asm.mixin.injection.At;
 import org.spongepowered.asm.mixin.injection.Inject;
+import org.spongepowered.asm.mixin.injection.ModifyArg;
 import org.spongepowered.asm.mixin.injection.callback.CallbackInfo;
 
 import java.util.List;
@@ -62,6 +65,9 @@ public abstract class MixinServerScoreboard extends MixinScoreboard {
     @Final
     private MinecraftServer server;
 
+    @Shadow
+    private boolean dirty;
+
     @Override
     protected Team unpackComponents(Team team, CcaPackedState packedTeam) {
         NbtCompound nbt = packedTeam.cca$getSerializedComponents();
@@ -103,4 +109,35 @@ private void initComponents(CallbackInfo ci) {
     private void syncTeamComponents(Team team, CallbackInfo ci) {
         TeamAddCallback.EVENT.invoker().onTeamAdded(team);
     }
+
+    @Inject(method = "writeTo", at = @At("HEAD"))
+    private void setDirty(ScoreboardState state, CallbackInfo ci) {
+        if (components.hasComponents()) {
+            for (var component : components.keys()) {
+                if (!(component instanceof TransientComponent)) {
+                    dirty = true;
+                    return;
+                }
+            }
+        }
+    }
+
+    @ModifyArg(method = "writeTo", at = @At(value = "INVOKE", target = "Lnet/minecraft/scoreboard/ScoreboardState;set(Lnet/minecraft/scoreboard/ScoreboardState$Packed;)V"))
+    private ScoreboardState.Packed writeComponents(ScoreboardState.Packed packed) {
+        ((CcaPackedState) (Object) packed).cca$setSerializedComponents(
+            components.toOrphanTag(server.getRegistryManager())
+        );
+
+        return packed;
+    }
+
+    @Inject(method = "read", at = @At("RETURN"))
+    private void readComponents(ScoreboardState.Packed packed, CallbackInfo ci) {
+        NbtCompound nbt = ((CcaPackedState) (Object) packed).cca$getSerializedComponents();
+        if (nbt != null) {
+            try (var errorReporter = new ErrorReporter.Logging(ComponentsInternals.LOGGER)) {
+                components.readOrphanData(NbtReadView.create(errorReporter, server.getRegistryManager(), nbt));
+            }
+        }
+    }
 }
diff --git a/cardinal-components-scoreboard/src/main/resources/mixins.cardinal_components_scoreboard.json b/cardinal-components-scoreboard/src/main/resources/mixins.cardinal_components_scoreboard.json
@@ -10,7 +10,6 @@
     "MixinPersistentState",
     "MixinPlayerManager",
     "MixinScoreboard",
-    "MixinScoreboardState",
     "MixinServerScoreboard",
     "MixinTeam",
     "ServerScoreboardAccessor",
diff --git a/cardinal-components-scoreboard/src/testmod/java/org/ladysnake/cca/test/scoreboard/CcaScoreboardTestSuite.java b/cardinal-components-scoreboard/src/testmod/java/org/ladysnake/cca/test/scoreboard/CcaScoreboardTestSuite.java
@@ -22,15 +22,12 @@
  */
 package org.ladysnake.cca.test.scoreboard;
 
-import com.mojang.serialization.Codec;
 import net.fabricmc.fabric.api.gametest.v1.GameTest;
-import net.minecraft.nbt.NbtOps;
 import net.minecraft.scoreboard.ScoreboardState;
 import net.minecraft.scoreboard.ServerScoreboard;
 import net.minecraft.scoreboard.Team;
 import net.minecraft.test.TestContext;
 import net.minecraft.text.Text;
-import net.minecraft.world.PersistentState;
 import org.ladysnake.cca.test.base.CardinalGameTest;
 import org.ladysnake.cca.test.base.LoadAwareTestComponent;
 import org.ladysnake.cca.test.base.Vita;
@@ -54,19 +51,16 @@ public void componentSerializesCorrectly(TestContext ctx) {
         scoreboard.getComponent(Vita.KEY).setVitality(42);
         Team testTeam = scoreboard.addTeam(TEST_TEAM_NAME);
         testTeam.getComponent(Vita.KEY).setVitality(420);
-        PersistentState.Context persistentStateCtx = new PersistentState.Context(ctx.getWorld());
-        Codec<ScoreboardState> codec = ServerScoreboard.STATE_TYPE.codec().apply(persistentStateCtx);
-        var serializationResult = codec.encodeStart(NbtOps.INSTANCE, ServerScoreboard.STATE_TYPE.constructor().apply(persistentStateCtx));
-        ctx.assertTrue("Serialization should succeed", serializationResult.isSuccess());
+        ScoreboardState state = ScoreboardState.TYPE.constructor().get();
+        scoreboard.writeTo(state);
         scoreboard.getComponent(Vita.KEY).setVitality(0);
         scoreboard.removeTeam(testTeam);
         ctx.assertEquals(
             0, scoreboard.getComponent(Vita.KEY).getVitality(),
             Text.literal("reset vita")
         );
         ctx.assertTrue("Reset team should be null", scoreboard.getTeam(TEST_TEAM_NAME) == null);
-        var deserializationResult = codec.decode(NbtOps.INSTANCE, serializationResult.getOrThrow());
-        ctx.assertTrue("Deserialization should succeed", deserializationResult.isSuccess());
+        scoreboard.read(state.getPackedState());
         ctx.assertEquals(
             42, scoreboard.getComponent(Vita.KEY).getVitality(),
             Text.literal("deserialized vita")
diff --git a/cardinal-components-world/src/main/java/org/ladysnake/cca/internal/world/ComponentPersistentState.java b/cardinal-components-world/src/main/java/org/ladysnake/cca/internal/world/ComponentPersistentState.java
@@ -25,31 +25,28 @@
 import net.minecraft.datafixer.DataFixTypes;
 import net.minecraft.nbt.NbtCompound;
 import net.minecraft.registry.RegistryWrapper;
-import net.minecraft.server.world.ServerWorld;
 import net.minecraft.storage.NbtReadView;
 import net.minecraft.util.ErrorReporter;
 import net.minecraft.world.PersistentState;
 import net.minecraft.world.PersistentStateType;
 import org.ladysnake.cca.api.v3.component.ComponentContainer;
-import org.ladysnake.cca.api.v3.component.ComponentProvider;
 import org.ladysnake.cca.internal.base.AbstractComponentContainer;
 import org.ladysnake.cca.internal.base.ComponentsInternals;
 
 public class ComponentPersistentState extends PersistentState {
     public static final ThreadLocal<Boolean> LOADING = ThreadLocal.withInitial(() -> false);
     private static final String PERSISTENT_STATE_KEY = "cardinal_world_components";
-    public static final PersistentStateType<ComponentPersistentState> STATE_TYPE = new PersistentStateType<>(
-        PERSISTENT_STATE_KEY,
-        (ctx) -> new ComponentPersistentState(((ComponentProvider) ctx.getWorldOrThrow()).getComponentContainer()),
-        (ctx) -> {
-            ServerWorld world = ctx.getWorldOrThrow();
-            return NbtCompound.CODEC.xmap(
-                nbt -> fromNbt(((ComponentProvider) world).getComponentContainer(), nbt, world.getRegistryManager()),
-                state -> state.writeNbt(new NbtCompound(), world.getRegistryManager())
-            );
-        },
-        DataFixTypes.LEVEL
-    );
+    public static PersistentStateType<ComponentPersistentState> stateType(ComponentContainer components, RegistryWrapper.WrapperLookup registries) {
+        return new PersistentStateType<>(
+            PERSISTENT_STATE_KEY,
+            () -> new ComponentPersistentState(components),
+            NbtCompound.CODEC.xmap(
+                nbt -> fromNbt(components, nbt, registries),
+                state -> state.writeNbt(new NbtCompound(), registries)
+            ),
+            DataFixTypes.LEVEL
+        );
+    }
 
     private final ComponentContainer components;
 
diff --git a/cardinal-components-world/src/main/java/org/ladysnake/cca/mixin/world/common/MixinServerWorld.java b/cardinal-components-world/src/main/java/org/ladysnake/cca/mixin/world/common/MixinServerWorld.java
@@ -52,7 +52,7 @@ public abstract class MixinServerWorld extends MixinWorld {
     private void constructor(CallbackInfo ci) {
         try {
             ComponentPersistentState.LOADING.set(true);
-            this.getPersistentStateManager().getOrCreate(ComponentPersistentState.STATE_TYPE);
+            this.getPersistentStateManager().getOrCreate(ComponentPersistentState.stateType(components, getRegistryManager()));
         } finally {
             ComponentPersistentState.LOADING.set(false);
         }
diff --git a/cardinal-components-world/src/main/java/org/ladysnake/cca/mixin/world/common/MixinWorld.java b/cardinal-components-world/src/main/java/org/ladysnake/cca/mixin/world/common/MixinWorld.java
@@ -22,11 +22,13 @@
  */
 package org.ladysnake.cca.mixin.world.common;
 
+import net.minecraft.registry.DynamicRegistryManager;
 import net.minecraft.world.World;
 import org.ladysnake.cca.api.v3.component.ComponentContainer;
 import org.ladysnake.cca.api.v3.component.ComponentProvider;
 import org.ladysnake.cca.internal.world.CardinalComponentsWorld;
 import org.spongepowered.asm.mixin.Mixin;
+import org.spongepowered.asm.mixin.Shadow;
 import org.spongepowered.asm.mixin.Unique;
 import org.spongepowered.asm.mixin.injection.At;
 import org.spongepowered.asm.mixin.injection.Inject;
@@ -37,6 +39,8 @@
 @Mixin(World.class)
 public abstract class MixinWorld implements ComponentProvider {
 
+    @Shadow public abstract DynamicRegistryManager getRegistryManager();
+
     @Unique
     protected ComponentContainer components;
 
diff --git a/changelog.md b/changelog.md
@@ -1,3 +1,8 @@
+------------------------------------------------------
+Version 7.3.0
+------------------------------------------------------
+Updated to 1.25.11
+
 ------------------------------------------------------
 Version 7.2.0
 ------------------------------------------------------
diff --git a/gradle.properties b/gradle.properties
@@ -4,22 +4,22 @@ org.gradle.parallel=true
 fabric.loom.multiProjectOptimisation=true
 
 #see https://fabricmc.net/develop/
-minecraft_version=1.21.10
+minecraft_version=1.21.11
 yarn_mappings=2
-loader_version=0.17.2
+loader_version=0.18.2
 #Fabric api
-fabric_api_version=0.135.0+1.21.10
+fabric_api_version=0.139.4+1.21.11
 
 elmendorf_version=0.16.0
 
 immersive_portals_version=v6.0.3-mc1.21.1
 
 #Publishing
-mod_version = 7.2.0
+mod_version = 7.3.0
 curseforge_id = 318449
 modrinth_id = K01OU20C
-curseforge_versions = 1.21.10
-modrinth_versions = 1.21.10
+curseforge_versions = 1.21.11
+modrinth_versions = 1.21.11
 release_type = release
 display_name = Cardinal-Components-API
 owners = Ladysnake

Original file line number	Diff line number	Diff line change
`@@ -4,7 +4,7 @@ import net.fabricmc.loom.task.RemapJarTask`
`4`	`4`	`import java.net.URI`
`5`	`5`
`6`	`6`	`plugins {`
`7`		`- id("fabric-loom") version "1.12.0-alpha.25"`
	`7`	`+ id("fabric-loom") version "1.13.3"`
`8`	`8`	`id("io.github.ladysnake.chenille") version "0.15.0"`
`9`	`9`	`id("org.cadixdev.licenser") version "0.6.1"`
`10`	`10`	`}`