Fix WrappedPositionMoveRotation compilation errors and add unit tests

Copilot · dmulloy2 · Copilot · commit bec4eacd731f · 2026-03-28T00:44:05.000Z
Agent-Logs-Url: https://github.com/dmulloy2/ProtocolLib/sessions/aad8f880-cbb2-49a9-8f74-21794fdd8e60 Co-authored-by: dmulloy2 <3039119+dmulloy2@users.noreply.github.com>
diff --git a/src/main/java/com/comphenix/protocol/wrappers/WrappedPositionMoveRotation.java b/src/main/java/com/comphenix/protocol/wrappers/WrappedPositionMoveRotation.java
@@ -27,36 +27,36 @@
  */
 public class WrappedPositionMoveRotation extends AbstractWrapper {
 
-    private static Class<?> HANDLE_TYPE;
+    private static Class<?> NMS_CLASS;
     private static ConstructorAccessor CONSTRUCTOR;
     private static StructureModifier<Object> BASE_MODIFIER;
 
     private final StructureModifier<Object> modifier;
 
     private WrappedPositionMoveRotation(Object handle) {
-        super(getHandleType());
+        super(getNmsClass());
         setHandle(handle);
         this.modifier = getBaseModifier().withTarget(handle);
     }
 
-    private static Class<?> getHandleType() {
-        if (HANDLE_TYPE == null) {
-            HANDLE_TYPE = MinecraftReflection.getPositionMoveRotationClass();
+    private static Class<?> getNmsClass() {
+        if (NMS_CLASS == null) {
+            NMS_CLASS = MinecraftReflection.getPositionMoveRotationClass();
         }
-        return HANDLE_TYPE;
+        return NMS_CLASS;
     }
 
     private static StructureModifier<Object> getBaseModifier() {
         if (BASE_MODIFIER == null) {
-            BASE_MODIFIER = new StructureModifier<>(getHandleType());
+            BASE_MODIFIER = new StructureModifier<>(getNmsClass());
         }
         return BASE_MODIFIER;
     }
 
     private static ConstructorAccessor getConstructor() {
         if (CONSTRUCTOR == null) {
             CONSTRUCTOR = Accessors.getConstructorAccessor(
-                    getHandleType(),
+                    getNmsClass(),
                     MinecraftReflection.getVec3DClass(),
                     MinecraftReflection.getVec3DClass(),
                     float.class,
@@ -138,7 +138,8 @@ public void setDeltaMovement(Vector deltaMovement) {
      * @return the yaw as a float.
      */
     public float getYRot() {
-        return modifier.withType(float.class).<Float>read(0);
+        StructureModifier<Float> floats = modifier.withType(float.class);
+        return floats.read(0);
     }
 
     /**
@@ -156,7 +157,8 @@ public void setYRot(float yRot) {
      * @return the pitch as a float.
      */
     public float getXRot() {
-        return modifier.withType(float.class).<Float>read(1);
+        StructureModifier<Float> floats = modifier.withType(float.class);
+        return floats.read(1);
     }
 
     /**
diff --git a/src/test/java/com/comphenix/protocol/wrappers/WrappedPositionMoveRotationTest.java b/src/test/java/com/comphenix/protocol/wrappers/WrappedPositionMoveRotationTest.java
@@ -0,0 +1,113 @@
+package com.comphenix.protocol.wrappers;
+
+import com.comphenix.protocol.BukkitInitialization;
+import com.comphenix.protocol.PacketType;
+import com.comphenix.protocol.events.PacketContainer;
+
+import org.bukkit.util.Vector;
+import org.junit.jupiter.api.BeforeAll;
+import org.junit.jupiter.api.Test;
+
+import static org.junit.jupiter.api.Assertions.*;
+
+public class WrappedPositionMoveRotationTest {
+
+    @BeforeAll
+    public static void beforeClass() {
+        BukkitInitialization.initializeAll();
+    }
+
+    @Test
+    public void testCreateAndRead() {
+        Vector position = new Vector(1.5, 64.0, -3.5);
+        Vector delta = new Vector(0.1, -0.05, 0.2);
+        float yRot = 45.0f;
+        float xRot = -10.0f;
+
+        WrappedPositionMoveRotation created = WrappedPositionMoveRotation.create(position, delta, yRot, xRot);
+
+        assertEquals(position.getX(), created.getPosition().getX(), 1e-6);
+        assertEquals(position.getY(), created.getPosition().getY(), 1e-6);
+        assertEquals(position.getZ(), created.getPosition().getZ(), 1e-6);
+
+        assertEquals(delta.getX(), created.getDeltaMovement().getX(), 1e-6);
+        assertEquals(delta.getY(), created.getDeltaMovement().getY(), 1e-6);
+        assertEquals(delta.getZ(), created.getDeltaMovement().getZ(), 1e-6);
+
+        assertEquals(yRot, created.getYRot(), 1e-6f);
+        assertEquals(xRot, created.getXRot(), 1e-6f);
+    }
+
+    @Test
+    public void testEntityPositionSyncPacket() {
+        PacketContainer packet = new PacketContainer(PacketType.Play.Server.ENTITY_POSITION_SYNC);
+
+        Vector position = new Vector(10.0, 70.0, -5.0);
+        Vector delta = new Vector(0.0, 0.0, 0.0);
+        float yRot = 90.0f;
+        float xRot = 0.0f;
+
+        packet.getPositionMoveRotation().write(0,
+                WrappedPositionMoveRotation.create(position, delta, yRot, xRot));
+
+        WrappedPositionMoveRotation result = packet.getPositionMoveRotation().read(0);
+
+        assertNotNull(result);
+
+        assertEquals(position.getX(), result.getPosition().getX(), 1e-6);
+        assertEquals(position.getY(), result.getPosition().getY(), 1e-6);
+        assertEquals(position.getZ(), result.getPosition().getZ(), 1e-6);
+
+        assertEquals(delta.getX(), result.getDeltaMovement().getX(), 1e-6);
+        assertEquals(delta.getY(), result.getDeltaMovement().getY(), 1e-6);
+        assertEquals(delta.getZ(), result.getDeltaMovement().getZ(), 1e-6);
+
+        assertEquals(yRot, result.getYRot(), 1e-6f);
+        assertEquals(xRot, result.getXRot(), 1e-6f);
+    }
+
+    @Test
+    public void testEntityTeleportPacket() {
+        PacketContainer packet = new PacketContainer(PacketType.Play.Server.ENTITY_TELEPORT);
+
+        Vector position = new Vector(-100.5, 200.0, 300.75);
+        Vector delta = new Vector(0.0, 0.0, 0.0);
+        float yRot = 180.0f;
+        float xRot = 30.0f;
+
+        packet.getPositionMoveRotation().write(0,
+                WrappedPositionMoveRotation.create(position, delta, yRot, xRot));
+
+        WrappedPositionMoveRotation result = packet.getPositionMoveRotation().read(0);
+
+        assertNotNull(result);
+
+        assertEquals(position.getX(), result.getPosition().getX(), 1e-6);
+        assertEquals(position.getY(), result.getPosition().getY(), 1e-6);
+        assertEquals(position.getZ(), result.getPosition().getZ(), 1e-6);
+
+        assertEquals(delta.getX(), result.getDeltaMovement().getX(), 1e-6);
+        assertEquals(delta.getY(), result.getDeltaMovement().getY(), 1e-6);
+        assertEquals(delta.getZ(), result.getDeltaMovement().getZ(), 1e-6);
+
+        assertEquals(yRot, result.getYRot(), 1e-6f);
+        assertEquals(xRot, result.getXRot(), 1e-6f);
+    }
+
+    @Test
+    public void testFromHandle() {
+        Vector position = new Vector(5.0, 65.0, 5.0);
+        Vector delta = new Vector(0.0, -0.1, 0.0);
+        float yRot = 270.0f;
+        float xRot = -45.0f;
+
+        WrappedPositionMoveRotation original = WrappedPositionMoveRotation.create(position, delta, yRot, xRot);
+        WrappedPositionMoveRotation fromHandle = WrappedPositionMoveRotation.fromHandle(original.getHandle());
+
+        assertEquals(original.getPosition().getX(), fromHandle.getPosition().getX(), 1e-6);
+        assertEquals(original.getPosition().getY(), fromHandle.getPosition().getY(), 1e-6);
+        assertEquals(original.getPosition().getZ(), fromHandle.getPosition().getZ(), 1e-6);
+        assertEquals(original.getYRot(), fromHandle.getYRot(), 1e-6f);
+        assertEquals(original.getXRot(), fromHandle.getXRot(), 1e-6f);
+    }
+}
