diff --git a/Artifacts/SubServers.Bungee.jar b/Artifacts/SubServers.Bungee.jar index 17874dd4..31ae8781 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 6c13bc97..7dd20dfd 100644 Binary files a/Artifacts/SubServers.Client.Bukkit.jar and b/Artifacts/SubServers.Client.Bukkit.jar differ diff --git a/Javadoc/SubServers.Bungee/allclasses-frame.html b/Javadoc/SubServers.Bungee/allclasses-frame.html index 5c9e7ca0..e861ec6d 100644 --- a/Javadoc/SubServers.Bungee/allclasses-frame.html +++ b/Javadoc/SubServers.Bungee/allclasses-frame.html @@ -15,6 +15,7 @@
  • ClientHandler
  • Container
  • Executable
    • +
  • ExtraDataHandler
  • Host
  • IllegalPacketException
  • InternalHost
    • @@ -66,6 +67,7 @@
  • SubStoppedEvent
  • UniversalFile
  • Util
    • +
  • Util.ExceptionRunnable
  • Version
  • VersionTokenizer
  • YAMLConfig
    • diff --git a/Javadoc/SubServers.Bungee/allclasses-noframe.html b/Javadoc/SubServers.Bungee/allclasses-noframe.html index 6b904213..81a0a271 100644 --- a/Javadoc/SubServers.Bungee/allclasses-noframe.html +++ b/Javadoc/SubServers.Bungee/allclasses-noframe.html @@ -15,6 +15,7 @@
  • ClientHandler
  • Container
  • Executable
    • +
  • ExtraDataHandler
  • Host
  • IllegalPacketException
  • InternalHost
    • @@ -66,6 +67,7 @@
  • SubStoppedEvent
  • UniversalFile
  • Util
    • +
  • Util.ExceptionRunnable
  • Version
  • VersionTokenizer
  • YAMLConfig
    • diff --git a/Javadoc/SubServers.Bungee/index-all.html b/Javadoc/SubServers.Bungee/index-all.html index 098c810f..4668b9a3 100644 --- a/Javadoc/SubServers.Bungee/index-all.html +++ b/Javadoc/SubServers.Bungee/index-all.html @@ -76,7 +76,11 @@
    Add a Client to the Network
    +
    addExtra(String, Object) - Method in class net.ME1312.SubServers.Bungee.Host.Host
    +
     
    addExtra(String, Object) - Method in class net.ME1312.SubServers.Bungee.Host.Server
    +
     
    +
    addExtra(String, Object) - Method in interface net.ME1312.SubServers.Bungee.Library.ExtraDataHandler
    Add an extra value to this Server
    @@ -213,6 +217,8 @@
    Broadcast a Packet to everything on the Network
    Warning: There are usually different types of applications on the network at once, they may not recognise the same packet handles
    +
    bversion - Variable in class net.ME1312.SubServers.Bungee.SubPlugin
    +
     
    @@ -235,6 +241,10 @@
    Client Handler Layout Class
    +
    clone() - Method in class net.ME1312.SubServers.Bungee.Library.Config.YAMLSection
    +
    +
    Clone this YAML Section
    +
    command(String, String...) - Method in class net.ME1312.SubServers.Bungee.Host.Host
    Commands the Servers Specified
    @@ -380,17 +390,25 @@
    Execute Incoming Packet
    execute(CommandSender, String[]) - Method in class net.ME1312.SubServers.Bungee.SubCommand.BungeeList
    -
     
    +
    +
    Override /glist
    +
    execute(CommandSender, String[]) - Method in class net.ME1312.SubServers.Bungee.SubCommand.BungeeServer
    -
     
    +
    +
    Override /server
    +
    execute(CommandSender, String[]) - Method in class net.ME1312.SubServers.Bungee.SubCommand
    -
    Load /Sub in console
    +
    Load /sub in console
    exLang - Variable in class net.ME1312.SubServers.Bungee.SubPlugin
     
    exServers - Variable in class net.ME1312.SubServers.Bungee.SubPlugin
     
    +
    ExtraDataHandler - Interface in net.ME1312.SubServers.Bungee.Library
    +
    +
    Extra Data Handler Layout Class
    +
    @@ -503,6 +521,10 @@
    Grabs a Client from the Network
    +
    getClients() - Method in class net.ME1312.SubServers.Bungee.Network.SubDataServer
    +
    +
    Grabs all the Clients from the Network
    +
    getColoredString(String, char) - Method in class net.ME1312.SubServers.Bungee.Library.Config.YAMLSection
    Get a Colored String by Handle
    @@ -569,13 +591,21 @@
    Get a Double List by Handle
    +
    getExtra(String) - Method in class net.ME1312.SubServers.Bungee.Host.Host
    +
     
    +
    getExtra() - Method in class net.ME1312.SubServers.Bungee.Host.Host
    +
     
    getExtra(String) - Method in class net.ME1312.SubServers.Bungee.Host.Server
    +
     
    +
    getExtra() - Method in class net.ME1312.SubServers.Bungee.Host.Server
    +
     
    +
    getExtra(String) - Method in interface net.ME1312.SubServers.Bungee.Library.ExtraDataHandler
    Get an extra value
    -
    getExtra() - Method in class net.ME1312.SubServers.Bungee.Host.Server
    +
    getExtra() - Method in interface net.ME1312.SubServers.Bungee.Library.ExtraDataHandler
    -
    Get all of the extra values
    +
    Get the extra value section
    getFloat(String) - Method in class net.ME1312.SubServers.Bungee.Library.Config.YAMLSection
    @@ -1005,7 +1035,11 @@

    H

    +
    hasExtra(String) - Method in class net.ME1312.SubServers.Bungee.Host.Host
    +
     
    hasExtra(String) - Method in class net.ME1312.SubServers.Bungee.Host.Server
    +
     
    +
    hasExtra(String) - Method in interface net.ME1312.SubServers.Bungee.Library.ExtraDataHandler
    Determine if an extra value exists
    @@ -1155,7 +1189,7 @@
    See if Versions are Equal
    -
    isException(Runnable) - Static method in class net.ME1312.SubServers.Bungee.Library.Util
    +
    isException(Util.ExceptionRunnable) - Static method in class net.ME1312.SubServers.Bungee.Library.Util
    Determines if an Exception will occur
    @@ -1332,8 +1366,14 @@

    O

    onTabComplete(CommandSender, String[]) - Method in class net.ME1312.SubServers.Bungee.SubCommand.BungeeServer
    -
     
    +
    +
    Tab completer
    +
    onTabComplete(CommandSender, String[]) - Method in class net.ME1312.SubServers.Bungee.SubCommand
    +
    +
    Tab complete for players
    +
    +
    out - Variable in class net.ME1312.SubServers.Bungee.SubPlugin
     
    @@ -1565,6 +1605,14 @@
    Remove a Client from the Network
    +
    removeExtra(String) - Method in class net.ME1312.SubServers.Bungee.Host.Host
    +
     
    +
    removeExtra(String) - Method in class net.ME1312.SubServers.Bungee.Host.Server
    +
     
    +
    removeExtra(String) - Method in interface net.ME1312.SubServers.Bungee.Library.ExtraDataHandler
    +
    +
    Remove an extra value from this Server
    +
    removeSubServer(String) - Method in class net.ME1312.SubServers.Bungee.Host.Host
    Removes a SubServer
    @@ -1583,6 +1631,8 @@
    Run the Callback
    +
    run() - Method in interface net.ME1312.SubServers.Bungee.Library.Util.ExceptionRunnable
    +
     
    @@ -1611,6 +1661,10 @@
    Set Object into this YAML Section
    +
    set(String, Collection<V>) - Method in class net.ME1312.SubServers.Bungee.Library.Config.YAMLSection
    +
    +
    Set Collection<V> into this YAML Section
    +
    set(V) - Method in class net.ME1312.SubServers.Bungee.Library.Container
    Overwrite the Object
    @@ -1736,7 +1790,7 @@
    startListeners() - Method in class net.ME1312.SubServers.Bungee.SubPlugin
    -
    Load Hosts, Servers, SubServers, and SubData.
    +
    Load Hosts, Servers, SubServers, and SubData Direct
    stop(String...) - Method in class net.ME1312.SubServers.Bungee.Host.Host
    @@ -1791,9 +1845,13 @@
    Plugin Command Class
    SubCommand.BungeeList - Class in net.ME1312.SubServers.Bungee
    -
     
    +
    +
    BungeeCord /glist
    +
    SubCommand.BungeeServer - Class in net.ME1312.SubServers.Bungee
    -
     
    +
    +
    BungeeCord /server
    +
    SubCreateEvent - Class in net.ME1312.SubServers.Bungee.Event
    Server Create Event
    @@ -1978,10 +2036,20 @@
    Creates a File.
    +
    unregisterPacket(PacketIn) - Static method in class net.ME1312.SubServers.Bungee.Network.SubDataServer
    +
    +
    Unregister PacketIn from the Network
    +
    +
    unregisterPacket(Class<? extends PacketOut>) - Static method in class net.ME1312.SubServers.Bungee.Network.SubDataServer
    +
    +
    Unregister PacketOut to the Network
    +
    Util - Class in net.ME1312.SubServers.Bungee.Library
    SubServers Utility Class
    +
    Util.ExceptionRunnable - Interface in net.ME1312.SubServers.Bungee.Library
    +
     
    diff --git a/Javadoc/SubServers.Bungee/net/ME1312/SubServers/Bungee/Host/Host.html b/Javadoc/SubServers.Bungee/net/ME1312/SubServers/Bungee/Host/Host.html index 19804012..a05c724e 100644 --- a/Javadoc/SubServers.Bungee/net/ME1312/SubServers/Bungee/Host/Host.html +++ b/Javadoc/SubServers.Bungee/net/ME1312/SubServers/Bungee/Host/Host.html @@ -17,7 +17,7 @@ catch(err) { } //--> -var methods = {"i0":10,"i1":6,"i2":10,"i3":6,"i4":10,"i5":6,"i6":6,"i7":6,"i8":6,"i9":6,"i10":6,"i11":6,"i12":6,"i13":10,"i14":6,"i15":6,"i16":10,"i17":6,"i18":10,"i19":6,"i20":10,"i21":6}; +var methods = {"i0":10,"i1":10,"i2":6,"i3":10,"i4":6,"i5":10,"i6":6,"i7":6,"i8":6,"i9":6,"i10":10,"i11":10,"i12":6,"i13":6,"i14":6,"i15":10,"i16":6,"i17":10,"i18":10,"i19":6,"i20":6,"i21":10,"i22":6,"i23":10,"i24":6,"i25":10,"i26":6}; var tabs = {65535:["t0","All Methods"],2:["t2","Instance Methods"],4:["t3","Abstract Methods"],8:["t4","Concrete Methods"]}; var altColor = "altColor"; var rowColor = "rowColor"; @@ -106,13 +106,18 @@ var activeTableTab = "activeTableTab"; @@ -157,6 +162,13 @@ extends java.lang.Object Method and Description +void +addExtra(java.lang.String handle, + java.lang.Object value) +
    Add an extra value to this Server
    + + + SubServer addSubServer(java.lang.String name, boolean enabled, @@ -174,7 +186,7 @@ extends java.lang.Object
    Adds a SubServer
    - + abstract SubServer addSubServer(java.util.UUID player, java.lang.String name, @@ -193,14 +205,14 @@ extends java.lang.Object
    Adds a SubServer
    - + int command(java.lang.String command, java.lang.String... servers)
    Commands the Servers Specified
    - + abstract int command(java.util.UUID player, java.lang.String command, @@ -208,113 +220,137 @@ extends java.lang.Object
    Commands the Servers Specified
    - + boolean forceRemoveSubServer(java.lang.String name)
    Forces the Removal of a SubServer
    - + abstract boolean forceRemoveSubServer(java.util.UUID player, java.lang.String name)
    Forces the Removal of a SubServer
    - + abstract java.net.InetAddress getAddress()
    Get the Address of this Host
    - + abstract SubCreator getCreator()
    Gets the SubCreator Instance for this Host
    - + abstract java.lang.String getDirectory()
    Get the Directory of this Host
    - + +YAMLSection +getExtra() +
    Get the extra value section
    + + + +YAMLValue +getExtra(java.lang.String handle) +
    Get an extra value
    + + + abstract java.lang.String getName()
    Get the Name of this Host
    - + abstract SubServer getSubServer(java.lang.String name)
    Gets a SubServer
    - + abstract java.util.Map<java.lang.String,? extends SubServer> getSubServers()
    Gets the SubServers on this Host
    - + +boolean +hasExtra(java.lang.String handle) +
    Determine if an extra value exists
    + + + abstract boolean isEnabled()
    Is this Host Enabled?
    - + +void +removeExtra(java.lang.String handle) +
    Remove an extra value from this Server
    + + + boolean removeSubServer(java.lang.String name)
    Removes a SubServer
    - + abstract boolean removeSubServer(java.util.UUID player, java.lang.String name)
    Removes a SubServer
    - + abstract void setEnabled(boolean value)
    Set if this Host is Enabled
    - + int start(java.lang.String... servers)
    Starts the Servers Specified
    - + abstract int start(java.util.UUID player, java.lang.String... servers)
    Starts the Servers Specified
    - + int stop(java.lang.String... servers)
    Stops the Servers Specified
    - + abstract int stop(java.util.UUID player, java.lang.String... servers)
    Stops the Servers Specified
    - + int terminate(java.lang.String... servers)
    Terminates the Servers Specified
    - + abstract int terminate(java.util.UUID player, java.lang.String... servers) @@ -772,7 +808,7 @@ extends java.lang.Object -
      +

      • forceRemoveSubServer

        public abstract boolean forceRemoveSubServer(java.util.UUID player,
@@ -785,6 +821,97 @@ extends java.lang.Object
      + + + +
        +
      • +

        addExtra

        +
        public void addExtra(java.lang.String handle,
+                     java.lang.Object value)
        +
        Description copied from interface: ExtraDataHandler
        +
        Add an extra value to this Server
        +
        +
        Specified by:
        +
        addExtra in interface ExtraDataHandler
        +
        Parameters:
        +
        handle - Handle
        +
        value - Value
        +
        +
        • +
      + + + +
        +
      • +

        hasExtra

        +
        public boolean hasExtra(java.lang.String handle)
        +
        Description copied from interface: ExtraDataHandler
        +
        Determine if an extra value exists
        +
        +
        Specified by:
        +
        hasExtra in interface ExtraDataHandler
        +
        Parameters:
        +
        handle - Handle
        +
        Returns:
        +
        Value Status
        +
        +
        • +
      + + + +
        +
      • +

        getExtra

        +
        public YAMLValue getExtra(java.lang.String handle)
        +
        Description copied from interface: ExtraDataHandler
        +
        Get an extra value
        +
        +
        Specified by:
        +
        getExtra in interface ExtraDataHandler
        +
        Parameters:
        +
        handle - Handle
        +
        Returns:
        +
        Value
        +
        +
        • +
      + + + + + + + +
        +
      • +

        removeExtra

        +
        public void removeExtra(java.lang.String handle)
        +
        Description copied from interface: ExtraDataHandler
        +
        Remove an extra value from this Server
        +
        +
        Specified by:
        +
        removeExtra in interface ExtraDataHandler
        +
        Parameters:
        +
        handle - Handle
        +
        +
        • +
    diff --git a/Javadoc/SubServers.Bungee/net/ME1312/SubServers/Bungee/Host/Internal/InternalHost.html b/Javadoc/SubServers.Bungee/net/ME1312/SubServers/Bungee/Host/Internal/InternalHost.html index 7d3c44bb..2caa652a 100644 --- a/Javadoc/SubServers.Bungee/net/ME1312/SubServers/Bungee/Host/Internal/InternalHost.html +++ b/Javadoc/SubServers.Bungee/net/ME1312/SubServers/Bungee/Host/Internal/InternalHost.html @@ -110,6 +110,10 @@ var activeTableTab = "activeTableTab";
    • diff --git a/Javadoc/SubServers.Bungee/net/ME1312/SubServers/Bungee/Host/Internal/package-tree.html b/Javadoc/SubServers.Bungee/net/ME1312/SubServers/Bungee/Host/Internal/package-tree.html index ff7796da..332bc338 100644 --- a/Javadoc/SubServers.Bungee/net/ME1312/SubServers/Bungee/Host/Internal/package-tree.html +++ b/Javadoc/SubServers.Bungee/net/ME1312/SubServers/Bungee/Host/Internal/package-tree.html @@ -81,7 +81,7 @@
      • net.md_5.bungee.BungeeServerInfo (implements net.md_5.bungee.api.config.ServerInfo)
          -
        • net.ME1312.SubServers.Bungee.Host.Server (implements net.ME1312.SubServers.Bungee.Network.ClientHandler) +
        • net.ME1312.SubServers.Bungee.Host.Server (implements net.ME1312.SubServers.Bungee.Network.ClientHandler, net.ME1312.SubServers.Bungee.Library.ExtraDataHandler)
          • net.ME1312.SubServers.Bungee.Host.SubServer
              @@ -92,7 +92,7 @@
            • -
          • net.ME1312.SubServers.Bungee.Host.Host +
          • net.ME1312.SubServers.Bungee.Host.Host (implements net.ME1312.SubServers.Bungee.Library.ExtraDataHandler) diff --git a/Javadoc/SubServers.Bungee/net/ME1312/SubServers/Bungee/Host/Server.html b/Javadoc/SubServers.Bungee/net/ME1312/SubServers/Bungee/Host/Server.html index 0665491b..bc7a09f1 100644 --- a/Javadoc/SubServers.Bungee/net/ME1312/SubServers/Bungee/Host/Server.html +++ b/Javadoc/SubServers.Bungee/net/ME1312/SubServers/Bungee/Host/Server.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"; @@ -112,7 +112,7 @@ var activeTableTab = "activeTableTab";
          • All Implemented Interfaces:
            -
            net.md_5.bungee.api.config.ServerInfo, ClientHandler
            +
            net.md_5.bungee.api.config.ServerInfo, ExtraDataHandler, ClientHandler
            Direct Known Subclasses:
            @@ -122,7 +122,7 @@ var activeTableTab = "activeTableTab"; 
            public class Server
 extends net.md_5.bungee.BungeeServerInfo
-implements ClientHandler
            +implements ClientHandler, ExtraDataHandler
            Server Class
          @@ -165,20 +165,20 @@ implements void -addExtra(java.lang.String key, +addExtra(java.lang.String handle, java.lang.Object value)
          Add an extra value to this Server
          -org.json.JSONObject +YAMLSection getExtra() -
          Get all of the extra values
          +
          Get the extra value section
          YAMLValue -getExtra(java.lang.String key) +getExtra(java.lang.String handle)
          Get an extra value
          @@ -196,7 +196,7 @@ implements boolean -hasExtra(java.lang.String key) +hasExtra(java.lang.String handle)
          Determine if an extra value exists
          @@ -220,17 +220,23 @@ implements void +removeExtra(java.lang.String handle) +
          Remove an extra value from this Server
          + + + +void setHidden(boolean value)
          Set if the server is hidden from players
          - + void setMotd(java.lang.String value)
          Sets the MOTD of the Server
          - + void setRestricted(boolean value)
          Sets if the Server is Restricted
          @@ -421,12 +427,15 @@ implements

        • addExtra

          -
          public void addExtra(java.lang.String key,
+
          public void addExtra(java.lang.String handle,
                      java.lang.Object value)
          
+
          Description copied from interface: ExtraDataHandler
          
 
          Add an extra value to this Server
          
 
          
+
          Specified by:
          
+
          addExtra in interface ExtraDataHandler
          
 
          Parameters:
          
-
          key - Key
          
+
          handle - Handle
          
 
          value - Value
          • @@ -437,11 +446,14 @@ implements

        • hasExtra

          -
          public boolean hasExtra(java.lang.String key)
          +
          public boolean hasExtra(java.lang.String handle)
          +
          Description copied from interface: ExtraDataHandler
          Determine if an extra value exists
          +
          Specified by:
          +
          hasExtra in interface ExtraDataHandler
          Parameters:
          -
          key - Key
          +
          handle - Handle
          Returns:
          Value Status
          @@ -453,11 +465,14 @@ implements

        • getExtra

          -
          public YAMLValue getExtra(java.lang.String key)
          +
          public YAMLValue getExtra(java.lang.String handle)
          +
          Description copied from interface: ExtraDataHandler
          Get an extra value
          +
          Specified by:
          +
          getExtra in interface ExtraDataHandler
          Parameters:
          -
          key - Key
          +
          handle - Handle
          Returns:
          Value
          @@ -466,14 +481,34 @@ implements -
          • diff --git a/Javadoc/SubServers.Bungee/net/ME1312/SubServers/Bungee/Host/package-tree.html b/Javadoc/SubServers.Bungee/net/ME1312/SubServers/Bungee/Host/package-tree.html index 4160f97d..cf71d201 100644 --- a/Javadoc/SubServers.Bungee/net/ME1312/SubServers/Bungee/Host/package-tree.html +++ b/Javadoc/SubServers.Bungee/net/ME1312/SubServers/Bungee/Host/package-tree.html @@ -81,7 +81,7 @@
            • diff --git a/Javadoc/SubServers.Bungee/net/ME1312/SubServers/Bungee/Launch.html b/Javadoc/SubServers.Bungee/net/ME1312/SubServers/Bungee/Launch.html index 52a21c19..3675515d 100644 --- a/Javadoc/SubServers.Bungee/net/ME1312/SubServers/Bungee/Launch.html +++ b/Javadoc/SubServers.Bungee/net/ME1312/SubServers/Bungee/Launch.html @@ -201,7 +201,7 @@ extends java.lang.Object
            Launch SubServers/BungeeCord
            Parameters:
            -
            args -
            +
            args - Launch Arguments
            Throws:
            java.lang.Exception
            diff --git a/Javadoc/SubServers.Bungee/net/ME1312/SubServers/Bungee/Library/Config/YAMLSection.html b/Javadoc/SubServers.Bungee/net/ME1312/SubServers/Bungee/Library/Config/YAMLSection.html index 285cd60a..d600b561 100644 --- a/Javadoc/SubServers.Bungee/net/ME1312/SubServers/Bungee/Library/Config/YAMLSection.html +++ b/Javadoc/SubServers.Bungee/net/ME1312/SubServers/Bungee/Library/Config/YAMLSection.html @@ -17,7 +17,7 @@ catch(err) { } //--> -var methods = {"i0":10,"i1":10,"i2":10,"i3":10,"i4":10,"i5":10,"i6":10,"i7":10,"i8":10,"i9":10,"i10":10,"i11":10,"i12":10,"i13":10,"i14":10,"i15":10,"i16":10,"i17":10,"i18":10,"i19":10,"i20":10,"i21":10,"i22":10,"i23":10,"i24":10,"i25":10,"i26":10,"i27":10,"i28":10,"i29":10,"i30":10,"i31":10,"i32":10,"i33":10,"i34":10,"i35":10,"i36":10,"i37":10,"i38":10,"i39":10,"i40":10,"i41":10,"i42":10,"i43":10,"i44":10,"i45":10,"i46":10,"i47":10,"i48":10,"i49":10,"i50":10,"i51":10,"i52":10,"i53":10,"i54":10,"i55":10,"i56":10,"i57":10,"i58":10,"i59":10,"i60":10,"i61":10,"i62":10,"i63":10,"i64":10,"i65":10,"i66":10,"i67":10,"i68":10,"i69":10,"i70":10,"i71":10,"i72":10,"i73":10,"i74":10,"i75":10}; +var methods = {"i0":10,"i1":10,"i2":10,"i3":10,"i4":10,"i5":10,"i6":10,"i7":10,"i8":10,"i9":10,"i10":10,"i11":10,"i12":10,"i13":10,"i14":10,"i15":10,"i16":10,"i17":10,"i18":10,"i19":10,"i20":10,"i21":10,"i22":10,"i23":10,"i24":10,"i25":10,"i26":10,"i27":10,"i28":10,"i29":10,"i30":10,"i31":10,"i32":10,"i33":10,"i34":10,"i35":10,"i36":10,"i37":10,"i38":10,"i39":10,"i40":10,"i41":10,"i42":10,"i43":10,"i44":10,"i45":10,"i46":10,"i47":10,"i48":10,"i49":10,"i50":10,"i51":10,"i52":10,"i53":10,"i54":10,"i55":10,"i56":10,"i57":10,"i58":10,"i59":10,"i60":10,"i61":10,"i62":10,"i63":10,"i64":10,"i65":10,"i66":10,"i67":10,"i68":10,"i69":10,"i70":10,"i71":10,"i72":10,"i73":10,"i74":10,"i75":10,"i76":10,"i77":10}; var tabs = {65535:["t0","All Methods"],2:["t2","Instance Methods"],8:["t4","Concrete Methods"]}; var altColor = "altColor"; var rowColor = "rowColor"; @@ -133,7 +133,7 @@ extends java.lang.Object -YAMLSection(java.io.InputStream io) +YAMLSection(java.io.InputStream stream)
            Creates a YAML Section from an Input Stream
            @@ -148,7 +148,7 @@ extends java.lang.Object -YAMLSection(java.lang.String yaml) +YAMLSection(java.lang.String str)
            Creates a YAML Section from String
            @@ -174,65 +174,71 @@ extends java.lang.Object +YAMLSection +clone() +
            Clone this YAML Section
            + + + boolean contains(java.lang.String handle)
            Check if a Handle exists
            - + YAMLValue get(java.lang.String handle)
            Get an Object by Handle
            - + YAMLValue get(java.lang.String handle, java.lang.Object def)
            Get an Object by Handle
            - + YAMLValue get(java.lang.String handle, YAMLValue def)
            Get an Object by Handle
            - + boolean getBoolean(java.lang.String handle)
            Get a Boolean by Handle
            - + boolean getBoolean(java.lang.String handle, boolean def)
            Get a Boolean by Handle
            - + java.util.List<java.lang.Boolean> getBooleanList(java.lang.String handle)
            Get a Boolean List by Handle
            - + java.util.List<java.lang.Boolean> getBooleanList(java.lang.String handle, java.util.List<java.lang.Boolean> def)
            Get a Boolean List by Handle
            - + java.lang.String getColoredString(java.lang.String handle, char color)
            Get a Colored String by Handle
            - + java.lang.String getColoredString(java.lang.String handle, java.lang.String def, @@ -240,14 +246,14 @@ extends java.lang.Object
            Get a Colored String by Handle
            - + java.util.List<java.lang.String> getColoredStringList(java.lang.String handle, char color)
            Get a Colored String List by Handle
            - + java.util.List<java.lang.String> getColoredStringList(java.lang.String handle, java.util.List<java.lang.String> def, @@ -255,404 +261,411 @@ extends java.lang.Object
            Get a Colored String List by Handle
            - + double getDouble(java.lang.String handle)
            Get a Double by Handle
            - + double getDouble(java.lang.String handle, double def)
            Get a Double by Handle
            - + java.util.List<java.lang.Double> getDoubleList(java.lang.String handle)
            Get a Double List by Handle
            - + java.util.List<java.lang.Double> getDoubleList(java.lang.String handle, java.util.List<java.lang.Double> def)
            Get a Double List by Handle
            - + float getFloat(java.lang.String handle)
            Get a Float by Handle
            - + float getFloat(java.lang.String handle, float def)
            Get a Float by Handle
            - + java.util.List<java.lang.Float> getFloatList(java.lang.String handle)
            Get a Float List by Handle
            - + java.util.List<java.lang.Float> getFloatList(java.lang.String handle, float def)
            Get a Float List by Handle
            - + int getInt(java.lang.String handle)
            Get an Integer by Handle
            - + int getInt(java.lang.String handle, int def)
            Get an Integer by Handle
            - + java.util.List<java.lang.Integer> getIntList(java.lang.String handle)
            Get an Integer List by Handle
            - + java.util.List<java.lang.Integer> getIntList(java.lang.String handle, java.util.List<java.lang.Integer> def)
            Get an Integer List by Handle
            - + java.util.Set<java.lang.String> getKeys()
            Get the Keys
            - + java.util.List<YAMLValue> getList(java.lang.String handle)
            Get a List by Handle
            - + java.util.List<YAMLValue> getList(java.lang.String handle, java.util.Collection<?> def)
            Get a List by Handle
            - + java.util.List<YAMLValue> getList(java.lang.String handle, java.util.List<? extends YAMLValue> def)
            Get a List by Handle
            - + long getLong(java.lang.String handle)
            Get a Long by Handle
            - + long getLong(java.lang.String handle, long def)
            Get a Long by Handle
            - + java.util.List<java.lang.Long> getLongList(java.lang.String handle)
            Get a Long List by Handle
            - + java.util.List<java.lang.Long> getLongList(java.lang.String handle, java.util.List<java.lang.Long> def)
            Get a Long List by Handle
            - + java.lang.Object getObject(java.lang.String handle)
            Get a Object by Handle
            - + java.lang.Object getObject(java.lang.String handle, java.lang.Object def)
            Get a Object by Handle
            - + java.util.List<?> getObjectList(java.lang.String handle)
            Get a Object List by Handle
            - + java.util.List<?> getObjectList(java.lang.String handle, java.util.List<?> def)
            Get a Object List by Handle
            - + java.lang.String getRawString(java.lang.String handle)
            Get an Unparsed String by Handle
            - + java.lang.String getRawString(java.lang.String handle, java.lang.String def)
            Get an Unparsed String by Handle
            - + java.util.List<java.lang.String> getRawStringList(java.lang.String handle)
            Get an Unparsed String List by Handle
            - + java.util.List<java.lang.String> getRawStringList(java.lang.String handle, java.util.List<java.lang.String> def)
            Get an Unparsed String List by Handle
            - + YAMLSection getSection(java.lang.String handle)
            Get a YAML Section by Handle
            - + YAMLSection getSection(java.lang.String handle, java.util.Map<java.lang.String,?> def)
            Get a YAML Section by Handle
            - + YAMLSection getSection(java.lang.String handle, YAMLSection def)
            Get a YAML Section by Handle
            - + java.util.List<YAMLSection> getSectionList(java.lang.String handle)
            Get a YAML Section List by Handle
            - + java.util.List<YAMLSection> getSectionList(java.lang.String handle, java.util.Collection<? extends java.util.Map<java.lang.String,?>> def)
            Get a YAML Section List by Handle
            - + java.util.List<YAMLSection> getSectionList(java.lang.String handle, java.util.List<? extends YAMLSection> def)
            Get a YAML Section List by Handle
            - + short getShort(java.lang.String handle)
            Get a Short by Handle
            - + short getShort(java.lang.String handle, short def)
            Get a Short by Handle
            - + java.util.List<java.lang.Short> getShortList(java.lang.String handle)
            Get a Short List by Handle
            - + java.util.List<java.lang.Short> getShortList(java.lang.String handle, java.util.List<java.lang.Short> def)
            Get a Short List by Handle
            - + java.lang.String getString(java.lang.String handle)
            Get a String by Handle
            - + java.lang.String getString(java.lang.String handle, java.lang.String def)
            Get a String by Handle
            - + java.util.List<java.lang.String> getStringList(java.lang.String handle)
            Get a String List by Handle
            - + java.util.List<java.lang.String> getStringList(java.lang.String handle, java.util.List<java.lang.String> def)
            Get a String List by Handle
            - + java.util.UUID getUUID(java.lang.String handle)
            Get a UUID by Handle
            - + java.util.UUID getUUID(java.lang.String handle, java.util.UUID def)
            Get a UUID by Handle
            - + java.util.List<java.util.UUID> getUUIDList(java.lang.String handle)
            Get a UUID List by Handle
            - + java.util.List<java.util.UUID> getUUIDList(java.lang.String handle, java.util.List<java.util.UUID> def)
            Get a UUID List by Handle
            - + java.util.Collection<YAMLValue> getValues()
            Get the Values
            - + boolean isBoolean(java.lang.String handle)
            Check if object is a Boolean by Handle
            - + boolean isDouble(java.lang.String handle)
            Check if object is a Double by Handle
            - + boolean isFloat(java.lang.String handle)
            Check if object is a Float by Handle
            - + boolean isInt(java.lang.String handle)
            Check if object is an Integer by Handle
            - + boolean isList(java.lang.String handle)
            Check if object is a List by Handle
            - + boolean isLong(java.lang.String handle)
            Check if object is a Long by Handle
            - + boolean isSection(java.lang.String handle)
            Check if object is a YAML Section by Handle
            - + boolean isString(java.lang.String handle)
            Check if object is a String by Handle
            - + boolean isUUID(java.lang.String handle)
            Check if object is a UUID by Handle
            - + void remove(java.lang.String handle)
            Remove an Object by Handle
            - + +<V> void +set(java.lang.String handle, + java.util.Collection<V> list) +
            Set Collection<V> into this YAML Section
            + + + void set(java.lang.String handle, java.lang.Object value)
            Set Object into this YAML Section
            - + void setAll(java.util.Map<java.lang.String,?> values)
            Set All Objects into this YAML Section
            - + void setAll(YAMLSection values)
            Copy YAML Values to this YAML Section
            - + YAMLSection superSection()
            Go up a level in the config (or null if this is the top layer)
            - + org.json.JSONObject toJSON()
            Convert to JSON
            - + java.lang.String toString()  @@ -694,12 +707,12 @@ extends java.lang.Object

            • YAMLSection

              -
              public YAMLSection(java.io.InputStream io)
+
              public YAMLSection(java.io.InputStream stream)
             throws org.yaml.snakeyaml.error.YAMLException
              
 
              Creates a YAML Section from an Input Stream
              
 
              
 
              Parameters:
              
-
              io - Input Stream
              
+
              stream - Input Stream
              
 
              Throws:
              
 
              org.yaml.snakeyaml.error.YAMLException
              
 
              
@@ -742,12 +755,12 @@ extends java.lang.Object

              • YAMLSection

                -
                public YAMLSection(java.lang.String yaml)
+
                public YAMLSection(java.lang.String str)
             throws org.yaml.snakeyaml.error.YAMLException
                
 
                Creates a YAML Section from String
                
 
                
 
                Parameters:
                
-
                yaml - String
                
+
                str - String
                
 
                Throws:
                
 
                org.yaml.snakeyaml.error.YAMLException
                
 
                
@@ -845,6 +858,24 @@ extends java.lang.Object
              + + + +
                +
              • +

                set

                +
                public <V> void set(java.lang.String handle,
+                    java.util.Collection<V> list)
                +
                Set Collection<V> into this YAML Section
                +
                +
                Type Parameters:
                +
                V - Collection Type
                +
                Parameters:
                +
                handle - Handle
                +
                list - Value
                +
                +
                • +
              @@ -887,6 +918,21 @@ extends java.lang.Object
            + + + +
              +
            • +

              clone

              +
              public YAMLSection clone()
              +
              Clone this YAML Section
              +
              +
              Overrides:
              +
              clone in class java.lang.Object
              +
              Returns:
              +
              +
              • +
            diff --git a/Javadoc/SubServers.Bungee/net/ME1312/SubServers/Bungee/Library/Container.html b/Javadoc/SubServers.Bungee/net/ME1312/SubServers/Bungee/Library/Container.html index e0de3309..8c070036 100644 --- a/Javadoc/SubServers.Bungee/net/ME1312/SubServers/Bungee/Library/Container.html +++ b/Javadoc/SubServers.Bungee/net/ME1312/SubServers/Bungee/Library/Container.html @@ -48,7 +48,7 @@ var activeTableTab = "activeTableTab";
            • Frames
              • @@ -271,7 +271,7 @@ extends java.lang.Object
              • Frames
                • diff --git a/Javadoc/SubServers.Bungee/net/ME1312/SubServers/Bungee/Library/ExtraDataHandler.html b/Javadoc/SubServers.Bungee/net/ME1312/SubServers/Bungee/Library/ExtraDataHandler.html new file mode 100644 index 00000000..de30f3c2 --- /dev/null +++ b/Javadoc/SubServers.Bungee/net/ME1312/SubServers/Bungee/Library/ExtraDataHandler.html @@ -0,0 +1,317 @@ + + + + + +ExtraDataHandler (SubServers.Bungee) + + + + + + + +
                + + +
                Skip navigation links
                + + + + +
                +
                + + + +
                + +
                +
                +
                  +
                • Summary: 
                  • +
                • Nested | 
                  • +
                • Field | 
                  • +
                • Constr | 
                  • +
                • Method
                  • +
                +
                  +
                • Detail: 
                  • +
                • Field | 
                  • +
                • Constr | 
                  • +
                • Method
                  • +
                +
                + + +
                + + +
                +
                net.ME1312.SubServers.Bungee.Library
                +

                Interface ExtraDataHandler

                +
                +
                +
                + +
                +
                +
                  +
                • + +
                    +
                  • + + +

                    Method Summary

                    + + + + + + + + + + + + + + + + + + + + + + + + + + +
                    All Methods Instance Methods Abstract Methods 
                    Modifier and TypeMethod and Description
                    voidaddExtra(java.lang.String handle, + java.lang.Object value) +
                    Add an extra value to this Server
                    +
                    YAMLSectiongetExtra() +
                    Get the extra value section
                    +
                    YAMLValuegetExtra(java.lang.String handle) +
                    Get an extra value
                    +
                    booleanhasExtra(java.lang.String handle) +
                    Determine if an extra value exists
                    +
                    voidremoveExtra(java.lang.String handle) +
                    Remove an extra value from this Server
                    +
                    +
                    • +
                  +
                  • +
                +
                +
                +
                  +
                • + +
                    +
                  • + + +

                    Method Detail

                    + + + +
                      +
                    • +

                      addExtra

                      +
                      void addExtra(java.lang.String handle,
+              java.lang.Object value)
                      +
                      Add an extra value to this Server
                      +
                      +
                      Parameters:
                      +
                      handle - Handle
                      +
                      value - Value
                      +
                      +
                      • +
                    + + + +
                      +
                    • +

                      hasExtra

                      +
                      boolean hasExtra(java.lang.String handle)
                      +
                      Determine if an extra value exists
                      +
                      +
                      Parameters:
                      +
                      handle - Handle
                      +
                      Returns:
                      +
                      Value Status
                      +
                      +
                      • +
                    + + + +
                      +
                    • +

                      getExtra

                      +
                      YAMLValue getExtra(java.lang.String handle)
                      +
                      Get an extra value
                      +
                      +
                      Parameters:
                      +
                      handle - Handle
                      +
                      Returns:
                      +
                      Value
                      +
                      +
                      • +
                    + + + +
                      +
                    • +

                      getExtra

                      +
                      YAMLSection getExtra()
                      +
                      Get the extra value section
                      +
                      +
                      Returns:
                      +
                      Extra Value Section
                      +
                      +
                      • +
                    + + + +
                      +
                    • +

                      removeExtra

                      +
                      void removeExtra(java.lang.String handle)
                      +
                      Remove an extra value from this Server
                      +
                      +
                      Parameters:
                      +
                      handle - Handle
                      +
                      +
                      • +
                    +
                    • +
                  +
                  • +
                +
                +
                + + +
                + + +
                Skip navigation links
                + + + + +
                +
                + + + +
                + +
                +
                +
                  +
                • Summary: 
                  • +
                • Nested | 
                  • +
                • Field | 
                  • +
                • Constr | 
                  • +
                • Method
                  • +
                +
                  +
                • Detail: 
                  • +
                • Field | 
                  • +
                • Constr | 
                  • +
                • Method
                  • +
                +
                + + +
                + + + 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 ad31f991..7ddf02c8 100644 --- a/Javadoc/SubServers.Bungee/net/ME1312/SubServers/Bungee/Library/JSONCallback.html +++ b/Javadoc/SubServers.Bungee/net/ME1312/SubServers/Bungee/Library/JSONCallback.html @@ -47,7 +47,7 @@ var activeTableTab = "activeTableTab";
                @@ -181,7 +181,7 @@ var activeTableTab = "activeTableTab";
                diff --git a/Javadoc/SubServers.Bungee/net/ME1312/SubServers/Bungee/Library/Util.ExceptionRunnable.html b/Javadoc/SubServers.Bungee/net/ME1312/SubServers/Bungee/Library/Util.ExceptionRunnable.html new file mode 100644 index 00000000..bf364640 --- /dev/null +++ b/Javadoc/SubServers.Bungee/net/ME1312/SubServers/Bungee/Library/Util.ExceptionRunnable.html @@ -0,0 +1,227 @@ + + + + + +Util.ExceptionRunnable (SubServers.Bungee) + + + + + + + +
                + + +
                Skip navigation links
                + + + + +
                +
                + + + +
                + +
                +
                +
                  +
                • Summary: 
                  • +
                • Nested | 
                  • +
                • Field | 
                  • +
                • Constr | 
                  • +
                • Method
                  • +
                +
                  +
                • Detail: 
                  • +
                • Field | 
                  • +
                • Constr | 
                  • +
                • Method
                  • +
                +
                + + +
                + + +
                +
                net.ME1312.SubServers.Bungee.Library
                +

                Interface Util.ExceptionRunnable

                +
                +
                +
                +
                  +
                • +
                  +
                  Enclosing class:
                  +
                  Util
                  +
                  +
                  +
                  +
                  public static interface Util.ExceptionRunnable
                  +
                  • +
                +
                +
                + +
                +
                +
                  +
                • + +
                    +
                  • + + +

                    Method Detail

                    + + + +
                      +
                    • +

                      run

                      +
                      void run()
+  throws java.lang.Throwable
                      +
                      +
                      Throws:
                      +
                      java.lang.Throwable
                      +
                      +
                      • +
                    +
                    • +
                  +
                  • +
                +
                +
                + + +
                + + +
                Skip navigation links
                + + + + +
                +
                + + + +
                + +
                +
                +
                  +
                • Summary: 
                  • +
                • Nested | 
                  • +
                • Field | 
                  • +
                • Constr | 
                  • +
                • Method
                  • +
                +
                  +
                • Detail: 
                  • +
                • Field | 
                  • +
                • Constr | 
                  • +
                • Method
                  • +
                +
                + + +
                + + + 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 9261fea3..0961964f 100644 --- a/Javadoc/SubServers.Bungee/net/ME1312/SubServers/Bungee/Library/Util.html +++ b/Javadoc/SubServers.Bungee/net/ME1312/SubServers/Bungee/Library/Util.html @@ -48,7 +48,7 @@ var activeTableTab = "activeTableTab";
                • Frames
                  • @@ -72,7 +72,7 @@ var activeTableTab = "activeTableTab";
                  • Summary: 
                    • -
                  • Nested | 
                    • +
                  • Nested | 
                  • Field | 
                  • Constr | 
                  • Method
                    • @@ -116,6 +116,25 @@ extends java.lang.Object
                    • + +
                        +
                      • + + +

                        Nested Class Summary

                        + + + + + + + + + + +
                        Nested Classes 
                        Modifier and TypeClass and Description
                        static interface Util.ExceptionRunnable 
                        +
                        • +
                      - +

                      • isException

                        -
                        public static boolean isException(java.lang.Runnable runnable)
                        +
                        public static boolean isException(Util.ExceptionRunnable runnable)
                        Determines if an Exception will occur
                        Parameters:
                        @@ -293,7 +312,7 @@ extends java.lang.Object
                        • Frames
                          • @@ -317,7 +336,7 @@ extends java.lang.Object
                          • Summary: 
                            • -
                          • Nested | 
                            • +
                          • Nested | 
                          • Field | 
                          • Constr | 
                          • Method
                            • 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 f3d3ce51..160242ac 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 @@ -12,8 +12,10 @@

                            Interfaces

                            Classes

                              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 34583cc9..66809a1f 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 @@ -81,17 +81,27 @@ +ExtraDataHandler + +
                              Extra Data Handler Layout Class
                              + + + JSONCallback
                              JSON Callback Class
                              - + SubEvent
                              SubEvent Layout Class
                              + +Util.ExceptionRunnable +  + 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 c7cf52cd..9a636adb 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 @@ -95,8 +95,10 @@

                            Interface Hierarchy

                            diff --git a/Javadoc/SubServers.Bungee/net/ME1312/SubServers/Bungee/Network/Packet/PacketLinkServer.html b/Javadoc/SubServers.Bungee/net/ME1312/SubServers/Bungee/Network/Packet/PacketLinkServer.html index 58bb0c90..188f4ebd 100644 --- a/Javadoc/SubServers.Bungee/net/ME1312/SubServers/Bungee/Network/Packet/PacketLinkServer.html +++ b/Javadoc/SubServers.Bungee/net/ME1312/SubServers/Bungee/Network/Packet/PacketLinkServer.html @@ -111,7 +111,7 @@ var activeTableTab = "activeTableTab";

                        -
                        public final class PacketLinkServer
+
                        public class PacketLinkServer
 extends java.lang.Object
 implements PacketIn, PacketOut
                        
 
                        Link Server Packet
                        
diff --git a/Javadoc/SubServers.Bungee/net/ME1312/SubServers/Bungee/Network/SubDataServer.html b/Javadoc/SubServers.Bungee/net/ME1312/SubServers/Bungee/Network/SubDataServer.html
index 525a7544..c984d695 100644
--- a/Javadoc/SubServers.Bungee/net/ME1312/SubServers/Bungee/Network/SubDataServer.html
+++ b/Javadoc/SubServers.Bungee/net/ME1312/SubServers/Bungee/Network/SubDataServer.html
@@ -17,7 +17,7 @@
     catch(err) {
     }
 //-->
-var methods = {"i0":10,"i1":9,"i2":10,"i3":9,"i4":10,"i5":10,"i6":10,"i7":9,"i8":10,"i9":9,"i10":9,"i11":10,"i12":10};
+var methods = {"i0":10,"i1":9,"i2":10,"i3":9,"i4":10,"i5":10,"i6":10,"i7":10,"i8":9,"i9":10,"i10":9,"i11":9,"i12":10,"i13":10,"i14":9,"i15":9};
 var tabs = {65535:["t0","All Methods"],1:["t1","Static Methods"],2:["t2","Instance Methods"],8:["t4","Concrete Methods"]};
 var altColor = "altColor";
 var rowColor = "rowColor";
@@ -194,43 +194,61 @@ extends java.lang.Object
                        +java.util.Collection<Client> +getClients() +
                        Grabs all the Clients from the Network
                        + + + static java.util.List<? extends PacketIn> getPacket(java.lang.String handle)
                        Grab PacketIn Instances via handle
                        - + java.net.ServerSocket getServer()
                        Gets the Server Socket
                        - + static void registerPacket(java.lang.Class<? extends PacketOut> packet, java.lang.String handle)
                        Register PacketOut to the Network
                        - + static void registerPacket(PacketIn packet, java.lang.String handle)
                        Register PacketIn to the Network
                        - + void removeClient(Client client)
                        Remove a Client from the Network
                        - + void removeClient(java.net.InetSocketAddress address)
                        Remove a Client from the Network
                        + +static void +unregisterPacket(java.lang.Class<? extends PacketOut> packet) +
                        Unregister PacketOut to the Network
                        + + + +static void +unregisterPacket(PacketIn packet) +
                        Unregister PacketIn from the Network
                        + + + + + +
                          +
                        • +

                          getClients

                          +
                          public java.util.Collection<Client> getClients()
                          +
                          Grabs all the Clients from the Network
                          +
                          +
                          Returns:
                          +
                          Client List
                          +
                          +
                          • +
                        @@ -397,6 +429,20 @@ extends java.lang.Object
                      + + + +
                        +
                      • +

                        unregisterPacket

                        +
                        public static void unregisterPacket(PacketIn packet)
                        +
                        Unregister PacketIn from the Network
                        +
                        +
                        Parameters:
                        +
                        packet - PacketIn to unregister
                        +
                        +
                        • +
                      @@ -413,6 +459,20 @@ extends java.lang.Object
                    + + + +
                      +
                    • +

                      unregisterPacket

                      +
                      public static void unregisterPacket(java.lang.Class<? extends PacketOut> packet)
                      +
                      Unregister PacketOut to the Network
                      +
                      +
                      Parameters:
                      +
                      packet - PacketOut to unregister
                      +
                      +
                      • +
                    diff --git a/Javadoc/SubServers.Bungee/net/ME1312/SubServers/Bungee/SubCommand.BungeeList.html b/Javadoc/SubServers.Bungee/net/ME1312/SubServers/Bungee/SubCommand.BungeeList.html index e6e40dfc..94a474b1 100644 --- a/Javadoc/SubServers.Bungee/net/ME1312/SubServers/Bungee/SubCommand.BungeeList.html +++ b/Javadoc/SubServers.Bungee/net/ME1312/SubServers/Bungee/SubCommand.BungeeList.html @@ -116,8 +116,9 @@ var activeTableTab = "activeTableTab";

                    -
                    public static class SubCommand.BungeeList
+
                    public static final class SubCommand.BungeeList
 extends net.md_5.bungee.api.plugin.Command
                    
+
                    BungeeCord /glist
                  @@ -139,7 +140,9 @@ extends net.md_5.bungee.api.plugin.Command void execute(net.md_5.bungee.api.CommandSender sender, - java.lang.String[] args)  + java.lang.String[] args)                   +
                  Override /glist
                  +
                    @@ -178,9 +181,13 @@ extends net.md_5.bungee.api.plugin.Command

                    execute

                    public void execute(net.md_5.bungee.api.CommandSender sender,
                     java.lang.String[] args)
                    +
                    Override /glist
                    Specified by:
                    execute in class net.md_5.bungee.api.plugin.Command
                    +
                    Parameters:
                    +
                    sender -
                    +
                    args -
                  diff --git a/Javadoc/SubServers.Bungee/net/ME1312/SubServers/Bungee/SubCommand.BungeeServer.html b/Javadoc/SubServers.Bungee/net/ME1312/SubServers/Bungee/SubCommand.BungeeServer.html index f3670fb5..977607c1 100644 --- a/Javadoc/SubServers.Bungee/net/ME1312/SubServers/Bungee/SubCommand.BungeeServer.html +++ b/Javadoc/SubServers.Bungee/net/ME1312/SubServers/Bungee/SubCommand.BungeeServer.html @@ -120,9 +120,10 @@ var activeTableTab = "activeTableTab";

                  -
                  public static class SubCommand.BungeeServer
+
                  public static final class SubCommand.BungeeServer
 extends net.md_5.bungee.api.plugin.Command
 implements net.md_5.bungee.api.plugin.TabExecutor
                  
+
                  BungeeCord /server
                @@ -144,12 +145,16 @@ implements net.md_5.bungee.api.plugin.TabExecutor void execute(net.md_5.bungee.api.CommandSender sender, - java.lang.String[] args)  + java.lang.String[] args)                 +
                Override /server
                + java.lang.Iterable<java.lang.String> onTabComplete(net.md_5.bungee.api.CommandSender sender, - java.lang.String[] args)  + java.lang.String[] args) +
                Tab completer
                +
                  @@ -188,9 +193,13 @@ implements net.md_5.bungee.api.plugin.TabExecutor

                  execute

                  public void execute(net.md_5.bungee.api.CommandSender sender,
                     java.lang.String[] args)
                  +
                  Override /server
                  Specified by:
                  execute in class net.md_5.bungee.api.plugin.Command
                  +
                  Parameters:
                  +
                  sender - Sender
                  +
                  args - Arguments
                @@ -202,9 +211,15 @@ implements net.md_5.bungee.api.plugin.TabExecutor

                onTabComplete

                public java.lang.Iterable<java.lang.String> onTabComplete(net.md_5.bungee.api.CommandSender sender,
                                                           java.lang.String[] args)
                +
                Tab completer
                Specified by:
                onTabComplete in interface net.md_5.bungee.api.plugin.TabExecutor
                +
                Parameters:
                +
                sender - Sender
                +
                args - Arguments
                +
                Returns:
                +
                Tab completes
              diff --git a/Javadoc/SubServers.Bungee/net/ME1312/SubServers/Bungee/SubCommand.html b/Javadoc/SubServers.Bungee/net/ME1312/SubServers/Bungee/SubCommand.html index ed6c43a2..969a7563 100644 --- a/Javadoc/SubServers.Bungee/net/ME1312/SubServers/Bungee/SubCommand.html +++ b/Javadoc/SubServers.Bungee/net/ME1312/SubServers/Bungee/SubCommand.html @@ -140,11 +140,15 @@ implements net.md_5.bungee.api.plugin.TabExecutor static class  -SubCommand.BungeeList  +SubCommand.BungeeList +
              BungeeCord /glist
              + static class  -SubCommand.BungeeServer  +SubCommand.BungeeServer +
              BungeeCord /server
              + @@ -165,13 +169,15 @@ implements net.md_5.bungee.api.plugin.TabExecutor void execute(net.md_5.bungee.api.CommandSender sender, java.lang.String[] args) -
              Load /Sub in console
              +
              Load /sub in console
              java.lang.Iterable<java.lang.String> onTabComplete(net.md_5.bungee.api.CommandSender sender, - java.lang.String[] args)  + java.lang.String[] args) +
              Tab complete for players
              +
                @@ -210,13 +216,13 @@ implements net.md_5.bungee.api.plugin.TabExecutor

                execute

                public void execute(net.md_5.bungee.api.CommandSender sender,
                     java.lang.String[] args)
                -
                Load /Sub in console
                +
                Load /sub in console
                Specified by:
                execute in class net.md_5.bungee.api.plugin.Command
                Parameters:
                -
                sender -
                -
                args -
                +
                sender - Sender
                +
                args - Arguments
              @@ -228,9 +234,15 @@ implements net.md_5.bungee.api.plugin.TabExecutor

              onTabComplete

              public java.lang.Iterable<java.lang.String> onTabComplete(net.md_5.bungee.api.CommandSender sender,
                                                           java.lang.String[] args)
              +
              Tab complete for players
              Specified by:
              onTabComplete in interface net.md_5.bungee.api.plugin.TabExecutor
              +
              Parameters:
              +
              sender - Sender
              +
              args - Arguments
              +
              Returns:
              +
              Tab completes
            diff --git a/Javadoc/SubServers.Bungee/net/ME1312/SubServers/Bungee/SubPlugin.html b/Javadoc/SubServers.Bungee/net/ME1312/SubServers/Bungee/SubPlugin.html index b170bfc6..ef29a12f 100644 --- a/Javadoc/SubServers.Bungee/net/ME1312/SubServers/Bungee/SubPlugin.html +++ b/Javadoc/SubServers.Bungee/net/ME1312/SubServers/Bungee/SubPlugin.html @@ -143,29 +143,37 @@ extends net.md_5.bungee.BungeeCord api  +Version +bversion  + + YAMLConfig config  - + UniversalFile dir  - + java.util.HashMap<java.lang.String,java.lang.String> exLang  - + java.util.HashMap<java.lang.String,Server> exServers  - + java.util.HashMap<java.lang.String,Host> hosts  - + YAMLConfig lang  + +java.io.PrintStream +out  + SubDataServer subdata  @@ -205,7 +213,7 @@ extends net.md_5.bungee.BungeeCord void startListeners() -
            Load Hosts, Servers, SubServers, and SubData.
            +
            Load Hosts, Servers, SubServers, and SubData Direct
            @@ -280,6 +288,15 @@ extends net.md_5.bungee.BungeeCord 
            public final java.util.HashMap<java.lang.String,Host> hosts
          + + + +
            +
          • +

            out

            +
            public final java.io.PrintStream out
            +
            • +
          @@ -334,6 +351,15 @@ extends net.md_5.bungee.BungeeCord 
          public final Version version
        + + + +
          +
        • +

          bversion

          +
          public final Version bversion
          +
          • +
        @@ -358,7 +384,7 @@ extends net.md_5.bungee.BungeeCord

      • startListeners

        public void startListeners()
        -
        Load Hosts, Servers, SubServers, and SubData.
        +
        Load Hosts, Servers, SubServers, and SubData Direct
        Overrides:
        startListeners in class net.md_5.bungee.BungeeCord
        diff --git a/Javadoc/SubServers.Bungee/net/ME1312/SubServers/Bungee/package-summary.html b/Javadoc/SubServers.Bungee/net/ME1312/SubServers/Bungee/package-summary.html index b6a06ae4..62ec1916 100644 --- a/Javadoc/SubServers.Bungee/net/ME1312/SubServers/Bungee/package-summary.html +++ b/Javadoc/SubServers.Bungee/net/ME1312/SubServers/Bungee/package-summary.html @@ -100,11 +100,15 @@ SubCommand.BungeeList -  + +
        BungeeCord /glist
        + SubCommand.BungeeServer -  + +
        BungeeCord /server
        + SubPlugin diff --git a/Javadoc/SubServers.Bungee/overview-tree.html b/Javadoc/SubServers.Bungee/overview-tree.html index 57952cf9..138e5336 100644 --- a/Javadoc/SubServers.Bungee/overview-tree.html +++ b/Javadoc/SubServers.Bungee/overview-tree.html @@ -90,7 +90,7 @@
        @@ -1130,9 +1132,17 @@
        Creates a File.
        +
        unregisterPacket(PacketIn) - Static method in class net.ME1312.SubServers.Client.Bukkit.Network.SubDataClient
        +
        +
        Unregister PacketIn from the Network
        +
        +
        unregisterPacket(Class<? extends PacketOut>) - Static method in class net.ME1312.SubServers.Client.Bukkit.Network.SubDataClient
        +
        +
        Unregister PacketOut to the Network
        +
        Util - Class in net.ME1312.SubServers.Client.Bukkit.Library
         
        -
        Util() - Constructor for class net.ME1312.SubServers.Client.Bukkit.Library.Util
        +
        Util.ExceptionRunnable - Interface in net.ME1312.SubServers.Client.Bukkit.Library
         
        diff --git a/Javadoc/SubServers.Client.Bukkit/net/ME1312/SubServers/Client/Bukkit/Library/Util.ExceptionRunnable.html b/Javadoc/SubServers.Client.Bukkit/net/ME1312/SubServers/Client/Bukkit/Library/Util.ExceptionRunnable.html new file mode 100644 index 00000000..dd5c9ec0 --- /dev/null +++ b/Javadoc/SubServers.Client.Bukkit/net/ME1312/SubServers/Client/Bukkit/Library/Util.ExceptionRunnable.html @@ -0,0 +1,227 @@ + + + + + +Util.ExceptionRunnable (SubServers.Client.Bukkit) + + + + + + + +
        + + +
        Skip navigation links
        + + + + +
        +
        + + + +
        + +
        +
        +
          +
        • Summary: 
          • +
        • Nested | 
          • +
        • Field | 
          • +
        • Constr | 
          • +
        • Method
          • +
        +
          +
        • Detail: 
          • +
        • Field | 
          • +
        • Constr | 
          • +
        • Method
          • +
        +
        + + +
        + + +
        +
        net.ME1312.SubServers.Client.Bukkit.Library
        +

        Interface Util.ExceptionRunnable

        +
        +
        +
        +
          +
        • +
          +
          Enclosing class:
          +
          Util
          +
          +
          +
          +
          public static interface Util.ExceptionRunnable
          +
          • +
        +
        +
        + +
        +
        +
          +
        • + +
            +
          • + + +

            Method Detail

            + + + +
              +
            • +

              run

              +
              void run()
+  throws java.lang.Throwable
              +
              +
              Throws:
              +
              java.lang.Throwable
              +
              +
              • +
            +
            • +
          +
          • +
        +
        +
        + + +
        + + +
        Skip navigation links
        + + + + +
        +
        + + + +
        + +
        +
        +
          +
        • Summary: 
          • +
        • Nested | 
          • +
        • Field | 
          • +
        • Constr | 
          • +
        • Method
          • +
        +
          +
        • Detail: 
          • +
        • Field | 
          • +
        • Constr | 
          • +
        • Method
          • +
        +
        + + +
        + + + 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 aa0965b0..0bfeb464 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 @@ -48,7 +48,7 @@ var activeTableTab = "activeTableTab";
        • Frames
          • @@ -72,15 +72,15 @@ var activeTableTab = "activeTableTab";
          @@ -115,19 +115,21 @@ extends java.lang.Object
          • - +
              -
            • +
            • -

              Constructor Summary

              - - +

              Nested Class Summary

              +
              Constructors 
              + - + + - + +
              Nested Classes 
              Constructor and DescriptionModifier and TypeClass and Description
              Util() static interface Util.ExceptionRunnable 
              • @@ -152,7 +154,7 @@ extends java.lang.Object static boolean -isException(java.lang.Runnable runnable)  +isException(Util.ExceptionRunnable runnable)  static boolean @@ -182,23 +184,6 @@ extends java.lang.Object
              • - -
                  -
                • - - -

                  Constructor Detail

                  - - - -
                    -
                  • -

                    Util

                    -
                    public Util()
                    -
                    • -
                  -
                  • -
                - +

                • isException

                  -
                  public static boolean isException(java.lang.Runnable runnable)
                  +
                  public static boolean isException(Util.ExceptionRunnable runnable)
                @@ -285,7 +270,7 @@ extends java.lang.Object
                • Frames
                  • @@ -309,15 +294,15 @@ extends java.lang.Object
                  diff --git a/Javadoc/SubServers.Client.Bukkit/net/ME1312/SubServers/Client/Bukkit/Library/package-frame.html b/Javadoc/SubServers.Client.Bukkit/net/ME1312/SubServers/Client/Bukkit/Library/package-frame.html index bc3444c3..fc5646b4 100644 --- a/Javadoc/SubServers.Client.Bukkit/net/ME1312/SubServers/Client/Bukkit/Library/package-frame.html +++ b/Javadoc/SubServers.Client.Bukkit/net/ME1312/SubServers/Client/Bukkit/Library/package-frame.html @@ -14,6 +14,7 @@

                  Classes

                    diff --git a/Javadoc/SubServers.Client.Bukkit/net/ME1312/SubServers/Client/Bukkit/Library/package-summary.html b/Javadoc/SubServers.Client.Bukkit/net/ME1312/SubServers/Client/Bukkit/Library/package-summary.html index a6b7cee3..763807d3 100644 --- a/Javadoc/SubServers.Client.Bukkit/net/ME1312/SubServers/Client/Bukkit/Library/package-summary.html +++ b/Javadoc/SubServers.Client.Bukkit/net/ME1312/SubServers/Client/Bukkit/Library/package-summary.html @@ -88,6 +88,10 @@ SubEvent   + +Util.ExceptionRunnable +  + diff --git a/Javadoc/SubServers.Client.Bukkit/net/ME1312/SubServers/Client/Bukkit/Library/package-tree.html b/Javadoc/SubServers.Client.Bukkit/net/ME1312/SubServers/Client/Bukkit/Library/package-tree.html index ec79d0f0..47e2be42 100644 --- a/Javadoc/SubServers.Client.Bukkit/net/ME1312/SubServers/Client/Bukkit/Library/package-tree.html +++ b/Javadoc/SubServers.Client.Bukkit/net/ME1312/SubServers/Client/Bukkit/Library/package-tree.html @@ -97,6 +97,7 @@
                diff --git a/Javadoc/SubServers.Client.Bukkit/net/ME1312/SubServers/Client/Bukkit/Network/Packet/PacketLinkServer.html b/Javadoc/SubServers.Client.Bukkit/net/ME1312/SubServers/Client/Bukkit/Network/Packet/PacketLinkServer.html index 0a7e2da2..8b6dc6c4 100644 --- a/Javadoc/SubServers.Client.Bukkit/net/ME1312/SubServers/Client/Bukkit/Network/Packet/PacketLinkServer.html +++ b/Javadoc/SubServers.Client.Bukkit/net/ME1312/SubServers/Client/Bukkit/Network/Packet/PacketLinkServer.html @@ -111,7 +111,7 @@ var activeTableTab = "activeTableTab";

                -
                public final class PacketLinkServer
+
                public class PacketLinkServer
 extends java.lang.Object
 implements PacketIn, PacketOut
                • diff --git a/Javadoc/SubServers.Client.Bukkit/net/ME1312/SubServers/Client/Bukkit/Network/SubDataClient.html b/Javadoc/SubServers.Client.Bukkit/net/ME1312/SubServers/Client/Bukkit/Network/SubDataClient.html index bd277f32..506c65cd 100644 --- a/Javadoc/SubServers.Client.Bukkit/net/ME1312/SubServers/Client/Bukkit/Network/SubDataClient.html +++ b/Javadoc/SubServers.Client.Bukkit/net/ME1312/SubServers/Client/Bukkit/Network/SubDataClient.html @@ -17,7 +17,7 @@ catch(err) { } //--> -var methods = {"i0":10,"i1":10,"i2":10,"i3":9,"i4":9,"i5":9,"i6":10}; +var methods = {"i0":10,"i1":10,"i2":10,"i3":9,"i4":9,"i5":9,"i6":10,"i7":9,"i8":9}; var tabs = {65535:["t0","All Methods"],1:["t1","Static Methods"],2:["t2","Instance Methods"],8:["t4","Concrete Methods"]}; var altColor = "altColor"; var rowColor = "rowColor"; @@ -177,14 +177,14 @@ extends java.lang.Object static void registerPacket(java.lang.Class<? extends PacketOut> packet, java.lang.String handle) -
                Register Packet to the Network
                +
                Register PacketOut to the Network
                static void registerPacket(PacketIn packet, java.lang.String handle) -
                Register Packet to the Network
                +
                Register PacketIn to the Network
                @@ -193,6 +193,18 @@ extends java.lang.Object
                Send Packet to Client
                + +static void +unregisterPacket(java.lang.Class<? extends PacketOut> packet) +
                Unregister PacketOut to the Network
                + + + +static void +unregisterPacket(PacketIn packet) +
                Unregister PacketIn from the Network
                + + + + + +
                  +
                • +

                  unregisterPacket

                  +
                  public static void unregisterPacket(PacketIn packet)
                  +
                  Unregister PacketIn from the Network
                  +
                  +
                  Parameters:
                  +
                  packet - PacketIn to unregister
                  +
                  +
                  • +
                @@ -297,7 +323,7 @@ extends java.lang.Object

                registerPacket

                public static void registerPacket(java.lang.Class<? extends PacketOut> packet,
                                   java.lang.String handle)
                -
                Register Packet to the Network
                +
                Register PacketOut to the Network
                Parameters:
                packet - PacketOut to register
                @@ -305,6 +331,20 @@ extends java.lang.Object
              + + + +
                +
              • +

                unregisterPacket

                +
                public static void unregisterPacket(java.lang.Class<? extends PacketOut> packet)
                +
                Unregister PacketOut to the Network
                +
                +
                Parameters:
                +
                packet - PacketOut to unregister
                +
                +
                • +
              diff --git a/Javadoc/SubServers.Client.Bukkit/overview-tree.html b/Javadoc/SubServers.Client.Bukkit/overview-tree.html index 1909aef4..234d32a4 100644 --- a/Javadoc/SubServers.Client.Bukkit/overview-tree.html +++ b/Javadoc/SubServers.Client.Bukkit/overview-tree.html @@ -175,6 +175,7 @@
            • net.ME1312.SubServers.Client.Bukkit.Network.PacketOut
            • net.ME1312.SubServers.Client.Bukkit.Graphic.Renderer
            • net.ME1312.SubServers.Client.Bukkit.Library.SubEvent
              • +
            • net.ME1312.SubServers.Client.Bukkit.Library.Util.ExceptionRunnable

            Enum Hierarchy

              diff --git a/SubServers.Bungee/META-INF/MANIFEST.MF b/SubServers.Bungee/META-INF/MANIFEST.MF index 27bfa088..ef526851 100644 --- a/SubServers.Bungee/META-INF/MANIFEST.MF +++ b/SubServers.Bungee/META-INF/MANIFEST.MF @@ -1,4 +1,6 @@ Manifest-Version: 1.0 Class-Path: BungeeCord.jar Main-Class: net.ME1312.SubServers.Bungee.Launch +Implementation-Version: 2.11.2e +Specification-Version: 3 diff --git a/SubServers.Bungee/src/net/ME1312/SubServers/Bungee/Host/Host.java b/SubServers.Bungee/src/net/ME1312/SubServers/Bungee/Host/Host.java index d999dc59..4cd707bd 100644 --- a/SubServers.Bungee/src/net/ME1312/SubServers/Bungee/Host/Host.java +++ b/SubServers.Bungee/src/net/ME1312/SubServers/Bungee/Host/Host.java @@ -1,9 +1,13 @@ package net.ME1312.SubServers.Bungee.Host; +import net.ME1312.SubServers.Bungee.Library.Config.YAMLSection; +import net.ME1312.SubServers.Bungee.Library.Config.YAMLValue; import net.ME1312.SubServers.Bungee.Library.Exception.InvalidHostException; import net.ME1312.SubServers.Bungee.Library.Exception.InvalidServerException; +import net.ME1312.SubServers.Bungee.Library.ExtraDataHandler; import net.ME1312.SubServers.Bungee.Library.NamedContainer; import net.ME1312.SubServers.Bungee.SubPlugin; +import org.json.JSONObject; import java.net.InetAddress; import java.util.Map; @@ -12,7 +16,8 @@ import java.util.UUID; /** * Host Layout Class */ -public abstract class Host { +public abstract class Host implements ExtraDataHandler { + private YAMLSection extra = new YAMLSection(); /** * This constructor is required to launch your host from the drivers list. Do not add or remove any arguments. @@ -244,4 +249,28 @@ public abstract class Host { */ public abstract boolean forceRemoveSubServer(UUID player, String name); + @Override + public void addExtra(String handle, Object value) { + extra.set(handle, value); + } + + @Override + public boolean hasExtra(String handle) { + return extra.getKeys().contains(handle); + } + + @Override + public YAMLValue getExtra(String handle) { + return extra.get(handle); + } + + @Override + public YAMLSection getExtra() { + return extra.clone(); + } + + @Override + public void removeExtra(String handle) { + extra.remove(handle); + } } diff --git a/SubServers.Bungee/src/net/ME1312/SubServers/Bungee/Host/Server.java b/SubServers.Bungee/src/net/ME1312/SubServers/Bungee/Host/Server.java index 394f3151..143322ca 100644 --- a/SubServers.Bungee/src/net/ME1312/SubServers/Bungee/Host/Server.java +++ b/SubServers.Bungee/src/net/ME1312/SubServers/Bungee/Host/Server.java @@ -3,6 +3,7 @@ package net.ME1312.SubServers.Bungee.Host; import net.ME1312.SubServers.Bungee.Library.Config.YAMLSection; import net.ME1312.SubServers.Bungee.Library.Config.YAMLValue; import net.ME1312.SubServers.Bungee.Library.Exception.InvalidServerException; +import net.ME1312.SubServers.Bungee.Library.ExtraDataHandler; import net.ME1312.SubServers.Bungee.Network.Client; import net.ME1312.SubServers.Bungee.Network.ClientHandler; import net.md_5.bungee.BungeeServerInfo; @@ -14,7 +15,7 @@ import java.net.InetSocketAddress; /** * Server Class */ -public class Server extends BungeeServerInfo implements ClientHandler { +public class Server extends BungeeServerInfo implements ClientHandler, ExtraDataHandler { private YAMLSection extra = new YAMLSection(); private Client client = null; private String motd; @@ -100,42 +101,28 @@ public class Server extends BungeeServerInfo implements ClientHandler { this.restricted = value; } - /** - * Add an extra value to this Server - * - * @param key Key - * @param value Value - */ - public void addExtra(String key, Object value) { - extra.set(key, value); + @Override + public void addExtra(String handle, Object value) { + extra.set(handle, value); } - /** - * Determine if an extra value exists - * - * @param key Key - * @return Value Status - */ - public boolean hasExtra(String key) { - return extra.getKeys().contains(key); + @Override + public boolean hasExtra(String handle) { + return extra.getKeys().contains(handle); } - /** - * Get an extra value - * - * @param key Key - * @return Value - */ - public YAMLValue getExtra(String key) { - return extra.get(key); + @Override + public YAMLValue getExtra(String handle) { + return extra.get(handle); } - /** - * Get all of the extra values - * - * @return JSON Formatted Extra Values - */ - public JSONObject getExtra() { - return extra.toJSON(); + @Override + public YAMLSection getExtra() { + return extra.clone(); + } + + @Override + public void removeExtra(String handle) { + extra.remove(handle); } } diff --git a/SubServers.Bungee/src/net/ME1312/SubServers/Bungee/Launch.java b/SubServers.Bungee/src/net/ME1312/SubServers/Bungee/Launch.java index fad15266..0cd785eb 100644 --- a/SubServers.Bungee/src/net/ME1312/SubServers/Bungee/Launch.java +++ b/SubServers.Bungee/src/net/ME1312/SubServers/Bungee/Launch.java @@ -1,16 +1,12 @@ package net.ME1312.SubServers.Bungee; +import net.ME1312.SubServers.Bungee.Library.Container; +import net.ME1312.SubServers.Bungee.Library.Util; + import java.security.Security; import java.text.SimpleDateFormat; import java.util.Calendar; import java.util.Date; -import joptsimple.OptionParser; -import joptsimple.OptionSet; -import net.md_5.bungee.Bootstrap; -import net.md_5.bungee.BungeeCord; -import net.md_5.bungee.api.ChatColor; -import net.md_5.bungee.api.ProxyServer; -import net.md_5.bungee.command.ConsoleCommandSender; /** * SubServers/BungeeCord Class @@ -20,70 +16,84 @@ public final class Launch { /** * Launch SubServers/BungeeCord * - * @param args + * @param args Launch Arguments * @throws Exception */ @SuppressWarnings("deprecation") public static void main(String[] args) throws Exception { - System.out.println(""); - System.out.println("*******************************************"); - System.out.println("*** Warning, this build is Unofficial ***"); - System.out.println("*** ***"); - System.out.println("*** Please report all issues to ME1312, ***"); - System.out.println("*** NOT the Spigot Staff! Thank You! ***"); - System.out.println("*******************************************"); - System.out.println(""); - - Security.setProperty("networkaddress.cache.ttl", "30"); - Security.setProperty("networkaddress.cache.negative.ttl", "10"); - OptionParser parser = new OptionParser(); - parser.allowsUnrecognizedOptions(); - parser.accepts("v"); - parser.accepts("version"); - parser.accepts("noconsole"); - OptionSet options = parser.parse(args); - if(options.has("version") || options.has("v")) { - System.out.println(Bootstrap.class.getPackage().getImplementationVersion()); + final Container bungee = new Container(false); + if (Util.isException(() -> { + if (Class.forName("net.md_5.bungee.BungeeCord") != null) bungee.set(true); + }) && !bungee.get()) { + System.out.println(""); + System.out.println("*******************************************"); + System.out.println("*** Error: BungeeCord.jar Doesn't Exist ***"); + System.out.println("*** ***"); + System.out.println("*** Please download a build from: ***"); + System.out.println("*** http://ci.md-5.net/job/BungeeCord ***"); + System.out.println("*******************************************"); + System.out.println(""); } else { - try { - if (BungeeCord.class.getPackage().getSpecificationVersion() != null) { - Date bungee = (new SimpleDateFormat("yyyyMMdd")).parse(BungeeCord.class.getPackage().getSpecificationVersion()); - Calendar line = Calendar.getInstance(); - line.add(3, -4); - if (bungee.before(line.getTime())) { - System.out.println("*******************************************"); - System.out.println("*** Warning, this build is outdated ***"); - System.out.println("*** Please download a new build from: ***"); - System.out.println("*** http://ci.md-5.net/job/BungeeCord ***"); - System.out.println("*** Errors may arise on older versions! ***"); - System.out.println("*******************************************"); - System.out.println(""); - } - } else throw new NullPointerException(); - } catch (Exception e) { - System.out.println("*******************************************"); - System.out.println("*** Problem checking BungeeCord Version ***"); - System.out.println("*** This build could be outdated. ***"); - System.out.println("*** ***"); - System.out.println("*** Errors may arise on older versions! ***"); - System.out.println("*******************************************"); + System.out.println(""); + System.out.println("*******************************************"); + System.out.println("*** Warning: this build is Unofficial ***"); + System.out.println("*** ***"); + System.out.println("*** Please report all issues to ME1312, ***"); + System.out.println("*** NOT the Spigot Team. Thank You! ***"); + System.out.println("*******************************************"); + + Security.setProperty("networkaddress.cache.ttl", "30"); + Security.setProperty("networkaddress.cache.negative.ttl", "10"); + joptsimple.OptionParser parser = new joptsimple.OptionParser(); + parser.allowsUnrecognizedOptions(); + parser.accepts("v"); + parser.accepts("version"); + parser.accepts("noconsole"); + joptsimple.OptionSet options = parser.parse(args); + if(options.has("version") || options.has("v")) { + System.out.println(""); + System.out.println(System.getProperty("os.name") + " " + System.getProperty("os.version") + ","); + System.out.println("Java " + System.getProperty("java.version") + ","); + System.out.println("BungeeCord " + net.md_5.bungee.Bootstrap.class.getPackage().getImplementationVersion() + ","); + System.out.println("SubServers v" + SubPlugin.class.getPackage().getImplementationVersion() + ((SubPlugin.class.getPackage().getSpecificationVersion().equals("0"))?"":" BETA "+SubPlugin.class.getPackage().getSpecificationVersion())); + System.out.println(""); + } else { + try { + if (net.md_5.bungee.BungeeCord.class.getPackage().getSpecificationVersion() != null) { + Date date = (new SimpleDateFormat("yyyyMMdd")).parse(net.md_5.bungee.BungeeCord.class.getPackage().getSpecificationVersion()); + Calendar line = Calendar.getInstance(); + line.add(3, -4); + if (date.before(line.getTime())) { + System.out.println("*** Warning: this build is outdated ***"); + System.out.println("*** Please download a new build from: ***"); + System.out.println("*** http://ci.md-5.net/job/BungeeCord ***"); + System.out.println("*** Errors may arise on older versions! ***"); + System.out.println("*******************************************"); + } + } else throw new Exception(); + } catch (Exception e) { + System.out.println("*** Problem checking BungeeCord Version ***"); + System.out.println("*** This build could be outdated. ***"); + System.out.println("*** ***"); + System.out.println("*** Errors may arise on older versions! ***"); + System.out.println("*******************************************"); + } System.out.println(""); - } - SubPlugin bungee = new SubPlugin(); - ProxyServer.setInstance(bungee); - bungee.getLogger().info("Enabled BungeeCord version " + bungee.getVersion()); - bungee.start(); + SubPlugin plugin = new SubPlugin(System.out); + net.md_5.bungee.api.ProxyServer.class.getMethod("setInstance", net.md_5.bungee.api.ProxyServer.class).invoke(null, plugin); + plugin.getLogger().info("Enabled BungeeCord version " + plugin.getVersion()); + plugin.start(); - String line; - if(!options.has("noconsole")) { - while(bungee.isRunning && (line = bungee.getConsoleReader().readLine(">")) != null) { - if(!bungee.getPluginManager().dispatchCommand(ConsoleCommandSender.getInstance(), line)) { - bungee.getConsole().sendMessage(ChatColor.RED + "Command not found"); + if (!options.has("noconsole")) { + String line; + while (plugin.isRunning && (line = plugin.getConsoleReader().readLine(">")) != null) { + if (!plugin.getPluginManager().dispatchCommand(net.md_5.bungee.command.ConsoleCommandSender.class.cast(net.md_5.bungee.command.ConsoleCommandSender.class.getMethod("getInstance").invoke(null)), line)) { + plugin.getConsole().sendMessage(net.md_5.bungee.api.ChatColor.RED + "Command not found"); + } } } } - } } } \ No newline at end of file diff --git a/SubServers.Bungee/src/net/ME1312/SubServers/Bungee/Library/Config/YAMLSection.java b/SubServers.Bungee/src/net/ME1312/SubServers/Bungee/Library/Config/YAMLSection.java index f4ef7d67..9c8aaa3a 100644 --- a/SubServers.Bungee/src/net/ME1312/SubServers/Bungee/Library/Config/YAMLSection.java +++ b/SubServers.Bungee/src/net/ME1312/SubServers/Bungee/Library/Config/YAMLSection.java @@ -32,11 +32,11 @@ public class YAMLSection { /** * Creates a YAML Section from an Input Stream * - * @param io Input Stream + * @param stream Input Stream * @throws YAMLException */ - public YAMLSection(InputStream io) throws YAMLException { - this.map = (Map) (this.yaml = new Yaml(YAMLConfig.getDumperOptions())).load(io); + public YAMLSection(InputStream stream) throws YAMLException { + this.map = (Map) (this.yaml = new Yaml(YAMLConfig.getDumperOptions())).load(stream); } /** @@ -61,11 +61,11 @@ public class YAMLSection { /** * Creates a YAML Section from String * - * @param yaml String + * @param str String * @throws YAMLException */ - public YAMLSection(String yaml) throws YAMLException { - this.map = (Map) (this.yaml = new Yaml(YAMLConfig.getDumperOptions())).load(yaml); + public YAMLSection(String str) throws YAMLException { + this.map = (Map) (this.yaml = new Yaml(YAMLConfig.getDumperOptions())).load(str); } protected YAMLSection(Map map, YAMLSection up, String handle, Yaml yaml) { @@ -134,6 +134,32 @@ public class YAMLSection { map.clear(); } + private Object convert(Object value) { + if (value instanceof JSONObject) { + value = new YAMLSection((JSONObject) value); + } + + if (value instanceof YAMLConfig) { + ((YAMLConfig) value).get().up = this; + ((YAMLConfig) value).get().handle = handle; + return ((YAMLConfig) value).get().map; + } else if (value instanceof YAMLSection) { + ((YAMLSection) value).up = this; + ((YAMLSection) value).handle = handle; + return ((YAMLSection) value).map; + } else if (value instanceof YAMLValue) { + return ((YAMLValue) value).asObject(); + } else if (value instanceof JSONArray) { + List list = new ArrayList(); + for (int i=0; i < ((JSONArray) value).length(); i++) list.add(((JSONArray) value).getString(i)); + return list; + } else if (value instanceof UUID) { + return ((UUID) value).toString(); + } else { + return value; + } + } + /** * Set Object into this YAML Section * @@ -141,31 +167,30 @@ public class YAMLSection { * @param value Value */ public void set(String handle, Object value) { - if (value instanceof JSONObject) { // JSON Values - value = new YAMLSection((JSONObject) value); - } - - if (value instanceof YAMLConfig) { // YAML Wrapper Values - ((YAMLConfig) value).get().up = this; - ((YAMLConfig) value).get().handle = handle; - map.put(handle, ((YAMLConfig) value).get().map); - } else if (value instanceof YAMLSection) { - ((YAMLSection) value).up = this; - ((YAMLSection) value).handle = handle; - map.put(handle, ((YAMLSection) value).map); - } else if (value instanceof YAMLValue) { - map.put(handle, ((YAMLValue) value).asObject()); - } else if (value instanceof UUID) { // Other Values YAML Doesn't Understand - map.put(handle, ((UUID) value).toString()); - } else if (value instanceof JSONArray) { - List list = new ArrayList(); - for (int i=0; i < ((JSONArray) value).length(); i++){ - list.add(((JSONArray) value).getString(i)); - } - map.put(handle, list); + if (value instanceof Collection) { + set(handle, (Collection) value); } else { - map.put(handle, value); + map.put(handle, convert(value)); + + if (this.handle != null && this.up != null) { + this.up.set(this.handle, this); + } } + } + + /** + * Set Collection<V> into this YAML Section + * + * @param handle Handle + * @param list Value + * @param Collection Type + */ + public void set(String handle, Collection list) { + List values = new LinkedList(); + for (V value : list) { + values.add(convert(value)); + } + map.put(handle, values); if (this.handle != null && this.up != null) { this.up.set(this.handle, this); @@ -203,6 +228,15 @@ public class YAMLSection { return up; } + /** + * Clone this YAML Section + * + * @return + */ + public YAMLSection clone() { + return new YAMLSection(map, null, null, yaml); + } + @Override public String toString() { return yaml.dump(map); diff --git a/SubServers.Bungee/src/net/ME1312/SubServers/Bungee/Library/ExtraDataHandler.java b/SubServers.Bungee/src/net/ME1312/SubServers/Bungee/Library/ExtraDataHandler.java new file mode 100644 index 00000000..340ee822 --- /dev/null +++ b/SubServers.Bungee/src/net/ME1312/SubServers/Bungee/Library/ExtraDataHandler.java @@ -0,0 +1,47 @@ +package net.ME1312.SubServers.Bungee.Library; + +import net.ME1312.SubServers.Bungee.Library.Config.YAMLSection; +import net.ME1312.SubServers.Bungee.Library.Config.YAMLValue; + +/** + * Extra Data Handler Layout Class + */ +public interface ExtraDataHandler { + /** + * Add an extra value to this Server + * + * @param handle Handle + * @param value Value + */ + void addExtra(String handle, Object value); + + /** + * Determine if an extra value exists + * + * @param handle Handle + * @return Value Status + */ + boolean hasExtra(String handle); + + /** + * Get an extra value + * + * @param handle Handle + * @return Value + */ + YAMLValue getExtra(String handle); + + /** + * Get the extra value section + * + * @return Extra Value Section + */ + YAMLSection getExtra(); + + /** + * Remove an extra value from this Server + * + * @param handle Handle + */ + void removeExtra(String handle); +} 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 070b92c0..dcdc72c6 100644 --- a/SubServers.Bungee/src/net/ME1312/SubServers/Bungee/Library/Util.java +++ b/SubServers.Bungee/src/net/ME1312/SubServers/Bungee/Library/Util.java @@ -7,6 +7,9 @@ import java.io.*; */ public final class Util { private Util(){} + public interface ExceptionRunnable { + void run() throws Throwable; + } /** * Read Everything from Reader @@ -54,7 +57,7 @@ public final class Util { * @param runnable Runnable * @return If an Exception occured */ - public static boolean isException(Runnable runnable) { + public static boolean isException(ExceptionRunnable runnable) { try { runnable.run(); return false; diff --git a/SubServers.Bungee/src/net/ME1312/SubServers/Bungee/Network/Packet/PacketDownloadHostInfo.java b/SubServers.Bungee/src/net/ME1312/SubServers/Bungee/Network/Packet/PacketDownloadHostInfo.java index a184200c..e419bf58 100644 --- a/SubServers.Bungee/src/net/ME1312/SubServers/Bungee/Network/Packet/PacketDownloadHostInfo.java +++ b/SubServers.Bungee/src/net/ME1312/SubServers/Bungee/Network/Packet/PacketDownloadHostInfo.java @@ -77,6 +77,7 @@ public class PacketDownloadHostInfo implements PacketIn, PacketOut { servers.put(server.getName(), sinfo); } info.put("servers", servers); + info.put("extra", host.getExtra().toJSON()); } else json.put("valid", false); json.put("host", info); diff --git a/SubServers.Bungee/src/net/ME1312/SubServers/Bungee/Network/Packet/PacketDownloadServerInfo.java b/SubServers.Bungee/src/net/ME1312/SubServers/Bungee/Network/Packet/PacketDownloadServerInfo.java index ad5189ae..2c01337f 100644 --- a/SubServers.Bungee/src/net/ME1312/SubServers/Bungee/Network/Packet/PacketDownloadServerInfo.java +++ b/SubServers.Bungee/src/net/ME1312/SubServers/Bungee/Network/Packet/PacketDownloadServerInfo.java @@ -65,7 +65,7 @@ public class PacketDownloadServerInfo implements PacketIn, PacketOut { info.put("hidden", server.isHidden()); info.put("motd", server.getMotd()); info.put("subdata", server.getSubDataClient() == null); - info.put("extra", server.getExtra()); + info.put("extra", server.getExtra().toJSON()); JSONObject players = new JSONObject(); for (ProxiedPlayer player : server.getPlayers()) { diff --git a/SubServers.Bungee/src/net/ME1312/SubServers/Bungee/Network/Packet/PacketLinkServer.java b/SubServers.Bungee/src/net/ME1312/SubServers/Bungee/Network/Packet/PacketLinkServer.java index c78e4c6b..7fdbc0e0 100644 --- a/SubServers.Bungee/src/net/ME1312/SubServers/Bungee/Network/Packet/PacketLinkServer.java +++ b/SubServers.Bungee/src/net/ME1312/SubServers/Bungee/Network/Packet/PacketLinkServer.java @@ -14,7 +14,7 @@ import java.util.Map; /** * Link Server Packet */ -public final class PacketLinkServer implements PacketIn, PacketOut { +public class PacketLinkServer implements PacketIn, PacketOut { private SubPlugin plugin; private int response; private String message; @@ -39,7 +39,6 @@ public final class PacketLinkServer implements PacketIn, PacketOut { this.message = message; } - @Override public JSONObject generate() { JSONObject json = new JSONObject(); diff --git a/SubServers.Bungee/src/net/ME1312/SubServers/Bungee/Network/SubDataServer.java b/SubServers.Bungee/src/net/ME1312/SubServers/Bungee/Network/SubDataServer.java index c32a6b02..dc86735a 100644 --- a/SubServers.Bungee/src/net/ME1312/SubServers/Bungee/Network/SubDataServer.java +++ b/SubServers.Bungee/src/net/ME1312/SubServers/Bungee/Network/SubDataServer.java @@ -9,6 +9,7 @@ import org.json.JSONObject; import java.io.IOException; import java.net.*; import java.util.ArrayList; +import java.util.Collection; import java.util.HashMap; import java.util.List; @@ -134,6 +135,15 @@ public final class SubDataServer { return clients.get(address); } + /** + * Grabs all the Clients from the Network + * + * @return Client List + */ + public Collection getClients() { + return clients.values(); + } + /** * Remove a Client from the Network * @@ -176,6 +186,15 @@ public final class SubDataServer { pIn.put(handle, list); } + /** + * Unregister PacketIn from the Network + * + * @param packet PacketIn to unregister + */ + public static void unregisterPacket(PacketIn packet) { + for (String handle : pIn.keySet()) if (pIn.get(handle).contains(packet)) pIn.get(handle).remove(packet); + } + /** * Register PacketOut to the Network * @@ -186,6 +205,15 @@ public final class SubDataServer { pOut.put(packet, handle); } + /** + * Unregister PacketOut to the Network + * + * @param packet PacketOut to unregister + */ + public static void unregisterPacket(Class packet) { + pOut.remove(packet); + } + /** * Grab PacketIn Instances via handle * diff --git a/SubServers.Bungee/src/net/ME1312/SubServers/Bungee/SubCommand.java b/SubServers.Bungee/src/net/ME1312/SubServers/Bungee/SubCommand.java index 41570208..b495792b 100644 --- a/SubServers.Bungee/src/net/ME1312/SubServers/Bungee/SubCommand.java +++ b/SubServers.Bungee/src/net/ME1312/SubServers/Bungee/SubCommand.java @@ -40,10 +40,10 @@ public final class SubCommand extends Command implements TabExecutor { } /** - * Load /Sub in console + * Load /sub in console * - * @param sender - * @param args + * @param sender Sender + * @param args Arguments */ @Override public void execute(CommandSender sender, String[] args) { @@ -224,6 +224,13 @@ public final class SubCommand extends Command implements TabExecutor { } } + /** + * Tab complete for players + * + * @param sender Sender + * @param args Arguments + * @return Tab completes + */ @Override public Iterable onTabComplete(CommandSender sender, String[] args) { String last = (args.length > 0)?args[args.length - 1].toLowerCase():""; @@ -338,13 +345,22 @@ public final class SubCommand extends Command implements TabExecutor { }; } - public static class BungeeServer extends Command implements TabExecutor { + /** + * BungeeCord /server + */ + public static final class BungeeServer extends Command implements TabExecutor { private SubPlugin plugin; protected BungeeServer(SubPlugin plugin, String command) { super(command, "bungeecord.command.server"); this.plugin = plugin; } + /** + * Override /server + * + * @param sender Sender + * @param args Arguments + */ @SuppressWarnings("deprecation") @Override public void execute(CommandSender sender, String[] args) { @@ -380,6 +396,13 @@ public final class SubCommand extends Command implements TabExecutor { } } + /** + * Tab completer + * + * @param sender Sender + * @param args Arguments + * @return Tab completes + */ @Override public Iterable onTabComplete(CommandSender sender, String[] args) { if (args.length <= 1) { @@ -399,13 +422,22 @@ public final class SubCommand extends Command implements TabExecutor { } } - public static class BungeeList extends Command { + /** + * BungeeCord /glist + */ + public static final class BungeeList extends Command { private SubPlugin plugin; protected BungeeList(SubPlugin plugin, String command) { super(command, "bungeecord.command.list"); this.plugin = plugin; } + /** + * Override /glist + * + * @param sender + * @param args + */ @SuppressWarnings("deprecation") @Override public void execute(CommandSender sender, String[] args) { diff --git a/SubServers.Bungee/src/net/ME1312/SubServers/Bungee/SubPlugin.java b/SubServers.Bungee/src/net/ME1312/SubServers/Bungee/SubPlugin.java index 65956a59..b7555ed2 100644 --- a/SubServers.Bungee/src/net/ME1312/SubServers/Bungee/SubPlugin.java +++ b/SubServers.Bungee/src/net/ME1312/SubServers/Bungee/SubPlugin.java @@ -3,6 +3,7 @@ package net.ME1312.SubServers.Bungee; import net.ME1312.SubServers.Bungee.Host.Executable; import net.ME1312.SubServers.Bungee.Host.Server; import net.ME1312.SubServers.Bungee.Library.Config.YAMLConfig; +import net.ME1312.SubServers.Bungee.Library.Config.YAMLSection; import net.ME1312.SubServers.Bungee.Library.Exception.InvalidHostException; import net.ME1312.SubServers.Bungee.Library.Exception.InvalidServerException; import net.ME1312.SubServers.Bungee.Host.Host; @@ -31,18 +32,20 @@ public final class SubPlugin extends BungeeCord { public final HashMap exServers = new HashMap(); public final HashMap hosts = new HashMap(); + public final PrintStream out; public final UniversalFile dir = new UniversalFile(new File(System.getProperty("user.dir"))); public YAMLConfig config; public YAMLConfig lang; public HashMap exLang = new HashMap(); public SubDataServer subdata = null; - public final Version version = new Version("2.11.2e"); - protected Version bversion = new Version(2); + public final Version version = new Version(SubPlugin.class.getPackage().getImplementationVersion()); + public final Version bversion = (SubPlugin.class.getPackage().getSpecificationVersion().equals("0"))?null:new Version(SubPlugin.class.getPackage().getSpecificationVersion()); protected boolean running = false; public final SubAPI api = new SubAPI(this); - protected SubPlugin() throws IOException { + protected SubPlugin(PrintStream out) throws IOException { + this.out = out; enable(); } @@ -54,7 +57,7 @@ public final class SubPlugin extends BungeeCord { protected void enable() throws IOException { if (running) throw new IllegalStateException("SubServers has already been loaded"); System.out.println("SubServers > Loading SubServers v" + version.toString() + " Libraries... "); - running = true; + if (!(new UniversalFile(dir, "config.yml").exists())) { Util.copyFromJar(SubPlugin.class.getClassLoader(), "net/ME1312/SubServers/Bungee/Library/Files/bungee.yml", new UniversalFile(dir, "config.yml").getPath()); YAMLConfig tmp = new YAMLConfig(new UniversalFile("config.yml")); @@ -157,11 +160,17 @@ public final class SubPlugin extends BungeeCord { hostDrivers.put("built-in", net.ME1312.SubServers.Bungee.Host.Internal.InternalHost.class); + getPluginManager().registerCommand(null, new SubCommand.BungeeServer(this, "server")); + getPluginManager().registerCommand(null, new SubCommand.BungeeList(this, "glist")); + getPluginManager().registerCommand(null, new SubCommand(this, "subservers")); + getPluginManager().registerCommand(null, new SubCommand(this, "subserver")); + getPluginManager().registerCommand(null, new SubCommand(this, "sub")); + System.out.println("SubServers > Loading BungeeCord Libraries..."); } /** - * Load Hosts, Servers, SubServers, and SubData. + * Load Hosts, Servers, SubServers, and SubData Direct */ @Override public void startListeners() { @@ -195,10 +204,9 @@ public final class SubPlugin extends BungeeCord { YAMLConfig bungee = new YAMLConfig(new UniversalFile(dir, "config.yml")); for (String name : bungee.get().getSection("servers").getKeys()) { try { - Server server = new Server(name, new InetSocketAddress(bungee.get().getSection("servers").getSection(name).getRawString("address").split(":")[0], - Integer.parseInt(bungee.get().getSection("servers").getSection(name).getRawString("address").split(":")[1])), bungee.get().getSection("servers").getSection(name).getColoredString("motd", '&'), + Server server = api.addServer(name, InetAddress.getByName(bungee.get().getSection("servers").getSection(name).getRawString("address").split(":")[0]), + Integer.parseInt(bungee.get().getSection("servers").getSection(name).getRawString("address").split(":")[1]), bungee.get().getSection("servers").getSection(name).getColoredString("motd", '&'), bungee.get().getSection("servers").getSection(name).getBoolean("hidden", false), bungee.get().getSection("servers").getSection(name).getBoolean("restricted")); - exServers.put(name.toLowerCase(), server); SubDataServer.allowConnection(server.getAddress().getAddress()); servers++; } catch (Exception e) { @@ -227,11 +235,7 @@ public final class SubPlugin extends BungeeCord { System.out.println("SubServers > " + hosts + " Host(s), " + servers + " Server(s), and " + subservers + " SubServer(s) loaded in " + (Calendar.getInstance().getTime().getTime() - begin) + "ms"); - getPluginManager().registerCommand(null, new SubCommand.BungeeServer(this, "server")); - getPluginManager().registerCommand(null, new SubCommand.BungeeList(this, "glist")); - getPluginManager().registerCommand(null, new SubCommand(this, "subservers")); - getPluginManager().registerCommand(null, new SubCommand(this, "subserver")); - getPluginManager().registerCommand(null, new SubCommand(this, "sub")); + running = true; super.startListeners(); } catch (IOException e) { @@ -259,12 +263,16 @@ public final class SubPlugin extends BungeeCord { */ @Override public Map getServers() { - HashMap servers = new HashMap(); - for (ServerInfo server : exServers.values()) servers.put(server.getName(), server); - for (Host host : this.hosts.values()) { - for (ServerInfo server : host.getSubServers().values()) servers.put(server.getName(), server); + if (!running) { + return super.getServers(); + } else { + HashMap servers = new HashMap(); + for (ServerInfo server : exServers.values()) servers.put(server.getName(), server); + for (Host host : this.hosts.values()) { + for (ServerInfo server : host.getSubServers().values()) servers.put(server.getName(), server); + } + return servers; } - return servers; } /** @@ -275,6 +283,7 @@ public final class SubPlugin extends BungeeCord { @Override public void stopListeners() { try { + running = false; System.out.println("SubServers > Resetting Hosts and Server Data"); List hosts = new ArrayList(); hosts.addAll(this.hosts.keySet()); 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 8c8a804a..4751e101 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 @@ -3,6 +3,11 @@ package net.ME1312.SubServers.Client.Bukkit.Library; import java.io.*; public final class Util { + private Util(){} + public interface ExceptionRunnable { + void run() throws Throwable; + } + public static String readAll(Reader rd) throws IOException { StringBuilder sb = new StringBuilder(); int cp; @@ -30,16 +35,13 @@ public final class Util { } public static boolean isSpigot() { - boolean spigot = false; - try { - if (Class.forName("org.spigotmc.SpigotConfig") != null) { - spigot = true; - } - } catch (ClassNotFoundException e) {} - return spigot; + final Container spigot = new Container(false); + return !isException(() -> { + if (Class.forName("org.spigotmc.SpigotConfig") != null) spigot.set(true); + }) && spigot.get(); } - public static boolean isException(Runnable runnable) { + public static boolean isException(ExceptionRunnable runnable) { try { runnable.run(); return false; diff --git a/SubServers.Client/Bukkit/src/net/ME1312/SubServers/Client/Bukkit/Network/Packet/PacketLinkServer.java b/SubServers.Client/Bukkit/src/net/ME1312/SubServers/Client/Bukkit/Network/Packet/PacketLinkServer.java index 48c74200..98a917e9 100644 --- a/SubServers.Client/Bukkit/src/net/ME1312/SubServers/Client/Bukkit/Network/Packet/PacketLinkServer.java +++ b/SubServers.Client/Bukkit/src/net/ME1312/SubServers/Client/Bukkit/Network/Packet/PacketLinkServer.java @@ -7,7 +7,7 @@ import net.ME1312.SubServers.Client.Bukkit.SubPlugin; import org.bukkit.Bukkit; import org.json.JSONObject; -public final class PacketLinkServer implements PacketIn, PacketOut { +public class PacketLinkServer implements PacketIn, PacketOut { private SubPlugin plugin; public PacketLinkServer(SubPlugin plugin) { diff --git a/SubServers.Client/Bukkit/src/net/ME1312/SubServers/Client/Bukkit/Network/SubDataClient.java b/SubServers.Client/Bukkit/src/net/ME1312/SubServers/Client/Bukkit/Network/SubDataClient.java index 661bbc1b..87c3b5cc 100644 --- a/SubServers.Client/Bukkit/src/net/ME1312/SubServers/Client/Bukkit/Network/SubDataClient.java +++ b/SubServers.Client/Bukkit/src/net/ME1312/SubServers/Client/Bukkit/Network/SubDataClient.java @@ -139,7 +139,7 @@ public final class SubDataClient { } /** - * Register Packet to the Network + * Register PacketIn to the Network * * @param packet PacketIn to register * @param handle Handle to Bind @@ -151,7 +151,16 @@ public final class SubDataClient { } /** - * Register Packet to the Network + * Unregister PacketIn from the Network + * + * @param packet PacketIn to unregister + */ + public static void unregisterPacket(PacketIn packet) { + for (String handle : pIn.keySet()) if (pIn.get(handle).contains(packet)) pIn.get(handle).remove(packet); + } + + /** + * Register PacketOut to the Network * * @param packet PacketOut to register * @param handle Handle to bind @@ -160,6 +169,15 @@ public final class SubDataClient { pOut.put(packet, handle); } + /** + * Unregister PacketOut to the Network + * + * @param packet PacketOut to unregister + */ + public static void unregisterPacket(Class packet) { + pOut.remove(packet); + } + /** * Grab PacketIn Instances via handle * diff --git a/SubServers.Client/Bukkit/src/net/ME1312/SubServers/Client/Bukkit/SubPlugin.java b/SubServers.Client/Bukkit/src/net/ME1312/SubServers/Client/Bukkit/SubPlugin.java index 0741c160..0708dae1 100644 --- a/SubServers.Client/Bukkit/src/net/ME1312/SubServers/Client/Bukkit/SubPlugin.java +++ b/SubServers.Client/Bukkit/src/net/ME1312/SubServers/Client/Bukkit/SubPlugin.java @@ -22,7 +22,7 @@ public final class SubPlugin extends JavaPlugin { public UIListener gui = null; public Version version; - protected Version bversion = new Version(1); + protected Version bversion = new Version(2); //public final SubAPI api = new SubAPI(this);