packetevents release 2.9.4

This reverts commit cfb054b8b2.

CHANGELOG.md

@@ -1,3 +1,85 @@
+!!!!! v2.9.4
+
+# PacketEvents 2.9.4 is out now! 🎉
+
+This update includes minor bug fixes & minor additions to the API.
+
+# Brief Announcement 📢⚠️
+
+### We have our very own website: https://packetevents.com
+
+### Documentation: https://docs.packetevents.com
+
+### JavaDocs: https://javadocs.packetevents.com
+
+## What's Changed (Summary)
+
+* Added SpigotConversionUtil#getEntityMetadata to retrieve metadata from a Bukkit entity.
+* Fixed outdated 1.8 Spigot forks from being unable to load on PacketEvents.
+* Fixed WrapperPlayServerWorldBorder for versions lower than 1.12.
+
+**View Full Changelog**: https://github.com/retrooper/packetevents/compare/v2.9.3...v2.9.4
+
+## If you want to support PacketEvents, consider sponsoring us on [GitHub Sponsors](https://github.com/sponsors/retrooper)
+
+## Maven/Gradle Dependency
+
+### **Check out**: https://docs.packetevents.com/getting-started
+
+!!!!! v2.9.3
+
+# PacketEvents 2.9.3 is out now! 🎉
+
+This is an update that adds support for Minecraft 1.21.8 server builds.
+
+# Brief Announcement 📢⚠️
+
+### We have our very own website: https://packetevents.com
+
+### Documentation: https://docs.packetevents.com
+
+### JavaDocs: https://javadocs.packetevents.com
+
+## What's Changed (Summary)
+
+* Added support for 1.21.8 Minecraft server builds.
+
+**View Full Changelog**: https://github.com/retrooper/packetevents/compare/v2.9.2...v2.9.3
+
+## If you want to support PacketEvents, consider sponsoring us on [GitHub Sponsors](https://github.com/sponsors/retrooper)
+
+## Maven/Gradle Dependency
+
+### **Check out**: https://docs.packetevents.com/getting-started
+
+!!!!! v2.9.2
+
+# PacketEvents 2.9.2 is out now! 🎉
+
+This is a patch update that fixes issues with UserLoginEvent (which previously contained null user data) and with importing Adventure serializers.
+
+# Brief Announcement 📢⚠️
+
+### We have our very own website: https://packetevents.com
+
+### Documentation: https://docs.packetevents.com
+
+### JavaDocs: https://javadocs.packetevents.com
+
+## What's Changed (Summary)
+
+* Added support for 1.7.2+ Minecraft protocol (useful for proxies)
+* Fixed UserLoginEvent. It is now (always) triggered by PlayerJoinEvent to prevent User instances from containing null data.
+* Fixed importing Adventure serializers.
+
+**View Full Changelog**: https://github.com/retrooper/packetevents/compare/v2.9.1...v2.9.2
+
+## If you want to support PacketEvents, consider sponsoring us on [GitHub Sponsors](https://github.com/sponsors/retrooper)
+
+## Maven/Gradle Dependency
+
+### **Check out**: https://docs.packetevents.com/getting-started
+
 !!!!! v2.9.1
 
 # PacketEvents 2.9.1 is out now! 🎉
@@ -97,76 +179,6 @@ This update wouldn't be possible without these contributors ❤️: @booky10, @A
 
 ## Maven/Gradle Dependency
 
-### **Check out**: https://docs.packetevents.com/getting-started
-!!!!! v2.9.0
-
-# PacketEvents 2.9.0 is out now! 🎉
-
-### New update now supports Minecraft version 1.21.6 & 1.21.7. We suggest that you update, as numerous bugs have been fixed.
-
-# Brief Announcement 📢⚠️
-
-### We have our very own website: https://packetevents.com
-
-### Documentation: https://docs.packetevents.com
-
-### JavaDocs: https://javadocs.packetevents.com
-
-## What's Changed? (Summary)
-
-* Added 1.21.6 support
-* Added 1.21.7 support
-* Bug fixes
-
-**View Full Changelog**: https://github.com/retrooper/packetevents/compare/v2.8.0...v2.9.0
-
-## If you want to support PacketEvents, consider sponsoring us on [GitHub Sponsors](https://github.com/sponsors/retrooper)
-
-## Maven/Gradle Dependency
-
-### **Check out**: https://docs.packetevents.com/getting-started
-
-!!!!! v2.8.0
-
-# PacketEvents 2.8.0 is out now! 🎉
-
-### New update now supports Minecraft version 1.21.5. Please update, as numerous bugs have been fixed.
-
-# Brief Announcement 📢⚠️
-
-### We have our very own website: https://packetevents.com
-
-### Documentation: https://docs.packetevents.com
-
-### JavaDocs: https://javadocs.packetevents.com
-
-## What's Changed? (Summary)
-
-* Added 1.21.5 support
-* Various bugs fixed
-
-**View Full Changelog**: https://github.com/retrooper/packetevents/compare/v2.7.0...v2.8.0
-
-## Contributors 🏅
-
-This update wouldn't be possible without these contributors ❤️: @booky10, @Axionize, @Bram1903, @ManInMyVan, @ytnoos,
-@AoElite, @HaHaWTH, @divinepablo, @scienziatopazzo, @bridgelol, @MachineBreaker, @Luuzzi, @Beaness, @Rubenicos, @Loyisa
-
-## New Contributors
-
-* @HaHaWTH made their first contribution in https://github.com/retrooper/packetevents/pull/1097
-* @divinepablo made their first contribution in https://github.com/retrooper/packetevents/pull/1098
-* @scienziatopazzo made their first contribution in https://github.com/retrooper/packetevents/pull/1105
-* @bridgelol made their first contribution in https://github.com/retrooper/packetevents/pull/1199
-* @Luuzzi made their first contribution in https://github.com/retrooper/packetevents/pull/1197
-* @Beaness made their first contribution in https://github.com/retrooper/packetevents/pull/1212
-* @Rubenicos made their first contribution in https://github.com/retrooper/packetevents/pull/1162
-* @Loyisa made their first contribution in https://github.com/retrooper/packetevents/pull/1220
-
-## If you want to support PacketEvents, consider sponsoring us on [GitHub Sponsors](https://github.com/sponsors/retrooper)
-
-## Maven/Gradle Dependency
-
 ### **Check out**: https://docs.packetevents.com/getting-started
 
 !!!!! v2.7.0

api/src/main/java/com/github/retrooper/packetevents/manager/server/ServerVersion.java

@@ -32,7 +32,8 @@ import org.jetbrains.annotations.NotNull;
  */
 public enum ServerVersion {
     //TODO Rename to MinecraftVersion?
-    V_1_7_10(5),
+    V_1_7_2(4), V_1_7_4(4), V_1_7_5(4),
+    V_1_7_6(5), V_1_7_7(5), V_1_7_8(5), V_1_7_9(5), V_1_7_10(5),
     V_1_8(47), V_1_8_3(47), V_1_8_8(47),
     V_1_9(107), V_1_9_1(108), V_1_9_2(109), V_1_9_4(110),
     //1.10 and 1.10.1 are redundant
@@ -50,7 +51,7 @@ public enum ServerVersion {
     //1.20 and 1.20.1 have the same protocol version. 1.20.3 and 1.20.4 have the same protocol version. 1.20.5 and 1.20.6 have the same protocol version
     V_1_20(763), V_1_20_1(763), V_1_20_2(764), V_1_20_3(765), V_1_20_4(765), V_1_20_5(766), V_1_20_6(766),
     //1.21 and 1.21.1 have the same protocol version. 1.21.2 and 1.21.3 have the same protocol version
-    V_1_21(767), V_1_21_1(767), V_1_21_2(768), V_1_21_3(768), V_1_21_4(769), V_1_21_5(770), V_1_21_6(771), V_1_21_7(772),
+    V_1_21(767), V_1_21_1(767), V_1_21_2(768), V_1_21_3(768), V_1_21_4(769), V_1_21_5(770), V_1_21_6(771), V_1_21_7(772), V_1_21_8(772),
     //TODO UPDATE Add server version constant
     ERROR(-1, true);
 

api/src/main/java/com/github/retrooper/packetevents/protocol/packettype/PacketType.java

@@ -206,7 +206,7 @@ public final class PacketType {
 
     //TODO UPDATE Update packet type mappings (clientbound pt. 1)
     private static final VersionMapper CLIENTBOUND_PLAY_VERSION_MAPPER = new VersionMapper(
-            ClientVersion.V_1_7_10,
+            ClientVersion.V_1_7_2,
             ClientVersion.V_1_8,
             ClientVersion.V_1_9,
             ClientVersion.V_1_10,
@@ -235,7 +235,7 @@ public final class PacketType {
 
     //TODO UPDATE Update packet type mappings (serverbound pt. 1)
     private static final VersionMapper SERVERBOUND_PLAY_VERSION_MAPPER = new VersionMapper(
-            ClientVersion.V_1_7_10,
+            ClientVersion.V_1_7_2,
             ClientVersion.V_1_8,
             ClientVersion.V_1_9,
             ClientVersion.V_1_12,

api/src/main/java/com/github/retrooper/packetevents/protocol/player/ClientVersion.java

@@ -39,6 +39,7 @@ import java.util.List;
  * @since 1.6.9
  */
 public enum ClientVersion {
+    V_1_7_2(4),
     V_1_7_10(5),
 
     V_1_8(47),
@@ -111,7 +112,7 @@ public enum ClientVersion {
     //TODO UPDATE Add new protocol version field
 
     @Deprecated
-    LOWER_THAN_SUPPORTED_VERSIONS(V_1_7_10.protocolVersion - 1, true),
+    LOWER_THAN_SUPPORTED_VERSIONS(V_1_7_2.protocolVersion - 1, true),
     //TODO UPDATE Update HIGHER_THAN_SUPPORTED_VERSIONS field
     @Deprecated
     HIGHER_THAN_SUPPORTED_VERSIONS(V_1_21_7.protocolVersion + 1, true),

api/src/main/java/com/github/retrooper/packetevents/protocol/world/chunk/impl/v1_7/Chunk_v1_7.java

@@ -18,11 +18,9 @@
 
 package com.github.retrooper.packetevents.protocol.world.chunk.impl.v1_7;
 
-import com.github.retrooper.packetevents.protocol.player.ClientVersion;
 import com.github.retrooper.packetevents.protocol.world.chunk.BaseChunk;
 import com.github.retrooper.packetevents.protocol.world.chunk.ByteArray3d;
 import com.github.retrooper.packetevents.protocol.world.chunk.NibbleArray3d;
-import com.github.retrooper.packetevents.protocol.world.states.WrappedBlockState;
 
 public class Chunk_v1_7 implements BaseChunk {
     private final ByteArray3d blocks;
@@ -45,13 +43,21 @@ public class Chunk_v1_7 implements BaseChunk {
 
     @Override
     public int getBlockId(int x, int y, int z) {
-        return blocks.get(x, y, z) | (extendedBlocks.get(x, y, z) << 12);
+        int blockId = (blocks.get(x, y, z) & 0xFF) << 4;
+        blockId |= metadata.get(x, y, z) & 0xF;
+        if (extendedBlocks != null) {
+            blockId |= (extendedBlocks.get(x, y, z) & 0xF) << 8;
+        }
+        return blockId;
     }
 
     @Override
     public void set(int x, int y, int z, int combinedID) {
-        blocks.set(x, y, z, combinedID & 0xFF);
-        extendedBlocks.set(x, y, z, combinedID >> 12);
+        blocks.set(x, y, z, (combinedID >> 4) & 0xFF);
+        metadata.set(x, y, z, combinedID & 0xF);
+        if (extendedBlocks != null) {
+            extendedBlocks.set(x, y, z, (combinedID >> 8) & 0xF);
+        }
     }
 
     @Override

api/src/main/java/com/github/retrooper/packetevents/protocol/world/states/WrappedBlockState.java

@@ -561,6 +561,16 @@ public class WrappedBlockState {
         return type;
     }
 
+    public Object getData(StateValue stateValue) {
+        return data.get(stateValue);
+    }
+
+    public void setData(StateValue stateValue, Object object) {
+        checkIfCloneNeeded();
+        data.put(stateValue, object);
+        checkIsStillValid();
+    }
+
     // Begin all block data types
     public int getAge() {
         return (int) data.get(StateValue.AGE);

api/src/main/java/com/github/retrooper/packetevents/wrapper/PacketWrapper.java

@@ -1362,6 +1362,18 @@ public class PacketWrapper<T extends PacketWrapper<T>> {
 
     public <K, C extends Collection<K>> C readCollection(IntFunction<C> function, Reader<K> reader) {
         int size = this.readVarInt();
+        return _readCollection(function, reader, size);
+    }
+
+    public <K, C extends Collection<K>> C readCollection(IntFunction<C> function, Reader<K> reader, int maxSize) {
+        int size = this.readVarInt();
+        if (size > maxSize) {
+            throw new RuntimeException(size + " elements exceeded max size of: " + maxSize);
+        }
+        return _readCollection(function, reader, size);
+    }
+
+    private <K, C extends Collection<K>> C _readCollection(IntFunction<C> function, Reader<K> reader, int size) {
         Collection<K> collection = function.apply(size);
         for (int i = 0; i < size; ++i) {
             collection.add(reader.apply(this));
@@ -1380,6 +1392,10 @@ public class PacketWrapper<T extends PacketWrapper<T>> {
         return this.readCollection(ArrayList::new, reader);
     }
 
+    public <K> List<K> readList(Reader<K> reader, int maxSize) {
+        return this.readCollection(ArrayList::new, reader, maxSize);
+    }
+
     public <K> void writeList(List<K> list, Writer<K> writer) {
         writeVarInt(list.size());
         for (K key : list) {

api/src/main/java/com/github/retrooper/packetevents/wrapper/common/client/WrapperCommonClientSettings.java

@@ -76,7 +76,7 @@ public class WrapperCommonClientSettings<T extends WrapperCommonClientSettings<T
         this.viewDistance = this.readByte();
         this.chatVisibility = this.readEnum(ChatVisibility.values());
         this.chatColors = this.readBoolean();
-        if (this.serverVersion == ServerVersion.V_1_7_10) {
+        if (this.serverVersion.isOlderThanOrEquals(ServerVersion.V_1_7_10)) {
             this.ignoredDifficulty = this.readByte();
             if (this.readBoolean()) { // show cape
                 this.skinMask = SkinSection.CAPE.getMask();
@@ -98,7 +98,7 @@ public class WrapperCommonClientSettings<T extends WrapperCommonClientSettings<T
         this.writeByte(this.viewDistance);
         this.writeEnum(this.chatVisibility);
         this.writeBoolean(this.chatColors);
-        if (this.serverVersion == ServerVersion.V_1_7_10) {
+        if (this.serverVersion.isOlderThanOrEquals(ServerVersion.V_1_7_10)) {
             this.writeByte(this.ignoredDifficulty);
             this.writeBoolean(SkinSection.CAPE.isSet(this.skinMask));
         } else {

api/src/main/java/com/github/retrooper/packetevents/wrapper/play/client/WrapperPlayClientAnimation.java

@@ -64,7 +64,7 @@ public class WrapperPlayClientAnimation extends PacketWrapper<WrapperPlayClientA
     /**
      * Hand used for the animation.
      * On {@link ClientVersion#V_1_9}, an off-hand was introduced and specifies which arm has been swung.
-     * For {@link ClientVersion#V_1_8} and {@link ClientVersion#V_1_7_10} clients only have a main hand.
+     * For {@link ClientVersion#V_1_8} and {@link ClientVersion#V_1_7_2} clients only have a main hand.
      *
      * @return Hand
      */
@@ -75,7 +75,7 @@ public class WrapperPlayClientAnimation extends PacketWrapper<WrapperPlayClientA
     /**
      * Modify the hand used for the animation.
      * On {@link ClientVersion#V_1_9}, an off-hand was introduced and specifies which arm has been swung.
-     * For {@link ClientVersion#V_1_8} and {@link ClientVersion#V_1_7_10} clients only have a main hand.
+     * For {@link ClientVersion#V_1_8} and {@link ClientVersion#V_1_7_2} clients only have a main hand.
      * Modifying the hand on 1.8 and 1.7 clients is redundant.
      *
      * @param interactionHand Hand used for the animation

api/src/main/java/com/github/retrooper/packetevents/wrapper/play/client/WrapperPlayClientEntityAction.java

@@ -106,7 +106,8 @@ public class WrapperPlayClientEntityAction extends PacketWrapper<WrapperPlayClie
             @Override
             public int getId(ServerVersion version) {
                 return version.isNewerThanOrEquals(ServerVersion.V_1_21_6)
-                        ? -1 : this.ordinal();
+                        ? -1 : version.isOlderThanOrEquals(ServerVersion.V_1_7_10)
+                        ? 1 : this.ordinal();
             }
         },
         /**
@@ -117,7 +118,8 @@ public class WrapperPlayClientEntityAction extends PacketWrapper<WrapperPlayClie
             @Override
             public int getId(ServerVersion version) {
                 return version.isNewerThanOrEquals(ServerVersion.V_1_21_6)
-                        ? -1 : this.ordinal();
+                        ? -1 : version.isOlderThanOrEquals(ServerVersion.V_1_7_10)
+                        ? 2 : this.ordinal();
             }
         },
         LEAVE_BED {
@@ -126,7 +128,7 @@ public class WrapperPlayClientEntityAction extends PacketWrapper<WrapperPlayClie
                 if (version.isNewerThanOrEquals(ServerVersion.V_1_21_6)) {
                     return this.ordinal() - 2;
                 }
-                return this.ordinal();
+                return version.isOlderThanOrEquals(ServerVersion.V_1_7_10) ? 3 : this.ordinal();
             }
         },
         START_SPRINTING {
@@ -135,7 +137,7 @@ public class WrapperPlayClientEntityAction extends PacketWrapper<WrapperPlayClie
                 if (version.isNewerThanOrEquals(ServerVersion.V_1_21_6)) {
                     return this.ordinal() - 2;
                 }
-                return this.ordinal();
+                return version.isOlderThanOrEquals(ServerVersion.V_1_7_10) ? 4 : this.ordinal();
             }
         },
         STOP_SPRINTING {
@@ -144,7 +146,7 @@ public class WrapperPlayClientEntityAction extends PacketWrapper<WrapperPlayClie
                 if (version.isNewerThanOrEquals(ServerVersion.V_1_21_6)) {
                     return this.ordinal() - 2;
                 }
-                return this.ordinal();
+                return version.isOlderThanOrEquals(ServerVersion.V_1_7_10) ? 5 : this.ordinal();
             }
         },
         START_JUMPING_WITH_HORSE {
@@ -153,7 +155,8 @@ public class WrapperPlayClientEntityAction extends PacketWrapper<WrapperPlayClie
                 if (version.isNewerThanOrEquals(ServerVersion.V_1_21_6)) {
                     return this.ordinal() - 2;
                 }
-                return this.ordinal();
+                return version.isOlderThanOrEquals(ServerVersion.V_1_7_10) ?
+                        (version.isOlderThanOrEquals(ServerVersion.V_1_7_5) ? -1 : 6) : this.ordinal();
             }
         },
         /**

api/src/main/java/com/github/retrooper/packetevents/wrapper/play/client/WrapperPlayClientInteractEntity.java

@@ -54,7 +54,7 @@ public class WrapperPlayClientInteractEntity extends PacketWrapper<WrapperPlayCl
 
     @Override
     public void read() {
-        if (serverVersion == ServerVersion.V_1_7_10) {
+        if (this.serverVersion.isOlderThanOrEquals(ServerVersion.V_1_7_10)) {
             this.entityID = readInt();
             byte typeIndex = readByte();
             this.interactAction = InteractAction.VALUES[typeIndex];
@@ -91,7 +91,7 @@ public class WrapperPlayClientInteractEntity extends PacketWrapper<WrapperPlayCl
 
     @Override
     public void write() {
-        if (serverVersion == ServerVersion.V_1_7_10) {
+        if (this.serverVersion.isOlderThanOrEquals(ServerVersion.V_1_7_10)) {
             writeInt(entityID);
             writeByte(interactAction.ordinal());
         } else {

api/src/main/java/com/github/retrooper/packetevents/wrapper/play/client/WrapperPlayClientPlayerBlockPlacement.java

@@ -86,7 +86,7 @@ public class WrapperPlayClientPlayerBlockPlacement extends PacketWrapper<Wrapper
                 sequence = readVarInt();
             }
         } else {
-            if (serverVersion == ServerVersion.V_1_7_10) {
+            if (this.serverVersion.isOlderThanOrEquals(ServerVersion.V_1_7_10)) {
                 blockPosition = new Vector3i(readInt(), readUnsignedByte(), readInt());
             } else {
                 blockPosition = readBlockPosition();
@@ -127,7 +127,7 @@ public class WrapperPlayClientPlayerBlockPlacement extends PacketWrapper<Wrapper
                 writeVarInt(sequence);
             }
         } else {
-            if (serverVersion == ServerVersion.V_1_7_10) {
+            if (this.serverVersion.isOlderThanOrEquals(ServerVersion.V_1_7_10)) {
                 writeInt(blockPosition.x);
                 writeByte(blockPosition.y);
                 writeInt(blockPosition.z);

api/src/main/java/com/github/retrooper/packetevents/wrapper/play/client/WrapperPlayClientPlayerFlying.java

@@ -72,7 +72,7 @@ public class WrapperPlayClientPlayerFlying extends PacketWrapper<WrapperPlayClie
         if (positionChanged) {
             double x = readDouble();
             double y = readDouble();
-            if (serverVersion == ServerVersion.V_1_7_10) {
+            if (this.serverVersion.isOlderThanOrEquals(ServerVersion.V_1_7_10)) {
                 //Can be ignored, cause stance = (y + 1.62)
                 double stance = readDouble();
             }
@@ -93,7 +93,7 @@ public class WrapperPlayClientPlayerFlying extends PacketWrapper<WrapperPlayClie
     public void write() {
         if (positionChanged) {
             writeDouble(location.getPosition().getX());
-            if (serverVersion == ServerVersion.V_1_7_10) {
+            if (this.serverVersion.isOlderThanOrEquals(ServerVersion.V_1_7_10)) {
                 //Can be ignored, cause stance = (y + 1.62)
                 writeDouble(location.getPosition().getY() + 1.62);
             }

api/src/main/java/com/github/retrooper/packetevents/wrapper/play/client/WrapperPlayClientPluginMessage.java

@@ -58,7 +58,7 @@ public class WrapperPlayClientPluginMessage extends PacketWrapper<WrapperPlayCli
             this.channelName = readString(20);
         }
 
-        if (serverVersion == ServerVersion.V_1_7_10) {
+        if (this.serverVersion.isOlderThanOrEquals(ServerVersion.V_1_7_10)) {
             //It is ignored, because we don't need it
             int legacyDataSize = readShort();
         }
@@ -75,7 +75,7 @@ public class WrapperPlayClientPluginMessage extends PacketWrapper<WrapperPlayCli
         else {
             writeString(this.channelName, 20);
         }
-        if (serverVersion == ServerVersion.V_1_7_10) {
+        if (this.serverVersion.isOlderThanOrEquals(ServerVersion.V_1_7_10)) {
             writeShort(this.data.length);
         }
         writeBytes(this.data);

api/src/main/java/com/github/retrooper/packetevents/wrapper/play/server/WrapperPlayServerBlockAction.java

@@ -45,7 +45,7 @@ public class WrapperPlayServerBlockAction extends PacketWrapper<WrapperPlayServe
 
     @Override
     public void read() {
-        if (serverVersion == ServerVersion.V_1_7_10) {
+        if (this.serverVersion.isOlderThanOrEquals(ServerVersion.V_1_7_10)) {
             int x = readInt();
             int y = readShort();
             int z = readInt();
@@ -60,7 +60,7 @@ public class WrapperPlayServerBlockAction extends PacketWrapper<WrapperPlayServe
 
     @Override
     public void write() {
-        if (serverVersion == ServerVersion.V_1_7_10) {
+        if (this.serverVersion.isOlderThanOrEquals(ServerVersion.V_1_7_10)) {
             writeInt(blockPosition.x);
             writeShort(blockPosition.y);
             writeInt(blockPosition.z);

api/src/main/java/com/github/retrooper/packetevents/wrapper/play/server/WrapperPlayServerBlockBreakAnimation.java

@@ -43,7 +43,7 @@ public class WrapperPlayServerBlockBreakAnimation extends PacketWrapper<WrapperP
     @Override
     public void read() {
         entityID = readVarInt();
-        if (serverVersion == ServerVersion.V_1_7_10) {
+        if (this.serverVersion.isOlderThanOrEquals(ServerVersion.V_1_7_10)) {
             int x = readInt();
             int y = readInt();
             int z = readInt();
@@ -57,7 +57,7 @@ public class WrapperPlayServerBlockBreakAnimation extends PacketWrapper<WrapperP
     @Override
     public void write() {
         writeVarInt(entityID);
-        if (serverVersion == ServerVersion.V_1_7_10) {
+        if (this.serverVersion.isOlderThanOrEquals(ServerVersion.V_1_7_10)) {
             writeInt(blockPosition.x);
             writeInt(blockPosition.y);
             writeInt(blockPosition.z);

api/src/main/java/com/github/retrooper/packetevents/wrapper/play/server/WrapperPlayServerBlockChange.java

@@ -41,7 +41,7 @@ public class WrapperPlayServerBlockChange extends PacketWrapper<WrapperPlayServe
 
     @Override
     public void read() {
-        if (serverVersion == ServerVersion.V_1_7_10) {
+        if (this.serverVersion.isOlderThanOrEquals(ServerVersion.V_1_7_10)) {
             blockPosition = new Vector3i(readInt(), readUnsignedByte(), readInt());
             int block = readVarInt();
             int blockData = readUnsignedByte();
@@ -54,7 +54,7 @@ public class WrapperPlayServerBlockChange extends PacketWrapper<WrapperPlayServe
 
     @Override
     public void write() {
-        if (serverVersion == ServerVersion.V_1_7_10) {
+        if (this.serverVersion.isOlderThanOrEquals(ServerVersion.V_1_7_10)) {
             writeInt(blockPosition.getX());
             writeByte(blockPosition.getY());
             writeInt(blockPosition.getZ());

api/src/main/java/com/github/retrooper/packetevents/wrapper/play/server/WrapperPlayServerCollectItem.java

@@ -41,7 +41,7 @@ public class WrapperPlayServerCollectItem extends PacketWrapper<WrapperPlayServe
 
     @Override
     public void read() {
-        if (serverVersion == ServerVersion.V_1_7_10) {
+        if (this.serverVersion.isOlderThanOrEquals(ServerVersion.V_1_7_10)) {
             collectedEntityId = readInt();
             collectorEntityId = readInt();
         } else {
@@ -55,7 +55,7 @@ public class WrapperPlayServerCollectItem extends PacketWrapper<WrapperPlayServe
 
     @Override
     public void write() {
-        if (serverVersion == ServerVersion.V_1_7_10) {
+        if (this.serverVersion.isOlderThanOrEquals(ServerVersion.V_1_7_10)) {
             writeInt(collectedEntityId);
             writeInt(collectorEntityId);
         } else {

api/src/main/java/com/github/retrooper/packetevents/wrapper/play/server/WrapperPlayServerDestroyEntities.java

@@ -45,7 +45,7 @@ public class WrapperPlayServerDestroyEntities extends PacketWrapper<WrapperPlayS
         if (serverVersion == ServerVersion.V_1_17) {
             entityIDs = new int[]{readVarInt()};
         } else {
-            if (serverVersion == ServerVersion.V_1_7_10) {
+            if (this.serverVersion.isOlderThanOrEquals(ServerVersion.V_1_7_10)) {
                 int entityIDCount = readUnsignedByte();
                 entityIDs = new int[entityIDCount];
                 for (int i = 0; i < entityIDCount; i++) {
@@ -66,7 +66,7 @@ public class WrapperPlayServerDestroyEntities extends PacketWrapper<WrapperPlayS
         if (serverVersion == ServerVersion.V_1_17) {
             writeVarInt(entityIDs[0]);
         } else {
-            if (serverVersion == ServerVersion.V_1_7_10) {
+            if (this.serverVersion.isOlderThanOrEquals(ServerVersion.V_1_7_10)) {
                 writeByte(entityIDs.length);
                 for (int entityID : entityIDs) {
                     writeInt(entityID);

api/src/main/java/com/github/retrooper/packetevents/wrapper/play/server/WrapperPlayServerEntityEquipment.java

@@ -45,7 +45,7 @@ public class WrapperPlayServerEntityEquipment extends PacketWrapper<WrapperPlayS
 
     @Override
     public void read() {
-        if (serverVersion == ServerVersion.V_1_7_10) {
+        if (this.serverVersion.isOlderThanOrEquals(ServerVersion.V_1_7_10)) {
             entityId = readInt();
         } else {
             entityId = readVarInt();
@@ -72,7 +72,7 @@ public class WrapperPlayServerEntityEquipment extends PacketWrapper<WrapperPlayS
 
     @Override
     public void write() {
-        if (serverVersion == ServerVersion.V_1_7_10) {
+        if (this.serverVersion.isOlderThanOrEquals(ServerVersion.V_1_7_10)) {
             writeInt(entityId);
         } else {
             writeVarInt(entityId);

api/src/main/java/com/github/retrooper/packetevents/wrapper/play/server/WrapperPlayServerEntityVelocity.java

@@ -49,7 +49,7 @@ public class WrapperPlayServerEntityVelocity extends PacketWrapper<WrapperPlaySe
 
     @Override
     public void read() {
-        if (serverVersion == ServerVersion.V_1_7_10) {
+        if (this.serverVersion.isOlderThanOrEquals(ServerVersion.V_1_7_10)) {
             entityID = readInt();
         } else {
             entityID = readVarInt();
@@ -62,7 +62,7 @@ public class WrapperPlayServerEntityVelocity extends PacketWrapper<WrapperPlaySe
 
     @Override
     public void write() {
-        if (serverVersion == ServerVersion.V_1_7_10) {
+        if (this.serverVersion.isOlderThanOrEquals(ServerVersion.V_1_7_10)) {
             writeInt(entityID);
         } else {
             writeVarInt(entityID);

api/src/main/java/com/github/retrooper/packetevents/wrapper/play/server/WrapperPlayServerParticle.java

@@ -77,7 +77,7 @@ public class WrapperPlayServerParticle extends PacketWrapper<WrapperPlayServerPa
         int particleTypeId = 0;
         ParticleType<?> particleType = null;
         boolean v1205 = this.serverVersion.isNewerThanOrEquals(ServerVersion.V_1_20_5);
-        if (serverVersion == ServerVersion.V_1_7_10) {
+        if (this.serverVersion.isOlderThanOrEquals(ServerVersion.V_1_7_10)) {
             String particleName = readString(64);
             particleType = ParticleTypes.getByName("minecraft:" + particleName);
         } else if (!v1205) {
@@ -118,7 +118,7 @@ public class WrapperPlayServerParticle extends PacketWrapper<WrapperPlayServerPa
     @Override
     public void write() {
         //TODO on 1.7 we get particle type by 64 len string
-        if (serverVersion == ServerVersion.V_1_7_10) {
+        if (this.serverVersion.isOlderThanOrEquals(ServerVersion.V_1_7_10)) {
             writeString(particle.getType().getName().getKey(), 64);
         } else if (this.serverVersion.isOlderThan(ServerVersion.V_1_20_5)) {
             int id = this.particle.getType().getId(this.serverVersion.toClientVersion());

api/src/main/java/com/github/retrooper/packetevents/wrapper/play/server/WrapperPlayServerPlayerInfo.java

@@ -71,7 +71,7 @@ public class WrapperPlayServerPlayerInfo extends PacketWrapper<WrapperPlayServer
 
     @Override
     public void read() {
-        if (serverVersion == ServerVersion.V_1_7_10) {
+        if (this.serverVersion.isOlderThanOrEquals(ServerVersion.V_1_7_10)) {
             playerDataList = new ArrayList<>(1);
             //Only one player data
             String rawUsername = readString();
@@ -145,7 +145,7 @@ public class WrapperPlayServerPlayerInfo extends PacketWrapper<WrapperPlayServer
 
     @Override
     public void write() {
-        if (serverVersion == ServerVersion.V_1_7_10) {
+        if (this.serverVersion.isOlderThanOrEquals(ServerVersion.V_1_7_10)) {
             //Only one player data can be sent
             PlayerData data = playerDataList.get(0);
             //We must convert the component string to a normal one

api/src/main/java/com/github/retrooper/packetevents/wrapper/play/server/WrapperPlayServerPluginMessage.java

@@ -58,7 +58,7 @@ public class WrapperPlayServerPluginMessage extends PacketWrapper<WrapperPlaySer
         else {
             this.channelName = readString(20);
         }
-        if (serverVersion == ServerVersion.V_1_7_10) {
+        if (serverVersion.isOlderThanOrEquals(ServerVersion.V_1_7_10)) {
             //We ignore this, because it's not needed.
             int legacyDataSize = readShort();
         }
@@ -73,7 +73,7 @@ public class WrapperPlayServerPluginMessage extends PacketWrapper<WrapperPlaySer
         else {
             writeString(this.channelName, 20);
         }
-        if (serverVersion == ServerVersion.V_1_7_10) {
+        if (serverVersion.isOlderThanOrEquals(ServerVersion.V_1_7_10)) {
             writeShort(data.length);
         }
         writeBytes(data);

api/src/main/java/com/github/retrooper/packetevents/wrapper/play/server/WrapperPlayServerSetExperience.java

@@ -42,7 +42,7 @@ public class WrapperPlayServerSetExperience extends PacketWrapper<WrapperPlaySer
     @Override
     public void read() {
         experienceBar = readFloat();
-        if (serverVersion == ServerVersion.V_1_7_10) {
+        if (this.serverVersion.isOlderThanOrEquals(ServerVersion.V_1_7_10)) {
             level = readShort();
             totalExperience = readShort();
         } else {
@@ -54,7 +54,7 @@ public class WrapperPlayServerSetExperience extends PacketWrapper<WrapperPlaySer
     @Override
     public void write() {
         writeFloat(experienceBar);
-        if (serverVersion == ServerVersion.V_1_7_10) {
+        if (this.serverVersion.isOlderThanOrEquals(ServerVersion.V_1_7_10)) {
             writeShort(level);
             writeShort(totalExperience);
         } else {

api/src/main/java/com/github/retrooper/packetevents/wrapper/play/server/WrapperPlayServerSpawnPosition.java

@@ -51,7 +51,7 @@ public class WrapperPlayServerSpawnPosition extends PacketWrapper<WrapperPlaySer
             this.position = new Vector3i(readLong(), this.serverVersion);
         } else {
             int x = readInt();
-            int y = readShort();
+            int y = readInt();
             int z = readInt();
             this.position = new Vector3i(x, y, z);
         }
@@ -67,7 +67,7 @@ public class WrapperPlayServerSpawnPosition extends PacketWrapper<WrapperPlaySer
             writeLong(positionVector);
         } else {
             writeInt(this.position.x);
-            writeShort(this.position.y);
+            writeInt(this.position.y);
             writeInt(this.position.z);
         }
         if (serverVersion.isNewerThanOrEquals(ServerVersion.V_1_17)) {

api/src/main/java/com/github/retrooper/packetevents/wrapper/play/server/WrapperPlayServerTeams.java

@@ -179,7 +179,7 @@ public class WrapperPlayServerTeams extends PacketWrapper<WrapperPlayServerTeams
                 prefix = serializer.deserialize(this.readString(16));
                 suffix = serializer.deserialize(this.readString(16));
                 optionData = OptionData.values()[readByte()];
-                if (serverVersion == ServerVersion.V_1_7_10) {
+                if (this.serverVersion.isOlderThanOrEquals(ServerVersion.V_1_7_10)) {
                     nameTagVisibility = NameTagVisibility.ALWAYS;
                     color = NamedTextColor.WHITE;
                 } else {
@@ -217,7 +217,7 @@ public class WrapperPlayServerTeams extends PacketWrapper<WrapperPlayServerTeams
         players = new ArrayList<>();
         if (teamMode == TeamMode.CREATE || teamMode == TeamMode.ADD_ENTITIES || teamMode == TeamMode.REMOVE_ENTITIES) {
             int size;
-            if (serverVersion == ServerVersion.V_1_7_10) {
+            if (this.serverVersion.isOlderThanOrEquals(ServerVersion.V_1_7_10)) {
                 size = readShort();
             } else {
                 size = readVarInt();
@@ -241,7 +241,7 @@ public class WrapperPlayServerTeams extends PacketWrapper<WrapperPlayServerTeams
                 writeString(LegacyFormat.trimLegacyFormat(serializer.serialize(info.prefix), 16));
                 writeString(LegacyFormat.trimLegacyFormat(serializer.serialize(info.suffix), 16));
                 writeByte(info.optionData.ordinal());
-                if (serverVersion == ServerVersion.V_1_7_10) {
+                if (this.serverVersion.isOlderThanOrEquals(ServerVersion.V_1_7_10)) {
                     writeString(NameTagVisibility.ALWAYS.getId(), 32);
                     writeByte(15);
                 } else {
@@ -274,7 +274,7 @@ public class WrapperPlayServerTeams extends PacketWrapper<WrapperPlayServerTeams
         }
 
         if (teamMode == TeamMode.CREATE || teamMode == TeamMode.ADD_ENTITIES || teamMode == TeamMode.REMOVE_ENTITIES) {
-            if (serverVersion == ServerVersion.V_1_7_10) {
+            if (this.serverVersion.isOlderThanOrEquals(ServerVersion.V_1_7_10)) {
                 writeShort(players.size());
             } else {
                 writeVarInt(players.size());

api/src/main/java/com/github/retrooper/packetevents/wrapper/play/server/WrapperPlayServerUpdateAttributes.java

@@ -83,7 +83,7 @@ public class WrapperPlayServerUpdateAttributes extends PacketWrapper<WrapperPlay
 
     @Override
     public void read() {
-        if (serverVersion == ServerVersion.V_1_7_10) {
+        if (this.serverVersion.isOlderThanOrEquals(ServerVersion.V_1_7_10)) {
             entityID = readInt();
         } else {
             entityID = readVarInt();
@@ -116,7 +116,7 @@ public class WrapperPlayServerUpdateAttributes extends PacketWrapper<WrapperPlay
 
             double value = readDouble();
             int modifiersLength;
-            if (serverVersion == ServerVersion.V_1_7_10) {
+            if (this.serverVersion.isOlderThanOrEquals(ServerVersion.V_1_7_10)) {
                 modifiersLength = readShort();
             } else {
                 modifiersLength = readVarInt();
@@ -144,7 +144,7 @@ public class WrapperPlayServerUpdateAttributes extends PacketWrapper<WrapperPlay
 
     @Override
     public void write() {
-        if (serverVersion == ServerVersion.V_1_7_10) {
+        if (this.serverVersion.isOlderThanOrEquals(ServerVersion.V_1_7_10)) {
             writeInt(entityID);
         } else {
             writeVarInt(entityID);
@@ -167,7 +167,7 @@ public class WrapperPlayServerUpdateAttributes extends PacketWrapper<WrapperPlay
             }
 
             writeDouble(property.value);
-            if (serverVersion == ServerVersion.V_1_7_10) {
+            if (this.serverVersion.isOlderThanOrEquals(ServerVersion.V_1_7_10)) {
                 writeShort(property.modifiers.size());
             } else {
                 writeVarInt(property.modifiers.size());

api/src/main/java/com/github/retrooper/packetevents/wrapper/play/server/WrapperPlayServerUpdateHealth.java

@@ -42,7 +42,7 @@ public class WrapperPlayServerUpdateHealth extends PacketWrapper<WrapperPlayServ
     @Override
     public void read() {
         health = readFloat();
-        if (serverVersion == ServerVersion.V_1_7_10) {
+        if (this.serverVersion.isOlderThanOrEquals(ServerVersion.V_1_7_10)) {
             food = readShort();
         } else {
             food = readVarInt();
@@ -53,7 +53,7 @@ public class WrapperPlayServerUpdateHealth extends PacketWrapper<WrapperPlayServ
     @Override
     public void write() {
         writeFloat(health);
-        if (serverVersion == ServerVersion.V_1_7_10) {
+        if (this.serverVersion.isOlderThanOrEquals(ServerVersion.V_1_7_10)) {
             writeShort(food);
         } else {
             writeVarInt(food);

api/src/main/java/com/github/retrooper/packetevents/wrapper/play/server/WrapperPlayServerUpdateScore.java

@@ -68,7 +68,7 @@ public class WrapperPlayServerUpdateScore extends PacketWrapper<WrapperPlayServe
             this.value = Optional.of(this.readVarInt());
             this.entityDisplayName = this.readOptional(PacketWrapper::readComponent);
             this.scoreFormat = this.readOptional(ScoreFormat::readTyped);
-        } else if (this.serverVersion == ServerVersion.V_1_7_10) {
+        } else if (this.serverVersion.isOlderThanOrEquals(ServerVersion.V_1_7_10)) {
             entityName = readString(16);
             action = Action.VALUES[readByte()];
             if (action != Action.REMOVE_ITEM) {
@@ -107,7 +107,7 @@ public class WrapperPlayServerUpdateScore extends PacketWrapper<WrapperPlayServe
             this.writeVarInt(this.value.orElse(0));
             this.writeOptional(this.entityDisplayName, PacketWrapper::writeComponent);
             this.writeOptional(this.scoreFormat, ScoreFormat::writeTyped);
-        } else if (this.serverVersion == ServerVersion.V_1_7_10) {
+        } else if (this.serverVersion.isOlderThanOrEquals(ServerVersion.V_1_7_10)) {
             writeString(entityName, 16);
             writeByte(action.ordinal());
             if (action != Action.REMOVE_ITEM) {

api/src/main/java/com/github/retrooper/packetevents/wrapper/play/server/WrapperPlayServerWorldBorder.java

@@ -93,9 +93,7 @@ public class WrapperPlayServerWorldBorder extends PacketWrapper<WrapperPlayServe
 
     @Override
     public void read() {
-        int actionId = readVarInt();
-        action = serverVersion.isNewerThanOrEquals(ServerVersion.V_1_12) ? WorldBorderAction.fromId(actionId)
-                : WorldBorderAction.fromLegacyId(actionId);
+        action = readEnum(WorldBorderAction.class);
         if (this.action == WorldBorderAction.SET_SIZE) {
             this.radius = readDouble();
         } else if (this.action == WorldBorderAction.LERP_SIZE) {
@@ -123,8 +121,7 @@ public class WrapperPlayServerWorldBorder extends PacketWrapper<WrapperPlayServe
 
     @Override
     public void write() {
-        int actionId = serverVersion.isNewerThanOrEquals(ServerVersion.V_1_12) ? action.getId() : action.getLegacyId();
-        writeVarInt(actionId);
+        writeEnum(action);
         if (this.action == WorldBorderAction.SET_SIZE) {
             writeDouble(this.radius);
         } else if (this.action == WorldBorderAction.LERP_SIZE) {
@@ -245,38 +242,20 @@ public class WrapperPlayServerWorldBorder extends PacketWrapper<WrapperPlayServe
     }
 
     public enum WorldBorderAction {
-        SET_SIZE(1),
-        LERP_SIZE(2),
-        SET_CENTER(3),
-        INITIALIZE(6),
-        SET_WARNING_TIME(5),
-        SET_WARNING_BLOCKS(4);
+        SET_SIZE,
+        LERP_SIZE,
+        SET_CENTER,
+        INITIALIZE,
+        SET_WARNING_TIME,
+        SET_WARNING_BLOCKS;
 
-        private final int legacyId;
-
-        WorldBorderAction(int legacyId) {
-            this.legacyId = legacyId;
-        }
 
         public int getId() {
             return ordinal();
         }
 
-        public int getLegacyId() {
-            return legacyId;
-        }
-
         public static WorldBorderAction fromId(int id) {
             return WorldBorderAction.values()[id];
         }
-
-        public static WorldBorderAction fromLegacyId(int legacyId) {
-            for (WorldBorderAction action : WorldBorderAction.values()) {
-                if (action.legacyId == legacyId) {
-                    return action;
-                }
-            }
-            return null;
-        }
     }
 }

build.gradle.kts

@@ -18,7 +18,7 @@ version = "${ext["fullVersion"]}${ext[if (ext["snapshot"] == true) "versionMetaW
 
 tasks {
     wrapper {
-        gradleVersion = "8.13"
+        gradleVersion = "8.14.3"
         distributionType = Wrapper.DistributionType.ALL
     }
 

fabric/build.gradle.kts

@@ -2,6 +2,7 @@ import me.modmuss50.mpp.ModPublishExtension
 import me.modmuss50.mpp.PublishModTask
 import net.fabricmc.loom.task.RemapJarTask
 import net.fabricmc.loom.task.RemapSourcesJarTask
+import net.fabricmc.loom.task.prod.ServerProductionRunTask
 
 plugins {
     packetevents.`library-conventions`
@@ -82,3 +83,9 @@ configure<ModPublishExtension> {
     file = tasks.named<RemapJarTask>("remapJar").flatMap { it.archiveFile }
     additionalFiles.from(tasks.named<RemapSourcesJarTask>("remapSourcesJar").flatMap { it.archiveFile })
 }
+
+tasks.register<ServerProductionRunTask>("prodServer") {
+    javaLauncher = javaToolchains.launcherFor {
+        languageVersion = JavaLanguageVersion.of(21)
+    }
+}

fabric/gradle.properties

@@ -4,7 +4,7 @@ org.gradle.parallel=true
 
 # Fabric Properties
 # check these on https://fabricmc.net/develop
-minecraft_version=1.21.6
+minecraft_version=1.21.7
 parchment_mappings=2025.06.01
 parchment_minecraft_version=1.21.5
 loader_version=0.16.14

gradle.properties

@@ -1,7 +1,7 @@
 org.gradle.jvmargs=-Xmx2000m
 
 # TODO UPDATE
-fullVersion=2.9.1
+fullVersion=2.9.4
 snapshot=false
 
 publishing.display_name=PacketEvents

gradle/wrapper/gradle-wrapper.properties

@@ -1,6 +1,6 @@
 distributionBase=GRADLE_USER_HOME
 distributionPath=wrapper/dists
-distributionUrl=https\://services.gradle.org/distributions/gradle-8.13-all.zip
+distributionUrl=https\://services.gradle.org/distributions/gradle-8.14.3-all.zip
 networkTimeout=10000
 validateDistributionUrl=true
 zipStoreBase=GRADLE_USER_HOME

gradlew

@@ -114,7 +114,7 @@ case "$( uname )" in                #(
   NONSTOP* )        nonstop=true ;;
 esac
 
-CLASSPATH=$APP_HOME/gradle/wrapper/gradle-wrapper.jar
+CLASSPATH="\\\"\\\""
 
 
 # Determine the Java command to use to start the JVM.
@@ -213,7 +213,7 @@ DEFAULT_JVM_OPTS='"-Xmx64m" "-Xms64m"'
 set -- \
         "-Dorg.gradle.appname=$APP_BASE_NAME" \
         -classpath "$CLASSPATH" \
-        org.gradle.wrapper.GradleWrapperMain \
+        -jar "$APP_HOME/gradle/wrapper/gradle-wrapper.jar" \
         "$@"
 
 # Stop when "xargs" is not available.

gradlew.bat

@@ -70,11 +70,11 @@ goto fail
 :execute
 @rem Setup the command line
 
-set CLASSPATH=%APP_HOME%\gradle\wrapper\gradle-wrapper.jar
+set CLASSPATH=
 
 
 @rem Execute Gradle
-"%JAVA_EXE%" %DEFAULT_JVM_OPTS% %JAVA_OPTS% %GRADLE_OPTS% "-Dorg.gradle.appname=%APP_BASE_NAME%" -classpath "%CLASSPATH%" org.gradle.wrapper.GradleWrapperMain %*
+"%JAVA_EXE%" %DEFAULT_JVM_OPTS% %JAVA_OPTS% %GRADLE_OPTS% "-Dorg.gradle.appname=%APP_BASE_NAME%" -classpath "%CLASSPATH%" -jar "%APP_HOME%\gradle\wrapper\gradle-wrapper.jar" %*
 
 :end
 @rem End local scope for the variables with windows NT shell

libs.versions.toml

@@ -10,7 +10,7 @@ paper = "1.20.6-R0.1-SNAPSHOT"
 bungeecord = "1.21-R0.1-SNAPSHOT"
 velocity = "3.4.0-SNAPSHOT"
 run-paper = "2.3.1"
-fabric-loom = "1.10.5"
+fabric-loom = "1.11.4"
 spongeGradle = "2.2.0"
 classgraph = "4.8.179"
 

mappings/registries/block.json

@@ -16405,7 +16405,7 @@
     "bubble_column",
     "structure_block"
   ],
-  "V_1_7_10": [
+  "V_1_7_2": [
     "air",
     "stone",
     "grass_block",

mappings/registries/click_event_action.json

@@ -32,7 +32,7 @@
     "suggest_command",
     "change_page"
   ],
-  "V_1_7_10": [
+  "V_1_7_2": [
     "open_url",
     "open_file",
     "run_command",

mappings/registries/dimension_type.json

@@ -11,7 +11,7 @@
     "the_nether": 2,
     "the_end": 3
   },
-  "V_1_7_10": {
+  "V_1_7_2": {
     "overworld": 0,
     "the_nether": -1,
     "the_end": 1

mappings/registries/equipment_asset.json

@@ -54,7 +54,7 @@
     "diamond",
     "turtle_scute"
   ],
-  "V_1_7_10": [
+  "V_1_7_2": [
     "leather",
     "chainmail",
     "iron",

mappings/registries/horse_variant.json

@@ -1,5 +1,5 @@
 {
-  "V_1_7_10": [
+  "V_1_7_2": [
     "white",
     "creamy",
     "chestnut",

mappings/registries/mob_effect.json

@@ -205,7 +205,7 @@
     "luck": 26,
     "unluck": 27
   },
-  "V_1_7_10": {
+  "V_1_7_2": {
     "speed": 1,
     "slowness": 2,
     "haste": 3,

mappings/registries/mooshroom_variant.json

@@ -1,5 +1,5 @@
 {
-  "V_1_7_10": [
+  "V_1_7_2": [
     "red"
   ],
   "V_1_14": [

mappings/registries/painting_variant.json

@@ -136,7 +136,7 @@
     "fire",
     "donkey_kong"
   ],
-  "V_1_7_10": [
+  "V_1_7_2": [
     "kebab",
     "aztec",
     "alban",

spigot/src/main/java/io/github/retrooper/packetevents/bukkit/InternalGlobalBukkitListener.java

@@ -0,0 +1,36 @@
+/*
+ * This file is part of packetevents - https://github.com/retrooper/packetevents
+ * Copyright (C) 2025 retrooper and contributors
+ *
+ * This program is free software: you can redistribute it and/or modify
+ * it under the terms of the GNU General Public License as published by
+ * the Free Software Foundation, either version 3 of the License, or
+ * (at your option) any later version.
+ *
+ * This program is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+ * GNU General Public License for more details.
+ *
+ * You should have received a copy of the GNU General Public License
+ * along with this program.  If not, see <http://www.gnu.org/licenses/>.
+ */
+
+package io.github.retrooper.packetevents.bukkit;
+
+import com.github.retrooper.packetevents.PacketEvents;
+import com.github.retrooper.packetevents.PacketEventsAPI;
+import com.github.retrooper.packetevents.event.UserLoginEvent;
+import com.github.retrooper.packetevents.protocol.player.User;
+import org.bukkit.event.EventHandler;
+import org.bukkit.event.Listener;
+import org.bukkit.event.player.PlayerJoinEvent;
+
+public class InternalGlobalBukkitListener implements Listener {
+    @EventHandler
+    public void onPlayerJoin(PlayerJoinEvent event) {
+        PacketEventsAPI<?> api = PacketEvents.getAPI();
+        User user = api.getPlayerManager().getUser(event.getPlayer());
+        PacketEvents.getAPI().getEventManager().callEvent(new UserLoginEvent(user, event.getPlayer()));
+    }
+}

spigot/src/main/java/io/github/retrooper/packetevents/factory/spigot/SpigotPacketEventsBuilder.java

@@ -34,6 +34,7 @@ import com.github.retrooper.packetevents.util.LogManager;
 import com.github.retrooper.packetevents.util.PEVersion;
 import io.github.retrooper.packetevents.bukkit.InternalBukkitListener;
 import io.github.retrooper.packetevents.bukkit.InternalBukkitLoginListener;
+import io.github.retrooper.packetevents.bukkit.InternalGlobalBukkitListener;
 import io.github.retrooper.packetevents.bukkit.InternalPaperListener;
 import io.github.retrooper.packetevents.injector.SpigotChannelInjector;
 import io.github.retrooper.packetevents.injector.connection.ServerConnectionInitializer;
@@ -143,16 +144,23 @@ public class SpigotPacketEventsBuilder {
                 if (!initialized) {
                     Plugin plugin = (Plugin) PacketEvents.getAPI().getPlugin();
                     String bukkitVersion = Bukkit.getBukkitVersion();
-                    // Our PEVersion class can parse this version and detect if it is a newer version than what is currently supported
-                    PEVersion bukkitServerVersion = PEVersion.fromString(bukkitVersion.substring(0, bukkitVersion.indexOf("-")));
-                    PEVersion latestSupportedVersion = PEVersion.fromString(ServerVersion.getLatest().getReleaseName());
-                    if (bukkitServerVersion.isNewerThan(latestSupportedVersion)) {
-                        //We do not support this version yet, so let us warn the user
-                        plugin.getLogger().warning("Your build of PacketEvents does not support the Minecraft version "
-                                + bukkitServerVersion + "! The latest Minecraft version supported by your build of PacketEvents is " + latestSupportedVersion
-                                + ". Please test the development builds, as they may already have support for your Minecraft version (hint: select the build that contains 'spigot'): https://ci.codemc.io/job/retrooper/job/packetevents/ If you're in need of any help, join our Discord server: https://discord.gg/DVHxPPxHZc");
-                        Bukkit.getPluginManager().disablePlugin(plugin);
-                        return;
+
+                    if (bukkitVersion.contains("Unknown")) {
+                        ServerVersion fallbackVersion = ServerVersion.V_1_8_8;
+                        String failureToDetectVersionMsg = "Your server software is preventing us from checking the Minecraft Server version. This is what we found: " + bukkitVersion + ". We will assume the Server version is " + fallbackVersion.name() + "...\n If you need assistance, join our Discord server: https://discord.gg/DVHxPPxHZc";
+                        plugin.getLogger().warning(failureToDetectVersionMsg);
+                    } else {
+                        // Our PEVersion class can parse this version and detect if it is a newer version than what is currently supported
+                        PEVersion bukkitServerVersion = PEVersion.fromString(bukkitVersion.substring(0, bukkitVersion.indexOf("-")));
+                        PEVersion latestSupportedVersion = PEVersion.fromString(ServerVersion.getLatest().getReleaseName());
+                        if (bukkitServerVersion.isNewerThan(latestSupportedVersion)) {
+                            //We do not support this version yet, so let us warn the user
+                            plugin.getLogger().warning("Your build of PacketEvents does not support the Minecraft version "
+                                    + bukkitServerVersion + "! The latest Minecraft version supported by your build of PacketEvents is " + latestSupportedVersion
+                                    + ". Please test the development builds, as they may already have support for your Minecraft version (hint: select the build that contains 'spigot'): https://ci.codemc.io/job/retrooper/job/packetevents/ If you're in need of any help, join our Discord server: https://discord.gg/DVHxPPxHZc");
+                            Bukkit.getPluginManager().disablePlugin(plugin);
+                            return;
+                        }
                     }
                     if (settings.shouldCheckForUpdates()) {
                         getUpdateChecker().handleUpdateCheck();
@@ -162,6 +170,8 @@ public class SpigotPacketEventsBuilder {
                     //Just to have an idea of which versions of packetevents people use
                     metrics.addCustomChart(new SimplePie("packetevents_version", () -> getVersion().toStringWithoutSnapshot()));
 
+                    Bukkit.getPluginManager().registerEvents(new InternalGlobalBukkitListener(), plugin);
+
                     try {
                         // register paper listener to support 1.21.7+ configuration api
                         Class.forName("io.papermc.paper.connection.PlayerConnection");

spigot/src/main/java/io/github/retrooper/packetevents/injector/SpigotChannelInjector.java

@@ -47,7 +47,6 @@ public class SpigotChannelInjector implements ChannelInjector {
     private int connectionChannelsListIndex = -1;
 
     public void updatePlayer(User user, Object player) {
-        PacketEvents.getAPI().getEventManager().callEvent(new UserLoginEvent(user, player));
         Object channel = user.getChannel();
         if (channel == null) {
             channel = PacketEvents.getAPI().getPlayerManager().getChannel(player);

spigot/src/main/java/io/github/retrooper/packetevents/util/SpigotConversionUtil.java

@@ -20,6 +20,7 @@ package io.github.retrooper.packetevents.util;
 
 import com.github.retrooper.packetevents.PacketEvents;
 import com.github.retrooper.packetevents.manager.server.ServerVersion;
+import com.github.retrooper.packetevents.protocol.entity.data.EntityData;
 import com.github.retrooper.packetevents.protocol.entity.pose.EntityPose;
 import com.github.retrooper.packetevents.protocol.entity.type.EntityType;
 import com.github.retrooper.packetevents.protocol.entity.type.EntityTypes;
@@ -41,10 +42,13 @@ import com.github.retrooper.packetevents.resources.ResourceLocation;
 import com.github.retrooper.packetevents.util.mappings.SimpleTypesBuilderData;
 import org.bukkit.World;
 import org.bukkit.block.data.BlockData;
+import org.bukkit.entity.Entity;
 import org.bukkit.entity.Pose;
 import org.bukkit.inventory.MainHand;
 import org.jetbrains.annotations.Nullable;
 
+import java.util.List;
+
 public class SpigotConversionUtil {
     public static Location fromBukkitLocation(org.bukkit.Location location) {
         return new Location(location.getX(), location.getY(), location.getZ(), location.getYaw(), location.getPitch());
@@ -233,4 +237,16 @@ public class SpigotConversionUtil {
     public static MainHand toBukkitHand(HumanoidArm arm) {
         return MainHand.values()[arm.ordinal()];
     }
+
+    /**
+     * Retrieves the metadata of a given Bukkit {@link org.bukkit.entity.Entity},
+     * returned as a list of {@link com.github.retrooper.packetevents.protocol.entity.data.EntityData}
+     * compatible with PacketEvents.
+     *
+     * @param entity the Bukkit entity to extract metadata from
+     * @return a list of the entity's metadata values
+     */
+    public static List<EntityData<?>> getEntityMetadata(Entity entity) {
+        return SpigotReflectionUtil.getEntityMetadata(entity);
+    }
 }

spigot/src/main/java/io/github/retrooper/packetevents/util/SpigotReflectionUtil.java

@@ -22,46 +22,33 @@ import com.github.retrooper.packetevents.PacketEvents;
 import com.github.retrooper.packetevents.manager.server.ServerVersion;
 import com.github.retrooper.packetevents.netty.buffer.ByteBufHelper;
 import com.github.retrooper.packetevents.netty.buffer.UnpooledByteBufAllocationHelper;
+import com.github.retrooper.packetevents.protocol.entity.data.EntityData;
 import com.github.retrooper.packetevents.protocol.nbt.NBTCompound;
 import com.github.retrooper.packetevents.protocol.particle.type.ParticleType;
 import com.github.retrooper.packetevents.protocol.particle.type.ParticleTypes;
 import com.github.retrooper.packetevents.protocol.player.TextureProperty;
 import com.github.retrooper.packetevents.resources.ResourceLocation;
+import com.github.retrooper.packetevents.util.reflection.NestedClassUtil;
 import com.github.retrooper.packetevents.util.reflection.Reflection;
 import com.github.retrooper.packetevents.util.reflection.ReflectionObject;
 import com.github.retrooper.packetevents.wrapper.PacketWrapper;
 import com.google.common.collect.BiMap;
 import com.google.common.collect.MapMaker;
 import io.netty.buffer.PooledByteBufAllocator;
-import org.bukkit.Bukkit;
-import org.bukkit.Material;
-import org.bukkit.NamespacedKey;
-import org.bukkit.Particle;
-import org.bukkit.Registry;
-import org.bukkit.Server;
-import org.bukkit.World;
+import org.bukkit.*;
 import org.bukkit.entity.Entity;
 import org.bukkit.entity.Player;
 import org.bukkit.inventory.ItemStack;
 import org.bukkit.material.MaterialData;
+import org.jetbrains.annotations.NotNull;
 import org.jetbrains.annotations.Nullable;
 
-import java.io.ByteArrayInputStream;
-import java.io.ByteArrayOutputStream;
-import java.io.DataInput;
-import java.io.DataInputStream;
-import java.io.DataOutput;
-import java.io.DataOutputStream;
-import java.io.IOException;
+import java.io.*;
 import java.lang.reflect.Constructor;
 import java.lang.reflect.Field;
 import java.lang.reflect.InvocationTargetException;
 import java.lang.reflect.Method;
-import java.util.ArrayList;
-import java.util.Collection;
-import java.util.List;
-import java.util.Map;
-import java.util.Optional;
+import java.util.*;
 import java.util.concurrent.atomic.AtomicInteger;
 import java.util.function.Supplier;
 
@@ -103,7 +90,8 @@ public final class SpigotReflectionUtil {
             DYNAMIC_OPS_NBT_CLASS, NMS_NBT_COMPOUND_CLASS, NMS_NBT_BASE_CLASS, NBT_COMPRESSION_STREAM_TOOLS_CLASS,
             STREAM_CODEC, STREAM_DECODER, STREAM_ENCODER, REGISTRY_FRIENDLY_BYTE_BUF, REGISTRY_ACCESS, REGISTRY_ACCESS_FROZEN,
             RESOURCE_KEY, REGISTRY, WRITABLE_REGISTRY, NBT_ACCOUNTER, CHUNK_PROVIDER_SERVER_CLASS, ICHUNKPROVIDER_CLASS, CHUNK_STATUS_CLASS,
-            BLOCK_POSITION_CLASS, PLAYER_CHUNK_MAP_CLASS, PLAYER_CHUNK_CLASS, CHUNK_CLASS, IBLOCKACCESS_CLASS, ICHUNKACCESS_CLASS, REMOTE_CHAT_SESSION_CLASS;
+            BLOCK_POSITION_CLASS, PLAYER_CHUNK_MAP_CLASS, PLAYER_CHUNK_CLASS, CHUNK_CLASS, IBLOCKACCESS_CLASS, ICHUNKACCESS_CLASS, REMOTE_CHAT_SESSION_CLASS,
+    DATA_WATCHER_CLASS, CLIENTBOUND_SET_ENTITY_DATA_PACKET_CLASS, DATA_WATCHER_ITEM_CLASS, DATA_WATCHER_VALUE_CLASS;
 
     //Netty classes
     public static Class<?> CHANNEL_CLASS, BYTE_BUF_CLASS, BYTE_TO_MESSAGE_DECODER, MESSAGE_TO_BYTE_ENCODER;
@@ -111,7 +99,7 @@ public final class SpigotReflectionUtil {
     //Fields
     public static Field ENTITY_PLAYER_PING_FIELD, ENTITY_BOUNDING_BOX_FIELD, BYTE_BUF_IN_PACKET_DATA_SERIALIZER, DIMENSION_CODEC_FIELD,
             DYNAMIC_OPS_NBT_INSTANCE_FIELD, CHUNK_PROVIDER_SERVER_FIELD, CRAFT_PARTICLE_PARTICLES_FIELD, NMS_MK_KEY_FIELD, LEGACY_NMS_PARTICLE_KEY_FIELD, LEGACY_NMS_KEY_TO_NMS_PARTICLE,
-            REMOTE_CHAT_SESSION_FIELD, REGISTRY_KEY_LOCATION_FIELD;
+            REMOTE_CHAT_SESSION_FIELD, REGISTRY_KEY_LOCATION_FIELD, DATA_WATCHER_FIELD;
 
     //Methods
     public static Method IS_DEBUGGING, GET_CRAFT_PLAYER_HANDLE_METHOD, GET_CRAFT_ENTITY_HANDLE_METHOD, GET_CRAFT_WORLD_HANDLE_METHOD,
@@ -125,7 +113,8 @@ public final class SpigotReflectionUtil {
             READ_NBT_FROM_STREAM_METHOD, WRITE_NBT_TO_STREAM_METHOD, STREAM_DECODER_DECODE, STREAM_ENCODER_ENCODE,
             CREATE_REGISTRY_RESOURCE_KEY, GET_REGISTRY_OR_THROW, GET_DIMENSION_TYPES, GET_REGISTRY_ID,
             NBT_ACCOUNTER_UNLIMITED_HEAP, CHUNK_CACHE_GET_IBLOCKACCESS, CHUNK_CACHE_GET_ICHUNKACCESS,
-            IBLOCKACCESS_GET_BLOCK_DATA, CHUNK_GET_BLOCK_DATA, PLAYER_CHUNK_MAP_GET_PLAYER_CHUNK, PLAYER_CHUNK_GET_CHUNK;
+            IBLOCKACCESS_GET_BLOCK_DATA, CHUNK_GET_BLOCK_DATA, PLAYER_CHUNK_MAP_GET_PLAYER_CHUNK, PLAYER_CHUNK_GET_CHUNK,
+            LEGACY_DATA_WATCHER_WRITE_METHOD, CLIENTBOUND_SET_ENTITY_DATA_PACKET_WRITE_DATA_WATCHER_METHOD, GET_DATA_VALUE_FROM_DATA_ITEM_METHOD;
 
     //Constructors
     private static Constructor<?> NMS_ITEM_STACK_CONSTRUCTOR, NMS_PACKET_DATA_SERIALIZER_CONSTRUCTOR,
@@ -275,6 +264,10 @@ public final class SpigotReflectionUtil {
         if (CHUNK_CLASS != null) {
             PLAYER_CHUNK_GET_CHUNK = Reflection.getMethod(SpigotReflectionUtil.PLAYER_CHUNK_CLASS, SpigotReflectionUtil.CHUNK_CLASS, 0);
         }
+
+        LEGACY_DATA_WATCHER_WRITE_METHOD = Reflection.getMethod(DATA_WATCHER_CLASS, void.class, 0, NMS_PACKET_DATA_SERIALIZER_CLASS);
+        CLIENTBOUND_SET_ENTITY_DATA_PACKET_WRITE_DATA_WATCHER_METHOD = Reflection.getMethod(CLIENTBOUND_SET_ENTITY_DATA_PACKET_CLASS, 0, List.class, REGISTRY_FRIENDLY_BYTE_BUF);
+        GET_DATA_VALUE_FROM_DATA_ITEM_METHOD = Reflection.getMethod(DATA_WATCHER_ITEM_CLASS, DATA_WATCHER_VALUE_CLASS, 0);
     }
 
     private static void initFields() {
@@ -302,6 +295,7 @@ public final class SpigotReflectionUtil {
 
         REMOTE_CHAT_SESSION_FIELD = Reflection.getField(ENTITY_PLAYER_CLASS, REMOTE_CHAT_SESSION_CLASS, 0);
         REGISTRY_KEY_LOCATION_FIELD = Reflection.getField(RESOURCE_KEY, NMS_MINECRAFT_KEY_CLASS, 1);
+        DATA_WATCHER_FIELD = Reflection.getField(NMS_ENTITY_CLASS, DATA_WATCHER_CLASS, 0, true);
     }
 
     private static void initClasses() {
@@ -402,6 +396,14 @@ public final class SpigotReflectionUtil {
         WRITABLE_REGISTRY = getServerClass(IS_OBFUSCATED ? "core.IRegistryWritable" : "core.WritableRegistry", "IRegistryWritable");
 
         REMOTE_CHAT_SESSION_CLASS = Reflection.getClassByNameWithoutException("net.minecraft.network.chat.RemoteChatSession");
+        DATA_WATCHER_CLASS =  SpigotReflectionUtil.getServerClass("network.syncher.DataWatcher", "DataWatcher");
+        if (DATA_WATCHER_CLASS == null) {
+            DATA_WATCHER_CLASS = SpigotReflectionUtil.getServerClass("network.syncher.SynchedEntityData", "DataWatcher");
+        }
+
+        CLIENTBOUND_SET_ENTITY_DATA_PACKET_CLASS = SpigotReflectionUtil.getServerClass("network.protocol.game.ClientboundSetEntityDataPacket", "PacketPlayOutEntityMetadata");
+        DATA_WATCHER_ITEM_CLASS = NestedClassUtil.getNestedClass(DATA_WATCHER_CLASS, 0);
+        DATA_WATCHER_VALUE_CLASS = NestedClassUtil.getNestedClass(DATA_WATCHER_CLASS, 1);
     }
 
     private static void initObjects() {
@@ -1207,4 +1209,35 @@ public final class SpigotReflectionUtil {
             return null;
         }
     }
+
+    public static List<EntityData<?>> getEntityMetadata(@NotNull Entity entity) {
+        Object byteBuf = PacketEvents.getAPI().getNettyManager().getByteBufAllocationOperator().buffer();
+        try {
+            Object handle = SpigotReflectionUtil.getNMSEntity(entity);
+            Object dataWatcher = DATA_WATCHER_FIELD.get(handle);
+
+            Object packetDataSerializer = createPacketDataSerializer(byteBuf);
+
+            if (LEGACY_DATA_WATCHER_WRITE_METHOD != null) {
+                // Legacy Minecraft versions have the DataWatcher class with a method to write to the PacketDataSerializer
+                LEGACY_DATA_WATCHER_WRITE_METHOD.invoke(dataWatcher, packetDataSerializer);
+            }
+            else {
+                // Modern Minecraft versions require the use of the pack method in the ClientboundSetEntityDataPacket class.
+                Object[] dataItems = new ReflectionObject(dataWatcher).readObjectArray(0, DATA_WATCHER_ITEM_CLASS);
+                List<Object> dataValues = new ArrayList<>(dataItems.length);
+                for (Object dataItem : dataItems) {
+                    dataValues.add(GET_DATA_VALUE_FROM_DATA_ITEM_METHOD.invoke(dataItem));
+                }
+                CLIENTBOUND_SET_ENTITY_DATA_PACKET_WRITE_DATA_WATCHER_METHOD.invoke(null, dataValues, packetDataSerializer);
+            }
+            PacketWrapper<?> packetWrapper = PacketWrapper.createUniversalPacketWrapper(byteBuf);
+            return packetWrapper.readEntityMetadata();
+        } catch (Exception e) {
+            throw new RuntimeException(e);
+        }
+        finally {
+            ByteBufHelper.release(byteBuf);
+        }
+    }
 }

sponge/src/main/java/io/github/retrooper/packetevents/sponge/InternalSpongeListener.java

@@ -18,6 +18,7 @@
 package io.github.retrooper.packetevents.sponge;
 
 import com.github.retrooper.packetevents.PacketEvents;
+import com.github.retrooper.packetevents.event.UserLoginEvent;
 import com.github.retrooper.packetevents.protocol.player.User;
 import com.github.retrooper.packetevents.util.FakeChannelUtil;
 import io.github.retrooper.packetevents.sponge.injector.SpongeChannelInjector;
@@ -49,6 +50,7 @@ public class InternalSpongeListener {
         }
 
         // Set player object in the injectors
+        PacketEvents.getAPI().getEventManager().callEvent(new UserLoginEvent(user, player));
         injector.updatePlayer(user, player);
     }
 

sponge/src/main/java/io/github/retrooper/packetevents/sponge/injector/SpongeChannelInjector.java

@@ -50,7 +50,6 @@ public class SpongeChannelInjector implements ChannelInjector {
     private int connectionChannelsListIndex = -1;
 
     public void updatePlayer(User user, Object player) {
-        PacketEvents.getAPI().getEventManager().callEvent(new UserLoginEvent(user, player));
         Object channel = user.getChannel();
         if (channel == null) {
             channel = PacketEvents.getAPI().getPlayerManager().getChannel(player);