Fix 1.19->1.18 painting offsets

Fixes #964

Author: kennytv

common/src/main/java/com/viaversion/viabackwards/protocol/v1_19to1_18_2/rewriter/EntityPacketRewriter1_19.java

@@ -40,13 +40,21 @@
 import com.viaversion.viaversion.api.type.Types;
 import com.viaversion.viaversion.api.type.types.version.Types1_18;
 import com.viaversion.viaversion.api.type.types.version.Types1_19;
+import com.viaversion.viaversion.libs.fastutil.ints.IntOpenHashSet;
+import com.viaversion.viaversion.libs.fastutil.ints.IntSet;
 import com.viaversion.viaversion.protocols.v1_17_1to1_18.packet.ClientboundPackets1_18;
 import com.viaversion.viaversion.protocols.v1_18_2to1_19.packet.ClientboundPackets1_19;
 import com.viaversion.viaversion.util.Key;
 import com.viaversion.viaversion.util.TagUtil;
 
 public final class EntityPacketRewriter1_19 extends EntityRewriter<ClientboundPackets1_19, Protocol1_19To1_18_2> {
 
+    private static final IntSet WIDE_PAINTINGS = IntOpenHashSet.of(
+        7, 8, 9, 10, 11,
+        14, 15, 16, 17, 18, 19, 20,
+        21, 22, 23, 24, 25
+    );
+
     public EntityPacketRewriter1_19(final Protocol1_19To1_18_2 protocol) {
         super(protocol);
     }
@@ -89,7 +97,10 @@ public void register() {
                         // The entity has been tracked, now we wait for the entity data packet
                         final int entityId = wrapper.get(Types.VAR_INT, 0);
                         final StoredEntityData entityData = tracker(wrapper.user()).entityData(entityId);
-                        final BlockPosition position = new BlockPosition(wrapper.get(Types.DOUBLE, 0).intValue(), wrapper.get(Types.DOUBLE, 1).intValue(), wrapper.get(Types.DOUBLE, 2).intValue());
+                        final int x = wrapper.get(Types.DOUBLE, 0).intValue();
+                        final int y = wrapper.get(Types.DOUBLE, 1).intValue();
+                        final int z = wrapper.get(Types.DOUBLE, 2).intValue();
+                        final BlockPosition position = new BlockPosition(x, y, z);
                         entityData.put(new StoredPainting(entityId, wrapper.get(Types.UUID, 0), position, data));
                         return;
                     }
@@ -102,6 +113,31 @@ public void register() {
             }
         });
 
+        protocol.registerClientbound(ClientboundPackets1_19.TELEPORT_ENTITY, wrapper -> {
+            final int entityId = wrapper.passthrough(Types.VAR_INT);
+            if (tracker(wrapper.user()).entityType(entityId) != EntityTypes1_19.PAINTING) {
+                return;
+            }
+
+            final double x = wrapper.read(Types.DOUBLE);
+            final double y = wrapper.read(Types.DOUBLE);
+            final double z = wrapper.read(Types.DOUBLE);
+
+            final StoredEntityData entityData = tracker(wrapper.user()).entityDataIfPresent(entityId);
+            final StoredPainting storedPainting = entityData != null ? entityData.get(StoredPainting.class) : null;
+            // Presumably there is a more correct way of fixing this? Only north and east looking paintings with a width of >1 seem to be extra special
+            if (storedPainting != null && (storedPainting.direction() == 2 || storedPainting.direction() == 3)
+                && WIDE_PAINTINGS.contains(storedPainting.type())) {
+                wrapper.write(Types.DOUBLE, storedPainting.direction() == 2 ? x : x + 1);
+                wrapper.write(Types.DOUBLE, y + 1);
+                wrapper.write(Types.DOUBLE, storedPainting.direction() == 3 ? z : z + 1);
+            } else {
+                wrapper.write(Types.DOUBLE, x + 1);
+                wrapper.write(Types.DOUBLE, y + 1);
+                wrapper.write(Types.DOUBLE, z + 1);
+            }
+        });
+
         protocol.registerClientbound(ClientboundPackets1_19.UPDATE_MOB_EFFECT, new PacketHandlers() {
             @Override
             public void register() {
@@ -327,12 +363,15 @@ protected void registerRewrites() {
             event.cancel();
 
             final StoredEntityData entityData = tracker(event.user()).entityDataIfPresent(event.entityId());
-            final StoredPainting storedPainting = entityData.remove(StoredPainting.class);
+            final StoredPainting storedPainting = entityData != null ? entityData.get(StoredPainting.class) : null;
             if (storedPainting != null) {
+                final int type = data.value();
+                storedPainting.setType(type);
+
                 final PacketWrapper packet = PacketWrapper.create(ClientboundPackets1_18.ADD_PAINTING, event.user());
                 packet.write(Types.VAR_INT, storedPainting.entityId());
                 packet.write(Types.UUID, storedPainting.uuid());
-                packet.write(Types.VAR_INT, data.value());
+                packet.write(Types.VAR_INT, type);
                 packet.write(Types.BLOCK_POSITION1_14, storedPainting.position());
                 packet.write(Types.BYTE, storedPainting.direction());
                 try {

common/src/main/java/com/viaversion/viabackwards/protocol/v1_19to1_18_2/storage/StoredPainting.java

@@ -22,17 +22,32 @@
 import java.util.UUID;
 
 public final class StoredPainting implements StorableObject {
-
     private final int entityId;
     private final UUID uuid;
     private final BlockPosition position;
     private final byte direction;
+    private int type;
 
-    public StoredPainting(final int entityId, final UUID uuid, final BlockPosition position, final int direction3d) {
+    public StoredPainting(int entityId, UUID uuid, BlockPosition position, byte direction) {
         this.entityId = entityId;
         this.uuid = uuid;
         this.position = position;
-        this.direction = to2dDirection(direction3d);
+        this.direction = direction;
+    }
+
+    public StoredPainting(final int entityId, final UUID uuid, final BlockPosition position, final int direction) {
+        this(entityId, uuid, position, to2dDirection(direction));
+    }
+
+    private static byte to2dDirection(int direction) {
+        return switch (direction) {
+            case 0, 1 -> -1; // No worky
+            case 2 -> 2;
+            case 3 -> 0;
+            case 4 -> 1;
+            case 5 -> 3;
+            default -> throw new IllegalArgumentException("Invalid direction: " + direction);
+        };
     }
 
     public int entityId() {
@@ -51,14 +66,11 @@ public byte direction() {
         return direction;
     }
 
-    private byte to2dDirection(int direction) {
-        return switch (direction) {
-            case 0, 1 -> -1; // No worky
-            case 2 -> 2;
-            case 3 -> 0;
-            case 4 -> 1;
-            case 5 -> 3;
-            default -> throw new IllegalArgumentException("Invalid direction: " + direction);
-        };
+    public int type() {
+        return type;
+    }
+
+    public void setType(final int type) {
+        this.type = type;
     }
 }