diff --git a/Artifacts/SubServers.Bungee.jar b/Artifacts/SubServers.Bungee.jar index aa69f267..0f306236 100644 Binary files a/Artifacts/SubServers.Bungee.jar and b/Artifacts/SubServers.Bungee.jar differ diff --git a/Artifacts/SubServers.Host.jar b/Artifacts/SubServers.Host.jar index fd7f0b35..c72e105b 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 2366ea04..3a609d15 100644 --- a/Javadoc/SubServers.Bungee/allclasses-frame.html +++ b/Javadoc/SubServers.Bungee/allclasses-frame.html @@ -37,6 +37,7 @@
  • InvalidTemplateException
  • JSONCallback
  • Launch
    • +
  • Metrics
  • NamedContainer
  • PacketAuthorization
  • PacketCommandServer
    • diff --git a/Javadoc/SubServers.Bungee/allclasses-noframe.html b/Javadoc/SubServers.Bungee/allclasses-noframe.html index 6d95b7d2..057de088 100644 --- a/Javadoc/SubServers.Bungee/allclasses-noframe.html +++ b/Javadoc/SubServers.Bungee/allclasses-noframe.html @@ -37,6 +37,7 @@
  • InvalidTemplateException
  • JSONCallback
  • Launch
    • +
  • Metrics
  • NamedContainer
  • PacketAuthorization
  • PacketCommandServer
    • diff --git a/Javadoc/SubServers.Bungee/constant-values.html b/Javadoc/SubServers.Bungee/constant-values.html index a9a7b3d9..ae050edc 100644 --- a/Javadoc/SubServers.Bungee/constant-values.html +++ b/Javadoc/SubServers.Bungee/constant-values.html @@ -70,6 +70,35 @@

    Constant Field Values

    Contents

    + +
    +
    + + +

    net.ME1312.*

    +
    diff --git a/Javadoc/SubServers.Bungee/index-all.html b/Javadoc/SubServers.Bungee/index-all.html index 9ce0193e..6e4aded9 100644 --- a/Javadoc/SubServers.Bungee/index-all.html +++ b/Javadoc/SubServers.Bungee/index-all.html @@ -237,6 +237,8 @@

    B

    +
    B_STATS_VERSION - Static variable in class net.ME1312.SubServers.Bungee.Library.Metrics
    +
     
    broadcastPacket(PacketOut) - Method in class net.ME1312.SubServers.Bungee.Network.SubDataServer
    Broadcast a Packet to everything on the Network
    @@ -1150,6 +1152,10 @@
    Gets the player that triggered the Event
    +
    getPluginData() - Method in class net.ME1312.SubServers.Bungee.Library.Metrics
    +
    +
    Gets the plugin specific data.
    +
    getPort() - Method in class net.ME1312.SubServers.Bungee.Event.SubCreateEvent
    Get the Port the Server will use
    @@ -1770,6 +1776,10 @@
    Launch() - Constructor for class net.ME1312.SubServers.Bungee.Launch
     
    +
    linkMetrics(Object) - Static method in class net.ME1312.SubServers.Bungee.Library.Metrics
    +
    +
    Links an other metrics class with this class.
    +
    log(String) - Method in class net.ME1312.SubServers.Bungee.Host.External.ExternalSubLogger
    Log a Message
    @@ -1812,6 +1822,12 @@
    Launch SubServers/BungeeCord
    +
    Metrics - Class in net.ME1312.SubServers.Bungee.Library
    +
    +
    bStats collects some data for plugin authors.
    +
    +
    Metrics(SubPlugin) - Constructor for class net.ME1312.SubServers.Bungee.Library.Metrics
    +
     
    @@ -2230,6 +2246,14 @@
    Register PacketOut to the Network
    +
    reload() - Method in class net.ME1312.SubServers.Bungee.Host.External.ExternalSubCreator
    +
     
    +
    reload() - Method in class net.ME1312.SubServers.Bungee.Host.Internal.InternalSubCreator
    +
     
    +
    reload() - Method in class net.ME1312.SubServers.Bungee.Host.SubCreator
    +
    +
    Reload SubCreator
    +
    reload() - Method in class net.ME1312.SubServers.Bungee.Library.Config.YAMLConfig
    Reload Config Contents
    diff --git a/Javadoc/SubServers.Bungee/net/ME1312/SubServers/Bungee/Host/External/ExternalSubCreator.html b/Javadoc/SubServers.Bungee/net/ME1312/SubServers/Bungee/Host/External/ExternalSubCreator.html index 1d95d0d5..1645fcc5 100644 --- a/Javadoc/SubServers.Bungee/net/ME1312/SubServers/Bungee/Host/External/ExternalSubCreator.html +++ b/Javadoc/SubServers.Bungee/net/ME1312/SubServers/Bungee/Host/External/ExternalSubCreator.html @@ -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}; +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}; var tabs = {65535:["t0","All Methods"],2:["t2","Instance Methods"],8:["t4","Concrete Methods"]}; var altColor = "altColor"; var rowColor = "rowColor"; @@ -222,23 +222,29 @@ extends void +reload() +
    Reload SubCreator
    + + + +void terminate()
    Terminate All SubCreator Instances on this host
    - + void terminate(java.lang.String name)
    Terminate a SubCreator Instance
    - + void waitFor()
    Wait for All SubCreator Instances to Finish
    - + void waitFor(java.lang.String name)
    Wait for SubCreator to Finish
    @@ -297,6 +303,21 @@ extends + + + diff --git a/Javadoc/SubServers.Bungee/net/ME1312/SubServers/Bungee/Host/Internal/InternalSubCreator.html b/Javadoc/SubServers.Bungee/net/ME1312/SubServers/Bungee/Host/Internal/InternalSubCreator.html index 9aad5a5c..1e776d4b 100644 --- a/Javadoc/SubServers.Bungee/net/ME1312/SubServers/Bungee/Host/Internal/InternalSubCreator.html +++ b/Javadoc/SubServers.Bungee/net/ME1312/SubServers/Bungee/Host/Internal/InternalSubCreator.html @@ -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}; +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}; var tabs = {65535:["t0","All Methods"],2:["t2","Instance Methods"],8:["t4","Concrete Methods"]}; var altColor = "altColor"; var rowColor = "rowColor"; @@ -222,23 +222,29 @@ extends void +reload() +
    Reload SubCreator
    + + + +void terminate()
    Terminate All SubCreator Instances on this host
    - + void terminate(java.lang.String name)
    Terminate a SubCreator Instance
    - + void waitFor()
    Wait for All SubCreator Instances to Finish
    - + void waitFor(java.lang.String name)
    Wait for SubCreator to Finish
    @@ -297,6 +303,21 @@ extends + + + diff --git a/Javadoc/SubServers.Bungee/net/ME1312/SubServers/Bungee/Host/SubCreator.html b/Javadoc/SubServers.Bungee/net/ME1312/SubServers/Bungee/Host/SubCreator.html index 0528b4c5..a385913a 100644 --- a/Javadoc/SubServers.Bungee/net/ME1312/SubServers/Bungee/Host/SubCreator.html +++ b/Javadoc/SubServers.Bungee/net/ME1312/SubServers/Bungee/Host/SubCreator.html @@ -17,7 +17,7 @@ catch(err) { } //--> -var methods = {"i0":10,"i1":6,"i2":9,"i3":6,"i4":6,"i5":6,"i6":6,"i7":6,"i8":6,"i9":6,"i10":9,"i11":6,"i12":6,"i13":6,"i14":6}; +var methods = {"i0":10,"i1":6,"i2":9,"i3":6,"i4":6,"i5":6,"i6":6,"i7":6,"i8":6,"i9":6,"i10":9,"i11":6,"i12":6,"i13":6,"i14":6,"i15":6}; var tabs = {65535:["t0","All Methods"],1:["t1","Static Methods"],2:["t2","Instance Methods"],4:["t3","Abstract Methods"],8:["t4","Concrete Methods"]}; var altColor = "altColor"; var rowColor = "rowColor"; @@ -247,23 +247,29 @@ extends java.lang.Object abstract void +reload() +
    Reload SubCreator
    + + + +abstract void terminate()
    Terminate All SubCreator Instances on this host
    - + abstract void terminate(java.lang.String name)
    Terminate a SubCreator Instance
    - + abstract void waitFor()
    Wait for All SubCreator Instances to Finish
    - + abstract void waitFor(java.lang.String name)
    Wait for SubCreator to Finish
    @@ -529,7 +535,7 @@ extends java.lang.Object - diff --git a/Javadoc/SubServers.Bungee/net/ME1312/SubServers/Bungee/Library/JSONCallback.html b/Javadoc/SubServers.Bungee/net/ME1312/SubServers/Bungee/Library/JSONCallback.html index 7ddf02c8..c2cd58ca 100644 --- a/Javadoc/SubServers.Bungee/net/ME1312/SubServers/Bungee/Library/JSONCallback.html +++ b/Javadoc/SubServers.Bungee/net/ME1312/SubServers/Bungee/Library/JSONCallback.html @@ -48,7 +48,7 @@ var activeTableTab = "activeTableTab";
    • Frames
      • @@ -182,7 +182,7 @@ var activeTableTab = "activeTableTab";
      • Frames
        • diff --git a/Javadoc/SubServers.Bungee/net/ME1312/SubServers/Bungee/Library/Metrics.html b/Javadoc/SubServers.Bungee/net/ME1312/SubServers/Bungee/Library/Metrics.html new file mode 100644 index 00000000..077605f3 --- /dev/null +++ b/Javadoc/SubServers.Bungee/net/ME1312/SubServers/Bungee/Library/Metrics.html @@ -0,0 +1,340 @@ + + + + + +Metrics (SubServers.Bungee) + + + + + + + +
        + + +
        Skip navigation links
        + + + + +
        +
        + + + +
        + +
        +
        + + +
        + + +
        + + +
        +
        net.ME1312.SubServers.Bungee.Library
        +

        Class Metrics

        +
        +
        +
          +
        • java.lang.Object
          • +
        • +
            +
          • net.ME1312.SubServers.Bungee.Library.Metrics
            • +
          +
          • +
        +
        +
          +
        • +
          +
          +
          public class Metrics
+extends java.lang.Object
          +
          bStats collects some data for plugin authors. + + Check out https://bStats.org/ to learn more about bStats!
          +
          • +
        +
        +
        +
          +
        • + +
            +
          • + + +

            Field Summary

            + + + + + + + + + + +
            Fields 
            Modifier and TypeField and Description
            static intB_STATS_VERSION 
            +
            • +
          + +
            +
          • + + +

            Constructor Summary

            + + + + + + + + +
            Constructors 
            Constructor and Description
            Metrics(SubPlugin plugin) 
            +
            • +
          + +
            +
          • + + +

            Method Summary

            + + + + + + + + + + + + + + +
            All Methods Static Methods Instance Methods Concrete Methods 
            Modifier and TypeMethod and Description
            com.google.gson.JsonObjectgetPluginData() +
            Gets the plugin specific data.
            +
            static voidlinkMetrics(java.lang.Object metrics) +
            Links an other metrics class with this class.
            +
            +
              +
            • + + +

              Methods inherited from class java.lang.Object

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

            Constructor Detail

            + + + +
              +
            • +

              Metrics

              +
              public Metrics(SubPlugin plugin)
              +
              • +
            +
            • +
          + +
            +
          • + + +

            Method Detail

            + + + +
              +
            • +

              linkMetrics

              +
              public static void linkMetrics(java.lang.Object metrics)
              +
              Links an other metrics class with this class. + This method is called using Reflection.
              +
              +
              Parameters:
              +
              metrics - An object of the metrics class to link.
              +
              +
              • +
            + + + +
              +
            • +

              getPluginData

              +
              public com.google.gson.JsonObject getPluginData()
              +
              Gets the plugin specific data. + This method is called using Reflection.
              +
              +
              Returns:
              +
              The plugin specific data.
              +
              +
              • +
            +
            • +
          +
          • +
        +
        +
        + + +
        + + +
        Skip navigation links
        + + + + +
        +
        + + + +
        + +
        +
        + + +
        + + +
        + + + diff --git a/Javadoc/SubServers.Bungee/net/ME1312/SubServers/Bungee/Library/NamedContainer.html b/Javadoc/SubServers.Bungee/net/ME1312/SubServers/Bungee/Library/NamedContainer.html index b9b6d9e7..68e4a0ea 100644 --- a/Javadoc/SubServers.Bungee/net/ME1312/SubServers/Bungee/Library/NamedContainer.html +++ b/Javadoc/SubServers.Bungee/net/ME1312/SubServers/Bungee/Library/NamedContainer.html @@ -47,7 +47,7 @@ var activeTableTab = "activeTableTab";
        @@ -299,7 +299,7 @@ extends
          diff --git a/Javadoc/SubServers.Bungee/net/ME1312/SubServers/Bungee/Library/package-frame.html b/Javadoc/SubServers.Bungee/net/ME1312/SubServers/Bungee/Library/package-frame.html index 788235c2..618b085f 100644 --- a/Javadoc/SubServers.Bungee/net/ME1312/SubServers/Bungee/Library/package-frame.html +++ b/Javadoc/SubServers.Bungee/net/ME1312/SubServers/Bungee/Library/package-frame.html @@ -21,6 +21,7 @@

          Classes

          • Container
            • +
          • Metrics
          • NamedContainer
          • UniversalFile
          • Util
            • diff --git a/Javadoc/SubServers.Bungee/net/ME1312/SubServers/Bungee/Library/package-summary.html b/Javadoc/SubServers.Bungee/net/ME1312/SubServers/Bungee/Library/package-summary.html index 5654cca3..dd47ddca 100644 --- a/Javadoc/SubServers.Bungee/net/ME1312/SubServers/Bungee/Library/package-summary.html +++ b/Javadoc/SubServers.Bungee/net/ME1312/SubServers/Bungee/Library/package-summary.html @@ -124,18 +124,24 @@ +Metrics + +
            bStats collects some data for plugin authors.
            + + + NamedContainer<T,V>
            Named Container Class
            - + UniversalFile
            Universal File Class
            - + Util
            SubServers Utility Class
            diff --git a/Javadoc/SubServers.Bungee/net/ME1312/SubServers/Bungee/Library/package-tree.html b/Javadoc/SubServers.Bungee/net/ME1312/SubServers/Bungee/Library/package-tree.html index e6e0bdb8..502f143b 100644 --- a/Javadoc/SubServers.Bungee/net/ME1312/SubServers/Bungee/Library/package-tree.html +++ b/Javadoc/SubServers.Bungee/net/ME1312/SubServers/Bungee/Library/package-tree.html @@ -89,6 +89,7 @@
          • net.ME1312.SubServers.Bungee.Library.UniversalFile
          +
        • net.ME1312.SubServers.Bungee.Library.Metrics
        • net.ME1312.SubServers.Bungee.Library.Util
        diff --git a/Javadoc/SubServers.Bungee/overview-tree.html b/Javadoc/SubServers.Bungee/overview-tree.html index 44dcd1f4..968fcbf6 100644 --- a/Javadoc/SubServers.Bungee/overview-tree.html +++ b/Javadoc/SubServers.Bungee/overview-tree.html @@ -142,6 +142,7 @@
    • net.ME1312.SubServers.Bungee.Launch
      • +
    • net.ME1312.SubServers.Bungee.Library.Metrics
    • net.ME1312.SubServers.Bungee.Network.Packet.PacketAuthorization (implements net.ME1312.SubServers.Bungee.Network.PacketIn, net.ME1312.SubServers.Bungee.Network.PacketOut)
    • net.ME1312.SubServers.Bungee.Network.Packet.PacketCommandServer (implements net.ME1312.SubServers.Bungee.Network.PacketIn, net.ME1312.SubServers.Bungee.Network.PacketOut)
    • net.ME1312.SubServers.Bungee.Network.Packet.PacketCreateServer (implements net.ME1312.SubServers.Bungee.Network.PacketIn, net.ME1312.SubServers.Bungee.Network.PacketOut)
      • diff --git a/Javadoc/SubServers.Host/index-all.html b/Javadoc/SubServers.Host/index-all.html index ffa9e336..9398529a 100644 --- a/Javadoc/SubServers.Host/index-all.html +++ b/Javadoc/SubServers.Host/index-all.html @@ -82,10 +82,6 @@
      Add an extra value to this Server
      -
      addListener(SubPluginInfo, Listener...) - Method in class net.ME1312.SubServers.Host.SubAPI
      -
      -
      Register SubEvent Listeners
      -
      AES - Class in net.ME1312.SubServers.Host.Network
      A class to perform password-based AES encryption and decryption in CBC mode.
      @@ -1731,7 +1727,7 @@
      Remove an extra value from this Server
      -
      removeListener(SubPluginInfo, Listener...) - Method in class net.ME1312.SubServers.Host.SubAPI
      +
      removeListener(SubPluginInfo, Object...) - Method in class net.ME1312.SubServers.Host.SubAPI
      Unregister SubEvent Listeners
      diff --git a/Javadoc/SubServers.Host/net/ME1312/SubServers/Host/Library/Event/EventHandler.html b/Javadoc/SubServers.Host/net/ME1312/SubServers/Host/Library/Event/EventHandler.html index 1b2397d5..04f2fbab 100644 --- a/Javadoc/SubServers.Host/net/ME1312/SubServers/Host/Library/Event/EventHandler.html +++ b/Javadoc/SubServers.Host/net/ME1312/SubServers/Host/Library/Event/EventHandler.html @@ -98,7 +98,7 @@ public @interface EventHandler Methods annotated by this and registered in SubAPI will be run when the event is called
      See Also:
      -
      SubAPI.addListener(SubPluginInfo, Listener...)
      +
      SubAPI.addListener(SubPluginInfo, Object...)
    diff --git a/Javadoc/SubServers.Host/net/ME1312/SubServers/Host/SubAPI.html b/Javadoc/SubServers.Host/net/ME1312/SubServers/Host/SubAPI.html index cc5099b8..f093b279 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":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 methods = {"i0":10,"i1":10,"i2":10,"i3":10,"i4":10,"i5":9,"i6":42,"i7":10,"i8":10,"i9":10,"i10":10,"i11":10,"i12":10,"i13":10,"i14":10,"i15":10,"i16":10,"i17":10,"i18":10}; var 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"; @@ -137,42 +137,35 @@ extends java.lang.Object void -addListener(SubPluginInfo plugin, - Listener... listeners) -
    Register SubEvent Listeners
    - - - -void cancelTask(java.util.UUID sid)
    Cancel a task
    - + 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
    - + ExHost getInternals()
    Deprecated.  @@ -180,63 +173,63 @@ 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... listeners) +removeListener(SubPluginInfo plugin, + java.lang.Object... listeners)
    Unregister SubEvent Listeners
    - + java.util.UUID schedule(SubPluginInfo plugin, java.lang.Runnable run)
    Schedule a task
    - + java.util.UUID schedule(SubPluginInfo plugin, java.lang.Runnable run, @@ -244,7 +237,7 @@ extends java.lang.Object
    Schedule a task
    - + java.util.UUID schedule(SubPluginInfo plugin, java.lang.Runnable run, @@ -253,7 +246,7 @@ extends java.lang.Object
    Schedule a task
    - + java.util.UUID schedule(SubTask builder)
    Schedule a task
    @@ -475,30 +468,14 @@ public  - - -
      -
    • -

      addListener

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

    • removeListener

      public void removeListener(SubPluginInfo plugin,
-                           Listener... listeners)
      + java.lang.Object... listeners)
      Unregister SubEvent Listeners
      Parameters:
      diff --git a/SubServers.Bungee/META-INF/MANIFEST.MF b/SubServers.Bungee/META-INF/MANIFEST.MF index 99d7144e..e12db158 100644 --- a/SubServers.Bungee/META-INF/MANIFEST.MF +++ b/SubServers.Bungee/META-INF/MANIFEST.MF @@ -1,5 +1,5 @@ Manifest-Version: 1.0 Class-Path: BungeeCord.jar Main-Class: net.ME1312.SubServers.Bungee.Launch -Implementation-Version: 2.12.1a +Implementation-Version: 2.12.1b Specification-Version: 0 diff --git a/SubServers.Bungee/src/net/ME1312/SubServers/Bungee/Host/External/ExternalHost.java b/SubServers.Bungee/src/net/ME1312/SubServers/Bungee/Host/External/ExternalHost.java index 5d00c850..a2d75429 100644 --- a/SubServers.Bungee/src/net/ME1312/SubServers/Bungee/Host/External/ExternalHost.java +++ b/SubServers.Bungee/src/net/ME1312/SubServers/Bungee/Host/External/ExternalHost.java @@ -55,9 +55,9 @@ public class ExternalHost extends Host implements ClientHandler { this.name = name; this.enabled = enabled; this.address = address; + this.client = new NamedContainer(false, null); this.creator = new ExternalSubCreator(this, gitBash); this.directory = directory; - this.client = new NamedContainer(false, null); this.queue = new LinkedList(); this.clean = false; } diff --git a/SubServers.Bungee/src/net/ME1312/SubServers/Bungee/Host/External/ExternalSubCreator.java b/SubServers.Bungee/src/net/ME1312/SubServers/Bungee/Host/External/ExternalSubCreator.java index af6c46bf..83de9db6 100644 --- a/SubServers.Bungee/src/net/ME1312/SubServers/Bungee/Host/External/ExternalSubCreator.java +++ b/SubServers.Bungee/src/net/ME1312/SubServers/Bungee/Host/External/ExternalSubCreator.java @@ -9,6 +9,7 @@ import net.ME1312.SubServers.Bungee.Library.JSONCallback; import net.ME1312.SubServers.Bungee.Library.UniversalFile; import net.ME1312.SubServers.Bungee.Library.Util; import net.ME1312.SubServers.Bungee.Library.Version.Version; +import net.ME1312.SubServers.Bungee.Network.Packet.PacketExConfigureHost; import net.ME1312.SubServers.Bungee.Network.Packet.PacketExCreateServer; import net.ME1312.SubServers.Bungee.SubAPI; @@ -35,7 +36,12 @@ public class ExternalSubCreator extends SubCreator { this.host = host; this.gitBash = gitBash; this.thread = new TreeMap(); + reload(); + } + @Override + public void reload() { + templates.clear(); if (new UniversalFile(host.plugin.dir, "SubServers:Templates").exists()) for (File file : new UniversalFile(host.plugin.dir, "SubServers:Templates").listFiles()) { try { if (file.isDirectory()) { @@ -49,6 +55,7 @@ public class ExternalSubCreator extends SubCreator { e.printStackTrace(); } } + if (host.client.name()) host.queue(new PacketExConfigureHost(host.plugin, host)); } @Override diff --git a/SubServers.Bungee/src/net/ME1312/SubServers/Bungee/Host/Internal/InternalSubCreator.java b/SubServers.Bungee/src/net/ME1312/SubServers/Bungee/Host/Internal/InternalSubCreator.java index a4fc980b..9214f9d5 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 @@ -46,7 +46,12 @@ public class InternalSubCreator extends SubCreator { this.host = host; this.gitBash = gitBash; this.thread = new TreeMap>>(); + reload(); + } + @Override + public void reload() { + templates.clear(); if (new UniversalFile(host.plugin.dir, "SubServers:Templates").exists()) for (File file : new UniversalFile(host.plugin.dir, "SubServers:Templates").listFiles()) { try { if (file.isDirectory()) { 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 31f15eca..c46738a4 100644 --- a/SubServers.Bungee/src/net/ME1312/SubServers/Bungee/Host/SubCreator.java +++ b/SubServers.Bungee/src/net/ME1312/SubServers/Bungee/Host/SubCreator.java @@ -289,4 +289,9 @@ public abstract class SubCreator { * @return Template */ public abstract ServerTemplate getTemplate(String name); + + /** + * Reload SubCreator + */ + public abstract void reload(); } diff --git a/SubServers.Bungee/src/net/ME1312/SubServers/Bungee/Library/Metrics.java b/SubServers.Bungee/src/net/ME1312/SubServers/Bungee/Library/Metrics.java new file mode 100644 index 00000000..768b430f --- /dev/null +++ b/SubServers.Bungee/src/net/ME1312/SubServers/Bungee/Library/Metrics.java @@ -0,0 +1,369 @@ +package net.ME1312.SubServers.Bungee.Library; + +import com.google.gson.JsonArray; +import com.google.gson.JsonObject; +import net.ME1312.SubServers.Bungee.SubPlugin; +import net.md_5.bungee.config.Configuration; +import net.md_5.bungee.config.ConfigurationProvider; +import net.md_5.bungee.config.YamlConfiguration; + +import javax.net.ssl.HttpsURLConnection; +import java.io.BufferedReader; +import java.io.BufferedWriter; +import java.io.ByteArrayOutputStream; +import java.io.DataOutputStream; +import java.io.File; +import java.io.FileReader; +import java.io.FileWriter; +import java.io.IOException; +import java.lang.reflect.InvocationTargetException; +import java.net.URL; +import java.nio.file.Path; +import java.util.*; +import java.util.concurrent.TimeUnit; +import java.util.logging.Level; +import java.util.zip.GZIPOutputStream; + +/** + * bStats collects some data for plugin authors. + * + * Check out https://bStats.org/ to learn more about bStats! + */ +public class Metrics { + + static { + // You can use the property to disable the check in your test environment + if (System.getProperty("bstats.relocatecheck") == null || !System.getProperty("bstats.relocatecheck").equals("false")) { + // Maven's Relocate is clever and changes strings, too. So we have to use this little "trick" ... :D + final String defaultPackage = new String( + new byte[]{'o', 'r', 'g', '.', 'b', 's', 't', 'a', 't', 's', '.', 'b', 'u', 'n', 'g', 'e', 'e', 'c', 'o', 'r', 'd'}); + final String examplePackage = new String(new byte[]{'y', 'o', 'u', 'r', '.', 'p', 'a', 'c', 'k', 'a', 'g', 'e'}); + // We want to make sure nobody just copy & pastes the example and use the wrong package names + if (Metrics.class.getPackage().getName().equals(defaultPackage) || Metrics.class.getPackage().getName().equals(examplePackage)) { + throw new IllegalStateException("bStats Metrics class has not been relocated correctly!"); + } + } + } + + // The version of this bStats class + public static final int B_STATS_VERSION = 1; + + // The url to which the data is sent + private static final String URL = "https://bStats.org/submitData/bungeecord"; + + // The plugin + private final SubPlugin plugin; + + // Is bStats enabled on this server? + private boolean enabled; + + // The uuid of the server + private String serverUUID; + + // Should failed requests be logged? + private boolean logFailedRequests = false; + + // A list with all known metrics class objects including this one + private static final List knownMetricsInstances = new ArrayList<>(); + + public Metrics(SubPlugin plugin) { + this.plugin = plugin; + + try { + loadConfig(); + } catch (IOException e) { + // Failed to load configuration + plugin.getLogger().log(Level.WARNING, "Failed to load bStats config!", e); + return; + } + + // We are not allowed to send data about this server :( + if (!enabled) { + return; + } + + Class usedMetricsClass = getFirstBStatsClass(); + if (usedMetricsClass == null) { + // Failed to get first metrics class + return; + } + if (usedMetricsClass == getClass()) { + // We are the first! :) + linkMetrics(this); + startSubmitting(); + } else { + // We aren't the first so we link to the first metrics class + try { + usedMetricsClass.getMethod("linkMetrics", Object.class).invoke(null,this); + } catch (NoSuchMethodException | IllegalAccessException | InvocationTargetException e) { + if (logFailedRequests) { + plugin.getLogger().log(Level.WARNING, "Failed to link to first metrics class " + usedMetricsClass.getName() + "!", e); + } + } + } + } + + /** + * Links an other metrics class with this class. + * This method is called using Reflection. + * + * @param metrics An object of the metrics class to link. + */ + public static void linkMetrics(Object metrics) { + knownMetricsInstances.add(metrics); + } + + /** + * Gets the plugin specific data. + * This method is called using Reflection. + * + * @return The plugin specific data. + */ + public JsonObject getPluginData() { + JsonObject data = new JsonObject(); + + String pluginName = "SubServers 2"; + String pluginVersion = plugin.version.toString(); + + data.addProperty("pluginName", pluginName); + data.addProperty("pluginVersion", pluginVersion); + + JsonArray customCharts = new JsonArray(); + data.add("customCharts", customCharts); + + return data; + } + + private void startSubmitting() { + new Timer().schedule( new TimerTask() { + @Override + public void run() { + // The data collection is async, as well as sending the data + // Bungeecord does not have a main thread, everything is async + submitData(); + } + }, TimeUnit.MINUTES.toMillis(2), TimeUnit.MINUTES.toMillis(30)); + // Submit the data every 30 minutes, first time after 2 minutes to give other plugins enough time to start + // WARNING: Changing the frequency has no effect but your plugin WILL be blocked/deleted! + // WARNING: Just don't do it! + } + + /** + * Gets the server specific data. + * + * @return The server specific data. + */ + private JsonObject getServerData() { + // Minecraft specific data + int playerAmount = plugin.getOnlineCount(); + playerAmount = playerAmount > 500 ? 500 : playerAmount; + int onlineMode = plugin.getConfig().isOnlineMode() ? 1 : 0; + String bungeecordVersion = plugin.getVersion(); + int managedServers = plugin.getServers().size(); + + // OS/Java specific data + String javaVersion = System.getProperty("java.version"); + String osName = System.getProperty("os.name"); + String osArch = System.getProperty("os.arch"); + String osVersion = System.getProperty("os.version"); + int coreCount = Runtime.getRuntime().availableProcessors(); + + JsonObject data = new JsonObject(); + + data.addProperty("serverUUID", serverUUID); + + data.addProperty("playerAmount", playerAmount); + data.addProperty("managedServers", managedServers); + data.addProperty("onlineMode", onlineMode); + data.addProperty("bungeecordVersion", bungeecordVersion); + + data.addProperty("javaVersion", javaVersion); + data.addProperty("osName", osName); + data.addProperty("osArch", osArch); + data.addProperty("osVersion", osVersion); + data.addProperty("coreCount", coreCount); + + return data; + } + + /** + * Collects the data and sends it afterwards. + */ + private void submitData() { + final JsonObject data = getServerData(); + + final JsonArray pluginData = new JsonArray(); + // Search for all other bStats Metrics classes to get their plugin data + for (Object metrics : knownMetricsInstances) { + try { + Object plugin = metrics.getClass().getMethod("getPluginData").invoke(metrics); + if (plugin instanceof JsonObject) { + pluginData.add((JsonObject) plugin); + } + } catch (NoSuchMethodException | IllegalAccessException | InvocationTargetException ignored) { } + } + + data.add("plugins", pluginData); + + try { + // Send the data + sendData(data); + } catch (Exception e) { + // Something went wrong! :( + if (logFailedRequests) { + plugin.getLogger().log(Level.WARNING, "Could not submit plugin stats!", e); + } + } + } + + /** + * Loads the bStats configuration. + * + * @throws IOException If something did not work :( + */ + private void loadConfig() throws IOException { + Path configPath = new File(plugin.dir, "plugins").toPath().resolve("bStats"); + configPath.toFile().mkdirs(); + File configFile = new File(configPath.toFile(), "config.yml"); + if (!configFile.exists()) { + writeFile(configFile, + "#bStats collects some data for plugin authors like how many servers are using their plugins.", + "#To honor their work, you should not disable it.", + "#This has nearly no effect on the server performance!", + "#Check out https://bStats.org/ to learn more :)", + "enabled: true", + "serverUuid: \"" + UUID.randomUUID().toString() + "\"", + "logFailedRequests: false"); + } + + Configuration configuration = ConfigurationProvider.getProvider(YamlConfiguration.class).load(configFile); + + // Load configuration + enabled = configuration.getBoolean("enabled", true); + serverUUID = configuration.getString("serverUuid"); + logFailedRequests = configuration.getBoolean("logFailedRequests", false); + } + + /** + * Gets the first bStat Metrics class. + * + * @return The first bStats metrics class. + */ + private Class getFirstBStatsClass() { + Path configPath = new File(plugin.dir, "plugins").toPath().resolve("bStats"); + configPath.toFile().mkdirs(); + File tempFile = new File(configPath.toFile(), "temp.txt"); + + try { + String className = readFile(tempFile); + if (className != null) { + try { + // Let's check if a class with the given name exists. + return Class.forName(className); + } catch (ClassNotFoundException ignored) { } + } + writeFile(tempFile, getClass().getName()); + return getClass(); + } catch (IOException e) { + if (logFailedRequests) { + plugin.getLogger().log(Level.WARNING, "Failed to get first bStats class!", e); + } + return null; + } + } + + /** + * Reads the first line of the file. + * + * @param file The file to read. Cannot be null. + * @return The first line of the file or null if the file does not exist or is empty. + * @throws IOException If something did not work :( + */ + private String readFile(File file) throws IOException { + if (!file.exists()) { + return null; + } + try ( + FileReader fileReader = new FileReader(file); + BufferedReader bufferedReader = new BufferedReader(fileReader); + ) { + return bufferedReader.readLine(); + } + } + + /** + * Writes a String to a file. It also adds a note for the user, + * + * @param file The file to write to. Cannot be null. + * @param lines The lines to write. + * @throws IOException If something did not work :( + */ + private void writeFile(File file, String... lines) throws IOException { + if (!file.exists()) { + file.createNewFile(); + } + try ( + FileWriter fileWriter = new FileWriter(file); + BufferedWriter bufferedWriter = new BufferedWriter(fileWriter) + ) { + for (String line : lines) { + bufferedWriter.write(line); + bufferedWriter.newLine(); + } + } + } + + /** + * Sends the data to the bStats server. + * + * @param data The data to send. + * @throws Exception If the request failed. + */ + private static void sendData(JsonObject data) throws Exception { + if (data == null) { + throw new IllegalArgumentException("Data cannot be null"); + } + + HttpsURLConnection connection = (HttpsURLConnection) new URL(URL).openConnection(); + + // Compress the data to save bandwidth + byte[] compressedData = compress(data.toString()); + + // Add headers + connection.setRequestMethod("POST"); + connection.addRequestProperty("Accept", "application/json"); + connection.addRequestProperty("Connection", "close"); + connection.addRequestProperty("Content-Encoding", "gzip"); // We gzip our request + connection.addRequestProperty("Content-Length", String.valueOf(compressedData.length)); + connection.setRequestProperty("Content-Type", "application/json"); // We send our data in JSON format + connection.setRequestProperty("User-Agent", "MC-Server/" + B_STATS_VERSION); + + // Send data + connection.setDoOutput(true); + DataOutputStream outputStream = new DataOutputStream(connection.getOutputStream()); + outputStream.write(compressedData); + outputStream.flush(); + outputStream.close(); + + connection.getInputStream().close(); // We don't care about the response - Just send our data :) + } + + /** + * Gzips the given String. + * + * @param str The string to gzip. + * @return The gzipped String. + * @throws IOException If the compression failed. + */ + private static byte[] compress(final String str) throws IOException { + if (str == null) { + return null; + } + ByteArrayOutputStream outputStream = new ByteArrayOutputStream(); + GZIPOutputStream gzip = new GZIPOutputStream(outputStream); + gzip.write(str.getBytes("UTF-8")); + gzip.close(); + return outputStream.toByteArray(); + } + +} \ No newline at end of file diff --git a/SubServers.Bungee/src/net/ME1312/SubServers/Bungee/SubCommand.java b/SubServers.Bungee/src/net/ME1312/SubServers/Bungee/SubCommand.java index 6eb623c0..d5928ec1 100644 --- a/SubServers.Bungee/src/net/ME1312/SubServers/Bungee/SubCommand.java +++ b/SubServers.Bungee/src/net/ME1312/SubServers/Bungee/SubCommand.java @@ -46,6 +46,31 @@ public final class SubCommand extends Command implements TabExecutor { sender.sendMessages(printHelp()); } else if (args[0].equalsIgnoreCase("version") || args[0].equalsIgnoreCase("ver")) { sender.sendMessage("SubServers > SubServers.Bungee is running version " + plugin.version.toString() + ((plugin.bversion != null)?" BETA "+plugin.bversion.toString():"")); + } else if (args[0].equalsIgnoreCase("reload")) { + if (args.length > 1) { + switch (args[1].toLowerCase()) { + case "all": + case "host": + case "hosts": + case "server": + case "servers": + plugin.getPluginManager().dispatchCommand(ConsoleCommandSender.getInstance(), "greload"); + break; + case "creator": + case "creators": + case "template": + case "templates": + for (Host host : plugin.api.getHosts().values()) { + host.getCreator().reload(); + } + sender.sendMessage("SubServers > SubCreator instances reloaded"); + break; + default: + sender.sendMessage("SubServers > Unknown reload type: " + args[1]); + } + } else { + plugin.getPluginManager().dispatchCommand(ConsoleCommandSender.getInstance(), "greload"); + } } else if (args[0].equalsIgnoreCase("list")) { List hosts = new ArrayList(); for (Host host : plugin.hosts.values()) { @@ -346,7 +371,8 @@ public final class SubCommand extends Command implements TabExecutor { " Help: /sub help", " List: /sub list", " Version: /sub version", - " Server Status: /sub info ", + " Reload: /sub reload [servers|creator]", + " Server Info: /sub info ", " Start Server: /sub start ", " Stop Server: /sub stop ", " Terminate Server: /sub kill ", diff --git a/SubServers.Bungee/src/net/ME1312/SubServers/Bungee/SubPlugin.java b/SubServers.Bungee/src/net/ME1312/SubServers/Bungee/SubPlugin.java index bcb1e4be..83434763 100644 --- a/SubServers.Bungee/src/net/ME1312/SubServers/Bungee/SubPlugin.java +++ b/SubServers.Bungee/src/net/ME1312/SubServers/Bungee/SubPlugin.java @@ -8,6 +8,7 @@ import net.ME1312.SubServers.Bungee.Library.Exception.InvalidHostException; import net.ME1312.SubServers.Bungee.Library.Exception.InvalidServerException; import net.ME1312.SubServers.Bungee.Host.Host; import net.ME1312.SubServers.Bungee.Host.SubServer; +import net.ME1312.SubServers.Bungee.Library.Metrics; import net.ME1312.SubServers.Bungee.Library.NamedContainer; import net.ME1312.SubServers.Bungee.Library.UniversalFile; import net.ME1312.SubServers.Bungee.Library.Util; @@ -29,8 +30,6 @@ import java.nio.file.Files; import java.text.DecimalFormat; import java.util.*; import java.util.concurrent.TimeUnit; -import java.util.zip.ZipEntry; -import java.util.zip.ZipInputStream; /** * Main Plugin Class @@ -170,15 +169,15 @@ public final class SubPlugin extends BungeeCord implements Listener { getPluginManager().registerCommand(null, new SubCommand(this, "subserver")); getPluginManager().registerCommand(null, new SubCommand(this, "sub")); - System.out.println("SubServers > Loading BungeeCord Libraries..."); - int i = 1, p = 1; + new Metrics(this); + + System.out.println("SubServers > Pre-Parsing Config..."); for (String name : config.get().getSection("Servers").getKeys()) { - if (i >= 255) i = 0; - if (p >= 65535) p = 0; - i++; - p++; - legServers.put(name, new BungeeServerInfo(name, new InetSocketAddress(InetAddress.getByName(i + ".0.0.0"), p), "Some SubServer", false)); + if (!config.get().getSection("Hosts").contains(config.get().getSection("Servers").getSection(name).getString("Host"))) throw new InvalidServerException("There is no host with this name: " + config.get().getSection("Servers").getSection(name).getString("Host")); + legServers.put(name, new BungeeServerInfo(name, new InetSocketAddress(InetAddress.getByName(config.get().getSection("Hosts").getSection(config.get().getSection("Servers").getSection(name).getString("Host")).getRawString("Address")), config.get().getSection("Servers").getSection(name).getInt("Port")), config.get().getSection("Servers").getSection(name).getColoredString("Motd", '&'), config.get().getSection("Servers").getSection(name).getBoolean("Restricted"))); } + + System.out.println("SubServers > Loading BungeeCord Libraries..."); } /** @@ -314,8 +313,8 @@ public final class SubPlugin extends BungeeCord implements Listener { public Map getServers() { HashMap servers = new HashMap(); if (!running) { - servers.putAll(legServers); servers.putAll(super.getServers()); + servers.putAll(legServers); } else { for (ServerInfo server : exServers.values()) servers.put(server.getName(), server); for (Host host : this.hosts.values()) { diff --git a/SubServers.Host/src/net/ME1312/SubServers/Host/Launch.java b/SubServers.Host/src/net/ME1312/SubServers/Host/Launch.java index 24e91980..27050829 100644 --- a/SubServers.Host/src/net/ME1312/SubServers/Host/Launch.java +++ b/SubServers.Host/src/net/ME1312/SubServers/Host/Launch.java @@ -7,13 +7,11 @@ import java.net.URLEncoder; import java.util.*; import java.util.jar.JarEntry; import java.util.jar.JarFile; -import java.util.zip.ZipEntry; -import java.util.zip.ZipInputStream; import javax.xml.parsers.DocumentBuilderFactory; -import jline.TerminalFactory; import jline.console.ConsoleReader; import jline.console.CursorBuffer; +import net.ME1312.SubServers.Host.Library.Util; import org.fusesource.jansi.AnsiConsole; import org.w3c.dom.NodeList; @@ -39,14 +37,14 @@ public final class Launch { extractJar(getCodeSourceLocation(), tmpdir); System.out.println(">> Extracted ~/" + getCodeSourceLocation().getName()); if (pldir.isDirectory() && pldir.listFiles().length > 0) { - for (File mod : Arrays.asList(pldir.listFiles())) { + for (File plugin : Arrays.asList(pldir.listFiles())) { try { boolean success = false; - if (getFileExtension(mod.getName()).equalsIgnoreCase("zip")) { - extractZip(mod, tmpdir); + if (getFileExtension(plugin.getName()).equalsIgnoreCase("zip")) { + Util.unzip(new FileInputStream(plugin), tmpdir); success = true; - } else if (getFileExtension(mod.getName()).equalsIgnoreCase("jar")) { - extractJar(mod, tmpdir); + } else if (getFileExtension(plugin.getName()).equalsIgnoreCase("jar")) { + extractJar(plugin, tmpdir); success = true; } if (new File(tmpdir, "package.xml").exists()) { @@ -58,9 +56,9 @@ public final class Launch { } new File(tmpdir, "package.xml").delete(); } - if (success) System.out.println(">> Extracted ~/plugins/" + mod.getName()); + if (success) System.out.println(">> Extracted ~/plugins/" + plugin.getName()); } catch (Exception e) { - System.out.println(">> Couldn't extract ~/plugins/" + mod.getName()); + System.out.println(">> Couldn't extract ~/plugins/" + plugin.getName()); e.printStackTrace(); } } @@ -138,8 +136,8 @@ public final class Launch { } catch (Exception e) { e.printStackTrace(); } + stashLine(console); AnsiConsole.systemUninstall(); - System.out.println(); } private static void extractJar(File jarFile, File dir) throws Exception { @@ -171,43 +169,6 @@ public final class Launch { } } - private static void extractZip(File zipFile, File dir) { - byte[] buffer = new byte[1024]; - try { - ZipInputStream zis = new ZipInputStream(new FileInputStream(zipFile)); - ZipEntry entry = zis.getNextEntry(); - ArrayList entries = new ArrayList(); - while (entry != null) { - entries.add(entry); - entry = zis.getNextEntry(); - } - for (ZipEntry ze : entries) { - int len; - File newFile = new File(dir, ze.getName()); - if (newFile.exists()) { - continue; - } - if (ze.isDirectory()) { - newFile.mkdirs(); - continue; - } - if (!newFile.getParentFile().exists()) { - newFile.getParentFile().mkdirs(); - } - FileOutputStream fos = new FileOutputStream(newFile); - while ((len = zis.read(buffer)) > 0) { - fos.write(buffer, 0, len); - } - fos.close(); - } - zis.closeEntry(); - zis.close(); - } - catch (IOException ex) { - ex.printStackTrace(); - } - } - private static void deleteDir(File f) { if (f.isDirectory()) { for (File c : f.listFiles()) { diff --git a/SubServers.Host/src/net/ME1312/SubServers/Host/Library/Event/EventHandler.java b/SubServers.Host/src/net/ME1312/SubServers/Host/Library/Event/EventHandler.java index 661911b6..dca701c1 100644 --- a/SubServers.Host/src/net/ME1312/SubServers/Host/Library/Event/EventHandler.java +++ b/SubServers.Host/src/net/ME1312/SubServers/Host/Library/Event/EventHandler.java @@ -11,7 +11,7 @@ import java.lang.annotation.Target; * EventHandler Method Annotation
      * Methods annotated by this and registered in SubAPI will be run when the event is called * - * @see net.ME1312.SubServers.Host.SubAPI#addListener(SubPluginInfo, Listener...) + * @see net.ME1312.SubServers.Host.SubAPI#addListener(SubPluginInfo, Object...) */ @Retention(RetentionPolicy.RUNTIME) @Target(ElementType.METHOD) 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 3961558e..59216cc2 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 @@ -22,6 +22,7 @@ import java.util.Base64; */ public class PacketExConfigureHost implements PacketIn, PacketOut { private ExHost host; + private boolean first = false; private Logger log = null; /** @@ -40,6 +41,7 @@ public class PacketExConfigureHost implements PacketIn, PacketOut { @Override public JSONObject generate() { host.log.info.println("Downloading Host Settings..."); + first = true; return null; } @@ -65,7 +67,8 @@ public class PacketExConfigureHost implements PacketIn, PacketOut { host.log.error.println(e); } } - log.info.println("Host Settings Downloaded"); + log.info.println(((first)?"":"New ") + "Host Settings Downloaded"); + first = false; } @Override diff --git a/SubServers.Host/src/net/ME1312/SubServers/Host/SubAPI.java b/SubServers.Host/src/net/ME1312/SubServers/Host/SubAPI.java index 77882d1a..86572553 100644 --- a/SubServers.Host/src/net/ME1312/SubServers/Host/SubAPI.java +++ b/SubServers.Host/src/net/ME1312/SubServers/Host/SubAPI.java @@ -79,17 +79,6 @@ public final class SubAPI { return getPlugins().get(plugin.toLowerCase()); } - private UUID getFreeSID() { - UUID sid = null; - do { - UUID id = UUID.randomUUID(); - if (!schedule.keySet().contains(id)) { - sid = id; - } - } while (sid == null); - return sid; - } - /** * Registers a Command * @@ -113,6 +102,17 @@ public final class SubAPI { } } + private UUID getFreeSID() { + UUID sid = null; + do { + UUID id = UUID.randomUUID(); + if (!schedule.keySet().contains(id)) { + sid = id; + } + } while (sid == null); + return sid; + } + /** * Schedule a task * @@ -212,34 +212,34 @@ public final class SubAPI { * @param plugin PluginInfo * @param listeners Listeners */ - public void addListener(SubPluginInfo plugin, Listener... listeners) { - for (Listener listener : listeners) addListener(plugin, (Object) listener); - } @SuppressWarnings("unchecked") - void addListener(SubPluginInfo plugin, Object listener) { - if (Util.isNull(plugin, listener)) throw new NullPointerException(); - for (Method method : Arrays.asList(listener.getClass().getMethods())) { - if (!method.isAnnotationPresent(EventHandler.class)) continue; - if (method.getParameterTypes().length == 1) { - if (Event.class.isAssignableFrom(method.getParameterTypes()[0])) { - HashMap, HashMap>>> events = (listeners.keySet().contains(method.getAnnotation(EventHandler.class).order()))?listeners.get(method.getAnnotation(EventHandler.class).order()):new LinkedHashMap, HashMap>>>(); - HashMap>> plugins = (events.keySet().contains((Class) method.getParameterTypes()[0]))?events.get((Class) method.getParameterTypes()[0]):new LinkedHashMap>>(); - HashMap> listeners = (plugins.keySet().contains(plugin))?plugins.get(plugin):new LinkedHashMap>(); - List methods = (listeners.keySet().contains(listener))?listeners.get(listener):new LinkedList(); - methods.add(method); - listeners.put(listener, methods); - plugins.put(plugin, listeners); - events.put((Class) method.getParameterTypes()[0], plugins); - this.listeners.put(method.getAnnotation(EventHandler.class).order(), events); - } else { - this.host.log.error.println( - "Cannot register EventHandler in class \"" + listener.getClass().getCanonicalName() + "\" using method \"" + method.getName() + "\":", - "\"" + method.getParameterTypes()[0].getCanonicalName() + "\" is not a SubEvent"); + void addListener(SubPluginInfo plugin, Object... listeners) { + for (Object listener : listeners) { + if (Util.isNull(plugin, listener)) throw new NullPointerException(); + for (Method method : Arrays.asList(listener.getClass().getMethods())) { + if (!method.isAnnotationPresent(EventHandler.class)) { + if (method.getParameterTypes().length == 1) { + if (Event.class.isAssignableFrom(method.getParameterTypes()[0])) { + HashMap, HashMap>>> events = (this.listeners.keySet().contains(method.getAnnotation(EventHandler.class).order()))?this.listeners.get(method.getAnnotation(EventHandler.class).order()):new LinkedHashMap, HashMap>>>(); + HashMap>> plugins = (events.keySet().contains((Class) method.getParameterTypes()[0]))?events.get((Class) method.getParameterTypes()[0]):new LinkedHashMap>>(); + HashMap> objects = (plugins.keySet().contains(plugin))?plugins.get(plugin):new LinkedHashMap>(); + List methods = (objects.keySet().contains(listener))?objects.get(listener):new LinkedList(); + methods.add(method); + objects.put(listener, methods); + plugins.put(plugin, objects); + events.put((Class) method.getParameterTypes()[0], plugins); + this.listeners.put(method.getAnnotation(EventHandler.class).order(), events); + } else { + this.host.log.error.println( + "Cannot register EventHandler in class \"" + listener.getClass().getCanonicalName() + "\" using method \"" + method.getName() + "\":", + "\"" + method.getParameterTypes()[0].getCanonicalName() + "\" is not an Event"); + } + } else { + this.host.log.error.println( + "Cannot register EventHandler in class \"" + listener.getClass().getCanonicalName() + "\" using method \"" + method.getName() + "\":", + ((method.getParameterTypes().length > 0) ? "Too many" : "No") + " parameters for SubEvent to execute"); + } } - } else { - this.host.log.error.println( - "Cannot register EventHandler in class \"" + listener.getClass().getCanonicalName() + "\" using method \"" + method.getName() + "\":", - ((method.getParameterTypes().length > 0) ? "Too many" : "No") + " parameters for SubEvent to execute"); } } } @@ -250,22 +250,21 @@ public final class SubAPI { * @param plugin PluginInfo * @param listeners Listeners */ - 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(); - TreeMap, HashMap>>>> map = new TreeMap, HashMap>>>>(listeners); - for (Short order : map.keySet()) { - for (Class event : map.get(order).keySet()) { - if (map.get(order).get(event).keySet().contains(plugin) && map.get(order).get(event).get(plugin).keySet().contains(listener)) { - HashMap, HashMap>>> events = listeners.get(order); - HashMap>> plugins = listeners.get(order).get(event); - HashMap> listeners = this.listeners.get(order).get(event).get(plugin); - listeners.remove(listener); - plugins.put(plugin, listeners); - events.put(event, plugins); - this.listeners.put(order, events); + public void removeListener(SubPluginInfo plugin, Object... listeners) { + for (Object listener : listeners) { + if (Util.isNull(plugin, listener)) throw new NullPointerException(); + TreeMap, HashMap>>>> map = new TreeMap, HashMap>>>>(this.listeners); + for (Short order : map.keySet()) { + for (Class event : map.get(order).keySet()) { + if (map.get(order).get(event).keySet().contains(plugin) && map.get(order).get(event).get(plugin).keySet().contains(listener)) { + HashMap, HashMap>>> events = this.listeners.get(order); + HashMap>> plugins = this.listeners.get(order).get(event); + HashMap> objects = this.listeners.get(order).get(event).get(plugin); + objects.remove(listener); + plugins.put(plugin, objects); + events.put(event, plugins); + this.listeners.put(order, events); + } } } } @@ -279,27 +278,29 @@ public final class SubAPI { public void executeEvent(Event event) { if (Util.isNull(event)) throw new NullPointerException(); for (Short order : listeners.keySet()) { - if (!listeners.get(order).keySet().contains(event.getClass())) continue; - for (SubPluginInfo plugin : listeners.get(order).get(event.getClass()).keySet()) { - try { - Field pf = Event.class.getDeclaredField("plugin"); - pf.setAccessible(true); - pf.set(event, plugin); - pf.setAccessible(false); - } catch (Exception e) { - this.host.log.error.println(e); - } - for (Object listener : listeners.get(order).get(event.getClass()).get(plugin).keySet()) { - for (Method method : listeners.get(order).get(event.getClass()).get(plugin).get(listener)) { - if (event instanceof Cancellable && ((Cancellable) event).isCancelled() && !method.getAnnotation(EventHandler.class).override()) continue; - try { - method.invoke(listener, event); - } catch (InvocationTargetException e) { - this.host.log.error.println("Event \"" + method.getName() + "(" + event.getClass().getTypeName() + ")\" in class \"" + listener.getClass().getCanonicalName() + "\" had an unhandled exception:"); - this.host.log.error.println(e.getTargetException()); - } catch (IllegalAccessException e) { - this.host.log.error.println("Cannot access method \"" + method.getName() + "\" in class \"" + listener.getClass().getCanonicalName() + "\""); - this.host.log.error.println(e); + if (!listeners.get(order).keySet().contains(event.getClass())) { + for (SubPluginInfo plugin : listeners.get(order).get(event.getClass()).keySet()) { + try { + Field pf = Event.class.getDeclaredField("plugin"); + pf.setAccessible(true); + pf.set(event, plugin); + pf.setAccessible(false); + } catch (Exception e) { + this.host.log.error.println(e); + } + for (Object listener : listeners.get(order).get(event.getClass()).get(plugin).keySet()) { + for (Method method : listeners.get(order).get(event.getClass()).get(plugin).get(listener)) { + if (event instanceof Cancellable && ((Cancellable) event).isCancelled() && !method.getAnnotation(EventHandler.class).override()) { + try { + method.invoke(listener, event); + } catch (InvocationTargetException e) { + this.host.log.error.println("Event \"" + method.getName() + "(" + event.getClass().getTypeName() + ")\" in class \"" + listener.getClass().getCanonicalName() + "\" had an unhandled exception:"); + this.host.log.error.println(e.getTargetException()); + } catch (IllegalAccessException e) { + this.host.log.error.println("Cannot access method \"" + method.getName() + "\" in class \"" + listener.getClass().getCanonicalName() + "\""); + this.host.log.error.println(e); + } + } } } } diff --git a/SubServers.Host/src/net/ME1312/SubServers/Host/SubCommand.java b/SubServers.Host/src/net/ME1312/SubServers/Host/SubCommand.java index 1f575434..ae0f1fa9 100644 --- a/SubServers.Host/src/net/ME1312/SubServers/Host/SubCommand.java +++ b/SubServers.Host/src/net/ME1312/SubServers/Host/SubCommand.java @@ -102,7 +102,7 @@ public class SubCommand { host.log.message.println("Usage: " + handle + " "); } } - }.description("Gets information about a SubServer").help( + }.usage("").description("Gets information about a SubServer").help( "This command will print a list of information about", "the specified SubServer.", "",