diff --git a/Artifacts/SubServers.Bungee.Patcher.sh b/Artifacts/SubServers.Bungee.Patcher.sh index e895ecf0..bbe0a863 100644 --- a/Artifacts/SubServers.Bungee.Patcher.sh +++ b/Artifacts/SubServers.Bungee.Patcher.sh @@ -4,8 +4,15 @@ #!/usr/bin/env bash if [ -z "$1" ] then - echo ERROR: No BungeeCord File Supplied - exit 1 + 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 fi if [ ! -f "$1" ] then @@ -26,7 +33,6 @@ if [ -d "Buildtools" ]; then rm -Rf Buildtools fi mkdir BuildTools -mkdir BuildTools/Vanilla.jar mkdir BuildTools/Modded.jar cd BuildTools/Modded.jar echo ">> Extracting $1..." @@ -39,6 +45,7 @@ if [ $retvala -eq 0 ] if [ -f "LICENSE" ]; then rm -Rf LICENSE fi + mkdir ../Vanilla.jar cd ../Vanilla.jar echo ">> Extracting $2..." jar xvf ../../$2; retvalb=$?; @@ -47,8 +54,12 @@ if [ $retvala -eq 0 ] 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 ../ - 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 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 diff --git a/Artifacts/SubServers.Bungee.jar b/Artifacts/SubServers.Bungee.jar index e54c2f7d..27b23fa6 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 8837eb64..4bb88375 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 91793a66..a2e62194 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 b8b47596..94915931 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 9ebb2825..8b106842 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 3aeb0ac8..63535c68 100644 Binary files a/Javadoc/SubServers.Bungee.jar and b/Javadoc/SubServers.Bungee.jar differ diff --git a/Javadoc/SubServers.Bungee/allclasses-frame.html b/Javadoc/SubServers.Bungee/allclasses-frame.html index 83ec31d9..0ea903e3 100644 --- a/Javadoc/SubServers.Bungee/allclasses-frame.html +++ b/Javadoc/SubServers.Bungee/allclasses-frame.html @@ -96,6 +96,7 @@
  • SubServer
  • SubServer.LoggedCommand
  • SubServerContainer
    • +
  • SubServerController
  • SubStartEvent
  • SubStopEvent
  • SubStoppedEvent
    • diff --git a/Javadoc/SubServers.Bungee/allclasses-noframe.html b/Javadoc/SubServers.Bungee/allclasses-noframe.html index 601d3d5e..8cea2e18 100644 --- a/Javadoc/SubServers.Bungee/allclasses-noframe.html +++ b/Javadoc/SubServers.Bungee/allclasses-noframe.html @@ -96,6 +96,7 @@
  • SubServer
  • SubServer.LoggedCommand
  • SubServerContainer
    • +
  • SubServerController
  • SubStartEvent
  • SubStopEvent
  • SubStoppedEvent
    • diff --git a/Javadoc/SubServers.Bungee/index-all.html b/Javadoc/SubServers.Bungee/index-all.html index 738f1499..1482eb04 100644 --- a/Javadoc/SubServers.Bungee/index-all.html +++ b/Javadoc/SubServers.Bungee/index-all.html @@ -308,6 +308,14 @@
    command(String) - Method in class net.ME1312.SubServers.Bungee.Host.SubServerContainer
     
    +
    command(UUID, String) - Method in class net.ME1312.SubServers.Bungee.Host.SubServerController
    +
    +
    Commands the Server
    +
    +
    command(String) - Method in class net.ME1312.SubServers.Bungee.Host.SubServerController
    +
    +
    Commands the Server
    +
    compare(Version, Version) - Static method in class net.ME1312.SubServers.Bungee.Library.Version.Version
    Compare Versions
    @@ -426,6 +434,14 @@
    edit(YAMLSection) - Method in class net.ME1312.SubServers.Bungee.Host.SubServerContainer
     
    +
    edit(UUID, YAMLSection) - Method in class net.ME1312.SubServers.Bungee.Host.SubServerController
    +
    +
    Edits the Server
    +
    +
    edit(YAMLSection) - Method in class net.ME1312.SubServers.Bungee.Host.SubServerController
    +
    +
    Edits the Server
    +
    encrypt(int, String, InputStream, OutputStream) - Static method in class net.ME1312.SubServers.Bungee.Network.AES
    Encrypts a stream of data.
    @@ -688,6 +704,10 @@
    Generate JSON Packet Contents
    +
    get() - Method in class net.ME1312.SubServers.Bungee.Host.SubServerController
    +
    +
    Get the SubServer that is being controlled
    +
    get() - Method in class net.ME1312.SubServers.Bungee.Library.Config.YAMLConfig
    Get Config Contents
    @@ -810,6 +830,10 @@
    Gets all the commands that were sent to this Server successfully
    +
    getCommandHistory() - Method in class net.ME1312.SubServers.Bungee.Host.SubServerController
    +
    +
    Gets all the commands that were sent to this Server successfully
    +
    getConfigOptions() - Method in class net.ME1312.SubServers.Bungee.Host.SubCreator.ServerTemplate
    Get the Configuration Options for this Template
    @@ -894,6 +918,10 @@
    Get the Server's Executable String
    +
    getExecutable() - Method in class net.ME1312.SubServers.Bungee.Host.SubServerController
    +
    +
    Get the Server's Executable String
    +
    getExternalAddress() - Method in class net.ME1312.SubServers.Bungee.Host.External.ExternalSubLogger
    Get the External Logger Address
    @@ -1002,6 +1030,10 @@
    Grabs the Host of the Server
    +
    getHost() - Method in class net.ME1312.SubServers.Bungee.Host.SubServerController
    +
    +
    Grabs the Host of the Server
    +
    getHost(String) - Method in class net.ME1312.SubServers.Bungee.SubAPI
    Gets a Host
    @@ -1102,6 +1134,10 @@
    Get Process Logger
    +
    getLogger() - Method in class net.ME1312.SubServers.Bungee.Host.SubServerController
    +
    +
    Get Process Logger
    +
    getLong(String) - Method in class net.ME1312.SubServers.Bungee.Library.Config.YAMLSection
    Get a Long by Handle
    @@ -1200,6 +1236,10 @@
    Get the Server Directory Path
    +
    getPath() - Method in class net.ME1312.SubServers.Bungee.Host.SubServerController
    +
    +
    Get the Server Directory Path
    +
    getPlayer() - Method in class net.ME1312.SubServers.Bungee.Event.SubAddHostEvent
    Gets the player that triggered the Event
    @@ -1376,6 +1416,10 @@
    Grab the Command to Stop the Server
    +
    getStopCommand() - Method in class net.ME1312.SubServers.Bungee.Host.SubServerController
    +
    +
    Grab the Command to Stop the Server
    +
    getString(String) - Method in class net.ME1312.SubServers.Bungee.Library.Config.YAMLSection
    Get a String by Handle
    @@ -1736,6 +1780,10 @@
    If the Server is Enabled
    +
    isEnabled() - Method in class net.ME1312.SubServers.Bungee.Host.SubServerController
    +
    +
    If the Server is Enabled
    +
    isException(Util.ExceptionRunnable) - Static method in class net.ME1312.SubServers.Bungee.Library.Util
    Determines if an Exception will occur
    @@ -1794,6 +1842,10 @@
    If the Server is Logging
    +
    isLogging() - Method in class net.ME1312.SubServers.Bungee.Host.SubServerController
    +
    +
    If the Server is Logging
    +
    isLong(String) - Method in class net.ME1312.SubServers.Bungee.Library.Config.YAMLSection
    Check if object is a Long by Handle
    @@ -1828,6 +1880,10 @@
    If the Server is Running
    +
    isRunning() - Method in class net.ME1312.SubServers.Bungee.Host.SubServerController
    +
    +
    If the Server is Running
    +
    isSection(String) - Method in class net.ME1312.SubServers.Bungee.Library.Config.YAMLSection
    Check if object is a YAML Section by Handle
    @@ -1852,6 +1908,10 @@
    If the Server is Temporary
    +
    isTemporary() - Method in class net.ME1312.SubServers.Bungee.Host.SubServerController
    +
    +
    If the Server is Temporary
    +
    isUUID(String) - Method in class net.ME1312.SubServers.Bungee.Library.Config.YAMLSection
    Check if object is a UUID by Handle
    @@ -2508,6 +2568,10 @@
    Set if the Server will Auto Restart on unexpected shutdowns
    +
    setAutoRestart(boolean) - Method in class net.ME1312.SubServers.Bungee.Host.SubServerController
    +
    +
    Set if the Server will Auto Restart on unexpected shutdowns
    +
    setCancelled(boolean) - Method in class net.ME1312.SubServers.Bungee.Event.SubAddHostEvent
    Sets the Cancelled Status
    @@ -2586,6 +2650,10 @@
    Set if the Server is Enabled
    +
    setEnabled(boolean) - Method in class net.ME1312.SubServers.Bungee.Host.SubServerController
    +
    +
    Set if the Server is Enabled
    +
    setHandler(ClientHandler) - Method in class net.ME1312.SubServers.Bungee.Network.Client
    Sets the Handler
    @@ -2612,6 +2680,10 @@
    Set if the Server is Logging
    +
    setLogging(boolean) - Method in class net.ME1312.SubServers.Bungee.Host.SubServerController
    +
    +
    Set if the Server is Logging
    +
    setMotd(String) - Method in interface net.ME1312.SubServers.Bungee.Host.Server
    Sets the MOTD of the Server
    @@ -2632,6 +2704,10 @@
    Set the Command that Stops the Server
    +
    setStopCommand(String) - Method in class net.ME1312.SubServers.Bungee.Host.SubServerController
    +
    +
    Set the Command that Stops the Server
    +
    setSubData(Client) - Method in class net.ME1312.SubServers.Bungee.Host.External.ExternalHost
     
    setSubData(Client) - Method in class net.ME1312.SubServers.Bungee.Host.ServerContainer
    @@ -2652,6 +2728,10 @@
    Set If the Server is Temporary (will start server if not running)
    +
    setTemporary(boolean) - Method in class net.ME1312.SubServers.Bungee.Host.SubServerController
    +
    +
    Set If the Server is Temporary (will start server if not running)
    +
    setVersion(Version) - Method in class net.ME1312.SubServers.Bungee.Event.SubCreateEvent
    Set the Version the Server will use
    @@ -2690,6 +2770,14 @@
    start() - Method in class net.ME1312.SubServers.Bungee.Host.SubServerContainer
     
    +
    start(UUID) - Method in class net.ME1312.SubServers.Bungee.Host.SubServerController
    +
    +
    Starts the Server
    +
    +
    start() - Method in class net.ME1312.SubServers.Bungee.Host.SubServerController
    +
    +
    Starts the Server
    +
    startListeners() - Method in class net.ME1312.SubServers.Bungee.SubPlugin
    Load Hosts, Servers, SubServers, and SubData Direct
    @@ -2728,6 +2816,14 @@
    stop() - Method in class net.ME1312.SubServers.Bungee.Host.SubServerContainer
     
    +
    stop(UUID) - Method in class net.ME1312.SubServers.Bungee.Host.SubServerController
    +
    +
    Stops the Server
    +
    +
    stop() - Method in class net.ME1312.SubServers.Bungee.Host.SubServerController
    +
    +
    Stops the Server
    +
    stopListeners() - Method in class net.ME1312.SubServers.Bungee.SubPlugin
    Reset all changes made by startListeners
    @@ -2874,6 +2970,14 @@
    Creates a SubServer
    +
    SubServerController - Class in net.ME1312.SubServers.Bungee.Host
    +
    +
    API-Safe SubServer Layout Class
    +
    +
    SubServerController(Host, String, int, String, boolean, boolean) - Constructor for class net.ME1312.SubServers.Bungee.Host.SubServerController
    +
    +
    Creates a SubServer
    +
    SubStartEvent - Class in net.ME1312.SubServers.Bungee.Event
    Server Start Event
    @@ -2948,6 +3052,14 @@
    terminate() - Method in class net.ME1312.SubServers.Bungee.Host.SubServerContainer
     
    +
    terminate(UUID) - Method in class net.ME1312.SubServers.Bungee.Host.SubServerController
    +
    +
    Terminates the Server
    +
    +
    terminate() - Method in class net.ME1312.SubServers.Bungee.Host.SubServerController
    +
    +
    Terminates the Server
    +
    toFile() - Method in class net.ME1312.SubServers.Bungee.Host.Executable
    Get Executable File
    @@ -3125,6 +3237,10 @@ the order they are declared.
    Waits for the Server to Stop
    +
    waitFor() - Method in class net.ME1312.SubServers.Bungee.Host.SubServerController
    +
    +
    Waits for the Server to Stop
    +
    willAutoRestart() - Method in class net.ME1312.SubServers.Bungee.Host.External.ExternalSubServer
     
    willAutoRestart() - Method in class net.ME1312.SubServers.Bungee.Host.Internal.InternalSubServer
    @@ -3133,6 +3249,10 @@ the order they are declared.
    If the Server will Auto Restart on unexpected shutdowns
    +
    willAutoRestart() - Method in class net.ME1312.SubServers.Bungee.Host.SubServerController
    +
    +
    If the Server will Auto Restart on unexpected shutdowns
    +
    diff --git a/Javadoc/SubServers.Bungee/net/ME1312/SubServers/Bungee/Host/SubServerContainer.html b/Javadoc/SubServers.Bungee/net/ME1312/SubServers/Bungee/Host/SubServerContainer.html index ef5bcaf8..959a2f4e 100644 --- a/Javadoc/SubServers.Bungee/net/ME1312/SubServers/Bungee/Host/SubServerContainer.html +++ b/Javadoc/SubServers.Bungee/net/ME1312/SubServers/Bungee/Host/SubServerContainer.html @@ -48,7 +48,7 @@ var activeTableTab = "activeTableTab";
    • Frames
      • @@ -572,7 +572,7 @@ implements
      • Frames
        • diff --git a/Javadoc/SubServers.Bungee/net/ME1312/SubServers/Bungee/Host/SubServerController.html b/Javadoc/SubServers.Bungee/net/ME1312/SubServers/Bungee/Host/SubServerController.html new file mode 100644 index 00000000..eba3825e --- /dev/null +++ b/Javadoc/SubServers.Bungee/net/ME1312/SubServers/Bungee/Host/SubServerController.html @@ -0,0 +1,857 @@ + + + + + +SubServerController (SubServers.Bungee) + + + + + + + +
        + + +
        Skip navigation links
        + + + + +
        +
        + + + +
        + +
        +
        +
          +
        • Summary: 
          • +
        • Nested | 
          • +
        • Field | 
          • +
        • Constr | 
          • +
        • Method
          • +
        + +
        + + +
        + + +
        +
        net.ME1312.SubServers.Bungee.Host
        +

        Class SubServerController

        +
        +
        +
          +
        • java.lang.Object
          • +
        • +
            +
          • net.ME1312.SubServers.Bungee.Host.SubServerController
            • +
          +
          • +
        +
        +
          +
        • +
          +
          +
          public abstract class SubServerController
+extends java.lang.Object
          +
          API-Safe SubServer Layout Class
          +
          • +
        +
        +
        +
          +
        • + +
            +
          • + + +

            Constructor Summary

            + + + + + + + + +
            Constructors 
            Constructor and Description
            SubServerController(Host host, + java.lang.String name, + int port, + java.lang.String motd, + boolean hidden, + boolean restricted) +
            Creates a SubServer
            +
            +
            • +
          + +
            +
          • + + +

            Method Summary

            + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + +
            All Methods Instance Methods Abstract Methods Concrete Methods 
            Modifier and TypeMethod and Description
            booleancommand(java.lang.String command) +
            Commands the Server
            +
            abstract booleancommand(java.util.UUID player, + java.lang.String command) +
            Commands the Server
            +
            abstract intedit(java.util.UUID player, + YAMLSection edit) +
            Edits the Server
            +
            intedit(YAMLSection edit) +
            Edits the Server
            +
            SubServerget() +
            Get the SubServer that is being controlled
            +
            abstract java.util.LinkedList<SubServer.LoggedCommand>getCommandHistory() +
            Gets all the commands that were sent to this Server successfully
            +
            abstract ExecutablegetExecutable() +
            Get the Server's Executable String
            +
            abstract HostgetHost() +
            Grabs the Host of the Server
            +
            abstract SubLoggergetLogger() +
            Get Process Logger
            +
            abstract java.lang.StringgetPath() +
            Get the Server Directory Path
            +
            abstract java.lang.StringgetStopCommand() +
            Grab the Command to Stop the Server
            +
            abstract booleanisEnabled() +
            If the Server is Enabled
            +
            abstract booleanisLogging() +
            If the Server is Logging
            +
            abstract booleanisRunning() +
            If the Server is Running
            +
            abstract booleanisTemporary() +
            If the Server is Temporary
            +
            abstract voidsetAutoRestart(boolean value) +
            Set if the Server will Auto Restart on unexpected shutdowns
            +
            abstract voidsetEnabled(boolean value) +
            Set if the Server is Enabled
            +
            abstract voidsetLogging(boolean value) +
            Set if the Server is Logging
            +
            abstract voidsetStopCommand(java.lang.String value) +
            Set the Command that Stops the Server
            +
            abstract voidsetTemporary(boolean value) +
            Set If the Server is Temporary (will start server if not running)
            +
            booleanstart() +
            Starts the Server
            +
            abstract booleanstart(java.util.UUID player) +
            Starts the Server
            +
            booleanstop() +
            Stops the Server
            +
            abstract booleanstop(java.util.UUID player) +
            Stops the Server
            +
            booleanterminate() +
            Terminates the Server
            +
            abstract booleanterminate(java.util.UUID player) +
            Terminates the Server
            +
            abstract voidwaitFor() +
            Waits for the Server to Stop
            +
            abstract booleanwillAutoRestart() +
            If the Server will Auto Restart on unexpected shutdowns
            +
            +
              +
            • + + +

              Methods inherited from class java.lang.Object

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

            Constructor Detail

            + + + +
              +
            • +

              SubServerController

              +
              public SubServerController(Host host,
+                           java.lang.String name,
+                           int port,
+                           java.lang.String motd,
+                           boolean hidden,
+                           boolean restricted)
+                    throws InvalidServerException
              +
              Creates a SubServer
              +
              +
              Parameters:
              +
              host - Host
              +
              name - Server Name
              +
              port - Port Number
              +
              motd - Server MOTD
              +
              restricted - Players will need a permission to join if true
              +
              Throws:
              +
              InvalidServerException
              +
              +
              • +
            +
            • +
          + +
            +
          • + + +

            Method Detail

            + + + +
              +
            • +

              get

              +
              public SubServer get()
              +
              Get the SubServer that is being controlled
              +
              +
              Returns:
              +
              SubServer
              +
              +
              • +
            + + + +
              +
            • +

              start

              +
              public abstract boolean start(java.util.UUID player)
              +
              Starts the Server
              +
              +
              Parameters:
              +
              player - Player who Started
              +
              Returns:
              +
              Success Status
              +
              +
              • +
            + + + +
              +
            • +

              start

              +
              public boolean start()
              +
              Starts the Server
              +
              +
              Returns:
              +
              Success Status
              +
              +
              • +
            + + + +
              +
            • +

              stop

              +
              public abstract boolean stop(java.util.UUID player)
              +
              Stops the Server
              +
              +
              Parameters:
              +
              player - Player who Stopped
              +
              Returns:
              +
              Success Status
              +
              +
              • +
            + + + +
              +
            • +

              stop

              +
              public boolean stop()
              +
              Stops the Server
              +
              +
              Returns:
              +
              Success Status
              +
              +
              • +
            + + + +
              +
            • +

              terminate

              +
              public abstract boolean terminate(java.util.UUID player)
              +
              Terminates the Server
              +
              +
              Parameters:
              +
              player - Player who Terminated
              +
              Returns:
              +
              Success Status
              +
              +
              • +
            + + + +
              +
            • +

              terminate

              +
              public boolean terminate()
              +
              Terminates the Server
              +
              +
              Returns:
              +
              Success Status
              +
              +
              • +
            + + + +
              +
            • +

              command

              +
              public abstract boolean command(java.util.UUID player,
+                                java.lang.String command)
              +
              Commands the Server
              +
              +
              Parameters:
              +
              player - Player who Commanded
              +
              command - Command to Send
              +
              Returns:
              +
              Success Status
              +
              +
              • +
            + + + +
              +
            • +

              command

              +
              public boolean command(java.lang.String command)
              +
              Commands the Server
              +
              +
              Parameters:
              +
              command - Command to Send
              +
              Returns:
              +
              Success Status
              +
              +
              • +
            + + + +
              +
            • +

              edit

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

              edit

              +
              public int edit(YAMLSection edit)
              +
              Edits the Server
              +
              +
              Parameters:
              +
              edit - Edits
              +
              Returns:
              +
              Success Status
              +
              +
              • +
            + + + +
              +
            • +

              waitFor

              +
              public abstract void waitFor()
+                      throws java.lang.InterruptedException
              +
              Waits for the Server to Stop
              +
              +
              Throws:
              +
              java.lang.InterruptedException
              +
              +
              • +
            + + + +
              +
            • +

              isRunning

              +
              public abstract boolean isRunning()
              +
              If the Server is Running
              +
              +
              Returns:
              +
              Running Status
              +
              +
              • +
            + + + +
              +
            • +

              getHost

              +
              public abstract Host getHost()
              +
              Grabs the Host of the Server
              +
              +
              Returns:
              +
              The Host
              +
              +
              • +
            + + + +
              +
            • +

              isEnabled

              +
              public abstract boolean isEnabled()
              +
              If the Server is Enabled
              +
              +
              Returns:
              +
              Enabled Status
              +
              +
              • +
            + + + +
              +
            • +

              setEnabled

              +
              public abstract void setEnabled(boolean value)
              +
              Set if the Server is Enabled
              +
              +
              Parameters:
              +
              value - Value
              +
              +
              • +
            + + + +
              +
            • +

              isLogging

              +
              public abstract boolean isLogging()
              +
              If the Server is Logging
              +
              +
              Returns:
              +
              Logging Status
              +
              +
              • +
            + + + +
              +
            • +

              setLogging

              +
              public abstract void setLogging(boolean value)
              +
              Set if the Server is Logging
              +
              +
              Parameters:
              +
              value - Value
              +
              +
              • +
            + + + +
              +
            • +

              getLogger

              +
              public abstract SubLogger getLogger()
              +
              Get Process Logger
              +
              • +
            + + + +
              +
            • +

              getCommandHistory

              +
              public abstract java.util.LinkedList<SubServer.LoggedCommand> getCommandHistory()
              +
              Gets all the commands that were sent to this Server successfully
              +
              +
              Returns:
              +
              Command History
              +
              +
              • +
            + + + +
              +
            • +

              getPath

              +
              public abstract java.lang.String getPath()
              +
              Get the Server Directory Path
              +
              +
              Returns:
              +
              Server Directory Path
              +
              +
              • +
            + + + +
              +
            • +

              getExecutable

              +
              public abstract Executable getExecutable()
              +
              Get the Server's Executable String
              +
              +
              Returns:
              +
              Executable String
              +
              +
              • +
            + + + +
              +
            • +

              getStopCommand

              +
              public abstract java.lang.String getStopCommand()
              +
              Grab the Command to Stop the Server
              +
              +
              Returns:
              +
              Stop Command
              +
              +
              • +
            + + + +
              +
            • +

              setStopCommand

              +
              public abstract void setStopCommand(java.lang.String value)
              +
              Set the Command that Stops the Server
              +
              +
              Parameters:
              +
              value - Value
              +
              +
              • +
            + + + +
              +
            • +

              willAutoRestart

              +
              public abstract boolean willAutoRestart()
              +
              If the Server will Auto Restart on unexpected shutdowns
              +
              +
              Returns:
              +
              Auto Restart Status
              +
              +
              • +
            + + + +
              +
            • +

              setAutoRestart

              +
              public abstract void setAutoRestart(boolean value)
              +
              Set if the Server will Auto Restart on unexpected shutdowns
              +
              +
              Parameters:
              +
              value - Value
              +
              +
              • +
            + + + +
              +
            • +

              isTemporary

              +
              public abstract boolean isTemporary()
              +
              If the Server is Temporary
              +
              +
              Returns:
              +
              Temporary Status
              +
              +
              • +
            + + + +
              +
            • +

              setTemporary

              +
              public abstract void setTemporary(boolean value)
              +
              Set If the Server is Temporary (will start server if not running)
              +
              +
              Parameters:
              +
              value - Value
              +
              +
              • +
            +
            • +
          +
          • +
        +
        +
        + + +
        + + +
        Skip navigation links
        + + + + +
        +
        + + + +
        + +
        +
        +
          +
        • Summary: 
          • +
        • Nested | 
          • +
        • Field | 
          • +
        • Constr | 
          • +
        • Method
          • +
        + +
        + + +
        + + + diff --git a/Javadoc/SubServers.Bungee/net/ME1312/SubServers/Bungee/Host/package-frame.html b/Javadoc/SubServers.Bungee/net/ME1312/SubServers/Bungee/Host/package-frame.html index 777fca4b..3770d821 100644 --- a/Javadoc/SubServers.Bungee/net/ME1312/SubServers/Bungee/Host/package-frame.html +++ b/Javadoc/SubServers.Bungee/net/ME1312/SubServers/Bungee/Host/package-frame.html @@ -27,6 +27,7 @@
      • SubLogger.LogMessage
      • SubServer.LoggedCommand
      • SubServerContainer
        • +
      • SubServerController

      Enums

        diff --git a/Javadoc/SubServers.Bungee/net/ME1312/SubServers/Bungee/Host/package-summary.html b/Javadoc/SubServers.Bungee/net/ME1312/SubServers/Bungee/Host/package-summary.html index 6dcf05f4..3bf18582 100644 --- a/Javadoc/SubServers.Bungee/net/ME1312/SubServers/Bungee/Host/package-summary.html +++ b/Javadoc/SubServers.Bungee/net/ME1312/SubServers/Bungee/Host/package-summary.html @@ -161,6 +161,12 @@
        SubServer Layout Class
        + +SubServerController + +
        API-Safe SubServer Layout Class
        + + 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 157f85cb..97c6522e 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 @@ -95,6 +95,7 @@
      • net.ME1312.SubServers.Bungee.Host.SubLogger
      • net.ME1312.SubServers.Bungee.Host.SubLogger.LogMessage
      • net.ME1312.SubServers.Bungee.Host.SubServer.LoggedCommand
        • +
      • net.ME1312.SubServers.Bungee.Host.SubServerController
    diff --git a/Javadoc/SubServers.Bungee/overview-tree.html b/Javadoc/SubServers.Bungee/overview-tree.html index 28d517f3..a504426a 100644 --- a/Javadoc/SubServers.Bungee/overview-tree.html +++ b/Javadoc/SubServers.Bungee/overview-tree.html @@ -198,6 +198,7 @@
  • net.ME1312.SubServers.Bungee.Host.SubLogger.LogMessage
  • net.ME1312.SubServers.Bungee.Host.SubServer.LoggedCommand
    • +
  • net.ME1312.SubServers.Bungee.Host.SubServerController
  • java.lang.Throwable (implements java.io.Serializable)
    • java.lang.Exception diff --git a/Javadoc/SubServers.Client.Bukkit.jar b/Javadoc/SubServers.Client.Bukkit.jar index 87b66c2d..4e333b05 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 0ed7e099..c6318276 100644 Binary files a/Javadoc/SubServers.Host.jar and b/Javadoc/SubServers.Host.jar differ diff --git a/Javadoc/SubServers.Sync.jar b/Javadoc/SubServers.Sync.jar index bd2d0f0e..b55cc0f7 100644 Binary files a/Javadoc/SubServers.Sync.jar and b/Javadoc/SubServers.Sync.jar differ diff --git a/SubServers.Bungee/META-INF/MANIFEST.MF b/SubServers.Bungee/META-INF/MANIFEST.MF index 1bd731ec..25590341 100644 --- a/SubServers.Bungee/META-INF/MANIFEST.MF +++ b/SubServers.Bungee/META-INF/MANIFEST.MF @@ -1,5 +1,5 @@ Manifest-Version: 1.0 Class-Path: BungeeCord.jar Main-Class: net.ME1312.SubServers.Bungee.Launch -Implementation-Version: 2.12.1e +Implementation-Version: 2.12.1f Specification-Version: 0 diff --git a/SubServers.Bungee/src.jar b/SubServers.Bungee/src.jar index 1584141d..4e2b29c4 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/ExternalSubCreator.java b/SubServers.Bungee/src/net/ME1312/SubServers/Bungee/Host/External/ExternalSubCreator.java index f0e1c4f9..f503e357 100644 --- a/SubServers.Bungee/src/net/ME1312/SubServers/Bungee/Host/External/ExternalSubCreator.java +++ b/SubServers.Bungee/src/net/ME1312/SubServers/Bungee/Host/External/ExternalSubCreator.java @@ -62,11 +62,11 @@ public class ExternalSubCreator extends SubCreator { public boolean create(UUID player, String name, ServerTemplate template, Version version, int port) { if (Util.isNull(name, template, version, port)) throw new NullPointerException(); if (template.isEnabled() && !SubAPI.getInstance().getSubServers().keySet().contains(name.toLowerCase()) && !SubCreator.isReserved(name)) { + ExternalSubLogger logger = new ExternalSubLogger(this, name + File.separator + "Creator", new Container(host.plugin.config.get().getSection("Settings").getBoolean("Log-Creator")), null); + thread.put(name.toLowerCase(), logger); final SubCreateEvent event = new SubCreateEvent(player, host, name, template, version, port); host.plugin.getPluginManager().callEvent(event); if (!event.isCancelled()) { - ExternalSubLogger logger = new ExternalSubLogger(this, name + File.separator + "Creator", new Container(host.plugin.config.get().getSection("Settings").getBoolean("Log-Creator")), null); - thread.put(name.toLowerCase(), logger); logger.start(); host.queue(new PacketExCreateServer(name, template, version, port, logger.getExternalAddress(), (JSONCallback) json -> { try { @@ -86,7 +86,7 @@ public class ExternalSubCreator extends SubCreator { if (!server.contains("Enabled")) server.set("Enabled", true); if (!server.contains("Display")) server.set("Display", ""); if (!server.contains("Host")) server.set("Host", host.getName()); - if (!server.contains("Group")) server.set("Group", ""); + if (!server.contains("Group")) server.set("Group", new ArrayList()); if (!server.contains("Port")) server.set("Port", port); if (!server.contains("Motd")) server.set("Motd", "Some SubServer"); if (!server.contains("Log")) server.set("Log", true); @@ -99,8 +99,11 @@ public class ExternalSubCreator extends SubCreator { if (!server.contains("Incompatible")) server.set("Incompatible", new ArrayList()); if (!server.contains("Hidden")) server.set("Hidden", false); - host.addSubServer(player, name, server.getBoolean("Enabled"), port, server.getColoredString("Motd", '&'), server.getBoolean("Log"), server.getRawString("Directory"), + SubServer subserver = host.addSubServer(player, name, server.getBoolean("Enabled"), port, server.getColoredString("Motd", '&'), server.getBoolean("Log"), server.getRawString("Directory"), new Executable(server.getRawString("Executable")), server.getRawString("Stop-Command"), true, server.getBoolean("Auto-Restart"), server.getBoolean("Hidden"), server.getBoolean("Restricted"), false); + if (server.getString("Display").length() > 0) subserver.setDisplayName(server.getString("Display")); + for (String group : server.getStringList("Group")) subserver.addGroup(group); + if (server.contains("Extra")) for (String extra : server.getSection("Extra").getKeys()) subserver.addExtra(extra, server.getObject(extra)); host.plugin.config.get().getSection("Servers").set(name, server); host.plugin.config.save(); } else { @@ -113,7 +116,10 @@ public class ExternalSubCreator extends SubCreator { this.thread.remove(name.toLowerCase()); })); return true; - } else return false; + } else { + thread.remove(name.toLowerCase()); + return false; + } } else return false; } diff --git a/SubServers.Bungee/src/net/ME1312/SubServers/Bungee/Host/Internal/InternalSubCreator.java b/SubServers.Bungee/src/net/ME1312/SubServers/Bungee/Host/Internal/InternalSubCreator.java index 840ac268..27c21534 100644 --- a/SubServers.Bungee/src/net/ME1312/SubServers/Bungee/Host/Internal/InternalSubCreator.java +++ b/SubServers.Bungee/src/net/ME1312/SubServers/Bungee/Host/Internal/InternalSubCreator.java @@ -201,7 +201,7 @@ public class InternalSubCreator extends SubCreator { if (!server.contains("Enabled")) server.set("Enabled", true); if (!server.contains("Display")) server.set("Display", ""); if (!server.contains("Host")) server.set("Host", host.getName()); - if (!server.contains("Group")) server.set("Group", ""); + if (!server.contains("Group")) server.set("Group", new ArrayList()); if (!server.contains("Port")) server.set("Port", port); if (!server.contains("Motd")) server.set("Motd", "Some SubServer"); if (!server.contains("Log")) server.set("Log", true); @@ -214,8 +214,11 @@ public class InternalSubCreator extends SubCreator { if (!server.contains("Incompatible")) server.set("Incompatible", new ArrayList()); if (!server.contains("Hidden")) server.set("Hidden", false); - host.addSubServer(player, name, server.getBoolean("Enabled"), port, server.getColoredString("Motd", '&'), server.getBoolean("Log"), server.getRawString("Directory"), + SubServer subserver = host.addSubServer(player, name, server.getBoolean("Enabled"), port, server.getColoredString("Motd", '&'), server.getBoolean("Log"), server.getRawString("Directory"), new Executable(server.getRawString("Executable")), server.getRawString("Stop-Command"), true, server.getBoolean("Auto-Restart"), server.getBoolean("Hidden"), server.getBoolean("Restricted"), false); + if (server.getString("Display").length() > 0) subserver.setDisplayName(server.getString("Display")); + for (String group : server.getStringList("Group")) subserver.addGroup(group); + if (server.contains("Extra")) for (String extra : server.getSection("Extra").getKeys()) subserver.addExtra(extra, server.getObject(extra)); host.plugin.config.get().getSection("Servers").set(name, server); host.plugin.config.save(); } catch (Exception e) { @@ -231,14 +234,19 @@ public class InternalSubCreator extends SubCreator { public boolean create(UUID player, String name, ServerTemplate template, Version version, int port) { if (Util.isNull(name, template, version, port)) throw new NullPointerException(); if (template.isEnabled() && !SubAPI.getInstance().getSubServers().keySet().contains(name.toLowerCase()) && !SubCreator.isReserved(name)) { + NamedContainer> thread = new NamedContainer>(null, new NamedContainer(new InternalSubLogger(null, this, name + File.separator + "Creator", new Container(false), null), null)); + this.thread.put(name.toLowerCase(), thread); + final SubCreateEvent event = new SubCreateEvent(player, host, name, template, version, port); host.plugin.getPluginManager().callEvent(event); if (!event.isCancelled()) { - NamedContainer> thread = new NamedContainer>(new Thread(() -> InternalSubCreator.this.run(player, name, event.getTemplate(), event.getVersion(), port)), new NamedContainer(new InternalSubLogger(null, this, name + File.separator + "Creator", new Container(false), null), null)); - this.thread.put(name.toLowerCase(), thread); + thread.rename(new Thread(() -> InternalSubCreator.this.run(player, name, event.getTemplate(), event.getVersion(), port))); thread.name().start(); return true; - } else return false; + } else { + this.thread.remove(name.toLowerCase()); + return false; + } } else return false; } diff --git a/SubServers.Bungee/src/net/ME1312/SubServers/Bungee/Host/SubServerController.java b/SubServers.Bungee/src/net/ME1312/SubServers/Bungee/Host/SubServerController.java new file mode 100644 index 00000000..9a948d70 --- /dev/null +++ b/SubServers.Bungee/src/net/ME1312/SubServers/Bungee/Host/SubServerController.java @@ -0,0 +1,377 @@ +package net.ME1312.SubServers.Bungee.Host; + +import net.ME1312.SubServers.Bungee.Library.Config.YAMLSection; +import net.ME1312.SubServers.Bungee.Library.Exception.InvalidServerException; + +import java.util.*; + +/** + * API-Safe SubServer Layout Class + */ +public abstract class SubServerController { + private final net.ME1312.SubServers.Bungee.Host.SubServerContainer control; + + /** + * Creates a SubServer + * + * @param host Host + * @param name Server Name + * @param port Port Number + * @param motd Server MOTD + * @param restricted Players will need a permission to join if true + * @throws InvalidServerException + */ + public SubServerController(Host host, String name, int port, String motd, boolean hidden, boolean restricted) throws InvalidServerException { + control = new SubServerContainer(host, name, port, motd, hidden, restricted) { + @Override + public boolean start() { + return SubServerController.this.start(); + } + + @Override + public boolean start(UUID player) { + return SubServerController.this.start(player); + } + + @Override + public boolean stop() { + return SubServerController.this.stop(); + } + + @Override + public boolean stop(UUID player) { + return SubServerController.this.stop(player); + } + + @Override + public boolean terminate() { + return SubServerController.this.terminate(); + } + + @Override + public boolean terminate(UUID player) { + return SubServerController.this.terminate(player); + } + + @Override + public boolean command(String command) { + return SubServerController.this.command(command); + } + + @Override + public boolean command(UUID player, String command) { + return SubServerController.this.command(player, command); + } + + @Override + public int edit(YAMLSection edit) { + return SubServerController.this.edit(edit); + } + + @Override + public int edit(UUID player, YAMLSection edit) { + return SubServerController.this.edit(player, edit); + } + + @Override + public void waitFor() throws InterruptedException { + SubServerController.this.waitFor(); + } + + @Override + public boolean isRunning() { + return SubServerController.this.isRunning(); + } + + @Override + public Host getHost() { + return SubServerController.this.getHost(); + } + + @Override + public boolean isEnabled() { + return SubServerController.this.isEnabled(); + } + + @Override + public void setEnabled(boolean value) { + SubServerController.this.setEnabled(value); + } + + @Override + public boolean isLogging() { + return SubServerController.this.isLogging(); + } + + @Override + public void setLogging(boolean value) { + SubServerController.this.setLogging(value); + } + + @Override + public SubLogger getLogger() { + return SubServerController.this.getLogger(); + } + + @Override + public LinkedList getCommandHistory() { + return SubServerController.this.getCommandHistory(); + } + + @Override + public String getPath() { + return SubServerController.this.getPath(); + } + + @Override + public Executable getExecutable() { + return SubServerController.this.getExecutable(); + } + + @Override + public String getStopCommand() { + return SubServerController.this.getStopCommand(); + } + + @Override + public void setStopCommand(String value) { + SubServerController.this.setStopCommand(value); + } + + @Override + public boolean willAutoRestart() { + return SubServerController.this.willAutoRestart(); + } + + @Override + public void setAutoRestart(boolean value) { + SubServerController.this.setAutoRestart(value); + } + + @Override + public boolean isTemporary() { + return SubServerController.this.isTemporary(); + } + + @Override + public void setTemporary(boolean value) { + SubServerController.this.setTemporary(value); + } + }; + } + + /** + * Get the SubServer that is being controlled + * + * @return SubServer + */ + public SubServer get() { + return control; + } + + /** + * Starts the Server + * + * @param player Player who Started + * @return Success Status + */ + public abstract boolean start(UUID player); + + /** + * Starts the Server + * + * @return Success Status + */ + public boolean start() { + return start(null); + } + + /** + * Stops the Server + * + * @param player Player who Stopped + * @return Success Status + */ + public abstract boolean stop(UUID player); + + /** + * Stops the Server + * + * @return Success Status + */ + public boolean stop() { + return stop(null); + } + + /** + * Terminates the Server + * + * @param player Player who Terminated + * @return Success Status + */ + public abstract boolean terminate(UUID player); + + /** + * Terminates the Server + * + * @return Success Status + */ + public boolean terminate() { + return terminate(null); + } + + /** + * Commands the Server + * + * @param player Player who Commanded + * @param command Command to Send + * @return Success Status + */ + public abstract boolean command(UUID player, String command); + + /** + * Commands the Server + * + * @param command Command to Send + * @return Success Status + */ + public boolean command(String command) { + return command(null, command); + } + + /** + * Edits the Server + * + * @param player Player Editing + * @param edit Edits + * @return Success Status + */ + public abstract int edit(UUID player, YAMLSection edit); + + /** + * Edits the Server + * + * @param edit Edits + * @return Success Status + */ + public int edit(YAMLSection edit) { + return edit(null, edit); + } + + /** + * Waits for the Server to Stop + * + * @throws InterruptedException + */ + public abstract void waitFor() throws InterruptedException; + + /** + * If the Server is Running + * + * @return Running Status + */ + public abstract boolean isRunning(); + + /** + * Grabs the Host of the Server + * + * @return The Host + */ + public abstract Host getHost(); + + /** + * If the Server is Enabled + * + * @return Enabled Status + */ + public abstract boolean isEnabled(); + + /** + * Set if the Server is Enabled + * + * @param value Value + */ + public abstract void setEnabled(boolean value); + + /** + * If the Server is Logging + * + * @return Logging Status + */ + public abstract boolean isLogging(); + + /** + * Set if the Server is Logging + * + * @param value Value + */ + public abstract void setLogging(boolean value); + + /** + * Get Process Logger + */ + public abstract SubLogger getLogger(); + + /** + * Gets all the commands that were sent to this Server successfully + * + * @return Command History + */ + public abstract LinkedList getCommandHistory(); + + /** + * Get the Server Directory Path + * + * @return Server Directory Path + */ + public abstract String getPath(); + + /** + * Get the Server's Executable String + * + * @return Executable String + */ + public abstract Executable getExecutable(); + + /** + * Grab the Command to Stop the Server + * + * @return Stop Command + */ + public abstract String getStopCommand(); + + /** + * Set the Command that Stops the Server + * + * @param value Value + */ + public abstract void setStopCommand(String value); + + /** + * If the Server will Auto Restart on unexpected shutdowns + * + * @return Auto Restart Status + */ + public abstract boolean willAutoRestart(); + + /** + * Set if the Server will Auto Restart on unexpected shutdowns + * + * @param value Value + */ + public abstract void setAutoRestart(boolean value); + + /** + * If the Server is Temporary + * + * @return Temporary Status + */ + public abstract boolean isTemporary(); + + /** + * Set If the Server is Temporary (will start server if not running) + * + * @param value Value + */ + public abstract void setTemporary(boolean value); +} \ No newline at end of file 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 ea148b85..a25d33cf 100644 --- a/SubServers.Bungee/src/net/ME1312/SubServers/Bungee/Network/SubDataServer.java +++ b/SubServers.Bungee/src/net/ME1312/SubServers/Bungee/Network/SubDataServer.java @@ -19,7 +19,7 @@ import java.util.List; * SubDataServer Class */ public final class SubDataServer { - private static final int MAX_QUEUE = 64; + private static int MAX_QUEUE = 64; private static HashMap, String> pOut = new HashMap, String>(); private static HashMap> pIn = new HashMap>(); private static List allowedAddresses = new ArrayList(); diff --git a/SubServers.Client/Bukkit/src.jar b/SubServers.Client/Bukkit/src.jar index c6b7098a..31dcc144 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/InternalUIHandler.java b/SubServers.Client/Bukkit/src/net/ME1312/SubServers/Client/Bukkit/Graphic/InternalUIHandler.java index be8aae6f..2120e0b8 100644 --- a/SubServers.Client/Bukkit/src/net/ME1312/SubServers/Client/Bukkit/Graphic/InternalUIHandler.java +++ b/SubServers.Client/Bukkit/src/net/ME1312/SubServers/Client/Bukkit/Graphic/InternalUIHandler.java @@ -96,13 +96,13 @@ public class InternalUIHandler implements UIHandler, Listener { gui.back(); } else if (item.equals(plugin.lang.getSection("Lang").getColoredString("Interface.Generic.Undo", '&'))) { player.closeInventory(); - gui.lastUsedOptions.undo(); - gui.hostCreator((UIRenderer.CreatorOptions) gui.lastUsedOptions); + ((UIRenderer.CreatorOptions) gui.lastVisitedObjects[0]).undo(); + gui.hostCreator((UIRenderer.CreatorOptions) gui.lastVisitedObjects[0]); } else if (item.equals(plugin.lang.getSection("Lang").getColoredString("Interface.Host-Creator.Submit", '&'))) { - if (player.hasPermission("subservers.host.create.*") || player.hasPermission("subservers.host.create." + gui.lastVisitedObject.toLowerCase())) { + if (player.hasPermission("subservers.host.create.*") || player.hasPermission("subservers.host.create." + ((UIRenderer.CreatorOptions) gui.lastVisitedObjects[0]).getHost().toLowerCase())) { player.closeInventory(); gui.setDownloading(plugin.lang.getSection("Lang").getColoredString("Interface.Generic.Downloading.Response", '&')); - plugin.subdata.sendPacket(new PacketCreateServer(player.getUniqueId(), (UIRenderer.CreatorOptions) gui.lastUsedOptions, json -> { + plugin.subdata.sendPacket(new PacketCreateServer(player.getUniqueId(), ((UIRenderer.CreatorOptions) gui.lastVisitedObjects[0]), json -> { gui.back(); })); } else { @@ -116,7 +116,7 @@ public class InternalUIHandler implements UIHandler, Listener { if (m.getString("message").contains(" ")) { if (!gui.sendTitle(plugin.lang.getSection("Lang").getColoredString("Interface.Host-Creator.Edit-Name.Invalid-Title", '&'), 4 * 20)) player.sendMessage(plugin.lang.getSection("Lang").getColoredString("Interface.Host-Creator.Edit-Name.Invalid", '&')); - Bukkit.getScheduler().runTaskLater(plugin, () -> gui.hostCreator((UIRenderer.CreatorOptions) gui.lastUsedOptions), 4 * 20); + Bukkit.getScheduler().runTaskLater(plugin, () -> gui.hostCreator((UIRenderer.CreatorOptions) gui.lastVisitedObjects[0]), 4 * 20); } else { gui.setDownloading(plugin.lang.getSection("Lang").getColoredString("Interface.Generic.Downloading.Response", '&')); plugin.subdata.sendPacket(new PacketDownloadServerList(null, null, json -> { @@ -130,17 +130,17 @@ public class InternalUIHandler implements UIHandler, Listener { gui.setDownloading(null); if (!gui.sendTitle(plugin.lang.getSection("Lang").getColoredString("Interface.Host-Creator.Edit-Name.Exists-Title", '&'), 4 * 20)) player.sendMessage(plugin.lang.getSection("Lang").getColoredString("Interface.Host-Creator.Edit-Name.Exists", '&')); - Bukkit.getScheduler().runTaskLater(plugin, () -> gui.hostCreator((UIRenderer.CreatorOptions) gui.lastUsedOptions), 4 * 20); + Bukkit.getScheduler().runTaskLater(plugin, () -> gui.hostCreator((UIRenderer.CreatorOptions) gui.lastVisitedObjects[0]), 4 * 20); } else { - ((UIRenderer.CreatorOptions) gui.lastUsedOptions).setName(m.getString("message")); - gui.hostCreator((UIRenderer.CreatorOptions) gui.lastUsedOptions); + ((UIRenderer.CreatorOptions) gui.lastVisitedObjects[0]).setName(m.getString("message")); + gui.hostCreator((UIRenderer.CreatorOptions) gui.lastVisitedObjects[0]); } })); } }); } else if (ChatColor.stripColor(item).equals(ChatColor.stripColor(plugin.lang.getSection("Lang").getColoredString("Interface.Host-Creator.Edit-Template", '&')))) { player.closeInventory(); - gui.hostCreatorTemplates(1, (UIRenderer.CreatorOptions) gui.lastUsedOptions); + gui.hostCreatorTemplates(1, (UIRenderer.CreatorOptions) gui.lastVisitedObjects[0]); } else if (ChatColor.stripColor(item).equals(ChatColor.stripColor(plugin.lang.getSection("Lang").getColoredString("Interface.Host-Creator.Edit-Version", '&')))) { player.closeInventory(); if (!gui.sendTitle(plugin.lang.getSection("Lang").getColoredString("Interface.Host-Creator.Edit-Version.Title", '&'), 4 * 20)) @@ -149,10 +149,10 @@ public class InternalUIHandler implements UIHandler, Listener { if (new Version("1.8").compareTo(new Version(m.getString("message"))) > 0) { if (!gui.sendTitle(plugin.lang.getSection("Lang").getColoredString("Interface.Host-Creator.Edit-Version.Unavailable-Title", '&'), 4 * 20)) player.sendMessage(plugin.lang.getSection("Lang").getColoredString("Interface.Host-Creator.Edit-Version.Unavailable", '&')); - Bukkit.getScheduler().runTaskLater(plugin, () -> gui.hostCreator((UIRenderer.CreatorOptions) gui.lastUsedOptions), 4 * 20); + Bukkit.getScheduler().runTaskLater(plugin, () -> gui.hostCreator((UIRenderer.CreatorOptions) gui.lastVisitedObjects[0]), 4 * 20); } else { - ((UIRenderer.CreatorOptions) gui.lastUsedOptions).setVersion(new Version(m.getString("message"))); - gui.hostCreator((UIRenderer.CreatorOptions) gui.lastUsedOptions); + ((UIRenderer.CreatorOptions) gui.lastVisitedObjects[0]).setVersion(new Version(m.getString("message"))); + gui.hostCreator((UIRenderer.CreatorOptions) gui.lastVisitedObjects[0]); } }); } else if (ChatColor.stripColor(item).equals(ChatColor.stripColor(plugin.lang.getSection("Lang").getColoredString("Interface.Host-Creator.Edit-Port", '&')))) { @@ -163,10 +163,10 @@ public class InternalUIHandler implements UIHandler, Listener { if (Util.isException(() -> Integer.parseInt(m.getString("message"))) || Integer.parseInt(m.getString("message")) <= 0 || Integer.parseInt(m.getString("message")) > 65535) { if (!gui.sendTitle(plugin.lang.getSection("Lang").getColoredString("Interface.Host-Creator.Edit-Port.Invalid-Title", '&'), 4 * 20)) player.sendMessage(plugin.lang.getSection("Lang").getColoredString("Interface.Host-Creator.Edit-Port.Invalid", '&')); - Bukkit.getScheduler().runTaskLater(plugin, () -> gui.hostCreator((UIRenderer.CreatorOptions) gui.lastUsedOptions), 4 * 20); + Bukkit.getScheduler().runTaskLater(plugin, () -> gui.hostCreator((UIRenderer.CreatorOptions) gui.lastVisitedObjects[0]), 4 * 20); } else { - ((UIRenderer.CreatorOptions) gui.lastUsedOptions).setPort(Integer.valueOf(m.getString("message"))); - gui.hostCreator((UIRenderer.CreatorOptions) gui.lastUsedOptions); + ((UIRenderer.CreatorOptions) gui.lastVisitedObjects[0]).setPort(Integer.valueOf(m.getString("message"))); + gui.hostCreator((UIRenderer.CreatorOptions) gui.lastVisitedObjects[0]); } }); } @@ -178,13 +178,13 @@ public class InternalUIHandler implements UIHandler, Listener { String item = event.getCurrentItem().getItemMeta().getDisplayName(); if (item.equals(plugin.lang.getSection("Lang").getColoredString("Interface.Generic.Back-Arrow", '&'))) { player.closeInventory(); - gui.hostCreatorTemplates(gui.lastPage - 1, (UIRenderer.CreatorOptions) gui.lastUsedOptions); + gui.hostCreatorTemplates(gui.lastPage - 1, (UIRenderer.CreatorOptions) gui.lastVisitedObjects[0]); } else if (item.equals(plugin.lang.getSection("Lang").getColoredString("Interface.Generic.Next-Arrow", '&'))) { player.closeInventory(); - gui.hostCreatorTemplates(gui.lastPage + 1, (UIRenderer.CreatorOptions) gui.lastUsedOptions); + gui.hostCreatorTemplates(gui.lastPage + 1, (UIRenderer.CreatorOptions) gui.lastVisitedObjects[0]); } else if (item.equals(plugin.lang.getSection("Lang").getColoredString("Interface.Generic.Back", '&'))) { player.closeInventory(); - gui.hostCreator((UIRenderer.CreatorOptions) gui.lastUsedOptions); + gui.hostCreator((UIRenderer.CreatorOptions) gui.lastVisitedObjects[0]); } else { player.closeInventory(); String obj; @@ -193,8 +193,8 @@ public class InternalUIHandler implements UIHandler, Listener { } else { obj = ChatColor.stripColor(item); } - ((UIRenderer.CreatorOptions) gui.lastUsedOptions).setTemplate(obj); - gui.hostCreator((UIRenderer.CreatorOptions) gui.lastUsedOptions); + ((UIRenderer.CreatorOptions) gui.lastVisitedObjects[0]).setTemplate(obj); + gui.hostCreator((UIRenderer.CreatorOptions) gui.lastVisitedObjects[0]); } } } else if (event.getClickedInventory().getTitle().startsWith(plugin.lang.getSection("Lang").getColoredString("Interface.Host-Plugin.Title", '&').split("\\$str\\$")[0]) && // Host Plugin @@ -204,10 +204,10 @@ public class InternalUIHandler implements UIHandler, Listener { String item = event.getCurrentItem().getItemMeta().getDisplayName(); if (item.equals(plugin.lang.getSection("Lang").getColoredString("Interface.Generic.Back-Arrow", '&'))) { player.closeInventory(); - gui.hostPlugin(gui.lastPage - 1, gui.lastVisitedObject); + gui.hostPlugin(gui.lastPage - 1, ((String) gui.lastVisitedObjects[0])); } else if (item.equals(plugin.lang.getSection("Lang").getColoredString("Interface.Generic.Next-Arrow", '&'))) { player.closeInventory(); - gui.hostPlugin(gui.lastPage + 1, gui.lastVisitedObject); + gui.hostPlugin(gui.lastPage + 1, ((String) gui.lastVisitedObjects[0])); } else if (item.equals(plugin.lang.getSection("Lang").getColoredString("Interface.Generic.Back", '&'))) { player.closeInventory(); gui.back(); @@ -220,8 +220,8 @@ public class InternalUIHandler implements UIHandler, Listener { if (plugin.get() == null) { gui.reopen(); } else { - gui.setDownloading(ChatColor.stripColor(this.plugin.lang.getSection("Lang").getColoredString("Interface.Host-Plugin.Title", '&').replace("$str$", gui.lastVisitedObject))); - this.plugin.subdata.sendPacket(new PacketDownloadHostInfo(gui.lastVisitedObject, (json) -> { + gui.setDownloading(ChatColor.stripColor(this.plugin.lang.getSection("Lang").getColoredString("Interface.Host-Plugin.Title", '&').replace("$str$", (String) gui.lastVisitedObjects[0]))); + this.plugin.subdata.sendPacket(new PacketDownloadHostInfo((String) gui.lastVisitedObjects[0], (json) -> { if (json.getBoolean("valid")) { gui.setDownloading(null); plugin.get().open(player, json.getJSONObject("host")); @@ -263,18 +263,10 @@ public class InternalUIHandler implements UIHandler, Listener { if (item.equals(plugin.lang.getSection("Lang").getColoredString("Interface.Generic.Back-Arrow", '&'))) { player.closeInventory(); - if (gui.lastVisitedObjectPosition > 1) { - gui.serverMenu(gui.lastPage - 1, null, gui.lastVisitedObject); - } else { - gui.serverMenu(gui.lastPage - 1, gui.lastVisitedObject, null); - } + gui.serverMenu(gui.lastPage - 1, (String) gui.lastVisitedObjects[0], (String) gui.lastVisitedObjects[1]); } else if (item.equals(plugin.lang.getSection("Lang").getColoredString("Interface.Generic.Next-Arrow", '&'))) { player.closeInventory(); - if (gui.lastVisitedObjectPosition > 1) { - gui.serverMenu(gui.lastPage + 1, null, gui.lastVisitedObject); - } else { - gui.serverMenu(gui.lastPage + 1, gui.lastVisitedObject, null); - } + gui.serverMenu(gui.lastPage + 1, (String) gui.lastVisitedObjects[0], (String) gui.lastVisitedObjects[1]); } else if (item.equals(plugin.lang.getSection("Lang").getColoredString("Interface.Server-Menu.Host-Menu", '&'))) { player.closeInventory(); gui.hostMenu(1); @@ -303,15 +295,15 @@ public class InternalUIHandler implements UIHandler, Listener { gui.back(); } else if (item.equals(plugin.lang.getSection("Lang").getColoredString("Interface.Host-Admin.Creator", '&'))) { player.closeInventory(); - if (player.hasPermission("subservers.host.create.*") || player.hasPermission("subservers.host.create." + gui.lastVisitedObject.toLowerCase())) { - gui.hostCreator(new UIRenderer.CreatorOptions(gui.lastVisitedObject)); + if (player.hasPermission("subservers.host.create.*") || player.hasPermission("subservers.host.create." + ((String) gui.lastVisitedObjects[0]).toLowerCase())) { + gui.hostCreator(new UIRenderer.CreatorOptions((String) gui.lastVisitedObjects[0])); } else gui.reopen(); } else if (item.equals(plugin.lang.getSection("Lang").getColoredString("Interface.Host-Admin.SubServers", '&'))) { player.closeInventory(); - gui.serverMenu(1, gui.lastVisitedObject, null); + gui.serverMenu(1, (String) gui.lastVisitedObjects[0], null); } else if (item.equals(plugin.lang.getSection("Lang").getColoredString("Interface.Host-Admin.Plugins", '&'))) { player.closeInventory(); - gui.hostPlugin(1, gui.lastVisitedObject); + gui.hostPlugin(1, (String) gui.lastVisitedObjects[0]); } } } else if (event.getClickedInventory().getTitle().startsWith(plugin.lang.getSection("Lang").getColoredString("Interface.SubServer-Admin.Title", '&').split("\\$str\\$")[0]) && // SubServer Admin @@ -325,23 +317,23 @@ public class InternalUIHandler implements UIHandler, Listener { gui.back(); } else if (item.equals(plugin.lang.getSection("Lang").getColoredString("Interface.SubServer-Admin.Start", '&'))) { player.closeInventory(); - if (player.hasPermission("subservers.subserver.start.*") || player.hasPermission("subservers.subserver.start." + gui.lastVisitedObject.toLowerCase())) { + if (player.hasPermission("subservers.subserver.start.*") || player.hasPermission("subservers.subserver.start." + ((String) gui.lastVisitedObjects[0]).toLowerCase())) { gui.setDownloading(plugin.lang.getSection("Lang").getColoredString("Interface.Generic.Downloading.Response", '&')); - plugin.subdata.sendPacket(new PacketStartServer(player.getUniqueId(), gui.lastVisitedObject, json -> { + plugin.subdata.sendPacket(new PacketStartServer(player.getUniqueId(), (String) gui.lastVisitedObjects[0], json -> { gui.setDownloading(plugin.lang.getSection("Lang").getColoredString("Interface.SubServer-Admin.Start.Title", '&')); Bukkit.getScheduler().runTaskLater(plugin, gui::reopen, 30); })); } else gui.reopen(); } else if (item.equals(plugin.lang.getSection("Lang").getColoredString("Interface.SubServer-Admin.Stop", '&'))) { player.closeInventory(); - if (player.hasPermission("subservers.subserver.stop.*") || player.hasPermission("subservers.subserver.stop." + gui.lastVisitedObject.toLowerCase())) { + if (player.hasPermission("subservers.subserver.stop.*") || player.hasPermission("subservers.subserver.stop." + ((String) gui.lastVisitedObjects[0]).toLowerCase())) { gui.setDownloading(plugin.lang.getSection("Lang").getColoredString("Interface.Generic.Downloading.Response", '&')); final Container listening = new Container(true); PacketInRunEvent.callback("SubStoppedEvent", new JSONCallback() { @Override public void run(JSONObject json) { try { - if (listening.get()) if (!json.getString("server").equalsIgnoreCase(gui.lastVisitedObject)) { + if (listening.get()) if (!json.getString("server").equalsIgnoreCase((String) gui.lastVisitedObjects[0])) { PacketInRunEvent.callback("SubStoppedEvent", this); } else { gui.reopen(); @@ -349,23 +341,23 @@ public class InternalUIHandler implements UIHandler, Listener { } catch (Exception e) {} } }); - plugin.subdata.sendPacket(new PacketStopServer(player.getUniqueId(), gui.lastVisitedObject, false, json -> { + plugin.subdata.sendPacket(new PacketStopServer(player.getUniqueId(), (String) gui.lastVisitedObjects[0], false, json -> { if (json.getInt("r") != 0) { gui.reopen(); listening.set(false); - } else gui.setDownloading(plugin.lang.getSection("Lang").getColoredString("Interface.SubServer-Admin.Stop.Title", '&').replace("$str$", gui.lastVisitedObject)); + } else gui.setDownloading(plugin.lang.getSection("Lang").getColoredString("Interface.SubServer-Admin.Stop.Title", '&').replace("$str$", (String) gui.lastVisitedObjects[0])); })); } else gui.reopen(); } else if (item.equals(plugin.lang.getSection("Lang").getColoredString("Interface.SubServer-Admin.Terminate", '&'))) { player.closeInventory(); - if (player.hasPermission("subservers.subserver.terminate.*") || player.hasPermission("subservers.subserver.terminate." + gui.lastVisitedObject.toLowerCase())) { + if (player.hasPermission("subservers.subserver.terminate.*") || player.hasPermission("subservers.subserver.terminate." + ((String) gui.lastVisitedObjects[0]).toLowerCase())) { gui.setDownloading(plugin.lang.getSection("Lang").getColoredString("Interface.Generic.Downloading.Response", '&')); final Container listening = new Container(true); PacketInRunEvent.callback("SubStoppedEvent", new JSONCallback() { @Override public void run(JSONObject json) { try { - if (listening.get()) if (!json.getString("server").equalsIgnoreCase(gui.lastVisitedObject)) { + if (listening.get()) if (!json.getString("server").equalsIgnoreCase((String) gui.lastVisitedObjects[0])) { PacketInRunEvent.callback("SubStoppedEvent", this); } else { gui.reopen(); @@ -373,28 +365,28 @@ public class InternalUIHandler implements UIHandler, Listener { } catch (Exception e) {} } }); - plugin.subdata.sendPacket(new PacketStopServer(player.getUniqueId(), gui.lastVisitedObject, false, json -> { + plugin.subdata.sendPacket(new PacketStopServer(player.getUniqueId(), (String) gui.lastVisitedObjects[0], false, json -> { if (json.getInt("r") != 0) { gui.reopen(); listening.set(false); - } else gui.setDownloading(plugin.lang.getSection("Lang").getColoredString("Interface.SubServer-Admin.Terminate.Title", '&').replace("$str$", gui.lastVisitedObject)); + } else gui.setDownloading(plugin.lang.getSection("Lang").getColoredString("Interface.SubServer-Admin.Terminate.Title", '&').replace("$str$", (String) gui.lastVisitedObjects[0])); })); } else gui.reopen(); } else if (item.equals(plugin.lang.getSection("Lang").getColoredString("Interface.SubServer-Admin.Command", '&'))) { player.closeInventory(); - if (player.hasPermission("subservers.subserver.command.*") || player.hasPermission("subservers.subserver.command." + gui.lastVisitedObject.toLowerCase())) { + if (player.hasPermission("subservers.subserver.command.*") || player.hasPermission("subservers.subserver.command." + ((String) gui.lastVisitedObjects[0]).toLowerCase())) { if (!gui.sendTitle(plugin.lang.getSection("Lang").getColoredString("Interface.SubServer-Admin.Command.Title", '&'), 4 * 20)) player.sendMessage(plugin.lang.getSection("Lang").getColoredString("Interface.SubServer-Admin.Command.Message", '&')); input.put(player.getUniqueId(), m -> { gui.setDownloading(plugin.lang.getSection("Lang").getColoredString("Interface.Generic.Downloading.Response", '&')); - plugin.subdata.sendPacket(new PacketCommandServer(player.getUniqueId(), gui.lastVisitedObject, (m.getString("message").startsWith("/"))?m.getString("message").substring(1):m.getString("message"), json -> { + plugin.subdata.sendPacket(new PacketCommandServer(player.getUniqueId(), (String) gui.lastVisitedObjects[0], (m.getString("message").startsWith("/"))?m.getString("message").substring(1):m.getString("message"), json -> { gui.reopen(); })); }); } else gui.reopen(); } else if (item.equals(plugin.lang.getSection("Lang").getColoredString("Interface.SubServer-Admin.Plugins", '&'))) { player.closeInventory(); - gui.subserverPlugin(1, gui.lastVisitedObject); + gui.subserverPlugin(1, (String) gui.lastVisitedObjects[0]); } } } else if (event.getClickedInventory().getTitle().startsWith(plugin.lang.getSection("Lang").getColoredString("Interface.SubServer-Plugin.Title", '&').split("\\$str\\$")[0]) && // SubServer Plugin @@ -404,10 +396,10 @@ public class InternalUIHandler implements UIHandler, Listener { String item = event.getCurrentItem().getItemMeta().getDisplayName(); if (item.equals(plugin.lang.getSection("Lang").getColoredString("Interface.Generic.Back-Arrow", '&'))) { player.closeInventory(); - gui.subserverPlugin(gui.lastPage - 1, gui.lastVisitedObject); + gui.subserverPlugin(gui.lastPage - 1, (String) gui.lastVisitedObjects[0]); } else if (item.equals(plugin.lang.getSection("Lang").getColoredString("Interface.Generic.Next-Arrow", '&'))) { player.closeInventory(); - gui.subserverPlugin(gui.lastPage + 1, gui.lastVisitedObject); + gui.subserverPlugin(gui.lastPage + 1, (String) gui.lastVisitedObjects[0]); } else if (item.equals(plugin.lang.getSection("Lang").getColoredString("Interface.Generic.Back", '&'))) { player.closeInventory(); gui.back(); @@ -420,8 +412,8 @@ public class InternalUIHandler implements UIHandler, Listener { if (plugin.get() == null) { gui.reopen(); } else { - gui.setDownloading(ChatColor.stripColor(this.plugin.lang.getSection("Lang").getColoredString("Interface.SubServer-Plugin.Title", '&').replace("$str$", gui.lastVisitedObject))); - this.plugin.subdata.sendPacket(new PacketDownloadServerInfo(gui.lastVisitedObject, json -> { + gui.setDownloading(ChatColor.stripColor(this.plugin.lang.getSection("Lang").getColoredString("Interface.SubServer-Plugin.Title", '&').replace("$str$", (String) gui.lastVisitedObjects[0]))); + this.plugin.subdata.sendPacket(new PacketDownloadServerInfo((String) gui.lastVisitedObjects[0], json -> { if (json.getString("type").equals("subserver")) { gui.setDownloading(null); plugin.get().open(player, json.getJSONObject("server")); diff --git a/SubServers.Client/Bukkit/src/net/ME1312/SubServers/Client/Bukkit/Graphic/InternalUIRenderer.java b/SubServers.Client/Bukkit/src/net/ME1312/SubServers/Client/Bukkit/Graphic/InternalUIRenderer.java index d5fa80d6..924dc91b 100644 --- a/SubServers.Client/Bukkit/src/net/ME1312/SubServers/Client/Bukkit/Graphic/InternalUIRenderer.java +++ b/SubServers.Client/Bukkit/src/net/ME1312/SubServers/Client/Bukkit/Graphic/InternalUIRenderer.java @@ -22,10 +22,9 @@ import java.util.regex.Pattern; * Internal GUI Renderer Class */ public class InternalUIRenderer extends UIRenderer { + private static int MAX_VISITED_OBJECTS = 2; private List windowHistory = new LinkedList(); - protected Options lastUsedOptions = null; - protected int lastVisitedObjectPosition = 0; - protected String lastVisitedObject = null; + protected Object[] lastVisitedObjects = new Object[MAX_VISITED_OBJECTS]; protected int lastPage = 1; protected Runnable lastMenu = null; protected boolean open = false; @@ -103,7 +102,7 @@ public class InternalUIRenderer extends UIRenderer { setDownloading(ChatColor.stripColor(plugin.lang.getSection("Lang").getColoredString("Interface.Host-Menu.Title", '&'))); plugin.subdata.sendPacket(new PacketDownloadServerList(null, null, (json) -> { setDownloading(null); - lastVisitedObject = null; + lastVisitedObjects[0] = null; lastPage = page; lastMenu = () -> hostMenu(1); windowHistory.add(() -> hostMenu(page)); @@ -232,7 +231,7 @@ public class InternalUIRenderer extends UIRenderer { if (hasHistory()) back(); } else { setDownloading(null); - lastVisitedObject = host; + lastVisitedObjects[0] = host; ItemStack block; ItemMeta blockMeta; @@ -339,15 +338,15 @@ public class InternalUIRenderer extends UIRenderer { public void hostCreator(final CreatorOptions options) { setDownloading(ChatColor.stripColor(plugin.lang.getSection("Lang").getColoredString("Interface.Host-Creator.Title", '&').replace("$str$", options.getHost()))); - lastUsedOptions = options; + lastVisitedObjects[0] = options; if (!options.init()) { windowHistory.add(() -> hostCreator(options)); - lastVisitedObject = options.getHost(); + lastVisitedObjects[0] = options.getHost(); } plugin.subdata.sendPacket(new PacketDownloadHostInfo(options.getHost(), json -> { if (!json.getBoolean("valid")|| !json.getJSONObject("host").getBoolean("enabled")) { - lastUsedOptions = null; + lastVisitedObjects[0] = null; if (hasHistory()) back(); } else { setDownloading(null); @@ -475,11 +474,11 @@ public class InternalUIRenderer extends UIRenderer { public void hostCreatorTemplates(final int page, final CreatorOptions options) { setDownloading(ChatColor.stripColor(plugin.lang.getSection("Lang").getColoredString("Interface.Host-Creator.Edit-Template.Title", '&').replace("$str$", options.getHost()))); - lastUsedOptions = options; - if (!options.init()) lastVisitedObject = options.getHost(); + lastVisitedObjects[0] = options; + if (!options.init()) lastVisitedObjects[0] = options.getHost(); plugin.subdata.sendPacket(new PacketDownloadHostInfo(options.getHost(), (json) -> { if (!json.getBoolean("valid")|| !json.getJSONObject("host").getBoolean("enabled")) { - lastUsedOptions = null; + lastVisitedObjects[0] = null; if (hasHistory()) back(); } else { lastPage = page; @@ -595,7 +594,7 @@ public class InternalUIRenderer extends UIRenderer { if (hasHistory()) back(); } else { setDownloading(null); - lastVisitedObject = host; + lastVisitedObjects[0] = host; lastPage = page; List renderers = new ArrayList(); for (String renderer : renderers) { @@ -699,7 +698,7 @@ public class InternalUIRenderer extends UIRenderer { setDownloading(ChatColor.stripColor(plugin.lang.getSection("Lang").getColoredString("Interface.Group-Menu.Title", '&'))); plugin.subdata.sendPacket(new PacketDownloadServerList(null, null, (json) -> { setDownloading(null); - lastVisitedObject = null; + lastVisitedObjects[0] = null; lastPage = page; lastMenu = () -> groupMenu(1); windowHistory.add(() -> groupMenu(page)); @@ -812,23 +811,18 @@ public class InternalUIRenderer extends UIRenderer { HashMap hosts = new HashMap(); List servers = new ArrayList(); + lastVisitedObjects[0] = host; + lastVisitedObjects[1] = group; if (host != null && json.getJSONObject("hosts").keySet().contains(host)) { - lastVisitedObject = host; - lastVisitedObjectPosition = 1; for (String subserver : json.getJSONObject("hosts").getJSONObject(host).getJSONObject("servers").keySet()) { hosts.put(subserver, host); servers.add(subserver); } } else if (group != null && json.getJSONObject("groups").keySet().contains(group)) { - lastVisitedObject = group; - lastVisitedObjectPosition = 2; for (String server : json.getJSONObject("groups").getJSONObject(group).keySet()) { hosts.put(server, (json.getJSONObject("groups").getJSONObject(group).getJSONObject(server).keySet().contains("host") && json.getJSONObject("hosts").keySet().contains(json.getJSONObject("groups").getJSONObject(group).getJSONObject(server).getString("host")))?json.getJSONObject("groups").getJSONObject(group).getJSONObject(server).getString("host"):null); servers.add(server); } - } else { - lastVisitedObject = null; - lastVisitedObjectPosition = 0; lastMenu = () -> serverMenu(1, null, null); for (String s : json.getJSONObject("servers").keySet()) { hosts.put(s, null); @@ -1012,7 +1006,7 @@ public class InternalUIRenderer extends UIRenderer { if (hasHistory()) back(); } else { setDownloading(null); - lastVisitedObject = subserver; + lastVisitedObjects[0] = subserver; ItemStack block; ItemMeta blockMeta; ItemStack div = new ItemStack(Material.STAINED_GLASS_PANE, 1, (short) 15); @@ -1194,7 +1188,7 @@ public class InternalUIRenderer extends UIRenderer { if (hasHistory()) back(); } else { setDownloading(null); - lastVisitedObject = subserver; + lastVisitedObjects[0] = subserver; lastPage = page; List renderers = new ArrayList(); for (String renderer : renderers) { diff --git a/SubServers.Console/src/bungee.yml b/SubServers.Console/src/bungee.yml index faa055f8..dbb55a0d 100644 --- a/SubServers.Console/src/bungee.yml +++ b/SubServers.Console/src/bungee.yml @@ -1,4 +1,4 @@ name: SubServers-Console main: net.ME1312.SubServers.Console.ConsolePlugin -version: 2.12b +version: 2.12.1a author: ME1312 \ No newline at end of file diff --git a/SubServers.Console/src/net/ME1312/SubServers/Console/AnsiHTMLColorStream.java b/SubServers.Console/src/net/ME1312/SubServers/Console/AnsiHTMLColorStream.java new file mode 100644 index 00000000..e990f452 --- /dev/null +++ b/SubServers.Console/src/net/ME1312/SubServers/Console/AnsiHTMLColorStream.java @@ -0,0 +1,114 @@ +package net.ME1312.SubServers.Console; + +import org.fusesource.jansi.AnsiOutputStream; + +import java.io.IOException; +import java.io.OutputStream; +import java.util.ArrayList; +import java.util.Iterator; +import java.util.List; + +public class AnsiHTMLColorStream extends AnsiOutputStream { + private boolean concealOn = false; + private static final String[] ANSI_COLOR_MAP = new String[]{"000000", "cd0000", "25bc24", "e1e100", "0000ee", "cd00cd", "00e1e1", "ffffff"}; + private static final byte[] BYTES_QUOT = """.getBytes(); + private static final byte[] BYTES_AMP = "&".getBytes(); + private static final byte[] BYTES_LT = "<".getBytes(); + private static final byte[] BYTES_GT = ">".getBytes(); + private List closingAttributes = new ArrayList(); + + public void close() throws IOException { + this.closeAttributes(); + super.close(); + } + + public AnsiHTMLColorStream(OutputStream os) { + super(os); + } + + private void write(String s) throws IOException { + super.out.write(s.getBytes()); + } + + private void writeAttribute(String s) throws IOException { + this.write("<" + s + ">"); + this.closingAttributes.add(0, s.split(" ", 2)[0]); + } + + private void closeAttributes() throws IOException { + Iterator i$ = this.closingAttributes.iterator(); + + while(i$.hasNext()) { + String attr = (String)i$.next(); + this.write(""); + } + + this.closingAttributes.clear(); + } + + public void write(int data) throws IOException { + switch(data) { + case 34: + this.out.write(BYTES_QUOT); + break; + case 38: + this.out.write(BYTES_AMP); + break; + case 60: + this.out.write(BYTES_LT); + break; + case 62: + this.out.write(BYTES_GT); + break; + default: + super.write(data); + } + + } + + public void writeLine(byte[] buf, int offset, int len) throws IOException { + this.write(buf, offset, len); + this.closeAttributes(); + } + + protected void processSetAttribute(int attribute) throws IOException { + switch(attribute) { + case 1: + this.writeAttribute("b"); + break; + case 4: + this.writeAttribute("u"); + case 7: + case 27: + default: + break; + case 8: + this.write("\u001b[8m"); + this.concealOn = true; + break; + case 22: + this.closeAttributes(); + break; + case 24: + this.closeAttributes(); + } + + } + + protected void processAttributeRest() throws IOException { + if (this.concealOn) { + this.write("\u001b[0m"); + this.concealOn = false; + } + + this.closeAttributes(); + } + + protected void processSetForegroundColor(int color) throws IOException { + this.writeAttribute("span style=\"color: #" + ANSI_COLOR_MAP[color] + ";\""); + } + + protected void processSetBackgroundColor(int color) throws IOException { + this.writeAttribute("span style=\"background-color: #" + ANSI_COLOR_MAP[color] + ";\""); + } +} diff --git a/SubServers.Console/src/net/ME1312/SubServers/Console/ConsolePlugin.java b/SubServers.Console/src/net/ME1312/SubServers/Console/ConsolePlugin.java index ad536c4e..05baf913 100644 --- a/SubServers.Console/src/net/ME1312/SubServers/Console/ConsolePlugin.java +++ b/SubServers.Console/src/net/ME1312/SubServers/Console/ConsolePlugin.java @@ -64,7 +64,7 @@ public final class ConsolePlugin extends Plugin implements Listener { public void onServerCreate(SubCreateEvent event) { if (!event.isCancelled() && config.get().getStringList("Enabled-Creators").contains(event.getHost().getName().toLowerCase())) { if (!cCurrent.keySet().contains(event.getHost().getName().toLowerCase())) { - SwingUtilities.invokeLater(() -> cCurrent.put(event.getName().toLowerCase(), new ConsoleWindow(this, event.getHost().getCreator().getLogger(event.getName().toLowerCase())))); + cCurrent.put(event.getName().toLowerCase(), new ConsoleWindow(this, event.getHost().getCreator().getLogger(event.getName().toLowerCase()))); } else { cCurrent.get(event.getName().toLowerCase()).clear(); } @@ -75,7 +75,7 @@ public final class ConsolePlugin extends Plugin implements Listener { public void onServerStart(SubStartEvent event) { if (!event.isCancelled() && config.get().getStringList("Enabled-Servers").contains(event.getServer().getName().toLowerCase())) { if (!sCurrent.keySet().contains(event.getServer().getName().toLowerCase())) { - SwingUtilities.invokeLater(() -> sCurrent.put(event.getServer().getName().toLowerCase(), new ConsoleWindow(this, event.getServer().getLogger()))); + sCurrent.put(event.getServer().getName().toLowerCase(), new ConsoleWindow(this, event.getServer().getLogger())); } else { sCurrent.get(event.getServer().getName().toLowerCase()).clear(); } diff --git a/SubServers.Console/src/net/ME1312/SubServers/Console/ConsoleWindow.form b/SubServers.Console/src/net/ME1312/SubServers/Console/ConsoleWindow.form index 707986a0..ec92eb64 100644 --- a/SubServers.Console/src/net/ME1312/SubServers/Console/ConsoleWindow.form +++ b/SubServers.Console/src/net/ME1312/SubServers/Console/ConsoleWindow.form @@ -50,7 +50,7 @@ - + @@ -61,11 +61,7 @@ - - - - diff --git a/SubServers.Console/src/net/ME1312/SubServers/Console/ConsoleWindow.java b/SubServers.Console/src/net/ME1312/SubServers/Console/ConsoleWindow.java index 79e19cfb..ab492bbf 100644 --- a/SubServers.Console/src/net/ME1312/SubServers/Console/ConsoleWindow.java +++ b/SubServers.Console/src/net/ME1312/SubServers/Console/ConsoleWindow.java @@ -10,22 +10,28 @@ import javax.imageio.ImageIO; import javax.swing.*; import javax.swing.border.Border; import javax.swing.text.*; +import javax.swing.text.html.HTMLDocument; +import javax.swing.text.html.HTMLEditorKit; +import javax.swing.text.html.StyleSheet; import java.awt.*; import java.awt.event.*; +import java.io.ByteArrayOutputStream; import java.io.IOException; +import java.io.OutputStream; import java.text.SimpleDateFormat; import java.util.*; import java.util.List; import java.util.logging.Level; public final class ConsoleWindow implements SubLogFilter { + private static String RESET_VALUE = "\n\u00A0\n\u00A0"; private ConsolePlugin plugin; private JFrame window; private JPanel panel; private JTextField input; private boolean ifocus = false; private TextFieldPopup popup; - private JTextArea log; + private JTextPane log; private JScrollPane vScroll; private JScrollBar hScroll; private List eScroll = new ArrayList(); @@ -38,6 +44,25 @@ public final class ConsoleWindow implements SubLogFilter { private int findI = 0; private boolean open = false; private SubLogger logger; + private int fontSize = 12; + private AnsiHTMLColorStream stream = new AnsiHTMLColorStream(new OutputStream() { + ByteArrayOutputStream stream = new ByteArrayOutputStream(); + + @Override + public void write(int b) throws IOException { + stream.write(b); + if (((char) b) == '\n') { + try { + HTMLEditorKit kit = (HTMLEditorKit) log.getEditorKit(); + HTMLDocument doc = (HTMLDocument) log.getDocument(); + kit.insertHTML(doc, doc.getLength() - 2, new String(stream.toByteArray(), "UTF-8"), 0, 0, null); + } catch (BadLocationException e) { + e.printStackTrace(); + } + stream = new ByteArrayOutputStream(); + } + } + }); private boolean[] kpressed = new boolean[65535]; private KeyEventDispatcher keys = event -> { switch (event.getID()) { @@ -111,21 +136,27 @@ public final class ConsoleWindow implements SubLogFilter { menu.addSeparator(); item = new JMenuItem("Reset Text Size"); item.addActionListener(event -> { - log.setFont(log.getFont().deriveFont(12f)); + HTMLDocument doc = (HTMLDocument) log.getDocument(); + fontSize = 12; + doc.getStyleSheet().addRule("body {font-size: "+fontSize+";}\n"); hScroll(); }); menu.add(item); item = new JMenuItem("Bigger Text"); item.setAccelerator(KeyStroke.getKeyStroke('=', Toolkit.getDefaultToolkit().getMenuShortcutKeyMask(), true)); item.addActionListener(event -> { - log.setFont(log.getFont().deriveFont((float) log.getFont().getSize() + 2)); + HTMLDocument doc = (HTMLDocument) log.getDocument(); + fontSize += 2; + doc.getStyleSheet().addRule("body {font-size: "+fontSize+";}\n"); hScroll(); }); menu.add(item); item = new JMenuItem("Smaller Text"); item.setAccelerator(KeyStroke.getKeyStroke('-', Toolkit.getDefaultToolkit().getMenuShortcutKeyMask(), true)); item.addActionListener(event -> { - log.setFont(log.getFont().deriveFont((float) log.getFont().getSize() - 2)); + HTMLDocument doc = (HTMLDocument) log.getDocument(); + fontSize -= 2; + doc.getStyleSheet().addRule("body {font-size: "+fontSize+";}\n"); hScroll(); }); menu.add(item); @@ -137,7 +168,7 @@ public final class ConsoleWindow implements SubLogFilter { item = new JMenuItem("Reload Log"); item.setAccelerator(KeyStroke.getKeyStroke('R', Toolkit.getDefaultToolkit().getMenuShortcutKeyMask(), true)); item.addActionListener(event -> { - log.setText("\n"); + log.setText(RESET_VALUE); loadContent(); }); menu.add(item); @@ -166,6 +197,11 @@ public final class ConsoleWindow implements SubLogFilter { }); vScroll.setBorder(BorderFactory.createEmptyBorder()); new SmartScroller(vScroll, SmartScroller.VERTICAL, SmartScroller.END); + log.setContentType("text/html"); + log.setEditorKit(new HTMLEditorKit()); + StyleSheet style = new StyleSheet(); + style.addRule("body {color: #dcdcdc; font-family: courier; font-size: 12;}\n"); + log.setDocument(new HTMLDocument(style)); log.setBorder(BorderFactory.createLineBorder(new Color(40, 44, 45))); new TextFieldPopup(log, false); ((AbstractDocument) log.getDocument()).setDocumentFilter(new DocumentFilter() { @@ -316,7 +352,7 @@ public final class ConsoleWindow implements SubLogFilter { } logger.registerFilter(this); - log.setText("\n"); + log.setText(RESET_VALUE); loadContent(); KeyboardFocusManager.getCurrentKeyboardFocusManager().addKeyEventDispatcher(keys); if (logger.isLogging() && !open) open(); @@ -354,7 +390,11 @@ public final class ConsoleWindow implements SubLogFilter { } public void log(Date date, String message) { - log.append(' ' + new SimpleDateFormat("hh:mm:ss").format(date) + ' ' + message + " \n"); + try { + stream.write((' ' + new SimpleDateFormat("hh:mm:ss").format(date) + ' ' + message + " \n").getBytes("UTF-8")); + } catch (IOException e) { + e.printStackTrace(); + } } public void log(String message) { log(Calendar.getInstance().getTime(), message); @@ -369,7 +409,7 @@ public final class ConsoleWindow implements SubLogFilter { } public void clear() { - log.setText("\n"); + log.setText(RESET_VALUE); hScroll(); } diff --git a/SubServers.Console/src/net/ME1312/SubServers/Console/PopoutCommand.java b/SubServers.Console/src/net/ME1312/SubServers/Console/PopoutCommand.java index e28b31c2..4fee88e7 100644 --- a/SubServers.Console/src/net/ME1312/SubServers/Console/PopoutCommand.java +++ b/SubServers.Console/src/net/ME1312/SubServers/Console/PopoutCommand.java @@ -7,7 +7,6 @@ import net.md_5.bungee.api.connection.ProxiedPlayer; import net.md_5.bungee.api.plugin.Command; import net.md_5.bungee.command.ConsoleCommandSender; -import javax.swing.*; import java.util.List; import java.util.Map; @@ -32,11 +31,9 @@ public final class PopoutCommand { boolean success = false; if (servers.get(args[0].toLowerCase()).isRunning()) { if (!plugin.sCurrent.keySet().contains(args[0].toLowerCase())) { - SwingUtilities.invokeLater(() -> { - ConsoleWindow window = new ConsoleWindow(plugin, servers.get(args[0].toLowerCase()).getLogger()); - plugin.sCurrent.put(args[0].toLowerCase(), window); - window.open(); - }); + ConsoleWindow window = new ConsoleWindow(plugin, servers.get(args[0].toLowerCase()).getLogger()); + plugin.sCurrent.put(args[0].toLowerCase(), window); + window.open(); } else { plugin.sCurrent.get(args[0].toLowerCase()).open(); } @@ -101,13 +98,11 @@ public final class PopoutCommand { boolean success = false; if (hosts.get(args[0].toLowerCase()).getCreator().getReservedNames().size() > 0) { if (!plugin.cCurrent.keySet().contains(args[0].toLowerCase())) { - SwingUtilities.invokeLater(() -> { - for (String reserved : hosts.get(args[0].toLowerCase()).getCreator().getReservedNames()) { - ConsoleWindow window = new ConsoleWindow(plugin, hosts.get(args[0].toLowerCase()).getCreator().getLogger(reserved)); - plugin.cCurrent.put(reserved.toLowerCase(), window); - window.open(); - } - }); + for (String reserved : hosts.get(args[0].toLowerCase()).getCreator().getReservedNames()) { + ConsoleWindow window = new ConsoleWindow(plugin, hosts.get(args[0].toLowerCase()).getCreator().getLogger(reserved)); + plugin.cCurrent.put(reserved.toLowerCase(), window); + window.open(); + } } else { plugin.cCurrent.get(args[0].toLowerCase()).open(); } diff --git a/SubServers.Host/src.jar b/SubServers.Host/src.jar index 28dd29cd..fed0e635 100644 Binary files a/SubServers.Host/src.jar and b/SubServers.Host/src.jar differ diff --git a/SubServers.Sync/src.jar b/SubServers.Sync/src.jar index 102df5f2..a4e21c90 100644 Binary files a/SubServers.Sync/src.jar and b/SubServers.Sync/src.jar differ