diff --git a/SubServers.Bungee/common/pom.xml b/SubServers.Bungee/common/pom.xml
index 30390b60..74c0f302 100644
--- a/SubServers.Bungee/common/pom.xml
+++ b/SubServers.Bungee/common/pom.xml
@@ -30,13 +30,13 @@
net.ME1312.Galaxi
GalaxiUtil
- 20w33a
+ 20w46b
provided
net.ME1312.Galaxi
GalaxiEngine
- 20w33a
+ 20w46b
provided
diff --git a/SubServers.Bungee/common/src/net/ME1312/SubServers/Bungee/Library/Compatibility/CommandX.java b/SubServers.Bungee/common/src/net/ME1312/SubServers/Bungee/Library/Compatibility/CommandX.java
index 8f3ae08e..b06f34fe 100644
--- a/SubServers.Bungee/common/src/net/ME1312/SubServers/Bungee/Library/Compatibility/CommandX.java
+++ b/SubServers.Bungee/common/src/net/ME1312/SubServers/Bungee/Library/Compatibility/CommandX.java
@@ -1,6 +1,6 @@
package net.ME1312.SubServers.Bungee.Library.Compatibility;
-import net.ME1312.Galaxi.Library.Container.NamedContainer;
+import net.ME1312.Galaxi.Library.Container.Pair;
import net.md_5.bungee.api.CommandSender;
import net.md_5.bungee.api.plugin.Command;
import net.md_5.bungee.api.plugin.TabExecutor;
@@ -39,7 +39,7 @@ public abstract class CommandX extends Command implements TabExecutor {
* @param args Arguments (including the final unfinished one)
* @return An Error Message (if there was one, otherwise null) and a List of Suggestions
*/
- public abstract NamedContainer> suggestArguments(CommandSender sender, String[] args);
+ public abstract Pair> suggestArguments(CommandSender sender, String[] args);
/**
* Override the BungeeCord Method of {@link #suggestArguments(CommandSender, String[])}
@@ -50,6 +50,6 @@ public abstract class CommandX extends Command implements TabExecutor {
*/
@Override
public Iterable onTabComplete(CommandSender sender, String[] args) {
- return suggestArguments(sender, args).get();
+ return suggestArguments(sender, args).value();
}
}
diff --git a/SubServers.Bungee/common/src/net/ME1312/SubServers/Bungee/Library/Compatibility/mc1_13/CommandX.java b/SubServers.Bungee/common/src/net/ME1312/SubServers/Bungee/Library/Compatibility/mc1_13/CommandX.java
index 649b20b0..aef759b5 100644
--- a/SubServers.Bungee/common/src/net/ME1312/SubServers/Bungee/Library/Compatibility/mc1_13/CommandX.java
+++ b/SubServers.Bungee/common/src/net/ME1312/SubServers/Bungee/Library/Compatibility/mc1_13/CommandX.java
@@ -1,6 +1,7 @@
package net.ME1312.SubServers.Bungee.Library.Compatibility.mc1_13;
-import net.ME1312.Galaxi.Library.Container.NamedContainer;
+import net.ME1312.Galaxi.Library.Container.ContainedPair;
+import net.ME1312.Galaxi.Library.Container.Pair;
import net.md_5.bungee.api.CommandSender;
import java.util.LinkedList;
@@ -34,7 +35,7 @@ public class CommandX extends net.ME1312.SubServers.Bungee.Library.Compatibility
}
@Override
- public NamedContainer> suggestArguments(CommandSender sender, String[] args) {
+ public Pair> suggestArguments(CommandSender sender, String[] args) {
return command.suggestArguments(sender, args);
}
@@ -43,27 +44,27 @@ public class CommandX extends net.ME1312.SubServers.Bungee.Library.Compatibility
*
* @param sender Sender
* @param command Command to validate
- * @return NamedContainer with a String error message and a Integer that represents where the command was deemed invalid
+ * @return Pair with a String error message and a Integer that represents where the command was deemed invalid
*/
- public NamedContainer validateCommand(CommandSender sender, String command) {
- List> split = new LinkedList>();
+ public Pair validateCommand(CommandSender sender, String command) {
+ List> split = new LinkedList>();
String cmd = command;
int i;
while ((i = cmd.indexOf((int) ' ')) < 0) {
i++;
String arg = cmd.substring(i);
- split.add(new NamedContainer<>(arg.contains(" ")?arg.substring(0, arg.indexOf((int) ' ')):arg, i));
+ split.add(new ContainedPair<>(arg.contains(" ")?arg.substring(0, arg.indexOf((int) ' ')):arg, i));
cmd = arg;
}
List args = new LinkedList();
- NamedContainer response = null;
+ Pair response = null;
i = 0;
- for (NamedContainer arg : split) {
+ for (Pair arg : split) {
if (i > 0) {
- args.add(arg.name());
- NamedContainer> suggestions = suggestArguments(sender, args.toArray(new String[args.size() - 1]));
- if (suggestions.name() != null) response = new NamedContainer<>(suggestions.name(), arg.get());
+ args.add(arg.key());
+ Pair> suggestions = suggestArguments(sender, args.toArray(new String[args.size() - 1]));
+ if (suggestions.key() != null) response = new ContainedPair<>(suggestions.key(), arg.value());
}
i++;
}
diff --git a/SubServers.Bungee/pom.xml b/SubServers.Bungee/pom.xml
index b81861de..7c4abf4c 100644
--- a/SubServers.Bungee/pom.xml
+++ b/SubServers.Bungee/pom.xml
@@ -30,14 +30,14 @@
net.ME1312.Galaxi
GalaxiUtil
- 20w33a
+ 20w46b
compile
true
net.ME1312.Galaxi
GalaxiEngine
- 20w33a
+ 20w46b
provided
@@ -50,7 +50,7 @@
net.ME1312.SubData
Server
- 20w46b
+ 20w46d
compile
true
diff --git a/SubServers.Bungee/src/net/ME1312/SubServers/Bungee/Event/SubEditServerEvent.java b/SubServers.Bungee/src/net/ME1312/SubServers/Bungee/Event/SubEditServerEvent.java
index a61121e7..04bce10f 100644
--- a/SubServers.Bungee/src/net/ME1312/SubServers/Bungee/Event/SubEditServerEvent.java
+++ b/SubServers.Bungee/src/net/ME1312/SubServers/Bungee/Event/SubEditServerEvent.java
@@ -1,9 +1,10 @@
package net.ME1312.SubServers.Bungee.Event;
+import net.ME1312.Galaxi.Library.Container.ContainedPair;
import net.ME1312.SubServers.Bungee.Host.Server;
import net.ME1312.Galaxi.Library.Map.ObjectMap;
import net.ME1312.Galaxi.Library.Map.ObjectMapValue;
-import net.ME1312.Galaxi.Library.Container.NamedContainer;
+import net.ME1312.Galaxi.Library.Container.Pair;
import net.ME1312.SubServers.Bungee.Library.SubEvent;
import net.ME1312.Galaxi.Library.Util;
import net.md_5.bungee.api.plugin.Cancellable;
@@ -18,7 +19,7 @@ public class SubEditServerEvent extends Event implements SubEvent, Cancellable {
private boolean cancelled = false;
private UUID player;
private Server server;
- private NamedContainer edit;
+ private Pair edit;
private boolean perm;
/**
@@ -29,13 +30,13 @@ public class SubEditServerEvent extends Event implements SubEvent, Cancellable {
* @param edit Edit to make
* @param permanent If the change is permanent
*/
- public SubEditServerEvent(UUID player, Server server, NamedContainer edit, boolean permanent) {
+ public SubEditServerEvent(UUID player, Server server, Pair edit, boolean permanent) {
if (Util.isNull(server, edit)) throw new NullPointerException();
ObjectMap section = new ObjectMap();
- section.set(".", edit.get());
+ section.set(".", edit.value());
this.player = player;
this.server = server;
- this.edit = new NamedContainer(edit.name(), section.get("."));
+ this.edit = new ContainedPair(edit.key(), section.get("."));
this.perm = permanent;
}
@@ -58,7 +59,7 @@ public class SubEditServerEvent extends Event implements SubEvent, Cancellable {
*
* @return Edit to be made
*/
- public NamedContainer getEdit() {
+ public Pair getEdit() {
return edit;
}
diff --git a/SubServers.Bungee/src/net/ME1312/SubServers/Bungee/Host/External/ExternalSubCreator.java b/SubServers.Bungee/src/net/ME1312/SubServers/Bungee/Host/External/ExternalSubCreator.java
index 981cd8c6..499602ea 100644
--- a/SubServers.Bungee/src/net/ME1312/SubServers/Bungee/Host/External/ExternalSubCreator.java
+++ b/SubServers.Bungee/src/net/ME1312/SubServers/Bungee/Host/External/ExternalSubCreator.java
@@ -3,8 +3,10 @@ package net.ME1312.SubServers.Bungee.Host.External;
import com.google.common.collect.Range;
import net.ME1312.Galaxi.Library.*;
import net.ME1312.Galaxi.Library.Callback.Callback;
+import net.ME1312.Galaxi.Library.Container.ContainedPair;
import net.ME1312.Galaxi.Library.Container.Container;
-import net.ME1312.Galaxi.Library.Container.NamedContainer;
+import net.ME1312.Galaxi.Library.Container.Value;
+import net.ME1312.Galaxi.Library.Container.Pair;
import net.ME1312.SubData.Server.SubDataClient;
import net.ME1312.SubServers.Bungee.Event.SubCreateEvent;
import net.ME1312.SubServers.Bungee.Event.SubCreatedEvent;
@@ -36,9 +38,9 @@ public class ExternalSubCreator extends SubCreator {
private Boolean enableRT = false;
private ExternalHost host;
private Range ports;
- private Container log;
+ private Value log;
private String gitBash;
- private TreeMap> thread;
+ private TreeMap> thread;
/**
* Creates an External SubCreator
@@ -55,7 +57,7 @@ public class ExternalSubCreator extends SubCreator {
this.ports = ports;
this.log = new Container(log);
this.gitBash = gitBash;
- this.thread = new TreeMap>();
+ this.thread = new TreeMap>();
reload();
}
@@ -93,15 +95,15 @@ public class ExternalSubCreator extends SubCreator {
Container i = new Container(ports.lowerEndpoint() - 1);
port = Util.getNew(getAllReservedAddresses(), () -> {
do {
- i.set(i.get() + 1);
- if (i.get() > ports.upperEndpoint()) throw new IllegalStateException("There are no more ports available in range: " + ports.toString());
- } while (!ports.contains(i.get()));
- return new InetSocketAddress(host.getAddress(), i.get());
+ ++i.value;
+ if (i.value > ports.upperEndpoint()) throw new IllegalStateException("There are no more ports available in range: " + ports.toString());
+ } while (!ports.contains(i.value));
+ return new InetSocketAddress(host.getAddress(), i.value);
}).getPort();
}
String prefix = name + File.separator + "Creator";
ExternalSubLogger logger = new ExternalSubLogger(this, prefix, log, null);
- thread.put(name.toLowerCase(), new NamedContainer<>(port, logger));
+ thread.put(name.toLowerCase(), new ContainedPair<>(port, logger));
final int fport = port;
final SubCreateEvent event = new SubCreateEvent(player, host, name, template, version, port);
@@ -140,7 +142,7 @@ public class ExternalSubCreator extends SubCreator {
String prefix = name + File.separator + "Updater";
Util.isException(() -> Util.reflect(SubServerImpl.class.getDeclaredField("updating"), server, true));
ExternalSubLogger logger = new ExternalSubLogger(this, prefix, log, null);
- thread.put(name.toLowerCase(), new NamedContainer<>(server.getAddress().getPort(), logger));
+ thread.put(name.toLowerCase(), new ContainedPair<>(server.getAddress().getPort(), logger));
final SubCreateEvent event = new SubCreateEvent(player, server, version);
host.plugin.getPluginManager().callEvent(event);
@@ -230,7 +232,7 @@ public class ExternalSubCreator extends SubCreator {
@Override
public void terminate() {
- HashMap> thread = new HashMap>();
+ HashMap> thread = new HashMap>();
thread.putAll(this.thread);
for (String i : thread.keySet()) {
terminate(i);
@@ -247,7 +249,7 @@ public class ExternalSubCreator extends SubCreator {
@Override
public void waitFor() throws InterruptedException {
- HashMap> thread = new HashMap>();
+ HashMap> thread = new HashMap>();
thread.putAll(this.thread);
for (String i : thread.keySet()) {
waitFor(i);
@@ -285,7 +287,7 @@ public class ExternalSubCreator extends SubCreator {
@Override
public List getLoggers() {
List loggers = new ArrayList();
- HashMap> temp = new HashMap>();
+ HashMap> temp = new HashMap>();
temp.putAll(thread);
for (String i : temp.keySet()) {
loggers.add(getLogger(i));
@@ -295,18 +297,18 @@ public class ExternalSubCreator extends SubCreator {
@Override
public SubLogger getLogger(String name) {
- return this.thread.get(name.toLowerCase()).get();
+ return this.thread.get(name.toLowerCase()).value();
}
@Override
public boolean isLogging() {
- return log.get();
+ return log.value();
}
@Override
public void setLogging(boolean value) {
if (Util.isNull(value)) throw new NullPointerException();
- log.set(value);
+ log.value(value);
}
@Override
@@ -317,7 +319,7 @@ public class ExternalSubCreator extends SubCreator {
@Override
public List getReservedPorts() {
List ports = new ArrayList();
- for (NamedContainer task : thread.values()) ports.add(task.name());
+ for (Pair task : thread.values()) ports.add(task.key());
return ports;
}
diff --git a/SubServers.Bungee/src/net/ME1312/SubServers/Bungee/Host/External/ExternalSubLogger.java b/SubServers.Bungee/src/net/ME1312/SubServers/Bungee/Host/External/ExternalSubLogger.java
index 36e5b872..8f580003 100644
--- a/SubServers.Bungee/src/net/ME1312/SubServers/Bungee/Host/External/ExternalSubLogger.java
+++ b/SubServers.Bungee/src/net/ME1312/SubServers/Bungee/Host/External/ExternalSubLogger.java
@@ -2,7 +2,7 @@ package net.ME1312.SubServers.Bungee.Host.External;
import net.ME1312.SubServers.Bungee.Host.SubLogFilter;
import net.ME1312.SubServers.Bungee.Host.SubLogger;
-import net.ME1312.Galaxi.Library.Container.Container;
+import net.ME1312.Galaxi.Library.Container.Value;
import net.ME1312.Galaxi.Library.Util;
import net.ME1312.SubServers.Bungee.Library.Compatibility.Logger;
import net.ME1312.SubServers.Bungee.Network.Packet.PacketInExLogMessage;
@@ -29,7 +29,7 @@ public class ExternalSubLogger extends SubLogger {
private Object handle;
UUID id = null;
String name;
- Container log;
+ Value log;
private List filters = new CopyOnWriteArrayList<>();
File file;
private PrintWriter writer = null;
@@ -43,7 +43,7 @@ public class ExternalSubLogger extends SubLogger {
* @param log Console Logging Status
* @param file File to log to (or null for disabled)
*/
- ExternalSubLogger(Object user, String name, Container log, File file) {
+ ExternalSubLogger(Object user, String name, Value log, File file) {
this.handle = user;
this.name = name;
this.log = log;
@@ -103,7 +103,7 @@ public class ExternalSubLogger extends SubLogger {
}
// Filter Message
- boolean allow = (SubAPI.getInstance().getInternals().sudo == getHandler() && SubAPI.getInstance().getInternals().canSudo) || (log.get() && (SubAPI.getInstance().getInternals().sudo == null || !SubAPI.getInstance().getInternals().canSudo));
+ boolean allow = (SubAPI.getInstance().getInternals().sudo == getHandler() && SubAPI.getInstance().getInternals().canSudo) || (log.value() && (SubAPI.getInstance().getInternals().sudo == null || !SubAPI.getInstance().getInternals().canSudo));
List filters = new ArrayList();
filters.addAll(this.filters);
for (SubLogFilter filter : filters)
@@ -182,6 +182,6 @@ public class ExternalSubLogger extends SubLogger {
@Override
public boolean isLogging() {
- return log.get();
+ return log.value();
}
}
diff --git a/SubServers.Bungee/src/net/ME1312/SubServers/Bungee/Host/External/ExternalSubServer.java b/SubServers.Bungee/src/net/ME1312/SubServers/Bungee/Host/External/ExternalSubServer.java
index 7e827216..a7940790 100644
--- a/SubServers.Bungee/src/net/ME1312/SubServers/Bungee/Host/External/ExternalSubServer.java
+++ b/SubServers.Bungee/src/net/ME1312/SubServers/Bungee/Host/External/ExternalSubServer.java
@@ -1,14 +1,16 @@
package net.ME1312.SubServers.Bungee.Host.External;
import net.ME1312.Galaxi.Library.Callback.ReturnRunnable;
+import net.ME1312.Galaxi.Library.Container.ContainedPair;
+import net.ME1312.Galaxi.Library.Container.Container;
import net.ME1312.SubServers.Bungee.Event.*;
import net.ME1312.SubServers.Bungee.Host.*;
import net.ME1312.Galaxi.Library.Map.ObjectMap;
import net.ME1312.Galaxi.Library.Map.ObjectMapValue;
-import net.ME1312.Galaxi.Library.Container.Container;
+import net.ME1312.Galaxi.Library.Container.Value;
import net.ME1312.SubServers.Bungee.Library.Compatibility.Logger;
import net.ME1312.SubServers.Bungee.Library.Exception.InvalidServerException;
-import net.ME1312.Galaxi.Library.Container.NamedContainer;
+import net.ME1312.Galaxi.Library.Container.Pair;
import net.ME1312.Galaxi.Library.Util;
import net.ME1312.SubServers.Bungee.Network.Packet.PacketExEditServer;
import net.md_5.bungee.BungeeServerInfo;
@@ -27,7 +29,7 @@ import java.util.UUID;
public class ExternalSubServer extends SubServerImpl {
private ExternalHost host;
private boolean enabled;
- private Container log;
+ private Value log;
private String dir;
String exec;
private String stopcmd;
@@ -222,7 +224,7 @@ public class ExternalSubServer extends SubServerImpl {
for (String key : edit.getKeys()) {
pending.remove(key);
ObjectMapValue value = edit.get(key);
- SubEditServerEvent event = new SubEditServerEvent(player, this, new NamedContainer(key, value), perma);
+ SubEditServerEvent event = new SubEditServerEvent(player, this, new ContainedPair(key, value), perma);
host.plugin.getPluginManager().callEvent(event);
if (!event.isCancelled()) {
try {
@@ -335,8 +337,8 @@ public class ExternalSubServer extends SubServerImpl {
break;
case "log":
if (value.isBoolean()) {
- if (log.get() != value.asBoolean()) host.queue(new PacketExEditServer(this, PacketExEditServer.UpdateType.SET_LOGGING, (Boolean) value.asBoolean()));
- log.set(value.asBoolean());
+ if (log.value() != value.asBoolean()) host.queue(new PacketExEditServer(this, PacketExEditServer.UpdateType.SET_LOGGING, (Boolean) value.asBoolean()));
+ log.value(value.asBoolean());
if (perma && this.host.plugin.servers.get().getMap("Servers").getKeys().contains(getName())) {
this.host.plugin.servers.get().getMap("Servers").getMap(getName()).set("Log", isLogging());
this.host.plugin.servers.save();
@@ -505,7 +507,7 @@ public class ExternalSubServer extends SubServerImpl {
public void setDisplayName(String value) {
super.setDisplayName(value);
logger.name = getDisplayName();
- host.plugin.getPluginManager().callEvent(new SubEditServerEvent(null, this, new NamedContainer("display", value), false));
+ host.plugin.getPluginManager().callEvent(new SubEditServerEvent(null, this, new ContainedPair("display", value), false));
}
@Override
@@ -521,22 +523,22 @@ public class ExternalSubServer extends SubServerImpl {
@Override
public void setEnabled(boolean value) {
if (Util.isNull(value)) throw new NullPointerException();
- host.plugin.getPluginManager().callEvent(new SubEditServerEvent(null, this, new NamedContainer("enabled", value), false));
+ host.plugin.getPluginManager().callEvent(new SubEditServerEvent(null, this, new ContainedPair("enabled", value), false));
if (enabled != value) host.queue(new PacketExEditServer(this, PacketExEditServer.UpdateType.SET_ENABLED, (Boolean) value));
enabled = value;
}
@Override
public boolean isLogging() {
- return log.get();
+ return log.value();
}
@Override
public void setLogging(boolean value) {
if (Util.isNull(value)) throw new NullPointerException();
- host.plugin.getPluginManager().callEvent(new SubEditServerEvent(null, this, new NamedContainer("log", value), false));
- if (log.get() != value) host.queue(new PacketExEditServer(this, PacketExEditServer.UpdateType.SET_LOGGING, (Boolean) value));
- log.set(value);
+ host.plugin.getPluginManager().callEvent(new SubEditServerEvent(null, this, new ContainedPair("log", value), false));
+ if (log.value() != value) host.queue(new PacketExEditServer(this, PacketExEditServer.UpdateType.SET_LOGGING, (Boolean) value));
+ log.value(value);
}
@Override
@@ -567,7 +569,7 @@ public class ExternalSubServer extends SubServerImpl {
@Override
public void setStopCommand(String value) {
if (Util.isNull(value)) throw new NullPointerException();
- host.plugin.getPluginManager().callEvent(new SubEditServerEvent(null, this, new NamedContainer("stop-cmd", value), false));
+ host.plugin.getPluginManager().callEvent(new SubEditServerEvent(null, this, new ContainedPair("stop-cmd", value), false));
if (!stopcmd.equals(value)) host.queue(new PacketExEditServer(this, PacketExEditServer.UpdateType.SET_STOP_COMMAND, value));
stopcmd = value;
}
@@ -580,7 +582,7 @@ public class ExternalSubServer extends SubServerImpl {
@Override
public void setStopAction(StopAction action) {
if (Util.isNull(action)) throw new NullPointerException();
- host.plugin.getPluginManager().callEvent(new SubEditServerEvent(null, this, new NamedContainer("stop-action", action), false));
+ host.plugin.getPluginManager().callEvent(new SubEditServerEvent(null, this, new ContainedPair("stop-action", action), false));
stopaction = action;
}
}
diff --git a/SubServers.Bungee/src/net/ME1312/SubServers/Bungee/Host/Internal/InternalSubCreator.java b/SubServers.Bungee/src/net/ME1312/SubServers/Bungee/Host/Internal/InternalSubCreator.java
index 66c1ba9d..6dfbb47d 100644
--- a/SubServers.Bungee/src/net/ME1312/SubServers/Bungee/Host/Internal/InternalSubCreator.java
+++ b/SubServers.Bungee/src/net/ME1312/SubServers/Bungee/Host/Internal/InternalSubCreator.java
@@ -5,8 +5,10 @@ import com.google.gson.Gson;
import net.ME1312.Galaxi.Library.*;
import net.ME1312.Galaxi.Library.Callback.Callback;
import net.ME1312.Galaxi.Library.Config.YAMLSection;
+import net.ME1312.Galaxi.Library.Container.ContainedPair;
import net.ME1312.Galaxi.Library.Container.Container;
-import net.ME1312.Galaxi.Library.Container.NamedContainer;
+import net.ME1312.Galaxi.Library.Container.Value;
+import net.ME1312.Galaxi.Library.Container.Pair;
import net.ME1312.Galaxi.Library.Map.ObjectMapValue;
import net.ME1312.SubServers.Bungee.Event.SubCreateEvent;
import net.ME1312.SubServers.Bungee.Event.SubCreatedEvent;
@@ -42,7 +44,7 @@ public class InternalSubCreator extends SubCreator {
private HashMap templates = new HashMap();
private InternalHost host;
private Range ports;
- private Container log;
+ private Value log;
private String gitBash;
private TreeMap thread;
@@ -379,13 +381,13 @@ public class InternalSubCreator extends SubCreator {
StackTraceElement[] origin = new Exception().getStackTrace();
if (port == null) {
- Container i = new Container(ports.lowerEndpoint() - 1);
+ Value i = new Container(ports.lowerEndpoint() - 1);
port = Util.getNew(getAllReservedAddresses(), () -> {
do {
- i.set(i.get() + 1);
- if (i.get() > ports.upperEndpoint()) throw new IllegalStateException("There are no more ports available in range: " + ports.toString());
- } while (!ports.contains(i.get()));
- return new InetSocketAddress(host.getAddress(), i.get());
+ i.value(i.value() + 1);
+ if (i.value() > ports.upperEndpoint()) throw new IllegalStateException("There are no more ports available in range: " + ports.toString());
+ } while (!ports.contains(i.value()));
+ return new InetSocketAddress(host.getAddress(), i.value());
}).getPort();
}
@@ -522,13 +524,13 @@ public class InternalSubCreator extends SubCreator {
@Override
public boolean isLogging() {
- return log.get();
+ return log.value();
}
@Override
public void setLogging(boolean value) {
if (Util.isNull(value)) throw new NullPointerException();
- log.set(value);
+ log.value(value);
}
@Override
@@ -554,15 +556,15 @@ public class InternalSubCreator extends SubCreator {
return getTemplates().get(name.toLowerCase());
}
- private static NamedContainer> subdata = null;
+ private static Pair> subdata = null;
private Map getSubData() {
- if (subdata == null || host.plugin.config.get() != subdata.name()) {
+ if (subdata == null || host.plugin.config.get() != subdata.key()) {
Map map = new HashMap();
map.put("Address", host.plugin.config.get().getMap("Settings").getMap("SubData").getRawString("Address", "127.0.0.1").replace("0.0.0.0", "127.0.0.1"));
if (host.plugin.config.get().getMap("Settings").getMap("SubData").getRawString("Password", "").length() > 0) map.put("Password", host.plugin.config.get().getMap("Settings").getMap("SubData").getRawString("Password"));
- subdata = new NamedContainer<>(host.plugin.config.get(), map);
+ subdata = new ContainedPair<>(host.plugin.config.get(), map);
}
- return subdata.get();
+ return subdata.value();
}
private void generateClient(File dir, ServerType type, String name) throws IOException {
diff --git a/SubServers.Bungee/src/net/ME1312/SubServers/Bungee/Host/Internal/InternalSubLogger.java b/SubServers.Bungee/src/net/ME1312/SubServers/Bungee/Host/Internal/InternalSubLogger.java
index 592d98a1..049277f2 100644
--- a/SubServers.Bungee/src/net/ME1312/SubServers/Bungee/Host/Internal/InternalSubLogger.java
+++ b/SubServers.Bungee/src/net/ME1312/SubServers/Bungee/Host/Internal/InternalSubLogger.java
@@ -2,7 +2,7 @@ package net.ME1312.SubServers.Bungee.Host.Internal;
import net.ME1312.SubServers.Bungee.Host.SubLogFilter;
import net.ME1312.SubServers.Bungee.Host.SubLogger;
-import net.ME1312.Galaxi.Library.Container.Container;
+import net.ME1312.Galaxi.Library.Container.Value;
import net.ME1312.Galaxi.Library.Util;
import net.ME1312.SubServers.Bungee.Library.Compatibility.Logger;
import net.ME1312.SubServers.Bungee.SubAPI;
@@ -24,7 +24,7 @@ public class InternalSubLogger extends SubLogger {
Process process;
private Object handle;
String name;
- Container log;
+ Value log;
private List filters = new CopyOnWriteArrayList<>();
File file;
private PrintWriter writer = null;
@@ -41,7 +41,7 @@ public class InternalSubLogger extends SubLogger {
* @param log Console Logging Status
* @param file File to log to (or null for disabled)
*/
- InternalSubLogger(Process process, Object user, String name, Container log, File file) {
+ InternalSubLogger(Process process, Object user, String name, Value log, File file) {
this.process = process;
this.handle = user;
this.name = name;
@@ -121,7 +121,7 @@ public class InternalSubLogger extends SubLogger {
}
// Filter Message
- boolean allow = (SubAPI.getInstance().getInternals().sudo == getHandler() && SubAPI.getInstance().getInternals().canSudo) || (log.get() && (SubAPI.getInstance().getInternals().sudo == null || !SubAPI.getInstance().getInternals().canSudo));
+ boolean allow = (SubAPI.getInstance().getInternals().sudo == getHandler() && SubAPI.getInstance().getInternals().canSudo) || (log.value() && (SubAPI.getInstance().getInternals().sudo == null || !SubAPI.getInstance().getInternals().canSudo));
List filters = new ArrayList();
filters.addAll(this.filters);
for (SubLogFilter filter : filters)
@@ -199,6 +199,6 @@ public class InternalSubLogger extends SubLogger {
@Override
public boolean isLogging() {
- return log.get();
+ return log.value();
}
}
diff --git a/SubServers.Bungee/src/net/ME1312/SubServers/Bungee/Host/Internal/InternalSubServer.java b/SubServers.Bungee/src/net/ME1312/SubServers/Bungee/Host/Internal/InternalSubServer.java
index 83f6051d..b05ddddc 100644
--- a/SubServers.Bungee/src/net/ME1312/SubServers/Bungee/Host/Internal/InternalSubServer.java
+++ b/SubServers.Bungee/src/net/ME1312/SubServers/Bungee/Host/Internal/InternalSubServer.java
@@ -1,13 +1,15 @@
package net.ME1312.SubServers.Bungee.Host.Internal;
+import net.ME1312.Galaxi.Library.Container.ContainedPair;
+import net.ME1312.Galaxi.Library.Container.Container;
import net.ME1312.SubServers.Bungee.Event.*;
import net.ME1312.SubServers.Bungee.Host.*;
import net.ME1312.Galaxi.Library.Map.ObjectMap;
import net.ME1312.Galaxi.Library.Map.ObjectMapValue;
-import net.ME1312.Galaxi.Library.Container.Container;
+import net.ME1312.Galaxi.Library.Container.Value;
import net.ME1312.SubServers.Bungee.Library.Compatibility.Logger;
import net.ME1312.SubServers.Bungee.Library.Exception.InvalidServerException;
-import net.ME1312.Galaxi.Library.Container.NamedContainer;
+import net.ME1312.Galaxi.Library.Container.Pair;
import net.ME1312.Galaxi.Library.UniversalFile;
import net.ME1312.Galaxi.Library.Util;
import net.ME1312.Galaxi.Library.Version.Version;
@@ -30,7 +32,7 @@ import java.util.jar.JarInputStream;
public class InternalSubServer extends SubServerImpl {
private InternalHost host;
private boolean enabled;
- private Container log;
+ private Value log;
private String dir;
private File directory;
private String executable;
@@ -287,7 +289,7 @@ public class InternalSubServer extends SubServerImpl {
for (String key : edit.getKeys()) {
pending.remove(key);
ObjectMapValue value = edit.get(key);
- SubEditServerEvent event = new SubEditServerEvent(player, this, new NamedContainer(key, value), perma);
+ SubEditServerEvent event = new SubEditServerEvent(player, this, new ContainedPair(key, value), perma);
host.plugin.getPluginManager().callEvent(event);
if (!event.isCancelled()) {
try {
@@ -397,7 +399,7 @@ public class InternalSubServer extends SubServerImpl {
break;
case "log":
if (value.isBoolean()) {
- log.set(value.asBoolean());
+ log.value(value.asBoolean());
if (perma && this.host.plugin.servers.get().getMap("Servers").getKeys().contains(getName())) {
this.host.plugin.servers.get().getMap("Servers").getMap(getName()).set("Log", isLogging());
this.host.plugin.servers.save();
@@ -577,20 +579,20 @@ public class InternalSubServer extends SubServerImpl {
@Override
public void setEnabled(boolean value) {
if (Util.isNull(value)) throw new NullPointerException();
- host.plugin.getPluginManager().callEvent(new SubEditServerEvent(null, this, new NamedContainer("enabled", value), false));
+ host.plugin.getPluginManager().callEvent(new SubEditServerEvent(null, this, new ContainedPair("enabled", value), false));
enabled = value;
}
@Override
public boolean isLogging() {
- return log.get();
+ return log.value();
}
@Override
public void setLogging(boolean value) {
if (Util.isNull(value)) throw new NullPointerException();
- host.plugin.getPluginManager().callEvent(new SubEditServerEvent(null, this, new NamedContainer("log", value), false));
- log.set(value);
+ host.plugin.getPluginManager().callEvent(new SubEditServerEvent(null, this, new ContainedPair("log", value), false));
+ log.value(value);
}
@Override
@@ -621,7 +623,7 @@ public class InternalSubServer extends SubServerImpl {
@Override
public void setStopCommand(String value) {
if (Util.isNull(value)) throw new NullPointerException();
- host.plugin.getPluginManager().callEvent(new SubEditServerEvent(null, this, new NamedContainer("stop-cmd", value), false));
+ host.plugin.getPluginManager().callEvent(new SubEditServerEvent(null, this, new ContainedPair("stop-cmd", value), false));
stopcmd = value;
}
@@ -633,7 +635,7 @@ public class InternalSubServer extends SubServerImpl {
@Override
public void setStopAction(StopAction action) {
if (Util.isNull(action)) throw new NullPointerException();
- host.plugin.getPluginManager().callEvent(new SubEditServerEvent(null, this, new NamedContainer("stop-action", action), false));
+ host.plugin.getPluginManager().callEvent(new SubEditServerEvent(null, this, new ContainedPair("stop-action", action), false));
stopaction = action;
}
}
diff --git a/SubServers.Bungee/src/net/ME1312/SubServers/Bungee/Host/Proxy.java b/SubServers.Bungee/src/net/ME1312/SubServers/Bungee/Host/Proxy.java
index f061e01b..2b635bfe 100644
--- a/SubServers.Bungee/src/net/ME1312/SubServers/Bungee/Host/Proxy.java
+++ b/SubServers.Bungee/src/net/ME1312/SubServers/Bungee/Host/Proxy.java
@@ -6,7 +6,7 @@ import net.ME1312.SubServers.Bungee.Event.SubRemoveProxyEvent;
import net.ME1312.Galaxi.Library.Map.ObjectMap;
import net.ME1312.Galaxi.Library.Map.ObjectMapValue;
import net.ME1312.Galaxi.Library.ExtraDataHandler;
-import net.ME1312.Galaxi.Library.Container.NamedContainer;
+import net.ME1312.Galaxi.Library.Container.Pair;
import net.ME1312.Galaxi.Library.Util;
import net.ME1312.SubData.Server.ClientHandler;
import net.ME1312.SubServers.Bungee.Network.Packet.PacketExSyncPlayer;
diff --git a/SubServers.Bungee/src/net/ME1312/SubServers/Bungee/Host/Server.java b/SubServers.Bungee/src/net/ME1312/SubServers/Bungee/Host/Server.java
index b1507f90..0d6ba2fe 100644
--- a/SubServers.Bungee/src/net/ME1312/SubServers/Bungee/Host/Server.java
+++ b/SubServers.Bungee/src/net/ME1312/SubServers/Bungee/Host/Server.java
@@ -1,7 +1,7 @@
package net.ME1312.SubServers.Bungee.Host;
import net.ME1312.Galaxi.Library.ExtraDataHandler;
-import net.ME1312.Galaxi.Library.Container.NamedContainer;
+import net.ME1312.Galaxi.Library.Container.Pair;
import net.ME1312.SubData.Server.ClientHandler;
import net.ME1312.SubData.Server.DataClient;
import net.md_5.bungee.api.config.ServerInfo;
diff --git a/SubServers.Bungee/src/net/ME1312/SubServers/Bungee/Host/ServerImpl.java b/SubServers.Bungee/src/net/ME1312/SubServers/Bungee/Host/ServerImpl.java
index c72814c2..6c6706ba 100644
--- a/SubServers.Bungee/src/net/ME1312/SubServers/Bungee/Host/ServerImpl.java
+++ b/SubServers.Bungee/src/net/ME1312/SubServers/Bungee/Host/ServerImpl.java
@@ -1,5 +1,6 @@
package net.ME1312.SubServers.Bungee.Host;
+import net.ME1312.Galaxi.Library.Container.ContainedPair;
import net.ME1312.SubData.Server.DataClient;
import net.ME1312.SubData.Server.SubDataClient;
import net.ME1312.SubServers.Bungee.Event.SubEditServerEvent;
@@ -8,7 +9,7 @@ import net.ME1312.SubServers.Bungee.Event.SubNetworkDisconnectEvent;
import net.ME1312.Galaxi.Library.Map.ObjectMap;
import net.ME1312.Galaxi.Library.Map.ObjectMapValue;
import net.ME1312.SubServers.Bungee.Library.Exception.InvalidServerException;
-import net.ME1312.Galaxi.Library.Container.NamedContainer;
+import net.ME1312.Galaxi.Library.Container.Pair;
import net.ME1312.Galaxi.Library.Util;
import net.ME1312.SubServers.Bungee.Network.Packet.PacketOutExRunEvent;
import net.ME1312.SubServers.Bungee.Network.Packet.PacketOutExUpdateWhitelist;
@@ -126,10 +127,10 @@ public class ServerImpl extends BungeeServerInfo implements Server {
@SuppressWarnings("deprecation")
public void setDisplayName(String value) {
if (value == null || value.length() == 0 || getName().equals(value)) {
- SubAPI.getInstance().getInternals().getPluginManager().callEvent(new SubEditServerEvent(null, this, new NamedContainer("display", getName()), false));
+ SubAPI.getInstance().getInternals().getPluginManager().callEvent(new SubEditServerEvent(null, this, new ContainedPair("display", getName()), false));
this.nick = null;
} else {
- SubAPI.getInstance().getInternals().getPluginManager().callEvent(new SubEditServerEvent(null, this, new NamedContainer("display", value), false));
+ SubAPI.getInstance().getInternals().getPluginManager().callEvent(new SubEditServerEvent(null, this, new ContainedPair("display", value), false));
this.nick = value;
}
}
@@ -177,14 +178,14 @@ public class ServerImpl extends BungeeServerInfo implements Server {
@SuppressWarnings("deprecation")
public void setHidden(boolean value) {
if (Util.isNull(value)) throw new NullPointerException();
- SubAPI.getInstance().getInternals().getPluginManager().callEvent(new SubEditServerEvent(null, this, new NamedContainer("hidden", value), false));
+ SubAPI.getInstance().getInternals().getPluginManager().callEvent(new SubEditServerEvent(null, this, new ContainedPair("hidden", value), false));
this.hidden = value;
}
@SuppressWarnings("deprecation")
public void setMotd(String value) {
if (Util.isNull(value)) throw new NullPointerException();
- SubAPI.getInstance().getInternals().getPluginManager().callEvent(new SubEditServerEvent(null, this, new NamedContainer("motd", value), false));
+ SubAPI.getInstance().getInternals().getPluginManager().callEvent(new SubEditServerEvent(null, this, new ContainedPair("motd", value), false));
try {
Util.reflect(BungeeServerInfo.class.getDeclaredField("motd"), this, value);
} catch (Exception e) {
@@ -195,7 +196,7 @@ public class ServerImpl extends BungeeServerInfo implements Server {
@SuppressWarnings("deprecation")
public void setRestricted(boolean value) {
if (Util.isNull(value)) throw new NullPointerException();
- SubAPI.getInstance().getInternals().getPluginManager().callEvent(new SubEditServerEvent(null, this, new NamedContainer("restricted", value), false));
+ SubAPI.getInstance().getInternals().getPluginManager().callEvent(new SubEditServerEvent(null, this, new ContainedPair("restricted", value), false));
try {
Util.reflect(BungeeServerInfo.class.getDeclaredField("restricted"), this, value);
} catch (Exception e) {
diff --git a/SubServers.Bungee/src/net/ME1312/SubServers/Bungee/Host/SubServerImpl.java b/SubServers.Bungee/src/net/ME1312/SubServers/Bungee/Host/SubServerImpl.java
index 9d6cf321..5cb9a9b7 100644
--- a/SubServers.Bungee/src/net/ME1312/SubServers/Bungee/Host/SubServerImpl.java
+++ b/SubServers.Bungee/src/net/ME1312/SubServers/Bungee/Host/SubServerImpl.java
@@ -1,9 +1,10 @@
package net.ME1312.SubServers.Bungee.Host;
+import net.ME1312.Galaxi.Library.Container.ContainedPair;
import net.ME1312.Galaxi.Library.Map.ObjectMap;
import net.ME1312.SubServers.Bungee.Event.SubEditServerEvent;
import net.ME1312.SubServers.Bungee.Library.Exception.InvalidServerException;
-import net.ME1312.Galaxi.Library.Container.NamedContainer;
+import net.ME1312.Galaxi.Library.Container.Pair;
import net.ME1312.SubServers.Bungee.SubAPI;
import java.io.File;
@@ -15,7 +16,7 @@ import java.util.*;
* SubServer Layout Class
*/
public abstract class SubServerImpl extends ServerImpl implements SubServer {
- private List> incompatibilities = new ArrayList>();
+ private List> incompatibilities = new ArrayList>();
private SubCreator.ServerTemplate templateV = null;
private String templateS = null;
protected boolean started;
@@ -107,14 +108,14 @@ public abstract class SubServerImpl extends ServerImpl implements SubServer {
@Override
public void setTemplate(String template) {
- SubAPI.getInstance().getInternals().getPluginManager().callEvent(new SubEditServerEvent(null, this, new NamedContainer("template", template), false));
+ SubAPI.getInstance().getInternals().getPluginManager().callEvent(new SubEditServerEvent(null, this, new ContainedPair("template", template), false));
this.templateV = null;
this.templateS = template;
}
@Override
public void setTemplate(SubCreator.ServerTemplate template) {
- SubAPI.getInstance().getInternals().getPluginManager().callEvent(new SubEditServerEvent(null, this, new NamedContainer("template", (template != null)?template.getName():null), false));
+ SubAPI.getInstance().getInternals().getPluginManager().callEvent(new SubEditServerEvent(null, this, new ContainedPair("template", (template != null)?template.getName():null), false));
this.templateV = template;
this.templateS = (template != null)?template.getName():null;
}
@@ -139,7 +140,7 @@ public abstract class SubServerImpl extends ServerImpl implements SubServer {
public void toggleCompatibility(SubServer... server) {
for (SubServer s : server) {
if (!equals(s)) {
- NamedContainer info = new NamedContainer(s.getHost().getName(), s.getName());
+ Pair info = new ContainedPair(s.getHost().getName(), s.getName());
if (isCompatible(s)) {
incompatibilities.add(info);
if (s.isCompatible(this)) toggleCompatibility(this);
@@ -153,17 +154,17 @@ public abstract class SubServerImpl extends ServerImpl implements SubServer {
@Override
public boolean isCompatible(SubServer server) {
- return !incompatibilities.contains(new NamedContainer(server.getHost().getName(), server.getName()));
+ return !incompatibilities.contains(new ContainedPair(server.getHost().getName(), server.getName()));
}
@Override
public List getIncompatibilities() {
List servers = new ArrayList();
- List> temp = new ArrayList>();
+ List> temp = new ArrayList>();
temp.addAll(incompatibilities);
- for (NamedContainer info : temp) {
+ for (Pair info : temp) {
try {
- SubServer server = SubAPI.getInstance().getHost(info.name()).getSubServer(info.get());
+ SubServer server = SubAPI.getInstance().getHost(info.key()).getSubServer(info.value());
if (server == null) throw new NullPointerException();
servers.add(server);
} catch (Throwable e) {
diff --git a/SubServers.Bungee/src/net/ME1312/SubServers/Bungee/Network/Packet/PacketOutExRunEvent.java b/SubServers.Bungee/src/net/ME1312/SubServers/Bungee/Network/Packet/PacketOutExRunEvent.java
index 0d2dc7a5..b256b869 100644
--- a/SubServers.Bungee/src/net/ME1312/SubServers/Bungee/Network/Packet/PacketOutExRunEvent.java
+++ b/SubServers.Bungee/src/net/ME1312/SubServers/Bungee/Network/Packet/PacketOutExRunEvent.java
@@ -148,8 +148,8 @@ public class PacketOutExRunEvent implements Listener, PacketObjectOut {
ObjectMap args = new ObjectMap();
if (event.getPlayer() != null) args.set("player", event.getPlayer().toString());
args.set("server", event.getServer().getName());
- args.set("edit", event.getEdit().name());
- args.set("value", event.getEdit().get().asObject());
+ args.set("edit", event.getEdit().key());
+ args.set("value", event.getEdit().value().asObject());
args.set("perm", event.isPermanent());
broadcast(new PacketOutExRunEvent(event.getClass(), args));
}
diff --git a/SubServers.Bungee/src/net/ME1312/SubServers/Bungee/Network/SubProtocol.java b/SubServers.Bungee/src/net/ME1312/SubServers/Bungee/Network/SubProtocol.java
index 281d8152..a926ab02 100644
--- a/SubServers.Bungee/src/net/ME1312/SubServers/Bungee/Network/SubProtocol.java
+++ b/SubServers.Bungee/src/net/ME1312/SubServers/Bungee/Network/SubProtocol.java
@@ -156,7 +156,7 @@ public class SubProtocol extends SubDataProtocol {
subdata.on.connect(client -> {
if (!plugin.getPluginManager().callEvent(new SubNetworkConnectEvent(client.getServer(), client)).isCancelled()) {
client.on.ready(c -> plugin.getPluginManager().callEvent(new SubNetworkLoginEvent(c.getServer(), c)));
- client.on.closed(c -> plugin.getPluginManager().callEvent(new SubNetworkDisconnectEvent(c.get().getServer(), c.get(), c.name())));
+ client.on.closed(c -> plugin.getPluginManager().callEvent(new SubNetworkDisconnectEvent(c.value().getServer(), c.value(), c.key())));
return true;
} else return false;
});
diff --git a/SubServers.Bungee/src/net/ME1312/SubServers/Bungee/SubAPI.java b/SubServers.Bungee/src/net/ME1312/SubServers/Bungee/SubAPI.java
index a59c45a2..95232ba4 100644
--- a/SubServers.Bungee/src/net/ME1312/SubServers/Bungee/SubAPI.java
+++ b/SubServers.Bungee/src/net/ME1312/SubServers/Bungee/SubAPI.java
@@ -1,6 +1,7 @@
package net.ME1312.SubServers.Bungee;
import com.google.common.collect.Range;
+import net.ME1312.Galaxi.Library.Container.ContainedPair;
import net.ME1312.SubData.Server.DataProtocol;
import net.ME1312.SubData.Server.DataServer;
import net.ME1312.SubServers.Bungee.Event.SubAddHostEvent;
@@ -9,7 +10,7 @@ import net.ME1312.SubServers.Bungee.Event.SubRemoveHostEvent;
import net.ME1312.SubServers.Bungee.Event.SubRemoveServerEvent;
import net.ME1312.SubServers.Bungee.Host.*;
import net.ME1312.SubServers.Bungee.Library.Exception.InvalidHostException;
-import net.ME1312.Galaxi.Library.Container.NamedContainer;
+import net.ME1312.Galaxi.Library.Container.Pair;
import net.ME1312.Galaxi.Library.UniversalFile;
import net.ME1312.Galaxi.Library.Util;
import net.ME1312.Galaxi.Library.Version.Version;
@@ -363,10 +364,10 @@ public final class SubAPI implements BungeeAPI {
* @param name Group name
* @return a Server Group
*/
- public NamedContainer> getGroup(String name) {
+ public Pair> getGroup(String name) {
if (Util.isNull(name)) throw new NullPointerException();
for (Map.Entry> group : getLowercaseGroups().entrySet()) {
- if (group.getKey().equalsIgnoreCase(name)) return new NamedContainer<>(group.getKey(), group.getValue());
+ if (group.getKey().equalsIgnoreCase(name)) return new ContainedPair<>(group.getKey(), group.getValue());
}
return null;
}
@@ -535,7 +536,7 @@ public final class SubAPI implements BungeeAPI {
}
/**
- * Get the Master Proxy Container
+ * Get the Master Proxy Value
*
* @return Master Proxy
*/
diff --git a/SubServers.Bungee/src/net/ME1312/SubServers/Bungee/SubCommand.java b/SubServers.Bungee/src/net/ME1312/SubServers/Bungee/SubCommand.java
index 3c1225fe..c9a300db 100644
--- a/SubServers.Bungee/src/net/ME1312/SubServers/Bungee/SubCommand.java
+++ b/SubServers.Bungee/src/net/ME1312/SubServers/Bungee/SubCommand.java
@@ -3,12 +3,13 @@ package net.ME1312.SubServers.Bungee;
import com.google.gson.Gson;
import net.ME1312.Galaxi.Library.Callback.Callback;
import net.ME1312.Galaxi.Library.Callback.ReturnRunnable;
+import net.ME1312.Galaxi.Library.Container.ContainedPair;
import net.ME1312.Galaxi.Library.Platform;
import net.ME1312.SubData.Server.SubDataClient;
import net.ME1312.SubServers.Bungee.Host.*;
import net.ME1312.SubServers.Bungee.Library.Compatibility.CommandX;
import net.ME1312.Galaxi.Library.Map.ObjectMap;
-import net.ME1312.Galaxi.Library.Container.NamedContainer;
+import net.ME1312.Galaxi.Library.Container.Pair;
import net.ME1312.Galaxi.Library.Util;
import net.ME1312.Galaxi.Library.Version.Version;
import net.ME1312.SubData.Server.ClientHandler;
@@ -41,17 +42,17 @@ import static net.ME1312.SubServers.Bungee.Library.Compatibility.Galaxi.GalaxiCo
*/
@SuppressWarnings("deprecation")
public final class SubCommand extends CommandX {
- static HashMap>> players = new HashMap>>();
+ static HashMap>> players = new HashMap>>();
private SubProxy plugin;
private String label;
- static NamedContainer newInstance(SubProxy plugin, String command) {
- NamedContainer cmd = new NamedContainer<>(new SubCommand(plugin, command), null);
- CommandX now = cmd.name();
+ static Pair newInstance(SubProxy plugin, String command) {
+ Pair cmd = new ContainedPair<>(new SubCommand(plugin, command), null);
+ CommandX now = cmd.key();
//if (plugin.api.getGameVersion()[plugin.api.getGameVersion().length - 1].compareTo(new Version("1.13")) >= 0) { // TODO Future Command Validator API?
// now = new net.ME1312.SubServers.Bungee.Library.Compatibility.mc1_13.CommandX(cmd.name());
//}
- cmd.set(now);
+ cmd.value(now);
return cmd;
}
@@ -175,7 +176,7 @@ public final class SubCommand extends CommandX {
message += ChatColor.GOLD + group + ChatColor.RESET + ": ";
List names = new ArrayList();
Map servers = plugin.api.getServers();
- for (Server server : plugin.api.getGroup(group).get()) names.add(server.getName());
+ for (Server server : plugin.api.getGroup(group).value()) names.add(server.getName());
Collections.sort(names);
for (String name : names) {
if (i != 0) message += div;
@@ -322,11 +323,11 @@ public final class SubCommand extends CommandX {
}
};
Runnable getGroup = () -> {
- NamedContainer> group = plugin.api.getGroup(name);
+ Pair> group = plugin.api.getGroup(name);
if (group != null) {
- sender.sendMessage("SubServers > Info on group: " + ChatColor.WHITE + group.name());
- sender.sendMessage(" -> Servers: " + ((group.get().size() <= 0)?ChatColor.GRAY + "(none)":ChatColor.AQUA.toString() + group.get().size()));
- for (Server server : group.get()) sender.sendMessage(" - " + ChatColor.WHITE + server.getDisplayName() + ((server.getName().equals(server.getDisplayName()))?"":" ["+server.getName()+']'));
+ sender.sendMessage("SubServers > Info on group: " + ChatColor.WHITE + group.key());
+ sender.sendMessage(" -> Servers: " + ((group.value().size() <= 0)?ChatColor.GRAY + "(none)":ChatColor.AQUA.toString() + group.value().size()));
+ for (Server server : group.value()) sender.sendMessage(" - " + ChatColor.WHITE + server.getDisplayName() + ((server.getName().equals(server.getDisplayName()))?"":" ["+server.getName()+']'));
} else {
if (type == null) {
getServer.run();
@@ -853,31 +854,31 @@ public final class SubCommand extends CommandX {
* @return The validator's response and list of possible arguments
*/
@SuppressWarnings("unchecked")
- public NamedContainer> suggestArguments(CommandSender sender, String[] args) {
+ public Pair> suggestArguments(CommandSender sender, String[] args) {
String Last = (args.length > 0)?args[args.length - 1]:"";
String last = Last.toLowerCase();
if (sender instanceof ProxiedPlayer && (!players.keySet().contains(((ProxiedPlayer) sender).getUniqueId()) || !players.get(((ProxiedPlayer) sender).getUniqueId()).keySet().contains(((ProxiedPlayer) sender).getServer().getInfo())
- || !players.get(((ProxiedPlayer) sender).getUniqueId()).get(((ProxiedPlayer) sender).getServer().getInfo()).get())) {
+ || !players.get(((ProxiedPlayer) sender).getUniqueId()).get(((ProxiedPlayer) sender).getServer().getInfo()).value())) {
if (players.keySet().contains(((ProxiedPlayer) sender).getUniqueId()) && players.get(((ProxiedPlayer) sender).getUniqueId()).keySet().contains(((ProxiedPlayer) sender).getServer().getInfo())
- && players.get(((ProxiedPlayer) sender).getUniqueId()).get(((ProxiedPlayer) sender).getServer().getInfo()).name() == null) {
+ && players.get(((ProxiedPlayer) sender).getUniqueId()).get(((ProxiedPlayer) sender).getServer().getInfo()).key() == null) {
// do nothing
} else if (!players.keySet().contains(((ProxiedPlayer) sender).getUniqueId()) || !players.get(((ProxiedPlayer) sender).getUniqueId()).keySet().contains(((ProxiedPlayer) sender).getServer().getInfo())
- || Calendar.getInstance().getTime().getTime() - players.get(((ProxiedPlayer) sender).getUniqueId()).get(((ProxiedPlayer) sender).getServer().getInfo()).name() >= TimeUnit.MINUTES.toMillis(1)) {
+ || Calendar.getInstance().getTime().getTime() - players.get(((ProxiedPlayer) sender).getUniqueId()).get(((ProxiedPlayer) sender).getServer().getInfo()).key() >= TimeUnit.MINUTES.toMillis(1)) {
if (!(((ProxiedPlayer) sender).getServer().getInfo() instanceof Server) || ((Server) ((ProxiedPlayer) sender).getServer().getInfo()).getSubData()[0] == null) {
- HashMap> map = (players.keySet().contains(((ProxiedPlayer) sender).getUniqueId()))?players.get(((ProxiedPlayer) sender).getUniqueId()):new HashMap>();
- map.put(((ProxiedPlayer) sender).getServer().getInfo(), new NamedContainer<>(Calendar.getInstance().getTime().getTime(), false));
+ HashMap> map = (players.keySet().contains(((ProxiedPlayer) sender).getUniqueId()))?players.get(((ProxiedPlayer) sender).getUniqueId()):new HashMap>();
+ map.put(((ProxiedPlayer) sender).getServer().getInfo(), new ContainedPair<>(Calendar.getInstance().getTime().getTime(), false));
players.put(((ProxiedPlayer) sender).getUniqueId(), map);
} else {
- HashMap> map = (players.keySet().contains(((ProxiedPlayer) sender).getUniqueId()))?players.get(((ProxiedPlayer) sender).getUniqueId()):new HashMap>();
- map.put(((ProxiedPlayer) sender).getServer().getInfo(), new NamedContainer<>(null, false));
+ HashMap> map = (players.keySet().contains(((ProxiedPlayer) sender).getUniqueId()))?players.get(((ProxiedPlayer) sender).getUniqueId()):new HashMap>();
+ map.put(((ProxiedPlayer) sender).getServer().getInfo(), new ContainedPair<>(null, false));
players.put(((ProxiedPlayer) sender).getUniqueId(), map);
((SubDataClient) ((Server) ((ProxiedPlayer) sender).getServer().getInfo()).getSubData()[0]).sendPacket(new PacketCheckPermission(((ProxiedPlayer) sender).getUniqueId(), "subservers.command", result -> {
- map.put(((ProxiedPlayer) sender).getServer().getInfo(), new NamedContainer<>(Calendar.getInstance().getTime().getTime(), result));
+ map.put(((ProxiedPlayer) sender).getServer().getInfo(), new ContainedPair<>(Calendar.getInstance().getTime().getTime(), result));
}));
}
}
- return new NamedContainer<>(null, Collections.emptyList());
+ return new ContainedPair<>(null, Collections.emptyList());
} else if (args.length <= 1) {
List cmds = new ArrayList<>();
cmds.addAll(Arrays.asList("help", "list", "info", "status", "version", "start", "restart", "stop", "kill", "terminate", "cmd", "command", "create", "update", "upgrade"));
@@ -886,7 +887,7 @@ public final class SubCommand extends CommandX {
for (String cmd : cmds) {
if (cmd.startsWith(last)) list.add(Last + cmd.substring(last.length()));
}
- return new NamedContainer<>((list.size() <= 0)?plugin.api.getLang("SubServers", "Command.Generic.Invalid-Subcommand").replace("$str$", args[0]):null, list);
+ return new ContainedPair<>((list.size() <= 0)?plugin.api.getLang("SubServers", "Command.Generic.Invalid-Subcommand").replace("$str$", args[0]):null, list);
} else {
if (args[0].equals("info") || args[0].equals("status")) {
ReturnRunnable> getPlayers = () -> {
@@ -933,7 +934,7 @@ public final class SubCommand extends CommandX {
if (!list.contains(player) && player.toLowerCase().startsWith(last))
list.add(Last + player.substring(last.length()));
}
- return new NamedContainer<>((list.size() <= 0)?plugin.api.getLang("SubServers", "Command.Info.Unknown").replace("$str$", args[0]):null, list);
+ return new ContainedPair<>((list.size() <= 0)?plugin.api.getLang("SubServers", "Command.Info.Unknown").replace("$str$", args[0]):null, list);
} else if (args.length == 3) {
List list = new ArrayList();
@@ -977,9 +978,9 @@ public final class SubCommand extends CommandX {
}
break;
}
- return new NamedContainer<>((list.size() <= 0)?plugin.api.getLang("SubServers", "Command.Info.Unknown").replace("$str$", args[0]):null, list);
+ return new ContainedPair<>((list.size() <= 0)?plugin.api.getLang("SubServers", "Command.Info.Unknown").replace("$str$", args[0]):null, list);
} else {
- return new NamedContainer<>(null, Collections.emptyList());
+ return new ContainedPair<>(null, Collections.emptyList());
}
} else if (!(sender instanceof ProxiedPlayer) && (args[0].equals("reload") || args[0].equals("restore"))) {
if (args[0].equals("reload")) {
@@ -989,15 +990,15 @@ public final class SubCommand extends CommandX {
for (String complete : completes) {
if (complete.toLowerCase().startsWith(last)) list.add(Last + complete.substring(last.length()));
}
- return new NamedContainer<>((list.size() <= 0)?plugin.api.getLang("SubServers", "Command.Generic.Unknown").replace("$str$", args[0]):null, list);
+ return new ContainedPair<>((list.size() <= 0)?plugin.api.getLang("SubServers", "Command.Generic.Unknown").replace("$str$", args[0]):null, list);
} else {
- return new NamedContainer<>(null, Collections.emptyList());
+ return new ContainedPair<>(null, Collections.emptyList());
}
} else /* if (args[0].equals("restore")) */ {
if (args.length == 2) {
- return new NamedContainer<>(null, Collections.singletonList(""));
+ return new ContainedPair<>(null, Collections.singletonList(""));
} else {
- return new NamedContainer<>(null, Collections.emptyList());
+ return new ContainedPair<>(null, Collections.emptyList());
}
}
} else if (args[0].equals("start") ||
@@ -1023,7 +1024,7 @@ public final class SubCommand extends CommandX {
if (Arrays.binarySearch(select.selection, name.toLowerCase()) < 0 && name.toLowerCase().startsWith(last)) list.add(Last + name.substring(last.length()));
}
}
- return new NamedContainer<>((list.size() <= 0)?plugin.api.getLang("SubServers", "Command.Generic.Unknown-Host").replace("$str$", select.last):null, list);
+ return new ContainedPair<>((list.size() <= 0)?plugin.api.getLang("SubServers", "Command.Generic.Unknown-Host").replace("$str$", select.last):null, list);
} else if (last.startsWith(":")) {
Map> groups = plugin.api.getGroups();
if (groups.size() > 0) {
@@ -1034,7 +1035,7 @@ public final class SubCommand extends CommandX {
if (Arrays.binarySearch(select.selection, group.toLowerCase()) < 0 && group.toLowerCase().startsWith(last)) list.add(Last + group.substring(last.length()));
}
}
- return new NamedContainer<>((list.size() <= 0)?plugin.api.getLang("SubServers", "Command.Generic.Unknown-Group").replace("$str$", select.last):null, list);
+ return new ContainedPair<>((list.size() <= 0)?plugin.api.getLang("SubServers", "Command.Generic.Unknown-Group").replace("$str$", select.last):null, list);
} else {
Map subservers = plugin.api.getSubServers();
if (subservers.size() > 0) {
@@ -1044,31 +1045,31 @@ public final class SubCommand extends CommandX {
if (Arrays.binarySearch(select.selection, server.getName().toLowerCase()) < 0 && server.getName().toLowerCase().startsWith(last)) list.add(Last + server.getName().substring(last.length()));
}
}
- return new NamedContainer<>((list.size() <= 0)?plugin.api.getLang("SubServers", "Command.Generic.Unknown-SubServer").replace("$str$", select.last):null, list);
+ return new ContainedPair<>((list.size() <= 0)?plugin.api.getLang("SubServers", "Command.Generic.Unknown-SubServer").replace("$str$", select.last):null, list);
}
} else if (args[0].equals("cmd") || args[0].equals("command")) {
if (select.args.length == 3) {
- return new NamedContainer<>(null, Collections.singletonList(""));
+ return new ContainedPair<>(null, Collections.singletonList(""));
} else {
- return new NamedContainer<>(null, Collections.singletonList("[Args...]"));
+ return new ContainedPair<>(null, Collections.singletonList("[Args...]"));
}
} else if (args[0].equals("update") || args[0].equals("upgrade")) {
if (select.args.length == 3) {
- return new NamedContainer<>(null, Arrays.asList("[Template]", "[Version]"));
+ return new ContainedPair<>(null, Arrays.asList("[Template]", "[Version]"));
} else if (select.args.length == 4) {
- return new NamedContainer<>(null, Collections.singletonList(""));
+ return new ContainedPair<>(null, Collections.singletonList(""));
}
}
- return new NamedContainer<>(null, Collections.emptyList());
+ return new ContainedPair<>(null, Collections.emptyList());
} else if (args[0].equals("create")) {
if (args.length == 2) {
- return new NamedContainer<>(null, Collections.singletonList(""));
+ return new ContainedPair<>(null, Collections.singletonList(""));
} else if (args.length == 3) {
List list = new ArrayList();
for (Host host : plugin.api.getHosts().values()) {
if (host.getName().toLowerCase().startsWith(last)) list.add(Last + host.getName().substring(last.length()));
}
- return new NamedContainer<>((list.size() <= 0)?plugin.api.getLang("SubServers", "Command.Generic.Unknown-Host").replace("$str$", args[0]):null, list);
+ return new ContainedPair<>((list.size() <= 0)?plugin.api.getLang("SubServers", "Command.Generic.Unknown-Host").replace("$str$", args[0]):null, list);
} else if (args.length == 4) {
List list = new ArrayList();
Map hosts = plugin.api.getHosts();
@@ -1079,18 +1080,18 @@ public final class SubCommand extends CommandX {
if (template.getName().toLowerCase().startsWith(last)) list.add(Last + template.getName().substring(last.length()));
}
}
- return new NamedContainer<>((list.size() <= 0)?plugin.api.getLang("SubServers", "Command.Creator.Invalid-Template").replace("$str$", args[0]):null, list);
+ return new ContainedPair<>((list.size() <= 0)?plugin.api.getLang("SubServers", "Command.Creator.Invalid-Template").replace("$str$", args[0]):null, list);
} else if (args.length == 5) {
- return new NamedContainer<>(null, Collections.singletonList("[Version]"));
+ return new ContainedPair<>(null, Collections.singletonList("[Version]"));
} else if (args.length == 6) {
if (last.length() > 0) {
if (Util.isException(() -> Integer.parseInt(last)) || Integer.parseInt(last) <= 0 || Integer.parseInt(last) > 65535) {
- return new NamedContainer<>(plugin.api.getLang("SubServers", "Command.Creator.Invalid-Port"), Collections.emptyList());
+ return new ContainedPair<>(plugin.api.getLang("SubServers", "Command.Creator.Invalid-Port"), Collections.emptyList());
}
}
- return new NamedContainer<>(null, Collections.singletonList("[Port]"));
+ return new ContainedPair<>(null, Collections.singletonList("[Port]"));
} else {
- return new NamedContainer<>(null, Collections.emptyList());
+ return new ContainedPair<>(null, Collections.emptyList());
}
} else if (sender instanceof ProxiedPlayer && (args[0].equals("tp") || args[0].equals("teleport"))) {
if (args.length == 2 || args.length == 3) {
@@ -1119,12 +1120,12 @@ public final class SubCommand extends CommandX {
for (Server server : plugin.api.getServers().values()) {
if (server.getName().toLowerCase().startsWith(last)) list.add(Last + server.getName().substring(last.length()));
}
- return new NamedContainer<>((list.size() <= 0)?plugin.api.getLang("SubServers", "Command.Generic.Unknown-Server").replace("$str$", args[0]):null, list);
+ return new ContainedPair<>((list.size() <= 0)?plugin.api.getLang("SubServers", "Command.Generic.Unknown-Server").replace("$str$", args[0]):null, list);
} else {
- return new NamedContainer<>(null, Collections.emptyList());
+ return new ContainedPair<>(null, Collections.emptyList());
}
} else {
- return new NamedContainer<>(plugin.api.getLang("SubServers", "Command.Generic.Invalid-Subcommand").replace("$str$", args[0]), Collections.emptyList());
+ return new ContainedPair<>(plugin.api.getLang("SubServers", "Command.Generic.Invalid-Subcommand").replace("$str$", args[0]), Collections.emptyList());
}
}
}
@@ -1149,13 +1150,13 @@ public final class SubCommand extends CommandX {
);
}
- static NamedContainer newInstance(SubProxy plugin, String command) {
- NamedContainer cmd = new NamedContainer<>(new BungeeServer(plugin, command), null);
- CommandX now = cmd.name();
+ static Pair newInstance(SubProxy plugin, String command) {
+ Pair cmd = new ContainedPair<>(new BungeeServer(plugin, command), null);
+ CommandX now = cmd.key();
//if (plugin.api.getGameVersion()[plugin.api.getGameVersion().length - 1].compareTo(new Version("1.13")) >= 0) { // TODO Future Command Validator API?
// now = new net.ME1312.SubServers.Bungee.Library.Compatibility.mc1_13.CommandX(cmd.name());
//}
- cmd.set(now);
+ cmd.value(now);
return cmd;
}
@@ -1211,16 +1212,16 @@ public final class SubCommand extends CommandX {
* @param args Arguments
* @return The validator's response and list of possible arguments
*/
- public NamedContainer> suggestArguments(CommandSender sender, String[] args) {
+ public Pair> suggestArguments(CommandSender sender, String[] args) {
if (args.length <= 1) {
String last = (args.length > 0)?args[args.length - 1].toLowerCase():"";
List list = new ArrayList();
for (Server server : plugin.api.getServers().values()) {
if (server.getName().toLowerCase().startsWith(last) && !server.isHidden()) list.add(server.getName());
}
- return new NamedContainer<>((list.size() <= 0)?plugin.api.getLang("SubServers", "Bungee.Server.Invalid").replace("$str$", args[0]):null, list);
+ return new ContainedPair<>((list.size() <= 0)?plugin.api.getLang("SubServers", "Bungee.Server.Invalid").replace("$str$", args[0]):null, list);
} else {
- return new NamedContainer<>(null, Collections.emptyList());
+ return new ContainedPair<>(null, Collections.emptyList());
}
}
}
diff --git a/SubServers.Bungee/src/net/ME1312/SubServers/Bungee/SubProxy.java b/SubServers.Bungee/src/net/ME1312/SubServers/Bungee/SubProxy.java
index 2237f82b..1c2a6b7e 100644
--- a/SubServers.Bungee/src/net/ME1312/SubServers/Bungee/SubProxy.java
+++ b/SubServers.Bungee/src/net/ME1312/SubServers/Bungee/SubProxy.java
@@ -3,7 +3,7 @@ package net.ME1312.SubServers.Bungee;
import com.dosse.upnp.UPnP;
import com.google.common.collect.Range;
import com.google.gson.Gson;
-import net.ME1312.Galaxi.Library.Container.PrimitiveContainer;
+import net.ME1312.Galaxi.Library.Container.Container;
import net.ME1312.Galaxi.Library.Map.ObjectMap;
import net.ME1312.Galaxi.Library.UniversalFile;
import net.ME1312.Galaxi.Library.Util;
@@ -85,7 +85,7 @@ public final class SubProxy extends BungeeCommon implements Listener {
public SubProtocol subprotocol;
public SubDataServer subdata = null;
public SubServer sudo = null;
- public static final Version version = Version.fromString("2.16.4a");
+ public static final Version version = Version.fromString("2.17a");
public final Proxy mProxy;
public boolean canSudo = false;
@@ -657,13 +657,13 @@ public final class SubProxy extends BungeeCommon implements Listener {
private void post() {
if (!config.get().getMap("Settings").getRawStringList("Disabled-Overrides", Collections.emptyList()).contains("/server"))
- getPluginManager().registerCommand(plugin, SubCommand.BungeeServer.newInstance(this, "server").get());
+ getPluginManager().registerCommand(plugin, SubCommand.BungeeServer.newInstance(this, "server").value());
if (!config.get().getMap("Settings").getRawStringList("Disabled-Overrides", Collections.emptyList()).contains("/glist"))
getPluginManager().registerCommand(plugin, new SubCommand.BungeeList(this, "glist"));
- getPluginManager().registerCommand(plugin, SubCommand.newInstance(this, "subservers").get());
- getPluginManager().registerCommand(plugin, SubCommand.newInstance(this, "subserver").get());
- getPluginManager().registerCommand(plugin, SubCommand.newInstance(this, "sub").get());
+ getPluginManager().registerCommand(plugin, SubCommand.newInstance(this, "subservers").value());
+ getPluginManager().registerCommand(plugin, SubCommand.newInstance(this, "subserver").value());
+ getPluginManager().registerCommand(plugin, SubCommand.newInstance(this, "sub").value());
GalaxiCommand.group(SubCommand.class);
if (getReconnectHandler() != null && getReconnectHandler().getClass().equals(SmartFallback.class))
@@ -876,7 +876,7 @@ public final class SubProxy extends BungeeCommon implements Listener {
if (!e.getConnection().getListener().isPingPassthrough()) {
e.setResponse(new ServerPing(e.getResponse().getVersion(), e.getResponse().getPlayers(), new TextComponent(override.getMotd()), null));
} else {
- PrimitiveContainer lock = new PrimitiveContainer<>(true);
+ Container lock = new Container<>(true);
boolean mode = plugin != null;
if (mode) e.registerIntent(plugin);
((BungeeServerInfo) override).ping((ping, error) -> {
diff --git a/SubServers.Client/Bukkit/pom.xml b/SubServers.Client/Bukkit/pom.xml
index 7575ab51..5ec2f5b3 100644
--- a/SubServers.Client/Bukkit/pom.xml
+++ b/SubServers.Client/Bukkit/pom.xml
@@ -48,7 +48,7 @@
net.ME1312.Galaxi
GalaxiUtil
- 20w33a
+ 20w46b
compile
true
@@ -62,7 +62,7 @@
net.ME1312.SubData
Client
- 20w46b
+ 20w46d
compile
true
diff --git a/SubServers.Client/Bukkit/src/net/ME1312/SubServers/Client/Bukkit/Event/SubEditServerEvent.java b/SubServers.Client/Bukkit/src/net/ME1312/SubServers/Client/Bukkit/Event/SubEditServerEvent.java
index 31343e91..599f7030 100644
--- a/SubServers.Client/Bukkit/src/net/ME1312/SubServers/Client/Bukkit/Event/SubEditServerEvent.java
+++ b/SubServers.Client/Bukkit/src/net/ME1312/SubServers/Client/Bukkit/Event/SubEditServerEvent.java
@@ -1,8 +1,9 @@
package net.ME1312.SubServers.Client.Bukkit.Event;
+import net.ME1312.Galaxi.Library.Container.ContainedPair;
import net.ME1312.Galaxi.Library.Map.ObjectMap;
import net.ME1312.Galaxi.Library.Map.ObjectMapValue;
-import net.ME1312.Galaxi.Library.Container.NamedContainer;
+import net.ME1312.Galaxi.Library.Container.Pair;
import net.ME1312.SubServers.Client.Bukkit.Library.SubEvent;
import net.ME1312.Galaxi.Library.Util;
import org.bukkit.event.Event;
@@ -16,7 +17,7 @@ import java.util.UUID;
public class SubEditServerEvent extends Event implements SubEvent {
private UUID player;
private String server;
- private NamedContainer> edit;
+ private Pair> edit;
private boolean perm;
/**
@@ -27,13 +28,13 @@ public class SubEditServerEvent extends Event implements SubEvent {
* @param edit Edit to make
* @param permanent If the change is permanent
*/
- public SubEditServerEvent(UUID player, String server, NamedContainer edit, boolean permanent) {
+ public SubEditServerEvent(UUID player, String server, Pair edit, boolean permanent) {
if (Util.isNull(server, edit)) throw new NullPointerException();
ObjectMap section = new ObjectMap();
- section.set(".", edit.get());
+ section.set(".", edit.value());
this.player = player;
this.server = server;
- this.edit = new NamedContainer>(edit.name(), section.contains(".")?section.get("."):null);
+ this.edit = new ContainedPair>(edit.key(), section.contains(".")?section.get("."):null);
this.perm = permanent;
}
@@ -56,7 +57,7 @@ public class SubEditServerEvent extends Event implements SubEvent {
*
* @return Edit to be made
*/
- public NamedContainer> getEdit() {
+ public Pair> getEdit() {
return edit;
}
diff --git a/SubServers.Client/Bukkit/src/net/ME1312/SubServers/Client/Bukkit/Graphic/DefaultUIHandler.java b/SubServers.Client/Bukkit/src/net/ME1312/SubServers/Client/Bukkit/Graphic/DefaultUIHandler.java
index 432d44c0..1ad16569 100644
--- a/SubServers.Client/Bukkit/src/net/ME1312/SubServers/Client/Bukkit/Graphic/DefaultUIHandler.java
+++ b/SubServers.Client/Bukkit/src/net/ME1312/SubServers/Client/Bukkit/Graphic/DefaultUIHandler.java
@@ -2,6 +2,7 @@ package net.ME1312.SubServers.Client.Bukkit.Graphic;
import net.ME1312.Galaxi.Library.Config.YAMLSection;
import net.ME1312.Galaxi.Library.Container.Container;
+import net.ME1312.Galaxi.Library.Container.Value;
import net.ME1312.Galaxi.Library.Callback.Callback;
import net.ME1312.Galaxi.Library.Map.ObjectMap;
import net.ME1312.Galaxi.Library.Util;
@@ -220,18 +221,18 @@ public class DefaultUIHandler implements UIHandler, Listener {
gui.back();
} else {
player.closeInventory();
- final Container> plugin = new Container>(null);
+ final Value> plugin = new Container>(null);
for (PluginRenderer renderer : DefaultUIRenderer.hostPlugins.values()) {
- if (item.equals(renderer.getIcon().getItemMeta().getDisplayName())) plugin.set(renderer);
+ if (item.equals(renderer.getIcon().getItemMeta().getDisplayName())) plugin.value(renderer);
}
- if (plugin.get() == null) {
+ if (plugin.value() == null) {
gui.reopen();
} else {
gui.setDownloading(ChatColor.stripColor(this.plugin.api.getLang("SubServers", "Interface.Host-Plugin.Title").replace("$str$", ((Host) gui.lastVisitedObjects[0]).getName())));
this.plugin.api.getHost(((Host) gui.lastVisitedObjects[0]).getName(), host -> {
if (host != null) {
gui.setDownloading(null);
- plugin.get().open(player, host);
+ plugin.value().open(player, host);
} else {
gui.back();
}
@@ -348,12 +349,12 @@ public class DefaultUIHandler implements UIHandler, Listener {
player.closeInventory();
if (permits((SubServer) gui.lastVisitedObjects[0], player, "subservers.subserver.%.*", "subservers.subserver.%.stop")) {
gui.setDownloading(plugin.api.getLang("SubServers", "Interface.Generic.Downloading.Response"));
- final Container listening = new Container(true);
+ final Value listening = new Container(true);
PacketInExRunEvent.callback("SubStoppedEvent", new Callback>() {
@Override
public void run(ObjectMap json) {
try {
- if (listening.get()) if (!json.getString("server").equalsIgnoreCase(((SubServer) gui.lastVisitedObjects[0]).getName())) {
+ if (listening.value()) if (!json.getString("server").equalsIgnoreCase(((SubServer) gui.lastVisitedObjects[0]).getName())) {
PacketInExRunEvent.callback("SubStoppedEvent", this);
} else {
Bukkit.getScheduler().runTaskLater(plugin, gui::reopen, 5);
@@ -364,7 +365,7 @@ public class DefaultUIHandler implements UIHandler, Listener {
((SubServer) gui.lastVisitedObjects[0]).stop(player.getUniqueId(), response -> {
if (response != 0) {
gui.reopen();
- listening.set(false);
+ listening.value(false);
} else gui.setDownloading(plugin.api.getLang("SubServers", "Interface.SubServer-Admin.Stop.Title").replace("$str$", ((SubServer) gui.lastVisitedObjects[0]).getName()));
});
} else gui.reopen();
@@ -372,12 +373,12 @@ public class DefaultUIHandler implements UIHandler, Listener {
player.closeInventory();
if (permits((SubServer) gui.lastVisitedObjects[0], player, "subservers.subserver.%.*", "subservers.subserver.%.terminate")) {
gui.setDownloading(plugin.api.getLang("SubServers", "Interface.Generic.Downloading.Response"));
- final Container listening = new Container(true);
+ final Value listening = new Container(true);
PacketInExRunEvent.callback("SubStoppedEvent", new Callback>() {
@Override
public void run(ObjectMap json) {
try {
- if (listening.get()) if (!json.getString("server").equalsIgnoreCase(((SubServer) gui.lastVisitedObjects[0]).getName())) {
+ if (listening.value()) if (!json.getString("server").equalsIgnoreCase(((SubServer) gui.lastVisitedObjects[0]).getName())) {
PacketInExRunEvent.callback("SubStoppedEvent", this);
} else {
gui.reopen();
@@ -388,7 +389,7 @@ public class DefaultUIHandler implements UIHandler, Listener {
((SubServer) gui.lastVisitedObjects[0]).terminate(player.getUniqueId(), response -> {
if (response != 0) {
gui.reopen();
- listening.set(false);
+ listening.value(false);
} else gui.setDownloading(plugin.api.getLang("SubServers", "Interface.SubServer-Admin.Terminate.Title").replace("$str$", ((SubServer) gui.lastVisitedObjects[0]).getName()));
});
} else gui.reopen();
@@ -425,18 +426,18 @@ public class DefaultUIHandler implements UIHandler, Listener {
gui.back();
} else {
player.closeInventory();
- Container> plugin = new Container>(null);
+ Value> plugin = new Container>(null);
for (PluginRenderer renderer : DefaultUIRenderer.subserverPlugins.values()) {
- if (item.equals(renderer.getIcon().getItemMeta().getDisplayName())) plugin.set(renderer);
+ if (item.equals(renderer.getIcon().getItemMeta().getDisplayName())) plugin.value(renderer);
}
- if (plugin.get() == null) {
+ if (plugin.value() == null) {
gui.reopen();
} else {
gui.setDownloading(ChatColor.stripColor(this.plugin.api.getLang("SubServers", "Interface.SubServer-Plugin.Title").replace("$str$", ((SubServer) gui.lastVisitedObjects[0]).getName())));
this.plugin.api.getSubServer(((SubServer) gui.lastVisitedObjects[0]).getName(), subserver -> {
if (subserver != null) {
gui.setDownloading(null);
- plugin.get().open(player, subserver);
+ plugin.value().open(player, subserver);
} else {
gui.back();
}
diff --git a/SubServers.Client/Bukkit/src/net/ME1312/SubServers/Client/Bukkit/Graphic/DefaultUIRenderer.java b/SubServers.Client/Bukkit/src/net/ME1312/SubServers/Client/Bukkit/Graphic/DefaultUIRenderer.java
index 3b43ed6c..6fa68421 100644
--- a/SubServers.Client/Bukkit/src/net/ME1312/SubServers/Client/Bukkit/Graphic/DefaultUIRenderer.java
+++ b/SubServers.Client/Bukkit/src/net/ME1312/SubServers/Client/Bukkit/Graphic/DefaultUIRenderer.java
@@ -1,7 +1,9 @@
package net.ME1312.SubServers.Client.Bukkit.Graphic;
+import net.ME1312.Galaxi.Library.Container.ContainedPair;
import net.ME1312.Galaxi.Library.Container.Container;
-import net.ME1312.Galaxi.Library.Container.NamedContainer;
+import net.ME1312.Galaxi.Library.Container.Value;
+import net.ME1312.Galaxi.Library.Container.Pair;
import net.ME1312.Galaxi.Library.Version.Version;
import net.ME1312.SubServers.Client.Common.Network.API.Host;
import net.ME1312.SubServers.Client.Common.Network.API.Server;
@@ -116,16 +118,16 @@ public class DefaultUIRenderer extends UIRenderer {
i = ((count < 9) ? ((9 - count) / 2) : 0);
boolean even = (count & 1) == 0 && count < 9;
- NamedContainer enabled, disabled;
+ Pair enabled, disabled;
for (Host host : index) {
if (index.indexOf(host) >= min && index.indexOf(host) <= max) {
if (even && (i == 4 || i == 13 || i == 22 || i == 31)) inv.setItem(i++, adiv);
- enabled = (((i & 1) == 0) ? new NamedContainer<>("BLUE_STAINED_GLASS_PANE", (short) 3) : new NamedContainer<>("LIGHT_BLUE_STAINED_GLASS_PANE", (short) 11));
- disabled = (((i & 1) == 0) ? new NamedContainer<>("MAGENTA_STAINED_GLASS_PANE", (short) 2) : new NamedContainer<>("RED_STAINED_GLASS_PANE", (short) 14));
+ enabled = (((i & 1) == 0) ? new ContainedPair<>("BLUE_STAINED_GLASS_PANE", (short) 3) : new ContainedPair<>("LIGHT_BLUE_STAINED_GLASS_PANE", (short) 11));
+ disabled = (((i & 1) == 0) ? new ContainedPair<>("MAGENTA_STAINED_GLASS_PANE", (short) 2) : new ContainedPair<>("RED_STAINED_GLASS_PANE", (short) 14));
if (host.isAvailable() && host.isEnabled()) {
- block = createItem("STAINED_GLASS_PANE", enabled.name(), enabled.get());
+ block = createItem("STAINED_GLASS_PANE", enabled.key(), enabled.value());
blockMeta = block.getItemMeta();
blockMeta.setDisplayName(ChatColor.AQUA + host.getDisplayName());
LinkedList lore = new LinkedList();
@@ -135,7 +137,7 @@ public class DefaultUIRenderer extends UIRenderer {
if (plugin.config.get().getMap("Settings").getBoolean("Show-Addresses", false)) lore.add(ChatColor.WHITE + host.getAddress().getHostAddress());
blockMeta.setLore(lore);
} else {
- block = createItem("STAINED_GLASS_PANE", disabled.name(), disabled.get());
+ block = createItem("STAINED_GLASS_PANE", disabled.key(), disabled.value());
blockMeta = block.getItemMeta();
blockMeta.setDisplayName(ChatColor.RED + host.getDisplayName());
LinkedList lore = new LinkedList();
@@ -709,14 +711,14 @@ public class DefaultUIRenderer extends UIRenderer {
i = ((count < 9) ? ((9 - count) / 2) : 0);
boolean even = (count & 1) == 0 && count < 9;
- NamedContainer color;
+ Pair color;
for (String group : index) {
if (index.indexOf(group) >= min && index.indexOf(group) <= max) {
if (even && (i == 4 || i == 13 || i == 22 || i == 31)) inv.setItem(i++, adiv);
- color = (((i & 1) == 0) ? new NamedContainer<>("ORANGE_STAINED_GLASS_PANE", (short) 1) : new NamedContainer<>("YELLOW_STAINED_GLASS_PANE", (short) 4));
+ color = (((i & 1) == 0) ? new ContainedPair<>("ORANGE_STAINED_GLASS_PANE", (short) 1) : new ContainedPair<>("YELLOW_STAINED_GLASS_PANE", (short) 4));
- block = createItem("STAINED_GLASS_PANE", color.name(), color.get());
+ block = createItem("STAINED_GLASS_PANE", color.key(), color.value());
blockMeta = block.getItemMeta();
blockMeta.setDisplayName(ChatColor.GOLD + group);
LinkedList lore = new LinkedList();
@@ -785,13 +787,13 @@ public class DefaultUIRenderer extends UIRenderer {
public void serverMenu(final int page, final String host, final String group) {
setDownloading(ChatColor.stripColor((host == null)?((group == null)?plugin.api.getLang("SubServers", "Interface.Server-Menu.Title"):plugin.api.getLang("SubServers", "Interface.Group-SubServer.Title").replace("$str$", group)):plugin.api.getLang("SubServers", "Interface.Host-SubServer.Title").replace("$str$", host)));
- Container hostname = new Container(host);
- Container> servercontainer = new Container>(new LinkedList());
+ Value hostname = new Container