Upstream/ViaBackwards
1
0
Fork 0
mirror of https://github.com/ViaVersion/ViaBackwards.git synced 2024-12-25 17:27:52 +01:00
Code Issues Packages Projects Releases Wiki Activity

Don't store UserConnection in stored objects unless needed

Browse Source
This commit is contained in:
KennyTV 2021-05-26 21:58:19 +02:00
parent 4a60f0f903
commit 8adb80b5eb
No known key found for this signature in database
GPG Key ID: 6BE3B555EBC5982B
16 changed files with 29 additions and 81 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

8
common/src/main/java/com/viaversion/viabackwards/api/entities/storage/PlayerPositionStorage.java
View File

@ -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() {

2
common/src/main/java/com/viaversion/viabackwards/protocol/protocol1_10to1_11/Protocol1_10To1_11.java
View File

@ -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());
}
}

9
common/src/main/java/com/viaversion/viabackwards/protocol/protocol1_10to1_11/storage/WindowTracker.java
View File

@ -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;
}

9
common/src/main/java/com/viaversion/viabackwards/protocol/protocol1_12_1to1_12_2/KeepAliveTracker.java
View File

@ -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;
}

2
common/src/main/java/com/viaversion/viabackwards/protocol/protocol1_12_1to1_12_2/Protocol1_12_1To1_12_2.java
View File

@ -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());
}
}

12
common/src/main/java/com/viaversion/viabackwards/protocol/protocol1_12_2to1_13/Protocol1_12_2To1_13.java
View File

@ -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());
}
}

9
common/src/main/java/com/viaversion/viabackwards/protocol/protocol1_12_2to1_13/storage/BackwardsBlockStorage.java
View File

@ -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

4
common/src/main/java/com/viaversion/viabackwards/protocol/protocol1_12_2to1_13/storage/PlayerPositionStorage1_13.java
View File

@ -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() {
}
}

9
common/src/main/java/com/viaversion/viabackwards/protocol/protocol1_12_2to1_13/storage/TabCompleteStorage.java
View File

@ -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);
}
}

4
common/src/main/java/com/viaversion/viabackwards/protocol/protocol1_14_4to1_15/Protocol1_14_4To1_15.java
View File

@ -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));
}

9
common/src/main/java/com/viaversion/viabackwards/protocol/protocol1_14_4to1_15/data/ImmediateRespawn.java
View File

@ -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;
}

4
common/src/main/java/com/viaversion/viabackwards/protocol/protocol1_15_2to1_16/Protocol1_15_2To1_16.java
View File

@ -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));
}

9
common/src/main/java/com/viaversion/viabackwards/protocol/protocol1_15_2to1_16/data/WorldNameTracker.java
View File

@ -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;
}

9
common/src/main/java/com/viaversion/viabackwards/protocol/protocol1_15_2to1_16/storage/PlayerSneakStorage.java
View File

@ -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;
}

2
common/src/main/java/com/viaversion/viabackwards/protocol/protocol1_16_3to1_16_4/Protocol1_16_3To1_16_4.java
View File

@ -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());
}
}

9
common/src/main/java/com/viaversion/viabackwards/protocol/protocol1_16_3to1_16_4/storage/PlayerHandStorage.java
View File

@ -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;
}