diff --git a/Artifacts/SubServers.Bungee.jar b/Artifacts/SubServers.Bungee.jar index 40f17869..d833ea1c 100644 Binary files a/Artifacts/SubServers.Bungee.jar and b/Artifacts/SubServers.Bungee.jar differ diff --git a/Artifacts/SubServers.Console.jar b/Artifacts/SubServers.Console.jar index c7aeda88..a18f198e 100644 Binary files a/Artifacts/SubServers.Console.jar and b/Artifacts/SubServers.Console.jar differ diff --git a/Artifacts/SubServers.Host.jar b/Artifacts/SubServers.Host.jar index 56585db3..a3d253a5 100644 Binary files a/Artifacts/SubServers.Host.jar and b/Artifacts/SubServers.Host.jar differ diff --git a/Javadoc/SubServers.Bungee/net/ME1312/SubServers/Bungee/Host/External/ExternalSubCreator.html b/Javadoc/SubServers.Bungee/net/ME1312/SubServers/Bungee/Host/External/ExternalSubCreator.html index eb68df1a..1d95d0d5 100644 --- a/Javadoc/SubServers.Bungee/net/ME1312/SubServers/Bungee/Host/External/ExternalSubCreator.html +++ b/Javadoc/SubServers.Bungee/net/ME1312/SubServers/Bungee/Host/External/ExternalSubCreator.html @@ -198,7 +198,7 @@ extends SubLogger -getLogger(java.lang.String thread) +getLogger(java.lang.String name)
Gets the Logger for a SubCreator Instance
@@ -451,14 +451,14 @@ extends

  • getLogger

    -
    public SubLogger getLogger(java.lang.String thread)
    +
    public SubLogger getLogger(java.lang.String name)
    Description copied from class: SubCreator
    Gets the Logger for a SubCreator Instance
    Specified by:
    getLogger in class SubCreator
    Parameters:
    -
    thread - Thread ID
    +
    name - Thread ID
    Returns:
    SubCreator Logger
    diff --git a/Javadoc/SubServers.Bungee/net/ME1312/SubServers/Bungee/Host/Internal/InternalSubCreator.html b/Javadoc/SubServers.Bungee/net/ME1312/SubServers/Bungee/Host/Internal/InternalSubCreator.html index dc4dea3e..9aad5a5c 100644 --- a/Javadoc/SubServers.Bungee/net/ME1312/SubServers/Bungee/Host/Internal/InternalSubCreator.html +++ b/Javadoc/SubServers.Bungee/net/ME1312/SubServers/Bungee/Host/Internal/InternalSubCreator.html @@ -198,7 +198,7 @@ extends SubLogger -getLogger(java.lang.String thread) +getLogger(java.lang.String name)
    Gets the Logger for a SubCreator Instance
    @@ -451,14 +451,14 @@ extends

  • getLogger

    -
    public SubLogger getLogger(java.lang.String thread)
    +
    public SubLogger getLogger(java.lang.String name)
    Description copied from class: SubCreator
    Gets the Logger for a SubCreator Instance
    Specified by:
    getLogger in class SubCreator
    Parameters:
    -
    thread - Thread ID
    +
    name - Thread ID
    Returns:
    SubCreator Logger
    diff --git a/SubServers.Bungee/src/net/ME1312/SubServers/Bungee/Host/External/ExternalSubCreator.java b/SubServers.Bungee/src/net/ME1312/SubServers/Bungee/Host/External/ExternalSubCreator.java index 48ce302e..8f4c77cc 100644 --- a/SubServers.Bungee/src/net/ME1312/SubServers/Bungee/Host/External/ExternalSubCreator.java +++ b/SubServers.Bungee/src/net/ME1312/SubServers/Bungee/Host/External/ExternalSubCreator.java @@ -120,8 +120,8 @@ public class ExternalSubCreator extends SubCreator { @Override public void terminate(String name) { - if (this.thread.keySet().contains(name)) { - host.getSubData().sendPacket(new PacketExCreateServer(name)); + if (this.thread.keySet().contains(name.toLowerCase())) { + host.getSubData().sendPacket(new PacketExCreateServer(name.toLowerCase())); } } @@ -136,7 +136,7 @@ public class ExternalSubCreator extends SubCreator { @Override public void waitFor(String name) throws InterruptedException { - while (this.thread.keySet().contains(name)) { + while (this.thread.keySet().contains(name.toLowerCase())) { Thread.sleep(250); } } @@ -157,8 +157,8 @@ public class ExternalSubCreator extends SubCreator { } @Override - public SubLogger getLogger(String thread) { - return this.thread.get(thread); + public SubLogger getLogger(String name) { + return this.thread.get(name.toLowerCase()); } @Override diff --git a/SubServers.Bungee/src/net/ME1312/SubServers/Bungee/Host/Internal/InternalSubCreator.java b/SubServers.Bungee/src/net/ME1312/SubServers/Bungee/Host/Internal/InternalSubCreator.java index 0ae354d1..a5d46b4b 100644 --- a/SubServers.Bungee/src/net/ME1312/SubServers/Bungee/Host/Internal/InternalSubCreator.java +++ b/SubServers.Bungee/src/net/ME1312/SubServers/Bungee/Host/Internal/InternalSubCreator.java @@ -141,7 +141,7 @@ public class InternalSubCreator extends SubCreator { try { System.out.println(name + "/Creator > Launching " + template.getBuildOptions().getRawString("Shell-Location")); - thread.set(Runtime.getRuntime().exec((System.getProperty("os.name").toLowerCase().indexOf("win") >= 0)?"\"" + gitBash + "\" --login -i -c \"bash " + template.getBuildOptions().getRawString("Shell-Location") + ' ' + version.toString() + '\"':("bash " + template.getBuildOptions().getRawString("Shell-Location") + ' ' + version.toString() + " " + System.getProperty("user.home")), null, dir)); + thread.set(Runtime.getRuntime().exec((System.getProperty("os.name").toLowerCase().indexOf("win") >= 0) ? "\"" + gitBash + "\" --login -i -c \"bash " + template.getBuildOptions().getRawString("Shell-Location") + ' ' + version.toString() + '\"' : ("bash " + template.getBuildOptions().getRawString("Shell-Location") + ' ' + version.toString() + " " + System.getProperty("user.home")), null, dir)); thread.name().log.set(host.plugin.config.get().getSection("Settings").getBoolean("Log-Creator")); thread.name().file = new File(dir, "SubCreator-" + template.getName() + "-" + version.toString().replace(" ", "@") + ".log"); thread.name().process = thread.get(); @@ -151,6 +151,8 @@ public class InternalSubCreator extends SubCreator { Thread.sleep(500); if (thread.get().exitValue() != 0) error = true; + } catch (InterruptedException e) { + error = true; } catch (Exception e) { error = true; e.printStackTrace(); @@ -244,11 +246,11 @@ public class InternalSubCreator extends SubCreator { @Override public void terminate(String name) { - if (this.thread.get(name).get().get() != null && this.thread.get(name).get().get().isAlive()) { - this.thread.get(name).get().get().destroyForcibly(); + if (this.thread.get(name.toLowerCase()).get().get() != null && this.thread.get(name.toLowerCase()).get().get().isAlive()) { + this.thread.get(name.toLowerCase()).get().get().destroyForcibly(); } - if (this.thread.get(name).name() != null && this.thread.get(name).name().isAlive()) { - this.thread.get(name).name().interrupt(); + if (this.thread.get(name.toLowerCase()).name() != null && this.thread.get(name.toLowerCase()).name().isAlive()) { + this.thread.get(name.toLowerCase()).name().interrupt(); } } @@ -263,7 +265,7 @@ public class InternalSubCreator extends SubCreator { @Override public void waitFor(String name) throws InterruptedException { - while (this.thread.get(name).name() != null && this.thread.get(name).name().isAlive()) { + while (this.thread.get(name.toLowerCase()) != null && this.thread.get(name.toLowerCase()).name() != null && this.thread.get(name.toLowerCase()).name().isAlive()) { Thread.sleep(250); } } @@ -290,8 +292,8 @@ public class InternalSubCreator extends SubCreator { } @Override - public SubLogger getLogger(String thread) { - return this.thread.get(thread).get().name(); + public SubLogger getLogger(String name) { + return this.thread.get(name.toLowerCase()).get().name(); } @Override diff --git a/SubServers.Console/src/._SubServers.png b/SubServers.Console/src/._SubServers.png deleted file mode 100644 index bdac7480..00000000 Binary files a/SubServers.Console/src/._SubServers.png and /dev/null differ diff --git a/SubServers.Console/src/bungee.yml b/SubServers.Console/src/bungee.yml index 6c49849b..31fb60fc 100644 --- a/SubServers.Console/src/bungee.yml +++ b/SubServers.Console/src/bungee.yml @@ -1,4 +1,4 @@ name: SubServers-Console main: net.ME1312.SubServers.Console.ConsolePlugin -version: 2.11.2b +version: 2.12a author: ME1312 \ No newline at end of file diff --git a/SubServers.Console/src/net/ME1312/SubServers/Console/ConsolePlugin.java b/SubServers.Console/src/net/ME1312/SubServers/Console/ConsolePlugin.java index a36aaa81..ad536c4e 100644 --- a/SubServers.Console/src/net/ME1312/SubServers/Console/ConsolePlugin.java +++ b/SubServers.Console/src/net/ME1312/SubServers/Console/ConsolePlugin.java @@ -64,9 +64,9 @@ public final class ConsolePlugin extends Plugin implements Listener { public void onServerCreate(SubCreateEvent event) { if (!event.isCancelled() && config.get().getStringList("Enabled-Creators").contains(event.getHost().getName().toLowerCase())) { if (!cCurrent.keySet().contains(event.getHost().getName().toLowerCase())) { - SwingUtilities.invokeLater(() -> cCurrent.put(event.getHost().getName().toLowerCase(), new ConsoleWindow(this, event.getHost().getCreator().getLogger()))); + SwingUtilities.invokeLater(() -> cCurrent.put(event.getName().toLowerCase(), new ConsoleWindow(this, event.getHost().getCreator().getLogger(event.getName().toLowerCase())))); } else { - cCurrent.get(event.getHost().getName().toLowerCase()).clear(); + cCurrent.get(event.getName().toLowerCase()).clear(); } } } diff --git a/SubServers.Console/src/net/ME1312/SubServers/Console/PopoutCommand.java b/SubServers.Console/src/net/ME1312/SubServers/Console/PopoutCommand.java index a8030f09..e28b31c2 100644 --- a/SubServers.Console/src/net/ME1312/SubServers/Console/PopoutCommand.java +++ b/SubServers.Console/src/net/ME1312/SubServers/Console/PopoutCommand.java @@ -99,17 +99,19 @@ public final class PopoutCommand { Map hosts = plugin.getProxy().api.getHosts(); if (hosts.keySet().contains(args[0].toLowerCase())) { boolean success = false; - if (hosts.get(args[0].toLowerCase()).getCreator().isBusy()) { + if (hosts.get(args[0].toLowerCase()).getCreator().getReservedNames().size() > 0) { if (!plugin.cCurrent.keySet().contains(args[0].toLowerCase())) { SwingUtilities.invokeLater(() -> { - ConsoleWindow window = new ConsoleWindow(plugin, hosts.get(args[0].toLowerCase()).getCreator().getLogger()); - plugin.cCurrent.put(args[0].toLowerCase(), window); - window.open(); + for (String reserved : hosts.get(args[0].toLowerCase()).getCreator().getReservedNames()) { + ConsoleWindow window = new ConsoleWindow(plugin, hosts.get(args[0].toLowerCase()).getCreator().getLogger(reserved)); + plugin.cCurrent.put(reserved.toLowerCase(), window); + window.open(); + } }); } else { plugin.cCurrent.get(args[0].toLowerCase()).open(); } - System.out.println("SubConsole > Opening Window..."); + System.out.println("SubConsole > Opening Windows..."); success = true; } 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 bd380317..6b381799 100644 --- a/SubServers.Host/src/net/ME1312/SubServers/Host/Executable/SubCreator.java +++ b/SubServers.Host/src/net/ME1312/SubServers/Host/Executable/SubCreator.java @@ -283,6 +283,8 @@ public class SubCreator { Thread.sleep(500); if (thread.get().exitValue() != 0) error = true; + } catch (InterruptedException e) { + error = true; } catch (Exception e) { error = true; thread.name().logger.error.println(e);