# Conflicts: # src/de/steamwar/bungeecore/commands/HelpCommand.java
Dieser Commit ist enthalten in:
Commit
1cbec668d1
@ -1 +1 @@
|
|||||||
Subproject commit 47bd9af03eb987f94777f3b13f6ae6c30f153393
|
Subproject commit 9df92595b2f344585bd3e1639cedc761680b7761
|
@ -61,11 +61,7 @@ public class BungeeCore extends Plugin {
|
|||||||
public static boolean MAIN_SERVER;
|
public static boolean MAIN_SERVER;
|
||||||
|
|
||||||
public static String CHAT_PREFIX;
|
public static String CHAT_PREFIX;
|
||||||
public static String WORLD_FOLDER;
|
|
||||||
public static String BAUWELT_PROTOTYP;
|
|
||||||
public static String LOBBY_SERVER;
|
public static String LOBBY_SERVER;
|
||||||
public static String USERWORLDS15;
|
|
||||||
public static String BAUWELT15;
|
|
||||||
public static boolean EVENT_MODE;
|
public static boolean EVENT_MODE;
|
||||||
|
|
||||||
private static BungeeCore instance;
|
private static BungeeCore instance;
|
||||||
@ -73,6 +69,7 @@ public class BungeeCore extends Plugin {
|
|||||||
public static final Map<String, String> serverPermissions = new HashMap<>();
|
public static final Map<String, String> serverPermissions = new HashMap<>();
|
||||||
public static final Map<String, String> commands = new HashMap<>();
|
public static final Map<String, String> commands = new HashMap<>();
|
||||||
|
|
||||||
|
public static Node local;
|
||||||
private ErrorLogger errorLogger;
|
private ErrorLogger errorLogger;
|
||||||
private TablistManager tablistManager;
|
private TablistManager tablistManager;
|
||||||
|
|
||||||
@ -114,9 +111,8 @@ public class BungeeCore extends Plugin {
|
|||||||
new Fabric();
|
new Fabric();
|
||||||
new SubserverProtocolFixer();
|
new SubserverProtocolFixer();
|
||||||
|
|
||||||
new Node.LocalNode();
|
local = new Node.LocalNode();
|
||||||
//new Node.RemoteNode("lx");
|
//new Node.RemoteNode("lx");
|
||||||
//new Node.RemoteNode("az");
|
|
||||||
|
|
||||||
commands.put("/tp", null);
|
commands.put("/tp", null);
|
||||||
commands.put("/bc", null);
|
commands.put("/bc", null);
|
||||||
@ -154,6 +150,7 @@ public class BungeeCore extends Plugin {
|
|||||||
new RankCommand();
|
new RankCommand();
|
||||||
new LocalCommand();
|
new LocalCommand();
|
||||||
new SetLocaleCommand();
|
new SetLocaleCommand();
|
||||||
|
new BuilderCloudCommand();
|
||||||
|
|
||||||
// Punishment Commands:
|
// Punishment Commands:
|
||||||
new PunishmentCommand("ban", Punishment.PunishmentType.Ban);
|
new PunishmentCommand("ban", Punishment.PunishmentType.Ban);
|
||||||
@ -168,7 +165,7 @@ public class BungeeCore extends Plugin {
|
|||||||
|
|
||||||
if(!EVENT_MODE){
|
if(!EVENT_MODE){
|
||||||
new BauCommand();
|
new BauCommand();
|
||||||
new WebregisterCommand();
|
new WebpasswordCommand();
|
||||||
new FightCommand();
|
new FightCommand();
|
||||||
new ChallengeCommand();
|
new ChallengeCommand();
|
||||||
new HistoricCommand();
|
new HistoricCommand();
|
||||||
@ -299,11 +296,7 @@ public class BungeeCore extends Plugin {
|
|||||||
}
|
}
|
||||||
|
|
||||||
CHAT_PREFIX = config.getString("prefix");
|
CHAT_PREFIX = config.getString("prefix");
|
||||||
WORLD_FOLDER = config.getString("worldfolder");
|
|
||||||
BAUWELT_PROTOTYP = config.getString("bauweltprototyp");
|
|
||||||
LOBBY_SERVER = config.getString("lobbyserver");
|
LOBBY_SERVER = config.getString("lobbyserver");
|
||||||
USERWORLDS15 = config.getString("userworlds15");
|
|
||||||
BAUWELT15 = config.getString("bauwelt15");
|
|
||||||
EVENT_MODE = config.getBoolean("eventmode");
|
EVENT_MODE = config.getBoolean("eventmode");
|
||||||
Broadcaster.setBroadCastMsgs(config.getStringList("broadcasts").toArray(new String[1]));
|
Broadcaster.setBroadCastMsgs(config.getStringList("broadcasts").toArray(new String[1]));
|
||||||
PollSystem.init(config.getString("poll.question"), config.getStringList("poll.answers"));
|
PollSystem.init(config.getString("poll.question"), config.getStringList("poll.answers"));
|
||||||
|
@ -33,7 +33,6 @@ import java.util.logging.LogRecord;
|
|||||||
import java.util.logging.Logger;
|
import java.util.logging.Logger;
|
||||||
|
|
||||||
public class ErrorLogger extends Handler {
|
public class ErrorLogger extends Handler {
|
||||||
private int ddosRate = 0;
|
|
||||||
|
|
||||||
ErrorLogger(){
|
ErrorLogger(){
|
||||||
Logger.getLogger("").addHandler(this);
|
Logger.getLogger("").addHandler(this);
|
||||||
@ -57,12 +56,7 @@ public class ErrorLogger extends Handler {
|
|||||||
if(logRecord.getThrown() != null)
|
if(logRecord.getThrown() != null)
|
||||||
logRecord.getThrown().printStackTrace(new PrintStream(stacktraceOutput));
|
logRecord.getThrown().printStackTrace(new PrintStream(stacktraceOutput));
|
||||||
String stacktrace = stacktraceOutput.toString();
|
String stacktrace = stacktraceOutput.toString();
|
||||||
if(stacktrace.contains("Cannot request protocol")) {
|
if (stacktrace.contains("ErrorLogger")) {
|
||||||
if(++ddosRate % 1000 == 0) {
|
|
||||||
SWException.log("Bungee", "DDOS", ddosRate + "");
|
|
||||||
}
|
|
||||||
return;
|
|
||||||
} else if (stacktrace.contains("ErrorLogger")) {
|
|
||||||
return;
|
return;
|
||||||
}
|
}
|
||||||
|
|
||||||
@ -86,10 +80,12 @@ public class ErrorLogger extends Handler {
|
|||||||
List<String> contains = new ArrayList<>();
|
List<String> contains = new ArrayList<>();
|
||||||
contains.add("Error authenticating ");
|
contains.add("Error authenticating ");
|
||||||
contains.add("read timed out");
|
contains.add("read timed out");
|
||||||
|
contains.add("could not decode packet");
|
||||||
contains.add("Connection reset by peer");
|
contains.add("Connection reset by peer");
|
||||||
contains.add("No client connected for pending server");
|
contains.add("No client connected for pending server");
|
||||||
contains.add("Error occurred processing connection for");
|
contains.add("Error occurred processing connection for");
|
||||||
contains.add("Server is online mode!");
|
contains.add("Server is online mode!");
|
||||||
|
contains.add(" took ");
|
||||||
ignoreContains = Collections.unmodifiableList(contains);
|
ignoreContains = Collections.unmodifiableList(contains);
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
@ -19,6 +19,7 @@
|
|||||||
|
|
||||||
package de.steamwar.bungeecore;
|
package de.steamwar.bungeecore;
|
||||||
|
|
||||||
|
import net.md_5.bungee.BungeeCord;
|
||||||
import net.md_5.bungee.api.ProxyServer;
|
import net.md_5.bungee.api.ProxyServer;
|
||||||
|
|
||||||
import java.io.*;
|
import java.io.*;
|
||||||
@ -30,7 +31,6 @@ import java.util.logging.Level;
|
|||||||
public abstract class Node {
|
public abstract class Node {
|
||||||
|
|
||||||
private static final List<String> OPENJ9_ARGS = Arrays.asList("-Xgc:excessiveGCratio=80", "-Xsyslog:none", "-Xtrace:none", "-Xdisableexplicitgc", "-XX:+AlwaysPreTouch", "-XX:+CompactStrings", "-XX:-HeapDumpOnOutOfMemory", "-XX:+ExitOnOutOfMemoryError", "-Dlog4j.configurationFile=log4j2.xml");
|
private static final List<String> OPENJ9_ARGS = Arrays.asList("-Xgc:excessiveGCratio=80", "-Xsyslog:none", "-Xtrace:none", "-Xdisableexplicitgc", "-XX:+AlwaysPreTouch", "-XX:+CompactStrings", "-XX:-HeapDumpOnOutOfMemory", "-XX:+ExitOnOutOfMemoryError", "-Dlog4j.configurationFile=log4j2.xml");
|
||||||
private static final double MIN_FREE_MEM = 4.0 * 1024 * 1024; // 4 GiB
|
|
||||||
private static final Set<String> JAVA_8 = new HashSet<>();
|
private static final Set<String> JAVA_8 = new HashSet<>();
|
||||||
static {
|
static {
|
||||||
JAVA_8.add("paper-1.8.8.jar");
|
JAVA_8.add("paper-1.8.8.jar");
|
||||||
@ -40,43 +40,57 @@ public abstract class Node {
|
|||||||
JAVA_8.add("spigot-1.10.2.jar");
|
JAVA_8.add("spigot-1.10.2.jar");
|
||||||
}
|
}
|
||||||
|
|
||||||
|
private static final long MIN_FREE_MEM = 4 * 1024 * 1024L; // 4 GiB
|
||||||
|
private static final double MAX_LOAD = 0.8;
|
||||||
|
|
||||||
private static final List<Node> nodes = new ArrayList<>();
|
private static final List<Node> nodes = new ArrayList<>();
|
||||||
public static Node local = null;
|
|
||||||
|
|
||||||
public static Node getNode() {
|
public static Node getNode() {
|
||||||
Node node = local;
|
for(Node node : nodes) {
|
||||||
double minLoad = local.getLoad();
|
if(node.belowLoadLimit)
|
||||||
if(minLoad < 0.5)
|
|
||||||
return local;
|
|
||||||
|
|
||||||
synchronized (nodes) {
|
|
||||||
Iterator<Node> it = nodes.iterator();
|
|
||||||
while(it.hasNext()) {
|
|
||||||
Node n = it.next();
|
|
||||||
double load = n.getLoad();
|
|
||||||
if (load < minLoad) {
|
|
||||||
minLoad = load;
|
|
||||||
node = n;
|
|
||||||
} else if (load == Double.POSITIVE_INFINITY) {
|
|
||||||
BungeeCore.get().getLogger().log(Level.SEVERE, "Removing " + n.getName() + " due to infinite load!");
|
|
||||||
it.remove();
|
|
||||||
}
|
|
||||||
}
|
|
||||||
}
|
|
||||||
return node;
|
return node;
|
||||||
}
|
}
|
||||||
|
return null;
|
||||||
|
}
|
||||||
|
|
||||||
public static void forEach(Consumer<Node> consumer) {
|
public static void forEach(Consumer<Node> consumer) {
|
||||||
consumer.accept(local);
|
|
||||||
synchronized (nodes) {
|
|
||||||
nodes.forEach(consumer);
|
nodes.forEach(consumer);
|
||||||
}
|
}
|
||||||
}
|
|
||||||
|
|
||||||
public abstract ProcessBuilder startServer(String serverJar, File directory, String worldDir, String levelName, int port, String xmx, String... dParams);
|
public abstract ProcessBuilder startServer(String serverJar, File directory, String worldDir, String levelName, int port, String xmx, String... dParams);
|
||||||
public abstract void execute(String... command);
|
|
||||||
public abstract String getName();
|
protected abstract ProcessBuilder prepareExecution(String... command);
|
||||||
public abstract double getLoad();
|
protected abstract void calcLoadLimit();
|
||||||
|
|
||||||
|
protected final String hostname;
|
||||||
|
protected volatile boolean belowLoadLimit = true;
|
||||||
|
|
||||||
|
private long previousCpuLoaded = 0;
|
||||||
|
private long previousCpuTotal = 0;
|
||||||
|
|
||||||
|
protected Node(String hostname) {
|
||||||
|
this.hostname = hostname;
|
||||||
|
nodes.add(this);
|
||||||
|
BungeeCord.getInstance().getScheduler().schedule(BungeeCore.get(), this::calcLoadLimit, 1, 2, TimeUnit.SECONDS);
|
||||||
|
}
|
||||||
|
|
||||||
|
public void execute(String... command) {
|
||||||
|
try {
|
||||||
|
prepareExecution(command).start().waitFor();
|
||||||
|
} catch (IOException e) {
|
||||||
|
throw new SecurityException("Could not execute command", e);
|
||||||
|
} catch (InterruptedException e) {
|
||||||
|
ProxyServer.getInstance().getLogger().log(Level.SEVERE, "Interrupted during execution", e);
|
||||||
|
Thread.currentThread().interrupt();
|
||||||
|
}
|
||||||
|
}
|
||||||
|
|
||||||
|
public boolean belowLoadLimit() {
|
||||||
|
return belowLoadLimit;
|
||||||
|
}
|
||||||
|
public String getName() {
|
||||||
|
return hostname;
|
||||||
|
}
|
||||||
|
|
||||||
protected void constructServerstart(File directory, List<String> cmd, String serverJar, String worldDir, String levelName, int port, String xmx, String... dParams) {
|
protected void constructServerstart(File directory, List<String> cmd, String serverJar, String worldDir, String levelName, int port, String xmx, String... dParams) {
|
||||||
if (JAVA_8.contains(serverJar))
|
if (JAVA_8.contains(serverJar))
|
||||||
@ -106,26 +120,31 @@ public abstract class Node {
|
|||||||
cmd.add("nogui");
|
cmd.add("nogui");
|
||||||
}
|
}
|
||||||
|
|
||||||
protected void execute(ProcessBuilder builder) {
|
protected void calcLoadLimit(BufferedReader stat, BufferedReader meminfo) throws IOException {
|
||||||
try {
|
String[] cpuline = stat.readLine().split(" "); // 0-1: prefix, 2: user, 3: nice, 4: system, 5: idle, 6: iowait, 7: irq, 8: softirq, 9: steal, 10: guest, 11: guest_nice
|
||||||
builder.start().waitFor();
|
long cpuLoaded = Long.parseLong(cpuline[2]) + Long.parseLong(cpuline[4]) + Long.parseLong(cpuline[6]) + Long.parseLong(cpuline[7]) + Long.parseLong(cpuline[8]) + Long.parseLong(cpuline[9]) + Long.parseLong(cpuline[10]) + Long.parseLong(cpuline[11]);
|
||||||
} catch (IOException e) {
|
long cpuTotal = cpuLoaded + Long.parseLong(cpuline[3]) + Long.parseLong(cpuline[5]);
|
||||||
throw new SecurityException("Could not execute command", e);
|
|
||||||
} catch (InterruptedException e) {
|
cpuLoaded -= previousCpuLoaded;
|
||||||
ProxyServer.getInstance().getLogger().log(Level.SEVERE, "Interrupted during execution", e);
|
cpuTotal -= previousCpuTotal;
|
||||||
Thread.currentThread().interrupt();
|
previousCpuLoaded += cpuLoaded;
|
||||||
|
previousCpuTotal += cpuTotal;
|
||||||
|
|
||||||
|
String line = meminfo.readLine();
|
||||||
|
while(!line.startsWith("MemAvailable")) {
|
||||||
|
line = meminfo.readLine();
|
||||||
}
|
}
|
||||||
|
|
||||||
|
long availableMem = Long.parseLong(line.replaceAll(" +", " ").split(" ")[1]);
|
||||||
|
belowLoadLimit = cpuLoaded / (double)cpuTotal <= MAX_LOAD && availableMem >= MIN_FREE_MEM;
|
||||||
}
|
}
|
||||||
|
|
||||||
public static class LocalNode extends Node {
|
public static class LocalNode extends Node {
|
||||||
private static final File meminfo = new File("/proc/meminfo");
|
private static final File MEMINFO = new File("/proc/meminfo");
|
||||||
private static final File loadavg = new File("/proc/loadavg");
|
private static final File STAT = new File("/proc/stat");
|
||||||
|
|
||||||
private final int cores;
|
|
||||||
|
|
||||||
public LocalNode() {
|
public LocalNode() {
|
||||||
this.cores = Runtime.getRuntime().availableProcessors();
|
super("sw");
|
||||||
local = this;
|
|
||||||
}
|
}
|
||||||
|
|
||||||
@Override
|
@Override
|
||||||
@ -138,74 +157,28 @@ public abstract class Node {
|
|||||||
}
|
}
|
||||||
|
|
||||||
@Override
|
@Override
|
||||||
public void execute(String... command) {
|
protected void calcLoadLimit() {
|
||||||
execute(new ProcessBuilder(command));
|
try (BufferedReader loadavg = new BufferedReader(new InputStreamReader(new FileInputStream(STAT)))) {
|
||||||
|
try (BufferedReader meminfo = new BufferedReader(new InputStreamReader(new FileInputStream(MEMINFO)))) {
|
||||||
|
calcLoadLimit(loadavg, meminfo);
|
||||||
|
}
|
||||||
|
} catch (IOException e) {
|
||||||
|
BungeeCore.get().getLogger().log(Level.SEVERE, "Could not read local load", e);
|
||||||
|
belowLoadLimit = false;
|
||||||
|
}
|
||||||
}
|
}
|
||||||
|
|
||||||
@Override
|
@Override
|
||||||
public String getName() {
|
protected ProcessBuilder prepareExecution(String... command) {
|
||||||
return "local";
|
return new ProcessBuilder(command);
|
||||||
}
|
|
||||||
|
|
||||||
@Override
|
|
||||||
public double getLoad() {
|
|
||||||
double totalMem;
|
|
||||||
double freeMem;
|
|
||||||
try (BufferedReader bufferedReader = new BufferedReader(new InputStreamReader(new FileInputStream(meminfo)))) {
|
|
||||||
totalMem = Double.parseDouble(bufferedReader.readLine().replaceAll(" +", " ").split(" ")[1]);
|
|
||||||
bufferedReader.readLine();
|
|
||||||
freeMem = Double.parseDouble(bufferedReader.readLine().replaceAll(" +", " ").split(" ")[1]);
|
|
||||||
} catch (IOException e) {
|
|
||||||
throw new SecurityException("Could not read local memory", e);
|
|
||||||
}
|
|
||||||
|
|
||||||
double cpuLoad;
|
|
||||||
try (BufferedReader bufferedReader = new BufferedReader(new InputStreamReader(new FileInputStream(loadavg)))) {
|
|
||||||
cpuLoad = Double.parseDouble(bufferedReader.readLine().split(" ")[0]);
|
|
||||||
} catch (IOException e) {
|
|
||||||
throw new SecurityException("Could not read local cpu", e);
|
|
||||||
}
|
|
||||||
|
|
||||||
return cpuLoad / cores + (freeMem > MIN_FREE_MEM ? 0 : ((totalMem - freeMem) / totalMem));
|
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
|
||||||
public static class RemoteNode extends Node {
|
public static class RemoteNode extends Node {
|
||||||
private final int cores;
|
|
||||||
private final String remote;
|
|
||||||
|
|
||||||
public RemoteNode(String remote) {
|
public RemoteNode(String hostname) {
|
||||||
this.remote = remote;
|
super(hostname);
|
||||||
|
BungeeCore.get().getLogger().log(Level.INFO, "Added node " + hostname);
|
||||||
//Determine core count
|
|
||||||
Process process;
|
|
||||||
try {
|
|
||||||
process = new ProcessBuilder("ssh", remote, "nproc").start();
|
|
||||||
if(!process.waitFor(5, TimeUnit.SECONDS))
|
|
||||||
throw new IOException("Timeout of " + remote + " on init");
|
|
||||||
} catch (IOException e) {
|
|
||||||
BungeeCore.get().getLogger().log(Level.SEVERE, "Could not initialize " + remote);
|
|
||||||
cores = 1;
|
|
||||||
return;
|
|
||||||
} catch (InterruptedException e) {
|
|
||||||
Thread.currentThread().interrupt();
|
|
||||||
cores = 1;
|
|
||||||
return;
|
|
||||||
}
|
|
||||||
|
|
||||||
int c;
|
|
||||||
try (BufferedReader bufferedReader = new BufferedReader(new InputStreamReader(process.getInputStream()))) {
|
|
||||||
c = Integer.parseInt(bufferedReader.readLine());
|
|
||||||
} catch (IOException | NumberFormatException e) {
|
|
||||||
BungeeCore.get().getLogger().log(Level.SEVERE, "Could not read cores of" + remote, e);
|
|
||||||
c = 1;
|
|
||||||
}
|
|
||||||
cores = c;
|
|
||||||
BungeeCore.get().getLogger().log(Level.INFO, "Adding node " + remote + " with " + cores + " cores.");
|
|
||||||
|
|
||||||
synchronized (nodes) {
|
|
||||||
nodes.add(this);
|
|
||||||
}
|
|
||||||
}
|
}
|
||||||
|
|
||||||
@Override
|
@Override
|
||||||
@ -214,7 +187,7 @@ public abstract class Node {
|
|||||||
cmd.add("ssh");
|
cmd.add("ssh");
|
||||||
cmd.add("-L");
|
cmd.add("-L");
|
||||||
cmd.add(port + ":localhost:" + port);
|
cmd.add(port + ":localhost:" + port);
|
||||||
cmd.add(remote);
|
cmd.add(hostname);
|
||||||
cmd.add("cd");
|
cmd.add("cd");
|
||||||
cmd.add(directory.getPath());
|
cmd.add(directory.getPath());
|
||||||
cmd.add(";");
|
cmd.add(";");
|
||||||
@ -223,43 +196,30 @@ public abstract class Node {
|
|||||||
}
|
}
|
||||||
|
|
||||||
@Override
|
@Override
|
||||||
public void execute(String... command) {
|
protected ProcessBuilder prepareExecution(String... command) {
|
||||||
List<String> cmd = new ArrayList<>();
|
List<String> cmd = new ArrayList<>();
|
||||||
cmd.add("ssh");
|
cmd.add("ssh");
|
||||||
cmd.add(remote);
|
cmd.add(hostname);
|
||||||
cmd.addAll(Arrays.asList(command));
|
cmd.addAll(Arrays.asList(command));
|
||||||
execute(new ProcessBuilder(cmd));
|
return new ProcessBuilder(cmd);
|
||||||
}
|
}
|
||||||
|
|
||||||
@Override
|
@Override
|
||||||
public String getName() {
|
protected void calcLoadLimit() {
|
||||||
return remote;
|
|
||||||
}
|
|
||||||
|
|
||||||
@Override
|
|
||||||
public double getLoad() {
|
|
||||||
Process process;
|
|
||||||
try {
|
try {
|
||||||
process = new ProcessBuilder("ssh", remote, "cat /proc/loadavg;cat /proc/meminfo").start();
|
Process process = prepareExecution("cat /proc/stat /proc/meminfo").start();
|
||||||
if(!process.waitFor(1, TimeUnit.SECONDS))
|
if(process.waitFor(1, TimeUnit.SECONDS))
|
||||||
return Double.POSITIVE_INFINITY;
|
throw new IOException(hostname + " timeout");
|
||||||
|
try (BufferedReader reader = new BufferedReader(new InputStreamReader(process.getInputStream()))) {
|
||||||
|
calcLoadLimit(reader, reader);
|
||||||
|
}
|
||||||
} catch (IOException e) {
|
} catch (IOException e) {
|
||||||
BungeeCore.get().getLogger().log(Level.SEVERE, "Could starting process to read load", e);
|
if(belowLoadLimit)
|
||||||
return Double.POSITIVE_INFINITY;
|
BungeeCore.get().getLogger().log(Level.SEVERE, "Could read remote load", e);
|
||||||
|
belowLoadLimit = false;
|
||||||
} catch (InterruptedException e) {
|
} catch (InterruptedException e) {
|
||||||
Thread.currentThread().interrupt();
|
Thread.currentThread().interrupt();
|
||||||
return Double.POSITIVE_INFINITY;
|
belowLoadLimit = false;
|
||||||
}
|
|
||||||
|
|
||||||
try (BufferedReader bufferedReader = new BufferedReader(new InputStreamReader(process.getInputStream()))) {
|
|
||||||
double cpuLoad = Double.parseDouble(bufferedReader.readLine().split(" ")[0]);
|
|
||||||
double totalMem = Double.parseDouble(bufferedReader.readLine().replaceAll(" +", " ").split(" ")[1]);
|
|
||||||
bufferedReader.readLine();
|
|
||||||
double freeMem = Double.parseDouble(bufferedReader.readLine().replaceAll(" +", " ").split(" ")[1]);
|
|
||||||
return cpuLoad / cores + (freeMem > MIN_FREE_MEM ? 0 : ((totalMem - freeMem) / totalMem));
|
|
||||||
} catch (IOException e) {
|
|
||||||
BungeeCore.get().getLogger().log(Level.SEVERE, "Could read load", e);
|
|
||||||
return Double.POSITIVE_INFINITY;
|
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
@ -4,10 +4,13 @@ import de.steamwar.bungeecore.sql.EventFight;
|
|||||||
import de.steamwar.bungeecore.sql.SteamwarUser;
|
import de.steamwar.bungeecore.sql.SteamwarUser;
|
||||||
import de.steamwar.bungeecore.sql.Team;
|
import de.steamwar.bungeecore.sql.Team;
|
||||||
import de.steamwar.bungeecore.sql.Tutorial;
|
import de.steamwar.bungeecore.sql.Tutorial;
|
||||||
|
import de.steamwar.messages.ChatSender;
|
||||||
import net.md_5.bungee.api.connection.ProxiedPlayer;
|
import net.md_5.bungee.api.connection.ProxiedPlayer;
|
||||||
|
|
||||||
import java.io.File;
|
import java.io.File;
|
||||||
|
import java.io.IOException;
|
||||||
import java.net.InetSocketAddress;
|
import java.net.InetSocketAddress;
|
||||||
|
import java.nio.file.Files;
|
||||||
import java.time.format.DateTimeFormatter;
|
import java.time.format.DateTimeFormatter;
|
||||||
import java.util.*;
|
import java.util.*;
|
||||||
import java.util.function.BooleanSupplier;
|
import java.util.function.BooleanSupplier;
|
||||||
@ -19,12 +22,16 @@ public class ServerStarter {
|
|||||||
private static final Portrange BAU_PORTS = BungeeCore.MAIN_SERVER ? new Portrange(10100, 20000) : new Portrange(2100, 2200);
|
private static final Portrange BAU_PORTS = BungeeCore.MAIN_SERVER ? new Portrange(10100, 20000) : new Portrange(2100, 2200);
|
||||||
private static final Portrange ARENA_PORTS = BungeeCore.MAIN_SERVER ? new Portrange(3000, 3100) : (BungeeCore.EVENT_MODE ? new Portrange(4000, 5000) : BAU_PORTS);
|
private static final Portrange ARENA_PORTS = BungeeCore.MAIN_SERVER ? new Portrange(3000, 3100) : (BungeeCore.EVENT_MODE ? new Portrange(4000, 5000) : BAU_PORTS);
|
||||||
|
|
||||||
private static final String BACKBONE = System.getProperty("user.home") + "/";
|
private static final String SERVER_PATH = "/servers/";
|
||||||
private static final String SERVER_PATH = BACKBONE + "server/";
|
private static final String USER_HOME = System.getProperty("user.home") + "/";
|
||||||
private static final String EVENT_PATH = BACKBONE + "event/";
|
private static final String EVENT_PATH = USER_HOME + "event/";
|
||||||
public static final String TEMP_WORLD_PATH = BACKBONE + "arenaserver/";
|
public static final String TEMP_WORLD_PATH = USER_HOME + "arenaserver/";
|
||||||
public static final String TUTORIAL_PATH = BACKBONE + "tutorials/";
|
public static final String TUTORIAL_PATH = USER_HOME + "tutorials/";
|
||||||
public static final String WORLDS19_PATH = BACKBONE + "userworlds19/";
|
public static final String WORLDS12_PATH = USER_HOME + "userworlds/";
|
||||||
|
public static final String WORLDS15_PATH = USER_HOME + "userworlds15/";
|
||||||
|
public static final String WORLDS19_PATH = USER_HOME + "userworlds19/";
|
||||||
|
|
||||||
|
public static final String BUILDER_BASE_PATH = USER_HOME + "builder";
|
||||||
|
|
||||||
private File directory = null;
|
private File directory = null;
|
||||||
private String worldDir = null;
|
private String worldDir = null;
|
||||||
@ -61,7 +68,7 @@ public class ServerStarter {
|
|||||||
|
|
||||||
public ServerStarter event(EventFight eventFight) {
|
public ServerStarter event(EventFight eventFight) {
|
||||||
arena(eventFight.getSpielmodus(), eventFight.getMap());
|
arena(eventFight.getSpielmodus(), eventFight.getMap());
|
||||||
node = Node.local;
|
node = BungeeCore.local;
|
||||||
worldDir = EVENT_PATH;
|
worldDir = EVENT_PATH;
|
||||||
worldCleanup = () -> {};
|
worldCleanup = () -> {};
|
||||||
arguments.put("fightID", String.valueOf(eventFight.getFightID()));
|
arguments.put("fightID", String.valueOf(eventFight.getFightID()));
|
||||||
@ -109,7 +116,7 @@ public class ServerStarter {
|
|||||||
|
|
||||||
public ServerStarter build19(UUID owner) {
|
public ServerStarter build19(UUID owner) {
|
||||||
directory = new File(SERVER_PATH, "Bau19");
|
directory = new File(SERVER_PATH, "Bau19");
|
||||||
serverJar = "paper-1.19.1.jar";
|
serverJar = "paper-1.19.2.jar";
|
||||||
worldDir = WORLDS19_PATH;
|
worldDir = WORLDS19_PATH;
|
||||||
worldName = String.valueOf(SteamwarUser.get(owner).getId());
|
worldName = String.valueOf(SteamwarUser.get(owner).getId());
|
||||||
buildWithWorld(owner, new File(directory, "Bauwelt").getPath());
|
buildWithWorld(owner, new File(directory, "Bauwelt").getPath());
|
||||||
@ -118,19 +125,19 @@ public class ServerStarter {
|
|||||||
|
|
||||||
public ServerStarter build15(UUID owner) {
|
public ServerStarter build15(UUID owner) {
|
||||||
directory = new File(SERVER_PATH, "Bau15");
|
directory = new File(SERVER_PATH, "Bau15");
|
||||||
worldDir = BungeeCore.USERWORLDS15;
|
worldDir = WORLDS15_PATH;
|
||||||
worldName = String.valueOf(SteamwarUser.get(owner).getId());
|
worldName = String.valueOf(SteamwarUser.get(owner).getId());
|
||||||
buildWithWorld(owner, BungeeCore.BAUWELT15);
|
buildWithWorld(owner, new File(directory, "Bauwelt").getPath());
|
||||||
return this;
|
return this;
|
||||||
}
|
}
|
||||||
|
|
||||||
public ServerStarter build12(UUID owner) {
|
public ServerStarter build12(UUID owner) {
|
||||||
directory = new File(SERVER_PATH, "UserBau");
|
directory = new File(SERVER_PATH, "Bau12");
|
||||||
serverJar = "spigot-1.12.2.jar";
|
serverJar = "spigot-1.12.2.jar";
|
||||||
xmx = "256M";
|
xmx = "256M";
|
||||||
worldDir = BungeeCore.WORLD_FOLDER;
|
worldDir = WORLDS12_PATH;
|
||||||
worldName = owner.toString();
|
worldName = owner.toString();
|
||||||
buildWithWorld(owner, BungeeCore.BAUWELT_PROTOTYP);
|
buildWithWorld(owner, new File(directory, "Bauwelt").getPath());
|
||||||
return this;
|
return this;
|
||||||
}
|
}
|
||||||
|
|
||||||
@ -194,6 +201,40 @@ public class ServerStarter {
|
|||||||
serverNameProvider = port -> bauServerName(SteamwarUser.get(owner));
|
serverNameProvider = port -> bauServerName(SteamwarUser.get(owner));
|
||||||
}
|
}
|
||||||
|
|
||||||
|
public ServerStarter builder(Version version, String map, File generator) {
|
||||||
|
serverJar = version.getServerJar();
|
||||||
|
directory = version.getServerDirectory("Builder");
|
||||||
|
worldDir = version.getWorldFolder(BUILDER_BASE_PATH);
|
||||||
|
worldName = map;
|
||||||
|
serverNameProvider = port -> "⛏" + map;
|
||||||
|
constructor = (serverName, port, builder, shutdownCallback) -> new Builderserver(serverName, worldName, port, builder, shutdownCallback);
|
||||||
|
|
||||||
|
// Send players to existing server
|
||||||
|
startCondition = () -> {
|
||||||
|
for(Subserver subserver : Subserver.getServerList()) {
|
||||||
|
if(subserver.getType() == Servertype.BUILDER && ((Builderserver)subserver).getMap().equals(worldName)) {
|
||||||
|
for(ProxiedPlayer p : playersToSend)
|
||||||
|
SubserverSystem.sendPlayer(subserver, p);
|
||||||
|
return false;
|
||||||
|
}
|
||||||
|
}
|
||||||
|
return true;
|
||||||
|
};
|
||||||
|
|
||||||
|
if(generator != null) {
|
||||||
|
worldSetup = () -> {
|
||||||
|
File leveldat = new File(new File(worldDir, worldName), "level.dat");
|
||||||
|
try {
|
||||||
|
Files.copy(generator.toPath(), leveldat.toPath());
|
||||||
|
} catch (IOException e) {
|
||||||
|
throw new SecurityException(e);
|
||||||
|
}
|
||||||
|
};
|
||||||
|
}
|
||||||
|
|
||||||
|
return this;
|
||||||
|
}
|
||||||
|
|
||||||
public ServerStarter send(ProxiedPlayer player) {
|
public ServerStarter send(ProxiedPlayer player) {
|
||||||
playersToSend.add(player);
|
playersToSend.add(player);
|
||||||
return this;
|
return this;
|
||||||
@ -206,8 +247,15 @@ public class ServerStarter {
|
|||||||
int port = portrange.freePort();
|
int port = portrange.freePort();
|
||||||
String serverName = serverNameProvider.apply(port);
|
String serverName = serverNameProvider.apply(port);
|
||||||
|
|
||||||
if(node == null)
|
if(node == null) {
|
||||||
node = Node.getNode();
|
node = Node.getNode();
|
||||||
|
if(node == null) {
|
||||||
|
for (ProxiedPlayer p : playersToSend)
|
||||||
|
ChatSender.of(p).system("SERVER_START_OVERLOAD");
|
||||||
|
|
||||||
|
return null;
|
||||||
|
}
|
||||||
|
}
|
||||||
if(worldName == null)
|
if(worldName == null)
|
||||||
worldName = serverToWorldName(serverName);
|
worldName = serverToWorldName(serverName);
|
||||||
|
|
||||||
@ -285,4 +333,30 @@ public class ServerStarter {
|
|||||||
return result;
|
return result;
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
|
||||||
|
public enum Version {
|
||||||
|
SPIGOT_12("spigot-1.12.2.jar", 12),
|
||||||
|
SPIGOT_15("spigot-1.15.2.jar", 15),
|
||||||
|
PAPER_19("paper-1.19.2.jar", 19);
|
||||||
|
|
||||||
|
private final String serverJar;
|
||||||
|
private final int versionSuffix;
|
||||||
|
|
||||||
|
Version(String serverJar, int versionSuffix) {
|
||||||
|
this.serverJar = serverJar;
|
||||||
|
this.versionSuffix = versionSuffix;
|
||||||
|
}
|
||||||
|
|
||||||
|
public String getServerJar() {
|
||||||
|
return serverJar;
|
||||||
|
}
|
||||||
|
|
||||||
|
public String getWorldFolder(String base) {
|
||||||
|
return base + versionSuffix + "/";
|
||||||
|
}
|
||||||
|
|
||||||
|
public File getServerDirectory(String base) {
|
||||||
|
return new File(SERVER_PATH, base + versionSuffix);
|
||||||
|
}
|
||||||
|
}
|
||||||
}
|
}
|
@ -257,8 +257,8 @@ public class BauCommand extends BasicCommand {
|
|||||||
SteamwarUser user = SteamwarUser.get(p.getUniqueId());
|
SteamwarUser user = SteamwarUser.get(p.getUniqueId());
|
||||||
versionSelector(p, args, 1,
|
versionSelector(p, args, 1,
|
||||||
() -> deleteConfirmation(p, () -> deleteWorld(p, ServerStarter.WORLDS19_PATH + user.getId())),
|
() -> deleteConfirmation(p, () -> deleteWorld(p, ServerStarter.WORLDS19_PATH + user.getId())),
|
||||||
() -> deleteConfirmation(p, () -> deleteWorld(p, BungeeCore.USERWORLDS15 + user.getId())),
|
() -> deleteConfirmation(p, () -> deleteWorld(p, ServerStarter.WORLDS15_PATH + user.getId())),
|
||||||
() -> deleteConfirmation(p, () -> deleteWorld(p, BungeeCore.WORLD_FOLDER + p.getUniqueId().toString())),
|
() -> deleteConfirmation(p, () -> deleteWorld(p, ServerStarter.WORLDS12_PATH + p.getUniqueId().toString())),
|
||||||
() -> HelpCommand.sendBauHelp(ChatSender.of(p)));
|
() -> HelpCommand.sendBauHelp(ChatSender.of(p)));
|
||||||
}
|
}
|
||||||
|
|
||||||
@ -282,7 +282,7 @@ public class BauCommand extends BasicCommand {
|
|||||||
break;
|
break;
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
SubserverSystem.deleteFolder(Node.local, world);
|
SubserverSystem.deleteFolder(BungeeCore.local, world);
|
||||||
Message.send("BAU_DELETE_DELETED", player);
|
Message.send("BAU_DELETE_DELETED", player);
|
||||||
});
|
});
|
||||||
}
|
}
|
||||||
|
121
src/de/steamwar/bungeecore/commands/BuilderCloudCommand.java
Normale Datei
121
src/de/steamwar/bungeecore/commands/BuilderCloudCommand.java
Normale Datei
@ -0,0 +1,121 @@
|
|||||||
|
package de.steamwar.bungeecore.commands;
|
||||||
|
|
||||||
|
import de.steamwar.bungeecore.ServerStarter;
|
||||||
|
import de.steamwar.command.SWCommand;
|
||||||
|
import de.steamwar.command.TypeMapper;
|
||||||
|
import net.md_5.bungee.api.CommandSender;
|
||||||
|
import net.md_5.bungee.api.connection.ProxiedPlayer;
|
||||||
|
|
||||||
|
import java.io.File;
|
||||||
|
import java.util.*;
|
||||||
|
import java.util.stream.Collectors;
|
||||||
|
|
||||||
|
public class BuilderCloudCommand extends SWCommand {
|
||||||
|
|
||||||
|
private final Map<String, ServerStarter.Version> versionMap = new HashMap<>();
|
||||||
|
|
||||||
|
public BuilderCloudCommand() {
|
||||||
|
super("buildercloud", "bungeecore.server.team");
|
||||||
|
|
||||||
|
versionMap.put("15", ServerStarter.Version.SPIGOT_15);
|
||||||
|
versionMap.put("1.15", ServerStarter.Version.SPIGOT_15);
|
||||||
|
versionMap.put("1.15.2", ServerStarter.Version.SPIGOT_15);
|
||||||
|
versionMap.put("19", ServerStarter.Version.PAPER_19);
|
||||||
|
versionMap.put("1.19", ServerStarter.Version.PAPER_19);
|
||||||
|
versionMap.put("1.19.2", ServerStarter.Version.PAPER_19);
|
||||||
|
}
|
||||||
|
|
||||||
|
@Register(description = "BUILDERCLOUD_USAGE")
|
||||||
|
public void genericCommand(ProxiedPlayer player, @ErrorMessage("BUILDERCLOUD_VERSION") ServerStarter.Version version, @Mapper("map") String map, @OptionalValue("") @Mapper("generator") @AllowNull File generator) {
|
||||||
|
new ServerStarter().builder(version, map, generator).send(player).start();
|
||||||
|
}
|
||||||
|
|
||||||
|
@ClassMapper(value = ServerStarter.Version.class, local = true)
|
||||||
|
private TypeMapper<ServerStarter.Version> versionTypeMapper() {
|
||||||
|
return new TypeMapper<ServerStarter.Version>() {
|
||||||
|
@Override
|
||||||
|
public ServerStarter.Version map(CommandSender commandSender, String[] previousArguments, String s) {
|
||||||
|
return versionMap.get(s);
|
||||||
|
}
|
||||||
|
|
||||||
|
@Override
|
||||||
|
public Collection<String> tabCompletes(CommandSender sender, String[] previousArguments, String s) {
|
||||||
|
return versionMap.keySet();
|
||||||
|
}
|
||||||
|
};
|
||||||
|
}
|
||||||
|
|
||||||
|
@Cached(global = true)
|
||||||
|
@Mapper(value = "map", local = true)
|
||||||
|
private TypeMapper<String> mapTypeMapper() {
|
||||||
|
|
||||||
|
return new TypeMapper<String>() {
|
||||||
|
@Override
|
||||||
|
public String map(CommandSender commandSender, String[] previousArguments, String s) {
|
||||||
|
File folder = getWorldFolder(previousArguments, 1);
|
||||||
|
|
||||||
|
if(folder == null)
|
||||||
|
return null;
|
||||||
|
|
||||||
|
File map = new File(folder, s);
|
||||||
|
if(!map.exists() && !map.mkdir())
|
||||||
|
return null;
|
||||||
|
|
||||||
|
return map.getName();
|
||||||
|
}
|
||||||
|
|
||||||
|
@Override
|
||||||
|
public Collection<String> tabCompletes(CommandSender sender, String[] previousArguments, String s) {
|
||||||
|
File folder = getWorldFolder(previousArguments, 1);
|
||||||
|
|
||||||
|
String[] files;
|
||||||
|
if(folder == null || (files = folder.list()) == null)
|
||||||
|
return Collections.emptyList();
|
||||||
|
|
||||||
|
return Arrays.stream(files).filter(file -> new File(folder, file).isDirectory()).collect(Collectors.toList());
|
||||||
|
}
|
||||||
|
};
|
||||||
|
}
|
||||||
|
|
||||||
|
@Cached(global = true)
|
||||||
|
@Mapper(value = "generator", local = true)
|
||||||
|
private TypeMapper<File> generatorTypeMapper() {
|
||||||
|
|
||||||
|
return new TypeMapper<File>() {
|
||||||
|
@Override
|
||||||
|
public File map(CommandSender commandSender, String[] previousArguments, String s) {
|
||||||
|
if(s.equals(""))
|
||||||
|
return null;
|
||||||
|
|
||||||
|
File folder = getWorldFolder(previousArguments, 2);
|
||||||
|
|
||||||
|
if(folder == null)
|
||||||
|
throw new SecurityException();
|
||||||
|
|
||||||
|
File generator = new File(folder, s + ".dat");
|
||||||
|
if(!generator.exists() || !generator.isFile())
|
||||||
|
throw new SecurityException();
|
||||||
|
|
||||||
|
return generator;
|
||||||
|
}
|
||||||
|
|
||||||
|
@Override
|
||||||
|
public Collection<String> tabCompletes(CommandSender sender, String[] previousArguments, String s) {
|
||||||
|
File folder = getWorldFolder(previousArguments, 2);
|
||||||
|
|
||||||
|
String[] files;
|
||||||
|
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)).collect(Collectors.toList());
|
||||||
|
}
|
||||||
|
};
|
||||||
|
}
|
||||||
|
|
||||||
|
private File getWorldFolder(String[] previousArguments, int offset) {
|
||||||
|
ServerStarter.Version v = versionMap.get(previousArguments[previousArguments.length - offset]);
|
||||||
|
if(v == null)
|
||||||
|
return null;
|
||||||
|
return new File(v.getWorldFolder(ServerStarter.BUILDER_BASE_PATH));
|
||||||
|
}
|
||||||
|
}
|
@ -20,88 +20,75 @@
|
|||||||
package de.steamwar.bungeecore.commands;
|
package de.steamwar.bungeecore.commands;
|
||||||
|
|
||||||
import de.steamwar.bungeecore.*;
|
import de.steamwar.bungeecore.*;
|
||||||
import de.steamwar.bungeecore.listeners.mods.ModLoaderBlocker;
|
|
||||||
import de.steamwar.bungeecore.sql.IgnoreSystem;
|
import de.steamwar.bungeecore.sql.IgnoreSystem;
|
||||||
import net.md_5.bungee.api.CommandSender;
|
import de.steamwar.command.SWCommand;
|
||||||
import net.md_5.bungee.api.ProxyServer;
|
import de.steamwar.command.TypeValidator;
|
||||||
import net.md_5.bungee.api.chat.ClickEvent;
|
import net.md_5.bungee.api.chat.ClickEvent;
|
||||||
import net.md_5.bungee.api.connection.ProxiedPlayer;
|
import net.md_5.bungee.api.connection.ProxiedPlayer;
|
||||||
|
|
||||||
import java.util.ArrayList;
|
|
||||||
import java.util.LinkedList;
|
import java.util.LinkedList;
|
||||||
|
|
||||||
import static de.steamwar.bungeecore.Storage.challenges;
|
import static de.steamwar.bungeecore.Storage.challenges;
|
||||||
|
|
||||||
public class ChallengeCommand extends BasicCommand {
|
public class ChallengeCommand extends SWCommand {
|
||||||
|
|
||||||
public ChallengeCommand() {
|
public ChallengeCommand() {
|
||||||
super("challenge", "");
|
super("challenge");
|
||||||
}
|
}
|
||||||
|
|
||||||
@Override
|
@Register(description = "CHALLENGE_USAGE")
|
||||||
public void execute(CommandSender sender, String[] args) {
|
public void challenge(@Validator("arenaPlayer") ProxiedPlayer player, @Validator("target") ProxiedPlayer target, @Mapper("nonHistoricArenaMode") @OptionalValue("") @AllowNull ArenaMode arenaMode, @Mapper("arenaMap") @OptionalValue("") @AllowNull String map) {
|
||||||
if(args.length < 1){
|
FightCommand.createArena(player, "/challenge " + target.getName() + " ", false, arenaMode, map, false, (p, mode, m) -> {
|
||||||
Message.send("CHALLENGE_USAGE", sender);
|
if(challenges.containsKey(target) && challenges.get(target).contains(p)){
|
||||||
return;
|
|
||||||
}
|
|
||||||
|
|
||||||
if (!(sender instanceof ProxiedPlayer))
|
|
||||||
return;
|
|
||||||
|
|
||||||
if(ModLoaderBlocker.isFabric((ProxiedPlayer) sender)) {
|
|
||||||
Message.send("MODLOADER_DENIED", sender);
|
|
||||||
return;
|
|
||||||
}
|
|
||||||
|
|
||||||
ProxiedPlayer target = ProxyServer.getInstance().getPlayer(args[0]);
|
|
||||||
if(target == null){
|
|
||||||
Message.send("CHALLENGE_OFFLINE", sender);
|
|
||||||
return;
|
|
||||||
}else if(target == sender){
|
|
||||||
Message.send("CHALLENGE_SELF", sender);
|
|
||||||
return;
|
|
||||||
}else if (IgnoreSystem.isIgnored(target, (ProxiedPlayer) sender)) {
|
|
||||||
Message.send("CHALLENGE_IGNORED", sender);
|
|
||||||
return;
|
|
||||||
}
|
|
||||||
|
|
||||||
Subserver subserver = Subserver.getSubserver(target);
|
|
||||||
if(subserver != null && subserver.getType() == Servertype.ARENA){
|
|
||||||
Message.send("CHALLENGE_INARENA", sender);
|
|
||||||
return;
|
|
||||||
}
|
|
||||||
|
|
||||||
FightCommand.createArena(sender, "/challenge " + target.getName() + " ", false, args, 1, false, (player, mode, map) -> {
|
|
||||||
if(challenges.containsKey(target) && challenges.get(target).contains(player)){
|
|
||||||
challenges.remove(target);
|
challenges.remove(target);
|
||||||
challenges.remove(player);
|
challenges.remove(p);
|
||||||
|
|
||||||
Subserver arena = new ServerStarter().arena(mode, map).blueLeader(player).redLeader(target).start();
|
Subserver arena = new ServerStarter().arena(mode, map).blueLeader(player).redLeader(target).start();
|
||||||
|
if(arena != null) {
|
||||||
Message.broadcast("CHALLENGE_BROADCAST", "CHALLENGE_BROADCAST_HOVER",
|
Message.broadcast("CHALLENGE_BROADCAST", "CHALLENGE_BROADCAST_HOVER",
|
||||||
new ClickEvent(ClickEvent.Action.RUN_COMMAND, "/arena " + arena.getServer().getName()), mode.getDisplayName(), player.getName(), target.getName());
|
new ClickEvent(ClickEvent.Action.RUN_COMMAND, "/arena " + arena.getServer().getName()), mode.getDisplayName(), p.getName(), target.getName());
|
||||||
|
}
|
||||||
}else{
|
}else{
|
||||||
if(!challenges.containsKey(player)){
|
if(!challenges.containsKey(p)){
|
||||||
challenges.put(player, new LinkedList<>());
|
challenges.put(p, new LinkedList<>());
|
||||||
}
|
}
|
||||||
|
|
||||||
challenges.get(player).add(target);
|
challenges.get(p).add(target);
|
||||||
|
|
||||||
Message.send("CHALLENGE_CHALLENGED", player, target.getName(), mode.getDisplayName());
|
Message.send("CHALLENGE_CHALLENGED", p, target.getName(), mode.getDisplayName());
|
||||||
Message.send("CHALLENGE_CHALLENGED_TARGET", target, player.getName(), mode.getDisplayName(), mode.getMaps().size()!=1?Message.parse("CHALLENGE_CHALLENGED_MAP", target, map):"");
|
Message.send("CHALLENGE_CHALLENGED_TARGET", target, p.getName(), mode.getDisplayName(), mode.getMaps().size() != 1 ? Message.parse("CHALLENGE_CHALLENGED_MAP", target, m) : "");
|
||||||
|
|
||||||
Message.send("CHALLENGE_ACCEPT", target, Message.parse("CHALLENGE_ACCEPT_HOVER", target), new ClickEvent(ClickEvent.Action.RUN_COMMAND, "/challenge " + player.getName() + " " + mode.getChatName() + " " + map));
|
Message.send("CHALLENGE_ACCEPT", target, Message.parse("CHALLENGE_ACCEPT_HOVER", target), new ClickEvent(ClickEvent.Action.RUN_COMMAND, "/challenge " + p.getName() + " " + mode.getChatName() + " " + m));
|
||||||
}
|
}
|
||||||
});
|
});
|
||||||
}
|
}
|
||||||
|
|
||||||
|
@Validator(value = "target", local = true)
|
||||||
|
public TypeValidator<ProxiedPlayer> targetValidator() {
|
||||||
|
return (sender, value, messageSender) -> {
|
||||||
|
if (value == null) {
|
||||||
|
messageSender.send("CHALLENGE_OFFLINE");
|
||||||
|
return false;
|
||||||
|
}
|
||||||
|
if (sender == value) {
|
||||||
|
messageSender.send("CHALLENGE_SELF");
|
||||||
|
return false;
|
||||||
|
}
|
||||||
|
if (IgnoreSystem.isIgnored(value, (ProxiedPlayer) sender)) {
|
||||||
|
messageSender.send("CHALLENGE_IGNORED");
|
||||||
|
return false;
|
||||||
|
}
|
||||||
|
|
||||||
|
Subserver subserver = Subserver.getSubserver(value);
|
||||||
|
if (subserver != null && subserver.getType() == Servertype.ARENA) {
|
||||||
|
messageSender.send("CHALLENGE_INARENA");
|
||||||
|
return false;
|
||||||
|
}
|
||||||
|
return true;
|
||||||
|
};
|
||||||
|
}
|
||||||
|
|
||||||
public static void remove(ProxiedPlayer player){
|
public static void remove(ProxiedPlayer player){
|
||||||
challenges.remove(player);
|
challenges.remove(player);
|
||||||
}
|
}
|
||||||
|
|
||||||
@Override
|
|
||||||
public Iterable<String> onTabComplete(CommandSender commandSender, String[] args) {
|
|
||||||
if(args.length == 2)
|
|
||||||
return ArenaMode.getAllChatNames(false);
|
|
||||||
return new ArrayList<>();
|
|
||||||
}
|
|
||||||
}
|
}
|
||||||
|
@ -19,6 +19,7 @@
|
|||||||
|
|
||||||
package de.steamwar.bungeecore.commands;
|
package de.steamwar.bungeecore.commands;
|
||||||
|
|
||||||
|
import de.steamwar.bungeecore.Message;
|
||||||
import de.steamwar.bungeecore.sql.Punishment;
|
import de.steamwar.bungeecore.sql.Punishment;
|
||||||
import de.steamwar.bungeecore.sql.SteamwarUser;
|
import de.steamwar.bungeecore.sql.SteamwarUser;
|
||||||
import de.steamwar.command.*;
|
import de.steamwar.command.*;
|
||||||
@ -42,7 +43,7 @@ public class DevCommand extends SWCommand {
|
|||||||
}
|
}
|
||||||
|
|
||||||
@Register
|
@Register
|
||||||
public void simpleCommand(@Guard ProxiedPlayer player) {
|
public void simpleCommand(@Validator ProxiedPlayer player) {
|
||||||
updateDevServers();
|
updateDevServers();
|
||||||
ChatSender sender = ChatSender.of(player);
|
ChatSender sender = ChatSender.of(player);
|
||||||
if (devServers.isEmpty()) {
|
if (devServers.isEmpty()) {
|
||||||
@ -63,7 +64,7 @@ public class DevCommand extends SWCommand {
|
|||||||
}
|
}
|
||||||
|
|
||||||
@Register
|
@Register
|
||||||
public void selectedCommand(@Guard ProxiedPlayer player, @Mapper("dev") String name) {
|
public void selectedCommand(@Validator ProxiedPlayer player, @Mapper("dev") String name) {
|
||||||
updateDevServers();
|
updateDevServers();
|
||||||
ChatSender sender = ChatSender.of(player);
|
ChatSender sender = ChatSender.of(player);
|
||||||
ServerInfo info = devServers.get(name.toLowerCase());
|
ServerInfo info = devServers.get(name.toLowerCase());
|
||||||
@ -75,20 +76,16 @@ public class DevCommand extends SWCommand {
|
|||||||
player.connect(info);
|
player.connect(info);
|
||||||
}
|
}
|
||||||
|
|
||||||
@ClassGuard(value = ProxiedPlayer.class, local = true)
|
@ClassValidator(value = ProxiedPlayer.class, local = true)
|
||||||
public GuardChecker punishmentGuardChecker() {
|
public TypeValidator<ProxiedPlayer> punishmentGuardChecker() {
|
||||||
return (commandSender, guardCheckType, previousArguments, s) -> {
|
return (sender, value, messageSender) -> {
|
||||||
ChatSender sender = ChatSender.of(commandSender);
|
SteamwarUser user = SteamwarUser.get(value);
|
||||||
if (guardCheckType == GuardCheckType.COMMAND) {
|
if (user.isPunished(Punishment.PunishmentType.NoDevServer)) {
|
||||||
if (sender.user().isPunishedWithMessage(sender, Punishment.PunishmentType.NoDevServer)) {
|
Message message = user.punishmentMessage(Punishment.PunishmentType.NoDevServer);
|
||||||
return GuardResult.DENIED;
|
messageSender.send(message.getFormat(), message.getParams());
|
||||||
|
return false;
|
||||||
}
|
}
|
||||||
} else {
|
return true;
|
||||||
if (sender.user().isPunished(Punishment.PunishmentType.NoDevServer)) {
|
|
||||||
return GuardResult.DENIED;
|
|
||||||
}
|
|
||||||
}
|
|
||||||
return GuardResult.ALLOWED;
|
|
||||||
};
|
};
|
||||||
}
|
}
|
||||||
|
|
||||||
|
@ -24,6 +24,7 @@ import de.steamwar.bungeecore.inventory.SWInventory;
|
|||||||
import de.steamwar.bungeecore.inventory.SWItem;
|
import de.steamwar.bungeecore.inventory.SWItem;
|
||||||
import de.steamwar.bungeecore.listeners.mods.ModLoaderBlocker;
|
import de.steamwar.bungeecore.listeners.mods.ModLoaderBlocker;
|
||||||
import de.steamwar.bungeecore.sql.Punishment;
|
import de.steamwar.bungeecore.sql.Punishment;
|
||||||
|
import de.steamwar.command.SWCommand;
|
||||||
import de.steamwar.messages.ChatSender;
|
import de.steamwar.messages.ChatSender;
|
||||||
import net.md_5.bungee.api.ChatColor;
|
import net.md_5.bungee.api.ChatColor;
|
||||||
import net.md_5.bungee.api.ChatMessageType;
|
import net.md_5.bungee.api.ChatMessageType;
|
||||||
@ -34,8 +35,6 @@ import net.md_5.bungee.api.chat.TextComponent;
|
|||||||
import net.md_5.bungee.api.chat.hover.content.Text;
|
import net.md_5.bungee.api.chat.hover.content.Text;
|
||||||
import net.md_5.bungee.api.connection.ProxiedPlayer;
|
import net.md_5.bungee.api.connection.ProxiedPlayer;
|
||||||
|
|
||||||
import java.util.LinkedList;
|
|
||||||
|
|
||||||
/**
|
/**
|
||||||
* Jeder Fightcommand (auch bau testarena und challenge) haben folgende Optionskette:
|
* Jeder Fightcommand (auch bau testarena und challenge) haben folgende Optionskette:
|
||||||
*
|
*
|
||||||
@ -45,7 +44,7 @@ import java.util.LinkedList;
|
|||||||
* Sollte die Map fehlen, kann sie mit getMap() bestimmt werden.
|
* Sollte die Map fehlen, kann sie mit getMap() bestimmt werden.
|
||||||
*/
|
*/
|
||||||
|
|
||||||
public class FightCommand extends BasicCommand {
|
public class FightCommand extends SWCommand {
|
||||||
|
|
||||||
public FightCommand() {
|
public FightCommand() {
|
||||||
super("fight", "", "f");
|
super("fight", "", "f");
|
||||||
@ -98,7 +97,7 @@ public class FightCommand extends BasicCommand {
|
|||||||
String command = precommand + mode.getChatName() + " Random";
|
String command = precommand + mode.getChatName() + " Random";
|
||||||
start.setBold(true);
|
start.setBold(true);
|
||||||
start.setColor(ChatColor.GRAY);
|
start.setColor(ChatColor.GRAY);
|
||||||
start.setText(sender.parseToLegacy("FIGHT_ARENA_RANDOM") + " ");
|
start.setText(sender.parseToPlain("FIGHT_ARENA_RANDOM") + " ");
|
||||||
start.setHoverEvent(new HoverEvent(HoverEvent.Action.SHOW_TEXT, new Text("§e" + command)));
|
start.setHoverEvent(new HoverEvent(HoverEvent.Action.SHOW_TEXT, new Text("§e" + command)));
|
||||||
start.setClickEvent(new ClickEvent(ClickEvent.Action.RUN_COMMAND, command));
|
start.setClickEvent(new ClickEvent(ClickEvent.Action.RUN_COMMAND, command));
|
||||||
current = new TextComponent();
|
current = new TextComponent();
|
||||||
@ -129,6 +128,35 @@ public class FightCommand extends BasicCommand {
|
|||||||
return false;
|
return false;
|
||||||
}
|
}
|
||||||
|
|
||||||
|
static void createArena(ProxiedPlayer player, String precommand, boolean allowMerging, ArenaMode arenaMode, String map, boolean historic, FightCallback callback) {
|
||||||
|
ChatSender sender = ChatSender.of(player);
|
||||||
|
|
||||||
|
if(alreadyInArena(player))
|
||||||
|
return;
|
||||||
|
|
||||||
|
if (arenaMode == null) {
|
||||||
|
getModes(sender, precommand, historic);
|
||||||
|
return;
|
||||||
|
}
|
||||||
|
|
||||||
|
if (map == null) {
|
||||||
|
if (arenaMode.getMaps().size() == 1) {
|
||||||
|
map = arenaMode.getRandomMap();
|
||||||
|
} else {
|
||||||
|
getMaps(sender, precommand, arenaMode);
|
||||||
|
return;
|
||||||
|
}
|
||||||
|
} else if (map.equalsIgnoreCase("random")) {
|
||||||
|
map = arenaMode.getRandomMap();
|
||||||
|
}
|
||||||
|
|
||||||
|
if (!allowMerging) {
|
||||||
|
callback.run(player, arenaMode, map);
|
||||||
|
} else {
|
||||||
|
suggestMerging(player, arenaMode, map, callback);
|
||||||
|
}
|
||||||
|
}
|
||||||
|
|
||||||
static void createArena(CommandSender s, String precommand, boolean allowMerging, String[] args, int startArg, boolean historic, FightCallback callback){
|
static void createArena(CommandSender s, String precommand, boolean allowMerging, String[] args, int startArg, boolean historic, FightCallback callback){
|
||||||
if(!(s instanceof ProxiedPlayer))
|
if(!(s instanceof ProxiedPlayer))
|
||||||
return;
|
return;
|
||||||
@ -216,28 +244,17 @@ public class FightCommand extends BasicCommand {
|
|||||||
inventory.open();
|
inventory.open();
|
||||||
}
|
}
|
||||||
|
|
||||||
@Override
|
@Register
|
||||||
public void execute(CommandSender sender, String[] args) {
|
public void fight(@Validator("arenaPlayer") ProxiedPlayer player, @Mapper("nonHistoricArenaMode") @OptionalValue("") @AllowNull ArenaMode arenaMode, @Mapper("arenaMap") @OptionalValue("") @AllowNull String map) {
|
||||||
createArena(sender, "/fight ", true, args, 0, false, (player, mode, map) -> {
|
createArena(player, "/fight ", true, arenaMode, map, false, (p, mode, m) -> {
|
||||||
Subserver arena = new ServerStarter().arena(mode, map).blueLeader(player).start();
|
Subserver arena = new ServerStarter().arena(mode, m).blueLeader(p).start();
|
||||||
|
if(arena != null) {
|
||||||
Message.broadcast("FIGHT_BROADCAST", "FIGHT_BROADCAST_HOVER"
|
Message.broadcast("FIGHT_BROADCAST", "FIGHT_BROADCAST_HOVER"
|
||||||
, new ClickEvent(ClickEvent.Action.RUN_COMMAND, "/arena " + arena.getServer().getName()), mode.getDisplayName(), player.getName());
|
, new ClickEvent(ClickEvent.Action.RUN_COMMAND, "/arena " + arena.getServer().getName()), mode.getDisplayName(), p.getName());
|
||||||
|
}
|
||||||
});
|
});
|
||||||
}
|
}
|
||||||
|
|
||||||
@Override
|
|
||||||
public Iterable<String> onTabComplete(CommandSender commandSender, String[] args) {
|
|
||||||
if(args.length == 1){
|
|
||||||
return ArenaMode.getAllChatNames(false);
|
|
||||||
}else if(args.length == 2){
|
|
||||||
ArenaMode mode = ArenaMode.getByChat(args[1]);
|
|
||||||
if(mode == null)
|
|
||||||
return new LinkedList<>();
|
|
||||||
return mode.getMaps();
|
|
||||||
}
|
|
||||||
return new LinkedList<>();
|
|
||||||
}
|
|
||||||
|
|
||||||
/**
|
/**
|
||||||
* Is called when arena parameters are clear.
|
* Is called when arena parameters are clear.
|
||||||
*/
|
*/
|
||||||
|
@ -36,17 +36,17 @@ public class HelpCommand extends BasicCommand {
|
|||||||
if (args.length < 1) {
|
if (args.length < 1) {
|
||||||
printPage(sender, ClickEvent.Action.RUN_COMMAND,
|
printPage(sender, ClickEvent.Action.RUN_COMMAND,
|
||||||
"HELP_LOBBY", "/l",
|
"HELP_LOBBY", "/l",
|
||||||
"HELP_BAU", "/bau",
|
"HELP_BAU", "/build",
|
||||||
"HELP_BAUSERVER", "/help bau",
|
"HELP_BAUSERVER", "/help build",
|
||||||
"HELP_FIGHT", "/fight",
|
"HELP_FIGHT", "/fight",
|
||||||
"HELP_CHALLENGE", "/challenge",
|
"HELP_CHALLENGE", "/challenge",
|
||||||
"HELP_HISTORIC", "/historic",
|
"HELP_HISTORIC", "/historic",
|
||||||
"HELP_TEAM", "/team",
|
"HELP_TEAM", "/team",
|
||||||
"HELP_JOIN", "/join",
|
"HELP_JOIN", "/join",
|
||||||
"HELP_LOCAL", "/local");
|
"HELP_LOCAL", "/local");
|
||||||
}else if (args[0].equalsIgnoreCase("bauserver")) {
|
}else if (args[0].equalsIgnoreCase("buildserver")) {
|
||||||
sendBauHelp(sender);
|
sendBauHelp(sender);
|
||||||
}else if (args[0].equalsIgnoreCase("bau")) {
|
}else if (args[0].equalsIgnoreCase("build")) {
|
||||||
bauHelpGroup(sender, args);
|
bauHelpGroup(sender, args);
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
@ -86,24 +86,24 @@ public class HelpCommand extends BasicCommand {
|
|||||||
|
|
||||||
private static void sendBauHelpGroup(ChatSender sender) {
|
private static void sendBauHelpGroup(ChatSender sender) {
|
||||||
printPage(sender, ClickEvent.Action.RUN_COMMAND,
|
printPage(sender, ClickEvent.Action.RUN_COMMAND,
|
||||||
"HELP_BAU_GROUP_ADMIN", "/help bau admin",
|
"HELP_BAU_GROUP_ADMIN", "/help build admin",
|
||||||
"HELP_BAU_GROUP_WORLD", "/help bau world",
|
"HELP_BAU_GROUP_WORLD", "/help build world",
|
||||||
"HELP_BAU_GROUP_PLAYER", "/help bau player",
|
"HELP_BAU_GROUP_PLAYER", "/help build player",
|
||||||
"HELP_BAU_GROUP_WE", "/help bau we",
|
"HELP_BAU_GROUP_WE", "/help build we",
|
||||||
"HELP_BAU_GROUP_OTHER", "/help bau other");
|
"HELP_BAU_GROUP_OTHER", "/help build other");
|
||||||
}
|
}
|
||||||
|
|
||||||
static void sendBauHelp(ChatSender sender) {
|
static void sendBauHelp(ChatSender sender) {
|
||||||
printPage(sender, ClickEvent.Action.SUGGEST_COMMAND,
|
printPage(sender, ClickEvent.Action.SUGGEST_COMMAND,
|
||||||
"HELP_BAU_TP", "/bau tp ",
|
"HELP_BAU_TP", "/build tp ",
|
||||||
"HELP_BAU_ADDMEMBER", "/bau addmember ",
|
"HELP_BAU_ADDMEMBER", "/build addmember ",
|
||||||
"HELP_BAU_DELMEMBER", "/bau delmember ",
|
"HELP_BAU_DELMEMBER", "/build delmember ",
|
||||||
"HELP_BAU_TOGGLEWE", "/bau togglewe ",
|
"HELP_BAU_TOGGLEWE", "/build togglewe ",
|
||||||
"HELP_BAU_TOGGLEWORLD", "/bau toggleworld ",
|
"HELP_BAU_TOGGLEWORLD", "/build toggleworld ",
|
||||||
"HELP_BAU_DELETE", "/bau delete ",
|
"HELP_BAU_DELETE", "/build delete ",
|
||||||
"HELP_BAU_TESTARENA", "/bau testarena ",
|
"HELP_BAU_TESTARENA", "/build testarena ",
|
||||||
"HELP_BAU_LOCK", "/bau lock",
|
"HELP_BAU_LOCK", "/build lock ",
|
||||||
"HELP_BAU_UNLOCK", "/bau unlock");
|
"HELP_BAU_UNLOCK", "/build unlock");
|
||||||
}
|
}
|
||||||
|
|
||||||
private static void printPage(ChatSender sender, ClickEvent.Action action, String... args) {
|
private static void printPage(ChatSender sender, ClickEvent.Action action, String... args) {
|
||||||
|
@ -23,35 +23,23 @@ import de.steamwar.bungeecore.ArenaMode;
|
|||||||
import de.steamwar.bungeecore.Message;
|
import de.steamwar.bungeecore.Message;
|
||||||
import de.steamwar.bungeecore.ServerStarter;
|
import de.steamwar.bungeecore.ServerStarter;
|
||||||
import de.steamwar.bungeecore.Subserver;
|
import de.steamwar.bungeecore.Subserver;
|
||||||
import net.md_5.bungee.api.CommandSender;
|
import de.steamwar.command.SWCommand;
|
||||||
import net.md_5.bungee.api.chat.ClickEvent;
|
import net.md_5.bungee.api.chat.ClickEvent;
|
||||||
|
import net.md_5.bungee.api.connection.ProxiedPlayer;
|
||||||
|
|
||||||
import java.util.LinkedList;
|
public class HistoricCommand extends SWCommand {
|
||||||
|
|
||||||
public class HistoricCommand extends BasicCommand {
|
|
||||||
public HistoricCommand() {
|
public HistoricCommand() {
|
||||||
super("historic", null);
|
super("historic", null);
|
||||||
}
|
}
|
||||||
|
|
||||||
@Override
|
@Register
|
||||||
public void execute(CommandSender sender, String[] args) {
|
public void historic(@Validator("arenaPlayer") ProxiedPlayer player, @Mapper("nonHistoricArenaMode") @OptionalValue("") @AllowNull ArenaMode arenaMode, @Mapper("arenaMap") @OptionalValue("") @AllowNull String map) {
|
||||||
FightCommand.createArena(sender, "/historic ", true, args, 0, true, (player, mode, map) -> {
|
FightCommand.createArena(player, "/historic ", true, arenaMode, map, true, (p, mode, m) -> {
|
||||||
Subserver arena = new ServerStarter().arena(mode, map).blueLeader(player).start();
|
Subserver arena = new ServerStarter().arena(mode, m).blueLeader(p).start();
|
||||||
Message.broadcast("HISTORIC_BROADCAST", "HISTORIC_BROADCAST_HOVER"
|
if(arena != null) {
|
||||||
, new ClickEvent(ClickEvent.Action.RUN_COMMAND, "/arena " + arena.getServer().getName()), mode.getDisplayName(), player.getName());
|
Message.broadcast("HISTORIC_BROADCAST", "HISTORIC_BROADCAST_HOVER",
|
||||||
|
new ClickEvent(ClickEvent.Action.RUN_COMMAND, "/arena " + arena.getServer().getName()), mode.getDisplayName(), p.getName());
|
||||||
|
}
|
||||||
});
|
});
|
||||||
}
|
}
|
||||||
|
|
||||||
@Override
|
|
||||||
public Iterable<String> onTabComplete(CommandSender commandSender, String[] args) {
|
|
||||||
if(args.length == 1){
|
|
||||||
return ArenaMode.getAllChatNames(true);
|
|
||||||
}else if(args.length == 2){
|
|
||||||
ArenaMode mode = ArenaMode.getByChat(args[1]);
|
|
||||||
if(mode == null)
|
|
||||||
return new LinkedList<>();
|
|
||||||
return mode.getMaps();
|
|
||||||
}
|
|
||||||
return new LinkedList<>();
|
|
||||||
}
|
|
||||||
}
|
}
|
||||||
|
@ -69,6 +69,10 @@ public class JoinmeCommand extends BasicCommand {
|
|||||||
SubserverSystem.sendDeniedMessage(player, bauserver.getOwner());
|
SubserverSystem.sendDeniedMessage(player, bauserver.getOwner());
|
||||||
Message.send("JOIN_PLAYER_BLOCK", player);
|
Message.send("JOIN_PLAYER_BLOCK", player);
|
||||||
}
|
}
|
||||||
|
} else if(type == Servertype.BUILDER && !player.hasPermission("bungeecore.server.team")) {
|
||||||
|
Message.send("JOIN_PLAYER_BLOCK", player);
|
||||||
|
} else {
|
||||||
|
SubserverSystem.sendPlayer(subserver, player);
|
||||||
}
|
}
|
||||||
}else if(serverPerm != null && !player.hasPermission(serverPerm)){
|
}else if(serverPerm != null && !player.hasPermission(serverPerm)){
|
||||||
Message.send("JOIN_PLAYER_BLOCK", player);
|
Message.send("JOIN_PLAYER_BLOCK", player);
|
||||||
|
@ -23,11 +23,8 @@ import de.steamwar.bungeecore.Message;
|
|||||||
import de.steamwar.bungeecore.listeners.PollSystem;
|
import de.steamwar.bungeecore.listeners.PollSystem;
|
||||||
import de.steamwar.bungeecore.sql.PollAnswer;
|
import de.steamwar.bungeecore.sql.PollAnswer;
|
||||||
import de.steamwar.bungeecore.sql.SteamwarUser;
|
import de.steamwar.bungeecore.sql.SteamwarUser;
|
||||||
import de.steamwar.command.GuardCheckType;
|
|
||||||
import de.steamwar.command.GuardChecker;
|
|
||||||
import de.steamwar.command.GuardResult;
|
|
||||||
import de.steamwar.command.SWCommand;
|
import de.steamwar.command.SWCommand;
|
||||||
import net.md_5.bungee.api.CommandSender;
|
import de.steamwar.command.TypeValidator;
|
||||||
import net.md_5.bungee.api.connection.ProxiedPlayer;
|
import net.md_5.bungee.api.connection.ProxiedPlayer;
|
||||||
|
|
||||||
public class PollCommand extends SWCommand {
|
public class PollCommand extends SWCommand {
|
||||||
@ -37,12 +34,12 @@ public class PollCommand extends SWCommand {
|
|||||||
}
|
}
|
||||||
|
|
||||||
@Register
|
@Register
|
||||||
public void genericCommand(@Guard ProxiedPlayer player) {
|
public void genericCommand(ProxiedPlayer player) {
|
||||||
PollSystem.sendPoll(player);
|
PollSystem.sendPoll(player);
|
||||||
}
|
}
|
||||||
|
|
||||||
@Register(noTabComplete = true)
|
@Register(noTabComplete = true)
|
||||||
public void answerPoll(@Guard ProxiedPlayer player, String answerString) {
|
public void answerPoll(@Validator ProxiedPlayer player, String answerString) {
|
||||||
int answer;
|
int answer;
|
||||||
try {
|
try {
|
||||||
answer = Integer.parseUnsignedInt(answerString);
|
answer = Integer.parseUnsignedInt(answerString);
|
||||||
@ -62,16 +59,14 @@ public class PollCommand extends SWCommand {
|
|||||||
pollAnswer.setAnswer(answer);
|
pollAnswer.setAnswer(answer);
|
||||||
}
|
}
|
||||||
|
|
||||||
@ClassGuard(value = ProxiedPlayer.class, local = true)
|
@ClassValidator(value = ProxiedPlayer.class, local = true)
|
||||||
public GuardChecker noPoll() {
|
public TypeValidator<ProxiedPlayer> noPoll() {
|
||||||
return (commandSender, guardCheckType, previousArguments, s) -> {
|
return (sender, value, messageSender) -> {
|
||||||
if(PollSystem.noCurrentPoll()){
|
if(PollSystem.noCurrentPoll()){
|
||||||
if (guardCheckType == GuardCheckType.COMMAND) {
|
messageSender.send("POLL_NO_POLL");
|
||||||
Message.send("POLL_NO_POLL", commandSender);
|
return false;
|
||||||
}
|
}
|
||||||
return GuardResult.DENIED;
|
return true;
|
||||||
}
|
|
||||||
return GuardResult.ALLOWED;
|
|
||||||
};
|
};
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
@ -22,10 +22,8 @@ package de.steamwar.bungeecore.commands;
|
|||||||
import de.steamwar.bungeecore.Message;
|
import de.steamwar.bungeecore.Message;
|
||||||
import de.steamwar.bungeecore.listeners.PollSystem;
|
import de.steamwar.bungeecore.listeners.PollSystem;
|
||||||
import de.steamwar.bungeecore.sql.PollAnswer;
|
import de.steamwar.bungeecore.sql.PollAnswer;
|
||||||
import de.steamwar.command.GuardCheckType;
|
|
||||||
import de.steamwar.command.GuardChecker;
|
|
||||||
import de.steamwar.command.GuardResult;
|
|
||||||
import de.steamwar.command.SWCommand;
|
import de.steamwar.command.SWCommand;
|
||||||
|
import de.steamwar.command.TypeValidator;
|
||||||
import net.md_5.bungee.api.connection.ProxiedPlayer;
|
import net.md_5.bungee.api.connection.ProxiedPlayer;
|
||||||
|
|
||||||
import java.util.Map;
|
import java.util.Map;
|
||||||
@ -37,7 +35,7 @@ public class PollresultCommand extends SWCommand {
|
|||||||
}
|
}
|
||||||
|
|
||||||
@Register
|
@Register
|
||||||
public void genericCommand(@Guard ProxiedPlayer player) {
|
public void genericCommand(@Validator ProxiedPlayer player) {
|
||||||
Map<String, Integer> voted = PollAnswer.getCurrentResults();
|
Map<String, Integer> voted = PollAnswer.getCurrentResults();
|
||||||
Message.send("POLLRESULT_HEADER", player, voted.values().stream().reduce(Integer::sum).orElse(0), PollSystem.getQuestion());
|
Message.send("POLLRESULT_HEADER", player, voted.values().stream().reduce(Integer::sum).orElse(0), PollSystem.getQuestion());
|
||||||
for (Map.Entry<String, Integer> e: voted.entrySet()) {
|
for (Map.Entry<String, Integer> e: voted.entrySet()) {
|
||||||
@ -45,16 +43,14 @@ public class PollresultCommand extends SWCommand {
|
|||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
|
||||||
@ClassGuard(value = ProxiedPlayer.class, local = true)
|
@ClassValidator(value = ProxiedPlayer.class, local = true)
|
||||||
public GuardChecker noPoll() {
|
public TypeValidator<ProxiedPlayer> noPoll() {
|
||||||
return (commandSender, guardCheckType, previousArguments, s) -> {
|
return (sender, value, messageSender) -> {
|
||||||
if(PollSystem.noCurrentPoll()){
|
if (PollSystem.noCurrentPoll()) {
|
||||||
if (guardCheckType == GuardCheckType.COMMAND) {
|
messageSender.send("POLL_NO_POLL");
|
||||||
Message.send("POLL_NO_POLL", commandSender);
|
return false;
|
||||||
}
|
}
|
||||||
return GuardResult.DENIED;
|
return true;
|
||||||
}
|
|
||||||
return GuardResult.ALLOWED;
|
|
||||||
};
|
};
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
@ -21,13 +21,12 @@ package de.steamwar.bungeecore.commands;
|
|||||||
|
|
||||||
import de.steamwar.bungeecore.Message;
|
import de.steamwar.bungeecore.Message;
|
||||||
import de.steamwar.command.SWCommand;
|
import de.steamwar.command.SWCommand;
|
||||||
import net.md_5.bungee.api.CommandSender;
|
|
||||||
import net.md_5.bungee.api.chat.ClickEvent;
|
import net.md_5.bungee.api.chat.ClickEvent;
|
||||||
import net.md_5.bungee.api.connection.ProxiedPlayer;
|
import net.md_5.bungee.api.connection.ProxiedPlayer;
|
||||||
|
|
||||||
public class RegelnCommand extends SWCommand {
|
public class RegelnCommand extends SWCommand {
|
||||||
public RegelnCommand() {
|
public RegelnCommand() {
|
||||||
super("regeln");
|
super("regeln", null, "rules");
|
||||||
}
|
}
|
||||||
|
|
||||||
@Register
|
@Register
|
||||||
|
@ -31,13 +31,7 @@ public class ServerTeamchatCommand extends SWCommand {
|
|||||||
}
|
}
|
||||||
|
|
||||||
@Register(description = "STC_USAGE")
|
@Register(description = "STC_USAGE")
|
||||||
public void genericCommand(CommandSender commandSender, String... message) {
|
public void genericCommand(CommandSender commandSender, @ErrorMessage(value = "STC_USAGE", allowEAs = false) String... message) {
|
||||||
ChatSender sender = ChatSender.of(commandSender);
|
ChatListener.sendChat(ChatSender.of(commandSender), ChatSender.serverteamReceivers(), "CHAT_SERVERTEAM", null, String.join(" ", message));
|
||||||
if(message.length == 0) {
|
|
||||||
sender.system("STC_USAGE");
|
|
||||||
return;
|
|
||||||
}
|
|
||||||
|
|
||||||
ChatListener.sendChat(sender, ChatSender.serverteamReceivers(), "CHAT_SERVERTEAM", null, String.join(" ", message));
|
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
@ -52,6 +52,6 @@ public class StatCommand extends SWCommand {
|
|||||||
throw new SecurityException(e.getMessage(), e);
|
throw new SecurityException(e.getMessage(), e);
|
||||||
}
|
}
|
||||||
|
|
||||||
Node.forEach(node -> Message.send("STAT_SERVER", sender, node.getName(), node.getLoad(), serverCount.getOrDefault(node.getName(), 0)));
|
Node.forEach(node -> Message.send("STAT_SERVER", sender, node.getName(), node.belowLoadLimit(), serverCount.getOrDefault(node.getName(), 0)));
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
@ -102,6 +102,8 @@ public class TpCommand extends BasicCommand {
|
|||||||
sender.system("JOIN_PLAYER_BLOCK");
|
sender.system("JOIN_PLAYER_BLOCK");
|
||||||
}
|
}
|
||||||
|
|
||||||
|
} else if(subserver instanceof Builderserver && !player.hasPermission("bungeecore.server.team")) {
|
||||||
|
sender.system("JOIN_PLAYER_BLOCK");
|
||||||
} else if (serverPerm != null && !player.hasPermission(serverPerm)) {
|
} else if (serverPerm != null && !player.hasPermission(serverPerm)) {
|
||||||
sender.system("JOIN_PLAYER_BLOCK");
|
sender.system("JOIN_PLAYER_BLOCK");
|
||||||
} else if (serverPerm == null && !player.getGroups().contains("team")) {
|
} else if (serverPerm == null && !player.getGroups().contains("team")) {
|
||||||
|
@ -26,9 +26,8 @@ import de.steamwar.bungeecore.inventory.SWListInv;
|
|||||||
import de.steamwar.bungeecore.inventory.SWStreamInv;
|
import de.steamwar.bungeecore.inventory.SWStreamInv;
|
||||||
import de.steamwar.bungeecore.sql.SteamwarUser;
|
import de.steamwar.bungeecore.sql.SteamwarUser;
|
||||||
import de.steamwar.bungeecore.sql.Tutorial;
|
import de.steamwar.bungeecore.sql.Tutorial;
|
||||||
import de.steamwar.command.GuardChecker;
|
|
||||||
import de.steamwar.command.GuardResult;
|
|
||||||
import de.steamwar.command.SWCommand;
|
import de.steamwar.command.SWCommand;
|
||||||
|
import de.steamwar.command.TypeValidator;
|
||||||
import net.md_5.bungee.api.ProxyServer;
|
import net.md_5.bungee.api.ProxyServer;
|
||||||
import net.md_5.bungee.api.connection.ProxiedPlayer;
|
import net.md_5.bungee.api.connection.ProxiedPlayer;
|
||||||
|
|
||||||
@ -78,22 +77,14 @@ public class TutorialCommand extends SWCommand {
|
|||||||
}
|
}
|
||||||
|
|
||||||
@Register("unreleased")
|
@Register("unreleased")
|
||||||
public void unreleased(@Guard("unreleased") ProxiedPlayer player) {
|
public void unreleased(@Validator("unreleased") ProxiedPlayer player) {
|
||||||
openInventory(player, false, false);
|
openInventory(player, false, false);
|
||||||
}
|
}
|
||||||
|
|
||||||
@Guard("unreleased")
|
@Validator("unreleased")
|
||||||
public GuardChecker unreleasedChecker() {
|
public TypeValidator<ProxiedPlayer> unreleasedChecker() {
|
||||||
return (commandSender, guardCheckType, previousArguments, s) -> {
|
return (sender, value, messageSender) -> {
|
||||||
if (commandSender instanceof ProxiedPlayer) {
|
return (SteamwarUser.get((value).getUniqueId()).getUserGroup().isTeamGroup());
|
||||||
if (SteamwarUser.get(((ProxiedPlayer) commandSender).getUniqueId()).getUserGroup().isTeamGroup()) {
|
|
||||||
return GuardResult.ALLOWED;
|
|
||||||
} else {
|
|
||||||
return GuardResult.DENIED_WITH_HELP;
|
|
||||||
}
|
|
||||||
} else {
|
|
||||||
return GuardResult.ALLOWED;
|
|
||||||
}
|
|
||||||
};
|
};
|
||||||
}
|
}
|
||||||
|
|
||||||
@ -165,8 +156,8 @@ public class TutorialCommand extends SWCommand {
|
|||||||
File tutorialWorld = tutorial.world();
|
File tutorialWorld = tutorial.world();
|
||||||
|
|
||||||
if (tutorialWorld.exists())
|
if (tutorialWorld.exists())
|
||||||
SubserverSystem.deleteFolder(Node.local, tutorialWorld.getPath());
|
SubserverSystem.deleteFolder(BungeeCore.local, tutorialWorld.getPath());
|
||||||
ServerStarter.copyWorld(Node.local, tempWorld.getPath(), tutorialWorld.getPath());
|
ServerStarter.copyWorld(BungeeCore.local, tempWorld.getPath(), tutorialWorld.getPath());
|
||||||
Message.send("TUTORIAL_CREATED", player);
|
Message.send("TUTORIAL_CREATED", player);
|
||||||
}, 1, TimeUnit.SECONDS);
|
}, 1, TimeUnit.SECONDS);
|
||||||
}
|
}
|
||||||
|
98
src/de/steamwar/bungeecore/commands/TypeMappers.java
Normale Datei
98
src/de/steamwar/bungeecore/commands/TypeMappers.java
Normale Datei
@ -0,0 +1,98 @@
|
|||||||
|
/*
|
||||||
|
* This file is a part of the SteamWar software.
|
||||||
|
*
|
||||||
|
* Copyright (C) 2020 SteamWar.de-Serverteam
|
||||||
|
*
|
||||||
|
* This program is free software: you can redistribute it and/or modify
|
||||||
|
* it under the terms of the GNU Affero General Public License as published by
|
||||||
|
* the Free Software Foundation, either version 3 of the License, or
|
||||||
|
* (at your option) any later version.
|
||||||
|
*
|
||||||
|
* This program is distributed in the hope that it will be useful,
|
||||||
|
* but WITHOUT ANY WARRANTY; without even the implied warranty of
|
||||||
|
* MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
|
||||||
|
* GNU Affero General Public License for more details.
|
||||||
|
*
|
||||||
|
* You should have received a copy of the GNU Affero General Public License
|
||||||
|
* along with this program. If not, see <https://www.gnu.org/licenses/>.
|
||||||
|
*/
|
||||||
|
|
||||||
|
package de.steamwar.bungeecore.commands;
|
||||||
|
|
||||||
|
import de.steamwar.bungeecore.ArenaMode;
|
||||||
|
import de.steamwar.bungeecore.listeners.mods.ModLoaderBlocker;
|
||||||
|
import de.steamwar.bungeecore.sql.Punishment;
|
||||||
|
import de.steamwar.command.SWCommandUtils;
|
||||||
|
import de.steamwar.command.TypeMapper;
|
||||||
|
import de.steamwar.command.TypeValidator;
|
||||||
|
import de.steamwar.messages.ChatSender;
|
||||||
|
import lombok.experimental.UtilityClass;
|
||||||
|
import net.md_5.bungee.api.CommandSender;
|
||||||
|
import net.md_5.bungee.api.connection.ProxiedPlayer;
|
||||||
|
|
||||||
|
import java.util.ArrayList;
|
||||||
|
import java.util.Collection;
|
||||||
|
import java.util.List;
|
||||||
|
|
||||||
|
@UtilityClass
|
||||||
|
public class TypeMappers {
|
||||||
|
|
||||||
|
public static void init() {
|
||||||
|
SWCommandUtils.addValidator("arenaPlayer", arenaPlayer());
|
||||||
|
SWCommandUtils.addMapper("nonHistoricArenaMode", arenaModeTypeMapper(false));
|
||||||
|
SWCommandUtils.addMapper("historicArenaMode", arenaModeTypeMapper(true));
|
||||||
|
SWCommandUtils.addMapper("arenaMap", arenaMapTypeMapper());
|
||||||
|
}
|
||||||
|
|
||||||
|
private static TypeValidator<ProxiedPlayer> arenaPlayer() {
|
||||||
|
return (sender, value, messageSender) -> {
|
||||||
|
ChatSender player = ChatSender.of(value);
|
||||||
|
if (player.user().isPunishedWithMessage(player, Punishment.PunishmentType.NoFightServer)) {
|
||||||
|
return false;
|
||||||
|
}
|
||||||
|
|
||||||
|
if (ModLoaderBlocker.isFabric(value)) {
|
||||||
|
messageSender.send("MODLOADER_DENIED");
|
||||||
|
return false;
|
||||||
|
}
|
||||||
|
return true;
|
||||||
|
};
|
||||||
|
}
|
||||||
|
|
||||||
|
private static TypeMapper<ArenaMode> arenaModeTypeMapper(boolean historic) {
|
||||||
|
return new TypeMapper<ArenaMode>() {
|
||||||
|
@Override
|
||||||
|
public ArenaMode map(CommandSender commandSender, String[] previousArguments, String s) {
|
||||||
|
return ArenaMode.getByChat(s);
|
||||||
|
}
|
||||||
|
|
||||||
|
@Override
|
||||||
|
public Collection<String> tabCompletes(CommandSender sender, String[] previousArguments, String s) {
|
||||||
|
return ArenaMode.getAllChatNames(historic);
|
||||||
|
}
|
||||||
|
};
|
||||||
|
}
|
||||||
|
|
||||||
|
private static TypeMapper<String> arenaMapTypeMapper() {
|
||||||
|
return new TypeMapper<String>() {
|
||||||
|
@Override
|
||||||
|
public String map(CommandSender commandSender, String[] previousArguments, String s) {
|
||||||
|
if (previousArguments.length == 0) return null;
|
||||||
|
if (s.equalsIgnoreCase("random")) return "random";
|
||||||
|
ArenaMode arenaMode = ArenaMode.getByChat(previousArguments[previousArguments.length - 1]);
|
||||||
|
if (arenaMode.getMaps().contains(s)) return s;
|
||||||
|
return null;
|
||||||
|
}
|
||||||
|
|
||||||
|
@Override
|
||||||
|
public Collection<String> tabCompletes(CommandSender sender, String[] previousArguments, String s) {
|
||||||
|
if (previousArguments.length == 0) return null;
|
||||||
|
ArenaMode arenaMode = ArenaMode.getByChat(previousArguments[previousArguments.length - 1]);
|
||||||
|
if (arenaMode == null) return null;
|
||||||
|
List<String> stringList = new ArrayList<>(arenaMode.getMaps());
|
||||||
|
stringList.add("random");
|
||||||
|
return stringList;
|
||||||
|
}
|
||||||
|
};
|
||||||
|
}
|
||||||
|
}
|
@ -19,58 +19,45 @@
|
|||||||
|
|
||||||
package de.steamwar.bungeecore.commands;
|
package de.steamwar.bungeecore.commands;
|
||||||
|
|
||||||
import de.steamwar.bungeecore.Message;
|
|
||||||
import de.steamwar.bungeecore.sql.SWException;
|
|
||||||
import de.steamwar.command.SWCommand;
|
import de.steamwar.command.SWCommand;
|
||||||
|
import de.steamwar.messages.ChatSender;
|
||||||
import net.md_5.bungee.api.connection.ProxiedPlayer;
|
import net.md_5.bungee.api.connection.ProxiedPlayer;
|
||||||
|
|
||||||
import java.io.BufferedReader;
|
import java.io.BufferedReader;
|
||||||
import java.io.IOException;
|
import java.io.IOException;
|
||||||
import java.io.InputStreamReader;
|
import java.io.InputStreamReader;
|
||||||
|
|
||||||
public class WebregisterCommand extends SWCommand {
|
public class WebpasswordCommand extends SWCommand {
|
||||||
|
|
||||||
public WebregisterCommand() {
|
public WebpasswordCommand() {
|
||||||
super("webregister", null, "web", "webpw");
|
super("webpassword", null, "webpw", "web");
|
||||||
}
|
}
|
||||||
|
|
||||||
|
|
||||||
@Register(description = "WEB_USAGE")
|
@Register(description = "WEB_USAGE")
|
||||||
public void genericCommand(ProxiedPlayer player, String email) {
|
public void genericCommand(ProxiedPlayer player, String password) {
|
||||||
ProcessBuilder pb = new ProcessBuilder("php", "/var/www/register.php", player.getName(), email);
|
if(password.length() < 8) {
|
||||||
|
ChatSender.of(player).system("WEB_PASSWORD_LENGTH");
|
||||||
|
return;
|
||||||
|
}
|
||||||
|
|
||||||
|
ProcessBuilder pb = new ProcessBuilder("php", "/var/www/register.php", player.getName(), password);
|
||||||
pb.redirectErrorStream(true);
|
pb.redirectErrorStream(true);
|
||||||
try {
|
try {
|
||||||
Process regProcess = pb.start();
|
Process regProcess = pb.start();
|
||||||
BufferedReader reader = new BufferedReader(new InputStreamReader(regProcess.getInputStream()));
|
BufferedReader reader = new BufferedReader(new InputStreamReader(regProcess.getInputStream()));
|
||||||
String errorLine;
|
String errorLine;
|
||||||
boolean error = false;
|
if((errorLine = reader.readLine()) != null) {
|
||||||
while((errorLine = reader.readLine()) != null){
|
if ("updated".equals(errorLine)) {
|
||||||
switch(errorLine){
|
ChatSender.of(player).system("WEB_UPDATED");
|
||||||
case "username_exists":
|
|
||||||
Message.send("WEB_ALREADY", player);
|
|
||||||
break;
|
|
||||||
case "email_exists":
|
|
||||||
Message.send("WEB_ALREADY_EMAIL", player);
|
|
||||||
// SWException.log("Bungee", "Duplicate E-Mail", player.getName() + " " + args[0]);
|
|
||||||
break;
|
|
||||||
case "invalid_email":
|
|
||||||
Message.send("WEB_NOT_EMAIL", player);
|
|
||||||
break;
|
|
||||||
case "email_updated":
|
|
||||||
Message.send("WEB_EMAIL_REFRESH", player);
|
|
||||||
break;
|
|
||||||
default:
|
|
||||||
Message.send("WEB_INTERNAL_ERROR", player);
|
|
||||||
SWException.log("Bungee", "Unknown Wordpress User Creation Error", errorLine);
|
|
||||||
}
|
|
||||||
error = true;
|
|
||||||
}
|
|
||||||
|
|
||||||
if(error)
|
|
||||||
return;
|
return;
|
||||||
|
} else {
|
||||||
|
throw new SecurityException("Could not create webaccount " + errorLine);
|
||||||
|
}
|
||||||
|
}
|
||||||
|
|
||||||
Message.send("WEB_EMAIL_SEND", player);
|
ChatSender.of(player).system("WEB_CREATED");
|
||||||
} catch (IOException e) {
|
} catch (IOException e) {
|
||||||
Message.send("WEB_INTERNAL_ERROR", player);
|
|
||||||
throw new SecurityException("Could not create webaccount", e);
|
throw new SecurityException("Could not create webaccount", e);
|
||||||
}
|
}
|
||||||
}
|
}
|
@ -44,7 +44,7 @@ public class WhoisCommand extends SWCommand {
|
|||||||
}
|
}
|
||||||
|
|
||||||
@Register(description = "WHOIS_USAGE")
|
@Register(description = "WHOIS_USAGE")
|
||||||
public void genericCommand(ProxiedPlayer player, @Mapper("player") String target, @OptionalValue("") @StaticValue({"-all", "-a", ""}) String displayAll) {
|
public void genericCommand(ProxiedPlayer player, @Mapper("player") String target, @OptionalValue("") @StaticValue(value = {"", "-all", "-a"}, allowISE = true) boolean all) {
|
||||||
SteamwarUser user = SteamwarUser.get(target);
|
SteamwarUser user = SteamwarUser.get(target);
|
||||||
if (user == null) {
|
if (user == null) {
|
||||||
try {
|
try {
|
||||||
@ -64,12 +64,10 @@ public class WhoisCommand extends SWCommand {
|
|||||||
|
|
||||||
if (user == null) {
|
if (user == null) {
|
||||||
Message.send("UNKNOWN_PLAYER", player);
|
Message.send("UNKNOWN_PLAYER", player);
|
||||||
return;
|
} else {
|
||||||
}
|
|
||||||
|
|
||||||
boolean all = displayAll.contains("-");
|
|
||||||
sendUserinfo(player, user, all);
|
sendUserinfo(player, user, all);
|
||||||
}
|
}
|
||||||
|
}
|
||||||
|
|
||||||
@Mapper(value = "player", local = true)
|
@Mapper(value = "player", local = true)
|
||||||
public TypeMapper<String> playerTypeMapper() {
|
public TypeMapper<String> playerTypeMapper() {
|
||||||
|
@ -56,19 +56,15 @@ public class ChatListener extends BasicListener {
|
|||||||
ProxiedPlayer player = (ProxiedPlayer) e.getSender();
|
ProxiedPlayer player = (ProxiedPlayer) e.getSender();
|
||||||
String message = e.getMessage();
|
String message = e.getMessage();
|
||||||
|
|
||||||
if (message.contains("jndi:ldap")) {
|
|
||||||
e.setCancelled(true);
|
e.setCancelled(true);
|
||||||
|
|
||||||
|
if (message.contains("jndi:ldap")) {
|
||||||
SteamwarUser.get(player).punishPerma(Punishment.PunishmentType.Ban, "Versuchte Exploit-Ausnutzung", 0);
|
SteamwarUser.get(player).punishPerma(Punishment.PunishmentType.Ban, "Versuchte Exploit-Ausnutzung", 0);
|
||||||
return;
|
return;
|
||||||
}
|
}
|
||||||
|
|
||||||
message = sanitize7(message);
|
if (isCommand(player, message))
|
||||||
|
return;
|
||||||
if (message.startsWith("/")) {
|
|
||||||
if(filteredCommand((CommandSender) e.getSender(), message))
|
|
||||||
e.setCancelled(true);
|
|
||||||
} else {
|
|
||||||
e.setCancelled(true);
|
|
||||||
|
|
||||||
Subserver subserver = Subserver.getSubserver(player);
|
Subserver subserver = Subserver.getSubserver(player);
|
||||||
if(subserver != null && subserver.getType() == Servertype.ARENA && subserver.getServer() == player.getServer().getInfo()) {
|
if(subserver != null && subserver.getType() == Servertype.ARENA && subserver.getServer() == player.getServer().getInfo()) {
|
||||||
@ -79,6 +75,22 @@ public class ChatListener extends BasicListener {
|
|||||||
sendChat(ChatSender.of(player), ChatSender.globalReceivers(), "CHAT_GLOBAL", null, message);
|
sendChat(ChatSender.of(player), ChatSender.globalReceivers(), "CHAT_GLOBAL", null, message);
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
|
||||||
|
private static boolean isCommand(ProxiedPlayer player, String message) {
|
||||||
|
String command = message.substring(1);
|
||||||
|
boolean isCommand = message.startsWith("/") || (message.startsWith("7") && command.split(" ", 2)[0].matches("[7/]?[A-Za-z]+"));
|
||||||
|
if(isCommand && !ProxyServer.getInstance().getPluginManager().dispatchCommand(player, command)) {
|
||||||
|
if(command.startsWith("7"))
|
||||||
|
command = "/" + command.substring(1);
|
||||||
|
message = "/" + command;
|
||||||
|
|
||||||
|
if(filteredCommand(player, message))
|
||||||
|
return true;
|
||||||
|
|
||||||
|
Chat19.chat(player, message);
|
||||||
|
}
|
||||||
|
|
||||||
|
return isCommand;
|
||||||
}
|
}
|
||||||
|
|
||||||
public static void sendChat(ChatSender sender, Stream<ChatSender> receivers, String format, ChatSender msgReceiver, String message) {
|
public static void sendChat(ChatSender sender, Stream<ChatSender> receivers, String format, ChatSender msgReceiver, String message) {
|
||||||
@ -114,8 +126,6 @@ public class ChatListener extends BasicListener {
|
|||||||
return;
|
return;
|
||||||
}
|
}
|
||||||
|
|
||||||
message = sanitize7(message);
|
|
||||||
|
|
||||||
if(ChatListener.filteredCommand(player, message))
|
if(ChatListener.filteredCommand(player, message))
|
||||||
return;
|
return;
|
||||||
|
|
||||||
@ -167,17 +177,6 @@ public class ChatListener extends BasicListener {
|
|||||||
group.getChatColorCode()));
|
group.getChatColorCode()));
|
||||||
}
|
}
|
||||||
|
|
||||||
private static String sanitize7(String message) {
|
|
||||||
String begin = message.split(" ", 2)[0];
|
|
||||||
if(begin.startsWith("7") && begin.substring(1).matches("[A-Za-z]+")){
|
|
||||||
message = "/" + message.substring(1);
|
|
||||||
}else if((begin.startsWith("77") || begin.startsWith("7/") || begin.startsWith("/7")) && begin.substring(2).matches("[A-Za-z]+")){
|
|
||||||
message = "//" + message.substring(2);
|
|
||||||
}
|
|
||||||
|
|
||||||
return message;
|
|
||||||
}
|
|
||||||
|
|
||||||
private static boolean filteredCommand(CommandSender sender, String message) {
|
private static boolean filteredCommand(CommandSender sender, String message) {
|
||||||
String command = message.split(" ", 2)[0];
|
String command = message.split(" ", 2)[0];
|
||||||
if(command.startsWith("/") && command.contains(":")) {
|
if(command.startsWith("/") && command.contains(":")) {
|
||||||
|
@ -105,6 +105,9 @@ public class ConnectionListener extends BasicListener {
|
|||||||
@EventHandler
|
@EventHandler
|
||||||
public void onServerKickEvent(ServerKickEvent ev)
|
public void onServerKickEvent(ServerKickEvent ev)
|
||||||
{
|
{
|
||||||
|
if(!ev.getPlayer().isConnected())
|
||||||
|
return;
|
||||||
|
|
||||||
ServerInfo kickedFrom;
|
ServerInfo kickedFrom;
|
||||||
|
|
||||||
if (ev.getPlayer().getServer() != null){
|
if (ev.getPlayer().getServer() != null){
|
||||||
|
@ -41,7 +41,6 @@ import java.nio.charset.UnsupportedCharsetException;
|
|||||||
import java.util.*;
|
import java.util.*;
|
||||||
import java.util.concurrent.TimeUnit;
|
import java.util.concurrent.TimeUnit;
|
||||||
import java.util.logging.Level;
|
import java.util.logging.Level;
|
||||||
import java.util.stream.Collectors;
|
|
||||||
|
|
||||||
public class Fabric extends BasicListener {
|
public class Fabric extends BasicListener {
|
||||||
|
|
||||||
@ -124,12 +123,14 @@ public class Fabric extends BasicListener {
|
|||||||
mods.add(Mod.get(mod.getAsString(), Mod.Platform.FABRIC));
|
mods.add(Mod.get(mod.getAsString(), Mod.Platform.FABRIC));
|
||||||
}
|
}
|
||||||
|
|
||||||
|
/*
|
||||||
boolean isSorted = isSortedAlphabetically(mods);
|
boolean isSorted = isSortedAlphabetically(mods);
|
||||||
|
|
||||||
if(!isSorted) {
|
if(!isSorted) {
|
||||||
banPlayer(user, player, "Mods are not sorted alphabetically: " + mods.stream().map(Mod::getModName).collect(Collectors.joining(", ")));
|
banPlayer(user, player, "Mods are not sorted alphabetically: " + mods.stream().map(Mod::getModName).collect(Collectors.joining(", ")));
|
||||||
return;
|
return;
|
||||||
}
|
}
|
||||||
|
*/
|
||||||
|
|
||||||
if(!neededModsContained(mods)) {
|
if(!neededModsContained(mods)) {
|
||||||
banPlayer(user, player, "Needed mods are not contained");
|
banPlayer(user, player, "Needed mods are not contained");
|
||||||
|
@ -22,6 +22,7 @@ package de.steamwar.bungeecore.network;
|
|||||||
import de.steamwar.bungeecore.BungeeCore;
|
import de.steamwar.bungeecore.BungeeCore;
|
||||||
import de.steamwar.bungeecore.commands.TeamCommand;
|
import de.steamwar.bungeecore.commands.TeamCommand;
|
||||||
import de.steamwar.bungeecore.listeners.BasicListener;
|
import de.steamwar.bungeecore.listeners.BasicListener;
|
||||||
|
import de.steamwar.bungeecore.sql.SWException;
|
||||||
import de.steamwar.network.packets.NetworkPacket;
|
import de.steamwar.network.packets.NetworkPacket;
|
||||||
import net.md_5.bungee.api.ProxyServer;
|
import net.md_5.bungee.api.ProxyServer;
|
||||||
import net.md_5.bungee.api.connection.Server;
|
import net.md_5.bungee.api.connection.Server;
|
||||||
@ -31,8 +32,8 @@ import net.md_5.bungee.event.EventPriority;
|
|||||||
|
|
||||||
import java.net.InetSocketAddress;
|
import java.net.InetSocketAddress;
|
||||||
import java.util.Arrays;
|
import java.util.Arrays;
|
||||||
|
import java.util.Base64;
|
||||||
import java.util.List;
|
import java.util.List;
|
||||||
import java.util.logging.Level;
|
|
||||||
|
|
||||||
public class NetworkReceiver extends BasicListener {
|
public class NetworkReceiver extends BasicListener {
|
||||||
|
|
||||||
@ -41,7 +42,7 @@ public class NetworkReceiver extends BasicListener {
|
|||||||
@EventHandler(priority = EventPriority.HIGHEST)
|
@EventHandler(priority = EventPriority.HIGHEST)
|
||||||
public void onPluginMessage(PluginMessageEvent event) {
|
public void onPluginMessage(PluginMessageEvent event) {
|
||||||
if (blockedTags.contains(event.getTag()) && !TeamCommand.isLocalhost(((InetSocketAddress) event.getSender().getSocketAddress()).getAddress())) {
|
if (blockedTags.contains(event.getTag()) && !TeamCommand.isLocalhost(((InetSocketAddress) event.getSender().getSocketAddress()).getAddress())) {
|
||||||
BungeeCore.log(Level.SEVERE, ((InetSocketAddress) event.getSender().getSocketAddress()).getHostString() + " tried to send a plugin message with tag " + event.getTag());
|
SWException.log("Bungee", ((InetSocketAddress) event.getSender().getSocketAddress()).getHostString() + " tried to send a plugin message with tag " + event.getTag(), Base64.getEncoder().encodeToString(event.getData()));
|
||||||
event.setCancelled(true);
|
event.setCancelled(true);
|
||||||
return;
|
return;
|
||||||
}
|
}
|
||||||
|
@ -22,7 +22,7 @@ package de.steamwar.bungeecore.sql;
|
|||||||
import com.google.gson.JsonParser;
|
import com.google.gson.JsonParser;
|
||||||
import de.steamwar.bungeecore.BungeeCore;
|
import de.steamwar.bungeecore.BungeeCore;
|
||||||
import de.steamwar.bungeecore.Message;
|
import de.steamwar.bungeecore.Message;
|
||||||
import de.steamwar.bungeecore.commands.WebregisterCommand;
|
import de.steamwar.bungeecore.commands.WebpasswordCommand;
|
||||||
import de.steamwar.bungeecore.listeners.ConnectionListener;
|
import de.steamwar.bungeecore.listeners.ConnectionListener;
|
||||||
import de.steamwar.bungeecore.network.NetworkSender;
|
import de.steamwar.bungeecore.network.NetworkSender;
|
||||||
import de.steamwar.messages.ChatSender;
|
import de.steamwar.messages.ChatSender;
|
||||||
@ -121,7 +121,7 @@ public class SteamwarUser {
|
|||||||
String userName = connection.getName();
|
String userName = connection.getName();
|
||||||
if (!user.userName.equals(userName)) {
|
if (!user.userName.equals(userName)) {
|
||||||
updateName.update(userName, user.id);
|
updateName.update(userName, user.id);
|
||||||
WebregisterCommand.changeUsername(user.userName, userName);
|
WebpasswordCommand.changeUsername(user.userName, userName);
|
||||||
user.userName = userName;
|
user.userName = userName;
|
||||||
}
|
}
|
||||||
} else {
|
} else {
|
||||||
|
@ -19,7 +19,7 @@
|
|||||||
|
|
||||||
package de.steamwar.bungeecore.sql;
|
package de.steamwar.bungeecore.sql;
|
||||||
|
|
||||||
import de.steamwar.bungeecore.Node;
|
import de.steamwar.bungeecore.BungeeCore;
|
||||||
import de.steamwar.bungeecore.ServerStarter;
|
import de.steamwar.bungeecore.ServerStarter;
|
||||||
import de.steamwar.bungeecore.SubserverSystem;
|
import de.steamwar.bungeecore.SubserverSystem;
|
||||||
|
|
||||||
@ -124,7 +124,7 @@ public class Tutorial {
|
|||||||
|
|
||||||
public void delete() {
|
public void delete() {
|
||||||
delete.update(id);
|
delete.update(id);
|
||||||
SubserverSystem.deleteFolder(Node.local, world().getPath());
|
SubserverSystem.deleteFolder(BungeeCore.local, world().getPath());
|
||||||
}
|
}
|
||||||
|
|
||||||
public File world() {
|
public File world() {
|
||||||
|
@ -62,7 +62,7 @@ public class Tablist extends MessageToMessageDecoder<PacketWrapper> {
|
|||||||
this.player = player;
|
this.player = player;
|
||||||
this.viewer = ChatSender.of(player);
|
this.viewer = ChatSender.of(player);
|
||||||
this.directTabItems = Storage.directTabItems.computeIfAbsent(player, p -> new HashMap<>());
|
this.directTabItems = Storage.directTabItems.computeIfAbsent(player, p -> new HashMap<>());
|
||||||
onServerSwitch();
|
injection();
|
||||||
}
|
}
|
||||||
|
|
||||||
public void update(TablistPart global, int seconds) {
|
public void update(TablistPart global, int seconds) {
|
||||||
@ -145,12 +145,17 @@ public class Tablist extends MessageToMessageDecoder<PacketWrapper> {
|
|||||||
}
|
}
|
||||||
|
|
||||||
public void onServerSwitch() {
|
public void onServerSwitch() {
|
||||||
connection = (ServerConnection) player.getServer();
|
injection();
|
||||||
|
|
||||||
synchronized (directTabItems) {
|
synchronized (directTabItems) {
|
||||||
sendNpcPacket(npcs.stream().map(npc -> directTabItems.get(npc).getUsername()).collect(Collectors.toList()), true);
|
sendNpcPacket(npcs.stream().map(npc -> directTabItems.get(npc).getUsername()).collect(Collectors.toList()), true);
|
||||||
directTabItems.clear();
|
directTabItems.clear();
|
||||||
npcs.clear();
|
npcs.clear();
|
||||||
}
|
}
|
||||||
|
}
|
||||||
|
|
||||||
|
private void injection() {
|
||||||
|
connection = (ServerConnection) player.getServer();
|
||||||
|
|
||||||
if(connection != null) {
|
if(connection != null) {
|
||||||
ChannelPipeline pipeline = connection.getCh().getHandle().pipeline();
|
ChannelPipeline pipeline = connection.getCh().getHandle().pipeline();
|
||||||
|
@ -51,8 +51,10 @@ public class TablistManager extends BasicListener {
|
|||||||
|
|
||||||
public TablistManager() {
|
public TablistManager() {
|
||||||
ProxyServer.getInstance().getScheduler().schedule(BungeeCore.get(), this::updateTablist, 1, 1, TimeUnit.SECONDS);
|
ProxyServer.getInstance().getScheduler().schedule(BungeeCore.get(), this::updateTablist, 1, 1, TimeUnit.SECONDS);
|
||||||
|
synchronized (tablists) {
|
||||||
ProxyServer.getInstance().getPlayers().forEach(player -> tablists.put(player, new Tablist(player)));
|
ProxyServer.getInstance().getPlayers().forEach(player -> tablists.put(player, new Tablist(player)));
|
||||||
}
|
}
|
||||||
|
}
|
||||||
|
|
||||||
@EventHandler
|
@EventHandler
|
||||||
public void onJoin(PostLoginEvent event) {
|
public void onJoin(PostLoginEvent event) {
|
||||||
|
@ -1,30 +0,0 @@
|
|||||||
/*
|
|
||||||
* This file is a part of the SteamWar software.
|
|
||||||
*
|
|
||||||
* Copyright (C) 2020 SteamWar.de-Serverteam
|
|
||||||
*
|
|
||||||
* This program is free software: you can redistribute it and/or modify
|
|
||||||
* it under the terms of the GNU Affero General Public License as published by
|
|
||||||
* the Free Software Foundation, either version 3 of the License, or
|
|
||||||
* (at your option) any later version.
|
|
||||||
*
|
|
||||||
* This program is distributed in the hope that it will be useful,
|
|
||||||
* but WITHOUT ANY WARRANTY; without even the implied warranty of
|
|
||||||
* MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
|
|
||||||
* GNU Affero General Public License for more details.
|
|
||||||
*
|
|
||||||
* You should have received a copy of the GNU Affero General Public License
|
|
||||||
* along with this program. If not, see <https://www.gnu.org/licenses/>.
|
|
||||||
*/
|
|
||||||
|
|
||||||
package de.steamwar.command;
|
|
||||||
|
|
||||||
import net.md_5.bungee.api.CommandSender;
|
|
||||||
|
|
||||||
@FunctionalInterface
|
|
||||||
public interface GuardChecker extends AbstractGuardChecker<CommandSender> {
|
|
||||||
/**
|
|
||||||
* While guarding the first parameter of the command the parameter s of this method is {@code null}
|
|
||||||
*/
|
|
||||||
GuardResult guard(CommandSender commandSender, GuardCheckType guardCheckType, String[] previousArguments, String s);
|
|
||||||
}
|
|
@ -149,7 +149,7 @@ public class SWCommand extends AbstractSWCommand<CommandSender> {
|
|||||||
}
|
}
|
||||||
if (args.length == 0 || atomicInteger.get() == commandList.size()) {
|
if (args.length == 0 || atomicInteger.get() == commandList.size()) {
|
||||||
commandList.forEach(subCommand -> {
|
commandList.forEach(subCommand -> {
|
||||||
if (subCommand.guardChecker == null || subCommand.guardChecker.guard(p, GuardCheckType.TAB_COMPLETE, new String[0], null) == GuardResult.ALLOWED) {
|
if (subCommand.validator == null || subCommand.validator.validate(p, p, (s, args1) -> {})) {
|
||||||
send(chatSender, subCommand);
|
send(chatSender, subCommand);
|
||||||
}
|
}
|
||||||
});
|
});
|
||||||
|
@ -19,6 +19,7 @@
|
|||||||
|
|
||||||
package de.steamwar.command;
|
package de.steamwar.command;
|
||||||
|
|
||||||
|
import de.steamwar.bungeecore.commands.TypeMappers;
|
||||||
import de.steamwar.bungeecore.sql.SteamwarUser;
|
import de.steamwar.bungeecore.sql.SteamwarUser;
|
||||||
import lombok.experimental.UtilityClass;
|
import lombok.experimental.UtilityClass;
|
||||||
import net.md_5.bungee.BungeeCord;
|
import net.md_5.bungee.BungeeCord;
|
||||||
@ -32,5 +33,7 @@ public class TypeUtils {
|
|||||||
static void init() {
|
static void init() {
|
||||||
SWCommandUtils.addMapper(ProxiedPlayer.class, SWCommandUtils.createMapper(BungeeCord.getInstance()::getPlayer, (s) -> BungeeCord.getInstance().getPlayers().stream().map(ProxiedPlayer::getName).collect(Collectors.toList())));
|
SWCommandUtils.addMapper(ProxiedPlayer.class, SWCommandUtils.createMapper(BungeeCord.getInstance()::getPlayer, (s) -> BungeeCord.getInstance().getPlayers().stream().map(ProxiedPlayer::getName).collect(Collectors.toList())));
|
||||||
SWCommandUtils.addMapper(SteamwarUser.class, SWCommandUtils.createMapper(SteamwarUser::get, s -> BungeeCord.getInstance().getPlayers().stream().map(ProxiedPlayer::getName).collect(Collectors.toList())));
|
SWCommandUtils.addMapper(SteamwarUser.class, SWCommandUtils.createMapper(SteamwarUser::get, s -> BungeeCord.getInstance().getPlayers().stream().map(ProxiedPlayer::getName).collect(Collectors.toList())));
|
||||||
|
|
||||||
|
TypeMappers.init();
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
@ -18,6 +18,8 @@ DEV_UNKNOWN_SERVER=§cPlease specify a dev server.
|
|||||||
|
|
||||||
DISABLED=§cCurrently disabled.
|
DISABLED=§cCurrently disabled.
|
||||||
|
|
||||||
|
SERVER_START_OVERLOAD=§cServer start cancelled due to overload. Please try again later.
|
||||||
|
|
||||||
#ModLoader blocker
|
#ModLoader blocker
|
||||||
MODLOADER_INSTALLED=§7You play with §e{0} §7client. Therefore you can't join arenas.
|
MODLOADER_INSTALLED=§7You play with §e{0} §7client. Therefore you can't join arenas.
|
||||||
MODLOADER_INSTALLED_FABRIC=§7You play with §e{0} §7client. You can join arenas only with the FabricModSender https://steamwar.de/downloads installed.
|
MODLOADER_INSTALLED_FABRIC=§7You play with §e{0} §7client. You can join arenas only with the FabricModSender https://steamwar.de/downloads installed.
|
||||||
@ -116,7 +118,7 @@ MOD_YELLOW_PLUR=§7Deactivate the mods\n§e{0}\n§7to continue playing on §eSte
|
|||||||
|
|
||||||
#Various commands
|
#Various commands
|
||||||
ALERT=§f{0}
|
ALERT=§f{0}
|
||||||
STAT_SERVER=§7Server §e{0}§8: §7Load §e{1} §7Server count §e{2}
|
STAT_SERVER=§7Server §e{0}§8: §7Below limit §e{1} §7Server count §e{2}
|
||||||
|
|
||||||
#Ban&Mute-Command
|
#Ban&Mute-Command
|
||||||
PUNISHMENT_USAGE=§8/§7{0} §8[§eplayer§8] [§edd§8.§emm§8.§eyyyy §7or §edd§8.§emm§8.§eyyyy§8_§ehh§8:§emm §7or §eperma§8] [§ereason§8]
|
PUNISHMENT_USAGE=§8/§7{0} §8[§eplayer§8] [§edd§8.§emm§8.§eyyyy §7or §edd§8.§emm§8.§eyyyy§8_§ehh§8:§emm §7or §eperma§8] [§ereason§8]
|
||||||
@ -507,13 +509,10 @@ UNIGNORE_NOT_IGNORED=§cYou are not ignoring this player.
|
|||||||
UNIGNORE_UNIGNORED=§7You ignored §e{0}§8.
|
UNIGNORE_UNIGNORED=§7You ignored §e{0}§8.
|
||||||
|
|
||||||
#WebregisterCommand
|
#WebregisterCommand
|
||||||
WEB_USAGE=§8/§7webregister §8[§eE-Mail§8]
|
WEB_USAGE=§8/§7webpassword §8[§epassword§8]
|
||||||
WEB_ALREADY=§cYou already have a webaccount.
|
WEB_UPDATED=§7Your password was updated.
|
||||||
WEB_ALREADY_EMAIL=§cYou already used this E-Mail address on another account...
|
WEB_CREATED=§7Your webaccount was created.
|
||||||
WEB_NOT_EMAIL=§c[E-Mail], not [free text]!
|
WEB_PASSWORD_LENGTH=§cYour password is shorter than 8 characters.
|
||||||
WEB_EMAIL_REFRESH=§aYour E-Mail was updated.
|
|
||||||
WEB_INTERNAL_ERROR=§cAn internal error occurred, please contact a developer.
|
|
||||||
WEB_EMAIL_SEND=§aAn E-Mail to reset your password has been sent.
|
|
||||||
|
|
||||||
#ChatListener
|
#ChatListener
|
||||||
CHAT_LIXFEL_ACTION_BAR=§4§lTechnical problems?
|
CHAT_LIXFEL_ACTION_BAR=§4§lTechnical problems?
|
||||||
@ -642,3 +641,7 @@ FIGHT_MERGE_INFO=§e{0}§8: §e{1}
|
|||||||
|
|
||||||
#Locale Locking
|
#Locale Locking
|
||||||
LOCK_LOCALE_CHANGED=§aLanguage saved
|
LOCK_LOCALE_CHANGED=§aLanguage saved
|
||||||
|
|
||||||
|
#Builder Cloud
|
||||||
|
BUILDERCLOUD_USAGE=§8/§7buildercloud §8[§eversion§8] §8[§emap§8] §8<§7generator§8>
|
||||||
|
BUILDERCLOUD_VERSION=§cUnknown version.
|
@ -14,6 +14,8 @@ DEV_UNKNOWN_SERVER=§cBitte gib einen DevServer an.
|
|||||||
|
|
||||||
DISABLED=§cDerzeit deaktiviert.
|
DISABLED=§cDerzeit deaktiviert.
|
||||||
|
|
||||||
|
SERVER_START_OVERLOAD=§cDer Serverstart wurde aufgrund von Überlastung abgebrochen. Versuche es später erneut.
|
||||||
|
|
||||||
#ModLoader blocker
|
#ModLoader blocker
|
||||||
MODLOADER_INSTALLED=§7Du spielst mit §e{0} §7Client. Daher kannst du keinen Arenen beitreten.
|
MODLOADER_INSTALLED=§7Du spielst mit §e{0} §7Client. Daher kannst du keinen Arenen beitreten.
|
||||||
MODLOADER_INSTALLED_FABRIC=§7Du spielst mit §e{0} §7Client. Nur mit dem FabricModSender https://steamwar.de/downloads kannst du Arenen beitreten.
|
MODLOADER_INSTALLED_FABRIC=§7Du spielst mit §e{0} §7Client. Nur mit dem FabricModSender https://steamwar.de/downloads kannst du Arenen beitreten.
|
||||||
@ -101,7 +103,7 @@ MOD_YELLOW_SING=§7Deaktiviere den Mod §e{0}§7, um weiter auf §eSteam§8War
|
|||||||
MOD_YELLOW_PLUR=§7Deaktiviere die Mods\n§e{0}\n§7um weiter auf §eSteam§8War §7spielen zu können.
|
MOD_YELLOW_PLUR=§7Deaktiviere die Mods\n§e{0}\n§7um weiter auf §eSteam§8War §7spielen zu können.
|
||||||
|
|
||||||
#Various commands
|
#Various commands
|
||||||
STAT_SERVER=§7Server §e{0}§8: §7Load §e{1} §7Serveranzahl §e{2}
|
STAT_SERVER=§7Server §e{0}§8: §7Startfähig §e{1} §7Serveranzahl §e{2}
|
||||||
|
|
||||||
#Ban&Mute-Command
|
#Ban&Mute-Command
|
||||||
PUNISHMENT_USAGE=§8/§7{0} §8[§eSpieler§8] [§edd§8.§emm§8.§eyyyy §7oder §edd§8.§emm§8.§eyyyy§8_§ehh§8:§emm §7oder §eperma§8] [§eGrund§8]
|
PUNISHMENT_USAGE=§8/§7{0} §8[§eSpieler§8] [§edd§8.§emm§8.§eyyyy §7oder §edd§8.§emm§8.§eyyyy§8_§ehh§8:§emm §7oder §eperma§8] [§eGrund§8]
|
||||||
@ -486,13 +488,10 @@ UNIGNORE_NOT_IGNORED=§cDu ignorierst diesen Spieler nicht.
|
|||||||
UNIGNORE_UNIGNORED=§7Du empfängst nun wieder Nachrichten von §e{0}§8.
|
UNIGNORE_UNIGNORED=§7Du empfängst nun wieder Nachrichten von §e{0}§8.
|
||||||
|
|
||||||
#WebregisterCommand
|
#WebregisterCommand
|
||||||
WEB_USAGE=§8/§7webregister §8[§eE-Mail§8]
|
WEB_USAGE=§8/§7webpassword §8[§ePasswort§8]
|
||||||
WEB_ALREADY=§cDu hast bereits einen Webaccount.
|
WEB_UPDATED=§7Dein Passwort wurde aktualisiert.
|
||||||
WEB_ALREADY_EMAIL=§cDie E-Mail hast du bereits für einen anderen Account verwendet...
|
WEB_CREATED=§7Dein Webaccount wurde erstellt.
|
||||||
WEB_NOT_EMAIL=§c[E-Mail], nicht [Freitext]!
|
WEB_PASSWORD_LENGTH=§cDein Passwort ist kürzer als 8 Zeichen.
|
||||||
WEB_EMAIL_REFRESH=§aDeine E-Mail-Adresse wurde aktualisiert.
|
|
||||||
WEB_INTERNAL_ERROR=§cEin interner Fehler ist aufgetreten, bitte wende dich an einen Developer.
|
|
||||||
WEB_EMAIL_SEND=§aEine E-Mail zum Setzen des Passworts wurde gesendet.
|
|
||||||
|
|
||||||
#ChatListener
|
#ChatListener
|
||||||
CHAT_LIXFEL_ACTION_BAR=§4§lTechnische Probleme?
|
CHAT_LIXFEL_ACTION_BAR=§4§lTechnische Probleme?
|
||||||
@ -620,3 +619,7 @@ FIGHT_MERGE_OFFLINE=§7Die vorgeschlagene Arena wurde in der Zwischenzeit beende
|
|||||||
|
|
||||||
#Locale Locking
|
#Locale Locking
|
||||||
LOCK_LOCALE_CHANGED=§aSprache gespeichert
|
LOCK_LOCALE_CHANGED=§aSprache gespeichert
|
||||||
|
|
||||||
|
#Builder Cloud
|
||||||
|
BUILDERCLOUD_USAGE=§8/§7buildercloud §8[§eVersion§8] §8[§eWelt§8] §8<§7Generator§8>
|
||||||
|
BUILDERCLOUD_VERSION=§cUnbekannte Version.
|
@ -107,6 +107,14 @@ public interface ChatSender {
|
|||||||
return new TextComponent(parse(prefixed, message));
|
return new TextComponent(parse(prefixed, message));
|
||||||
}
|
}
|
||||||
|
|
||||||
|
default String parseToPlain(String format, Object... params) {
|
||||||
|
return parseToPlain(new Message(format, params));
|
||||||
|
}
|
||||||
|
|
||||||
|
default String parseToPlain(Message message) {
|
||||||
|
return parseToComponent(false, message).toPlainText();
|
||||||
|
}
|
||||||
|
|
||||||
default String parseToLegacy(String format, Object... params) {
|
default String parseToLegacy(String format, Object... params) {
|
||||||
return parseToLegacy(new Message(format, params));
|
return parseToLegacy(new Message(format, params));
|
||||||
}
|
}
|
||||||
|
In neuem Issue referenzieren
Einen Benutzer sperren