From 8adb80b5ebe6462f042fb7e849cbefae196dbcdd Mon Sep 17 00:00:00 2001
From: KennyTV <jahnke.nassim@gmail.com>
Date: Wed, 26 May 2021 21:58:19 +0200
Subject: [PATCH] Don't store UserConnection in stored objects unless needed

---
 .../api/entities/storage/PlayerPositionStorage.java  |  8 +++-----
 .../protocol1_10to1_11/Protocol1_10To1_11.java       |  2 +-
 .../protocol1_10to1_11/storage/WindowTracker.java    |  9 ++-------
 .../protocol1_12_1to1_12_2/KeepAliveTracker.java     |  9 ++-------
 .../Protocol1_12_1To1_12_2.java                      |  2 +-
 .../protocol1_12_2to1_13/Protocol1_12_2To1_13.java   | 12 +++---------
 .../storage/BackwardsBlockStorage.java               |  9 ++-------
 .../storage/PlayerPositionStorage1_13.java           |  4 +---
 .../storage/TabCompleteStorage.java                  |  9 ++-------
 .../protocol1_14_4to1_15/Protocol1_14_4To1_15.java   |  4 +---
 .../protocol1_14_4to1_15/data/ImmediateRespawn.java  |  9 ++-------
 .../protocol1_15_2to1_16/Protocol1_15_2To1_16.java   |  4 ++--
 .../protocol1_15_2to1_16/data/WorldNameTracker.java  |  9 ++-------
 .../storage/PlayerSneakStorage.java                  |  9 ++-------
 .../Protocol1_16_3To1_16_4.java                      |  2 +-
 .../storage/PlayerHandStorage.java                   |  9 ++-------
 16 files changed, 29 insertions(+), 81 deletions(-)

diff --git a/common/src/main/java/com/viaversion/viabackwards/api/entities/storage/PlayerPositionStorage.java b/common/src/main/java/com/viaversion/viabackwards/api/entities/storage/PlayerPositionStorage.java
index 146c040e..3ae3e01d 100644
--- a/common/src/main/java/com/viaversion/viabackwards/api/entities/storage/PlayerPositionStorage.java
+++ b/common/src/main/java/com/viaversion/viabackwards/api/entities/storage/PlayerPositionStorage.java
@@ -17,18 +17,16 @@
  */
 package com.viaversion.viabackwards.api.entities.storage;
 
-import com.viaversion.viaversion.api.connection.StoredObject;
-import com.viaversion.viaversion.api.connection.UserConnection;
+import com.viaversion.viaversion.api.connection.StorableObject;
 import com.viaversion.viaversion.api.protocol.packet.PacketWrapper;
 import com.viaversion.viaversion.api.type.Type;
 
-public abstract class PlayerPositionStorage extends StoredObject {
+public abstract class PlayerPositionStorage implements StorableObject {
     private double x;
     private double y;
     private double z;
 
-    protected PlayerPositionStorage(UserConnection user) {
-        super(user);
+    protected PlayerPositionStorage() {
     }
 
     public double getX() {
diff --git a/common/src/main/java/com/viaversion/viabackwards/protocol/protocol1_10to1_11/Protocol1_10To1_11.java b/common/src/main/java/com/viaversion/viabackwards/protocol/protocol1_10to1_11/Protocol1_10To1_11.java
index 90612f5f..f0c9b606 100644
--- a/common/src/main/java/com/viaversion/viabackwards/protocol/protocol1_10to1_11/Protocol1_10To1_11.java
+++ b/common/src/main/java/com/viaversion/viabackwards/protocol/protocol1_10to1_11/Protocol1_10To1_11.java
@@ -63,7 +63,7 @@ public class Protocol1_10To1_11 extends BackwardsProtocol<ClientboundPackets1_9_
         user.addEntityTracker(this.getClass(), new EntityTrackerBase(user, Entity1_11Types.EntityType.PLAYER, true));
 
         if (!user.has(WindowTracker.class)) {
-            user.put(new WindowTracker(user));
+            user.put(new WindowTracker());
         }
     }
 
diff --git a/common/src/main/java/com/viaversion/viabackwards/protocol/protocol1_10to1_11/storage/WindowTracker.java b/common/src/main/java/com/viaversion/viabackwards/protocol/protocol1_10to1_11/storage/WindowTracker.java
index 925bc1e4..f2e51f1c 100644
--- a/common/src/main/java/com/viaversion/viabackwards/protocol/protocol1_10to1_11/storage/WindowTracker.java
+++ b/common/src/main/java/com/viaversion/viabackwards/protocol/protocol1_10to1_11/storage/WindowTracker.java
@@ -18,17 +18,12 @@
 
 package com.viaversion.viabackwards.protocol.protocol1_10to1_11.storage;
 
-import com.viaversion.viaversion.api.connection.StoredObject;
-import com.viaversion.viaversion.api.connection.UserConnection;
+import com.viaversion.viaversion.api.connection.StorableObject;
 
-public class WindowTracker extends StoredObject {
+public class WindowTracker implements StorableObject {
     private String inventory;
     private int entityId = -1;
 
-    public WindowTracker(UserConnection user) {
-        super(user);
-    }
-
     public String getInventory() {
         return inventory;
     }
diff --git a/common/src/main/java/com/viaversion/viabackwards/protocol/protocol1_12_1to1_12_2/KeepAliveTracker.java b/common/src/main/java/com/viaversion/viabackwards/protocol/protocol1_12_1to1_12_2/KeepAliveTracker.java
index 630c1903..d9aa52b7 100644
--- a/common/src/main/java/com/viaversion/viabackwards/protocol/protocol1_12_1to1_12_2/KeepAliveTracker.java
+++ b/common/src/main/java/com/viaversion/viabackwards/protocol/protocol1_12_1to1_12_2/KeepAliveTracker.java
@@ -18,16 +18,11 @@
 
 package com.viaversion.viabackwards.protocol.protocol1_12_1to1_12_2;
 
-import com.viaversion.viaversion.api.connection.StoredObject;
-import com.viaversion.viaversion.api.connection.UserConnection;
+import com.viaversion.viaversion.api.connection.StorableObject;
 
-public class KeepAliveTracker extends StoredObject {
+public class KeepAliveTracker implements StorableObject {
     private long keepAlive = Integer.MAX_VALUE;
 
-    public KeepAliveTracker(UserConnection user) {
-        super(user);
-    }
-
     public long getKeepAlive() {
         return keepAlive;
     }
diff --git a/common/src/main/java/com/viaversion/viabackwards/protocol/protocol1_12_1to1_12_2/Protocol1_12_1To1_12_2.java b/common/src/main/java/com/viaversion/viabackwards/protocol/protocol1_12_1to1_12_2/Protocol1_12_1To1_12_2.java
index 2b0cfc77..b35680c0 100644
--- a/common/src/main/java/com/viaversion/viabackwards/protocol/protocol1_12_1to1_12_2/Protocol1_12_1To1_12_2.java
+++ b/common/src/main/java/com/viaversion/viabackwards/protocol/protocol1_12_1to1_12_2/Protocol1_12_1To1_12_2.java
@@ -72,6 +72,6 @@ public class Protocol1_12_1To1_12_2 extends BackwardsProtocol<ClientboundPackets
 
     @Override
     public void init(UserConnection userConnection) {
-        userConnection.put(new KeepAliveTracker(userConnection));
+        userConnection.put(new KeepAliveTracker());
     }
 }
diff --git a/common/src/main/java/com/viaversion/viabackwards/protocol/protocol1_12_2to1_13/Protocol1_12_2To1_13.java b/common/src/main/java/com/viaversion/viabackwards/protocol/protocol1_12_2to1_13/Protocol1_12_2To1_13.java
index 668bee11..5b5e7621 100644
--- a/common/src/main/java/com/viaversion/viabackwards/protocol/protocol1_12_2to1_13/Protocol1_12_2To1_13.java
+++ b/common/src/main/java/com/viaversion/viabackwards/protocol/protocol1_12_2to1_13/Protocol1_12_2To1_13.java
@@ -103,17 +103,11 @@ public class Protocol1_12_2To1_13 extends BackwardsProtocol<ClientboundPackets1_
 
         user.addEntityTracker(this.getClass(), new EntityTrackerBase(user, Entity1_13Types.EntityType.PLAYER));
 
-        // Register Block Storage
-        if (!user.has(BackwardsBlockStorage.class)) {
-            user.put(new BackwardsBlockStorage(user));
-        }
-        // Register Block Storage
-        if (!user.has(TabCompleteStorage.class)) {
-            user.put(new TabCompleteStorage(user));
-        }
+        user.put(new BackwardsBlockStorage());
+        user.put(new TabCompleteStorage());
 
         if (ViaBackwards.getConfig().isFix1_13FacePlayer() && !user.has(PlayerPositionStorage1_13.class)) {
-            user.put(new PlayerPositionStorage1_13(user));
+            user.put(new PlayerPositionStorage1_13());
         }
     }
 
diff --git a/common/src/main/java/com/viaversion/viabackwards/protocol/protocol1_12_2to1_13/storage/BackwardsBlockStorage.java b/common/src/main/java/com/viaversion/viabackwards/protocol/protocol1_12_2to1_13/storage/BackwardsBlockStorage.java
index b1e2576d..e27236dd 100644
--- a/common/src/main/java/com/viaversion/viabackwards/protocol/protocol1_12_2to1_13/storage/BackwardsBlockStorage.java
+++ b/common/src/main/java/com/viaversion/viabackwards/protocol/protocol1_12_2to1_13/storage/BackwardsBlockStorage.java
@@ -18,8 +18,7 @@
 
 package com.viaversion.viabackwards.protocol.protocol1_12_2to1_13.storage;
 
-import com.viaversion.viaversion.api.connection.StoredObject;
-import com.viaversion.viaversion.api.connection.UserConnection;
+import com.viaversion.viaversion.api.connection.StorableObject;
 import com.viaversion.viaversion.api.minecraft.Position;
 import com.viaversion.viaversion.libs.fastutil.ints.IntOpenHashSet;
 import com.viaversion.viaversion.libs.fastutil.ints.IntSet;
@@ -27,7 +26,7 @@ import com.viaversion.viaversion.libs.fastutil.ints.IntSet;
 import java.util.Map;
 import java.util.concurrent.ConcurrentHashMap;
 
-public class BackwardsBlockStorage extends StoredObject {
+public class BackwardsBlockStorage implements StorableObject {
     // This BlockStorage is very exclusive (;
     private static final IntSet WHITELIST = new IntOpenHashSet(779);
 
@@ -69,10 +68,6 @@ public class BackwardsBlockStorage extends StoredObject {
 
     private final Map<Position, Integer> blocks = new ConcurrentHashMap<>();
 
-    public BackwardsBlockStorage(UserConnection user) {
-        super(user);
-    }
-
     public void checkAndStore(Position position, int block) {
         if (!WHITELIST.contains(block)) {
             // Remove if not whitelisted
diff --git a/common/src/main/java/com/viaversion/viabackwards/protocol/protocol1_12_2to1_13/storage/PlayerPositionStorage1_13.java b/common/src/main/java/com/viaversion/viabackwards/protocol/protocol1_12_2to1_13/storage/PlayerPositionStorage1_13.java
index 03697d6d..f0421d1a 100644
--- a/common/src/main/java/com/viaversion/viabackwards/protocol/protocol1_12_2to1_13/storage/PlayerPositionStorage1_13.java
+++ b/common/src/main/java/com/viaversion/viabackwards/protocol/protocol1_12_2to1_13/storage/PlayerPositionStorage1_13.java
@@ -18,11 +18,9 @@
 package com.viaversion.viabackwards.protocol.protocol1_12_2to1_13.storage;
 
 import com.viaversion.viabackwards.api.entities.storage.PlayerPositionStorage;
-import com.viaversion.viaversion.api.connection.UserConnection;
 
 public class PlayerPositionStorage1_13 extends PlayerPositionStorage {
 
-    public PlayerPositionStorage1_13(UserConnection user) {
-        super(user);
+    public PlayerPositionStorage1_13() {
     }
 }
diff --git a/common/src/main/java/com/viaversion/viabackwards/protocol/protocol1_12_2to1_13/storage/TabCompleteStorage.java b/common/src/main/java/com/viaversion/viabackwards/protocol/protocol1_12_2to1_13/storage/TabCompleteStorage.java
index 9d5833cb..e675d07f 100644
--- a/common/src/main/java/com/viaversion/viabackwards/protocol/protocol1_12_2to1_13/storage/TabCompleteStorage.java
+++ b/common/src/main/java/com/viaversion/viabackwards/protocol/protocol1_12_2to1_13/storage/TabCompleteStorage.java
@@ -17,8 +17,7 @@
  */
 package com.viaversion.viabackwards.protocol.protocol1_12_2to1_13.storage;
 
-import com.viaversion.viaversion.api.connection.StoredObject;
-import com.viaversion.viaversion.api.connection.UserConnection;
+import com.viaversion.viaversion.api.connection.StorableObject;
 
 import java.util.HashMap;
 import java.util.HashSet;
@@ -26,14 +25,10 @@ import java.util.Map;
 import java.util.Set;
 import java.util.UUID;
 
-public class TabCompleteStorage extends StoredObject {
+public class TabCompleteStorage implements StorableObject {
     public int lastId;
     public String lastRequest;
     public boolean lastAssumeCommand;
     public Map<UUID, String> usernames = new HashMap<>();
     public Set<String> commands = new HashSet<>();
-
-    public TabCompleteStorage(UserConnection user) {
-        super(user);
-    }
 }
diff --git a/common/src/main/java/com/viaversion/viabackwards/protocol/protocol1_14_4to1_15/Protocol1_14_4To1_15.java b/common/src/main/java/com/viaversion/viabackwards/protocol/protocol1_14_4to1_15/Protocol1_14_4To1_15.java
index 28ec6673..48c9301c 100644
--- a/common/src/main/java/com/viaversion/viabackwards/protocol/protocol1_14_4to1_15/Protocol1_14_4To1_15.java
+++ b/common/src/main/java/com/viaversion/viabackwards/protocol/protocol1_14_4to1_15/Protocol1_14_4To1_15.java
@@ -103,9 +103,7 @@ public class Protocol1_14_4To1_15 extends BackwardsProtocol<ClientboundPackets1_
 
     @Override
     public void init(UserConnection user) {
-        if (!user.has(ImmediateRespawn.class)) {
-            user.put(new ImmediateRespawn(user));
-        }
+        user.put(new ImmediateRespawn());
         user.addEntityTracker(getClass(), new EntityTrackerBase(user, Entity1_15Types.PLAYER));
     }
 
diff --git a/common/src/main/java/com/viaversion/viabackwards/protocol/protocol1_14_4to1_15/data/ImmediateRespawn.java b/common/src/main/java/com/viaversion/viabackwards/protocol/protocol1_14_4to1_15/data/ImmediateRespawn.java
index a231f335..d969fd73 100644
--- a/common/src/main/java/com/viaversion/viabackwards/protocol/protocol1_14_4to1_15/data/ImmediateRespawn.java
+++ b/common/src/main/java/com/viaversion/viabackwards/protocol/protocol1_14_4to1_15/data/ImmediateRespawn.java
@@ -17,16 +17,11 @@
  */
 package com.viaversion.viabackwards.protocol.protocol1_14_4to1_15.data;
 
-import com.viaversion.viaversion.api.connection.StoredObject;
-import com.viaversion.viaversion.api.connection.UserConnection;
+import com.viaversion.viaversion.api.connection.StorableObject;
 
-public class ImmediateRespawn extends StoredObject {
+public class ImmediateRespawn implements StorableObject {
     private boolean immediateRespawn;
 
-    public ImmediateRespawn(UserConnection user) {
-        super(user);
-    }
-
     public boolean isImmediateRespawn() {
         return immediateRespawn;
     }
diff --git a/common/src/main/java/com/viaversion/viabackwards/protocol/protocol1_15_2to1_16/Protocol1_15_2To1_16.java b/common/src/main/java/com/viaversion/viabackwards/protocol/protocol1_15_2to1_16/Protocol1_15_2To1_16.java
index 2a6fd5ce..51e16c74 100644
--- a/common/src/main/java/com/viaversion/viabackwards/protocol/protocol1_15_2to1_16/Protocol1_15_2To1_16.java
+++ b/common/src/main/java/com/viaversion/viabackwards/protocol/protocol1_15_2to1_16/Protocol1_15_2To1_16.java
@@ -200,8 +200,8 @@ public class Protocol1_15_2To1_16 extends BackwardsProtocol<ClientboundPackets1_
             user.put(new ClientWorld(user));
         }
 
-        user.put(new PlayerSneakStorage(user));
-        user.put(new WorldNameTracker(user));
+        user.put(new PlayerSneakStorage());
+        user.put(new WorldNameTracker());
         user.addEntityTracker(this.getClass(), new EntityTrackerBase(user, Entity1_16Types.PLAYER));
     }
 
diff --git a/common/src/main/java/com/viaversion/viabackwards/protocol/protocol1_15_2to1_16/data/WorldNameTracker.java b/common/src/main/java/com/viaversion/viabackwards/protocol/protocol1_15_2to1_16/data/WorldNameTracker.java
index bf3a0031..974c1c04 100644
--- a/common/src/main/java/com/viaversion/viabackwards/protocol/protocol1_15_2to1_16/data/WorldNameTracker.java
+++ b/common/src/main/java/com/viaversion/viabackwards/protocol/protocol1_15_2to1_16/data/WorldNameTracker.java
@@ -17,16 +17,11 @@
  */
 package com.viaversion.viabackwards.protocol.protocol1_15_2to1_16.data;
 
-import com.viaversion.viaversion.api.connection.StoredObject;
-import com.viaversion.viaversion.api.connection.UserConnection;
+import com.viaversion.viaversion.api.connection.StorableObject;
 
-public class WorldNameTracker extends StoredObject {
+public class WorldNameTracker implements StorableObject {
     private String worldName;
 
-    public WorldNameTracker(UserConnection user) {
-        super(user);
-    }
-
     public String getWorldName() {
         return worldName;
     }
diff --git a/common/src/main/java/com/viaversion/viabackwards/protocol/protocol1_15_2to1_16/storage/PlayerSneakStorage.java b/common/src/main/java/com/viaversion/viabackwards/protocol/protocol1_15_2to1_16/storage/PlayerSneakStorage.java
index 9ebde807..1d774661 100644
--- a/common/src/main/java/com/viaversion/viabackwards/protocol/protocol1_15_2to1_16/storage/PlayerSneakStorage.java
+++ b/common/src/main/java/com/viaversion/viabackwards/protocol/protocol1_15_2to1_16/storage/PlayerSneakStorage.java
@@ -17,16 +17,11 @@
  */
 package com.viaversion.viabackwards.protocol.protocol1_15_2to1_16.storage;
 
-import com.viaversion.viaversion.api.connection.StoredObject;
-import com.viaversion.viaversion.api.connection.UserConnection;
+import com.viaversion.viaversion.api.connection.StorableObject;
 
-public class PlayerSneakStorage extends StoredObject {
+public class PlayerSneakStorage implements StorableObject {
     private boolean sneaking;
 
-    public PlayerSneakStorage(UserConnection user) {
-        super(user);
-    }
-
     public boolean isSneaking() {
         return sneaking;
     }
diff --git a/common/src/main/java/com/viaversion/viabackwards/protocol/protocol1_16_3to1_16_4/Protocol1_16_3To1_16_4.java b/common/src/main/java/com/viaversion/viabackwards/protocol/protocol1_16_3to1_16_4/Protocol1_16_3To1_16_4.java
index 122a8355..94c06e6c 100644
--- a/common/src/main/java/com/viaversion/viabackwards/protocol/protocol1_16_3to1_16_4/Protocol1_16_3To1_16_4.java
+++ b/common/src/main/java/com/viaversion/viabackwards/protocol/protocol1_16_3to1_16_4/Protocol1_16_3To1_16_4.java
@@ -62,6 +62,6 @@ public class Protocol1_16_3To1_16_4 extends BackwardsProtocol<ClientboundPackets
 
     @Override
     public void init(UserConnection user) {
-        user.put(new PlayerHandStorage(user));
+        user.put(new PlayerHandStorage());
     }
 }
diff --git a/common/src/main/java/com/viaversion/viabackwards/protocol/protocol1_16_3to1_16_4/storage/PlayerHandStorage.java b/common/src/main/java/com/viaversion/viabackwards/protocol/protocol1_16_3to1_16_4/storage/PlayerHandStorage.java
index aba990dd..fba5df8f 100644
--- a/common/src/main/java/com/viaversion/viabackwards/protocol/protocol1_16_3to1_16_4/storage/PlayerHandStorage.java
+++ b/common/src/main/java/com/viaversion/viabackwards/protocol/protocol1_16_3to1_16_4/storage/PlayerHandStorage.java
@@ -17,17 +17,12 @@
  */
 package com.viaversion.viabackwards.protocol.protocol1_16_3to1_16_4.storage;
 
-import com.viaversion.viaversion.api.connection.StoredObject;
-import com.viaversion.viaversion.api.connection.UserConnection;
+import com.viaversion.viaversion.api.connection.StorableObject;
 
-public class PlayerHandStorage extends StoredObject {
+public class PlayerHandStorage implements StorableObject {
 
     private int currentHand;
 
-    public PlayerHandStorage(UserConnection user) {
-        super(user);
-    }
-
     public int getCurrentHand() {
         return currentHand;
     }