player uuid rewrite: mc1.21.2 support

TISUnion · Oct 23, 2024 · ad2e544 · ad2e544
1 parent c2f7057
commit ad2e544
Show file tree

Hide file tree

Showing 2 changed files with 26 additions and 24 deletions.
diff --git a/proxy/src/main/java/com/velocitypowered/proxy/protocol/StateRegistry.java b/proxy/src/main/java/com/velocitypowered/proxy/protocol/StateRegistry.java
@@ -708,29 +708,29 @@ public enum StateRegistry {
           map(0x7B, MINECRAFT_1_21, false),
           map(0x82, MINECRAFT_1_21_2, false));
 
-	    // [fallen's fork] player uuid rewrite - entity packet
-	    clientbound.register(UrSpawnPlayerS2CPacket.class, UrSpawnPlayerS2CPacket::new,
-			    map(0x05, MINECRAFT_1_8, false),
-			    map(0x04, MINECRAFT_1_16, false),
-			    map(0x02, MINECRAFT_1_19, false),
-			    map(0x03, MINECRAFT_1_19_4, false),
-			    map(-1, MINECRAFT_1_20_2, false));
-	    clientbound.register(UrSpawnEntityS2CPacket.class, UrSpawnEntityS2CPacket::new,
-			    map(0x01, MINECRAFT_1_20_2, false));
-	    serverbound.register(UrSpectatorTeleportC2SPacket.class, UrSpectatorTeleportC2SPacket::new,
-			    map(0x18, MINECRAFT_1_8, false),
-			    map(0x1B, MINECRAFT_1_9, false),
-			    map(0x1E, MINECRAFT_1_12, false),
-			    map(0x28, MINECRAFT_1_13, false),
-			    map(0x2B, MINECRAFT_1_14, false),
-			    map(0x2C, MINECRAFT_1_16, false),
-			    map(0x2D, MINECRAFT_1_16_2, false),
-			    map(0x2F, MINECRAFT_1_19, false),
-			    map(0x30, MINECRAFT_1_19_1, false),
-			    map(0x33, MINECRAFT_1_20_2, false),
-			    map(0x34, MINECRAFT_1_20_3, false),
-			    map(0x37, MINECRAFT_1_20_5, false));
-	    // [fallen's fork] ends
+      // [fallen's fork] player uuid rewrite - entity packet
+      clientbound.register(UrSpawnPlayerS2CPacket.class, UrSpawnPlayerS2CPacket::new,
+              map(0x05, MINECRAFT_1_8, false),
+              map(0x04, MINECRAFT_1_16, false),
+              map(0x02, MINECRAFT_1_19, false),
+              map(0x03, MINECRAFT_1_19_4, false),
+              map(-1, MINECRAFT_1_20_2, false));
+      clientbound.register(UrSpawnEntityS2CPacket.class, UrSpawnEntityS2CPacket::new,
+              map(0x01, MINECRAFT_1_20_2, false));
+      serverbound.register(UrSpectatorTeleportC2SPacket.class, UrSpectatorTeleportC2SPacket::new,
+              map(0x18, MINECRAFT_1_8, false),
+              map(0x1B, MINECRAFT_1_9, false),
+              map(0x1E, MINECRAFT_1_12, false),
+              map(0x28, MINECRAFT_1_13, false),
+              map(0x2B, MINECRAFT_1_14, false),
+              map(0x2C, MINECRAFT_1_16, false),
+              map(0x2D, MINECRAFT_1_16_2, false),
+              map(0x2F, MINECRAFT_1_19, false),
+              map(0x30, MINECRAFT_1_19_1, false),
+              map(0x33, MINECRAFT_1_20_2, false),
+              map(0x34, MINECRAFT_1_20_3, false),
+              map(0x37, MINECRAFT_1_20_5, false));
+      // [fallen's fork] ends
     }
   },
   LOGIN {

diff --git a/...in/java/com/velocitypowered/proxy/protocol/packet/uuidrewrite/UrSpawnEntityS2CPacket.java b/...in/java/com/velocitypowered/proxy/protocol/packet/uuidrewrite/UrSpawnEntityS2CPacket.java
@@ -41,7 +41,9 @@ public class UrSpawnEntityS2CPacket implements MinecraftPacket, PacketToRewriteE
   private static int getPlayerEntityType(ProtocolVersion version) {
     // https://wiki.vg/Entity_metadata#Mobs
     // https://github.com/Fallen-Breath/mc-registry-dump
-    if (version.noLessThan(ProtocolVersion.MINECRAFT_1_20_5)) {
+    if (version.noLessThan(ProtocolVersion.MINECRAFT_1_21_2)) {
+      return 148;
+    } else if (version.noLessThan(ProtocolVersion.MINECRAFT_1_20_5)) {
       return 128;
     } else if (version.noLessThan(ProtocolVersion.MINECRAFT_1_20_3)) {
       return 124;