fix gradle file

# Conflicts:
#	server/build.gradle

.github/workflows/codeql-analysis.yml

@@ -1,14 +1,3 @@
-# For most projects, this workflow file will not need changing; you simply need
-# to commit it to your repository.
-#
-# You may wish to alter this file to override the set of languages analyzed,
-# or to provide custom queries or build logic.
-#
-# ******** NOTE ********
-# We have attempted to detect the languages in your repository. Please check
-# the `language` matrix defined below to confirm you have the correct set of
-# supported CodeQL languages.
-#
 name: "CodeQL"
 
 on:
@@ -18,7 +7,7 @@ on:
     # The branches below must be a subset of the branches above
     branches: [ master ]
   schedule:
-    - cron: '29 4 * * *'
+    - cron: '30 4 * * *'
 
 jobs:
   analyze:
@@ -33,45 +22,26 @@ jobs:
       fail-fast: false
       matrix:
         language: [ 'java' ]
-        # CodeQL supports [ 'cpp', 'csharp', 'go', 'java', 'javascript', 'python', 'ruby' ]
-        # Learn more about CodeQL language support at https://git.io/codeql-language-support
+        java: [ 17 ]
 
     steps:
       - name: Checkout repository
         uses: actions/checkout@v3
 
-      - name: Set up JDK 17
-        uses: actions/setup-java@v2
+      - name: Set up JDK ${{ matrix.java }}
+        uses: actions/setup-java@v3
         with:
           distribution: temurin
-          java-version: 17
+          java-version: ${{ matrix.java }}
           cache: gradle
 
-      # Initializes the CodeQL tools for scanning.
       - name: Initialize CodeQL
         uses: github/codeql-action/init@v2
         with:
           languages: ${{ matrix.language }}
-          # If you wish to specify custom queries, you can do so here or in a config file.
-          # By default, queries listed here will override any specified in a config file.
-          # Prefix the list here with "+" to use these queries and those in the config file.
-          # queries: ./path/to/local/query, your-org/your-repo/queries@main
 
-      # Autobuild attempts to build any compiled languages  (C/C++, C#, or Java).
-      # If this step fails, then you should remove it and run the build manually (see below)
       - name: Autobuild
         uses: github/codeql-action/autobuild@v2
 
-      # ℹ️ Command-line programs to run using the OS shell.
-      # 📚 https://git.io/JvXDl
-
-      # ✏️ If the Autobuild fails above, remove it and uncomment the following three lines
-      #    and modify them (or add more) to build your code if your project
-      #    uses a compiled language
-
-      - run: |
-          chmod +x gradlew
-          ./gradlew build --no-daemon
-
       - name: Perform CodeQL Analysis
         uses: github/codeql-action/analyze@v2

.github/workflows/gradle.yml

@@ -1,18 +1,26 @@
-name: Gradle
-
-on: [ push ]
+# Adapted from Paper's build script
+name: Build
+on: [ push, pull_request ]
 
 jobs:
   build:
+    # Only run on PRs if the source branch is on someone else's repo
+    if: ${{ github.event_name != 'pull_request' || github.repository != github.event.pull_request.head.repo.full_name }}
     runs-on: ubuntu-latest
-
+    strategy:
+      matrix:
+        java: [ 17 ]
+      fail-fast: true
     steps:
-      - uses: actions/checkout@v2
-      - name: Set up JDK 17
-        uses: actions/setup-java@v2
+      - uses: actions/checkout@v3
+      - name: JDK ${{ matrix.java }}
+        uses: actions/setup-java@v3
         with:
-          distribution: temurin
-          java-version: 17
-          cache: gradle
-      - name: Build with Gradle
-        run: chmod a+x gradlew && ./gradlew build --no-daemon
+          java-version: ${{ matrix.java }}
+          cache: 'gradle'
+          distribution: 'temurin'
+      - name: Build
+        run: |
+          git config --global user.email "no-reply@github.com"
+          git config --global user.name "Github Actions"
+          ./gradlew build --stacktrace

.gitignore

@@ -14,4 +14,7 @@ Thumbs.db
 # Gradle
 /build/
 /*/build/
-/.gradle/
+/.gradle/
+
+# Common working directory
+run/

.idea/codeStyles/Plexus_Code_Style.xml

@@ -1,33 +1,8 @@
 <component name="ProjectCodeStyleConfiguration">
-  <code_scheme name="Plexus Code Style" version="1">
-    <JavaCodeStyleSettings>
-      <option name="CLASS_COUNT_TO_USE_IMPORT_ON_DEMAND" value="20" />
-      <option name="IMPORT_LAYOUT_TABLE">
-        <value>
-          <package name="" withSubpackages="true" static="false" />
-          <package name="" withSubpackages="true" static="true" />
-        </value>
-      </option>
-    </JavaCodeStyleSettings>
-    <JetCodeStyleSettings>
-      <option name="PACKAGES_TO_USE_STAR_IMPORTS">
-        <value>
-          <package name="java.util" alias="false" withSubpackages="false" />
-          <package name="kotlinx.android.synthetic" alias="false" withSubpackages="true" />
-          <package name="io.ktor" alias="false" withSubpackages="true" />
-        </value>
-      </option>
-      <option name="PACKAGES_IMPORT_LAYOUT">
-        <value>
-          <package name="" alias="false" withSubpackages="true" />
-          <package name="java" alias="false" withSubpackages="true" />
-          <package name="javax" alias="false" withSubpackages="true" />
-          <package name="kotlin" alias="false" withSubpackages="true" />
-          <package name="" alias="true" withSubpackages="true" />
-        </value>
-      </option>
-    </JetCodeStyleSettings>
+  <code_scheme name="Plexus Code Style" version="173">
     <codeStyleSettings language="JAVA">
+      <option name="KEEP_FIRST_COLUMN_COMMENT" value="false" />
+      <option name="KEEP_BLANK_LINES_BEFORE_RBRACE" value="1" />
       <option name="BRACE_STYLE" value="2" />
       <option name="CLASS_BRACE_STYLE" value="2" />
       <option name="METHOD_BRACE_STYLE" value="2" />
@@ -36,14 +11,10 @@
       <option name="WHILE_ON_NEW_LINE" value="true" />
       <option name="CATCH_ON_NEW_LINE" value="true" />
       <option name="FINALLY_ON_NEW_LINE" value="true" />
-      <option name="SPACE_AFTER_TYPE_CAST" value="true" />
       <option name="IF_BRACE_FORCE" value="3" />
       <option name="DOWHILE_BRACE_FORCE" value="3" />
       <option name="WHILE_BRACE_FORCE" value="3" />
       <option name="FOR_BRACE_FORCE" value="3" />
-      <option name="BLANK_LINES_AFTER_CLASS_HEADER" value="0" />
-      <option name="KEEP_BLANK_LINES_BEFORE_RBRACE" value="1" />
-      <option name="KEEP_FIRST_COLUMN_COMMENT" value="false" />
     </codeStyleSettings>
   </code_scheme>
 </component>

CONTRIBUTING.md

@@ -1,5 +1,5 @@
 For those who are wanting to contribute, we fully encourage doing so. There are a few rules we require following when
-contributing however.
+contributing.
 
 ## Steps
 
@@ -17,7 +17,8 @@ contributing however.
 - Keep in mind that it **must** be formatted correctly. If you are using IntelliJ, there is a `codeStyle.xml` file that
   tells IntelliJ how to format your code. Check this link for information on how to use the
   file: https://www.jetbrains.com/help/idea/configuring-code-style.html#import-export-schemes
-- If you are not using IntelliJ, that is fine. We use Allman style so please format your code accordingly.
+- If you are not using IntelliJ, that is fine. We use the Plexus Code Style (which is almost the same as Allman) so
+  please format your code accordingly.
 
 6. Push your changes to your new branch and make a PR based off of that branch.
 

Jenkinsfile

@@ -8,25 +8,13 @@ pipeline {
                 }
             }
         }
-        stage("publish") {
-            when {
-                branch "master"
-            }
-            steps {
-            withCredentials([usernamePassword(credentialsId: '85b7099f-2e65-461e-b2ce-124edec41ed6', passwordVariable: 'plexPassword', usernameVariable: 'plexUser')]) {
-                withGradle {
-                    sh "./gradlew publish --no-daemon"
-                    }
-                }
-            }
-        }
     }
     post {
         always {
             archiveArtifacts artifacts: "build/libs/*.jar", fingerprint: true
-            javadoc javadocDir: "api/build/docs/javadoc", keepAll: false
+            javadoc javadocDir: "server/build/docs/javadoc", keepAll: false
             discordSend description: "**Build:** ${env.BUILD_NUMBER}\n**Status:** ${currentBuild.currentResult}", enableArtifactsList: true, footer: "Built with Jenkins", link: env.BUILD_URL, result: currentBuild.currentResult, scmWebUrl: "https://github.com/plexusorg/Plex", showChangeset: true, title: env.JOB_NAME, webhookURL: env.WEBHOOK_URL
             cleanWs()
         }
     }
-}
+}

README.md

@@ -1,8 +1,8 @@
-# Plex [![Build Status](https://ci.plex.us.org/job/Plex/job/master/badge/icon)](https://ci.plex.us.org/job/Plex/job/master/)
+# Plex [![Build Status](https://ci.plex.us.org/job/Plex/job/master/badge/icon)](https://ci.plex.us.org/job/Plex/job/master/) [![License](https://img.shields.io/github/license/plexusorg/Plex)](https://github.com/plexusorg/Plex/blob/master/LICENSE.md) [![Discord](https://img.shields.io/discord/927737516864446495)](https://discord.plex.us.org)
 
 Plex is a new freedom plugin. It is an alternative to TotalFreedomMod. It has many of the features that make a freedom
 server unique, but also many features that TotalFreedomMod doesn’t have. For example, there is full support for using a
 permissions plugin instead of ranks. It is also much more performance oriented. You can use Redis to store indefinite
 bans and store player data in MongoDB, MariaDB, or SQLite. Plex is also fully customizable as you can change almost all
 of the messages within the plugin. Plex also has a module system which can be used to add additional functionality. Plex
-is not a rewrite, "debloat", or related to TotalFreedomMod. Plex is an entirely new experience.
+is not a rewrite, "debloat", or related to TotalFreedomMod. Plex is an entirely new experience.

api/build.gradle

@@ -1,32 +0,0 @@
-group = rootProject.group
-version = rootProject.version
-description = "Plex-API"
-
-jar {
-    archiveBaseName.set("Plex-API")
-}
-
-tasks {
-    jar {
-        finalizedBy(rootProject.tasks.copyJars)
-    }
-
-    shadowJar {
-        enabled = false
-    }
-}
-
-publishing {
-    publications {
-        maven(MavenPublication) {
-            from components.java
-        }
-    }
-}
-
-dependencies {
-    compileOnly "org.projectlombok:lombok:1.18.24"
-    annotationProcessor "org.projectlombok:lombok:1.18.24"
-    compileOnly "io.papermc.paper:paper-api:1.18.2-R0.1-SNAPSHOT"
-    compileOnly "org.json:json:20220320"
-}

api/src/main/java/dev/plex/api/IPlayerCache.java

@@ -1,11 +0,0 @@
-package dev.plex.api;
-
-import java.util.Map;
-import java.util.UUID;
-
-public interface IPlayerCache<T>
-{
-    Map<UUID, T> getPlexPlayerMap();
-
-    T getPlexPlayer(UUID uuid);
-}

api/src/main/java/dev/plex/api/PlexApi.java

@@ -1,6 +0,0 @@
-package dev.plex.api;
-
-public interface PlexApi
-{
-    IPlayerCache<?> getPlayerCache();
-}

api/src/main/java/dev/plex/api/PlexApiProvider.java

@@ -1,6 +0,0 @@
-package dev.plex.api;
-
-public interface PlexApiProvider
-{
-    PlexApi getApi();
-}

api/src/main/java/dev/plex/api/chat/IChatHandler.java

@@ -1,8 +0,0 @@
-package dev.plex.api.chat;
-
-import io.papermc.paper.event.player.AsyncChatEvent;
-
-public interface IChatHandler
-{
-    void doChat(AsyncChatEvent event);
-}

api/src/main/java/dev/plex/api/permission/IPermissionHandler.java

@@ -1,32 +0,0 @@
-package dev.plex.api.permission;
-
-import org.bukkit.Bukkit;
-import org.bukkit.OfflinePlayer;
-import org.bukkit.entity.Player;
-import org.jetbrains.annotations.NotNull;
-import org.jetbrains.annotations.Nullable;
-
-public interface IPermissionHandler
-{
-    default boolean hasPermission(@NotNull Player player, @Nullable String permission)
-    {
-        if (permission == null)
-        {
-            return true;
-        }
-        return player.hasPermission(permission);
-    }
-
-    default boolean hasPermission(@NotNull OfflinePlayer player, @Nullable String permission)
-    {
-        if (permission == null)
-        {
-            return true;
-        }
-        if (player.isOnline() && Bukkit.getPlayer(player.getUniqueId()) != null)
-        {
-            return Bukkit.getPlayer(player.getUniqueId()).hasPermission(permission);
-        }
-        throw new UnsupportedOperationException("Not implemented yet");
-    }
-}

api/src/main/java/dev/plex/api/player/IPlexPlayer.java

@@ -1,67 +0,0 @@
-package dev.plex.api.player;
-
-import java.util.List;
-import java.util.UUID;
-import org.bukkit.entity.Player;
-import org.bukkit.permissions.PermissionAttachment;
-
-public interface IPlexPlayer
-{
-    String getId();
-
-    UUID getUuid();
-
-    String getName();
-
-    Player getPlayer();
-
-    void setPlayer(Player player);
-
-    String getLoginMessage();
-
-    void setLoginMessage(String message);
-
-    String getPrefix();
-
-    void setPrefix(String prefix);
-
-    boolean isVanished();
-
-    void setVanished(boolean vanished);
-
-    boolean isCommandSpy();
-
-    void setCommandSpy(boolean commandSpy);
-
-    boolean isFrozen();
-
-    void setFrozen(boolean frozen);
-
-    boolean isMuted();
-
-    void setMuted(boolean muted);
-
-    boolean isLockedUp();
-
-    void setLockedUp(boolean lockedUp);
-
-    boolean isAdminActive();
-
-    void setAdminActive(boolean active);
-
-    long getCoins();
-
-    void setCoins(long coins);
-
-    String getRank();
-
-    void setRank(String rank);
-
-    List<String> getIps();
-
-    void setIps(List<String> ips);
-
-    PermissionAttachment getPermissionAttachment();
-
-    void setPermissionAttachment(PermissionAttachment attachment);
-}

api/src/main/java/dev/plex/api/plugin/PlexPlugin.java

@@ -1,30 +0,0 @@
-package dev.plex.api.plugin;
-
-import dev.plex.api.chat.IChatHandler;
-import dev.plex.api.permission.IPermissionHandler;
-import lombok.AccessLevel;
-import lombok.Getter;
-import lombok.Setter;
-import org.bukkit.plugin.java.JavaPlugin;
-
-@Getter
-@Setter
-public abstract class PlexPlugin extends JavaPlugin
-{
-    @Setter(AccessLevel.NONE)
-    private static PlexPlugin plugin;
-
-    private IChatHandler chatHandler;
-    private IPermissionHandler permissionHandler;
-
-    @Override
-    public void onLoad()
-    {
-        plugin = this;
-    }
-
-    public static PlexPlugin get()
-    {
-        return plugin;
-    }
-}

api/src/main/java/dev/plex/api/rank/IRank.java

@@ -1,26 +0,0 @@
-package dev.plex.api.rank;
-
-import net.kyori.adventure.text.Component;
-import net.kyori.adventure.text.format.NamedTextColor;
-import org.json.JSONObject;
-
-public interface IRank<T>
-{
-    int getLevel();
-
-    String getLoginMessage();
-
-    void setLoginMessage(String message);
-
-    String getReadable();
-
-    Component getPrefix();
-
-    void setPrefix(String prefix);
-
-    NamedTextColor getColor();
-
-    boolean isAtLeast(T rank);
-
-    JSONObject toJSON();
-}

build.gradle

@@ -1,11 +1,11 @@
 plugins {
     id "java"
     id "maven-publish"
-    id "com.github.johnrengelman.shadow" version "7.1.2"
+    id "com.github.johnrengelman.shadow" version "8.1.1"
 }
 
 group = "dev.plex"
-version = "1.1"
+version = "1.3-SNAPSHOT"
 description = "Plex"
 
 subprojects {
@@ -33,6 +33,11 @@ subprojects {
             }
         }
 
+        maven {
+            url = uri("https://libraries.minecraft.net")
+        }
+
+
         mavenCentral()
     }
 
@@ -60,7 +65,6 @@ subprojects {
 }
 
 clean {
-    dependsOn(":api:clean")
     dependsOn(":server:clean")
     dependsOn(":proxy:clean")
 }
@@ -70,4 +74,4 @@ task copyJars(type: Copy, dependsOn: subprojects.jar) {
     from(subprojects.jar)
     from(subprojects.shadowJar)
     into project.file('build/libs')
-}
+}

gradle/wrapper/gradle-wrapper.properties

@@ -1,5 +1,6 @@
 distributionBase=GRADLE_USER_HOME
 distributionPath=wrapper/dists
-distributionUrl=https\://services.gradle.org/distributions/gradle-7.4.2-bin.zip
+distributionUrl=https\://services.gradle.org/distributions/gradle-8.1.1-bin.zip
+networkTimeout=10000
 zipStoreBase=GRADLE_USER_HOME
 zipStorePath=wrapper/dists

gradlew

@@ -55,7 +55,7 @@
 #       Darwin, MinGW, and NonStop.
 #
 #   (3) This script is generated from the Groovy template
-#       https://github.com/gradle/gradle/blob/master/subprojects/plugins/src/main/resources/org/gradle/api/internal/plugins/unixStartScript.txt
+#       https://github.com/gradle/gradle/blob/HEAD/subprojects/plugins/src/main/resources/org/gradle/api/internal/plugins/unixStartScript.txt
 #       within the Gradle project.
 #
 #       You can find Gradle at https://github.com/gradle/gradle/.
@@ -80,10 +80,10 @@ do
     esac
 done
 
-APP_HOME=$( cd "${APP_HOME:-./}" && pwd -P ) || exit
-
-APP_NAME="Gradle"
+# This is normally unused
+# shellcheck disable=SC2034
 APP_BASE_NAME=${0##*/}
+APP_HOME=$( cd "${APP_HOME:-./}" && pwd -P ) || exit
 
 # Add default JVM options here. You can also use JAVA_OPTS and GRADLE_OPTS to pass JVM options to this script.
 DEFAULT_JVM_OPTS='"-Xmx64m" "-Xms64m"'
@@ -143,12 +143,16 @@ fi
 if ! "$cygwin" && ! "$darwin" && ! "$nonstop" ; then
     case $MAX_FD in #(
       max*)
+        # In POSIX sh, ulimit -H is undefined. That's why the result is checked to see if it worked.
+        # shellcheck disable=SC3045
         MAX_FD=$( ulimit -H -n ) ||
             warn "Could not query maximum file descriptor limit"
     esac
     case $MAX_FD in  #(
       '' | soft) :;; #(
       *)
+        # In POSIX sh, ulimit -n is undefined. That's why the result is checked to see if it worked.
+        # shellcheck disable=SC3045
         ulimit -n "$MAX_FD" ||
             warn "Could not set maximum file descriptor limit to $MAX_FD"
     esac
@@ -205,6 +209,12 @@ set -- \
         org.gradle.wrapper.GradleWrapperMain \
         "$@"
 
+# Stop when "xargs" is not available.
+if ! command -v xargs >/dev/null 2>&1
+then
+    die "xargs is not available"
+fi
+
 # Use "xargs" to parse quoted args.
 #
 # With -n1 it outputs one arg per line, with the quotes and backslashes removed.

gradlew.bat

@@ -14,7 +14,7 @@
 @rem limitations under the License.
 @rem
 
-@if "%DEBUG%" == "" @echo off
+@if "%DEBUG%"=="" @echo off
 @rem ##########################################################################
 @rem
 @rem  Gradle startup script for Windows
@@ -25,7 +25,8 @@
 if "%OS%"=="Windows_NT" setlocal
 
 set DIRNAME=%~dp0
-if "%DIRNAME%" == "" set DIRNAME=.
+if "%DIRNAME%"=="" set DIRNAME=.
+@rem This is normally unused
 set APP_BASE_NAME=%~n0
 set APP_HOME=%DIRNAME%
 
@@ -40,7 +41,7 @@ if defined JAVA_HOME goto findJavaFromJavaHome
 
 set JAVA_EXE=java.exe
 %JAVA_EXE% -version >NUL 2>&1
-if "%ERRORLEVEL%" == "0" goto execute
+if %ERRORLEVEL% equ 0 goto execute
 
 echo.
 echo ERROR: JAVA_HOME is not set and no 'java' command could be found in your PATH.
@@ -75,13 +76,15 @@ set CLASSPATH=%APP_HOME%\gradle\wrapper\gradle-wrapper.jar
 
 :end
 @rem End local scope for the variables with windows NT shell
-if "%ERRORLEVEL%"=="0" goto mainEnd
+if %ERRORLEVEL% equ 0 goto mainEnd
 
 :fail
 rem Set variable GRADLE_EXIT_CONSOLE if you need the _script_ return code instead of
 rem the _cmd.exe /c_ return code!
-if  not "" == "%GRADLE_EXIT_CONSOLE%" exit 1
-exit /b 1
+set EXIT_CODE=%ERRORLEVEL%
+if %EXIT_CODE% equ 0 set EXIT_CODE=1
+if not ""=="%GRADLE_EXIT_CONSOLE%" exit %EXIT_CODE%
+exit /b %EXIT_CODE%
 
 :mainEnd
 if "%OS%"=="Windows_NT" endlocal

proxy/build.gradle.kts

@@ -1,5 +1,5 @@
 plugins {
-    id("net.kyori.blossom") version "1.2.0"
+    id("net.kyori.blossom") version "1.3.1"
 }
 
 group = rootProject.group
@@ -7,7 +7,7 @@ version = rootProject.version
 description = "Plex-Velocity"
 
 repositories {
-    maven { url = uri("https://papermc.io/repo/repository/maven-public/") }
+    maven { url = uri("https://repo.papermc.io/repository/maven-public/") }
 }
 
 tasks.getByName<Jar>("jar") {
@@ -37,10 +37,9 @@ publishing {
 }
 
 dependencies {
-    compileOnly("org.projectlombok:lombok:1.18.24")
-    annotationProcessor("org.projectlombok:lombok:1.18.24")
-    compileOnly("org.json:json:20220320")
-    compileOnly("com.velocitypowered:velocity-api:3.1.2-SNAPSHOT")
-    annotationProcessor("com.velocitypowered:velocity-api:3.1.2-SNAPSHOT")
-    implementation(project(":api"))
+    compileOnly("org.projectlombok:lombok:1.18.28")
+    annotationProcessor("org.projectlombok:lombok:1.18.28")
+    compileOnly("org.json:json:20230227")
+    compileOnly("com.velocitypowered:velocity-api:3.2.0-SNAPSHOT")
+    annotationProcessor("com.velocitypowered:velocity-api:3.2.0-SNAPSHOT")
 }

proxy/src/main/java/dev/plex/Plex.java

@@ -10,10 +10,11 @@ import dev.plex.config.TomlConfig;
 import dev.plex.handlers.ListenerHandler;
 import dev.plex.settings.ServerSettings;
 import dev.plex.util.PlexLog;
+import lombok.Getter;
+
 import java.io.File;
 import java.nio.file.Path;
 import java.util.logging.Logger;
-import lombok.Getter;
 
 /**
  * Credits for TOML library go to https://github.com/mwanji/toml4j

proxy/src/main/java/dev/plex/command/PlexCommand.java

@@ -9,12 +9,13 @@ import dev.plex.Plex;
 import dev.plex.command.annotation.CommandParameters;
 import dev.plex.command.annotation.CommandPermissions;
 import dev.plex.command.source.RequiredCommandSource;
-import java.util.Arrays;
 import net.kyori.adventure.audience.Audience;
 import net.kyori.adventure.text.Component;
 import org.jetbrains.annotations.NotNull;
 import org.jetbrains.annotations.Nullable;
 
+import java.util.Arrays;
+
 public abstract class PlexCommand implements SimpleCommand
 {
     /**

proxy/src/main/java/dev/plex/command/annotation/CommandPermissions.java

@@ -1,6 +1,7 @@
 package dev.plex.command.annotation;
 
 import dev.plex.command.source.RequiredCommandSource;
+
 import java.lang.annotation.Retention;
 import java.lang.annotation.RetentionPolicy;
 

proxy/src/main/java/dev/plex/config/TomlConfig.java

@@ -3,12 +3,13 @@ package dev.plex.config;
 import dev.plex.Plex;
 import dev.plex.toml.Toml;
 import dev.plex.toml.TomlWriter;
+import lombok.Getter;
+import lombok.Setter;
+
 import java.io.File;
 import java.io.IOException;
 import java.nio.file.Files;
 import java.util.function.Consumer;
-import lombok.Getter;
-import lombok.Setter;
 
 @Getter
 public class TomlConfig

proxy/src/main/java/dev/plex/handlers/ListenerHandler.java

@@ -4,6 +4,7 @@ import com.google.common.collect.Lists;
 import dev.plex.listener.PlexListener;
 import dev.plex.util.PlexLog;
 import dev.plex.util.ReflectionsUtil;
+
 import java.lang.reflect.InvocationTargetException;
 import java.util.List;
 import java.util.Set;

proxy/src/main/java/dev/plex/listener/impl/ServerListener.java

@@ -7,13 +7,14 @@ import com.velocitypowered.api.proxy.server.ServerPing;
 import dev.plex.listener.PlexListener;
 import dev.plex.settings.ServerSettings;
 import dev.plex.util.RandomUtil;
+import net.kyori.adventure.text.Component;
+import net.kyori.adventure.text.minimessage.MiniMessage;
+
 import java.util.UUID;
 import java.util.concurrent.ThreadLocalRandom;
 import java.util.concurrent.atomic.AtomicReference;
 import java.util.regex.Matcher;
 import java.util.regex.Pattern;
-import net.kyori.adventure.text.Component;
-import net.kyori.adventure.text.minimessage.MiniMessage;
 
 public class ServerListener extends PlexListener
 {

proxy/src/main/java/dev/plex/settings/ServerSettings.java

@@ -2,10 +2,11 @@ package dev.plex.settings;
 
 import com.google.common.collect.Lists;
 import com.google.gson.annotations.SerializedName;
-import java.util.List;
 import lombok.Data;
 import lombok.Getter;
 
+import java.util.List;
+
 @Getter
 public class ServerSettings
 {

proxy/src/main/java/dev/plex/toml/ArrayValueWriter.java

@@ -4,6 +4,7 @@ package dev.plex.toml;
 import java.lang.reflect.Array;
 import java.util.ArrayList;
 import java.util.Collection;
+
 import static dev.plex.toml.ValueWriters.WRITERS;
 
 public abstract class ArrayValueWriter implements dev.plex.toml.ValueWriter

proxy/src/main/java/dev/plex/toml/ObjectValueWriter.java

@@ -1,14 +1,10 @@
 package dev.plex.toml;
 
 import com.google.gson.annotations.SerializedName;
+
 import java.lang.reflect.Field;
 import java.lang.reflect.Modifier;
-import java.util.Arrays;
-import java.util.Iterator;
-import java.util.LinkedHashMap;
-import java.util.LinkedHashSet;
-import java.util.Map;
-import java.util.Set;
+import java.util.*;
 
 class ObjectValueWriter implements ValueWriter
 {

proxy/src/main/java/dev/plex/toml/Results.java

@@ -1,11 +1,6 @@
 package dev.plex.toml;
 
-import java.util.ArrayDeque;
-import java.util.Deque;
-import java.util.HashSet;
-import java.util.Iterator;
-import java.util.Map;
-import java.util.Set;
+import java.util.*;
 import java.util.concurrent.atomic.AtomicInteger;
 
 class Results

proxy/src/main/java/dev/plex/toml/TableArrayValueWriter.java

@@ -1,6 +1,7 @@
 package dev.plex.toml;
 
 import java.util.Collection;
+
 import static dev.plex.toml.ValueWriters.WRITERS;
 
 class TableArrayValueWriter extends ArrayValueWriter

proxy/src/main/java/dev/plex/toml/Toml.java

@@ -2,23 +2,12 @@ package dev.plex.toml;
 
 import com.google.gson.Gson;
 import com.google.gson.JsonElement;
-import java.io.BufferedReader;
-import java.io.File;
-import java.io.FileInputStream;
-import java.io.IOException;
-import java.io.InputStream;
-import java.io.InputStreamReader;
-import java.io.Reader;
-import java.nio.charset.StandardCharsets;
-import java.util.ArrayList;
-import java.util.Date;
-import java.util.HashMap;
-import java.util.LinkedHashSet;
-import java.util.List;
-import java.util.Map;
-import java.util.Set;
 import lombok.Getter;
 
+import java.io.*;
+import java.nio.charset.StandardCharsets;
+import java.util.*;
+
 /**
  * <p>Provides access to the keys and tables in a TOML data source.</p>
  *

proxy/src/main/java/dev/plex/toml/TomlWriter.java

@@ -1,17 +1,13 @@
 package dev.plex.toml;
 
-import java.io.File;
-import java.io.FileOutputStream;
-import java.io.IOException;
-import java.io.OutputStream;
-import java.io.OutputStreamWriter;
-import java.io.StringWriter;
-import java.io.Writer;
+import org.jetbrains.annotations.Nullable;
+
+import java.io.*;
 import java.nio.charset.StandardCharsets;
 import java.util.List;
 import java.util.Map;
 import java.util.TimeZone;
-import org.jetbrains.annotations.Nullable;
+
 import static dev.plex.toml.ValueWriters.WRITERS;
 
 /**

proxy/src/main/java/dev/plex/toml/ValueReaders.java

@@ -1,6 +1,7 @@
 package dev.plex.toml;
 
 import java.util.concurrent.atomic.AtomicInteger;
+
 import static dev.plex.toml.ArrayValueReader.ARRAY_VALUE_READER;
 import static dev.plex.toml.BooleanValueReaderWriter.BOOLEAN_VALUE_READER_WRITER;
 import static dev.plex.toml.DateValueReaderWriter.DATE_VALUE_READER_WRITER;

proxy/src/main/java/dev/plex/util/RandomUtil.java

@@ -1,8 +1,9 @@
 package dev.plex.util;
 
-import java.util.concurrent.ThreadLocalRandom;
 import net.kyori.adventure.text.format.NamedTextColor;
 
+import java.util.concurrent.ThreadLocalRandom;
+
 public class RandomUtil
 {
     public static NamedTextColor getRandomColor()

proxy/src/main/java/dev/plex/util/ReflectionsUtil.java

@@ -3,6 +3,7 @@ package dev.plex.util;
 import com.google.common.collect.ImmutableSet;
 import com.google.common.reflect.ClassPath;
 import dev.plex.Plex;
+
 import java.io.IOException;
 import java.util.Arrays;
 import java.util.Collections;

proxy/src/main/resources/config.toml

@@ -6,26 +6,26 @@
 #############################
 
 [server]
-  name = "Plexus"
+name = "Plexus"
 
-  # Placeholders
-  # %mcversion% - The Velocity Version (i.e. 3.1.2-SNAPSHOT)
-  # %servername% - The name provided above
-  # %randomgradient% - Creates a random gradient every ping of two random colors for the whole string
-  # Supports MiniMessage strings, no legacy & and §
-  motd = ["%randomgradient%%servername% - %mcversion%", "Another motd"]
-  colorizeMotd = false
+# Placeholders
+# %mcversion% - The Velocity Version (i.e. 3.1.2-SNAPSHOT)
+# %servername% - The name provided above
+# %randomgradient% - Creates a random gradient every ping of two random colors for the whole string
+# Supports MiniMessage strings, no legacy & and §
+motd = ["%randomgradient%%servername% - %mcversion%", "Another motd"]
+colorizeMotd = false
 
-  # Enables debug messages
-  debug = false
+# Enables debug messages
+debug = false
 
-  # Due to game code only supporting legacy color codes for
-  # player samples and not components, you may only use § or & here
-  # for colors.
-  sample = ["example", "example"]
+# Due to game code only supporting legacy color codes for
+# player samples and not components, you may only use § or & here
+# for colors.
+sample = ["example", "example"]
 
-  # Adds this amount to the current player count
-  add-player-count = 0
+# Adds this amount to the current player count
+add-player-count = 0
 
-  # The max player count will always display as +1 more than the player count
-  plus-one-max-count = true
+# The max player count will always display as +1 more than the player count
+plus-one-max-count = true

server/build.gradle

@@ -1,34 +1,25 @@
 plugins {
-    id "net.minecrell.plugin-yml.bukkit" version "0.6.1-SNAPSHOT"
+    id "net.minecrell.plugin-yml.paper" version "0.6.0"
 }
 
 dependencies {
-    library "org.projectlombok:lombok:1.18.24"
-    annotationProcessor "org.projectlombok:lombok:1.18.24"
-    library "org.json:json:20220320"
-    library "commons-io:commons-io:2.11.0"
-    library "dev.morphia.morphia:morphia-core:2.2.6"
-    library "redis.clients:jedis:4.2.2"
-    library "org.mariadb.jdbc:mariadb-java-client:3.0.4"
+    library "org.projectlombok:lombok:1.18.28"
+    annotationProcessor "org.projectlombok:lombok:1.18.28"
+    library "org.json:json:20230618"
+    library "commons-io:commons-io:2.13.0"
+    library "dev.morphia.morphia:morphia-core:2.3.5"
+    library "redis.clients:jedis:5.0.0-beta2"
+    library "org.mariadb.jdbc:mariadb-java-client:3.1.4"
     library "com.zaxxer:HikariCP:5.0.1"
-    library "org.apache.httpcomponents:httpclient:4.5.13"
-    library "org.apache.commons:commons-lang3:3.12.0"
-    library "org.apache.maven.resolver:maven-resolver-api:1.8.0"
-    library "org.apache.maven.resolver:maven-resolver-impl:1.8.0"
-    library "org.apache.maven.resolver:maven-resolver-connector-basic:1.8.0"
-    library "org.apache.maven.resolver:maven-resolver-transport-http:1.8.0"
-    library "org.apache.maven:maven-resolver-provider:3.8.5"
-    library "org.eclipse.jetty:jetty-server:11.0.9"
-    library "org.eclipse.jetty:jetty-servlet:11.0.9"
-    library "org.eclipse.jetty:jetty-proxy:11.0.9"
-    library "com.google.code.gson:gson:2.9.0"
-    compileOnly "io.papermc.paper:paper-api:1.18.2-R0.1-SNAPSHOT"
-    compileOnly("com.github.MilkBowl:VaultAPI:1.7") {
+    library "org.apache.maven.resolver:maven-resolver-transport-http:1.9.13"
+    compileOnly "io.papermc.paper:paper-api:1.20.1-R0.1-SNAPSHOT"
+    compileOnly "io.papermc.paper:paper-mojangapi:1.20.1-R0.1-SNAPSHOT"
+    compileOnly("com.github.MilkBowl:VaultAPI:1.7.1") {
         exclude group: "org.bukkit", module: "bukkit"
     }
-    implementation "org.bstats:bstats-base:3.0.0"
-    implementation "org.bstats:bstats-bukkit:3.0.0"
-    implementation project(":api")
+    compileOnly "com.mojang:brigadier:1.0.18"
+    implementation "org.bstats:bstats-base:3.0.2"
+    implementation "org.bstats:bstats-bukkit:3.0.2"
 }
 
 group = rootProject.group
@@ -41,15 +32,31 @@ shadowJar {
     relocate "org.bstats", "dev.plex"
 }
 
-bukkit {
+paper {
     name = "Plex"
     version = project.version
     description = "Plex provides a new experience for freedom servers."
     main = "dev.plex.Plex"
+    loader = "dev.plex.PlexLibraryManager"
     website = "https://plex.us.org"
     authors = ["Telesphoreo", "taahanis", "supernt"]
-    softDepend = ["Vault"]
-    apiVersion = "1.18"
+    // Load BukkitTelnet and LibsDisguises before Plex so the modules register properly
+    apiVersion = "1.19"
+    generateLibrariesJson = true
+    serverDependencies {
+        'BukkitTelnet' {
+            required = false
+            load = 'BEFORE'
+        }
+        'LibsDisguises' {
+            required = false
+            load = 'BEFORE'
+        }
+        'Vault' {
+            required = false
+            load = 'BEFORE'
+        }
+    }
 }
 
 String getGitHash() {

server/src/main/java/dev/plex/Plex.java

@@ -2,19 +2,14 @@ package dev.plex;
 
 import dev.plex.admin.Admin;
 import dev.plex.admin.AdminList;
-import dev.plex.api.PlexApi;
-import dev.plex.api.PlexApiProvider;
-import dev.plex.api.plugin.PlexPlugin;
 import dev.plex.cache.DataUtils;
 import dev.plex.cache.PlayerCache;
+import dev.plex.command.PlexBrigadierCommand;
+import dev.plex.command.impl.brigadier.PlexBrigadierCMD;
 import dev.plex.config.Config;
 import dev.plex.handlers.CommandHandler;
 import dev.plex.handlers.ListenerHandler;
-import dev.plex.hook.VaultHook;
-import dev.plex.listener.impl.ChatListener;
 import dev.plex.module.ModuleManager;
-import dev.plex.permission.handler.NativePermissionHandler;
-import dev.plex.permission.handler.VaultPermissionHandler;
 import dev.plex.player.PlexPlayer;
 import dev.plex.punishment.PunishmentManager;
 import dev.plex.rank.RankManager;
@@ -28,38 +23,33 @@ import dev.plex.storage.player.MongoPlayerData;
 import dev.plex.storage.player.SQLPlayerData;
 import dev.plex.storage.punishment.SQLNotes;
 import dev.plex.storage.punishment.SQLPunishment;
-import dev.plex.util.BuildInfo;
-import dev.plex.util.BungeeUtil;
-import dev.plex.util.PlexLog;
-import dev.plex.util.PlexUtils;
-import dev.plex.util.UpdateChecker;
+import dev.plex.util.*;
+import dev.plex.util.redis.MessageUtil;
 import dev.plex.world.CustomWorld;
-import java.io.File;
 import lombok.Getter;
 import lombok.Setter;
-import org.bson.conversions.Bson;
+import net.milkbowl.vault.chat.Chat;
+import net.milkbowl.vault.permission.Permission;
 import org.bstats.bukkit.Metrics;
 import org.bukkit.Bukkit;
+import org.bukkit.plugin.RegisteredServiceProvider;
+import org.bukkit.plugin.java.JavaPlugin;
+
+import java.io.File;
 
 @Getter
 @Setter
-public class Plex extends PlexPlugin implements PlexApiProvider
+public class Plex extends JavaPlugin
 {
+    public static final BuildInfo build = new BuildInfo();
     private static Plex plugin;
-
     public Config config;
     public Config messages;
     public Config indefBans;
     public Config commands;
     public Config toggles;
-
-    private PlexProvider provider;
-
     public File modulesFolder;
     private StorageType storageType = StorageType.SQLITE;
-
-    public static final BuildInfo build = new BuildInfo();
-
     private SQLConnection sqlConnection;
     private MongoConnection mongoConnection;
     private RedisConnection redisConnection;
@@ -82,6 +72,8 @@ public class Plex extends PlexPlugin implements PlexApiProvider
     private UpdateChecker updateChecker;
     private String system;
 
+    private Permission permissions;
+    private Chat chat;
 
     public static Plex get()
     {
@@ -110,8 +102,7 @@ public class Plex extends PlexPlugin implements PlexApiProvider
         moduleManager.loadAllModules();
         moduleManager.loadModules();
 
-        this.setChatHandler(new ChatListener.ChatHandlerImpl());
-
+        //this.setChatHandler(new ChatListener.ChatHandlerImpl());
     }
 
     @Override
@@ -145,21 +136,15 @@ public class Plex extends PlexPlugin implements PlexApiProvider
             e.printStackTrace();
         }
 
-        boolean permissions = false;
-        if (getServer().getPluginManager().isPluginEnabled("Vault"))
+        if (system.equals("permissions"))
         {
-            VaultPermissionHandler handler = new VaultPermissionHandler();
-            if (VaultHook.getPermission() != null)
+            if (!getServer().getPluginManager().isPluginEnabled("Vault"))
             {
-                this.setPermissionHandler(handler);
-                permissions = true;
-                PlexLog.debug("Enabling Vault support for permissions with a permission plugin: " + VaultHook.getPermission().getName());
+                throw new RuntimeException("Vault is required to run on the server if you use permissions!");
             }
-        }
 
-        if (!permissions)
-        {
-            this.setPermissionHandler(new NativePermissionHandler());
+            permissions = setupPermissions();
+            chat = setupChat();
         }
 
         updateChecker = new UpdateChecker();
@@ -173,6 +158,8 @@ public class Plex extends PlexPlugin implements PlexApiProvider
         {
             redisConnection.getJedis();
             PlexLog.log("Connected to Redis!");
+            MessageUtil.subscribe();
+
         }
         else
         {
@@ -193,6 +180,7 @@ public class Plex extends PlexPlugin implements PlexApiProvider
 
         new ListenerHandler();
         new CommandHandler();
+        new PlexBrigadierCMD();
 
         rankManager = new RankManager();
         rankManager.generateDefaultRanks();
@@ -221,8 +209,6 @@ public class Plex extends PlexPlugin implements PlexApiProvider
         }
         this.getServer().getMessenger().registerOutgoingPluginChannel(this, "BungeeCord");
 
-
-        provider = new PlexProvider();
         moduleManager.enableModules();
     }
 
@@ -284,9 +270,17 @@ public class Plex extends PlexPlugin implements PlexApiProvider
         });
     }
 
-    @Override
-    public PlexApi getApi()
+    private Permission setupPermissions()
     {
-        return provider;
+        RegisteredServiceProvider<Permission> rsp = Bukkit.getServicesManager().getRegistration(Permission.class);
+        permissions = rsp.getProvider();
+        return permissions;
+    }
+
+    private Chat setupChat()
+    {
+        RegisteredServiceProvider<Chat> rsp = Bukkit.getServicesManager().getRegistration(Chat.class);
+        chat = rsp.getProvider();
+        return chat;
     }
 }

server/src/main/java/dev/plex/PlexLibraryManager.java

@@ -0,0 +1,66 @@
+package dev.plex;
+
+import com.google.gson.Gson;
+import io.papermc.paper.plugin.loader.PluginClasspathBuilder;
+import io.papermc.paper.plugin.loader.PluginLoader;
+import io.papermc.paper.plugin.loader.library.impl.MavenLibraryResolver;
+import org.eclipse.aether.artifact.DefaultArtifact;
+import org.eclipse.aether.graph.Dependency;
+import org.eclipse.aether.repository.RemoteRepository;
+import org.jetbrains.annotations.NotNull;
+
+import java.io.File;
+import java.io.IOException;
+import java.io.InputStreamReader;
+import java.nio.charset.StandardCharsets;
+import java.util.List;
+import java.util.Map;
+import java.util.stream.Stream;
+
+public class PlexLibraryManager implements PluginLoader
+{
+    @Override
+    public void classloader(@NotNull PluginClasspathBuilder classpathBuilder)
+    {
+
+        MavenLibraryResolver resolver = new MavenLibraryResolver();
+        PluginLibraries pluginLibraries = load();
+        pluginLibraries.asDependencies().forEach(resolver::addDependency);
+        pluginLibraries.asRepositories().forEach(resolver::addRepository);
+        // The plugin is null, a hacky way to check whether to load Jetty or not
+        if (new File("plugins/Plex/modules/Plex-HTTPD.jar").isFile())
+        {
+            resolver.addDependency(new Dependency(new DefaultArtifact("org.eclipse.jetty:jetty-server:11.0.15"), null));
+            resolver.addDependency(new Dependency(new DefaultArtifact("org.eclipse.jetty:jetty-servlet:11.0.15"), null));
+            resolver.addDependency(new Dependency(new DefaultArtifact("org.eclipse.jetty:jetty-proxy:11.0.15"), null));
+        }
+        classpathBuilder.addLibrary(resolver);
+    }
+
+    public PluginLibraries load()
+    {
+        try (var in = getClass().getResourceAsStream("/paper-libraries.json"))
+        {
+            return new Gson().fromJson(new InputStreamReader(in, StandardCharsets.UTF_8), PluginLibraries.class);
+        }
+        catch (IOException e)
+        {
+            throw new RuntimeException(e);
+        }
+    }
+
+    private record PluginLibraries(Map<String, String> repositories, List<String> dependencies)
+    {
+        public Stream<Dependency> asDependencies()
+        {
+            return dependencies.stream()
+                    .map(d -> new Dependency(new DefaultArtifact(d), null));
+        }
+
+        public Stream<RemoteRepository> asRepositories()
+        {
+            return repositories.entrySet().stream()
+                    .map(e -> new RemoteRepository.Builder(e.getKey(), "default", e.getValue()).build());
+        }
+    }
+}

server/src/main/java/dev/plex/PlexProvider.java

@@ -1,14 +0,0 @@
-package dev.plex;
-
-import dev.plex.api.IPlayerCache;
-import dev.plex.api.PlexApi;
-import dev.plex.player.PlexPlayer;
-
-public class PlexProvider implements PlexApi
-{
-    @Override
-    public IPlayerCache<PlexPlayer> getPlayerCache()
-    {
-        return Plex.get().getPlayerCache();
-    }
-}

server/src/main/java/dev/plex/admin/Admin.java

@@ -1,11 +1,12 @@
 package dev.plex.admin;
 
 import dev.plex.rank.enums.Rank;
-import java.util.UUID;
 import lombok.AccessLevel;
 import lombok.Getter;
 import lombok.Setter;
 
+import java.util.UUID;
+
 /**
  * Admin object to handle cached admins
  */

server/src/main/java/dev/plex/admin/AdminList.java

@@ -10,6 +10,7 @@ import dev.plex.PlexBase;
 import dev.plex.player.PlexPlayer;
 import dev.plex.rank.enums.Rank;
 import dev.plex.storage.StorageType;
+
 import java.sql.Connection;
 import java.sql.PreparedStatement;
 import java.sql.ResultSet;

server/src/main/java/dev/plex/cache/DataUtils.java

@@ -3,6 +3,7 @@ package dev.plex.cache;
 import dev.plex.Plex;
 import dev.plex.player.PlexPlayer;
 import dev.plex.storage.StorageType;
+
 import java.util.Optional;
 import java.util.UUID;
 

server/src/main/java/dev/plex/cache/PlayerCache.java

@@ -1,8 +1,8 @@
 package dev.plex.cache;
 
 import com.google.common.collect.Maps;
-import dev.plex.api.IPlayerCache;
 import dev.plex.player.PlexPlayer;
+
 import java.util.Map;
 import java.util.UUID;
 
@@ -10,7 +10,7 @@ import java.util.UUID;
  * Cache storage
  */
 
-public class PlayerCache implements IPlayerCache<PlexPlayer>
+public class PlayerCache
 {
     /**
      * A key/value pair where the key is the unique ID of the Plex Player

server/src/main/java/dev/plex/command/PlexBrigadierCommand.java

@@ -0,0 +1,571 @@
+package dev.plex.command;
+
+import com.destroystokyo.paper.brigadier.BukkitBrigadierCommandSource;
+import com.google.common.collect.Maps;
+import com.google.gson.GsonBuilder;
+import com.mojang.brigadier.CommandDispatcher;
+import com.mojang.brigadier.arguments.*;
+import com.mojang.brigadier.builder.LiteralArgumentBuilder;
+import com.mojang.brigadier.builder.RequiredArgumentBuilder;
+import com.mojang.brigadier.context.CommandContext;
+import com.mojang.brigadier.tree.CommandNode;
+import com.mojang.brigadier.tree.LiteralCommandNode;
+import dev.plex.Plex;
+import dev.plex.cache.DataUtils;
+import dev.plex.command.annotation.*;
+import dev.plex.command.source.RequiredCommandSource;
+import dev.plex.player.PlexPlayer;
+import dev.plex.util.PlexLog;
+import dev.plex.util.PlexUtils;
+import dev.plex.util.ReflectionsUtil;
+import net.kyori.adventure.audience.Audience;
+import net.kyori.adventure.text.Component;
+import net.kyori.adventure.text.format.NamedTextColor;
+import net.kyori.adventure.text.serializer.legacy.LegacyComponentSerializer;
+import org.bukkit.Bukkit;
+import org.bukkit.command.CommandSender;
+import org.bukkit.entity.Player;
+import org.jetbrains.annotations.NotNull;
+
+import java.lang.System;
+import java.lang.reflect.Method;
+import java.lang.reflect.Parameter;
+import java.util.*;
+
+/**
+ * @author Taah
+ * @since 2:27 PM [07-07-2023]
+ */
+public abstract class PlexBrigadierCommand
+{
+    protected final Plex plugin;
+    private CommandDispatcher<BukkitBrigadierCommandSource> commandDispatcher;
+
+    public PlexBrigadierCommand()
+    {
+        this.plugin = Plex.get();
+        try
+        {
+            final Object dedicatedServer = ReflectionsUtil.callFunction(getCraftServer(), "getServer");
+            final Object minecraftServer = Class.forName("net.minecraft.server.MinecraftServer").cast(dedicatedServer);
+            final Object serverFunctionsManager = ReflectionsUtil.callFunction(minecraftServer, "aA");
+            this.commandDispatcher = ReflectionsUtil.callFunction(serverFunctionsManager, "b");
+        }
+        catch (ClassNotFoundException e)
+        {
+            this.commandDispatcher = null;
+            PlexLog.error("Disabling commands as brigadier could not properly be located.");
+        }
+
+        if (!this.getClass().isAnnotationPresent(CommandName.class))
+        {
+            if (this.commandDispatcher != null)
+            {
+                this.commandDispatcher.register(execute());
+            }
+            return;
+        }
+
+        String[] commandName = this.getClass().getAnnotation(CommandName.class).value();
+
+        final HashMap<String, Method> subcommands = Maps.newHashMap();
+
+        Method defaultMethod = null;
+        for (Method declaredMethod : this.getClass().getDeclaredMethods())
+        {
+            if (declaredMethod.isAnnotationPresent(SubCommand.class))
+            {
+                String subcommand = declaredMethod.getAnnotation(SubCommand.class).value();
+                subcommands.put(subcommand.toLowerCase(), declaredMethod);
+            }
+            if (declaredMethod.isAnnotationPresent(Default.class))
+            {
+                if (defaultMethod != null)
+                {
+                    PlexLog.error("There cannot be more than one default execution.");
+                    continue;
+                }
+                defaultMethod = declaredMethod;
+            }
+        }
+
+        if (this.commandDispatcher != null)
+        {
+            for (String name : commandName)
+            {
+                LiteralArgumentBuilder<BukkitBrigadierCommandSource> builder = LiteralArgumentBuilder.literal(name.toLowerCase());
+
+                for (Map.Entry<String, Method> stringMethodEntry : subcommands.entrySet())
+                {
+                    String[] subCommandArgs = stringMethodEntry.getKey().split(" ");
+                    LinkedList<LiteralArgumentBuilder<BukkitBrigadierCommandSource>> builders = new LinkedList<>();
+                    for (int i = 0; i < subCommandArgs.length; i++)
+                    {
+                        LiteralArgumentBuilder<BukkitBrigadierCommandSource> newNode = LiteralArgumentBuilder.literal(subCommandArgs[i]);
+                        builders.addLast(newNode);
+                    }
+
+                    if (builders.size() == 1)
+                    {
+                        LiteralArgumentBuilder<BukkitBrigadierCommandSource> parent = builders.removeFirst();
+                        LinkedList<RequiredArgumentBuilder<BukkitBrigadierCommandSource, ?>> argumentBuilders = new LinkedList<>();
+
+                        LinkedHashMap<Parameter, RequiredArgumentBuilder<BukkitBrigadierCommandSource, ?>> arguments = getArguments(stringMethodEntry.getValue());
+                        for (Map.Entry<Parameter, RequiredArgumentBuilder<BukkitBrigadierCommandSource, ?>> parameterArgumentBuilderEntry : arguments.entrySet())
+                        {
+                            argumentBuilders.addLast(parameterArgumentBuilderEntry.getValue());
+                        }
+                        boolean setExecution = false;
+                        CommandNode<BukkitBrigadierCommandSource> parentArg = null;
+                        CommandNode<BukkitBrigadierCommandSource> currArg = null;
+                        while (!argumentBuilders.isEmpty())
+                        {
+                            if (parentArg == null)
+                            {
+                                RequiredArgumentBuilder<BukkitBrigadierCommandSource, ?> newParent = argumentBuilders.removeFirst();
+                                if (argumentBuilders.isEmpty())
+                                {
+                                    newParent.executes(context -> execute(stringMethodEntry.getValue(), context, arguments.keySet()));
+                                    setExecution = true;
+                                }
+                                parentArg = newParent.build();
+                                parent.then(parentArg);
+                                currArg = parentArg;
+                            }
+                            else
+                            {
+                                RequiredArgumentBuilder<BukkitBrigadierCommandSource, ?> newCurr = argumentBuilders.removeFirst();
+                                if (argumentBuilders.isEmpty())
+                                {
+                                    newCurr.executes(context -> execute(stringMethodEntry.getValue(), context, arguments.keySet()));
+                                    setExecution = true;
+                                }
+                                CommandNode<BukkitBrigadierCommandSource> newCurrNode = newCurr.build();
+                                currArg.addChild(newCurrNode);
+                                currArg = newCurrNode;
+                            }
+                        }
+                        if (!setExecution)
+                        {
+                            parent.executes(context -> execute(stringMethodEntry.getValue(), context, arguments.keySet()));
+                        }
+                        builder.then(parent);
+                    }
+                    else if (builders.size() > 1)
+                    {
+                        LiteralCommandNode<BukkitBrigadierCommandSource> parent = builders.removeFirst().build();
+                        LiteralCommandNode<BukkitBrigadierCommandSource> curr = null;
+                        while (!builders.isEmpty())
+                        {
+                            LiteralArgumentBuilder<BukkitBrigadierCommandSource> newCurr = builders.removeFirst();
+                            PlexLog.debug("Adding subcommand " + newCurr.getLiteral());
+                            if (builders.isEmpty())
+                            {
+                                LinkedList<RequiredArgumentBuilder<BukkitBrigadierCommandSource, ?>> argumentBuilders = new LinkedList<>();
+                                LinkedHashMap<Parameter, RequiredArgumentBuilder<BukkitBrigadierCommandSource, ?>> arguments = getArguments(stringMethodEntry.getValue());
+                                for (Map.Entry<Parameter, RequiredArgumentBuilder<BukkitBrigadierCommandSource, ?>> parameterArgumentBuilderEntry : arguments.entrySet())
+                                {
+                                    argumentBuilders.addLast(parameterArgumentBuilderEntry.getValue());
+                                }
+                                boolean setExecution = false;
+                                CommandNode<BukkitBrigadierCommandSource> parentArg = null;
+                                CommandNode<BukkitBrigadierCommandSource> currArg = null;
+                                while (!argumentBuilders.isEmpty())
+                                {
+                                    if (parentArg == null)
+                                    {
+                                        RequiredArgumentBuilder<BukkitBrigadierCommandSource, ?> newParent = argumentBuilders.removeFirst();
+                                        if (argumentBuilders.isEmpty())
+                                        {
+                                            newParent.executes(context -> execute(stringMethodEntry.getValue(), context, arguments.keySet()));
+                                            setExecution = true;
+                                        }
+                                        parentArg = newParent.build();
+                                        newCurr.then(parentArg);
+                                        currArg = parentArg;
+                                    }
+                                    else
+                                    {
+                                        RequiredArgumentBuilder<BukkitBrigadierCommandSource, ?> newCurrArg = argumentBuilders.removeFirst();
+                                        if (argumentBuilders.isEmpty())
+                                        {
+                                            newCurrArg.executes(context -> execute(stringMethodEntry.getValue(), context, arguments.keySet()));
+                                            setExecution = true;
+                                        }
+                                        CommandNode<BukkitBrigadierCommandSource> newCurrNode = newCurrArg.build();
+                                        currArg.addChild(newCurrNode);
+                                        currArg = newCurrNode;
+                                    }
+                                }
+                                if (!setExecution)
+                                {
+                                    newCurr.executes(context -> execute(stringMethodEntry.getValue(), context, arguments.keySet()));
+                                }
+                            }
+                            if (curr == null)
+                            {
+                                LiteralCommandNode<BukkitBrigadierCommandSource> temp = newCurr.build();
+                                parent.addChild(temp);
+                                curr = temp;
+                            }
+                            else
+                            {
+                                LiteralCommandNode<BukkitBrigadierCommandSource> temp = newCurr.build();
+                                curr.addChild(temp);
+                                curr = temp;
+                            }
+                        }
+                        builder.then(parent);
+                    }
+                    PlexLog.debug("Overall Builder: " + new GsonBuilder().setPrettyPrinting().disableHtmlEscaping().create().toJson(builder));
+                }
+
+                if (defaultMethod != null)
+                {
+                    LinkedList<RequiredArgumentBuilder<BukkitBrigadierCommandSource, ?>> argumentBuilders = new LinkedList<>();
+                    LinkedHashMap<Parameter, RequiredArgumentBuilder<BukkitBrigadierCommandSource, ?>> arguments = getArguments(defaultMethod);
+                    for (Map.Entry<Parameter, RequiredArgumentBuilder<BukkitBrigadierCommandSource, ?>> parameterArgumentBuilderEntry : arguments.entrySet())
+                    {
+                        argumentBuilders.addLast(parameterArgumentBuilderEntry.getValue());
+                    }
+                    boolean setExecution = false;
+                    CommandNode<BukkitBrigadierCommandSource> parentArg = null;
+                    CommandNode<BukkitBrigadierCommandSource> currArg = null;
+                    while (!argumentBuilders.isEmpty())
+                    {
+                        if (parentArg == null)
+                        {
+                            RequiredArgumentBuilder<BukkitBrigadierCommandSource, ?> newParent = argumentBuilders.removeFirst();
+                            if (argumentBuilders.isEmpty())
+                            {
+                                Method finalDefaultMethod = defaultMethod;
+                                newParent.executes(context -> execute(finalDefaultMethod, context, arguments.keySet()));
+                                setExecution = true;
+                            }
+                            parentArg = newParent.build();
+                            builder.then(parentArg);
+                            currArg = parentArg;
+                        }
+                        else
+                        {
+                            RequiredArgumentBuilder<BukkitBrigadierCommandSource, ?> newCurrArg = argumentBuilders.removeFirst();
+                            if (argumentBuilders.isEmpty())
+                            {
+                                Method finalDefaultMethod1 = defaultMethod;
+                                newCurrArg.executes(context -> execute(finalDefaultMethod1, context, arguments.keySet()));
+                                setExecution = true;
+                            }
+                            CommandNode<BukkitBrigadierCommandSource> newCurrNode = newCurrArg.build();
+                            currArg.addChild(newCurrNode);
+                            currArg = newCurrNode;
+                        }
+                    }
+                    if (!setExecution)
+                    {
+                        Method finalDefaultMethod2 = defaultMethod;
+                        builder.executes(context -> execute(finalDefaultMethod2, context, arguments.keySet()));
+                    }
+                }
+
+                this.commandDispatcher.register(builder);
+            }
+
+            this.commandDispatcher.register(LiteralArgumentBuilder.<BukkitBrigadierCommandSource>literal("testing")
+                    .then(RequiredArgumentBuilder.<BukkitBrigadierCommandSource, Integer>argument("test0", IntegerArgumentType.integer())
+                            .then(RequiredArgumentBuilder.<BukkitBrigadierCommandSource, String>argument("test", StringArgumentType.word())
+                                    .then(RequiredArgumentBuilder.<BukkitBrigadierCommandSource, String>argument("test1", StringArgumentType.word())
+                                            .executes(context ->
+                                            {
+                                                send(context, context.getArgument("test", String.class));
+                                                send(context, context.getArgument("test1", String.class));
+                                                return 1;
+                                            })))));
+        }
+    }
+
+    public LiteralArgumentBuilder<BukkitBrigadierCommandSource> execute()
+    {
+        return LiteralArgumentBuilder.literal(this.getClass().getName().toLowerCase());
+    }
+
+    /**
+     * Gets a PlexPlayer from Player object
+     *
+     * @param player The player object
+     * @return PlexPlayer Object
+     * @see PlexPlayer
+     */
+    protected PlexPlayer getPlexPlayer(@NotNull Player player)
+    {
+        return DataUtils.getPlayer(player.getUniqueId());
+    }
+
+    protected void send(Audience audience, Component component)
+    {
+        audience.sendMessage(component);
+    }
+
+    /**
+     * Sends a message to an Audience
+     *
+     * @param audience The Audience to send the message to
+     * @param s        The message to send
+     */
+    protected void send(Audience audience, String s)
+    {
+        audience.sendMessage(componentFromString(s));
+    }
+
+    /**
+     * Sends a message to a CommandSender
+     *
+     * @param context The Command Context's sender to send the message to
+     * @param s       The message to send
+     */
+    protected void send(CommandContext<BukkitBrigadierCommandSource> context, String s)
+    {
+        context.getSource().getBukkitSender().sendMessage(componentFromString(s));
+    }
+
+    /**
+     * Sends a message to a CommandSender
+     *
+     * @param context   The Command Context's sender to send the message to
+     * @param component The Component to send
+     */
+    protected void send(CommandContext<BukkitBrigadierCommandSource> context, Component component)
+    {
+        context.getSource().getBukkitSender().sendMessage(component);
+    }
+
+    /**
+     * Converts a String to a MiniMessage Component
+     *
+     * @param s The String to convert
+     * @return A Kyori Component
+     */
+    protected Component mmString(String s)
+    {
+        return PlexUtils.mmDeserialize(s);
+    }
+
+    /**
+     * Converts a String to a legacy Kyori Component
+     *
+     * @param s The String to convert
+     * @return A Kyori component
+     */
+    protected Component componentFromString(String s)
+    {
+        return LegacyComponentSerializer.legacyAmpersand().deserialize(s).colorIfAbsent(NamedTextColor.GRAY);
+    }
+
+    /**
+     * Checks if a player is an admin
+     *
+     * @param plexPlayer The PlexPlayer object
+     * @return true if the player is an admin
+     * @see PlexPlayer
+     */
+    protected boolean isAdmin(PlexPlayer plexPlayer)
+    {
+        return Plex.get().getRankManager().isAdmin(plexPlayer);
+    }
+
+    /**
+     * Checks if a sender is an admin
+     *
+     * @param sender A command sender
+     * @return true if the sender is an admin or if console
+     */
+    protected boolean isAdmin(CommandSender sender)
+    {
+        if (!(sender instanceof Player player))
+        {
+            return true;
+        }
+        PlexPlayer plexPlayer = getPlexPlayer(player);
+        return plugin.getRankManager().isAdmin(plexPlayer);
+    }
+
+    /**
+     * Checks if a username is an admin
+     *
+     * @param name The username
+     * @return true if the username is an admin
+     */
+    protected boolean isAdmin(String name)
+    {
+        PlexPlayer plexPlayer = DataUtils.getPlayer(name);
+        return plugin.getRankManager().isAdmin(plexPlayer);
+    }
+
+    /**
+     * Checks if a sender is a senior admin
+     *
+     * @param sender A command sender
+     * @return true if the sender is a senior admin or if console
+     */
+    protected boolean isSeniorAdmin(CommandSender sender)
+    {
+        if (!(sender instanceof Player player))
+        {
+            return true;
+        }
+        PlexPlayer plexPlayer = getPlexPlayer(player);
+        return plugin.getRankManager().isSeniorAdmin(plexPlayer);
+    }
+
+    /**
+     * Gets the UUID of the sender
+     *
+     * @param sender A command sender
+     * @return A unique ID or null if the sender is console
+     * @see UUID
+     */
+    protected UUID getUUID(CommandSender sender)
+    {
+        if (!(sender instanceof Player player))
+        {
+            return null;
+        }
+        return player.getUniqueId();
+    }
+
+    private LinkedHashMap<Parameter, RequiredArgumentBuilder<BukkitBrigadierCommandSource, ?>> getArguments(Method method)
+    {
+        LinkedHashMap<Parameter, RequiredArgumentBuilder<BukkitBrigadierCommandSource, ?>> result = new LinkedHashMap<>();
+        if (!method.canAccess(this))
+        {
+            method.setAccessible(true);
+        }
+        for (Parameter parameter : method.getParameters())
+        {
+            if (parameter.isAnnotationPresent(Argument.class))
+            {
+                Argument argument = parameter.getAnnotation(Argument.class);
+                if (String.class.isAssignableFrom(parameter.getType()))
+                {
+                    result.put(parameter, RequiredArgumentBuilder.argument(argument.value(), argument.argumentType() == StringArgumentType.StringType.SINGLE_WORD ? StringArgumentType.word() : StringArgumentType.greedyString()));
+                }
+                else if (int.class.isAssignableFrom(parameter.getType()))
+                {
+                    result.put(parameter, RequiredArgumentBuilder.argument(argument.value(), IntegerArgumentType.integer(argument.min() == Double.MIN_VALUE ? Integer.MIN_VALUE : (int) argument.min(), argument.max() == Double.MAX_VALUE ? Integer.MAX_VALUE : (int) argument.max())));
+                }
+                else if (double.class.isAssignableFrom(parameter.getType()))
+                {
+                    result.put(parameter, RequiredArgumentBuilder.argument(argument.value(), DoubleArgumentType.doubleArg(argument.min(), argument.max())));
+                }
+                else if (float.class.isAssignableFrom(parameter.getType()))
+                {
+                    result.put(parameter, RequiredArgumentBuilder.argument(argument.value(), FloatArgumentType.floatArg(argument.min() == Double.MIN_VALUE ? Float.MIN_VALUE : (int) argument.min(), argument.max() == Double.MAX_VALUE ? Float.MAX_VALUE : (int) argument.max())));
+                }
+                else if (boolean.class.isAssignableFrom(parameter.getType()))
+                {
+                    result.put(parameter, RequiredArgumentBuilder.argument(argument.value(), BoolArgumentType.bool()));
+                }
+                else if (long.class.isAssignableFrom(parameter.getType()))
+                {
+                    result.put(parameter, RequiredArgumentBuilder.argument(argument.value(), LongArgumentType.longArg(argument.min() == Double.MIN_VALUE ? Long.MIN_VALUE : (int) argument.min(), argument.max() == Double.MAX_VALUE ? Long.MAX_VALUE : (int) argument.max())));
+                }
+            }
+        }
+        return result;
+    }
+
+    private Object getArgument(Class<?> clazz, CommandContext<BukkitBrigadierCommandSource> context, String name)
+    {
+        if (String.class.isAssignableFrom(clazz))
+        {
+            return StringArgumentType.getString(context, name);
+        }
+        else if (int.class.isAssignableFrom(clazz))
+        {
+            return IntegerArgumentType.getInteger(context, name);
+        }
+        else if (double.class.isAssignableFrom(clazz))
+        {
+            return DoubleArgumentType.getDouble(context, name);
+        }
+        else if (float.class.isAssignableFrom(clazz))
+        {
+            return FloatArgumentType.getFloat(context, name);
+        }
+        else if (boolean.class.isAssignableFrom(clazz))
+        {
+            return BoolArgumentType.getBool(context, name);
+        }
+        else if (long.class.isAssignableFrom(clazz))
+        {
+            return LongArgumentType.getLong(context, name);
+        }
+        return null;
+    }
+
+    private int execute(Method method, CommandContext<BukkitBrigadierCommandSource> context, Set<Parameter> arguments)
+    {
+        if (method.isAnnotationPresent(CommandPermission.class))
+        {
+            String permission = method.getAnnotation(CommandPermission.class).value();
+            if (!context.getSource().getBukkitSender().hasPermission(permission))
+            {
+                send(context, PlexUtils.messageComponent("noPermissionNode", permission));
+                return 1;
+            }
+        }
+        try
+        {
+            List<Object> params = arguments
+                    .stream().map(bukkitBrigadierCommandSourceArgumentBuilder -> getArgument(bukkitBrigadierCommandSourceArgumentBuilder.getType(), context, bukkitBrigadierCommandSourceArgumentBuilder.getAnnotation(Argument.class).value())).toList();
+            LinkedList<Object> parameters = new LinkedList<>(params);
+//            parameters.addFirst(context.getSource().getBukkitSender());
+            if (method.isAnnotationPresent(CommandSource.class)) {
+                RequiredCommandSource commandSource = method.getAnnotation(CommandSource.class).value();
+                if (commandSource == RequiredCommandSource.IN_GAME) {
+                    if (!(context.getSource().getBukkitSender() instanceof Player player)) {
+                        send(context, PlexUtils.messageComponent("noPermissionConsole"));
+                        return 1;
+                    } else {
+                        parameters.addFirst(player);
+                    }
+                } else if (commandSource == RequiredCommandSource.CONSOLE) {
+                    if (context.getSource().getBukkitSender() instanceof Player) {
+                        send(context, PlexUtils.messageComponent("noPermissionInGame"));
+                        return 1;
+                    }
+                    parameters.addFirst(context.getSource().getBukkitSender());
+                } else {
+                    parameters.addFirst(context.getSource().getBukkitSender());
+                }
+            }
+            System.out.println(Arrays.toString(parameters.stream().map(Object::getClass).map(Class::getName).toArray()));
+            System.out.println(Arrays.toString(Arrays.stream(method.getParameterTypes()).map(Class::getName).toArray()));
+            method.invoke(this, parameters.toArray());
+            return 1;
+        }
+        catch (Exception e)
+        {
+            PlexLog.error(e.getMessage());
+            for (StackTraceElement stackTraceElement : e.getStackTrace())
+            {
+                PlexLog.error(stackTraceElement.toString());
+            }
+            return 0;
+        }
+    }
+
+    private Object getCraftServer()
+    {
+        String nmsVersion = Bukkit.getServer().getClass().getPackage().getName();
+        nmsVersion = nmsVersion.substring(nmsVersion.lastIndexOf('.') + 1);
+        try
+        {
+            Class<?> craftServer = Class.forName("org.bukkit.craftbukkit." + nmsVersion + ".CraftServer");
+            return craftServer.cast(Bukkit.getServer());
+        }
+        catch (ClassNotFoundException e)
+        {
+            throw new RuntimeException(e);
+        }
+    }
+}

server/src/main/java/dev/plex/command/PlexCommand.java

@@ -4,18 +4,12 @@ import dev.plex.Plex;
 import dev.plex.cache.DataUtils;
 import dev.plex.command.annotation.CommandParameters;
 import dev.plex.command.annotation.CommandPermissions;
-import dev.plex.command.exception.CommandFailException;
-import dev.plex.command.exception.ConsoleMustDefinePlayerException;
-import dev.plex.command.exception.ConsoleOnlyException;
-import dev.plex.command.exception.PlayerNotBannedException;
-import dev.plex.command.exception.PlayerNotFoundException;
+import dev.plex.command.exception.*;
 import dev.plex.command.source.RequiredCommandSource;
 import dev.plex.player.PlexPlayer;
 import dev.plex.rank.enums.Rank;
 import dev.plex.util.PlexLog;
 import dev.plex.util.PlexUtils;
-import java.util.Arrays;
-import java.util.UUID;
 import net.kyori.adventure.audience.Audience;
 import net.kyori.adventure.text.Component;
 import net.kyori.adventure.text.format.NamedTextColor;
@@ -23,15 +17,14 @@ import net.kyori.adventure.text.serializer.legacy.LegacyComponentSerializer;
 import org.bukkit.Bukkit;
 import org.bukkit.ChatColor;
 import org.bukkit.World;
-import org.bukkit.command.Command;
-import org.bukkit.command.CommandMap;
-import org.bukkit.command.CommandSender;
-import org.bukkit.command.ConsoleCommandSender;
-import org.bukkit.command.PluginIdentifiableCommand;
+import org.bukkit.command.*;
 import org.bukkit.entity.Player;
 import org.jetbrains.annotations.NotNull;
 import org.jetbrains.annotations.Nullable;
 
+import java.util.Arrays;
+import java.util.UUID;
+
 /**
  * Superclass for all commands
  */
@@ -132,6 +125,11 @@ public abstract class PlexCommand extends Command implements PluginIdentifiableC
         {
             PlexPlayer plexPlayer = plugin.getPlayerCache().getPlexPlayerMap().get(player.getUniqueId());
 
+            if (plexPlayer == null)
+            {
+                return false;
+            }
+
             if (plugin.getSystem().equalsIgnoreCase("ranks"))
             {
                 if (!plexPlayer.getRankFromString().isAtLeast(getLevel()))
@@ -150,7 +148,7 @@ public abstract class PlexCommand extends Command implements PluginIdentifiableC
             }
             else if (plugin.getSystem().equalsIgnoreCase("permissions"))
             {
-                if (!perms.permission().isEmpty() && !plugin.getPermissionHandler().hasPermission(player, perms.permission()))
+                if (!perms.permission().isEmpty() && !player.hasPermission(perms.permission()))
                 {
                     send(sender, messageComponent("noPermissionNode", perms.permission()));
                     return true;
@@ -186,7 +184,7 @@ public abstract class PlexCommand extends Command implements PluginIdentifiableC
             }
             else if (plugin.getSystem().equalsIgnoreCase("permissions"))
             {
-                if (!perms.permission().isEmpty() && !plugin.getPermissionHandler().hasPermission(Bukkit.getOfflinePlayer(plexPlayer.getName()), perms.permission()))
+                if (!perms.permission().isEmpty() && !plugin.getPermissions().playerHas(null, Bukkit.getPlayer(plexPlayer.getName()), perms.permission()))
                 {
                     send(sender, messageComponent("noPermissionNode", perms.permission()));
                     return true;
@@ -305,7 +303,7 @@ public abstract class PlexCommand extends Command implements PluginIdentifiableC
             }
             else if (plugin.getSystem().equalsIgnoreCase("permissions"))
             {
-                if (!perms.permission().isEmpty() && !plugin.getPermissionHandler().hasPermission(Bukkit.getOfflinePlayer(plexPlayer.getName()), perms.permission()))
+                if (!perms.permission().isEmpty() && !plugin.getPermissions().playerHas(null, Bukkit.getOfflinePlayer(plexPlayer.getName()), perms.permission()))
                 {
                     throw new CommandFailException(PlexUtils.messageString("noPermissionNode", permission));
                 }
@@ -343,7 +341,7 @@ public abstract class PlexCommand extends Command implements PluginIdentifiableC
         }
         else if (plugin.getSystem().equalsIgnoreCase("permissions"))
         {
-            if (!perms.permission().isEmpty() && !plugin.getPermissionHandler().hasPermission(player, permission))
+            if (!perms.permission().isEmpty() && !player.hasPermission(perms.permission()))
             {
                 throw new CommandFailException(PlexUtils.messageString("noPermissionNode", permission));
             }
@@ -364,7 +362,7 @@ public abstract class PlexCommand extends Command implements PluginIdentifiableC
         }
         else if (plugin.getSystem().equalsIgnoreCase("permissions"))
         {
-            return !perms.permission().isEmpty() && plugin.getPermissionHandler().hasPermission(player, permission);
+            return !perms.permission().isEmpty() && player.hasPermission(permission);
         }
         return false;
     }
@@ -405,7 +403,7 @@ public abstract class PlexCommand extends Command implements PluginIdentifiableC
         }
         else if (plugin.getSystem().equalsIgnoreCase("permissions"))
         {
-            return !perms.permission().isEmpty() && plugin.getPermissionHandler().hasPermission(player, permission);
+            return !perms.permission().isEmpty() && player.hasPermission(permission);
         }
         return true;
     }

server/src/main/java/dev/plex/command/annotation/Argument.java

@@ -0,0 +1,24 @@
+package dev.plex.command.annotation;
+
+import com.mojang.brigadier.arguments.StringArgumentType;
+
+import java.lang.annotation.ElementType;
+import java.lang.annotation.Retention;
+import java.lang.annotation.RetentionPolicy;
+import java.lang.annotation.Target;
+
+/**
+ * @author Taah
+ * @since 4:31 AM [08-07-2023]
+ */
+@Retention(RetentionPolicy.RUNTIME)
+@Target(ElementType.PARAMETER)
+public @interface Argument
+{
+    String value();
+
+    StringArgumentType.StringType argumentType() default StringArgumentType.StringType.SINGLE_WORD;
+
+    double min() default Double.MIN_VALUE;
+    double max() default Double.MAX_VALUE;
+}

server/src/main/java/dev/plex/command/annotation/CommandName.java

@@ -0,0 +1,18 @@
+package dev.plex.command.annotation;
+
+import java.lang.annotation.ElementType;
+import java.lang.annotation.Retention;
+import java.lang.annotation.RetentionPolicy;
+import java.lang.annotation.Target;
+
+/**
+ * @author Taah
+ * @since 4:54 PM [07-07-2023]
+ */
+
+@Retention(RetentionPolicy.RUNTIME)
+@Target(ElementType.TYPE)
+public @interface CommandName
+{
+    String[] value();
+}

server/src/main/java/dev/plex/command/annotation/CommandPermission.java

@@ -0,0 +1,18 @@
+package dev.plex.command.annotation;
+
+import java.lang.annotation.ElementType;
+import java.lang.annotation.Retention;
+import java.lang.annotation.RetentionPolicy;
+import java.lang.annotation.Target;
+
+/**
+ * @author Taah
+ * @since 4:54 PM [07-07-2023]
+ */
+
+@Retention(RetentionPolicy.RUNTIME)
+@Target(ElementType.METHOD)
+public @interface CommandPermission
+{
+    String value();
+}

server/src/main/java/dev/plex/command/annotation/CommandPermissions.java

@@ -2,6 +2,7 @@ package dev.plex.command.annotation;
 
 import dev.plex.command.source.RequiredCommandSource;
 import dev.plex.rank.enums.Rank;
+
 import java.lang.annotation.Retention;
 import java.lang.annotation.RetentionPolicy;
 

server/src/main/java/dev/plex/command/annotation/CommandSource.java

@@ -0,0 +1,19 @@
+package dev.plex.command.annotation;
+
+import dev.plex.command.source.RequiredCommandSource;
+
+import java.lang.annotation.ElementType;
+import java.lang.annotation.Retention;
+import java.lang.annotation.RetentionPolicy;
+import java.lang.annotation.Target;
+
+/**
+ * @author Taah
+ * @since 7:08 AM [09-07-2023]
+ */
+@Retention(RetentionPolicy.RUNTIME)
+@Target(ElementType.METHOD)
+public @interface CommandSource
+{
+    RequiredCommandSource value() default RequiredCommandSource.ANY;
+}

server/src/main/java/dev/plex/command/annotation/Default.java

@@ -0,0 +1,17 @@
+package dev.plex.command.annotation;
+
+import java.lang.annotation.ElementType;
+import java.lang.annotation.Retention;
+import java.lang.annotation.RetentionPolicy;
+import java.lang.annotation.Target;
+
+/**
+ * @author Taah
+ * @since 4:54 PM [07-07-2023]
+ */
+
+@Retention(RetentionPolicy.RUNTIME)
+@Target(ElementType.METHOD)
+public @interface Default
+{
+}

server/src/main/java/dev/plex/command/annotation/SubCommand.java

@@ -0,0 +1,18 @@
+package dev.plex.command.annotation;
+
+import java.lang.annotation.ElementType;
+import java.lang.annotation.Retention;
+import java.lang.annotation.RetentionPolicy;
+import java.lang.annotation.Target;
+
+/**
+ * @author Taah
+ * @since 4:46 PM [07-07-2023]
+ */
+
+@Retention(RetentionPolicy.RUNTIME)
+@Target(ElementType.METHOD)
+public @interface SubCommand
+{
+    String value();
+}

server/src/main/java/dev/plex/command/blocking/BlockedCommand.java

@@ -1,10 +1,11 @@
 package dev.plex.command.blocking;
 
 import com.google.common.collect.Lists;
-import java.util.List;
 import lombok.Data;
 import net.kyori.adventure.text.Component;
 
+import java.util.List;
+
 @Data
 public class BlockedCommand
 {

server/src/main/java/dev/plex/command/impl/AdminCMD.java

@@ -1,9 +1,6 @@
 package dev.plex.command.impl;
 
 import com.google.common.collect.ImmutableList;
-import dev.plex.api.event.AdminAddEvent;
-import dev.plex.api.event.AdminRemoveEvent;
-import dev.plex.api.event.AdminSetRankEvent;
 import dev.plex.cache.DataUtils;
 import dev.plex.command.PlexCommand;
 import dev.plex.command.annotation.CommandParameters;
@@ -12,19 +9,23 @@ import dev.plex.command.annotation.System;
 import dev.plex.command.exception.ConsoleOnlyException;
 import dev.plex.command.exception.PlayerNotFoundException;
 import dev.plex.command.source.RequiredCommandSource;
+import dev.plex.event.AdminAddEvent;
+import dev.plex.event.AdminRemoveEvent;
+import dev.plex.event.AdminSetRankEvent;
 import dev.plex.player.PlexPlayer;
 import dev.plex.rank.enums.Rank;
 import dev.plex.util.PlexUtils;
-import java.util.Arrays;
-import java.util.List;
 import net.kyori.adventure.text.Component;
-import org.apache.commons.lang.StringUtils;
+import org.apache.commons.lang3.StringUtils;
 import org.bukkit.Bukkit;
 import org.bukkit.command.CommandSender;
 import org.bukkit.entity.Player;
 import org.jetbrains.annotations.NotNull;
 import org.jetbrains.annotations.Nullable;
 
+import java.util.Arrays;
+import java.util.List;
+
 @CommandPermissions(level = Rank.OP, source = RequiredCommandSource.ANY)
 @CommandParameters(name = "admin", usage = "/<command> <add <player> | remove <player> | setrank <player> <rank> | list>", aliases = "saconfig,slconfig,adminconfig,adminmanage", description = "Manage all admins")
 @System(value = "ranks")

server/src/main/java/dev/plex/command/impl/AdminChatCMD.java

@@ -1,5 +1,6 @@
 package dev.plex.command.impl;
 
+import dev.plex.cache.DataUtils;
 import dev.plex.command.PlexCommand;
 import dev.plex.command.annotation.CommandParameters;
 import dev.plex.command.annotation.CommandPermissions;
@@ -7,14 +8,18 @@ import dev.plex.command.source.RequiredCommandSource;
 import dev.plex.player.PlexPlayer;
 import dev.plex.rank.enums.Rank;
 import dev.plex.util.PlexUtils;
+import dev.plex.util.minimessage.SafeMiniMessage;
+import dev.plex.util.redis.MessageUtil;
 import net.kyori.adventure.text.Component;
-import org.apache.commons.lang.StringUtils;
-import org.bukkit.Bukkit;
+import org.apache.commons.lang3.BooleanUtils;
+import org.apache.commons.lang3.StringUtils;
 import org.bukkit.command.CommandSender;
 import org.bukkit.entity.Player;
 import org.jetbrains.annotations.NotNull;
 import org.jetbrains.annotations.Nullable;
 
+import java.util.UUID;
+
 @CommandPermissions(level = Rank.ADMIN, permission = "plex.adminchat", source = RequiredCommandSource.ANY)
 @CommandParameters(name = "adminchat", description = "Talk privately with other admins", usage = "/<command> <message>", aliases = "o,ac,sc,staffchat")
 public class AdminChatCMD extends PlexCommand
@@ -24,33 +29,18 @@ public class AdminChatCMD extends PlexCommand
     {
         if (args.length == 0)
         {
+            if (playerSender != null)
+            {
+                PlexPlayer player = DataUtils.getPlayer(playerSender.getUniqueId());
+                player.setStaffChat(!player.isStaffChat());
+                return messageComponent("adminChatToggled", BooleanUtils.toStringOnOff(player.isStaffChat()));
+            }
             return usage();
         }
 
-        adminChat(sender, StringUtils.join(args, " "));
+        String message = StringUtils.join(args, " ");
+        plugin.getServer().getConsoleSender().sendMessage(messageComponent("adminChatFormat", sender.getName(), message));
+        MessageUtil.sendStaffChat(sender, SafeMiniMessage.mmDeserialize(message), PlexUtils.adminChat(sender.getName(), message).toArray(UUID[]::new));
         return null;
     }
-
-    private void adminChat(CommandSender sender, String message)
-    {
-        for (Player player : Bukkit.getOnlinePlayers())
-        {
-            if (plugin.getSystem().equalsIgnoreCase("ranks"))
-            {
-                PlexPlayer plexPlayer = plugin.getPlayerCache().getPlexPlayerMap().get(player.getUniqueId());
-                if (plexPlayer.getRankFromString().isAtLeast(Rank.ADMIN) && plexPlayer.isAdminActive())
-                {
-                    player.sendMessage(PlexUtils.messageComponent("adminChatFormat", sender.getName(), message));
-                }
-            }
-            else if (plugin.getSystem().equalsIgnoreCase("permissions"))
-            {
-                if (plugin.getPermissionHandler().hasPermission(player, "plex.adminchat"))
-                {
-                    player.sendMessage(PlexUtils.messageComponent("adminChatFormat", sender.getName(), message));
-                }
-            }
-        }
-        plugin.getServer().getConsoleSender().sendMessage(PlexUtils.messageComponent("adminChatFormat", sender.getName(), message));
-    }
 }

server/src/main/java/dev/plex/command/impl/AdventureCMD.java

@@ -1,15 +1,14 @@
 package dev.plex.command.impl;
 
 import com.google.common.collect.ImmutableList;
-import dev.plex.api.event.GameModeUpdateEvent;
 import dev.plex.command.PlexCommand;
 import dev.plex.command.annotation.CommandParameters;
 import dev.plex.command.annotation.CommandPermissions;
 import dev.plex.command.exception.CommandFailException;
 import dev.plex.command.source.RequiredCommandSource;
+import dev.plex.event.GameModeUpdateEvent;
 import dev.plex.rank.enums.Rank;
 import dev.plex.util.PlexUtils;
-import java.util.List;
 import net.kyori.adventure.text.Component;
 import org.bukkit.Bukkit;
 import org.bukkit.GameMode;
@@ -18,6 +17,8 @@ import org.bukkit.entity.Player;
 import org.jetbrains.annotations.NotNull;
 import org.jetbrains.annotations.Nullable;
 
+import java.util.List;
+
 @CommandPermissions(level = Rank.OP, permission = "plex.gamemode.adventure", source = RequiredCommandSource.ANY)
 @CommandParameters(name = "adventure", aliases = "gma,egma,eadventure,adventuremode,eadventuremode", description = "Set your own or another player's gamemode to adventure mode")
 public class AdventureCMD extends PlexCommand
@@ -29,7 +30,7 @@ public class AdventureCMD extends PlexCommand
         {
             if (isConsole(sender))
             {
-                throw new CommandFailException(PlexUtils.messageString("consoleMustDefinePlayer"));
+                throw new CommandFailException(messageString("consoleMustDefinePlayer"));
             }
             Bukkit.getServer().getPluginManager().callEvent(new GameModeUpdateEvent(sender, playerSender, GameMode.ADVENTURE));
             return null;

server/src/main/java/dev/plex/command/impl/BanCMD.java

@@ -12,23 +12,20 @@ import dev.plex.player.PlexPlayer;
 import dev.plex.punishment.Punishment;
 import dev.plex.punishment.PunishmentType;
 import dev.plex.rank.enums.Rank;
-import dev.plex.util.BungeeUtil;
-import dev.plex.util.PlexLog;
-import dev.plex.util.PlexUtils;
-import dev.plex.util.TimeUtils;
-import dev.plex.util.WebUtils;
-import java.time.ZoneId;
-import java.time.ZonedDateTime;
-import java.util.List;
-import java.util.UUID;
+import dev.plex.util.*;
 import net.kyori.adventure.text.Component;
-import org.apache.commons.lang.StringUtils;
+import org.apache.commons.lang3.StringUtils;
 import org.bukkit.Bukkit;
 import org.bukkit.command.CommandSender;
 import org.bukkit.entity.Player;
 import org.jetbrains.annotations.NotNull;
 import org.jetbrains.annotations.Nullable;
 
+import java.time.ZoneId;
+import java.time.ZonedDateTime;
+import java.util.List;
+import java.util.UUID;
+
 @CommandParameters(name = "ban", usage = "/<command> <player> [reason]", aliases = "offlineban,gtfo", description = "Bans a player, offline or online")
 @CommandPermissions(level = Rank.ADMIN, permission = "plex.ban", source = RequiredCommandSource.ANY)
 

server/src/main/java/dev/plex/command/impl/CommandSpyCMD.java

@@ -22,7 +22,7 @@ public class CommandSpyCMD extends PlexCommand
     {
         if (playerSender != null)
         {
-            PlexPlayer plexPlayer = DataUtils.getPlayer(playerSender.getUniqueId());
+            PlexPlayer plexPlayer = plugin.getPlayerCache().getPlexPlayer(playerSender.getUniqueId());
             plexPlayer.setCommandSpy(!plexPlayer.isCommandSpy());
             DataUtils.update(plexPlayer);
             send(sender, messageComponent("toggleCommandSpy")

server/src/main/java/dev/plex/command/impl/ConsoleSayCMD.java

@@ -7,7 +7,7 @@ import dev.plex.command.source.RequiredCommandSource;
 import dev.plex.rank.enums.Rank;
 import dev.plex.util.PlexUtils;
 import net.kyori.adventure.text.Component;
-import org.apache.commons.lang.StringUtils;
+import org.apache.commons.lang3.StringUtils;
 import org.bukkit.command.CommandSender;
 import org.bukkit.entity.Player;
 import org.jetbrains.annotations.NotNull;

server/src/main/java/dev/plex/command/impl/CreativeCMD.java

@@ -1,15 +1,14 @@
 package dev.plex.command.impl;
 
 import com.google.common.collect.ImmutableList;
-import dev.plex.api.event.GameModeUpdateEvent;
 import dev.plex.command.PlexCommand;
 import dev.plex.command.annotation.CommandParameters;
 import dev.plex.command.annotation.CommandPermissions;
 import dev.plex.command.exception.CommandFailException;
 import dev.plex.command.source.RequiredCommandSource;
+import dev.plex.event.GameModeUpdateEvent;
 import dev.plex.rank.enums.Rank;
 import dev.plex.util.PlexUtils;
-import java.util.List;
 import net.kyori.adventure.text.Component;
 import org.bukkit.Bukkit;
 import org.bukkit.GameMode;
@@ -18,6 +17,8 @@ import org.bukkit.entity.Player;
 import org.jetbrains.annotations.NotNull;
 import org.jetbrains.annotations.Nullable;
 
+import java.util.List;
+
 @CommandPermissions(level = Rank.OP, permission = "plex.gamemode.creative", source = RequiredCommandSource.ANY)
 @CommandParameters(name = "creative", aliases = "gmc,egmc,ecreative,eecreative,creativemode,ecreativemode", description = "Set your own or another player's gamemode to creative mode")
 public class CreativeCMD extends PlexCommand
@@ -29,7 +30,7 @@ public class CreativeCMD extends PlexCommand
         {
             if (isConsole(sender))
             {
-                throw new CommandFailException(PlexUtils.messageString("consoleMustDefinePlayer"));
+                throw new CommandFailException(messageString("consoleMustDefinePlayer"));
             }
             if (!(playerSender == null))
             {

server/src/main/java/dev/plex/command/impl/DebugCMD.java

@@ -9,9 +9,6 @@ import dev.plex.rank.enums.Rank;
 import dev.plex.util.GameRuleUtil;
 import dev.plex.util.PlexLog;
 import dev.plex.util.PlexUtils;
-import java.util.Arrays;
-import java.util.List;
-import java.util.Locale;
 import net.kyori.adventure.text.Component;
 import net.kyori.adventure.text.format.NamedTextColor;
 import org.bukkit.Bukkit;
@@ -22,6 +19,10 @@ import org.bukkit.entity.Player;
 import org.jetbrains.annotations.NotNull;
 import org.jetbrains.annotations.Nullable;
 
+import java.util.Arrays;
+import java.util.List;
+import java.util.Locale;
+
 @CommandParameters(name = "pdebug", description = "Plex's debug command", usage = "/<command> <aliases <command> | redis-reset <player> | gamerules>")
 @CommandPermissions(level = Rank.EXECUTIVE, permission = "plex.debug")
 @System(debug = true)
@@ -36,13 +37,16 @@ public class DebugCMD extends PlexCommand
         }
         if (args[0].equalsIgnoreCase("redis-reset"))
         {
-            Player player = getNonNullPlayer(args[1]);
-            if (plugin.getRedisConnection().getJedis().exists(player.getUniqueId().toString()))
+            if (args.length == 2)
             {
-                plugin.getRedisConnection().getJedis().del(player.getUniqueId().toString());
-                return componentFromString("Successfully reset " + player.getName() + "'s Redis punishments!").color(NamedTextColor.YELLOW);
+                Player player = getNonNullPlayer(args[1]);
+                if (plugin.getRedisConnection().getJedis().exists(player.getUniqueId().toString()))
+                {
+                    plugin.getRedisConnection().getJedis().del(player.getUniqueId().toString());
+                    return componentFromString("Successfully reset " + player.getName() + "'s Redis punishments!").color(NamedTextColor.YELLOW);
+                }
+                return componentFromString("Couldn't find player in Redis punishments.");
             }
-            return componentFromString("Couldn't find player in Redis punishments.");
         }
         if (args[0].equalsIgnoreCase("gamerules"))
         {
@@ -64,15 +68,18 @@ public class DebugCMD extends PlexCommand
         }
         if (args[0].equalsIgnoreCase("aliases"))
         {
-            String commandName = args[1];
-            Command command = plugin.getServer().getCommandMap().getCommand(commandName);
-            if (command == null)
+            if (args.length == 2)
             {
-                return mmString("<red>That command could not be found!");
+                String commandName = args[1];
+                Command command = plugin.getServer().getCommandMap().getCommand(commandName);
+                if (command == null)
+                {
+                    return mmString("<red>That command could not be found!");
+                }
+                return mmString("<aqua>Aliases for " + commandName + " are: " + Arrays.toString(command.getAliases().toArray(new String[0])));
             }
-            return mmString("<aqua>Aliases for " + commandName + " are: " + Arrays.toString(command.getAliases().toArray(new String[0])));
         }
-        return null;
+        return usage();
     }
 
     @Override

server/src/main/java/dev/plex/command/impl/DeopCMD.java

@@ -7,13 +7,14 @@ import dev.plex.command.annotation.CommandPermissions;
 import dev.plex.command.annotation.System;
 import dev.plex.rank.enums.Rank;
 import dev.plex.util.PlexUtils;
-import java.util.List;
 import net.kyori.adventure.text.Component;
 import org.bukkit.command.CommandSender;
 import org.bukkit.entity.Player;
 import org.jetbrains.annotations.NotNull;
 import org.jetbrains.annotations.Nullable;
 
+import java.util.List;
+
 @CommandParameters(name = "deop", description = "Deop a player on the server", usage = "/<command> <player>")
 @CommandPermissions(level = Rank.ADMIN, permission = "plex.deop")
 @System(value = "ranks")

server/src/main/java/dev/plex/command/impl/EntityWipeCMD.java

@@ -6,11 +6,6 @@ import dev.plex.command.annotation.CommandPermissions;
 import dev.plex.command.source.RequiredCommandSource;
 import dev.plex.rank.enums.Rank;
 import dev.plex.util.PlexUtils;
-import java.util.ArrayList;
-import java.util.Arrays;
-import java.util.HashMap;
-import java.util.LinkedList;
-import java.util.List;
 import net.kyori.adventure.text.Component;
 import org.bukkit.Bukkit;
 import org.bukkit.World;
@@ -21,6 +16,8 @@ import org.bukkit.entity.Player;
 import org.jetbrains.annotations.NotNull;
 import org.jetbrains.annotations.Nullable;
 
+import java.util.*;
+
 @CommandPermissions(level = Rank.ADMIN, permission = "plex.entitywipe", source = RequiredCommandSource.ANY)
 @CommandParameters(name = "entitywipe", description = "Remove various server entities that may cause lag, such as dropped items, minecarts, and boats.", usage = "/<command> [name]", aliases = "ew,rd")
 public class EntityWipeCMD extends PlexCommand

server/src/main/java/dev/plex/command/impl/FreezeCMD.java

@@ -10,15 +10,16 @@ import dev.plex.punishment.PunishmentType;
 import dev.plex.rank.enums.Rank;
 import dev.plex.util.PlexUtils;
 import dev.plex.util.TimeUtils;
-import java.time.ZoneId;
-import java.time.ZonedDateTime;
-import java.util.List;
 import net.kyori.adventure.text.Component;
 import org.bukkit.command.CommandSender;
 import org.bukkit.entity.Player;
 import org.jetbrains.annotations.NotNull;
 import org.jetbrains.annotations.Nullable;
 
+import java.time.ZoneId;
+import java.time.ZonedDateTime;
+import java.util.List;
+
 @CommandParameters(name = "freeze", description = "Freeze a player on the server", usage = "/<command> <player>", aliases = "fr")
 @CommandPermissions(level = Rank.ADMIN, permission = "plex.freeze")
 public class FreezeCMD extends PlexCommand

server/src/main/java/dev/plex/command/impl/GamemodeCMD.java

@@ -1,16 +1,13 @@
 package dev.plex.command.impl;
 
-import dev.plex.api.event.GameModeUpdateEvent;
 import dev.plex.command.PlexCommand;
 import dev.plex.command.annotation.CommandParameters;
 import dev.plex.command.annotation.CommandPermissions;
 import dev.plex.command.exception.CommandFailException;
 import dev.plex.command.source.RequiredCommandSource;
+import dev.plex.event.GameModeUpdateEvent;
 import dev.plex.rank.enums.Rank;
 import dev.plex.util.PlexUtils;
-import java.util.Arrays;
-import java.util.Collections;
-import java.util.List;
 import net.kyori.adventure.text.Component;
 import org.bukkit.Bukkit;
 import org.bukkit.GameMode;
@@ -19,6 +16,10 @@ import org.bukkit.entity.Player;
 import org.jetbrains.annotations.NotNull;
 import org.jetbrains.annotations.Nullable;
 
+import java.util.Arrays;
+import java.util.Collections;
+import java.util.List;
+
 @CommandParameters(name = "gamemode", usage = "/<command> <creative | survival | adventure | default | spectator> [player]", description = "Change your gamemode", aliases = "gm,egamemode,gmt,egmt")
 @CommandPermissions(level = Rank.OP, permission = "plex.gamemode", source = RequiredCommandSource.ANY)
 public class GamemodeCMD extends PlexCommand

server/src/main/java/dev/plex/command/impl/KickCMD.java

@@ -14,17 +14,18 @@ import dev.plex.util.BungeeUtil;
 import dev.plex.util.PlexUtils;
 import dev.plex.util.TimeUtils;
 import dev.plex.util.WebUtils;
-import java.time.ZoneId;
-import java.time.ZonedDateTime;
-import java.util.UUID;
 import net.kyori.adventure.text.Component;
-import org.apache.commons.lang.StringUtils;
+import org.apache.commons.lang3.StringUtils;
 import org.bukkit.Bukkit;
 import org.bukkit.command.CommandSender;
 import org.bukkit.entity.Player;
 import org.jetbrains.annotations.NotNull;
 import org.jetbrains.annotations.Nullable;
 
+import java.time.ZoneId;
+import java.time.ZonedDateTime;
+import java.util.UUID;
+
 @CommandParameters(name = "kick", description = "Kicks a player", usage = "/<command> <player>")
 @CommandPermissions(level = Rank.ADMIN, permission = "plex.kick", source = RequiredCommandSource.ANY)
 public class KickCMD extends PlexCommand
@@ -56,9 +57,9 @@ public class KickCMD extends PlexCommand
         if (args.length > 1)
         {
             reason = StringUtils.join(args, " ", 1, args.length);
-            punishment.setReason(reason);
         }
 
+        punishment.setReason(reason);
         punishment.setPunishedUsername(plexPlayer.getName());
         punishment.setEndDate(ZonedDateTime.now(ZoneId.of(TimeUtils.TIMEZONE)));
         punishment.setCustomTime(false);

server/src/main/java/dev/plex/command/impl/ListCMD.java

@@ -4,9 +4,8 @@ import com.google.common.collect.Lists;
 import dev.plex.command.PlexCommand;
 import dev.plex.command.annotation.CommandParameters;
 import dev.plex.command.annotation.CommandPermissions;
-import dev.plex.command.annotation.System;
+import dev.plex.hook.VaultHook;
 import dev.plex.rank.enums.Rank;
-import java.util.List;
 import net.kyori.adventure.text.Component;
 import net.kyori.adventure.text.format.NamedTextColor;
 import org.bukkit.Bukkit;
@@ -15,9 +14,10 @@ import org.bukkit.entity.Player;
 import org.jetbrains.annotations.NotNull;
 import org.jetbrains.annotations.Nullable;
 
-@CommandParameters(name = "list", description = "Show a list of all online players", aliases = "lsit")
+import java.util.List;
+
+@CommandParameters(name = "list", description = "Show a list of all online players", aliases = "lsit,who,playerlist,online")
 @CommandPermissions(level = Rank.OP, permission = "plex.list")
-@System(value = "ranks")
 public class ListCMD extends PlexCommand
 {
     @Override
@@ -44,7 +44,14 @@ public class ListCMD extends PlexCommand
         for (int i = 0; i < players.size(); i++)
         {
             Player player = players.get(i);
-            list = list.append(getPlexPlayer(player).getRankFromString().getPrefix()).append(Component.space()).append(Component.text(player.getName()).color(NamedTextColor.WHITE));
+            if (plugin.getSystem().equals("ranks"))
+            {
+                list = list.append(getPlexPlayer(player).getRankFromString().getPrefix()).append(Component.space()).append(Component.text(player.getName()).color(NamedTextColor.WHITE));
+            }
+            else
+            {
+                list = list.append(VaultHook.getPrefix(getPlexPlayer(player))).append(Component.space()).append(Component.text(player.getName()).color(NamedTextColor.WHITE));
+            }
             if (i != players.size() - 1)
             {
                 list = list.append(Component.text(",")).append(Component.space());

server/src/main/java/dev/plex/command/impl/LocalSpawnCMD.java

@@ -12,7 +12,7 @@ import org.jetbrains.annotations.NotNull;
 import org.jetbrains.annotations.Nullable;
 
 @CommandParameters(name = "localspawn", description = "Teleport to the spawnpoint of the world you are in")
-@CommandPermissions(level = Rank.OP, permission = "plex.spawnpoint", source = RequiredCommandSource.IN_GAME)
+@CommandPermissions(level = Rank.OP, permission = "plex.localspawn", source = RequiredCommandSource.IN_GAME)
 public class LocalSpawnCMD extends PlexCommand
 {
     @Override

server/src/main/java/dev/plex/command/impl/LockupCMD.java

@@ -7,13 +7,14 @@ import dev.plex.command.annotation.CommandPermissions;
 import dev.plex.player.PlexPlayer;
 import dev.plex.rank.enums.Rank;
 import dev.plex.util.PlexUtils;
-import java.util.List;
 import net.kyori.adventure.text.Component;
 import org.bukkit.command.CommandSender;
 import org.bukkit.entity.Player;
 import org.jetbrains.annotations.NotNull;
 import org.jetbrains.annotations.Nullable;
 
+import java.util.List;
+
 @CommandParameters(name = "lockup", description = "Lockup a player on the server", usage = "/<command> <player>")
 @CommandPermissions(level = Rank.ADMIN, permission = "plex.lockup")
 public class LockupCMD extends PlexCommand

server/src/main/java/dev/plex/command/impl/MobPurgeCMD.java

@@ -6,7 +6,6 @@ import dev.plex.command.annotation.CommandPermissions;
 import dev.plex.command.source.RequiredCommandSource;
 import dev.plex.rank.enums.Rank;
 import dev.plex.util.PlexUtils;
-import java.util.HashMap;
 import net.kyori.adventure.text.Component;
 import org.bukkit.Bukkit;
 import org.bukkit.World;
@@ -17,6 +16,8 @@ import org.bukkit.entity.Player;
 import org.jetbrains.annotations.NotNull;
 import org.jetbrains.annotations.Nullable;
 
+import java.util.HashMap;
+
 @CommandPermissions(level = Rank.ADMIN, permission = "plex.mobpurge", source = RequiredCommandSource.ANY)
 @CommandParameters(name = "mobpurge", description = "Purge all mobs.", usage = "/<command>", aliases = "mp")
 public class MobPurgeCMD extends PlexCommand

server/src/main/java/dev/plex/command/impl/MuteCMD.java

@@ -10,15 +10,16 @@ import dev.plex.punishment.PunishmentType;
 import dev.plex.rank.enums.Rank;
 import dev.plex.util.PlexUtils;
 import dev.plex.util.TimeUtils;
-import java.time.ZoneId;
-import java.time.ZonedDateTime;
-import java.util.List;
 import net.kyori.adventure.text.Component;
 import org.bukkit.command.CommandSender;
 import org.bukkit.entity.Player;
 import org.jetbrains.annotations.NotNull;
 import org.jetbrains.annotations.Nullable;
 
+import java.time.ZoneId;
+import java.time.ZonedDateTime;
+import java.util.List;
+
 @CommandParameters(name = "mute", description = "Mute a player on the server", usage = "/<command> <player>", aliases = "stfu")
 @CommandPermissions(level = Rank.ADMIN, permission = "plex.mute")
 public class MuteCMD extends PlexCommand

server/src/main/java/dev/plex/command/impl/NameHistoryCMD.java

@@ -6,13 +6,7 @@ import dev.plex.command.PlexCommand;
 import dev.plex.command.annotation.CommandParameters;
 import dev.plex.command.annotation.CommandPermissions;
 import dev.plex.rank.enums.Rank;
-import dev.plex.util.AshconInfo;
-import dev.plex.util.MojangUtils;
-import dev.plex.util.PlexLog;
-import dev.plex.util.PlexUtils;
-import dev.plex.util.TimeUtils;
-import java.util.Arrays;
-import java.util.List;
+import dev.plex.util.*;
 import net.kyori.adventure.text.Component;
 import net.kyori.adventure.text.format.NamedTextColor;
 import org.bukkit.command.CommandSender;
@@ -20,6 +14,9 @@ import org.bukkit.entity.Player;
 import org.jetbrains.annotations.NotNull;
 import org.jetbrains.annotations.Nullable;
 
+import java.util.Arrays;
+import java.util.List;
+
 @CommandParameters(name = "namehistory", description = "Get the name history of a player", usage = "/<command> <player>", aliases = "nh")
 @CommandPermissions(level = Rank.OP, permission = "plex.namehistory")
 public class NameHistoryCMD extends PlexCommand

server/src/main/java/dev/plex/command/impl/NotesCMD.java

@@ -10,12 +10,6 @@ import dev.plex.rank.enums.Rank;
 import dev.plex.storage.StorageType;
 import dev.plex.util.PlexUtils;
 import dev.plex.util.TimeUtils;
-import java.time.ZoneId;
-import java.time.ZonedDateTime;
-import java.util.Arrays;
-import java.util.Collections;
-import java.util.List;
-import java.util.concurrent.atomic.AtomicReference;
 import net.kyori.adventure.text.Component;
 import net.kyori.adventure.text.format.NamedTextColor;
 import org.apache.commons.lang3.ArrayUtils;
@@ -25,6 +19,13 @@ import org.bukkit.entity.Player;
 import org.jetbrains.annotations.NotNull;
 import org.jetbrains.annotations.Nullable;
 
+import java.time.ZoneId;
+import java.time.ZonedDateTime;
+import java.util.Arrays;
+import java.util.Collections;
+import java.util.List;
+import java.util.concurrent.atomic.AtomicReference;
+
 @CommandParameters(name = "notes", description = "Manage notes for a player", usage = "/<command> <player> <list | add <note> | remove <id> | clear>")
 @CommandPermissions(level = Rank.ADMIN, permission = "plex.notes")
 public class NotesCMD extends PlexCommand

server/src/main/java/dev/plex/command/impl/OpCMD.java

@@ -7,13 +7,14 @@ import dev.plex.command.annotation.CommandPermissions;
 import dev.plex.command.annotation.System;
 import dev.plex.rank.enums.Rank;
 import dev.plex.util.PlexUtils;
-import java.util.List;
 import net.kyori.adventure.text.Component;
 import org.bukkit.command.CommandSender;
 import org.bukkit.entity.Player;
 import org.jetbrains.annotations.NotNull;
 import org.jetbrains.annotations.Nullable;
 
+import java.util.List;
+
 @CommandParameters(name = "op", description = "Op a player on the server", usage = "/<command> <player>")
 @CommandPermissions(level = Rank.OP)
 @System(value = "ranks")

server/src/main/java/dev/plex/command/impl/PlexCMD.java

@@ -11,12 +11,8 @@ import dev.plex.rank.enums.Rank;
 import dev.plex.util.BuildInfo;
 import dev.plex.util.PlexUtils;
 import dev.plex.util.TimeUtils;
-import java.util.Arrays;
-import java.util.Collections;
-import java.util.List;
-import java.util.stream.Collectors;
 import net.kyori.adventure.text.Component;
-import org.apache.commons.lang.StringUtils;
+import org.apache.commons.lang3.StringUtils;
 import org.bukkit.Bukkit;
 import org.bukkit.OfflinePlayer;
 import org.bukkit.command.CommandSender;
@@ -24,10 +20,18 @@ import org.bukkit.entity.Player;
 import org.jetbrains.annotations.NotNull;
 import org.jetbrains.annotations.Nullable;
 
+import java.util.Arrays;
+import java.util.Collections;
+import java.util.List;
+import java.util.stream.Collectors;
+
 @CommandPermissions(level = Rank.IMPOSTOR, source = RequiredCommandSource.ANY)
 @CommandParameters(name = "plex", usage = "/<command> [reload | redis | modules [reload]]", description = "Show information about Plex or reload it")
 public class PlexCMD extends PlexCommand
 {
+    public PlexCMD() {
+        super(false);
+    }
     // Don't modify this command
     @Override
     protected Component execute(@NotNull CommandSender sender, @Nullable Player playerSender, String[] args)
@@ -72,14 +76,7 @@ public class PlexCMD extends PlexCommand
         else if (args[0].equalsIgnoreCase("redis"))
         {
             checkRank(sender, Rank.SENIOR_ADMIN, "plex.redis");
-            if (!plugin.getRedisConnection().isEnabled())
-            {
-                throw new CommandFailException("&cRedis is not enabled.");
-            }
-            plugin.getRedisConnection().getJedis().set("test", "123");
-            send(sender, "Set test to 123. Now outputting key test...");
-            send(sender, plugin.getRedisConnection().getJedis().get("test"));
-            plugin.getRedisConnection().getJedis().close();
+
             return null;
         }
         else if (args[0].equalsIgnoreCase("modules"))

server/src/main/java/dev/plex/command/impl/PunishmentsCMD.java

@@ -8,13 +8,14 @@ import dev.plex.command.source.RequiredCommandSource;
 import dev.plex.menu.PunishmentMenu;
 import dev.plex.rank.enums.Rank;
 import dev.plex.util.PlexUtils;
-import java.util.List;
 import net.kyori.adventure.text.Component;
 import org.bukkit.command.CommandSender;
 import org.bukkit.entity.Player;
 import org.jetbrains.annotations.NotNull;
 import org.jetbrains.annotations.Nullable;
 
+import java.util.List;
+
 @CommandParameters(name = "punishments", usage = "/<command> [player]", description = "Opens the Punishments GUI", aliases = "punishlist,punishes")
 @CommandPermissions(level = Rank.ADMIN, permission = "plex.punishments", source = RequiredCommandSource.IN_GAME)
 public class PunishmentsCMD extends PlexCommand

server/src/main/java/dev/plex/command/impl/RankCMD.java

@@ -8,14 +8,15 @@ import dev.plex.command.exception.CommandFailException;
 import dev.plex.command.source.RequiredCommandSource;
 import dev.plex.rank.enums.Rank;
 import dev.plex.util.PlexUtils;
-import java.util.Collections;
-import java.util.List;
 import net.kyori.adventure.text.Component;
 import org.bukkit.command.CommandSender;
 import org.bukkit.entity.Player;
 import org.jetbrains.annotations.NotNull;
 import org.jetbrains.annotations.Nullable;
 
+import java.util.Collections;
+import java.util.List;
+
 @CommandPermissions(level = Rank.OP, permission = "plex.rank", source = RequiredCommandSource.ANY)
 @CommandParameters(name = "rank", description = "Displays your rank")
 @System(value = "ranks")

server/src/main/java/dev/plex/command/impl/RawSayCMD.java

@@ -7,7 +7,7 @@ import dev.plex.command.source.RequiredCommandSource;
 import dev.plex.rank.enums.Rank;
 import dev.plex.util.PlexUtils;
 import net.kyori.adventure.text.Component;
-import org.apache.commons.lang.StringUtils;
+import org.apache.commons.lang3.StringUtils;
 import org.bukkit.command.CommandSender;
 import org.bukkit.entity.Player;
 import org.jetbrains.annotations.NotNull;

server/src/main/java/dev/plex/command/impl/RemoveLoginMessageCMD.java

@@ -0,0 +1,55 @@
+package dev.plex.command.impl;
+
+import dev.plex.cache.DataUtils;
+import dev.plex.command.PlexCommand;
+import dev.plex.command.annotation.CommandParameters;
+import dev.plex.command.annotation.CommandPermissions;
+import dev.plex.command.source.RequiredCommandSource;
+import dev.plex.player.PlexPlayer;
+import dev.plex.rank.enums.Rank;
+import net.kyori.adventure.text.Component;
+import org.bukkit.command.CommandSender;
+import org.bukkit.entity.Player;
+import org.jetbrains.annotations.NotNull;
+import org.jetbrains.annotations.Nullable;
+
+@CommandPermissions(level = Rank.ADMIN, permission = "plex.removeloginmessage", source = RequiredCommandSource.ANY)
+@CommandParameters(name = "removeloginmessage", usage = "/<command> [-o <player>]", description = "Remove your own (or someone else's) login message", aliases = "rlm,removeloginmsg")
+public class RemoveLoginMessageCMD extends PlexCommand
+{
+    @Override
+    protected Component execute(@NotNull CommandSender sender, @Nullable Player playerSender, String[] args)
+    {
+        if (args.length == 0 && !isConsole(sender))
+        {
+            if (playerSender != null)
+            {
+                PlexPlayer plexPlayer = plugin.getPlayerCache().getPlexPlayer(playerSender.getUniqueId());
+                plexPlayer.setLoginMessage("");
+                return messageComponent("removedOwnLoginMessage");
+            }
+        }
+        else if (args[0].equalsIgnoreCase("-o"))
+        {
+            checkRank(sender, Rank.SENIOR_ADMIN, "plex.removeloginmessage.others");
+
+            if (args.length < 2)
+            {
+                return messageComponent("specifyPlayer");
+            }
+
+            PlexPlayer plexPlayer = DataUtils.getPlayer(args[1]);
+            if (plexPlayer == null)
+            {
+                return messageComponent("playerNotFound");
+            }
+            plexPlayer.setLoginMessage("");
+            return messageComponent("removedOtherLoginMessage", plexPlayer.getName());
+        }
+        else
+        {
+            return messageComponent("noPermissionConsole");
+        }
+        return null;
+    }
+}

server/src/main/java/dev/plex/command/impl/SayCMD.java

@@ -7,7 +7,7 @@ import dev.plex.command.source.RequiredCommandSource;
 import dev.plex.rank.enums.Rank;
 import dev.plex.util.PlexUtils;
 import net.kyori.adventure.text.Component;
-import org.apache.commons.lang.StringUtils;
+import org.apache.commons.lang3.StringUtils;
 import org.bukkit.command.CommandSender;
 import org.bukkit.entity.Player;
 import org.jetbrains.annotations.NotNull;

server/src/main/java/dev/plex/command/impl/SetLoginMessageCMD.java

@@ -0,0 +1,89 @@
+package dev.plex.command.impl;
+
+import dev.plex.cache.DataUtils;
+import dev.plex.command.PlexCommand;
+import dev.plex.command.annotation.CommandParameters;
+import dev.plex.command.annotation.CommandPermissions;
+import dev.plex.command.exception.CommandFailException;
+import dev.plex.command.source.RequiredCommandSource;
+import dev.plex.player.PlexPlayer;
+import dev.plex.rank.enums.Rank;
+import dev.plex.util.PlexLog;
+import net.kyori.adventure.text.Component;
+import org.apache.commons.lang3.StringUtils;
+import org.bukkit.command.CommandSender;
+import org.bukkit.entity.Player;
+import org.jetbrains.annotations.NotNull;
+import org.jetbrains.annotations.Nullable;
+
+@CommandPermissions(level = Rank.ADMIN, permission = "plex.setloginmessage", source = RequiredCommandSource.ANY)
+@CommandParameters(name = "setloginmessage", usage = "/<command> [-o <player>] <message>", description = "Sets your (or someone else's) login message", aliases = "slm,setloginmsg")
+public class SetLoginMessageCMD extends PlexCommand
+{
+    private final boolean nameRequired = plugin.getConfig().getBoolean("loginmessages.name");
+    private final boolean rankRequired = plugin.getConfig().getBoolean("loginmessages.rank");
+
+    @Override
+    protected Component execute(@NotNull CommandSender sender, @Nullable Player playerSender, String[] args)
+    {
+        if (args.length == 0)
+        {
+            return usage();
+        }
+        if (playerSender != null)
+        {
+            if (args[0].equals("-o"))
+            {
+                checkRank(sender, Rank.SENIOR_ADMIN, "plex.setloginmessage.others");
+
+                if (args.length < 2)
+                {
+                    return messageComponent("specifyPlayer");
+                }
+                if (args.length < 3)
+                {
+                    return messageComponent("specifyLoginMessage");
+                }
+                PlexPlayer plexPlayer = DataUtils.getPlayer(args[1]);
+                if (plexPlayer == null)
+                {
+                    return messageComponent("playerNotFound");
+                }
+                String message = StringUtils.join(args, " ", 2, args.length);
+                message = message.replace(plexPlayer.getName(), "%player%");
+                validateMessage(message);
+                plexPlayer.setLoginMessage(message);
+                return messageComponent("setOtherPlayersLoginMessage", plexPlayer.getName(),
+                        message.replace("%player%", plexPlayer.getName())
+                                .replace("%rank%", plexPlayer.getRank()));
+            }
+            if (isConsole(sender))
+            {
+                return messageComponent("noPermissionConsole");
+            }
+            PlexPlayer plexPlayer = plugin.getPlayerCache().getPlexPlayer(playerSender.getUniqueId());
+            String message = StringUtils.join(args, " ", 0, args.length);
+            message = message.replace(plexPlayer.getName(), "%player%");
+            validateMessage(message);
+            plexPlayer.setLoginMessage(message);
+            return messageComponent("setOwnLoginMessage",
+                    message.replace("%player%", plexPlayer.getName())
+                            .replace("%rank%", plexPlayer.getRank()));
+        }
+        return null;
+    }
+
+    private void validateMessage(String message)
+    {
+        if (nameRequired && !message.contains("%player%"))
+        {
+            PlexLog.debug("Validating login message has a valid name in it");
+            throw new CommandFailException(messageString("nameRequired"));
+        }
+        if (plugin.getSystem().equalsIgnoreCase("ranks") && rankRequired && !message.contains("%rank%"))
+        {
+            PlexLog.debug("Validating login message has a valid rank in it");
+            throw new CommandFailException(messageString("rankRequired"));
+        }
+    }
+}

server/src/main/java/dev/plex/command/impl/SmiteCMD.java

@@ -10,15 +10,11 @@ import dev.plex.punishment.PunishmentType;
 import dev.plex.rank.enums.Rank;
 import dev.plex.util.PlexUtils;
 import dev.plex.util.TimeUtils;
-import java.time.ZoneId;
-import java.time.ZonedDateTime;
-import java.util.Collections;
-import java.util.List;
 import net.kyori.adventure.text.Component;
 import net.kyori.adventure.text.format.NamedTextColor;
 import net.kyori.adventure.title.Title;
-import org.apache.commons.lang.StringUtils;
 import org.apache.commons.lang3.ArrayUtils;
+import org.apache.commons.lang3.StringUtils;
 import org.bukkit.GameMode;
 import org.bukkit.Location;
 import org.bukkit.World;
@@ -27,6 +23,11 @@ import org.bukkit.entity.Player;
 import org.jetbrains.annotations.NotNull;
 import org.jetbrains.annotations.Nullable;
 
+import java.time.ZoneId;
+import java.time.ZonedDateTime;
+import java.util.Collections;
+import java.util.List;
+
 @CommandPermissions(level = Rank.ADMIN, permission = "plex.smite", source = RequiredCommandSource.ANY)
 @CommandParameters(name = "smite", usage = "/<command> <player> [reason] [-ci | -q]", description = "Someone being a little bitch? Smite them down...")
 public class SmiteCMD extends PlexCommand

server/src/main/java/dev/plex/command/impl/SpectatorCMD.java

@@ -1,15 +1,14 @@
 package dev.plex.command.impl;
 
 import com.google.common.collect.ImmutableList;
-import dev.plex.api.event.GameModeUpdateEvent;
 import dev.plex.command.PlexCommand;
 import dev.plex.command.annotation.CommandParameters;
 import dev.plex.command.annotation.CommandPermissions;
 import dev.plex.command.exception.CommandFailException;
 import dev.plex.command.source.RequiredCommandSource;
+import dev.plex.event.GameModeUpdateEvent;
 import dev.plex.rank.enums.Rank;
 import dev.plex.util.PlexUtils;
-import java.util.List;
 import net.kyori.adventure.text.Component;
 import org.bukkit.Bukkit;
 import org.bukkit.GameMode;
@@ -18,6 +17,8 @@ import org.bukkit.entity.Player;
 import org.jetbrains.annotations.NotNull;
 import org.jetbrains.annotations.Nullable;
 
+import java.util.List;
+
 @CommandPermissions(level = Rank.ADMIN, permission = "plex.gamemode.spectator", source = RequiredCommandSource.ANY)
 @CommandParameters(name = "spectator", aliases = "gmsp,egmsp,spec", description = "Set your own or another player's gamemode to spectator mode")
 public class SpectatorCMD extends PlexCommand
@@ -29,7 +30,7 @@ public class SpectatorCMD extends PlexCommand
         {
             if (isConsole(sender))
             {
-                throw new CommandFailException(PlexUtils.messageString("consoleMustDefinePlayer"));
+                throw new CommandFailException(messageString("consoleMustDefinePlayer"));
             }
             Bukkit.getServer().getPluginManager().callEvent(new GameModeUpdateEvent(sender, playerSender, GameMode.SPECTATOR));
             return null;

server/src/main/java/dev/plex/command/impl/SurvivalCMD.java

@@ -1,15 +1,14 @@
 package dev.plex.command.impl;
 
 import com.google.common.collect.ImmutableList;
-import dev.plex.api.event.GameModeUpdateEvent;
 import dev.plex.command.PlexCommand;
 import dev.plex.command.annotation.CommandParameters;
 import dev.plex.command.annotation.CommandPermissions;
 import dev.plex.command.exception.CommandFailException;
 import dev.plex.command.source.RequiredCommandSource;
+import dev.plex.event.GameModeUpdateEvent;
 import dev.plex.rank.enums.Rank;
 import dev.plex.util.PlexUtils;
-import java.util.List;
 import net.kyori.adventure.text.Component;
 import org.bukkit.Bukkit;
 import org.bukkit.GameMode;
@@ -18,6 +17,8 @@ import org.bukkit.entity.Player;
 import org.jetbrains.annotations.NotNull;
 import org.jetbrains.annotations.Nullable;
 
+import java.util.List;
+
 @CommandPermissions(level = Rank.OP, permission = "plex.gamemode.survival", source = RequiredCommandSource.ANY)
 @CommandParameters(name = "survival", aliases = "gms,egms,esurvival,survivalmode,esurvivalmode", description = "Set your own or another player's gamemode to survival mode")
 public class SurvivalCMD extends PlexCommand
@@ -29,7 +30,7 @@ public class SurvivalCMD extends PlexCommand
         {
             if (isConsole(sender))
             {
-                throw new CommandFailException(PlexUtils.messageString("consoleMustDefinePlayer"));
+                throw new CommandFailException(messageString("consoleMustDefinePlayer"));
             }
             Bukkit.getServer().getPluginManager().callEvent(new GameModeUpdateEvent(sender, playerSender, GameMode.SURVIVAL));
             return null;

server/src/main/java/dev/plex/command/impl/TFMCMD.java

@@ -7,8 +7,6 @@ import dev.plex.command.annotation.CommandPermissions;
 import dev.plex.command.source.RequiredCommandSource;
 import dev.plex.rank.enums.Rank;
 import dev.plex.util.PlexUtils;
-import java.util.ArrayList;
-import java.util.List;
 import net.kyori.adventure.inventory.Book;
 import net.kyori.adventure.text.Component;
 import org.bukkit.command.CommandSender;
@@ -16,6 +14,9 @@ import org.bukkit.entity.Player;
 import org.jetbrains.annotations.NotNull;
 import org.jetbrains.annotations.Nullable;
 
+import java.util.ArrayList;
+import java.util.List;
+
 @CommandParameters(name = "totalfreedommod", description = "You can't simpy do that.", aliases = "tfm")
 @CommandPermissions(level = Rank.OP, source = RequiredCommandSource.ANY)
 

server/src/main/java/dev/plex/command/impl/TagCMD.java

@@ -7,11 +7,12 @@ import dev.plex.command.annotation.CommandPermissions;
 import dev.plex.command.source.RequiredCommandSource;
 import dev.plex.player.PlexPlayer;
 import dev.plex.rank.enums.Rank;
+import dev.plex.util.PlexUtils;
 import dev.plex.util.minimessage.SafeMiniMessage;
 import net.kyori.adventure.text.Component;
 import net.kyori.adventure.text.minimessage.MiniMessage;
 import net.kyori.adventure.text.serializer.plain.PlainTextComponentSerializer;
-import org.apache.commons.lang.StringUtils;
+import org.apache.commons.lang3.StringUtils;
 import org.bukkit.command.CommandSender;
 import org.bukkit.command.ConsoleCommandSender;
 import org.bukkit.entity.Player;
@@ -46,7 +47,7 @@ public class TagCMD extends PlexCommand
             {
                 return usage("/tag set <prefix>");
             }
-            String prefix = StringUtils.join(args, " ", 1, args.length);
+            String prefix = PlexUtils.cleanString(StringUtils.join(args, " ", 1, args.length));
 
             Component convertedComponent = SafeMiniMessage.mmDeserializeWithoutEvents(prefix);
 

server/src/main/java/dev/plex/command/impl/TempbanCMD.java

@@ -15,16 +15,17 @@ import dev.plex.util.BungeeUtil;
 import dev.plex.util.PlexUtils;
 import dev.plex.util.TimeUtils;
 import dev.plex.util.WebUtils;
-import java.util.List;
-import java.util.UUID;
 import net.kyori.adventure.text.Component;
-import org.apache.commons.lang.StringUtils;
+import org.apache.commons.lang3.StringUtils;
 import org.bukkit.Bukkit;
 import org.bukkit.command.CommandSender;
 import org.bukkit.entity.Player;
 import org.jetbrains.annotations.NotNull;
 import org.jetbrains.annotations.Nullable;
 
+import java.util.List;
+import java.util.UUID;
+
 @CommandParameters(name = "tempban", usage = "/<command> <player> <time> [reason]", description = "Temporarily ban a player")
 @CommandPermissions(level = Rank.ADMIN, permission = "plex.tempban", source = RequiredCommandSource.ANY)
 

server/src/main/java/dev/plex/command/impl/ToggleCMD.java

@@ -8,7 +8,6 @@ import dev.plex.command.source.RequiredCommandSource;
 import dev.plex.menu.ToggleMenu;
 import dev.plex.rank.enums.Rank;
 import dev.plex.util.PlexUtils;
-import java.util.List;
 import net.kyori.adventure.text.Component;
 import net.kyori.adventure.text.format.NamedTextColor;
 import org.bukkit.command.CommandSender;
@@ -16,6 +15,8 @@ import org.bukkit.entity.Player;
 import org.jetbrains.annotations.NotNull;
 import org.jetbrains.annotations.Nullable;
 
+import java.util.List;
+
 @CommandParameters(name = "toggle", description = "Allows toggling various server aspects through a GUI", aliases = "toggles")
 @CommandPermissions(level = Rank.ADMIN, permission = "plex.toggle", source = RequiredCommandSource.ANY)
 public class ToggleCMD extends PlexCommand
@@ -31,6 +32,7 @@ public class ToggleCMD extends PlexCommand
                 sender.sendMessage(PlexUtils.mmDeserialize("<gray>  - Explosions" + status("explosions")));
                 sender.sendMessage(PlexUtils.mmDeserialize("<gray>  - Fluidspread" + status("fluidspread")));
                 sender.sendMessage(PlexUtils.mmDeserialize("<gray>  - Drops" + status("drops")));
+                sender.sendMessage(PlexUtils.mmDeserialize("<gray>  - Redstone" + status("redstone")));
                 return null;
             }
             switch (args[0].toLowerCase())
@@ -47,6 +49,10 @@ public class ToggleCMD extends PlexCommand
                 {
                     return toggle("drops");
                 }
+                case "redstone" ->
+                {
+                    return toggle("redstone");
+                }
                 default ->
                 {
                     return messageComponent("invalidToggle");

server/src/main/java/dev/plex/command/impl/UnbanCMD.java

@@ -12,14 +12,15 @@ import dev.plex.player.PlexPlayer;
 import dev.plex.rank.enums.Rank;
 import dev.plex.util.PlexUtils;
 import dev.plex.util.WebUtils;
-import java.util.List;
-import java.util.UUID;
 import net.kyori.adventure.text.Component;
 import org.bukkit.command.CommandSender;
 import org.bukkit.entity.Player;
 import org.jetbrains.annotations.NotNull;
 import org.jetbrains.annotations.Nullable;
 
+import java.util.List;
+import java.util.UUID;
+
 @CommandParameters(name = "unban", usage = "/<command> <player>", description = "Unbans a player, offline or online")
 @CommandPermissions(level = Rank.ADMIN, permission = "plex.ban", source = RequiredCommandSource.ANY)
 

server/src/main/java/dev/plex/command/impl/UnfreezeCMD.java

@@ -8,13 +8,14 @@ import dev.plex.command.exception.CommandFailException;
 import dev.plex.player.PlexPlayer;
 import dev.plex.rank.enums.Rank;
 import dev.plex.util.PlexUtils;
-import java.util.List;
 import net.kyori.adventure.text.Component;
 import org.bukkit.command.CommandSender;
 import org.bukkit.entity.Player;
 import org.jetbrains.annotations.NotNull;
 import org.jetbrains.annotations.Nullable;
 
+import java.util.List;
+
 @CommandPermissions(level = Rank.ADMIN, permission = "plex.unfreeze")
 @CommandParameters(name = "unfreeze", description = "Unfreeze a player", usage = "/<command> <player>")
 public class UnfreezeCMD extends PlexCommand

server/src/main/java/dev/plex/command/impl/UnmuteCMD.java

@@ -8,13 +8,14 @@ import dev.plex.command.exception.CommandFailException;
 import dev.plex.player.PlexPlayer;
 import dev.plex.rank.enums.Rank;
 import dev.plex.util.PlexUtils;
-import java.util.List;
 import net.kyori.adventure.text.Component;
 import org.bukkit.command.CommandSender;
 import org.bukkit.entity.Player;
 import org.jetbrains.annotations.NotNull;
 import org.jetbrains.annotations.Nullable;
 
+import java.util.List;
+
 @CommandPermissions(level = Rank.ADMIN, permission = "plex.unmute")
 @CommandParameters(name = "unmute", description = "Unmute a player", usage = "/<command> <player>")
 public class UnmuteCMD extends PlexCommand

server/src/main/java/dev/plex/command/impl/WorldCMD.java

@@ -6,8 +6,6 @@ import dev.plex.command.annotation.CommandParameters;
 import dev.plex.command.annotation.CommandPermissions;
 import dev.plex.command.source.RequiredCommandSource;
 import dev.plex.rank.enums.Rank;
-import java.util.List;
-import java.util.stream.Collectors;
 import net.kyori.adventure.text.Component;
 import org.bukkit.Bukkit;
 import org.bukkit.Location;
@@ -17,6 +15,9 @@ import org.bukkit.entity.Player;
 import org.jetbrains.annotations.NotNull;
 import org.jetbrains.annotations.Nullable;
 
+import java.util.List;
+import java.util.stream.Collectors;
+
 @CommandPermissions(level = Rank.OP, permission = "plex.world", source = RequiredCommandSource.IN_GAME)
 @CommandParameters(name = "world", description = "Teleport to a world.", usage = "/<command> <world>")
 public class WorldCMD extends PlexCommand

server/src/main/java/dev/plex/command/impl/brigadier/AdminChatCMD.java

@@ -0,0 +1,31 @@
+package dev.plex.command.impl.brigadier;
+
+import dev.plex.cache.DataUtils;
+import dev.plex.command.PlexBrigadierCommand;
+import dev.plex.command.annotation.CommandName;
+import dev.plex.command.annotation.CommandPermission;
+import dev.plex.command.annotation.CommandSource;
+import dev.plex.command.annotation.Default;
+import dev.plex.command.source.RequiredCommandSource;
+import dev.plex.player.PlexPlayer;
+import org.apache.commons.lang3.BooleanUtils;
+import org.bukkit.entity.Player;
+
+import static dev.plex.util.PlexUtils.messageComponent;
+
+/**
+ * @author Taah
+ * @since 6:54 AM [09-07-2023]
+ */
+@CommandName({"adminchat", "o", "sc", "ac", "staffchat"})
+public class AdminChatCMD extends PlexBrigadierCommand
+{
+    @Default
+    @CommandPermission("plex.adminchat")
+    @CommandSource(RequiredCommandSource.IN_GAME)
+    public void toggle(Player sender) {
+        PlexPlayer player = DataUtils.getPlayer(sender.getUniqueId());
+        player.setStaffChat(!player.isStaffChat());
+        send(sender, messageComponent("adminChatToggled", BooleanUtils.toStringOnOff(player.isStaffChat())));
+    }
+}

server/src/main/java/dev/plex/command/impl/brigadier/PlexBrigadierCMD.java

@@ -0,0 +1,90 @@
+package dev.plex.command.impl.brigadier;
+
+import com.mojang.brigadier.arguments.StringArgumentType;
+import dev.plex.command.PlexBrigadierCommand;
+import dev.plex.command.annotation.*;
+import dev.plex.command.exception.CommandFailException;
+import dev.plex.module.PlexModule;
+import dev.plex.module.PlexModuleFile;
+import dev.plex.util.BuildInfo;
+import dev.plex.util.TimeUtils;
+import org.apache.commons.lang3.StringUtils;
+import org.bukkit.command.CommandSender;
+
+import java.util.stream.Collectors;
+
+/**
+ * @author Taah
+ * @since 3:46 PM [07-07-2023]
+ */
+@CommandName({"plex", "pplexx"})
+public class PlexBrigadierCMD extends PlexBrigadierCommand
+{
+    @SubCommand("reload")
+    @CommandPermission("plex.reload")
+    public void reloadPlex(CommandSender sender)
+    {
+        plugin.config.load();
+        send(sender, "Reloaded config file");
+        plugin.messages.load();
+        send(sender, "Reloaded messages file");
+        plugin.indefBans.load(false);
+        plugin.getPunishmentManager().mergeIndefiniteBans();
+        send(sender, "Reloaded indefinite bans");
+        plugin.commands.load();
+        send(sender, "Reloaded blocked commands file");
+        plugin.getRankManager().importDefaultRanks();
+        send(sender, "Imported ranks");
+        plugin.setSystem(plugin.config.getString("system"));
+        if (plugin.getSystem().equalsIgnoreCase("permissions") && !plugin.getServer().getPluginManager().isPluginEnabled("Vault"))
+        {
+            throw new RuntimeException("Vault is required to run on the server if you use permissions!");
+        }
+        plugin.getServiceManager().endServices();
+        plugin.getServiceManager().startServices();
+        send(sender, "Restarted services.");
+        TimeUtils.TIMEZONE = plugin.config.getString("server.timezone");
+        send(sender, "Set timezone to: " + TimeUtils.TIMEZONE);
+        send(sender, "Plex successfully reloaded.");
+    }
+
+    @SubCommand("redis")
+    @CommandPermission("plex.redis")
+    public void testRedis(CommandSender sender)
+    {
+        if (!plugin.getRedisConnection().isEnabled())
+        {
+            throw new CommandFailException("&cRedis is not enabled.");
+        }
+        plugin.getRedisConnection().getJedis().set("test", "123");
+        send(sender, "Set test to 123. Now outputting key test...");
+        send(sender, plugin.getRedisConnection().getJedis().get("test"));
+        plugin.getRedisConnection().getJedis().close();
+    }
+
+    @SubCommand("modules")
+    @CommandPermission("plex.modules")
+    public void viewModules(CommandSender sender)
+    {
+        send(sender, mmString("<gold>Modules (" + plugin.getModuleManager().getModules().size() + "): <yellow>" + StringUtils.join(plugin.getModuleManager().getModules().stream().map(PlexModule::getPlexModuleFile).map(PlexModuleFile::getName).collect(Collectors.toList()), ", ")));
+    }
+
+    @SubCommand("modules reload")
+    @CommandPermission("plex.modules.reload")
+    public void reloadModules(CommandSender sender)
+    {
+        plugin.getModuleManager().reloadModules();
+        send(sender, mmString("<green>All modules reloaded!"));
+    }
+
+    @Default
+    public void defaultCommand(CommandSender sender)
+    {
+        send(sender, mmString("<light_purple>Plex - A new freedom plugin."));
+        send(sender, mmString("<light_purple>Plugin version: <gold>" + plugin.getPluginMeta().getVersion() + " #" + BuildInfo.getNumber() + " <light_purple>Git: <gold>" + BuildInfo.getHead()));
+        send(sender, mmString("<light_purple>Authors: <gold>Telesphoreo, Taahh"));
+        send(sender, mmString("<light_purple>Built by: <gold>" + BuildInfo.getAuthor() + " <light_purple>on <gold>" + BuildInfo.getDate()));
+        send(sender, mmString("<light_purple>Run <gold>/plex modules <light_purple>to see a list of modules."));
+        plugin.getUpdateChecker().getUpdateStatusMessage(sender, true, 2);
+    }
+}

server/src/main/java/dev/plex/config/Config.java

@@ -2,10 +2,11 @@ package dev.plex.config;
 
 import dev.plex.Plex;
 import dev.plex.util.PlexLog;
+import org.bukkit.configuration.file.YamlConfiguration;
+
 import java.io.File;
 import java.io.InputStreamReader;
 import java.nio.charset.StandardCharsets;
-import org.bukkit.configuration.file.YamlConfiguration;
 
 /**
  * Creates a custom Config object

server/src/main/java/dev/plex/config/ModuleConfig.java

@@ -1,11 +1,12 @@
 package dev.plex.config;
 
 import dev.plex.module.PlexModule;
+import org.bukkit.configuration.InvalidConfigurationException;
+import org.bukkit.configuration.file.YamlConfiguration;
+
 import java.io.File;
 import java.io.IOException;
 import java.nio.file.Files;
-import org.bukkit.configuration.InvalidConfigurationException;
-import org.bukkit.configuration.file.YamlConfiguration;
 
 /**
  * Creates a custom Config object