Dieser Commit ist enthalten in:
Ursprung
67a7b60bdc
Commit
060949c31a
@ -156,6 +156,7 @@ public class BungeeCore extends Plugin {
|
|||||||
new LocalCommand();
|
new LocalCommand();
|
||||||
new SetLocaleCommand();
|
new SetLocaleCommand();
|
||||||
new BuilderCloudCommand();
|
new BuilderCloudCommand();
|
||||||
|
new SlimTablistToggleCommand();
|
||||||
|
|
||||||
// Punishment Commands:
|
// Punishment Commands:
|
||||||
new PunishmentCommand("ban", Punishment.PunishmentType.Ban);
|
new PunishmentCommand("ban", Punishment.PunishmentType.Ban);
|
||||||
|
45
src/de/steamwar/bungeecore/commands/SlimTablistToggleCommand.java
Normale Datei
45
src/de/steamwar/bungeecore/commands/SlimTablistToggleCommand.java
Normale Datei
@ -0,0 +1,45 @@
|
|||||||
|
/*
|
||||||
|
* This file is a part of the SteamWar software.
|
||||||
|
*
|
||||||
|
* Copyright (C) 2020 SteamWar.de-Serverteam
|
||||||
|
*
|
||||||
|
* This program is free software: you can redistribute it and/or modify
|
||||||
|
* it under the terms of the GNU Affero General Public License as published by
|
||||||
|
* the Free Software Foundation, either version 3 of the License, or
|
||||||
|
* (at your option) any later version.
|
||||||
|
*
|
||||||
|
* This program is distributed in the hope that it will be useful,
|
||||||
|
* but WITHOUT ANY WARRANTY; without even the implied warranty of
|
||||||
|
* MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
|
||||||
|
* GNU Affero General Public License for more details.
|
||||||
|
*
|
||||||
|
* You should have received a copy of the GNU Affero General Public License
|
||||||
|
* along with this program. If not, see <https://www.gnu.org/licenses/>.
|
||||||
|
*/
|
||||||
|
|
||||||
|
package de.steamwar.bungeecore.commands;
|
||||||
|
|
||||||
|
import de.steamwar.bungeecore.Message;
|
||||||
|
import de.steamwar.bungeecore.sql.SteamwarUser;
|
||||||
|
import de.steamwar.bungeecore.sql.UserConfig;
|
||||||
|
import de.steamwar.command.SWCommand;
|
||||||
|
import net.md_5.bungee.api.connection.ProxiedPlayer;
|
||||||
|
|
||||||
|
public class SlimTablistToggleCommand extends SWCommand {
|
||||||
|
|
||||||
|
public SlimTablistToggleCommand() {
|
||||||
|
super("toggleslimtablist", null, "toggleslim", "toggletablist", "toggleslimtab", "toggletab");
|
||||||
|
}
|
||||||
|
|
||||||
|
@Register(description = "SLIMTABLIST_USAGE")
|
||||||
|
public void toggle(ProxiedPlayer player) {
|
||||||
|
SteamwarUser user = SteamwarUser.get(player.getUniqueId());
|
||||||
|
boolean alwaysSlim = Boolean.parseBoolean(UserConfig.getConfig(user.getId(), "slimTablist"));
|
||||||
|
UserConfig.updateUserConfig(user.getId(), "slimTablist", String.valueOf(!alwaysSlim));
|
||||||
|
if (alwaysSlim) {
|
||||||
|
Message.send("SLIMTABLIST_DISABLED", player);
|
||||||
|
} else {
|
||||||
|
Message.send("SLIMTABLIST_ENABLED", player);
|
||||||
|
}
|
||||||
|
}
|
||||||
|
}
|
@ -20,6 +20,7 @@
|
|||||||
package de.steamwar.bungeecore.tablist;
|
package de.steamwar.bungeecore.tablist;
|
||||||
|
|
||||||
import de.steamwar.bungeecore.Storage;
|
import de.steamwar.bungeecore.Storage;
|
||||||
|
import de.steamwar.bungeecore.sql.UserConfig;
|
||||||
import de.steamwar.messages.ChatSender;
|
import de.steamwar.messages.ChatSender;
|
||||||
import io.netty.channel.ChannelHandler;
|
import io.netty.channel.ChannelHandler;
|
||||||
import io.netty.channel.ChannelHandlerContext;
|
import io.netty.channel.ChannelHandlerContext;
|
||||||
@ -76,7 +77,12 @@ public class Tablist extends MessageToMessageDecoder<PacketWrapper> {
|
|||||||
|
|
||||||
List<TablistPart.Item> tablist = new ArrayList<>();
|
List<TablistPart.Item> tablist = new ArrayList<>();
|
||||||
List<TablistPart.Item> direct = new ArrayList<>();
|
List<TablistPart.Item> direct = new ArrayList<>();
|
||||||
global.print(viewer, player, tablist, direct);
|
boolean alwaysSlim = Boolean.parseBoolean(UserConfig.getConfig(viewer.user().getId(), "slimTablist"));
|
||||||
|
if (alwaysSlim || global.size(viewer, player) > 80) {
|
||||||
|
global.slimPrint(viewer, player, tablist, direct);
|
||||||
|
} else {
|
||||||
|
global.print(viewer, player, tablist, direct);
|
||||||
|
}
|
||||||
|
|
||||||
// NPC handling
|
// NPC handling
|
||||||
List<String> addNpc = new ArrayList<>();
|
List<String> addNpc = new ArrayList<>();
|
||||||
|
@ -21,15 +21,15 @@ package de.steamwar.bungeecore.tablist;
|
|||||||
|
|
||||||
import de.steamwar.bungeecore.Servertype;
|
import de.steamwar.bungeecore.Servertype;
|
||||||
import de.steamwar.bungeecore.Subserver;
|
import de.steamwar.bungeecore.Subserver;
|
||||||
|
import de.steamwar.bungeecore.sql.SteamwarUser;
|
||||||
|
import de.steamwar.bungeecore.sql.UserGroup;
|
||||||
import de.steamwar.messages.ChatSender;
|
import de.steamwar.messages.ChatSender;
|
||||||
|
import net.md_5.bungee.BungeeCord;
|
||||||
import net.md_5.bungee.api.ProxyServer;
|
import net.md_5.bungee.api.ProxyServer;
|
||||||
import net.md_5.bungee.api.config.ServerInfo;
|
import net.md_5.bungee.api.config.ServerInfo;
|
||||||
import net.md_5.bungee.api.connection.ProxiedPlayer;
|
import net.md_5.bungee.api.connection.ProxiedPlayer;
|
||||||
|
|
||||||
import java.util.ArrayList;
|
import java.util.*;
|
||||||
import java.util.HashMap;
|
|
||||||
import java.util.List;
|
|
||||||
import java.util.Map;
|
|
||||||
import java.util.stream.Collectors;
|
import java.util.stream.Collectors;
|
||||||
|
|
||||||
public class TablistBuild implements TablistPart {
|
public class TablistBuild implements TablistPart {
|
||||||
@ -54,6 +54,12 @@ public class TablistBuild implements TablistPart {
|
|||||||
return "Build";
|
return "Build";
|
||||||
}
|
}
|
||||||
|
|
||||||
|
@Override
|
||||||
|
public int size(ChatSender viewer, ProxiedPlayer player) {
|
||||||
|
ServerInfo server = player.getServer().getInfo();
|
||||||
|
return servers.stream().mapToInt(s -> players.get(s).size()).sum() + (players.keySet().stream().anyMatch(info -> server != info) ? 2 : 0);
|
||||||
|
}
|
||||||
|
|
||||||
@Override
|
@Override
|
||||||
public void print(ChatSender viewer, ProxiedPlayer player, List<Item> tablist, List<Item> direct) {
|
public void print(ChatSender viewer, ProxiedPlayer player, List<Item> tablist, List<Item> direct) {
|
||||||
ServerInfo server = player.getServer().getInfo();
|
ServerInfo server = player.getServer().getInfo();
|
||||||
@ -67,4 +73,35 @@ public class TablistBuild implements TablistPart {
|
|||||||
.forEach(((server == info) ? direct : tablist)::add);
|
.forEach(((server == info) ? direct : tablist)::add);
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
|
||||||
|
@Override
|
||||||
|
public void slimPrint(ChatSender viewer, ProxiedPlayer player, List<Item> tablist, List<Item> direct) {
|
||||||
|
ServerInfo server = player.getServer().getInfo();
|
||||||
|
List<Item> toPrint = new ArrayList<>();
|
||||||
|
for (ServerInfo info : servers) {
|
||||||
|
if (server == info) {
|
||||||
|
TablistServer.teamify(players.get(info), player)
|
||||||
|
.forEach(direct::add);
|
||||||
|
} else {
|
||||||
|
toPrint.addAll(players.get(info));
|
||||||
|
}
|
||||||
|
}
|
||||||
|
if (toPrint.isEmpty()) return;
|
||||||
|
|
||||||
|
int all = toPrint.size();
|
||||||
|
toPrint = TablistServer.slimify(viewer, toPrint);
|
||||||
|
|
||||||
|
if (tablist.isEmpty() || tablist.get(tablist.size() - 1).getDisplayName().equals("")) {
|
||||||
|
tablist.add(new Item(null, "", TablistServer.GRAY));
|
||||||
|
}
|
||||||
|
if (toPrint.size() == all) {
|
||||||
|
tablist.add(new Item(null, viewer.parseToLegacy("TABLIST_BAU"), TablistServer.LIGHT_GRAY));
|
||||||
|
} else if (toPrint.isEmpty()) {
|
||||||
|
tablist.add(new Item(null, viewer.parseToLegacy("TABLIST_BAU") + " (" + all + ")", TablistServer.LIGHT_GRAY));
|
||||||
|
} else {
|
||||||
|
tablist.add(new Item(null, viewer.parseToLegacy("TABLIST_BAU") + " (+" + (all - toPrint.size()) + ")", TablistServer.LIGHT_GRAY));
|
||||||
|
}
|
||||||
|
TablistServer.teamify(toPrint, player)
|
||||||
|
.forEach(tablist::add);
|
||||||
|
}
|
||||||
}
|
}
|
||||||
|
@ -36,10 +36,26 @@ public class TablistGroup implements TablistPart {
|
|||||||
return "";
|
return "";
|
||||||
}
|
}
|
||||||
|
|
||||||
|
@Override
|
||||||
|
public int size(ChatSender viewer, ProxiedPlayer player) {
|
||||||
|
int size = 0;
|
||||||
|
for (TablistPart part : sublists) {
|
||||||
|
size += part.size(viewer, player);
|
||||||
|
}
|
||||||
|
return size;
|
||||||
|
}
|
||||||
|
|
||||||
@Override
|
@Override
|
||||||
public void print(ChatSender viewer, ProxiedPlayer player, List<Item> tablist, List<Item> direct) {
|
public void print(ChatSender viewer, ProxiedPlayer player, List<Item> tablist, List<Item> direct) {
|
||||||
for (TablistPart sublist : sublists) {
|
for (TablistPart sublist : sublists) {
|
||||||
sublist.print(viewer, player, tablist, direct);
|
sublist.print(viewer, player, tablist, direct);
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
|
||||||
|
@Override
|
||||||
|
public void slimPrint(ChatSender viewer, ProxiedPlayer player, List<Item> tablist, List<Item> direct) {
|
||||||
|
for (TablistPart sublist : sublists) {
|
||||||
|
sublist.slimPrint(viewer, player, tablist, direct);
|
||||||
|
}
|
||||||
|
}
|
||||||
}
|
}
|
||||||
|
@ -33,7 +33,9 @@ import java.util.UUID;
|
|||||||
|
|
||||||
interface TablistPart {
|
interface TablistPart {
|
||||||
String sortKey();
|
String sortKey();
|
||||||
|
int size(ChatSender viewer, ProxiedPlayer player);
|
||||||
void print(ChatSender viewer, ProxiedPlayer player, List<Item> tablist, List<Item> direct);
|
void print(ChatSender viewer, ProxiedPlayer player, List<Item> tablist, List<Item> direct);
|
||||||
|
void slimPrint(ChatSender viewer, ProxiedPlayer player, List<Item> tablist, List<Item> direct);
|
||||||
|
|
||||||
class Item {
|
class Item {
|
||||||
|
|
||||||
|
@ -19,8 +19,10 @@
|
|||||||
|
|
||||||
package de.steamwar.bungeecore.tablist;
|
package de.steamwar.bungeecore.tablist;
|
||||||
|
|
||||||
import de.steamwar.bungeecore.BungeeCore;
|
import de.steamwar.bungeecore.Arenaserver;
|
||||||
|
import de.steamwar.bungeecore.Subserver;
|
||||||
import de.steamwar.bungeecore.sql.SteamwarUser;
|
import de.steamwar.bungeecore.sql.SteamwarUser;
|
||||||
|
import de.steamwar.bungeecore.sql.UserGroup;
|
||||||
import de.steamwar.messages.ChatSender;
|
import de.steamwar.messages.ChatSender;
|
||||||
import de.steamwar.network.packets.common.FightInfoPacket;
|
import de.steamwar.network.packets.common.FightInfoPacket;
|
||||||
import net.md_5.bungee.BungeeCord;
|
import net.md_5.bungee.BungeeCord;
|
||||||
@ -28,10 +30,7 @@ import net.md_5.bungee.api.config.ServerInfo;
|
|||||||
import net.md_5.bungee.api.connection.ProxiedPlayer;
|
import net.md_5.bungee.api.connection.ProxiedPlayer;
|
||||||
import net.md_5.bungee.protocol.Property;
|
import net.md_5.bungee.protocol.Property;
|
||||||
|
|
||||||
import java.util.ArrayList;
|
import java.util.*;
|
||||||
import java.util.Collection;
|
|
||||||
import java.util.List;
|
|
||||||
import java.util.Optional;
|
|
||||||
import java.util.stream.Collectors;
|
import java.util.stream.Collectors;
|
||||||
import java.util.stream.Stream;
|
import java.util.stream.Stream;
|
||||||
|
|
||||||
@ -66,6 +65,11 @@ public class TablistServer implements TablistPart {
|
|||||||
return server.getName();
|
return server.getName();
|
||||||
}
|
}
|
||||||
|
|
||||||
|
@Override
|
||||||
|
public int size(ChatSender viewer, ProxiedPlayer player) {
|
||||||
|
return (player.getServer().getInfo() == server ? 2 : 0) + players.size();
|
||||||
|
}
|
||||||
|
|
||||||
@Override
|
@Override
|
||||||
public void print(ChatSender viewer, ProxiedPlayer player, List<Item> tablist, List<Item> direct) {
|
public void print(ChatSender viewer, ProxiedPlayer player, List<Item> tablist, List<Item> direct) {
|
||||||
boolean onServer = player.getServer().getInfo() == server;
|
boolean onServer = player.getServer().getInfo() == server;
|
||||||
@ -79,6 +83,30 @@ public class TablistServer implements TablistPart {
|
|||||||
teamify(players, player).forEach(items::add);
|
teamify(players, player).forEach(items::add);
|
||||||
}
|
}
|
||||||
|
|
||||||
|
@Override
|
||||||
|
public void slimPrint(ChatSender viewer, ProxiedPlayer player, List<Item> tablist, List<Item> direct) {
|
||||||
|
boolean onServer = player.getServer().getInfo() == server;
|
||||||
|
List<Item> items = onServer ? direct : tablist;
|
||||||
|
|
||||||
|
List<Item> toPrint = players;
|
||||||
|
if (!onServer) {
|
||||||
|
toPrint = TablistServer.slimify(viewer, players);
|
||||||
|
|
||||||
|
if (tablist.isEmpty() || tablist.get(tablist.size() - 1).getDisplayName().equals("")) {
|
||||||
|
items.add(new Item(null, "", GRAY));
|
||||||
|
}
|
||||||
|
if (toPrint.size() == players.size()) {
|
||||||
|
items.add(new Item(null, "§7§l" + server.getName(), LIGHT_GRAY));
|
||||||
|
} else if (toPrint.isEmpty()) {
|
||||||
|
items.add(new Item(null, "§7§l" + server.getName() + " (" + players.size() + ")", LIGHT_GRAY));
|
||||||
|
} else {
|
||||||
|
items.add(new Item(null, "§7§l" + server.getName() + " (+" + (players.size() - toPrint.size()) + ")", LIGHT_GRAY));
|
||||||
|
}
|
||||||
|
}
|
||||||
|
|
||||||
|
teamify(toPrint, player).forEach(items::add);
|
||||||
|
}
|
||||||
|
|
||||||
private void addPlayers(String prefix, List<Integer> teamPlayers, Collection<ProxiedPlayer> onlinePlayers){
|
private void addPlayers(String prefix, List<Integer> teamPlayers, Collection<ProxiedPlayer> onlinePlayers){
|
||||||
teamPlayers.stream().map(SteamwarUser::get).map(
|
teamPlayers.stream().map(SteamwarUser::get).map(
|
||||||
user -> onlinePlayers.stream().filter(player -> player.getUniqueId().equals(user.getUuid())).findAny()
|
user -> onlinePlayers.stream().filter(player -> player.getUniqueId().equals(user.getUuid())).findAny()
|
||||||
@ -96,4 +124,24 @@ public class TablistServer implements TablistPart {
|
|||||||
return new Item(p, true);
|
return new Item(p, true);
|
||||||
});
|
});
|
||||||
}
|
}
|
||||||
|
|
||||||
|
public static List<Item> slimify(ChatSender viewer, List<Item> items) {
|
||||||
|
int team = viewer.user().getTeam();
|
||||||
|
return items.stream()
|
||||||
|
.map(Item::getUuid)
|
||||||
|
.map(SteamwarUser::get)
|
||||||
|
.filter(steamwarUser -> {
|
||||||
|
if (steamwarUser.getUserGroup() != UserGroup.Member) return true;
|
||||||
|
Subserver subserver = Subserver.getSubserver(BungeeCord.getInstance().getPlayer(steamwarUser.getUuid()));
|
||||||
|
if (subserver instanceof Arenaserver && subserver.getServer().getPlayers().size() == 1) {
|
||||||
|
return true;
|
||||||
|
}
|
||||||
|
return steamwarUser.getTeam() == team;
|
||||||
|
})
|
||||||
|
.map(SteamwarUser::getUuid)
|
||||||
|
.map(BungeeCord.getInstance()::getPlayer)
|
||||||
|
.filter(Objects::nonNull)
|
||||||
|
.map(TablistPart.Item::new)
|
||||||
|
.collect(Collectors.toList());
|
||||||
|
}
|
||||||
}
|
}
|
||||||
|
@ -649,3 +649,8 @@ LOCK_LOCALE_CHANGED=§aLanguage saved
|
|||||||
#Builder Cloud
|
#Builder Cloud
|
||||||
BUILDERCLOUD_USAGE=§8/§7buildercloud §8[§eversion§8] §8[§emap§8] §8<§7generator§8>
|
BUILDERCLOUD_USAGE=§8/§7buildercloud §8[§eversion§8] §8[§emap§8] §8<§7generator§8>
|
||||||
BUILDERCLOUD_VERSION=§cUnknown version.
|
BUILDERCLOUD_VERSION=§cUnknown version.
|
||||||
|
|
||||||
|
# SlimTablist Command
|
||||||
|
SLIMTABLIST_USAGE=§c/§7toggleslimtablist
|
||||||
|
SLIMTABLIST_ENABLED=§aSlimTablist enabled
|
||||||
|
SLIMTABLIST_DISABLED=§cSlimTablist disabled
|
In neuem Issue referenzieren
Einen Benutzer sperren