chore: update to 1.21.6

Author: derklaro

build.gradle.kts

@@ -60,6 +60,11 @@ allprojects {
         includeGroup("com.github.retrooper")
       }
     }
+    maven("https://repo.codemc.io/repository/maven-snapshots/") {
+      mavenContent {
+        includeGroup("com.github.retrooper")
+      }
+    }
   }
 }
 

bukkit/src/main/java/com/github/juliarn/npclib/bukkit/protocol/PacketEventsPacketAdapter.java

@@ -104,6 +104,7 @@ final class PacketEventsPacketAdapter implements PlatformPacketAdapter<World, Pl
 
   static final PacketEventsPacketAdapter INSTANCE = new PacketEventsPacketAdapter();
 
+  @SuppressWarnings("UnstableApiUsage") // fine for now
   private static final PacketEventsSettings PACKET_EVENTS_SETTINGS = new PacketEventsSettings()
     .debug(false)
     .checkForUpdates(false)
@@ -128,7 +129,7 @@ final class PacketEventsPacketAdapter implements PlatformPacketAdapter<World, Pl
     return new Location(pos.x(), pos.y(), pos.z(), yaw, pitch);
   }
 
-  private static @NotNull EntityData createEntityData(
+  private static @NotNull EntityData<Object> createEntityData(
     int index,
     @NotNull Type type,
     @NotNull Object value,
@@ -144,7 +145,9 @@ final class PacketEventsPacketAdapter implements PlatformPacketAdapter<World, Pl
       value = converted.getValue();
     }
 
-    return new EntityData(index, Lazy.ENTITY_DATA_TYPE_LOOKUP.get(type), value);
+    @SuppressWarnings("unchecked") // safe to cast here
+    EntityDataType<Object> entityDataType = (EntityDataType<Object>) Lazy.ENTITY_DATA_TYPE_LOOKUP.get(type);
+    return new EntityData<>(index, entityDataType, value);
   }
 
   @Override
@@ -323,7 +326,7 @@ final class PacketEventsPacketAdapter implements PlatformPacketAdapter<World, Pl
       }
 
       // construct the meta we want to send out
-      List<EntityData> entityData = new ArrayList<>();
+      List<EntityData<?>> entityData = new ArrayList<>();
       entityData.add(createEntityData(
         entityMetadata.index(),
         entityMetadata.type(),
@@ -543,10 +546,11 @@ private static final class Lazy {
                 OPTIONAL_CHAT_COMPONENT_TYPE,
                 optionalComponent.map(component -> {
                   // build the component based on the given input
+                  AdventureSerializer serializer = AdventureSerializer.serializer();
                   if (component.rawMessage() != null) {
-                    return AdventureSerializer.fromLegacyFormat(component.rawMessage());
+                    return serializer.fromLegacy(component.rawMessage());
                   } else {
-                    return AdventureSerializer.parseComponent(component.encodedJsonMessage());
+                    return serializer.fromJson(component.encodedJsonMessage());
                   }
                 }));
             } else {

bukkit/src/main/java/com/github/juliarn/npclib/bukkit/protocol/ProtocolLibPacketAdapter.java

@@ -235,14 +235,14 @@ final class ProtocolLibPacketAdapter implements PlatformPacketAdapter<World, Pla
         boolean optional = parameterized.getRawType() == Optional.class;
         if (optional) {
           Type serializerType = parameterized.getActualTypeArguments()[0];
-          Class<?> rawSerializerType = GenericTypeReflector.erase(serializerType);
+          Type rawSerializerType = GenericTypeReflector.erase(serializerType);
 
           WrappedDataWatcher.Serializer serializer = WrappedDataWatcher.Registry.get(rawSerializerType, true);
           return new WrappedWatchableObject(new WrappedDataWatcher.WrappedDataWatcherObject(index, serializer), value);
         }
       }
 
-      Class<?> raw = GenericTypeReflector.erase(type);
+      Type raw = GenericTypeReflector.erase(type);
       WrappedDataWatcher.Serializer serializer = WrappedDataWatcher.Registry.get(raw, false);
       return new WrappedWatchableObject(new WrappedDataWatcher.WrappedDataWatcherObject(index, serializer), value);
     } else {

fabric/src/main/java/com/github/juliarn/npclib/fabric/FabricVersionAccessor.java

@@ -31,7 +31,7 @@
 public final class FabricVersionAccessor {
 
   private static int[] extractServerVersionParts() {
-    String[] parts = SharedConstants.getCurrentVersion().getName().split("\\.");
+    String[] parts = SharedConstants.getCurrentVersion().name().split("\\.");
     if (parts.length == 2 || parts.length == 3) {
       // should be in the correct format, just to make sure
       try {

fabric/src/main/java/com/github/juliarn/npclib/fabric/controller/FabricActionController.java

@@ -77,7 +77,7 @@ public FabricActionController(
         ServerPlayer player = event.player();
         var pos = player.position();
         var rot = player.getRotationVector();
-        var level = player.serverLevel();
+        var level = player.level();
 
         double distance = FabricUtil.distance(event.npc(), pos);
         if (distance <= this.imitateDistance && event.npc().flagValueOrDefault(Npc.LOOK_AT_PLAYER)) {
@@ -109,7 +109,7 @@ private void handleMove(@NotNull ServerPlayer player, @Nullable Vec3 pos, @Nulla
     for (var npc : this.npcTracker.trackedNpcs()) {
       // check if the player is still in the same world as the npc
       var npcPos = npc.position();
-      var level = player.serverLevel();
+      var level = player.level();
       if (!npc.world().equals(level) || !npc.world().hasChunk(npcPos.chunkX(), npcPos.chunkZ())) {
         // if the player is tracked by the npc, stop that
         npc.stopTrackingPlayer(player);
@@ -146,7 +146,7 @@ private void handleLevelChange(
   ) {
     // ensure that we stop tracking the player on NPCs which are not in the same world as the player
     for (var npc : this.npcTracker.trackedNpcs()) {
-      if (!npc.world().equals(player.serverLevel())) {
+      if (!npc.world().equals(player.level())) {
         // the player is no longer in the same world, stop tracking
         npc.stopTrackingPlayer(player);
         continue;
@@ -164,7 +164,7 @@ private void handleToggleSneak(@NotNull ServerPlayer player, boolean sneaking) {
     for (var npc : this.npcTracker.trackedNpcs()) {
       // check if we should imitate the action
       var distance = FabricUtil.distance(npc, player.position());
-      if (npc.world().equals(player.serverLevel())
+      if (npc.world().equals(player.level())
         && npc.tracksPlayer(player)
         && distance <= this.imitateDistance
         && npc.flagValueOrDefault(Npc.SNEAK_WHEN_PLAYER_SNEAKS)) {
@@ -180,7 +180,7 @@ private void handlePlayerHandSwing(@NotNull ServerPlayer player) {
     for (var npc : this.npcTracker.trackedNpcs()) {
       // check if we should imitate the action
       var distance = FabricUtil.distance(npc, player.position());
-      if (npc.world().equals(player.serverLevel())
+      if (npc.world().equals(player.level())
         && npc.tracksPlayer(player)
         && distance <= this.imitateDistance
         && npc.flagValueOrDefault(Npc.HIT_WHEN_PLAYER_HITS)) {

fabric/src/main/java/com/github/juliarn/npclib/fabric/mixins/PlayerListMixin.java

@@ -50,7 +50,7 @@ public abstract class PlayerListMixin {
     CommonListenerCookie commonListenerCookie,
     CallbackInfo ci
   ) {
-    var newLevel = serverPlayer.serverLevel();
+    var newLevel = serverPlayer.level();
     var invoker = FabricActionControllerEvents.SERVER_PLAYER_LEVEL_CHANGE.invoker();
     invoker.levelChange(serverPlayer, null, newLevel);
   }

fabric/src/main/java/com/github/juliarn/npclib/fabric/mixins/ServerGamePacketListenerImplMixin.java

@@ -28,7 +28,7 @@
 import net.minecraft.network.protocol.game.ServerboundInteractPacket;
 import net.minecraft.network.protocol.game.ServerboundMovePlayerPacket;
 import net.minecraft.network.protocol.game.ServerboundMoveVehiclePacket;
-import net.minecraft.network.protocol.game.ServerboundPlayerCommandPacket;
+import net.minecraft.network.protocol.game.ServerboundPlayerInputPacket;
 import net.minecraft.network.protocol.game.ServerboundSwingPacket;
 import net.minecraft.server.level.ServerPlayer;
 import net.minecraft.server.network.ServerGamePacketListenerImpl;
@@ -45,21 +45,24 @@
 @Mixin(ServerGamePacketListenerImpl.class)
 public abstract class ServerGamePacketListenerImplMixin {
 
-  @Shadow
-  public ServerPlayer player;
-
   @Shadow
   public abstract ServerPlayer getPlayer();
 
-  @Inject(method = "handlePlayerCommand", at = @At("TAIL"))
-  public void npc_lib$handlePlayerCommand(ServerboundPlayerCommandPacket packet, CallbackInfo ci) {
+  @Inject(
+    method = "handlePlayerInput",
+    at = @At(
+      value = "INVOKE",
+      shift = At.Shift.AFTER,
+      target = "Lnet/minecraft/network/protocol/PacketUtils;ensureRunningOnSameThread(Lnet/minecraft/network/protocol/Packet;Lnet/minecraft/network/PacketListener;Lnet/minecraft/server/level/ServerLevel;)V"
+    )
+  )
+  public void npc_lib$handlePlayerInput(ServerboundPlayerInputPacket packet, CallbackInfo ci) {
     var player = this.getPlayer();
-    var command = packet.getAction();
-    if (command == ServerboundPlayerCommandPacket.Action.PRESS_SHIFT_KEY
-      || command == ServerboundPlayerCommandPacket.Action.RELEASE_SHIFT_KEY) {
+    var sentInput = packet.input();
+    var lastInput = player.getLastClientInput();
+    if (lastInput.shift() != sentInput.shift()) {
       var invoker = FabricActionControllerEvents.SERVER_PLAYER_TOGGLE_SNEAK.invoker();
-      var sprintStarted = command == ServerboundPlayerCommandPacket.Action.PRESS_SHIFT_KEY;
-      invoker.toggleSneak(player, sprintStarted);
+      invoker.toggleSneak(player, sentInput.shift());
     }
   }
 

fabric/src/main/java/com/github/juliarn/npclib/fabric/mixins/ServerPlayerMixin.java

@@ -37,11 +37,11 @@
 public abstract class ServerPlayerMixin {
 
   @Shadow
-  public abstract ServerLevel serverLevel();
+  public abstract ServerLevel level();
 
   @Inject(method = "setServerLevel", at = @At("HEAD"))
   public void npc_lib$setServerLevel(ServerLevel level, CallbackInfo ci) {
-    var currentLevel = this.serverLevel();
+    var currentLevel = this.level();
     var player = (ServerPlayer) (Object) this;
     if (currentLevel != null && player.connection != null) {
       var eventInvoker = FabricActionControllerEvents.SERVER_PLAYER_LEVEL_CHANGE.invoker();

fabric/src/main/java/com/github/juliarn/npclib/fabric/protocol/FabricProtocolAdapter.java

@@ -37,9 +37,11 @@
 import com.github.juliarn.npclib.common.event.DefaultInteractNpcEvent;
 import com.github.juliarn.npclib.fabric.controller.FabricActionControllerEvents;
 import com.github.juliarn.npclib.fabric.util.FabricUtil;
+import com.google.gson.JsonParser;
 import com.mojang.authlib.GameProfile;
 import com.mojang.authlib.properties.Property;
 import com.mojang.datafixers.util.Pair;
+import com.mojang.serialization.JsonOps;
 import io.leangen.geantyref.TypeFactory;
 import java.lang.reflect.Type;
 import java.util.ArrayList;
@@ -54,6 +56,7 @@
 import net.fabricmc.fabric.api.networking.v1.ServerPlayNetworking;
 import net.fabricmc.fabric.impl.networking.PayloadTypeRegistryImpl;
 import net.minecraft.network.chat.Component;
+import net.minecraft.network.chat.ComponentSerialization;
 import net.minecraft.network.protocol.common.custom.CustomPacketPayload;
 import net.minecraft.network.protocol.game.ClientboundAddEntityPacket;
 import net.minecraft.network.protocol.game.ClientboundAnimatePacket;
@@ -152,8 +155,13 @@ public final class FabricProtocolAdapter
             if (rawMessage != null) {
               return Component.literal(rawMessage);
             } else {
-              var registries = FabricUtil.getServer().registryAccess();
-              return Component.Serializer.fromJson(Objects.requireNonNull(component.encodedJsonMessage()), registries);
+              var encodedJson = Objects.requireNonNull(component.encodedJsonMessage());
+              var encodedJsonTree = JsonParser.parseString(encodedJson);
+              var context = FabricUtil.getServer().registryAccess().createSerializationContext(JsonOps.INSTANCE);
+              return ComponentSerialization.CODEC
+                .decode(context, encodedJsonTree)
+                .getOrThrow(IllegalArgumentException::new)
+                .getFirst();
             }
           });
         }

fabric/src/main/resources/fabric.mod.json

@@ -23,8 +23,8 @@
   ],
   "accessWidener": "npc_lib.accesswidener",
   "depends": {
-    "fabricloader": ">=0.16.10",
-    "minecraft": "~1.21.5",
+    "fabricloader": ">=0.16.14",
+    "minecraft": "~1.21.6",
     "java": ">=21",
     "fabric-networking-api-v1": "*"
   }