Fix world border scale in 1.21.9->1.21.7

kennytv · kennytv · commit 64b454de6f28 · 2025-10-05T22:20:44.000+02:00
diff --git a/common/src/main/java/com/viaversion/viabackwards/api/ViaBackwardsPlatform.java b/common/src/main/java/com/viaversion/viabackwards/api/ViaBackwardsPlatform.java
@@ -77,7 +77,7 @@
 
 public interface ViaBackwardsPlatform {
 
-    String MINIMUM_VV_VERSION = "5.5.0";
+    String MINIMUM_VV_VERSION = "5.5.1";
 
     /**
      * Initialize ViaBackwards.
diff --git a/common/src/main/java/com/viaversion/viabackwards/protocol/v1_21_9to1_21_7/Protocol1_21_9To1_21_7.java b/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.DimensionScaleStorage;
 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;
@@ -205,6 +206,7 @@ public void init(final UserConnection connection) {
         addEntityTracker(connection, new EntityTracker1_21_9(connection, EntityTypes1_21_9.PLAYER));
         addItemHasher(connection, new ItemHasherBase(this, connection));
         connection.put(new PlayerRotationStorage());
+        connection.put(new DimensionScaleStorage());
     }
 
     @Override
diff --git a/common/src/main/java/com/viaversion/viabackwards/protocol/v1_21_9to1_21_7/rewriter/BlockItemPacketRewriter1_21_9.java b/common/src/main/java/com/viaversion/viabackwards/protocol/v1_21_9to1_21_7/rewriter/BlockItemPacketRewriter1_21_9.java
@@ -20,11 +20,15 @@
 import com.viaversion.nbt.tag.CompoundTag;
 import com.viaversion.viabackwards.api.rewriters.BackwardsStructuredItemRewriter;
 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.DimensionScaleStorage;
 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;
 import com.viaversion.viaversion.api.minecraft.item.Item;
+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.ServerboundPacket1_21_6;
@@ -68,6 +72,9 @@ public void registerPackets() {
         recipeRewriter.registerUpdateRecipes(ClientboundPackets1_21_9.UPDATE_RECIPES);
         recipeRewriter.registerRecipeBookAdd(ClientboundPackets1_21_9.RECIPE_BOOK_ADD);
         recipeRewriter.registerPlaceGhostRecipe(ClientboundPackets1_21_9.PLACE_GHOST_RECIPE);
+
+        protocol.registerClientbound(ClientboundPackets1_21_9.INITIALIZE_BORDER, this::updateBorderCenter);
+        protocol.registerClientbound(ClientboundPackets1_21_9.SET_BORDER_CENTER, this::updateBorderCenter);
     }
 
     @Override
@@ -123,4 +130,19 @@ protected void restoreBackupData(final Item item, final StructuredDataContainer
             ));
         }
     }
+
+    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/viabackwards/protocol/v1_21_9to1_21_7/rewriter/EntityPacketRewriter1_21_9.java b/common/src/main/java/com/viaversion/viabackwards/protocol/v1_21_9to1_21_7/rewriter/EntityPacketRewriter1_21_9.java
@@ -23,12 +23,14 @@
 import com.viaversion.viabackwards.api.rewriters.BackwardsRegistryRewriter;
 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.DimensionScaleStorage;
 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;
 import com.viaversion.viaversion.api.minecraft.GlobalBlockPosition;
+import com.viaversion.viaversion.api.minecraft.RegistryEntry;
 import com.viaversion.viaversion.api.minecraft.ResolvableProfile;
 import com.viaversion.viaversion.api.minecraft.Vector3d;
 import com.viaversion.viaversion.api.minecraft.entities.EntityType;
@@ -127,7 +129,27 @@ public void registerPackets() {
             wrapper.read(Types.FLOAT); // Pitch
         });
 
-        final RegistryDataRewriter registryDataRewriter = new BackwardsRegistryRewriter(protocol);
+        final RegistryDataRewriter registryDataRewriter = new BackwardsRegistryRewriter(protocol) {
+            @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);
+                    dimensionScaleStorage.setScale(i, coordinateScale);
+                }
+            }
+        };
         protocol.registerClientbound(ClientboundConfigurationPackets1_21_9.REGISTRY_DATA, registryDataRewriter::handle);
 
         protocol.registerServerbound(ServerboundPackets1_21_6.MOVE_PLAYER_POS_ROT, wrapper -> {
diff --git a/common/src/main/java/com/viaversion/viabackwards/protocol/v1_21_9to1_21_7/storage/DimensionScaleStorage.java b/common/src/main/java/com/viaversion/viabackwards/protocol/v1_21_9to1_21_7/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.viabackwards.protocol.v1_21_9to1_21_7.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/gradle/libs.versions.toml b/gradle/libs.versions.toml
@@ -3,7 +3,7 @@ metadata.format.version = "1.1"
 [versions]
 
 # ViaVersion
-viaver = "5.5.0"
+viaver = "5.5.1-SNAPSHOT"
 
 # Common provided
 netty = "4.0.20.Final"
diff --git a/sponge/src/main/resources/META-INF/sponge_plugins.json b/sponge/src/main/resources/META-INF/sponge_plugins.json
@@ -47,7 +47,7 @@
       },
       {
         "id": "viaversion",
-        "version": "[5.5.0-SNAPSHOT,)"
+        "version": "[5.5.1-SNAPSHOT,)"
       }
     ]
   },

Original file line number	Diff line number	Diff line change
`@@ -47,7 +47,7 @@`
`47`	`47`	`},`
`48`	`48`	`{`
`49`	`49`	`"id": "viaversion",`
`50`		`- "version": "[5.5.0-SNAPSHOT,)"`
	`50`	`+ "version": "[5.5.1-SNAPSHOT,)"`
`51`	`51`	`}`
`52`	`52`	`]`
`53`	`53`	`},`