@@ -177,119 +172,155 @@ implements
+boolean |
+
canAccess(net.md_5.bungee.api.CommandSender sender)
+Whether the Player can access this Server
+ |
+
+
+java.net.InetSocketAddress |
+getAddress()
+Get this Server's Address
+ |
+
+
java.lang.String |
getDisplayName()
Get the Display Name of this Server
|
-
+
YAMLSection |
getExtra()
Get the extra value section
|
-
+
YAMLValue |
getExtra(java.lang.String handle)
Get an extra value
|
-
+
java.util.List<java.lang.String> |
getGroups()
Get this Server's Groups
|
-
+
java.lang.String |
getMotd()
-Gets the MOTD of the Server
+Get this Server's MOTD
|
-
+
+java.lang.String |
+getName()
+Get this Server's Name
+ |
+
+
+java.util.Collection<net.md_5.bungee.api.connection.ProxiedPlayer> |
+getPlayers()
+Get the Players connected to this Server
+ |
+
+
Client |
getSubData()
Gets the SubData Client
|
-
+
boolean |
hasExtra(java.lang.String handle)
Determine if an extra value exists
|
-
+
boolean |
isHidden()
-If the server is hidden from players
+If the Server is hidden from players
|
-
+
boolean |
isRestricted()
-Gets if the Server is Restricted
+Get the Server's Restricted Status
|
-
+
+void |
+ping(net.md_5.bungee.api.Callback<net.md_5.bungee.api.ServerPing> callback)
+Ping the Server
+ |
+
+
void |
removeExtra(java.lang.String handle)
Remove an extra value from this Server
|
-
+
void |
removeGroup(java.lang.String value)
Remove this Server from a Group
|
-
+
+void |
+sendData(java.lang.String channel,
+ byte[] data)
+Send PluginMessageChannel data to the Server
+ |
+
+
+boolean |
+sendData(java.lang.String channel,
+ byte[] data,
+ boolean queue)
+Send PluginMessageChannel data to the Server
+ |
+
+
void |
setDisplayName(java.lang.String value)
Sets the Display Name for this Server
|
-
+
void |
setHidden(boolean value)
-Set if the server is hidden from players
+Set if the Server is hidden from players
|
-
+
void |
setMotd(java.lang.String value)
-Sets the MOTD of the Server
+Set this Server's MOTD
|
-
+
void |
-setRestricted(boolean value)
-Sets if the Server is Restricted
- |
+setRestricted(boolean value) |
-
+
void |
setSubData(Client client)
Link a SubData Client to this Object
|
-
+
java.lang.String |
toString() |
--
-
-
-
Methods inherited from class net.md_5.bungee.BungeeServerInfo
-addPlayer, canAccess, equals, getAddress, getName, getPacketQueue, getPlayers, hashCode, ping, ping, removePlayer, sendData, sendData
-
-
-
Methods inherited from class java.lang.Object
-getClass, notify, notifyAll, wait, wait, wait
+equals, getClass, hashCode, notify, notifyAll, wait, wait, wait
@@ -395,82 +426,6 @@ implements
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
@@ -513,6 +468,200 @@ implements
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+-
+
sendData
+public void sendData(java.lang.String channel,
+ byte[] data)
+Send PluginMessageChannel data to the Server
+
+- Specified by:
+sendData in interface net.md_5.bungee.api.config.ServerInfo- Parameters:
+channel - Channel namedata - Data to send
+
+
+
+
+
+
+-
+
sendData
+public boolean sendData(java.lang.String channel,
+ byte[] data,
+ boolean queue)
+Send PluginMessageChannel data to the Server
+
+- Specified by:
+sendData in interface net.md_5.bungee.api.config.ServerInfo- Parameters:
+channel - Channel namedata - Data to sendqueue - Queue message for later if cannot be sent immediately- Returns:
+- If the message was sent immediately
+
+
+
+
+
+
+
+
+
+
+
@@ -520,11 +669,6 @@ implements
setRestricted
public void setRestricted(boolean value)
-Sets if the Server is Restricted
-
-- Parameters:
-value - Value
@@ -627,7 +771,7 @@ implements Overrides:
-toString in class net.md_5.bungee.BungeeServerInfo
+toString in class java.lang.Object
diff --git a/Javadoc/SubServers.Bungee/net/ME1312/SubServers/Bungee/Host/SubServer.html b/Javadoc/SubServers.Bungee/net/ME1312/SubServers/Bungee/Host/SubServer.html
index be3d852d..4ab0c960 100644
--- a/Javadoc/SubServers.Bungee/net/ME1312/SubServers/Bungee/Host/SubServer.html
+++ b/Javadoc/SubServers.Bungee/net/ME1312/SubServers/Bungee/Host/SubServer.html
@@ -98,9 +98,6 @@ var activeTableTab = "activeTableTab";
java.lang.Object
-- net.md_5.bungee.BungeeServerInfo
--
-
-
-
-
@@ -395,21 +390,14 @@ extends
Methods inherited from class net.ME1312.SubServers.Bungee.Host.Server
-addExtra, addGroup, getDisplayName, getExtra, getExtra, getGroups, getMotd, getSubData, hasExtra, isHidden, isRestricted, removeExtra, removeGroup, setDisplayName, setHidden, setMotd, setRestricted, setSubData
-
-
--
-
-
-
Methods inherited from class net.md_5.bungee.BungeeServerInfo
-addPlayer, canAccess, equals, getAddress, getName, getPacketQueue, getPlayers, hashCode, ping, ping, removePlayer, sendData, sendData
+addExtra, addGroup, canAccess, getAddress, getDisplayName, getExtra, getExtra, getGroups, getMotd, getName, getPlayers, getSubData, hasExtra, isHidden, isRestricted, ping, removeExtra, removeGroup, sendData, sendData, setDisplayName, setHidden, setMotd, setRestricted, setSubData
-
Methods inherited from class java.lang.Object
-getClass, notify, notifyAll, wait, wait, wait
+equals, getClass, hashCode, notify, notifyAll, wait, wait, wait
diff --git a/Javadoc/SubServers.Bungee/net/ME1312/SubServers/Bungee/Host/package-tree.html b/Javadoc/SubServers.Bungee/net/ME1312/SubServers/Bungee/Host/package-tree.html
index 3758f68b..3a7b2683 100644
--- a/Javadoc/SubServers.Bungee/net/ME1312/SubServers/Bungee/Host/package-tree.html
+++ b/Javadoc/SubServers.Bungee/net/ME1312/SubServers/Bungee/Host/package-tree.html
@@ -79,17 +79,13 @@
- java.lang.Object
-- net.md_5.bungee.BungeeServerInfo (implements net.md_5.bungee.api.config.ServerInfo)
-
-- net.ME1312.SubServers.Bungee.Host.Server (implements net.ME1312.SubServers.Bungee.Network.ClientHandler, net.ME1312.SubServers.Bungee.Library.ExtraDataHandler)
+
- net.ME1312.SubServers.Bungee.Host.Executable (implements java.io.Serializable)
+- net.ME1312.SubServers.Bungee.Host.Host (implements net.ME1312.SubServers.Bungee.Library.ExtraDataHandler)
+- net.ME1312.SubServers.Bungee.Host.Server (implements net.ME1312.SubServers.Bungee.Network.ClientHandler, net.ME1312.SubServers.Bungee.Library.ExtraDataHandler, net.md_5.bungee.api.config.ServerInfo)
-
-
-- net.ME1312.SubServers.Bungee.Host.Executable (implements java.io.Serializable)
-- net.ME1312.SubServers.Bungee.Host.Host (implements net.ME1312.SubServers.Bungee.Library.ExtraDataHandler)
- net.ME1312.SubServers.Bungee.Host.SubCreator
- net.ME1312.SubServers.Bungee.Host.SubCreator.ServerTemplate
- net.ME1312.SubServers.Bungee.Host.SubLogger
diff --git a/Javadoc/SubServers.Bungee/overview-tree.html b/Javadoc/SubServers.Bungee/overview-tree.html
index e644a53e..6b3e9eab 100644
--- a/Javadoc/SubServers.Bungee/overview-tree.html
+++ b/Javadoc/SubServers.Bungee/overview-tree.html
@@ -90,20 +90,6 @@
- java.lang.Object
- net.ME1312.SubServers.Bungee.Network.AES
-- net.md_5.bungee.BungeeServerInfo (implements net.md_5.bungee.api.config.ServerInfo)
-
-
- net.ME1312.SubServers.Bungee.Network.Client
- net.md_5.bungee.api.plugin.Command
+- net.ME1312.SubServers.Bungee.Host.Server (implements net.ME1312.SubServers.Bungee.Network.ClientHandler, net.ME1312.SubServers.Bungee.Library.ExtraDataHandler, net.md_5.bungee.api.config.ServerInfo)
+
+- net.ME1312.SubServers.Bungee.Host.SubServer
+
+
+
+
- net.ME1312.SubServers.Bungee.SubAPI
- net.ME1312.SubServers.Bungee.Host.SubCreator
diff --git a/SubServers.Bungee/META-INF/MANIFEST.MF b/SubServers.Bungee/META-INF/MANIFEST.MF
index 48d5effa..1bd731ec 100644
--- a/SubServers.Bungee/META-INF/MANIFEST.MF
+++ b/SubServers.Bungee/META-INF/MANIFEST.MF
@@ -2,4 +2,4 @@ Manifest-Version: 1.0
Class-Path: BungeeCord.jar
Main-Class: net.ME1312.SubServers.Bungee.Launch
Implementation-Version: 2.12.1e
-Specification-Version: 1
+Specification-Version: 0
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 bc8828bb..517e890f 100644
--- a/SubServers.Bungee/src/net/ME1312/SubServers/Bungee/Host/Server.java
+++ b/SubServers.Bungee/src/net/ME1312/SubServers/Bungee/Host/Server.java
@@ -11,39 +11,65 @@ import net.ME1312.SubServers.Bungee.Network.Client;
import net.ME1312.SubServers.Bungee.Network.ClientHandler;
import net.ME1312.SubServers.Bungee.Network.SubDataServer;
import net.ME1312.SubServers.Bungee.SubAPI;
-import net.md_5.bungee.BungeeServerInfo;
+import net.md_5.bungee.api.Callback;
import net.md_5.bungee.api.ChatColor;
+import net.md_5.bungee.api.CommandSender;
+import net.md_5.bungee.api.ServerPing;
+import net.md_5.bungee.api.config.ServerInfo;
import net.md_5.bungee.api.connection.ProxiedPlayer;
import org.json.JSONObject;
import java.net.InetSocketAddress;
-import java.util.ArrayList;
-import java.util.Collections;
-import java.util.HashMap;
-import java.util.List;
+import java.util.*;
/**
* Server Class
*/
-public class Server extends BungeeServerInfo implements ClientHandler, ExtraDataHandler {
+public class Server implements ServerInfo, ClientHandler, ExtraDataHandler {
private YAMLSection extra = new YAMLSection();
private Client client = null;
private List groups = new ArrayList();
private String nick = null;
- private String motd;
- private boolean restricted;
+ private ServerInfo info;
private boolean hidden;
public Server(String name, InetSocketAddress address, String motd, boolean hidden, boolean restricted) throws InvalidServerException {
- super(name, address, ChatColor.translateAlternateColorCodes('&', motd), restricted);
if (Util.isNull(name, address, motd, hidden, restricted)) throw new NullPointerException();
if (name.contains(" ")) throw new InvalidServerException("Server names cannot have spaces: " + name);
SubDataServer.allowConnection(getAddress().getAddress());
- this.motd = motd;
- this.restricted = restricted;
+ this.info = new ServerInfo(name, address, motd, restricted);
this.hidden = hidden;
}
+ private static final class ServerInfo extends net.md_5.bungee.BungeeServerInfo {
+ private String motd;
+ private boolean restricted;
+
+ public ServerInfo(String name, InetSocketAddress address, String motd, boolean restricted) {
+ super(name, address, ChatColor.translateAlternateColorCodes('&', motd), restricted);
+ this.motd = motd;
+ this.restricted = restricted;
+ }
+
+ @Override
+ public String getMotd() {
+ return motd;
+ }
+
+ public void setMotd(String value) {
+ this.motd = value;
+ }
+
+ @Override
+ public boolean isRestricted() {
+ return restricted;
+ }
+
+ public void setRestricted(boolean value) {
+ this.restricted = value;
+ }
+ }
+
@Override
public Client getSubData() {
return client;
@@ -79,64 +105,13 @@ public class Server extends BungeeServerInfo implements ClientHandler, ExtraData
}
}
- /**
- * If the server is hidden from players
- *
- * @return Hidden Status
- */
- public boolean isHidden() {
- return hidden;
- }
-
- /**
- * Set if the server is hidden from players
- *
- * @param value Value
- */
- public void setHidden(boolean value) {
- if (Util.isNull(value)) throw new NullPointerException();
- new SubEditServerEvent(null, this, new NamedContainer("hidden", value), false);
- this.hidden = value;
- }
-
- /**
- * Gets the MOTD of the Server
- *
- * @return Server MOTD
- */
- @Override
- public String getMotd() {
- return motd;
- }
-
- /**
- * Sets the MOTD of the Server
- *
- * @param value Value
- */
- public void setMotd(String value) {
- if (Util.isNull(value)) throw new NullPointerException();
- new SubEditServerEvent(null, this, new NamedContainer("motd", value), false);
- this.motd = value;
- }
-
- /**
- * Gets if the Server is Restricted
- *
- * @return Restricted Status
- */
- @Override
- public boolean isRestricted() {
- return restricted;
- }
-
/**
* Get this Server's Groups
*
* @return Group names
*/
public List getGroups() {
- return groups;
+ return groups;
}
/**
@@ -170,14 +145,136 @@ public class Server extends BungeeServerInfo implements ClientHandler, ExtraData
}
/**
- * Sets if the Server is Restricted
+ * If the Server is hidden from players
+ *
+ * @return Hidden Status
+ */
+ public boolean isHidden() {
+ return hidden;
+ }
+
+ /**
+ * Set if the Server is hidden from players
*
* @param value Value
*/
+ public void setHidden(boolean value) {
+ if (Util.isNull(value)) throw new NullPointerException();
+ new SubEditServerEvent(null, this, new NamedContainer("hidden", value), false);
+ this.hidden = value;
+ }
+
+ // Methods unrelated to SubServers
+
+ /**
+ * Get this Server's Name
+ *
+ * @return Server Name
+ */
+ @Override
+ public String getName() {
+ return info.getName();
+ }
+
+ /**
+ * Get this Server's Address
+ *
+ * @return Server Address
+ */
+ @Override
+ public InetSocketAddress getAddress() {
+ return info.getAddress();
+ }
+
+ /**
+ * Get the Players connected to this Server
+ *
+ * @return Player list
+ */
+ @Override
+ public Collection getPlayers() {
+ return info.getPlayers();
+ }
+
+ /**
+ * Get this Server's MOTD
+ *
+ * @return Server MOTD
+ */
+ @Override
+ public String getMotd() {
+ return info.getMotd();
+ }
+
+ /**
+ * Set this Server's MOTD
+ *
+ * @param value Value
+ */
+ public void setMotd(String value) {
+ if (Util.isNull(value)) throw new NullPointerException();
+ new SubEditServerEvent(null, this, new NamedContainer("motd", value), false);
+ info.setMotd(value);
+ }
+
+ /**
+ * Whether the Player can access this Server
+ *
+ * @param sender Player
+ * @return Player Access Status
+ */
+ @Override
+ public boolean canAccess(CommandSender sender) {
+ return info.canAccess(sender);
+ }
+
+ /**
+ * Send PluginMessageChannel data to the Server
+ *
+ * @param channel Channel name
+ * @param data Data to send
+ */
+ @Override
+ public void sendData(String channel, byte[] data) {
+ info.sendData(channel, data);
+ }
+
+ /**
+ * Send PluginMessageChannel data to the Server
+ *
+ * @param channel Channel name
+ * @param data Data to send
+ * @param queue Queue message for later if cannot be sent immediately
+ * @return If the message was sent immediately
+ */
+ @Override
+ public boolean sendData(String channel, byte[] data, boolean queue) {
+ return info.sendData(channel, data, queue);
+ }
+
+ /**
+ * Ping the Server
+ *
+ * @param callback Ping Callback
+ */
+ @Override
+ public void ping(Callback callback) {
+ info.ping(callback);
+ }
+
+ /**
+ * Get the Server's Restricted Status
+ *
+ * @return Restricted Status
+ */
+ public boolean isRestricted() {
+ return info.isRestricted();
+ }
+
public void setRestricted(boolean value) {
if (Util.isNull(value)) throw new NullPointerException();
new SubEditServerEvent(null, this, new NamedContainer("restricted", value), false);
- this.restricted = value;
+ info.setRestricted(value);
}
@Override
diff --git a/SubServers.Client/Bukkit/src/net/ME1312/SubServers/Client/Bukkit/SubPlugin.java b/SubServers.Client/Bukkit/src/net/ME1312/SubServers/Client/Bukkit/SubPlugin.java
index d568c938..147c3dcd 100644
--- a/SubServers.Client/Bukkit/src/net/ME1312/SubServers/Client/Bukkit/SubPlugin.java
+++ b/SubServers.Client/Bukkit/src/net/ME1312/SubServers/Client/Bukkit/SubPlugin.java
@@ -27,7 +27,7 @@ public final class SubPlugin extends JavaPlugin {
public UIHandler gui = null;
public final Version version;
- public final Version bversion = new Version(1);
+ public final Version bversion = null;
public final SubAPI api = new SubAPI(this);
public SubPlugin() {
diff --git a/SubServers.Host/src/net/ME1312/SubServers/Host/ExHost.java b/SubServers.Host/src/net/ME1312/SubServers/Host/ExHost.java
index ed31bef1..ec372e13 100644
--- a/SubServers.Host/src/net/ME1312/SubServers/Host/ExHost.java
+++ b/SubServers.Host/src/net/ME1312/SubServers/Host/ExHost.java
@@ -54,7 +54,7 @@ public final class ExHost {
public SubDataClient subdata = null;
public final Version version = new Version("2.12.1d");
- public final Version bversion = new Version(1);
+ public final Version bversion = null;
public final SubAPI api = new SubAPI(this);
private boolean running;
diff --git a/SubServers.Host/src/net/ME1312/SubServers/Host/Network/Packet/PacketExConfigureHost.java b/SubServers.Host/src/net/ME1312/SubServers/Host/Network/Packet/PacketExConfigureHost.java
index 59216cc2..620edd5f 100644
--- a/SubServers.Host/src/net/ME1312/SubServers/Host/Network/Packet/PacketExConfigureHost.java
+++ b/SubServers.Host/src/net/ME1312/SubServers/Host/Network/Packet/PacketExConfigureHost.java
@@ -21,8 +21,8 @@ import java.util.Base64;
* External Host Configuration Packet
*/
public class PacketExConfigureHost implements PacketIn, PacketOut {
+ private static boolean first = false;
private ExHost host;
- private boolean first = false;
private Logger log = null;
/**
diff --git a/SubServers.Host/src/net/ME1312/SubServers/Host/SubCommand.java b/SubServers.Host/src/net/ME1312/SubServers/Host/SubCommand.java
index 27cf7448..bccb341b 100644
--- a/SubServers.Host/src/net/ME1312/SubServers/Host/SubCommand.java
+++ b/SubServers.Host/src/net/ME1312/SubServers/Host/SubCommand.java
@@ -175,7 +175,6 @@ public class SubCommand {
if (!json.getJSONObject("server").getString("name").equals(json.getJSONObject("server").getString("display"))) host.log.message.println(" - Real Name: " + json.getJSONObject("server").getString("name"));
host.log.message.println(" - Host: " + json.getJSONObject("server").getString("host"));
host.log.message.println(" - Enabled: " + ((json.getJSONObject("server").getBoolean("enabled"))?"yes":"no"));
- host.log.message.println(" - Group: " + ((json.getJSONObject("server").getString("group").length() > 0)?json.getJSONObject("server").getString("group"):"(none)"));
if (json.getJSONObject("server").getJSONArray("group").length() > 0) {
host.log.message.println(" - Group:");
for (int i = 0; i < json.getJSONObject("server").getJSONArray("group").length(); i++)
diff --git a/SubServers.Sync/META-INF/MANIFEST.MF b/SubServers.Sync/META-INF/MANIFEST.MF
index 39f5ca0b..07e51b6e 100644
--- a/SubServers.Sync/META-INF/MANIFEST.MF
+++ b/SubServers.Sync/META-INF/MANIFEST.MF
@@ -2,4 +2,4 @@ Manifest-Version: 1.0
Class-Path: BungeeCord.jar
Main-Class: net.ME1312.SubServers.Sync.Launch
Implementation-Version: 2.12.1b
-Specification-Version: 1
+Specification-Version: 0