forked from SteamWar/SteamWar
Format code
This commit is contained in:
@@ -29,6 +29,7 @@ import java.util.function.Consumer;
|
||||
@Getter
|
||||
public class Bauserver extends Subserver {
|
||||
private static final Map<UUID, Bauserver> servers = new HashMap<>();
|
||||
|
||||
public static Bauserver get(UUID owner) {
|
||||
synchronized (servers) {
|
||||
return servers.get(owner);
|
||||
@@ -37,11 +38,11 @@ public class Bauserver extends Subserver {
|
||||
|
||||
private final UUID owner;
|
||||
|
||||
public Bauserver(String serverName, UUID owner, int port, ProcessBuilder processBuilder, Runnable shutdownCallback){
|
||||
public Bauserver(String serverName, UUID owner, int port, ProcessBuilder processBuilder, Runnable shutdownCallback) {
|
||||
this(serverName, owner, port, processBuilder, shutdownCallback, null);
|
||||
}
|
||||
|
||||
public Bauserver(String serverName, UUID owner, int port, ProcessBuilder processBuilder, Runnable shutdownCallback, Consumer<Exception> failureCallback){
|
||||
public Bauserver(String serverName, UUID owner, int port, ProcessBuilder processBuilder, Runnable shutdownCallback, Consumer<Exception> failureCallback) {
|
||||
super(serverName, port, processBuilder, shutdownCallback, failureCallback);
|
||||
this.owner = owner;
|
||||
|
||||
|
||||
@@ -29,6 +29,7 @@ import java.util.function.Consumer;
|
||||
public class Builderserver extends Subserver {
|
||||
|
||||
private static final Map<String, Builderserver> servers = new HashMap<>();
|
||||
|
||||
public static Builderserver get(String map) {
|
||||
synchronized (servers) {
|
||||
return servers.get(map);
|
||||
@@ -36,11 +37,12 @@ public class Builderserver extends Subserver {
|
||||
}
|
||||
|
||||
private final String map;
|
||||
public Builderserver(String serverName, String map, int port, ProcessBuilder processBuilder, Runnable shutdownCallback){
|
||||
|
||||
public Builderserver(String serverName, String map, int port, ProcessBuilder processBuilder, Runnable shutdownCallback) {
|
||||
this(serverName, map, port, processBuilder, shutdownCallback, null);
|
||||
}
|
||||
|
||||
public Builderserver(String serverName, String map, int port, ProcessBuilder processBuilder, Runnable shutdownCallback, Consumer<Exception> failureCallback){
|
||||
public Builderserver(String serverName, String map, int port, ProcessBuilder processBuilder, Runnable shutdownCallback, Consumer<Exception> failureCallback) {
|
||||
super(serverName, port, processBuilder, shutdownCallback, failureCallback);
|
||||
this.map = map;
|
||||
|
||||
|
||||
@@ -137,7 +137,7 @@ public class Persistent {
|
||||
|
||||
broadcast("§eNetwork update is starting§8.");
|
||||
try {
|
||||
if(container != null && plugin != null) {
|
||||
if (container != null && plugin != null) {
|
||||
System.out.println("Proxy Shutdown Event");
|
||||
plugin.onProxyShutdown(new ProxyShutdownEvent());
|
||||
System.out.println("Unloading of Container");
|
||||
@@ -193,9 +193,9 @@ public class Persistent {
|
||||
PluginClassLoader classLoader = ((PluginClassLoader) plugin.getClass().getClassLoader());
|
||||
|
||||
CommandManager commandManager = proxy.getCommandManager();
|
||||
for(String alias : commandManager.getAliases()) {
|
||||
for (String alias : commandManager.getAliases()) {
|
||||
CommandMeta meta = commandManager.getCommandMeta(alias);
|
||||
if(meta != null && meta.getPlugin() == plugin)
|
||||
if (meta != null && meta.getPlugin() == plugin)
|
||||
commandManager.unregister(meta);
|
||||
}
|
||||
|
||||
@@ -203,11 +203,11 @@ public class Persistent {
|
||||
proxy.getScheduler().tasksByPlugin(plugin).forEach(ScheduledTask::cancel);
|
||||
|
||||
container.getExecutorService().shutdown();
|
||||
if(!container.getExecutorService().awaitTermination(100, TimeUnit.MILLISECONDS))
|
||||
if (!container.getExecutorService().awaitTermination(100, TimeUnit.MILLISECONDS))
|
||||
logger.log(Level.WARNING, "ExecutorService termination took longer than 100ms, continuing.");
|
||||
|
||||
for(Thread thread : Thread.getAllStackTraces().keySet()) {
|
||||
if(thread.getClass().getClassLoader() != classLoader)
|
||||
for (Thread thread : Thread.getAllStackTraces().keySet()) {
|
||||
if (thread.getClass().getClassLoader() != classLoader)
|
||||
continue;
|
||||
|
||||
thread.interrupt();
|
||||
|
||||
@@ -24,5 +24,7 @@ import com.velocitypowered.api.event.proxy.ProxyShutdownEvent;
|
||||
|
||||
public interface ReloadablePlugin {
|
||||
void onProxyInitialization(ProxyInitializeEvent event);
|
||||
default void onProxyShutdown(ProxyShutdownEvent event) {}
|
||||
|
||||
default void onProxyShutdown(ProxyShutdownEvent event) {
|
||||
}
|
||||
}
|
||||
|
||||
@@ -156,7 +156,7 @@ public class Subserver {
|
||||
process.destroyForcibly();
|
||||
}
|
||||
|
||||
if(thread.isAlive())
|
||||
if (thread.isAlive())
|
||||
thread.join();
|
||||
} catch (InterruptedException e) {
|
||||
logger.log(Level.SEVERE, "Subserver stop interrupted!", e);
|
||||
|
||||
@@ -1,16 +1,20 @@
|
||||
# SteamWar GDPR report
|
||||
|
||||
## Copyright notice
|
||||
|
||||
The provided build worlds contain the world design of SteamWar contributors and is subject to their copyright.
|
||||
The build worlds are therefore provided for personal use only.
|
||||
|
||||
## Categories of personal data processed
|
||||
|
||||
- IP address
|
||||
- Minecraft account
|
||||
- E-Mail address (if using a website account)
|
||||
|
||||
## Processing purposes of personal data and person-related data
|
||||
- Provision of SteamWar user functionality (Minecraft account, IP address, BuildWorlds, BuildInventories, BuildMembers, Elo, IgnoredPlayers, SchematicMembers, SchematicChecksessions, Schematics, PersonalKits, UserData, UserConfigs)
|
||||
|
||||
- Provision of SteamWar user functionality (Minecraft account, IP address, BuildWorlds, BuildInventories, BuildMembers,
|
||||
Elo, IgnoredPlayers, SchematicMembers, SchematicChecksessions, Schematics, PersonalKits, UserData, UserConfigs)
|
||||
- Manual analysis and punishment of player misbehaviour (BannedIPs, log files, Punishments)
|
||||
- Statistical analysis (Sessions, Fights, SchematicChecksessions)
|
||||
- Historical data storage (Fights)
|
||||
@@ -18,12 +22,14 @@ The build worlds are therefore provided for personal use only.
|
||||
- Provision of the SteamWar website functionality (IP address, E-Mail address)
|
||||
|
||||
## Data Accessors
|
||||
|
||||
- SteamWar software
|
||||
- SteamWar Administration
|
||||
- SteamWar Development
|
||||
- SteamWar Moderation (limited to Punishments and SchematicChecksessions)
|
||||
|
||||
## Storage duration
|
||||
|
||||
- Data for provision of functionality is stored until user triggered deletion
|
||||
- Log file storage duration is targeted at one month, but might differ due to technical reasons
|
||||
- Historical and statistical data deletion is not intended
|
||||
|
||||
@@ -84,7 +84,7 @@ public class SWCommand extends AbstractSWCommand<Chatter> {
|
||||
@Override
|
||||
public List<String> suggest(Invocation invocation) {
|
||||
String[] args = invocation.arguments();
|
||||
if(args.length == 0)
|
||||
if (args.length == 0)
|
||||
args = new String[]{""};
|
||||
|
||||
return SWCommand.this.tabComplete(Chatter.of(invocation.source()), invocation.alias(), args);
|
||||
@@ -163,7 +163,8 @@ public class SWCommand extends AbstractSWCommand<Chatter> {
|
||||
}
|
||||
if (args.length == 0 || atomicInteger.get() == commandList.size()) {
|
||||
commandList.forEach(subCommand -> {
|
||||
if (subCommand.validator == null || subCommand.validator.validate(sender, sender, (s, args1) -> {})) {
|
||||
if (subCommand.validator == null || subCommand.validator.validate(sender, sender, (s, args1) -> {
|
||||
})) {
|
||||
send(sender, subCommand);
|
||||
}
|
||||
});
|
||||
|
||||
@@ -21,4 +21,5 @@ package de.steamwar.command;
|
||||
|
||||
import de.steamwar.messages.Chatter;
|
||||
|
||||
public interface TypeValidator<T> extends AbstractValidator<Chatter, T> {}
|
||||
public interface TypeValidator<T> extends AbstractValidator<Chatter, T> {
|
||||
}
|
||||
|
||||
File diff suppressed because it is too large
Load Diff
File diff suppressed because it is too large
Load Diff
@@ -77,27 +77,33 @@ public interface Chatter {
|
||||
SteamwarUser user();
|
||||
|
||||
Locale getLocale();
|
||||
|
||||
boolean chatShown();
|
||||
|
||||
void sendMessage(Component msg);
|
||||
|
||||
Player getPlayer();
|
||||
|
||||
default <T> T withPlayerOrOffline(Function<Player, T> withPlayer, Supplier<T> withOffline) {
|
||||
Player player = getPlayer();
|
||||
if(player == null)
|
||||
if (player == null)
|
||||
return withOffline.get();
|
||||
else
|
||||
return withPlayer.apply(player);
|
||||
}
|
||||
|
||||
default void withPlayerOrOffline(Consumer<Player> withPlayer, Runnable withOffline) {
|
||||
Player player = getPlayer();
|
||||
if(player == null) {
|
||||
if (player == null) {
|
||||
withOffline.run();
|
||||
} else {
|
||||
withPlayer.accept(player);
|
||||
}
|
||||
}
|
||||
|
||||
default void withPlayer(Consumer<Player> function) {
|
||||
withPlayerOrOffline(function, () -> {});
|
||||
withPlayerOrOffline(function, () -> {
|
||||
});
|
||||
}
|
||||
|
||||
default void system(String format, Object... params) {
|
||||
@@ -122,9 +128,9 @@ public interface Chatter {
|
||||
|
||||
default void send(boolean prefixed, Message onHover, ClickEvent onClick, Message message) {
|
||||
Component msg = parse(prefixed, message);
|
||||
if(onHover != null)
|
||||
if (onHover != null)
|
||||
msg = msg.hoverEvent(HoverEvent.showText(parse(false, onHover)));
|
||||
if(onClick != null)
|
||||
if (onClick != null)
|
||||
msg = msg.clickEvent(onClick);
|
||||
sendMessage(msg);
|
||||
}
|
||||
@@ -161,24 +167,24 @@ public interface Chatter {
|
||||
Locale locale = getLocale();
|
||||
ResourceBundle resourceBundle = SteamwarResourceBundle.getResourceBundle(locale);
|
||||
String pattern = "";
|
||||
if(prefixed)
|
||||
if (prefixed)
|
||||
pattern = resourceBundle.getObject("PREFIX") + " ";
|
||||
pattern += (String)resourceBundle.getObject(message.format());
|
||||
pattern += (String) resourceBundle.getObject(message.format());
|
||||
|
||||
MessageFormat format = new MessageFormat(pattern, locale);
|
||||
Object[] params = message.params();
|
||||
for (int i = 0; i < params.length; i++) {
|
||||
if(params[i] instanceof Message msg) {
|
||||
if (params[i] instanceof Message msg) {
|
||||
params[i] = parseToLegacy(msg);
|
||||
} else if(params[i] instanceof Date date) {
|
||||
} else if (params[i] instanceof Date date) {
|
||||
params[i] = DateFormat.getDateTimeInstance(DateFormat.SHORT, DateFormat.SHORT, locale).format(date);
|
||||
} else if(params[i] instanceof SteamwarUser user) {
|
||||
} else if (params[i] instanceof SteamwarUser user) {
|
||||
params[i] = user.getUserName();
|
||||
} else if(params[i] instanceof Player player) {
|
||||
} else if (params[i] instanceof Player player) {
|
||||
params[i] = player.getUsername();
|
||||
} else if(params[i] instanceof Chatter chatter) {
|
||||
} else if (params[i] instanceof Chatter chatter) {
|
||||
params[i] = chatter.user().getUserName();
|
||||
} else if(params[i] instanceof Function func) {
|
||||
} else if (params[i] instanceof Function func) {
|
||||
params[i] = func.apply(this);
|
||||
}
|
||||
}
|
||||
@@ -194,7 +200,7 @@ public interface Chatter {
|
||||
}
|
||||
|
||||
static Chatter of(CommandSource sender) {
|
||||
if(sender instanceof Player player)
|
||||
if (sender instanceof Player player)
|
||||
return of(player);
|
||||
|
||||
//Console
|
||||
@@ -226,7 +232,7 @@ public interface Chatter {
|
||||
|
||||
static Chatter of(UUID uuid, boolean playerlessChatShown) {
|
||||
Player player = VelocityCore.getProxy().getPlayer(uuid).orElse(null);
|
||||
if(player != null)
|
||||
if (player != null)
|
||||
return Chatter.of(player);
|
||||
|
||||
return new PlayerlessChatter() {
|
||||
|
||||
@@ -47,7 +47,7 @@ public class ChatterGroup extends Chatter.PlayerlessChatter {
|
||||
|
||||
@Override
|
||||
public void send(boolean prefixed, Message onHover, ClickEvent onClick, Message message) {
|
||||
for(Chatter sender : chatters)
|
||||
for (Chatter sender : chatters)
|
||||
sender.send(prefixed, onHover, onClick, message);
|
||||
}
|
||||
|
||||
|
||||
@@ -19,4 +19,5 @@
|
||||
|
||||
package de.steamwar.messages;
|
||||
|
||||
public record Message(String format, Object... params) { }
|
||||
public record Message(String format, Object... params) {
|
||||
}
|
||||
@@ -46,7 +46,7 @@ public class PlayerChatter implements Chatter {
|
||||
|
||||
@Override
|
||||
public boolean chatShown() {
|
||||
if(!player.hasSentPlayerSettings())
|
||||
if (!player.hasSentPlayerSettings())
|
||||
return false;
|
||||
|
||||
return player.getPlayerSettings().getChatMode() == PlayerSettings.ChatMode.SHOWN;
|
||||
|
||||
@@ -30,13 +30,13 @@ public class SteamwarResourceBundle extends PropertyResourceBundle {
|
||||
private static final Map<String, ResourceBundle> bundles = new HashMap<>();
|
||||
|
||||
public static ResourceBundle getResourceBundle(Locale locale) {
|
||||
return getResourceBundle(locale.toString(), getResourceBundle(locale.getLanguage(), getResourceBundle( "", null)));
|
||||
return getResourceBundle(locale.toString(), getResourceBundle(locale.getLanguage(), getResourceBundle("", null)));
|
||||
}
|
||||
|
||||
private static synchronized ResourceBundle getResourceBundle(String locale, ResourceBundle parent) {
|
||||
return bundles.computeIfAbsent(locale, locale1 -> {
|
||||
InputStream inputStream = Message.class.getResourceAsStream(BASE_PATH + ("".equals(locale) ? "" : "_" + locale) + ".properties");
|
||||
if(inputStream == null)
|
||||
if (inputStream == null)
|
||||
return parent;
|
||||
try {
|
||||
return new SteamwarResourceBundle(inputStream, parent);
|
||||
|
||||
@@ -40,9 +40,9 @@ public class SQLWrapperImpl implements SQLWrapper<String> {
|
||||
@Override
|
||||
public void additionalExceptionMetadata(StringBuilder builder) {
|
||||
builder.append("\nServers: ");
|
||||
for(RegisteredServer server : VelocityCore.getProxy().getAllServers()) {
|
||||
for (RegisteredServer server : VelocityCore.getProxy().getAllServers()) {
|
||||
builder.append(server.getServerInfo().getName()).append("(");
|
||||
for(Player player : server.getPlayersConnected()) {
|
||||
for (Player player : server.getPlayersConnected()) {
|
||||
builder.append(player.getUsername()).append(" ");
|
||||
}
|
||||
builder.append(") ");
|
||||
|
||||
@@ -50,7 +50,7 @@ public class ArenaMode {
|
||||
allModes.clear();
|
||||
|
||||
File folder = new File(VelocityCore.get().getDataDirectory().getParent().toFile(), "FightSystem");
|
||||
if(!folder.exists())
|
||||
if (!folder.exists())
|
||||
return;
|
||||
|
||||
GameModeConfig.init();
|
||||
@@ -71,24 +71,24 @@ public class ArenaMode {
|
||||
}
|
||||
}
|
||||
|
||||
public static GameModeConfig<String, String> getByChat(String name){
|
||||
public static GameModeConfig<String, String> getByChat(String name) {
|
||||
return byChat.get(name.toLowerCase());
|
||||
}
|
||||
|
||||
public static GameModeConfig<String, String> getByInternal(String name){
|
||||
public static GameModeConfig<String, String> getByInternal(String name) {
|
||||
return byInternal.get(name);
|
||||
}
|
||||
|
||||
public static List<String> getAllChatNames(boolean historic) {
|
||||
List<String> chatNames = new LinkedList<>();
|
||||
for(GameModeConfig<String, String> mode : byInternal.values()){
|
||||
if(mode.isActive() && historic == mode.Server.Historic)
|
||||
for (GameModeConfig<String, String> mode : byInternal.values()) {
|
||||
if (mode.isActive() && historic == mode.Server.Historic)
|
||||
chatNames.addAll(mode.Server.ChatNames);
|
||||
}
|
||||
return chatNames;
|
||||
}
|
||||
|
||||
public static GameModeConfig<String, String> getBySchemType(SchematicType schemType){
|
||||
public static GameModeConfig<String, String> getBySchemType(SchematicType schemType) {
|
||||
return bySchemType.get(schemType);
|
||||
}
|
||||
}
|
||||
|
||||
@@ -34,15 +34,15 @@ public class Broadcaster {
|
||||
private int lastBroadCast = 0;
|
||||
|
||||
public Broadcaster() {
|
||||
if(!broadcasts.isEmpty())
|
||||
if (!broadcasts.isEmpty())
|
||||
VelocityCore.schedule(this::broadcast).repeat(10, TimeUnit.MINUTES).schedule();
|
||||
}
|
||||
|
||||
private void broadcast() {
|
||||
if(!VelocityCore.getProxy().getAllPlayers().isEmpty())
|
||||
if (!VelocityCore.getProxy().getAllPlayers().isEmpty())
|
||||
Chatter.broadcast().system("PLAIN_STRING", broadcasts.get(lastBroadCast++));
|
||||
|
||||
if(lastBroadCast == broadcasts.size())
|
||||
if (lastBroadCast == broadcasts.size())
|
||||
lastBroadCast = 0;
|
||||
}
|
||||
}
|
||||
|
||||
@@ -52,9 +52,9 @@ public class Config {
|
||||
Yaml yaml = new Yaml(constructor, representer);
|
||||
yaml.setBeanAccess(BeanAccess.FIELD);
|
||||
|
||||
try{
|
||||
try {
|
||||
return yaml.load(new FileInputStream(file));
|
||||
}catch(IOException e){
|
||||
} catch (IOException e) {
|
||||
VelocityCore.getProxy().shutdown();
|
||||
throw new SecurityException("Could not load config", e);
|
||||
}
|
||||
|
||||
@@ -53,19 +53,19 @@ public class ErrorLogger extends AbstractAppender {
|
||||
|
||||
@Override
|
||||
public void append(LogEvent event) {
|
||||
if(event.getLevel().intLevel() > Level.WARN.intLevel())
|
||||
if (event.getLevel().intLevel() > Level.WARN.intLevel())
|
||||
return;
|
||||
|
||||
String message = event.getMessage().getFormattedMessage();
|
||||
for(String reason : filteredMessages)
|
||||
if(message.contains(reason))
|
||||
for (String reason : filteredMessages)
|
||||
if (message.contains(reason))
|
||||
return;
|
||||
|
||||
ByteArrayOutputStream stacktraceOutput = new ByteArrayOutputStream();
|
||||
if(event.getThrown() != null)
|
||||
if (event.getThrown() != null)
|
||||
event.getThrown().printStackTrace(new PrintStream(stacktraceOutput));
|
||||
String stacktrace = stacktraceOutput.toString();
|
||||
for(String reason : filteredStacktraces)
|
||||
for (String reason : filteredStacktraces)
|
||||
if (stacktrace.contains(reason))
|
||||
return;
|
||||
|
||||
|
||||
@@ -63,13 +63,13 @@ public class EventStarter {
|
||||
Queue<EventFight> fights = EventFight.getFights();
|
||||
|
||||
EventFight next;
|
||||
while((next = nextFight(fights)) != null){
|
||||
while ((next = nextFight(fights)) != null) {
|
||||
Team blue = Team.byId(next.getTeamBlue());
|
||||
Team red = Team.byId(next.getTeamRed());
|
||||
|
||||
//Don't start EventServer if not the event bungee
|
||||
String command;
|
||||
if(VelocityCore.get().getConfig().isEventmode() || next.getSpectatePort() == null) {
|
||||
if (VelocityCore.get().getConfig().isEventmode() || next.getSpectatePort() == null) {
|
||||
ServerStarter starter = new ServerStarter().event(next);
|
||||
|
||||
starter.callback(subserver -> {
|
||||
@@ -95,12 +95,12 @@ public class EventStarter {
|
||||
EventFight.clearActiveFightsCache();
|
||||
}
|
||||
|
||||
private EventFight nextFight(Queue<EventFight> fights){
|
||||
private EventFight nextFight(Queue<EventFight> fights) {
|
||||
EventFight next = fights.peek();
|
||||
if(next == null)
|
||||
if (next == null)
|
||||
return null;
|
||||
|
||||
if(!next.getStartTime().before(new Timestamp(System.currentTimeMillis())))
|
||||
if (!next.getStartTime().before(new Timestamp(System.currentTimeMillis())))
|
||||
return null;
|
||||
|
||||
return fights.poll();
|
||||
|
||||
@@ -39,6 +39,7 @@ public abstract class Node {
|
||||
"-XX:+EnableDynamicAgentLoading", "-Dlog4j.configurationFile=log4j2.xml"
|
||||
);
|
||||
private static final Set<String> JAVA_8 = new HashSet<>();
|
||||
|
||||
static {
|
||||
JAVA_8.add("paper-1.8.8.jar");
|
||||
JAVA_8.add("paper-1.10.2.jar");
|
||||
@@ -52,8 +53,8 @@ public abstract class Node {
|
||||
private static final List<Node> nodes = new ArrayList<>();
|
||||
|
||||
public static Node getNode() {
|
||||
for(Node node : nodes) {
|
||||
if(node.belowLoadLimit)
|
||||
for (Node node : nodes) {
|
||||
if (node.belowLoadLimit)
|
||||
return node;
|
||||
}
|
||||
return null;
|
||||
@@ -66,6 +67,7 @@ public abstract class Node {
|
||||
public abstract ProcessBuilder startServer(String serverJar, File directory, String worldDir, String levelName, int port, String... dParams);
|
||||
|
||||
protected abstract ProcessBuilder prepareExecution(String... command);
|
||||
|
||||
protected abstract void calcLoadLimit();
|
||||
|
||||
protected final String hostname;
|
||||
@@ -91,6 +93,7 @@ public abstract class Node {
|
||||
public boolean belowLoadLimit() {
|
||||
return belowLoadLimit;
|
||||
}
|
||||
|
||||
public String getName() {
|
||||
return hostname;
|
||||
}
|
||||
@@ -101,7 +104,7 @@ public abstract class Node {
|
||||
else
|
||||
cmd.add("/usr/lib/jvm/openj9-21/bin/java");
|
||||
|
||||
for(String param : dParams){
|
||||
for (String param : dParams) {
|
||||
cmd.add("-D" + param);
|
||||
}
|
||||
cmd.add("-Xshareclasses:nonfatal,name=" + directory.getName());
|
||||
@@ -126,7 +129,7 @@ public abstract class Node {
|
||||
|
||||
protected void calcLoadLimit(BufferedReader meminfo) throws IOException {
|
||||
String line = meminfo.readLine();
|
||||
while(!line.startsWith("MemAvailable")) {
|
||||
while (!line.startsWith("MemAvailable")) {
|
||||
line = meminfo.readLine();
|
||||
}
|
||||
|
||||
@@ -200,13 +203,13 @@ public abstract class Node {
|
||||
protected void calcLoadLimit() {
|
||||
try {
|
||||
Process process = prepareExecution("cat /proc/meminfo").start();
|
||||
if(!process.waitFor(1, TimeUnit.SECONDS))
|
||||
if (!process.waitFor(1, TimeUnit.SECONDS))
|
||||
throw new IOException(hostname + " timeout");
|
||||
try (BufferedReader reader = new BufferedReader(new InputStreamReader(process.getInputStream()))) {
|
||||
calcLoadLimit(reader);
|
||||
}
|
||||
} catch (IOException e) {
|
||||
if(belowLoadLimit)
|
||||
if (belowLoadLimit)
|
||||
VelocityCore.getLogger().log(Level.SEVERE, "Could read remote load", e);
|
||||
belowLoadLimit = false;
|
||||
} catch (InterruptedException e) {
|
||||
|
||||
@@ -49,7 +49,7 @@ public class ServerStarter {
|
||||
|
||||
private static final String TMP_DATA = System.getProperty("user.home") + "/";
|
||||
private static final String EVENT_PATH = TMP_DATA + "event/";
|
||||
public static final String TEMP_WORLD_PATH = TMP_DATA + "arenaserver/";
|
||||
public static final String TEMP_WORLD_PATH = TMP_DATA + "arenaserver/";
|
||||
|
||||
private static final String WORLDS_FOLDER = "/worlds";
|
||||
public static final String WORLDS_BASE_PATH = WORLDS_FOLDER + "/userworlds";
|
||||
@@ -65,15 +65,18 @@ public class ServerStarter {
|
||||
private Portrange portrange = BAU_PORTS;
|
||||
private Function<Integer, String> serverNameProvider = port -> node.getName() + port;
|
||||
private BooleanSupplier startCondition = () -> true;
|
||||
private Runnable worldSetup = () -> {};
|
||||
private Runnable worldSetup = () -> {
|
||||
};
|
||||
private String worldName = null;
|
||||
private Runnable worldCleanup = () -> {};
|
||||
private Runnable worldCleanup = () -> {
|
||||
};
|
||||
private boolean allowMerge = false;
|
||||
private String fightMap = null;
|
||||
private String gameMode = null;
|
||||
private boolean checkpoint = false;
|
||||
private ServerConstructor constructor = (serverName, port, builder, shutdownCallback, failureCallback) -> new Arenaserver(serverName, gameMode, fightMap, allowMerge, port, builder, shutdownCallback);
|
||||
private Consumer<Subserver> callback = subserver -> {};
|
||||
private Consumer<Subserver> callback = subserver -> {
|
||||
};
|
||||
private Object responsible = new Object();
|
||||
|
||||
private final Set<Player> playersToSend = new HashSet<>();
|
||||
@@ -90,7 +93,7 @@ public class ServerStarter {
|
||||
arguments.put("config", mode.configFile.getName());
|
||||
tempWorld(SERVER_PATH + mode.Server.Folder + "/arenas/" + map);
|
||||
startCondition = () -> {
|
||||
if(playersToSend.stream().anyMatch(player -> Subserver.isArena(Subserver.getSubserver(player)))) {
|
||||
if (playersToSend.stream().anyMatch(player -> Subserver.isArena(Subserver.getSubserver(player)))) {
|
||||
playersToSend.forEach(player -> Chatter.of(player).system("FIGHT_IN_ARENA"));
|
||||
return false;
|
||||
}
|
||||
@@ -104,7 +107,8 @@ public class ServerStarter {
|
||||
arena(ArenaMode.getByInternal(eventFight.getSpielmodus()), eventFight.getMap());
|
||||
node = VelocityCore.local;
|
||||
worldDir = EVENT_PATH;
|
||||
worldCleanup = () -> {};
|
||||
worldCleanup = () -> {
|
||||
};
|
||||
arguments.put("fightID", String.valueOf(eventFight.getFightID()));
|
||||
fightMap = eventFight.getMap();
|
||||
gameMode = eventFight.getSpielmodus();
|
||||
@@ -162,7 +166,7 @@ public class ServerStarter {
|
||||
if (!world.exists()) {
|
||||
File storage = new File(version.getWorldFolder(WORLDS_STORAGE_BASE_PATH), worldName);
|
||||
|
||||
if(storage.exists())
|
||||
if (storage.exists())
|
||||
node.execute("mv", storage.getPath(), world.getPath());
|
||||
else
|
||||
copyWorld(node, new File(directory, "Bauwelt").getPath(), world.getPath());
|
||||
@@ -172,8 +176,8 @@ public class ServerStarter {
|
||||
// Send players to existing server
|
||||
startCondition = () -> {
|
||||
Bauserver subserver = Bauserver.get(owner);
|
||||
if(subserver != null) {
|
||||
for(Player p : playersToSend)
|
||||
if (subserver != null) {
|
||||
for (Player p : playersToSend)
|
||||
SubserverSystem.sendPlayer(subserver, p);
|
||||
return false;
|
||||
}
|
||||
@@ -204,11 +208,11 @@ public class ServerStarter {
|
||||
|
||||
// Stop existing build server
|
||||
startCondition = () -> {
|
||||
if(startingBau(owner))
|
||||
if (startingBau(owner))
|
||||
return false;
|
||||
|
||||
Bauserver subserver = Bauserver.get(owner.getUniqueId());
|
||||
if(subserver != null && subserver.isStarted())
|
||||
if (subserver != null && subserver.isStarted())
|
||||
subserver.stop();
|
||||
|
||||
return !startingBau(owner);
|
||||
@@ -233,14 +237,14 @@ public class ServerStarter {
|
||||
startCondition = () -> {
|
||||
Builderserver subserver = Builderserver.get(worldName);
|
||||
if (subserver != null) {
|
||||
for(Player p : playersToSend)
|
||||
for (Player p : playersToSend)
|
||||
SubserverSystem.sendPlayer(subserver, p);
|
||||
return false;
|
||||
}
|
||||
return true;
|
||||
};
|
||||
|
||||
if(generator != null) {
|
||||
if (generator != null) {
|
||||
worldSetup = () -> {
|
||||
File leveldat = new File(new File(worldDir, worldName), "level.dat");
|
||||
try {
|
||||
@@ -257,7 +261,7 @@ public class ServerStarter {
|
||||
public ServerStarter send(Player player) {
|
||||
playersToSend.add(player);
|
||||
|
||||
if(!(responsible instanceof Player))
|
||||
if (!(responsible instanceof Player))
|
||||
responsible = player;
|
||||
|
||||
return this;
|
||||
@@ -271,35 +275,35 @@ public class ServerStarter {
|
||||
public void start() {
|
||||
VelocityCore.schedule(() -> {
|
||||
synchronized (responsible) {
|
||||
if(!startCondition.getAsBoolean())
|
||||
if (!startCondition.getAsBoolean())
|
||||
return;
|
||||
|
||||
int port = portrange.freePort();
|
||||
String serverName = serverNameProvider.apply(port);
|
||||
arguments.put("serverName", serverName);
|
||||
|
||||
if(node == null) {
|
||||
if (node == null) {
|
||||
node = Node.getNode();
|
||||
if(node == null) {
|
||||
if (node == null) {
|
||||
for (Player p : playersToSend)
|
||||
Chatter.of(p).system("SERVER_START_OVERLOAD");
|
||||
|
||||
return;
|
||||
}
|
||||
}
|
||||
if(worldName == null)
|
||||
if (worldName == null)
|
||||
worldName = serverToWorldName(serverName);
|
||||
|
||||
worldSetup.run();
|
||||
arguments.put("logPath", worldName);
|
||||
|
||||
File checkpointDir = new File("/tmp/" + System.getProperty("user.name") + ".checkpoints/" + directory.getName() + "/" + worldName);
|
||||
if(checkpoint)
|
||||
if (checkpoint)
|
||||
arguments.put("checkpoint", checkpointDir.getPath());
|
||||
|
||||
((VelocityViaConfig) Via.getConfig()).getVelocityServerProtocols().put(serverName, version.getProtocolVersion().getProtocol());
|
||||
if(checkpoint && checkpointDir.exists()) {
|
||||
try(DataOutputStream out = new DataOutputStream(Files.newOutputStream(new File(checkpointDir, "port").toPath()))) {
|
||||
if (checkpoint && checkpointDir.exists()) {
|
||||
try (DataOutputStream out = new DataOutputStream(Files.newOutputStream(new File(checkpointDir, "port").toPath()))) {
|
||||
out.writeInt(port);
|
||||
} catch (IOException e) {
|
||||
throw new SecurityException(e);
|
||||
@@ -322,7 +326,7 @@ public class ServerStarter {
|
||||
}
|
||||
|
||||
private void postStart(Subserver subserver) {
|
||||
for(Player p : playersToSend)
|
||||
for (Player p : playersToSend)
|
||||
SubserverSystem.sendPlayer(subserver, p);
|
||||
|
||||
callback.accept(subserver);
|
||||
@@ -330,7 +334,7 @@ public class ServerStarter {
|
||||
|
||||
private static boolean startingBau(Player p) {
|
||||
Bauserver subserver = Bauserver.get(p.getUniqueId());
|
||||
if(subserver != null && !subserver.isStarted()) {
|
||||
if (subserver != null && !subserver.isStarted()) {
|
||||
Chatter.of(p).system("BAU_START_ALREADY");
|
||||
return true;
|
||||
}
|
||||
@@ -368,7 +372,7 @@ public class ServerStarter {
|
||||
private void increment() {
|
||||
current++;
|
||||
|
||||
if(current == end)
|
||||
if (current == end)
|
||||
current = start;
|
||||
}
|
||||
|
||||
@@ -379,7 +383,7 @@ public class ServerStarter {
|
||||
usedPorts = Subserver.getServerList().stream().map(server -> server.getServer().getAddress().getPort()).collect(Collectors.toSet());
|
||||
}
|
||||
|
||||
while(usedPorts.contains(current)) {
|
||||
while (usedPorts.contains(current)) {
|
||||
increment();
|
||||
}
|
||||
|
||||
|
||||
@@ -92,7 +92,7 @@ public enum ServerVersion {
|
||||
private static final Map<Integer, ServerVersion> versionMap = new HashMap<>();
|
||||
|
||||
static {
|
||||
for(ServerVersion version : values())
|
||||
for (ServerVersion version : values())
|
||||
versionMap.put(version.getVersionSuffix(), version);
|
||||
}
|
||||
|
||||
|
||||
@@ -33,14 +33,15 @@ import net.kyori.adventure.text.event.ClickEvent;
|
||||
import java.util.UUID;
|
||||
|
||||
public class SubserverSystem {
|
||||
private SubserverSystem(){}
|
||||
private SubserverSystem() {
|
||||
}
|
||||
|
||||
public static void deleteFolder(Node node, String worldName) {
|
||||
node.execute("rm", "-r", worldName);
|
||||
}
|
||||
|
||||
public static void sendDeniedMessage(Chatter p, UUID owner) {
|
||||
if(IgnoreSystem.isIgnored(owner, p.user().getUUID())){
|
||||
if (IgnoreSystem.isIgnored(owner, p.user().getUUID())) {
|
||||
p.system("SERVER_IGNORED");
|
||||
return;
|
||||
}
|
||||
@@ -52,7 +53,7 @@ public class SubserverSystem {
|
||||
|
||||
public static void sendPlayer(Subserver subserver, Player player) {
|
||||
subserver.sendPlayer(player);
|
||||
if(!subserver.isStarted() && FightInfoHandler.onLobby(player))
|
||||
if (!subserver.isStarted() && FightInfoHandler.onLobby(player))
|
||||
NetworkSender.send(player, new StartingServerPacket(SteamwarUser.get(player.getUniqueId()).getId()));
|
||||
}
|
||||
}
|
||||
|
||||
@@ -62,13 +62,14 @@ import java.util.logging.Logger;
|
||||
@Plugin(
|
||||
id = "velocitycore",
|
||||
name = "VelocityCore",
|
||||
dependencies = { @Dependency(id = "persistentvelocitycore"), @Dependency(id = "depencendiesvelocitycore") }
|
||||
dependencies = {@Dependency(id = "persistentvelocitycore"), @Dependency(id = "depencendiesvelocitycore")}
|
||||
)
|
||||
public class VelocityCore implements ReloadablePlugin {
|
||||
|
||||
public static boolean MAIN_SERVER;
|
||||
|
||||
private static VelocityCore instance;
|
||||
|
||||
public static VelocityCore get() {
|
||||
return instance;
|
||||
}
|
||||
@@ -135,7 +136,7 @@ public class VelocityCore implements ReloadablePlugin {
|
||||
initStaticServers();
|
||||
|
||||
local = new Node.LocalNode();
|
||||
if(MAIN_SERVER) {
|
||||
if (MAIN_SERVER) {
|
||||
//new Node.RemoteNode("lx");
|
||||
}
|
||||
|
||||
@@ -205,7 +206,7 @@ public class VelocityCore implements ReloadablePlugin {
|
||||
bot.getJda().getHttpClient().connectionPool().evictAll();
|
||||
bot.getJda().getHttpClient().dispatcher().executorService().shutdown();
|
||||
try {
|
||||
if(!bot.getJda().awaitShutdown(1, TimeUnit.SECONDS))
|
||||
if (!bot.getJda().awaitShutdown(1, TimeUnit.SECONDS))
|
||||
logger.log(Level.SEVERE, "Could not await discord bot shutdown");
|
||||
} catch (InterruptedException e) {
|
||||
Thread.currentThread().interrupt();
|
||||
@@ -228,11 +229,11 @@ public class VelocityCore implements ReloadablePlugin {
|
||||
|
||||
private void initStaticServers() {
|
||||
for (Map.Entry<String, Config.Server> entry : config.getServers().entrySet()) {
|
||||
Config.Server server = entry.getValue();
|
||||
Config.Server server = entry.getValue();
|
||||
List<String> cmds = server.getCommands();
|
||||
String cmd = cmds.remove(0);
|
||||
|
||||
if(server.getSpectatePort() != 0)
|
||||
if (server.getSpectatePort() != 0)
|
||||
EventStarter.addSpectateServer(server.getSpectatePort(), cmd);
|
||||
|
||||
new ServerSwitchCommand(cmd, entry.getKey(), server.getSpectatePort() != 0, cmds.toArray(new String[0]));
|
||||
|
||||
@@ -161,7 +161,7 @@ public class BauCommand extends SWCommand {
|
||||
setter.accept(target);
|
||||
|
||||
Bauserver bauserver = Bauserver.get(owner.user().getUUID());
|
||||
if(bauserver != null)
|
||||
if (bauserver != null)
|
||||
bauserver.getRegisteredServer().getPlayersConnected().stream().findAny().ifPresent(player -> NetworkSender.send(player, new BaumemberUpdatePacket()));
|
||||
|
||||
Chatter.of(user.getUUID()).system("BAU_MEMBER_SET_TARGET", owner, new Message(permName));
|
||||
@@ -181,7 +181,7 @@ public class BauCommand extends SWCommand {
|
||||
player.createConnectionRequest(VelocityCore.get().getConfig().lobbyserver()).fireAndForget();
|
||||
});
|
||||
|
||||
if(bauserver != null)
|
||||
if (bauserver != null)
|
||||
bauserver.getRegisteredServer().getPlayersConnected().stream().findAny().ifPresent(player -> NetworkSender.send(player, new BaumemberUpdatePacket()));
|
||||
|
||||
member.system("BAU_DELMEMBER_DELETED_TARGET", owner);
|
||||
@@ -211,7 +211,7 @@ public class BauCommand extends SWCommand {
|
||||
VelocityCore.schedule(() -> {
|
||||
sender.system("BAU_STOPPING");
|
||||
Bauserver subserver = Bauserver.get(sender.user().getUUID());
|
||||
if(subserver != null)
|
||||
if (subserver != null)
|
||||
subserver.stop();
|
||||
|
||||
sender.system("BAU_STOPPED");
|
||||
@@ -227,7 +227,7 @@ public class BauCommand extends SWCommand {
|
||||
|
||||
VelocityCore.schedule(() -> {
|
||||
Bauserver subserver = Bauserver.get(sender.user().getUUID());
|
||||
if(subserver != null)
|
||||
if (subserver != null)
|
||||
subserver.stop();
|
||||
|
||||
SubserverSystem.deleteFolder(VelocityCore.local, world);
|
||||
|
||||
@@ -54,7 +54,7 @@ public class BuilderCloudCommand extends SWCommand {
|
||||
|
||||
@Register(description = "BUILDERCLOUD_USAGE")
|
||||
public void start(PlayerChatter sender, @ErrorMessage("BUILDERCLOUD_VERSION") ServerVersion version, @Mapper("map") String map) {
|
||||
if(!mapFile(version, map).exists()) {
|
||||
if (!mapFile(version, map).exists()) {
|
||||
sender.system("BUILDERCLOUD_UNKNOWN_MAP");
|
||||
return;
|
||||
}
|
||||
@@ -65,13 +65,13 @@ public class BuilderCloudCommand extends SWCommand {
|
||||
@Register(value = "rename", description = "BUILDERCLOUD_RENAME_USAGE")
|
||||
public void rename(Chatter sender, @ErrorMessage("BUILDERCLOUD_VERSION") ServerVersion version, @Mapper("map") String oldName, String newName) {
|
||||
File oldMap = mapFile(version, oldName);
|
||||
if(!oldMap.exists()) {
|
||||
if (!oldMap.exists()) {
|
||||
sender.system("BUILDERCLOUD_UNKNOWN_MAP");
|
||||
return;
|
||||
}
|
||||
|
||||
File newMap = mapFile(version, newName);
|
||||
if(newMap.exists()) {
|
||||
if (newMap.exists()) {
|
||||
sender.system("BUILDERCLOUD_EXISTING_MAP");
|
||||
return;
|
||||
}
|
||||
@@ -87,7 +87,7 @@ public class BuilderCloudCommand extends SWCommand {
|
||||
|
||||
@Register(value = "deploy", description = "BUILDERCLOUD_DEPLOY_USAGE")
|
||||
public void deploy(Chatter sender, @Mapper("nonHistoricArenaMode") GameModeConfig<String, String> arenaMode, @ErrorMessage("BUILDERCLOUD_VERSION") ServerVersion version, @Mapper("map") String map) {
|
||||
if(!mapFile(version, map).exists()) {
|
||||
if (!mapFile(version, map).exists()) {
|
||||
sender.system("BUILDERCLOUD_UNKNOWN_MAP");
|
||||
return;
|
||||
}
|
||||
@@ -114,7 +114,7 @@ public class BuilderCloudCommand extends SWCommand {
|
||||
File folder = getWorldFolder(previousArguments, 1);
|
||||
|
||||
String[] files;
|
||||
if(folder == null || (files = folder.list()) == null)
|
||||
if (folder == null || (files = folder.list()) == null)
|
||||
return Collections.emptyList();
|
||||
|
||||
return Arrays.stream(files).filter(file -> new File(folder, file).isDirectory()).filter(file -> s.startsWith(".") || !file.startsWith(".")).toList();
|
||||
@@ -129,16 +129,16 @@ public class BuilderCloudCommand extends SWCommand {
|
||||
return new TypeMapper<File>() {
|
||||
@Override
|
||||
public File map(Chatter sender, PreviousArguments previousArguments, String s) {
|
||||
if(s.isEmpty())
|
||||
if (s.isEmpty())
|
||||
return null;
|
||||
|
||||
File folder = getWorldFolder(previousArguments, 2);
|
||||
|
||||
if(folder == null)
|
||||
if (folder == null)
|
||||
throw new SecurityException();
|
||||
|
||||
File generator = new File(folder, s + ".dat");
|
||||
if(!generator.exists() || !generator.isFile())
|
||||
if (!generator.exists() || !generator.isFile())
|
||||
throw new SecurityException();
|
||||
|
||||
return generator;
|
||||
@@ -149,7 +149,7 @@ public class BuilderCloudCommand extends SWCommand {
|
||||
File folder = getWorldFolder(previousArguments, 2);
|
||||
|
||||
String[] files;
|
||||
if(folder == null || (files = folder.list()) == null)
|
||||
if (folder == null || (files = folder.list()) == null)
|
||||
return Collections.emptyList();
|
||||
|
||||
return Arrays.stream(files).filter(file -> new File(folder, file).isFile()).filter(file -> file.endsWith(".dat")).map(file -> file.substring(0, file.length() - 4)).toList();
|
||||
@@ -163,7 +163,7 @@ public class BuilderCloudCommand extends SWCommand {
|
||||
|
||||
private File getWorldFolder(PreviousArguments previousArguments, int offset) {
|
||||
ServerVersion v = ServerVersion.get(previousArguments.userArgs[previousArguments.userArgs.length - offset]);
|
||||
if(v == null)
|
||||
if (v == null)
|
||||
return null;
|
||||
return new File(v.getWorldFolder(ServerStarter.BUILDER_BASE_PATH));
|
||||
}
|
||||
|
||||
@@ -49,15 +49,15 @@ public class ChallengeCommand extends SWCommand {
|
||||
public void challenge(@Validator("arenaPlayer") PlayerChatter sender, @Validator("target") Player target, @Mapper("nonHistoricArenaMode") @OptionalValue("") @AllowNull GameModeConfig<String, String> arenaMode, @Mapper("arenaMap") @OptionalValue("") @AllowNull String map) {
|
||||
FightCommand.createArena(sender, "/challenge " + target.getUsername() + " ", false, arenaMode, map, false, (chatter, mode, m) -> {
|
||||
Player p = sender.getPlayer();
|
||||
if(challenges.containsKey(target) && challenges.get(target).contains(p)){
|
||||
if (challenges.containsKey(target) && challenges.get(target).contains(p)) {
|
||||
challenges.remove(target);
|
||||
challenges.remove(p);
|
||||
|
||||
new ServerStarter().arena(mode, map).blueLeader(sender.getPlayer()).redLeader(target).callback(
|
||||
arena -> Chatter.broadcast().system("CHALLENGE_BROADCAST", new Message("CHALLENGE_BROADCAST_HOVER"), ClickEvent.runCommand("/arena " + arena.getServer().getName()), mode.GameName, p, target)
|
||||
).start();
|
||||
}else{
|
||||
if(!challenges.containsKey(p)){
|
||||
} else {
|
||||
if (!challenges.containsKey(p)) {
|
||||
challenges.put(p, new LinkedList<>());
|
||||
}
|
||||
|
||||
@@ -95,7 +95,7 @@ public class ChallengeCommand extends SWCommand {
|
||||
};
|
||||
}
|
||||
|
||||
public static void remove(Player player){
|
||||
public static void remove(Player player) {
|
||||
challenges.remove(player);
|
||||
}
|
||||
}
|
||||
|
||||
@@ -52,7 +52,7 @@ public class CheckCommand extends SWCommand {
|
||||
private static final Map<UUID, CheckSession> currentCheckers = new HashMap<>();
|
||||
private static final Map<Integer, CheckSession> currentSchems = new HashMap<>();
|
||||
|
||||
public static boolean isChecking(Player player){
|
||||
public static boolean isChecking(Player player) {
|
||||
return currentCheckers.containsKey(player.getUniqueId());
|
||||
}
|
||||
|
||||
@@ -77,7 +77,7 @@ public class CheckCommand extends SWCommand {
|
||||
|
||||
public static void sendReminder(Chatter chatter) {
|
||||
List<SchematicNode> schematics = getSchemsToCheck();
|
||||
if(schematics.size() == currentCheckers.size())
|
||||
if (schematics.size() == currentCheckers.size())
|
||||
return;
|
||||
|
||||
chatter.system("CHECK_REMINDER", new Message("CHECK_REMINDER_HOVER"), ClickEvent.runCommand("/check list"), schematics.size() - currentCheckers.size());
|
||||
@@ -123,7 +123,7 @@ public class CheckCommand extends SWCommand {
|
||||
|
||||
@Register(value = "schematic", noTabComplete = true)
|
||||
public void schematic(PlayerChatter sender, String schemID) {
|
||||
if(isChecking(sender.getPlayer())){
|
||||
if (isChecking(sender.getPlayer())) {
|
||||
sender.system("CHECK_SCHEMATIC_ALREADY_CHECKING");
|
||||
return;
|
||||
}
|
||||
@@ -134,10 +134,10 @@ public class CheckCommand extends SWCommand {
|
||||
sender.system("CHECK_SCHEMATIC_EVENT");
|
||||
return;
|
||||
}
|
||||
if(!schem.getSchemtype().check()){
|
||||
if (!schem.getSchemtype().check()) {
|
||||
VelocityCore.getLogger().log(Level.SEVERE, () -> sender.user().getUserName() + " tried to check an uncheckable schematic!");
|
||||
return;
|
||||
}else if(schem.getOwner() == sender.user().getId() && !sender.user().hasPerm(UserPerm.ADMINISTRATION)) {
|
||||
} else if (schem.getOwner() == sender.user().getId() && !sender.user().hasPerm(UserPerm.ADMINISTRATION)) {
|
||||
sender.system("CHECK_SCHEMATIC_OWN");
|
||||
return;
|
||||
}
|
||||
@@ -167,7 +167,7 @@ public class CheckCommand extends SWCommand {
|
||||
}
|
||||
|
||||
public static void abort(Player player) {
|
||||
if(notChecking(player))
|
||||
if (notChecking(player))
|
||||
return;
|
||||
|
||||
Chatter.of(player).system("CHECK_ABORT");
|
||||
@@ -176,7 +176,7 @@ public class CheckCommand extends SWCommand {
|
||||
|
||||
@Register(value = "next", description = "CHECK_HELP_NEXT")
|
||||
public void next(PlayerChatter sender) {
|
||||
if(notChecking(sender.getPlayer()))
|
||||
if (notChecking(sender.getPlayer()))
|
||||
return;
|
||||
|
||||
currentCheckers.get(sender.getPlayer().getUniqueId()).next();
|
||||
@@ -189,7 +189,7 @@ public class CheckCommand extends SWCommand {
|
||||
|
||||
@Register(value = "decline", description = "CHECK_HELP_DECLINE")
|
||||
public void decline(PlayerChatter sender) {
|
||||
if(notChecking(sender.getPlayer()))
|
||||
if (notChecking(sender.getPlayer()))
|
||||
return;
|
||||
|
||||
currentCheckers.get(sender.getPlayer().getUniqueId()).markDeclined();
|
||||
@@ -197,13 +197,13 @@ public class CheckCommand extends SWCommand {
|
||||
|
||||
@Register(value = "decline", description = "CHECK_HELP_DECLINE")
|
||||
public void decline(PlayerChatter sender, String... message) {
|
||||
if(notChecking(sender.getPlayer()))
|
||||
if (notChecking(sender.getPlayer()))
|
||||
return;
|
||||
|
||||
currentCheckers.get(sender.getPlayer().getUniqueId()).decline(String.join(" ", message));
|
||||
}
|
||||
|
||||
public static List<SchematicNode> getSchemsToCheck(){
|
||||
public static List<SchematicNode> getSchemsToCheck() {
|
||||
List<SchematicNode> schematicList = new ArrayList<>();
|
||||
|
||||
for (SchematicType type : SchematicType.values()) {
|
||||
@@ -218,15 +218,15 @@ public class CheckCommand extends SWCommand {
|
||||
return currentSchems.get(schematic.getId()).checker.user().getUserName();
|
||||
}
|
||||
|
||||
private static boolean notChecking(Player player){
|
||||
if(!isChecking(player)){
|
||||
private static boolean notChecking(Player player) {
|
||||
if (!isChecking(player)) {
|
||||
Chatter.of(player).system("CHECK_NOT_CHECKING");
|
||||
return true;
|
||||
}
|
||||
return false;
|
||||
}
|
||||
|
||||
private static class CheckSession{
|
||||
private static class CheckSession {
|
||||
private final PlayerChatter checker;
|
||||
private final SchematicNode schematic;
|
||||
private final Timestamp startTime;
|
||||
@@ -234,7 +234,7 @@ public class CheckCommand extends SWCommand {
|
||||
private String currentQuestion;
|
||||
private final List<String> declinedQuestions = new ArrayList<>();
|
||||
|
||||
private CheckSession(PlayerChatter checker, SchematicNode schematic){
|
||||
private CheckSession(PlayerChatter checker, SchematicNode schematic) {
|
||||
this.checker = checker;
|
||||
this.schematic = schematic;
|
||||
this.startTime = Timestamp.from(Instant.now());
|
||||
@@ -245,14 +245,14 @@ public class CheckCommand extends SWCommand {
|
||||
currentCheckers.put(checker.user().getUUID(), this);
|
||||
currentSchems.put(schematic.getId(), this);
|
||||
|
||||
for(CheckedSchematic previous : CheckedSchematic.previousChecks(schematic))
|
||||
for (CheckedSchematic previous : CheckedSchematic.previousChecks(schematic))
|
||||
checker.prefixless("CHECK_SCHEMATIC_PREVIOUS", previous.getEndTime(), SteamwarUser.byId(previous.getValidator()).getUserName(), previous.getDeclineReason());
|
||||
next();
|
||||
}).start();
|
||||
}
|
||||
|
||||
private void next() {
|
||||
if(!checkList.hasNext()){
|
||||
if (!checkList.hasNext()) {
|
||||
if (declinedQuestions.isEmpty()) {
|
||||
accept();
|
||||
} else {
|
||||
@@ -293,7 +293,7 @@ public class CheckCommand extends SWCommand {
|
||||
next();
|
||||
}
|
||||
|
||||
private void accept(){
|
||||
private void accept() {
|
||||
// TODO: This Code is only for the WGS and because YoyoNow is not available this can be removed or changed after the WGS!
|
||||
if (schematic.getSchemtype().toDB().equals("cwargearseason26")) {
|
||||
int userId = schematic.getOwner();
|
||||
@@ -359,7 +359,7 @@ public class CheckCommand extends SWCommand {
|
||||
});
|
||||
}
|
||||
|
||||
private void decline(String reason){
|
||||
private void decline(String reason) {
|
||||
concludeCheckSession(reason, SchematicType.Normal, () -> {
|
||||
Chatter owner = Chatter.of(SteamwarUser.byId(schematic.getOwner()).getUUID());
|
||||
owner.withPlayerOrOffline(
|
||||
@@ -377,14 +377,14 @@ public class CheckCommand extends SWCommand {
|
||||
DiscordBot.withBot(bot -> bot.getChecklistChannel().system(message));
|
||||
}
|
||||
|
||||
private void abort(){
|
||||
private void abort() {
|
||||
concludeCheckSession("Prüfvorgang abgebrochen", null, () -> true);
|
||||
}
|
||||
|
||||
private void concludeCheckSession(String reason, SchematicType type, BooleanSupplier sendMessageIsOnline) {
|
||||
if(SchematicNode.getSchematicNode(schematic.getId()) != null) {
|
||||
if (SchematicNode.getSchematicNode(schematic.getId()) != null) {
|
||||
CheckedSchematic.create(schematic, checker.user().getId(), startTime, Timestamp.from(Instant.now()), reason, sendMessageIsOnline.getAsBoolean());
|
||||
if(type != null) {
|
||||
if (type != null) {
|
||||
schematic.setSchemtype(type);
|
||||
if (type == SchematicType.Normal) {
|
||||
schematic.setPrepared(false);
|
||||
@@ -395,7 +395,7 @@ public class CheckCommand extends SWCommand {
|
||||
remove();
|
||||
VelocityCore.schedule(() -> {
|
||||
Bauserver subserver = Bauserver.get(checker.user().getUUID());
|
||||
if(subserver != null)
|
||||
if (subserver != null)
|
||||
subserver.stop();
|
||||
}).schedule();
|
||||
}
|
||||
|
||||
@@ -77,7 +77,7 @@ public class DevCommand extends SWCommand {
|
||||
|
||||
@Register(value = "reloadmodes")
|
||||
public void reloadModes(Chatter sender) {
|
||||
if(!sender.user().hasPerm(UserPerm.ADMINISTRATION))
|
||||
if (!sender.user().hasPerm(UserPerm.ADMINISTRATION))
|
||||
return;
|
||||
|
||||
try {
|
||||
|
||||
@@ -150,7 +150,8 @@ public class EventCommand extends SWCommand {
|
||||
@ClassMapper(value = Team.class, local = true)
|
||||
public TypeMapper<Team> eventTeams() {
|
||||
return eventTeam(eventFight -> {
|
||||
if (eventFight.getStartTime().after(new Timestamp(System.currentTimeMillis()))) return Collections.emptyList();
|
||||
if (eventFight.getStartTime().after(new Timestamp(System.currentTimeMillis())))
|
||||
return Collections.emptyList();
|
||||
return List.of(eventFight.getTeamBlue(), eventFight.getTeamRed());
|
||||
});
|
||||
}
|
||||
|
||||
@@ -43,7 +43,7 @@ public class EventRescheduleCommand extends SWCommand {
|
||||
@Register
|
||||
public void reschedule(Chatter sender, @Mapper("BLUE_TEAM") Team teamBlue, @Mapper("RED_TEAM") Team teamRed) {
|
||||
Event event = Event.get();
|
||||
if(event == null){
|
||||
if (event == null) {
|
||||
sender.system("EVENTRESCHEDULE_UNKNOWN_TEAM");
|
||||
return;
|
||||
}
|
||||
@@ -51,12 +51,12 @@ public class EventRescheduleCommand extends SWCommand {
|
||||
List<EventFight> fights = EventFight.getEvent(event.getEventID());
|
||||
ListIterator<EventFight> it = fights.listIterator(fights.size());
|
||||
Timestamp now = Timestamp.from(new Date().toInstant());
|
||||
while(it.hasPrevious()){
|
||||
while (it.hasPrevious()) {
|
||||
EventFight fight = it.previous();
|
||||
if(fight.getStartTime().after(now))
|
||||
if (fight.getStartTime().after(now))
|
||||
continue;
|
||||
|
||||
if(fight.getTeamBlue() == teamBlue.getTeamId() && fight.getTeamRed() == teamRed.getTeamId()){
|
||||
if (fight.getTeamBlue() == teamBlue.getTeamId() && fight.getTeamRed() == teamRed.getTeamId()) {
|
||||
sender.system("EVENTRESCHEDULE_STARTING");
|
||||
fight.reschedule();
|
||||
EventFight.loadAllComingFights();
|
||||
|
||||
@@ -47,9 +47,9 @@ public class FightCommand extends SWCommand {
|
||||
super("fight", "f");
|
||||
}
|
||||
|
||||
private static void getModes(Chatter sender, String precommand, boolean historic){
|
||||
private static void getModes(Chatter sender, String precommand, boolean historic) {
|
||||
Component start = Component.empty();
|
||||
for(GameModeConfig<String, String> mode : ArenaMode.getAllModes()){
|
||||
for (GameModeConfig<String, String> mode : ArenaMode.getAllModes()) {
|
||||
if (!mode.isActive() || mode.Server.Historic != historic)
|
||||
continue;
|
||||
|
||||
@@ -85,7 +85,7 @@ public class FightCommand extends SWCommand {
|
||||
Arenaserver mergable = null;
|
||||
synchronized (Subserver.getServerList()) {
|
||||
for (Subserver subserver : Subserver.getServerList()) {
|
||||
if(subserver instanceof Arenaserver arenaserver &&
|
||||
if (subserver instanceof Arenaserver arenaserver &&
|
||||
(mode.configFile.getName().replace(".yml", "").equals(arenaserver.getMode()) && arenaserver.isAllowMerge() && arenaserver.getRegisteredServer().getPlayersConnected().size() == 1)) {
|
||||
mergable = arenaserver;
|
||||
break;
|
||||
@@ -93,7 +93,7 @@ public class FightCommand extends SWCommand {
|
||||
}
|
||||
}
|
||||
|
||||
if(mergable == null) {
|
||||
if (mergable == null) {
|
||||
declineMerge.run(sender, mode, map);
|
||||
return;
|
||||
}
|
||||
@@ -106,9 +106,10 @@ public class FightCommand extends SWCommand {
|
||||
Arenaserver finalMergable = mergable;
|
||||
SWItem item = new SWItem("YELLOW_DYE", new Message("FIGHT_MERGE_INFO", mode.GameName, finalMergable.getMap()));
|
||||
item.addLore(new Message("FIGHT_MERGE_INFO_LORE_1", finalMergable.getRegisteredServer().getPlayersConnected().toArray(new Player[1])[0].getUsername()));
|
||||
inventory.addItem(4, item, click -> {});
|
||||
inventory.addItem(4, item, click -> {
|
||||
});
|
||||
inventory.addItem(8, new SWItem("LIME_DYE", new Message("FIGHT_MERGE_ACCEPT")), click -> {
|
||||
if(Subserver.getServerList().contains(finalMergable)) {
|
||||
if (Subserver.getServerList().contains(finalMergable)) {
|
||||
finalMergable.sendPlayer(sender.getPlayer());
|
||||
} else {
|
||||
sender.system("FIGHT_MERGE_OFFLINE");
|
||||
|
||||
@@ -122,14 +122,14 @@ public class GDPRQuery extends SWCommand {
|
||||
OutputStreamWriter writer = new OutputStreamWriter(stream);
|
||||
int columns = rs.getMetaData().getColumnCount();
|
||||
|
||||
for(int i = 1; i <= columns; i++) {
|
||||
for (int i = 1; i <= columns; i++) {
|
||||
writer.write(rs.getMetaData().getColumnLabel(i));
|
||||
writer.write(";");
|
||||
}
|
||||
writer.write("\n");
|
||||
|
||||
while(rs.next()) {
|
||||
for(int i = 1; i <= columns; i++) {
|
||||
while (rs.next()) {
|
||||
for (int i = 1; i <= columns; i++) {
|
||||
try {
|
||||
writer.write(rs.getString(i));
|
||||
} catch (NullPointerException e) {
|
||||
@@ -149,13 +149,13 @@ public class GDPRQuery extends SWCommand {
|
||||
|
||||
private void personalKits(SteamwarUser user, ZipOutputStream out) {
|
||||
personalKitData.select(rs -> {
|
||||
while(rs.next()) {
|
||||
while (rs.next()) {
|
||||
try {
|
||||
String path = "PersonalKit/" + rs.getString("GameMode") + "/" + rs.getString("Name");
|
||||
try(InputStream data = rs.getBinaryStream("Inventory")) {
|
||||
try (InputStream data = rs.getBinaryStream("Inventory")) {
|
||||
copy(data, out, path + ".Inventory.yml");
|
||||
}
|
||||
try(InputStream data = rs.getBinaryStream("Armor")) {
|
||||
try (InputStream data = rs.getBinaryStream("Armor")) {
|
||||
copy(data, out, path + ".Armor.yml");
|
||||
}
|
||||
} catch (IOException e) {
|
||||
@@ -168,10 +168,10 @@ public class GDPRQuery extends SWCommand {
|
||||
|
||||
private void schematics(SteamwarUser user, ZipOutputStream out) {
|
||||
schematicData.select(rs -> {
|
||||
while(rs.next()) {
|
||||
while (rs.next()) {
|
||||
String name = (rs.getString("ParentNode") != null ? rs.getString("ParentNode") : "") + ":" + rs.getString("NodeName");
|
||||
boolean format = rs.getBoolean("NodeFormat");
|
||||
try(InputStream data = rs.getBinaryStream("NodeData")) {
|
||||
try (InputStream data = rs.getBinaryStream("NodeData")) {
|
||||
copy(data, out, "Schematics/" + name + (format ? ".schem" : ".schematic"));
|
||||
} catch (IOException e) {
|
||||
throw new SecurityException("Could not export Schematic", e);
|
||||
@@ -183,9 +183,9 @@ public class GDPRQuery extends SWCommand {
|
||||
|
||||
private void userConfig(SteamwarUser user, ZipOutputStream out) {
|
||||
userConfig.select(rs -> {
|
||||
while(rs.next()) {
|
||||
while (rs.next()) {
|
||||
String name = rs.getString("Config");
|
||||
try(InputStream data = rs.getBinaryStream("Value")) {
|
||||
try (InputStream data = rs.getBinaryStream("Value")) {
|
||||
copy(data, out, name + ".yapion");
|
||||
} catch (IOException e) {
|
||||
throw new SecurityException("Could not export UserConfig", e);
|
||||
@@ -197,7 +197,7 @@ public class GDPRQuery extends SWCommand {
|
||||
|
||||
private void copyLogs(SteamwarUser user, ZipOutputStream out, File log, String outFile) throws IOException {
|
||||
if (log.isDirectory()) {
|
||||
for(File logfile : log.listFiles()) {
|
||||
for (File logfile : log.listFiles()) {
|
||||
copyLogs(user, out, logfile, outFile + "/" + logfile.getName().replace(".gz", ""));
|
||||
}
|
||||
} else {
|
||||
@@ -208,25 +208,25 @@ public class GDPRQuery extends SWCommand {
|
||||
|
||||
private void copyBauwelt(SteamwarUser user, ZipOutputStream out, String inDir, String outDir) throws IOException {
|
||||
File world = new File(inDir);
|
||||
if(!world.exists())
|
||||
if (!world.exists())
|
||||
return;
|
||||
|
||||
copy(new File(world, "level.dat"), out, outDir + "/level.dat");
|
||||
|
||||
File region = new File(world, "region");
|
||||
for(File regionfile : region.listFiles()) {
|
||||
for (File regionfile : region.listFiles()) {
|
||||
copy(regionfile, out, outDir + "/region/" + regionfile.getName());
|
||||
}
|
||||
|
||||
File poi = new File(world, "poi");
|
||||
if(poi.exists()) {
|
||||
for(File regionfile : poi.listFiles()) {
|
||||
if (poi.exists()) {
|
||||
for (File regionfile : poi.listFiles()) {
|
||||
copy(regionfile, out, outDir + "/poi/" + regionfile.getName());
|
||||
}
|
||||
}
|
||||
|
||||
File playerdata = new File(world, "playerdata/" + user.getUUID().toString() + ".dat");
|
||||
if(playerdata.exists())
|
||||
if (playerdata.exists())
|
||||
copy(playerdata, out, outDir + "/playerdata/" + user.getUUID().toString() + ".dat");
|
||||
}
|
||||
|
||||
@@ -235,9 +235,9 @@ public class GDPRQuery extends SWCommand {
|
||||
String path = "playerdata/" + user.getUUID().toString() + ".dat";
|
||||
|
||||
int i = 0;
|
||||
for(File world : worlds.listFiles()) {
|
||||
for (File world : worlds.listFiles()) {
|
||||
File playerdata = new File(world, path);
|
||||
if(!playerdata.exists())
|
||||
if (!playerdata.exists())
|
||||
continue;
|
||||
|
||||
copy(playerdata, out, outDir + "/" + (i++) + "/" + user.getUUID().toString() + ".dat");
|
||||
@@ -245,7 +245,7 @@ public class GDPRQuery extends SWCommand {
|
||||
}
|
||||
|
||||
private void copy(File file, ZipOutputStream out, String path) throws IOException {
|
||||
try(FileInputStream in = new FileInputStream(file)) {
|
||||
try (FileInputStream in = new FileInputStream(file)) {
|
||||
copy(in, out, path);
|
||||
}
|
||||
}
|
||||
@@ -254,8 +254,8 @@ public class GDPRQuery extends SWCommand {
|
||||
boolean initialized = false;
|
||||
|
||||
int bytes;
|
||||
for(byte[] buf = new byte[8192]; (bytes = in.read(buf)) > 0; ) {
|
||||
if(!initialized) {
|
||||
for (byte[] buf = new byte[8192]; (bytes = in.read(buf)) > 0; ) {
|
||||
if (!initialized) {
|
||||
ZipEntry entry = new ZipEntry(path);
|
||||
out.putNextEntry(entry);
|
||||
initialized = true;
|
||||
@@ -264,7 +264,7 @@ public class GDPRQuery extends SWCommand {
|
||||
out.write(buf, 0, bytes);
|
||||
}
|
||||
|
||||
if(initialized) {
|
||||
if (initialized) {
|
||||
out.closeEntry();
|
||||
}
|
||||
}
|
||||
|
||||
@@ -48,25 +48,25 @@ public class HelpCommand extends SWCommand {
|
||||
"HELP_LOCAL", "/local");
|
||||
}
|
||||
|
||||
@Register({"build","world"})
|
||||
@Register({"build", "world"})
|
||||
public void buildWorld(Chatter sender) {
|
||||
printPage(sender, "HELP_BAU_GROUP_WORLD_TITLE", "HELP_TNT", "HELP_FIRE", "HELP_FREEZE", "HELP_TPSLIMIT", "HELP_PROTECT", "HELP_RESET");
|
||||
}
|
||||
|
||||
@Register({"build","player"})
|
||||
@Register({"build", "player"})
|
||||
public void buildPlayer(Chatter sender) {
|
||||
printPage(sender, "HELP_BAU_GROUP_PLAYER_TITLE", "HELP_SPEED", "HELP_NV", "HELP_DEBUGSTICK", "HELP_TRACE", "HELP_LOADER");
|
||||
}
|
||||
|
||||
@Register({"build","worldedit"})
|
||||
@Register({"build","we"})
|
||||
@Register({"build","world-edit"})
|
||||
@Register({"build","edit"})
|
||||
@Register({"build", "worldedit"})
|
||||
@Register({"build", "we"})
|
||||
@Register({"build", "world-edit"})
|
||||
@Register({"build", "edit"})
|
||||
public void buildWorldedit(Chatter sender) {
|
||||
printPage(sender, "HELP_BAU_GROUP_WE_TITLE", "HELP_WE_POS1", "HELP_WE_POS2", "HELP_WE_COPY", "HELP_WE_PASTE", "HELP_WE_FLOPY", "HELP_WE_FLOPYP", "HELP_WE_ROTATE_90", "HELP_WE_ROTATE_180", "HELP_WE_ROTATE_N90");
|
||||
}
|
||||
|
||||
@Register({"build","other"})
|
||||
@Register({"build", "other"})
|
||||
public void buildOther(Chatter sender) {
|
||||
printPage(sender, "HELP_BAU_GROUP_OTHER_TITLE", "HELP_TESTBLOCK", "HELP_SKULL", "HELP_BAUINFO");
|
||||
sender.prefixless("HELP_SCHEMSUBMIT", new Message("HELP_SCHEMSUBMIT_HOVER"), ClickEvent.openUrl("https://www.youtube.com/watch?v=9QrQ3UBWveE"));
|
||||
@@ -83,9 +83,9 @@ public class HelpCommand extends SWCommand {
|
||||
}
|
||||
|
||||
@Register("buildserver")
|
||||
@Register({"build","admin"})
|
||||
@Register({"build","owner"})
|
||||
@Register({"build","bauwelt"})
|
||||
@Register({"build", "admin"})
|
||||
@Register({"build", "owner"})
|
||||
@Register({"build", "bauwelt"})
|
||||
public void sendBauHelp(Chatter sender) {
|
||||
printPage(sender, ClickEvent::suggestCommand,
|
||||
"HELP_BAU_TP", "/build tp ",
|
||||
@@ -102,10 +102,10 @@ public class HelpCommand extends SWCommand {
|
||||
}
|
||||
|
||||
private static void printPage(Chatter sender, Function<String, ClickEvent> action, String... args) {
|
||||
for(int i = 0; i < args.length; i += 2) {
|
||||
for (int i = 0; i < args.length; i += 2) {
|
||||
String message = args[i];
|
||||
String hoverMessage = message + "_HOVER";
|
||||
String command = args[i+1];
|
||||
String command = args[i + 1];
|
||||
|
||||
sender.system(message, new Message(hoverMessage), action.apply(command));
|
||||
}
|
||||
|
||||
@@ -36,11 +36,11 @@ public class IgnoreCommand extends SWCommand {
|
||||
public void genericCommand(Chatter player, @ErrorMessage("UNKNOWN_PLAYER") SteamwarUser target) {
|
||||
SteamwarUser user = player.user();
|
||||
|
||||
if(target.equals(user)){
|
||||
if (target.equals(user)) {
|
||||
player.system("IGNORE_YOURSELF");
|
||||
return;
|
||||
}
|
||||
if(IgnoreSystem.isIgnored(user, target)){
|
||||
if (IgnoreSystem.isIgnored(user, target)) {
|
||||
player.system("IGNORE_ALREADY");
|
||||
return;
|
||||
}
|
||||
|
||||
@@ -40,7 +40,7 @@ public class ListCommand extends SWCommand {
|
||||
super("list");
|
||||
}
|
||||
|
||||
public static synchronized SortedMap<String, List<Player>> getCustomTablist(){
|
||||
public static synchronized SortedMap<String, List<Player>> getCustomTablist() {
|
||||
SortedMap<String, List<Player>> playerMap = new TreeMap<>();
|
||||
for (Player player : VelocityCore.getProxy().getAllPlayers()) {
|
||||
ServerConnection pserver = player.getCurrentServer().orElse(null);
|
||||
|
||||
@@ -58,7 +58,7 @@ public class ModCommand extends SWCommand {
|
||||
openGui(player);
|
||||
}), page -> {
|
||||
Mod.ModType filtertype = playerFilterType.get(player.user().getUUID());
|
||||
return Mod.getAllModsFiltered(page,45, filtertype).stream().map(mod -> new SWListInv.SWListEntry<>(new SWItem("NAME_TAG", new Message("PLAIN_STRING", mod.getModName())).addLore(new Message("PLAIN_STRING", mod.getPlatform().name())), mod)).toList();
|
||||
return Mod.getAllModsFiltered(page, 45, filtertype).stream().map(mod -> new SWListInv.SWListEntry<>(new SWItem("NAME_TAG", new Message("PLAIN_STRING", mod.getModName())).addLore(new Message("PLAIN_STRING", mod.getPlatform().name())), mod)).toList();
|
||||
});
|
||||
|
||||
swStreamInv.addItem(52, new SWItem("NAME_TAG", new Message("MOD_TITLE_FILTER")), click -> {
|
||||
@@ -86,10 +86,10 @@ public class ModCommand extends SWCommand {
|
||||
inv.open();
|
||||
}
|
||||
|
||||
@Register(value = {"set"},description = "MOD_COMMAND_SET_USAGE")
|
||||
@Register(value = {"set"}, description = "MOD_COMMAND_SET_USAGE")
|
||||
public void set(Chatter sender, String modName, Mod.Platform platform, Mod.ModType newModType) {
|
||||
Mod mod = Mod.get(modName, platform);
|
||||
if(mod == null) {
|
||||
if (mod == null) {
|
||||
sender.system("MOD_COMMAND_NOT_FOUND_IN_DATABASE", modName, platform.name());
|
||||
return;
|
||||
}
|
||||
@@ -98,10 +98,10 @@ public class ModCommand extends SWCommand {
|
||||
sender.system("MOD_CHANGED_TYPE", modName, platform.name(), newModType.name());
|
||||
}
|
||||
|
||||
@Register(value = {"get"},description = "MOD_COMMAND_GET_USAGE")
|
||||
@Register(value = {"get"}, description = "MOD_COMMAND_GET_USAGE")
|
||||
public void get(Chatter sender, String modName, Mod.Platform platform) {
|
||||
Mod mod = Mod.get(modName, platform);
|
||||
if(mod == null) {
|
||||
if (mod == null) {
|
||||
sender.system("MOD_COMMAND_NOT_FOUND_IN_DATABASE", modName, platform.name());
|
||||
return;
|
||||
}
|
||||
@@ -112,7 +112,7 @@ public class ModCommand extends SWCommand {
|
||||
@Register(value = {"next"})
|
||||
public void next(Chatter sender) {
|
||||
Mod mod = Mod.findFirstMod();
|
||||
if(mod == null) {
|
||||
if (mod == null) {
|
||||
sender.system("MOD_NO_MORE_UNCLASSIFIED_MODS");
|
||||
return;
|
||||
}
|
||||
|
||||
@@ -44,7 +44,7 @@ public class MsgCommand extends SWCommand {
|
||||
}
|
||||
|
||||
public static void msg(PlayerChatter sender, Player target, String[] args) {
|
||||
if(target == null || VelocityCore.getProxy().getPlayer(target.getUniqueId()).orElse(null) == null) {
|
||||
if (target == null || VelocityCore.getProxy().getPlayer(target.getUniqueId()).orElse(null) == null) {
|
||||
sender.system("MSG_OFFLINE");
|
||||
return;
|
||||
}
|
||||
@@ -60,7 +60,7 @@ public class MsgCommand extends SWCommand {
|
||||
lastChats.put(target, sender.getPlayer());
|
||||
}
|
||||
|
||||
public static void remove(Player player){
|
||||
public static void remove(Player player) {
|
||||
lastChats.remove(player);
|
||||
}
|
||||
}
|
||||
|
||||
@@ -60,7 +60,8 @@ public class PunishmentCommand {
|
||||
return null;
|
||||
}
|
||||
|
||||
return SteamwarUser.getOrCreate(uuid, name, u -> {});
|
||||
return SteamwarUser.getOrCreate(uuid, name, u -> {
|
||||
});
|
||||
}
|
||||
|
||||
private static UUID getUUIDofOfflinePlayer(String playerName) {
|
||||
@@ -187,7 +188,7 @@ public class PunishmentCommand {
|
||||
|
||||
private SteamwarUser unsafeUser(Chatter sender, String arg) {
|
||||
SteamwarUser target = getOrCreateOfflinePlayer(arg);
|
||||
if(target == null)
|
||||
if (target == null)
|
||||
sender.system("UNKNOWN_PLAYER");
|
||||
return target;
|
||||
}
|
||||
@@ -209,7 +210,7 @@ public class PunishmentCommand {
|
||||
boolean isPerma = date.equalsIgnoreCase("perma");
|
||||
String msg = String.join(" ", message);
|
||||
target.punish(punishmentType, banTime, msg, punisher.getId(), isPerma);
|
||||
if(punishmentType == Punishment.PunishmentType.Ban)
|
||||
if (punishmentType == Punishment.PunishmentType.Ban)
|
||||
ban(target, banTime, msg, punisher, isPerma);
|
||||
Chatter.serverteam().system(punishmentType.getTeamMessage(), target, sender, new Message((isPerma ? "PUNISHMENT_PERMA" : "PUNISHMENT_UNTIL"), banTime), msg);
|
||||
}
|
||||
@@ -262,7 +263,7 @@ public class PunishmentCommand {
|
||||
}
|
||||
|
||||
target.punish(punishmentType, Timestamp.from(new Date().toInstant()), command, sender.user().getId(), false);
|
||||
if(punishmentType == Punishment.PunishmentType.Ban)
|
||||
if (punishmentType == Punishment.PunishmentType.Ban)
|
||||
BannedUserIPs.unbanIPs(target.getId());
|
||||
|
||||
sender.system(punishmentType.getUnpunishmentMessage(), target.getUserName());
|
||||
|
||||
@@ -43,7 +43,7 @@ public class ReplayCommand extends SWCommand {
|
||||
}
|
||||
|
||||
@Register
|
||||
public void genericCommand(PlayerChatter sender, int replayId, @StaticValue(value = {"", "-a"}, allowISE=true) @OptionalValue("") boolean isAdmin, @OptionalValue("") String optionalMap) {
|
||||
public void genericCommand(PlayerChatter sender, int replayId, @StaticValue(value = {"", "-a"}, allowISE = true) @OptionalValue("") boolean isAdmin, @OptionalValue("") String optionalMap) {
|
||||
Fight fight = Fight.getById(replayId);
|
||||
|
||||
if (fight == null) {
|
||||
@@ -80,7 +80,7 @@ public class ReplayCommand extends SWCommand {
|
||||
if (sender.user().hasPerm(UserPerm.MODERATION) && isAdmin && fight.replayExists()) {
|
||||
System.out.println("Starting admin replay");
|
||||
starter.test(mode, map, sender.getPlayer()).start();
|
||||
} else if(!fight.replayAllowed()) {
|
||||
} else if (!fight.replayAllowed()) {
|
||||
sender.system("REPLAY_UNAVAILABLE");
|
||||
} else {
|
||||
starter.arena(mode, map).start();
|
||||
@@ -96,11 +96,11 @@ public class ReplayCommand extends SWCommand {
|
||||
lore.add(new Message("REPLAY_TIME", fight.getStartTime()));
|
||||
lore.add(new Message("SPACER"));
|
||||
lore.add(new Message("REPLAY_SERVER", fight.getServer(), Integer.toString(fight.getFightID())));
|
||||
if(!fight.replayAllowed())
|
||||
if (!fight.replayAllowed())
|
||||
lore.add(new Message("REPLAY_UNAVAILABLE"));
|
||||
item.setLore(lore);
|
||||
|
||||
if(fight.replayAllowed())
|
||||
if (fight.replayAllowed())
|
||||
item.setEnchanted(true);
|
||||
|
||||
return item;
|
||||
|
||||
@@ -37,7 +37,7 @@ public class RulesCommand extends SWCommand {
|
||||
public void genericCommand(Chatter sender) {
|
||||
sender.system("REGELN_RULES");
|
||||
|
||||
for(String ruleset : Arrays.asList("REGELN_AS", "REGELN_MWG", "REGELN_WG", "REGELN_WS", "REGELN_QG", "REGELN_CONDUCT"))
|
||||
for (String ruleset : Arrays.asList("REGELN_AS", "REGELN_MWG", "REGELN_WG", "REGELN_WS", "REGELN_QG", "REGELN_CONDUCT"))
|
||||
sender.prefixless(ruleset, new Message("URL_FORMAT", sender.parseToPlain(ruleset + "_URL")), ClickEvent.openUrl(sender.parseToPlain(ruleset + "_URL")));
|
||||
}
|
||||
}
|
||||
|
||||
@@ -56,31 +56,31 @@ public class TeamCommand extends SWCommand {
|
||||
}
|
||||
|
||||
@Register(noTabComplete = true)
|
||||
public void help(Chatter sender, String... args){
|
||||
public void help(Chatter sender, String... args) {
|
||||
helpMessages(sender, "TEAM_HELP_HEADER", "TEAM_HELP_LIST", "TEAM_HELP_INFO");
|
||||
|
||||
SteamwarUser user = sender.user();
|
||||
if(user.getTeam() == 0) {
|
||||
if (user.getTeam() == 0) {
|
||||
helpMessages(sender, "TEAM_HELP_CREATE", "TEAM_HELP_JOIN");
|
||||
}else{
|
||||
} else {
|
||||
helpMessages(sender, "TEAM_HELP_CHAT", "TEAM_HELP_EVENT", "TEAM_HELP_LEAVE");
|
||||
|
||||
if(user.isLeader())
|
||||
if (user.isLeader())
|
||||
helpMessages(sender, "TEAM_HELP_INVITE", "TEAM_HELP_REMOVE", "TEAM_HELP_KUERZEL", "TEAM_HELP_NAME", "TEAM_HELP_COLOR", "TEAM_HELP_LEADER", "TEAM_HELP_STEP_BACK", "TEAM_HELP_SERVER");
|
||||
}
|
||||
}
|
||||
|
||||
private void helpMessages(Chatter sender, String... messages) {
|
||||
for(String message : messages)
|
||||
for (String message : messages)
|
||||
sender.system(message);
|
||||
}
|
||||
|
||||
@Register(value = "create", description = "TEAM_CREATE_USAGE")
|
||||
public void create(@Validator("isNotInTeam") Chatter sender, @Length(min = 2, max = 4) @ErrorMessage("TEAM_KUERZEL_LENGTH") String kuerzel, @Length(min = 4, max = 15) @ErrorMessage("TEAM_NAME_LENGTH") String name){
|
||||
public void create(@Validator("isNotInTeam") Chatter sender, @Length(min = 2, max = 4) @ErrorMessage("TEAM_KUERZEL_LENGTH") String kuerzel, @Length(min = 4, max = 15) @ErrorMessage("TEAM_NAME_LENGTH") String name) {
|
||||
SteamwarUser user = sender.user();
|
||||
Team team = Team.byId(user.getTeam());
|
||||
|
||||
if(checkTeamKuerzel(sender, team, kuerzel) || checkTeamName(sender, team, name))
|
||||
if (checkTeamKuerzel(sender, team, kuerzel) || checkTeamName(sender, team, name))
|
||||
return;
|
||||
|
||||
Team.create(kuerzel, name);
|
||||
@@ -90,13 +90,13 @@ public class TeamCommand extends SWCommand {
|
||||
}
|
||||
|
||||
@Register("join")
|
||||
public void join(@Validator("isNotInTeam") Chatter sender, String... args){
|
||||
public void join(@Validator("isNotInTeam") Chatter sender, String... args) {
|
||||
SteamwarUser user = sender.user();
|
||||
|
||||
if(notDuringEvent(sender))
|
||||
if (notDuringEvent(sender))
|
||||
return;
|
||||
|
||||
if(!teamInvitations.containsKey(user.getId())){
|
||||
if (!teamInvitations.containsKey(user.getId())) {
|
||||
sender.system("TEAM_JOIN_NO_INVITE");
|
||||
return;
|
||||
}
|
||||
@@ -104,13 +104,13 @@ public class TeamCommand extends SWCommand {
|
||||
List<Integer> invs = teamInvitations.get(user.getId());
|
||||
Integer t = null;
|
||||
|
||||
if(invs.size() == 1){
|
||||
if (invs.size() == 1) {
|
||||
t = invs.get(0);
|
||||
}else{
|
||||
if(args.length != 1){
|
||||
} else {
|
||||
if (args.length != 1) {
|
||||
sender.system("TEAM_JOIN_USAGE");
|
||||
StringBuilder sb = new StringBuilder();
|
||||
for(int inv : invs){
|
||||
for (int inv : invs) {
|
||||
Team team = Team.byId(inv);
|
||||
sb.append(team.getTeamName()).append(" ");
|
||||
}
|
||||
@@ -118,15 +118,15 @@ public class TeamCommand extends SWCommand {
|
||||
return;
|
||||
}
|
||||
|
||||
for(int inv : invs){
|
||||
for (int inv : invs) {
|
||||
Team team = Team.byId(inv);
|
||||
if(team.getTeamKuerzel().equalsIgnoreCase(args[0]) || team.getTeamName().equalsIgnoreCase(args[0])){
|
||||
if (team.getTeamKuerzel().equalsIgnoreCase(args[0]) || team.getTeamName().equalsIgnoreCase(args[0])) {
|
||||
t = inv;
|
||||
break;
|
||||
}
|
||||
}
|
||||
|
||||
if(t == null){
|
||||
if (t == null) {
|
||||
sender.system("TEAM_JOIN_NOT_BY_TEAM");
|
||||
return;
|
||||
}
|
||||
@@ -142,7 +142,7 @@ public class TeamCommand extends SWCommand {
|
||||
SteamwarUser user = sender.user();
|
||||
Team team = Team.byId(user.getTeam());
|
||||
|
||||
if(noRemainingLeaders(team, user)){
|
||||
if (noRemainingLeaders(team, user)) {
|
||||
sender.system("TEAM_OTHER_LEADER_REQUIRED");
|
||||
return;
|
||||
}
|
||||
@@ -157,14 +157,14 @@ public class TeamCommand extends SWCommand {
|
||||
Team team = Team.byId(user.getTeam());
|
||||
|
||||
int teamSize = team.size();
|
||||
if(teamSize > 1 && user.isLeader() && noRemainingLeaders(team, user)) {
|
||||
if (teamSize > 1 && user.isLeader() && noRemainingLeaders(team, user)) {
|
||||
sender.system("TEAM_OTHER_LEADER_REQUIRED");
|
||||
return;
|
||||
}
|
||||
|
||||
user.setTeam(0);
|
||||
|
||||
if(teamSize == 1)
|
||||
if (teamSize == 1)
|
||||
team.disband(user);
|
||||
|
||||
sender.system("TEAM_LEAVE_LEFT");
|
||||
@@ -176,19 +176,19 @@ public class TeamCommand extends SWCommand {
|
||||
|
||||
|
||||
@Register(value = "invite", description = "TEAM_INVITE_USAGE")
|
||||
public void invite(@Validator("isLeader") Chatter sender, @ErrorMessage("TEAM_INVITE_NO_PLAYER") SteamwarUser target){
|
||||
public void invite(@Validator("isLeader") Chatter sender, @ErrorMessage("TEAM_INVITE_NO_PLAYER") SteamwarUser target) {
|
||||
Team team = Team.byId(sender.user().getTeam());
|
||||
|
||||
if(notDuringEvent(sender))
|
||||
if (notDuringEvent(sender))
|
||||
return;
|
||||
|
||||
if(target.getTeam() != 0){
|
||||
if (target.getTeam() != 0) {
|
||||
sender.system("TEAM_INVITE_IN_TEAM");
|
||||
return;
|
||||
}
|
||||
|
||||
List<Integer> invitations = teamInvitations.computeIfAbsent(target.getId(), id -> new ArrayList<>());
|
||||
if(invitations.contains(team.getTeamId())){
|
||||
if (invitations.contains(team.getTeamId())) {
|
||||
sender.system("TEAM_INVITE_ALREADY_INVITED");
|
||||
return;
|
||||
}
|
||||
@@ -199,7 +199,7 @@ public class TeamCommand extends SWCommand {
|
||||
}
|
||||
|
||||
@Register(value = "remove", description = "TEAM_REMOVE_USAGE")
|
||||
public void remove(@Validator("isLeader") Chatter sender, @ErrorMessage("TEAM_REMOVE_NOT_PLAYER") @Mapper("memberList") SteamwarUser target){
|
||||
public void remove(@Validator("isLeader") Chatter sender, @ErrorMessage("TEAM_REMOVE_NOT_PLAYER") @Mapper("memberList") SteamwarUser target) {
|
||||
Team team = Team.byId(sender.user().getTeam());
|
||||
|
||||
if (target.isLeader()) {
|
||||
@@ -208,12 +208,12 @@ public class TeamCommand extends SWCommand {
|
||||
}
|
||||
|
||||
List<Integer> invitations = teamInvitations.get(target.getId());
|
||||
if(invitations != null) {
|
||||
if (invitations != null) {
|
||||
sender.system(invitations.remove((Integer) team.getTeamId()) ? "TEAM_REMOVE_INVITE" : "TEAM_REMOVE_NO_INVITE");
|
||||
return;
|
||||
}
|
||||
|
||||
if(target.getTeam() != team.getTeamId()) {
|
||||
if (target.getTeam() != team.getTeamId()) {
|
||||
sender.system("TEAM_REMOVE_NOT_IN_TEAM");
|
||||
return;
|
||||
}
|
||||
@@ -243,13 +243,13 @@ public class TeamCommand extends SWCommand {
|
||||
}
|
||||
|
||||
@Register(value = "changekurzel", description = "TEAM_KUERZEL_USAGE")
|
||||
public void changekuerzel(@Validator("isLeader") Chatter sender, @Length(min = 2, max = 4) @ErrorMessage("TEAM_KUERZEL_LENGTH") String kuerzel){
|
||||
public void changekuerzel(@Validator("isLeader") Chatter sender, @Length(min = 2, max = 4) @ErrorMessage("TEAM_KUERZEL_LENGTH") String kuerzel) {
|
||||
Team team = Team.byId(sender.user().getTeam());
|
||||
|
||||
if(notDuringEvent(sender))
|
||||
if (notDuringEvent(sender))
|
||||
return;
|
||||
|
||||
if(checkTeamKuerzel(sender, team, kuerzel))
|
||||
if (checkTeamKuerzel(sender, team, kuerzel))
|
||||
return;
|
||||
|
||||
team.setTeamKuerzel(kuerzel);
|
||||
@@ -257,13 +257,13 @@ public class TeamCommand extends SWCommand {
|
||||
}
|
||||
|
||||
@Register(value = "changename", description = "TEAM_NAME_USAGE")
|
||||
public void changename(@Validator("isLeader") Chatter sender, @Length(min = 4, max = 15) @ErrorMessage("TEAM_NAME_LENGTH") String name){
|
||||
public void changename(@Validator("isLeader") Chatter sender, @Length(min = 4, max = 15) @ErrorMessage("TEAM_NAME_LENGTH") String name) {
|
||||
Team team = Team.byId(sender.user().getTeam());
|
||||
|
||||
if(notDuringEvent(sender))
|
||||
if (notDuringEvent(sender))
|
||||
return;
|
||||
|
||||
if(checkTeamName(sender, team, name))
|
||||
if (checkTeamName(sender, team, name))
|
||||
return;
|
||||
|
||||
team.setTeamName(name);
|
||||
@@ -271,8 +271,8 @@ public class TeamCommand extends SWCommand {
|
||||
}
|
||||
|
||||
@Register(value = "promote", description = "TEAM_LEADER_USAGE")
|
||||
public void promote(@Validator("isLeader") Chatter sender, @ErrorMessage("TEAM_LEADER_NOT_USER") @Mapper("memberList") SteamwarUser target){
|
||||
if(notDuringEvent(sender))
|
||||
public void promote(@Validator("isLeader") Chatter sender, @ErrorMessage("TEAM_LEADER_NOT_USER") @Mapper("memberList") SteamwarUser target) {
|
||||
if (notDuringEvent(sender))
|
||||
return;
|
||||
|
||||
if (target.getTeam() != sender.user().getTeam()) {
|
||||
@@ -285,23 +285,23 @@ public class TeamCommand extends SWCommand {
|
||||
}
|
||||
|
||||
@Register("info")
|
||||
public void info(@Validator("isInTeam") Chatter sender){
|
||||
public void info(@Validator("isInTeam") Chatter sender) {
|
||||
info(sender, Team.byId(sender.user().getTeam()));
|
||||
}
|
||||
|
||||
@Register(value = "info", description = "TEAM_INFO_USAGE")
|
||||
public void info(Chatter sender, @ErrorMessage("UNKNOWN_TEAM") Team team){
|
||||
public void info(Chatter sender, @ErrorMessage("UNKNOWN_TEAM") Team team) {
|
||||
List<SteamwarUser> users = team.getMembers().stream().map(SteamwarUser::byId).toList();
|
||||
|
||||
sender.system("TEAM_INFO_TEAM", team.getTeamName(), team.getTeamColor(), team.getTeamKuerzel());
|
||||
sender.prefixless("TEAM_INFO_LEADER", users.stream().filter(SteamwarUser::isLeader).count(), getMemberList(users, true));
|
||||
|
||||
String members = getMemberList(users, false);
|
||||
if(!members.isEmpty())
|
||||
if (!members.isEmpty())
|
||||
sender.prefixless("TEAM_INFO_MEMBER", users.stream().filter(u -> !u.isLeader()).count(), members);
|
||||
|
||||
Set<Event> events = TeamTeilnahme.getEvents(team.getTeamId());
|
||||
if(!events.isEmpty()){
|
||||
if (!events.isEmpty()) {
|
||||
sender.prefixless("TEAM_INFO_EVENTS", events.size(), events.stream().map(event -> {
|
||||
Integer placement = TeamTeilnahme.getPlacement(team, event);
|
||||
if (placement != null) {
|
||||
@@ -349,19 +349,19 @@ public class TeamCommand extends SWCommand {
|
||||
}
|
||||
|
||||
@Register("list")
|
||||
public void list(Chatter sender, @Min(intValue = 1) @OptionalValue("1") @ErrorMessage("TEAM_LIST_NOT_PAGE") int page){
|
||||
public void list(Chatter sender, @Min(intValue = 1) @OptionalValue("1") @ErrorMessage("TEAM_LIST_NOT_PAGE") int page) {
|
||||
final int TEAMS_PER_PAGE = 10;
|
||||
|
||||
List<Team> all = Team.getAll();
|
||||
final int lastPage = ((all.size() - 1) / 10) + 1;
|
||||
if(page < 1 || page > lastPage){
|
||||
if (page < 1 || page > lastPage) {
|
||||
sender.system("TEAM_LIST_UNKNOWN_PAGE");
|
||||
return;
|
||||
}
|
||||
|
||||
sender.system("TEAM_LIST_HEADER", page, lastPage);
|
||||
|
||||
for(int i = (page-1) * TEAMS_PER_PAGE; i < (page-1) * TEAMS_PER_PAGE + TEAMS_PER_PAGE && i < all.size(); i++){
|
||||
for (int i = (page - 1) * TEAMS_PER_PAGE; i < (page - 1) * TEAMS_PER_PAGE + TEAMS_PER_PAGE && i < all.size(); i++) {
|
||||
Team tm = all.get(i);
|
||||
|
||||
sender.prefixless("TEAM_LIST_TEAM", new Message("TEAM_LIST_TEAM_HOVER"),
|
||||
@@ -371,14 +371,14 @@ public class TeamCommand extends SWCommand {
|
||||
Component beforePage = Component
|
||||
.text("«« ")
|
||||
.color(page > 1 ? NamedTextColor.YELLOW : NamedTextColor.DARK_GRAY);
|
||||
if(page > 1)
|
||||
if (page > 1)
|
||||
beforePage = beforePage
|
||||
.hoverEvent(HoverEvent.showText(sender.parse("TEAM_LIST_PREV")))
|
||||
.clickEvent(ClickEvent.runCommand("/team list " + (page - 1)));
|
||||
|
||||
Component nextPage = sender.parse("TEAM_LIST_PAGE")
|
||||
.color(page > 1 ? NamedTextColor.YELLOW : NamedTextColor.DARK_GRAY);
|
||||
if(page < lastPage)
|
||||
if (page < lastPage)
|
||||
nextPage = nextPage
|
||||
.hoverEvent(HoverEvent.showText(sender.parse("TEAM_LIST_NEXT")))
|
||||
.clickEvent(ClickEvent.runCommand("/team list " + (page + 1)));
|
||||
@@ -392,30 +392,30 @@ public class TeamCommand extends SWCommand {
|
||||
|
||||
sender.system("TEAM_EVENT_USAGE");
|
||||
Set<Event> events = TeamTeilnahme.getEvents(team.getTeamId());
|
||||
if(!events.isEmpty()){
|
||||
if (!events.isEmpty()) {
|
||||
sender.system("TEAM_EVENT_HEADER");
|
||||
DateTimeFormatter dateFormat = DateTimeFormatter.ofPattern(sender.parseToPlain("EVENT_DATE_FORMAT"));
|
||||
for(Event e : events)
|
||||
for (Event e : events)
|
||||
sender.prefixless("TEAM_EVENT_EVENT", e.getStart().toLocalDateTime().format(dateFormat), e.getEventName());
|
||||
}
|
||||
}
|
||||
|
||||
@Register("event")
|
||||
public void event(@Validator("isLeader") Chatter sender, Event event){
|
||||
public void event(@Validator("isLeader") Chatter sender, Event event) {
|
||||
Team team = Team.byId(sender.user().getTeam());
|
||||
|
||||
if(notDuringEvent(sender))
|
||||
if (notDuringEvent(sender))
|
||||
return;
|
||||
|
||||
if(Instant.now().isAfter(event.getDeadline().toInstant())){
|
||||
if (Instant.now().isAfter(event.getDeadline().toInstant())) {
|
||||
sender.system("TEAM_EVENT_OVER");
|
||||
return;
|
||||
}
|
||||
|
||||
if(TeamTeilnahme.nimmtTeil(team.getTeamId(), event.getEventID())){
|
||||
if (TeamTeilnahme.nimmtTeil(team.getTeamId(), event.getEventID())) {
|
||||
TeamTeilnahme.notTeilnehmen(team.getTeamId(), event.getEventID());
|
||||
sender.system("TEAM_EVENT_LEFT");
|
||||
}else{
|
||||
} else {
|
||||
TeamTeilnahme.teilnehmen(team.getTeamId(), event.getEventID());
|
||||
sender.system("TEAM_EVENT_JOINED", event.getEventName());
|
||||
sender.prefixless("TEAM_EVENT_HOW_TO_LEAVE");
|
||||
@@ -450,10 +450,11 @@ public class TeamCommand extends SWCommand {
|
||||
public void changeColor(@Validator("isLeader") PlayerChatter sender) {
|
||||
Team team = Team.byId(sender.user().getTeam());
|
||||
|
||||
if(notDuringEvent(sender))
|
||||
if (notDuringEvent(sender))
|
||||
return;
|
||||
|
||||
SWListInv<String> inv = new SWListInv<>(sender, new Message("TEAM_COLOR_TITLE"), COLOR_CODES.entrySet().stream().map(entry -> new SWListInv.SWListEntry<>(new SWItem(entry.getValue(), new Message("PLAIN_STRING", "§" + entry.getKey() + team.getTeamKuerzel())), entry.getKey())).toList(), (click, element) -> {});
|
||||
SWListInv<String> inv = new SWListInv<>(sender, new Message("TEAM_COLOR_TITLE"), COLOR_CODES.entrySet().stream().map(entry -> new SWListInv.SWListEntry<>(new SWItem(entry.getValue(), new Message("PLAIN_STRING", "§" + entry.getKey() + team.getTeamKuerzel())), entry.getKey())).toList(), (click, element) -> {
|
||||
});
|
||||
inv.setCallback((click, element) -> {
|
||||
inv.close();
|
||||
team.setTeamColor(element);
|
||||
@@ -546,26 +547,26 @@ public class TeamCommand extends SWCommand {
|
||||
};
|
||||
}
|
||||
|
||||
private boolean checkTeamName(Chatter sender, Team team, String arg){
|
||||
private boolean checkTeamName(Chatter sender, Team team, String arg) {
|
||||
Team t = Team.get(arg);
|
||||
if(t != null && t.getTeamId() != team.getTeamId()){
|
||||
if (t != null && t.getTeamId() != team.getTeamId()) {
|
||||
sender.system("TEAM_NAME_TAKEN");
|
||||
return true;
|
||||
}
|
||||
return false;
|
||||
}
|
||||
|
||||
private boolean checkTeamKuerzel(Chatter sender, Team team, String arg){
|
||||
private boolean checkTeamKuerzel(Chatter sender, Team team, String arg) {
|
||||
Team t = Team.get(arg);
|
||||
if(t != null && (team == null || t.getTeamId() != team.getTeamId())){
|
||||
if (t != null && (team == null || t.getTeamId() != team.getTeamId())) {
|
||||
sender.system("TEAM_KUERZEL_TAKEN");
|
||||
return true;
|
||||
}
|
||||
return false;
|
||||
}
|
||||
|
||||
private boolean notDuringEvent(Chatter sender){
|
||||
if(Event.get() != null){
|
||||
private boolean notDuringEvent(Chatter sender) {
|
||||
if (Event.get() != null) {
|
||||
sender.system("TEAM_NOT_IN_EVENT");
|
||||
return true;
|
||||
}
|
||||
|
||||
@@ -37,7 +37,7 @@ public class TeamchatCommand extends SWCommand {
|
||||
public void genericCommand(Chatter sender, @ErrorMessage(value = "TC_USAGE", allowEAs = false) String... args) {
|
||||
SteamwarUser user = sender.user();
|
||||
|
||||
if(user.getTeam() == 0){
|
||||
if (user.getTeam() == 0) {
|
||||
sender.system("TC_NO_TEAM");
|
||||
return;
|
||||
}
|
||||
|
||||
@@ -45,7 +45,7 @@ import java.util.List;
|
||||
@Linked
|
||||
public class TpCommand extends SWCommand {
|
||||
|
||||
public TpCommand(){
|
||||
public TpCommand() {
|
||||
super("join", "tp", "teleport");
|
||||
}
|
||||
|
||||
@@ -103,21 +103,21 @@ public class TpCommand extends SWCommand {
|
||||
}
|
||||
|
||||
public static void teleport(PlayerChatter sender, RegisteredServer server) {
|
||||
if(CheckCommand.isChecking(sender.getPlayer())){
|
||||
if (CheckCommand.isChecking(sender.getPlayer())) {
|
||||
sender.system("CHECK_CHECKING");
|
||||
return;
|
||||
}
|
||||
|
||||
Subserver subserver = Subserver.getSubserver(server.getServerInfo());
|
||||
if(subserver == null) {
|
||||
if (subserver == null) {
|
||||
sender.getPlayer().createConnectionRequest(server).fireAndForget();
|
||||
return;
|
||||
}
|
||||
|
||||
if(Subserver.isArena(subserver)) {
|
||||
if (Subserver.isArena(subserver)) {
|
||||
if (PunishmentCommand.isPunishedWithMessage(sender, Punishment.PunishmentType.NoFightServer))
|
||||
return;
|
||||
} else if(Subserver.isBuild(subserver)) {
|
||||
} else if (Subserver.isBuild(subserver)) {
|
||||
Bauserver bauserver = (Bauserver) subserver;
|
||||
Player checker = VelocityCore.getProxy().getPlayer(bauserver.getOwner()).orElse(null);
|
||||
if (checker != null && CheckCommand.isChecking(checker)) {
|
||||
@@ -134,8 +134,8 @@ public class TpCommand extends SWCommand {
|
||||
sender.system("JOIN_PLAYER_BLOCK");
|
||||
return;
|
||||
}
|
||||
} else if(Subserver.isBuilder(subserver)) {
|
||||
if(!sender.user().hasPerm(UserPerm.BUILD)) {
|
||||
} else if (Subserver.isBuilder(subserver)) {
|
||||
if (!sender.user().hasPerm(UserPerm.BUILD)) {
|
||||
sender.system("JOIN_PLAYER_BLOCK");
|
||||
return;
|
||||
}
|
||||
@@ -149,15 +149,15 @@ public class TpCommand extends SWCommand {
|
||||
|
||||
//Get target player server
|
||||
Player target = VelocityCore.getProxy().getPlayer(arg).orElse(null);
|
||||
if(target != null)
|
||||
if (target != null)
|
||||
server = target.getCurrentServer().map(ServerConnection::getServer).orElse(server);
|
||||
|
||||
//Get target team event arena
|
||||
if(server == null){
|
||||
if (server == null) {
|
||||
Team team = Team.get(arg);
|
||||
if(team != null){
|
||||
if (team != null) {
|
||||
Subserver eventArena = EventStarter.getEventServer().get(team.getTeamId());
|
||||
if(eventArena != null && Subserver.getServerList().contains(eventArena))
|
||||
if (eventArena != null && Subserver.getServerList().contains(eventArena))
|
||||
server = eventArena.getRegisteredServer();
|
||||
}
|
||||
}
|
||||
|
||||
@@ -36,7 +36,7 @@ public class UnIgnoreCommand extends SWCommand {
|
||||
public void genericCommand(Chatter sender, @ErrorMessage("UNIGNORE_NOT_PLAYER") SteamwarUser target) {
|
||||
SteamwarUser user = sender.user();
|
||||
|
||||
if(!IgnoreSystem.isIgnored(user, target)){
|
||||
if (!IgnoreSystem.isIgnored(user, target)) {
|
||||
sender.system("UNIGNORE_NOT_IGNORED");
|
||||
return;
|
||||
}
|
||||
|
||||
@@ -46,14 +46,14 @@ public class VerifyCommand extends SWCommand {
|
||||
return;
|
||||
}
|
||||
|
||||
if(bytes.length != 16) {
|
||||
if (bytes.length != 16) {
|
||||
sender.system("VERIFY_INVALID");
|
||||
return;
|
||||
}
|
||||
|
||||
User user = AuthManager.connectAuth(sender.user(), code);
|
||||
if(user != null) {
|
||||
VelocityCore.getLogger().log(Level.INFO,"%s Verified with Discorduser: %s".formatted(sender.user().getUserName(), user.getIdLong()));
|
||||
if (user != null) {
|
||||
VelocityCore.getLogger().log(Level.INFO, "%s Verified with Discorduser: %s".formatted(sender.user().getUserName(), user.getIdLong()));
|
||||
sender.system("VERIFY_SUCCESS", user.getAsTag());
|
||||
} else {
|
||||
sender.system("VERIFY_INVALID");
|
||||
|
||||
@@ -36,7 +36,7 @@ public class WebpasswordCommand extends SWCommand {
|
||||
|
||||
@Register(description = "WEB_USAGE")
|
||||
public void genericCommand(Chatter sender, String password) {
|
||||
if(password.length() < 8) {
|
||||
if (password.length() < 8) {
|
||||
sender.system("WEB_PASSWORD_LENGTH");
|
||||
return;
|
||||
}
|
||||
|
||||
@@ -50,7 +50,7 @@ public class WhoisCommand extends SWCommand {
|
||||
|
||||
@Register(description = "WHOIS_USAGE")
|
||||
public void whois(Chatter sender, long id, WhoisParameterTypes... parameters) {
|
||||
if(!sender.user().hasPerm(UserPerm.ADMINISTRATION) && !sender.user().hasPerm(UserPerm.PREFIX_DEVELOPER)) {
|
||||
if (!sender.user().hasPerm(UserPerm.ADMINISTRATION) && !sender.user().hasPerm(UserPerm.PREFIX_DEVELOPER)) {
|
||||
sender.system("UNKNOWN_PLAYER");
|
||||
return;
|
||||
}
|
||||
@@ -85,24 +85,24 @@ public class WhoisCommand extends SWCommand {
|
||||
Player target = VelocityCore.getProxy().getPlayer(user.getUUID()).orElse(null);
|
||||
Timestamp firstJoin = user.getFirstjoin();
|
||||
double onlineTime = user.getOnlinetime();
|
||||
if(firstJoin == null && target != null) {
|
||||
if (firstJoin == null && target != null) {
|
||||
firstJoin = Storage.sessions.get(target);
|
||||
}
|
||||
Timestamp lastOnline = user.getLastOnline();
|
||||
|
||||
if(firstJoin != null)
|
||||
if (firstJoin != null)
|
||||
sender.system("WHOIS_JOINED_FIRST", firstJoin.toString());
|
||||
if (lastOnline != null)
|
||||
sender.system("WHOIS_LAST_ONLINE", lastOnline.toString());
|
||||
sender.system("WHOIS_HOURS_PLAYED", new DecimalFormat("###.##").format(onlineTime / 3600d));
|
||||
|
||||
if(target != null) {
|
||||
if (target != null) {
|
||||
sender.system("WHOIS_CURRENT_PLAYED", new DecimalFormat("####.##").format((Instant.now().getEpochSecond() - Storage.sessions.get(target).toInstant().getEpochSecond()) / 60d));
|
||||
sender.system("WHOIS_CURRENT_SERVER", target.getCurrentServer().orElseThrow().getServerInfo().getName());
|
||||
sender.system("WHOIS_CURRENT_PROTOCOL", target.getProtocolVersion().getMostRecentSupportedVersion());
|
||||
|
||||
List<Mod> mods = ModUtils.getPlayerModMap().get(user.getUUID());
|
||||
if(mods == null)
|
||||
if (mods == null)
|
||||
mods = Collections.emptyList();
|
||||
|
||||
sender.system("WHOIS_PLATFORM", mods.isEmpty() ? "Vanilla" : mods.get(0).getPlatform().toString());
|
||||
@@ -137,10 +137,10 @@ public class WhoisCommand extends SWCommand {
|
||||
}
|
||||
|
||||
private Message duration(Chatter sender, Timestamp timestamp, boolean perma) {
|
||||
if(perma)
|
||||
if (perma)
|
||||
return new Message("PUNISHMENT_PERMA");
|
||||
else
|
||||
return new Message("PLAIN_STRING", timestamp.toLocalDateTime().format(DateTimeFormatter.ofPattern(sender.parseToPlain("TIMEFORMAT"))));
|
||||
return new Message("PLAIN_STRING", timestamp.toLocalDateTime().format(DateTimeFormatter.ofPattern(sender.parseToPlain("TIMEFORMAT"))));
|
||||
}
|
||||
|
||||
@ClassMapper(value = WhoisParameterTypes.class, local = true)
|
||||
|
||||
@@ -36,7 +36,7 @@ public class DiscordConfig {
|
||||
|
||||
public static DiscordConfig load() {
|
||||
File file = new File(System.getProperty("user.home"), "discord.yml");
|
||||
if(!file.exists() || VelocityCore.get().getConfig().isEventmode())
|
||||
if (!file.exists() || VelocityCore.get().getConfig().isEventmode())
|
||||
return null;
|
||||
|
||||
return Config.load(DiscordConfig.class, file, description -> description.addPropertyParameters("roles", String.class, DiscordRole.class));
|
||||
|
||||
@@ -40,7 +40,7 @@ public enum DiscordTicketType {
|
||||
private final String url;
|
||||
|
||||
public Button toButton() {
|
||||
if(style == ButtonStyle.LINK) {
|
||||
if (style == ButtonStyle.LINK) {
|
||||
return Button.link(url, label).withEmoji(Emoji.fromUnicode(emoji));
|
||||
}
|
||||
return Button.of(style, name().toLowerCase(), Emoji.fromUnicode(emoji)).withLabel(label);
|
||||
|
||||
@@ -35,15 +35,15 @@ public class ChecklistChannel extends DiscordChannel {
|
||||
}
|
||||
|
||||
public void update() {
|
||||
List<SchematicNode> schems = CheckCommand.getSchemsToCheck();
|
||||
List<SchematicNode> schems = CheckCommand.getSchemsToCheck();
|
||||
|
||||
lastSchematics.removeIf(id -> schems.stream().noneMatch(schem -> schem.getId() == id));
|
||||
schems.removeIf(schem -> lastSchematics.contains(schem.getId()));
|
||||
lastSchematics.removeIf(id -> schems.stream().noneMatch(schem -> schem.getId() == id));
|
||||
schems.removeIf(schem -> lastSchematics.contains(schem.getId()));
|
||||
|
||||
for(SchematicNode schem : schems) {
|
||||
String waitTime = "<t:" + (schem.getLastUpdate().getTime() / 1000) + ":R>";
|
||||
system("CHECK_LIST_TO_CHECK", waitTime, schem.getSchemtype().getKuerzel(), SteamwarUser.byId(schem.getOwner()).getUserName(), schem.getName());
|
||||
lastSchematics.add(schem.getId());
|
||||
}
|
||||
for (SchematicNode schem : schems) {
|
||||
String waitTime = "<t:" + (schem.getLastUpdate().getTime() / 1000) + ":R>";
|
||||
system("CHECK_LIST_TO_CHECK", waitTime, schem.getSchemtype().getKuerzel(), SteamwarUser.byId(schem.getOwner()).getUserName(), schem.getName());
|
||||
lastSchematics.add(schem.getId());
|
||||
}
|
||||
}
|
||||
}
|
||||
|
||||
@@ -70,7 +70,8 @@ public class CouncilChannel extends StaticMessageChannel {
|
||||
});
|
||||
|
||||
return messageCreateBuilder;
|
||||
}, event -> {});
|
||||
}, event -> {
|
||||
});
|
||||
|
||||
channels.add(this);
|
||||
}
|
||||
|
||||
@@ -73,7 +73,7 @@ public class EventChannel {
|
||||
st.append("\nAngemeldete Teams: ").append(teilname);
|
||||
}
|
||||
embedBuilder.addField(event.getEventName(), st.toString(), false);
|
||||
if(event.getDeadline().after(Timestamp.from(Instant.now()))) {
|
||||
if (event.getDeadline().after(Timestamp.from(Instant.now()))) {
|
||||
menuBuilder.addOption(event.getEventName(), event.getEventID() + "", "An " + event.getEventName() + " teilnehmen", Emoji.fromUnicode("U+1F4DD"));
|
||||
}
|
||||
});
|
||||
@@ -81,7 +81,7 @@ public class EventChannel {
|
||||
MessageCreateBuilder messageBuilder = new MessageCreateBuilder()
|
||||
.setEmbeds(embedBuilder.build());
|
||||
|
||||
if(events.stream().anyMatch(event -> event.getDeadline().after(Timestamp.from(Instant.now())))) {
|
||||
if (events.stream().anyMatch(event -> event.getDeadline().after(Timestamp.from(Instant.now())))) {
|
||||
messageBuilder.setComponents(ActionRow.of(menuBuilder.build()));
|
||||
}
|
||||
return messageBuilder;
|
||||
@@ -105,7 +105,7 @@ public class EventChannel {
|
||||
|
||||
StringBuilder st = new StringBuilder();
|
||||
st.append("Fightbeginn: <t:").append(eventFight.getStartTime().getTime() / 1000).append(":R>");
|
||||
if(now.isAfter(eventFight.getStartTime().toInstant().plus(35, ChronoUnit.MINUTES))) {
|
||||
if (now.isAfter(eventFight.getStartTime().toInstant().plus(35, ChronoUnit.MINUTES))) {
|
||||
st.append("\n");
|
||||
if (eventFight.getErgebnis() == 1) {
|
||||
st.append("Sieg ").append(teamBlue.getTeamKuerzel());
|
||||
|
||||
@@ -48,12 +48,12 @@ public class InteractionReply extends DiscordChannel {
|
||||
|
||||
@Override
|
||||
public void sendMessage(Component msg) {
|
||||
if(!replied) {
|
||||
if (!replied) {
|
||||
messages.add(PlainTextComponentSerializer.plainText().serialize(msg));
|
||||
return;
|
||||
}
|
||||
|
||||
if(interaction.getHook().isExpired())
|
||||
if (interaction.getHook().isExpired())
|
||||
super.sendMessage(msg);
|
||||
else
|
||||
interaction.getHook().sendMessage(PlainTextComponentSerializer.plainText().serialize(msg)).queue();
|
||||
|
||||
+2
-1
@@ -44,7 +44,8 @@ public class StaticMessageChannel extends DiscordChannel {
|
||||
private final Consumer<GenericComponentInteractionCreateEvent> interaction;
|
||||
|
||||
public StaticMessageChannel(String channel, Supplier<MessageCreateBuilder> supplier) {
|
||||
this(channel, supplier, event -> {});
|
||||
this(channel, supplier, event -> {
|
||||
});
|
||||
}
|
||||
|
||||
public StaticMessageChannel(String channel, Supplier<MessageCreateBuilder> supplier, Consumer<GenericComponentInteractionCreateEvent> interaction) {
|
||||
|
||||
@@ -46,26 +46,26 @@ public class ChannelListener extends ListenerAdapter {
|
||||
|
||||
@Override
|
||||
public void onMessageReceived(@NotNull MessageReceivedEvent event) {
|
||||
if(event.getAuthor().isBot())
|
||||
if (event.getAuthor().isBot())
|
||||
return;
|
||||
|
||||
DiscordChannel channel = channels.get(event.getChannel());
|
||||
if(channel != null)
|
||||
if (channel != null)
|
||||
channel.received(event);
|
||||
}
|
||||
|
||||
@Override
|
||||
public void onGenericComponentInteractionCreate(@NotNull GenericComponentInteractionCreateEvent event) {
|
||||
if(event.getType() != InteractionType.COMPONENT)
|
||||
if (event.getType() != InteractionType.COMPONENT)
|
||||
return;
|
||||
|
||||
DiscordChannel channel = channels.get(event.getChannel());
|
||||
if(channel != null) {
|
||||
if (channel != null) {
|
||||
channel.received(event);
|
||||
return;
|
||||
}
|
||||
|
||||
if(event.getChannelType() == ChannelType.PRIVATE && event.getComponentId().equals("tada"))
|
||||
if (event.getChannelType() == ChannelType.PRIVATE && event.getComponentId().equals("tada"))
|
||||
event.reply(":tada:").queue();
|
||||
}
|
||||
|
||||
@@ -73,18 +73,18 @@ public class ChannelListener extends ListenerAdapter {
|
||||
public void onSlashCommandInteraction(@NotNull SlashCommandInteractionEvent event) {
|
||||
if (event.getGuild().getIdLong() == 1241489896909180998L) return;
|
||||
InteractionReply.reply(event, sender -> {
|
||||
if(sender.user().getDiscordId() == null)
|
||||
if (sender.user().getDiscordId() == null)
|
||||
return;
|
||||
|
||||
OptionMapping option = event.getOption(DiscordBot.ARGUMENT_NAME);
|
||||
String args = "";
|
||||
if(option != null)
|
||||
if (option != null)
|
||||
args = option.getAsString();
|
||||
|
||||
VelocityCore.getLogger().log(Level.INFO, "%s -> executed Discord command /%s %s".formatted(sender.user().getUserName(), event.getName(), args));
|
||||
SWCommand command = DiscordBot.getCommands().get(event.getName());
|
||||
UserPerm permission = command.getPermission();
|
||||
if(permission != null && !sender.user().perms().contains(permission))
|
||||
if (permission != null && !sender.user().perms().contains(permission))
|
||||
return;
|
||||
|
||||
command.execute(sender, args.isEmpty() ? new String[0] : args.split(" "));
|
||||
|
||||
@@ -52,17 +52,17 @@ public class DiscordSchemUpload extends ListenerAdapter {
|
||||
if (event.isFromGuild()) return;
|
||||
|
||||
Message message = event.getMessage();
|
||||
if(message.getAttachments().isEmpty())
|
||||
if (message.getAttachments().isEmpty())
|
||||
return;
|
||||
|
||||
DiscordChannel sender = new DiscordChannel(event.getAuthor());
|
||||
SteamwarUser user = sender.user();
|
||||
if(user.getId() == 0) {
|
||||
if (user.getId() == 0) {
|
||||
sender.system("DC_UNLINKED");
|
||||
return;
|
||||
}
|
||||
|
||||
if(user.isPunished(Punishment.PunishmentType.NoSchemReceiving)) {
|
||||
if (user.isPunished(Punishment.PunishmentType.NoSchemReceiving)) {
|
||||
sender.system("DC_SCHEMUPLOAD_NOPERM");
|
||||
return;
|
||||
}
|
||||
@@ -70,19 +70,19 @@ public class DiscordSchemUpload extends ListenerAdapter {
|
||||
for (Message.Attachment attachment : message.getAttachments()) {
|
||||
String fileName = attachment.getFileName();
|
||||
int dot = fileName.lastIndexOf('.');
|
||||
if(dot == -1 || !SCHEM_FILE_ENDINGS.contains(fileName.substring(dot).toLowerCase())) {
|
||||
if (dot == -1 || !SCHEM_FILE_ENDINGS.contains(fileName.substring(dot).toLowerCase())) {
|
||||
sender.system("DC_SCHEMUPLOAD_IGNORED", attachment.getFileName());
|
||||
continue;
|
||||
}
|
||||
|
||||
String name = fileName.substring(0, dot);
|
||||
if(SchematicNode.invalidSchemName(new String[] {name})) {
|
||||
if (SchematicNode.invalidSchemName(new String[]{name})) {
|
||||
sender.system("DC_SCHEMUPLOAD_INVCHAR", name);
|
||||
continue;
|
||||
}
|
||||
|
||||
SchematicNode node = SchematicNode.getSchematicNode(user.getId(), name, (Integer) null);
|
||||
if(node == null)
|
||||
if (node == null)
|
||||
node = SchematicNode.createSchematic(user.getId(), name, null);
|
||||
|
||||
try (InputStream in = attachment.getProxy().download().get()) {
|
||||
|
||||
@@ -33,10 +33,10 @@ public class DiscordTeamEvent extends ListenerAdapter {
|
||||
|
||||
@Override
|
||||
public void onStringSelectInteraction(@NotNull StringSelectInteractionEvent event) {
|
||||
if(!event.getChannel().getId().equals(eventsChannel))
|
||||
if (!event.getChannel().getId().equals(eventsChannel))
|
||||
return;
|
||||
|
||||
if(event.getSelectedOptions().isEmpty()) {
|
||||
if (event.getSelectedOptions().isEmpty()) {
|
||||
event.deferReply(true).queue();
|
||||
return;
|
||||
}
|
||||
@@ -50,13 +50,13 @@ public class DiscordTeamEvent extends ListenerAdapter {
|
||||
return;
|
||||
}
|
||||
|
||||
if(reply.user().getId() == 0) {
|
||||
if (reply.user().getId() == 0) {
|
||||
reply.system("DC_UNLINKED");
|
||||
return;
|
||||
}
|
||||
|
||||
Event tournament = Event.byId(eventId);
|
||||
if(tournament == null){
|
||||
if (tournament == null) {
|
||||
reply.system("UNKNOWN_EVENT");
|
||||
return;
|
||||
}
|
||||
|
||||
+17
-17
@@ -86,7 +86,7 @@ public class DiscordTicketHandler extends ListenerAdapter {
|
||||
@Override
|
||||
public void onGenericComponentInteractionCreate(@NotNull GenericComponentInteractionCreateEvent event) {
|
||||
MessageChannel messageChannel = event.getChannel();
|
||||
if(messageChannel instanceof TextChannel channel && channel.getParentCategoryIdLong() != 0 && channel.getParentCategoryId().equals(TICKET_CATEGORY) && event.getComponentId().startsWith("close-")) {
|
||||
if (messageChannel instanceof TextChannel channel && channel.getParentCategoryIdLong() != 0 && channel.getParentCategoryId().equals(TICKET_CATEGORY) && event.getComponentId().startsWith("close-")) {
|
||||
LinkedList<StringBuilder> messages = channel.getIterableHistory().reverse().complete().stream()
|
||||
.filter(message -> !message.getAuthor().isSystem() && !message.getAuthor().isBot())
|
||||
.map(message -> {
|
||||
@@ -96,7 +96,7 @@ public class DiscordTicketHandler extends ListenerAdapter {
|
||||
.append(message.getContentRaw())
|
||||
.append("\n");
|
||||
|
||||
if(!message.getAttachments().isEmpty()) {
|
||||
if (!message.getAttachments().isEmpty()) {
|
||||
message.getAttachments().forEach(attachment -> stringBuilder.append(attachment.getUrl()));
|
||||
stringBuilder.append("\n");
|
||||
}
|
||||
@@ -113,7 +113,7 @@ public class DiscordTicketHandler extends ListenerAdapter {
|
||||
.setTitle(event.getChannel().getName());
|
||||
|
||||
User user;
|
||||
if(channel.getTopic() != null && !channel.getTopic().isEmpty()) {
|
||||
if (channel.getTopic() != null && !channel.getTopic().isEmpty()) {
|
||||
user = event.getJDA().retrieveUserById(channel.getTopic()).complete();
|
||||
embedBuilder.setAuthor(user.getName(), null, user.getAvatarUrl());
|
||||
} else {
|
||||
@@ -122,12 +122,12 @@ public class DiscordTicketHandler extends ListenerAdapter {
|
||||
|
||||
TextChannel logChannel = event.getGuild().getTextChannelById(TICKET_LOG);
|
||||
SplitUtil.split(
|
||||
messages.stream()
|
||||
.map(StringBuilder::toString).collect(Collectors.joining()),
|
||||
2000,
|
||||
SplitUtil.Strategy.NEWLINE,
|
||||
SplitUtil.Strategy.ANYWHERE
|
||||
).stream().map(message -> new MessageCreateBuilder().setEmbeds(embedBuilder.setDescription(message).build()))
|
||||
messages.stream()
|
||||
.map(StringBuilder::toString).collect(Collectors.joining()),
|
||||
2000,
|
||||
SplitUtil.Strategy.NEWLINE,
|
||||
SplitUtil.Strategy.ANYWHERE
|
||||
).stream().map(message -> new MessageCreateBuilder().setEmbeds(embedBuilder.setDescription(message).build()))
|
||||
.forEach(builder -> {
|
||||
MessageCreateData createData = builder.build();
|
||||
logChannel.sendMessage(createData).queue();
|
||||
@@ -144,22 +144,22 @@ public class DiscordTicketHandler extends ListenerAdapter {
|
||||
@Override
|
||||
public void onMessageReceived(@NotNull MessageReceivedEvent event) {
|
||||
MessageChannel channel = event.getChannel();
|
||||
if(
|
||||
if (
|
||||
channel instanceof TextChannel textChannel &&
|
||||
textChannel.getParentCategoryIdLong() != 0 &&
|
||||
textChannel.getParentCategoryId().equals(TICKET_CATEGORY) &&
|
||||
!channel.getId().equals(TICKET_CHANNEL) &&
|
||||
!channel.getId().equals(TICKET_LOG)
|
||||
textChannel.getParentCategoryIdLong() != 0 &&
|
||||
textChannel.getParentCategoryId().equals(TICKET_CATEGORY) &&
|
||||
!channel.getId().equals(TICKET_CHANNEL) &&
|
||||
!channel.getId().equals(TICKET_LOG)
|
||||
) {
|
||||
if(event.getAuthor().isBot())
|
||||
if (event.getAuthor().isBot())
|
||||
return;
|
||||
|
||||
ChatterGroup receivers = new ChatterGroup(Chatter.allStream().filter(player -> player.user().hasPerm(UserPerm.TICKET_LOG)));
|
||||
try {
|
||||
SteamwarUser user = SteamwarUser.get(Long.parseLong(textChannel.getTopic()));
|
||||
if(user != null && !user.perms().contains(UserPerm.TEAM))
|
||||
if (user != null && !user.perms().contains(UserPerm.TEAM))
|
||||
receivers = new ChatterGroup(receivers, Chatter.of(user));
|
||||
} catch(NumberFormatException e) {
|
||||
} catch (NumberFormatException e) {
|
||||
//ignored
|
||||
}
|
||||
|
||||
|
||||
@@ -57,7 +57,7 @@ public class AuthManager {
|
||||
|
||||
public User connectAuth(SteamwarUser user, String code) {
|
||||
User dcUser = TOKENS.remove(code);
|
||||
if(dcUser == null)
|
||||
if (dcUser == null)
|
||||
return null;
|
||||
|
||||
user.setDiscordId(dcUser.getIdLong());
|
||||
|
||||
@@ -40,11 +40,11 @@ public class DiscordAlert {
|
||||
public static void send(Chatter player, Color color, Message title, Message description, boolean success) {
|
||||
DiscordBot.withBot(bot -> {
|
||||
Long discordId = player.user().getDiscordId();
|
||||
if(discordId == null)
|
||||
if (discordId == null)
|
||||
return;
|
||||
|
||||
User user = DiscordBot.getInstance().getJda().retrieveUserById(discordId).complete();
|
||||
if(user == null)
|
||||
if (user == null)
|
||||
return;
|
||||
|
||||
MessageCreateBuilder builder = new MessageCreateBuilder()
|
||||
@@ -55,7 +55,7 @@ public class DiscordAlert {
|
||||
.setDescription(player.parseToPlain(description))
|
||||
.setTimestamp(Instant.now())
|
||||
.build());
|
||||
if(success)
|
||||
if (success)
|
||||
builder.setComponents(ActionRow.of(Button.success("tada", Emoji.fromUnicode("U+1F389"))));
|
||||
|
||||
new DiscordChannel(user).send(builder);
|
||||
|
||||
@@ -54,7 +54,7 @@ public class DiscordRanks {
|
||||
if (prefixRole != null && member.getRoles().stream().noneMatch(role -> role.getId().equals(prefixRole)))
|
||||
guild.addRoleToMember(member, guild.getRoleById(prefixRole)).queue();
|
||||
}, e -> {
|
||||
if(e instanceof ErrorResponseException err && err.getErrorCode() == 10007)
|
||||
if (e instanceof ErrorResponseException err && err.getErrorCode() == 10007)
|
||||
user.setDiscordId(null);
|
||||
});
|
||||
}
|
||||
|
||||
@@ -48,7 +48,8 @@ public class SWAnvilInv {
|
||||
openInv.get(packet.getPlayerId()).callback.accept(packet.getText());
|
||||
break;
|
||||
}
|
||||
} catch (NullPointerException ignored) { }
|
||||
} catch (NullPointerException ignored) {
|
||||
}
|
||||
}
|
||||
|
||||
private final Player player;
|
||||
|
||||
@@ -69,16 +69,16 @@ public class SWInventory {
|
||||
}
|
||||
|
||||
public void handleCallback(InvCallback.ClickType type, int pos) {
|
||||
if(processingClick.compareAndSet(false, true)) {
|
||||
if (processingClick.compareAndSet(false, true)) {
|
||||
itemMap.get(pos).getCallback().clicked(type);
|
||||
processingClick.set(false);
|
||||
}
|
||||
}
|
||||
|
||||
public void handleClose() {
|
||||
if(processingClick.compareAndSet(false, true)) {
|
||||
if (processingClick.compareAndSet(false, true)) {
|
||||
InventoryCallbackHandler.inventoryHashMap.remove(player.user().getId(), this);
|
||||
if(close != null)
|
||||
if (close != null)
|
||||
close.clicked(null);
|
||||
processingClick.set(false);
|
||||
}
|
||||
|
||||
@@ -70,15 +70,15 @@ public class SWItem {
|
||||
object.addProperty("material", material);
|
||||
object.addProperty("position", position);
|
||||
object.addProperty("title", player.parseToLegacy(title));
|
||||
if(skullOwner != null)
|
||||
if (skullOwner != null)
|
||||
object.addProperty("skullOwner", skullOwner);
|
||||
if(enchanted)
|
||||
if (enchanted)
|
||||
object.addProperty("enchanted", true);
|
||||
if(hideAttributes)
|
||||
if (hideAttributes)
|
||||
object.addProperty("hideAttributes", true);
|
||||
if(color != 0)
|
||||
if (color != 0)
|
||||
object.addProperty("color", color);
|
||||
if(lore != null) {
|
||||
if (lore != null) {
|
||||
JsonArray array = new JsonArray();
|
||||
for (Message lores : lore) {
|
||||
array.add(player.parseToLegacy(lores));
|
||||
|
||||
@@ -33,38 +33,40 @@ public class SWListInv<T> extends SWInventory {
|
||||
private final List<SWListEntry<T>> elements;
|
||||
private int page;
|
||||
|
||||
public SWListInv(PlayerChatter p, Message t, List<SWListEntry<T>> l, ListCallback<T> c){
|
||||
super(p, (l.size()>45) ? 54 : (l.size() + 9-l.size()%9), t);
|
||||
public SWListInv(PlayerChatter p, Message t, List<SWListEntry<T>> l, ListCallback<T> c) {
|
||||
super(p, (l.size() > 45) ? 54 : (l.size() + 9 - l.size() % 9), t);
|
||||
callback = c;
|
||||
elements = l;
|
||||
page = 0;
|
||||
}
|
||||
|
||||
@Override
|
||||
public void open(){
|
||||
if(elements.size() > 54){
|
||||
if(page != 0)
|
||||
public void open() {
|
||||
if (elements.size() > 54) {
|
||||
if (page != 0)
|
||||
addItem(45, new SWItem("LIME_DYE", new Message("INV_PAGE_BACK", "e")), (InvCallback.ClickType click) -> {
|
||||
page--;
|
||||
open();
|
||||
});
|
||||
else
|
||||
addItem(45, new SWItem("GRAY_DYE", new Message("INV_PAGE_BACK", "7")), (InvCallback.ClickType click) -> {});
|
||||
if(page < elements.size()/45)
|
||||
addItem(45, new SWItem("GRAY_DYE", new Message("INV_PAGE_BACK", "7")), (InvCallback.ClickType click) -> {
|
||||
});
|
||||
if (page < elements.size() / 45)
|
||||
addItem(53, new SWItem("LIME_DYE", new Message("INV_PAGE_NEXT", "e")), (InvCallback.ClickType click) -> {
|
||||
page++;
|
||||
open();
|
||||
});
|
||||
else
|
||||
addItem(53, new SWItem("GRAY_DYE", new Message("INV_PAGE_NEXT", "7")), (InvCallback.ClickType click) -> {});
|
||||
addItem(53, new SWItem("GRAY_DYE", new Message("INV_PAGE_NEXT", "7")), (InvCallback.ClickType click) -> {
|
||||
});
|
||||
}
|
||||
|
||||
int ipageLimit = elements.size() - page*45;
|
||||
if(ipageLimit > 45 && elements.size() > 54){
|
||||
int ipageLimit = elements.size() - page * 45;
|
||||
if (ipageLimit > 45 && elements.size() > 54) {
|
||||
ipageLimit = 45;
|
||||
}
|
||||
int i = page*45;
|
||||
for(int ipage=0; ipage < ipageLimit; ipage++ ){
|
||||
int i = page * 45;
|
||||
for (int ipage = 0; ipage < ipageLimit; ipage++) {
|
||||
SWItem e = elements.get(i).getItem();
|
||||
|
||||
final int pos = i;
|
||||
@@ -75,7 +77,7 @@ public class SWListInv<T> extends SWInventory {
|
||||
super.open();
|
||||
}
|
||||
|
||||
public interface ListCallback<T>{
|
||||
public interface ListCallback<T> {
|
||||
void clicked(InvCallback.ClickType click, T element);
|
||||
}
|
||||
|
||||
|
||||
@@ -38,26 +38,28 @@ public class SWStreamInv<T> extends SWInventory {
|
||||
}
|
||||
|
||||
@Override
|
||||
public void open(){
|
||||
public void open() {
|
||||
List<SWListInv.SWListEntry<T>> entries = constructor.apply(page);
|
||||
|
||||
if(page != 0)
|
||||
if (page != 0)
|
||||
addItem(45, new SWItem("LIME_DYE", new Message("INV_PAGE_BACK", "e")), (InvCallback.ClickType click) -> {
|
||||
page--;
|
||||
open();
|
||||
});
|
||||
else
|
||||
addItem(45, new SWItem("GRAY_DYE", new Message("INV_PAGE_BACK", "7")), (InvCallback.ClickType click) -> {});
|
||||
addItem(45, new SWItem("GRAY_DYE", new Message("INV_PAGE_BACK", "7")), (InvCallback.ClickType click) -> {
|
||||
});
|
||||
|
||||
if(entries.size() == 45)
|
||||
if (entries.size() == 45)
|
||||
addItem(53, new SWItem("LIME_DYE", new Message("INV_PAGE_NEXT", "e")), (InvCallback.ClickType click) -> {
|
||||
page++;
|
||||
open();
|
||||
});
|
||||
else
|
||||
addItem(53, new SWItem("GRAY_DYE", new Message("INV_PAGE_NEXT", "7")), (InvCallback.ClickType click) -> {});
|
||||
addItem(53, new SWItem("GRAY_DYE", new Message("INV_PAGE_NEXT", "7")), (InvCallback.ClickType click) -> {
|
||||
});
|
||||
|
||||
for(int i = 0; i < entries.size(); i++) {
|
||||
for (int i = 0; i < entries.size(); i++) {
|
||||
SWListInv.SWListEntry<T> item = entries.get(i);
|
||||
addItem(i, item.getItem());
|
||||
setCallback(i, (InvCallback.ClickType click) -> {
|
||||
|
||||
@@ -54,18 +54,18 @@ public class BanListener extends BasicListener {
|
||||
}
|
||||
|
||||
List<BannedUserIPs> ips = BannedUserIPs.get(ip);
|
||||
if(!ips.isEmpty()){
|
||||
if (!ips.isEmpty()) {
|
||||
Timestamp highestBan = ips.get(0).getTimestamp();
|
||||
boolean perma = false;
|
||||
for(BannedUserIPs banned : ips) {
|
||||
for (BannedUserIPs banned : ips) {
|
||||
SteamwarUser bannedUser = SteamwarUser.byId(banned.getUserID());
|
||||
if (bannedUser.isPunished(Punishment.PunishmentType.Ban)) {
|
||||
Punishment ban = bannedUser.getPunishment(Punishment.PunishmentType.Ban);
|
||||
if(ban.isPerma()) {
|
||||
if (ban.isPerma()) {
|
||||
perma = true;
|
||||
break;
|
||||
}
|
||||
if(ban.getEndTime().after(highestBan))
|
||||
if (ban.getEndTime().after(highestBan))
|
||||
highestBan = ban.getEndTime();
|
||||
}
|
||||
}
|
||||
|
||||
@@ -63,13 +63,13 @@ public class ChatListener extends BasicListener {
|
||||
@Subscribe(order = PostOrder.FIRST)
|
||||
public void fixCommands(CommandExecuteEvent e) {
|
||||
String command = e.getCommand();
|
||||
if(command.startsWith("7")) {
|
||||
if (command.startsWith("7")) {
|
||||
command = "/" + command.substring(1);
|
||||
|
||||
CommandExecuteEvent.CommandResult result = e.getResult();
|
||||
if(result.isForwardToServer())
|
||||
if (result.isForwardToServer())
|
||||
result = CommandExecuteEvent.CommandResult.forwardToServer(command);
|
||||
else if(result.isAllowed())
|
||||
else if (result.isAllowed())
|
||||
result = CommandExecuteEvent.CommandResult.command(command);
|
||||
|
||||
e.setResult(result);
|
||||
@@ -81,7 +81,7 @@ public class ChatListener extends BasicListener {
|
||||
String command = e.getCommand();
|
||||
int space = command.indexOf(' ');
|
||||
String cmd = space != -1 ? command.substring(0, space) : command;
|
||||
if(VelocityCore.getProxy().getCommandManager().hasCommand(cmd)) {
|
||||
if (VelocityCore.getProxy().getCommandManager().hasCommand(cmd)) {
|
||||
CommandSource source = e.getCommandSource();
|
||||
String name;
|
||||
SteamwarUser user = null;
|
||||
@@ -128,7 +128,7 @@ public class ChatListener extends BasicListener {
|
||||
SteamwarUser user = SteamwarUser.get(player.getUniqueId());
|
||||
if (message.contains("jndi:ldap")) {
|
||||
PunishmentCommand.ban(user, Punishment.PERMA_TIME, "Versuchte Exploit-Ausnutzung", SteamwarUser.byId(-1), true);
|
||||
VelocityCore.getLogger().log(Level.SEVERE, "%s %s wurde automatisch wegen jndi:ldap gebannt.".formatted(user.getUserName(), user.getId()));
|
||||
VelocityCore.getLogger().log(Level.SEVERE, "%s %s wurde automatisch wegen jndi:ldap gebannt.".formatted(user.getUserName(), user.getId()));
|
||||
return;
|
||||
}
|
||||
|
||||
@@ -137,7 +137,7 @@ public class ChatListener extends BasicListener {
|
||||
|
||||
Subserver subserver = Subserver.getSubserver(player);
|
||||
String serverName = AuditLog.SERVER_NAME_VELOCITY;
|
||||
if(Subserver.isArena(subserver) && subserver.getServer() == player.getCurrentServer().orElseThrow().getServerInfo()) {
|
||||
if (Subserver.isArena(subserver) && subserver.getServer() == player.getCurrentServer().orElseThrow().getServerInfo()) {
|
||||
serverName = subserver.getServer().getName();
|
||||
localChat(Chatter.of(player), message);
|
||||
} else if (message.startsWith("+")) {
|
||||
@@ -155,12 +155,12 @@ public class ChatListener extends BasicListener {
|
||||
private static boolean isMistypedCommand(Player player, String message) {
|
||||
String command = message.substring(1);
|
||||
boolean isCommand = message.startsWith("7") && command.matches("^[7/]?[A-Za-z]+");
|
||||
if(isCommand && Boolean.FALSE.equals(VelocityCore.getProxy().getCommandManager().executeAsync(player, command).join())) {
|
||||
if(command.startsWith("7"))
|
||||
if (isCommand && Boolean.FALSE.equals(VelocityCore.getProxy().getCommandManager().executeAsync(player, command).join())) {
|
||||
if (command.startsWith("7"))
|
||||
command = "/" + command.substring(1);
|
||||
message = "/" + command;
|
||||
|
||||
if(filteredCommand(Chatter.of(player), message))
|
||||
if (filteredCommand(Chatter.of(player), message))
|
||||
return true;
|
||||
|
||||
player.spoofChatInput(message);
|
||||
@@ -172,20 +172,20 @@ public class ChatListener extends BasicListener {
|
||||
public static void sendChat(Chatter sender, ChatterGroup receivers, String format, Chatter msgReceiver, String message) {
|
||||
SteamwarUser user = sender.user();
|
||||
final String coloredMessage = user.hasPerm(UserPerm.COLOR_CHAT) ? message.replace('&', '§') : message;
|
||||
if(chatFilter(sender, coloredMessage))
|
||||
if (chatFilter(sender, coloredMessage))
|
||||
return;
|
||||
|
||||
boolean noReceiver = true;
|
||||
for(Chatter player : receivers.getChatters()) {
|
||||
if(player.chatShown()) {
|
||||
for (Chatter player : receivers.getChatters()) {
|
||||
if (player.chatShown()) {
|
||||
chatToReciever(player, msgReceiver, user, format, coloredMessage);
|
||||
if(sender.user().getId() != player.user().getId())
|
||||
if (sender.user().getId() != player.user().getId())
|
||||
noReceiver = false;
|
||||
}
|
||||
|
||||
}
|
||||
|
||||
if(format.equals("CHAT_GLOBAL")) {
|
||||
if (format.equals("CHAT_GLOBAL")) {
|
||||
DiscordBot.withBot(bot -> chatToReciever(bot.getIngameChat(), msgReceiver, user, format, coloredMessage));
|
||||
} else if (format.equals("CHAT_SERVERTEAM")) {
|
||||
DiscordBot.withBot(bot -> chatToReciever(bot.getServerTeamChat(), msgReceiver, user, "CHAT_GLOBAL", coloredMessage));
|
||||
@@ -195,33 +195,33 @@ public class ChatListener extends BasicListener {
|
||||
}
|
||||
|
||||
public static void localChat(PlayerChatter sender, String message) {
|
||||
if(message.isEmpty()){
|
||||
if (message.isEmpty()) {
|
||||
sender.system("CHAT_BC_USAGE");
|
||||
return;
|
||||
}
|
||||
|
||||
if(ChatListener.filteredCommand(sender, message))
|
||||
if (ChatListener.filteredCommand(sender, message))
|
||||
return;
|
||||
|
||||
if(!message.startsWith("/") && chatFilter(sender, message))
|
||||
if (!message.startsWith("/") && chatFilter(sender, message))
|
||||
return;
|
||||
|
||||
sender.getPlayer().spoofChatInput(message);
|
||||
}
|
||||
|
||||
private static boolean chatFilter(Chatter sender, String message) {
|
||||
if(!sender.chatShown()) {
|
||||
if (!sender.chatShown()) {
|
||||
sender.system("CHAT_RECEIVE");
|
||||
return true;
|
||||
}
|
||||
|
||||
if(message.replace("§[a-f0-9klmno]", "").trim().isEmpty()) {
|
||||
if (message.replace("§[a-f0-9klmno]", "").trim().isEmpty()) {
|
||||
sender.system("CHAT_EMPTY");
|
||||
return true;
|
||||
}
|
||||
|
||||
SteamwarUser user = sender.user();
|
||||
if(!user.hasPerm(UserPerm.TEAM) && (message.contains("http:") || message.contains("https:") || message.contains("www."))){
|
||||
if (!user.hasPerm(UserPerm.TEAM) && (message.contains("http:") || message.contains("https:") || message.contains("www."))) {
|
||||
sender.system("CHAT_NO_LINKS");
|
||||
return true;
|
||||
}
|
||||
@@ -255,7 +255,7 @@ public class ChatListener extends BasicListener {
|
||||
|
||||
private static boolean filteredCommand(Chatter sender, String message) {
|
||||
String command = message.split(" ", 2)[0];
|
||||
if(command.startsWith("/") && command.contains(":")) {
|
||||
if (command.startsWith("/") && command.contains(":")) {
|
||||
sender.system("UNKNOWN_COMMAND");
|
||||
return true;
|
||||
}
|
||||
@@ -264,19 +264,19 @@ public class ChatListener extends BasicListener {
|
||||
|
||||
private static void specialAlert(Chatter sender, String name, String baseMessage, int... delay) {
|
||||
sender.system("CHAT_LIXFEL_ACTION_BAR");
|
||||
for(int i = 0; i < delay.length; i++) {
|
||||
for (int i = 0; i < delay.length; i++) {
|
||||
int finalI = i;
|
||||
VelocityCore.schedule( () -> sender.prefixless("CHAT_MSG", name, sender.user(), new Message(baseMessage + (finalI+1)))).delay(delay[i], TimeUnit.SECONDS).schedule();
|
||||
VelocityCore.schedule(() -> sender.prefixless("CHAT_MSG", name, sender.user(), new Message(baseMessage + (finalI + 1)))).delay(delay[i], TimeUnit.SECONDS).schedule();
|
||||
}
|
||||
}
|
||||
|
||||
private static String highlightMentions(String message, String returnColor, Chatter player) {
|
||||
if(!message.contains("@"))
|
||||
if (!message.contains("@"))
|
||||
return message;
|
||||
|
||||
String mark = "@" + player.user().getUserName();
|
||||
return Arrays.stream(message.split(" ")).map(cur -> {
|
||||
if(cur.equalsIgnoreCase(mark) && player.getPlayer() != null) {
|
||||
if (cur.equalsIgnoreCase(mark) && player.getPlayer() != null) {
|
||||
NetworkSender.send(player.getPlayer(), new PingPacket(player.user().getId()));
|
||||
return "§e" + cur + returnColor;
|
||||
}
|
||||
@@ -285,12 +285,12 @@ public class ChatListener extends BasicListener {
|
||||
}
|
||||
|
||||
@Subscribe
|
||||
public void onTabCompleteResponseEvent(TabCompleteEvent e){
|
||||
public void onTabCompleteResponseEvent(TabCompleteEvent e) {
|
||||
List<String> suggestions = e.getSuggestions();
|
||||
int i = 0;
|
||||
while (i < suggestions.size()) {
|
||||
String suggestion = suggestions.get(i);
|
||||
if(suggestion.startsWith("/") && suggestion.contains(":"))
|
||||
if (suggestion.startsWith("/") && suggestion.contains(":"))
|
||||
suggestions.remove(i);
|
||||
else
|
||||
i++;
|
||||
|
||||
@@ -39,33 +39,33 @@ import java.util.List;
|
||||
public class CheckListener extends BasicListener {
|
||||
|
||||
@Subscribe
|
||||
public void onPlayerJoin(PostLoginEvent e){
|
||||
public void onPlayerJoin(PostLoginEvent e) {
|
||||
Chatter sender = Chatter.of(e.getPlayer());
|
||||
|
||||
List<SchematicNode> uncheckedSchematics = new ArrayList<>();
|
||||
for(SchematicType type : SchematicType.values()){
|
||||
if(type.check())
|
||||
for (SchematicType type : SchematicType.values()) {
|
||||
if (type.check())
|
||||
uncheckedSchematics.addAll(SchematicNode.getAllSchematicsOfType(sender.user().getId(), type.toDB()));
|
||||
}
|
||||
|
||||
if(!uncheckedSchematics.isEmpty())
|
||||
if (!uncheckedSchematics.isEmpty())
|
||||
sender.system("CHECK_UNCHECKED", uncheckedSchematics.size());
|
||||
}
|
||||
|
||||
@Subscribe
|
||||
public void onServerSwitch(ServerConnectedEvent e){
|
||||
public void onServerSwitch(ServerConnectedEvent e) {
|
||||
Player player = e.getPlayer();
|
||||
if(CheckCommand.isChecking(player)){
|
||||
if (CheckCommand.isChecking(player)) {
|
||||
Subserver server = Subserver.getSubserver(e.getServer().getServerInfo());
|
||||
if(!Subserver.isBuild(server) || ((Bauserver)server).getOwner() != player.getUniqueId())
|
||||
if (!Subserver.isBuild(server) || ((Bauserver) server).getOwner() != player.getUniqueId())
|
||||
CheckCommand.abort(player);
|
||||
}
|
||||
}
|
||||
|
||||
@Subscribe
|
||||
public void onPlayerDisconnect(DisconnectEvent e){
|
||||
public void onPlayerDisconnect(DisconnectEvent e) {
|
||||
Player player = e.getPlayer();
|
||||
if(CheckCommand.isChecking(player))
|
||||
if (CheckCommand.isChecking(player))
|
||||
CheckCommand.abort(player);
|
||||
}
|
||||
}
|
||||
|
||||
@@ -51,7 +51,7 @@ public class ConnectionListener extends BasicListener {
|
||||
|
||||
private static final Set<UUID> newPlayers = new HashSet<>();
|
||||
|
||||
public static void newPlayer(UUID player){
|
||||
public static void newPlayer(UUID player) {
|
||||
newPlayers.add(player);
|
||||
}
|
||||
|
||||
@@ -60,13 +60,13 @@ public class ConnectionListener extends BasicListener {
|
||||
@Subscribe
|
||||
public void onPermissionSetup(PermissionsSetupEvent event) {
|
||||
event.setProvider(subject -> {
|
||||
if(!(subject instanceof Player player))
|
||||
if (!(subject instanceof Player player))
|
||||
return perm -> Tristate.TRUE;
|
||||
|
||||
Set<UserPerm> perms = SteamwarUser.getOrCreate(player.getUniqueId(), player.getUsername(), ConnectionListener::newPlayer).perms();
|
||||
if(perms.contains(UserPerm.ADMINISTRATION))
|
||||
if (perms.contains(UserPerm.ADMINISTRATION))
|
||||
return perm -> Tristate.TRUE;
|
||||
else if(perms.contains(UserPerm.TEAM))
|
||||
else if (perms.contains(UserPerm.TEAM))
|
||||
return perm -> Tristate.fromBoolean(TEAM_PERMISSIONS.contains(perm));
|
||||
else
|
||||
return perm -> Tristate.FALSE;
|
||||
@@ -79,18 +79,18 @@ public class ConnectionListener extends BasicListener {
|
||||
SteamwarUser user = SteamwarUser.get(player.getUniqueId());
|
||||
Chatter chatter = Chatter.of(player);
|
||||
|
||||
if(user.hasPerm(UserPerm.CHECK))
|
||||
if (user.hasPerm(UserPerm.CHECK))
|
||||
CheckCommand.sendReminder(chatter);
|
||||
|
||||
for(Subserver subserver : Subserver.getServerList()) {
|
||||
if(Subserver.isArena(subserver)) {
|
||||
for (Subserver subserver : Subserver.getServerList()) {
|
||||
if (Subserver.isArena(subserver)) {
|
||||
chatter.system("JOIN_ARENA", new Message("JOIN_ARENA_HOVER"), ClickEvent.runCommand("/arena " + subserver.getServer().getName()), subserver.getServer().getName());
|
||||
}
|
||||
}
|
||||
|
||||
for (CheckedSchematic checkedSchematic : CheckedSchematic.getUnseen(user)) {
|
||||
SchematicType type = SchematicType.fromDB(checkedSchematic.getNodeType());
|
||||
if(type == null) continue;
|
||||
if (type == null) continue;
|
||||
if (checkedSchematic.getDeclineReason().equals("freigegeben")) {
|
||||
chatter.system("CHECK_ACCEPTED", type.name(), checkedSchematic.getSchemName());
|
||||
} else {
|
||||
@@ -100,7 +100,7 @@ public class ConnectionListener extends BasicListener {
|
||||
checkedSchematic.setSeen(true);
|
||||
}
|
||||
|
||||
if(newPlayers.contains(player.getUniqueId())){
|
||||
if (newPlayers.contains(player.getUniqueId())) {
|
||||
Chatter.broadcast().system("JOIN_FIRST", player);
|
||||
newPlayers.remove(player.getUniqueId());
|
||||
}
|
||||
@@ -124,7 +124,7 @@ public class ConnectionListener extends BasicListener {
|
||||
}
|
||||
|
||||
@Subscribe
|
||||
public void onDisconnect(DisconnectEvent e){
|
||||
public void onDisconnect(DisconnectEvent e) {
|
||||
ChallengeCommand.remove(e.getPlayer());
|
||||
MsgCommand.remove(e.getPlayer());
|
||||
ModUtils.getPlayerModMap().remove(e.getPlayer().getUniqueId());
|
||||
|
||||
@@ -45,7 +45,7 @@ public class IPSanitizer extends BasicListener {
|
||||
private static final Map<UUID, InetAddress> trueAddress = new HashMap<>(); // Will likely slightly leak over time
|
||||
|
||||
public static InetAddress getTrueAddress(Player player) {
|
||||
return trueAddress.getOrDefault(player.getUniqueId(), ((InetSocketAddress) ((ConnectedPlayer)player).getConnection().getChannel().remoteAddress()).getAddress());
|
||||
return trueAddress.getOrDefault(player.getUniqueId(), ((InetSocketAddress) ((ConnectedPlayer) player).getConnection().getChannel().remoteAddress()).getAddress());
|
||||
}
|
||||
|
||||
private static final Reflection.Field<MinecraftConnection, SocketAddress> remoteAddress = new Reflection.Field<>(MinecraftConnection.class, "remoteAddress");
|
||||
|
||||
@@ -90,7 +90,8 @@ public class PluginMessage extends BasicListener {
|
||||
|
||||
private static final Parser UNKNOWN = event -> VelocityCore.getLogger().log(Level.WARNING, () -> "Undefined PluginMessage on channel " + event.getIdentifier() + " from " + event.getSource() + " received.\n" + new String(event.getData()) + "\n" + Arrays.toString(event.getData()));
|
||||
private static final Parser PASS_THROUGH = event -> event.setResult(PluginMessageEvent.ForwardResult.forward());
|
||||
private static final Parser DROP = event -> {};
|
||||
private static final Parser DROP = event -> {
|
||||
};
|
||||
|
||||
private final Lunar lunar = new Lunar();
|
||||
private final Badlion badlion = new Badlion();
|
||||
@@ -105,7 +106,7 @@ public class PluginMessage extends BasicListener {
|
||||
|
||||
knownBrands.addAll(Arrays.asList("vanilla", "badlion", "fabric", "quilt", "forge", "optifine", "Geyser", "labymod", "Feather Fabric"));
|
||||
|
||||
for(String channel : Arrays.asList(
|
||||
for (String channel : Arrays.asList(
|
||||
"fabric:container/open", "fabric:registry/sync/direct", "fabric:registry/sync",
|
||||
"fabric-screen-handler-api-v1:open_screen", "fabric:attachment_sync_v1",
|
||||
|
||||
@@ -346,12 +347,13 @@ public class PluginMessage extends BasicListener {
|
||||
"imm_ptl:remote_cts", //https://www.curseforge.com/minecraft/mc-mods/immersive-portals-mod
|
||||
"distant_horizons:message", "tcdcommons:cpn"
|
||||
))
|
||||
channelRegisterHandlers.put(channel, player -> {});
|
||||
channelRegisterHandlers.put(channel, player -> {
|
||||
});
|
||||
|
||||
//channelRegisterHandlers.put(Lunar.CHANNEL, lunar::sendRestrictions);
|
||||
channelRegisterHandlers.put(Feather.CHANNEL, new Feather()::sendRestrictions);
|
||||
channelRegisterHandlers.put("openboatutils:settings", player -> send(player, "openboatutils:settings", new byte[] { 0, 0 })); //https://github.com/o7Moon/OpenBoatUtils/wiki/Packets (Reset packet)
|
||||
channelRegisterHandlers.put("itemswapper:disable", player -> send(player, "itemswapper:disable", new byte[]{ 0 })); //https://github.com/tr7zw/ItemSwapper/blob/main/src/main/java/dev/tr7zw/itemswapper/packets/DisableModPayload.java
|
||||
channelRegisterHandlers.put("openboatutils:settings", player -> send(player, "openboatutils:settings", new byte[]{0, 0})); //https://github.com/o7Moon/OpenBoatUtils/wiki/Packets (Reset packet)
|
||||
channelRegisterHandlers.put("itemswapper:disable", player -> send(player, "itemswapper:disable", new byte[]{0})); //https://github.com/tr7zw/ItemSwapper/blob/main/src/main/java/dev/tr7zw/itemswapper/packets/DisableModPayload.java
|
||||
channelRegisterHandlers.put("xaerominimap:main", player -> player.sendMessage(Component.text("§n§o§m§i§n§i§m§a§p"))); //https://www.curseforge.com/minecraft/mc-mods/xaeros-minimap
|
||||
channelRegisterHandlers.put("xaeroworldmap:main", player -> player.sendMessage(Component.text("§n§o§m§i§n§i§m§a§p"))); //https://www.curseforge.com/minecraft/mc-mods/xaeros-minimap
|
||||
channelRegisterHandlers.put("litemoretica:init_easy_place", player -> Chatter.disconnect(player).prefixless("MOD_YELLOW_SING", "litematica")); //https://github.com/Earthcomputer/litemoretica/tree/master
|
||||
@@ -361,7 +363,7 @@ public class PluginMessage extends BasicListener {
|
||||
channelRegisterHandlers.put("inventoryessentials:hello", player -> Chatter.disconnect(player).prefixless("MOD_YELLOW_SING", "InventoryEssentials")); //https://github.com/TwelveIterationMods/InventoryEssentials
|
||||
channelRegisterHandlers.put(Controlify.CHANNEL, new Controlify()::onRegister);
|
||||
|
||||
for(String channel : Arrays.asList(
|
||||
for (String channel : Arrays.asList(
|
||||
"worldinfo:world_id", // JourneyMap and VoxelMap
|
||||
"journeymap:version", "journeymap:admin_req", "journeymap:mp_options_req", "journeymap:waypoint",
|
||||
"journeymap:player_loc", "journeymap:admin_save", "journeymap:teleport_req", "journeymap:common",
|
||||
@@ -374,7 +376,7 @@ public class PluginMessage extends BasicListener {
|
||||
Chatter.disconnect(player).prefixless("MOD_YELLOW_SING", "norisk client");
|
||||
});
|
||||
|
||||
for(String channel : Arrays.asList(
|
||||
for (String channel : Arrays.asList(
|
||||
"flashback:remote_food_data",
|
||||
"flashback:remote_set_slot",
|
||||
"flashback:force_client_tick",
|
||||
@@ -393,7 +395,7 @@ public class PluginMessage extends BasicListener {
|
||||
}
|
||||
});
|
||||
|
||||
for(String channel : Arrays.asList("bedrockify:cauldron_particles", "bedrockify:eat-particles")) //https://github.com/juancarloscp52/BedrockIfy (Bedrock features on Java, banned for reach-around block placement)
|
||||
for (String channel : Arrays.asList("bedrockify:cauldron_particles", "bedrockify:eat-particles")) //https://github.com/juancarloscp52/BedrockIfy (Bedrock features on Java, banned for reach-around block placement)
|
||||
channelRegisterHandlers.put(channel, player -> Chatter.disconnect(player).prefixless("MOD_YELLOW_SING", "bedrockify"));
|
||||
|
||||
registerBiDirPassthrough("WECUI", "worldedit:cui", "worldedit:internal", "minecraft:wecui");
|
||||
@@ -407,7 +409,7 @@ public class PluginMessage extends BasicListener {
|
||||
"axiom:register_world"
|
||||
);
|
||||
registerBiDirPassthrough("axiom:handle_big_payload", "axiom:set_editor_views", "axiom:update_available_dispatch_sends");
|
||||
for(String channel : Arrays.asList(
|
||||
for (String channel : Arrays.asList(
|
||||
"axiom:hello", "axiom:set_gamemode", "axiom:set_fly_speed", "axiom:set_world_time",
|
||||
"axiom:set_world_property", "axiom:set_block", "axiom:set_hotbar_slot", "axiom:switch_active_hotbar",
|
||||
"axiom:teleport", "axiom:request_chunk_data", "axiom:spawn_entity", "axiom:response_entity_data",
|
||||
@@ -415,11 +417,12 @@ public class PluginMessage extends BasicListener {
|
||||
"axiom:allowed_gamemodes", "axiom:ignore_display_entities", "axiom:add_server_heightmap", "axiom:set_no_physical_trigger",
|
||||
"axiom:request_blueprint", "axiom:request_entity_data", "axiom:upload_blueprint"
|
||||
)) {
|
||||
channelRegisterHandlers.put(channel, player -> {});
|
||||
channelRegisterHandlers.put(channel, player -> {
|
||||
});
|
||||
registerPassthroughToServer(channel);
|
||||
}
|
||||
|
||||
for(String channel : Arrays.asList(
|
||||
for (String channel : Arrays.asList(
|
||||
"floodgate:skin",
|
||||
"watut:nbt", "watut:nbt_server", //https://github.com/Corosauce/WATUT
|
||||
"bclib:hello_server",
|
||||
@@ -429,11 +432,12 @@ public class PluginMessage extends BasicListener {
|
||||
"hyevent:location", "hyevent:register", // Hypixel mods (I could not find which sadly)
|
||||
"hypixel:hello", "hypixel:party_info", "hypixel:ping", "hypixel:player_info", "hypixel:register", "hypixel:party_info", "hypixel:player_info", "hypixel:ping" // Hypixel mods (I could not find which sadly)
|
||||
)) {
|
||||
channelRegisterHandlers.put(channel, player -> {});
|
||||
channelRegisterHandlers.put(channel, player -> {
|
||||
});
|
||||
register(channel, false, directional(UNKNOWN, DROP));
|
||||
}
|
||||
|
||||
for(String channel : Arrays.asList(
|
||||
for (String channel : Arrays.asList(
|
||||
"UNREGISTER", "minecraft:unregister", // used by carpet and servux
|
||||
"WDL|REQUEST", "wdl:request",
|
||||
"minecraft:intave", //undocumented, byte stringlength, clientconfig, byte length, json {"legacySneakHeight":false,"legacyOldRange":false,"legacyOldSlowdown":false}
|
||||
@@ -493,7 +497,7 @@ public class PluginMessage extends BasicListener {
|
||||
public void onClientChannelRegister(PlayerChannelRegisterEvent event) {
|
||||
Player player = event.getPlayer();
|
||||
|
||||
for(ChannelIdentifier channel : event.getChannels()) {
|
||||
for (ChannelIdentifier channel : event.getChannels()) {
|
||||
channelRegisterHandlers.getOrDefault(channel.getId(), p -> VelocityCore.getLogger().log(Level.WARNING, () -> p.getUsername() + " registered unknown channel " + channel)).accept(player);
|
||||
}
|
||||
}
|
||||
@@ -516,32 +520,34 @@ public class PluginMessage extends BasicListener {
|
||||
String brand = event.getBrand();
|
||||
|
||||
VelocityCore.getLogger().log(knownBrands.contains(brand) ? Level.INFO : Level.WARNING, () -> player.getUsername() + " joins with brand: " + brand);
|
||||
if(brand.equals("badlion"))
|
||||
if (brand.equals("badlion"))
|
||||
badlion.sendRestrictions(player);
|
||||
}
|
||||
|
||||
private void registerPassthroughToClient(String... channels) {
|
||||
for(String channel : channels) {
|
||||
channelRegisterHandlers.put(channel, player -> {});
|
||||
for (String channel : channels) {
|
||||
channelRegisterHandlers.put(channel, player -> {
|
||||
});
|
||||
register(channel, false, directional(PASS_THROUGH, UNKNOWN));
|
||||
}
|
||||
}
|
||||
|
||||
private void registerPassthroughToServer(String... channels) {
|
||||
for(String channel : channels)
|
||||
for (String channel : channels)
|
||||
register(channel, false, directional(UNKNOWN, PASS_THROUGH));
|
||||
}
|
||||
|
||||
private void registerBiDirPassthrough(String... channels) {
|
||||
for(String channel : channels) {
|
||||
channelRegisterHandlers.put(channel, player -> {});
|
||||
for (String channel : channels) {
|
||||
channelRegisterHandlers.put(channel, player -> {
|
||||
});
|
||||
register(channel, false, PASS_THROUGH);
|
||||
}
|
||||
}
|
||||
|
||||
private void register(String channel, boolean clientSideRegister, Parser handler) {
|
||||
handlers.put(channel, handler);
|
||||
if(clientSideRegister)
|
||||
if (clientSideRegister)
|
||||
VelocityCore.getProxy().getChannelRegistrar().register(channel.indexOf(':') != -1 ? MinecraftChannelIdentifier.from(channel) : new LegacyChannelIdentifier(channel));
|
||||
}
|
||||
|
||||
@@ -562,7 +568,7 @@ public class PluginMessage extends BasicListener {
|
||||
|
||||
private Parser directional(Parser fromServer, Parser fromPlayer) {
|
||||
return event -> {
|
||||
if(event.getSource() instanceof Player)
|
||||
if (event.getSource() instanceof Player)
|
||||
fromPlayer.handle(event);
|
||||
else
|
||||
fromServer.handle(event);
|
||||
|
||||
@@ -37,16 +37,16 @@ import static de.steamwar.persistent.Storage.sessions;
|
||||
public class SessionManager extends BasicListener {
|
||||
|
||||
@Subscribe
|
||||
public void onPostLogin(PostLoginEvent event){
|
||||
public void onPostLogin(PostLoginEvent event) {
|
||||
sessions.put(event.getPlayer(), Timestamp.from(Instant.now()));
|
||||
AuditLog.createJoin(AuditLog.SERVER_NAME_VELOCITY, null, SteamwarUser.get(event.getPlayer().getUniqueId()));
|
||||
}
|
||||
|
||||
@Subscribe
|
||||
public void onDisconnect(DisconnectEvent e){
|
||||
public void onDisconnect(DisconnectEvent e) {
|
||||
AuditLog.createLeave(AuditLog.SERVER_NAME_VELOCITY, null, SteamwarUser.get(e.getPlayer().getUniqueId()));
|
||||
Timestamp timestamp = sessions.remove(e.getPlayer());
|
||||
if(timestamp != null) {
|
||||
if (timestamp != null) {
|
||||
VelocityCore.schedule(() -> Session.insertSession(SteamwarUser.get(e.getPlayer().getUniqueId()).getId(), timestamp)).schedule();
|
||||
}
|
||||
}
|
||||
|
||||
@@ -100,7 +100,7 @@ public class TexturePackSystem extends BasicListener {
|
||||
|
||||
for (int i = 0; i < len; i += 2) {
|
||||
data[i / 2] = (byte) ((Character.digit(s.charAt(i), 16) << 4)
|
||||
+ Character.digit(s.charAt(i+1), 16));
|
||||
+ Character.digit(s.charAt(i + 1), 16));
|
||||
}
|
||||
|
||||
return data;
|
||||
|
||||
@@ -56,10 +56,10 @@ public class VersionAnnouncer extends BasicListener {
|
||||
}).delay(Duration.of(100, ChronoUnit.MILLIS)).schedule();
|
||||
}
|
||||
|
||||
if(playerVersion == serverVersion)
|
||||
if (playerVersion == serverVersion)
|
||||
return;
|
||||
|
||||
if(!Subserver.isBuild(Subserver.getSubserver(server)))
|
||||
if (!Subserver.isBuild(Subserver.getSubserver(server)))
|
||||
return;
|
||||
|
||||
player.sendActionBar(Chatter.of(player).parse("SERVER_VERSION", ProtocolVersion.getProtocolVersion(serverVersion).getMostRecentSupportedVersion()));
|
||||
|
||||
@@ -34,12 +34,12 @@ public class Alpine {
|
||||
public static final String HANDSHAKE = "ac:handshake";
|
||||
public static final String PLAY = "ac:play";
|
||||
|
||||
private final byte[] magicHandshakeResponse = new byte[] {0x3A, 0x3D}; //https://github.com/alpine-client/alpine-client-api/blob/master/src/main/java/com/alpineclient/plugin/listener/plugin/HandshakeListener.java#L19
|
||||
private final byte[] magicHandshakeResponse = new byte[]{0x3A, 0x3D}; //https://github.com/alpine-client/alpine-client-api/blob/master/src/main/java/com/alpineclient/plugin/listener/plugin/HandshakeListener.java#L19
|
||||
private final byte[] modulesPacket;
|
||||
|
||||
public Alpine() {
|
||||
//https://github.com/alpine-client/alpine-client-api/blob/master/MODULES.md
|
||||
String[] disabledModules = new String[] {
|
||||
String[] disabledModules = new String[]{
|
||||
"armor_status", "cannon_playback", "cannon_view", "clear_water", "explosion_boxes", "fullbright",
|
||||
"hit_color", "inventory_tweaks", "low_hp_tint", "minimap", "perspective_mod", "potion_status",
|
||||
"reach_display", "schematica", "tnt_timer", "toggle_sneak_sprint"
|
||||
|
||||
@@ -32,8 +32,9 @@ public class Controlify {
|
||||
public static final String CHANNEL = "controlify:server_policy";
|
||||
|
||||
private final byte[][] packets;
|
||||
|
||||
public Controlify() {
|
||||
packets = new byte[][] {
|
||||
packets = new byte[][]{
|
||||
restrict("reachAround"),
|
||||
restrict("disableFlyDrifting")
|
||||
};
|
||||
@@ -47,7 +48,7 @@ public class Controlify {
|
||||
}
|
||||
|
||||
public void onRegister(Player player) {
|
||||
for(byte[] packet : packets)
|
||||
for (byte[] packet : packets)
|
||||
player.sendPluginMessage(MinecraftChannelIdentifier.from(CHANNEL), packet);
|
||||
}
|
||||
}
|
||||
|
||||
@@ -53,14 +53,14 @@ public class FML extends BasicListener {
|
||||
Player player = event.getPlayer();
|
||||
|
||||
synchronized (unlocked) {
|
||||
if(unlocked.contains(player.getUniqueId())){
|
||||
if (unlocked.contains(player.getUniqueId())) {
|
||||
unlocked.remove(player.getUniqueId());
|
||||
return;
|
||||
}
|
||||
}
|
||||
|
||||
//if(isFML(player, "\0FML\0"))
|
||||
if(player.getProtocolVersion().lessThan(ProtocolVersion.MINECRAFT_1_13))
|
||||
if (player.getProtocolVersion().lessThan(ProtocolVersion.MINECRAFT_1_13))
|
||||
player.sendPluginMessage(new LegacyChannelIdentifier(CHANNEL), helloPacket);
|
||||
}
|
||||
|
||||
@@ -72,7 +72,7 @@ public class FML extends BasicListener {
|
||||
int numMods = ProtocolUtils.readVarInt(buf);
|
||||
|
||||
List<Mod> mods = new ArrayList<>();
|
||||
for(int i = 0; i < numMods; i++) {
|
||||
for (int i = 0; i < numMods; i++) {
|
||||
String name = ProtocolUtils.readString(buf);
|
||||
ProtocolUtils.readString(buf); // version
|
||||
|
||||
|
||||
@@ -78,12 +78,12 @@ public class FML2 extends BasicListener {
|
||||
boolean fml2 = isFML(connection, "\0FML2\0");
|
||||
boolean fml3 = isFML(connection, "\0FML3\0");
|
||||
boolean forge = isFML(connection, "\0FORGE");
|
||||
if(!fml2 && !fml3 && !forge)
|
||||
if (!fml2 && !fml3 && !forge)
|
||||
return;
|
||||
|
||||
FML2LoginHandler handler = new FML2LoginHandler(connection, event.getUniqueId(), forge);
|
||||
|
||||
if(forge) {
|
||||
if (forge) {
|
||||
connection.sendLoginPluginMessage(MinecraftChannelIdentifier.from("forge:login"), forgeModListPacket, handler);
|
||||
} else {
|
||||
connection.sendLoginPluginMessage(MinecraftChannelIdentifier.from("fml:loginwrapper"), fml3 ? fml3ModListPacket : fml2ModListPacket, handler);
|
||||
@@ -98,8 +98,8 @@ public class FML2 extends BasicListener {
|
||||
packet.writeByte(1); // Mod list packet
|
||||
ProtocolUtils.writeVarInt(packet, 0); // Mod amount
|
||||
|
||||
if(fml3) {
|
||||
ProtocolUtils.writeVarInt(packet,1); // Channel amount
|
||||
if (fml3) {
|
||||
ProtocolUtils.writeVarInt(packet, 1); // Channel amount
|
||||
ProtocolUtils.writeString(packet, "forge:tier_sorting");
|
||||
ProtocolUtils.writeString(packet, "1.0");
|
||||
} else {
|
||||
@@ -107,7 +107,7 @@ public class FML2 extends BasicListener {
|
||||
}
|
||||
|
||||
ProtocolUtils.writeVarInt(packet, 0); // Registries amount
|
||||
if(fml3)
|
||||
if (fml3)
|
||||
ProtocolUtils.writeVarInt(packet, 0); // DataPacks amount
|
||||
|
||||
ProtocolUtils.writeVarInt(buf, packet.readableBytes());
|
||||
@@ -129,28 +129,28 @@ public class FML2 extends BasicListener {
|
||||
|
||||
@Override
|
||||
public void onMessageResponse(byte[] data) {
|
||||
if(data == null) {
|
||||
if (data == null) {
|
||||
abort(null, "Not FML2/3 client");
|
||||
return;
|
||||
}
|
||||
|
||||
ByteBuf buf = Unpooled.wrappedBuffer(data);
|
||||
if(forge && buf.readByte() != 0) {
|
||||
if (forge && buf.readByte() != 0) {
|
||||
abort(data, "Not FORGE login wrapper");
|
||||
return;
|
||||
}
|
||||
|
||||
if(!ProtocolUtils.readString(buf).equals(forge ? "forge:handshake" : "fml:handshake")) {
|
||||
if (!ProtocolUtils.readString(buf).equals(forge ? "forge:handshake" : "fml:handshake")) {
|
||||
abort(data, "Not FML2/3/FORGE handshake response");
|
||||
return;
|
||||
}
|
||||
|
||||
if(ProtocolUtils.readVarInt(buf) != buf.readableBytes()) {
|
||||
if (ProtocolUtils.readVarInt(buf) != buf.readableBytes()) {
|
||||
abort(data, "FML2/3/FORGE packet size mismatch");
|
||||
return;
|
||||
}
|
||||
|
||||
if(ProtocolUtils.readVarInt(buf) != (forge ? /* Mod Versions */ 1 : /* Mod List Reply */ 2)) {
|
||||
if (ProtocolUtils.readVarInt(buf) != (forge ? /* Mod Versions */ 1 : /* Mod List Reply */ 2)) {
|
||||
abort(data, "Not FML2/3/FORGE mod list reply");
|
||||
return;
|
||||
}
|
||||
@@ -158,10 +158,10 @@ public class FML2 extends BasicListener {
|
||||
List<Mod> mods = new ArrayList<>();
|
||||
|
||||
int modCount = ProtocolUtils.readVarInt(buf);
|
||||
for(int i = 0; i < modCount; i++) {
|
||||
for (int i = 0; i < modCount; i++) {
|
||||
mods.add(Mod.getOrCreate(ProtocolUtils.readString(buf), Mod.Platform.FORGE));
|
||||
|
||||
if(forge) {
|
||||
if (forge) {
|
||||
ProtocolUtils.readString(buf); // Human readable name
|
||||
ProtocolUtils.readString(buf); // Version
|
||||
}
|
||||
|
||||
@@ -71,7 +71,7 @@ public class FabricModSender extends BasicListener {
|
||||
}).repeat(1, TimeUnit.SECONDS).schedule();
|
||||
}
|
||||
|
||||
public void handlePluginMessage(PluginMessageEvent e){
|
||||
public void handlePluginMessage(PluginMessageEvent e) {
|
||||
Player player = (Player) e.getSource();
|
||||
SteamwarUser user = SteamwarUser.get(player.getUniqueId());
|
||||
|
||||
@@ -88,24 +88,24 @@ public class FabricModSender extends BasicListener {
|
||||
List<Mod> mods = new ArrayList<>();
|
||||
|
||||
ByteBuf buf = Unpooled.wrappedBuffer(e.getData());
|
||||
String data = ProtocolUtils.readString(buf, 1024*1024);
|
||||
if(buf.readableBytes() > 0) {
|
||||
String data = ProtocolUtils.readString(buf, 1024 * 1024);
|
||||
if (buf.readableBytes() > 0) {
|
||||
logMessage(user, "Invalid message length", Arrays.toString(e.getData()));
|
||||
return;
|
||||
}
|
||||
|
||||
JsonArray array = JsonParser.parseString(data).getAsJsonArray();
|
||||
|
||||
for(JsonElement mod : array) {
|
||||
for (JsonElement mod : array) {
|
||||
mods.add(Mod.getOrCreate(mod.getAsString(), Mod.Platform.FABRIC));
|
||||
}
|
||||
|
||||
if(!neededModsContained(neededFabricMods, mods) && !neededModsContained(neededQuiltMods, mods)) {
|
||||
if (!neededModsContained(neededFabricMods, mods) && !neededModsContained(neededQuiltMods, mods)) {
|
||||
logMessage(user, "Needed mods are not contained", data);
|
||||
return;
|
||||
}
|
||||
|
||||
if(!ModUtils.handleMods(player,mods))
|
||||
if (!ModUtils.handleMods(player, mods))
|
||||
return;
|
||||
|
||||
if (!Storage.fabricCheckedPlayers.containsKey(player)) {
|
||||
|
||||
@@ -30,6 +30,7 @@ public class Feather {
|
||||
public static final String CHANNEL = "feather:client";
|
||||
|
||||
private final byte[] packet;
|
||||
|
||||
public Feather() {
|
||||
JsonArray array = new JsonArray();
|
||||
array.add("clearWater");
|
||||
|
||||
@@ -37,15 +37,17 @@ import java.util.logging.Level;
|
||||
public class Hostname extends BasicListener {
|
||||
|
||||
private static final Reflection.Field<LoginInboundConnection, InitialInboundConnection> delegate = new Reflection.Field<>(LoginInboundConnection.class, "delegate");
|
||||
|
||||
public static InitialInboundConnection getInitialInboundConnection(LoginInboundConnection loginInboundConnection) {
|
||||
return delegate.get(loginInboundConnection);
|
||||
}
|
||||
|
||||
private static final Reflection.Field<InitialInboundConnection, HandshakePacket> handshake = new Reflection.Field<>(InitialInboundConnection.class, "handshake");
|
||||
|
||||
public static String getExtraHandshakeData(LoginInboundConnection loginInboundConnection) {
|
||||
HandshakePacket handshakePacket = handshake.get(getInitialInboundConnection(loginInboundConnection));
|
||||
int i = handshakePacket.getServerAddress().indexOf('\0');
|
||||
if(i == -1)
|
||||
if (i == -1)
|
||||
return "";
|
||||
|
||||
return handshakePacket.getServerAddress().substring(i);
|
||||
|
||||
@@ -41,6 +41,7 @@ public class LabyMod {
|
||||
// https://dl.labymod.net/addons.json
|
||||
|
||||
private final byte[] gameInfoPacket;
|
||||
|
||||
public LabyMod() {
|
||||
gameInfoPacket = PluginMessage.genBufPacket(buf -> {
|
||||
ProtocolUtils.writeString(buf, "discord_rpc");
|
||||
@@ -60,20 +61,20 @@ public class LabyMod {
|
||||
|
||||
ByteBuf buf = Unpooled.wrappedBuffer(event.getData());
|
||||
String purpose = ProtocolUtils.readString(buf);
|
||||
if(!"INFO".equals(purpose))
|
||||
if (!"INFO".equals(purpose))
|
||||
return;
|
||||
|
||||
JsonObject message = JsonParser.parseString(ProtocolUtils.readString(buf)).getAsJsonObject();
|
||||
List<Mod> mods = new LinkedList<>();
|
||||
|
||||
if(message.has("addons")) {
|
||||
for(JsonElement element : message.getAsJsonArray("addons")) {
|
||||
if (message.has("addons")) {
|
||||
for (JsonElement element : message.getAsJsonArray("addons")) {
|
||||
JsonObject addon = element.getAsJsonObject();
|
||||
mods.add(Mod.getOrCreate(addon.get("name").getAsString(), Mod.Platform.LABYMOD));
|
||||
}
|
||||
}
|
||||
|
||||
if(message.has("mods")) {
|
||||
if (message.has("mods")) {
|
||||
VelocityCore.getLogger().log(Level.WARNING, () -> "LabyMod External Mods for debugging: " + message.getAsJsonArray("mods"));
|
||||
//for(JsonElement element : message.getAsJsonArray("mods")) {
|
||||
// JsonObject addon = element.getAsJsonObject();
|
||||
|
||||
@@ -44,29 +44,29 @@ import java.util.stream.Collectors;
|
||||
public class ModUtils {
|
||||
|
||||
@Getter
|
||||
private static final Map<UUID,List<Mod>> playerModMap = new HashMap<>();
|
||||
private static final Map<UUID, List<Mod>> playerModMap = new HashMap<>();
|
||||
|
||||
public static boolean handleMods(Player player, List<Mod> mods) {
|
||||
return handleMods(player.getUniqueId(), Chatter.of(player).getLocale(), player::disconnect, mods);
|
||||
}
|
||||
|
||||
public static boolean handleMods(UUID uuid, Locale locale, Consumer<Component> disconnect, List<Mod> mods){
|
||||
public static boolean handleMods(UUID uuid, Locale locale, Consumer<Component> disconnect, List<Mod> mods) {
|
||||
Chatter sender = Chatter.of(uuid);
|
||||
SteamwarUser user = sender.user();
|
||||
playerModMap.put(uuid,new ArrayList<>(mods));
|
||||
playerModMap.put(uuid, new ArrayList<>(mods));
|
||||
VelocityCore.getLogger().log(Level.INFO, "%s declares mods: %s".formatted(user.getUserName(), mods.stream().map(mod -> mod.getPlatform() + ":" + mod.getModName()).collect(Collectors.joining(" "))));
|
||||
|
||||
ModType max = ModType.YELLOW;
|
||||
Iterator<Mod> it = mods.iterator();
|
||||
while(it.hasNext()){
|
||||
while (it.hasNext()) {
|
||||
Mod mod = it.next();
|
||||
if(mod.getModType() == ModType.UNKLASSIFIED || mod.getModType() == ModType.GREEN || (mod.getModType() == ModType.YOUTUBER_ONLY && user.hasPerm(UserPerm.RESTRICTED_MODS)))
|
||||
if (mod.getModType() == ModType.UNKLASSIFIED || mod.getModType() == ModType.GREEN || (mod.getModType() == ModType.YOUTUBER_ONLY && user.hasPerm(UserPerm.RESTRICTED_MODS)))
|
||||
it.remove();
|
||||
else if(mod.getModType() == ModType.RED)
|
||||
else if (mod.getModType() == ModType.RED)
|
||||
max = ModType.RED;
|
||||
}
|
||||
|
||||
if(mods.isEmpty()) {
|
||||
if (mods.isEmpty()) {
|
||||
return true;
|
||||
}
|
||||
|
||||
@@ -75,13 +75,13 @@ public class ModUtils {
|
||||
String modList = mods.stream().filter(mod -> finalMax == ModType.YELLOW || mod.getModType() == ModType.RED).map(Mod::getModName).collect(Collectors.joining("\n"));
|
||||
String message;
|
||||
|
||||
if(mods.size() == 1) {
|
||||
if (mods.size() == 1) {
|
||||
message = sender.parseToLegacy(max == ModType.RED ? "MOD_RED_SING" : "MOD_YELLOW_SING", modList);
|
||||
} else {
|
||||
message = sender.parseToLegacy(max == ModType.RED ? "MOD_RED_PLUR" : "MOD_YELLOW_PLUR", modList);
|
||||
}
|
||||
|
||||
if(max == ModType.RED) {
|
||||
if (max == ModType.RED) {
|
||||
user.punish(Punishment.PunishmentType.Ban, Timestamp.from(Instant.now().plus(7, ChronoUnit.DAYS)), message, -1, false);
|
||||
PunishmentCommand.ban(user, Timestamp.from(Instant.now().plus(7, ChronoUnit.DAYS)), message, SteamwarUser.byId(-1), false);
|
||||
VelocityCore.getLogger().log(Level.SEVERE, "%s %s wurde automatisch wegen der Mods %s gebannt.".formatted(user.getUserName(), user.getId(), modList));
|
||||
|
||||
@@ -43,7 +43,7 @@ public class ReplayMod extends BasicListener {
|
||||
|
||||
public ReplayMod() {
|
||||
restrict = PluginMessage.genStreamPacket(out -> {
|
||||
for(String restriction : Arrays.asList("no_xray", "no_noclip", "only_first_person", "only_recording_player")) {
|
||||
for (String restriction : Arrays.asList("no_xray", "no_noclip", "only_first_person", "only_recording_player")) {
|
||||
byte[] bytes = restriction.getBytes();
|
||||
out.writeByte(bytes.length);
|
||||
out.write(bytes);
|
||||
@@ -55,11 +55,11 @@ public class ReplayMod extends BasicListener {
|
||||
@Subscribe
|
||||
public void onPlayerJoin(ServerPostConnectEvent event) {
|
||||
Player player = event.getPlayer();
|
||||
if(VelocityCore.get().getConfig().lobbyserver().getPlayersConnected().contains(player))
|
||||
if (VelocityCore.get().getConfig().lobbyserver().getPlayersConnected().contains(player))
|
||||
return;
|
||||
|
||||
Subserver subserver = Subserver.getSubserver(player.getCurrentServer().orElseThrow().getServerInfo());
|
||||
if(subserver instanceof Builderserver || (subserver instanceof Bauserver bauserver && bauserver.getOwner().equals(player.getUniqueId())) || DevCommand.getDevServers().containsValue(player.getCurrentServer().orElseThrow().getServer()))
|
||||
if (subserver instanceof Builderserver || (subserver instanceof Bauserver bauserver && bauserver.getOwner().equals(player.getUniqueId())) || DevCommand.getDevServers().containsValue(player.getCurrentServer().orElseThrow().getServer()))
|
||||
return;
|
||||
|
||||
PluginMessage.send(player, "Replay|Restrict", "replaymod:restrict", restrict);
|
||||
|
||||
@@ -29,7 +29,7 @@ import de.steamwar.velocitycore.listeners.BasicListener;
|
||||
public class Schematica extends BasicListener {
|
||||
// https://github.com/Lunatrius/SchematicaPlugin/blob/master/src/main/java/com/github/lunatrius/schematica/plugin/SchematicaPlugin.java
|
||||
|
||||
private final byte[] packet = new byte[] {
|
||||
private final byte[] packet = new byte[]{
|
||||
/* ProtocolVersion? */ 0,
|
||||
/* PERM_PRINTER */ 1,
|
||||
/* PERM_SAVE */ 0,
|
||||
|
||||
@@ -22,4 +22,5 @@ package de.steamwar.velocitycore.network;
|
||||
import com.velocitypowered.api.proxy.ServerConnection;
|
||||
import de.steamwar.network.packets.MetaInfos;
|
||||
|
||||
public record ServerMetaInfo(ServerConnection sender) implements MetaInfos {}
|
||||
public record ServerMetaInfo(ServerConnection sender) implements MetaInfos {
|
||||
}
|
||||
|
||||
+5
-5
@@ -43,19 +43,19 @@ public class InventoryCallbackHandler extends PacketHandler {
|
||||
public void handle(InventoryCallbackPacket packet) {
|
||||
SteamwarUser owner = SteamwarUser.byId(packet.getOwner());
|
||||
InventoryCallbackPacket.CallbackType type = packet.getType();
|
||||
if(!inventoryHashMap.containsKey(owner.getId())) {
|
||||
if (!inventoryHashMap.containsKey(owner.getId())) {
|
||||
Chatter.of(owner).system("UPDATE_INTERRUPTION");
|
||||
if(type == InventoryCallbackPacket.CallbackType.CLICK) {
|
||||
if (type == InventoryCallbackPacket.CallbackType.CLICK) {
|
||||
NetworkSender.send((Player) ((ServerMetaInfo) packet.getMetaInfos()).sender(), new CloseInventoryPacket(owner.getId()));
|
||||
}
|
||||
return;
|
||||
}
|
||||
if(type == InventoryCallbackPacket.CallbackType.CLICK) {
|
||||
if (type == InventoryCallbackPacket.CallbackType.CLICK) {
|
||||
int pos = packet.getPosition();
|
||||
InvCallback.ClickType clickType = InvCallback.ClickType.valueOf(packet.getClickType().name());
|
||||
inventoryHashMap.get(owner.getId()).handleCallback(clickType, pos);
|
||||
}else if(type == InventoryCallbackPacket.CallbackType.CLOSE) {
|
||||
if(inventoryHashMap.get(owner.getId()).isNext()) {
|
||||
} else if (type == InventoryCallbackPacket.CallbackType.CLOSE) {
|
||||
if (inventoryHashMap.get(owner.getId()).isNext()) {
|
||||
inventoryHashMap.get(owner.getId()).handleClose();
|
||||
return;
|
||||
}
|
||||
|
||||
@@ -122,5 +122,6 @@ public class PlayerSkinHandler extends PacketHandler {
|
||||
}
|
||||
}
|
||||
|
||||
public record SkinData(String skin, String signature) {}
|
||||
public record SkinData(String skin, String signature) {
|
||||
}
|
||||
}
|
||||
|
||||
@@ -51,7 +51,7 @@ public class Tablist extends ChannelInboundHandlerAdapter {
|
||||
|
||||
private static final UUID[] swUuids = IntStream.range(0, 80).mapToObj(i -> UUID.randomUUID()).toArray(UUID[]::new);
|
||||
private static final String[] swNames = IntStream.range(0, 80).mapToObj(i -> " »SW« " + String.format("%02d", i)).toArray(String[]::new);
|
||||
public static final UpdateTeamsPacket createTeamPacket = new UpdateTeamsPacket21("zzzzzsw-tab", UpdateTeamsPacket.Mode.CREATE, Component.empty(), Component.empty(), Component.empty(), UpdateTeamsPacket.NameTagVisibility.NEVER, UpdateTeamsPacket.CollisionRule.ALWAYS, 21, (byte)0x00, Arrays.stream(Tablist.swNames).toList());
|
||||
public static final UpdateTeamsPacket createTeamPacket = new UpdateTeamsPacket21("zzzzzsw-tab", UpdateTeamsPacket.Mode.CREATE, Component.empty(), Component.empty(), Component.empty(), UpdateTeamsPacket.NameTagVisibility.NEVER, UpdateTeamsPacket.CollisionRule.ALWAYS, 21, (byte) 0x00, Arrays.stream(Tablist.swNames).toList());
|
||||
|
||||
private final Map<UUID, UpsertPlayerInfoPacket.Entry> directTabItems;
|
||||
private final List<UpsertPlayerInfoPacket.Entry> current = new ArrayList<>();
|
||||
@@ -85,7 +85,7 @@ public class Tablist extends ChannelInboundHandlerAdapter {
|
||||
for (; i < tablist.size() && i < 80; i++) {
|
||||
TablistPart.Item item = tablist.get(i);
|
||||
UpsertPlayerInfoPacket.Entry tabItem;
|
||||
if(current.size() > i) {
|
||||
if (current.size() > i) {
|
||||
tabItem = current.get(i);
|
||||
} else {
|
||||
tabItem = new UpsertPlayerInfoPacket.Entry(swUuids[i]);
|
||||
@@ -96,21 +96,21 @@ public class Tablist extends ChannelInboundHandlerAdapter {
|
||||
current.add(tabItem);
|
||||
}
|
||||
|
||||
if(!tabItem.getProfile().getProperties().equals(item.getProperties())) {
|
||||
if (!tabItem.getProfile().getProperties().equals(item.getProperties())) {
|
||||
tabItem.setProfile(new GameProfile(tabItem.getProfile().getId(), tabItem.getProfile().getName(), item.getProperties()));
|
||||
tabItem.setDisplayName(new ComponentHolder(player.getProtocolVersion(), item.getDisplayName()));
|
||||
add.add(tabItem);
|
||||
if(current.size() > i) {
|
||||
if (current.size() > i) {
|
||||
remove.add(tabItem);
|
||||
}
|
||||
} else if(!item.getDisplayName().equals(getDisplayName(tabItem))) {
|
||||
} else if (!item.getDisplayName().equals(getDisplayName(tabItem))) {
|
||||
tabItem.setDisplayName(new ComponentHolder(player.getProtocolVersion(), item.getDisplayName()));
|
||||
update.add(tabItem);
|
||||
}
|
||||
}
|
||||
|
||||
// Excess removal
|
||||
while(i < current.size()) {
|
||||
while (i < current.size()) {
|
||||
remove.add(current.remove(i));
|
||||
}
|
||||
|
||||
@@ -128,8 +128,8 @@ public class Tablist extends ChannelInboundHandlerAdapter {
|
||||
}
|
||||
|
||||
public void onServerPostSwitch() {
|
||||
if(player.getProtocolVersion().noLessThan(ProtocolVersion.MINECRAFT_1_20)) {
|
||||
if(player.getProtocolVersion().greaterThan(ProtocolVersion.MINECRAFT_1_20)) {
|
||||
if (player.getProtocolVersion().noLessThan(ProtocolVersion.MINECRAFT_1_20)) {
|
||||
if (player.getProtocolVersion().greaterThan(ProtocolVersion.MINECRAFT_1_20)) {
|
||||
sendTabPacket(current, null);
|
||||
current.clear();
|
||||
}
|
||||
@@ -140,17 +140,17 @@ public class Tablist extends ChannelInboundHandlerAdapter {
|
||||
|
||||
private void injection() {
|
||||
connection = (VelocityServerConnection) player.getCurrentServer().orElse(null);
|
||||
if(connection == null) {
|
||||
if (connection == null) {
|
||||
connection = ((ConnectedPlayer) player).getConnectionInFlight();
|
||||
|
||||
if(connection == null) {
|
||||
if (connection == null) {
|
||||
VelocityCore.getLogger().log(Level.WARNING, "Could not inject Tablist: %s".formatted(player));
|
||||
return;
|
||||
}
|
||||
}
|
||||
|
||||
ChannelPipeline pipeline = connection.getConnection().getChannel().pipeline();
|
||||
if(pipeline.get("steamwar-tablist") != null) //Catch unclean exit
|
||||
if (pipeline.get("steamwar-tablist") != null) //Catch unclean exit
|
||||
pipeline.remove("steamwar-tablist");
|
||||
|
||||
pipeline.addBefore(Connections.HANDLER, "steamwar-tablist", this);
|
||||
@@ -161,7 +161,7 @@ public class Tablist extends ChannelInboundHandlerAdapter {
|
||||
sendTabPacket(current, null);
|
||||
current.clear();
|
||||
|
||||
if(connection != null) {
|
||||
if (connection != null) {
|
||||
connection.getConnection().getChannel().pipeline().remove(this);
|
||||
connection = null;
|
||||
}
|
||||
@@ -169,16 +169,16 @@ public class Tablist extends ChannelInboundHandlerAdapter {
|
||||
|
||||
@Override
|
||||
public void channelRead(ChannelHandlerContext ctx, Object msg) {
|
||||
if(msg instanceof UpsertPlayerInfoPacket packet) {
|
||||
if (msg instanceof UpsertPlayerInfoPacket packet) {
|
||||
packet.getActions().remove(UpsertPlayerInfoPacket.Action.INITIALIZE_CHAT);
|
||||
packet.getActions().remove(UpsertPlayerInfoPacket.Action.UPDATE_LATENCY);
|
||||
packet.getActions().remove(UpsertPlayerInfoPacket.Action.UPDATE_LISTED);
|
||||
if(packet.getActions().isEmpty()) {
|
||||
if (packet.getActions().isEmpty()) {
|
||||
ReferenceCountUtil.release(msg);
|
||||
return;
|
||||
}
|
||||
|
||||
if(packet.containsAction(UpsertPlayerInfoPacket.Action.ADD_PLAYER)) {
|
||||
if (packet.containsAction(UpsertPlayerInfoPacket.Action.ADD_PLAYER)) {
|
||||
for (UpsertPlayerInfoPacket.Entry entry : packet.getEntries()) {
|
||||
entry.setLatency(1);
|
||||
entry.setChatSession(null);
|
||||
@@ -201,21 +201,21 @@ public class Tablist extends ChannelInboundHandlerAdapter {
|
||||
packet.addAction(UpsertPlayerInfoPacket.Action.UPDATE_GAME_MODE);
|
||||
}
|
||||
|
||||
if(packet.containsAction(UpsertPlayerInfoPacket.Action.UPDATE_GAME_MODE)) {
|
||||
for(UpsertPlayerInfoPacket.Entry entry : packet.getEntries()) {
|
||||
if(!entry.getProfileId().equals(player.getUniqueId()) && entry.getGameMode() == 3)
|
||||
if (packet.containsAction(UpsertPlayerInfoPacket.Action.UPDATE_GAME_MODE)) {
|
||||
for (UpsertPlayerInfoPacket.Entry entry : packet.getEntries()) {
|
||||
if (!entry.getProfileId().equals(player.getUniqueId()) && entry.getGameMode() == 3)
|
||||
entry.setGameMode(1);
|
||||
}
|
||||
}
|
||||
} else if(msg instanceof RemovePlayerInfoPacket packet) {
|
||||
for(UUID uuid : packet.getProfilesToRemove()) {
|
||||
} else if (msg instanceof RemovePlayerInfoPacket packet) {
|
||||
for (UUID uuid : packet.getProfilesToRemove()) {
|
||||
synchronized (directTabItems) {
|
||||
directTabItems.remove(uuid);
|
||||
}
|
||||
}
|
||||
} else if(msg instanceof LegacyPlayerListItemPacket packet) {
|
||||
if(packet.getAction() == LegacyPlayerListItemPacket.ADD_PLAYER) {
|
||||
for(LegacyPlayerListItemPacket.Item entry : packet.getItems()) {
|
||||
} else if (msg instanceof LegacyPlayerListItemPacket packet) {
|
||||
if (packet.getAction() == LegacyPlayerListItemPacket.ADD_PLAYER) {
|
||||
for (LegacyPlayerListItemPacket.Item entry : packet.getItems()) {
|
||||
entry.setLatency(1).setPlayerKey(null);
|
||||
|
||||
if (!Storage.teamServers.containsValue(connection.getServerInfo())) {
|
||||
@@ -232,13 +232,13 @@ public class Tablist extends ChannelInboundHandlerAdapter {
|
||||
directTabItems.put(entry.getUuid(), newEntry);
|
||||
}
|
||||
}
|
||||
} else if(packet.getAction() == LegacyPlayerListItemPacket.UPDATE_GAMEMODE) {
|
||||
for(LegacyPlayerListItemPacket.Item entry : packet.getItems()) {
|
||||
if(!player.getUniqueId().equals(entry.getUuid()) && entry.getGameMode() == 3)
|
||||
} else if (packet.getAction() == LegacyPlayerListItemPacket.UPDATE_GAMEMODE) {
|
||||
for (LegacyPlayerListItemPacket.Item entry : packet.getItems()) {
|
||||
if (!player.getUniqueId().equals(entry.getUuid()) && entry.getGameMode() == 3)
|
||||
entry.setGameMode(1);
|
||||
}
|
||||
} else if(packet.getAction() == LegacyPlayerListItemPacket.REMOVE_PLAYER) {
|
||||
for(LegacyPlayerListItemPacket.Item entry : packet.getItems()) {
|
||||
} else if (packet.getAction() == LegacyPlayerListItemPacket.REMOVE_PLAYER) {
|
||||
for (LegacyPlayerListItemPacket.Item entry : packet.getItems()) {
|
||||
synchronized (directTabItems) {
|
||||
directTabItems.remove(entry.getUuid());
|
||||
}
|
||||
@@ -253,27 +253,27 @@ public class Tablist extends ChannelInboundHandlerAdapter {
|
||||
}
|
||||
|
||||
private void sendTabPacket(List<UpsertPlayerInfoPacket.Entry> items, UpsertPlayerInfoPacket.Action action) { //Breaks in 1.19.3 if action != UPDATE_DISPLAY_NAME, ADD_PLAYER or REMOVE_PLAYER
|
||||
if(items.isEmpty())
|
||||
if (items.isEmpty())
|
||||
return;
|
||||
|
||||
if(player.getProtocolVersion().lessThan(ProtocolVersion.MINECRAFT_1_19_3)) {
|
||||
if (player.getProtocolVersion().lessThan(ProtocolVersion.MINECRAFT_1_19_3)) {
|
||||
int legacyAction = LegacyPlayerListItemPacket.REMOVE_PLAYER;
|
||||
if(action == UpsertPlayerInfoPacket.Action.UPDATE_DISPLAY_NAME)
|
||||
if (action == UpsertPlayerInfoPacket.Action.UPDATE_DISPLAY_NAME)
|
||||
legacyAction = LegacyPlayerListItemPacket.UPDATE_DISPLAY_NAME;
|
||||
else if (action == UpsertPlayerInfoPacket.Action.ADD_PLAYER)
|
||||
legacyAction = LegacyPlayerListItemPacket.ADD_PLAYER;
|
||||
|
||||
sendPacket(player, new LegacyPlayerListItemPacket(legacyAction, items.stream().map(item -> new LegacyPlayerListItemPacket
|
||||
.Item(item.getProfileId())
|
||||
.setName(item.getProfile().getName())
|
||||
.setProperties(item.getProfile().getProperties())
|
||||
.setDisplayName(item.getDisplayName().getComponent())
|
||||
.setLatency(item.getLatency())
|
||||
.setGameMode(item.getGameMode())).toList()));
|
||||
.Item(item.getProfileId())
|
||||
.setName(item.getProfile().getName())
|
||||
.setProperties(item.getProfile().getProperties())
|
||||
.setDisplayName(item.getDisplayName().getComponent())
|
||||
.setLatency(item.getLatency())
|
||||
.setGameMode(item.getGameMode())).toList()));
|
||||
return;
|
||||
}
|
||||
|
||||
if(action == null) { //REMOVE
|
||||
if (action == null) { //REMOVE
|
||||
sendPacket(player, new RemovePlayerInfoPacket(items.stream().map(item -> item.getProfile().getId()).toList()));
|
||||
return;
|
||||
}
|
||||
@@ -307,7 +307,7 @@ public class Tablist extends ChannelInboundHandlerAdapter {
|
||||
|
||||
private Component getDisplayName(UpsertPlayerInfoPacket.Entry entry) {
|
||||
ComponentHolder displayName = entry.getDisplayName();
|
||||
if(displayName == null)
|
||||
if (displayName == null)
|
||||
return null;
|
||||
|
||||
return displayName.getComponent();
|
||||
|
||||
@@ -38,7 +38,7 @@ public class TablistBuild implements TablistPart {
|
||||
|
||||
public TablistBuild() {
|
||||
for (RegisteredServer server : VelocityCore.getProxy().getAllServers()) {
|
||||
if(server.getPlayersConnected().isEmpty() || !Subserver.isBuild(Subserver.getSubserver(server.getServerInfo())))
|
||||
if (server.getPlayersConnected().isEmpty() || !Subserver.isBuild(Subserver.getSubserver(server.getServerInfo())))
|
||||
continue;
|
||||
|
||||
servers.add(server);
|
||||
@@ -55,7 +55,7 @@ public class TablistBuild implements TablistPart {
|
||||
@Override
|
||||
public void print(Chatter viewer, Player player, List<Item> tablist, List<Item> direct) {
|
||||
RegisteredServer server = player.getCurrentServer().map(ServerConnection::getServer).orElse(null);
|
||||
if(players.keySet().stream().anyMatch(info -> server != info)) {
|
||||
if (players.keySet().stream().anyMatch(info -> server != info)) {
|
||||
tablist.add(new Item(null, "", TablistServer.GRAY));
|
||||
tablist.add(new Item(null, viewer.parseToLegacy("TABLIST_BAU"), TablistServer.LIGHT_GRAY));
|
||||
}
|
||||
|
||||
@@ -67,7 +67,7 @@ public class TablistManager extends BasicListener implements Disable {
|
||||
tablists.computeIfAbsent(event.getPlayer(), Tablist::new).onServerSwitch();
|
||||
}
|
||||
|
||||
if(event.getPlayer().getProtocolVersion().lessThan(ProtocolVersion.MINECRAFT_1_20))
|
||||
if (event.getPlayer().getProtocolVersion().lessThan(ProtocolVersion.MINECRAFT_1_20))
|
||||
Tablist.sendPacket(event.getPlayer(), Tablist.createTeamPacket);
|
||||
}
|
||||
|
||||
|
||||
@@ -32,6 +32,7 @@ import java.util.UUID;
|
||||
|
||||
public interface TablistPart {
|
||||
String sortKey();
|
||||
|
||||
void print(Chatter viewer, Player player, List<Item> tablist, List<Item> direct);
|
||||
|
||||
@Getter
|
||||
|
||||
@@ -71,7 +71,7 @@ public class TablistServer implements TablistPart {
|
||||
boolean onServer = player.getCurrentServer().map(ServerConnection::getServer).orElse(null) == server;
|
||||
List<Item> items = onServer ? direct : tablist;
|
||||
|
||||
if(!onServer) {
|
||||
if (!onServer) {
|
||||
items.add(new Item(null, "", GRAY));
|
||||
items.add(new Item(null, "§7§l" + server.getServerInfo().getName(), LIGHT_GRAY));
|
||||
}
|
||||
@@ -93,7 +93,8 @@ public class TablistServer implements TablistPart {
|
||||
return players.stream().map(item -> {
|
||||
Player p = VelocityCore.getProxy().getPlayer(item.getUuid()).orElse(null);
|
||||
if (p == null) return item;
|
||||
if (Subserver.isArena(Subserver.getSubserver(p.getCurrentServer().map(ServerConnection::getServerInfo).orElse(null)))) return item;
|
||||
if (Subserver.isArena(Subserver.getSubserver(p.getCurrentServer().map(ServerConnection::getServerInfo).orElse(null))))
|
||||
return item;
|
||||
if (SteamwarUser.get(p.getUniqueId()).getTeam() != team) return item;
|
||||
return new Item(p, true);
|
||||
});
|
||||
|
||||
@@ -81,12 +81,12 @@ public class UpdateTeamsPacket21 extends UpdateTeamsPacket {
|
||||
(new ComponentHolder(protocolVersion, this.prefix)).write(byteBuf);
|
||||
(new ComponentHolder(protocolVersion, this.suffix)).write(byteBuf);
|
||||
} else {
|
||||
byteBuf.writeByte((byte)this.color);
|
||||
byteBuf.writeByte((byte) this.color);
|
||||
}
|
||||
|
||||
ProtocolUtils.writeVarInt(byteBuf, this.players.size());
|
||||
|
||||
for(String player : this.players) {
|
||||
for (String player : this.players) {
|
||||
ProtocolUtils.writeString(byteBuf, player);
|
||||
}
|
||||
break;
|
||||
@@ -94,7 +94,7 @@ public class UpdateTeamsPacket21 extends UpdateTeamsPacket {
|
||||
case REMOVE_PLAYER:
|
||||
ProtocolUtils.writeVarInt(byteBuf, this.players.size());
|
||||
|
||||
for(String player : this.players) {
|
||||
for (String player : this.players) {
|
||||
ProtocolUtils.writeString(byteBuf, player);
|
||||
}
|
||||
case REMOVE:
|
||||
|
||||
@@ -34,12 +34,13 @@ import lombok.experimental.UtilityClass;
|
||||
public class BauLock {
|
||||
|
||||
private static final String BAU_LOCK_CONFIG_NAME = "baulockstate";
|
||||
|
||||
public static void setLocked(Chatter owner, BauLockState state) {
|
||||
UserConfig.updatePlayerConfig(owner.user().getId(), BAU_LOCK_CONFIG_NAME, state == BauLockState.OPEN ? null : state.name());
|
||||
owner.system("BAU_LOCKED_" + state.name());
|
||||
|
||||
Bauserver bauserver = Bauserver.get(owner.user().getUUID());
|
||||
if(bauserver != null)
|
||||
if (bauserver != null)
|
||||
bauserver.getRegisteredServer().getPlayersConnected().stream().findAny().ifPresent(player -> NetworkSender.send(player, new BaulockUpdatePacket()));
|
||||
}
|
||||
|
||||
|
||||
Reference in New Issue
Block a user