diff --git a/Artifacts/SubServers.Bungee.jar b/Artifacts/SubServers.Bungee.jar index d13718bf..deab968e 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 66e97eea..58ecdb68 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 5ebc428a..18fc8e15 100644 Binary files a/Artifacts/SubServers.Host.jar and b/Artifacts/SubServers.Host.jar differ diff --git a/Javadoc/SubServers.Bungee/index-all.html b/Javadoc/SubServers.Bungee/index-all.html index 56054ec3..7d515215 100644 --- a/Javadoc/SubServers.Bungee/index-all.html +++ b/Javadoc/SubServers.Bungee/index-all.html @@ -495,6 +495,10 @@
Get Remote Address
+
getBackwards(Map<K, V>, V) - Static method in class net.ME1312.SubServers.Bungee.Library.Util
+
+
Get keys by value from map
+
getBashDirectory() - Method in class net.ME1312.SubServers.Bungee.Host.Internal.InternalSubCreator
 
getBashDirectory() - Method in class net.ME1312.SubServers.Bungee.Host.SubCreator
diff --git a/Javadoc/SubServers.Bungee/net/ME1312/SubServers/Bungee/Library/Util.html b/Javadoc/SubServers.Bungee/net/ME1312/SubServers/Bungee/Library/Util.html index 1bb651ed..6a7316c3 100644 --- a/Javadoc/SubServers.Bungee/net/ME1312/SubServers/Bungee/Library/Util.html +++ b/Javadoc/SubServers.Bungee/net/ME1312/SubServers/Bungee/Library/Util.html @@ -17,7 +17,7 @@ catch(err) { } //--> -var methods = {"i0":9,"i1":9,"i2":9,"i3":9,"i4":9,"i5":9,"i6":9,"i7":9}; +var methods = {"i0":9,"i1":9,"i2":9,"i3":9,"i4":9,"i5":9,"i6":9,"i7":9,"i8":9}; var tabs = {65535:["t0","All Methods"],1:["t1","Static Methods"],8:["t4","Concrete Methods"]}; var altColor = "altColor"; var rowColor = "rowColor"; @@ -169,31 +169,38 @@ extends java.lang.Object +static <K,V> java.util.List<K> +getBackwards(java.util.Map<K,V> map, + V value) +
Get keys by value from map
+ + + static boolean isException(Util.ExceptionRunnable runnable)
Determines if an Exception will occur
- + static boolean isNull(java.lang.Object... values)
Checks values to make sure they're not null
- + static int random(int min, int max)
Get a Random Integer
- + static java.lang.String readAll(java.io.Reader rd)
Read Everything from Reader
- + static java.lang.String unescapeJavaString(java.lang.String str)
Parse escapes in a Java String
@@ -237,6 +244,29 @@ extends java.lang.Object + + + + + + diff --git a/Javadoc/SubServers.Client.Bukkit/index-all.html b/Javadoc/SubServers.Client.Bukkit/index-all.html index a69b0402..ab9eea13 100644 --- a/Javadoc/SubServers.Client.Bukkit/index-all.html +++ b/Javadoc/SubServers.Client.Bukkit/index-all.html @@ -376,6 +376,10 @@
Grabs the Object
+
getBackwards(Map<K, V>, V) - Static method in class net.ME1312.SubServers.Client.Bukkit.Library.Util
+
+
Get keys by value from map
+
getBetaVersion() - Method in class net.ME1312.SubServers.Client.Bukkit.SubAPI
Gets the SubServers Beta Version
diff --git a/Javadoc/SubServers.Client.Bukkit/net/ME1312/SubServers/Client/Bukkit/Library/Util.html b/Javadoc/SubServers.Client.Bukkit/net/ME1312/SubServers/Client/Bukkit/Library/Util.html index 79c06bcb..151b791c 100644 --- a/Javadoc/SubServers.Client.Bukkit/net/ME1312/SubServers/Client/Bukkit/Library/Util.html +++ b/Javadoc/SubServers.Client.Bukkit/net/ME1312/SubServers/Client/Bukkit/Library/Util.html @@ -17,7 +17,7 @@ catch(err) { } //--> -var methods = {"i0":9,"i1":9,"i2":9,"i3":9,"i4":9,"i5":9,"i6":9,"i7":9}; +var methods = {"i0":9,"i1":9,"i2":9,"i3":9,"i4":9,"i5":9,"i6":9,"i7":9,"i8":9}; var tabs = {65535:["t0","All Methods"],1:["t1","Static Methods"],8:["t4","Concrete Methods"]}; var altColor = "altColor"; var rowColor = "rowColor"; @@ -169,31 +169,38 @@ extends java.lang.Object +static <K,V> java.util.List<K> +getBackwards(java.util.Map<K,V> map, + V value) +
Get keys by value from map
+ + + static boolean isException(Util.ExceptionRunnable runnable)
Determines if an Exception will occur
- + static boolean isNull(java.lang.Object... values)
Checks values to make sure they're not null
- + static int random(int min, int max)
Get a Random Integer
- + static java.lang.String readAll(java.io.Reader rd)
Read Everything from Reader
- + static java.lang.String unescapeJavaString(java.lang.String str)
Parse escapes in a Java String
@@ -237,6 +244,29 @@ extends java.lang.Object + + + + + + diff --git a/Javadoc/SubServers.Host/allclasses-frame.html b/Javadoc/SubServers.Host/allclasses-frame.html index e1f82f3a..05cc324e 100644 --- a/Javadoc/SubServers.Host/allclasses-frame.html +++ b/Javadoc/SubServers.Host/allclasses-frame.html @@ -12,7 +12,7 @@
diff --git a/Javadoc/SubServers.Host/net/ME1312/SubServers/Host/API/Event/SubDisableEvent.html b/Javadoc/SubServers.Host/net/ME1312/SubServers/Host/API/Event/SubDisableEvent.html index fb74ef5d..8c5b2dc0 100644 --- a/Javadoc/SubServers.Host/net/ME1312/SubServers/Host/API/Event/SubDisableEvent.html +++ b/Javadoc/SubServers.Host/net/ME1312/SubServers/Host/API/Event/SubDisableEvent.html @@ -171,14 +171,14 @@ extends Event -getAPI, getPlugin +getAPI, getHandlers, getPlugin, toString diff --git a/Javadoc/SubServers.Host/net/ME1312/SubServers/Host/API/Event/SubEnableEvent.html b/Javadoc/SubServers.Host/net/ME1312/SubServers/Host/API/Event/SubEnableEvent.html index b066007f..3794e23e 100644 --- a/Javadoc/SubServers.Host/net/ME1312/SubServers/Host/API/Event/SubEnableEvent.html +++ b/Javadoc/SubServers.Host/net/ME1312/SubServers/Host/API/Event/SubEnableEvent.html @@ -145,14 +145,14 @@ extends Event -getAPI, getPlugin +getAPI, getHandlers, getPlugin, toString diff --git a/Javadoc/SubServers.Host/net/ME1312/SubServers/Host/API/SubPlugin.html b/Javadoc/SubServers.Host/net/ME1312/SubServers/Host/API/SubPlugin.html index 7bd1eb2e..d5b44cce 100644 --- a/Javadoc/SubServers.Host/net/ME1312/SubServers/Host/API/SubPlugin.html +++ b/Javadoc/SubServers.Host/net/ME1312/SubServers/Host/API/SubPlugin.html @@ -41,7 +41,7 @@
+
diff --git a/Javadoc/SubServers.Host/net/ME1312/SubServers/Host/Library/Util.html b/Javadoc/SubServers.Host/net/ME1312/SubServers/Host/Library/Util.html index de9bf9ad..7db79764 100644 --- a/Javadoc/SubServers.Host/net/ME1312/SubServers/Host/Library/Util.html +++ b/Javadoc/SubServers.Host/net/ME1312/SubServers/Host/Library/Util.html @@ -17,7 +17,7 @@ catch(err) { } //--> -var methods = {"i0":9,"i1":9,"i2":9,"i3":9,"i4":9,"i5":9,"i6":9,"i7":9}; +var methods = {"i0":9,"i1":9,"i2":9,"i3":9,"i4":9,"i5":9,"i6":9,"i7":9,"i8":9}; var tabs = {65535:["t0","All Methods"],1:["t1","Static Methods"],8:["t4","Concrete Methods"]}; var altColor = "altColor"; var rowColor = "rowColor"; @@ -169,31 +169,38 @@ extends java.lang.Object +static <K,V> java.util.List<K> +getBackwards(java.util.Map<K,V> map, + V value) +
Get keys by value from map
+ + + static boolean isException(Util.ExceptionRunnable runnable)
Determines if an Exception will occur
- + static boolean isNull(java.lang.Object... values)
Checks values to make sure they're not null
- + static int random(int min, int max)
Get a Random Integer
- + static java.lang.String readAll(java.io.Reader rd)
Read Everything from Reader
- + static java.lang.String unescapeJavaString(java.lang.String str)
Parse escapes in a Java String
@@ -237,6 +244,29 @@ extends java.lang.Object + + + + + +
    +
  • +

    getBackwards

    +
    public static <K,V> java.util.List<K> getBackwards(java.util.Map<K,V> map,
+                                                   V value)
    +
    Get keys by value from map
    +
    +
    Type Parameters:
    +
    K - Key
    +
    V - Value
    +
    Parameters:
    +
    map - Map to search
    +
    value - Value to search for
    +
    Returns:
    +
    Search results
    +
    +
    • +
diff --git a/Javadoc/SubServers.Host/net/ME1312/SubServers/Host/SubAPI.html b/Javadoc/SubServers.Host/net/ME1312/SubServers/Host/SubAPI.html index 0f1b3916..8e8e6bb7 100644 --- a/Javadoc/SubServers.Host/net/ME1312/SubServers/Host/SubAPI.html +++ b/Javadoc/SubServers.Host/net/ME1312/SubServers/Host/SubAPI.html @@ -17,7 +17,7 @@ catch(err) { } //--> -var methods = {"i0":10,"i1":10,"i2":10,"i3":10,"i4":10,"i5":9,"i6":42,"i7":10,"i8":10,"i9":10,"i10":10,"i11":10,"i12":10,"i13":10,"i14":10,"i15":10,"i16":10,"i17":10,"i18":10,"i19":10}; +var methods = {"i0":10,"i1":10,"i2":10,"i3":10,"i4":10,"i5":10,"i6":9,"i7":42,"i8":10,"i9":10,"i10":10,"i11":10,"i12":10,"i13":10,"i14":10,"i15":10,"i16":10,"i17":10,"i18":10,"i19":10}; var tabs = {65535:["t0","All Methods"],1:["t1","Static Methods"],2:["t2","Instance Methods"],8:["t4","Concrete Methods"],32:["t6","Deprecated Methods"]}; var altColor = "altColor"; var rowColor = "rowColor"; @@ -130,16 +130,16 @@ extends java.lang.Object void -addCommand(Command command, +addCommand(Command command, java.lang.String... handles)
Registers a Command
void -addListener(SubPluginInfo plugin, - Listener listener) -
Register a SubEvent Listener
+addListener(SubPluginInfo plugin, + Listener... listeners) +
Register SubEvent Listeners
@@ -149,24 +149,30 @@ extends java.lang.Object +void +executeEvent(Event event) +
Run a SubEvent
+ + + Version getAppVersion()
Gets the SubServers Version
- + Version getBetaVersion()
Gets the SubServers Beta Version
- + static SubAPI getInstance()
Gets the SubAPI Methods
- + SubServers getInternals()
Deprecated.  @@ -174,59 +180,53 @@ extends java.lang.Object
- + java.util.Map<java.lang.String,java.lang.String> getLang()
Gets the SubServers Lang
- + java.lang.String getLang(java.lang.String key)
Gets a value from the SubServers Lang
- + SubPluginInfo getPlugin(java.lang.String plugin)
Gets a Plugin
- + java.util.Map<java.lang.String,SubPluginInfo> getPlugins()
Get a map of the Plugins
- + UniversalFile getRuntimeDirectory()
Gets the Runtime Directory
- + SubDataClient getSubDataNetwork()
Gets the SubData Network Manager
- + void removeCommand(java.lang.String... handles)
Unregisters a Command
- -void -removeListener(SubPluginInfo plugin, - Listener listener) -
Unregister a SubEvent Listener
- - void -runEvent(Event event) -
Run a SubEvent
+removeListener(SubPluginInfo plugin, + Listener... listeners) +
Unregister SubEvent Listeners
@@ -255,7 +255,7 @@ extends java.lang.Object java.util.UUID -schedule(SubTaskBuilder builder) +schedule(SubTask builder)
Schedule a task
@@ -361,7 +361,7 @@ public 

  • addCommand

    -
    public void addCommand(Command command,
+
    public void addCommand(Command command,
                        java.lang.String... handles)
    
 
    Registers a Command
    
 
    
@@ -385,13 +385,13 @@ public 
    • - +

    • schedule

      -
      public java.util.UUID schedule(SubTaskBuilder builder)
      +
      public java.util.UUID schedule(SubTask builder)
      Schedule a task
      Parameters:
      @@ -475,45 +475,45 @@ public 
    - +

    • addListener

      public void addListener(SubPluginInfo plugin,
-                        Listener listener)
      -
      Register a SubEvent Listener
      + Listener... listeners) +
      Register SubEvent Listeners
      Parameters:
      plugin - PluginInfo
      -
      listener - Listener
      +
      listeners - Listeners
    - +

    • removeListener

      public void removeListener(SubPluginInfo plugin,
-                           Listener listener)
      -
      Unregister a SubEvent Listener
      + Listener... listeners) +
      Unregister SubEvent Listeners
      Parameters:
      plugin - PluginInfo
      -
      listener - Listener
      +
      listeners - Listeners
    - +
    • -

      runEvent

      -
      public void runEvent(Event event)
      +

      executeEvent

      +
      public void executeEvent(Event event)
      Run a SubEvent
      Parameters:
      diff --git a/Javadoc/SubServers.Host/overview-tree.html b/Javadoc/SubServers.Host/overview-tree.html index ba3ea6b6..2a3621f1 100644 --- a/Javadoc/SubServers.Host/overview-tree.html +++ b/Javadoc/SubServers.Host/overview-tree.html @@ -89,6 +89,7 @@
      • java.lang.Object
          +
        • net.ME1312.SubServers.Host.API.Command
        • net.ME1312.SubServers.Host.Library.Container<V>
          • net.ME1312.SubServers.Host.Library.NamedContainer<T,V>
            • @@ -120,7 +121,7 @@
          • net.ME1312.SubServers.Host.Network.SubDataClient
          • net.ME1312.SubServers.Host.API.SubPluginInfo (implements net.ME1312.SubServers.Host.Library.ExtraDataHandler)
          • net.ME1312.SubServers.Host.SubServers
            • -
          • net.ME1312.SubServers.Host.API.SubTaskBuilder (implements java.lang.Runnable)
            • +
          • net.ME1312.SubServers.Host.API.SubTask (implements java.lang.Runnable)
          • java.lang.Throwable (implements java.io.Serializable) @@ -159,7 +161,6 @@

            Interface Hierarchy

          • diff --git a/SubServers.Bungee/src/net/ME1312/SubServers/Bungee/Library/Util.java b/SubServers.Bungee/src/net/ME1312/SubServers/Bungee/Library/Util.java index f8f8ca32..41998df2 100644 --- a/SubServers.Bungee/src/net/ME1312/SubServers/Bungee/Library/Util.java +++ b/SubServers.Bungee/src/net/ME1312/SubServers/Bungee/Library/Util.java @@ -1,6 +1,9 @@ package net.ME1312.SubServers.Bungee.Library; import java.io.*; +import java.util.ArrayList; +import java.util.List; +import java.util.Map; import java.util.Random; /** @@ -26,6 +29,27 @@ public final class Util { return ret; } + /** + * Get keys by value from map + * + * @param map Map to search + * @param value Value to search for + * @param Key + * @param Value + * @return Search results + */ + public static List getBackwards(Map map, V value) { + List values = new ArrayList(); + + for (K key : map.keySet()) { + if (map.get(key).equals(value)) { + values.add(key); + } + } + + return values; + } + /** * Read Everything from Reader * diff --git a/SubServers.Client/Bukkit/src/net/ME1312/SubServers/Client/Bukkit/Library/Util.java b/SubServers.Client/Bukkit/src/net/ME1312/SubServers/Client/Bukkit/Library/Util.java index 5e5d5dbb..02515c83 100644 --- a/SubServers.Client/Bukkit/src/net/ME1312/SubServers/Client/Bukkit/Library/Util.java +++ b/SubServers.Client/Bukkit/src/net/ME1312/SubServers/Client/Bukkit/Library/Util.java @@ -1,6 +1,9 @@ package net.ME1312.SubServers.Client.Bukkit.Library; import java.io.*; +import java.util.ArrayList; +import java.util.List; +import java.util.Map; import java.util.Random; /** @@ -26,6 +29,27 @@ public final class Util { return ret; } + /** + * Get keys by value from map + * + * @param map Map to search + * @param value Value to search for + * @param Key + * @param Value + * @return Search results + */ + public static List getBackwards(Map map, V value) { + List values = new ArrayList(); + + for (K key : map.keySet()) { + if (map.get(key).equals(value)) { + values.add(key); + } + } + + return values; + } + /** * Read Everything from Reader * diff --git a/SubServers.Host/src/net/ME1312/SubServers/Host/API/Command.java b/SubServers.Host/src/net/ME1312/SubServers/Host/API/Command.java index f80f21b2..1b0eb8e3 100644 --- a/SubServers.Host/src/net/ME1312/SubServers/Host/API/Command.java +++ b/SubServers.Host/src/net/ME1312/SubServers/Host/API/Command.java @@ -1,14 +1,120 @@ package net.ME1312.SubServers.Host.API; +import net.ME1312.SubServers.Host.Library.Exception.IllegalStringValueException; +import net.ME1312.SubServers.Host.SubAPI; + /** * Command Layout Class */ -public interface Command { +public abstract class Command { + private String desc = null; + private String[] exDesc = new String[0]; + private String[] usage = new String[0]; + private SubPluginInfo plugin; + + public Command(SubPluginInfo plugin) { + this.plugin = plugin; + } + /** * Run Command * - * @param command Command Name + * @param handle Command Name * @param args Arguments */ - void command(String command, String[] args); + public abstract void command(String handle, String[] args); + + /** + * Gets the Plugin that registering this Command + * + * @return Plugin Info + */ + public SubPluginInfo plugin() { + return this.plugin; + } + + /** + * Gets the Description of this Command + * + * @return Command Description + */ + public String description() { + return this.desc; + } + + /** + * Set the Description of this Command + * + * @param value Value + * @return The Command + */ + public Command description(String value) { + if (value != null) { + if (value.length() == 0) throw new StringIndexOutOfBoundsException("Cannot use empty string for description"); + if (value.contains("\n")) throw new IllegalStringValueException("String contains illegal character(s)"); + } + this.desc = value; + return this; + } + + /** + * Get the Help Page for this Command + * + * @return Help Page + */ + public String[] help() { + if (exDesc.length == 0 && desc != null) { + return new String[]{desc}; + } else { + return exDesc; + } + } + + /** + * Set the Help Page for this Command + * + * @param lines Help Page Lines + * @return The Command + */ + public Command help(String... lines) { + for (String line : lines) { + if (line.contains("\n")) throw new IllegalStringValueException("String contains illegal character(s)"); + } + this.exDesc = lines; + return this; + } + + /** + * Get the Usage of this Command + * + * @return Command Usage + */ + public String[] usage() { + return this.usage; + } + + /** + * Set the Usage of this Command + * + * @param args Argument Placeholders + * @return The Command + */ + public Command usage(String... args) { + for (String arg : args) { + if (arg.length() == 0) throw new StringIndexOutOfBoundsException("Cannot use empty string for usage"); + if (arg.contains(" ") || arg.contains("\n")) throw new IllegalStringValueException("String contains illegal character(s)"); + } + this.usage = args; + return this; + } + + /** + * Register this Command + * + * @param handles Aliases + * @return + */ + public void register(String... handles) { + SubAPI.getInstance().addCommand(this, handles); + } } diff --git a/SubServers.Host/src/net/ME1312/SubServers/Host/API/SubPlugin.java b/SubServers.Host/src/net/ME1312/SubServers/Host/API/SubPlugin.java index f2779bae..dbcac02b 100644 --- a/SubServers.Host/src/net/ME1312/SubServers/Host/API/SubPlugin.java +++ b/SubServers.Host/src/net/ME1312/SubServers/Host/API/SubPlugin.java @@ -47,6 +47,13 @@ public @interface SubPlugin { */ String website() default ""; + /** + * Load Before Plugins List + * + * @return Load Before List + */ + String[] loadBefore() default {}; + /** * Dependencies List * diff --git a/SubServers.Host/src/net/ME1312/SubServers/Host/API/SubPluginInfo.java b/SubServers.Host/src/net/ME1312/SubServers/Host/API/SubPluginInfo.java index 86b9c448..a0306ddb 100644 --- a/SubServers.Host/src/net/ME1312/SubServers/Host/API/SubPluginInfo.java +++ b/SubServers.Host/src/net/ME1312/SubServers/Host/API/SubPluginInfo.java @@ -7,6 +7,7 @@ import net.ME1312.SubServers.Host.Library.Log.Logger; import net.ME1312.SubServers.Host.Library.Util; import net.ME1312.SubServers.Host.Library.Version.Version; import net.ME1312.SubServers.Host.SubAPI; +import net.ME1312.SubServers.Host.SubServers; import java.io.File; import java.net.URL; @@ -18,14 +19,16 @@ import java.util.*; * @see SubPlugin */ public class SubPluginInfo implements ExtraDataHandler { - private Object plugin; + private SubServers plugin; + private Object main; private String name; private Version version; private List authors; - private String desc = null; - private URL website = null; - private List depend = Collections.emptyList(); - private List softDepend = Collections.emptyList(); + private String desc; + private URL website; + private List loadBefore; + private List depend; + private List softDepend; private Logger logger; private boolean enabled = false; @@ -34,24 +37,31 @@ public class SubPluginInfo implements ExtraDataHandler { /** * Create a SubPlugin Description * - * @param plugin Plugin Instance + * @param plugin SubServers.Host + * @param main Plugin * @param name Plugin Name * @param version Plugin Version * @param authors Authors List * @param description Plugin Description * @param website Authors' Website - * @param softDependencies Soft Dependencies List * @param dependencies Dependencies List + * @param softDependencies Soft Dependencies List */ - public SubPluginInfo(Object plugin, String name, Version version, List authors, String description, URL website, List dependencies, List softDependencies) { - if (Util.isNull(plugin, name, version, authors)) throw new NullPointerException(); - if (authors.size() == 0) throw new ArrayIndexOutOfBoundsException("Authors list cannot be empty"); + public SubPluginInfo(SubServers plugin, Object main, String name, Version version, List authors, String description, URL website, List loadBefore, List dependencies, List softDependencies) { + if (Util.isNull(plugin, main, name, version, authors)) throw new NullPointerException(); + name = name.replaceAll("#|<|\\$|\\+|%|>|!|`|&|\\*|'|\\||\\{|\\?|\"|=|}|/|\\\\|\\s|@|\\.|\\n", "_"); + if (name.length() == 0) throw new StringIndexOutOfBoundsException("Cannot use an empty name"); + if (version.toString().length() == 0) throw new StringIndexOutOfBoundsException("Cannot use an empty version"); + if (authors.size() == 0) throw new ArrayIndexOutOfBoundsException("Cannot use an empty authors list"); + if (description != null && description.length() == 0) throw new StringIndexOutOfBoundsException("Cannot use an empty description"); this.plugin = plugin; + this.main = main; this.name = name; this.version = version; - this.authors = (authors == null)?Collections.emptyList():authors; + this.authors = authors; this.desc = description; this.website = website; + this.loadBefore = (loadBefore == null)?Collections.emptyList():loadBefore; this.depend = (dependencies == null)?Collections.emptyList():dependencies; this.softDepend = (softDependencies == null)?Collections.emptyList():softDependencies; @@ -59,7 +69,7 @@ public class SubPluginInfo implements ExtraDataHandler { } public Object get() { - return plugin; + return main; } /** @@ -107,6 +117,15 @@ public class SubPluginInfo implements ExtraDataHandler { return this.website; } + /** + * Gets the Load Before Plugins List + * + * @return Load Before Plugins List + */ + public List getLoadBefore() { + return this.loadBefore; + } + /** * Gets the Dependencies List * @@ -158,7 +177,7 @@ public class SubPluginInfo implements ExtraDataHandler { * @return Data Folder */ public File getDataFolder() { - File dir = new File(SubAPI.getInstance().getRuntimeDirectory(), "Plugins" + File.separator + name); + File dir = new File(plugin.api.getRuntimeDirectory(), "Plugins" + File.separator + name); if (!dir.exists()) dir.mkdir(); return dir; } diff --git a/SubServers.Host/src/net/ME1312/SubServers/Host/API/SubTaskBuilder.java b/SubServers.Host/src/net/ME1312/SubServers/Host/API/SubTask.java similarity index 79% rename from SubServers.Host/src/net/ME1312/SubServers/Host/API/SubTaskBuilder.java rename to SubServers.Host/src/net/ME1312/SubServers/Host/API/SubTask.java index e075820d..82897458 100644 --- a/SubServers.Host/src/net/ME1312/SubServers/Host/API/SubTaskBuilder.java +++ b/SubServers.Host/src/net/ME1312/SubServers/Host/API/SubTask.java @@ -8,7 +8,7 @@ import java.util.UUID; /** * SubServers Task Builder Class */ -public abstract class SubTaskBuilder implements Runnable { +public abstract class SubTask implements Runnable { private long repeat = -1L; private long delay = -1L; private SubPluginInfo plugin; @@ -18,8 +18,7 @@ public abstract class SubTaskBuilder implements Runnable { * * @param plugin Plugin Creating */ - public SubTaskBuilder(SubPluginInfo plugin) { - if (Util.isNull(plugin)) throw new NullPointerException(); + public SubTask(SubPluginInfo plugin) { this.plugin = plugin; } @@ -28,7 +27,7 @@ public abstract class SubTaskBuilder implements Runnable { * * @return Plugin Info */ - public SubPluginInfo getPlugin() { + public SubPluginInfo plugin() { return this.plugin; } @@ -38,7 +37,7 @@ public abstract class SubTaskBuilder implements Runnable { * @param value Value * @return Task Builder */ - public SubTaskBuilder repeat(long value) { + public SubTask repeat(long value) { if (Util.isNull(value)) throw new NullPointerException(); this.repeat = value; return this; @@ -49,7 +48,7 @@ public abstract class SubTaskBuilder implements Runnable { * * @return Repeat Interval */ - public long getRepeat() { + public long repeat() { return this.repeat; } @@ -59,7 +58,7 @@ public abstract class SubTaskBuilder implements Runnable { * @param value Value * @return Task Builder */ - public SubTaskBuilder delay(long value) { + public SubTask delay(long value) { if (Util.isNull(value)) throw new NullPointerException(); this.delay = value; return this; @@ -70,7 +69,7 @@ public abstract class SubTaskBuilder implements Runnable { * * @return Task Delay */ - public long getDelay() { + public long delay() { return this.delay; } diff --git a/SubServers.Host/src/net/ME1312/SubServers/Host/Launch.java b/SubServers.Host/src/net/ME1312/SubServers/Host/Launch.java index c92cea57..137c0807 100644 --- a/SubServers.Host/src/net/ME1312/SubServers/Host/Launch.java +++ b/SubServers.Host/src/net/ME1312/SubServers/Host/Launch.java @@ -26,7 +26,7 @@ public final class Launch { * @throws Exception */ public static void main(String[] args) throws Exception { - String mods = ""; + String plugins = ""; File rtdir = new File(System.getProperty("user.dir")); File tmpdir = File.createTempFile("SubServers.Host.", ".jar"); File pldir = new File(rtdir, "Plugins"); @@ -37,21 +37,28 @@ public final class Launch { System.out.println(">> Extracted ~/" + getCodeSourceLocation().getName()); if (pldir.isDirectory() && pldir.listFiles().length > 0) { for (File mod : Arrays.asList(pldir.listFiles())) { - if (getFileExtension(mod.getName()).equalsIgnoreCase("zip")) { - extractZip(mod, tmpdir); - System.out.println(">> Extracted ~/plugins/" + mod.getName()); - } else if (getFileExtension(mod.getName()).equalsIgnoreCase("jar")) { - extractJar(mod, tmpdir); - System.out.println(">> Extracted ~/plugins/" + mod.getName()); - } - if (new File(tmpdir, "package.xml").exists()) { - NodeList node = DocumentBuilderFactory.newInstance().newDocumentBuilder().parse(new File(tmpdir, "package.xml")).getElementsByTagName("class"); - if (node.getLength() > 0) { - for (int i = 0; i < node.getLength(); i++) { - mods += (mods.equals("")?"":" ") + node.item(i).getTextContent(); - } + try { + boolean success = false; + if (getFileExtension(mod.getName()).equalsIgnoreCase("zip")) { + extractZip(mod, tmpdir); + success = true; + } else if (getFileExtension(mod.getName()).equalsIgnoreCase("jar")) { + extractJar(mod, tmpdir); + success = true; } - new File(tmpdir, "package.xml").delete(); + if (new File(tmpdir, "package.xml").exists()) { + NodeList xml = DocumentBuilderFactory.newInstance().newDocumentBuilder().parse(new File(tmpdir, "package.xml")).getElementsByTagName("class"); + if (xml.getLength() > 0) { + for (int i = 0; i < xml.getLength(); i++) { + plugins += ((plugins.length() == 0)?"":" ") + xml.item(i).getTextContent().replace(' ', '_'); + } + } + new File(tmpdir, "package.xml").delete(); + } + if (success) System.out.println(">> Extracted ~/plugins/" + mod.getName()); + } catch (Exception e) { + System.out.println(">> Couldn't extract ~/plugins/" + mod.getName()); + e.printStackTrace(); } } } @@ -60,8 +67,8 @@ public final class Launch { arguments.add(javaPath); arguments.addAll(getVmArgs()); arguments.add("-Dsubservers.host.runtime=" + URLEncoder.encode(tmpdir.getPath(), "UTF-8")); - if (!mods.equals("")) - arguments.add("-Dsubservers.host.plugins=" + URLEncoder.encode(mods, "UTF-8")); + if (!plugins.equals("")) + arguments.add("-Dsubservers.host.plugins=" + URLEncoder.encode(plugins, "UTF-8")); arguments.add("-cp"); arguments.add(tmpdir.getPath()); arguments.add("net.ME1312.SubServers.Host.SubServers"); diff --git a/SubServers.Host/src/net/ME1312/SubServers/Host/Library/Event/Event.java b/SubServers.Host/src/net/ME1312/SubServers/Host/Library/Event/Event.java index b181829a..e4498b2a 100644 --- a/SubServers.Host/src/net/ME1312/SubServers/Host/Library/Event/Event.java +++ b/SubServers.Host/src/net/ME1312/SubServers/Host/Library/Event/Event.java @@ -3,6 +3,11 @@ package net.ME1312.SubServers.Host.Library.Event; import net.ME1312.SubServers.Host.API.SubPluginInfo; import net.ME1312.SubServers.Host.SubAPI; +import java.lang.reflect.Field; +import java.lang.reflect.InvocationTargetException; +import java.lang.reflect.Method; +import java.util.*; + /** * SubEvent Layout Class */ @@ -26,4 +31,41 @@ public abstract class Event { public SubPluginInfo getPlugin() { return plugin; } + + /** + * Get the handlers for this event + * + * @return Handler Map + */ + @SuppressWarnings({"deprecation", "unchecked"}) + public Map> getHandlers() throws IllegalAccessException { + try { + Field f = SubAPI.class.getDeclaredField("listeners"); + f.setAccessible(true); + HashMap, HashMap>>>> listeners = (HashMap, HashMap>>>>) f.get(getAPI()); + HashMap> map = new LinkedHashMap>(); + f.setAccessible(false); + for (EventPriority priority : listeners.keySet()) { + if (!listeners.get(priority).keySet().contains(getClass())) continue; + for (SubPluginInfo plugin : listeners.get(priority).get(getClass()).keySet()) { + for (Object listener : listeners.get(priority).get(getClass()).get(plugin).keySet()) { + for (Method method : listeners.get(priority).get(getClass()).get(plugin).get(listener)) { + List methods = (map.keySet().contains(plugin))?map.get(plugin):new LinkedList(); + methods.add(method); + map.put(plugin, methods); + } + } + } + } + return map; + } catch (NoSuchFieldException e) { + getAPI().getInternals().log.error(new InvocationTargetException(e, "Couldn't get handler list for event: " + toString())); + return null; + } + } + + @Override + public String toString() { + return getClass().getTypeName(); + } } diff --git a/SubServers.Host/src/net/ME1312/SubServers/Host/Library/Exception/IllegalStringValueException.java b/SubServers.Host/src/net/ME1312/SubServers/Host/Library/Exception/IllegalStringValueException.java new file mode 100644 index 00000000..93392b17 --- /dev/null +++ b/SubServers.Host/src/net/ME1312/SubServers/Host/Library/Exception/IllegalStringValueException.java @@ -0,0 +1,8 @@ +package net.ME1312.SubServers.Host.Library.Exception; + +public class IllegalStringValueException extends IllegalStateException { + public IllegalStringValueException() {} + public IllegalStringValueException(String s) { + super(s); + } +} diff --git a/SubServers.Host/src/net/ME1312/SubServers/Host/Library/Log/Logger.java b/SubServers.Host/src/net/ME1312/SubServers/Host/Library/Log/Logger.java index ff4ac152..51b0872c 100644 --- a/SubServers.Host/src/net/ME1312/SubServers/Host/Library/Log/Logger.java +++ b/SubServers.Host/src/net/ME1312/SubServers/Host/Library/Log/Logger.java @@ -125,11 +125,11 @@ public class Logger { */ public void error(Throwable exception) { Throwable error = exception; - String indent = " "; + String indent = " "; boolean hasException = true; while (hasException) { String[] arrstring = new String[1]; - arrstring[0] = (!indent.substring(4).equals("") ? new StringBuilder().append(indent.substring(4)).append("Caused by ").toString() : "") + error.getClass().getCanonicalName() + ": " + error.getMessage(); + arrstring[0] = (!indent.substring(2).equals("") ? new StringBuilder().append(indent.substring(2)).append("Caused by ").toString() : "") + error.getClass().getCanonicalName() + ": " + error.getMessage(); this.error(arrstring); Iterator items = Arrays.asList(error.getStackTrace()).iterator(); while (items.hasNext()) { @@ -138,7 +138,7 @@ public class Logger { if (error instanceof InvocationTargetException) { this.error(indent); error = ((InvocationTargetException)error).getTargetException(); - indent = indent + " "; + indent = indent + " "; continue; } hasException = false; diff --git a/SubServers.Host/src/net/ME1312/SubServers/Host/Library/Util.java b/SubServers.Host/src/net/ME1312/SubServers/Host/Library/Util.java index 7f2f1a16..3d0af02d 100644 --- a/SubServers.Host/src/net/ME1312/SubServers/Host/Library/Util.java +++ b/SubServers.Host/src/net/ME1312/SubServers/Host/Library/Util.java @@ -3,7 +3,7 @@ package net.ME1312.SubServers.Host.Library; import net.ME1312.SubServers.Host.SubAPI; import java.io.*; -import java.util.Random; +import java.util.*; /** * SubServers Utility Class @@ -29,6 +29,27 @@ public final class Util { return ret; } + /** + * Get keys by value from map + * + * @param map Map to search + * @param value Value to search for + * @param Key + * @param Value + * @return Search results + */ + public static List getBackwards(Map map, V value) { + List values = new ArrayList(); + + for (K key : map.keySet()) { + if (map.get(key).equals(value)) { + values.add(key); + } + } + + return values; + } + /** * Read Everything from Reader * diff --git a/SubServers.Host/src/net/ME1312/SubServers/Host/SubAPI.java b/SubServers.Host/src/net/ME1312/SubServers/Host/SubAPI.java index bdca0d48..5fb47998 100644 --- a/SubServers.Host/src/net/ME1312/SubServers/Host/SubAPI.java +++ b/SubServers.Host/src/net/ME1312/SubServers/Host/SubAPI.java @@ -2,7 +2,7 @@ package net.ME1312.SubServers.Host; import net.ME1312.SubServers.Host.API.Command; import net.ME1312.SubServers.Host.API.SubPluginInfo; -import net.ME1312.SubServers.Host.API.SubTaskBuilder; +import net.ME1312.SubServers.Host.API.SubTask; import net.ME1312.SubServers.Host.Library.Event.*; import net.ME1312.SubServers.Host.Library.UniversalFile; import net.ME1312.SubServers.Host.Library.Util; @@ -119,7 +119,7 @@ public final class SubAPI { * @param builder SubTaskBuilder * @return Task ID */ - public UUID schedule(SubTaskBuilder builder) { + public UUID schedule(SubTask builder) { if (Util.isNull(builder)) throw new NullPointerException(); UUID sid = getFreeSID(); TimerTask task = new TimerTask() { @@ -130,20 +130,20 @@ public final class SubAPI { } catch (Throwable e) { plugin.log.error(new InvocationTargetException(e, "Unhandled exception while running SubTask " + sid.toString())); } - if (builder.getRepeat() <= 0) schedule.remove(sid); + if (builder.repeat() <= 0) schedule.remove(sid); } }; schedule.put(sid, new Timer("SubTask_" + sid.toString())); - if (builder.getRepeat() > 0) { - if (builder.getDelay() > 0) { - schedule.get(sid).scheduleAtFixedRate(task, builder.getDelay(), builder.getRepeat()); + if (builder.repeat() > 0) { + if (builder.delay() > 0) { + schedule.get(sid).scheduleAtFixedRate(task, builder.delay(), builder.repeat()); } else { - schedule.get(sid).scheduleAtFixedRate(task, new Date(), builder.getRepeat()); + schedule.get(sid).scheduleAtFixedRate(task, new Date(), builder.repeat()); } } else { - if (builder.getDelay() > 0) { - schedule.get(sid).schedule(task, builder.getDelay()); + if (builder.delay() > 0) { + schedule.get(sid).schedule(task, builder.delay()); } else { new Thread(task).start(); } @@ -159,13 +159,7 @@ public final class SubAPI { * @return Task ID */ public UUID schedule(SubPluginInfo plugin, Runnable run) { - if (Util.isNull(plugin, run)) throw new NullPointerException(); - return schedule(new SubTaskBuilder(plugin) { - @Override - public void run() { - run.run(); - } - }); + return schedule(plugin, run, -1L, -1L); } /** @@ -177,13 +171,7 @@ public final class SubAPI { * @return Task ID */ public UUID schedule(SubPluginInfo plugin, Runnable run, long delay) { - if (Util.isNull(plugin, run, delay)) throw new NullPointerException(); - return schedule(new SubTaskBuilder(plugin) { - @Override - public void run() { - run.run(); - } - }.delay(delay)); + return schedule(plugin, run, delay, -1L); } /** @@ -197,7 +185,7 @@ public final class SubAPI { */ public UUID schedule(SubPluginInfo plugin, Runnable run, long delay, long repeat) { if (Util.isNull(plugin, run, delay, repeat)) throw new NullPointerException(); - return schedule(new SubTaskBuilder(plugin) { + return schedule(new SubTask(plugin) { @Override public void run() { run.run(); @@ -219,13 +207,13 @@ public final class SubAPI { } /** - * Register a SubEvent Listener + * Register SubEvent Listeners * * @param plugin PluginInfo - * @param listener Listener + * @param listeners Listeners */ - public void addListener(SubPluginInfo plugin, Listener listener) { - addListener(plugin, (Object) listener); + public void addListener(SubPluginInfo plugin, Listener... listeners) { + for (Listener listener : listeners) addListener(plugin, (Object) listener); } @SuppressWarnings("unchecked") void addListener(SubPluginInfo plugin, Object listener) { @@ -257,13 +245,13 @@ public final class SubAPI { } /** - * Unregister a SubEvent Listener + * Unregister SubEvent Listeners * * @param plugin PluginInfo - * @param listener Listener + * @param listeners Listeners */ - public void removeListener(SubPluginInfo plugin, Listener listener) { - removeListener(plugin, (Object) listener); + public void removeListener(SubPluginInfo plugin, Listener... listeners) { + for (Listener listener : listeners) removeListener(plugin, (Object) listener); } void removeListener(SubPluginInfo plugin, Object listener) { if (Util.isNull(plugin, listener)) throw new NullPointerException(); @@ -288,7 +276,7 @@ public final class SubAPI { * * @param event SubEvent */ - public void runEvent(Event event) { + public void executeEvent(Event event) { if (Util.isNull(event)) throw new NullPointerException(); for (EventPriority priority : listeners.keySet()) { if (!listeners.get(priority).keySet().contains(event.getClass())) continue; diff --git a/SubServers.Host/src/net/ME1312/SubServers/Host/SubServers.java b/SubServers.Host/src/net/ME1312/SubServers/Host/SubServers.java index ce545aaa..566fd325 100644 --- a/SubServers.Host/src/net/ME1312/SubServers/Host/SubServers.java +++ b/SubServers.Host/src/net/ME1312/SubServers/Host/SubServers.java @@ -1,5 +1,6 @@ package net.ME1312.SubServers.Host; +import net.ME1312.SubServers.Host.API.Command; import net.ME1312.SubServers.Host.API.Event.CommandPreProcessEvent; import net.ME1312.SubServers.Host.API.Event.SubDisableEvent; import net.ME1312.SubServers.Host.API.Event.SubEnableEvent; @@ -68,6 +69,10 @@ public final class SubServers { long begin = Calendar.getInstance().getTime().getTime(); long i = 0; log.info("Loading SubAPI Plugins..."); + + /* + * Decode Plugin List Variable + */ String decoded = URLDecoder.decode(System.getProperty("subservers.host.plugins"), "UTF-8"); List classes = new LinkedList(); HashMap plugins = new LinkedHashMap(); @@ -76,6 +81,10 @@ public final class SubServers { } else { classes.addAll(Arrays.asList(decoded.split(" "))); } + + /* + * Load Main Classes & Plugin Descriptions + */ for (String main : classes) { try { Class clazz = Class.forName(main); @@ -83,11 +92,12 @@ public final class SubServers { Object obj = clazz.getConstructor().newInstance(); try { - SubPluginInfo plugin = new SubPluginInfo(obj, clazz.getAnnotation(SubPlugin.class).name(), new Version(clazz.getAnnotation(SubPlugin.class).version()), + SubPluginInfo plugin = new SubPluginInfo(this, obj, clazz.getAnnotation(SubPlugin.class).name(), new Version(clazz.getAnnotation(SubPlugin.class).version()), Arrays.asList(clazz.getAnnotation(SubPlugin.class).authors()), (clazz.getAnnotation(SubPlugin.class).description().length() > 0)?clazz.getAnnotation(SubPlugin.class).description():null, - (clazz.getAnnotation(SubPlugin.class).website().length() > 0)?new URL(clazz.getAnnotation(SubPlugin.class).website()):null, Arrays.asList(clazz.getAnnotation(SubPlugin.class).depend()), - Arrays.asList(clazz.getAnnotation(SubPlugin.class).softDepend())); - if (plugins.keySet().contains(plugin.getName().toLowerCase())) log.warn("Duplicate plugin: " + plugin.getName()); + (clazz.getAnnotation(SubPlugin.class).website().length() > 0)?new URL(clazz.getAnnotation(SubPlugin.class).website()):null, Arrays.asList(clazz.getAnnotation(SubPlugin.class).loadBefore()), + Arrays.asList(clazz.getAnnotation(SubPlugin.class).depend()), Arrays.asList(clazz.getAnnotation(SubPlugin.class).softDepend())); + if (plugins.keySet().contains(plugin.getName().toLowerCase())) log.warn("Duplicate plugin: " + plugin.getName().toLowerCase()); + plugin.addExtra("subservers.plugin.loadafter", new ArrayList()); plugins.put(plugin.getName().toLowerCase(), plugin); } catch (Throwable e) { log.error(new IllegalPluginException(e, "Cannot load plugin descriptor for main class: " + main)); @@ -101,10 +111,25 @@ public final class SubServers { } } + /* + * Load Extra Plugin Settings + */ + for (SubPluginInfo plugin : plugins.values()) { + for (String loadbefore : plugin.getLoadBefore()) { + if (plugins.keySet().contains(loadbefore.toLowerCase())) { + List loadafter = plugins.get(loadbefore.toLowerCase()).getExtra("subservers.plugin.loadafter").asRawStringList(); + loadafter.add(plugin.getName().toLowerCase()); + plugins.get(loadbefore.toLowerCase()).addExtra("subservers.plugin.loadafter", loadafter); + } + } + } + + /* + * Register Plugins + */ while (plugins.size() > 0) { List loaded = new ArrayList(); - for (String name : plugins.keySet()) { - SubPluginInfo plugin = plugins.get(name); + for (SubPluginInfo plugin : plugins.values()) { try { boolean load = true; for (String depend : plugin.getDependancies()) { @@ -119,22 +144,26 @@ public final class SubServers { load = false; } } - if (load) { - try { - plugin.setEnabled(true); - api.addListener(plugin, plugin.get()); - api.plugins.put(plugin.getName().toLowerCase(), plugin); - loaded.add(name); - log.info("Loaded " + plugin.getName() + " v" + plugin.getVersion().toString()); - i++; - } catch (Throwable e) { - plugin.setEnabled(false); - throw new InvocationTargetException(e, "Problem enabling plugin: " + plugin.getName() + " v" + plugin.getVersion().toString() + " (is it up to date?)"); + for (String loadafter : plugin.getExtra("subservers.plugin.loadafter").asRawStringList()) { + if (plugins.keySet().contains(loadafter.toLowerCase())) { + load = false; } } + if (load) try { + plugin.removeExtra("subservers.plugin.loadafter"); + plugin.setEnabled(true); + api.addListener(plugin, plugin.get()); + api.plugins.put(plugin.getName().toLowerCase(), plugin); + loaded.add(plugin.getName().toLowerCase()); + log.info("Loaded " + plugin.getName() + " v" + plugin.getVersion().toString() + " by " + plugin.getAuthors().toString().substring(1, plugin.getAuthors().toString().length() - 1)); + i++; + } catch (Throwable e) { + plugin.setEnabled(false); + throw new InvocationTargetException(e, "Problem loading plugin: " + plugin.getName()); + } } catch (InvocationTargetException e) { log.error(e); - loaded.add(name); + loaded.add(plugin.getName().toLowerCase()); } } int progress = 0; @@ -143,20 +172,19 @@ public final class SubServers { plugins.remove(name); } if (progress == 0 && plugins.size() != 0) { - log.error(new IllegalStateException("Cannot load any more plugins but there's " + plugins.size() + " left")); + log.error(new IllegalStateException("Couldn't load more plugins but there are " + plugins.size() + " more")); break; } } - api.runEvent(new SubEnableEvent(this)); - log.info("SubServers > " + i + " Plugin"+((i == 1)?"":"s") + " loaded in " + (Calendar.getInstance().getTime().getTime() - begin) + "ms"); + /* + * Enable Plugins + */ + api.executeEvent(new SubEnableEvent(this)); + log.info(i + " Plugin"+((i == 1)?"":"s") + " loaded in " + (Calendar.getInstance().getTime().getTime() - begin) + "ms"); } - api.addCommand((command, cargs) -> log.info( - System.getProperty("os.name") + ' ' + System.getProperty("os.version") + ',', - "Java " + System.getProperty("java.version") + ',', - "SubServers.Host v" + version.toString() + ((bversion == null)?"":" BETA " + bversion.toString())), "ver", "version"); - api.addCommand((command, cargs) -> stop(0), "stop", "exit"); + loadDefaults(); running = true; loop(); @@ -169,11 +197,12 @@ public final class SubServers { Scanner console = new Scanner(System.in); while (running && console.hasNextLine()) { + if (!running) continue; final String umsg = console.nextLine(); final CommandPreProcessEvent event; - api.runEvent(event = new CommandPreProcessEvent(this, umsg)); + api.executeEvent(event = new CommandPreProcessEvent(this, umsg)); if (!event.isCancelled()) { - final String cmd = (umsg.contains(" ")?umsg.split(" "):new String[]{umsg})[0]; + final String cmd = (umsg.startsWith("/"))?((umsg.contains(" ")?umsg.split(" "):new String[]{umsg})[0].substring(1)):((umsg.contains(" ")?umsg.split(" "):new String[]{umsg})[0]); if (api.commands.keySet().contains(cmd.toLowerCase())) { ArrayList args = new ArrayList(); args.addAll(Arrays.asList(umsg.contains(" ") ? umsg.split(" ") : new String[]{umsg})); @@ -193,11 +222,119 @@ public final class SubServers { } } + private void loadDefaults() { + new Command(null) { + @Override + public void command(String handle, String[] args) { + if (args.length == 0) { + log.info( + System.getProperty("os.name") + ' ' + System.getProperty("os.version") + ',', + "Java " + System.getProperty("java.version") + ',', + "SubServers.Host v" + version.toString() + ((bversion == null) ? "" : " BETA " + bversion.toString())); + } else if (api.plugins.get(args[0].toLowerCase()) != null) { + SubPluginInfo plugin = api.plugins.get(args[0].toLowerCase()); + log.info(plugin.getName() + " v" + plugin.getVersion() + " by " + plugin.getAuthors().toString().substring(1, plugin.getAuthors().toString().length() - 1)); + if (plugin.getWebsite() != null) log.info(plugin.getWebsite().toString()); + if (plugin.getDescription() != null) log.info("", plugin.getDescription()); + } else { + log.info("There is no plugin with that name"); + } + } + }.usage("[plugin]").description("Gets the version of the System and SubServers or the specified Plugin").help( + "This command will print what OS you're running, your OS version,", + "your Java version, and the SubServers.Host version.", + "", + "If the [plugin] option is provided, it will print information about the specified plugin instead.", + "", + "Examples:", + " /version", + " /version ExamplePlugin" + ).register("ver", "version"); + new Command(null) { + public void command(String handle, String[] args) { + HashMap commands = new LinkedHashMap(); + HashMap handles = new LinkedHashMap(); + + int length = 0; + for(String command : api.commands.keySet()) { + String formatted = "/ "; + Command cmd = api.commands.get(command); + String alias = (handles.keySet().contains(cmd))?handles.get(cmd):null; + + if (alias != null) formatted = commands.get(alias); + if (cmd.usage().length == 0 || alias != null) { + formatted = formatted.replaceFirst("\\s", ((alias != null)?"|":"") + command + ' '); + } else { + String usage = ""; + for (String str : cmd.usage()) usage += ((usage.length() == 0)?"":" ") + str; + formatted = formatted.replaceFirst("\\s", command + ' ' + usage + ' '); + } + if(formatted.length() > length) { + length = formatted.length(); + } + + if (alias == null) { + commands.put(command, formatted); + handles.put(cmd, command); + } else { + commands.put(alias, formatted); + } + } + + if (args.length == 0) { + log.info("SubServers.Host Command List:"); + for (String command : commands.keySet()) { + String formatted = commands.get(command); + Command cmd = api.commands.get(command); + + while (formatted.length() < length) { + formatted += ' '; + } + formatted += ((cmd.description() == null || cmd.description().length() == 0)?" ":"- "+cmd.description()); + + log.info(formatted); + } + } else if (api.commands.keySet().contains((args[0].startsWith("/"))?args[0].toLowerCase().substring(1):args[0].toLowerCase())) { + Command cmd = api.commands.get((args[0].startsWith("/"))?args[0].toLowerCase().substring(1):args[0].toLowerCase()); + String formatted = commands.get(Util.getBackwards(api.commands, cmd).get(0)); + log.info(formatted.substring(0, formatted.length() - 1)); + for (String line : cmd.help()) { + log.info(" " + line); + } + } else { + log.info("There is no command with that name"); + } + } + }.usage("[command]").description("Prints a list of the commands and/or their descriptions").help( + "This command will print a list of all currently registered commands and aliases,", + "along with their usage and a short description.", + "", + "If the [command] option is provided, it will print that command, it's aliases,", + "it's usage, and an extended description like the one you see here instead.", + "", + "Examples:", + " /help", + " /help end" + ).register("help", "?"); + new Command(null) { + @Override + public void command(String handle, String[] args) { + stop(0); + } + }.description("Stops this SubServers instance").help( + "This command will shutdown this instance of SubServers.Host,", + "SubServers running on this host, and any plugins currently running via SubAPI.", + "", + "Example:", + " /stop" + ).register("exit", "end"); + } + public void stop(int exit) { log.info("Shutting down..."); - SubDisableEvent event = new SubDisableEvent(this, exit); - api.runEvent(event); running = false; + SubDisableEvent event = new SubDisableEvent(this, exit); + api.executeEvent(event); if (subdata != null) Util.isException(() -> subdata.destroy(false)); Util.isException(FileLogger::end);