Merge pull request #1839 from creeper123123321/nonuuidbossbar

Allow use of UserConnections for BossBars

common/src/main/java/us/myles/ViaVersion/ViaManager.java

@@ -156,6 +156,10 @@ public class ViaManager {
         return platform.getConnectionManager().getConnectedClients();
     }
 
+    public UUID getConnectedClientId(UserConnection conn) {
+        return platform.getConnectionManager().getConnectedClientId(conn);
+    }
+
     /**
      * @see ViaConnectionManager#isClientConnected(UUID)
      */

common/src/main/java/us/myles/ViaVersion/api/boss/BossBar.java

@@ -1,6 +1,7 @@
 package us.myles.ViaVersion.api.boss;
 
 import us.myles.ViaVersion.api.Via;
+import us.myles.ViaVersion.api.data.UserConnection;
 
 import java.util.Set;
 import java.util.UUID;
@@ -80,13 +81,21 @@ public abstract class BossBar<T> {
     }
 
     /**
-     * Show the bossbar to a player (uuid)
+     * Show the bossbar to a player (uuid). This only works for frontend connections. Use #addConnection(UserConnection) for other types.
      *
      * @param player uuid of the player
      * @return The BossBar object
      */
     public abstract BossBar addPlayer(UUID player);
 
+    /**
+     * Show the bossbar to a player connection.
+     *
+     * @param conn UserConnection of the connection
+     * @return The BossBar object
+     */
+    public abstract BossBar addConnection(UserConnection conn);
+
     /**
      * add multiple players
      *
@@ -112,13 +121,21 @@ public abstract class BossBar<T> {
     }
 
     /**
-     * Removes the bossbar from a player
+     * Removes the bossbar from a player. This only works for frontend connections. For others types, use #removeConnection(UserConnection)
      *
-     * @param uuid The platers YYUD
+     * @param uuid The players UUID
      * @return The BossBar object
      */
     public abstract BossBar removePlayer(UUID uuid);
 
+    /**
+     * Removes the bossbar from a player connection.
+     *
+     * @param conn The UserConnection
+     * @return The BossBar object
+     */
+    public abstract BossBar removeConnection(UserConnection conn);
+
     /**
      * Add flags
      *
@@ -142,12 +159,19 @@ public abstract class BossBar<T> {
     public abstract boolean hasFlag(BossFlag flag);
 
     /**
-     * Get players
+     * Get players. Only returns UUIDs which are front-end. For all connections, use #getConnections()
      *
      * @return UUIDS from players (sorry I lied)
      */
     public abstract Set<UUID> getPlayers();
 
+    /**
+     * Get UserConnections.
+     *
+     * @return UserConnection from players
+     */
+    public abstract Set<UserConnection> getConnections();
+
     /**
      * Show the bossbar to everyone (In the getPlayer set)
      *

common/src/main/java/us/myles/ViaVersion/api/platform/ViaConnectionManager.java

@@ -2,8 +2,8 @@ package us.myles.ViaVersion.api.platform;
 
 import io.netty.channel.ChannelFutureListener;
 import org.jetbrains.annotations.Nullable;
+import us.myles.ViaVersion.api.Via;
 import us.myles.ViaVersion.api.data.UserConnection;
-import us.myles.ViaVersion.protocols.base.ProtocolInfo;
 
 import java.util.*;
 import java.util.concurrent.ConcurrentHashMap;
@@ -17,9 +17,14 @@ public class ViaConnectionManager {
 
     public void onLoginSuccess(UserConnection connection) {
         Objects.requireNonNull(connection, "connection is null!");
-        UUID id = connection.getProtocolInfo().getUuid();
         connections.add(connection);
-        clients.put(id, connection);
+
+        if (isFrontEnd(connection)) {
+            UUID id = connection.getProtocolInfo().getUuid();
+            if (clients.put(id, connection) != null) {
+                Via.getPlatform().getLogger().warning("Duplicate UUID on frontend connection! ("+id+")");
+            }
+        }
 
         if (connection.getChannel() != null) {
             connection.getChannel().closeFuture().addListener((ChannelFutureListener) future -> onDisconnect(connection));
@@ -28,9 +33,20 @@ public class ViaConnectionManager {
 
     public void onDisconnect(UserConnection connection) {
         Objects.requireNonNull(connection, "connection is null!");
-        UUID id = connection.getProtocolInfo().getUuid();
         connections.remove(connection);
-        clients.remove(id);
+
+        if (isFrontEnd(connection)) {
+            UUID id = connection.getProtocolInfo().getUuid();
+            clients.remove(id);
+        }
+    }
+
+    /**
+     * Frontend connections will have the UUID stored. Override this if your platform isn't always frontend.
+     * UUIDs can't be duplicate between frontend connections.
+     */
+    public boolean isFrontEnd(UserConnection conn) {
+        return true;
     }
 
     /**
@@ -57,6 +73,27 @@ public class ViaConnectionManager {
         return clients.get(clientIdentifier);
     }
 
+    /**
+     * Returns the UUID from the frontend connection to this proxy server
+     * Returns null when there isn't a server or this connection isn't frontend or it doesn't have an id
+     * When ViaVersion is reloaded, this method may not return some players.
+     * May not return ProtocolSupport players.
+     * <p>
+     * Note that connections are removed as soon as their channel is closed,
+     * so avoid using this method during player quits for example.
+     */
+    @Nullable
+    public UUID getConnectedClientId(UserConnection conn) {
+        if (conn.getProtocolInfo() == null) return null;
+        UUID uuid = conn.getProtocolInfo().getUuid();
+        UserConnection client = clients.get(uuid);
+        if (client != null && client.equals(conn)) {
+            // This is frontend
+            return uuid;
+        }
+        return null;
+    }
+
     /**
      * Returns all UserConnections which are registered
      * May contain duplicated UUIDs on multiple ProtocolInfo.

common/src/main/java/us/myles/ViaVersion/boss/CommonBoss.java

@@ -8,25 +8,21 @@ import us.myles.ViaVersion.api.boss.BossColor;
 import us.myles.ViaVersion.api.boss.BossFlag;
 import us.myles.ViaVersion.api.boss.BossStyle;
 import us.myles.ViaVersion.api.data.UserConnection;
-import us.myles.ViaVersion.api.protocol.ProtocolVersion;
 import us.myles.ViaVersion.api.type.Type;
 import us.myles.ViaVersion.protocols.protocol1_9to1_8.Protocol1_9To1_8;
 
-import java.util.ArrayList;
+import java.util.*;
-import java.util.Collections;
+import java.util.stream.Collectors;
-import java.util.HashSet;
-import java.util.Set;
-import java.util.UUID;
 
 public abstract class CommonBoss<T> extends BossBar<T> {
     private final UUID uuid;
+    private final Set<UserConnection> connections;
+    private final Set<BossFlag> flags;
     private String title;
     private float health;
     private BossColor color;
     private BossStyle style;
-    private final Set<UUID> players;
     private boolean visible;
-    private final Set<BossFlag> flags;
 
     public CommonBoss(String title, float health, BossColor color, BossStyle style) {
         Preconditions.checkNotNull(title, "Title cannot be null");
@@ -37,7 +33,7 @@ public abstract class CommonBoss<T> extends BossBar<T> {
         this.health = health;
         this.color = color == null ? BossColor.PURPLE : color;
         this.style = style == null ? BossStyle.SOLID : style;
-        this.players = new HashSet<>();
+        this.connections = Collections.newSetFromMap(new WeakHashMap<>());
         this.flags = new HashSet<>();
         visible = true;
     }
@@ -81,22 +77,26 @@ public abstract class CommonBoss<T> extends BossBar<T> {
 
     @Override
     public BossBar addPlayer(UUID player) {
-        if (!players.contains(player)) {
+        return addConnection(Via.getManager().getConnection(player));
-            players.add(player);
+    }
-            if (visible) {
+
-                UserConnection user = Via.getManager().getConnection(player);
+    @Override
-                sendPacket(player, getPacket(CommonBoss.UpdateAction.ADD, user));
+    public BossBar addConnection(UserConnection conn) {
-            }
+        if (connections.add(conn) && visible) {
+            sendPacketConnection(conn, getPacket(CommonBoss.UpdateAction.ADD, conn));
         }
         return this;
     }
 
     @Override
     public BossBar removePlayer(UUID uuid) {
-        if (players.contains(uuid)) {
+        return removeConnection(Via.getManager().getConnection(uuid));
-            players.remove(uuid);
+    }
-            UserConnection user = Via.getManager().getConnection(uuid);
+
-            sendPacket(uuid, getPacket(UpdateAction.REMOVE, user));
+    @Override
+    public BossBar removeConnection(UserConnection conn) {
+        if (connections.remove(conn)) {
+            sendPacketConnection(conn, getPacket(UpdateAction.REMOVE, conn));
         }
         return this;
     }
@@ -127,7 +127,13 @@ public abstract class CommonBoss<T> extends BossBar<T> {
 
     @Override
     public Set<UUID> getPlayers() {
-        return Collections.unmodifiableSet(players);
+        return connections.stream().map(conn -> Via.getManager().getConnectedClientId(conn)).filter(Objects::nonNull)
+                .collect(Collectors.toSet());
+    }
+
+    @Override
+    public Set<UserConnection> getConnections() {
+        return Collections.unmodifiableSet(connections);
     }
 
     @Override
@@ -147,6 +153,13 @@ public abstract class CommonBoss<T> extends BossBar<T> {
         return visible;
     }
 
+    private void setVisible(boolean value) {
+        if (visible != value) {
+            visible = value;
+            sendPacket(value ? CommonBoss.UpdateAction.ADD : CommonBoss.UpdateAction.REMOVE);
+        }
+    }
+
     @Override
     public UUID getId() {
         return uuid;
@@ -175,24 +188,16 @@ public abstract class CommonBoss<T> extends BossBar<T> {
         return flags;
     }
 
-    private void setVisible(boolean value) {
-        if (visible != value) {
-            visible = value;
-            sendPacket(value ? CommonBoss.UpdateAction.ADD : CommonBoss.UpdateAction.REMOVE);
-        }
-    }
-
     private void sendPacket(UpdateAction action) {
-        for (UUID uuid : new ArrayList<>(players)) {
+        for (UserConnection conn : new ArrayList<>(connections)) {
-            UserConnection connection = Via.getManager().getConnection(uuid);
+            PacketWrapper wrapper = getPacket(action, conn);
-            PacketWrapper wrapper = getPacket(action, connection);
+            sendPacketConnection(conn, wrapper);
-            sendPacket(uuid, wrapper);
         }
     }
 
-    private void sendPacket(UUID uuid, PacketWrapper wrapper) {
+    private void sendPacketConnection(UserConnection conn, PacketWrapper wrapper) {
-        if (!Via.getAPI().isInjected(uuid) || !(Via.getAPI().getPlayerVersion(uuid) >= ProtocolVersion.v1_9.getId())) {
+        if (conn.getProtocolInfo() == null || conn.getProtocolInfo().getPipeline().contains(Protocol1_9To1_8.class)) {
-            players.remove(uuid);
+            connections.remove(conn);
             return;
         }
         try {

common/src/main/java/us/myles/ViaVersion/protocols/protocol1_9to1_8/storage/EntityTracker1_9.java

@@ -191,7 +191,6 @@ public class EntityTracker1_9 extends EntityTracker {
                     }
                 }
             }
-            UUID uuid = getUser().getProtocolInfo().getUuid();
             // Boss bar
             if (Via.getConfig().isBossbarPatch()) {
                 if (type == EntityType.ENDER_DRAGON || type == EntityType.WITHER) {
@@ -202,7 +201,7 @@ public class EntityTracker1_9 extends EntityTracker {
                         if (bar == null) {
                             bar = Via.getAPI().createBossBar(title, BossColor.PINK, BossStyle.SOLID);
                             bossBarMap.put(entityId, bar);
-                            bar.addPlayer(uuid);
+                            bar.addConnection(getUser());
                             bar.show();
 
                             // Send to provider
@@ -219,7 +218,7 @@ public class EntityTracker1_9 extends EntityTracker {
                             String title = type == EntityType.ENDER_DRAGON ? "Ender Dragon" : "Wither";
                             bar = Via.getAPI().createBossBar(title, health, BossColor.PINK, BossStyle.SOLID);
                             bossBarMap.put(entityId, bar);
-                            bar.addPlayer(uuid);
+                            bar.addConnection(getUser());
                             bar.show();
                             // Send to provider
                             Via.getManager().getProviders().get(BossBarProvider.class).handleAdd(getUser(), bar.getId());