From 5e9b9df87cc79970245cf4561da11a20b8e822d2 Mon Sep 17 00:00:00 2001 From: Pasqual Koschmieder Date: Sun, 8 Dec 2024 10:34:56 +0100 Subject: [PATCH] chore: update dependencies, update to minestom 1.21.3 --- gradle/libs.versions.toml | 8 +-- .../protocol/MinestomProtocolAdapter.java | 56 ++++++++++--------- 2 files changed, 33 insertions(+), 31 deletions(-) diff --git a/gradle/libs.versions.toml b/gradle/libs.versions.toml index 6696b37..320bfc2 100644 --- a/gradle/libs.versions.toml +++ b/gradle/libs.versions.toml @@ -3,18 +3,18 @@ # plugins spotless = "7.0.0.BETA4" nexusPublish = "2.0.0" -checkstyleTools = "10.20.1" +checkstyleTools = "10.20.2" # general gson = "2.11.0" geantyref = "1.3.16" annotations = "26.0.1" -netty = "4.1.114.Final" +netty = "4.1.115.Final" # platform api versions sponge = "10.0.0" -minestom = "f71ab6d851" -paper = "1.21.3-R0.1-SNAPSHOT" +minestom = "d760a60a5c" +paper = "1.21.4-R0.1-SNAPSHOT" # platform extensions paperLib = "1.0.8" diff --git a/minestom/src/main/java/com/github/juliarn/npclib/minestom/protocol/MinestomProtocolAdapter.java b/minestom/src/main/java/com/github/juliarn/npclib/minestom/protocol/MinestomProtocolAdapter.java index 8dfb97a..7bdd79a 100644 --- a/minestom/src/main/java/com/github/juliarn/npclib/minestom/protocol/MinestomProtocolAdapter.java +++ b/minestom/src/main/java/com/github/juliarn/npclib/minestom/protocol/MinestomProtocolAdapter.java @@ -58,12 +58,12 @@ import net.kyori.adventure.text.serializer.legacy.LegacyComponentSerializer; import net.minestom.server.MinecraftServer; import net.minestom.server.coordinate.Pos; -import net.minestom.server.entity.Entity; import net.minestom.server.entity.EntityType; import net.minestom.server.entity.EquipmentSlot; import net.minestom.server.entity.GameMode; import net.minestom.server.entity.Metadata; import net.minestom.server.entity.Player; +import net.minestom.server.entity.PlayerHand; import net.minestom.server.event.player.PlayerPacketEvent; import net.minestom.server.instance.Instance; import net.minestom.server.item.ItemStack; @@ -80,7 +80,6 @@ import net.minestom.server.network.packet.server.play.SpawnEntityPacket; import org.jetbrains.annotations.NotNull; -@SuppressWarnings("UnstableApiUsage") public final class MinestomProtocolAdapter implements PlatformPacketAdapter { private static final MinestomProtocolAdapter INSTANCE = new MinestomProtocolAdapter(); @@ -90,8 +89,8 @@ public final class MinestomProtocolAdapter implements PlatformPacketAdapter ITEM_SLOT_CONVERTER; - private static final EnumMap ENTITY_POSE_CONVERTER; - private static final EnumMap HAND_CONVERTER; + private static final EnumMap ENTITY_POSE_CONVERTER; + private static final EnumMap HAND_CONVERTER; private static final EnumMap ANIMATION_CONVERTER; private static final Map>> META_ENTRY_FACTORY; @@ -117,28 +116,28 @@ public final class MinestomProtocolAdapter implements PlatformPacketAdapter(EntityPose.class); - ENTITY_POSE_CONVERTER.put(EntityPose.STANDING, Entity.Pose.STANDING); - ENTITY_POSE_CONVERTER.put(EntityPose.FALL_FLYING, Entity.Pose.FALL_FLYING); - ENTITY_POSE_CONVERTER.put(EntityPose.SLEEPING, Entity.Pose.SLEEPING); - ENTITY_POSE_CONVERTER.put(EntityPose.SWIMMING, Entity.Pose.SWIMMING); - ENTITY_POSE_CONVERTER.put(EntityPose.SPIN_ATTACK, Entity.Pose.SPIN_ATTACK); - ENTITY_POSE_CONVERTER.put(EntityPose.CROUCHING, Entity.Pose.SNEAKING); - ENTITY_POSE_CONVERTER.put(EntityPose.LONG_JUMPING, Entity.Pose.LONG_JUMPING); - ENTITY_POSE_CONVERTER.put(EntityPose.DYING, Entity.Pose.DYING); - ENTITY_POSE_CONVERTER.put(EntityPose.CROAKING, Entity.Pose.CROAKING); - ENTITY_POSE_CONVERTER.put(EntityPose.USING_TONGUE, Entity.Pose.USING_TONGUE); - ENTITY_POSE_CONVERTER.put(EntityPose.ROARING, Entity.Pose.ROARING); - ENTITY_POSE_CONVERTER.put(EntityPose.SNIFFING, Entity.Pose.SNIFFING); - ENTITY_POSE_CONVERTER.put(EntityPose.EMERGING, Entity.Pose.EMERGING); - ENTITY_POSE_CONVERTER.put(EntityPose.DIGGING, Entity.Pose.DIGGING); - ENTITY_POSE_CONVERTER.put(EntityPose.SLIDING, Entity.Pose.SLIDING); - ENTITY_POSE_CONVERTER.put(EntityPose.SHOOTING, Entity.Pose.SHOOTING); - ENTITY_POSE_CONVERTER.put(EntityPose.INHALING, Entity.Pose.INHALING); + ENTITY_POSE_CONVERTER.put(EntityPose.STANDING, net.minestom.server.entity.EntityPose.STANDING); + ENTITY_POSE_CONVERTER.put(EntityPose.FALL_FLYING, net.minestom.server.entity.EntityPose.FALL_FLYING); + ENTITY_POSE_CONVERTER.put(EntityPose.SLEEPING, net.minestom.server.entity.EntityPose.SLEEPING); + ENTITY_POSE_CONVERTER.put(EntityPose.SWIMMING, net.minestom.server.entity.EntityPose.SWIMMING); + ENTITY_POSE_CONVERTER.put(EntityPose.SPIN_ATTACK, net.minestom.server.entity.EntityPose.SPIN_ATTACK); + ENTITY_POSE_CONVERTER.put(EntityPose.CROUCHING, net.minestom.server.entity.EntityPose.SNEAKING); + ENTITY_POSE_CONVERTER.put(EntityPose.LONG_JUMPING, net.minestom.server.entity.EntityPose.LONG_JUMPING); + ENTITY_POSE_CONVERTER.put(EntityPose.DYING, net.minestom.server.entity.EntityPose.DYING); + ENTITY_POSE_CONVERTER.put(EntityPose.CROAKING, net.minestom.server.entity.EntityPose.CROAKING); + ENTITY_POSE_CONVERTER.put(EntityPose.USING_TONGUE, net.minestom.server.entity.EntityPose.USING_TONGUE); + ENTITY_POSE_CONVERTER.put(EntityPose.ROARING, net.minestom.server.entity.EntityPose.ROARING); + ENTITY_POSE_CONVERTER.put(EntityPose.SNIFFING, net.minestom.server.entity.EntityPose.SNIFFING); + ENTITY_POSE_CONVERTER.put(EntityPose.EMERGING, net.minestom.server.entity.EntityPose.EMERGING); + ENTITY_POSE_CONVERTER.put(EntityPose.DIGGING, net.minestom.server.entity.EntityPose.DIGGING); + ENTITY_POSE_CONVERTER.put(EntityPose.SLIDING, net.minestom.server.entity.EntityPose.SLIDING); + ENTITY_POSE_CONVERTER.put(EntityPose.SHOOTING, net.minestom.server.entity.EntityPose.SHOOTING); + ENTITY_POSE_CONVERTER.put(EntityPose.INHALING, net.minestom.server.entity.EntityPose.INHALING); // associate hands with their respective minestom lib enum - HAND_CONVERTER = new EnumMap<>(Player.Hand.class); - HAND_CONVERTER.put(Player.Hand.MAIN, InteractNpcEvent.Hand.MAIN_HAND); - HAND_CONVERTER.put(Player.Hand.OFF, InteractNpcEvent.Hand.OFF_HAND); + HAND_CONVERTER = new EnumMap<>(PlayerHand.class); + HAND_CONVERTER.put(PlayerHand.MAIN, InteractNpcEvent.Hand.MAIN_HAND); + HAND_CONVERTER.put(PlayerHand.OFF, InteractNpcEvent.Hand.OFF_HAND); // associate animations with their respective minestom lib enum ANIMATION_CONVERTER = new EnumMap<>(EntityAnimation.class); @@ -155,7 +154,7 @@ public final class MinestomProtocolAdapter implements PlatformPacketAdapter(1); //noinspection SuspiciousMethodCalls SERIALIZER_CONVERTERS.put(EntityPose.class, new AbstractMap.SimpleImmutableEntry<>( - Entity.Pose.class, + net.minestom.server.entity.EntityPose.class, ENTITY_POSE_CONVERTER::get)); SERIALIZER_CONVERTERS.put( TypeFactory.parameterizedClass(Optional.class, Component.class), @@ -183,7 +182,9 @@ public final class MinestomProtocolAdapter implements PlatformPacketAdapter Metadata.Float((float) value)); META_ENTRY_FACTORY.put(boolean.class, value -> Metadata.Boolean((boolean) value)); META_ENTRY_FACTORY.put(String.class, value -> Metadata.String((String) value)); - META_ENTRY_FACTORY.put(Entity.Pose.class, value -> Metadata.Pose((Entity.Pose) value)); + META_ENTRY_FACTORY.put( + net.minestom.server.entity.EntityPose.class, + value -> Metadata.Pose((net.minestom.server.entity.EntityPose) value)); //noinspection unchecked META_ENTRY_FACTORY.put( OPTIONAL_CHAT_COMPONENT_TYPE, @@ -275,7 +276,8 @@ private MinestomProtocolAdapter() { 20, GameMode.CREATIVE, null, - null + null, + 0 ))); player.sendPacket(updatePacket); });