diff --git a/Artifacts/SubServers.Bungee.jar b/Artifacts/SubServers.Bungee.jar index cbceeb84..7d0383b9 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 50410db5..bb75e736 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 45a96a1f..2d68ce6f 100644 Binary files a/Artifacts/SubServers.Host.jar and b/Artifacts/SubServers.Host.jar differ diff --git a/Javadoc/SubServers.Bungee/allclasses-frame.html b/Javadoc/SubServers.Bungee/allclasses-frame.html index 691c3ba8..c9eb6bde 100644 --- a/Javadoc/SubServers.Bungee/allclasses-frame.html +++ b/Javadoc/SubServers.Bungee/allclasses-frame.html @@ -36,7 +36,6 @@
  • PacketAuthorization
  • PacketCommandServer
  • PacketCreateServer
    • -
  • PacketDownloadBuildScript
  • PacketDownloadHostInfo
  • PacketDownloadLang
  • PacketDownloadPlayerList
    • diff --git a/Javadoc/SubServers.Bungee/allclasses-noframe.html b/Javadoc/SubServers.Bungee/allclasses-noframe.html index d02270d6..732cf878 100644 --- a/Javadoc/SubServers.Bungee/allclasses-noframe.html +++ b/Javadoc/SubServers.Bungee/allclasses-noframe.html @@ -36,7 +36,6 @@
  • PacketAuthorization
  • PacketCommandServer
  • PacketCreateServer
    • -
  • PacketDownloadBuildScript
  • PacketDownloadHostInfo
  • PacketDownloadLang
  • PacketDownloadPlayerList
    • diff --git a/Javadoc/SubServers.Bungee/index-all.html b/Javadoc/SubServers.Bungee/index-all.html index 2ade9c86..b57d1bcd 100644 --- a/Javadoc/SubServers.Bungee/index-all.html +++ b/Javadoc/SubServers.Bungee/index-all.html @@ -407,8 +407,6 @@
     
    execute(Client, JSONObject) - Method in class net.ME1312.SubServers.Bungee.Network.Packet.PacketCreateServer
     
    -
    execute(Client, JSONObject) - Method in class net.ME1312.SubServers.Bungee.Network.Packet.PacketDownloadBuildScript
    -
     
    execute(Client, JSONObject) - Method in class net.ME1312.SubServers.Bungee.Network.Packet.PacketDownloadHostInfo
     
    execute(Client, JSONObject) - Method in class net.ME1312.SubServers.Bungee.Network.Packet.PacketDownloadLang
    @@ -545,8 +543,6 @@
     
    generate() - Method in class net.ME1312.SubServers.Bungee.Network.Packet.PacketCreateServer
     
    -
    generate() - Method in class net.ME1312.SubServers.Bungee.Network.Packet.PacketDownloadBuildScript
    -
     
    generate() - Method in class net.ME1312.SubServers.Bungee.Network.Packet.PacketDownloadHostInfo
     
    generate() - Method in class net.ME1312.SubServers.Bungee.Network.Packet.PacketDownloadLang
    @@ -1305,8 +1301,6 @@
     
    getVersion() - Method in class net.ME1312.SubServers.Bungee.Network.Packet.PacketCreateServer
     
    -
    getVersion() - Method in class net.ME1312.SubServers.Bungee.Network.Packet.PacketDownloadBuildScript
    -
     
    getVersion() - Method in class net.ME1312.SubServers.Bungee.Network.Packet.PacketDownloadHostInfo
     
    getVersion() - Method in class net.ME1312.SubServers.Bungee.Network.Packet.PacketDownloadLang
    @@ -1827,18 +1821,6 @@
    New PacketCreateServer (Out)
    -
    PacketDownloadBuildScript - Class in net.ME1312.SubServers.Bungee.Network.Packet
    -
    -
    Download Build Script Packet
    -
    -
    PacketDownloadBuildScript(SubPlugin) - Constructor for class net.ME1312.SubServers.Bungee.Network.Packet.PacketDownloadBuildScript
    -
    -
    New PacketDownloadBuildScript (In)
    -
    -
    PacketDownloadBuildScript(SubPlugin, String) - Constructor for class net.ME1312.SubServers.Bungee.Network.Packet.PacketDownloadBuildScript
    -
    -
    New PacketDownloadBuildScript (Out)
    -
    PacketDownloadHostInfo - Class in net.ME1312.SubServers.Bungee.Network.Packet
    Download Host Info Packet
    @@ -2592,14 +2574,6 @@

    T

    -
    templatify() - Method in class net.ME1312.SubServers.Bungee.Host.External.ExternalSubServer
    -
     
    -
    templatify() - Method in class net.ME1312.SubServers.Bungee.Host.Internal.InternalSubServer
    -
     
    -
    templatify() - Method in class net.ME1312.SubServers.Bungee.Host.SubServer
    -
    -
    Templatify this SubServer
    -
    terminate() - Method in class net.ME1312.SubServers.Bungee.Host.External.ExternalSubCreator
     
    terminate(UUID) - Method in class net.ME1312.SubServers.Bungee.Host.External.ExternalSubServer
    diff --git a/Javadoc/SubServers.Bungee/net/ME1312/SubServers/Bungee/Host/External/ExternalSubServer.html b/Javadoc/SubServers.Bungee/net/ME1312/SubServers/Bungee/Host/External/ExternalSubServer.html index 25c49b92..2427958e 100644 --- a/Javadoc/SubServers.Bungee/net/ME1312/SubServers/Bungee/Host/External/ExternalSubServer.html +++ b/Javadoc/SubServers.Bungee/net/ME1312/SubServers/Bungee/Host/External/ExternalSubServer.html @@ -17,7 +17,7 @@ catch(err) { } //--> -var methods = {"i0":10,"i1":10,"i2":10,"i3":10,"i4":10,"i5":10,"i6":10,"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,"i20":10,"i21":10,"i22":10,"i23":10}; +var methods = {"i0":10,"i1":10,"i2":10,"i3":10,"i4":10,"i5":10,"i6":10,"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,"i20":10,"i21":10,"i22":10}; var tabs = {65535:["t0","All Methods"],2:["t2","Instance Methods"],8:["t4","Concrete Methods"]}; var altColor = "altColor"; var rowColor = "rowColor"; @@ -316,23 +316,17 @@ extends boolean -templatify() -
    Templatify this SubServer
    - - - -boolean terminate(java.util.UUID player)
    Terminates the Server
    - + void waitFor()
    Waits for the Server to Stop
    - + boolean willAutoRestart()
    If the Server will Auto Restart on unexpected shutdowns
    @@ -527,23 +521,6 @@ extends - - - diff --git a/Javadoc/SubServers.Bungee/net/ME1312/SubServers/Bungee/Host/Internal/InternalSubServer.html b/Javadoc/SubServers.Bungee/net/ME1312/SubServers/Bungee/Host/Internal/InternalSubServer.html index 03c9c05e..4d1dda17 100644 --- a/Javadoc/SubServers.Bungee/net/ME1312/SubServers/Bungee/Host/Internal/InternalSubServer.html +++ b/Javadoc/SubServers.Bungee/net/ME1312/SubServers/Bungee/Host/Internal/InternalSubServer.html @@ -17,7 +17,7 @@ catch(err) { } //--> -var methods = {"i0":10,"i1":10,"i2":10,"i3":10,"i4":10,"i5":10,"i6":10,"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,"i20":10,"i21":10,"i22":10,"i23":10}; +var methods = {"i0":10,"i1":10,"i2":10,"i3":10,"i4":10,"i5":10,"i6":10,"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,"i20":10,"i21":10,"i22":10}; var tabs = {65535:["t0","All Methods"],2:["t2","Instance Methods"],8:["t4","Concrete Methods"]}; var altColor = "altColor"; var rowColor = "rowColor"; @@ -318,23 +318,17 @@ extends boolean -templatify() -
    Templatify this SubServer
    - - - -boolean terminate(java.util.UUID player)
    Terminates the Server
    - + void waitFor()
    Waits for the Server to Stop
    - + boolean willAutoRestart()
    If the Server will Auto Restart on unexpected shutdowns
    @@ -533,23 +527,6 @@ extends - - - diff --git a/Javadoc/SubServers.Bungee/net/ME1312/SubServers/Bungee/Host/SubServer.html b/Javadoc/SubServers.Bungee/net/ME1312/SubServers/Bungee/Host/SubServer.html index e6ac9a3a..a1ea2b68 100644 --- a/Javadoc/SubServers.Bungee/net/ME1312/SubServers/Bungee/Host/SubServer.html +++ b/Javadoc/SubServers.Bungee/net/ME1312/SubServers/Bungee/Host/SubServer.html @@ -17,7 +17,7 @@ catch(err) { } //--> -var methods = {"i0":10,"i1":6,"i2":6,"i3":10,"i4":6,"i5":6,"i6":10,"i7":6,"i8":6,"i9":6,"i10":6,"i11":6,"i12":6,"i13":6,"i14":6,"i15":6,"i16":6,"i17":6,"i18":6,"i19":6,"i20":10,"i21":6,"i22":10,"i23":6,"i24":6,"i25":10,"i26":6,"i27":6,"i28":6}; +var methods = {"i0":10,"i1":6,"i2":6,"i3":10,"i4":6,"i5":6,"i6":10,"i7":6,"i8":6,"i9":6,"i10":6,"i11":6,"i12":6,"i13":6,"i14":6,"i15":6,"i16":6,"i17":6,"i18":6,"i19":6,"i20":10,"i21":6,"i22":10,"i23":6,"i24":10,"i25":6,"i26":6,"i27":6}; var tabs = {65535:["t0","All Methods"],2:["t2","Instance Methods"],4:["t3","Abstract Methods"],8:["t4","Concrete Methods"]}; var altColor = "altColor"; var rowColor = "rowColor"; @@ -338,30 +338,24 @@ extends -abstract boolean -templatify() -
    Templatify this SubServer
    - - - boolean terminate()
    Terminates the Server
    - + abstract boolean terminate(java.util.UUID player)
    Terminates the Server
    - + abstract void waitFor()
    Waits for the Server to Stop
    - + abstract boolean willAutoRestart()
    If the Server will Auto Restart on unexpected shutdowns
    @@ -595,20 +589,6 @@ extends - - - - diff --git a/Javadoc/SubServers.Bungee/net/ME1312/SubServers/Bungee/Network/Packet/PacketCreateServer.html b/Javadoc/SubServers.Bungee/net/ME1312/SubServers/Bungee/Network/Packet/PacketCreateServer.html index 78093764..ca64f09d 100644 --- a/Javadoc/SubServers.Bungee/net/ME1312/SubServers/Bungee/Network/Packet/PacketCreateServer.html +++ b/Javadoc/SubServers.Bungee/net/ME1312/SubServers/Bungee/Network/Packet/PacketCreateServer.html @@ -48,7 +48,7 @@ var activeTableTab = "activeTableTab";
    • Frames
      • @@ -323,7 +323,7 @@ implements
      • Frames
        • diff --git a/Javadoc/SubServers.Bungee/net/ME1312/SubServers/Bungee/Network/Packet/PacketDownloadBuildScript.html b/Javadoc/SubServers.Bungee/net/ME1312/SubServers/Bungee/Network/Packet/PacketDownloadBuildScript.html deleted file mode 100644 index ba3894d1..00000000 --- a/Javadoc/SubServers.Bungee/net/ME1312/SubServers/Bungee/Network/Packet/PacketDownloadBuildScript.html +++ /dev/null @@ -1,364 +0,0 @@ - - - - - -PacketDownloadBuildScript (SubServers.Bungee) - - - - - - - -
        - - -
        Skip navigation links
        - - - - -
        -
        - - - -
        - -
        -
        -
          -
        • Summary: 
          • -
        • Nested | 
          • -
        • Field | 
          • -
        • Constr | 
          • -
        • Method
          • -
        - -
        - - -
        - - -
        -
        net.ME1312.SubServers.Bungee.Network.Packet
        -

        Class PacketDownloadBuildScript

        -
        -
        -
          -
        • java.lang.Object
          • -
        • -
            -
          • net.ME1312.SubServers.Bungee.Network.Packet.PacketDownloadBuildScript
            • -
          -
          • -
        -
        -
          -
        • -
          -
          All Implemented Interfaces:
          -
          PacketIn, PacketOut
          -
          -
          -
          -
          public class PacketDownloadBuildScript
-extends java.lang.Object
-implements PacketIn, PacketOut
          -
          Download Build Script Packet
          -
          • -
        -
        -
        -
          -
        • - - - -
            -
          • - - -

            Method Summary

            - - - - - - - - - - - - - - - - - - -
            All Methods Instance Methods Concrete Methods 
            Modifier and TypeMethod and Description
            voidexecute(Client client, - org.json.JSONObject data) -
            Execute Incoming Packet
            -
            org.json.JSONObjectgenerate() -
            Generate JSON Packet Contents
            -
            VersiongetVersion() -
            Get Packet Version
            -
            -
              -
            • - - -

              Methods inherited from class java.lang.Object

              -equals, getClass, hashCode, notify, notifyAll, toString, wait, wait, wait
              • -
            -
            • -
          -
          • -
        -
        -
        -
          -
        • - -
            -
          • - - -

            Constructor Detail

            - - - -
              -
            • -

              PacketDownloadBuildScript

              -
              public PacketDownloadBuildScript(SubPlugin plugin)
              -
              New PacketDownloadBuildScript (In)
              -
              -
              Parameters:
              -
              plugin - SubPlugin
              -
              -
              • -
            - - - -
              -
            • -

              PacketDownloadBuildScript

              -
              public PacketDownloadBuildScript(SubPlugin plugin,
-                                 java.lang.String id)
              -
              New PacketDownloadBuildScript (Out)
              -
              -
              Parameters:
              -
              plugin - SubPlugin
              -
              id - Receiver ID
              -
              -
              • -
            -
            • -
          - -
            -
          • - - -

            Method Detail

            - - - -
              -
            • -

              generate

              -
              public org.json.JSONObject generate()
              -
              Description copied from interface: PacketOut
              -
              Generate JSON Packet Contents
              -
              -
              Specified by:
              -
              generate in interface PacketOut
              -
              Returns:
              -
              Packet Contents
              -
              -
              • -
            - - - -
              -
            • -

              execute

              -
              public void execute(Client client,
-                    org.json.JSONObject data)
              -
              Description copied from interface: PacketIn
              -
              Execute Incoming Packet
              -
              -
              Specified by:
              -
              execute in interface PacketIn
              -
              Parameters:
              -
              client - Client Accepting
              -
              data - Incoming Data
              -
              -
              • -
            - - - - -
            • -
          -
          • -
        -
        -
        - - -
        - - -
        Skip navigation links
        - - - - -
        -
        - - - -
        - -
        -
        -
          -
        • Summary: 
          • -
        • Nested | 
          • -
        • Field | 
          • -
        • Constr | 
          • -
        • Method
          • -
        - -
        - - -
        - - - diff --git a/Javadoc/SubServers.Bungee/net/ME1312/SubServers/Bungee/Network/Packet/PacketDownloadHostInfo.html b/Javadoc/SubServers.Bungee/net/ME1312/SubServers/Bungee/Network/Packet/PacketDownloadHostInfo.html index 7eb0dbdb..c0105969 100644 --- a/Javadoc/SubServers.Bungee/net/ME1312/SubServers/Bungee/Network/Packet/PacketDownloadHostInfo.html +++ b/Javadoc/SubServers.Bungee/net/ME1312/SubServers/Bungee/Network/Packet/PacketDownloadHostInfo.html @@ -47,7 +47,7 @@ var activeTableTab = "activeTableTab";
    - @@ -326,7 +338,7 @@ not permitted.)
      diff --git a/Javadoc/SubServers.Host/net/ME1312/SubServers/Host/Executable/SubCreator.html b/Javadoc/SubServers.Host/net/ME1312/SubServers/Host/Executable/SubCreator.html index b5d409e0..1743c312 100644 --- a/Javadoc/SubServers.Host/net/ME1312/SubServers/Host/Executable/SubCreator.html +++ b/Javadoc/SubServers.Host/net/ME1312/SubServers/Host/Executable/SubCreator.html @@ -48,7 +48,7 @@ var activeTableTab = "activeTableTab";
      • Frames
        • @@ -130,6 +130,10 @@ extends java.lang.Object static class  +SubCreator.ServerTemplate  + + +static class  SubCreator.ServerType  @@ -168,10 +172,9 @@ extends java.lang.Object boolean -create(java.lang.String name, - SubCreator.ServerType type, +create(java.lang.String name, + SubCreator.ServerTemplate template, Version version, - int memory, int port, java.util.UUID address, java.lang.String id)  @@ -236,16 +239,15 @@ extends java.lang.Object

        Method Detail

        - +
      • diff --git a/SubServers.Bungee/META-INF/MANIFEST.MF b/SubServers.Bungee/META-INF/MANIFEST.MF index ebadbdc4..404997b8 100644 --- a/SubServers.Bungee/META-INF/MANIFEST.MF +++ b/SubServers.Bungee/META-INF/MANIFEST.MF @@ -2,4 +2,4 @@ Manifest-Version: 1.0 Class-Path: BungeeCord.jar Main-Class: net.ME1312.SubServers.Bungee.Launch Implementation-Version: 2.11.2m -Specification-Version: 1 +Specification-Version: 0 diff --git a/SubServers.Bungee/src/net/ME1312/SubServers/Bungee/Host/External/ExternalSubServer.java b/SubServers.Bungee/src/net/ME1312/SubServers/Bungee/Host/External/ExternalSubServer.java index fec367f1..4c5b090d 100644 --- a/SubServers.Bungee/src/net/ME1312/SubServers/Bungee/Host/External/ExternalSubServer.java +++ b/SubServers.Bungee/src/net/ME1312/SubServers/Bungee/Host/External/ExternalSubServer.java @@ -360,12 +360,6 @@ public class ExternalSubServer extends SubServer { return c; } - @Override - public boolean templatify() { - // TODO - return false; - } - @Override public void waitFor() throws InterruptedException { while (running) { 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 47998b13..8fec77c6 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 @@ -15,14 +15,11 @@ import org.w3c.dom.Document; import org.w3c.dom.Node; import org.w3c.dom.NodeList; import org.xml.sax.InputSource; -import org.xml.sax.SAXException; import javax.xml.parsers.DocumentBuilderFactory; -import javax.xml.parsers.ParserConfigurationException; import java.io.*; import java.net.URL; import java.nio.charset.Charset; -import java.text.SimpleDateFormat; import java.util.*; /** @@ -52,7 +49,7 @@ public class InternalSubCreator extends SubCreator { try { if (file.isDirectory()) { YAMLSection config = (new UniversalFile(file, "template.yml").exists())?new YAMLConfig(new UniversalFile(file, "template.yml")).get().getSection("Template", new YAMLSection()):new YAMLSection(); - ServerTemplate template = new ServerTemplate(file.getName(), config.getBoolean("Enabled", true), (config.contains("Icon"))?config.getRawString("Icon"):null, file, config.getSection("Build", new YAMLSection()), config.getSection("Settings", new YAMLSection())); + ServerTemplate template = new ServerTemplate(file.getName(), config.getBoolean("Enabled", true), config.getRawString("Icon", "::NULL::"), file, config.getSection("Build", new YAMLSection()), config.getSection("Settings", new YAMLSection())); templates.put(file.getName().toLowerCase(), template); if (config.getKeys().contains("Display")) template.setDisplayName(config.getString("Display")); } @@ -63,7 +60,6 @@ public class InternalSubCreator extends SubCreator { } } - private void run(UUID player, String name, ServerTemplate template, Version version, int port) { UniversalFile dir = new UniversalFile(new File(host.getPath()), name); dir.mkdirs(); @@ -71,7 +67,6 @@ public class InternalSubCreator extends SubCreator { System.out.println(host.getName() + "/Creator > Generating Server Files..."); try { Util.copyDirectory(template.getDirectory(), dir); - new UniversalFile(dir, "template.yml").delete(); generateProperties(dir, port); generateClient(dir, template.getType(), name); @@ -132,7 +127,7 @@ public class InternalSubCreator extends SubCreator { try { System.out.println(host.getName() + "/Creator > Launching " + template.getBuildOptions().getRawString("Shell-Location")); - process = Runtime.getRuntime().exec((System.getProperty("os.name").toLowerCase().indexOf("win") >= 0)?"\"" + gitBash + "\" --login -i -c \"bash " + template.getBuildOptions().getRawString("Shell-Location") + ' ' + version.toString() + " " + System.getProperty("user.home").replace("\"", "\\\"") + "\"":("bash " + template.getBuildOptions().getRawString("Shell-Location") + ' ' + version.toString() + " " + System.getProperty("user.home")), null, dir); + process = 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); logger.process = this.process; logger.log.set(host.plugin.config.get().getSection("Settings").getBoolean("Log-Creator")); logger.file = new File(dir, "SubCreator-" + template.getType().toString() + "-" + version.toString().replace(" ", "@") + ".log"); @@ -148,7 +143,7 @@ public class InternalSubCreator extends SubCreator { } } - + new UniversalFile(dir, "template.yml").delete(); if (!error) { try { System.out.println(host.getName() + "/Creator > Saving..."); diff --git a/SubServers.Bungee/src/net/ME1312/SubServers/Bungee/Host/Internal/InternalSubServer.java b/SubServers.Bungee/src/net/ME1312/SubServers/Bungee/Host/Internal/InternalSubServer.java index 0a852237..b87cac6c 100644 --- a/SubServers.Bungee/src/net/ME1312/SubServers/Bungee/Host/Internal/InternalSubServer.java +++ b/SubServers.Bungee/src/net/ME1312/SubServers/Bungee/Host/Internal/InternalSubServer.java @@ -417,12 +417,6 @@ public class InternalSubServer extends SubServer { return c; } - @Override - public boolean templatify() { - // TODO - return false; - } - @Override public void waitFor() throws InterruptedException { while (thread != null && thread.isAlive()) { diff --git a/SubServers.Bungee/src/net/ME1312/SubServers/Bungee/Host/SubCreator.java b/SubServers.Bungee/src/net/ME1312/SubServers/Bungee/Host/SubCreator.java index 61347498..9c0813eb 100644 --- a/SubServers.Bungee/src/net/ME1312/SubServers/Bungee/Host/SubCreator.java +++ b/SubServers.Bungee/src/net/ME1312/SubServers/Bungee/Host/SubCreator.java @@ -1,6 +1,7 @@ package net.ME1312.SubServers.Bungee.Host; import net.ME1312.SubServers.Bungee.Library.Config.YAMLSection; +import net.ME1312.SubServers.Bungee.Library.Exception.InvalidTemplateException; import net.ME1312.SubServers.Bungee.Library.Util; import net.ME1312.SubServers.Bungee.Library.Version.Version; @@ -31,7 +32,8 @@ public abstract class SubCreator { * @param options Configuration Options */ public ServerTemplate(String name, boolean enabled, String icon, File directory, YAMLSection build, YAMLSection options) { - Util.isNull(name, enabled, directory, build, options); + if (Util.isNull(name, enabled, directory, build, options)) throw new NullPointerException(); + if (name.contains(" ")) throw new InvalidTemplateException("Template names cannot have spaces: " + name); this.name = name; this.enabled = enabled; this.icon = icon; diff --git a/SubServers.Bungee/src/net/ME1312/SubServers/Bungee/Host/SubServer.java b/SubServers.Bungee/src/net/ME1312/SubServers/Bungee/Host/SubServer.java index 6e005f51..68b19b30 100644 --- a/SubServers.Bungee/src/net/ME1312/SubServers/Bungee/Host/SubServer.java +++ b/SubServers.Bungee/src/net/ME1312/SubServers/Bungee/Host/SubServer.java @@ -194,13 +194,6 @@ public abstract class SubServer extends Server { return edit(null, edit); } - /** - * Templatify this SubServer - * - * @return Success Status - */ - public abstract boolean templatify(); - /** * Waits for the Server to Stop * diff --git a/SubServers.Bungee/src/net/ME1312/SubServers/Bungee/Network/Packet/PacketDownloadBuildScript.java b/SubServers.Bungee/src/net/ME1312/SubServers/Bungee/Network/Packet/PacketDownloadBuildScript.java deleted file mode 100644 index 1066f66e..00000000 --- a/SubServers.Bungee/src/net/ME1312/SubServers/Bungee/Network/Packet/PacketDownloadBuildScript.java +++ /dev/null @@ -1,70 +0,0 @@ -package net.ME1312.SubServers.Bungee.Network.Packet; - -import net.ME1312.SubServers.Bungee.Library.UniversalFile; -import net.ME1312.SubServers.Bungee.Library.Version.Version; -import net.ME1312.SubServers.Bungee.Network.Client; -import net.ME1312.SubServers.Bungee.Network.PacketIn; -import net.ME1312.SubServers.Bungee.Network.PacketOut; -import net.ME1312.SubServers.Bungee.SubPlugin; -import org.json.JSONObject; - -import java.io.BufferedReader; -import java.io.FileReader; -import java.util.LinkedList; - -/** - * Download Build Script Packet - */ -public class PacketDownloadBuildScript implements PacketIn, PacketOut { - private SubPlugin plugin; - private String id; - - /** - * New PacketDownloadBuildScript (In) - * - * @param plugin SubPlugin - */ - public PacketDownloadBuildScript(SubPlugin plugin) { - this.plugin = plugin; - } - - /** - * New PacketDownloadBuildScript (Out) - * - * @param plugin SubPlugin - * @param id Receiver ID - */ - public PacketDownloadBuildScript(SubPlugin plugin, String id) { - this.plugin = plugin; - this.id = id; - } - - @Override - public JSONObject generate() { - JSONObject json = new JSONObject(); - json.put("id", id); - try { - LinkedList list = new LinkedList(); - BufferedReader script = new BufferedReader(new FileReader(new UniversalFile(plugin.dir, "SubServers:build.sh"))); - String line; - while ((line = script.readLine()) != null) { - list.add(line); - } - script.close(); - json.put("script", list); - } catch (Exception e) { - e.printStackTrace(); - } - return json; - } - - @Override - public void execute(Client client, JSONObject data) { - client.sendPacket(new PacketDownloadBuildScript(plugin, (data != null && data.keySet().contains("id"))?data.getString("id"):null)); - } - - @Override - public Version getVersion() { - return new Version("2.11.0a"); - } -} \ No newline at end of file diff --git a/SubServers.Bungee/src/net/ME1312/SubServers/Bungee/Network/Packet/PacketExConfigureHost.java b/SubServers.Bungee/src/net/ME1312/SubServers/Bungee/Network/Packet/PacketExConfigureHost.java index 5b402786..8df521a8 100644 --- a/SubServers.Bungee/src/net/ME1312/SubServers/Bungee/Network/Packet/PacketExConfigureHost.java +++ b/SubServers.Bungee/src/net/ME1312/SubServers/Bungee/Network/Packet/PacketExConfigureHost.java @@ -1,6 +1,9 @@ package net.ME1312.SubServers.Bungee.Network.Packet; import net.ME1312.SubServers.Bungee.Host.External.ExternalHost; +import net.ME1312.SubServers.Bungee.Host.External.ExternalSubCreator; +import net.ME1312.SubServers.Bungee.Host.SubCreator; +import net.ME1312.SubServers.Bungee.Library.Config.YAMLSection; import net.ME1312.SubServers.Bungee.Library.Version.Version; import net.ME1312.SubServers.Bungee.Network.Client; import net.ME1312.SubServers.Bungee.Network.PacketIn; @@ -8,6 +11,10 @@ import net.ME1312.SubServers.Bungee.Network.PacketOut; import net.ME1312.SubServers.Bungee.SubPlugin; import org.json.JSONObject; +import java.io.File; +import java.lang.reflect.Field; +import java.util.HashMap; + /** * External Host Configuration Packet */ @@ -38,8 +45,28 @@ public class PacketExConfigureHost implements PacketIn, PacketOut { } @Override + @SuppressWarnings("unchecked") public void execute(Client client, JSONObject data) { if (client.getHandler() != null && client.getHandler() instanceof ExternalHost && plugin.config.get().getSection("Hosts").getKeys().contains(((ExternalHost) client.getHandler()).getName())) { + try { + Field field = ExternalSubCreator.class.getDeclaredField("templates"); + field.setAccessible(true); + HashMap templates = new HashMap(); + for (String name : data.getJSONObject("templates").keySet()) { + try { + SubCreator.ServerTemplate template = new SubCreator.ServerTemplate(name, data.getJSONObject("templates").getJSONObject(name).getBoolean("enabled"), data.getJSONObject("templates").getJSONObject(name).getString("icon"), + new File(data.getJSONObject("templates").getJSONObject(name).getString("dir")), new YAMLSection(data.getJSONObject("templates").getJSONObject(name).getJSONObject("build")), new YAMLSection(data.getJSONObject("templates").getJSONObject(name).getJSONObject("options"))); + templates.put(name.toLowerCase(), template); + if (data.getJSONObject("templates").getJSONObject(name).keySet().contains("display")) template.setDisplayName(data.getJSONObject("templates").getJSONObject(name).getString("display")); + } catch (Exception e) { + e.printStackTrace(); + } + } + field.set(((ExternalHost) client.getHandler()).getCreator(), templates); + field.setAccessible(false); + } catch (Exception e) { + e.printStackTrace(); + } client.sendPacket(new PacketExConfigureHost(plugin, (ExternalHost) client.getHandler())); } } diff --git a/SubServers.Bungee/src/net/ME1312/SubServers/Bungee/Network/Packet/PacketExCreateServer.java b/SubServers.Bungee/src/net/ME1312/SubServers/Bungee/Network/Packet/PacketExCreateServer.java index a682dce1..25e8cf11 100644 --- a/SubServers.Bungee/src/net/ME1312/SubServers/Bungee/Network/Packet/PacketExCreateServer.java +++ b/SubServers.Bungee/src/net/ME1312/SubServers/Bungee/Network/Packet/PacketExCreateServer.java @@ -75,6 +75,6 @@ public class PacketExCreateServer implements PacketIn, PacketOut { @Override public Version getVersion() { - return new Version("2.11.2m"); + return new Version("2.11.0a"); } } \ No newline at end of file diff --git a/SubServers.Bungee/src/net/ME1312/SubServers/Bungee/Network/Packet/PacketLinkExHost.java b/SubServers.Bungee/src/net/ME1312/SubServers/Bungee/Network/Packet/PacketLinkExHost.java index 9e407517..3d5bac27 100644 --- a/SubServers.Bungee/src/net/ME1312/SubServers/Bungee/Network/Packet/PacketLinkExHost.java +++ b/SubServers.Bungee/src/net/ME1312/SubServers/Bungee/Network/Packet/PacketLinkExHost.java @@ -64,7 +64,6 @@ public class PacketLinkExHost implements PacketIn, PacketOut { ((ClientHandler) host).linkSubDataClient(client); System.out.println("SubData > " + client.getAddress().toString() + " has been defined as Host: " + host.getName()); client.sendPacket(new PacketLinkExHost(0, "Definition Successful")); - if (host instanceof ExternalHost) client.sendPacket(new PacketExConfigureHost(plugin, (ExternalHost) host)); } else { client.sendPacket(new PacketLinkExHost(3, "Host already linked")); } 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 9accd64e..6c547aa3 100644 --- a/SubServers.Bungee/src/net/ME1312/SubServers/Bungee/Network/SubDataServer.java +++ b/SubServers.Bungee/src/net/ME1312/SubServers/Bungee/Network/SubDataServer.java @@ -64,7 +64,6 @@ public final class SubDataServer { registerPacket(new PacketAuthorization(plugin), "Authorization"); registerPacket(new PacketCommandServer(plugin), "SubCommandServer"); registerPacket(new PacketCreateServer(plugin), "SubCreateServer"); - registerPacket(new PacketDownloadBuildScript(plugin), "SubDownloadBuildScript"); registerPacket(new PacketDownloadHostInfo(plugin), "SubDownloadHostInfo"); registerPacket(new PacketDownloadLang(plugin), "SubDownloadLang"); registerPacket(new PacketDownloadPlayerList(plugin), "SubDownloadPlayerList"); @@ -90,7 +89,6 @@ public final class SubDataServer { registerPacket(PacketAuthorization.class, "Authorization"); registerPacket(PacketCommandServer.class, "SubCommandServer"); registerPacket(PacketCreateServer.class, "SubCreateServer"); - registerPacket(PacketDownloadBuildScript.class, "SubDownloadBuildScript"); registerPacket(PacketDownloadHostInfo.class, "SubDownloadHostInfo"); registerPacket(PacketDownloadLang.class, "SubDownloadLang"); registerPacket(PacketDownloadPlayerList.class, "SubDownloadPlayerList"); diff --git a/SubServers.Bungee/src/net/ME1312/SubServers/Bungee/SubPlugin.java b/SubServers.Bungee/src/net/ME1312/SubServers/Bungee/SubPlugin.java index 14955c73..ef0e2610 100644 --- a/SubServers.Bungee/src/net/ME1312/SubServers/Bungee/SubPlugin.java +++ b/SubServers.Bungee/src/net/ME1312/SubServers/Bungee/SubPlugin.java @@ -23,6 +23,7 @@ import java.net.InetAddress; import java.net.InetSocketAddress; import java.net.SocketException; import java.nio.file.Files; +import java.text.DecimalFormat; import java.util.*; import java.util.concurrent.TimeUnit; import java.util.zip.ZipEntry; @@ -258,7 +259,7 @@ public final class SubPlugin extends BungeeCord { } } - System.out.println("SubServers > " + ((plugins > 0)?plugins+" Plugin"+((plugins == 1)?"":"s")+", ":"") + hosts + " Host"+((hosts == 1)?"":"s")+", " + servers + " Server"+((servers == 1)?"":"s")+", and " + subservers + " SubServer"+((subservers == 1)?"":"s")+" loaded in " + TimeUnit.MILLISECONDS.toSeconds(Calendar.getInstance().getTime().getTime() - begin) + "s"); + System.out.println("SubServers > " + ((plugins > 0)?plugins+" Plugin"+((plugins == 1)?"":"s")+", ":"") + hosts + " Host"+((hosts == 1)?"":"s")+", " + servers + " Server"+((servers == 1)?"":"s")+", and " + subservers + " SubServer"+((subservers == 1)?"":"s")+" loaded in " + new DecimalFormat("#.000").format((Calendar.getInstance().getTime().getTime() - begin) / 1000D) + "s"); super.startListeners(); } catch (IOException e) { diff --git a/SubServers.Client/Bukkit/src/net/ME1312/SubServers/Client/Bukkit/Graphic/InternalRenderer.java b/SubServers.Client/Bukkit/src/net/ME1312/SubServers/Client/Bukkit/Graphic/InternalRenderer.java index a3cbb973..3d63aeb3 100644 --- a/SubServers.Client/Bukkit/src/net/ME1312/SubServers/Client/Bukkit/Graphic/InternalRenderer.java +++ b/SubServers.Client/Bukkit/src/net/ME1312/SubServers/Client/Bukkit/Graphic/InternalRenderer.java @@ -96,11 +96,7 @@ public class InternalRenderer extends UIRenderer { } } - ItemStack stack = new ItemStack(Material.SKULL_ITEM, 1, (short) 3); - SkullMeta meta = (SkullMeta) stack.getItemMeta(); - meta.setOwner("MHF_Question"); - stack.setItemMeta(meta); - return stack; + return new ItemStack(Material.ENDER_CHEST); } public void hostMenu(final int page) { @@ -124,7 +120,7 @@ public class InternalRenderer extends UIRenderer { int i = 0; int min = ((page - 1) * 36); int max = (min + 35); - int count = (hosts.size() == 0)?27:((hosts.size() - min - 1 >= max)?36:hosts.size() - min); + int count = (hosts.size() == 0)?27:((hosts.size() - min >= max)?36:hosts.size() - min); int area = (count % 9 == 0) ? count : (int) (Math.floor(count / 9) + 1) * 9; Inventory inv = Bukkit.createInventory(null, 18 + area, plugin.lang.getSection("Lang").getColoredString("Interface.Host-Menu.Title", '&')); @@ -294,6 +290,7 @@ public class InternalRenderer extends UIRenderer { blockMeta = block.getItemMeta(); blockMeta.setDisplayName(plugin.lang.getSection("Lang").getColoredString("Interface.Host-Admin.Plugins", '&')); } + block.setItemMeta(blockMeta); inv.setItem(27, block); inv.setItem(28, block); @@ -339,12 +336,10 @@ public class InternalRenderer extends UIRenderer { public void hostCreator(final CreatorOptions options) { setDownloading(ChatColor.stripColor(plugin.lang.getSection("Lang").getColoredString("Interface.Host-Creator.Title", '&').replace("$str$", options.getHost()))); - final int lastPage = this.lastPage; lastUsedOptions = options; if (!options.init()) { windowHistory.add(() -> hostCreator(options)); lastVistedObject = options.getHost(); - this.lastPage = lastPage; } plugin.subdata.sendPacket(new PacketDownloadHostInfo(options.getHost(), json -> { @@ -484,11 +479,13 @@ public class InternalRenderer extends UIRenderer { lastUsedOptions = null; if (hasHistory()) back(); } else { + lastPage = page; setDownloading(null); List templates = new ArrayList(); for (String template : json.getJSONObject("host").getJSONObject("creator").getJSONObject("templates").keySet()) { if (json.getJSONObject("host").getJSONObject("creator").getJSONObject("templates").getJSONObject(template).getBoolean("enabled")) templates.add(template); } + Collections.sort(templates); ItemStack block; ItemMeta blockMeta; @@ -500,8 +497,8 @@ public class InternalRenderer extends UIRenderer { int i = 0; int min = ((page - 1) * 36); int max = (min + 35); - int count = (templates.size() == 0) ? 27 : ((templates.size() - min - 1 >= max) ? 36 : templates.size() - min); - int area = (count % 9 == 0) ? count : (int) (Math.floor(count / 9) + 1) * 9; + int count = (templates.size() == 0)?27:((templates.size() - min >= max)?36:templates.size() - min); + int area = (count % 9 == 0)?count: (int) (Math.floor(count / 9) + 1) * 9; Inventory inv = Bukkit.createInventory(null, 18 + area, plugin.lang.getSection("Lang").getColoredString("Interface.Host-Creator.Edit-Template.Title", '&').replace("$str$", json.getJSONObject("host").getString("display"))); block = new ItemStack(Material.STAINED_GLASS_PANE, 1, (short) 7); @@ -613,7 +610,7 @@ public class InternalRenderer extends UIRenderer { int i = 0; int min = ((page - 1) * 36); int max = (min + 35); - int count = (renderers.size() == 0)?27:((renderers.size() - min - 1 >= max)?36:renderers.size() - min); + int count = (renderers.size() == 0)?27:((renderers.size() - min >= max)?36:renderers.size() - min); int area = (count % 9 == 0) ? count : (int) (Math.floor(count / 9) + 1) * 9; Inventory inv = Bukkit.createInventory(null, 18 + area, plugin.lang.getSection("Lang").getColoredString("Interface.Host-Plugin.Title", '&').replace("$str$", json.getJSONObject("host").getString("display"))); @@ -732,7 +729,7 @@ public class InternalRenderer extends UIRenderer { int i = 0; int min = ((page - 1) * 36); int max = (min + 35); - int count = (subservers.size() == 0)?27:((subservers.size() - min - 1 >= max)?36:subservers.size() - min); + int count = (subservers.size() == 0)?27:((subservers.size() - min >= max)?36:subservers.size() - min); int area = (count % 9 == 0) ? count : (int) (Math.floor(count / 9) + 1) * 9; Inventory inv = Bukkit.createInventory(null, 18 + area, (host == null)?plugin.lang.getSection("Lang").getColoredString("Interface.SubServer-Menu.Title", '&'):plugin.lang.getSection("Lang").getColoredString("Interface.Host-SubServer.Title", '&').replace("$str$", json.getJSONObject("hosts").getJSONObject(host).getString("display"))); @@ -1053,7 +1050,7 @@ public class InternalRenderer extends UIRenderer { int i = 0; int min = ((page - 1) * 36); int max = (min + 35); - int count = (renderers.size() == 0)?27:((renderers.size() - min - 1 >= max)?36:renderers.size() - min); + int count = (renderers.size() == 0)?27:((renderers.size() - min >= max)?36:renderers.size() - min); int area = (count % 9 == 0) ? count : (int) (Math.floor(count / 9) + 1) * 9; Inventory inv = Bukkit.createInventory(null, 18 + area, plugin.lang.getSection("Lang").getColoredString("Interface.SubServer-Plugin.Title", '&').replace("$str$", json.getJSONObject("server").getString("display"))); diff --git a/SubServers.Client/Bukkit/src/net/ME1312/SubServers/Client/Bukkit/SubPlugin.java b/SubServers.Client/Bukkit/src/net/ME1312/SubServers/Client/Bukkit/SubPlugin.java index 3cac772a..681e49c5 100644 --- a/SubServers.Client/Bukkit/src/net/ME1312/SubServers/Client/Bukkit/SubPlugin.java +++ b/SubServers.Client/Bukkit/src/net/ME1312/SubServers/Client/Bukkit/SubPlugin.java @@ -27,7 +27,7 @@ public final class SubPlugin extends JavaPlugin { public UIHandler gui = null; public final Version version; - public final Version bversion = new Version(1); + public final Version bversion = null; public final SubAPI api = new SubAPI(this); public SubPlugin() { diff --git a/SubServers.Host/src/net/ME1312/SubServers/Host/API/Event/SubCreateEvent.java b/SubServers.Host/src/net/ME1312/SubServers/Host/API/Event/SubCreateEvent.java index 4f389324..73fe6e36 100644 --- a/SubServers.Host/src/net/ME1312/SubServers/Host/API/Event/SubCreateEvent.java +++ b/SubServers.Host/src/net/ME1312/SubServers/Host/API/Event/SubCreateEvent.java @@ -1,6 +1,5 @@ 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; @@ -14,9 +13,8 @@ public class SubCreateEvent extends Event { private UUID player; private String host; private String name; - private SubCreator.ServerType type; + private String template; private Version version; - private int memory; private int port; /** @@ -25,19 +23,17 @@ public class SubCreateEvent extends Event { * @param player Player Creating * @param host Potential Host * @param name Server Name - * @param type Server Type + * @param template Server Template * @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(); + public SubCreateEvent(UUID player, String host, String name, String template, Version version, int port) { + if (Util.isNull(host, name, template, version, port)) throw new NullPointerException(); this.player = player; this.host = host; this.name = name; - this.type = type; + this.template = template; this.version = version; - this.memory = memory; this.port = port; } @@ -60,21 +56,21 @@ public class SubCreateEvent extends Event { } /** - * Get the type of Server to create + * Get the Template to Use * - * @return Server Type + * @return Server Template */ - public SubCreator.ServerType getType() { - return type; + public String getTemplate() { + return template; } /** - * Set the Type of Server to Create + * Set the Template to Use * * @param value Value */ - public void setType(SubCreator.ServerType value) { - this.type = value; + public void getTemplate(String value) { + this.template = value; } /** @@ -95,24 +91,6 @@ public class SubCreateEvent extends Event { 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 * diff --git a/SubServers.Host/src/net/ME1312/SubServers/Host/ExHost.java b/SubServers.Host/src/net/ME1312/SubServers/Host/ExHost.java index f67e89a3..15a52c2b 100644 --- a/SubServers.Host/src/net/ME1312/SubServers/Host/ExHost.java +++ b/SubServers.Host/src/net/ME1312/SubServers/Host/ExHost.java @@ -34,6 +34,7 @@ import java.util.zip.ZipInputStream; * SubServers.Host Main Class */ public final class ExHost { + public HashMap templates = new HashMap(); public HashMap servers = new HashMap(); public SubCreator creator; @@ -45,7 +46,7 @@ public final class ExHost { public SubDataClient subdata = null; public final Version version = new Version("2.11.2c"); - public final Version bversion = new Version(1); + public final Version bversion = null; public final SubAPI api = new SubAPI(this); private boolean running; @@ -76,9 +77,30 @@ public final class ExHost { log.info.println("Updated ~/config.yml"); } - if (!(new UniversalFile(dir, "Templates").exists())) { - unzip(ExHost.class.getResourceAsStream("/net/ME1312/SubServers/Host/Library/Files/templates.zip"), dir); - System.out.println("SubServers > Created ~/Templates"); + if (!(new UniversalFile(dir, "Templates").exists())) new UniversalFile(dir, "Templates").mkdirs(); + if (!(new UniversalFile(dir, "Templates:Vanilla:template.yml").exists())) { + unzip(SubPlugin.class.getResourceAsStream("/net/ME1312/SubServers/Host/Library/Files/Templates/vanilla.zip"), new UniversalFile(dir, "Templates")); + log.info.println("Created ~/SubServers/Templates/Vanilla"); + } else if ((new Version((new YAMLConfig(new UniversalFile(dir, "Templates:Vanilla:template.yml"))).get().getString("Version", "0")).compareTo(new Version("2.11.2m+"))) != 0) { + Files.move(new UniversalFile(dir, "Templates:Vanilla").toPath(), new UniversalFile(dir, "Templates:Vanilla.old" + Math.round(Math.random() * 100000)).toPath()); + unzip(SubPlugin.class.getResourceAsStream("/net/ME1312/SubServers/Host/Library/Files/Templates/vanilla.zip"), new UniversalFile(dir, "Templates")); + log.info.println("Updated ~/SubServers/Templates/Vanilla"); + } + if (!(new UniversalFile(dir, "Templates:Spigot:template.yml").exists())) { + unzip(SubPlugin.class.getResourceAsStream("/net/ME1312/SubServers/Host/Library/Files/Templates/spigot.zip"), new UniversalFile(dir, "Templates")); + log.info.println("Created ~/SubServers/Templates/Spigot"); + } else if ((new Version((new YAMLConfig(new UniversalFile(dir, "Templates:Spigot:template.yml"))).get().getString("Version", "0")).compareTo(new Version("2.11.2m+"))) != 0) { + Files.move(new UniversalFile(dir, "Templates:Vanilla").toPath(), new UniversalFile(dir, "Templates:Spigot.old" + Math.round(Math.random() * 100000)).toPath()); + unzip(SubPlugin.class.getResourceAsStream("/net/ME1312/SubServers/Host/Library/Files/Templates/spigot.zip"), new UniversalFile(dir, "Templates")); + log.info.println("Updated ~/SubServers/Templates/Spigot"); + } + if (!(new UniversalFile(dir, "Templates:Sponge:template.yml").exists())) { + unzip(SubPlugin.class.getResourceAsStream("/net/ME1312/SubServers/Host/Library/Files/Templates/sponge.zip"), new UniversalFile(dir, "Templates")); + log.info.println("Created ~/SubServers/Templates/Sponge"); + } else if ((new Version((new YAMLConfig(new UniversalFile(dir, "Templates:Sponge:template.yml"))).get().getString("Version", "0")).compareTo(new Version("2.11.2m+"))) != 0) { + Files.move(new UniversalFile(dir, "Templates:Vanilla").toPath(), new UniversalFile(dir, "Templates:Sponge.old" + Math.round(Math.random() * 100000)).toPath()); + unzip(SubPlugin.class.getResourceAsStream("/net/ME1312/SubServers/Host/Library/Files/Templates/sponge.zip"), new UniversalFile(dir, "Templates")); + log.info.println("Updated ~/SubServers/Templates/Sponge"); } if (new UniversalFile(dir, "Recently Deleted").exists()) { @@ -92,22 +114,22 @@ public final class ExHost { if (TimeUnit.MILLISECONDS.toDays(Calendar.getInstance().getTime().getTime() - json.getLong("Timestamp")) >= 7) { Util.deleteDirectory(file); f--; - log.info.println("SubServers > Removed ~/Recently Deleted/" + file.getName()); + log.info.println("Removed ~/Recently Deleted/" + file.getName()); } } else { Util.deleteDirectory(file); f--; - log.info.println("SubServers > Removed ~/Recently Deleted/" + file.getName()); + log.info.println("Removed ~/Recently Deleted/" + file.getName()); } } else { Util.deleteDirectory(file); f--; - log.info.println("SubServers > Removed ~/Recently Deleted/" + file.getName()); + log.info.println("Removed ~/Recently Deleted/" + file.getName()); } } else { Files.delete(file.toPath()); f--; - log.info.println("SubServers > Removed ~/Recently Deleted/" + file.getName()); + log.info.println("Removed ~/Recently Deleted/" + file.getName()); } } catch (Exception e) { log.error.println(e); @@ -124,6 +146,20 @@ public final class ExHost { Integer.parseInt(config.get().getSection("Settings").getSection("SubData").getString("Address", "127.0.0.1:4391").split(":")[1])); creator = new SubCreator(this); + if (new UniversalFile(dir, "Templates").exists()) for (File file : new UniversalFile(dir, "Templates").listFiles()) { + try { + if (file.isDirectory()) { + YAMLSection config = (new UniversalFile(file, "template.yml").exists())?new YAMLConfig(new UniversalFile(file, "template.yml")).get().getSection("Template", new YAMLSection()):new YAMLSection(); + SubCreator.ServerTemplate template = new SubCreator.ServerTemplate(file.getName(), config.getBoolean("Enabled", true), config.getRawString("Icon", "::NULL::"), file, config.getSection("Build", new YAMLSection()), config.getSection("Settings", new YAMLSection())); + templates.put(file.getName().toLowerCase(), template); + if (config.getKeys().contains("Display")) template.setDisplayName(config.getString("Display")); + } + } catch (Exception e) { + System.out.println("SubCreator > Couldn't load template: " + file.getName()); + e.printStackTrace(); + } + } + if (System.getProperty("subservers.host.plugins", "").length() > 0) { long begin = Calendar.getInstance().getTime().getTime(); long i = 0; 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 82de89f9..03de01ab 100644 --- a/SubServers.Host/src/net/ME1312/SubServers/Host/Executable/SubCreator.java +++ b/SubServers.Host/src/net/ME1312/SubServers/Host/Executable/SubCreator.java @@ -1,13 +1,12 @@ package net.ME1312.SubServers.Host.Executable; -import net.ME1312.SubServers.Host.Library.Config.YAMLConfig; import net.ME1312.SubServers.Host.Library.Config.YAMLSection; import net.ME1312.SubServers.Host.Library.Container; import net.ME1312.SubServers.Host.Library.Exception.InvalidServerException; +import net.ME1312.SubServers.Host.Library.Exception.InvalidTemplateException; import net.ME1312.SubServers.Host.Library.UniversalFile; import net.ME1312.SubServers.Host.Library.Util; import net.ME1312.SubServers.Host.Library.Version.Version; -import net.ME1312.SubServers.Host.Network.Packet.PacketDownloadBuildScript; import net.ME1312.SubServers.Host.Network.Packet.PacketExCreateServer; import net.ME1312.SubServers.Host.Network.Packet.PacketOutExLogMessage; import net.ME1312.SubServers.Host.ExHost; @@ -16,16 +15,11 @@ import org.w3c.dom.Document; import org.w3c.dom.Node; import org.w3c.dom.NodeList; import org.xml.sax.InputSource; -import org.xml.sax.SAXException; import javax.xml.parsers.DocumentBuilderFactory; -import javax.xml.parsers.ParserConfigurationException; import java.io.*; import java.net.URL; import java.nio.charset.Charset; -import java.text.SimpleDateFormat; -import java.util.Calendar; -import java.util.Iterator; import java.util.UUID; /** @@ -37,10 +31,145 @@ public class SubCreator { private Process process = null; private Thread thread = null; + public static class ServerTemplate { + private String name; + private String nick = null; + private boolean enabled; + private String icon; + private File directory; + private ServerType type; + private YAMLSection build; + private YAMLSection options; + + /** + * Create a SubCreator Template + * + * @param name Template Name + * @param directory Template Directory + * @param build Build Options + * @param options Configuration Options + */ + public ServerTemplate(String name, boolean enabled, String icon, File directory, YAMLSection build, YAMLSection options) { + if (Util.isNull(name, enabled, directory, build, options)) throw new NullPointerException(); + if (name.contains(" ")) throw new InvalidTemplateException("Template names cannot have spaces: " + name); + this.name = name; + this.enabled = enabled; + this.icon = icon; + this.directory = directory; + this.type = (build.contains("Server-Type"))?ServerType.valueOf(build.getRawString("Server-Type").toUpperCase()):ServerType.CUSTOM; + this.build = build; + this.options = options; + } + + /** + * Get the Name of this Template + * + * @return Template Name + */ + public String getName() { + return name; + } + + /** + * Get the Display Name of this Template + * + * @return Display Name + */ + public String getDisplayName() { + return (nick == null)?getName():nick; + } + + /** + * Sets the Display Name for this Template + * + * @param value Value (or null to reset) + */ + public void setDisplayName(String value) { + if (value == null || value.length() == 0 || getName().equals(value)) { + this.nick = null; + } else { + this.nick = value; + } + } + + /** + * Get the Enabled Status of this Template + * + * @return Enabled Status + */ + public boolean isEnabled() { + return enabled; + } + + /** + * Set the Enabled Status of this Template + * + * @param value Value + */ + public void setEnabled(boolean value) { + enabled = value; + } + + /** + * Get the Item Icon for this Template + * + * @return Item Icon Name/ID + */ + public String getIcon() { + return icon; + } + + /** + * Set the Item Icon for this Template + * + * @param value Value + */ + public void setIcon(String value) { + icon = value; + } + + /** + * Get the Directory for this Template + * + * @return Directory + */ + public File getDirectory() { + return directory; + } + + + /** + * Get the Type of this Template + * + * @return Template Type + */ + public ServerType getType() { + return type; + } + + /** + * Get the Build Options for this Template + * + * @return Build Options + */ + public YAMLSection getBuildOptions() { + return build; + } + + /** + * Get the Configuration Options for this Template + * + * @return Configuration Options + */ + public YAMLSection getConfigOptions() { + return options; + } + } public enum ServerType { SPIGOT, VANILLA, - SPONGE,; + SPONGE, + CUSTOM; @Override public String toString() { @@ -59,45 +188,18 @@ public class SubCreator { this.logger = new SubLogger(null, this, "SubCreator", null, new Container(false), null); } - - private void run(String name, ServerType type, Version version, int memory, int port, UUID address, String id) { - Executable executable = null; + private void run(String name, ServerTemplate template, Version version, int port, UUID address, String id) { UniversalFile dir = new UniversalFile(new File(host.host.getRawString("Directory")), name); dir.mkdirs(); 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"); - - try { - copyFolder(new UniversalFile(host.dir, "Templates:Spigot"), dir); - generateProperties(dir, port); - generateClient(dir, name, type); - } catch (Exception e) { - logger.logger.error.println(e); - } - - } else if (type == ServerType.VANILLA) { - executable = new Executable("java -Xmx" + memory + "M -jar Vanilla.jar nogui"); - - try { - copyFolder(new UniversalFile(host.dir, "Templates:Vanilla"), dir); - generateEULA(dir); - generateProperties(dir, port); - } catch (IOException e) { - logger.logger.error.println(e); - } - } else if (type == ServerType.SPONGE) { - try { - executable = new Executable("java -Xmx" + memory + "M -jar Forge.jar"); - - copyFolder(new UniversalFile(host.dir, "" + - "Templates:Sponge"), dir); - generateEULA(dir); - generateProperties(dir, port); - generateClient(dir, name, type); + try { + Util.copyDirectory(template.getDirectory(), dir); + generateProperties(dir, port); + generateClient(dir, template.getType(), name); + if (template.getType() == ServerType.SPONGE) { 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"))))))); @@ -113,7 +215,8 @@ public class SubCreator { } } } - if (spversion == null) throw new InvalidServerException("Cannot find sponge version for Minecraft " + version.toString()); + if (spversion == null) + throw new InvalidServerException("Cannot find sponge version for Minecraft " + version.toString()); logger.logger.info.println("Found \"spongeforge-" + spversion.toString() + '"'); host.subdata.sendPacket(new PacketOutExLogMessage(address, "Found \"spongeforge-" + spversion.toString() + '"')); @@ -127,87 +230,69 @@ public class SubCreator { } } } - if (mcfversion == null) throw new InvalidServerException("Cannot find forge version for Sponge " + spversion.toString()); + if (mcfversion == null) + throw new InvalidServerException("Cannot find forge version for Sponge " + spversion.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()); - } catch (ParserConfigurationException | IOException | SAXException | NullPointerException e) { - logger.logger.error.println(e); + version = new Version(mcfversion.toString() + " " + spversion.toString()); + } + } catch (Exception e) { + e.printStackTrace(); + } + + boolean error = false; + if (template.getBuildOptions().getKeys().size() > 0) { + File gitBash = new File(host.host.getRawString("Git-Bash"), "bin" + File.separatorChar + "bash.exe"); + if (!(System.getProperty("os.name").toLowerCase().indexOf("win") >= 0) && template.getBuildOptions().contains("Permission")) { + try { + Process process = Runtime.getRuntime().exec("chmod " + template.getBuildOptions().getRawString("Permission") + ' ' + template.getBuildOptions().getRawString("Shell-Location"), null, dir); + Thread.sleep(500); + if (process.exitValue() != 0) { + logger.logger.info.println("Couldn't set " + template.getBuildOptions().getRawString("Permission") + " permissions to " + template.getBuildOptions().getRawString("Shell-Location")); + host.subdata.sendPacket(new PacketOutExLogMessage(address, "Couldn't set " + template.getBuildOptions().getRawString("Permission") + " permissions to " + template.getBuildOptions().getRawString("Shell-Location"))); + } + } catch (Exception e) { + logger.logger.info.println("Couldn't set " + template.getBuildOptions().getRawString("Permission") + " permissions to " + template.getBuildOptions().getRawString("Shell-Location")); + host.subdata.sendPacket(new PacketOutExLogMessage(address, "Couldn't set " + template.getBuildOptions().getRawString("Permission") + " permissions to " + template.getBuildOptions().getRawString("Shell-Location"))); + e.printStackTrace(); + } + } + + try { + logger.logger.info.println("/Creator > Launching " + template.getBuildOptions().getRawString("Shell-Location")); + host.subdata.sendPacket(new PacketOutExLogMessage(address,"/Creator > Launching " + template.getBuildOptions().getRawString("Shell-Location"))); + process = 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); + logger.process = this.process; + logger.log.set(true); + logger.address = address; + logger.file = new File(dir, "SubCreator-" + template.getType().toString() + "-" + version.toString().replace(" ", "@") + ".log"); + logger.start(); + + process.waitFor(); + Thread.sleep(500); + + if (process.exitValue() != 0) error = true; + } catch (Exception e) { + error = true; + e.printStackTrace(); } } - Version ver = version; - Executable exec = executable; - host.subdata.sendPacket(new PacketDownloadBuildScript(json -> { - (thread = new Thread(() -> { - try { - - PrintWriter writer = new PrintWriter(new UniversalFile(dir, "build.sh"), "UTF-8"); - Iterator i = json.getJSONArray("script").iterator(); - while (i.hasNext()) { - String line = (String) i.next(); - writer.println(line); - } - writer.close(); - - if (!(new File(dir, "build.sh").exists())) { - 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"); - if (!(System.getProperty("os.name").toLowerCase().indexOf("win") >= 0)) { - Process process = Runtime.getRuntime().exec("chmod +x build.sh", null, dir); - try { - process.waitFor(); - Thread.sleep(500); - } catch (InterruptedException e) { - logger.logger.error.println(e); - } - if (process.exitValue() != 0) { - logger.logger.info.println("Problem Setting Executable Permissions."); - host.subdata.sendPacket(new PacketOutExLogMessage(address, "Problem Setting Executable Permissions.")); - } - } - - 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() + "\"" - : ("bash build.sh " + ver.toString() + " " + type.toString().toLowerCase() + " " + System.getProperty("user.home")), null, dir); - logger.process = this.process; - logger.log.set(true); - logger.address = address; - logger.file = new File(dir, "SubCreator-" + type.toString() + "-" + ver.toString().replace("::", "@") + ".log"); - logger.start(); - try { - this.process.waitFor(); - Thread.sleep(500); - } catch (InterruptedException e) { - logger.logger.error.println(e); - } - - JSONObject info = new JSONObject(); - info.put("dir", "." + File.separatorChar + name); - 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) { - logger.logger.info.println("Couldn't build the server jar. See \"SubCreator-" + type.toString() + "-" + ver.toString().replace("::", "@") + ".log\" for more details."); - } - } - } catch (IOException e) { - host.log.error.println(e); - host.subdata.sendPacket(new PacketExCreateServer(-1, "An Exception occurred while running SubCreator. See the " + host.subdata.getName() + " console for more details.", null, id)); - } - })).start(); - })); + new UniversalFile(dir, "template.yml").delete(); + if (!error) { + host.subdata.sendPacket(new PacketExCreateServer(process.exitValue(), "Created Server Successfully", template.getConfigOptions().toJSON(), id)); + } else { + logger.logger.info.println("Couldn't build the server jar. See \"SubCreator-" + template.getType().toString() + "-" + version.toString().replace(" ", "@") + ".log\" for more details."); + host.subdata.sendPacket(new PacketOutExLogMessage(address, "Couldn't build the server jar. See \"SubCreator-" + template.getType().toString() + "-" + version.toString().replace(" ", "@") + ".log\" for more details.")); + } } - public boolean create(String name, ServerType type, Version version, int memory, int port, UUID address, String id) { - if (Util.isNull(name, type, version, memory, port, address)) throw new NullPointerException(); + public boolean create(String name, ServerTemplate template, Version version, int port, UUID address, String id) { + if (Util.isNull(name, template, version, port, address)) throw new NullPointerException(); if (!isBusy()) { (thread = new Thread(() -> { - SubCreator.this.run(name, type, version, memory, port, address, id); + SubCreator.this.run(name, template, version, port, address, id); })).start(); return true; } else return false; @@ -235,37 +320,28 @@ public class SubCreator { return thread != null && thread.isAlive(); } - private void generateClient(File dir, String name, ServerType type) throws IOException { - if (type == ServerType.SPIGOT) { - new UniversalFile(dir, "plugins:SubServers-Client-Bukkit").mkdirs(); - Util.copyFromJar(ExHost.class.getClassLoader(), "net/ME1312/SubServers/Host/Library/Files/bukkit.jar", new UniversalFile(dir, "plugins:SubServers.Client.jar").getPath()); - YAMLConfig config = new YAMLConfig(new UniversalFile(dir, "plugins:Subservers-Client-Bukkit:config.yml")); - YAMLSection settings = new YAMLSection(); - settings.set("Version", "2.11.2a+"); - settings.set("Ingame-Access", true); - settings.set("Use-Title-Messages", true); - YAMLSection subdata = new YAMLSection(); - subdata.set("Name", name); - subdata.set("Address", host.config.get().getSection("Settings").getSection("SubData").getRawString("Address")); - subdata.set("Password", host.config.get().getSection("Settings").getSection("SubData").getRawString("Password")); - settings.set("SubData", subdata); - config.get().set("Settings", settings); - config.save(); - } else if (type == ServerType.SPONGE) { - // TODO + private void generateClient(File dir, ServerType type, String name) throws IOException { + if (new UniversalFile(dir, "subservers.client").exists()) { + if (type == ServerType.SPIGOT) { + if (!new UniversalFile(dir, "plugins").exists()) new UniversalFile(dir, "plugins").mkdirs(); + Util.copyFromJar(ExHost.class.getClassLoader(), "net/ME1312/SubServers/Host/Library/Files/Client/spigot.jar", new UniversalFile(dir, "plugins:SubServers.Client.jar").getPath()); + } else if (type == ServerType.SPONGE) { + // TODO + // if (!new UniversalFile(dir, "plugins").exists()) new UniversalFile(dir, "mods").mkdirs(); + // Util.copyFromJar(SubPlugin.class.getClassLoader(), "net/ME1312/SubServers/Host/Library/Files/Client/sponge.jar", new UniversalFile(dir, "mods:SubServers.Client.jar").getPath()); + } + JSONObject config = new JSONObject(Util.readAll(new FileReader(new UniversalFile(dir, "subservers.client")))); + FileWriter writer = new FileWriter(new UniversalFile(dir, "subservers.client"), false); + config.put("Name", name); + config.put("Address", host.config.get().getSection("Settings").getSection("SubData").getRawString("Address")); + config.put("Password", host.config.get().getSection("Settings").getSection("SubData").getRawString("Password")); + config.write(writer); + writer.close(); } } - private void generateEULA(File dir) throws FileNotFoundException, UnsupportedEncodingException { - PrintWriter writer = new PrintWriter(new File(dir, "eula.txt"), "UTF-8"); - - writer.println("#By changing the setting below to TRUE you are indicating your agreement to our EULA (https://account.mojang.com/documents/minecraft_eula)."); - writer.println("#" + new SimpleDateFormat("EEE MMM d HH:mm:ss z yyyy").format(Calendar.getInstance().getTime())); - writer.println("eula=true"); - - writer.close(); - } private void generateProperties(File dir, int port) throws IOException { File file = new File(dir, "server.properties"); + if (!file.exists()) file.createNewFile(); String content = Util.readAll(new BufferedReader(new InputStreamReader(new FileInputStream(file)))).replace("server-port=", "server-port=" + port).replace("server-ip=", "server-ip=" + host.config.get().getSection("Settings").getRawString("Server-Bind")); file.delete(); PrintWriter writer = new PrintWriter(file, "UTF-8"); diff --git a/SubServers.Host/src/net/ME1312/SubServers/Host/Executable/SubServer.java b/SubServers.Host/src/net/ME1312/SubServers/Host/Executable/SubServer.java index ac11c19a..9616afc4 100644 --- a/SubServers.Host/src/net/ME1312/SubServers/Host/Executable/SubServer.java +++ b/SubServers.Host/src/net/ME1312/SubServers/Host/Executable/SubServer.java @@ -65,10 +65,10 @@ public class SubServer { try { JarFile jar = new JarFile(new UniversalFile(this.directory, "plugins:SubServers.Client.jar")); YAMLSection plugin = new YAMLSection(Util.readAll(new InputStreamReader(jar.getInputStream(jar.getJarEntry("plugin.yml"))))); - YAMLSection bplugin = new YAMLSection(Util.readAll(new InputStreamReader(ExHost.class.getResourceAsStream("/net/ME1312/SubServers/Host/Library/Files/bukkit.yml")))); + YAMLSection bplugin = new YAMLSection(Util.readAll(new InputStreamReader(ExHost.class.getResourceAsStream("/net/ME1312/SubServers/Host/Library/Files/Client/spigot.yml")))); if (new Version(plugin.getString("version")).compareTo(new Version(bplugin.getString("version"))) < 0) { new UniversalFile(this.directory, "plugins:SubServers.Client.jar").delete(); - Util.copyFromJar(ExHost.class.getClassLoader(), "net/ME1312/SubServers/Host/Library/Files/bukkit.jar", new UniversalFile(this.directory, "plugins:SubServers.Client.jar").getPath()); + Util.copyFromJar(ExHost.class.getClassLoader(), "net/ME1312/SubServers/Host/Library/Files/Client/spigot.jar", new UniversalFile(this.directory, "plugins:SubServers.Client.jar").getPath()); } } catch (Throwable e) { host.log.info.println("Couldn't auto-update SubServers.Client.jar"); diff --git a/SubServers.Host/src/net/ME1312/SubServers/Host/Launch.java b/SubServers.Host/src/net/ME1312/SubServers/Host/Launch.java index 3e2e7f59..3f231fe7 100644 --- a/SubServers.Host/src/net/ME1312/SubServers/Host/Launch.java +++ b/SubServers.Host/src/net/ME1312/SubServers/Host/Launch.java @@ -71,7 +71,7 @@ public final class Launch { arguments.add("-Dsubservers.host.plugins=" + URLEncoder.encode(plugins, "UTF-8")); arguments.add("-cp"); arguments.add(tmpdir.getPath()); - arguments.add("net.ME1312.SubServers.Host.SubServers"); + arguments.add("net.ME1312.SubServers.Host.ExHost"); arguments.addAll(Arrays.asList(args)); ProcessBuilder processBuilder = new ProcessBuilder(arguments); processBuilder.directory(new File(System.getProperty("user.dir"))); diff --git a/SubServers.Host/src/net/ME1312/SubServers/Host/Library/Exception/InvalidTemplateException.java b/SubServers.Host/src/net/ME1312/SubServers/Host/Library/Exception/InvalidTemplateException.java new file mode 100644 index 00000000..b3b09e96 --- /dev/null +++ b/SubServers.Host/src/net/ME1312/SubServers/Host/Library/Exception/InvalidTemplateException.java @@ -0,0 +1,11 @@ +package net.ME1312.SubServers.Host.Library.Exception; + +/** + * Invalid Template Exception + */ +public class InvalidTemplateException extends IllegalStateException { + public InvalidTemplateException() {} + public InvalidTemplateException(String s) { + super(s); + } +} diff --git a/SubServers.Host/src/net/ME1312/SubServers/Host/Library/Files/Templates/spigot.zip b/SubServers.Host/src/net/ME1312/SubServers/Host/Library/Files/Templates/spigot.zip new file mode 100755 index 00000000..a4a674cf Binary files /dev/null and b/SubServers.Host/src/net/ME1312/SubServers/Host/Library/Files/Templates/spigot.zip differ diff --git a/SubServers.Host/src/net/ME1312/SubServers/Host/Library/Files/Templates/sponge.zip b/SubServers.Host/src/net/ME1312/SubServers/Host/Library/Files/Templates/sponge.zip new file mode 100755 index 00000000..d1879dfb Binary files /dev/null and b/SubServers.Host/src/net/ME1312/SubServers/Host/Library/Files/Templates/sponge.zip differ diff --git a/SubServers.Host/src/net/ME1312/SubServers/Host/Library/Files/Templates/vanilla.zip b/SubServers.Host/src/net/ME1312/SubServers/Host/Library/Files/Templates/vanilla.zip new file mode 100755 index 00000000..adf90894 Binary files /dev/null and b/SubServers.Host/src/net/ME1312/SubServers/Host/Library/Files/Templates/vanilla.zip differ diff --git a/SubServers.Host/src/net/ME1312/SubServers/Host/Library/Files/templates.zip b/SubServers.Host/src/net/ME1312/SubServers/Host/Library/Files/templates.zip deleted file mode 100755 index b18a22af..00000000 Binary files a/SubServers.Host/src/net/ME1312/SubServers/Host/Library/Files/templates.zip and /dev/null differ diff --git a/SubServers.Host/src/net/ME1312/SubServers/Host/Network/Packet/PacketDownloadBuildScript.java b/SubServers.Host/src/net/ME1312/SubServers/Host/Network/Packet/PacketDownloadBuildScript.java deleted file mode 100644 index 9b6bee6c..00000000 --- a/SubServers.Host/src/net/ME1312/SubServers/Host/Network/Packet/PacketDownloadBuildScript.java +++ /dev/null @@ -1,53 +0,0 @@ -package net.ME1312.SubServers.Host.Network.Packet; - -import net.ME1312.SubServers.Host.Library.JSONCallback; -import net.ME1312.SubServers.Host.Library.Util; -import net.ME1312.SubServers.Host.Library.Version.Version; -import net.ME1312.SubServers.Host.Network.PacketIn; -import net.ME1312.SubServers.Host.Network.PacketOut; -import org.json.JSONObject; - -import java.util.HashMap; -import java.util.UUID; - -/** - * Download Build Script Packet - */ -public class PacketDownloadBuildScript implements PacketIn, PacketOut { - private static HashMap callbacks = new HashMap(); - private String id; - - /** - * New PacketDownloadBuildScript (In) - */ - public PacketDownloadBuildScript() {} - - /** - * New PacketDownloadBuildScript (Out) - * - * @param callback Callbacks - */ - public PacketDownloadBuildScript(JSONCallback... callback) { - if (Util.isNull((Object) callback)) throw new NullPointerException(); - this.id = Util.getNew(callbacks.keySet(), UUID::randomUUID).toString(); - callbacks.put(id, callback); - } - - @Override - public JSONObject generate() { - JSONObject json = new JSONObject(); - json.put("id", id); - return json; - } - - @Override - public void execute(JSONObject data) { - for (JSONCallback callback : callbacks.get(data.getString("id"))) callback.run(data); - callbacks.remove(data.getString("id")); - } - - @Override - public Version getVersion() { - return new Version("2.11.0a"); - } -} \ No newline at end of file diff --git a/SubServers.Host/src/net/ME1312/SubServers/Host/Network/Packet/PacketExConfigureHost.java b/SubServers.Host/src/net/ME1312/SubServers/Host/Network/Packet/PacketExConfigureHost.java index 028afd70..68fec5ad 100644 --- a/SubServers.Host/src/net/ME1312/SubServers/Host/Network/Packet/PacketExConfigureHost.java +++ b/SubServers.Host/src/net/ME1312/SubServers/Host/Network/Packet/PacketExConfigureHost.java @@ -1,5 +1,6 @@ package net.ME1312.SubServers.Host.Network.Packet; +import net.ME1312.SubServers.Host.Executable.SubCreator; import net.ME1312.SubServers.Host.Library.Config.YAMLSection; import net.ME1312.SubServers.Host.Library.Log.Logger; import net.ME1312.SubServers.Host.Library.Version.Version; @@ -33,7 +34,21 @@ public class PacketExConfigureHost implements PacketIn, PacketOut { @Override public JSONObject generate() { - return null; + JSONObject json = new JSONObject(); + JSONObject templates = new JSONObject(); + for (SubCreator.ServerTemplate template : host.templates.values()) { + JSONObject tinfo = new JSONObject(); + tinfo.put("enabled", template.isEnabled()); + tinfo.put("display", template.getDisplayName()); + tinfo.put("icon", template.getIcon()); + tinfo.put("type", template.getType().toString()); + tinfo.put("dir", template.getDirectory().toString()); + tinfo.put("build", template.getBuildOptions().toJSON()); + tinfo.put("options", template.getConfigOptions().toJSON()); + templates.put(template.getName(), tinfo); + } + json.put("templates", templates); + return json; } @Override diff --git a/SubServers.Host/src/net/ME1312/SubServers/Host/Network/Packet/PacketExCreateServer.java b/SubServers.Host/src/net/ME1312/SubServers/Host/Network/Packet/PacketExCreateServer.java index 1d7485aa..1ab1ec08 100644 --- a/SubServers.Host/src/net/ME1312/SubServers/Host/Network/Packet/PacketExCreateServer.java +++ b/SubServers.Host/src/net/ME1312/SubServers/Host/Network/Packet/PacketExCreateServer.java @@ -59,8 +59,8 @@ public class PacketExCreateServer implements PacketIn, PacketOut { @Override public void execute(JSONObject data) { try { - host.creator.create(data.getJSONObject("creator").getString("name"), SubCreator.ServerType.valueOf(data.getJSONObject("creator").getString("type").toUpperCase()), new Version(data.getJSONObject("creator").getString("version")), - data.getJSONObject("creator").getInt("ram"), data.getJSONObject("creator").getInt("port"), UUID.fromString(data.getJSONObject("creator").getString("log")), (data.keySet().contains("id"))?data.getString("id"):null); + host.creator.create(data.getJSONObject("creator").getString("name"), host.templates.get(data.getJSONObject("creator").getString("template").toLowerCase()), new Version(data.getJSONObject("creator").getString("version")), + data.getJSONObject("creator").getInt("port"), UUID.fromString(data.getJSONObject("creator").getString("log")), (data.keySet().contains("id"))?data.getString("id"):null); } catch (Throwable e) { host.subdata.sendPacket(new PacketExCreateServer(1, e.getClass().getCanonicalName() + ": " + e.getMessage(), null, (data.keySet().contains("id"))?data.getString("id"):null)); } 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 index 010196d2..d4a7331f 100644 --- a/SubServers.Host/src/net/ME1312/SubServers/Host/Network/Packet/PacketInReset.java +++ b/SubServers.Host/src/net/ME1312/SubServers/Host/Network/Packet/PacketInReset.java @@ -1,11 +1,16 @@ package net.ME1312.SubServers.Host.Network.Packet; +import net.ME1312.SubServers.Host.Executable.SubCreator; +import net.ME1312.SubServers.Host.Library.Config.YAMLConfig; +import net.ME1312.SubServers.Host.Library.Config.YAMLSection; +import net.ME1312.SubServers.Host.Library.UniversalFile; import net.ME1312.SubServers.Host.Library.Version.Version; import net.ME1312.SubServers.Host.Network.PacketIn; import net.ME1312.SubServers.Host.ExHost; import org.json.JSONObject; +import java.io.File; import java.util.ArrayList; import java.util.List; @@ -44,6 +49,21 @@ public class PacketInReset implements PacketIn { host.log.error.println(e); } } + host.templates.clear(); + + if (new UniversalFile(host.dir, "Templates").exists()) for (File file : new UniversalFile(host.dir, "Templates").listFiles()) { + try { + if (file.isDirectory()) { + YAMLSection config = (new UniversalFile(file, "template.yml").exists())?new YAMLConfig(new UniversalFile(file, "template.yml")).get().getSection("Template", new YAMLSection()):new YAMLSection(); + SubCreator.ServerTemplate template = new SubCreator.ServerTemplate(file.getName(), config.getBoolean("Enabled", true), config.getRawString("Icon", "::NULL::"), file, config.getSection("Build", new YAMLSection()), config.getSection("Settings", new YAMLSection())); + host.templates.put(file.getName().toLowerCase(), template); + if (config.getKeys().contains("Display")) template.setDisplayName(config.getString("Display")); + } + } catch (Exception e) { + System.out.println("SubCreator > Couldn't load template: " + file.getName()); + e.printStackTrace(); + } + } } } 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 b99ba548..df425206 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 @@ -34,7 +34,7 @@ public class PacketInRunEvent implements PacketIn { @Override public void run(JSONObject json) { 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"))); + json.getString("template"), new Version(json.getString("version")), json.getInt("port"))); callback("SubCreateEvent", this); } }); 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 d493c58a..50cb3cf5 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 @@ -45,6 +45,7 @@ public class PacketLinkExHost implements PacketIn, PacketOut { @Override public void execute(JSONObject data) { if (data.getInt("r") == 0) { + host.subdata.sendPacket(new PacketExConfigureHost(host)); host.subdata.sendPacket(new PacketDownloadLang()); host.subdata.sendPacket(new PacketOutExRequestQueue()); host.api.executeEvent(new SubNetworkConnectEvent(host.subdata)); 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 cea45af1..c9ab2129 100644 --- a/SubServers.Host/src/net/ME1312/SubServers/Host/Network/SubDataClient.java +++ b/SubServers.Host/src/net/ME1312/SubServers/Host/Network/SubDataClient.java @@ -71,7 +71,6 @@ public final class SubDataClient { registerPacket(new PacketAuthorization(host), "Authorization"); registerPacket(new PacketCommandServer(), "SubCommandServer"); registerPacket(new PacketCreateServer(), "SubCreateServer"); - registerPacket(new PacketDownloadBuildScript(), "SubDownloadBuildScript"); registerPacket(new PacketDownloadHostInfo(), "SubDownloadHostInfo"); registerPacket(new PacketDownloadLang(host), "SubDownloadLang"); registerPacket(new PacketDownloadPlayerList(), "SubDownloadPlayerList"); @@ -94,7 +93,6 @@ public final class SubDataClient { registerPacket(PacketAuthorization.class, "Authorization"); registerPacket(PacketCommandServer.class, "SubCommandServer"); registerPacket(PacketCreateServer.class, "SubCreateServer"); - registerPacket(PacketDownloadBuildScript.class, "SubDownloadBuildScript"); registerPacket(PacketDownloadHostInfo.class, "SubDownloadHostInfo"); registerPacket(PacketDownloadLang.class, "SubDownloadLang"); registerPacket(PacketDownloadPlayerList.class, "SubDownloadPlayerList");