Handle relative player rotations

Author: FlorianMichael

common/src/main/java/com/viaversion/viabackwards/protocol/v1_21_9to1_21_7/Protocol1_21_9To1_21_7.java

@@ -26,6 +26,7 @@
 import com.viaversion.viabackwards.protocol.v1_21_9to1_21_7.rewriter.ComponentRewriter1_21_9;
 import com.viaversion.viabackwards.protocol.v1_21_9to1_21_7.rewriter.EntityPacketRewriter1_21_9;
 import com.viaversion.viabackwards.protocol.v1_21_9to1_21_7.rewriter.ParticleRewriter1_21_9;
+import com.viaversion.viabackwards.protocol.v1_21_9to1_21_7.storage.PlayerRotationStorage;
 import com.viaversion.viabackwards.protocol.v1_21_9to1_21_7.tracker.EntityTracker1_21_9;
 import com.viaversion.viaversion.api.connection.UserConnection;
 import com.viaversion.viaversion.api.minecraft.data.version.StructuredDataKeys1_21_5;
@@ -39,7 +40,6 @@
 import com.viaversion.viaversion.api.type.types.version.Types1_20_5;
 import com.viaversion.viaversion.api.type.types.version.VersionedTypes;
 import com.viaversion.viaversion.api.type.types.version.VersionedTypesHolder;
-import com.viaversion.viaversion.data.entity.EntityTrackerBase;
 import com.viaversion.viaversion.data.item.ItemHasherBase;
 import com.viaversion.viaversion.protocols.v1_21_5to1_21_6.packet.ClientboundConfigurationPackets1_21_6;
 import com.viaversion.viaversion.protocols.v1_21_5to1_21_6.packet.ClientboundPacket1_21_6;
@@ -56,7 +56,6 @@
 import com.viaversion.viaversion.rewriter.ParticleRewriter;
 import com.viaversion.viaversion.rewriter.StatisticsRewriter;
 import com.viaversion.viaversion.rewriter.TagRewriter;
-import com.viaversion.viaversion.util.SerializerVersion;
 
 import static com.viaversion.viaversion.util.ProtocolUtil.packetTypeMap;
 
@@ -192,7 +191,8 @@ protected void registerPackets() {
  @Override
  public void init(final UserConnection connection) {
  addEntityTracker(connection, new EntityTracker1_21_9(connection, EntityTypes1_21_9.PLAYER));
- addItemHasher(connection, new ItemHasherBase(this, connection, SerializerVersion.V1_21_6, SerializerVersion.V1_21_6));
+ addItemHasher(connection, new ItemHasherBase(this, connection));
+ connection.put(new PlayerRotationStorage());
  }
 
  @Override

common/src/main/java/com/viaversion/viabackwards/protocol/v1_21_9to1_21_7/rewriter/EntityPacketRewriter1_21_9.java

@@ -24,6 +24,7 @@
 import com.viaversion.viabackwards.api.rewriters.EntityRewriter;
 import com.viaversion.viabackwards.protocol.v1_21_9to1_21_7.Protocol1_21_9To1_21_7;
 import com.viaversion.viabackwards.protocol.v1_21_9to1_21_7.storage.MannequinData;
+import com.viaversion.viabackwards.protocol.v1_21_9to1_21_7.storage.PlayerRotationStorage;
 import com.viaversion.viaversion.api.connection.UserConnection;
 import com.viaversion.viaversion.api.minecraft.BlockPosition;
 import com.viaversion.viaversion.api.minecraft.GameProfile;
@@ -38,6 +39,7 @@
 import com.viaversion.viaversion.api.type.Types;
 import com.viaversion.viaversion.api.type.types.version.VersionedTypes;
 import com.viaversion.viaversion.protocols.v1_21_5to1_21_6.packet.ClientboundPackets1_21_6;
+import com.viaversion.viaversion.protocols.v1_21_5to1_21_6.packet.ServerboundPackets1_21_6;
 import com.viaversion.viaversion.protocols.v1_21_7to1_21_9.packet.ClientboundConfigurationPackets1_21_9;
 import com.viaversion.viaversion.protocols.v1_21_7to1_21_9.packet.ClientboundPacket1_21_9;
 import com.viaversion.viaversion.protocols.v1_21_7to1_21_9.packet.ClientboundPackets1_21_9;
@@ -101,11 +103,21 @@ public void registerPackets() {
  });
 
  protocol.registerClientbound(ClientboundPackets1_21_9.PLAYER_ROTATION, wrapper -> {
- // TODO track
- wrapper.passthrough(Types.FLOAT); // Y rotation
- final boolean relativeY = wrapper.read(Types.BOOLEAN);
- wrapper.passthrough(Types.FLOAT); // X rotation
- final boolean relativeX = wrapper.read(Types.BOOLEAN);
+ final PlayerRotationStorage storage = wrapper.user().get(PlayerRotationStorage.class);
+
+ float yRot = wrapper.read(Types.FLOAT);
+ if (wrapper.read(Types.BOOLEAN)) {
+ yRot = storage.yaw() + yRot;
+ }
+
+ float xRot = wrapper.read(Types.FLOAT);
+ if (wrapper.read(Types.BOOLEAN)) {
+ xRot = storage.pitch() + xRot;
+ }
+
+ wrapper.write(Types.FLOAT, yRot);
+ wrapper.write(Types.FLOAT, xRot);
+ storage.setRotation(yRot, xRot); // Update after having used its previous data
  });
 
  protocol.registerClientbound(ClientboundPackets1_21_9.SET_DEFAULT_SPAWN_POSITION, wrapper -> {
@@ -117,6 +129,16 @@ public void registerPackets() {
 
  final RegistryDataRewriter registryDataRewriter = new BackwardsRegistryRewriter(protocol);
  protocol.registerClientbound(ClientboundConfigurationPackets1_21_9.REGISTRY_DATA, registryDataRewriter::handle);
+
+ protocol.registerServerbound(ServerboundPackets1_21_6.MOVE_PLAYER_POS_ROT, wrapper -> {
+ wrapper.passthrough(Types.DOUBLE); // X
+ wrapper.passthrough(Types.DOUBLE); // Y
+ wrapper.passthrough(Types.DOUBLE); // Z
+
+ storePlayerRotation(wrapper);
+ });
+
+ protocol.registerServerbound(ServerboundPackets1_21_6.MOVE_PLAYER_ROT, this::storePlayerRotation);
  }
 
  private void sendInitialPlayerInfoUpdate(final PacketWrapper wrapper, final MannequinData mannequinData) {
@@ -204,6 +226,13 @@ private void writeMovementShorts(final PacketWrapper wrapper, final Vector3d mov
  wrapper.write(Types.SHORT, (short) (movement.z() * 8000));
  }
 
+ private void storePlayerRotation(final PacketWrapper wrapper) {
+ final float yaw = wrapper.passthrough(Types.FLOAT);
+ final float pitch = wrapper.passthrough(Types.FLOAT);
+
+ wrapper.user().get(PlayerRotationStorage.class).setRotation(yaw, pitch);
+ }
+
  @Override
  protected void registerRewrites() {
  final EntityDataTypes1_21_5 entityDataTypes = protocol.mappedTypes().entityDataTypes();

common/src/main/java/com/viaversion/viabackwards/protocol/v1_21_9to1_21_7/storage/PlayerRotationStorage.java

@@ -0,0 +1,38 @@
+/*
+ * This file is part of ViaBackwards - https://github.com/ViaVersion/ViaBackwards
+ * Copyright (C) 2016-2025 ViaVersion 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 com.viaversion.viabackwards.protocol.v1_21_9to1_21_7.storage;
+
+import com.viaversion.viaversion.api.connection.StorableObject;
+
+public final class PlayerRotationStorage implements StorableObject {
+
+ private float yaw, pitch;
+
+ public void setRotation(final float yaw, final float pitch) {
+ this.yaw = yaw;
+ this.pitch = pitch;
+ }
+
+ public float yaw() {
+ return yaw;
+ }
+
+ public float pitch() {
+ return pitch;
+ }
+}