Skip to content

Commit 5e9b9df

Browse files
derklaroderklaro
committed
chore: update dependencies, update to minestom 1.21.3
1 parent e678403 commit 5e9b9df

File tree

2 files changed

+33
-31
lines changed

2 files changed

+33
-31
lines changed

‎gradle/libs.versions.toml

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -3,18 +3,18 @@
33
# plugins
44
spotless = "7.0.0.BETA4"
55
nexusPublish = "2.0.0"
6-
checkstyleTools = "10.20.1"
6+
checkstyleTools = "10.20.2"
77

88
# general
99
gson = "2.11.0"
1010
geantyref = "1.3.16"
1111
annotations = "26.0.1"
12-
netty = "4.1.114.Final"
12+
netty = "4.1.115.Final"
1313

1414
# platform api versions
1515
sponge = "10.0.0"
16-
minestom = "f71ab6d851"
17-
paper = "1.21.3-R0.1-SNAPSHOT"
16+
minestom = "d760a60a5c"
17+
paper = "1.21.4-R0.1-SNAPSHOT"
1818

1919
# platform extensions
2020
paperLib = "1.0.8"

‎minestom/src/main/java/com/github/juliarn/npclib/minestom/protocol/MinestomProtocolAdapter.java

Lines changed: 29 additions & 27 deletions
Original file line numberDiff line numberDiff line change
@@ -58,12 +58,12 @@
5858
import net.kyori.adventure.text.serializer.legacy.LegacyComponentSerializer;
5959
import net.minestom.server.MinecraftServer;
6060
import net.minestom.server.coordinate.Pos;
61-
import net.minestom.server.entity.Entity;
6261
import net.minestom.server.entity.EntityType;
6362
import net.minestom.server.entity.EquipmentSlot;
6463
import net.minestom.server.entity.GameMode;
6564
import net.minestom.server.entity.Metadata;
6665
import net.minestom.server.entity.Player;
66+
import net.minestom.server.entity.PlayerHand;
6767
import net.minestom.server.event.player.PlayerPacketEvent;
6868
import net.minestom.server.instance.Instance;
6969
import net.minestom.server.item.ItemStack;
@@ -80,7 +80,6 @@
8080
import net.minestom.server.network.packet.server.play.SpawnEntityPacket;
8181
import org.jetbrains.annotations.NotNull;
8282

83-
@SuppressWarnings("UnstableApiUsage")
8483
public final class MinestomProtocolAdapter implements PlatformPacketAdapter<Instance, Player, ItemStack, Object> {
8584

8685
private static final MinestomProtocolAdapter INSTANCE = new MinestomProtocolAdapter();
@@ -90,8 +89,8 @@ public final class MinestomProtocolAdapter implements PlatformPacketAdapter<Inst
9089
net.kyori.adventure.text.Component.class);
9190

9291
private static final EnumMap<ItemSlot, EquipmentSlot> ITEM_SLOT_CONVERTER;
93-
private static final EnumMap<EntityPose, Entity.Pose> ENTITY_POSE_CONVERTER;
94-
private static final EnumMap<Player.Hand, InteractNpcEvent.Hand> HAND_CONVERTER;
92+
private static final EnumMap<EntityPose, net.minestom.server.entity.EntityPose> ENTITY_POSE_CONVERTER;
93+
private static final EnumMap<PlayerHand, InteractNpcEvent.Hand> HAND_CONVERTER;
9594
private static final EnumMap<EntityAnimation, EntityAnimationPacket.Animation> ANIMATION_CONVERTER;
9695

9796
private static final Map<Type, Function<Object, Metadata.Entry<?>>> META_ENTRY_FACTORY;
@@ -117,28 +116,28 @@ public final class MinestomProtocolAdapter implements PlatformPacketAdapter<Inst
117116

118117
// associate entity poses with their respective minestom lib enum
119118
ENTITY_POSE_CONVERTER = new EnumMap<>(EntityPose.class);
120-
ENTITY_POSE_CONVERTER.put(EntityPose.STANDING, Entity.Pose.STANDING);
121-
ENTITY_POSE_CONVERTER.put(EntityPose.FALL_FLYING, Entity.Pose.FALL_FLYING);
122-
ENTITY_POSE_CONVERTER.put(EntityPose.SLEEPING, Entity.Pose.SLEEPING);
123-
ENTITY_POSE_CONVERTER.put(EntityPose.SWIMMING, Entity.Pose.SWIMMING);
124-
ENTITY_POSE_CONVERTER.put(EntityPose.SPIN_ATTACK, Entity.Pose.SPIN_ATTACK);
125-
ENTITY_POSE_CONVERTER.put(EntityPose.CROUCHING, Entity.Pose.SNEAKING);
126-
ENTITY_POSE_CONVERTER.put(EntityPose.LONG_JUMPING, Entity.Pose.LONG_JUMPING);
127-
ENTITY_POSE_CONVERTER.put(EntityPose.DYING, Entity.Pose.DYING);
128-
ENTITY_POSE_CONVERTER.put(EntityPose.CROAKING, Entity.Pose.CROAKING);
129-
ENTITY_POSE_CONVERTER.put(EntityPose.USING_TONGUE, Entity.Pose.USING_TONGUE);
130-
ENTITY_POSE_CONVERTER.put(EntityPose.ROARING, Entity.Pose.ROARING);
131-
ENTITY_POSE_CONVERTER.put(EntityPose.SNIFFING, Entity.Pose.SNIFFING);
132-
ENTITY_POSE_CONVERTER.put(EntityPose.EMERGING, Entity.Pose.EMERGING);
133-
ENTITY_POSE_CONVERTER.put(EntityPose.DIGGING, Entity.Pose.DIGGING);
134-
ENTITY_POSE_CONVERTER.put(EntityPose.SLIDING, Entity.Pose.SLIDING);
135-
ENTITY_POSE_CONVERTER.put(EntityPose.SHOOTING, Entity.Pose.SHOOTING);
136-
ENTITY_POSE_CONVERTER.put(EntityPose.INHALING, Entity.Pose.INHALING);
119+
ENTITY_POSE_CONVERTER.put(EntityPose.STANDING, net.minestom.server.entity.EntityPose.STANDING);
120+
ENTITY_POSE_CONVERTER.put(EntityPose.FALL_FLYING, net.minestom.server.entity.EntityPose.FALL_FLYING);
121+
ENTITY_POSE_CONVERTER.put(EntityPose.SLEEPING, net.minestom.server.entity.EntityPose.SLEEPING);
122+
ENTITY_POSE_CONVERTER.put(EntityPose.SWIMMING, net.minestom.server.entity.EntityPose.SWIMMING);
123+
ENTITY_POSE_CONVERTER.put(EntityPose.SPIN_ATTACK, net.minestom.server.entity.EntityPose.SPIN_ATTACK);
124+
ENTITY_POSE_CONVERTER.put(EntityPose.CROUCHING, net.minestom.server.entity.EntityPose.SNEAKING);
125+
ENTITY_POSE_CONVERTER.put(EntityPose.LONG_JUMPING, net.minestom.server.entity.EntityPose.LONG_JUMPING);
126+
ENTITY_POSE_CONVERTER.put(EntityPose.DYING, net.minestom.server.entity.EntityPose.DYING);
127+
ENTITY_POSE_CONVERTER.put(EntityPose.CROAKING, net.minestom.server.entity.EntityPose.CROAKING);
128+
ENTITY_POSE_CONVERTER.put(EntityPose.USING_TONGUE, net.minestom.server.entity.EntityPose.USING_TONGUE);
129+
ENTITY_POSE_CONVERTER.put(EntityPose.ROARING, net.minestom.server.entity.EntityPose.ROARING);
130+
ENTITY_POSE_CONVERTER.put(EntityPose.SNIFFING, net.minestom.server.entity.EntityPose.SNIFFING);
131+
ENTITY_POSE_CONVERTER.put(EntityPose.EMERGING, net.minestom.server.entity.EntityPose.EMERGING);
132+
ENTITY_POSE_CONVERTER.put(EntityPose.DIGGING, net.minestom.server.entity.EntityPose.DIGGING);
133+
ENTITY_POSE_CONVERTER.put(EntityPose.SLIDING, net.minestom.server.entity.EntityPose.SLIDING);
134+
ENTITY_POSE_CONVERTER.put(EntityPose.SHOOTING, net.minestom.server.entity.EntityPose.SHOOTING);
135+
ENTITY_POSE_CONVERTER.put(EntityPose.INHALING, net.minestom.server.entity.EntityPose.INHALING);
137136

138137
// associate hands with their respective minestom lib enum
139-
HAND_CONVERTER = new EnumMap<>(Player.Hand.class);
140-
HAND_CONVERTER.put(Player.Hand.MAIN, InteractNpcEvent.Hand.MAIN_HAND);
141-
HAND_CONVERTER.put(Player.Hand.OFF, InteractNpcEvent.Hand.OFF_HAND);
138+
HAND_CONVERTER = new EnumMap<>(PlayerHand.class);
139+
HAND_CONVERTER.put(PlayerHand.MAIN, InteractNpcEvent.Hand.MAIN_HAND);
140+
HAND_CONVERTER.put(PlayerHand.OFF, InteractNpcEvent.Hand.OFF_HAND);
142141

143142
// associate animations with their respective minestom lib enum
144143
ANIMATION_CONVERTER = new EnumMap<>(EntityAnimation.class);
@@ -155,7 +154,7 @@ public final class MinestomProtocolAdapter implements PlatformPacketAdapter<Inst
155154
SERIALIZER_CONVERTERS = new HashMap<>(1);
156155
//noinspection SuspiciousMethodCalls
157156
SERIALIZER_CONVERTERS.put(EntityPose.class, new AbstractMap.SimpleImmutableEntry<>(
158-
Entity.Pose.class,
157+
net.minestom.server.entity.EntityPose.class,
159158
ENTITY_POSE_CONVERTER::get));
160159
SERIALIZER_CONVERTERS.put(
161160
TypeFactory.parameterizedClass(Optional.class, Component.class),
@@ -183,7 +182,9 @@ public final class MinestomProtocolAdapter implements PlatformPacketAdapter<Inst
183182
META_ENTRY_FACTORY.put(float.class, value -> Metadata.Float((float) value));
184183
META_ENTRY_FACTORY.put(boolean.class, value -> Metadata.Boolean((boolean) value));
185184
META_ENTRY_FACTORY.put(String.class, value -> Metadata.String((String) value));
186-
META_ENTRY_FACTORY.put(Entity.Pose.class, value -> Metadata.Pose((Entity.Pose) value));
185+
META_ENTRY_FACTORY.put(
186+
net.minestom.server.entity.EntityPose.class,
187+
value -> Metadata.Pose((net.minestom.server.entity.EntityPose) value));
187188
//noinspection unchecked
188189
META_ENTRY_FACTORY.put(
189190
OPTIONAL_CHAT_COMPONENT_TYPE,
@@ -275,7 +276,8 @@ private MinestomProtocolAdapter() {
275276
20,
276277
GameMode.CREATIVE,
277278
null,
278-
null
279+
null,
280+
0
279281
)));
280282
player.sendPacket(updatePacket);
281283
});

0 commit comments

Comments
 (0)