diff --git a/Artifacts/SubServers.Bungee.Patcher.sh b/Artifacts/SubServers.Bungee.Patcher.sh index bbe0a863..53b2a082 100644 --- a/Artifacts/SubServers.Bungee.Patcher.sh +++ b/Artifacts/SubServers.Bungee.Patcher.sh @@ -5,14 +5,14 @@ if [ -z "$1" ] then if [ -z "$2" ] - then - echo "SubServers Library Patcher: Combines BungeeCord and SubServers.Bungee/SubServers.Sync into one jar file" - echo "Usage: SubServers.Bungee.Patcher.sh " - exit 0 - else - echo ERROR: No BungeeCord File Supplied - exit 1 - fi + then + echo "SubServers Library Patcher: Combines BungeeCord and SubServers.Bungee/SubServers.Sync into one jar file" + echo "Usage: bash $0 " + exit 0 + else + echo ERROR: No BungeeCord File Supplied + exit 1 + fi fi if [ ! -f "$1" ] then @@ -32,56 +32,60 @@ fi if [ -d "Buildtools" ]; then rm -Rf Buildtools fi +echo ">> Extracting $1..." mkdir BuildTools mkdir BuildTools/Modded.jar cd BuildTools/Modded.jar -echo ">> Extracting $1..." jar xvf ../../$1; retvala=$?; if [ $retvala -eq 0 ] then if [ -f "LICENSE.txt" ]; then - rm -Rf LICENSE.txt - fi - if [ -f "LICENSE" ]; then - rm -Rf LICENSE - fi - mkdir ../Vanilla.jar - cd ../Vanilla.jar + rm -Rf LICENSE.txt + fi + if [ -f "LICENSE" ]; then + rm -Rf LICENSE + fi echo ">> Extracting $2..." + mkdir ../Vanilla.jar + cd ../Vanilla.jar jar xvf ../../$2; retvalb=$?; - if [ $retvalb -eq 0 ] - then - echo ">> Writing Changes..." - yes | cp -rf . ../Modded.jar - printf "\n " >> META-INF/MANIFEST.MF - if [ -f "MODIFICATIONS" ]; then - mv -f MODIFICATIONS ../MODIFICATIONS - else - printf "# SubServers.Bungee.Patcher generated difference list (may be empty if git is not installed)\n#\n> git --no-pager diff --no-index --name-status BuildTools/Vanilla.jar BuildTools/Modded.jar\n" > ../MODIFICATIONS - fi - cd ../ - git --no-pager diff --no-index --name-status Vanilla.jar Modded.jar | sed -e "s/\tVanilla.jar\//\t\//" -e "s/\tModded.jar\//\t\//" >> MODIFICATIONS - mv -f MODIFICATIONS Modded.jar - cd Modded.jar - echo ">> Recompiling..." - jar cvfm ../../SubServers.Patched.jar META-INF/MANIFEST.MF .; retvalc=$?; - if [ $retvalc -eq 0 ] - then - echo ">> Cleaning Up..." - rm -Rf ../../Buildtools - exit 0; - else - echo ">> Error Recomiling Files" - rm -Rf ../../Buildtools - exit 4 - fi - else - echo ">> Error Decompiling $2 Files" - rm -Rf ../../Buildtools - exit 3 - fi + if [ $retvalb -eq 0 ] + then + echo ">> Writing Changes..." + yes | cp -rf . ../Modded.jar + printf "\n " >> META-INF/MANIFEST.MF + if [ -f "MODIFICATIONS" ]; then + mv -f MODIFICATIONS ../MODIFICATIONS + else + printf "# SubServers.Bungee.Patcher generated difference list (may be empty if git is not installed)\n#\n" > ../MODIFICATIONS + fi + cd ../ + printf "@ `date`\n> git --no-pager diff --no-index --name-status BuildTools/Vanilla.jar BuildTools/Modded.jar\n" >> MODIFICATIONS + git --no-pager diff --no-index --name-status Vanilla.jar Modded.jar | sed -e "s/\tVanilla.jar\//\t\//" -e "s/\tModded.jar\//\t\//" >> MODIFICATIONS + mv -f MODIFICATIONS Modded.jar + cd Modded.jar + echo ">> Recompiling..." + if [ -f "../../SubServers.Patched.jar" ]; then + rm -Rf ../../SubServers.Patched.jar + fi + jar cvfm ../../SubServers.Patched.jar META-INF/MANIFEST.MF .; retvalc=$?; + if [ $retvalc -eq 0 ] + then + echo ">> Cleaning Up..." + rm -Rf ../../Buildtools + exit 0; + else + echo ">> Error Recomiling Files" + rm -Rf ../../Buildtools + exit 4 + fi + else + echo ">> Error Decompiling $2 Files" + rm -Rf ../../Buildtools + exit 3 + fi else echo ">> Error Decompiling $1 Files" rm -Rf ../../Buildtools - exit 3 + exit 3 fi \ No newline at end of file diff --git a/Artifacts/SubServers.Bungee.jar b/Artifacts/SubServers.Bungee.jar index 67a5e850..e9c2db75 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 b4fba05a..2fed4dd8 100644 Binary files a/Artifacts/SubServers.Client.Bukkit.jar and b/Artifacts/SubServers.Client.Bukkit.jar differ diff --git a/Artifacts/SubServers.Host.jar b/Artifacts/SubServers.Host.jar index b140143e..e6b9097a 100644 Binary files a/Artifacts/SubServers.Host.jar and b/Artifacts/SubServers.Host.jar differ diff --git a/Javadoc/SubServers.Bungee.jar b/Javadoc/SubServers.Bungee.jar index 79f66a42..d4fcc6d1 100644 Binary files a/Javadoc/SubServers.Bungee.jar and b/Javadoc/SubServers.Bungee.jar differ diff --git a/Javadoc/SubServers.Client.Bukkit.jar b/Javadoc/SubServers.Client.Bukkit.jar index 547f5545..87cc7a47 100644 Binary files a/Javadoc/SubServers.Client.Bukkit.jar and b/Javadoc/SubServers.Client.Bukkit.jar differ diff --git a/Javadoc/SubServers.Host.jar b/Javadoc/SubServers.Host.jar index 23155657..8a9aecef 100644 Binary files a/Javadoc/SubServers.Host.jar and b/Javadoc/SubServers.Host.jar differ diff --git a/SubServers.Bungee/src.jar b/SubServers.Bungee/src.jar index ad9b74e4..4ac621b5 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/Library/Files/lang.yml b/SubServers.Bungee/src/net/ME1312/SubServers/Bungee/Library/Files/lang.yml index 246b1973..5a412344 100644 --- a/SubServers.Bungee/src/net/ME1312/SubServers/Bungee/Library/Files/lang.yml +++ b/SubServers.Bungee/src/net/ME1312/SubServers/Bungee/Library/Files/lang.yml @@ -10,12 +10,12 @@ Lang: 'Bungee.List.List': '&f$str$' 'Bungee.List.Divider': '&f, ' 'Bungee.List.Total': 'Total players online: $int$' - 'Command.Generic.Player-Only': '&4SubServers \u00BB Console cannot run this command' - 'Command.Generic.Console-Only': '&4SubServers \u00BB This command is for console use only' - 'Command.Generic.Usage': '&7SubServers \u00BB Usage: &f$str$' - 'Command.Generic.Invalid-Subcommand': '&4SubServers \u00BB Unknown sub-command: $str$' - 'Command.Generic.Invalid-Permission': '&4SubServers \u00BB You need &n$str$&4 to use this command' - 'Command.Help.Header': '&7SubServers \u00BB Command Help:' + 'Command.Generic.Player-Only': '&cSubServers &4&l\u00BB&c Console cannot run this command' + 'Command.Generic.Console-Only': '&cSubServers &4&l\u00BB&c This command is for console use only' + 'Command.Generic.Usage': '&7SubServers &8&l\u00BB&7 Usage: &f$str$' + 'Command.Generic.Invalid-Subcommand': '&cSubServers &4&l\u00BB&c Unknown sub-command: $str$' + 'Command.Generic.Invalid-Permission': '&cSubServers &4&l\u00BB&c You need &n$str$&4 to use this command' + 'Command.Help.Header': '&7SubServers &8&l\u00BB&7 Command Help:' 'Command.Help.Help': ' &7Help:&f $str$' 'Command.Help.List': ' &7List:&f $str$' 'Command.Help.Version': ' &7Version:&f $str$' @@ -27,53 +27,53 @@ Lang: 'Command.Help.SubServer.Stop': ' &7Stop Server:&f $str$' 'Command.Help.SubServer.Terminate': ' &7Terminate Server:&f $str$' 'Command.Help.SubServer.Command': ' &7Command Server:&f $str$' - 'Command.Version': '&7SubServers \u00BB $name$ is running version &f$str$' + 'Command.Version': '&7SubServers &8&l\u00BB&7 $name$ is running version &f$str$' 'Command.Version.Outdated': '&7You are $int$ version(s) behind.' 'Command.Version.Latest': '&7You are on the latest version.' - 'Command.List.Group-Header': '&7SubServers \u00BB Group/Server List:' - 'Command.List.Host-Header': '&7SubServers \u00BB Host/SubServer List:' - 'Command.List.Server-Header': '&7SubServers \u00BB Server List:' + 'Command.List.Group-Header': '&7SubServers &8&l\u00BB&7 Group/Server List:' + 'Command.List.Host-Header': '&7SubServers &8&l\u00BB&7 Host/SubServer List:' + 'Command.List.Server-Header': '&7SubServers &8&l\u00BB&7 Server List:' 'Command.List.Header': '&7: ' 'Command.List.Divider': '&7, ' 'Command.List.Empty': '&7(none)' - 'Command.Info': '&7SubServers \u00BB Info on &f$str$&7:' - 'Command.Info.Unknown': '&cSubServers \u00BB There is no server with that name' - 'Command.Info.Invalid': '&cSubServers \u00BB That Server is not a SubServer' + 'Command.Info': '&7SubServers &8&l\u00BB&7 Info on &f$str$&7:' + 'Command.Info.Unknown': '&cSubServers &4&l\u00BB&c There is no server with that name' + 'Command.Info.Invalid': '&cSubServers &4&l\u00BB&c That Server is not a SubServer' 'Command.Info.Format': '- &f$str$&7: &r' 'Command.Info.List': ' - $str$' - 'Command.Start': '&aSubServers \u00BB Starting SubServer' - 'Command.Start.Unknown': '&cSubServers \u00BB There is no server with that name' - 'Command.Start.Invalid': '&cSubServers \u00BB That Server is not a SubServer' - 'Command.Start.Host-Disabled': '&cSubServers \u00BB That SubServer\u0027s Host is not enabled' - 'Command.Start.Server-Disabled': '&cSubServers \u00BB That SubServer is not enabled' - 'Command.Start.Server-Incompatible': '&cSubServers \u00BB That SubServer cannot start while these server(s) are running: &4$str$' - 'Command.Start.Running': '&cSubServers \u00BB That SubServer is already running' - 'Command.Stop': '&aSubServers \u00BB Stopping SubServer' - 'Command.Stop.Unknown': '&cSubServers \u00BB There is no server with that name' - 'Command.Stop.Invalid': '&cSubServers \u00BB That Server is not a SubServer' - 'Command.Stop.Not-Running': '&cSubServers \u00BB That SubServer is not running' - 'Command.Terminate': '&aSubServers \u00BB Stopping SubServer' - 'Command.Terminate.Unknown': '&cSubServers \u00BB There is no server with that name' - 'Command.Terminate.Invalid': '&cSubServers \u00BB That Server is not a SubServer' - 'Command.Terminate.Not-Running': '&cSubServers \u00BB That SubServer is not running' - 'Command.Command': '&aSubServers \u00BB Sending command to SubServer' - 'Command.Command.Unknown': '&cSubServers \u00BB There is no server with that name' - 'Command.Command.Invalid': '&cSubServers \u00BB That Server is not a SubServer' - 'Command.Command.Not-Running': '&cSubServers \u00BB That SubServer is not running' - 'Command.Teleport': '&aSubServers \u00BB Teleporting...' - 'Command.Teleport.Offline': '&cSubServers \u00BB There is no player online with that name' - 'Command.Teleport.Invalid': '&cSubServers \u00BB There is no server with that name' - 'Command.Creator': '&aSubServers \u00BB Creating SubServer' - 'Command.Creator.Exists': '&cSubServers \u00BB There is already a SubServer with that name' - 'Command.Creator.Unknown-Host': '&cSubServers \u00BB There is no host with that name' - 'Command.Creator.Invalid-Template': '&cSubServers \u00BB There is no template with that name' - 'Command.Creator.Invalid-Version': '&cSubServers \u00BB SubCreator cannot create servers before Minecraft 1.8' - 'Command.Creator.Invalid-Port': '&cSubServers \u00BB Invalid Port Number' + 'Command.Start': '&aSubServers &2&l\u00BB&a Starting SubServer' + 'Command.Start.Unknown': '&cSubServers &4&l\u00BB&c There is no server with that name' + 'Command.Start.Invalid': '&cSubServers &4&l\u00BB&c That Server is not a SubServer' + 'Command.Start.Host-Disabled': '&cSubServers &4&l\u00BB&c That SubServer\u0027s Host is not enabled' + 'Command.Start.Server-Disabled': '&cSubServers &4&l\u00BB&c That SubServer is not enabled' + 'Command.Start.Server-Incompatible': '&cSubServers &4&l\u00BB&c That SubServer cannot start while these server(s) are running: &4$str$' + 'Command.Start.Running': '&cSubServers &4&l\u00BB&c That SubServer is already running' + 'Command.Stop': '&aSubServers &2&l\u00BB&a Stopping SubServer' + 'Command.Stop.Unknown': '&cSubServers &4&l\u00BB&c There is no server with that name' + 'Command.Stop.Invalid': '&cSubServers &4&l\u00BB&c That Server is not a SubServer' + 'Command.Stop.Not-Running': '&cSubServers &4&l\u00BB&c That SubServer is not running' + 'Command.Terminate': '&aSubServers &2&l\u00BB&a Stopping SubServer' + 'Command.Terminate.Unknown': '&cSubServers &4&l\u00BB&c There is no server with that name' + 'Command.Terminate.Invalid': '&cSubServers &4&l\u00BB&c That Server is not a SubServer' + 'Command.Terminate.Not-Running': '&cSubServers &4&l\u00BB&c That SubServer is not running' + 'Command.Command': '&aSubServers &2&l\u00BB&a Sending command to SubServer' + 'Command.Command.Unknown': '&cSubServers &4&l\u00BB&c There is no server with that name' + 'Command.Command.Invalid': '&cSubServers &4&l\u00BB&c That Server is not a SubServer' + 'Command.Command.Not-Running': '&cSubServers &4&l\u00BB&c That SubServer is not running' + 'Command.Teleport': '&aSubServers &2&l\u00BB&a Teleporting...' + 'Command.Teleport.Offline': '&cSubServers &4&l\u00BB&c There is no player online with that name' + 'Command.Teleport.Invalid': '&cSubServers &4&l\u00BB&c There is no server with that name' + 'Command.Creator': '&aSubServers &2&l\u00BB&a Creating SubServer' + 'Command.Creator.Exists': '&cSubServers &4&l\u00BB&c There is already a SubServer with that name' + 'Command.Creator.Unknown-Host': '&cSubServers &4&l\u00BB&c There is no host with that name' + 'Command.Creator.Invalid-Template': '&cSubServers &4&l\u00BB&c There is no template with that name' + 'Command.Creator.Invalid-Version': '&cSubServers &4&l\u00BB&c SubCreator cannot create servers before Minecraft 1.8' + 'Command.Creator.Invalid-Port': '&cSubServers &4&l\u00BB&c Invalid Port Number' 'Interface.Generic.Back': '&cBack' 'Interface.Generic.Back-Arrow': '&e&l<--' 'Interface.Generic.Next-Arrow': '&e&l-->' 'Interface.Generic.Undo': '&6Undo' - 'Interface.Generic.Downloading': '&bSubServers \u00BB Downloading - $str$' + 'Interface.Generic.Downloading': '&bSubServers &1&l\u00BB&b Downloading - $str$' 'Interface.Generic.Downloading.Title': 'Downloading...' 'Interface.Generic.Downloading.Title-Color': '&b' 'Interface.Generic.Downloading.Title-Color-Alt': '&3' @@ -138,7 +138,7 @@ Lang: 'Interface.SubServer-Admin.Terminate.Title': '&cTerminating $str$' 'Interface.SubServer-Admin.Command': '&eSend a Command to the SubServer' 'Interface.SubServer-Admin.Command.Title': '&eSubServers\n&6Enter a Command to send via Chat' - 'Interface.SubServer-Admin.Command.Message': '&eSubServers \u00BB Enter a Command to send via Chat' + 'Interface.SubServer-Admin.Command.Message': '&eSubServers &6&l\u00BB&e Enter a Command to send via Chat' 'Interface.SubServer-Admin.Plugins': '&bPlugins...' 'Interface.SubServer-Plugin.Title': 'SubServer/$str$/Plugins' 'Interface.SubServer-Plugin.No-Plugins': '&c&oThere are No Plugins Available' \ No newline at end of file diff --git a/SubServers.Bungee/src/net/ME1312/SubServers/Bungee/SubCommand.java b/SubServers.Bungee/src/net/ME1312/SubServers/Bungee/SubCommand.java index 92e64002..36f88594 100644 --- a/SubServers.Bungee/src/net/ME1312/SubServers/Bungee/SubCommand.java +++ b/SubServers.Bungee/src/net/ME1312/SubServers/Bungee/SubCommand.java @@ -109,6 +109,7 @@ public final class SubCommand extends Command implements TabExecutor { } else if (args[0].equalsIgnoreCase("list")) { String div = ChatColor.RESET + ", "; int i = 0; + boolean sent = false; sender.sendMessage("SubServers > Group/Server List:"); for (String group : plugin.api.getGroups().keySet()) { String message = ""; @@ -134,9 +135,13 @@ public final class SubCommand extends Command implements TabExecutor { message += server.getDisplayName() + " (" + server.getAddress().getAddress().getHostAddress() + ':' + server.getAddress().getPort() + ((server.getName().equals(server.getDisplayName()))?"":ChatColor.stripColor(div)+server.getName()) + ")"; i++; } + if (i == 0) message += ChatColor.RESET + "(none)"; sender.sendMessage(message); i = 0; + sent = true; } + if (!sent) sender.sendMessage(ChatColor.RESET + "(none)"); + sent = false; sender.sendMessage("SubServers > Host/SubServer List:"); for (Host host : plugin.api.getHosts().values()) { String message = ""; @@ -160,9 +165,12 @@ public final class SubCommand extends Command implements TabExecutor { message += subserver.getDisplayName() + " (" + subserver.getAddress().getPort() + ((subserver.getName().equals(subserver.getDisplayName()))?"":ChatColor.stripColor(div)+subserver.getName()) + ")"; i++; } + if (i == 0) message += ChatColor.RESET + "(none)"; sender.sendMessage(message); i = 0; + sent = true; } + if (!sent) sender.sendMessage(ChatColor.RESET + "(none)"); sender.sendMessage("SubServers > Server List:"); String message = ""; for (Server server : plugin.api.getServers().values()) { @@ -172,6 +180,7 @@ public final class SubCommand extends Command implements TabExecutor { i++; } } + if (i == 0) message += ChatColor.RESET + "(none)"; sender.sendMessage(message); } else if (args[0].equalsIgnoreCase("info") || args[0].equalsIgnoreCase("status")) { if (args.length > 1) { diff --git a/SubServers.Client/Bukkit/src.jar b/SubServers.Client/Bukkit/src.jar index 2152a3a8..d99e65f6 100644 Binary files a/SubServers.Client/Bukkit/src.jar and b/SubServers.Client/Bukkit/src.jar differ diff --git a/SubServers.Client/Bukkit/src/net/ME1312/SubServers/Client/Bukkit/Graphic/UIRenderer.java b/SubServers.Client/Bukkit/src/net/ME1312/SubServers/Client/Bukkit/Graphic/UIRenderer.java index 84f99695..9d0e7276 100644 --- a/SubServers.Client/Bukkit/src/net/ME1312/SubServers/Client/Bukkit/Graphic/UIRenderer.java +++ b/SubServers.Client/Bukkit/src/net/ME1312/SubServers/Client/Bukkit/Graphic/UIRenderer.java @@ -128,7 +128,7 @@ public abstract class UIRenderer { Bukkit.getScheduler().scheduleSyncDelayedTask(plugin, () -> { if (tdownload != null) Bukkit.getPlayer(player).sendMessage(plugin.lang.getSection("Lang").getColoredString("Interface.Generic.Downloading", '&').replace("$str$", subtitle)); download = null; - }, 30L); + }, 50L); } if (subtitle != null && tdownload == null) { tdownload = new NamedContainer(subtitle, 0); final Container delay = new Container(0); diff --git a/SubServers.Host/src.jar b/SubServers.Host/src.jar index 936cd68c..993c39b4 100644 Binary files a/SubServers.Host/src.jar and b/SubServers.Host/src.jar differ