Skip to content

Commit

Permalink
SubServers, Host & Client v2.12.1c/2.12.1b/2.12.1b
Browse files Browse the repository at this point in the history
  • Loading branch information
@ME1312
ME1312 committed Aug 18, 2017
1 parent ebe1ba0 commit 837331a
Show file tree
Hide file tree
Showing 23 changed files with 502 additions and 140 deletions.
Binary file modified Artifacts/SubServers.Bungee.jar
View file
Binary file not shown.
Binary file modified Artifacts/SubServers.Client.Bukkit.jar
View file
Binary file not shown.
Binary file modified Artifacts/SubServers.Host.jar
View file
Binary file not shown.
2 changes: 2 additions & 0 deletions Javadoc/SubServers.Bungee/index-all.html
View file
Expand Up @@ -2298,6 +2298,8 @@ <h2 class="title">R</h2>
<dd>
<div class="block">Renames the Container</div>
</dd>
<dt><span class="memberNameLink"><a href="net/ME1312/SubServers/Bungee/SubPlugin.html#reroute-net.md_5.bungee.api.event.ServerConnectEvent-">reroute(ServerConnectEvent)</a></span> - Method in class net.ME1312.SubServers.Bungee.<a href="net/ME1312/SubServers/Bungee/SubPlugin.html" title="class in net.ME1312.SubServers.Bungee">SubPlugin</a></dt>
<dd>&nbsp;</dd>
<dt><span class="memberNameLink"><a href="net/ME1312/SubServers/Bungee/SubPlugin.html#resetSudo-net.ME1312.SubServers.Bungee.Event.SubStoppedEvent-">resetSudo(SubStoppedEvent)</a></span> - Method in class net.ME1312.SubServers.Bungee.<a href="net/ME1312/SubServers/Bungee/SubPlugin.html" title="class in net.ME1312.SubServers.Bungee">SubPlugin</a></dt>
<dd>&nbsp;</dd>
<dt><span class="memberNameLink"><a href="net/ME1312/SubServers/Bungee/Library/JSONCallback.html#run-org.json.JSONObject-">run(JSONObject)</a></span> - Method in interface net.ME1312.SubServers.Bungee.Library.<a href="net/ME1312/SubServers/Bungee/Library/JSONCallback.html" title="interface in net.ME1312.SubServers.Bungee.Library">JSONCallback</a></dt>
Expand Down
19 changes: 16 additions & 3 deletions Javadoc/SubServers.Bungee/net/ME1312/SubServers/Bungee/SubPlugin.html
View file
Expand Up @@ -17,7 +17,7 @@
catch(err) {
}
//-->
var methods = {"i0":10,"i1":10,"i2":10,"i3":10};
var methods = {"i0":10,"i1":10,"i2":10,"i3":10,"i4":10};
var tabs = {65535:["t0","All Methods"],2:["t2","Instance Methods"],8:["t4","Concrete Methods"]};
var altColor = "altColor";
var rowColor = "rowColor";
Expand Down Expand Up @@ -221,15 +221,19 @@ <h3>Method Summary</h3>
</tr>
<tr id="i1" class="rowColor">
<td class="colFirst"><code>void</code></td>
<td class="colLast"><code><span class="memberNameLink"><a href="../../../../net/ME1312/SubServers/Bungee/SubPlugin.html#resetSudo-net.ME1312.SubServers.Bungee.Event.SubStoppedEvent-">resetSudo</a></span>(<a href="../../../../net/ME1312/SubServers/Bungee/Event/SubStoppedEvent.html" title="class in net.ME1312.SubServers.Bungee.Event">SubStoppedEvent</a>&nbsp;e)</code>&nbsp;</td>
<td class="colLast"><code><span class="memberNameLink"><a href="../../../../net/ME1312/SubServers/Bungee/SubPlugin.html#reroute-net.md_5.bungee.api.event.ServerConnectEvent-">reroute</a></span>(net.md_5.bungee.api.event.ServerConnectEvent&nbsp;e)</code>&nbsp;</td>
</tr>
<tr id="i2" class="altColor">
<td class="colFirst"><code>void</code></td>
<td class="colLast"><code><span class="memberNameLink"><a href="../../../../net/ME1312/SubServers/Bungee/SubPlugin.html#resetSudo-net.ME1312.SubServers.Bungee.Event.SubStoppedEvent-">resetSudo</a></span>(<a href="../../../../net/ME1312/SubServers/Bungee/Event/SubStoppedEvent.html" title="class in net.ME1312.SubServers.Bungee.Event">SubStoppedEvent</a>&nbsp;e)</code>&nbsp;</td>
</tr>
<tr id="i3" class="rowColor">
<td class="colFirst"><code>void</code></td>
<td class="colLast"><code><span class="memberNameLink"><a href="../../../../net/ME1312/SubServers/Bungee/SubPlugin.html#startListeners--">startListeners</a></span>()</code>
<div class="block">Load Hosts, Servers, SubServers, and SubData Direct</div>
</td>
</tr>
<tr id="i3" class="rowColor">
<tr id="i4" class="altColor">
<td class="colFirst"><code>void</code></td>
<td class="colLast"><code><span class="memberNameLink"><a href="../../../../net/ME1312/SubServers/Bungee/SubPlugin.html#stopListeners--">stopListeners</a></span>()</code>
<div class="block">Reset all changes made by startListeners</div>
Expand Down Expand Up @@ -435,6 +439,15 @@ <h4>stopListeners</h4>
</dl>
</li>
</ul>
<a name="reroute-net.md_5.bungee.api.event.ServerConnectEvent-">
<!-- -->
</a>
<ul class="blockList">
<li class="blockList">
<h4>reroute</h4>
<pre>public&nbsp;void&nbsp;reroute(net.md_5.bungee.api.event.ServerConnectEvent&nbsp;e)</pre>
</li>
</ul>
<a name="resetSudo-net.ME1312.SubServers.Bungee.Event.SubStoppedEvent-">
<!-- -->
</a>
Expand Down
4 changes: 4 additions & 0 deletions Javadoc/SubServers.Host/index-all.html
View file
Expand Up @@ -1783,6 +1783,10 @@ <h2 class="title">S</h2>
<dd>
<div class="block">Schedule a task</div>
</dd>
<dt><span class="memberNameLink"><a href="net/ME1312/SubServers/Host/SubAPI.html#schedule-net.ME1312.SubServers.Host.API.SubPluginInfo-java.lang.Runnable-java.util.concurrent.TimeUnit-long-long-">schedule(SubPluginInfo, Runnable, TimeUnit, long, long)</a></span> - Method in class net.ME1312.SubServers.Host.<a href="net/ME1312/SubServers/Host/SubAPI.html" title="class in net.ME1312.SubServers.Host">SubAPI</a></dt>
<dd>
<div class="block">Schedule a task</div>
</dd>
<dt><span class="memberNameLink"><a href="net/ME1312/SubServers/Host/Network/SubDataClient.html#sendPacket-net.ME1312.SubServers.Host.Network.PacketOut-">sendPacket(PacketOut)</a></span> - Method in class net.ME1312.SubServers.Host.Network.<a href="net/ME1312/SubServers/Host/Network/SubDataClient.html" title="class in net.ME1312.SubServers.Host.Network">SubDataClient</a></dt>
<dd>
<div class="block">Send Packet to Client</div>
Expand Down
36 changes: 35 additions & 1 deletion Javadoc/SubServers.Host/net/ME1312/SubServers/Host/SubAPI.html
View file
Expand Up @@ -17,7 +17,7 @@
catch(err) {
}
//-->
var methods = {"i0":10,"i1":10,"i2":10,"i3":10,"i4":10,"i5":9,"i6":42,"i7":10,"i8":10,"i9":10,"i10":10,"i11":10,"i12":10,"i13":10,"i14":10,"i15":10,"i16":10,"i17":10,"i18":10};
var methods = {"i0":10,"i1":10,"i2":10,"i3":10,"i4":10,"i5":9,"i6":42,"i7":10,"i8":10,"i9":10,"i10":10,"i11":10,"i12":10,"i13":10,"i14":10,"i15":10,"i16":10,"i17":10,"i18":10,"i19":10};
var tabs = {65535:["t0","All Methods"],1:["t1","Static Methods"],2:["t2","Instance Methods"],8:["t4","Concrete Methods"],32:["t6","Deprecated Methods"]};
var altColor = "altColor";
var rowColor = "rowColor";
Expand Down Expand Up @@ -248,6 +248,16 @@ <h3>Method Summary</h3>
</tr>
<tr id="i18" class="altColor">
<td class="colFirst"><code>java.util.UUID</code></td>
<td class="colLast"><code><span class="memberNameLink"><a href="../../../../net/ME1312/SubServers/Host/SubAPI.html#schedule-net.ME1312.SubServers.Host.API.SubPluginInfo-java.lang.Runnable-java.util.concurrent.TimeUnit-long-long-">schedule</a></span>(<a href="../../../../net/ME1312/SubServers/Host/API/SubPluginInfo.html" title="class in net.ME1312.SubServers.Host.API">SubPluginInfo</a>&nbsp;plugin,
java.lang.Runnable&nbsp;run,
java.util.concurrent.TimeUnit&nbsp;unit,
long&nbsp;delay,
long&nbsp;repeat)</code>
<div class="block">Schedule a task</div>
</td>
</tr>
<tr id="i19" class="rowColor">
<td class="colFirst"><code>java.util.UUID</code></td>
<td class="colLast"><code><span class="memberNameLink"><a href="../../../../net/ME1312/SubServers/Host/SubAPI.html#schedule-net.ME1312.SubServers.Host.API.SubTask-">schedule</a></span>(<a href="../../../../net/ME1312/SubServers/Host/API/SubTask.html" title="class in net.ME1312.SubServers.Host.API">SubTask</a>&nbsp;builder)</code>
<div class="block">Schedule a task</div>
</td>
Expand Down Expand Up @@ -454,6 +464,30 @@ <h4>schedule</h4>
</dl>
</li>
</ul>
<a name="schedule-net.ME1312.SubServers.Host.API.SubPluginInfo-java.lang.Runnable-java.util.concurrent.TimeUnit-long-long-">
<!-- -->
</a>
<ul class="blockList">
<li class="blockList">
<h4>schedule</h4>
<pre>public&nbsp;java.util.UUID&nbsp;schedule(<a href="../../../../net/ME1312/SubServers/Host/API/SubPluginInfo.html" title="class in net.ME1312.SubServers.Host.API">SubPluginInfo</a>&nbsp;plugin,
java.lang.Runnable&nbsp;run,
java.util.concurrent.TimeUnit&nbsp;unit,
long&nbsp;delay,
long&nbsp;repeat)</pre>
<div class="block">Schedule a task</div>
<dl>
<dt><span class="paramLabel">Parameters:</span></dt>
<dd><code>plugin</code> - Plugin Scheduling</dd>
<dd><code>run</code> - What to Run</dd>
<dd><code>unit</code> - TimeUnit to use</dd>
<dd><code>delay</code> - Task Delay</dd>
<dd><code>repeat</code> - Task Repeat Interval</dd>
<dt><span class="returnLabel">Returns:</span></dt>
<dd>Task ID</dd>
</dl>
</li>
</ul>
<a name="cancelTask-java.util.UUID-">
<!-- -->
</a>
Expand Down
2 changes: 1 addition & 1 deletion SubServers.Bungee/META-INF/MANIFEST.MF
View file
@@ -1,5 +1,5 @@
Manifest-Version: 1.0
Class-Path: BungeeCord.jar
Main-Class: net.ME1312.SubServers.Bungee.Launch
Implementation-Version: 2.12.1b
Implementation-Version: 2.12.1c
Specification-Version: 0
2 changes: 1 addition & 1 deletion SubServers.Bungee/src/net/ME1312/SubServers/Bungee/Host/External/ExternalHost.java
View file
Expand Up @@ -97,7 +97,7 @@ private void requeue() {

@Override
public boolean isEnabled() {
return enabled && this.client != null;
return enabled && this.client.name();
}

@Override
Expand Down
1 change: 1 addition & 0 deletions SubServers.Bungee/src/net/ME1312/SubServers/Bungee/Host/Host.java
View file
Expand Up @@ -393,6 +393,7 @@ public String toString() {
hinfo.put("name", getName());
hinfo.put("enabled", isEnabled());
hinfo.put("display", getDisplayName());
hinfo.put("address", getAddress().toString());
JSONObject servers = new JSONObject();
for (SubServer server : getSubServers().values()) {
servers.put(server.getName(), new JSONObject(server.toString()));
Expand Down
1 change: 1 addition & 0 deletions SubServers.Bungee/src/net/ME1312/SubServers/Bungee/Host/Server.java
View file
Expand Up @@ -161,6 +161,7 @@ public String toString() {
info.put("type", "Server");
info.put("name", getName());
info.put("display", getDisplayName());
info.put("address", getAddress().toString());
JSONObject players = new JSONObject();
for (ProxiedPlayer player : getPlayers()) {
JSONObject pinfo = new JSONObject();
Expand Down
14 changes: 12 additions & 2 deletions SubServers.Bungee/src/net/ME1312/SubServers/Bungee/Launch.java
View file
Expand Up @@ -36,7 +36,7 @@ public static void main(String[] args) throws Exception {
System.out.println("*******************************************");
System.out.println("");
System.exit(1);
} else {
} else if (System.getProperty("subservers.bungee.allow", "true").equalsIgnoreCase("true")) {
Security.setProperty("networkaddress.cache.ttl", "30");
Security.setProperty("networkaddress.cache.negative.ttl", "10");
joptsimple.OptionParser parser = new joptsimple.OptionParser();
Expand Down Expand Up @@ -94,7 +94,7 @@ public static void main(String[] args) throws Exception {
if (!plugin.getPluginManager().dispatchCommand(net.md_5.bungee.command.ConsoleCommandSender.class.cast(net.md_5.bungee.command.ConsoleCommandSender.class.getMethod("getInstance").invoke(null)), line)) {
plugin.getConsole().sendMessage(net.md_5.bungee.api.ChatColor.RED + "Command not found");
}
} else if (line.equals("exit")) {
} else if (line.equalsIgnoreCase("exit")) {
plugin.sudo = null;
System.out.println("SubServers > Reverting to the BungeeCord Console");
} else {
Expand All @@ -103,6 +103,16 @@ public static void main(String[] args) throws Exception {
}
}
}
} else {
System.out.println("");
System.out.println("*******************************************");
System.out.println("*** SubServers code has been disallowed ***");
System.out.println("*** to work on this machine. Check with ***");
System.out.println("*** your provider for more information. ***");
System.out.println("*** Attempting re-launch as BungeeCord. ***");
System.out.println("*******************************************");
System.out.println("");
net.md_5.bungee.BungeeCordLauncher.class.getMethod("main", String[].class).invoke(null, (Object) args);
}
}
}
Binary file modified SubServers.Bungee/src/net/ME1312/SubServers/Bungee/Library/Files/Templates/spigot.zip
View file
Binary file not shown.
8 changes: 5 additions & 3 deletions SubServers.Bungee/src/net/ME1312/SubServers/Bungee/Library/Files/lang.yml
View file
@@ -1,4 +1,4 @@
Version: '2.12.1a+'
Version: '2.12.1c+'
Lang:
'Bungee.Server.Current': '&6You are currently connected to $str$'
'Bungee.Server.Available': '&6You may connect to the following servers at this time:'
Expand All @@ -19,7 +19,7 @@ Lang:
'Command.Help.Help': ' &7Help:&f $str$'
'Command.Help.List': ' &7List:&f $str$'
'Command.Help.Version': ' &7Version:&f $str$'
'Command.Help.Info': ' &Info:&f $str$'
'Command.Help.Info': ' &7Info:&f $str$'
'Command.Help.Terminate': ' &7Teleport to Server:&f $str$'
'Command.Help.Host.Create': ' &7Create Server:&f $str$'
'Command.Help.Server.Teleport': ' &7Teleport to Server:&f $str$'
Expand All @@ -28,7 +28,9 @@ Lang:
'Command.Help.SubServer.Terminate': ' &7Terminate Server:&f $str$'
'Command.Help.SubServer.Command': ' &7Command Server:&f $str$'
'Command.Version': '&7SubServers \u00BB $name$ is running version &f$str$'
'Command.List.Host-Header': '&7SubServers \u00BB Host List:'
'Command.Version.Outdated': '&7You are $int$ version(s) behind.'
'Command.Version.Latest': '&7You are on the latest version.'
'Command.List.Host-Header': '&7SubServers \u00BB Host/SubServer List:'
'Command.List.Server-Header': '&7SubServers \u00BB Server List:'
'Command.List.Divider': '&7, '
'Command.Info': '&7SubServers \u00BB Info on &f$str$&7:'
Expand Down
79 changes: 71 additions & 8 deletions SubServers.Bungee/src/net/ME1312/SubServers/Bungee/SubCommand.java
View file
Expand Up @@ -15,7 +15,17 @@
import net.md_5.bungee.api.plugin.Command;
import net.md_5.bungee.api.plugin.TabExecutor;
import net.md_5.bungee.command.ConsoleCommandSender;
import org.w3c.dom.Document;
import org.w3c.dom.Node;
import org.w3c.dom.NodeList;
import org.xml.sax.InputSource;

import javax.xml.parsers.DocumentBuilderFactory;
import java.io.BufferedReader;
import java.io.InputStreamReader;
import java.io.StringReader;
import java.net.URL;
import java.nio.charset.Charset;
import java.util.*;

/**
Expand Down Expand Up @@ -46,6 +56,31 @@ public void execute(CommandSender sender, String[] args) {
sender.sendMessages(printHelp());
} else if (args[0].equalsIgnoreCase("version") || args[0].equalsIgnoreCase("ver")) {
sender.sendMessage("SubServers > SubServers.Bungee is running version " + plugin.version.toString() + ((plugin.bversion != null)?" BETA "+plugin.bversion.toString():""));
if (plugin.bversion == null) {
new Thread(() -> {
try {
Document updxml = DocumentBuilderFactory.newInstance().newDocumentBuilder().parse(new InputSource(new StringReader(Util.readAll(new BufferedReader(new InputStreamReader(new URL("http://src.me1312.net/maven/net/ME1312/SubServers/SubServers.Bungee/maven-metadata.xml").openStream(), Charset.forName("UTF-8")))))));

NodeList updnodeList = updxml.getElementsByTagName("version");
Version updversion = plugin.version;
int updcount = -1;
for (int i = 0; i < updnodeList.getLength(); i++) {
Node node = updnodeList.item(i);
if (node.getNodeType() == Node.ELEMENT_NODE) {
if (!node.getTextContent().startsWith("-") && new Version(node.getTextContent()).compareTo(updversion) >= 0) {
updversion = new Version(node.getTextContent());
updcount++;
}
}
}
if (updversion.equals(plugin.version)) {
sender.sendMessage("You are on the latest version.");
} else {
sender.sendMessage("You are " + updcount + " version" + ((updcount == 1)?"":"s") + " behind.");
}
} catch (Exception e) {}
}).start();
}
} else if (args[0].equalsIgnoreCase("reload")) {
if (args.length > 1) {
switch (args[1].toLowerCase()) {
Expand All @@ -72,17 +107,44 @@ public void execute(CommandSender sender, String[] args) {
plugin.getPluginManager().dispatchCommand(ConsoleCommandSender.getInstance(), "greload");
}
} else if (args[0].equalsIgnoreCase("list")) {
List<String> hosts = new ArrayList<String>();
for (Host host : plugin.hosts.values()) {
hosts.add(host.getDisplayName() + ((host.getName().equals(host.getDisplayName())) ? "" : " (" + host.getName() + ')'));
sender.sendMessage("SubServers > Host/SubServer List:");
String div = ChatColor.RESET + ", ";
int i = 0;
for (Host host : plugin.api.getHosts().values()) {
String message = "";
if (host.isEnabled()) {
message += ChatColor.AQUA;
} else {
message += ChatColor.RED;
}
message += host.getDisplayName() + " (" + host.getAddress().toString() + ((host.getName().equals(host.getDisplayName()))?"":ChatColor.stripColor(div)+host.getName()) + ")" + ChatColor.RESET + ": ";
for (SubServer subserver : host.getSubServers().values()) {
if (i != 0) message += div;
if (subserver.isTemporary()) {
message += ChatColor.AQUA;
} else if (subserver.isRunning()) {
message += ChatColor.GREEN;
} else if (subserver.isEnabled() && subserver.getCurrentIncompatibilities().size() == 0) {
message += ChatColor.YELLOW;
} else {
message += ChatColor.RED;
}
message += subserver.getDisplayName() + " (" + subserver.getAddress().toString().split(":")[subserver.getAddress().toString().split(":").length - 1] + ((subserver.getName().equals(subserver.getDisplayName()))?"":ChatColor.stripColor(div)+subserver.getName()) + ")";
i++;
}
sender.sendMessage(message);
i = 0;
}
List<String> servers = new ArrayList<String>();
sender.sendMessage("SubServers > Server List:");
String message = "";
for (Server server : plugin.api.getServers().values()) {
servers.add(server.getDisplayName() + ((server.getName().equals(server.getDisplayName())) ? "" : " (" + server.getName() + ')'));
if (!(server instanceof SubServer)) {
if (i != 0) message += div;
message += ChatColor.WHITE + server.getDisplayName() + " (" + server.getAddress().toString() + ((server.getName().equals(server.getDisplayName()))?"":ChatColor.stripColor(div)+server.getName()) + ")";
i++;
}
}
sender.sendMessages(
"SubServers > Host List:", hosts.toString().substring(1, hosts.toString().length() - 1),
"SubServers > Server List:", servers.toString().substring(1, servers.toString().length() - 1));
sender.sendMessage(message);
} else if (args[0].equalsIgnoreCase("info") || args[0].equalsIgnoreCase("status")) {
if (args.length > 1) {
Map<String, Server> servers = plugin.api.getServers();
Expand All @@ -99,6 +161,7 @@ public void execute(CommandSender sender, String[] args) {
if (server.isTemporary()) sender.sendMessage(" - Temporary: yes");
sender.sendMessage(" - Running: " + ((server.isRunning())?"yes":"no"));
sender.sendMessage(" - Logging: " + ((server.isLogging())?"yes":"no"));
sender.sendMessage(" - Address: " + server.getAddress().toString());
sender.sendMessage(" - Auto Restart: " + ((server.willAutoRestart())?"yes":"no"));
sender.sendMessage(" - Hidden: " + ((server.isHidden())?"yes":"no"));
if (server.getIncompatibilities().size() > 0) {
Expand Down

0 comments on commit 837331a

Please sign in to comment.