From ec2f118d8032de38a7c9be37ed8b8fc1bef5d6cf Mon Sep 17 00:00:00 2001
From: Myles <myles@myles.us>
Date: Sun, 6 Dec 2020 09:37:00 +0000
Subject: [PATCH] Dimension Name -> World Name

---
 .../Protocol1_15_2To1_16.java                 |  4 ++--
 .../data/DimensionNameTracker.java            | 20 -------------------
 .../data/WorldNameTracker.java                | 20 +++++++++++++++++++
 .../packets/EntityPackets1_16.java            | 16 +++++++--------
 4 files changed, 30 insertions(+), 30 deletions(-)
 delete mode 100644 core/src/main/java/nl/matsv/viabackwards/protocol/protocol1_15_2to1_16/data/DimensionNameTracker.java
 create mode 100644 core/src/main/java/nl/matsv/viabackwards/protocol/protocol1_15_2to1_16/data/WorldNameTracker.java

diff --git a/core/src/main/java/nl/matsv/viabackwards/protocol/protocol1_15_2to1_16/Protocol1_15_2To1_16.java b/core/src/main/java/nl/matsv/viabackwards/protocol/protocol1_15_2to1_16/Protocol1_15_2To1_16.java
index df13c809..30342646 100644
--- a/core/src/main/java/nl/matsv/viabackwards/protocol/protocol1_15_2to1_16/Protocol1_15_2To1_16.java
+++ b/core/src/main/java/nl/matsv/viabackwards/protocol/protocol1_15_2to1_16/Protocol1_15_2To1_16.java
@@ -6,7 +6,7 @@ import nl.matsv.viabackwards.api.rewriters.SoundRewriter;
 import nl.matsv.viabackwards.api.rewriters.TranslatableRewriter;
 import nl.matsv.viabackwards.protocol.protocol1_15_2to1_16.chat.TranslatableRewriter1_16;
 import nl.matsv.viabackwards.protocol.protocol1_15_2to1_16.data.BackwardsMappings;
-import nl.matsv.viabackwards.protocol.protocol1_15_2to1_16.data.DimensionNameTracker;
+import nl.matsv.viabackwards.protocol.protocol1_15_2to1_16.data.WorldNameTracker;
 import nl.matsv.viabackwards.protocol.protocol1_15_2to1_16.packets.BlockItemPackets1_16;
 import nl.matsv.viabackwards.protocol.protocol1_15_2to1_16.packets.EntityPackets1_16;
 import nl.matsv.viabackwards.protocol.protocol1_15_2to1_16.storage.PlayerSneakStorage;
@@ -182,7 +182,7 @@ public class Protocol1_15_2To1_16 extends BackwardsProtocol<ClientboundPackets1_
             user.put(new EntityTracker(user));
         }
         user.put(new PlayerSneakStorage(user));
-        user.put(new DimensionNameTracker(user));
+        user.put(new WorldNameTracker(user));
         user.get(EntityTracker.class).initProtocol(this);
     }
 
diff --git a/core/src/main/java/nl/matsv/viabackwards/protocol/protocol1_15_2to1_16/data/DimensionNameTracker.java b/core/src/main/java/nl/matsv/viabackwards/protocol/protocol1_15_2to1_16/data/DimensionNameTracker.java
deleted file mode 100644
index 0856460e..00000000
--- a/core/src/main/java/nl/matsv/viabackwards/protocol/protocol1_15_2to1_16/data/DimensionNameTracker.java
+++ /dev/null
@@ -1,20 +0,0 @@
-package nl.matsv.viabackwards.protocol.protocol1_15_2to1_16.data;
-
-import us.myles.ViaVersion.api.data.StoredObject;
-import us.myles.ViaVersion.api.data.UserConnection;
-
-public class DimensionNameTracker extends StoredObject {
-    private String dimensionName;
-
-    public DimensionNameTracker(UserConnection user) {
-        super(user);
-    }
-
-    public String getDimensionName() {
-        return dimensionName;
-    }
-
-    public void setDimensionName(String dimensionName) {
-        this.dimensionName = dimensionName;
-    }
-}
diff --git a/core/src/main/java/nl/matsv/viabackwards/protocol/protocol1_15_2to1_16/data/WorldNameTracker.java b/core/src/main/java/nl/matsv/viabackwards/protocol/protocol1_15_2to1_16/data/WorldNameTracker.java
new file mode 100644
index 00000000..5916c1e0
--- /dev/null
+++ b/core/src/main/java/nl/matsv/viabackwards/protocol/protocol1_15_2to1_16/data/WorldNameTracker.java
@@ -0,0 +1,20 @@
+package nl.matsv.viabackwards.protocol.protocol1_15_2to1_16.data;
+
+import us.myles.ViaVersion.api.data.StoredObject;
+import us.myles.ViaVersion.api.data.UserConnection;
+
+public class WorldNameTracker extends StoredObject {
+    private String worldName;
+
+    public WorldNameTracker(UserConnection user) {
+        super(user);
+    }
+
+    public String getWorldName() {
+        return worldName;
+    }
+
+    public void setWorldName(String worldName) {
+        this.worldName = worldName;
+    }
+}
diff --git a/core/src/main/java/nl/matsv/viabackwards/protocol/protocol1_15_2to1_16/packets/EntityPackets1_16.java b/core/src/main/java/nl/matsv/viabackwards/protocol/protocol1_15_2to1_16/packets/EntityPackets1_16.java
index 582a3a80..345b9080 100644
--- a/core/src/main/java/nl/matsv/viabackwards/protocol/protocol1_15_2to1_16/packets/EntityPackets1_16.java
+++ b/core/src/main/java/nl/matsv/viabackwards/protocol/protocol1_15_2to1_16/packets/EntityPackets1_16.java
@@ -2,7 +2,7 @@ package nl.matsv.viabackwards.protocol.protocol1_15_2to1_16.packets;
 
 import nl.matsv.viabackwards.api.rewriters.EntityRewriter;
 import nl.matsv.viabackwards.protocol.protocol1_15_2to1_16.Protocol1_15_2To1_16;
-import nl.matsv.viabackwards.protocol.protocol1_15_2to1_16.data.DimensionNameTracker;
+import nl.matsv.viabackwards.protocol.protocol1_15_2to1_16.data.WorldNameTracker;
 import us.myles.ViaVersion.api.PacketWrapper;
 import us.myles.ViaVersion.api.entities.Entity1_15Types;
 import us.myles.ViaVersion.api.entities.Entity1_16Types;
@@ -53,8 +53,8 @@ public class EntityPackets1_16 extends EntityRewriter<Protocol1_15_2To1_16> {
                 map(dimensionTransformer); // Dimension Type
                 handler(wrapper -> {
                     // Grab the tracker for dimension names
-                    DimensionNameTracker dimensionNameTracker = wrapper.user().get(DimensionNameTracker.class);
-                    String nextDimensionName = wrapper.read(Type.STRING); // Dimension
+                    WorldNameTracker worldNameTracker = wrapper.user().get(WorldNameTracker.class);
+                    String nextWorldName = wrapper.read(Type.STRING); // World Name
 
                     wrapper.passthrough(Type.LONG); // Seed
                     wrapper.passthrough(Type.UNSIGNED_BYTE); // Gamemode
@@ -65,7 +65,7 @@ public class EntityPackets1_16 extends EntityRewriter<Protocol1_15_2To1_16> {
                     int dimension = wrapper.get(Type.INT, 0);
 
                     // Send a dummy respawn with a different dimension if the previous one is equal to the new
-                    if (clientWorld.getEnvironment() != null && dimension == clientWorld.getEnvironment().getId() && !nextDimensionName.equals(dimensionNameTracker.getDimensionName())) {
+                    if (clientWorld.getEnvironment() != null && dimension == clientWorld.getEnvironment().getId() && !nextWorldName.equals(worldNameTracker.getWorldName())) {
                         PacketWrapper packet = wrapper.create(ClientboundPackets1_15.RESPAWN.ordinal());
                         packet.write(Type.INT, dimension == 0 ? -1 : 0);
                         packet.write(Type.LONG, 0L);
@@ -83,8 +83,8 @@ public class EntityPackets1_16 extends EntityRewriter<Protocol1_15_2To1_16> {
                     }
                     wrapper.read(Type.BOOLEAN); // Keep all playerdata
 
-                    // Finally update the dimension
-                    dimensionNameTracker.setDimensionName(nextDimensionName);
+                    // Finally update the world name
+                    worldNameTracker.setWorldName(nextWorldName);
                 });
             }
         });
@@ -99,8 +99,8 @@ public class EntityPackets1_16 extends EntityRewriter<Protocol1_15_2To1_16> {
                 map(Type.NBT, Type.NOTHING); // whatever this is
                 map(dimensionTransformer); // Dimension Type
                 handler(wrapper -> {
-                    DimensionNameTracker dimensionNameTracker = wrapper.user().get(DimensionNameTracker.class);
-                    dimensionNameTracker.setDimensionName(wrapper.read(Type.STRING)); // Save the dimension name
+                    WorldNameTracker worldNameTracker = wrapper.user().get(WorldNameTracker.class);
+                    worldNameTracker.setWorldName(wrapper.read(Type.STRING)); // Save the world name
                 });
                 map(Type.LONG); // Seed
                 map(Type.UNSIGNED_BYTE); // Max players