diff --git a/SubServers.Bungee/pom.xml b/SubServers.Bungee/pom.xml
index cc9699a1..c44971f0 100644
--- a/SubServers.Bungee/pom.xml
+++ b/SubServers.Bungee/pom.xml
@@ -30,13 +30,13 @@
net.ME1312.Galaxi
GalaxiUtil
- 19w20a
+ 19w20b
compile
net.ME1312.SubData
Server
- 19w20f
+ 19w20g
compile
diff --git a/SubServers.Bungee/src/net/ME1312/SubServers/Bungee/Host/External/ExternalHost.java b/SubServers.Bungee/src/net/ME1312/SubServers/Bungee/Host/External/ExternalHost.java
index 2a4abe72..67ca0a59 100644
--- a/SubServers.Bungee/src/net/ME1312/SubServers/Bungee/Host/External/ExternalHost.java
+++ b/SubServers.Bungee/src/net/ME1312/SubServers/Bungee/Host/External/ExternalHost.java
@@ -62,7 +62,7 @@ public class ExternalHost extends Host implements ClientHandler {
this.queue = new LinkedList();
this.clean = false;
- setSubData(null, 0);
+ subdata.put(0, null);
}
@Override
@@ -365,4 +365,13 @@ public class ExternalHost extends Host implements ClientHandler {
}));
return true;
}
+
+ @Override
+ public ObjectMap forSubData() {
+ ObjectMap hinfo = super.forSubData();
+ ObjectMap subdata = new ObjectMap();
+ for (int channel : this.subdata.keySet()) subdata.set(channel, (this.subdata.get(channel) == null)?null:this.subdata.get(channel).getID());
+ hinfo.set("subdata", subdata);
+ return hinfo;
+ }
}
diff --git a/SubServers.Bungee/src/net/ME1312/SubServers/Bungee/Host/Host.java b/SubServers.Bungee/src/net/ME1312/SubServers/Bungee/Host/Host.java
index f70ebf60..b375171b 100644
--- a/SubServers.Bungee/src/net/ME1312/SubServers/Bungee/Host/Host.java
+++ b/SubServers.Bungee/src/net/ME1312/SubServers/Bungee/Host/Host.java
@@ -450,11 +450,6 @@ public abstract class Host implements ExtraDataHandler {
servers.set(server.getName(), server.forSubData());
}
hinfo.set("servers", servers);
- if (this instanceof ClientHandler) {
- LinkedList subdata = new LinkedList();
- for (DataClient client : ((ClientHandler) this).getSubData()) subdata.add((client == null)?null:client.getID());
- hinfo.set("subdata", subdata);
- }
hinfo.set("signature", signature);
hinfo.set("extra", getExtra());
return hinfo;
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 0094ddbc..8923ab77 100644
--- a/SubServers.Bungee/src/net/ME1312/SubServers/Bungee/Host/Proxy.java
+++ b/SubServers.Bungee/src/net/ME1312/SubServers/Bungee/Host/Proxy.java
@@ -36,7 +36,7 @@ public class Proxy implements ClientHandler, ExtraDataHandler {
this.name = name;
this.signature = SubAPI.getInstance().signAnonymousObject();
- setSubData(null, 0);
+ subdata.put(0, null);
}
@Override
@@ -48,8 +48,7 @@ public class Proxy implements ClientHandler, ExtraDataHandler {
return channels.toArray(new DataClient[0]);
}
- @SuppressWarnings("deprecation")
- public void setSubData(DataClient client, int channel) {
+ public void setSubData(SubDataClient client, int channel) {
boolean update = false;
if (channel < 0) throw new IllegalArgumentException("Subchannel ID cannot be less than zero");
if (client != null || channel == 0) {
@@ -189,8 +188,8 @@ public class Proxy implements ClientHandler, ExtraDataHandler {
}
info.set("players", players);
info.set("redis", isRedis());
- LinkedList subdata = new LinkedList();
- for (DataClient client : getSubData()) subdata.add((client == null)?null:client.getID());
+ ObjectMap subdata = new ObjectMap();
+ for (int channel : this.subdata.keySet()) subdata.set(channel, (this.subdata.get(channel) == null)?null:this.subdata.get(channel).getID());
info.set("subdata", subdata);
info.set("signature", signature);
info.set("extra", getExtra());
diff --git a/SubServers.Bungee/src/net/ME1312/SubServers/Bungee/Host/ServerContainer.java b/SubServers.Bungee/src/net/ME1312/SubServers/Bungee/Host/ServerContainer.java
index 8a3d950e..fadc2fd6 100644
--- a/SubServers.Bungee/src/net/ME1312/SubServers/Bungee/Host/ServerContainer.java
+++ b/SubServers.Bungee/src/net/ME1312/SubServers/Bungee/Host/ServerContainer.java
@@ -41,7 +41,7 @@ public class ServerContainer extends BungeeServerInfo implements Server {
SubAPI.getInstance().getSubDataNetwork().getProtocol().whitelist(getAddress().getAddress().getHostAddress());
this.hidden = hidden;
- setSubData(null, 0);
+ subdata.put(0, null);
}
@Override
@@ -71,7 +71,7 @@ public class ServerContainer extends BungeeServerInfo implements Server {
ObjectMap args = new ObjectMap();
args.set("server", getName());
args.set("channel", channel);
- if (client != null) args.set("address", client.getAddress().toString());
+ if (client != null) args.set("id", client.getID());
((SubDataClient) proxy.getSubData()[0]).sendPacket(new PacketOutExRunEvent((client != null)?SubNetworkConnectEvent.class:SubNetworkDisconnectEvent.class, args));
}
}
@@ -259,8 +259,8 @@ public class ServerContainer extends BungeeServerInfo implements Server {
players.set(player.get().toString(), pinfo);
}
info.set("players", players);
- LinkedList subdata = new LinkedList();
- for (DataClient client : getSubData()) subdata.add((client == null)?null:client.getID());
+ ObjectMap subdata = new ObjectMap();
+ for (int channel : this.subdata.keySet()) subdata.set(channel, (this.subdata.get(channel) == null)?null:this.subdata.get(channel).getID());
info.set("subdata", subdata);
info.set("signature", signature);
info.set("extra", getExtra());
diff --git a/SubServers.Bungee/src/net/ME1312/SubServers/Bungee/Library/Updates/ConfigUpdater.java b/SubServers.Bungee/src/net/ME1312/SubServers/Bungee/Library/Updates/ConfigUpdater.java
index 3ff59a26..c70742e7 100644
--- a/SubServers.Bungee/src/net/ME1312/SubServers/Bungee/Library/Updates/ConfigUpdater.java
+++ b/SubServers.Bungee/src/net/ME1312/SubServers/Bungee/Library/Updates/ConfigUpdater.java
@@ -81,6 +81,7 @@ public class ConfigUpdater {
if (i > 0) {
YAMLSection settings = new YAMLSection();
settings.set("Version", ((now.compareTo(was) <= 0)?was:now).toString());
+ settings.set("Smart-Fallback", updated.getMap("Settings", new YAMLSection()).getBoolean("Smart-Fallback", true));
settings.set("Override-Bungee-Commands", updated.getMap("Settings", new YAMLSection()).getBoolean("Override-Bungee-Commands", true));
YAMLSection upnp = new YAMLSection();
@@ -164,7 +165,6 @@ public class ConfigUpdater {
if (i > 0) {
YAMLSection settings = new YAMLSection();
settings.set("Version", ((now.compareTo(was) <= 0)?was:now).toString());
- settings.set("Smart-Fallback", updated.getMap("Settings", new YAMLSection()).getBoolean("Smart-Fallback", true));
settings.set("Run-On-Launch-Timeout", updated.getMap("Settings", new YAMLSection()).getInt("Run-On-Launch-Timeout", 0));
rewritten.set("Settings", settings);
diff --git a/SubServers.Bungee/src/net/ME1312/SubServers/Bungee/Network/Packet/PacketLinkProxy.java b/SubServers.Bungee/src/net/ME1312/SubServers/Bungee/Network/Packet/PacketLinkProxy.java
index 3c588204..23074957 100644
--- a/SubServers.Bungee/src/net/ME1312/SubServers/Bungee/Network/Packet/PacketLinkProxy.java
+++ b/SubServers.Bungee/src/net/ME1312/SubServers/Bungee/Network/Packet/PacketLinkProxy.java
@@ -61,17 +61,20 @@ public class PacketLinkProxy implements InitialPacket, PacketObjectIn,
Map proxies = plugin.api.getProxies();
String name = ((data.contains(0x0000))?data.getRawString(0x0000):null);
Integer channel = data.getInt(0x0001);
+
+ boolean isnew = false;
Proxy proxy;
if (name != null && proxies.keySet().contains(name.toLowerCase())) {
proxy = proxies.get(name.toLowerCase());
} else {
proxy = new Proxy((name != null && !proxies.keySet().contains(name.toLowerCase()))?name:null);
- plugin.getPluginManager().callEvent(new SubAddProxyEvent(proxy));
+ isnew = true;
plugin.proxies.put(proxy.getName().toLowerCase(), proxy);
}
HashMap subdata = Util.getDespiteException(() -> Util.reflect(Proxy.class.getDeclaredField("subdata"), proxy), null);
if (!subdata.keySet().contains(channel) || (channel == 0 && subdata.get(0) == null)) {
proxy.setSubData(client, channel);
+ if (isnew) plugin.getPluginManager().callEvent(new SubAddProxyEvent(proxy));
System.out.println("SubData > " + client.getAddress().toString() + " has been defined as Proxy: " + proxy.getName() + ((channel > 0)?" (Sub-"+channel+")":""));
client.sendPacket(new PacketLinkProxy(proxy.getName(), 0, null));
setReady(client, true);
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 2312137d..f18267fb 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
@@ -57,10 +57,18 @@ public class PacketOutExRunEvent implements Listener, PacketObjectOut {
}
private void broadcast(PacketOutExRunEvent packet) {
+ broadcast(null, packet);
+ }
+
+ private void broadcast(Object self, PacketOutExRunEvent packet) {
List clients = new LinkedList();
clients.addAll(plugin.subdata.getClients().values());
for (SubDataClient client : clients) {
- client.sendPacket(packet);
+ if (client.getHandler() == null || client.getHandler() != self) { // Don't send events about yourself to yourself
+ if (client.getHandler() == null || client.getHandler().getSubData()[0] == client) { // Don't send events over subchannels
+ client.sendPacket(packet);
+ }
+ }
}
}
@@ -68,7 +76,7 @@ public class PacketOutExRunEvent implements Listener, PacketObjectOut {
public void event(SubAddProxyEvent event) {
ObjectMap args = new ObjectMap();
args.set("proxy", event.getProxy().getName());
- broadcast(new PacketOutExRunEvent(event.getClass(), args));
+ broadcast(event.getProxy(), new PacketOutExRunEvent(event.getClass(), args));
}
@EventHandler(priority = Byte.MAX_VALUE)
@@ -77,7 +85,7 @@ public class PacketOutExRunEvent implements Listener, PacketObjectOut {
ObjectMap args = new ObjectMap();
if (event.getPlayer() != null) args.set("player", event.getPlayer().toString());
args.set("host", event.getHost().getName());
- broadcast(new PacketOutExRunEvent(event.getClass(), args));
+ broadcast(event.getHost(), new PacketOutExRunEvent(event.getClass(), args));
}
}
@@ -88,7 +96,7 @@ public class PacketOutExRunEvent implements Listener, PacketObjectOut {
if (event.getPlayer() != null) args.set("player", event.getPlayer().toString());
if (event.getHost() != null) args.set("host", event.getHost().getName());
args.set("server", event.getServer().getName());
- broadcast(new PacketOutExRunEvent(event.getClass(), args));
+ broadcast(event.getServer(), new PacketOutExRunEvent(event.getClass(), args));
}
}
@@ -163,7 +171,7 @@ public class PacketOutExRunEvent implements Listener, PacketObjectOut {
if (event.getPlayer() != null) args.set("player", event.getPlayer().toString());
if (event.getHost() != null) args.set("host", event.getHost().getName());
args.set("server", event.getServer().getName());
- broadcast(new PacketOutExRunEvent(event.getClass(), args));
+ broadcast(event.getServer(), new PacketOutExRunEvent(event.getClass(), args));
}
}
@@ -173,7 +181,7 @@ public class PacketOutExRunEvent implements Listener, PacketObjectOut {
ObjectMap args = new ObjectMap();
if (event.getPlayer() != null) args.set("player", event.getPlayer().toString());
args.set("host", event.getHost().getName());
- broadcast(new PacketOutExRunEvent(event.getClass(), args));
+ broadcast(event.getHost(), new PacketOutExRunEvent(event.getClass(), args));
}
}
@@ -181,6 +189,6 @@ public class PacketOutExRunEvent implements Listener, PacketObjectOut {
public void event(SubRemoveProxyEvent event) {
ObjectMap args = new ObjectMap();
args.set("proxy", event.getProxy().getName());
- broadcast(new PacketOutExRunEvent(event.getClass(), args));
+ broadcast(event.getProxy(), new PacketOutExRunEvent(event.getClass(), args));
}
}
\ No newline at end of file
diff --git a/SubServers.Client/Bukkit/pom.xml b/SubServers.Client/Bukkit/pom.xml
index 8b7e133e..3020802d 100644
--- a/SubServers.Client/Bukkit/pom.xml
+++ b/SubServers.Client/Bukkit/pom.xml
@@ -48,13 +48,13 @@
net.ME1312.Galaxi
GalaxiUtil
- 19w20a
+ 19w20b
compile
net.ME1312.SubData
Client
- 19w20f
+ 19w20g
compile
diff --git a/SubServers.Client/Bukkit/src/net/ME1312/SubServers/Client/Bukkit/Network/API/Host.java b/SubServers.Client/Bukkit/src/net/ME1312/SubServers/Client/Bukkit/Network/API/Host.java
index de8ecc16..e7002f8c 100644
--- a/SubServers.Client/Bukkit/src/net/ME1312/SubServers/Client/Bukkit/Network/API/Host.java
+++ b/SubServers.Client/Bukkit/src/net/ME1312/SubServers/Client/Bukkit/Network/API/Host.java
@@ -57,8 +57,18 @@ public class Host {
*
* @return SubData Client Channel ID Array (may be empty if unsupported)
*/
+ @SuppressWarnings("unchecked")
public UUID[] getSubData() {
- return raw.getUUIDList("subdata", Collections.emptyList()).toArray(new UUID[0]);
+ if (raw.contains("subdata")) {
+ ObjectMap subdata = new ObjectMap((Map) raw.getObject("subdata"));
+ LinkedList keys = new LinkedList(subdata.getKeys());
+ LinkedList channels = new LinkedList();
+ Collections.sort(keys);
+ for (Integer channel : keys) channels.add(subdata.getUUID(channel));
+ return channels.toArray(new UUID[0]);
+ } else {
+ return new UUID[0];
+ }
}
/**
diff --git a/SubServers.Client/Bukkit/src/net/ME1312/SubServers/Client/Bukkit/Network/API/Proxy.java b/SubServers.Client/Bukkit/src/net/ME1312/SubServers/Client/Bukkit/Network/API/Proxy.java
index bf2a064e..d844f10b 100644
--- a/SubServers.Client/Bukkit/src/net/ME1312/SubServers/Client/Bukkit/Network/API/Proxy.java
+++ b/SubServers.Client/Bukkit/src/net/ME1312/SubServers/Client/Bukkit/Network/API/Proxy.java
@@ -46,8 +46,14 @@ public class Proxy {
*
* @return SubData Client Channel ID Array
*/
+ @SuppressWarnings("unchecked")
public UUID[] getSubData() {
- return raw.getUUIDList("subdata", Collections.emptyList()).toArray(new UUID[0]);
+ ObjectMap subdata = new ObjectMap((Map) raw.getObject("subdata"));
+ LinkedList keys = new LinkedList(subdata.getKeys());
+ LinkedList channels = new LinkedList();
+ Collections.sort(keys);
+ for (Integer channel : keys) channels.add(subdata.getUUID(channel));
+ return channels.toArray(new UUID[0]);
}
/**
diff --git a/SubServers.Client/Bukkit/src/net/ME1312/SubServers/Client/Bukkit/Network/API/Server.java b/SubServers.Client/Bukkit/src/net/ME1312/SubServers/Client/Bukkit/Network/API/Server.java
index 0e5c94ba..89354200 100644
--- a/SubServers.Client/Bukkit/src/net/ME1312/SubServers/Client/Bukkit/Network/API/Server.java
+++ b/SubServers.Client/Bukkit/src/net/ME1312/SubServers/Client/Bukkit/Network/API/Server.java
@@ -45,8 +45,14 @@ public class Server {
*
* @return SubData Client Channel ID Array
*/
+ @SuppressWarnings("unchecked")
public UUID[] getSubData() {
- return raw.getUUIDList("subdata", Collections.emptyList()).toArray(new UUID[0]);
+ ObjectMap subdata = new ObjectMap((Map) raw.getObject("subdata"));
+ LinkedList keys = new LinkedList(subdata.getKeys());
+ LinkedList channels = new LinkedList();
+ Collections.sort(keys);
+ for (Integer channel : keys) channels.add(subdata.getUUID(channel));
+ return channels.toArray(new UUID[0]);
}
/**
diff --git a/SubServers.Client/Sponge/pom.xml b/SubServers.Client/Sponge/pom.xml
index 9a198b1f..b2aa4a2d 100644
--- a/SubServers.Client/Sponge/pom.xml
+++ b/SubServers.Client/Sponge/pom.xml
@@ -30,13 +30,13 @@
net.ME1312.Galaxi
GalaxiUtil
- 19w20a
+ 19w20b
compile
net.ME1312.SubData
Client
- 19w20f
+ 19w20g
compile
diff --git a/SubServers.Client/Sponge/src/net/ME1312/SubServers/Client/Sponge/Network/API/Host.java b/SubServers.Client/Sponge/src/net/ME1312/SubServers/Client/Sponge/Network/API/Host.java
index 97e5b96c..9485f55a 100644
--- a/SubServers.Client/Sponge/src/net/ME1312/SubServers/Client/Sponge/Network/API/Host.java
+++ b/SubServers.Client/Sponge/src/net/ME1312/SubServers/Client/Sponge/Network/API/Host.java
@@ -60,8 +60,18 @@ public class Host {
*
* @return SubData Client Channel ID Array (may be empty if unsupported)
*/
+ @SuppressWarnings("unchecked")
public UUID[] getSubData() {
- return raw.getUUIDList("subdata", Collections.emptyList()).toArray(new UUID[0]);
+ if (raw.contains("subdata")) {
+ ObjectMap subdata = new ObjectMap((Map) raw.getObject("subdata"));
+ LinkedList keys = new LinkedList(subdata.getKeys());
+ LinkedList channels = new LinkedList();
+ Collections.sort(keys);
+ for (Integer channel : keys) channels.add(subdata.getUUID(channel));
+ return channels.toArray(new UUID[0]);
+ } else {
+ return new UUID[0];
+ }
}
/**
diff --git a/SubServers.Client/Sponge/src/net/ME1312/SubServers/Client/Sponge/Network/API/Proxy.java b/SubServers.Client/Sponge/src/net/ME1312/SubServers/Client/Sponge/Network/API/Proxy.java
index 901c079c..fd1f991e 100644
--- a/SubServers.Client/Sponge/src/net/ME1312/SubServers/Client/Sponge/Network/API/Proxy.java
+++ b/SubServers.Client/Sponge/src/net/ME1312/SubServers/Client/Sponge/Network/API/Proxy.java
@@ -46,8 +46,14 @@ public class Proxy {
*
* @return SubData Client Channel ID Array
*/
+ @SuppressWarnings("unchecked")
public UUID[] getSubData() {
- return raw.getUUIDList("subdata", Collections.emptyList()).toArray(new UUID[0]);
+ ObjectMap subdata = new ObjectMap((Map) raw.getObject("subdata"));
+ LinkedList keys = new LinkedList(subdata.getKeys());
+ LinkedList channels = new LinkedList();
+ Collections.sort(keys);
+ for (Integer channel : keys) channels.add(subdata.getUUID(channel));
+ return channels.toArray(new UUID[0]);
}
/**
diff --git a/SubServers.Client/Sponge/src/net/ME1312/SubServers/Client/Sponge/Network/API/Server.java b/SubServers.Client/Sponge/src/net/ME1312/SubServers/Client/Sponge/Network/API/Server.java
index a9ddee3d..5faac936 100644
--- a/SubServers.Client/Sponge/src/net/ME1312/SubServers/Client/Sponge/Network/API/Server.java
+++ b/SubServers.Client/Sponge/src/net/ME1312/SubServers/Client/Sponge/Network/API/Server.java
@@ -45,8 +45,14 @@ public class Server {
*
* @return SubData Client Channel ID Array
*/
+ @SuppressWarnings("unchecked")
public UUID[] getSubData() {
- return raw.getUUIDList("subdata", Collections.emptyList()).toArray(new UUID[0]);
+ ObjectMap subdata = new ObjectMap((Map) raw.getObject("subdata"));
+ LinkedList keys = new LinkedList(subdata.getKeys());
+ LinkedList channels = new LinkedList();
+ Collections.sort(keys);
+ for (Integer channel : keys) channels.add(subdata.getUUID(channel));
+ return channels.toArray(new UUID[0]);
}
/**
diff --git a/SubServers.Host/pom.xml b/SubServers.Host/pom.xml
index 08d9b450..46c1aeca 100644
--- a/SubServers.Host/pom.xml
+++ b/SubServers.Host/pom.xml
@@ -20,13 +20,13 @@
net.ME1312.Galaxi
GalaxiEngine
- 19w20a
+ 19w20b
compile
net.ME1312.SubData
Client
- 19w20f
+ 19w20g
compile
diff --git a/SubServers.Host/src/net/ME1312/SubServers/Host/Network/API/Host.java b/SubServers.Host/src/net/ME1312/SubServers/Host/Network/API/Host.java
index bc1695e3..62d0172a 100644
--- a/SubServers.Host/src/net/ME1312/SubServers/Host/Network/API/Host.java
+++ b/SubServers.Host/src/net/ME1312/SubServers/Host/Network/API/Host.java
@@ -60,8 +60,18 @@ public class Host {
*
* @return SubData Client Channel ID Array (may be empty if unsupported)
*/
+ @SuppressWarnings("unchecked")
public UUID[] getSubData() {
- return raw.getUUIDList("subdata", Collections.emptyList()).toArray(new UUID[0]);
+ if (raw.contains("subdata")) {
+ ObjectMap subdata = new ObjectMap((Map) raw.getObject("subdata"));
+ LinkedList keys = new LinkedList(subdata.getKeys());
+ LinkedList channels = new LinkedList();
+ Collections.sort(keys);
+ for (Integer channel : keys) channels.add(subdata.getUUID(channel));
+ return channels.toArray(new UUID[0]);
+ } else {
+ return new UUID[0];
+ }
}
/**
diff --git a/SubServers.Host/src/net/ME1312/SubServers/Host/Network/API/Proxy.java b/SubServers.Host/src/net/ME1312/SubServers/Host/Network/API/Proxy.java
index 38ecd80e..5dfdb29c 100644
--- a/SubServers.Host/src/net/ME1312/SubServers/Host/Network/API/Proxy.java
+++ b/SubServers.Host/src/net/ME1312/SubServers/Host/Network/API/Proxy.java
@@ -46,8 +46,14 @@ public class Proxy {
*
* @return SubData Client Channel ID Array
*/
+ @SuppressWarnings("unchecked")
public UUID[] getSubData() {
- return raw.getUUIDList("subdata", Collections.emptyList()).toArray(new UUID[0]);
+ ObjectMap subdata = new ObjectMap((Map) raw.getObject("subdata"));
+ LinkedList keys = new LinkedList(subdata.getKeys());
+ LinkedList channels = new LinkedList();
+ Collections.sort(keys);
+ for (Integer channel : keys) channels.add(subdata.getUUID(channel));
+ return channels.toArray(new UUID[0]);
}
/**
diff --git a/SubServers.Host/src/net/ME1312/SubServers/Host/Network/API/Server.java b/SubServers.Host/src/net/ME1312/SubServers/Host/Network/API/Server.java
index 3b8dd770..2989c663 100644
--- a/SubServers.Host/src/net/ME1312/SubServers/Host/Network/API/Server.java
+++ b/SubServers.Host/src/net/ME1312/SubServers/Host/Network/API/Server.java
@@ -45,8 +45,14 @@ public class Server {
*
* @return SubData Client Channel ID Array
*/
+ @SuppressWarnings("unchecked")
public UUID[] getSubData() {
- return raw.getUUIDList("subdata", Collections.emptyList()).toArray(new UUID[0]);
+ ObjectMap subdata = new ObjectMap((Map) raw.getObject("subdata"));
+ LinkedList keys = new LinkedList(subdata.getKeys());
+ LinkedList channels = new LinkedList();
+ Collections.sort(keys);
+ for (Integer channel : keys) channels.add(subdata.getUUID(channel));
+ return channels.toArray(new UUID[0]);
}
/**
diff --git a/SubServers.Host/src/net/ME1312/SubServers/Host/Network/Packet/PacketLinkExHost.java b/SubServers.Host/src/net/ME1312/SubServers/Host/Network/Packet/PacketLinkExHost.java
index 095c41a7..cc7cd3b7 100644
--- a/SubServers.Host/src/net/ME1312/SubServers/Host/Network/Packet/PacketLinkExHost.java
+++ b/SubServers.Host/src/net/ME1312/SubServers/Host/Network/Packet/PacketLinkExHost.java
@@ -4,6 +4,7 @@ import net.ME1312.Galaxi.Engine.GalaxiEngine;
import net.ME1312.Galaxi.Library.Map.ObjectMap;
import net.ME1312.Galaxi.Library.Util;
import net.ME1312.Galaxi.Library.Version.Version;
+import net.ME1312.SubData.Client.Library.DebugUtil;
import net.ME1312.SubData.Client.Protocol.Initial.InitialPacket;
import net.ME1312.SubData.Client.Protocol.PacketObjectIn;
import net.ME1312.SubData.Client.Protocol.PacketObjectOut;
@@ -57,7 +58,8 @@ public class PacketLinkExHost implements InitialPacket, PacketObjectIn,
if (data.getInt(0x0001) == 0) {
setReady(client, true);
} else {
- log.info("Could not link name with host" + ((data.contains(0x0002))?": "+data.getRawString(0x0002):'.'));
+ log.severe("Could not link name with host" + ((data.contains(0x0002))?": "+data.getRawString(0x0002):'.'));
+ DebugUtil.logException(new IllegalStateException(), log);
GalaxiEngine.getInstance().stop();
}
}
diff --git a/SubServers.Host/src/net/ME1312/SubServers/Host/SubCommand.java b/SubServers.Host/src/net/ME1312/SubServers/Host/SubCommand.java
index 76e691e5..e7394bfe 100644
--- a/SubServers.Host/src/net/ME1312/SubServers/Host/SubCommand.java
+++ b/SubServers.Host/src/net/ME1312/SubServers/Host/SubCommand.java
@@ -16,8 +16,8 @@ import net.ME1312.SubServers.Host.Library.TextColor;
import net.ME1312.SubServers.Host.Network.API.*;
import net.ME1312.SubServers.Host.Network.Packet.*;
-import java.lang.reflect.Field;
import java.util.*;
+import java.util.List;
import java.util.concurrent.TimeUnit;
/**
@@ -30,6 +30,14 @@ public class SubCommand {
private static TreeMap serverCache = new TreeMap();
private static long cacheDate = 0;
+ private static boolean canRun() {
+ if (SubAPI.getInstance().getSubDataNetwork()[0] == null) {
+ throw new IllegalStateException("SubData is not connected");
+ } else {
+ return true;
+ }
+ }
+
private SubCommand() {}
@SuppressWarnings("unchecked")
protected static void load(ExHost host) {
@@ -37,18 +45,20 @@ public class SubCommand {
new Command(host.info) {
@Override
public void command(CommandSender sender, String handle, String[] args) {
- if (args.length > 0) {
- int i = 0;
- String str = args[0];
- if (args.length > 1) {
- do {
- i++;
- str = str + " " + args[i].replace(" ", "\\ ");
- } while ((i + 1) != args.length);
+ if (canRun()) {
+ if (args.length > 0) {
+ int i = 0;
+ String str = args[0];
+ if (args.length > 1) {
+ do {
+ i++;
+ str = str + " " + args[i].replace(" ", "\\ ");
+ } while ((i + 1) != args.length);
+ }
+ GalaxiEngine.getInstance().getConsoleReader().runCommand(sender, str);
+ } else {
+ sender.sendMessage("Usage: /" + handle + " [Args...]");
}
- GalaxiEngine.getInstance().getConsoleReader().runCommand(sender, str);
- } else {
- sender.sendMessage("Usage: /" + handle + " [Args...]");
}
}
}.autocomplete((sender, handle, args) -> {
@@ -91,7 +101,7 @@ public class SubCommand {
new Command(host.info) {
@Override
public void command(CommandSender sender, String handle, String[] args) {
- host.api.getGroups(groups -> host.api.getHosts(hosts -> host.api.getServers(servers -> host.api.getMasterProxy(proxymaster -> host.api.getProxies(proxies -> {
+ if (canRun()) host.api.getGroups(groups -> host.api.getHosts(hosts -> host.api.getServers(servers -> host.api.getMasterProxy(proxymaster -> host.api.getProxies(proxies -> {
int i = 0;
boolean sent = false;
String div = TextColor.RESET + ", ";
@@ -196,125 +206,127 @@ public class SubCommand {
new Command(host.info) {
@Override
public void command(CommandSender sender, String handle, String[] args) {
- if (args.length > 0) {
- String type = (args.length > 1)?args[0]:null;
- String name = args[(type != null)?1:0];
-
- Runnable getServer = () -> host.api.getServer(name, server -> {
- if (server != null) {
- sender.sendMessage("SubServers > Info on " + ((server instanceof SubServer)?"Sub":"") + "Server: " + TextColor.WHITE + server.getDisplayName());
- if (!server.getName().equals(server.getDisplayName())) sender.sendMessage(" -> System Name: " + TextColor.WHITE + server.getName());
- if (server instanceof SubServer) {
- sender.sendMessage(" -> Enabled: " + ((((SubServer) server).isEnabled())?TextColor.GREEN+"yes":TextColor.RED+"no"));
- if (!((SubServer) server).isEditable()) sender.sendMessage(" -> Editable: " + TextColor.RED + "no");
- sender.sendMessage(" -> Host: " + TextColor.WHITE + ((SubServer) server).getHost());
- }
- if (server.getGroups().size() > 0) sender.sendMessage(" -> Group" + ((server.getGroups().size() > 1)?"s:":": " + TextColor.WHITE + server.getGroups().get(0)));
- if (server.getGroups().size() > 1) for (String group : server.getGroups()) sender.sendMessage(" - " + TextColor.WHITE + group);
- sender.sendMessage(" -> Address: " + TextColor.WHITE + server.getAddress().getAddress().getHostAddress()+':'+server.getAddress().getPort());
- if (server instanceof SubServer) sender.sendMessage(" -> Running: " + ((((SubServer) server).isRunning())?TextColor.GREEN+"yes":TextColor.RED+"no"));
- if (!(server instanceof SubServer) || ((SubServer) server).isRunning()) {
- sender.sendMessage(" -> Connected: " + ((server.getSubData()[0] != null)?TextColor.GREEN+"yes"+((server.getSubData().length > 1)?TextColor.AQUA+" +"+(server.getSubData().length-1)+" subchannel"+((server.getSubData().length == 2)?"":"s"):""):TextColor.RED+"no"));
- sender.sendMessage(" -> Players: " + TextColor.AQUA + server.getPlayers().size() + " online");
- }
- sender.sendMessage(" -> MOTD: " + TextColor.WHITE + TextColor.stripColor(server.getMotd()));
- if (server instanceof SubServer && ((SubServer) server).getStopAction() != SubServer.StopAction.NONE) sender.sendMessage(" -> Stop Action: " + TextColor.WHITE + ((SubServer) server).getStopAction().toString());
- sender.sendMessage(" -> Signature: " + TextColor.AQUA + server.getSignature());
- if (server instanceof SubServer) sender.sendMessage(" -> Logging: " + ((((SubServer) server).isLogging())?TextColor.GREEN+"yes":TextColor.RED+"no"));
- sender.sendMessage(" -> Restricted: " + ((server.isRestricted())?TextColor.GREEN+"yes":TextColor.RED+"no"));
- if (server instanceof SubServer && ((SubServer) server).getIncompatibilities().size() > 0) {
- List current = new ArrayList();
- for (String other : ((SubServer) server).getCurrentIncompatibilities()) current.add(other.toLowerCase());
- sender.sendMessage(" -> Incompatibilities:");
- for (String other : ((SubServer) server).getIncompatibilities()) sender.sendMessage(" - " + ((current.contains(other.toLowerCase()))?TextColor.WHITE:TextColor.GRAY) + other);
- }
- sender.sendMessage(" -> Hidden: " + ((server.isHidden())?TextColor.GREEN+"yes":TextColor.RED+"no"));
- } else {
- if (type == null) {
- sender.sendMessage("SubServers > There is no object with that name");
+ if (canRun()) {
+ if (args.length > 0) {
+ String type = (args.length > 1)?args[0]:null;
+ String name = args[(type != null)?1:0];
+
+ Runnable getServer = () -> host.api.getServer(name, server -> {
+ if (server != null) {
+ sender.sendMessage("SubServers > Info on " + ((server instanceof SubServer)?"Sub":"") + "Server: " + TextColor.WHITE + server.getDisplayName());
+ if (!server.getName().equals(server.getDisplayName())) sender.sendMessage(" -> System Name: " + TextColor.WHITE + server.getName());
+ if (server instanceof SubServer) {
+ sender.sendMessage(" -> Enabled: " + ((((SubServer) server).isEnabled())?TextColor.GREEN+"yes":TextColor.RED+"no"));
+ if (!((SubServer) server).isEditable()) sender.sendMessage(" -> Editable: " + TextColor.RED + "no");
+ sender.sendMessage(" -> Host: " + TextColor.WHITE + ((SubServer) server).getHost());
+ }
+ if (server.getGroups().size() > 0) sender.sendMessage(" -> Group" + ((server.getGroups().size() > 1)?"s:":": " + TextColor.WHITE + server.getGroups().get(0)));
+ if (server.getGroups().size() > 1) for (String group : server.getGroups()) sender.sendMessage(" - " + TextColor.WHITE + group);
+ sender.sendMessage(" -> Address: " + TextColor.WHITE + server.getAddress().getAddress().getHostAddress()+':'+server.getAddress().getPort());
+ if (server instanceof SubServer) sender.sendMessage(" -> Running: " + ((((SubServer) server).isRunning())?TextColor.GREEN+"yes":TextColor.RED+"no"));
+ if (!(server instanceof SubServer) || ((SubServer) server).isRunning()) {
+ sender.sendMessage(" -> Connected: " + ((server.getSubData()[0] != null)?TextColor.GREEN+"yes"+((server.getSubData().length > 1)?TextColor.AQUA+" +"+(server.getSubData().length-1)+" subchannel"+((server.getSubData().length == 2)?"":"s"):""):TextColor.RED+"no"));
+ sender.sendMessage(" -> Players: " + TextColor.AQUA + server.getPlayers().size() + " online");
+ }
+ sender.sendMessage(" -> MOTD: " + TextColor.WHITE + TextColor.stripColor(server.getMotd()));
+ if (server instanceof SubServer && ((SubServer) server).getStopAction() != SubServer.StopAction.NONE) sender.sendMessage(" -> Stop Action: " + TextColor.WHITE + ((SubServer) server).getStopAction().toString());
+ sender.sendMessage(" -> Signature: " + TextColor.AQUA + server.getSignature());
+ if (server instanceof SubServer) sender.sendMessage(" -> Logging: " + ((((SubServer) server).isLogging())?TextColor.GREEN+"yes":TextColor.RED+"no"));
+ sender.sendMessage(" -> Restricted: " + ((server.isRestricted())?TextColor.GREEN+"yes":TextColor.RED+"no"));
+ if (server instanceof SubServer && ((SubServer) server).getIncompatibilities().size() > 0) {
+ List current = new ArrayList();
+ for (String other : ((SubServer) server).getCurrentIncompatibilities()) current.add(other.toLowerCase());
+ sender.sendMessage(" -> Incompatibilities:");
+ for (String other : ((SubServer) server).getIncompatibilities()) sender.sendMessage(" - " + ((current.contains(other.toLowerCase()))?TextColor.WHITE:TextColor.GRAY) + other);
+ }
+ sender.sendMessage(" -> Hidden: " + ((server.isHidden())?TextColor.GREEN+"yes":TextColor.RED+"no"));
} else {
- sender.sendMessage("SubServers > There is no server with that name");
+ if (type == null) {
+ sender.sendMessage("SubServers > There is no object with that name");
+ } else {
+ sender.sendMessage("SubServers > There is no server with that name");
+ }
+ }
+ });
+ Runnable getGroup = () -> host.api.getGroup(name, group -> {
+ if (group != null) {
+ sender.sendMessage("SubServers > Info on Group: " + TextColor.WHITE + name);
+ sender.sendMessage(" -> Servers: " + ((group.size() <= 0)?TextColor.GRAY + "(none)":TextColor.AQUA.toString() + group.size()));
+ for (Server server : group) sender.sendMessage(" - " + TextColor.WHITE + server.getDisplayName() + ((server.getName().equals(server.getDisplayName()))?"":" ("+server.getName()+')'));
+ } else {
+ if (type == null) {
+ getServer.run();
+ } else {
+ sender.sendMessage("SubServers > There is no group with that name");
+ }
+ }
+ });
+ Runnable getHost = () -> host.api.getHost(name, host -> {
+ if (host != null) {
+ sender.sendMessage("SubServers > Info on Host: " + TextColor.WHITE + host.getDisplayName());
+ if (!host.getName().equals(host.getDisplayName())) sender.sendMessage(" -> System Name: " + TextColor.WHITE + host.getName());
+ sender.sendMessage(" -> Available: " + ((host.isAvailable())?TextColor.GREEN+"yes":TextColor.RED+"no"));
+ sender.sendMessage(" -> Enabled: " + ((host.isEnabled())?TextColor.GREEN+"yes":TextColor.RED+"no"));
+ sender.sendMessage(" -> Address: " + TextColor.WHITE + host.getAddress().getHostAddress());
+ if (host.getSubData().length > 0) sender.sendMessage(" -> Connected: " + ((host.getSubData()[0] != null)?TextColor.GREEN+"yes"+((host.getSubData().length > 1)?TextColor.AQUA+" +"+(host.getSubData().length-1)+" subchannel"+((host.getSubData().length == 2)?"":"s"):""):TextColor.RED+"no"));
+ sender.sendMessage(" -> SubServers: " + ((host.getSubServers().keySet().size() <= 0)?TextColor.GRAY + "(none)":TextColor.AQUA.toString() + host.getSubServers().keySet().size()));
+ for (SubServer subserver : host.getSubServers().values()) sender.sendMessage(" - " + ((subserver.isEnabled())?TextColor.WHITE:TextColor.GRAY) + subserver.getDisplayName() + ((subserver.getName().equals(subserver.getDisplayName()))?"":" ("+subserver.getName()+')'));
+ sender.sendMessage(" -> Templates: " + ((host.getCreator().getTemplates().keySet().size() <= 0)?TextColor.GRAY + "(none)":TextColor.AQUA.toString() + host.getCreator().getTemplates().keySet().size()));
+ for (SubCreator.ServerTemplate template : host.getCreator().getTemplates().values()) sender.sendMessage(" - " + ((template.isEnabled())?TextColor.WHITE:TextColor.GRAY) + template.getDisplayName() + ((template.getName().equals(template.getDisplayName()))?"":" ("+template.getName()+')'));
+ sender.sendMessage(" -> Signature: " + TextColor.AQUA + host.getSignature());
+ } else {
+ if (type == null) {
+ getGroup.run();
+ } else {
+ sender.sendMessage("SubServers > There is no host with that name");
+ }
+ }
+ });
+ Runnable getProxy = () -> host.api.getProxy(name, proxy -> {
+ if (proxy != null) {
+ sender.sendMessage("SubServers > Info on Proxy: " + TextColor.WHITE + proxy.getDisplayName());
+ if (!proxy.getName().equals(proxy.getDisplayName())) sender.sendMessage(" -> System Name: " + TextColor.WHITE + proxy.getName());
+ sender.sendMessage(" -> Connected: " + ((proxy.getSubData()[0] != null)?TextColor.GREEN+"yes"+((proxy.getSubData().length > 1)?TextColor.AQUA+" +"+(proxy.getSubData().length-1)+" subchannel"+((proxy.getSubData().length == 2)?"":"s"):""):TextColor.RED+"no"));
+ sender.sendMessage(" -> Redis: " + ((proxy.isRedis())?TextColor.GREEN:TextColor.RED+"un") + "available");
+ if (proxy.isRedis()) sender.sendMessage(" -> Players: " + TextColor.AQUA + proxy.getPlayers().size() + " online");
+ sender.sendMessage(" -> Signature: " + TextColor.AQUA + proxy.getSignature());
+ } else {
+ if (type == null) {
+ getHost.run();
+ } else {
+ sender.sendMessage("SubServers > There is no proxy with that name");
+ }
+ }
+ });
+
+ if (type == null) {
+ getProxy.run();
+ } else {
+ switch (type.toLowerCase()) {
+ case "p":
+ case "proxy":
+ getProxy.run();
+ break;
+ case "h":
+ case "host":
+ getHost.run();
+ break;
+ case "g":
+ case "group":
+ getGroup.run();
+ break;
+ case "s":
+ case "server":
+ case "subserver":
+ getServer.run();
+ break;
+ default:
+ sender.sendMessage("SubServers > There is no object type with that name");
}
}
- });
- Runnable getGroup = () -> host.api.getGroup(name, group -> {
- if (group != null) {
- sender.sendMessage("SubServers > Info on Group: " + TextColor.WHITE + name);
- sender.sendMessage(" -> Servers: " + ((group.size() <= 0)?TextColor.GRAY + "(none)":TextColor.AQUA.toString() + group.size()));
- for (Server server : group) sender.sendMessage(" - " + TextColor.WHITE + server.getDisplayName() + ((server.getName().equals(server.getDisplayName()))?"":" ("+server.getName()+')'));
- } else {
- if (type == null) {
- getServer.run();
- } else {
- sender.sendMessage("SubServers > There is no group with that name");
- }
- }
- });
- Runnable getHost = () -> host.api.getHost(name, host -> {
- if (host != null) {
- sender.sendMessage("SubServers > Info on Host: " + TextColor.WHITE + host.getDisplayName());
- if (!host.getName().equals(host.getDisplayName())) sender.sendMessage(" -> System Name: " + TextColor.WHITE + host.getName());
- sender.sendMessage(" -> Available: " + ((host.isAvailable())?TextColor.GREEN+"yes":TextColor.RED+"no"));
- sender.sendMessage(" -> Enabled: " + ((host.isEnabled())?TextColor.GREEN+"yes":TextColor.RED+"no"));
- sender.sendMessage(" -> Address: " + TextColor.WHITE + host.getAddress().getHostAddress());
- if (host.getSubData().length > 0) sender.sendMessage(" -> Connected: " + ((host.getSubData()[0] != null)?TextColor.GREEN+"yes"+((host.getSubData().length > 1)?TextColor.AQUA+" +"+(host.getSubData().length-1)+" subchannel"+((host.getSubData().length == 2)?"":"s"):""):TextColor.RED+"no"));
- sender.sendMessage(" -> SubServers: " + ((host.getSubServers().keySet().size() <= 0)?TextColor.GRAY + "(none)":TextColor.AQUA.toString() + host.getSubServers().keySet().size()));
- for (SubServer subserver : host.getSubServers().values()) sender.sendMessage(" - " + ((subserver.isEnabled())?TextColor.WHITE:TextColor.GRAY) + subserver.getDisplayName() + ((subserver.getName().equals(subserver.getDisplayName()))?"":" ("+subserver.getName()+')'));
- sender.sendMessage(" -> Templates: " + ((host.getCreator().getTemplates().keySet().size() <= 0)?TextColor.GRAY + "(none)":TextColor.AQUA.toString() + host.getCreator().getTemplates().keySet().size()));
- for (SubCreator.ServerTemplate template : host.getCreator().getTemplates().values()) sender.sendMessage(" - " + ((template.isEnabled())?TextColor.WHITE:TextColor.GRAY) + template.getDisplayName() + ((template.getName().equals(template.getDisplayName()))?"":" ("+template.getName()+')'));
- sender.sendMessage(" -> Signature: " + TextColor.AQUA + host.getSignature());
- } else {
- if (type == null) {
- getGroup.run();
- } else {
- sender.sendMessage("SubServers > There is no host with that name");
- }
- }
- });
- Runnable getProxy = () -> host.api.getProxy(name, proxy -> {
- if (proxy != null) {
- sender.sendMessage("SubServers > Info on Proxy: " + TextColor.WHITE + proxy.getDisplayName());
- if (!proxy.getName().equals(proxy.getDisplayName())) sender.sendMessage(" -> System Name: " + TextColor.WHITE + proxy.getName());
- sender.sendMessage(" -> Connected: " + ((proxy.getSubData()[0] != null)?TextColor.GREEN+"yes"+((proxy.getSubData().length > 1)?TextColor.AQUA+" +"+(proxy.getSubData().length-1)+" subchannel"+((proxy.getSubData().length == 2)?"":"s"):""):TextColor.RED+"no"));
- sender.sendMessage(" -> Redis: " + ((proxy.isRedis())?TextColor.GREEN:TextColor.RED+"un") + "available");
- if (proxy.isRedis()) sender.sendMessage(" -> Players: " + TextColor.AQUA + proxy.getPlayers().size() + " online");
- sender.sendMessage(" -> Signature: " + TextColor.AQUA + proxy.getSignature());
- } else {
- if (type == null) {
- getHost.run();
- } else {
- sender.sendMessage("SubServers > There is no proxy with that name");
- }
- }
- });
-
- if (type == null) {
- getProxy.run();
} else {
- switch (type.toLowerCase()) {
- case "p":
- case "proxy":
- getProxy.run();
- break;
- case "h":
- case "host":
- getHost.run();
- break;
- case "g":
- case "group":
- getGroup.run();
- break;
- case "s":
- case "server":
- case "subserver":
- getServer.run();
- break;
- default:
- sender.sendMessage("SubServers > There is no object type with that name");
- }
+ sender.sendMessage("SubServers > Usage: /" + handle + " [proxy|host|group|server] ");
}
- } else {
- sender.sendMessage("SubServers > Usage: /" + handle + " [proxy|host|group|server] ");
}
}
}.autocomplete((sender, handle, args) -> {
@@ -434,38 +446,40 @@ public class SubCommand {
new Command(host.info) {
@Override
public void command(CommandSender sender, String handle, String[] args) {
- if (args.length > 0) {
- ((SubDataClient) SubAPI.getInstance().getSubDataNetwork()[0]).sendPacket(new PacketStartServer(null, args[0], data -> {
- switch (data.getInt(0x0001)) {
- case 3:
- sender.sendMessage("There is no server with that name");
- break;
- case 4:
- sender.sendMessage("That Server is not a SubServer");
- break;
- case 5:
- sender.sendMessage("That SubServer's Host is not available");
- break;
- case 6:
- sender.sendMessage("That SubServer's Host is not enabled");
- break;
- case 7:
- sender.sendMessage("That SubServer is not enabled");
- break;
- case 8:
- sender.sendMessage("That SubServer is already running");
- break;
- case 9:
- sender.sendMessage("That SubServer cannot start while these server(s) are running:", data.getRawString(0x0002));
- break;
- case 0:
- case 1:
- sender.sendMessage("Server was started successfully");
- break;
- }
- }));
- } else {
- sender.sendMessage("Usage: /" + handle + " ");
+ if (canRun()) {
+ if (args.length > 0) {
+ ((SubDataClient) SubAPI.getInstance().getSubDataNetwork()[0]).sendPacket(new PacketStartServer(null, args[0], data -> {
+ switch (data.getInt(0x0001)) {
+ case 3:
+ sender.sendMessage("There is no server with that name");
+ break;
+ case 4:
+ sender.sendMessage("That Server is not a SubServer");
+ break;
+ case 5:
+ sender.sendMessage("That SubServer's Host is not available");
+ break;
+ case 6:
+ sender.sendMessage("That SubServer's Host is not enabled");
+ break;
+ case 7:
+ sender.sendMessage("That SubServer is not enabled");
+ break;
+ case 8:
+ sender.sendMessage("That SubServer is already running");
+ break;
+ case 9:
+ sender.sendMessage("That SubServer cannot start while these server(s) are running:", data.getRawString(0x0002));
+ break;
+ case 0:
+ case 1:
+ sender.sendMessage("Server was started successfully");
+ break;
+ }
+ }));
+ } else {
+ sender.sendMessage("Usage: /" + handle + " ");
+ }
}
}
}.autocomplete(defaultCompletor = (sender, handle, args) -> {
@@ -498,72 +512,74 @@ public class SubCommand {
new Command(host.info) {
@Override
public void command(CommandSender sender, String handle, String[] args) {
- if (args.length > 0) {
- TimerTask starter = new TimerTask() {
- @Override
- public void run() {
- ((SubDataClient) SubAPI.getInstance().getSubDataNetwork()[0]).sendPacket(new PacketStartServer(null, args[0], data -> {
- switch (data.getInt(0x0001)) {
- case 3:
- case 4:
- sender.sendMessage("Could not restart server: That SubServer has disappeared");
- break;
- case 5:
- sender.sendMessage("Could not restart server: That SubServer's Host is no longer available");
- break;
- case 6:
- sender.sendMessage("Could not restart server: That SubServer's Host is no longer enabled");
- break;
- case 7:
- sender.sendMessage("Could not restart server: That SubServer is no longer enabled");
- break;
- case 9:
- sender.sendMessage("Could not restart server: That SubServer cannot start while these server(s) are running:", data.getRawString(0x0002));
- break;
- case 8:
- case 0:
- case 1:
- sender.sendMessage("Server was started successfully");
- break;
- }
- }));
- }
- };
-
- final Container listening = new Container(true);
- PacketInExRunEvent.callback("SubStoppedEvent", new Callback>() {
- @Override
- public void run(ObjectMap json) {
- try {
- if (listening.get()) if (!json.getString("server").equalsIgnoreCase(args[0])) {
- PacketInExRunEvent.callback("SubStoppedEvent", this);
- } else {
- new Timer(SubAPI.getInstance().getAppInfo().getName() + "::Server_Restart_Command_Handler(" + args[0] + ')').schedule(starter, 100);
- }
- } catch (Exception e) {}
- }
- });
-
- ((SubDataClient) SubAPI.getInstance().getSubDataNetwork()[0]).sendPacket(new PacketStopServer(null, args[0], false, data -> {
- if (data.getInt(0x0001) != 0) listening.set(false);
- switch (data.getInt(0x0001)) {
- case 3:
- sender.sendMessage("There is no server with that name");
- break;
- case 4:
- sender.sendMessage("That Server is not a SubServer");
- break;
- case 5:
- starter.run();
- break;
- case 0:
- case 1:
- sender.sendMessage("Server was stopped successfully");
- break;
- }
- }));
- } else {
- sender.sendMessage("Usage: /" + handle + " ");
+ if (canRun()) {
+ if (args.length > 0) {
+ TimerTask starter = new TimerTask() {
+ @Override
+ public void run() {
+ ((SubDataClient) SubAPI.getInstance().getSubDataNetwork()[0]).sendPacket(new PacketStartServer(null, args[0], data -> {
+ switch (data.getInt(0x0001)) {
+ case 3:
+ case 4:
+ sender.sendMessage("Could not restart server: That SubServer has disappeared");
+ break;
+ case 5:
+ sender.sendMessage("Could not restart server: That SubServer's Host is no longer available");
+ break;
+ case 6:
+ sender.sendMessage("Could not restart server: That SubServer's Host is no longer enabled");
+ break;
+ case 7:
+ sender.sendMessage("Could not restart server: That SubServer is no longer enabled");
+ break;
+ case 9:
+ sender.sendMessage("Could not restart server: That SubServer cannot start while these server(s) are running:", data.getRawString(0x0002));
+ break;
+ case 8:
+ case 0:
+ case 1:
+ sender.sendMessage("Server was started successfully");
+ break;
+ }
+ }));
+ }
+ };
+
+ final Container listening = new Container(true);
+ PacketInExRunEvent.callback("SubStoppedEvent", new Callback>() {
+ @Override
+ public void run(ObjectMap json) {
+ try {
+ if (listening.get()) if (!json.getString("server").equalsIgnoreCase(args[0])) {
+ PacketInExRunEvent.callback("SubStoppedEvent", this);
+ } else {
+ new Timer(SubAPI.getInstance().getAppInfo().getName() + "::Server_Restart_Command_Handler(" + args[0] + ')').schedule(starter, 100);
+ }
+ } catch (Exception e) {}
+ }
+ });
+
+ ((SubDataClient) SubAPI.getInstance().getSubDataNetwork()[0]).sendPacket(new PacketStopServer(null, args[0], false, data -> {
+ if (data.getInt(0x0001) != 0) listening.set(false);
+ switch (data.getInt(0x0001)) {
+ case 3:
+ sender.sendMessage("There is no server with that name");
+ break;
+ case 4:
+ sender.sendMessage("That Server is not a SubServer");
+ break;
+ case 5:
+ starter.run();
+ break;
+ case 0:
+ case 1:
+ sender.sendMessage("Server was stopped successfully");
+ break;
+ }
+ }));
+ } else {
+ sender.sendMessage("Usage: /" + handle + " ");
+ }
}
}
}.autocomplete(defaultCompletor).usage("").description("Restarts a SubServer").help(
@@ -580,26 +596,28 @@ public class SubCommand {
new Command(host.info) {
@Override
public void command(CommandSender sender, String handle, String[] args) {
- if (args.length > 0) {
- ((SubDataClient) SubAPI.getInstance().getSubDataNetwork()[0]).sendPacket(new PacketStopServer(null, args[0], false, data -> {
- switch (data.getInt(0x0001)) {
- case 3:
- sender.sendMessage("There is no server with that name");
- break;
- case 4:
- sender.sendMessage("That Server is not a SubServer");
- break;
- case 5:
- sender.sendMessage("That SubServer is not running");
- break;
- case 0:
- case 1:
- sender.sendMessage("Server was stopped successfully");
- break;
- }
- }));
- } else {
- sender.sendMessage("Usage: /" + handle + " ");
+ if (canRun()) {
+ if (args.length > 0) {
+ ((SubDataClient) SubAPI.getInstance().getSubDataNetwork()[0]).sendPacket(new PacketStopServer(null, args[0], false, data -> {
+ switch (data.getInt(0x0001)) {
+ case 3:
+ sender.sendMessage("There is no server with that name");
+ break;
+ case 4:
+ sender.sendMessage("That Server is not a SubServer");
+ break;
+ case 5:
+ sender.sendMessage("That SubServer is not running");
+ break;
+ case 0:
+ case 1:
+ sender.sendMessage("Server was stopped successfully");
+ break;
+ }
+ }));
+ } else {
+ sender.sendMessage("Usage: /" + handle + " ");
+ }
}
}
}.autocomplete(defaultCompletor).usage("").description("Stops a SubServer").help(
@@ -616,26 +634,28 @@ public class SubCommand {
new Command(host.info) {
@Override
public void command(CommandSender sender, String handle, String[] args) {
- if (args.length > 0) {
- ((SubDataClient) SubAPI.getInstance().getSubDataNetwork()[0]).sendPacket(new PacketStopServer(null, args[0], true, data -> {
- switch (data.getInt(0x0001)) {
- case 3:
- sender.sendMessage("There is no server with that name");
- break;
- case 4:
- sender.sendMessage("That Server is not a SubServer");
- break;
- case 5:
- sender.sendMessage("That SubServer is not running");
- break;
- case 0:
- case 1:
- sender.sendMessage("Server was terminated successfully");
- break;
- }
- }));
- } else {
- sender.sendMessage("Usage: /" + handle + " ");
+ if (canRun()) {
+ if (args.length > 0) {
+ ((SubDataClient) SubAPI.getInstance().getSubDataNetwork()[0]).sendPacket(new PacketStopServer(null, args[0], true, data -> {
+ switch (data.getInt(0x0001)) {
+ case 3:
+ sender.sendMessage("There is no server with that name");
+ break;
+ case 4:
+ sender.sendMessage("That Server is not a SubServer");
+ break;
+ case 5:
+ sender.sendMessage("That SubServer is not running");
+ break;
+ case 0:
+ case 1:
+ sender.sendMessage("Server was terminated successfully");
+ break;
+ }
+ }));
+ } else {
+ sender.sendMessage("Usage: /" + handle + " ");
+ }
}
}
}.autocomplete(defaultCompletor).usage("").description("Terminates a SubServer").help(
@@ -652,35 +672,37 @@ public class SubCommand {
new Command(host.info) {
@Override
public void command(CommandSender sender, String handle, String[] args) {
- if (args.length > 1) {
- int i = 1;
- String str = args[1];
- if (args.length > 2) {
- do {
- i++;
- str = str + " " + args[i];
- } while ((i + 1) != args.length);
- }
- final String cmd = str;
- ((SubDataClient) SubAPI.getInstance().getSubDataNetwork()[0]).sendPacket(new PacketCommandServer(null, args[0], cmd, data -> {
- switch (data.getInt(0x0001)) {
- case 3:
- sender.sendMessage("There is no server with that name");
- break;
- case 4:
- sender.sendMessage("That Server is not a SubServer");
- break;
- case 5:
- sender.sendMessage("That SubServer is not running");
- break;
- case 0:
- case 1:
- sender.sendMessage("Command was sent successfully");
- break;
+ if (canRun()) {
+ if (args.length > 1) {
+ int i = 1;
+ String str = args[1];
+ if (args.length > 2) {
+ do {
+ i++;
+ str = str + " " + args[i];
+ } while ((i + 1) != args.length);
}
- }));
- } else {
- sender.sendMessage("Usage: /" + handle + " [Args...]");
+ final String cmd = str;
+ ((SubDataClient) SubAPI.getInstance().getSubDataNetwork()[0]).sendPacket(new PacketCommandServer(null, args[0], cmd, data -> {
+ switch (data.getInt(0x0001)) {
+ case 3:
+ sender.sendMessage("There is no server with that name");
+ break;
+ case 4:
+ sender.sendMessage("That Server is not a SubServer");
+ break;
+ case 5:
+ sender.sendMessage("That SubServer is not running");
+ break;
+ case 0:
+ case 1:
+ sender.sendMessage("Command was sent successfully");
+ break;
+ }
+ }));
+ } else {
+ sender.sendMessage("Usage: /" + handle + " [Args...]");
+ }
}
}
}.autocomplete(defaultCompletor).usage("", "", "[Args...]").description("Sends a Command to a SubServer").help(
@@ -699,47 +721,49 @@ public class SubCommand {
new Command(host.info) {
@Override
public void command(CommandSender sender, String handle, String[] args) {
- if (args.length > 3) {
- if (args.length > 4 && Util.isException(() -> Integer.parseInt(args[4]))) {
- sender.sendMessage("Invalid Port Number");
+ if (canRun()) {
+ if (args.length > 3) {
+ if (args.length > 4 && Util.isException(() -> Integer.parseInt(args[4]))) {
+ sender.sendMessage("Invalid Port Number");
+ } else {
+ ((SubDataClient) SubAPI.getInstance().getSubDataNetwork()[0]).sendPacket(new PacketCreateServer(null, args[0], args[1], args[2], new Version(args[3]), (args.length > 4)?Integer.parseInt(args[4]):null, data -> {
+ switch (data.getInt(0x0001)) {
+ case 3:
+ sender.sendMessage("Server names cannot use spaces");
+ case 4:
+ sender.sendMessage("There is already a SubServer with that name");
+ break;
+ case 5:
+ sender.sendMessage("There is no host with that name");
+ break;
+ case 6:
+ sender.sendMessage("That Host is not available");
+ break;
+ case 7:
+ sender.sendMessage("That Host is not enabled");
+ break;
+ case 8:
+ sender.sendMessage("There is no template with that name");
+ break;
+ case 9:
+ sender.sendMessage("That Template is not enabled");
+ break;
+ case 10:
+ sender.sendMessage("That Template requires a Minecraft Version to be specified");
+ break;
+ case 11:
+ sender.sendMessage("Invalid Port Number");
+ break;
+ case 0:
+ case 1:
+ sender.sendMessage("Launching SubCreator...");
+ break;
+ }
+ }));
+ }
} else {
- ((SubDataClient) SubAPI.getInstance().getSubDataNetwork()[0]).sendPacket(new PacketCreateServer(null, args[0], args[1], args[2], new Version(args[3]), (args.length > 4)?Integer.parseInt(args[4]):null, data -> {
- switch (data.getInt(0x0001)) {
- case 3:
- sender.sendMessage("Server names cannot use spaces");
- case 4:
- sender.sendMessage("There is already a SubServer with that name");
- break;
- case 5:
- sender.sendMessage("There is no host with that name");
- break;
- case 6:
- sender.sendMessage("That Host is not available");
- break;
- case 7:
- sender.sendMessage("That Host is not enabled");
- break;
- case 8:
- sender.sendMessage("There is no template with that name");
- break;
- case 9:
- sender.sendMessage("That Template is not enabled");
- break;
- case 10:
- sender.sendMessage("That Template requires a Minecraft Version to be specified");
- break;
- case 11:
- sender.sendMessage("Invalid Port Number");
- break;
- case 0:
- case 1:
- sender.sendMessage("Launching SubCreator...");
- break;
- }
- }));
+ sender.sendMessage("Usage: /" + handle + " [Version] [Port]");
}
- } else {
- sender.sendMessage("Usage: /" + handle + " [Version] [Port]");
}
}
}.autocomplete((sender, handle, args) -> {
@@ -798,34 +822,36 @@ public class SubCommand {
}
private static void updateCache() {
- if (Calendar.getInstance().getTime().getTime() - cacheDate >= TimeUnit.MINUTES.toMillis(1)) {
- cacheDate = Calendar.getInstance().getTime().getTime();
- SubAPI.getInstance().getProxies(proxies -> {
- proxyCache = new LinkedList(proxies.keySet());
+ if (canRun()) {
+ if (Calendar.getInstance().getTime().getTime() - cacheDate >= TimeUnit.MINUTES.toMillis(1)) {
cacheDate = Calendar.getInstance().getTime().getTime();
- });
- SubAPI.getInstance().getHosts(hosts -> {
- TreeMap> cache = new TreeMap>();
- for (Host host : hosts.values()) {
- List templates = new ArrayList();
- templates.addAll(host.getCreator().getTemplates().keySet());
- cache.put(host.getName().toLowerCase(), templates);
- }
- hostCache = cache;
- cacheDate = Calendar.getInstance().getTime().getTime();
- });
- SubAPI.getInstance().getGroups(groups -> {
- groupCache = new LinkedList(groups.keySet());
- cacheDate = Calendar.getInstance().getTime().getTime();
- });
- SubAPI.getInstance().getServers(servers -> {
- TreeMap cache = new TreeMap();
- for (Server server : servers.values()) {
- cache.put(server.getName(), server instanceof SubServer);
- }
- serverCache = cache;
- cacheDate = Calendar.getInstance().getTime().getTime();
- });
+ SubAPI.getInstance().getProxies(proxies -> {
+ proxyCache = new LinkedList(proxies.keySet());
+ cacheDate = Calendar.getInstance().getTime().getTime();
+ });
+ SubAPI.getInstance().getHosts(hosts -> {
+ TreeMap> cache = new TreeMap>();
+ for (Host host : hosts.values()) {
+ List templates = new ArrayList();
+ templates.addAll(host.getCreator().getTemplates().keySet());
+ cache.put(host.getName().toLowerCase(), templates);
+ }
+ hostCache = cache;
+ cacheDate = Calendar.getInstance().getTime().getTime();
+ });
+ SubAPI.getInstance().getGroups(groups -> {
+ groupCache = new LinkedList(groups.keySet());
+ cacheDate = Calendar.getInstance().getTime().getTime();
+ });
+ SubAPI.getInstance().getServers(servers -> {
+ TreeMap cache = new TreeMap();
+ for (Server server : servers.values()) {
+ cache.put(server.getName(), server instanceof SubServer);
+ }
+ serverCache = cache;
+ cacheDate = Calendar.getInstance().getTime().getTime();
+ });
+ }
}
}
diff --git a/SubServers.Sync/pom.xml b/SubServers.Sync/pom.xml
index 1a08b305..88b50e2b 100644
--- a/SubServers.Sync/pom.xml
+++ b/SubServers.Sync/pom.xml
@@ -28,9 +28,15 @@
provided
- org.msgpack
- msgpack-core
- 0.8.16
+ net.ME1312.Galaxi
+ GalaxiUtil
+ 19w20b
+ compile
+
+
+ net.ME1312.SubData
+ Client
+ 19w20g
compile
diff --git a/SubServers.Sync/src/net/ME1312/SubServers/Sync/Event/SubAddHostEvent.java b/SubServers.Sync/src/net/ME1312/SubServers/Sync/Event/SubAddHostEvent.java
index ee54e611..1c56c2b1 100644
--- a/SubServers.Sync/src/net/ME1312/SubServers/Sync/Event/SubAddHostEvent.java
+++ b/SubServers.Sync/src/net/ME1312/SubServers/Sync/Event/SubAddHostEvent.java
@@ -1,7 +1,7 @@
package net.ME1312.SubServers.Sync.Event;
import net.ME1312.SubServers.Sync.Library.SubEvent;
-import net.ME1312.SubServers.Sync.Library.Util;
+import net.ME1312.Galaxi.Library.Util;
import net.md_5.bungee.api.plugin.Event;
import java.util.UUID;
diff --git a/SubServers.Sync/src/net/ME1312/SubServers/Sync/Event/SubAddProxyEvent.java b/SubServers.Sync/src/net/ME1312/SubServers/Sync/Event/SubAddProxyEvent.java
index b12afcd1..a47921ce 100644
--- a/SubServers.Sync/src/net/ME1312/SubServers/Sync/Event/SubAddProxyEvent.java
+++ b/SubServers.Sync/src/net/ME1312/SubServers/Sync/Event/SubAddProxyEvent.java
@@ -1,7 +1,7 @@
package net.ME1312.SubServers.Sync.Event;
import net.ME1312.SubServers.Sync.Library.SubEvent;
-import net.ME1312.SubServers.Sync.Library.Util;
+import net.ME1312.Galaxi.Library.Util;
import net.md_5.bungee.api.plugin.Event;
/**
diff --git a/SubServers.Sync/src/net/ME1312/SubServers/Sync/Event/SubAddServerEvent.java b/SubServers.Sync/src/net/ME1312/SubServers/Sync/Event/SubAddServerEvent.java
index a1cf797a..7724559f 100644
--- a/SubServers.Sync/src/net/ME1312/SubServers/Sync/Event/SubAddServerEvent.java
+++ b/SubServers.Sync/src/net/ME1312/SubServers/Sync/Event/SubAddServerEvent.java
@@ -1,7 +1,7 @@
package net.ME1312.SubServers.Sync.Event;
import net.ME1312.SubServers.Sync.Library.SubEvent;
-import net.ME1312.SubServers.Sync.Library.Util;
+import net.ME1312.Galaxi.Library.Util;
import net.md_5.bungee.api.plugin.Event;
import java.util.UUID;
diff --git a/SubServers.Sync/src/net/ME1312/SubServers/Sync/Event/SubCreateEvent.java b/SubServers.Sync/src/net/ME1312/SubServers/Sync/Event/SubCreateEvent.java
index 6e289e90..c5b97a0a 100644
--- a/SubServers.Sync/src/net/ME1312/SubServers/Sync/Event/SubCreateEvent.java
+++ b/SubServers.Sync/src/net/ME1312/SubServers/Sync/Event/SubCreateEvent.java
@@ -1,8 +1,8 @@
package net.ME1312.SubServers.Sync.Event;
import net.ME1312.SubServers.Sync.Library.SubEvent;
-import net.ME1312.SubServers.Sync.Library.Util;
-import net.ME1312.SubServers.Sync.Library.Version.Version;
+import net.ME1312.Galaxi.Library.Util;
+import net.ME1312.Galaxi.Library.Version.Version;
import net.md_5.bungee.api.plugin.Event;
import java.util.UUID;
diff --git a/SubServers.Sync/src/net/ME1312/SubServers/Sync/Event/SubEditServerEvent.java b/SubServers.Sync/src/net/ME1312/SubServers/Sync/Event/SubEditServerEvent.java
index e3ad26d6..f8882bd0 100644
--- a/SubServers.Sync/src/net/ME1312/SubServers/Sync/Event/SubEditServerEvent.java
+++ b/SubServers.Sync/src/net/ME1312/SubServers/Sync/Event/SubEditServerEvent.java
@@ -1,10 +1,10 @@
package net.ME1312.SubServers.Sync.Event;
-import net.ME1312.SubServers.Sync.Library.Config.YAMLSection;
-import net.ME1312.SubServers.Sync.Library.Config.YAMLValue;
-import net.ME1312.SubServers.Sync.Library.NamedContainer;
+import net.ME1312.Galaxi.Library.Map.ObjectMap;
+import net.ME1312.Galaxi.Library.Map.ObjectMapValue;
+import net.ME1312.Galaxi.Library.NamedContainer;
import net.ME1312.SubServers.Sync.Library.SubEvent;
-import net.ME1312.SubServers.Sync.Library.Util;
+import net.ME1312.Galaxi.Library.Util;
import net.md_5.bungee.api.plugin.Event;
import java.util.UUID;
@@ -15,7 +15,7 @@ import java.util.UUID;
public class SubEditServerEvent extends Event implements SubEvent {
private UUID player;
private String server;
- private NamedContainer edit;
+ private NamedContainer> edit;
private boolean perm;
/**
@@ -28,11 +28,11 @@ public class SubEditServerEvent extends Event implements SubEvent {
*/
public SubEditServerEvent(UUID player, String server, NamedContainer edit, boolean permanent) {
if (Util.isNull(server, edit)) throw new NullPointerException();
- YAMLSection section = new YAMLSection();
+ ObjectMap section = new ObjectMap();
section.set(".", edit.get());
this.player = player;
this.server = server;
- this.edit = new NamedContainer(edit.name(), section.get("."));
+ this.edit = new NamedContainer>(edit.name(), section.get("."));
this.perm = permanent;
}
@@ -55,7 +55,7 @@ public class SubEditServerEvent extends Event implements SubEvent {
*
* @return Edit to be made
*/
- public NamedContainer getEdit() {
+ public NamedContainer> getEdit() {
return edit;
}
diff --git a/SubServers.Sync/src/net/ME1312/SubServers/Sync/Event/SubNetworkConnectEvent.java b/SubServers.Sync/src/net/ME1312/SubServers/Sync/Event/SubNetworkConnectEvent.java
index 96247ef4..ea8956d9 100644
--- a/SubServers.Sync/src/net/ME1312/SubServers/Sync/Event/SubNetworkConnectEvent.java
+++ b/SubServers.Sync/src/net/ME1312/SubServers/Sync/Event/SubNetworkConnectEvent.java
@@ -1,8 +1,8 @@
package net.ME1312.SubServers.Sync.Event;
import net.ME1312.SubServers.Sync.Library.SubEvent;
-import net.ME1312.SubServers.Sync.Library.Util;
-import net.ME1312.SubServers.Sync.Network.SubDataClient;
+import net.ME1312.Galaxi.Library.Util;
+import net.ME1312.SubData.Client.SubDataClient;
import net.md_5.bungee.api.plugin.Event;
/**
diff --git a/SubServers.Sync/src/net/ME1312/SubServers/Sync/Event/SubNetworkDisconnectEvent.java b/SubServers.Sync/src/net/ME1312/SubServers/Sync/Event/SubNetworkDisconnectEvent.java
index 41ba72c9..3184597c 100644
--- a/SubServers.Sync/src/net/ME1312/SubServers/Sync/Event/SubNetworkDisconnectEvent.java
+++ b/SubServers.Sync/src/net/ME1312/SubServers/Sync/Event/SubNetworkDisconnectEvent.java
@@ -1,9 +1,42 @@
package net.ME1312.SubServers.Sync.Event;
+import net.ME1312.Galaxi.Library.Util;
+import net.ME1312.SubData.Client.DataClient;
+import net.ME1312.SubData.Client.Library.DisconnectReason;
import net.ME1312.SubServers.Sync.Library.SubEvent;
import net.md_5.bungee.api.plugin.Event;
/**
* SubData Network Disconnect Event
*/
-public class SubNetworkDisconnectEvent extends Event implements SubEvent {}
\ No newline at end of file
+public class SubNetworkDisconnectEvent extends Event implements SubEvent {
+ private DataClient network;
+ private DisconnectReason reason;
+
+ /**
+ * SubData Network Disconnect Event
+ */
+ public SubNetworkDisconnectEvent(DataClient network, DisconnectReason reason) {
+ if (Util.isNull(network, reason)) throw new NullPointerException();
+ this.network = network;
+ this.reason = reason;
+ }
+
+ /**
+ * Get the SubData network
+ *
+ * @return SubData Network
+ */
+ public DataClient getNetwork() {
+ return network;
+ }
+
+ /**
+ * Get the reason the client disconnected
+ *
+ * @return Disconnect Reason
+ */
+ public DisconnectReason getReason() {
+ return reason;
+ }
+}
\ No newline at end of file
diff --git a/SubServers.Sync/src/net/ME1312/SubServers/Sync/Event/SubRemoveHostEvent.java b/SubServers.Sync/src/net/ME1312/SubServers/Sync/Event/SubRemoveHostEvent.java
index 60de7e44..c3f59f12 100644
--- a/SubServers.Sync/src/net/ME1312/SubServers/Sync/Event/SubRemoveHostEvent.java
+++ b/SubServers.Sync/src/net/ME1312/SubServers/Sync/Event/SubRemoveHostEvent.java
@@ -1,7 +1,7 @@
package net.ME1312.SubServers.Sync.Event;
import net.ME1312.SubServers.Sync.Library.SubEvent;
-import net.ME1312.SubServers.Sync.Library.Util;
+import net.ME1312.Galaxi.Library.Util;
import net.md_5.bungee.api.plugin.Event;
import java.util.UUID;
diff --git a/SubServers.Sync/src/net/ME1312/SubServers/Sync/Event/SubRemoveProxyEvent.java b/SubServers.Sync/src/net/ME1312/SubServers/Sync/Event/SubRemoveProxyEvent.java
index b9e50507..0b4d6880 100644
--- a/SubServers.Sync/src/net/ME1312/SubServers/Sync/Event/SubRemoveProxyEvent.java
+++ b/SubServers.Sync/src/net/ME1312/SubServers/Sync/Event/SubRemoveProxyEvent.java
@@ -1,7 +1,7 @@
package net.ME1312.SubServers.Sync.Event;
import net.ME1312.SubServers.Sync.Library.SubEvent;
-import net.ME1312.SubServers.Sync.Library.Util;
+import net.ME1312.Galaxi.Library.Util;
import net.md_5.bungee.api.plugin.Event;
/**
diff --git a/SubServers.Sync/src/net/ME1312/SubServers/Sync/Event/SubRemoveServerEvent.java b/SubServers.Sync/src/net/ME1312/SubServers/Sync/Event/SubRemoveServerEvent.java
index 770f0cf3..04b31258 100644
--- a/SubServers.Sync/src/net/ME1312/SubServers/Sync/Event/SubRemoveServerEvent.java
+++ b/SubServers.Sync/src/net/ME1312/SubServers/Sync/Event/SubRemoveServerEvent.java
@@ -1,7 +1,7 @@
package net.ME1312.SubServers.Sync.Event;
import net.ME1312.SubServers.Sync.Library.SubEvent;
-import net.ME1312.SubServers.Sync.Library.Util;
+import net.ME1312.Galaxi.Library.Util;
import net.md_5.bungee.api.plugin.Event;
import java.util.UUID;
diff --git a/SubServers.Sync/src/net/ME1312/SubServers/Sync/Event/SubSendCommandEvent.java b/SubServers.Sync/src/net/ME1312/SubServers/Sync/Event/SubSendCommandEvent.java
index 1cc5cd55..0f6d0c1e 100644
--- a/SubServers.Sync/src/net/ME1312/SubServers/Sync/Event/SubSendCommandEvent.java
+++ b/SubServers.Sync/src/net/ME1312/SubServers/Sync/Event/SubSendCommandEvent.java
@@ -1,7 +1,7 @@
package net.ME1312.SubServers.Sync.Event;
import net.ME1312.SubServers.Sync.Library.SubEvent;
-import net.ME1312.SubServers.Sync.Library.Util;
+import net.ME1312.Galaxi.Library.Util;
import net.md_5.bungee.api.plugin.Event;
import java.util.UUID;
diff --git a/SubServers.Sync/src/net/ME1312/SubServers/Sync/Event/SubStartEvent.java b/SubServers.Sync/src/net/ME1312/SubServers/Sync/Event/SubStartEvent.java
index f61a2135..44a41d32 100644
--- a/SubServers.Sync/src/net/ME1312/SubServers/Sync/Event/SubStartEvent.java
+++ b/SubServers.Sync/src/net/ME1312/SubServers/Sync/Event/SubStartEvent.java
@@ -1,7 +1,7 @@
package net.ME1312.SubServers.Sync.Event;
import net.ME1312.SubServers.Sync.Library.SubEvent;
-import net.ME1312.SubServers.Sync.Library.Util;
+import net.ME1312.Galaxi.Library.Util;
import net.md_5.bungee.api.plugin.Event;
import java.util.UUID;
diff --git a/SubServers.Sync/src/net/ME1312/SubServers/Sync/Event/SubStopEvent.java b/SubServers.Sync/src/net/ME1312/SubServers/Sync/Event/SubStopEvent.java
index 20bba9d5..88dab221 100644
--- a/SubServers.Sync/src/net/ME1312/SubServers/Sync/Event/SubStopEvent.java
+++ b/SubServers.Sync/src/net/ME1312/SubServers/Sync/Event/SubStopEvent.java
@@ -1,7 +1,7 @@
package net.ME1312.SubServers.Sync.Event;
import net.ME1312.SubServers.Sync.Library.SubEvent;
-import net.ME1312.SubServers.Sync.Library.Util;
+import net.ME1312.Galaxi.Library.Util;
import net.md_5.bungee.api.plugin.Event;
import java.util.UUID;
diff --git a/SubServers.Sync/src/net/ME1312/SubServers/Sync/Event/SubStoppedEvent.java b/SubServers.Sync/src/net/ME1312/SubServers/Sync/Event/SubStoppedEvent.java
index 7dad0865..39dd8f3d 100644
--- a/SubServers.Sync/src/net/ME1312/SubServers/Sync/Event/SubStoppedEvent.java
+++ b/SubServers.Sync/src/net/ME1312/SubServers/Sync/Event/SubStoppedEvent.java
@@ -1,7 +1,7 @@
package net.ME1312.SubServers.Sync.Event;
import net.ME1312.SubServers.Sync.Library.SubEvent;
-import net.ME1312.SubServers.Sync.Library.Util;
+import net.ME1312.Galaxi.Library.Util;
import net.md_5.bungee.api.plugin.Event;
/**
diff --git a/SubServers.Sync/src/net/ME1312/SubServers/Sync/Launch.java b/SubServers.Sync/src/net/ME1312/SubServers/Sync/Launch.java
index 742adde3..9b6f0abb 100644
--- a/SubServers.Sync/src/net/ME1312/SubServers/Sync/Launch.java
+++ b/SubServers.Sync/src/net/ME1312/SubServers/Sync/Launch.java
@@ -1,9 +1,9 @@
package net.ME1312.SubServers.Sync;
-import net.ME1312.SubServers.Sync.Library.Container;
-import net.ME1312.SubServers.Sync.Library.Util;
-import net.ME1312.SubServers.Sync.Library.Version.Version;
-import net.ME1312.SubServers.Sync.Library.Version.VersionType;
+import net.ME1312.Galaxi.Library.Container;
+import net.ME1312.Galaxi.Library.Util;
+import net.ME1312.Galaxi.Library.Version.Version;
+import net.ME1312.Galaxi.Library.Version.VersionType;
import java.lang.reflect.Field;
import java.security.Security;
diff --git a/SubServers.Sync/src/net/ME1312/SubServers/Sync/Library/Callback.java b/SubServers.Sync/src/net/ME1312/SubServers/Sync/Library/Callback.java
deleted file mode 100644
index 38694426..00000000
--- a/SubServers.Sync/src/net/ME1312/SubServers/Sync/Library/Callback.java
+++ /dev/null
@@ -1,13 +0,0 @@
-package net.ME1312.SubServers.Sync.Library;
-
-/**
- * Callback Class
- */
-public interface Callback {
- /**
- * Run the Callback
- *
- * @param obj Object
- */
- void run(T obj);
-}
diff --git a/SubServers.Sync/src/net/ME1312/SubServers/Sync/Library/Compatibility/CommandX.java b/SubServers.Sync/src/net/ME1312/SubServers/Sync/Library/Compatibility/CommandX.java
index 0b5c4c2f..a2aa562c 100644
--- a/SubServers.Sync/src/net/ME1312/SubServers/Sync/Library/Compatibility/CommandX.java
+++ b/SubServers.Sync/src/net/ME1312/SubServers/Sync/Library/Compatibility/CommandX.java
@@ -1,6 +1,6 @@
package net.ME1312.SubServers.Sync.Library.Compatibility;
-import net.ME1312.SubServers.Sync.Library.NamedContainer;
+import net.ME1312.Galaxi.Library.NamedContainer;
import net.md_5.bungee.api.CommandSender;
import net.md_5.bungee.api.plugin.Command;
import net.md_5.bungee.api.plugin.TabExecutor;
diff --git a/SubServers.Sync/src/net/ME1312/SubServers/Sync/Library/Compatibility/mc1_13/CommandX.java b/SubServers.Sync/src/net/ME1312/SubServers/Sync/Library/Compatibility/mc1_13/CommandX.java
index 2a283e04..486bd84a 100644
--- a/SubServers.Sync/src/net/ME1312/SubServers/Sync/Library/Compatibility/mc1_13/CommandX.java
+++ b/SubServers.Sync/src/net/ME1312/SubServers/Sync/Library/Compatibility/mc1_13/CommandX.java
@@ -1,6 +1,6 @@
package net.ME1312.SubServers.Sync.Library.Compatibility.mc1_13;
-import net.ME1312.SubServers.Sync.Library.NamedContainer;
+import net.ME1312.Galaxi.Library.NamedContainer;
import net.md_5.bungee.api.CommandSender;
import java.util.LinkedList;
diff --git a/SubServers.Sync/src/net/ME1312/SubServers/Sync/Library/Config/YAMLConfig.java b/SubServers.Sync/src/net/ME1312/SubServers/Sync/Library/Config/YAMLConfig.java
deleted file mode 100644
index 1016a6ac..00000000
--- a/SubServers.Sync/src/net/ME1312/SubServers/Sync/Library/Config/YAMLConfig.java
+++ /dev/null
@@ -1,110 +0,0 @@
-package net.ME1312.SubServers.Sync.Library.Config;
-
-import net.ME1312.SubServers.Sync.Library.Util;
-import org.yaml.snakeyaml.DumperOptions;
-import org.yaml.snakeyaml.Yaml;
-import org.yaml.snakeyaml.error.YAMLException;
-
-import java.io.*;
-import java.util.LinkedHashMap;
-
-/**
- * YAML Config Class
- */
-@SuppressWarnings("unused")
-public class YAMLConfig {
- private File file;
- private Yaml yaml;
- private YAMLSection config;
-
- /**
- * Creates/Loads a YAML Formatted Config
- *
- * @param file
- * @throws IOException
- * @throws YAMLException
- */
- @SuppressWarnings("unchecked")
- public YAMLConfig(File file) throws IOException, YAMLException {
- if (Util.isNull(file)) throw new NullPointerException();
- this.file = file;
- this.yaml = new Yaml(getDumperOptions());
- if (file.exists()) {
- InputStream stream = new FileInputStream(file);
- this.config = new YAMLSection((LinkedHashMap) yaml.loadAs(stream, LinkedHashMap.class), null, null, yaml);
- stream.close();
- } else {
- this.config = new YAMLSection(null, null, null, yaml);
- }
- }
-
- /**
- * Get Config Contents
- *
- * @return Config Contents
- */
- public YAMLSection get() {
- return config;
- }
-
- /**
- * Set Config Contents
- *
- * @param value Value
- */
- public void set(YAMLSection value) {
- if (Util.isNull(value)) throw new NullPointerException();
- config = value;
- }
-
- /**
- * Reload Config Contents
- *
- * @throws IOException
- */
- @SuppressWarnings("unchecked")
- public void reload() throws IOException {
- if (file.exists()) {
- InputStream stream = new FileInputStream(file);
- this.config = new YAMLSection((LinkedHashMap) yaml.loadAs(stream, LinkedHashMap.class), null, null, yaml);
- stream.close();
- } else {
- this.config = new YAMLSection(null, null, null, yaml);
- }
- }
-
- /**
- * Save Config Contents
- *
- * @throws IOException
- */
- public void save() throws IOException {
- if (!file.exists()) file.createNewFile();
- FileWriter writer = new FileWriter(file);
- yaml.dump(config.map, writer);
- writer.close();
- }
-
- @Override
- public boolean equals(Object object) {
- if (object instanceof YAMLConfig) {
- return get().equals(((YAMLConfig) object).get());
- } else {
- return super.equals(object);
- }
- }
-
- @Override
- public String toString() {
- return yaml.dump(config.map);
- }
-
- protected static DumperOptions getDumperOptions() {
- DumperOptions options = new DumperOptions();
- options.setAllowUnicode(false);
- options.setDefaultFlowStyle(DumperOptions.FlowStyle.BLOCK);
- options.setIndent(2);
-
- return options;
- }
-}
\ No newline at end of file
diff --git a/SubServers.Sync/src/net/ME1312/SubServers/Sync/Library/Config/YAMLSection.java b/SubServers.Sync/src/net/ME1312/SubServers/Sync/Library/Config/YAMLSection.java
deleted file mode 100644
index e9e20d26..00000000
--- a/SubServers.Sync/src/net/ME1312/SubServers/Sync/Library/Config/YAMLSection.java
+++ /dev/null
@@ -1,1143 +0,0 @@
-package net.ME1312.SubServers.Sync.Library.Config;
-
-import com.google.gson.Gson;
-import net.ME1312.SubServers.Sync.Library.Util;
-import net.ME1312.SubServers.Sync.Library.Version.Version;
-import org.msgpack.value.MapValue;
-import org.msgpack.value.Value;
-import org.msgpack.value.ValueFactory;
-import org.yaml.snakeyaml.Yaml;
-import org.yaml.snakeyaml.error.YAMLException;
-
-import java.io.InputStream;
-import java.io.Reader;
-import java.util.*;
-
-/**
- * YAML Config Section Class
- */
-@SuppressWarnings({"unchecked", "unused"})
-public class YAMLSection {
- protected LinkedHashMap map;
- protected String handle = null;
- protected YAMLSection up = null;
- private Yaml yaml;
-
- /**
- * Creates an empty YAML Section
- */
- public YAMLSection() {
- this.map = new LinkedHashMap<>();
- this.yaml = new Yaml(YAMLConfig.getDumperOptions());
- }
-
- /**
- * Creates a YAML Section from an Input Stream
- *
- * @param stream Input Stream
- * @throws YAMLException
- */
- public YAMLSection(InputStream stream) throws YAMLException {
- if (Util.isNull(stream)) throw new NullPointerException();
- this.map = (LinkedHashMap) (this.yaml = new Yaml(YAMLConfig.getDumperOptions())).loadAs(stream, LinkedHashMap.class);
- }
-
- /**
- * Creates a YAML Section from a Reader
- *
- * @param reader Reader
- * @throws YAMLException
- */
- public YAMLSection(Reader reader) throws YAMLException {
- if (Util.isNull(reader)) throw new NullPointerException();
- this.map = (LinkedHashMap) (this.yaml = new Yaml(YAMLConfig.getDumperOptions())).loadAs(reader, LinkedHashMap.class);
- }
-
- /**
- * Creates a YAML Section from String
- *
- * @param str String
- * @throws YAMLException
- */
- public YAMLSection(String str) throws YAMLException {
- if (Util.isNull(str)) throw new NullPointerException();
- this.map = (LinkedHashMap) (this.yaml = new Yaml(YAMLConfig.getDumperOptions())).loadAs(str, LinkedHashMap.class);
- }
-
- /**
- * Creates a YAML Section from Map Contents
- *
- * @param map Map
- */
- public YAMLSection(Map map) {
- if (Util.isNull(map)) throw new NullPointerException();
- this.map = new LinkedHashMap<>();
- this.yaml = new Yaml(YAMLConfig.getDumperOptions());
-
- setAll(map);
- }
-
- /**
- * Creates a YAML Section from Message Pack Contents
- *
- * @param msgpack MessagePack Map
- */
- public YAMLSection(MapValue msgpack) {
- if (Util.isNull(msgpack)) throw new NullPointerException();
- this.map = new LinkedHashMap<>();
- this.yaml = new Yaml(YAMLConfig.getDumperOptions());
-
- boolean warned = false;
- Map map = msgpack.map();
- for (Value key : map.keySet()) {
- if (key.isStringValue()) {
- set(key.asStringValue().asString(), map.get(key));
- } else if (!warned) {
- new IllegalStateException("MessagePack contains non-string key(s)").printStackTrace();
- warned = true;
- }
- }
- }
-
- protected YAMLSection(Map map, YAMLSection up, String handle, Yaml yaml) {
- this.map = new LinkedHashMap();
- this.yaml = yaml;
- this.handle = handle;
- this.up = up;
-
- if (map != null) setAll(map);
- }
-
-
- /**
- * Get a copy of the original Object Map
- *
- * @return Object Map
- */
- public Map get() {
- LinkedHashMap map = new LinkedHashMap();
- map.putAll(this.map);
- return map;
- }
-
- /**
- * Get the Keys
- *
- * @return KeySet
- */
- public Set getKeys() {
- return map.keySet();
- }
-
- /**
- * Get the Values
- *
- * @return Values
- */
- public Collection getValues() {
- List values = new ArrayList();
- for (String value : map.keySet()) {
- values.add(new YAMLValue(map.get(value), this, value, yaml));
- }
- return values;
- }
-
- /**
- * Check if a Handle exists
- *
- * @param handle Handle
- * @return if that handle exists
- */
- public boolean contains(String handle) {
- return map.keySet().contains(handle);
- }
-
- private Object convert(Object value) {
- if (value instanceof Value) {
- if (((Value) value).isNilValue()) {
- value = null;
- } else if (((Value) value).isMapValue()) {
- Map map = ((Value) value).asMapValue().map();
- value = new YAMLSection(((Value) value).asMapValue());
- } else if (((Value) value).isArrayValue()) {
- value = ((Value) value).asArrayValue().list();
- } else if (((Value) value).isBooleanValue()) {
- value = ((Value) value).asBooleanValue().getBoolean();
- } else if (((Value) value).isFloatValue()) {
- if (((Value) value).asFloatValue().toDouble() == (double)(float) ((Value) value).asFloatValue().toDouble()) {
- value = ((Value) value).asFloatValue().toFloat();
- } else {
- value = ((Value) value).asFloatValue().toDouble();
- }
- } else if (((Value) value).isIntegerValue()) {
- if (((Value) value).asIntegerValue().isInByteRange()) {
- value = ((Value) value).asIntegerValue().asByte();
- } else if (((Value) value).asIntegerValue().isInShortRange()) {
- value = ((Value) value).asIntegerValue().asShort();
- } else if (((Value) value).asIntegerValue().isInIntRange()) {
- value = ((Value) value).asIntegerValue().asInt();
- } else if (((Value) value).asIntegerValue().isInLongRange()) {
- value = ((Value) value).asIntegerValue().asLong();
- } else {
- value = ((Value) value).asIntegerValue().asBigInteger();
- }
- } else if (((Value) value).isStringValue()) {
- value = ((Value) value).asStringValue().asString();
- }
-
- }
-
- if (value == null) {
- return null;
- } else if (value instanceof Map) {
- List list = new ArrayList();
- list.addAll(((Map) value).keySet());
- for (String key : list) ((Map) value).put(key, convert(((Map) value).get(key)));
- return value;
- } else if (value instanceof YAMLConfig) {
- ((YAMLConfig) value).get().up = this;
- ((YAMLConfig) value).get().handle = handle;
- return ((YAMLConfig) value).get().map;
- } else if (value instanceof YAMLSection) {
- ((YAMLSection) value).up = this;
- ((YAMLSection) value).handle = handle;
- return ((YAMLSection) value).map;
- } else if (value instanceof YAMLValue) {
- return ((YAMLValue) value).asObject();
- } else if (value instanceof Collection) {
- List