Fix world border scale in 1.21.7->1.21.9

kennytv · kennytv · commit fb18f69a0b4c · 2025-10-05T22:05:44.000+02:00
diff --git a/api/src/main/java/com/viaversion/viaversion/api/data/entity/EntityTracker.java b/api/src/main/java/com/viaversion/viaversion/api/data/entity/EntityTracker.java
@@ -185,6 +185,20 @@ public interface EntityTracker {
      */
     void setCurrentWorld(String currentWorld);
 
+    /**
+     * Returns the id of the current dimension, or -1 if unset (i.e. before 1.20.5).
+     *
+     * @return id of the current dimension, or -1 if unset
+     */
+    int currentDimensionId();
+
+    /**
+     * Sets the id of the current dimension.
+     *
+     * @param currentDimensionId id of the current dimension
+     */
+    void setCurrentDimensionId(int currentDimensionId);
+
     int biomesSent();
 
     void setBiomesSent(int biomesSent);
diff --git a/common/src/main/java/com/viaversion/viaversion/data/entity/EntityTrackerBase.java b/common/src/main/java/com/viaversion/viaversion/data/entity/EntityTrackerBase.java
@@ -41,6 +41,7 @@ public class EntityTrackerBase implements EntityTracker, ClientEntityIdChangeLis
     private int currentWorldSectionHeight = -1;
     private int currentMinY;
     private String currentWorld;
+    private int currentDimensionId = -1;
     private int biomesSent = -1;
     private Map<String, DimensionData> dimensions = Collections.emptyMap();
     private boolean instaBuild;
@@ -182,6 +183,16 @@ public void setCurrentWorld(final String currentWorld) {
         this.currentWorld = currentWorld;
     }
 
+    @Override
+    public int currentDimensionId() {
+        return currentDimensionId;
+    }
+
+    @Override
+    public void setCurrentDimensionId(final int currentDimensionId) {
+        this.currentDimensionId = currentDimensionId;
+    }
+
     @Override
     public int biomesSent() {
         return biomesSent;
diff --git a/common/src/main/java/com/viaversion/viaversion/protocols/v1_21_7to1_21_9/Protocol1_21_7To1_21_9.java b/common/src/main/java/com/viaversion/viaversion/protocols/v1_21_7to1_21_9/Protocol1_21_7To1_21_9.java
@@ -49,6 +49,7 @@
 import com.viaversion.viaversion.protocols.v1_21_7to1_21_9.rewriter.ComponentRewriter1_21_9;
 import com.viaversion.viaversion.protocols.v1_21_7to1_21_9.rewriter.EntityPacketRewriter1_21_9;
 import com.viaversion.viaversion.protocols.v1_21_7to1_21_9.rewriter.ParticleRewriter1_21_9;
+import com.viaversion.viaversion.protocols.v1_21_7to1_21_9.storage.DimensionScaleStorage;
 import com.viaversion.viaversion.protocols.v1_21to1_21_2.storage.LastExplosionPowerStorage;
 import com.viaversion.viaversion.rewriter.AttributeRewriter;
 import com.viaversion.viaversion.rewriter.ParticleRewriter;
@@ -197,6 +198,7 @@ protected void onMappingDataLoaded() {
     public void init(final UserConnection connection) {
         addEntityTracker(connection, new EntityTrackerBase(connection, EntityTypes1_21_9.PLAYER));
         addItemHasher(connection, new ItemHasherBase(this, connection));
+        connection.put(new DimensionScaleStorage());
     }
 
     @Override
diff --git a/common/src/main/java/com/viaversion/viaversion/protocols/v1_21_7to1_21_9/rewriter/BlockItemPacketRewriter1_21_9.java b/common/src/main/java/com/viaversion/viaversion/protocols/v1_21_7to1_21_9/rewriter/BlockItemPacketRewriter1_21_9.java
@@ -18,6 +18,7 @@
 package com.viaversion.viaversion.protocols.v1_21_7to1_21_9.rewriter;
 
 import com.viaversion.viaversion.api.connection.UserConnection;
+import com.viaversion.viaversion.api.data.entity.EntityTracker;
 import com.viaversion.viaversion.api.minecraft.ResolvableProfile;
 import com.viaversion.viaversion.api.minecraft.data.StructuredDataContainer;
 import com.viaversion.viaversion.api.minecraft.data.StructuredDataKey;
@@ -26,13 +27,16 @@
 import com.viaversion.viaversion.api.minecraft.item.data.Bee;
 import com.viaversion.viaversion.api.minecraft.item.data.BlockEntityData;
 import com.viaversion.viaversion.api.minecraft.item.data.EntityData;
+import com.viaversion.viaversion.api.protocol.packet.PacketWrapper;
+import com.viaversion.viaversion.api.type.Types;
 import com.viaversion.viaversion.api.type.types.chunk.ChunkType1_21_5;
 import com.viaversion.viaversion.protocols.v1_21_4to1_21_5.rewriter.RecipeDisplayRewriter1_21_5;
 import com.viaversion.viaversion.protocols.v1_21_5to1_21_6.packet.ClientboundPacket1_21_6;
 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.Protocol1_21_7To1_21_9;
 import com.viaversion.viaversion.protocols.v1_21_7to1_21_9.packet.ServerboundPacket1_21_9;
+import com.viaversion.viaversion.protocols.v1_21_7to1_21_9.storage.DimensionScaleStorage;
 import com.viaversion.viaversion.rewriter.BlockRewriter;
 import com.viaversion.viaversion.rewriter.RecipeDisplayRewriter;
 import com.viaversion.viaversion.rewriter.StructuredItemRewriter;
@@ -68,6 +72,9 @@ public void registerPackets() {
         recipeRewriter.registerUpdateRecipes(ClientboundPackets1_21_6.UPDATE_RECIPES);
         recipeRewriter.registerRecipeBookAdd(ClientboundPackets1_21_6.RECIPE_BOOK_ADD);
         recipeRewriter.registerPlaceGhostRecipe(ClientboundPackets1_21_6.PLACE_GHOST_RECIPE);
+
+        protocol.registerClientbound(ClientboundPackets1_21_6.INITIALIZE_BORDER, this::updateBorderCenter);
+        protocol.registerClientbound(ClientboundPackets1_21_6.SET_BORDER_CENTER, this::updateBorderCenter);
     }
 
     @Override
@@ -116,4 +123,19 @@ public static void downgradeData(final Item item, final StructuredDataContainer
         });
         container.replace(StructuredDataKey.PROFILE1_21_9, StructuredDataKey.PROFILE1_20_5, ResolvableProfile::profile);
     }
+
+    private void updateBorderCenter(final PacketWrapper wrapper) {
+        double centerX = wrapper.read(Types.DOUBLE);
+        double centerZ = wrapper.read(Types.DOUBLE);
+
+        final EntityTracker tracker = protocol.getEntityRewriter().tracker(wrapper.user());
+        if (tracker.currentDimensionId() != -1) {
+            final double scale = wrapper.user().get(DimensionScaleStorage.class).getScale(tracker.currentDimensionId());
+            centerX /= scale;
+            centerZ /= scale;
+        }
+
+        wrapper.write(Types.DOUBLE, centerX);
+        wrapper.write(Types.DOUBLE, centerZ);
+    }
 }
diff --git a/common/src/main/java/com/viaversion/viaversion/protocols/v1_21_7to1_21_9/rewriter/EntityPacketRewriter1_21_9.java b/common/src/main/java/com/viaversion/viaversion/protocols/v1_21_7to1_21_9/rewriter/EntityPacketRewriter1_21_9.java
@@ -18,8 +18,10 @@
 package com.viaversion.viaversion.protocols.v1_21_7to1_21_9.rewriter;
 
 import com.viaversion.nbt.tag.CompoundTag;
+import com.viaversion.viaversion.api.connection.UserConnection;
 import com.viaversion.viaversion.api.minecraft.BlockPosition;
 import com.viaversion.viaversion.api.minecraft.GlobalBlockPosition;
+import com.viaversion.viaversion.api.minecraft.RegistryEntry;
 import com.viaversion.viaversion.api.minecraft.Vector3d;
 import com.viaversion.viaversion.api.minecraft.entities.EntityType;
 import com.viaversion.viaversion.api.minecraft.entities.EntityTypes1_21_9;
@@ -31,6 +33,7 @@
 import com.viaversion.viaversion.protocols.v1_21_5to1_21_6.packet.ClientboundPacket1_21_6;
 import com.viaversion.viaversion.protocols.v1_21_5to1_21_6.packet.ClientboundPackets1_21_6;
 import com.viaversion.viaversion.protocols.v1_21_7to1_21_9.Protocol1_21_7To1_21_9;
+import com.viaversion.viaversion.protocols.v1_21_7to1_21_9.storage.DimensionScaleStorage;
 import com.viaversion.viaversion.rewriter.EntityRewriter;
 import com.viaversion.viaversion.rewriter.RegistryDataRewriter;
 import com.viaversion.viaversion.rewriter.entitydata.EntityDataHandler;
@@ -103,6 +106,28 @@ protected void handleParticleData(final CompoundTag particleData) {
                 }
                 super.handleParticleData(particleData);
             }
+
+            @Override
+            public void trackDimensionAndBiomes(final UserConnection connection, final String registryKey, final RegistryEntry[] entries) {
+                super.trackDimensionAndBiomes(connection, registryKey, entries);
+                if (!registryKey.equals("dimension_type")) {
+                    return;
+                }
+
+                final DimensionScaleStorage dimensionScaleStorage = connection.get(DimensionScaleStorage.class);
+                for (int i = 0; i < entries.length; i++) {
+                    final RegistryEntry entry = entries[i];
+                    final CompoundTag dimension = (CompoundTag) entry.tag();
+                    if (dimension == null) {
+                        continue;
+                    }
+
+                    final double coordinateScale = dimension.getDouble("coordinate_scale", 1);
+                    if (coordinateScale != 1 && coordinateScale != 0) {
+                        dimensionScaleStorage.setScale(i, coordinateScale);
+                    }
+                }
+            }
         };
         registryDataRewriter.addHandler("dimension_type", (key, dimension) -> {
             if (Key.equals(key, "minecraft:the_end")) {
diff --git a/common/src/main/java/com/viaversion/viaversion/protocols/v1_21_7to1_21_9/storage/DimensionScaleStorage.java b/common/src/main/java/com/viaversion/viaversion/protocols/v1_21_7to1_21_9/storage/DimensionScaleStorage.java
@@ -0,0 +1,35 @@
+/*
+ * This file is part of ViaVersion - https://github.com/ViaVersion/ViaVersion
+ * 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.viaversion.protocols.v1_21_7to1_21_9.storage;
+
+import com.viaversion.viaversion.api.connection.StorableObject;
+import java.util.HashMap;
+import java.util.Map;
+
+public final class DimensionScaleStorage implements StorableObject {
+
+    private final Map<Integer, Double> dimensionScales = new HashMap<>(4);
+
+    public double getScale(final int dimensionId) {
+        return dimensionScales.getOrDefault(dimensionId, 1D);
+    }
+
+    public void setScale(final int dimensionId, final double scale) {
+        dimensionScales.put(dimensionId, scale);
+    }
+}
diff --git a/common/src/main/java/com/viaversion/viaversion/rewriter/EntityRewriter.java b/common/src/main/java/com/viaversion/viaversion/rewriter/EntityRewriter.java
@@ -536,6 +536,7 @@ public void trackWorldDataByKey1_20_5(final UserConnection connection, final int
             dimensionData = tracker.dimensionData("overworld");
             Preconditions.checkNotNull(dimensionData, "Overworld data missing");
         }
+        tracker.setCurrentDimensionId(dimensionId);
         tracker.setCurrentWorldSectionHeight(dimensionData.height() >> 4);
         tracker.setCurrentMinY(dimensionData.minY());
         trackWorld(connection, world);

Original file line number	Diff line number	Diff line change
`@@ -536,6 +536,7 @@ public void trackWorldDataByKey1_20_5(final UserConnection connection, final int`
`536`	`536`	`dimensionData = tracker.dimensionData("overworld");`
`537`	`537`	`Preconditions.checkNotNull(dimensionData, "Overworld data missing");`
`538`	`538`	`}`
	`539`	`+ tracker.setCurrentDimensionId(dimensionId);`
`539`	`540`	`tracker.setCurrentWorldSectionHeight(dimensionData.height() >> 4);`
`540`	`541`	`tracker.setCurrentMinY(dimensionData.minY());`
`541`	`542`	`trackWorld(connection, world);`