Fork/Velocitab
2
0
Fork 0
forked from Upstream/Velocitab
Code Pull Requests Actions Releases Activity

Sorting improvements

Browse Source
This commit is contained in:
AlexDev_ 2025-01-05 18:30:39 +01:00
parent 9593058684
commit ea40814c71
9 changed files with 34 additions and 33 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
src/main/java/net/william278/velocitab/config/Group.java
View File

@ -163,7 +163,7 @@ public record Group(
return plugin.getTabList().getPlayers()
.values()
.stream()
.filter(tabPlayer -> tabPlayer.getGroup().equals(this))
.filter(tabPlayer -> tabPlayer.isLoaded() && tabPlayer.getGroup().equals(this))
.collect(Collectors.toSet());
}
@ -177,7 +177,7 @@ public record Group(
return plugin.getTabList().getPlayers()
.values()
.stream()
.filter(player -> player.getGroup().equals(this) && player.getServerName().equals(tabPlayer.getServerName()))
.filter(player -> player.isLoaded() && player.getGroup().equals(this) && player.getServerName().equals(tabPlayer.getServerName()))
.collect(Collectors.toSet());
}

3
src/main/java/net/william278/velocitab/hook/LuckPermsHook.java
View File

@ -120,7 +120,7 @@ public class LuckPermsHook extends Hook {
tabList.getVanishTabList().recalculateVanishForPlayer(tabPlayer);
checkRoleUpdate(tabPlayer, oldRole);
})
.delay(500, TimeUnit.MILLISECONDS)
.delay(100, TimeUnit.MILLISECONDS)
.schedule());
}
@ -145,6 +145,7 @@ public class LuckPermsHook extends Hook {
if (oldRole.equals(player.getRole())) {
return;
}
plugin.getTabList().updatePlayer(player, false);
}

12
src/main/java/net/william278/velocitab/packet/ScoreboardManager.java
View File

@ -41,6 +41,8 @@ import org.jetbrains.annotations.NotNull;
import org.slf4j.event.Level;
import java.util.*;
import java.util.concurrent.ExecutorService;
import java.util.concurrent.Executors;
import static com.velocitypowered.api.network.ProtocolVersion.*;
@ -48,6 +50,7 @@ public class ScoreboardManager {
private PacketRegistration<UpdateTeamsPacket> packetRegistration;
private final Velocitab plugin;
private final ExecutorService executorService;
private final boolean teams;
private final Map<ProtocolVersion, TeamsPacketAdapter> versions;
@Getter
@ -64,8 +67,9 @@ public class ScoreboardManager {
this.nametags = Maps.newConcurrentMap();
this.versions = Maps.newHashMap();
this.trackedTeams = Multimaps.synchronizedMultimap(Multimaps.newSetMultimap(Maps.newConcurrentMap(), Sets::newConcurrentHashSet));
this.sortedTeams = new SortedSet(Comparator.reverseOrder());
this.sortedTeams = new SortedSet(Comparator.reverseOrder()); //Comparator.reverseOrder()
this.registerVersions();
this.executorService = Executors.newFixedThreadPool(2);
}
public boolean handleTeams() {
@ -389,8 +393,10 @@ public class ScoreboardManager {
return;
}
final ConnectedPlayer connectedPlayer = (ConnectedPlayer) player;
connectedPlayer.getConnection().write(packet);
executorService.submit(() -> {
final ConnectedPlayer connectedPlayer = (ConnectedPlayer) player;
connectedPlayer.getConnection().write(packet);
});
}
public void registerPacket() {

4
src/main/java/net/william278/velocitab/placeholder/PlaceholderManager.java
View File

@ -76,7 +76,9 @@ public class PlaceholderManager {
}
final Map<String, String> parsed = placeholders.computeIfAbsent(uuid, k -> Maps.newConcurrentMap());
final TabPlayer tabPlayer = plugin.getTabList().getTabPlayer(player)
.orElse(new TabPlayer(plugin, player, Role.DEFAULT_ROLE, plugin.getTabList().getGroupOrDefault(player)));
.orElse(new TabPlayer(plugin, player,
plugin.getLuckPermsHook().map(hook -> hook.getPlayerRole(player)).orElse(Role.DEFAULT_ROLE),
plugin.getTabList().getGroupOrDefault(player)));
final List<String> placeholders = texts.stream()
.map(PlaceholderManager::extractPlaceholders)

2
src/main/java/net/william278/velocitab/player/Role.java
View File

@ -65,7 +65,7 @@ public class Role implements Comparable<Role> {
}
@NotNull
protected String getWeightString() {
public String getWeightString() {
return Integer.toString(weight);
}

7
src/main/java/net/william278/velocitab/player/TabPlayer.java
View File

@ -51,7 +51,6 @@ public final class TabPlayer implements Comparable<TabPlayer> {
// Each TabPlayer contains the components for each TabPlayer it's currently viewing this player
private final Map<UUID, Component> relationalDisplayNames;
private final Map<UUID, Component[]> relationalNametags;
private final Map<UUID, Integer> cachedListOrders;
private String lastDisplayName;
private Component lastHeader;
private Component lastFooter;
@ -81,7 +80,6 @@ public final class TabPlayer implements Comparable<TabPlayer> {
this.group = group;
this.relationalDisplayNames = Maps.newConcurrentMap();
this.relationalNametags = Maps.newConcurrentMap();
this.cachedListOrders = Maps.newConcurrentMap();
}
@NotNull
@ -183,10 +181,6 @@ public final class TabPlayer implements Comparable<TabPlayer> {
relationalNametags.remove(target);
}
public void unsetTabListOrder(@NotNull UUID target) {
cachedListOrders.remove(target);
}
public Optional<Component[]> getRelationalNametag(@NotNull UUID target) {
return Optional.ofNullable(relationalNametags.get(target));
}
@ -199,7 +193,6 @@ public final class TabPlayer implements Comparable<TabPlayer> {
lastFooter = null;
role = Role.DEFAULT_ROLE;
teamName = null;
cachedListOrders.clear();
}
/**

2
src/main/java/net/william278/velocitab/sorting/SortingManager.java
View File

@ -48,7 +48,7 @@ public class SortingManager {
.stream()
.map(s -> plugin.getPlaceholderManager().applyPlaceholders(player, s))
.map(s -> adaptValue(s, player))
.toList();
.collect(Collectors.toList());
return handleList(player, placeholders);
}

31
src/main/java/net/william278/velocitab/tab/PlayerTabList.java
View File

@ -28,8 +28,6 @@ import com.velocitypowered.api.proxy.player.TabListEntry;
import com.velocitypowered.api.proxy.server.RegisteredServer;
import com.velocitypowered.api.proxy.server.ServerInfo;
import com.velocitypowered.api.util.ServerLink;
import com.velocitypowered.proxy.connection.client.ConnectedPlayer;
import com.velocitypowered.proxy.protocol.packet.UpsertPlayerInfoPacket;
import com.velocitypowered.proxy.tablist.KeyedVelocityTabList;
import com.velocitypowered.proxy.tablist.VelocityTabList;
import lombok.AccessLevel;
@ -51,8 +49,6 @@ import java.util.*;
import java.util.concurrent.TimeUnit;
import java.util.stream.Collectors;
import static com.velocitypowered.proxy.protocol.packet.UpsertPlayerInfoPacket.Action.UPDATE_LIST_ORDER;
/**
* The main class for tracking the server TAB list for a map of {@link TabPlayer}s
*/
@ -172,7 +168,6 @@ public class PlayerTabList {
players.values().forEach(p -> {
p.unsetRelationalDisplayName(player.getUniqueId());
p.unsetRelationalNametag(player.getUniqueId());
p.unsetTabListOrder(player.getUniqueId());
});
}
@ -185,6 +180,7 @@ public class PlayerTabList {
tabPlayerOptional.get().setGroup(group);
tabPlayerOptional.get().setRole(plugin.getLuckPermsHook().map(hook -> hook.getPlayerRole(joined)).orElse(Role.DEFAULT_ROLE));
}
final TabPlayer tabPlayer = tabPlayerOptional.orElseGet(() -> createTabPlayer(joined, group));
final String serverName = getServerName(joined);
// Store last server, so it's possible to have the last server on disconnect
@ -193,7 +189,6 @@ public class PlayerTabList {
// Send server URLs (1.21 clients)
sendPlayerServerLinks(tabPlayer);
tabPlayer.getDisplayName(plugin);
handleDisplayLoad(tabPlayer);
}
@ -404,7 +399,13 @@ public class PlayerTabList {
return;
}
updateSorting(tabPlayer, force);
plugin.getPlaceholderManager().fetchPlaceholders(tabPlayer.getPlayer().getUniqueId(), tabPlayer.getGroup().sortingPlaceholders());
//to make sure that role placeholder is updated even for a backend placeholder
plugin.getServer().getScheduler().buildTask(plugin,
() -> updateSorting(tabPlayer, force))
.delay(100, TimeUnit.MILLISECONDS)
.schedule();
}
public void updateSorting(@NotNull Group group) {
@ -416,13 +417,13 @@ public class PlayerTabList {
if (teamName.isBlank()) {
return;
}
plugin.getScoreboardManager().updateRole(tabPlayer, teamName, force);
final int order = plugin.getScoreboardManager().getPosition(teamName);
if (order == -1) {
plugin.log(Level.ERROR, "Failed to get position for " + tabPlayer.getPlayer().getUsername());
return;
}
tabPlayer.setListOrder(order);
final Set<TabPlayer> players = tabPlayer.getGroup().getTabPlayers(plugin, tabPlayer);
players.forEach(p -> recalculateSortingForPlayer(p, players));
@ -586,15 +587,13 @@ public class PlayerTabList {
if (!tabPlayer.getPlayer().getTabList().containsEntry(uuid)) {
return;
}
if (tabPlayer.getCachedListOrders().containsKey(uuid) && tabPlayer.getCachedListOrders().get(uuid) == position) {
final Optional<TabListEntry> entry = tabPlayer.getPlayer().getTabList().getEntry(uuid);
if(entry.isEmpty() || entry.get().getListOrder() == position) {
return;
}
tabPlayer.getCachedListOrders().put(uuid, position);
final UpsertPlayerInfoPacket packet = new UpsertPlayerInfoPacket(UPDATE_LIST_ORDER);
final UpsertPlayerInfoPacket.Entry entry = new UpsertPlayerInfoPacket.Entry(uuid);
entry.setListOrder(position);
packet.addEntry(entry);
((ConnectedPlayer) tabPlayer.getPlayer()).getConnection().write(packet);
entry.get().setListOrder(position);
}
public synchronized void recalculateSortingForPlayer(@NotNull TabPlayer tabPlayer, @NotNull Set<TabPlayer> players) {
@ -603,7 +602,7 @@ public class PlayerTabList {
}
players.forEach(p -> {
final int order = p.getListOrder();
final int order = plugin.getScoreboardManager().getPosition(p.getLastTeamName().orElse(""));
updateSorting(tabPlayer, p.getPlayer().getUniqueId(), order);
});
}

2
src/main/java/net/william278/velocitab/tab/TabListListener.java
View File

@ -155,7 +155,7 @@ public class TabListListener {
.repeat(50, TimeUnit.MILLISECONDS)
.schedule();
final int delay = justQuit.contains(joined.getUniqueId()) ? 650 : 500;
final int delay = justQuit.contains(joined.getUniqueId()) ? 400 : 200;
plugin.getServer().getScheduler().buildTask(plugin,
() -> {
task.cancel();