Switch project to Mojmap using Ravel

Author: Pyrofab

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

@@ -22,9 +22,9 @@
  */
 package org.ladysnake.cca.api.v3.component;
 
-import net.minecraft.nbt.NbtCompound;
-import net.minecraft.storage.ReadView;
-import net.minecraft.storage.WriteView;
+import net.minecraft.nbt.CompoundTag;
+import net.minecraft.world.level.storage.ValueInput;
+import net.minecraft.world.level.storage.ValueOutput;
 import org.jetbrains.annotations.Contract;
 
 /**
@@ -35,21 +35,21 @@
 public interface Component {
 
     /**
-     * Reads this component's properties from a {@link NbtCompound}.
+     * Reads this component's properties from a {@link CompoundTag}.
      *
      * @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 readData(ReadView readView);
+    void readData(ValueInput readView);
 
     /**
-     * Writes this component's properties to a {@link NbtCompound}.
+     * Writes this component's properties to a {@link CompoundTag}.
      *
      * @param writeView a {@code NbtCompound} on which to write this component's serializable data
      */
     @Contract(mutates = "param1")
-    void writeData(WriteView writeView);
+    void writeData(ValueOutput writeView);
 }

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

@@ -23,10 +23,10 @@
 package org.ladysnake.cca.api.v3.component;
 
 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 net.minecraft.nbt.CompoundTag;
+import net.minecraft.core.HolderLookup;
+import net.minecraft.world.level.storage.ValueInput;
+import net.minecraft.world.level.storage.ValueOutput;
 import org.jetbrains.annotations.ApiStatus;
 import org.jetbrains.annotations.Contract;
 import org.jetbrains.annotations.Nullable;
@@ -63,7 +63,7 @@ public interface ComponentContainer extends NbtSerializable {
     boolean hasComponents();
 
     @Contract(mutates = "this")
-    void copyFrom(ComponentContainer other, RegistryWrapper.WrapperLookup registryLookup);
+    void copyFrom(ComponentContainer other, HolderLookup.Provider registryLookup);
 
     @AsmGeneratedCallback(ServerTickingComponent.class)
     void tickServerComponents();
@@ -111,7 +111,7 @@ default ComponentKey<?> getKey(Component component) {
     }
 
     /**
-     * Reads this object's properties from a {@link NbtCompound}.
+     * Reads this object's properties from a {@link CompoundTag}.
      *
      * @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
@@ -120,23 +120,23 @@ default ComponentKey<?> getKey(Component component) {
      * information may be stored in said tag.
      */
     @Contract(mutates = "this")
-    void readData(ReadView readView);
+    void readData(ValueInput readView);
 
     @Contract(mutates = "this")
-    void readOrphanData(ReadView readView);
+    void readOrphanData(ValueInput readView);
 
     /**
-     * Writes this object's properties to a {@link NbtCompound}.
+     * Writes this object's properties to a {@link CompoundTag}.
      *
      * @param writeView a {@code NbtCompound} on which to write this component's serializable data
      */
     @Contract(mutates = "param1")
-    void writeData(WriteView writeView);
+    void writeData(ValueOutput writeView);
 
     @Contract(mutates = "param1")
-    void writeOrphanData(WriteView writeView);
+    void writeOrphanData(ValueOutput writeView);
 
-    @Nullable NbtCompound toOrphanTag(RegistryWrapper.WrapperLookup registryLookup);
+    @Nullable CompoundTag toOrphanTag(HolderLookup.Provider registryLookup);
 
     /**
      * A factory for {@link ComponentContainer}s.

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

@@ -25,12 +25,12 @@
 import io.netty.buffer.Unpooled;
 import net.fabricmc.fabric.api.networking.v1.ServerPlayNetworking;
 import net.fabricmc.loader.api.FabricLoader;
-import net.minecraft.network.PacketCallbacks;
-import net.minecraft.network.RegistryByteBuf;
-import net.minecraft.network.packet.CustomPayload;
-import net.minecraft.server.network.ServerPlayerEntity;
-import net.minecraft.text.Text;
-import net.minecraft.util.Identifier;
+import net.minecraft.network.PacketSendListener;
+import net.minecraft.network.RegistryFriendlyByteBuf;
+import net.minecraft.network.protocol.common.custom.CustomPacketPayload;
+import net.minecraft.server.level.ServerPlayer;
+import net.minecraft.network.chat.Component;
+import net.minecraft.resources.Identifier;
 import org.jetbrains.annotations.ApiStatus;
 import org.jetbrains.annotations.Contract;
 import org.jetbrains.annotations.Nullable;
@@ -174,7 +174,7 @@ public void sync(Object provider, ComponentPacketWriter packetWriter) {
      * @see ComponentAccess#syncComponent(ComponentKey, ComponentPacketWriter, PlayerSyncPredicate)
      */
     public void sync(Object provider, ComponentPacketWriter packetWriter, PlayerSyncPredicate predicate) {
-        for (ServerPlayerEntity player : ((ComponentProvider) provider).getRecipientsForComponentSync()) {
+        for (ServerPlayer player : ((ComponentProvider) provider).getRecipientsForComponentSync()) {
             this.syncWith(player, (ComponentProvider) provider, packetWriter, predicate);
         }
     }
@@ -191,28 +191,28 @@ public void sync(Object provider, ComponentPacketWriter packetWriter, PlayerSync
      * @throws ClassCastException     if <code>provider</code> does not implement {@link ComponentProvider}
      */
     @ApiStatus.Experimental
-    public void syncWith(ServerPlayerEntity player, ComponentProvider provider) {
+    public void syncWith(ServerPlayer player, ComponentProvider provider) {
         if (this.get(provider) instanceof AutoSyncedComponent synced) {
             this.syncWith(player, provider, synced, synced);
         }
     }
 
     @ApiStatus.Experimental
-    public void syncWith(ServerPlayerEntity player, ComponentProvider provider, ComponentPacketWriter writer, PlayerSyncPredicate predicate) {
+    public void syncWith(ServerPlayer player, ComponentProvider provider, ComponentPacketWriter writer, PlayerSyncPredicate predicate) {
         if (predicate.shouldSyncWith(player)) {
-            RegistryByteBuf buf = new RegistryByteBuf(Unpooled.buffer(), player.getEntityWorld().getRegistryManager());
+            RegistryFriendlyByteBuf buf = new RegistryFriendlyByteBuf(Unpooled.buffer(), player.level().registryAccess());
             writer.writeSyncPacket(buf, player);
-            CustomPayload payload = provider.toComponentPacket(this, predicate.isRequiredOnClient(), buf);
+            CustomPacketPayload payload = provider.toComponentPacket(this, predicate.isRequiredOnClient(), buf);
 
             if (payload != null) {
-                if (ServerPlayNetworking.canSend(player, payload.getId())) {
-                    ServerPlayNetworking.getSender(player).sendPacket(payload, PacketCallbacks.always(buf::release));
+                if (ServerPlayNetworking.canSend(player, payload.type())) {
+                    ServerPlayNetworking.getSender(player).sendPacket(payload, PacketSendListener.thenRun(buf::release));
                 } else {
                     if (predicate.isRequiredOnClient()) {
                         String specificMod = FabricLoader.getInstance().getModContainer(this.id.getNamespace()).map(c -> c.getMetadata().getName() + " and ").orElse("");
-                        player.networkHandler.disconnect(Text.literal(
+                        player.connection.disconnect(Component.literal(
                             "This server requires " + specificMod + "Cardinal Components API " +
-                                "(unhandled packet: " + payload.getId().id() + ")" +
+                                "(unhandled packet: " + payload.type().id() + ")" +
                                 ComponentsInternals.getClientOptionalModAdvice()));
                     }
                     buf.release();

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

@@ -23,9 +23,9 @@
 package org.ladysnake.cca.api.v3.component;
 
 import io.netty.buffer.ByteBuf;
-import net.minecraft.network.RegistryByteBuf;
-import net.minecraft.network.packet.CustomPayload;
-import net.minecraft.server.network.ServerPlayerEntity;
+import net.minecraft.network.RegistryFriendlyByteBuf;
+import net.minecraft.network.protocol.common.custom.CustomPacketPayload;
+import net.minecraft.server.level.ServerPlayer;
 import org.jetbrains.annotations.Nullable;
 import org.ladysnake.cca.api.v3.component.sync.AutoSyncedComponent;
 import org.ladysnake.cca.api.v3.component.sync.PlayerSyncPredicate;
@@ -48,14 +48,14 @@ public interface ComponentProvider extends ComponentAccess {
      * Retrieves an iterator describing the list of players who may receive
      * component sync packets from this provider.
      *
-     * <p>Individual components can {@linkplain PlayerSyncPredicate#shouldSyncWith(ServerPlayerEntity) filter
+     * <p>Individual components can {@linkplain PlayerSyncPredicate#shouldSyncWith(ServerPlayer) filter
      * which players among the returned list should receive their packets};
      * this method does <em>not</em> take current components into account, so callers should perform
      * additional checks as needed.
      *
      * @return a list of player candidates for receiving component sync packets
      */
-    default Iterable<ServerPlayerEntity> getRecipientsForComponentSync() {
+    default Iterable<ServerPlayer> getRecipientsForComponentSync() {
         return List.of();
     }
 
@@ -71,7 +71,7 @@ default Iterable<ServerPlayerEntity> getRecipientsForComponentSync() {
      * @since 6.0.0
      */
     @Nullable
-    default <C extends AutoSyncedComponent> CustomPayload toComponentPacket(ComponentKey<? super C> key, boolean required, RegistryByteBuf data) {
+    default <C extends AutoSyncedComponent> CustomPacketPayload toComponentPacket(ComponentKey<? super C> key, boolean required, RegistryFriendlyByteBuf data) {
         return null;
     }
 }

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

@@ -22,7 +22,7 @@
  */
 package org.ladysnake.cca.api.v3.component;
 
-import net.minecraft.util.Identifier;
+import net.minecraft.resources.Identifier;
 import org.jetbrains.annotations.ApiStatus;
 import org.jetbrains.annotations.Contract;
 import org.ladysnake.cca.internal.base.ComponentRegistryImpl;

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

@@ -22,7 +22,7 @@
  */
 package org.ladysnake.cca.api.v3.component;
 
-import net.minecraft.util.Identifier;
+import net.minecraft.resources.Identifier;
 import org.jetbrains.annotations.ApiStatus;
 import org.jetbrains.annotations.Contract;
 import org.ladysnake.cca.internal.base.ComponentRegistryImpl;

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

@@ -22,7 +22,7 @@
  */
 package org.ladysnake.cca.api.v3.component;
 
-import net.minecraft.item.ItemStack;
+import net.minecraft.world.item.ItemStack;
 
 /**
  * The base interface for components.

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

@@ -22,8 +22,8 @@
  */
 package org.ladysnake.cca.api.v3.component;
 
-import net.minecraft.nbt.NbtCompound;
-import net.minecraft.registry.RegistryWrapper;
+import net.minecraft.nbt.CompoundTag;
+import net.minecraft.core.HolderLookup;
 
 /**
  * A component that can copy its data from another component of the same type.
@@ -35,12 +35,12 @@ public interface CopyableComponent<C extends Component> extends Component {
     /**
      * Copies the data from {@code other} into {@code this}.
      *
-     * @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)}.
+     * @implSpec The default implementation {@linkplain Component#writeData(net.minecraft.world.level.storage.ValueOutput) serializes}
+     * the component data to a {@link CompoundTag} and calls {@link Component#readData(net.minecraft.world.level.storage.ValueInput)}.
      * @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.
      * Implementing classes can nearly always provide a better implementation.
      */
-    void copyFrom(C other, RegistryWrapper.WrapperLookup registryLookup);
+    void copyFrom(C other, HolderLookup.Provider registryLookup);
 }

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

@@ -22,7 +22,7 @@
  */
 package org.ladysnake.cca.api.v3.component;
 
-import net.minecraft.util.Identifier;
+import net.minecraft.resources.Identifier;
 
 import java.util.Collection;
 import java.util.Collections;

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.storage.ReadView;
-import net.minecraft.storage.WriteView;
+import net.minecraft.world.level.storage.ValueInput;
+import net.minecraft.world.level.storage.ValueOutput;
 import org.jetbrains.annotations.Nullable;
 
 /**
  * Utility interface for components that do not hold any data
  */
 public interface TransientComponent extends Component {
     @Override
-    default void readData(ReadView readView) {
+    default void readData(ValueInput readView) {
         // Nothing to read
     }
 
     @Override
-    default void writeData(WriteView writeView) {
+    default void writeData(ValueOutput writeView) {
         // Nothing to write
     }