Delete duplicated DimensionTracker and use ClientWorld instead

ViaVersion · Sep 14, 2024 · aa2e231 · aa2e231
1 parent 32d0952
commit aa2e231
Show file tree

Hide file tree

Showing 8 changed files with 15 additions and 169 deletions.
diff --git a/...in/java/net/raphimc/vialegacy/protocol/release/r1_1tor1_2_1_3/Protocolr1_1Tor1_2_1_3.java b/...in/java/net/raphimc/vialegacy/protocol/release/r1_1tor1_2_1_3/Protocolr1_1Tor1_2_1_3.java
@@ -21,6 +21,7 @@
 import com.viaversion.viaversion.api.connection.UserConnection;
 import com.viaversion.viaversion.api.minecraft.BlockChangeRecord;
 import com.viaversion.viaversion.api.minecraft.BlockPosition;
+import com.viaversion.viaversion.api.minecraft.ClientWorld;
 import com.viaversion.viaversion.api.minecraft.chunks.Chunk;
 import com.viaversion.viaversion.api.minecraft.chunks.ChunkSection;
 import com.viaversion.viaversion.api.minecraft.chunks.NibbleArray;
@@ -43,7 +44,6 @@
 import net.raphimc.vialegacy.protocol.release.r1_1tor1_2_1_3.packet.ClientboundPackets1_1;
 import net.raphimc.vialegacy.protocol.release.r1_1tor1_2_1_3.packet.ServerboundPackets1_1;
 import net.raphimc.vialegacy.protocol.release.r1_1tor1_2_1_3.rewriter.ItemRewriter;
-import net.raphimc.vialegacy.protocol.release.r1_1tor1_2_1_3.storage.DimensionTracker;
 import net.raphimc.vialegacy.protocol.release.r1_1tor1_2_1_3.storage.PendingBlocksTracker;
 import net.raphimc.vialegacy.protocol.release.r1_1tor1_2_1_3.storage.SeedStorage;
 import net.raphimc.vialegacy.protocol.release.r1_1tor1_2_1_3.task.BlockReceiveInvalidatorTask;
@@ -314,7 +314,7 @@ public void register() {
     }
 
     private void handleRespawn(final int dimensionId, final UserConnection user) {
-        if (user.get(DimensionTracker.class).changeDimension(dimensionId)) {
+        if (user.getClientWorld(Protocolr1_1Tor1_2_1_3.class).setEnvironment(dimensionId)) {
             user.get(PendingBlocksTracker.class).clear();
         }
 
@@ -357,10 +357,10 @@ public void register(ViaProviders providers) {
     @Override
     public void init(UserConnection userConnection) {
         userConnection.put(new PreNettySplitter(Protocolr1_1Tor1_2_1_3.class, ClientboundPackets1_1::getPacket));
+        userConnection.addClientWorld(this.getClass(), new ClientWorld());
 
         userConnection.put(new SeedStorage());
         userConnection.put(new PendingBlocksTracker(userConnection));
-        userConnection.put(new DimensionTracker());
     }
 
     @Override

diff --git a/.../java/net/raphimc/vialegacy/protocol/release/r1_1tor1_2_1_3/storage/DimensionTracker.java b/.../java/net/raphimc/vialegacy/protocol/release/r1_1tor1_2_1_3/storage/DimensionTracker.java
diff --git a/...net/raphimc/vialegacy/protocol/release/r1_2_4_5tor1_3_1_2/Protocolr1_2_4_5Tor1_3_1_2.java b/...net/raphimc/vialegacy/protocol/release/r1_2_4_5tor1_3_1_2/Protocolr1_2_4_5Tor1_3_1_2.java
@@ -53,7 +53,6 @@
 import net.raphimc.vialegacy.protocol.release.r1_2_4_5tor1_3_1_2.provider.OldAuthProvider;
 import net.raphimc.vialegacy.protocol.release.r1_2_4_5tor1_3_1_2.rewriter.ItemRewriter;
 import net.raphimc.vialegacy.protocol.release.r1_2_4_5tor1_3_1_2.storage.ChestStateTracker;
-import net.raphimc.vialegacy.protocol.release.r1_2_4_5tor1_3_1_2.storage.DimensionTracker;
 import net.raphimc.vialegacy.protocol.release.r1_2_4_5tor1_3_1_2.storage.EntityTracker;
 import net.raphimc.vialegacy.protocol.release.r1_2_4_5tor1_3_1_2.task.EntityTrackerTickTask;
 import net.raphimc.vialegacy.protocol.release.r1_2_4_5tor1_3_1_2.types.Types1_2_4;
@@ -133,7 +132,7 @@ public void register() {
                 map(Types.BYTE); // world height
                 map(Types.BYTE); // max players
                 handler(wrapper -> {
-                    wrapper.user().get(DimensionTracker.class).changeDimension(wrapper.get(Types.BYTE, 1));
+                    wrapper.user().getClientWorld(Protocolr1_2_4_5Tor1_3_1_2.class).setEnvironment(wrapper.get(Types.BYTE, 1));
                     final EntityTracker entityTracker = wrapper.user().get(EntityTracker.class);
                     entityTracker.setPlayerID(wrapper.get(Types.INT, 0));
                     entityTracker.getTrackedEntities().put(entityTracker.getPlayerID(), new TrackedLivingEntity(entityTracker.getPlayerID(), new Location(8, 64, 8), EntityTypes1_8.EntityType.PLAYER));
@@ -161,7 +160,7 @@ public void register() {
                 map(Types.SHORT); // world height
                 map(Types1_6_4.STRING); // level type
                 handler(wrapper -> {
-                    if (wrapper.user().get(DimensionTracker.class).changeDimension(wrapper.get(Types.INT, 0))) {
+                    if (wrapper.user().getClientWorld(Protocolr1_2_4_5Tor1_3_1_2.class).setEnvironment(wrapper.get(Types.INT, 0))) {
                         wrapper.user().get(ChestStateTracker.class).clear();
                         final EntityTracker entityTracker = wrapper.user().get(EntityTracker.class);
                         entityTracker.getTrackedEntities().clear();
@@ -433,13 +432,13 @@ public void register() {
 
             if (!load) {
                 final Chunk chunk = new BaseChunk(chunkX, chunkZ, true, false, 0, new ChunkSection[16], null, new ArrayList<>());
-                wrapper.write(Types1_7_6.getChunk(wrapper.user().get(DimensionTracker.class).getDimension()), chunk);
+                wrapper.write(Types1_7_6.getChunk(wrapper.user().getClientWorld(this.getClass()).getEnvironment()), chunk);
             } else {
                 wrapper.cancel();
             }
         });
         this.registerClientbound(ClientboundPackets1_2_4.LEVEL_CHUNK, wrapper -> {
-            final Environment dimension = wrapper.user().get(DimensionTracker.class).getDimension();
+            final Environment dimension = wrapper.user().getClientWorld(this.getClass()).getEnvironment();
             Chunk chunk = wrapper.read(Types1_2_4.CHUNK);
 
             wrapper.user().get(ChestStateTracker.class).unload(chunk.getX(), chunk.getZ());
@@ -776,7 +775,6 @@ public void init(UserConnection userConnection) {
 
         userConnection.put(new ChestStateTracker());
         userConnection.put(new EntityTracker(userConnection));
-        userConnection.put(new DimensionTracker());
     }
 
     @Override

diff --git a/...a/net/raphimc/vialegacy/protocol/release/r1_2_4_5tor1_3_1_2/storage/DimensionTracker.java b/...a/net/raphimc/vialegacy/protocol/release/r1_2_4_5tor1_3_1_2/storage/DimensionTracker.java
diff --git a/...ava/net/raphimc/vialegacy/protocol/release/r1_6_4tor1_7_2_5/Protocolr1_6_4Tor1_7_2_5.java b/...ava/net/raphimc/vialegacy/protocol/release/r1_6_4tor1_7_2_5/Protocolr1_6_4Tor1_7_2_5.java
@@ -104,7 +104,7 @@ public void register() {
                         });
                         handler(wrapper -> {
                             final byte dimensionId = wrapper.get(Types.BYTE, 0);
-                            wrapper.user().get(DimensionTracker.class).changeDimension(dimensionId);
+                            wrapper.user().getClientWorld(Protocolr1_6_4Tor1_7_2_5.class).setEnvironment(dimensionId);
 
                             wrapper.user().put(new ChunkTracker(wrapper.user()));
                         });
@@ -147,7 +147,7 @@ public void register() {
                 read(Types.SHORT); // world height
                 map(Types1_6_4.STRING, Types.STRING); // worldType
                 handler(wrapper -> {
-                    if (wrapper.user().get(DimensionTracker.class).changeDimension(wrapper.get(Types.INT, 0))) {
+                    if (wrapper.user().getClientWorld(Protocolr1_6_4Tor1_7_2_5.class).setEnvironment(wrapper.get(Types.INT, 0))) {
                         wrapper.user().get(ChunkTracker.class).clear();
                     }
                 });
@@ -390,7 +390,7 @@ public void register() {
             }
         });
         this.registerClientbound(ClientboundPackets1_6_4.LEVEL_CHUNK, wrapper -> {
-            final Chunk chunk = wrapper.passthrough(Types1_7_6.getChunk(wrapper.user().get(DimensionTracker.class).getDimension()));
+            final Chunk chunk = wrapper.passthrough(Types1_7_6.getChunk(wrapper.user().getClientWorld(this.getClass()).getEnvironment()));
             wrapper.user().get(ChunkTracker.class).trackAndRemap(chunk);
         });
         this.registerClientbound(ClientboundPackets1_6_4.CHUNK_BLOCKS_UPDATE, new PacketHandlers() {
@@ -1111,7 +1111,6 @@ public void init(UserConnection userConnection) {
         userConnection.put(new ProtocolMetadataStorage());
         userConnection.put(new PlayerInfoStorage());
         userConnection.put(new StatisticsStorage());
-        userConnection.put(new DimensionTracker());
         userConnection.put(new ChunkTracker(userConnection)); // Set again in JOIN_GAME handler for version comparisons to work
 
         if (userConnection.getChannel() != null) {

diff --git a/...ava/net/raphimc/vialegacy/protocol/release/r1_6_4tor1_7_2_5/storage/DimensionTracker.java b/...ava/net/raphimc/vialegacy/protocol/release/r1_6_4tor1_7_2_5/storage/DimensionTracker.java
diff --git a/.../java/net/raphimc/vialegacy/protocol/release/r1_7_6_10tor1_8/Protocolr1_7_6_10Tor1_8.java b/.../java/net/raphimc/vialegacy/protocol/release/r1_7_6_10tor1_8/Protocolr1_7_6_10Tor1_8.java
@@ -23,6 +23,7 @@
 import com.viaversion.viaversion.api.connection.UserConnection;
 import com.viaversion.viaversion.api.minecraft.BlockChangeRecord;
 import com.viaversion.viaversion.api.minecraft.BlockPosition;
+import com.viaversion.viaversion.api.minecraft.ClientWorld;
 import com.viaversion.viaversion.api.minecraft.Environment;
 import com.viaversion.viaversion.api.minecraft.chunks.Chunk;
 import com.viaversion.viaversion.api.minecraft.entities.EntityTypes1_8;
@@ -147,7 +148,7 @@ public void register() {
                     final EntityTracker tracker = wrapper.user().get(EntityTracker.class);
                     tracker.trackEntity(entityId, EntityTypes1_8.EntityType.PLAYER);
                     tracker.setPlayerID(entityId);
-                    wrapper.user().get(DimensionTracker.class).changeDimension(dimensionId);
+                    wrapper.user().get(ClientWorld.class).setEnvironment(dimensionId);
                 });
             }
         });
@@ -190,7 +191,7 @@ public void register() {
                 map(Types.STRING); // worldType
                 handler(wrapper -> {
                     final EntityTracker entityTracker = wrapper.user().get(EntityTracker.class);
-                    if (wrapper.user().get(DimensionTracker.class).changeDimension(wrapper.get(Types.INT, 0))) {
+                    if (wrapper.user().getClientWorld(Protocolr1_7_6_10Tor1_8.class).setEnvironment(wrapper.get(Types.INT, 0))) {
                         wrapper.user().get(ChunkTracker.class).clear();
                         entityTracker.clear();
                         entityTracker.trackEntity(entityTracker.getPlayerID(), EntityTypes1_8.EntityType.PLAYER);
@@ -625,7 +626,7 @@ public void register() {
             }
         });
         this.registerClientbound(ClientboundPackets1_7_2.LEVEL_CHUNK, wrapper -> {
-            final Environment dimension = wrapper.user().get(DimensionTracker.class).getDimension();
+            final Environment dimension = wrapper.user().getClientWorld(this.getClass()).getEnvironment();
 
             final Chunk chunk = wrapper.read(Types1_7_6.getChunk(dimension));
             wrapper.user().get(ChunkTracker.class).trackAndRemap(chunk);
@@ -1498,11 +1499,11 @@ public void register(ViaProviders providers) {
 
     @Override
     public void init(UserConnection userConnection) {
+        userConnection.addClientWorld(this.getClass(), new ClientWorld());
         userConnection.put(new TablistStorage(userConnection));
         userConnection.put(new WindowTracker());
         userConnection.put(new EntityTracker(userConnection));
         userConnection.put(new MapStorage());
-        userConnection.put(new DimensionTracker());
         userConnection.put(new ChunkTracker());
     }
 

diff --git a/...java/net/raphimc/vialegacy/protocol/release/r1_7_6_10tor1_8/storage/DimensionTracker.java b/...java/net/raphimc/vialegacy/protocol/release/r1_7_6_10tor1_8/storage/DimensionTracker.java