diff --git a/Artifacts/SubServers.Bungee.jar b/Artifacts/SubServers.Bungee.jar index e45baf54..6b6528cf 100644 Binary files a/Artifacts/SubServers.Bungee.jar and b/Artifacts/SubServers.Bungee.jar differ diff --git a/Artifacts/SubServers.Client.Bukkit.jar b/Artifacts/SubServers.Client.Bukkit.jar index 239b2f40..aa9f3544 100644 Binary files a/Artifacts/SubServers.Client.Bukkit.jar and b/Artifacts/SubServers.Client.Bukkit.jar differ diff --git a/Artifacts/SubServers.Host.jar b/Artifacts/SubServers.Host.jar index 39d15386..07b36e6a 100644 Binary files a/Artifacts/SubServers.Host.jar and b/Artifacts/SubServers.Host.jar differ diff --git a/Javadoc/SubServers.Client.Bukkit/allclasses-frame.html b/Javadoc/SubServers.Client.Bukkit/allclasses-frame.html index 9c6fc1e0..17967bec 100644 --- a/Javadoc/SubServers.Client.Bukkit/allclasses-frame.html +++ b/Javadoc/SubServers.Client.Bukkit/allclasses-frame.html @@ -28,8 +28,8 @@
  • PacketDownloadServerInfo
  • PacketDownloadServerList
  • PacketIn
    • +
  • PacketInReset
  • PacketInRunEvent
    • -
  • PacketInShutdown
  • PacketLinkServer
  • PacketOut
  • PacketStartServer
    • diff --git a/Javadoc/SubServers.Client.Bukkit/allclasses-noframe.html b/Javadoc/SubServers.Client.Bukkit/allclasses-noframe.html index 38cfc2a3..19692a5f 100644 --- a/Javadoc/SubServers.Client.Bukkit/allclasses-noframe.html +++ b/Javadoc/SubServers.Client.Bukkit/allclasses-noframe.html @@ -28,8 +28,8 @@
  • PacketDownloadServerInfo
  • PacketDownloadServerList
  • PacketIn
    • +
  • PacketInReset
  • PacketInRunEvent
    • -
  • PacketInShutdown
  • PacketLinkServer
  • PacketOut
  • PacketStartServer
    • diff --git a/Javadoc/SubServers.Client.Bukkit/index-all.html b/Javadoc/SubServers.Client.Bukkit/index-all.html index 2b61a8fd..1872a751 100644 --- a/Javadoc/SubServers.Client.Bukkit/index-all.html +++ b/Javadoc/SubServers.Client.Bukkit/index-all.html @@ -302,9 +302,9 @@
     
    execute(JSONObject) - Method in class net.ME1312.SubServers.Client.Bukkit.Network.Packet.PacketDownloadServerList
     
    -
    execute(JSONObject) - Method in class net.ME1312.SubServers.Client.Bukkit.Network.Packet.PacketInRunEvent
    +
    execute(JSONObject) - Method in class net.ME1312.SubServers.Client.Bukkit.Network.Packet.PacketInReset
     
    -
    execute(JSONObject) - Method in class net.ME1312.SubServers.Client.Bukkit.Network.Packet.PacketInShutdown
    +
    execute(JSONObject) - Method in class net.ME1312.SubServers.Client.Bukkit.Network.Packet.PacketInRunEvent
     
    execute(JSONObject) - Method in class net.ME1312.SubServers.Client.Bukkit.Network.Packet.PacketLinkServer
     
    @@ -844,9 +844,9 @@
     
    getVersion() - Method in class net.ME1312.SubServers.Client.Bukkit.Network.Packet.PacketDownloadServerList
     
    -
    getVersion() - Method in class net.ME1312.SubServers.Client.Bukkit.Network.Packet.PacketInRunEvent
    +
    getVersion() - Method in class net.ME1312.SubServers.Client.Bukkit.Network.Packet.PacketInReset
     
    -
    getVersion() - Method in class net.ME1312.SubServers.Client.Bukkit.Network.Packet.PacketInShutdown
    +
    getVersion() - Method in class net.ME1312.SubServers.Client.Bukkit.Network.Packet.PacketInRunEvent
     
    getVersion() - Method in class net.ME1312.SubServers.Client.Bukkit.Network.Packet.PacketLinkServer
     
    @@ -1224,6 +1224,12 @@
    PacketIn Layout Class
    +
    PacketInReset - Class in net.ME1312.SubServers.Client.Bukkit.Network.Packet
    +
    +
    Reset Packet
    +
    +
    PacketInReset() - Constructor for class net.ME1312.SubServers.Client.Bukkit.Network.Packet.PacketInReset
    +
     
    PacketInRunEvent - Class in net.ME1312.SubServers.Client.Bukkit.Network.Packet
    Run Event Packet
    @@ -1232,12 +1238,6 @@
    New PacketInRunEvent
    -
    PacketInShutdown - Class in net.ME1312.SubServers.Client.Bukkit.Network.Packet
    -
    -
    Shutdown Packet
    -
    -
    PacketInShutdown() - Constructor for class net.ME1312.SubServers.Client.Bukkit.Network.Packet.PacketInShutdown
    -
     
    PacketLinkServer - Class in net.ME1312.SubServers.Client.Bukkit.Network.Packet
    Link Server Packet
    diff --git a/Javadoc/SubServers.Client.Bukkit/net/ME1312/SubServers/Client/Bukkit/Network/Packet/PacketDownloadServerList.html b/Javadoc/SubServers.Client.Bukkit/net/ME1312/SubServers/Client/Bukkit/Network/Packet/PacketDownloadServerList.html index 4daa01a5..81765152 100644 --- a/Javadoc/SubServers.Client.Bukkit/net/ME1312/SubServers/Client/Bukkit/Network/Packet/PacketDownloadServerList.html +++ b/Javadoc/SubServers.Client.Bukkit/net/ME1312/SubServers/Client/Bukkit/Network/Packet/PacketDownloadServerList.html @@ -48,7 +48,7 @@ var activeTableTab = "activeTableTab";
    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 f579d863..cf9e864a 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 @@ -14,6 +14,7 @@ import net.ME1312.SubServers.Bungee.Network.ClientHandler; import net.ME1312.SubServers.Bungee.Network.Packet.PacketExAddServer; import net.ME1312.SubServers.Bungee.Network.Packet.PacketExDeleteServer; import net.ME1312.SubServers.Bungee.Network.Packet.PacketExRemoveServer; +import net.ME1312.SubServers.Bungee.Network.Packet.PacketOutReset; import net.ME1312.SubServers.Bungee.Network.PacketOut; import net.ME1312.SubServers.Bungee.SubPlugin; import org.json.JSONObject; @@ -30,6 +31,7 @@ public class ExternalHost extends Host implements ClientHandler { private String directory; private NamedContainer client; private LinkedList queue; + private boolean clean; protected SubPlugin plugin; /** @@ -53,6 +55,7 @@ public class ExternalHost extends Host implements ClientHandler { this.directory = directory; this.client = new NamedContainer(false, null); this.queue = new LinkedList(); + this.clean = false; } @Override @@ -78,8 +81,12 @@ public class ExternalHost extends Host implements ClientHandler { } } private void requeue() { + if (!clean) { + client.get().sendPacket(new PacketOutReset("Prevent Desync")); + clean = true; + } for (SubServer server : servers.values()) { - client.get().sendPacket(new PacketExAddServer(server.getName(), server.isEnabled(), server.isLogging(), server.getDirectory(), ((ExternalSubServer) server).exec, server.getStopCommand())); + client.get().sendPacket(new PacketExAddServer(server.getName(), server.isEnabled(), server.isLogging(), server.getDirectory(), ((ExternalSubServer) server).exec, server.getStopCommand(), (server.isRunning())?((ExternalSubLogger) server.getLogger()).getExternalAddress():null)); } while (queue.size() != 0) { client.get().sendPacket(queue.get(0)); @@ -136,7 +143,7 @@ public class ExternalHost extends Host implements ClientHandler { SubAddServerEvent event = new SubAddServerEvent(player, this, server); plugin.getPluginManager().callEvent(event); if (!event.isCancelled()) { - queue(new PacketExAddServer(name, enabled, log, directory, executable, stopcmd, json -> { + queue(new PacketExAddServer(name, enabled, log, directory, executable, stopcmd, (server.isRunning())?((ExternalSubLogger) server.getLogger()).getExternalAddress():null, json -> { if (json.getInt("r") == 0) { if (!((start || temporary) && !server.start()) && temporary) server.setTemporary(true); servers.put(name.toLowerCase(), server); diff --git a/SubServers.Bungee/src/net/ME1312/SubServers/Bungee/Network/Packet/PacketExAddServer.java b/SubServers.Bungee/src/net/ME1312/SubServers/Bungee/Network/Packet/PacketExAddServer.java index e872203b..2a18a107 100644 --- a/SubServers.Bungee/src/net/ME1312/SubServers/Bungee/Network/Packet/PacketExAddServer.java +++ b/SubServers.Bungee/src/net/ME1312/SubServers/Bungee/Network/Packet/PacketExAddServer.java @@ -24,6 +24,7 @@ public class PacketExAddServer implements PacketIn, PacketOut { private String directory; private Executable executable; private String stopcmd; + private UUID running; private String id; /** @@ -40,7 +41,7 @@ public class PacketExAddServer implements PacketIn, PacketOut { * @param directory Directory * @param executable Executable */ - public PacketExAddServer(String name, boolean enabled, boolean log, String directory, Executable executable, String stopcmd, JSONCallback... callback) { + public PacketExAddServer(String name, boolean enabled, boolean log, String directory, Executable executable, String stopcmd, UUID running, JSONCallback... callback) { if (Util.isNull(name, enabled, log, directory, executable, callback)) throw new NullPointerException(); this.name = name; this.enabled = enabled; @@ -48,6 +49,7 @@ public class PacketExAddServer implements PacketIn, PacketOut { this.directory = directory; this.executable = executable; this.stopcmd = stopcmd; + this.running = running; this.id = Util.getNew(callbacks.keySet(), UUID::randomUUID).toString(); callbacks.put(id, callback); } @@ -63,6 +65,7 @@ public class PacketExAddServer implements PacketIn, PacketOut { server.put("dir", directory); server.put("exec", executable.toString()); server.put("stopcmd", stopcmd); + if (running != null) server.put("running", running.toString()); json.put("server", server); return json; } diff --git a/SubServers.Bungee/src/net/ME1312/SubServers/Bungee/Network/Packet/PacketLinkServer.java b/SubServers.Bungee/src/net/ME1312/SubServers/Bungee/Network/Packet/PacketLinkServer.java index e7dc73f1..a887dac3 100644 --- a/SubServers.Bungee/src/net/ME1312/SubServers/Bungee/Network/Packet/PacketLinkServer.java +++ b/SubServers.Bungee/src/net/ME1312/SubServers/Bungee/Network/Packet/PacketLinkServer.java @@ -60,7 +60,7 @@ public class PacketLinkServer implements PacketIn, PacketOut { server.linkSubDataClient(client); System.out.println("SubData > " + client.getAddress().toString() + " has been defined as " + ((server instanceof SubServer) ? "SubServer" : "Server") + ": " + server.getName()); client.sendPacket(new PacketLinkServer(0, "Definition Successful")); - if (server instanceof SubServer && !((SubServer) server).isRunning()) client.sendPacket(new PacketOutShutdown("Rogue SubServer Detected")); + if (server instanceof SubServer && !((SubServer) server).isRunning()) client.sendPacket(new PacketOutReset("Rogue SubServer Detected")); } else { client.sendPacket(new PacketLinkServer(3, "Server already linked")); } diff --git a/SubServers.Bungee/src/net/ME1312/SubServers/Bungee/Network/Packet/PacketOutShutdown.java b/SubServers.Bungee/src/net/ME1312/SubServers/Bungee/Network/Packet/PacketOutReset.java similarity index 84% rename from SubServers.Bungee/src/net/ME1312/SubServers/Bungee/Network/Packet/PacketOutShutdown.java rename to SubServers.Bungee/src/net/ME1312/SubServers/Bungee/Network/Packet/PacketOutReset.java index 9c223b47..dd45e63e 100644 --- a/SubServers.Bungee/src/net/ME1312/SubServers/Bungee/Network/Packet/PacketOutShutdown.java +++ b/SubServers.Bungee/src/net/ME1312/SubServers/Bungee/Network/Packet/PacketOutReset.java @@ -6,17 +6,17 @@ import net.ME1312.SubServers.Bungee.Network.PacketOut; import org.json.JSONObject; /** - * Shutdown Packet + * Reset Packet */ -public class PacketOutShutdown implements PacketOut { +public class PacketOutReset implements PacketOut { private String message; /** - * New PacketOutShutdown + * New PacketOutReset * * @param message Message */ - public PacketOutShutdown(String message) { + public PacketOutReset(String message) { if (Util.isNull(message)) throw new NullPointerException(); this.message = message; } diff --git a/SubServers.Bungee/src/net/ME1312/SubServers/Bungee/Network/SubDataServer.java b/SubServers.Bungee/src/net/ME1312/SubServers/Bungee/Network/SubDataServer.java index bf37777f..17794ad7 100644 --- a/SubServers.Bungee/src/net/ME1312/SubServers/Bungee/Network/SubDataServer.java +++ b/SubServers.Bungee/src/net/ME1312/SubServers/Bungee/Network/SubDataServer.java @@ -97,7 +97,7 @@ public final class SubDataServer { registerPacket(PacketLinkExHost.class, "SubLinkExHost"); registerPacket(PacketLinkServer.class, "SubLinkServer"); registerPacket(PacketOutRunEvent.class, "SubRunEvent"); - registerPacket(PacketOutShutdown.class, "SubShutdown"); + registerPacket(PacketOutReset.class, "SubReset"); registerPacket(PacketStartServer.class, "SubStartServer"); registerPacket(PacketStopServer.class, "SubStopServer"); registerPacket(PacketTeleportPlayer.class, "SubTeleportPlayer"); diff --git a/SubServers.Client/Bukkit/src/net/ME1312/SubServers/Client/Bukkit/Network/Packet/PacketAuthorization.java b/SubServers.Client/Bukkit/src/net/ME1312/SubServers/Client/Bukkit/Network/Packet/PacketAuthorization.java index ae9c6fc5..f8ec88d0 100644 --- a/SubServers.Client/Bukkit/src/net/ME1312/SubServers/Client/Bukkit/Network/Packet/PacketAuthorization.java +++ b/SubServers.Client/Bukkit/src/net/ME1312/SubServers/Client/Bukkit/Network/Packet/PacketAuthorization.java @@ -30,7 +30,6 @@ public final class PacketAuthorization implements PacketIn, PacketOut { try { if (data.getInt("r") == 0) { plugin.subdata.sendPacket(new PacketLinkServer(plugin)); - plugin.subdata.sendPacket(new PacketDownloadLang()); } else { Bukkit.getLogger().info("SubServers > Could not authorize SubData connection: " + data.getString("m")); plugin.subdata.destroy(false); diff --git a/SubServers.Client/Bukkit/src/net/ME1312/SubServers/Client/Bukkit/Network/Packet/PacketInShutdown.java b/SubServers.Client/Bukkit/src/net/ME1312/SubServers/Client/Bukkit/Network/Packet/PacketInReset.java similarity index 90% rename from SubServers.Client/Bukkit/src/net/ME1312/SubServers/Client/Bukkit/Network/Packet/PacketInShutdown.java rename to SubServers.Client/Bukkit/src/net/ME1312/SubServers/Client/Bukkit/Network/Packet/PacketInReset.java index f45c3990..8326df62 100644 --- a/SubServers.Client/Bukkit/src/net/ME1312/SubServers/Client/Bukkit/Network/Packet/PacketInShutdown.java +++ b/SubServers.Client/Bukkit/src/net/ME1312/SubServers/Client/Bukkit/Network/Packet/PacketInReset.java @@ -6,9 +6,9 @@ import org.bukkit.Bukkit; import org.json.JSONObject; /** - * Shutdown Packet + * Reset Packet */ -public class PacketInShutdown implements PacketIn { +public class PacketInReset implements PacketIn { @Override public void execute(JSONObject data) { diff --git a/SubServers.Client/Bukkit/src/net/ME1312/SubServers/Client/Bukkit/Network/Packet/PacketLinkServer.java b/SubServers.Client/Bukkit/src/net/ME1312/SubServers/Client/Bukkit/Network/Packet/PacketLinkServer.java index 82bb737b..29f1f0f8 100644 --- a/SubServers.Client/Bukkit/src/net/ME1312/SubServers/Client/Bukkit/Network/Packet/PacketLinkServer.java +++ b/SubServers.Client/Bukkit/src/net/ME1312/SubServers/Client/Bukkit/Network/Packet/PacketLinkServer.java @@ -33,7 +33,9 @@ public class PacketLinkServer implements PacketIn, PacketOut { @Override public void execute(JSONObject data) { - if (data.getInt("r") != 0) { + if (data.getInt("r") == 0) { + plugin.subdata.sendPacket(new PacketDownloadLang()); + } else { Bukkit.getLogger().info("SubData > Could not link name with server: " + data.getString("m")); } } diff --git a/SubServers.Client/Bukkit/src/net/ME1312/SubServers/Client/Bukkit/Network/SubDataClient.java b/SubServers.Client/Bukkit/src/net/ME1312/SubServers/Client/Bukkit/Network/SubDataClient.java index 0e7165e5..ce87f1dc 100644 --- a/SubServers.Client/Bukkit/src/net/ME1312/SubServers/Client/Bukkit/Network/SubDataClient.java +++ b/SubServers.Client/Bukkit/src/net/ME1312/SubServers/Client/Bukkit/Network/SubDataClient.java @@ -69,7 +69,7 @@ public final class SubDataClient { registerPacket(new PacketDownloadServerInfo(), "SubDownloadServerInfo"); registerPacket(new PacketDownloadServerList(), "SubDownloadServerList"); registerPacket(new PacketInRunEvent(), "SubRunEvent"); - registerPacket(new PacketInShutdown(), "SubShutdown"); + registerPacket(new PacketInReset(), "SubReset"); registerPacket(new PacketLinkServer(plugin), "SubLinkServer"); registerPacket(new PacketStartServer(), "SubStartServer"); registerPacket(new PacketStopServer(), "SubStopServer"); diff --git a/SubServers.Host/src/net/ME1312/SubServers/Host/API/Event/SubAddServerEvent.java b/SubServers.Host/src/net/ME1312/SubServers/Host/API/Event/SubAddServerEvent.java new file mode 100644 index 00000000..4cf4bcd0 --- /dev/null +++ b/SubServers.Host/src/net/ME1312/SubServers/Host/API/Event/SubAddServerEvent.java @@ -0,0 +1,51 @@ +package net.ME1312.SubServers.Host.API.Event; + +import net.ME1312.SubServers.Host.Library.Event.Event; +import net.ME1312.SubServers.Host.Library.Util; + +import java.util.UUID; + +/** + * Add Server Event + */ +public class SubAddServerEvent extends Event { + private UUID player; + private String host; + private String server; + + /** + * Server Add Event + * + * @param player Player Adding Server + * @param server Server Starting + */ + public SubAddServerEvent(UUID player, String host, String server) { + if (Util.isNull(server)) throw new NullPointerException(); + this.player = player; + this.host = host; + this.server = server; + } + + /** + * Gets the Server to be Added + * + * @return The Server to be Added + */ + public String getServer() { return server; } + + /** + * Gets the Host of the Server + * + * @return The Host of the Server or null if isn't a SubServer + */ + public String getHost() { + return host; + } + + /** + * Gets the player that triggered the Event + * + * @return The Player that triggered this Event or null if Console + */ + public UUID getPlayer() { return player; } +} diff --git a/SubServers.Host/src/net/ME1312/SubServers/Host/API/Event/SubCreateEvent.java b/SubServers.Host/src/net/ME1312/SubServers/Host/API/Event/SubCreateEvent.java new file mode 100644 index 00000000..4f389324 --- /dev/null +++ b/SubServers.Host/src/net/ME1312/SubServers/Host/API/Event/SubCreateEvent.java @@ -0,0 +1,131 @@ +package net.ME1312.SubServers.Host.API.Event; + +import net.ME1312.SubServers.Host.Executable.SubCreator; +import net.ME1312.SubServers.Host.Library.Event.Event; +import net.ME1312.SubServers.Host.Library.Util; +import net.ME1312.SubServers.Host.Library.Version.Version; + +import java.util.UUID; + +/** + * Server Create Event + */ +public class SubCreateEvent extends Event { + private UUID player; + private String host; + private String name; + private SubCreator.ServerType type; + private Version version; + private int memory; + private int port; + + /** + * Server Create Event + * + * @param player Player Creating + * @param host Potential Host + * @param name Server Name + * @param type Server Type + * @param version Server Version + * @param memory Server RAM Amount + * @param port Server Port Number + */ + public SubCreateEvent(UUID player, String host, String name, SubCreator.ServerType type, Version version, int memory, int port) { + if (Util.isNull(host, name, type, version, memory, port)) throw new NullPointerException(); + this.player = player; + this.host = host; + this.name = name; + this.type = type; + this.version = version; + this.memory = memory; + this.port = port; + } + + /** + * Get the Host the SubServer will run on + * + * @return Potential Host + */ + public String getHost() { + return host; + } + + /** + * Get the name the SubServer will use + * + * @return SubServer Name + */ + public String getName() { + return name; + } + + /** + * Get the type of Server to create + * + * @return Server Type + */ + public SubCreator.ServerType getType() { + return type; + } + + /** + * Set the Type of Server to Create + * + * @param value Value + */ + public void setType(SubCreator.ServerType value) { + this.type = value; + } + + /** + * Get the Version the Server will use + * + * @return Server Version + */ + public Version getVersion() { + return version; + } + + /** + * Set the Version the Server will use + * + * @param value Value + */ + public void setVersion(Version value) { + this.version = value; + } + + /** + * Get the Server RAM Amount (in MB) + * + * @return RAM Amount + */ + public int getMemory() { + return memory; + } + + /** + * Set the Server RAM Amount (in MB) + * + * @param value Value + */ + public void setMemory(int value) { + this.memory = value; + } + + /** + * Get the Port the Server will use + * + * @return Port Number + */ + public int getPort() { + return port; + } + + /** + * Gets the player that triggered the Event + * + * @return The Player that triggered this Event or null if Console + */ + public UUID getPlayer() { return player; } +} diff --git a/SubServers.Host/src/net/ME1312/SubServers/Host/API/Event/SubRemoveServerEvent.java b/SubServers.Host/src/net/ME1312/SubServers/Host/API/Event/SubRemoveServerEvent.java new file mode 100644 index 00000000..5c831b7c --- /dev/null +++ b/SubServers.Host/src/net/ME1312/SubServers/Host/API/Event/SubRemoveServerEvent.java @@ -0,0 +1,51 @@ +package net.ME1312.SubServers.Host.API.Event; + +import net.ME1312.SubServers.Host.Library.Event.Event; +import net.ME1312.SubServers.Host.Library.Util; + +import java.util.UUID; + +/** + * Remove Server Event + */ +public class SubRemoveServerEvent extends Event { + private UUID player; + private String host; + private String server; + + /** + * Server Remove Event + * + * @param player Player Adding Server + * @param server Server Starting + */ + public SubRemoveServerEvent(UUID player, String host, String server) { + if (Util.isNull(server)) throw new NullPointerException(); + this.player = player; + this.host = host; + this.server = server; + } + + /** + * Gets the Server to be Removed + * + * @return The Server to be Removed + */ + public String getServer() { return server; } + + /** + * Gets the Host of the Server + * + * @return The Host of the Server or null if isn't a SubServer + */ + public String getHost() { + return host; + } + + /** + * Gets the player that triggered the Event + * + * @return The Player that triggered this Event or null if Console + */ + public UUID getPlayer() { return player; } +} diff --git a/SubServers.Host/src/net/ME1312/SubServers/Host/API/Event/SubSendCommandEvent.java b/SubServers.Host/src/net/ME1312/SubServers/Host/API/Event/SubSendCommandEvent.java new file mode 100644 index 00000000..45d9a5ed --- /dev/null +++ b/SubServers.Host/src/net/ME1312/SubServers/Host/API/Event/SubSendCommandEvent.java @@ -0,0 +1,60 @@ +package net.ME1312.SubServers.Host.API.Event; + +import net.ME1312.SubServers.Host.Library.Event.Event; +import net.ME1312.SubServers.Host.Library.Util; + +import java.util.UUID; + +/** + * Send Command Event + */ +public class SubSendCommandEvent extends Event { + private UUID player; + private String server; + private String command; + + /** + * Server Command Event + * + * @param player Player Commanding Server + * @param server Server being Commanded + */ + public SubSendCommandEvent(UUID player, String server, String command) { + if (Util.isNull(server, command)) throw new NullPointerException(); + this.player = player; + this.server = server; + this.command = command; + } + + /** + * Gets the Server Effected + * + * @return The Server Effected + */ + public String getServer() { return server; } + + /** + * Gets the player that triggered the Event + * + * @return The Player that triggered this Event or null if Console + */ + public UUID getPlayer() { return player; } + + /** + * Gets the Command to Send + * + * @return Command to Send + */ + public String getCommand() { + return command; + } + + /** + * Sets the Command to be Sent + * + * @param value Value + */ + public void setCommand(String value) { + command = value; + } +} diff --git a/SubServers.Host/src/net/ME1312/SubServers/Host/API/Event/SubStartEvent.java b/SubServers.Host/src/net/ME1312/SubServers/Host/API/Event/SubStartEvent.java new file mode 100644 index 00000000..1a17f677 --- /dev/null +++ b/SubServers.Host/src/net/ME1312/SubServers/Host/API/Event/SubStartEvent.java @@ -0,0 +1,41 @@ +package net.ME1312.SubServers.Host.API.Event; + +import net.ME1312.SubServers.Host.Library.Event.Event; +import net.ME1312.SubServers.Host.Library.Util; + +import java.util.UUID; + +/** + * Start Server Event + */ +public class SubStartEvent extends Event { + private boolean cancelled = false; + private UUID player; + private String server; + + /** + * Server Start Event + * + * @param player Player Starting Server + * @param server Server Starting + */ + public SubStartEvent(UUID player, String server) { + if (Util.isNull(server)) throw new NullPointerException(); + this.player = player; + this.server = server; + } + + /** + * Gets the Server Effected + * + * @return The Server Effected + */ + public String getServer() { return server; } + + /** + * Gets the player that triggered the Event + * + * @return The Player that triggered this Event or null if Console + */ + public UUID getPlayer() { return player; } +} diff --git a/SubServers.Host/src/net/ME1312/SubServers/Host/API/Event/SubStopEvent.java b/SubServers.Host/src/net/ME1312/SubServers/Host/API/Event/SubStopEvent.java new file mode 100644 index 00000000..98ee3786 --- /dev/null +++ b/SubServers.Host/src/net/ME1312/SubServers/Host/API/Event/SubStopEvent.java @@ -0,0 +1,53 @@ +package net.ME1312.SubServers.Host.API.Event; + + +import net.ME1312.SubServers.Host.Library.Event.Event; +import net.ME1312.SubServers.Host.Library.Util; + +import java.util.UUID; + +/** + * Server Stop Event + */ +public class SubStopEvent extends Event { + private UUID player; + private String server; + private boolean force; + + /** + * Server Stop Event + * + * @param player Player Stopping Server + * @param server Server Stopping + * @param force If it was a Forced Shutdown + */ + public SubStopEvent(UUID player, String server, boolean force) { + if (Util.isNull(server, force)) throw new NullPointerException(); + this.player = player; + this.server = server; + this.force = force; + } + + /** + * Gets the Server Effected + * + * @return The Server Effected + */ + public String getServer() { return server; } + + /** + * Gets the player that triggered the Event + * + * @return The Player that triggered this Event or null if Console + */ + public UUID getPlayer() { return player; } + + /** + * Gets if it was a forced shutdown + * + * @return Forced Shutdown Status + */ + public boolean isForced() { + return force; + } +} diff --git a/SubServers.Host/src/net/ME1312/SubServers/Host/API/Event/SubStoppedEvent.java b/SubServers.Host/src/net/ME1312/SubServers/Host/API/Event/SubStoppedEvent.java new file mode 100644 index 00000000..be88fd4f --- /dev/null +++ b/SubServers.Host/src/net/ME1312/SubServers/Host/API/Event/SubStoppedEvent.java @@ -0,0 +1,30 @@ +package net.ME1312.SubServers.Host.API.Event; + +import net.ME1312.SubServers.Host.Library.Event.Event; +import net.ME1312.SubServers.Host.Library.Util; + +/** + * Server Shell Exit Event + */ +public class SubStoppedEvent extends Event { + private String server; + + /** + * Server Shell Exit Event + * + * @param server Server that Stopped + */ + public SubStoppedEvent(String server) { + if (Util.isNull(server)) throw new NullPointerException(); + this.server = server; + } + + /** + * Gets the Server Effected + * + * @return The Server Effected + */ + public String getServer() { + return server; + } +} diff --git a/SubServers.Host/src/net/ME1312/SubServers/Host/Executable/SubCreator.java b/SubServers.Host/src/net/ME1312/SubServers/Host/Executable/SubCreator.java index 77cee35e..7db36d12 100644 --- a/SubServers.Host/src/net/ME1312/SubServers/Host/Executable/SubCreator.java +++ b/SubServers.Host/src/net/ME1312/SubServers/Host/Executable/SubCreator.java @@ -56,7 +56,7 @@ public class SubCreator { public SubCreator(SubServers host) { if (Util.isNull(host)) throw new NullPointerException(); this.host = host; - this.logger = new SubLogger(null, this, host.subdata.getName() + "/Creator", null, new Container(false), null); + this.logger = new SubLogger(null, this, "SubCreator", null, new Container(false), null); } @@ -65,7 +65,7 @@ public class SubCreator { UniversalFile dir = new UniversalFile(new File(host.host.getRawString("Directory")), name); dir.mkdirs(); - host.log.info.println(host.subdata.getName() + "/Creator > Generating Server Files..."); + logger.logger.info.println("Generating Server Files..."); host.subdata.sendPacket(new PacketOutExLogMessage(address, "Generating Server Files...")); if (type == ServerType.SPIGOT) { executable = new Executable("java -Xmx" + memory + "M -Djline.terminal=jline.UnsupportedTerminal -Dcom.mojang.eula.agree=true -jar Spigot.jar"); @@ -73,7 +73,7 @@ public class SubCreator { try { generateSpigotYAML(dir); generateProperties(dir, port); - host.log.info.println(host.subdata.getName() + "/Creator > Copying Plugins..."); + logger.logger.info.println("Copying Plugins..."); host.subdata.sendPacket(new PacketOutExLogMessage(address, "Copying Plugins...")); generateClient(dir, name, type); copyFolder(new UniversalFile(host.dir, "Templates:Spigot Plugins"), new UniversalFile(dir, "plugins")); @@ -101,7 +101,7 @@ public class SubCreator { generateSpongeConf(dir); generateClient(dir, name, type); - host.log.info.println(host.subdata.getName() + "/Creator > Searching Versions..."); + logger.logger.info.println("Searching Versions..."); host.subdata.sendPacket(new PacketOutExLogMessage(address, "Searching Versions...")); Document spongexml = DocumentBuilderFactory.newInstance().newDocumentBuilder().parse(new InputSource(new StringReader(Util.readAll(new BufferedReader(new InputStreamReader(new URL("http://files.minecraftforge.net/maven/org/spongepowered/spongeforge/maven-metadata.xml").openStream(), Charset.forName("UTF-8"))))))); Document forgexml = DocumentBuilderFactory.newInstance().newDocumentBuilder().parse(new InputSource(new StringReader(Util.readAll(new BufferedReader(new InputStreamReader(new URL("http://files.minecraftforge.net/maven/net/minecraftforge/forge/maven-metadata.xml").openStream(), Charset.forName("UTF-8"))))))); @@ -117,7 +117,7 @@ public class SubCreator { } } if (spversion == null) throw new InvalidServerException("Cannot find sponge version for Minecraft " + version.toString()); - host.log.info.println(host.subdata.getName() + "/Creator > Found \"spongeforge-" + spversion.toString() + '"'); + logger.logger.info.println("Found \"spongeforge-" + spversion.toString() + '"'); host.subdata.sendPacket(new PacketOutExLogMessage(address, "Found \"spongeforge-" + spversion.toString() + '"')); NodeList mcfnodeList = forgexml.getElementsByTagName("version"); @@ -131,12 +131,12 @@ public class SubCreator { } } if (mcfversion == null) throw new InvalidServerException("Cannot find forge version for Sponge " + spversion.toString()); - host.log.info.println(host.subdata.getName() + "/Creator > Found \"forge-" + mcfversion.toString() + '"'); + logger.logger.info.println("Found \"forge-" + mcfversion.toString() + '"'); host.subdata.sendPacket(new PacketOutExLogMessage(address, "Found \"forge-" + mcfversion.toString() + '"')); version = new Version(mcfversion.toString() + "::" + spversion.toString()); - host.log.info.println(host.subdata.getName() + "/Creator > Copying Mods..."); + logger.logger.info.println("Copying Mods..."); host.subdata.sendPacket(new PacketOutExLogMessage(address, "Copying Mods...")); copyFolder(new UniversalFile(host.dir, "Templates:Sponge Config"), new UniversalFile(dir, "config")); copyFolder(new UniversalFile(host.dir, "Templates:Sponge Mods"), new UniversalFile(dir, "mods")); @@ -159,7 +159,7 @@ public class SubCreator { writer.close(); if (!(new File(dir, "build.sh").exists())) { - host.log.info.println(host.subdata.getName() + "/Creator > Problem copying build.sh"); + logger.logger.info.println("Problem copying build.sh"); host.subdata.sendPacket(new PacketOutExLogMessage(address, "Problem copying build.sh")); } else { File gitBash = new File(host.host.getRawString("Git-Bash"), "bin" + File.separatorChar + "bash.exe"); @@ -172,12 +172,12 @@ public class SubCreator { e.printStackTrace(); } if (process.exitValue() != 0) { - host.log.info.println(host.subdata.getName() + "/Creator > Problem Setting Executable Permissions."); + logger.logger.info.println("Problem Setting Executable Permissions."); host.subdata.sendPacket(new PacketOutExLogMessage(address, "Problem Setting Executable Permissions.")); } } - host.log.info.println(host.subdata.getName() + "/Creator > Launching build.sh"); + logger.logger.info.println("Launching build.sh"); host.subdata.sendPacket(new PacketOutExLogMessage(address, "Launching build.sh")); this.process = Runtime.getRuntime().exec((System.getProperty("os.name").toLowerCase().indexOf("win") >= 0)? "\"" + gitBash + "\" --login -i -c \"bash build.sh " + ver.toString() + " " + type.toString().toLowerCase() + "\"" @@ -199,7 +199,7 @@ public class SubCreator { info.put("exec", exec.toString()); host.subdata.sendPacket(new PacketExCreateServer(process.exitValue(), (this.process.exitValue() == 0)?"Created Server Successfully":("Couldn't build the server jar. See \"SubCreator-" + type.toString() + "-" + ver.toString().replace("::", "@") + ".log\" for more details."), info, id)); if (this.process.exitValue() != 0) { - host.log.info.println(host.subdata.getName() + "/Creator > Couldn't build the server jar. See \"SubCreator-" + type.toString() + "-" + ver.toString().replace("::", "@") + ".log\" for more details."); + logger.logger.info.println("Couldn't build the server jar. See \"SubCreator-" + type.toString() + "-" + ver.toString().replace("::", "@") + ".log\" for more details."); } } } catch (IOException e) { diff --git a/SubServers.Host/src/net/ME1312/SubServers/Host/Executable/SubLogger.java b/SubServers.Host/src/net/ME1312/SubServers/Host/Executable/SubLogger.java index 6cbf7472..d9e88909 100644 --- a/SubServers.Host/src/net/ME1312/SubServers/Host/Executable/SubLogger.java +++ b/SubServers.Host/src/net/ME1312/SubServers/Host/Executable/SubLogger.java @@ -17,8 +17,8 @@ import java.util.regex.Pattern; public class SubLogger { protected Process process; private Object handle; - private Logger logger; - private String name; + protected final Logger logger; + protected final String name; protected UUID address; protected Container log; protected File file; diff --git a/SubServers.Host/src/net/ME1312/SubServers/Host/Network/Packet/PacketAuthorization.java b/SubServers.Host/src/net/ME1312/SubServers/Host/Network/Packet/PacketAuthorization.java index e44ae648..a6d08a4f 100644 --- a/SubServers.Host/src/net/ME1312/SubServers/Host/Network/Packet/PacketAuthorization.java +++ b/SubServers.Host/src/net/ME1312/SubServers/Host/Network/Packet/PacketAuthorization.java @@ -47,8 +47,6 @@ public final class PacketAuthorization implements PacketIn, PacketOut { try { if (data.getInt("r") == 0) { host.subdata.sendPacket(new PacketLinkExHost(host)); - host.subdata.sendPacket(new PacketDownloadLang()); - host.subdata.sendPacket(new PacketOutExRequestQueue()); } else { log.info.println("SubServers > Could not authorize SubData connection: " + data.getString("m")); host.subdata.destroy(false); diff --git a/SubServers.Host/src/net/ME1312/SubServers/Host/Network/Packet/PacketCreateServer.java b/SubServers.Host/src/net/ME1312/SubServers/Host/Network/Packet/PacketCreateServer.java index a6b0b6bf..dd59a704 100644 --- a/SubServers.Host/src/net/ME1312/SubServers/Host/Network/Packet/PacketCreateServer.java +++ b/SubServers.Host/src/net/ME1312/SubServers/Host/Network/Packet/PacketCreateServer.java @@ -1,5 +1,6 @@ package net.ME1312.SubServers.Host.Network.Packet; +import net.ME1312.SubServers.Host.Executable.SubCreator; import net.ME1312.SubServers.Host.Library.JSONCallback; import net.ME1312.SubServers.Host.Library.Util; import net.ME1312.SubServers.Host.Library.Version.Version; @@ -15,20 +16,10 @@ import java.util.UUID; */ public class PacketCreateServer implements PacketIn, PacketOut { private static HashMap callbacks = new HashMap(); - public enum ServerType { - SPIGOT, - VANILLA, - SPONGE,; - - @Override - public String toString() { - return super.toString().substring(0, 1).toUpperCase()+super.toString().substring(1).toLowerCase(); - } - } private UUID player; private String name; private String host; - private ServerType type; + private SubCreator.ServerType type; private Version version; private int port; private int ram; @@ -51,7 +42,7 @@ public class PacketCreateServer implements PacketIn, PacketOut { * @param memory Server Memory * @param callback Callbacks */ - public PacketCreateServer(UUID player, String name, String host, ServerType type, Version version, int port, int memory, JSONCallback... callback) { + public PacketCreateServer(UUID player, String name, String host, SubCreator.ServerType type, Version version, int port, int memory, JSONCallback... callback) { if (Util.isNull(name, host, type, version, port, memory, callback)) throw new NullPointerException(); this.player = player; this.name = name; diff --git a/SubServers.Host/src/net/ME1312/SubServers/Host/Network/Packet/PacketExAddServer.java b/SubServers.Host/src/net/ME1312/SubServers/Host/Network/Packet/PacketExAddServer.java index 65ba068c..814f6365 100644 --- a/SubServers.Host/src/net/ME1312/SubServers/Host/Network/Packet/PacketExAddServer.java +++ b/SubServers.Host/src/net/ME1312/SubServers/Host/Network/Packet/PacketExAddServer.java @@ -70,9 +70,11 @@ public class PacketExAddServer implements PacketIn, PacketOut { if (host.servers.keySet().contains(data.getJSONObject("server").getString("name").toLowerCase())) { host.subdata.sendPacket(new PacketExAddServer(0, "Server Already Added", (data.keySet().contains("id"))?data.getString("id"):null)); } else { - host.servers.put(data.getJSONObject("server").getString("name").toLowerCase(), new SubServer(host, data.getJSONObject("server").getString("name"), data.getJSONObject("server").getBoolean("enabled"), data.getJSONObject("server").getBoolean("log"), - data.getJSONObject("server").getString("dir"), new Executable(data.getJSONObject("server").getString("exec")), data.getJSONObject("server").getString("stopcmd"))); + SubServer server = new SubServer(host, data.getJSONObject("server").getString("name"), data.getJSONObject("server").getBoolean("enabled"), data.getJSONObject("server").getBoolean("log"), + data.getJSONObject("server").getString("dir"), new Executable(data.getJSONObject("server").getString("exec")), data.getJSONObject("server").getString("stopcmd")); + host.servers.put(data.getJSONObject("server").getString("name").toLowerCase(), server); log.info.println("Added Server \u2014 " + data.getJSONObject("server").getString("name")); + if (data.getJSONObject("server").keySet().contains("running")) server.start(UUID.fromString(data.getJSONObject("server").getString("running"))); host.subdata.sendPacket(new PacketExAddServer(0, "Server Added Successfully", (data.keySet().contains("id"))?data.getString("id"):null)); } } catch (Throwable e) { diff --git a/SubServers.Host/src/net/ME1312/SubServers/Host/Network/Packet/PacketInReset.java b/SubServers.Host/src/net/ME1312/SubServers/Host/Network/Packet/PacketInReset.java new file mode 100644 index 00000000..6d9d40f5 --- /dev/null +++ b/SubServers.Host/src/net/ME1312/SubServers/Host/Network/Packet/PacketInReset.java @@ -0,0 +1,54 @@ +package net.ME1312.SubServers.Host.Network.Packet; + + +import net.ME1312.SubServers.Host.Library.Version.Version; +import net.ME1312.SubServers.Host.Network.PacketIn; +import net.ME1312.SubServers.Host.SubServers; +import org.json.JSONObject; + +import java.util.ArrayList; +import java.util.List; + +/** + * Reset Packet + */ +public class PacketInReset implements PacketIn { + private SubServers host; + + public PacketInReset(SubServers host) { + this.host = host; + } + + @Override + public void execute(JSONObject data) { + if (data != null && data.keySet().contains("m")) { + List subservers = new ArrayList(); + subservers.addAll(host.servers.keySet()); + + for (String server : subservers) { + host.servers.get(server).stop(); + try { + host.servers.get(server).waitFor(); + } catch (Exception e) { + host.log.error.println(e); + } + } + subservers.clear(); + host.servers.clear(); + + if (host.creator.isBusy()) { + host.creator.terminate(); + try { + host.creator.waitFor(); + } catch (Exception e) { + host.log.error.println(e); + } + } + } + } + + @Override + public Version getVersion() { + return new Version("2.11.0a"); + } +} diff --git a/SubServers.Host/src/net/ME1312/SubServers/Host/Network/Packet/PacketInRunEvent.java b/SubServers.Host/src/net/ME1312/SubServers/Host/Network/Packet/PacketInRunEvent.java index 88e04c19..b99ba548 100644 --- a/SubServers.Host/src/net/ME1312/SubServers/Host/Network/Packet/PacketInRunEvent.java +++ b/SubServers.Host/src/net/ME1312/SubServers/Host/Network/Packet/PacketInRunEvent.java @@ -1,13 +1,17 @@ package net.ME1312.SubServers.Host.Network.Packet; +import net.ME1312.SubServers.Host.API.Event.*; +import net.ME1312.SubServers.Host.Executable.SubCreator; import net.ME1312.SubServers.Host.Library.JSONCallback; import net.ME1312.SubServers.Host.Library.Version.Version; import net.ME1312.SubServers.Host.Network.PacketIn; +import net.ME1312.SubServers.Host.SubAPI; import org.json.JSONObject; import java.util.ArrayList; import java.util.HashMap; import java.util.List; +import java.util.UUID; /** * Run Event Packet @@ -18,57 +22,57 @@ public class PacketInRunEvent implements PacketIn { /** * New PacketInRunEvent */ - public PacketInRunEvent() {/* + public PacketInRunEvent() { callback("SubAddServerEvent", new JSONCallback() { @Override public void run(JSONObject json) { - Bukkit.getPluginManager().callEvent(new SubAddServerEvent((json.keySet().contains("player"))?UUID.fromString(json.getString("player")):null, json.getString("host"), json.getString("server"))); + SubAPI.getInstance().executeEvent(new SubAddServerEvent((json.keySet().contains("player"))?UUID.fromString(json.getString("player")):null, json.getString("host"), json.getString("server"))); callback("SubAddServerEvent", this); } }); callback("SubCreateEvent", new JSONCallback() { @Override public void run(JSONObject json) { - Bukkit.getPluginManager().callEvent(new SubCreateEvent((json.keySet().contains("player"))?UUID.fromString(json.getString("player")):null, json.getString("host"), json.getString("name"), - PacketCreateServer.ServerType.valueOf(json.getString("type").toUpperCase()), new Version(json.getString("version")), json.getInt("memory"), json.getInt("port"))); + SubAPI.getInstance().executeEvent(new SubCreateEvent((json.keySet().contains("player"))?UUID.fromString(json.getString("player")):null, json.getString("host"), json.getString("name"), + SubCreator.ServerType.valueOf(json.getString("type").toUpperCase()), new Version(json.getString("version")), json.getInt("memory"), json.getInt("port"))); callback("SubCreateEvent", this); } }); callback("SubSendCommandEvent", new JSONCallback() { @Override public void run(JSONObject json) { - Bukkit.getPluginManager().callEvent(new SubSendCommandEvent((json.keySet().contains("player"))?UUID.fromString(json.getString("player")):null, json.getString("server"), json.getString("command"))); + SubAPI.getInstance().executeEvent(new SubSendCommandEvent((json.keySet().contains("player"))?UUID.fromString(json.getString("player")):null, json.getString("server"), json.getString("command"))); callback("SubSendCommandEvent", this); } }); callback("SubStartEvent", new JSONCallback() { @Override public void run(JSONObject json) { - Bukkit.getPluginManager().callEvent(new SubStartEvent((json.keySet().contains("player"))?UUID.fromString(json.getString("player")):null, json.getString("server"))); + SubAPI.getInstance().executeEvent(new SubStartEvent((json.keySet().contains("player"))?UUID.fromString(json.getString("player")):null, json.getString("server"))); callback("SubStartEvent", this); } }); callback("SubStopEvent", new JSONCallback() { @Override public void run(JSONObject json) { - Bukkit.getPluginManager().callEvent(new SubStopEvent((json.keySet().contains("player"))?UUID.fromString(json.getString("player")):null, json.getString("server"), json.getBoolean("force"))); + SubAPI.getInstance().executeEvent(new SubStopEvent((json.keySet().contains("player"))?UUID.fromString(json.getString("player")):null, json.getString("server"), json.getBoolean("force"))); callback("SubStopEvent", this); } }); callback("SubStoppedEvent", new JSONCallback() { @Override public void run(JSONObject json) { - Bukkit.getPluginManager().callEvent(new SubStoppedEvent(json.getString("server"))); + SubAPI.getInstance().executeEvent(new SubStoppedEvent(json.getString("server"))); callback("SubStoppedEvent", this); } }); callback("SubRemoveServerEvent", new JSONCallback() { @Override public void run(JSONObject json) { - Bukkit.getPluginManager().callEvent(new SubRemoveServerEvent((json.keySet().contains("player"))?UUID.fromString(json.getString("player")):null, json.getString("host"), json.getString("server"))); + SubAPI.getInstance().executeEvent(new SubRemoveServerEvent((json.keySet().contains("player"))?UUID.fromString(json.getString("player")):null, json.getString("host"), json.getString("server"))); callback("SubRemoveServerEvent", this); } - });*/ + }); } @Override 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 db3a42e1..ed3f6d39 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 @@ -43,7 +43,10 @@ public class PacketLinkExHost implements PacketIn, PacketOut { @Override public void execute(JSONObject data) { - if (data.getInt("r") != 0) { + if (data.getInt("r") == 0) { + host.subdata.sendPacket(new PacketDownloadLang()); + host.subdata.sendPacket(new PacketOutExRequestQueue()); + } else { log.info.println("Could not link name with host: " + data.getString("m")); } } diff --git a/SubServers.Host/src/net/ME1312/SubServers/Host/Network/SubDataClient.java b/SubServers.Host/src/net/ME1312/SubServers/Host/Network/SubDataClient.java index 23243823..171b5ef3 100644 --- a/SubServers.Host/src/net/ME1312/SubServers/Host/Network/SubDataClient.java +++ b/SubServers.Host/src/net/ME1312/SubServers/Host/Network/SubDataClient.java @@ -81,6 +81,7 @@ public final class SubDataClient { registerPacket(new PacketExDeleteServer(host), "SubExDeleteServer"); registerPacket(new PacketExRemoveServer(host), "SubExRemoveServer"); registerPacket(new PacketExUpdateServer(host), "SubExUpdateServer"); + registerPacket(new PacketInReset(host), "SubReset"); registerPacket(new PacketInRunEvent(), "SubRunEvent"); registerPacket(new PacketLinkExHost(host), "SubLinkExHost"); registerPacket(new PacketStartServer(), "SubStartServer"); diff --git a/SubServers.Host/src/net/ME1312/SubServers/Host/SubCommand.java b/SubServers.Host/src/net/ME1312/SubServers/Host/SubCommand.java new file mode 100644 index 00000000..3fe18096 --- /dev/null +++ b/SubServers.Host/src/net/ME1312/SubServers/Host/SubCommand.java @@ -0,0 +1,401 @@ +package net.ME1312.SubServers.Host; + +import net.ME1312.SubServers.Host.API.Command; +import net.ME1312.SubServers.Host.API.SubPluginInfo; +import net.ME1312.SubServers.Host.Executable.SubCreator; +import net.ME1312.SubServers.Host.Library.Util; +import net.ME1312.SubServers.Host.Library.Version.Version; +import net.ME1312.SubServers.Host.Network.Packet.*; +import org.json.JSONObject; + +import java.util.*; + +/** + * Command Class + */ +public class SubCommand { + private SubCommand() {} + protected static void load(SubServers host) { + new Command(null) { + @Override + public void command(String handle, String[] args) { + if (args.length == 0) { + host.log.message.println( + System.getProperty("os.name") + ' ' + System.getProperty("os.version") + ',', + "Java " + System.getProperty("java.version") + ',', + "SubServers.Host v" + host.version.toString() + ((host.bversion == null) ? "" : " BETA " + host.bversion.toString())); + } else if (host.api.plugins.get(args[0].toLowerCase()) != null) { + SubPluginInfo plugin = host.api.plugins.get(args[0].toLowerCase()); + host.log.message.println(plugin.getName() + " v" + plugin.getVersion() + " by " + plugin.getAuthors().toString().substring(1, plugin.getAuthors().toString().length() - 1)); + if (plugin.getWebsite() != null) host.log.message.println(plugin.getWebsite().toString()); + if (plugin.getDescription() != null) host.log.message.println("", plugin.getDescription()); + } else { + host.log.message.println("There is no plugin with that name"); + } + } + }.usage("[plugin]").description("Gets the version of the System and SubServers or the specified Plugin").help( + "This command will print what OS you're running, your OS version,", + "your Java version, and the SubServers.Host version.", + "", + "If the [plugin] option is provided, it will print information about the specified plugin instead.", + "", + "Examples:", + " /version", + " /version ExamplePlugin" + ).register("ver", "version"); + new Command(null) { + @Override + public void command(String handle, String[] args) { + host.subdata.sendPacket(new PacketDownloadServerList(null, json -> { + TreeSet servers = new TreeSet(); + TreeSet hosts = new TreeSet(); + for (String host : json.getJSONObject("hosts").keySet()) { + hosts.add(host); + for (String subserver : json.getJSONObject("hosts").getJSONObject(host).getJSONObject("servers").keySet()) { + servers.add(subserver); + } + } + for (String server : json.getJSONObject("servers").keySet()) { + servers.add(server); + } + host.log.message.println("Host List:", hosts.toString().substring(1, hosts.toString().length() - 1), "Server List:", servers.toString().substring(1, servers.toString().length() - 1)); + })); + } + }.description("Lists the available Hosts and Servers").help( + "This command will print a list of the available Hosts and Servers.", + "You can then use these names in commands where applicable.", + "", + "Example:", + " /list" + ).register("list"); + new Command(null) { + @Override + public void command(String handle, String[] args) { + if (args.length > 0) { + host.subdata.sendPacket(new PacketStartServer(null, args[0], json -> { + switch (json.getInt("r")) { + case 3: + host.log.message.println("There is no server with that name"); + break; + case 4: + host.log.message.println("That Server is not a SubServer"); + break; + case 5: + if (json.getString("m").contains("Host")) { + host.log.message.println("That SubServer's Host is not enabled"); + } else { + host.log.message.println("That SubServer is not enabled"); + } + break; + case 6: + host.log.message.println("That SubServer is already running"); + break; + case 0: + case 1: + host.log.message.println("Server was started successfully"); + break; + default: + host.log.warn.println("PacketStartServer(null, " + args[0] + ") responded with: " + json.getString("m")); + host.log.message.println("Server was started successfully"); + break; + } + })); + } else { + host.log.message.println("Usage: " + handle + " "); + } + } + }.usage("").description("Starts a SubServer").help( + "This command is used to start a SubServer on the network.", + "Once it has been started, you can control it via the other commands", + "", + "The argument is required, and should be the name of", + "the SubServer you want to start.", + "", + "Example:", + " /start ExampleServer" + ).register("start"); + new Command(null) { + @Override + public void command(String handle, String[] args) { + if (args.length > 0) { + host.subdata.sendPacket(new PacketStopServer(null, args[0], false, json -> { + switch (json.getInt("r")) { + case 3: + host.log.message.println("There is no server with that name"); + break; + case 4: + host.log.message.println("That Server is not a SubServer"); + break; + case 5: + host.log.message.println("That SubServer is not running"); + break; + case 0: + case 1: + host.log.message.println("Server was stopped successfully"); + break; + default: + host.log.warn.println("PacketStopServer(null, " + args[0] + ", false) responded with: " + json.getString("m")); + host.log.message.println("Server was stopped successfully"); + break; + } + })); + } else { + host.log.message.println("Usage: " + handle + " "); + } + } + }.usage("").description("Stops a SubServer").help( + "This command is used to request a SubServer to stop via the network.", + "Stopping a SubServer in this way will run the stop command", + "specified in the server's configuration", + "", + "The argument is required, and should be the name of", + "the SubServer you want to stop.", + "", + "Example:", + " /stop ExampleServer" + ).register("stop"); + new Command(null) { + @Override + public void command(String handle, String[] args) { + if (args.length > 0) { + host.subdata.sendPacket(new PacketStopServer(null, args[0], true, json -> { + switch (json.getInt("r")) { + case 3: + host.log.message.println("There is no server with that name"); + break; + case 4: + host.log.message.println("That Server is not a SubServer"); + break; + case 5: + host.log.message.println("That SubServer is not running"); + break; + case 0: + case 1: + host.log.message.println("Server was terminated successfully"); + break; + default: + host.log.warn.println("PacketStopServer(null, " + args[0] + ", true) responded with: " + json.getString("m")); + host.log.message.println("Server was terminated successfully"); + break; + } + })); + } else { + host.log.message.println("Usage: " + handle + " "); + } + } + }.usage("").description("Terminates a SubServer").help( + "This command is used to forcefully stop a SubServer on the network.", + "Stopping a SubServer in this way can make you lose unsaved data though,", + "so it is generally recommended to use this command only when it stops responding.", + "", + "The argument is required, and should be the name of", + "the SubServer you want to terminate.", + "", + "Example:", + " /kill ExampleServer" + ).register("kill", "terminate"); + new Command(null) { + @Override + public void command(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; + host.subdata.sendPacket(new PacketCommandServer(null, args[0], cmd, json -> { + switch (json.getInt("r")) { + case 3: + host.log.message.println("There is no server with that name"); + break; + case 4: + host.log.message.println("That Server is not a SubServer"); + break; + case 5: + host.log.message.println("That SubServer is not running"); + break; + case 0: + case 1: + host.log.message.println("Command was sent successfully"); + break; + default: + host.log.warn.println("PacketCommandServer(null, " + args[0] + ", /" + cmd + ") responded with: " + json.getString("m")); + host.log.message.println("Command was sent successfully"); + break; + } + })); + } else { + host.log.message.println("Usage: " + handle + " [Args...]"); + } + } + }.usage("", "", "[Args...]").description("Sends a Command to a SubServer").help( + "This command is used to send a command to a SubServer's Console via the network.", + "", + "The argument is required, and should be the name of", + "the SubServer you want to send a command to.", + "", + "The argument is required, and should be the command you", + "want to send, the following [Args...] will be passed to that command.", + "", + "Examples:", + " /cmd ExampleServer help", + " /cmd ExampleServer say Hello World!" + ).register("cmd", "command"); + new Command(null) { + @Override + public void command(String handle, String[] args) { + if (args.length > 4) { + if (Util.isException(() -> SubCreator.ServerType.valueOf(args[2].toUpperCase()))) { + host.log.message.println("There is no server type with that name"); + } else if (Util.isException(() -> Integer.parseInt(args[4]))) { + host.log.message.println("Invalid Port Number"); + } else if (args.length > 6 && Util.isException(() -> Integer.parseInt(args[5]))) { + host.log.message.println("Invalid Ram Amount"); + } else { + host.subdata.sendPacket(new PacketCreateServer(null, args[0], args[1], SubCreator.ServerType.valueOf(args[2].toUpperCase()), new Version(args[3]), Integer.parseInt(args[4]), (args.length > 6)?Integer.parseInt(args[5]):1024, json -> { + switch (json.getInt("r")) { + case 3: + host.log.message.println("There is already a SubServer with that name"); + break; + case 4: + host.log.message.println("There is no host with that name"); + break; + case 5: + host.log.message.println("The SubCreator instance on that host is already running"); + break; + case 6: + host.log.message.println("There is no server type with that name"); + break; + case 7: + host.log.message.println("SubCreator cannot create servers before Minecraft 1.8"); + break; + case 8: + host.log.message.println("Invalid Port Number"); + break; + case 9: + host.log.message.println("Invalid Ram Amount"); + break; + case 0: + case 1: + host.log.message.println("Launching SubCreator..."); + break; + default: + host.log.warn.println("PacketCreateServer(null, " + args[0] + ", " + args[1] + ", " + args[2].toUpperCase() + ", " + args[3] + ", " + args[4] + ", " + ((args.length > 5)?args[5]:"1024") + ") responded with: " + json.getString("m")); + host.log.message.println("Launching SubCreator..."); + break; + } + })); + } + } else { + host.log.message.println("Usage: " + handle + " [RAM]"); + } + } + }.usage("", "", "", "", "", "[RAM]").description("Creates a SubServer").help( + "This command is used to create and launch a SubServer on the specified host via the network.", + "", + "The argument is required, and should be the name of", + "the SubServer you want to create.", + "", + "The argument is required, and should be the name of", + "the host you want to the server to run on.", + "", + "The argument is required, and should be the name of", + "the type of server you want to create.", + "", + "The argument is required, and should be a version", + "string of the type of server that you want to create", + "", + "The argument is required, and should be the port number", + "that you want the server to listen on after it has been created.", + "", + "If the [RAM] argument is provided, it will allocate in megabytes", + "the amount of RAM that the server will use after it has been created", + "", + "Examples:", + " /create ExampleServer ExampleHost Spigot 1.11 25565", + " /create ExampleServer ExampleHost Spigot 1.11 25565 1024" + ).register("create"); + new Command(null) { + public void command(String handle, String[] args) { + HashMap commands = new LinkedHashMap(); + HashMap handles = new LinkedHashMap(); + + int length = 0; + for(String command : host.api.commands.keySet()) { + String formatted = "/ "; + Command cmd = host.api.commands.get(command); + String alias = (handles.keySet().contains(cmd))?handles.get(cmd):null; + + if (alias != null) formatted = commands.get(alias); + if (cmd.usage().length == 0 || alias != null) { + formatted = formatted.replaceFirst("\\s", ((alias != null)?"|":"") + command + ' '); + } else { + String usage = ""; + for (String str : cmd.usage()) usage += ((usage.length() == 0)?"":" ") + str; + formatted = formatted.replaceFirst("\\s", command + ' ' + usage + ' '); + } + if(formatted.length() > length) { + length = formatted.length(); + } + + if (alias == null) { + commands.put(command, formatted); + handles.put(cmd, command); + } else { + commands.put(alias, formatted); + } + } + + if (args.length == 0) { + host.log.message.println("SubServers.Host Command List:"); + for (String command : commands.keySet()) { + String formatted = commands.get(command); + Command cmd = host.api.commands.get(command); + + while (formatted.length() < length) { + formatted += ' '; + } + formatted += ((cmd.description() == null || cmd.description().length() == 0)?" ":"- "+cmd.description()); + + host.log.message.println(formatted); + } + } else if (host.api.commands.keySet().contains((args[0].startsWith("/"))?args[0].toLowerCase().substring(1):args[0].toLowerCase())) { + Command cmd = host.api.commands.get((args[0].startsWith("/"))?args[0].toLowerCase().substring(1):args[0].toLowerCase()); + String formatted = commands.get(Util.getBackwards(host.api.commands, cmd).get(0)); + host.log.message.println(formatted.substring(0, formatted.length() - 1)); + for (String line : cmd.help()) { + host.log.message.println(" " + line); + } + } else { + host.log.message.println("There is no command with that name"); + } + } + }.usage("[command]").description("Prints a list of the commands and/or their descriptions").help( + "This command will print a list of all currently registered commands and aliases,", + "along with their usage and a short description.", + "", + "If the [command] option is provided, it will print that command, it's aliases,", + "it's usage, and an extended description like the one you see here instead.", + "", + "Examples:", + " /help", + " /help end" + ).register("help", "?"); + new Command(null) { + @Override + public void command(String handle, String[] args) { + host.stop(0); + } + }.description("Stops this SubServers instance").help( + "This command will shutdown this instance of SubServers.Host,", + "SubServers running on this host, and any plugins currently running via SubAPI.", + "", + "Example:", + " /exit" + ).register("exit", "end"); + } +} diff --git a/SubServers.Host/src/net/ME1312/SubServers/Host/SubServers.java b/SubServers.Host/src/net/ME1312/SubServers/Host/SubServers.java index 75906864..729c25b4 100644 --- a/SubServers.Host/src/net/ME1312/SubServers/Host/SubServers.java +++ b/SubServers.Host/src/net/ME1312/SubServers/Host/SubServers.java @@ -292,111 +292,7 @@ public final class SubServers { } private void loadDefaults() { - new Command(null) { - @Override - public void command(String handle, String[] args) { - if (args.length == 0) { - log.message.println( - System.getProperty("os.name") + ' ' + System.getProperty("os.version") + ',', - "Java " + System.getProperty("java.version") + ',', - "SubServers.Host v" + version.toString() + ((bversion == null) ? "" : " BETA " + bversion.toString())); - } else if (api.plugins.get(args[0].toLowerCase()) != null) { - SubPluginInfo plugin = api.plugins.get(args[0].toLowerCase()); - log.message.println(plugin.getName() + " v" + plugin.getVersion() + " by " + plugin.getAuthors().toString().substring(1, plugin.getAuthors().toString().length() - 1)); - if (plugin.getWebsite() != null) log.message.println(plugin.getWebsite().toString()); - if (plugin.getDescription() != null) log.message.println("", plugin.getDescription()); - } else { - log.message.println("There is no plugin with that name"); - } - } - }.usage("[plugin]").description("Gets the version of the System and SubServers or the specified Plugin").help( - "This command will print what OS you're running, your OS version,", - "your Java version, and the SubServers.Host version.", - "", - "If the [plugin] option is provided, it will print information about the specified plugin instead.", - "", - "Examples:", - " /version", - " /version ExamplePlugin" - ).register("ver", "version"); - new Command(null) { - public void command(String handle, String[] args) { - HashMap commands = new LinkedHashMap(); - HashMap handles = new LinkedHashMap(); - - int length = 0; - for(String command : api.commands.keySet()) { - String formatted = "/ "; - Command cmd = api.commands.get(command); - String alias = (handles.keySet().contains(cmd))?handles.get(cmd):null; - - if (alias != null) formatted = commands.get(alias); - if (cmd.usage().length == 0 || alias != null) { - formatted = formatted.replaceFirst("\\s", ((alias != null)?"|":"") + command + ' '); - } else { - String usage = ""; - for (String str : cmd.usage()) usage += ((usage.length() == 0)?"":" ") + str; - formatted = formatted.replaceFirst("\\s", command + ' ' + usage + ' '); - } - if(formatted.length() > length) { - length = formatted.length(); - } - - if (alias == null) { - commands.put(command, formatted); - handles.put(cmd, command); - } else { - commands.put(alias, formatted); - } - } - - if (args.length == 0) { - log.message.println("SubServers.Host Command List:"); - for (String command : commands.keySet()) { - String formatted = commands.get(command); - Command cmd = api.commands.get(command); - - while (formatted.length() < length) { - formatted += ' '; - } - formatted += ((cmd.description() == null || cmd.description().length() == 0)?" ":"- "+cmd.description()); - - log.message.println(formatted); - } - } else if (api.commands.keySet().contains((args[0].startsWith("/"))?args[0].toLowerCase().substring(1):args[0].toLowerCase())) { - Command cmd = api.commands.get((args[0].startsWith("/"))?args[0].toLowerCase().substring(1):args[0].toLowerCase()); - String formatted = commands.get(Util.getBackwards(api.commands, cmd).get(0)); - log.message.println(formatted.substring(0, formatted.length() - 1)); - for (String line : cmd.help()) { - log.message.println(" " + line); - } - } else { - log.message.println("There is no command with that name"); - } - } - }.usage("[command]").description("Prints a list of the commands and/or their descriptions").help( - "This command will print a list of all currently registered commands and aliases,", - "along with their usage and a short description.", - "", - "If the [command] option is provided, it will print that command, it's aliases,", - "it's usage, and an extended description like the one you see here instead.", - "", - "Examples:", - " /help", - " /help end" - ).register("help", "?"); - new Command(null) { - @Override - public void command(String handle, String[] args) { - stop(0); - } - }.description("Stops this SubServers instance").help( - "This command will shutdown this instance of SubServers.Host,", - "SubServers running on this host, and any plugins currently running via SubAPI.", - "", - "Example:", - " /stop" - ).register("exit", "end"); + SubCommand.load(this); } /**