diff --git a/Artifacts/SubServers.Bungee.jar b/Artifacts/SubServers.Bungee.jar index 707bc957..ffa61f8a 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 2c84d19c..44d47de8 100644 Binary files a/Artifacts/SubServers.Client.Bukkit.jar and b/Artifacts/SubServers.Client.Bukkit.jar differ diff --git a/Artifacts/SubServers.Console.jar b/Artifacts/SubServers.Console.jar index de199636..a750ff10 100644 Binary files a/Artifacts/SubServers.Console.jar and b/Artifacts/SubServers.Console.jar differ diff --git a/Artifacts/SubServers.Host.jar b/Artifacts/SubServers.Host.jar index 37a3b657..e5a14a45 100644 Binary files a/Artifacts/SubServers.Host.jar and b/Artifacts/SubServers.Host.jar differ diff --git a/Artifacts/SubServers.Sync.jar b/Artifacts/SubServers.Sync.jar index 64c62820..0b499261 100644 Binary files a/Artifacts/SubServers.Sync.jar and b/Artifacts/SubServers.Sync.jar differ diff --git a/Javadoc/SubServers.Bungee.jar b/Javadoc/SubServers.Bungee.jar index eff18120..6ca36422 100644 Binary files a/Javadoc/SubServers.Bungee.jar and b/Javadoc/SubServers.Bungee.jar differ diff --git a/Javadoc/SubServers.Bungee/index-all.html b/Javadoc/SubServers.Bungee/index-all.html index 10918c41..ae7d1bbe 100644 --- a/Javadoc/SubServers.Bungee/index-all.html +++ b/Javadoc/SubServers.Bungee/index-all.html @@ -460,20 +460,8 @@

E

-
edit(UUID, YAMLSection) - Method in class net.ME1312.SubServers.Bungee.Host.External.ExternalHost
-
 
edit(UUID, YAMLSection) - Method in class net.ME1312.SubServers.Bungee.Host.External.ExternalSubServer
 
-
edit(UUID, YAMLSection) - Method in class net.ME1312.SubServers.Bungee.Host.Host
-
-
Edits the Host
-
-
edit(YAMLSection) - Method in class net.ME1312.SubServers.Bungee.Host.Host
-
-
Edits the Host
-
-
edit(UUID, YAMLSection) - Method in class net.ME1312.SubServers.Bungee.Host.Internal.InternalHost
-
 
edit(UUID, YAMLSection) - Method in class net.ME1312.SubServers.Bungee.Host.Internal.InternalSubServer
 
edit(UUID, YAMLSection) - Method in interface net.ME1312.SubServers.Bungee.Host.SubServer
@@ -616,8 +604,6 @@
Load /sub in console
-
exLang - Variable in class net.ME1312.SubServers.Bungee.SubPlugin
-
 
exServers - Variable in class net.ME1312.SubServers.Bungee.SubPlugin
 
ExternalHost - Class in net.ME1312.SubServers.Bungee.Host.External
@@ -1158,14 +1144,18 @@
Get the Keys
-
getLang(String) - Method in class net.ME1312.SubServers.Bungee.SubAPI
-
-
Gets a value from the SubServers Lang
-
getLang() - Method in class net.ME1312.SubServers.Bungee.SubAPI
Gets the SubServers Lang
+
getLang(String) - Method in class net.ME1312.SubServers.Bungee.SubAPI
+
+
Gets values from the SubServers Lang
+
+
getLang(String, String) - Method in class net.ME1312.SubServers.Bungee.SubAPI
+
+
Gets a value from the SubServers Lang
+
getLevel() - Method in class net.ME1312.SubServers.Bungee.Host.SubLogger.LogMessage
Get the level this message was logged on
@@ -2032,7 +2022,7 @@

L

-
lang - Variable in class net.ME1312.SubServers.Bungee.SubPlugin
+
langconfig - Variable in class net.ME1312.SubServers.Bungee.SubPlugin
 
Launch - Class in net.ME1312.SubServers.Bungee
@@ -2800,9 +2790,9 @@
Set the Item Icon for this Template
-
setLang(String, String) - Method in class net.ME1312.SubServers.Bungee.SubAPI
+
setLang(String, String, String) - Method in class net.ME1312.SubServers.Bungee.SubAPI
-
Adds to the Language Map
+
Adds to the SubServers Lang
setLogging(boolean) - Method in class net.ME1312.SubServers.Bungee.Host.External.ExternalSubServer
 
diff --git a/Javadoc/SubServers.Bungee/net/ME1312/SubServers/Bungee/Host/External/ExternalHost.html b/Javadoc/SubServers.Bungee/net/ME1312/SubServers/Bungee/Host/External/ExternalHost.html index 91877bd1..fcdd789f 100644 --- a/Javadoc/SubServers.Bungee/net/ME1312/SubServers/Bungee/Host/External/ExternalHost.html +++ b/Javadoc/SubServers.Bungee/net/ME1312/SubServers/Bungee/Host/External/ExternalHost.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}; +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}; var tabs = {65535:["t0","All Methods"],2:["t2","Instance Methods"],8:["t4","Concrete Methods"]}; var altColor = "altColor"; var rowColor = "rowColor"; @@ -189,88 +189,81 @@ implements -int -edit(java.util.UUID player, - YAMLSection edit) -
Edits the Host
- - - boolean forceDeleteSubServer(java.util.UUID player, java.lang.String name)
Forces the Deletion of a SubServer
- + boolean forceRemoveSubServer(java.util.UUID player, java.lang.String name)
Forces the Removal of a SubServer
- + java.net.InetAddress getAddress()
Get the Address of this Host
- + SubCreator getCreator()
Gets the SubCreator Instance for this Host
- + java.lang.String getName()
Get the Name of this Host
- + java.lang.String getPath()
Get the host Directory Path
- + Client getSubData()
Gets the SubData Client
- + SubServer getSubServer(java.lang.String name)
Gets a SubServer
- + java.util.Map<java.lang.String,? extends SubServer> getSubServers()
Gets the SubServers on this Host
- + boolean isEnabled()
Is this Host Enabled?
- + boolean removeSubServer(java.util.UUID player, java.lang.String name)
Removes a SubServer
- + void setEnabled(boolean value)
Set if this Host is Enabled
- + void setSubData(Client client)
Link a SubData Client to this Object
@@ -282,7 +275,7 @@ implements Host -addExtra, addSubServer, command, command, deleteSubServer, edit, forceDeleteSubServer, forceRemoveSubServer, getDisplayName, getExtra, getExtra, getSignature, hasExtra, removeExtra, removeSubServer, setDisplayName, start, start, stop, stop, terminate, terminate, toString +addExtra, addSubServer, command, command, deleteSubServer, forceDeleteSubServer, forceRemoveSubServer, getDisplayName, getExtra, getExtra, getSignature, hasExtra, removeExtra, removeSubServer, setDisplayName, start, start, stop, stop, terminate, terminate, toString
  • @@ -458,27 +451,6 @@ implements - - -
      -
    • -

      edit

      -
      public int edit(java.util.UUID player,
-                YAMLSection edit)
      -
      Description copied from class: Host
      -
      Edits the Host
      -
      -
      Specified by:
      -
      edit in class Host
      -
      Parameters:
      -
      player - Player Editing
      -
      edit - Edits
      -
      Returns:
      -
      Success Status
      -
      -
      • -
    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 0b42e0b2..a7938dc1 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":10,"i2":6,"i3":10,"i4":10,"i5":10,"i6":6,"i7":6,"i8":10,"i9":10,"i10":6,"i11":10,"i12":6,"i13":6,"i14":6,"i15":10,"i16":10,"i17":10,"i18":6,"i19":6,"i20":10,"i21":6,"i22":6,"i23":10,"i24":6,"i25":10,"i26":10,"i27":6,"i28":10,"i29":6,"i30":10,"i31":10,"i32":10,"i33":10,"i34":10,"i35":10,"i36":10}; +var methods = {"i0":10,"i1":10,"i2":6,"i3":10,"i4":10,"i5":10,"i6":6,"i7":10,"i8":6,"i9":10,"i10":6,"i11":6,"i12":6,"i13":10,"i14":10,"i15":10,"i16":6,"i17":6,"i18":10,"i19":6,"i20":6,"i21":10,"i22":6,"i23":10,"i24":10,"i25":6,"i26":10,"i27":6,"i28":10,"i29":10,"i30":10,"i31":10,"i32":10,"i33":10,"i34":10}; var tabs = {65535:["t0","All Methods"],2:["t2","Instance Methods"],4:["t3","Abstract Methods"],8:["t4","Concrete Methods"]}; var altColor = "altColor"; var rowColor = "rowColor"; @@ -234,187 +234,174 @@ implements -abstract int -edit(java.util.UUID player, - YAMLSection edit) -
    Edits the Host
    - - - -int -edit(YAMLSection edit) -
    Edits the Host
    - - - boolean forceDeleteSubServer(java.lang.String name)
    Forced the Deletion of a SubServer
    - + abstract boolean forceDeleteSubServer(java.util.UUID player, java.lang.String name)
    Forces the Deletion of a SubServer
    - + 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
    - + java.lang.String getDisplayName()
    Get the Display Name 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 java.lang.String getPath()
    Get the host Directory Path
    - + java.lang.String getSignature()
    Get the Signature of this Object
    - + 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
    - + void setDisplayName(java.lang.String value)
    Sets the Display Name for this Host
    - + abstract void setEnabled(boolean value)
    Set if this Host is Enabled
    - + int start(java.lang.String... servers)
    Starts the Servers Specified
    - + int start(java.util.UUID player, java.lang.String... servers)
    Starts the Servers Specified
    - + int stop(java.lang.String... servers)
    Stops the Servers Specified
    - + int stop(java.util.UUID player, java.lang.String... servers)
    Stops the Servers Specified
    - + int terminate(java.lang.String... servers)
    Terminates the Servers Specified
    - + int terminate(java.util.UUID player, java.lang.String... servers)
    Terminates the Servers Specified
    - + java.lang.String toString()  @@ -710,40 +697,6 @@ implements - - -
      -
    • -

      edit

      -
      public abstract int edit(java.util.UUID player,
-                         YAMLSection edit)
      -
      Edits the Host
      -
      -
      Parameters:
      -
      player - Player Editing
      -
      edit - Edits
      -
      Returns:
      -
      Success Status
      -
      -
      • -
    - - - -
      -
    • -

      edit

      -
      public int edit(YAMLSection edit)
      -
      Edits the Host
      -
      -
      Parameters:
      -
      edit - Edits
      -
      Returns:
      -
      Success Status
      -
      -
      • -
    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 8985d77a..8926ec34 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 @@ -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}; +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"; @@ -188,76 +188,69 @@ extends -int -edit(java.util.UUID player, - YAMLSection edit) -
    Edits the Host
    - - - boolean forceDeleteSubServer(java.util.UUID player, java.lang.String name)
    Forces the Deletion of a SubServer
    - + boolean forceRemoveSubServer(java.util.UUID player, java.lang.String name)
    Forces the Removal of a SubServer
    - + java.net.InetAddress getAddress()
    Get the Address of this Host
    - + SubCreator getCreator()
    Gets the SubCreator Instance for this Host
    - + java.lang.String getName()
    Get the Name of this Host
    - + java.lang.String getPath()
    Get the host Directory Path
    - + SubServer getSubServer(java.lang.String name)
    Gets a SubServer
    - + java.util.Map<java.lang.String,? extends SubServer> getSubServers()
    Gets the SubServers on this Host
    - + boolean isEnabled()
    Is this Host Enabled?
    - + boolean removeSubServer(java.util.UUID player, java.lang.String name)
    Removes a SubServer
    - + void setEnabled(boolean value)
    Set if this Host is Enabled
    @@ -269,7 +262,7 @@ extends

    Methods inherited from class net.ME1312.SubServers.Bungee.Host.Host

    -addExtra, addSubServer, command, command, deleteSubServer, edit, forceDeleteSubServer, forceRemoveSubServer, getDisplayName, getExtra, getExtra, getSignature, hasExtra, removeExtra, removeSubServer, setDisplayName, start, start, stop, stop, terminate, terminate, toString
    • +addExtra, addSubServer, command, command, deleteSubServer, forceDeleteSubServer, forceRemoveSubServer, getDisplayName, getExtra, getExtra, getSignature, hasExtra, removeExtra, removeSubServer, setDisplayName, start, start, stop, stop, terminate, terminate, toString
- - - -
    -
  • -

    edit

    -
    public int edit(java.util.UUID player,
-                YAMLSection edit)
    -
    Description copied from class: Host
    -
    Edits the Host
    -
    -
    Specified by:
    -
    edit in class Host
    -
    Parameters:
    -
    player - Player Editing
    -
    edit - Edits
    -
    Returns:
    -
    Success Status
    -
    -
    • -
diff --git a/Javadoc/SubServers.Bungee/net/ME1312/SubServers/Bungee/SubAPI.html b/Javadoc/SubServers.Bungee/net/ME1312/SubServers/Bungee/SubAPI.html index 2fe0288d..3f756b6c 100644 --- a/Javadoc/SubServers.Bungee/net/ME1312/SubServers/Bungee/SubAPI.html +++ b/Javadoc/SubServers.Bungee/net/ME1312/SubServers/Bungee/SubAPI.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":9,"i24":42,"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}; +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":9,"i24":42,"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}; var tabs = {65535:["t0","All Methods"],1:["t1","Static Methods"],2:["t2","Instance Methods"],8:["t4","Concrete Methods"],32:["t6","Deprecated Methods"]}; var altColor = "altColor"; var rowColor = "rowColor"; @@ -321,123 +321,131 @@ extends java.lang.Object -java.util.Map<java.lang.String,java.lang.String> +java.util.Map<java.lang.String,java.util.Map<java.lang.String,java.lang.String>> getLang()
Gets the SubServers Lang
-java.lang.String -getLang(java.lang.String key) -
Gets a value from the SubServers Lang
+java.util.Map<java.lang.String,java.lang.String> +getLang(java.lang.String channel) +
Gets values from the SubServers Lang
+java.lang.String +getLang(java.lang.String channel, + java.lang.String key) +
Gets a value from the SubServers Lang
+ + + java.util.Map<java.lang.String,java.util.List<Server>> getLowercaseGroups()
Gets the Server Groups (Group names are all lowercase here)
- + <R> R getObjectBySignature(java.lang.String signature)
Get an Object by it's Signature
- + Version getProxyVersion()
Gets the BungeeCord Version
- + UniversalFile getRuntimeDirectory()
Gets the Runtime Directory
- + Server getServer(java.lang.String name)
Gets a Server
- + java.util.Map<java.lang.String,Server> getServers()
Gets the Servers (including SubServers)
- + SubDataServer getSubDataNetwork()
Gets the SubData Network Manager
- + SubServer getSubServer(java.lang.String name)
Gets a SubServer
- + java.util.Map<java.lang.String,SubServer> getSubServers()
Gets the SubServers
- + Version getWrapperVersion()
Gets the SubServers Version
- + void invalidateObjectSignature(java.lang.String signature)
Invalidate an Object Signature.
- + boolean removeHost(java.lang.String name)
Remove a Host from the Network
- + boolean removeHost(java.util.UUID player, java.lang.String name)
Remove a Host from the Network
- + boolean removeServer(java.lang.String name)
Remove a Server from the Network
- + boolean removeServer(java.util.UUID player, java.lang.String name)
Remove a Server from the Network
- + void -setLang(java.lang.String key, +setLang(java.lang.String channel, + java.lang.String key, java.lang.String value) -
Adds to the Language Map
+
Adds to the SubServers Lang
- + java.lang.String signAnonymousObject()
Get an Object Signature without linking the Signature to any object
- + java.lang.String signObject(java.lang.Object object)
Signs an Object
@@ -1089,45 +1097,31 @@ public  - +

  • setLang

    -
    public void setLang(java.lang.String key,
+
    public void setLang(java.lang.String channel,
+                    java.lang.String key,
                     java.lang.String value)
    
-
    Adds to the Language Map
    
+
    Adds to the SubServers Lang
    
 
    
 
    Parameters:
    
+
    channel - Lang Channel
    
 
    key - Key
    
 
    value - Lang Value
- - - -
    -
  • -

    getLang

    -
    public java.lang.String getLang(java.lang.String key)
    -
    Gets a value from the SubServers Lang
    -
    -
    Parameters:
    -
    key - Key
    -
    Returns:
    -
    Lang Value
    -
    -
    • -

  • getLang

    -
    public java.util.Map<java.lang.String,java.lang.String> getLang()
    +
    public java.util.Map<java.lang.String,java.util.Map<java.lang.String,java.lang.String>> getLang()
    Gets the SubServers Lang
    Returns:
    @@ -1135,6 +1129,40 @@ public 
+ + + +
    +
  • +

    getLang

    +
    public java.util.Map<java.lang.String,java.lang.String> getLang(java.lang.String channel)
    +
    Gets values from the SubServers Lang
    +
    +
    Parameters:
    +
    channel - Lang Channel
    +
    Returns:
    +
    Lang Value
    +
    +
    • +
+ + + +
    +
  • +

    getLang

    +
    public java.lang.String getLang(java.lang.String channel,
+                                java.lang.String key)
    +
    Gets a value from the SubServers Lang
    +
    +
    Parameters:
    +
    channel - Lang Channel
    +
    key - Key
    +
    Returns:
    +
    Lang Values
    +
    +
    • +
diff --git a/Javadoc/SubServers.Bungee/net/ME1312/SubServers/Bungee/SubPlugin.html b/Javadoc/SubServers.Bungee/net/ME1312/SubServers/Bungee/SubPlugin.html index d1df4af4..8487b695 100644 --- a/Javadoc/SubServers.Bungee/net/ME1312/SubServers/Bungee/SubPlugin.html +++ b/Javadoc/SubServers.Bungee/net/ME1312/SubServers/Bungee/SubPlugin.html @@ -160,42 +160,38 @@ implements net.md_5.bungee.api.plugin.Listener 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  - +YAMLConfig +langconfig  + + java.io.PrintStream out  - + boolean redis  - + long resetDate  - + SubDataServer subdata  - + SubServer sudo  - + Version version  @@ -359,22 +355,13 @@ implements net.md_5.bungee.api.plugin.Listener 
public YAMLConfig config
- + - - - -
    -
  • -

    exLang

    -
    public java.util.HashMap<java.lang.String,java.lang.String> exLang
    +

    langconfig

    +
    public YAMLConfig langconfig
diff --git a/Javadoc/SubServers.Client.Bukkit.jar b/Javadoc/SubServers.Client.Bukkit.jar index 699a846f..a99cc073 100644 Binary files a/Javadoc/SubServers.Client.Bukkit.jar and b/Javadoc/SubServers.Client.Bukkit.jar differ diff --git a/Javadoc/SubServers.Client.Bukkit/index-all.html b/Javadoc/SubServers.Client.Bukkit/index-all.html index 1c16b046..dadb8cc2 100644 --- a/Javadoc/SubServers.Client.Bukkit/index-all.html +++ b/Javadoc/SubServers.Client.Bukkit/index-all.html @@ -67,7 +67,7 @@ -
A B C D E F G H I J L N O P R S T U V Y  +
A B C D E F G H I J N O P R S T U V Y 

A

@@ -675,14 +675,18 @@
Get the Keys
-
getLang(String) - Method in class net.ME1312.SubServers.Client.Bukkit.SubAPI
-
-
Gets a value from the SubServers Lang
-
getLang() - Method in class net.ME1312.SubServers.Client.Bukkit.SubAPI
Gets the SubServers Lang
+
getLang(String) - Method in class net.ME1312.SubServers.Client.Bukkit.SubAPI
+
+
Gets values from the SubServers Lang
+
+
getLang(String, String) - Method in class net.ME1312.SubServers.Client.Bukkit.SubAPI
+
+
Gets a value from the SubServers Lang
+
getList(String) - Method in class net.ME1312.SubServers.Client.Bukkit.Library.Config.YAMLSection
Get a List by Handle
@@ -1188,14 +1192,6 @@
JSON Callback Class
- - - -

L

-
-
lang - Variable in class net.ME1312.SubServers.Client.Bukkit.SubPlugin
-
 
-
@@ -1313,11 +1309,11 @@
Download Lang Packet
-
PacketDownloadLang() - Constructor for class net.ME1312.SubServers.Client.Bukkit.Network.Packet.PacketDownloadLang
+
PacketDownloadLang(SubPlugin) - Constructor for class net.ME1312.SubServers.Client.Bukkit.Network.Packet.PacketDownloadLang
New PacketDownloadLang (In)
-
PacketDownloadLang(SubPlugin) - Constructor for class net.ME1312.SubServers.Client.Bukkit.Network.Packet.PacketDownloadLang
+
PacketDownloadLang() - Constructor for class net.ME1312.SubServers.Client.Bukkit.Network.Packet.PacketDownloadLang
New PacketDownloadLang (Out)
@@ -1935,7 +1931,7 @@ the order they are declared.
YAML Value Class
-A B C D E F G H I J L N O P R S T U V Y  +A B C D E F G H I J N O P R S T U V Y 
diff --git a/Javadoc/SubServers.Client.Bukkit/net/ME1312/SubServers/Client/Bukkit/Network/Packet/PacketDownloadLang.html b/Javadoc/SubServers.Client.Bukkit/net/ME1312/SubServers/Client/Bukkit/Network/Packet/PacketDownloadLang.html index d1b823ac..afb2b033 100644 --- a/Javadoc/SubServers.Client.Bukkit/net/ME1312/SubServers/Client/Bukkit/Network/Packet/PacketDownloadLang.html +++ b/Javadoc/SubServers.Client.Bukkit/net/ME1312/SubServers/Client/Bukkit/Network/Packet/PacketDownloadLang.html @@ -134,12 +134,12 @@ implements PacketDownloadLang() -
New PacketDownloadLang (In)
+
New PacketDownloadLang (Out)
PacketDownloadLang(SubPlugin plugin) -
New PacketDownloadLang (Out)
+
New PacketDownloadLang (In)
@@ -197,28 +197,28 @@ implements + - + diff --git a/Javadoc/SubServers.Client.Bukkit/net/ME1312/SubServers/Client/Bukkit/SubAPI.html b/Javadoc/SubServers.Client.Bukkit/net/ME1312/SubServers/Client/Bukkit/SubAPI.html index d1f31f34..4542c143 100644 --- a/Javadoc/SubServers.Client.Bukkit/net/ME1312/SubServers/Client/Bukkit/SubAPI.html +++ b/Javadoc/SubServers.Client.Bukkit/net/ME1312/SubServers/Client/Bukkit/SubAPI.html @@ -17,7 +17,7 @@ catch(err) { } //--> -var methods = {"i0":10,"i1":10,"i2":10,"i3":10,"i4":9,"i5":42,"i6":10,"i7":10,"i8":10,"i9":10,"i10":10,"i11":10}; +var methods = {"i0":10,"i1":10,"i2":10,"i3":10,"i4":9,"i5":42,"i6":10,"i7":10,"i8":10,"i9":10,"i10":10,"i11":10,"i12":10}; var tabs = {65535:["t0","All Methods"],1:["t1","Static Methods"],2:["t2","Instance Methods"],8:["t4","Concrete Methods"],32:["t6","Deprecated Methods"]}; var altColor = "altColor"; var rowColor = "rowColor"; @@ -167,36 +167,43 @@ extends java.lang.Object -java.util.Map<java.lang.String,java.lang.String> +java.util.Map<java.lang.String,java.util.Map<java.lang.String,java.lang.String>> getLang()
Gets the SubServers Lang
-java.lang.String -getLang(java.lang.String key) -
Gets a value from the SubServers Lang
+java.util.Map<java.lang.String,java.lang.String> +getLang(java.lang.String channel) +
Gets values from the SubServers Lang
+java.lang.String +getLang(java.lang.String channel, + java.lang.String key) +
Gets a value from the SubServers Lang
+ + + Version getPluginVersion()
Gets the SubServers Version
- + Version getServerVersion()
Gets the Server Version
- + SubDataClient getSubDataNetwork()
Gets the SubData Network Manager
- + void setGraphicHandler(UIHandler graphics)
Sets the Graphics Handler for SubServers to use
@@ -282,29 +289,13 @@ public  - - - - - - - diff --git a/Javadoc/SubServers.Host.jar b/Javadoc/SubServers.Host.jar index dff5381e..95de9887 100644 Binary files a/Javadoc/SubServers.Host.jar and b/Javadoc/SubServers.Host.jar differ diff --git a/Javadoc/SubServers.Host/index-all.html b/Javadoc/SubServers.Host/index-all.html index a6473cca..a1ee3066 100644 --- a/Javadoc/SubServers.Host/index-all.html +++ b/Javadoc/SubServers.Host/index-all.html @@ -775,14 +775,18 @@
Get the Keys
-
getLang(String) - Method in class net.ME1312.SubServers.Host.SubAPI
-
-
Gets a value from the SubServers Lang
-
getLang() - Method in class net.ME1312.SubServers.Host.SubAPI
Gets the SubServers Lang
+
getLang(String) - Method in class net.ME1312.SubServers.Host.SubAPI
+
+
Gets values from the SubServers Lang
+
+
getLang(String, String) - Method in class net.ME1312.SubServers.Host.SubAPI
+
+
Gets a value from the SubServers Lang
+
getList(String) - Method in class net.ME1312.SubServers.Host.Library.Config.YAMLSection
Get a List by Handle
@@ -1353,8 +1357,6 @@

L

-
lang - Variable in class net.ME1312.SubServers.Host.ExHost
-
 
LAST - Static variable in class net.ME1312.SubServers.Host.Library.Event.EventOrder
 
LATE - Static variable in class net.ME1312.SubServers.Host.Library.Event.EventOrder
@@ -1553,7 +1555,7 @@
New PacketDownloadServerList (In)
-
PacketDownloadServerList(String, JSONCallback...) - Constructor for class net.ME1312.SubServers.Host.Network.Packet.PacketDownloadServerList
+
PacketDownloadServerList(String, String, JSONCallback...) - Constructor for class net.ME1312.SubServers.Host.Network.Packet.PacketDownloadServerList
New PacketDownloadServerList (Out)
diff --git a/Javadoc/SubServers.Host/net/ME1312/SubServers/Host/ExHost.html b/Javadoc/SubServers.Host/net/ME1312/SubServers/Host/ExHost.html index 9e245711..5042cc88 100644 --- a/Javadoc/SubServers.Host/net/ME1312/SubServers/Host/ExHost.html +++ b/Javadoc/SubServers.Host/net/ME1312/SubServers/Host/ExHost.html @@ -153,30 +153,26 @@ extends java.lang.Object host  -YAMLSection -lang  - - Logger log  - + UniversalFile runtime  - + java.util.HashMap<java.lang.String,SubServer> servers  - + SubDataClient subdata  - + java.util.HashMap<java.lang.String,SubCreator.ServerTemplate> templates  - + Version version  @@ -305,15 +301,6 @@ extends java.lang.Object 
public YAMLSection host
- - - - diff --git a/Javadoc/SubServers.Host/net/ME1312/SubServers/Host/Network/Packet/PacketDownloadServerList.html b/Javadoc/SubServers.Host/net/ME1312/SubServers/Host/Network/Packet/PacketDownloadServerList.html index 7fcc82f0..22001ce3 100644 --- a/Javadoc/SubServers.Host/net/ME1312/SubServers/Host/Network/Packet/PacketDownloadServerList.html +++ b/Javadoc/SubServers.Host/net/ME1312/SubServers/Host/Network/Packet/PacketDownloadServerList.html @@ -138,7 +138,8 @@ implements -PacketDownloadServerList(java.lang.String host, +PacketDownloadServerList(java.lang.String host, + java.lang.String group, JSONCallback... callback)
New PacketDownloadServerList (Out)
@@ -208,18 +209,20 @@ implements New PacketDownloadServerList (In)
- + @@ -101,19 +101,28 @@ var activeTableTab = "activeTableTab";
  • net.md_5.bungee.api.plugin.Command
    • + +
    • +
      +
      All Implemented Interfaces:
      +
      net.md_5.bungee.api.plugin.TabExecutor
      +

      public final class SubCommand
-extends net.md_5.bungee.api.plugin.Command
      +extends CommandX
    @@ -147,24 +156,6 @@ extends net.md_5.bungee.api.plugin.Command - -
      -
    • - - -

      Constructor Summary

      - - - - - - - - -
      Constructors 
      Constructor and Description
      SubCommand(SubPlugin plugin, - java.lang.String label) 
      -
      • -
    • @@ -182,8 +173,22 @@ extends net.md_5.bungee.api.plugin.Command execute(net.md_5.bungee.api.CommandSender sender, java.lang.String[] args)  + +NamedContainer<java.lang.String,java.util.List<java.lang.String>> +suggestArguments(net.md_5.bungee.api.CommandSender sender, + java.lang.String[] args) +
      Suggest command arguments
      + + +
      • @@ -205,24 +210,6 @@ extends net.md_5.bungee.api.plugin.Command
        • - -
            -
          • - - -

            Constructor Detail

            - - - -
              -
            • -

              SubCommand

              -
              public SubCommand(SubPlugin plugin,
-                  java.lang.String label)
              -
              • -
            -
            • -
          • @@ -232,7 +219,7 @@ extends net.md_5.bungee.api.plugin.Command -
              +

              • execute

                public void execute(net.md_5.bungee.api.CommandSender sender,
@@ -243,6 +230,26 @@ extends net.md_5.bungee.api.plugin.Command
              + + + +
                +
              • +

                suggestArguments

                +
                public NamedContainer<java.lang.String,java.util.List<java.lang.String>> suggestArguments(net.md_5.bungee.api.CommandSender sender,
+                                                                                          java.lang.String[] args)
                +
                Suggest command arguments
                +
                +
                Specified by:
                +
                suggestArguments in class CommandX
                +
                Parameters:
                +
                sender - Sender
                +
                args - Arguments
                +
                Returns:
                +
                The validator's response and list of possible arguments
                +
                +
                • +
            • @@ -297,13 +304,13 @@ extends net.md_5.bungee.api.plugin.Command
          • Summary: 
          • Nested | 
          • Field | 
            • -
          • Constr | 
            • +
          • Constr | 
          • Method
        diff --git a/Javadoc/SubServers.Sync/net/ME1312/SubServers/Sync/SubPlugin.html b/Javadoc/SubServers.Sync/net/ME1312/SubServers/Sync/SubPlugin.html index 1d26ac7a..1563e426 100644 --- a/Javadoc/SubServers.Sync/net/ME1312/SubServers/Sync/SubPlugin.html +++ b/Javadoc/SubServers.Sync/net/ME1312/SubServers/Sync/SubPlugin.html @@ -160,30 +160,26 @@ implements net.md_5.bungee.api.plugin.Listener dir  -YAMLSection -lang  - - long lastReload  - + java.io.PrintStream out  - + boolean redis  - + java.util.Map<java.lang.String,Server> servers  - + SubDataClient subdata  - + Version version  @@ -348,15 +344,6 @@ implements net.md_5.bungee.api.plugin.Listener 
        public YAMLConfig config
      - - - - diff --git a/Javadoc/SubServers.Sync/net/ME1312/SubServers/Sync/package-tree.html b/Javadoc/SubServers.Sync/net/ME1312/SubServers/Sync/package-tree.html index abe41aad..ca060188 100644 --- a/Javadoc/SubServers.Sync/net/ME1312/SubServers/Sync/package-tree.html +++ b/Javadoc/SubServers.Sync/net/ME1312/SubServers/Sync/package-tree.html @@ -81,9 +81,13 @@
      • net.md_5.bungee.api.plugin.Command
      • net.ME1312.SubServers.Sync.Launch
        • diff --git a/Javadoc/SubServers.Sync/overview-frame.html b/Javadoc/SubServers.Sync/overview-frame.html index 8368c270..b5d753ff 100644 --- a/Javadoc/SubServers.Sync/overview-frame.html +++ b/Javadoc/SubServers.Sync/overview-frame.html @@ -15,6 +15,8 @@
      • net.ME1312.SubServers.Sync
      • net.ME1312.SubServers.Sync.Event
      • net.ME1312.SubServers.Sync.Library
        • +
      • net.ME1312.SubServers.Sync.Library.Compatibility
        • +
      • net.ME1312.SubServers.Sync.Library.Compatibility.v1_13
      • net.ME1312.SubServers.Sync.Library.Config
      • net.ME1312.SubServers.Sync.Library.Exception
      • net.ME1312.SubServers.Sync.Library.Version
        • diff --git a/Javadoc/SubServers.Sync/overview-summary.html b/Javadoc/SubServers.Sync/overview-summary.html index 9daccce9..e165a528 100644 --- a/Javadoc/SubServers.Sync/overview-summary.html +++ b/Javadoc/SubServers.Sync/overview-summary.html @@ -91,6 +91,14 @@   +net.ME1312.SubServers.Sync.Library.Compatibility +  + + +net.ME1312.SubServers.Sync.Library.Compatibility.v1_13 +  + + net.ME1312.SubServers.Sync.Library.Config   diff --git a/Javadoc/SubServers.Sync/overview-tree.html b/Javadoc/SubServers.Sync/overview-tree.html index f67f6698..16565a59 100644 --- a/Javadoc/SubServers.Sync/overview-tree.html +++ b/Javadoc/SubServers.Sync/overview-tree.html @@ -74,6 +74,8 @@
      • net.ME1312.SubServers.Sync,
      • net.ME1312.SubServers.Sync.Event,
      • net.ME1312.SubServers.Sync.Library,
        • +
      • net.ME1312.SubServers.Sync.Library.Compatibility,
        • +
      • net.ME1312.SubServers.Sync.Library.Compatibility.v1_13,
      • net.ME1312.SubServers.Sync.Library.Config,
      • net.ME1312.SubServers.Sync.Library.Exception,
      • net.ME1312.SubServers.Sync.Library.Version,
        • @@ -99,9 +101,14 @@
      • net.md_5.bungee.api.plugin.Command
      • net.ME1312.SubServers.Sync.Library.Container<V> diff --git a/Javadoc/SubServers.Sync/package-list b/Javadoc/SubServers.Sync/package-list index cf998bc9..5d29fe18 100644 --- a/Javadoc/SubServers.Sync/package-list +++ b/Javadoc/SubServers.Sync/package-list @@ -1,6 +1,8 @@ net.ME1312.SubServers.Sync net.ME1312.SubServers.Sync.Event net.ME1312.SubServers.Sync.Library +net.ME1312.SubServers.Sync.Library.Compatibility +net.ME1312.SubServers.Sync.Library.Compatibility.v1_13 net.ME1312.SubServers.Sync.Library.Config net.ME1312.SubServers.Sync.Library.Exception net.ME1312.SubServers.Sync.Library.Version diff --git a/SubServers.Bungee/module_subservers.bungee.xml b/SubServers.Bungee/module_subservers.bungee.xml new file mode 100644 index 00000000..b054ecbe --- /dev/null +++ b/SubServers.Bungee/module_subservers.bungee.xml @@ -0,0 +1,88 @@ + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + \ No newline at end of file diff --git a/SubServers.Bungee/src.jar b/SubServers.Bungee/src.jar index 58a0f89b..1d4b11d2 100644 Binary files a/SubServers.Bungee/src.jar and b/SubServers.Bungee/src.jar differ diff --git a/SubServers.Bungee/src/net/ME1312/SubServers/Bungee/Host/External/ExternalHost.java b/SubServers.Bungee/src/net/ME1312/SubServers/Bungee/Host/External/ExternalHost.java index de088fe7..8ffd5324 100644 --- a/SubServers.Bungee/src/net/ME1312/SubServers/Bungee/Host/External/ExternalHost.java +++ b/SubServers.Bungee/src/net/ME1312/SubServers/Bungee/Host/External/ExternalHost.java @@ -120,11 +120,6 @@ public class ExternalHost extends Host implements ClientHandler { return name; } - @Override - public int edit(UUID player, YAMLSection edit) { - return 0; // TODO - } - @Override public SubCreator getCreator() { return creator; 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 cc8f8b6d..03d203c9 100644 --- a/SubServers.Bungee/src/net/ME1312/SubServers/Bungee/Host/Host.java +++ b/SubServers.Bungee/src/net/ME1312/SubServers/Bungee/Host/Host.java @@ -199,25 +199,6 @@ public abstract class Host implements ExtraDataHandler { return i; } - /** - * Edits the Host - * - * @param player Player Editing - * @param edit Edits - * @return Success Status - */ - public abstract int edit(UUID player, YAMLSection edit); - - /** - * Edits the Host - * - * @param edit Edits - * @return Success Status - */ - public int edit(YAMLSection edit) { - return edit(null, edit); - } - /** * Gets the SubCreator Instance for this Host * diff --git a/SubServers.Bungee/src/net/ME1312/SubServers/Bungee/Host/Internal/InternalHost.java b/SubServers.Bungee/src/net/ME1312/SubServers/Bungee/Host/Internal/InternalHost.java index a0bebdb4..217542ef 100644 --- a/SubServers.Bungee/src/net/ME1312/SubServers/Bungee/Host/Internal/InternalHost.java +++ b/SubServers.Bungee/src/net/ME1312/SubServers/Bungee/Host/Internal/InternalHost.java @@ -77,11 +77,6 @@ public class InternalHost extends Host { return name; } - @Override - public int edit(UUID player, YAMLSection edit) { - return 0; // TODO - } - @Override public SubCreator getCreator() { return creator; diff --git a/SubServers.Bungee/src/net/ME1312/SubServers/Bungee/SubAPI.java b/SubServers.Bungee/src/net/ME1312/SubServers/Bungee/SubAPI.java index 8fbda94a..bfa7a9ed 100644 --- a/SubServers.Bungee/src/net/ME1312/SubServers/Bungee/SubAPI.java +++ b/SubServers.Bungee/src/net/ME1312/SubServers/Bungee/SubAPI.java @@ -8,6 +8,7 @@ import net.ME1312.SubServers.Bungee.Host.Server; import net.ME1312.SubServers.Bungee.Host.Host; import net.ME1312.SubServers.Bungee.Host.ServerContainer; import net.ME1312.SubServers.Bungee.Host.SubServer; +import net.ME1312.SubServers.Bungee.Library.Config.YAMLSection; import net.ME1312.SubServers.Bungee.Library.Exception.InvalidHostException; import net.ME1312.SubServers.Bungee.Library.NamedContainer; import net.ME1312.SubServers.Bungee.Library.UniversalFile; @@ -529,25 +530,17 @@ public final class SubAPI { } /** - * Adds to the Language Map + * Adds to the SubServers Lang * + * @param channel Lang Channel * @param key Key * @param value Lang Value */ - public void setLang(String key, String value) { - if (Util.isNull(key, value)) throw new NullPointerException(); - plugin.exLang.put(key, value); - } - - /** - * Gets a value from the SubServers Lang - * - * @param key Key - * @return Lang Value - */ - public String getLang(String key) { - if (Util.isNull(key)) throw new NullPointerException(); - return getLang().get(key); + public void setLang(String channel, String key, String value) { + if (Util.isNull(channel, key, value)) throw new NullPointerException(); + LinkedHashMap map = (plugin.lang.keySet().contains(channel.toLowerCase()))?plugin.lang.get(channel.toLowerCase()):new LinkedHashMap(); + map.put(key, value); + plugin.lang.put(channel.toLowerCase(), map); } /** @@ -555,13 +548,31 @@ public final class SubAPI { * * @return SubServers Lang */ - public Map getLang() { - HashMap lang = new HashMap(); - for (String key : plugin.lang.get().getSection("Lang").getKeys()) { - if (plugin.lang.get().getSection("Lang").isString(key)) lang.put(key, plugin.lang.get().getSection("Lang").getString(key)); - } - lang.putAll(plugin.exLang); - return lang; + public Map> getLang() { + return new LinkedHashMap<>(plugin.lang); + } + + /** + * Gets values from the SubServers Lang + * + * @param channel Lang Channel + * @return Lang Value + */ + public Map getLang(String channel) { + if (Util.isNull(channel)) throw new NullPointerException(); + return getLang().get(channel.toLowerCase()); + } + + /** + * Gets a value from the SubServers Lang + * + * @param channel Lang Channel + * @param key Key + * @return Lang Values + */ + public String getLang(String channel, String key) { + if (Util.isNull(channel, key)) throw new NullPointerException(); + return getLang(channel).get(key); } /** diff --git a/SubServers.Bungee/src/net/ME1312/SubServers/Bungee/SubCommand.java b/SubServers.Bungee/src/net/ME1312/SubServers/Bungee/SubCommand.java index 12d50962..fc605c55 100644 --- a/SubServers.Bungee/src/net/ME1312/SubServers/Bungee/SubCommand.java +++ b/SubServers.Bungee/src/net/ME1312/SubServers/Bungee/SubCommand.java @@ -432,7 +432,7 @@ public final class SubCommand extends CommandX { for (String cmd : cmds) { if (cmd.startsWith(last)) list.add(last + cmd.substring(last.length())); } - return new NamedContainer<>((list.size() <= 0)?plugin.lang.get().getSection("Lang").getColoredString("Command.Generic.Invalid-Subcommand", '&').replace("$str$", args[0]):null, list); + return new NamedContainer<>((list.size() <= 0)?plugin.api.getLang("SubServers", "Command.Generic.Invalid-Subcommand").replace("$str$", args[0]):null, list); } } else { if (args[0].equals("info") || args[0].equals("status") || @@ -449,7 +449,7 @@ public final class SubCommand extends CommandX { list.add(last + server.getName().substring(last.length())); } } - return new NamedContainer<>((list.size() <= 0)?plugin.lang.get().getSection("Lang").getColoredString("Command.Generic.Unknown-SubServer", '&').replace("$str$", args[0]):null, list); + return new NamedContainer<>((list.size() <= 0)?plugin.api.getLang("SubServers", "Command.Generic.Unknown-SubServer").replace("$str$", args[0]):null, list); } else { return new NamedContainer<>(null, Collections.emptyList()); } @@ -463,7 +463,7 @@ public final class SubCommand extends CommandX { if (server.getName().toLowerCase().startsWith(last)) list.add(last + server.getName().substring(last.length())); } } - return new NamedContainer<>((list.size() <= 0)?plugin.lang.get().getSection("Lang").getColoredString("Command.Generic.Unknown-SubServer", '&').replace("$str$", args[0]):null, list); + return new NamedContainer<>((list.size() <= 0)?plugin.api.getLang("SubServers", "Command.Generic.Unknown-SubServer").replace("$str$", args[0]):null, list); } else if (args.length == 3) { return new NamedContainer<>(null, Collections.singletonList("")); } else { @@ -481,29 +481,31 @@ public final class SubCommand extends CommandX { if (host.getName().toLowerCase().startsWith(last)) list.add(last + host.getName().substring(last.length())); } } - return new NamedContainer<>((list.size() <= 0)?plugin.lang.get().getSection("Lang").getColoredString("Command.Generic.Unknown-Host", '&').replace("$str$", args[0]):null, list); + return new NamedContainer<>((list.size() <= 0)?plugin.api.getLang("SubServers", "Command.Generic.Unknown-Host").replace("$str$", args[0]):null, list); } else if (args.length == 4) { List list = new ArrayList(); Map hosts = plugin.api.getHosts(); - if (last.length() == 0) { - for (SubCreator.ServerTemplate template : hosts.get(args[2].toLowerCase()).getCreator().getTemplates().values()) list.add(template.toString()); + if (!hosts.keySet().contains(args[2].toLowerCase())) { + list.add("