Update to 25w20a

Author: Pyrofab

cardinal-components-base/src/main/java/org/ladysnake/cca/api/v3/component/Component.java

@@ -23,7 +23,8 @@
 package org.ladysnake.cca.api.v3.component;
 
 import net.minecraft.nbt.NbtCompound;
-import net.minecraft.registry.RegistryWrapper;
+import net.minecraft.storage.ReadView;
+import net.minecraft.storage.WriteView;
 import org.jetbrains.annotations.Contract;
 
 /**
@@ -36,21 +37,19 @@ public interface Component {
     /**
      * Reads this component's properties from a {@link NbtCompound}.
      *
-     * @param tag            a {@code NbtCompound} on which this component's serializable data has been written
-     * @param registryLookup access to dynamic registry data
+     * @param readView a {@code NbtCompound} on which this component's serializable data has been written
      * @implNote implementations should not assert that the data written on the tag corresponds to any
      * specific scheme, as saved data is susceptible to external tempering, and may come from an earlier
      * version.
      */
     @Contract(mutates = "this")
-    void readFromNbt(NbtCompound tag, RegistryWrapper.WrapperLookup registryLookup);
+    void readData(ReadView readView);
 
     /**
      * Writes this component's properties to a {@link NbtCompound}.
      *
-     * @param tag            a {@code NbtCompound} on which to write this component's serializable data
-     * @param registryLookup access to dynamic registry data
+     * @param writeView a {@code NbtCompound} on which to write this component's serializable data
      */
     @Contract(mutates = "param1")
-    void writeToNbt(NbtCompound tag, RegistryWrapper.WrapperLookup registryLookup);
+    void writeData(WriteView writeView);
 }

cardinal-components-base/src/main/java/org/ladysnake/cca/api/v3/component/ComponentContainer.java

@@ -25,6 +25,8 @@
 import net.fabricmc.api.EnvType;
 import net.minecraft.nbt.NbtCompound;
 import net.minecraft.registry.RegistryWrapper;
+import net.minecraft.storage.ReadView;
+import net.minecraft.storage.WriteView;
 import org.jetbrains.annotations.ApiStatus;
 import org.jetbrains.annotations.Contract;
 import org.jetbrains.annotations.Nullable;
@@ -111,28 +113,28 @@ default ComponentKey<?> getKey(Component component) {
     /**
      * Reads this object's properties from a {@link NbtCompound}.
      *
-     * @param tag            a {@code NbtCompound} on which this object's serializable data has been written
-     * @param registryLookup access to dynamic registry data
+     * @param readView a {@code NbtCompound} on which this object's serializable data has been written
      * @implNote implementations must not assert that the data written on the tag corresponds to any
      * specific scheme, as saved data is susceptible to external tempering, and may come from an earlier
      * version. They should also store values into {@code tag} using only unique namespaced keys, as other
      * information may be stored in said tag.
      */
     @Contract(mutates = "this")
-    void fromTag(NbtCompound tag, RegistryWrapper.WrapperLookup registryLookup);
+    void readData(ReadView readView);
 
     @Contract(mutates = "this")
-    void fromOrphanTag(NbtCompound tag, RegistryWrapper.WrapperLookup registryLookup);
+    void readOrphanData(ReadView readView);
 
     /**
      * Writes this object's properties to a {@link NbtCompound}.
      *
-     * @param tag            a {@code NbtCompound} on which to write this component's serializable data
-     * @param registryLookup access to dynamic registry data
-     * @return {@code tag} for easy chaining
+     * @param writeView a {@code NbtCompound} on which to write this component's serializable data
      */
     @Contract(mutates = "param1")
-    NbtCompound toTag(NbtCompound tag, RegistryWrapper.WrapperLookup registryLookup);
+    void writeData(WriteView writeView);
+
+    @Contract(mutates = "param1")
+    void writeOrphanData(WriteView writeView);
 
     @Nullable NbtCompound toOrphanTag(RegistryWrapper.WrapperLookup registryLookup);
 

cardinal-components-base/src/main/java/org/ladysnake/cca/api/v3/component/ComponentKey.java

@@ -200,7 +200,7 @@ public void syncWith(ServerPlayerEntity player, ComponentProvider provider) {
     @ApiStatus.Experimental
     public void syncWith(ServerPlayerEntity player, ComponentProvider provider, ComponentPacketWriter writer, PlayerSyncPredicate predicate) {
         if (predicate.shouldSyncWith(player)) {
-            RegistryByteBuf buf = new RegistryByteBuf(Unpooled.buffer(), player.getServerWorld().getRegistryManager());
+            RegistryByteBuf buf = new RegistryByteBuf(Unpooled.buffer(), player.getWorld().getRegistryManager());
             writer.writeSyncPacket(buf, player);
             CustomPayload payload = provider.toComponentPacket(this, predicate.isRequiredOnClient(), buf);
 

cardinal-components-base/src/main/java/org/ladysnake/cca/api/v3/component/CopyableComponent.java

@@ -35,8 +35,8 @@ public interface CopyableComponent<C extends Component> extends Component {
     /**
      * Copies the data from {@code other} into {@code this}.
      *
-     * @implSpec The default implementation {@linkplain Component#writeToNbt(NbtCompound, RegistryWrapper.WrapperLookup) serializes}
-     * the component data to a {@link NbtCompound} and calls {@link Component#readFromNbt(NbtCompound, RegistryWrapper.WrapperLookup)}.
+     * @implSpec The default implementation {@linkplain Component#writeData(net.minecraft.storage.WriteView) serializes}
+     * the component data to a {@link NbtCompound} and calls {@link Component#readData(net.minecraft.storage.ReadView)}.
      * @implNote The default implementation should generally be overridden.
      * The serialization done by the default implementation assumes NBT consistency
      * between implementations, and is generally slower than a direct copy.

cardinal-components-base/src/main/java/org/ladysnake/cca/api/v3/component/TransientComponent.java

@@ -22,21 +22,21 @@
  */
 package org.ladysnake.cca.api.v3.component;
 
-import net.minecraft.nbt.NbtCompound;
-import net.minecraft.registry.RegistryWrapper;
+import net.minecraft.storage.ReadView;
+import net.minecraft.storage.WriteView;
 import org.jetbrains.annotations.Nullable;
 
 /**
  * Utility interface for components that do not hold any data
  */
 public interface TransientComponent extends Component {
     @Override
-    default void readFromNbt(NbtCompound tag, RegistryWrapper.WrapperLookup registryLookup) {
+    default void readData(ReadView readView) {
         // Nothing to read
     }
 
     @Override
-    default void writeToNbt(NbtCompound tag, RegistryWrapper.WrapperLookup registryLookup) {
+    default void writeData(WriteView writeView) {
         // Nothing to write
     }
 

cardinal-components-base/src/main/java/org/ladysnake/cca/api/v3/component/sync/AutoSyncedComponent.java

@@ -26,13 +26,16 @@
 import net.minecraft.entity.Entity;
 import net.minecraft.nbt.NbtCompound;
 import net.minecraft.network.RegistryByteBuf;
-import net.minecraft.registry.RegistryWrapper.WrapperLookup;
 import net.minecraft.server.network.ServerPlayerEntity;
+import net.minecraft.storage.NbtReadView;
+import net.minecraft.storage.NbtWriteView;
+import net.minecraft.util.ErrorReporter;
 import net.minecraft.world.World;
 import org.jetbrains.annotations.Contract;
 import org.ladysnake.cca.api.v3.component.Component;
 import org.ladysnake.cca.api.v3.component.ComponentKey;
 import org.ladysnake.cca.api.v3.util.CheckEnvironment;
+import org.ladysnake.cca.internal.base.ComponentsInternals;
 
 /**
  * A {@link Component} implementing this interface will have its data automatically
@@ -68,7 +71,7 @@ default boolean shouldSyncWith(ServerPlayerEntity player) {
      * @param buf       the buffer to write the data to
      * @param recipient the player to which the packet will be sent
      * @implSpec The default implementation writes the whole NBT representation
-     * of this component to the buffer using {@link Component#writeToNbt(NbtCompound, WrapperLookup)}.
+     * of this component to the buffer using {@link Component#writeData(net.minecraft.storage.WriteView)}.
      * @implNote The default implementation should generally be overridden.
      * The serialization done by the default implementation sends possibly hidden
      * information to clients, uses a wasteful data format, and does not support
@@ -81,16 +84,18 @@ default boolean shouldSyncWith(ServerPlayerEntity player) {
     @Contract(mutates = "param1")
     @Override
     default void writeSyncPacket(RegistryByteBuf buf, ServerPlayerEntity recipient) {
-        NbtCompound tag = new NbtCompound();
-        this.writeToNbt(tag, buf.getRegistryManager());
-        buf.writeNbt(tag);
+        try (var errorReporter = new ErrorReporter.Logging(ComponentsInternals.LOGGER)) {
+            NbtWriteView writeView = NbtWriteView.create(errorReporter, buf.getRegistryManager());
+            this.writeData(writeView);
+            buf.writeNbt(writeView.getNbt());
+        }
     }
 
     /**
      * Reads this component's data from {@code buf}.
      *
      * @implSpec The default implementation converts the buffer's content
-     * to a {@link NbtCompound} and calls {@link Component#readFromNbt(NbtCompound, WrapperLookup)}.
+     * to a {@link NbtCompound} and calls {@link Component#readData(net.minecraft.storage.ReadView)}.
      * @implNote any implementing class overriding {@link #writeSyncPacket(RegistryByteBuf, ServerPlayerEntity)}
      * such that it uses a different data format must override this method.
      * @see #writeSyncPacket(RegistryByteBuf, ServerPlayerEntity)
@@ -99,7 +104,9 @@ default void writeSyncPacket(RegistryByteBuf buf, ServerPlayerEntity recipient)
     default void applySyncPacket(RegistryByteBuf buf) {
         NbtCompound tag = buf.readNbt();
         if (tag != null) {
-            this.readFromNbt(tag, buf.getRegistryManager());
+            try (var errorReporter = new ErrorReporter.Logging(ComponentsInternals.LOGGER)) {
+                this.readData(NbtReadView.create(errorReporter, buf.getRegistryManager(), tag));
+            }
         }
     }
 }

cardinal-components-base/src/main/java/org/ladysnake/cca/api/v3/util/NbtSerializable.java

@@ -22,10 +22,9 @@
  */
 package org.ladysnake.cca.api.v3.util;
 
-import com.mojang.serialization.Dynamic;
 import net.minecraft.nbt.NbtCompound;
-import net.minecraft.nbt.NbtOps;
-import net.minecraft.registry.RegistryWrapper;
+import net.minecraft.storage.ReadView;
+import net.minecraft.storage.WriteView;
 import org.jetbrains.annotations.ApiStatus;
 import org.jetbrains.annotations.Contract;
 
@@ -34,33 +33,20 @@ public interface NbtSerializable {
     /**
      * Reads this object's properties from a {@link NbtCompound}.
      *
-     * @param tag            a {@code NbtCompound} on which this object's serializable data has been written
-     * @param registryLookup access to dynamic registry data
+     * @param readView a {@code NbtCompound} on which this object's serializable data has been written
      * @implNote implementations must not assert that the data written on the tag corresponds to any
      * specific scheme, as saved data is susceptible to external tempering, and may come from an earlier
      * version. They should also store values into {@code tag} using only unique namespaced keys, as other
      * information may be stored in said tag.
      */
     @Contract(mutates = "this")
-    void fromTag(NbtCompound tag, RegistryWrapper.WrapperLookup registryLookup);
+    void readData(ReadView readView);
 
     /**
      * Writes this object's properties to a {@link NbtCompound}.
      *
-     * @param tag            a {@code NbtCompound} on which to write this component's serializable data
-     * @param registryLookup access to dynamic registry data
-     * @return {@code tag} for easy chaining
+     * @param writeView a {@code NbtCompound} on which to write this component's serializable data
      */
     @Contract(mutates = "param")
-    NbtCompound toTag(NbtCompound tag, RegistryWrapper.WrapperLookup registryLookup);
-
-    @Contract(mutates = "this")
-    default void fromDynamic(Dynamic<?> dynamic, RegistryWrapper.WrapperLookup registryLookup) {
-        this.fromTag((NbtCompound) dynamic.convert(NbtOps.INSTANCE).getValue(), registryLookup);
-    }
-
-    @Contract(pure = true)
-    default <T> Dynamic<T> toDynamic(Dynamic<T> dynamic, RegistryWrapper.WrapperLookup wrapperLookup) {
-        return dynamic.convert(NbtOps.INSTANCE).map(tag -> this.toTag((NbtCompound)tag, wrapperLookup)).convert(dynamic.getOps());
-    }
+    void writeData(WriteView writeView);
 }

cardinal-components-base/src/main/java/org/ladysnake/cca/internal/base/AbstractComponentContainer.java

@@ -23,14 +23,17 @@
 package org.ladysnake.cca.internal.base;
 
 import net.minecraft.nbt.NbtCompound;
-import net.minecraft.nbt.NbtList;
 import net.minecraft.registry.RegistryWrapper;
-import net.minecraft.util.Identifier;
+import net.minecraft.storage.NbtReadView;
+import net.minecraft.storage.NbtWriteView;
+import net.minecraft.storage.ReadView;
+import net.minecraft.storage.WriteView;
+import net.minecraft.util.ErrorReporter;
 import org.jetbrains.annotations.Nullable;
 import org.ladysnake.cca.api.v3.component.*;
+import org.ladysnake.cca.mixin.base.NbtReadViewAccessor;
 
 import java.util.Iterator;
-import java.util.Optional;
 
 /**
  * Implementing class for {@link ComponentContainer}.
@@ -51,9 +54,11 @@ public void copyFrom(ComponentContainer other, RegistryWrapper.WrapperLookup reg
                     @SuppressWarnings("unchecked") CopyableComponent<Component> copyable = (CopyableComponent<Component>) ours;
                     copyable.copyFrom(theirs, registryLookup);
                 } else {
-                    NbtCompound tag = new NbtCompound();
-                    theirs.writeToNbt(tag, registryLookup);
-                    ours.readFromNbt(tag, registryLookup);
+                    try (var errorReporter = new ErrorReporter.Logging(ComponentsInternals.LOGGER)) {
+                        NbtWriteView writeView = NbtWriteView.create(errorReporter, registryLookup);
+                        theirs.writeData(writeView);
+                        ours.readData(NbtReadView.create(errorReporter, registryLookup, writeView.getNbt()));
+                    }
                 }
             }
         }
@@ -70,45 +75,28 @@ public void copyFrom(ComponentContainer other, RegistryWrapper.WrapperLookup reg
      * type, the component tag is skipped.
      */
     @Override
-    public void fromTag(NbtCompound tag, RegistryWrapper.WrapperLookup registryLookup) {
-        Optional<NbtList> list = tag.getList(NBT_KEY);
-        if(list.isPresent()) {
-            NbtList componentList = list.get();
-            for (int i = 0; i < componentList.size(); i++) {
-                NbtCompound nbt = componentList.getCompoundOrEmpty(i);
-                Optional<ComponentKey<?>> type = nbt.getString("componentId").map(Identifier::tryParse).map(ComponentRegistry::get);
-                if (type.isPresent()) {
-                    Component component = type.get().getInternal(this);
-                    if (component != null) {
-                        component.readFromNbt(nbt, registryLookup);
-                    }
-                }
-            }
-        } else {
-            Optional<NbtCompound> compound = tag.getCompound(NBT_KEY);
-
-            if (compound.isPresent()) {
-                NbtCompound componentMap = compound.get();
-                fromOrphanTag(componentMap, registryLookup);
-            }
-        }
+    public void readData(ReadView readView) {
+        readOrphanData(readView.getReadView(NBT_KEY));
     }
 
     @Override
-    public void fromOrphanTag(NbtCompound componentMap, RegistryWrapper.WrapperLookup registryLookup) {
+    public void readOrphanData(ReadView componentMap) {
+        NbtCompound underlyingNbt = componentMap instanceof NbtReadViewAccessor nbtReadView ? nbtReadView.getNbt() : null;
         for (ComponentKey<?> key : this.keys()) {
             String keyId = key.getId().toString();
 
-            Optional<NbtCompound> componentNbt = componentMap.getCompound(keyId);
-            if (componentNbt.isPresent()) {
-                Component component = key.getInternal(this);
-                assert component != null;
-                component.readFromNbt(componentNbt.get(), registryLookup);
-                componentMap.remove(keyId);
+            ReadView componentData = componentMap.getReadView(keyId);
+            Component component = key.getInternal(this);
+            assert component != null;
+            component.readData(componentData);
+            if (underlyingNbt != null) {
+                underlyingNbt.remove(keyId);
             }
         }
 
-        ComponentsInternals.logDeserializationWarnings(componentMap.getKeys());
+        if (underlyingNbt != null) {
+            ComponentsInternals.logDeserializationWarnings(underlyingNbt.getKeys());
+        }
     }
 
     /**
@@ -117,40 +105,34 @@ public void fromOrphanTag(NbtCompound componentMap, RegistryWrapper.WrapperLooku
      * @implSpec This implementation first checks if the container is empty; if so it
      * returns immediately. Then, it iterates over this container's mappings, and creates
      * a compound tag for each component. The tag is then passed to the component's
-     * {@link Component#writeToNbt(NbtCompound, RegistryWrapper.WrapperLookup)} method. Every such serialized component is appended
+     * {@link Component#writeData(WriteView)} method. Every such serialized component is appended
      * to a {@code NbtCompound}, using the component type's identifier as the key.
      * The serialized map is finally appended to the passed in tag using the "cardinal_components" key.
      */
     @Override
-    public NbtCompound toTag(NbtCompound tag, RegistryWrapper.WrapperLookup registryLookup) {
+    public void writeData(WriteView writeView) {
         if(this.hasComponents()) {
-            NbtCompound componentMap = toOrphanTag(registryLookup);
-            if (componentMap != null) {
-                tag.put(NBT_KEY, componentMap);
-            }
+            writeOrphanData(writeView.get(NBT_KEY));
         }
-        return tag;
     }
 
     @Override
-    public @Nullable NbtCompound toOrphanTag(RegistryWrapper.WrapperLookup registryLookup) {
-        NbtCompound componentMap = null;
-        NbtCompound componentTag = new NbtCompound();
-
+    public void writeOrphanData(WriteView writeView) {
         for (ComponentKey<?> type : this.keys()) {
             Component component = type.getFromContainer(this);
-            component.writeToNbt(componentTag, registryLookup);
-
-            if (!componentTag.isEmpty()) {
-                if (componentMap == null) {
-                    componentMap = new NbtCompound();
-                }
-
-                componentMap.put(type.getId().toString(), componentTag);
-                componentTag = new NbtCompound();   // recycle tag objects if possible
+            if (!(component instanceof TransientComponent)) {
+                component.writeData(writeView.get(type.getId().toString()));
             }
         }
-        return componentMap;
+    }
+
+    @Override
+    public @Nullable NbtCompound toOrphanTag(RegistryWrapper.WrapperLookup registryLookup) {
+        try (var errorReporter = new ErrorReporter.Logging(ComponentsInternals.LOGGER)) {
+            NbtWriteView writeView = NbtWriteView.create(errorReporter, registryLookup);
+            writeOrphanData(writeView);
+            return writeView.isEmpty() ? null : writeView.getNbt();
+        }
     }
 
     @Override