Merge 87d94909bc into 315e16488b

Jenkinsfile

@@ -1,8 +1,5 @@
 pipeline {
     agent any
-    tools {
-        jdk 'JDK 21.0.7'
-    }
     stages {
         stage("build") {
             steps {
@@ -17,7 +14,6 @@ pipeline {
             archiveArtifacts artifacts: "build/libs/*.jar", fingerprint: true
             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
-            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.TF_WEBHOOK_URL
             cleanWs()
         }
     }

build.gradle.kts

@@ -1,13 +1,13 @@
 plugins {
     id("java")
     id("maven-publish")
-    id("org.jetbrains.gradle.plugin.idea-ext") version "1.1.10"
+    id("org.jetbrains.gradle.plugin.idea-ext") version "1.1.7"
     id("net.kyori.blossom") version "2.1.0"
-    id("com.gradleup.shadow") version "9.0.0-rc1"
+    id("com.github.johnrengelman.shadow") version "8.1.1"
 }
 
 group = "dev.plex"
-version = "1.5"
+version = "1.4-SNAPSHOT"
 description = "Plex"
 
 subprojects {
@@ -15,7 +15,7 @@ subprojects {
     apply(plugin = "maven-publish")
     apply(plugin = "org.jetbrains.gradle.plugin.idea-ext")
     apply(plugin = "net.kyori.blossom")
-    apply(plugin = "com.gradleup.shadow")
+    apply(plugin = "com.github.johnrengelman.shadow")
 
     repositories {
         maven {
@@ -26,6 +26,10 @@ subprojects {
             url = uri("https://repository.apache.org/content/repositories/snapshots/")
         }
 
+        maven {
+            url = uri("https://repo.maven.apache.org/maven2/")
+        }
+
         maven {
             url = uri("https://jitpack.io")
             content {
@@ -38,7 +42,7 @@ subprojects {
     }
 
     java {
-        toolchain.languageVersion.set(JavaLanguageVersion.of(21))
+        toolchain.languageVersion.set(JavaLanguageVersion.of(17))
     }
 
     tasks {
@@ -74,7 +78,7 @@ tasks.clean {
     })
 }
 
-tasks.register<Copy>("copyJars", fun Copy.() {
+tasks.create<Copy>("copyJars") {
     dependsOn(tasks.jar)
     duplicatesStrategy = DuplicatesStrategy.EXCLUDE
     from(subprojects.map {
@@ -84,4 +88,4 @@ tasks.register<Copy>("copyJars", fun Copy.() {
         it.project.tasks.jar
     })
     into(file("build/libs"))
-})
+}

gradle/wrapper/gradle-wrapper.properties

@@ -1,6 +1,6 @@
 distributionBase=GRADLE_USER_HOME
 distributionPath=wrapper/dists
-distributionUrl=https\://services.gradle.org/distributions/gradle-8.14.3-bin.zip
+distributionUrl=https\://services.gradle.org/distributions/gradle-8.5-bin.zip
 networkTimeout=10000
 validateDistributionUrl=true
 zipStoreBase=GRADLE_USER_HOME

gradlew

@@ -15,8 +15,6 @@
 # See the License for the specific language governing permissions and
 # limitations under the License.
 #
-# SPDX-License-Identifier: Apache-2.0
-#
 
 ##############################################################################
 #
@@ -57,7 +55,7 @@
 #       Darwin, MinGW, and NonStop.
 #
 #   (3) This script is generated from the Groovy template
-#       https://github.com/gradle/gradle/blob/HEAD/platforms/jvm/plugins-application/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/.
@@ -86,7 +84,7 @@ done
 # shellcheck disable=SC2034
 APP_BASE_NAME=${0##*/}
 # Discard cd standard output in case $CDPATH is set (https://github.com/gradle/gradle/issues/25036)
-APP_HOME=$( cd -P "${APP_HOME:-./}" > /dev/null && printf '%s\n' "$PWD" ) || exit
+APP_HOME=$( cd "${APP_HOME:-./}" > /dev/null && pwd -P ) || exit
 
 # Use the maximum available, or set MAX_FD != -1 to use that value.
 MAX_FD=maximum
@@ -205,7 +203,7 @@ fi
 DEFAULT_JVM_OPTS='"-Xmx64m" "-Xms64m"'
 
 # Collect all arguments for the java command:
-#   * DEFAULT_JVM_OPTS, JAVA_OPTS, and optsEnvironmentVar are not allowed to contain shell fragments,
+#   * DEFAULT_JVM_OPTS, JAVA_OPTS, JAVA_OPTS, and optsEnvironmentVar are not allowed to contain shell fragments,
 #     and any embedded shellness will be escaped.
 #   * For example: A user cannot expect ${Hostname} to be expanded, as it is an environment variable and will be
 #     treated as '${Hostname}' itself on the command line.

gradlew.bat

@@ -13,8 +13,6 @@
 @rem See the License for the specific language governing permissions and
 @rem limitations under the License.
 @rem
-@rem SPDX-License-Identifier: Apache-2.0
-@rem
 
 @if "%DEBUG%"=="" @echo off
 @rem ##########################################################################
@@ -45,11 +43,11 @@ set JAVA_EXE=java.exe
 %JAVA_EXE% -version >NUL 2>&1
 if %ERRORLEVEL% equ 0 goto execute
 
-echo. 1>&2
-echo ERROR: JAVA_HOME is not set and no 'java' command could be found in your PATH. 1>&2
-echo. 1>&2
-echo Please set the JAVA_HOME variable in your environment to match the 1>&2
-echo location of your Java installation. 1>&2
+echo.
+echo ERROR: JAVA_HOME is not set and no 'java' command could be found in your PATH.
+echo.
+echo Please set the JAVA_HOME variable in your environment to match the
+echo location of your Java installation.
 
 goto fail
 
@@ -59,11 +57,11 @@ set JAVA_EXE=%JAVA_HOME%/bin/java.exe
 
 if exist "%JAVA_EXE%" goto execute
 
-echo. 1>&2
-echo ERROR: JAVA_HOME is set to an invalid directory: %JAVA_HOME% 1>&2
-echo. 1>&2
-echo Please set the JAVA_HOME variable in your environment to match the 1>&2
-echo location of your Java installation. 1>&2
+echo.
+echo ERROR: JAVA_HOME is set to an invalid directory: %JAVA_HOME%
+echo.
+echo Please set the JAVA_HOME variable in your environment to match the
+echo location of your Java installation.
 
 goto fail
 

proxy/build.gradle.kts

@@ -39,9 +39,9 @@ publishing {
 }
 
 dependencies {
-    compileOnly("org.projectlombok:lombok:1.18.38")
-    annotationProcessor("org.projectlombok:lombok:1.18.38")
-    compileOnly("org.json:json:20250107")
-    compileOnly("com.velocitypowered:velocity-api:3.4.0-SNAPSHOT")
-    annotationProcessor("com.velocitypowered:velocity-api:3.4.0-SNAPSHOT")
+    compileOnly("org.projectlombok:lombok:1.18.30")
+    annotationProcessor("org.projectlombok:lombok:1.18.30")
+    compileOnly("org.json:json:20231013")
+    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;

server/build.gradle.kts

@@ -5,7 +5,7 @@ import java.util.*
 
 plugins {
     id("net.kyori.indra.git") version "3.1.3"
-    id("de.eldoria.plugin-yml.paper") version "0.7.1"
+    id("net.minecrell.plugin-yml.paper") version "0.6.0"
 }
 
 repositories {
@@ -14,27 +14,28 @@ repositories {
 }
 
 dependencies {
-    library("org.projectlombok:lombok:1.18.38")
-    library("org.json:json:20250107")
-    library("commons-io:commons-io:2.19.0")
-    library("redis.clients:jedis:6.0.0")
-    library("org.mariadb.jdbc:mariadb-java-client:3.5.4")
-    library("com.zaxxer:HikariCP:6.3.0")
-    library("org.apache.maven.resolver:maven-resolver-transport-http:1.9.24")
-    library("org.jetbrains:annotations:26.0.2")
-    compileOnly("io.papermc.paper:paper-api:1.21.7-R0.1-SNAPSHOT")
+    library("org.projectlombok:lombok:1.18.30")
+    library("org.json:json:20231013")
+    library("commons-io:commons-io:2.15.1")
+    library("redis.clients:jedis:5.1.0")
+    library("org.mariadb.jdbc:mariadb-java-client:3.3.1")
+    library("com.zaxxer:HikariCP:5.1.0")
+    library("org.apache.maven.resolver:maven-resolver-transport-http:1.9.18")
+    library("org.jetbrains:annotations:24.1.0")
+
+    compileOnly("dev.folia:folia-api:1.20.2-R0.1-SNAPSHOT")
     compileOnly("com.github.MilkBowl:VaultAPI:1.7.1") {
         exclude("org.bukkit", "bukkit")
     }
-    compileOnly("net.coreprotect:coreprotect:22.4")
+    compileOnly("net.coreprotect:coreprotect:22.2")
     compileOnly("network.darkhelmet.prism:Prism-Api:1.0.0")
-    compileOnly("com.github.LeonMangler:SuperVanish:6.2.19")
 
-    implementation("org.bstats:bstats-base:3.1.0")
-    implementation("org.bstats:bstats-bukkit:3.1.0")
+    implementation("org.bstats:bstats-base:3.0.2")
+    implementation("org.bstats:bstats-bukkit:3.0.2")
 
+    implementation("com.github.LeonMangler:SuperVanish:6.2.18-3")
 
-    annotationProcessor("org.projectlombok:lombok:1.18.38")
+    annotationProcessor("org.projectlombok:lombok:1.18.30")
 }
 
 group = rootProject.group
@@ -49,7 +50,7 @@ paper {
     loader = "dev.plex.PlexLibraryManager"
     website = "https://plex.us.org"
     authors = listOf("Telesphoreo", "taahanis", "supernt")
-    apiVersion = "1.21"
+    apiVersion = "1.19"
     foliaSupported = true
     generateLibrariesJson = true
     // Load BukkitTelnet and LibsDisguises before Plex so the modules register properly

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

@@ -109,6 +109,7 @@ public class Plex extends JavaPlugin
         commands.load(false);
 
         sqlConnection = new SQLConnection();
+//        mongoConnection = new MongoConnection();
         redisConnection = new RedisConnection();
 
         playerCache = new PlayerCache();
@@ -152,13 +153,6 @@ public class Plex extends JavaPlugin
             PlexLog.debug("Not hooking into Prism");
         }
 
-        if (PlexUtils.hasVanishPlugin())
-        {
-            PlexLog.log("Hooked into SuperVanish / PremiumVanish!");
-        } else {
-            PlexLog.debug("Not hooking into SuperVanish / PremiumVanish");
-        }
-
         updateChecker = new UpdateChecker();
         PlexLog.log("Update checking enabled");
 

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

@@ -4,6 +4,10 @@ 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;
@@ -13,11 +17,6 @@ import java.util.List;
 import java.util.Map;
 import java.util.stream.Stream;
 
-import org.eclipse.aether.artifact.DefaultArtifact;
-import org.eclipse.aether.graph.Dependency;
-import org.eclipse.aether.repository.RemoteRepository;
-import org.jetbrains.annotations.NotNull;
-
 public class PlexLibraryManager implements PluginLoader
 {
     @Override
@@ -30,9 +29,9 @@ public class PlexLibraryManager implements PluginLoader
         // The plugin is null, a hacky way to check whether to load Jetty or not
         if (new File("plugins/Plex/modules/Module-HTTPD.jar").isFile())
         {
-            resolver.addDependency(new Dependency(new DefaultArtifact("org.eclipse.jetty:jetty-server:12.0.14"), null));
-            resolver.addDependency(new Dependency(new DefaultArtifact("org.eclipse.jetty.ee10:jetty-ee10-servlet:12.0.14"), null));
-            resolver.addDependency(new Dependency(new DefaultArtifact("org.eclipse.jetty:jetty-proxy:12.0.14"), null));
+            resolver.addDependency(new Dependency(new DefaultArtifact("org.eclipse.jetty:jetty-server:11.0.19"), null));
+            resolver.addDependency(new Dependency(new DefaultArtifact("org.eclipse.jetty:jetty-servlet:11.0.19"), null));
+            resolver.addDependency(new Dependency(new DefaultArtifact("org.eclipse.jetty:jetty-proxy:11.0.19"), null));
         }
         classpathBuilder.addLibrary(resolver);
     }
@@ -41,12 +40,7 @@ public class PlexLibraryManager implements PluginLoader
     {
         try (var in = getClass().getResourceAsStream("/paper-libraries.json"))
         {
-            PluginLibraries libraries = new Gson().fromJson(new InputStreamReader(in, StandardCharsets.UTF_8), PluginLibraries.class);
-
-            // Patch the MavenRepo to use the default mirror
-            libraries.repositories.put("MavenRepo", MavenLibraryResolver.MAVEN_CENTRAL_DEFAULT_MIRROR);
-
-            return libraries;
+            return new Gson().fromJson(new InputStreamReader(in, StandardCharsets.UTF_8), PluginLibraries.class);
         }
         catch (IOException e)
         {
@@ -58,12 +52,14 @@ public class PlexLibraryManager implements PluginLoader
     {
         public Stream<Dependency> asDependencies()
         {
-            return dependencies.stream().map(d -> new Dependency(new DefaultArtifact(d), null));
+            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());
+            return repositories.entrySet().stream()
+                    .map(e -> new RemoteRepository.Builder(e.getKey(), "default", e.getValue()).build());
         }
     }
 }

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

@@ -2,6 +2,8 @@ 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

@@ -2,6 +2,7 @@ package dev.plex.cache;
 
 import com.google.common.collect.Maps;
 import dev.plex.player.PlexPlayer;
+
 import java.util.Map;
 import java.util.UUID;
 

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

@@ -5,34 +5,27 @@ 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.util.PlexLog;
 import dev.plex.util.PlexUtils;
-import java.util.Arrays;
-import java.util.List;
-import java.util.UUID;
 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.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.bukkit.util.StringUtil;
 import org.jetbrains.annotations.NotNull;
 import org.jetbrains.annotations.Nullable;
 
+import java.util.Arrays;
+import java.util.List;
+import java.util.UUID;
+
 /**
  * Superclass for all commands
  */

server/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;
 

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/AdminChatCMD.java

@@ -10,9 +10,6 @@ import dev.plex.util.PlexLog;
 import dev.plex.util.PlexUtils;
 import dev.plex.util.minimessage.SafeMiniMessage;
 import dev.plex.util.redis.MessageUtil;
-import java.util.Collections;
-import java.util.List;
-import java.util.UUID;
 import net.kyori.adventure.text.Component;
 import org.apache.commons.lang3.BooleanUtils;
 import org.apache.commons.lang3.StringUtils;
@@ -21,6 +18,10 @@ import org.bukkit.entity.Player;
 import org.jetbrains.annotations.NotNull;
 import org.jetbrains.annotations.Nullable;
 
+import java.util.Collections;
+import java.util.List;
+import java.util.UUID;
+
 @CommandPermissions(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

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

@@ -4,8 +4,6 @@ import dev.plex.command.PlexCommand;
 import dev.plex.command.annotation.CommandParameters;
 import dev.plex.command.annotation.CommandPermissions;
 import dev.plex.command.source.RequiredCommandSource;
-import java.util.Collections;
-import java.util.List;
 import net.kyori.adventure.text.Component;
 import org.bukkit.Bukkit;
 import org.bukkit.Location;
@@ -14,6 +12,9 @@ import org.bukkit.entity.Player;
 import org.jetbrains.annotations.NotNull;
 import org.jetbrains.annotations.Nullable;
 
+import java.util.Collections;
+import java.util.List;
+
 @CommandPermissions(permission = "plex.adminworld", source = RequiredCommandSource.IN_GAME)
 @CommandParameters(name = "adminworld", aliases = "aw", description = "Teleport to the adminworld")
 public class AdminworldCMD extends PlexCommand

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

@@ -8,7 +8,6 @@ import dev.plex.command.exception.CommandFailException;
 import dev.plex.command.source.RequiredCommandSource;
 import dev.plex.event.GameModeUpdateEvent;
 import dev.plex.util.PlexUtils;
-import java.util.List;
 import net.kyori.adventure.text.Component;
 import org.bukkit.Bukkit;
 import org.bukkit.GameMode;
@@ -17,6 +16,8 @@ import org.bukkit.entity.Player;
 import org.jetbrains.annotations.NotNull;
 import org.jetbrains.annotations.Nullable;
 
+import java.util.List;
+
 @CommandPermissions(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

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

@@ -13,11 +13,17 @@ import dev.plex.util.BungeeUtil;
 import dev.plex.util.PlexLog;
 import dev.plex.util.PlexUtils;
 import dev.plex.util.TimeUtils;
+import java.time.Instant;
 import java.time.ZoneId;
 import java.time.ZonedDateTime;
 import java.util.Collections;
 import java.util.List;
+import java.util.concurrent.ExecutionException;
+import java.util.concurrent.Future;
 import net.kyori.adventure.text.Component;
+import network.darkhelmet.prism.api.PrismParameters;
+import network.darkhelmet.prism.api.Result;
+import network.darkhelmet.prism.api.actions.PrismProcessType;
 import org.apache.commons.lang3.StringUtils;
 import org.bukkit.Bukkit;
 import org.bukkit.command.CommandSender;
@@ -25,7 +31,7 @@ import org.bukkit.entity.Player;
 import org.jetbrains.annotations.NotNull;
 import org.jetbrains.annotations.Nullable;
 
-@CommandParameters(name = "ban", usage = "/<command> <player> [reason] [-rb]", aliases = "offlineban,gtfo", description = "Bans a player, offline or online")
+@CommandParameters(name = "ban", usage = "/<command> <player> [reason] [-nrb]", aliases = "offlineban,gtfo", description = "Bans a player, offline or online")
 @CommandPermissions(permission = "plex.ban", source = RequiredCommandSource.ANY)
 
 public class BanCMD extends PlexCommand
@@ -57,17 +63,17 @@ public class BanCMD extends PlexCommand
             String reason;
             Punishment punishment = new Punishment(plexPlayer.getUuid(), getUUID(sender));
             punishment.setType(PunishmentType.BAN);
-            boolean rollBack = false;
+            boolean rollBack = true;
             if (args.length > 1)
             {
                 reason = StringUtils.join(args, " ", 1, args.length);
-                String newReason = StringUtils.normalizeSpace(reason.replace("-rb", ""));
-                punishment.setReason(newReason.trim().isEmpty() ? messageString("noReasonProvided") : newReason);
-                rollBack = reason.startsWith("-rb") || reason.endsWith("-rb");
+                String newReason = StringUtils.normalizeSpace(reason.replace("-nrb", ""));
+                punishment.setReason(newReason.trim().isEmpty() ? "No reason provided." : newReason);
+                rollBack = !reason.startsWith("-nrb") && !reason.endsWith("-nrb");
             }
             else
             {
-                punishment.setReason(messageString("noReasonProvided"));
+                punishment.setReason("No reason provided.");
             }
             punishment.setPunishedUsername(plexPlayer.getName());
             ZonedDateTime date = ZonedDateTime.now(ZoneId.of(TimeUtils.TIMEZONE));
@@ -88,7 +94,7 @@ public class BanCMD extends PlexCommand
 
             if (rollBack)
             {
-                /*if (plugin.getPrismHook() != null && plugin.getPrismHook().hasPrism())
+                if (plugin.getPrismHook() != null && plugin.getPrismHook().hasPrism())
                 {
                     PrismParameters parameters = plugin.getPrismHook().prismApi().createParameters();
                     parameters.addActionType("block-place");
@@ -113,10 +119,10 @@ public class BanCMD extends PlexCommand
                         }
                     });
                 }
-                else */
-                if (plugin.getCoreProtectHook() != null && plugin.getCoreProtectHook().hasCoreProtect())
+                else if (plugin.getCoreProtectHook() != null && plugin.getCoreProtectHook().hasCoreProtect())
                 {
-                    Bukkit.getAsyncScheduler().runNow(plugin, scheduledTask ->
+                    PlexLog.debug("Testing coreprotect");
+                    Bukkit.getGlobalRegionScheduler().run(plugin, scheduledTask ->
                     {
                         plugin.getCoreProtectHook().coreProtectAPI().performRollback(86400, Collections.singletonList(plexPlayer.getName()), null, null, null, null, 0, null);
                     });
@@ -134,9 +140,9 @@ public class BanCMD extends PlexCommand
         {
             return PlexUtils.getPlayerNameList();
         }
-        if (args.length > 1 && silentCheckPermission(sender, this.getPermission()))
+        if (args.length != 1 && silentCheckPermission(sender, this.getPermission()))
         {
-            return Collections.singletonList("-rb");
+            return Collections.singletonList("-nrb");
         }
         return Collections.emptyList();
     }

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

@@ -1,59 +0,0 @@
-package dev.plex.command.impl;
-
-import com.google.common.collect.ImmutableList;
-import dev.plex.command.PlexCommand;
-import dev.plex.command.annotation.CommandParameters;
-import dev.plex.command.annotation.CommandPermissions;
-import dev.plex.punishment.Punishment;
-import java.util.List;
-import java.util.stream.Collectors;
-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;
-
-@CommandParameters(name = "banlist", description = "Manages the banlist", usage = "/<command> [purge]")
-@CommandPermissions(permission = "plex.banlist")
-public class BanListCommand extends PlexCommand
-{
-    @Override
-    protected Component execute(@NotNull CommandSender sender, @Nullable Player player, @NotNull String[] args)
-    {
-        if (args.length == 0)
-        {
-            plugin.getPunishmentManager().getActiveBans().whenComplete((punishments, throwable) ->
-            {
-                send(sender, mmString("<gold>Active Bans (" + punishments.size() + "): <yellow>" + StringUtils.join(punishments.stream().map(Punishment::getPunishedUsername).collect(Collectors.toList()), ", ")));
-            });
-            return null;
-        }
-        if (args[0].equalsIgnoreCase("purge") || args[0].equalsIgnoreCase("clear"))
-        {
-            if (sender instanceof Player)
-            {
-                return messageComponent("noPermissionInGame");
-            }
-            if (!sender.getName().equalsIgnoreCase("console"))
-            {
-                if (!checkPermission(sender, "plex.banlist.clear"))
-                {
-                    return null;
-                }
-            }
-            plugin.getPunishmentManager().getActiveBans().whenComplete((punishments, throwable) ->
-            {
-                punishments.forEach(plugin.getPunishmentManager()::unban);
-                send(sender, mmString("<gold>Unbanned " + punishments.size() + " players."));
-            });
-        }
-        return null;
-    }
-
-    @Override
-    public @NotNull List<String> smartTabComplete(@NotNull CommandSender sender, @NotNull String alias, @NotNull String[] args) throws IllegalArgumentException
-    {
-        return args.length == 1 && silentCheckPermission(sender, "plex.banlist.clear") ? List.of("purge", "clear") : ImmutableList.of();
-    }
-}

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

@@ -1,58 +0,0 @@
-package dev.plex.command.impl;
-
-import com.google.common.collect.ImmutableList;
-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.PlayerNotFoundException;
-import dev.plex.command.source.RequiredCommandSource;
-import dev.plex.meta.PlayerMeta;
-import dev.plex.player.PlexPlayer;
-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;
-
-@CommandPermissions(permission = "plex.broadcastloginmessage", source = RequiredCommandSource.ANY)
-@CommandParameters(name = "bcastloginmessage", usage = "/<command> <player>", description = "Broadcast your login message (for vanish support)", aliases = "bcastlm")
-public class BcastLoginMessageCMD extends PlexCommand
-{
-    @Override
-    protected Component execute(@NotNull CommandSender sender, @Nullable Player playerSender, String[] args)
-    {
-        if (args.length == 0)
-        {
-            return usage();
-        }
-
-        PlexPlayer plexPlayer = DataUtils.getPlayer(args[0]);
-
-        if (plexPlayer == null)
-        {
-            throw new PlayerNotFoundException();
-        }
-
-        String loginMessage = PlayerMeta.getLoginMessage(plexPlayer);
-        if (!loginMessage.isEmpty())
-        {
-            PlexUtils.broadcast(PlexUtils.stringToComponent(loginMessage));
-            PlexUtils.broadcast(messageComponent("loginMessage", plexPlayer.getName()));
-        }
-        else
-        {
-            return mmString("<red>This player does not have a login message.");
-        }
-
-        return null;
-    }
-
-    @Override
-    public @NotNull List<String> smartTabComplete(@NotNull CommandSender sender, @NotNull String alias, @NotNull String[] args) throws IllegalArgumentException
-    {
-        return args.length == 1 && silentCheckPermission(sender, this.getPermission()) ? PlexUtils.getPlayerNameList() : ImmutableList.of();
-    }
-}

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

@@ -5,10 +5,6 @@ import dev.plex.command.annotation.CommandParameters;
 import dev.plex.command.annotation.CommandPermissions;
 import dev.plex.listener.impl.BlockListener;
 import dev.plex.util.PlexUtils;
-import java.util.ArrayList;
-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.command.CommandSender;
@@ -16,6 +12,11 @@ import org.bukkit.entity.Player;
 import org.jetbrains.annotations.NotNull;
 import org.jetbrains.annotations.Nullable;
 
+import java.util.ArrayList;
+import java.util.Arrays;
+import java.util.Collections;
+import java.util.List;
+
 @CommandPermissions(permission = "plex.blockedit")
 @CommandParameters(name = "blockedit", usage = "/<command> [list | purge | all | <player>]", aliases = "bedit", description = "Prevent players from modifying blocks")
 public class BlockEditCMD extends PlexCommand

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

@@ -6,14 +6,15 @@ import dev.plex.command.annotation.CommandParameters;
 import dev.plex.command.annotation.CommandPermissions;
 import dev.plex.command.source.RequiredCommandSource;
 import dev.plex.player.PlexPlayer;
-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(permission = "plex.commandspy", source = RequiredCommandSource.IN_GAME)
 @CommandParameters(name = "commandspy", aliases = "cmdspy", description = "Spy on other player's commands")
 public class CommandSpyCMD extends PlexCommand

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

@@ -5,8 +5,6 @@ import dev.plex.command.annotation.CommandParameters;
 import dev.plex.command.annotation.CommandPermissions;
 import dev.plex.command.source.RequiredCommandSource;
 import dev.plex.util.PlexUtils;
-import java.util.Collections;
-import java.util.List;
 import net.kyori.adventure.text.Component;
 import org.apache.commons.lang3.StringUtils;
 import org.bukkit.command.CommandSender;
@@ -14,6 +12,9 @@ import org.bukkit.entity.Player;
 import org.jetbrains.annotations.NotNull;
 import org.jetbrains.annotations.Nullable;
 
+import java.util.Collections;
+import java.util.List;
+
 @CommandPermissions(permission = "plex.consolesay", source = RequiredCommandSource.CONSOLE)
 @CommandParameters(name = "consolesay", usage = "/<command> <message>", description = "Displays a message to everyone", aliases = "csay")
 public class ConsoleSayCMD extends PlexCommand

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

@@ -8,7 +8,6 @@ import dev.plex.command.exception.CommandFailException;
 import dev.plex.command.source.RequiredCommandSource;
 import dev.plex.event.GameModeUpdateEvent;
 import dev.plex.util.PlexUtils;
-import java.util.List;
 import net.kyori.adventure.text.Component;
 import org.bukkit.Bukkit;
 import org.bukkit.GameMode;
@@ -17,6 +16,8 @@ import org.bukkit.entity.Player;
 import org.jetbrains.annotations.NotNull;
 import org.jetbrains.annotations.Nullable;
 
+import java.util.List;
+
 @CommandPermissions(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

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

@@ -8,10 +8,8 @@ import dev.plex.menu.impl.MaterialMenu;
 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;
 import org.bukkit.World;
 import org.bukkit.command.Command;
@@ -20,6 +18,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(permission = "plex.debug")
 public class DebugCMD extends PlexCommand
@@ -39,9 +41,9 @@ public class DebugCMD extends PlexCommand
                 if (plugin.getRedisConnection().getJedis().exists(player.getUniqueId().toString()))
                 {
                     plugin.getRedisConnection().getJedis().del(player.getUniqueId().toString());
-                    return messageComponent("redisResetSuccessful", player.getName());
+                    return componentFromString("Successfully reset " + player.getName() + "'s Redis punishments!").color(NamedTextColor.YELLOW);
                 }
-                return messageComponent("redisResetPlayerNotFound");
+                return componentFromString("Couldn't find player in Redis punishments.");
             }
         }
         if (args[0].equalsIgnoreCase("gamerules"))
@@ -60,7 +62,7 @@ public class DebugCMD extends PlexCommand
                     PlexLog.log("Set specific gamerules for world: " + world.toLowerCase(Locale.ROOT));
                 }
             }
-            return messageComponent("reappliedGamerules");
+            return mmString("<aqua>Re-applied game all the game rules!");
         }
         if (args[0].equalsIgnoreCase("aliases"))
         {
@@ -70,9 +72,9 @@ public class DebugCMD extends PlexCommand
                 Command command = plugin.getServer().getCommandMap().getCommand(commandName);
                 if (command == null)
                 {
-                    return messageComponent("commandNotFound");
+                    return mmString("<red>That command could not be found!");
                 }
-                return messageComponent("commandAliases", commandName, Arrays.toString(command.getAliases().toArray(new String[0])));
+                return mmString("<aqua>Aliases for " + commandName + " are: " + Arrays.toString(command.getAliases().toArray(new String[0])));
             }
         }
         if (args[0].equalsIgnoreCase("pagination"))

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

@@ -6,12 +6,6 @@ import dev.plex.command.annotation.CommandPermissions;
 import dev.plex.command.source.RequiredCommandSource;
 import dev.plex.util.PlexLog;
 import dev.plex.util.PlexUtils;
-import java.util.ArrayList;
-import java.util.Arrays;
-import java.util.Collections;
-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;
@@ -22,6 +16,8 @@ import org.bukkit.entity.Player;
 import org.jetbrains.annotations.NotNull;
 import org.jetbrains.annotations.Nullable;
 
+import java.util.*;
+
 @CommandPermissions(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> [entity] [radius]", aliases = "ew,rd")
 public class EntityWipeCMD extends PlexCommand
@@ -138,7 +134,7 @@ public class EntityWipeCMD extends PlexCommand
         }
         catch (NumberFormatException ex)
         {
-            sender.sendMessage(messageComponent("notANumber", string));
+            sender.sendMessage(mmString("<red>" + string + "<red> is not a valid number!"));
         }
         return null;
     }

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

@@ -4,8 +4,6 @@ import dev.plex.command.PlexCommand;
 import dev.plex.command.annotation.CommandParameters;
 import dev.plex.command.annotation.CommandPermissions;
 import dev.plex.command.source.RequiredCommandSource;
-import java.util.Collections;
-import java.util.List;
 import net.kyori.adventure.text.Component;
 import org.bukkit.Bukkit;
 import org.bukkit.Location;
@@ -14,6 +12,9 @@ import org.bukkit.entity.Player;
 import org.jetbrains.annotations.NotNull;
 import org.jetbrains.annotations.Nullable;
 
+import java.util.Collections;
+import java.util.List;
+
 @CommandPermissions(permission = "plex.flatlands", source = RequiredCommandSource.IN_GAME)
 @CommandParameters(name = "flatlands", description = "Teleport to the flatlands")
 public class FlatlandsCMD extends PlexCommand

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

@@ -9,15 +9,16 @@ import dev.plex.punishment.Punishment;
 import dev.plex.punishment.PunishmentType;
 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(permission = "plex.freeze")
 public class FreezeCMD extends PlexCommand

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

@@ -7,9 +7,6 @@ import dev.plex.command.exception.CommandFailException;
 import dev.plex.command.source.RequiredCommandSource;
 import dev.plex.event.GameModeUpdateEvent;
 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;
@@ -18,6 +15,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(permission = "plex.gamemode", source = RequiredCommandSource.ANY)
 public class GamemodeCMD extends PlexCommand

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

@@ -13,9 +13,6 @@ import dev.plex.punishment.PunishmentType;
 import dev.plex.util.BungeeUtil;
 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.apache.commons.lang3.StringUtils;
 import org.bukkit.Bukkit;
@@ -24,6 +21,10 @@ 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 = "kick", description = "Kicks a player", usage = "/<command> <player>")
 @CommandPermissions(permission = "plex.kick", source = RequiredCommandSource.ANY)
 public class KickCMD extends PlexCommand
@@ -37,7 +38,7 @@ public class KickCMD extends PlexCommand
         }
 
         PlexPlayer plexPlayer = DataUtils.getPlayer(args[0]);
-        String reason = messageString("noReasonProvided");
+        String reason = "No reason provided";
 
         if (plexPlayer == null)
         {

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

@@ -6,9 +6,6 @@ import dev.plex.command.annotation.CommandParameters;
 import dev.plex.command.annotation.CommandPermissions;
 import dev.plex.hook.VaultHook;
 import dev.plex.meta.PlayerMeta;
-import dev.plex.util.PlexUtils;
-import java.util.Collections;
-import java.util.List;
 import net.kyori.adventure.text.Component;
 import net.kyori.adventure.text.format.NamedTextColor;
 import org.bukkit.Bukkit;
@@ -17,7 +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", usage = "/<command> [-d | -v]", aliases = "lsit,who,playerlist,online")
+import java.util.Collections;
+import java.util.List;
+
+@CommandParameters(name = "list", description = "Show a list of all online players", usage = "/<command> [-d]", aliases = "lsit,who,playerlist,online")
 @CommandPermissions(permission = "plex.list")
 public class ListCMD extends PlexCommand
 {
@@ -25,17 +25,19 @@ public class ListCMD extends PlexCommand
     protected Component execute(@NotNull CommandSender sender, @Nullable Player playerSender, String[] args)
     {
         List<Player> players = Lists.newArrayList(Bukkit.getOnlinePlayers());
-        if (args.length > 0 && args[0].equalsIgnoreCase("-v"))
-        {
-            checkPermission(sender, "plex.list.vanished");
-            players.removeIf(player -> !PlayerMeta.isVanished(player));
-        }
-        else
-        {
         players.removeIf(PlayerMeta::isVanished);
-        }
         Component list = Component.empty();
-        Component header = PlexUtils.messageComponent(players.size() == 1 ? "listHeader" : "listHeaderPlural", players.size(), Bukkit.getMaxPlayers());
+        Component header = Component.text("There " + (players.size() == 1 ? "is" : "are") + " currently").color(NamedTextColor.GRAY)
+                .append(Component.space())
+                .append(Component.text(players.size()).color(NamedTextColor.YELLOW))
+                .append(Component.space())
+                .append(Component.text(players.size() == 1 ? "player" : "players").color(NamedTextColor.GRAY))
+                .append(Component.space())
+                .append(Component.text("online out of").color(NamedTextColor.GRAY))
+                .append(Component.space())
+                .append(Component.text(Bukkit.getMaxPlayers()).color(NamedTextColor.YELLOW))
+                .append(Component.space())
+                .append(Component.text(Bukkit.getMaxPlayers() == 1 ? "player." : "players.").color(NamedTextColor.GRAY));
         send(sender, header);
         if (players.isEmpty())
         {
@@ -69,7 +71,7 @@ public class ListCMD extends PlexCommand
     {
         if (args.length == 1 && silentCheckPermission(sender, this.getPermission()))
         {
-            return List.of("-d", "-v");
+            return Collections.singletonList("-d");
         }
         return Collections.emptyList();
     }

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

@@ -4,14 +4,16 @@ import dev.plex.command.PlexCommand;
 import dev.plex.command.annotation.CommandParameters;
 import dev.plex.command.annotation.CommandPermissions;
 import dev.plex.command.source.RequiredCommandSource;
-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;
+
 @CommandParameters(name = "localspawn", description = "Teleport to the spawnpoint of the world you are in")
 @CommandPermissions(permission = "plex.localspawn", source = RequiredCommandSource.IN_GAME)
 public class LocalSpawnCMD extends PlexCommand

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

@@ -6,13 +6,14 @@ import dev.plex.command.annotation.CommandParameters;
 import dev.plex.command.annotation.CommandPermissions;
 import dev.plex.player.PlexPlayer;
 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(permission = "plex.lockup")
 public class LockupCMD extends PlexCommand

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

@@ -4,8 +4,7 @@ import dev.plex.command.PlexCommand;
 import dev.plex.command.annotation.CommandParameters;
 import dev.plex.command.annotation.CommandPermissions;
 import dev.plex.command.source.RequiredCommandSource;
-import java.util.Collections;
-import java.util.List;
+
 import net.kyori.adventure.text.Component;
 import org.bukkit.Bukkit;
 import org.bukkit.Location;
@@ -14,6 +13,9 @@ import org.bukkit.entity.Player;
 import org.jetbrains.annotations.NotNull;
 import org.jetbrains.annotations.Nullable;
 
+import java.util.Collections;
+import java.util.List;
+
 @CommandPermissions(permission = "plex.masterbuilderworld", source = RequiredCommandSource.IN_GAME)
 @CommandParameters(name = "masterbuilderworld", aliases = "mbw", description = "Teleport to the Master Builder world")
 public class MasterbuilderworldCMD extends PlexCommand

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

@@ -1,95 +0,0 @@
-package dev.plex.command.impl;
-
-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.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.Chunk;
-import org.bukkit.command.CommandSender;
-import org.bukkit.entity.LivingEntity;
-import org.bukkit.entity.Player;
-import org.jetbrains.annotations.NotNull;
-import org.jetbrains.annotations.Nullable;
-
-@CommandParameters(name = "moblimit", usage = "/<command> [on | off | setmax <limit>]", aliases = "entitylimit", description = "Manages the mob limit per chunk.")
-@CommandPermissions(permission = "plex.moblimit", source = RequiredCommandSource.ANY)
-public class MobLimitCMD extends PlexCommand
-{
-    @Override
-    protected Component execute(@NotNull CommandSender sender, @Nullable Player playerSender, String[] args)
-    {
-        if (args.length == 0)
-        {
-            Chunk chunk = playerSender != null ? playerSender.getLocation().getChunk() : Bukkit.getWorlds().get(0).getChunkAt(0, 0);
-
-            int currentLimit = plugin.config.getInt("entity_limit.max_mobs_per_chunk");
-            int currentMobCount = (int) Arrays.stream(chunk.getEntities())
-                    .filter(entity -> entity instanceof LivingEntity && !(entity instanceof Player))
-                    .count();
-
-            String status = plugin.config.getBoolean("entity_limit.mob_limit_enabled") ? "<green>Enabled" : "<red>Disabled";
-            return PlexUtils.messageComponent("mobLimitStatus", status, currentMobCount, currentLimit, chunk.getX(), chunk.getZ());
-        }
-
-        switch (args[0].toLowerCase())
-        {
-            case "on":
-                plugin.config.set("entity_limit.mob_limit_enabled", true);
-                plugin.config.save();
-                return PlexUtils.messageComponent("mobLimitToggle", "enabled");
-            case "off":
-                plugin.config.set("entity_limit.mob_limit_enabled", false);
-                plugin.config.save();
-                return PlexUtils.messageComponent("mobLimitToggle", "disabled");
-            case "setmax":
-                try
-                {
-                    if (args.length != 2) return usage();
-
-                    int newLimit = Integer.parseInt(args[1]);
-                    if (newLimit < 0) throw new NumberFormatException();
-
-                    int limitCeiling = plugin.config.getInt("entity_limit.mob_limit_ceiling");
-                    if (newLimit > limitCeiling)
-                    {
-                        newLimit = limitCeiling;
-                        sender.sendMessage(PlexUtils.messageComponent("mobLimitCeiling"));
-                    }
-
-                    plugin.config.set("entity_limit.max_mobs_per_chunk", newLimit);
-                    plugin.config.save();
-                    return PlexUtils.messageComponent("mobLimitSet", newLimit);
-                }
-                catch (NumberFormatException e)
-                {
-                    return PlexUtils.messageComponent("unableToParseNumber", args[1]);
-                }
-            default:
-                return usage();
-        }
-    }
-
-    @Override
-    public @NotNull List<String> smartTabComplete(@NotNull CommandSender sender, @NotNull String alias, @NotNull String[] args) throws IllegalArgumentException
-    {
-        if (silentCheckPermission(sender, this.getPermission()))
-        {
-            if (args.length == 1)
-            {
-                return Arrays.asList("on", "off", "setmax");
-            }
-            if (args.length == 2 && args[0].equals("setmax"))
-            {
-                return Collections.emptyList();
-            }
-            return Collections.emptyList();
-        }
-        return Collections.emptyList();
-    }
-}

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

@@ -6,10 +6,6 @@ import dev.plex.command.annotation.CommandPermissions;
 import dev.plex.command.source.RequiredCommandSource;
 import dev.plex.util.PlexLog;
 import dev.plex.util.PlexUtils;
-import java.util.ArrayList;
-import java.util.Arrays;
-import java.util.Collections;
-import java.util.List;
 import net.kyori.adventure.text.Component;
 import org.apache.commons.lang3.text.WordUtils;
 import org.bukkit.Bukkit;
@@ -22,6 +18,11 @@ import org.bukkit.entity.Player;
 import org.jetbrains.annotations.NotNull;
 import org.jetbrains.annotations.Nullable;
 
+import java.util.ArrayList;
+import java.util.Arrays;
+import java.util.Collections;
+import java.util.List;
+
 @CommandPermissions(permission = "plex.mobpurge", source = RequiredCommandSource.ANY)
 @CommandParameters(name = "mobpurge", description = "Purge all mobs.", usage = "/<command> [mob]", aliases = "mp")
 public class MobPurgeCMD extends PlexCommand

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

@@ -9,15 +9,16 @@ import dev.plex.punishment.Punishment;
 import dev.plex.punishment.PunishmentType;
 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(permission = "plex.mute")
 public class MuteCMD extends PlexCommand

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

@@ -8,13 +8,8 @@ import dev.plex.player.PlexPlayer;
 import dev.plex.punishment.extra.Note;
 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;
 import org.apache.commons.lang3.StringUtils;
 import org.bukkit.command.CommandSender;
@@ -22,6 +17,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(permission = "plex.notes")
 public class NotesCMD extends PlexCommand
@@ -122,11 +124,11 @@ public class NotesCMD extends PlexCommand
 
     private void readNotes(@NotNull CommandSender sender, PlexPlayer plexPlayer, List<Note> notes)
     {
-        AtomicReference<Component> noteList = new AtomicReference<>(messageComponent("notesHeader", plexPlayer.getName()));
+        AtomicReference<Component> noteList = new AtomicReference<>(Component.text("Player notes for: " + plexPlayer.getName()).color(NamedTextColor.GREEN));
         for (Note note : notes)
         {
-            Component noteLine = messageComponent("notePrefix", note.getId(), DataUtils.getPlayer(note.getWrittenBy()).getName(), TimeUtils.useTimezone(note.getTimestamp()));
-            noteLine = noteLine.append(messageComponent("noteLine", note.getNote()));
+            Component noteLine = mmString("<gold><!italic>" + note.getId() + " - Written by: " + DataUtils.getPlayer(note.getWrittenBy()).getName() + " on " + TimeUtils.useTimezone(note.getTimestamp()));
+            noteLine = noteLine.append(mmString("<newline><yellow># " + note.getNote()));
             noteList.set(noteList.get().append(Component.newline()));
             noteList.set(noteList.get().append(noteLine));
         }

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

@@ -10,10 +10,6 @@ import dev.plex.module.PlexModuleFile;
 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.lang3.StringUtils;
 import org.bukkit.Bukkit;
@@ -23,6 +19,11 @@ 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(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

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

@@ -11,7 +11,6 @@ import dev.plex.menu.impl.PunishedPlayerMenu;
 import dev.plex.menu.impl.PunishmentMenu;
 import dev.plex.player.PlexPlayer;
 import dev.plex.util.PlexUtils;
-import java.util.List;
 import net.kyori.adventure.text.Component;
 import org.bukkit.Bukkit;
 import org.bukkit.OfflinePlayer;
@@ -20,6 +19,8 @@ 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(permission = "plex.punishments", source = RequiredCommandSource.IN_GAME)
 public class PunishmentsCMD extends PlexCommand

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

@@ -4,9 +4,8 @@ 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.util.PlexUtils;
-import java.util.Collections;
-import java.util.List;
 import net.kyori.adventure.text.Component;
 import org.apache.commons.lang3.StringUtils;
 import org.bukkit.command.CommandSender;
@@ -14,6 +13,9 @@ import org.bukkit.entity.Player;
 import org.jetbrains.annotations.NotNull;
 import org.jetbrains.annotations.Nullable;
 
+import java.util.Collections;
+import java.util.List;
+
 @CommandPermissions(permission = "plex.rawsay", source = RequiredCommandSource.ANY)
 @CommandParameters(name = "rawsay", usage = "/<command> <message>", description = "Displays a raw message to everyone")
 public class RawSayCMD extends PlexCommand

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

@@ -8,13 +8,14 @@ import dev.plex.command.annotation.CommandPermissions;
 import dev.plex.command.source.RequiredCommandSource;
 import dev.plex.player.PlexPlayer;
 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(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

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

@@ -5,8 +5,6 @@ import dev.plex.command.annotation.CommandParameters;
 import dev.plex.command.annotation.CommandPermissions;
 import dev.plex.command.source.RequiredCommandSource;
 import dev.plex.util.PlexUtils;
-import java.util.Collections;
-import java.util.List;
 import net.kyori.adventure.text.Component;
 import org.apache.commons.lang3.StringUtils;
 import org.bukkit.command.CommandSender;
@@ -14,6 +12,9 @@ import org.bukkit.entity.Player;
 import org.jetbrains.annotations.NotNull;
 import org.jetbrains.annotations.Nullable;
 
+import java.util.Collections;
+import java.util.List;
+
 @CommandPermissions(permission = "plex.say", source = RequiredCommandSource.ANY)
 @CommandParameters(name = "say", usage = "/<command> <message>", description = "Displays a message to everyone")
 public class SayCMD extends PlexCommand

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

@@ -10,7 +10,6 @@ import dev.plex.command.source.RequiredCommandSource;
 import dev.plex.player.PlexPlayer;
 import dev.plex.util.PlexLog;
 import dev.plex.util.PlexUtils;
-import java.util.List;
 import net.kyori.adventure.text.Component;
 import net.kyori.adventure.text.minimessage.MiniMessage;
 import org.apache.commons.lang3.StringUtils;
@@ -19,6 +18,8 @@ import org.bukkit.entity.Player;
 import org.jetbrains.annotations.NotNull;
 import org.jetbrains.annotations.Nullable;
 
+import java.util.List;
+
 @CommandPermissions(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

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

@@ -9,11 +9,8 @@ import dev.plex.punishment.Punishment;
 import dev.plex.punishment.PunishmentType;
 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.lang3.ArrayUtils;
 import org.apache.commons.lang3.StringUtils;
@@ -25,6 +22,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(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
@@ -76,16 +78,21 @@ public class SmiteCMD extends PlexCommand
         final Player player = getNonNullPlayer(args[0]);
         final PlexPlayer plexPlayer = getPlexPlayer(player);
 
-        Title title = Title.title(messageComponent("smiteTitleHeader"), messageComponent("smiteTitleMessage", reason, sender.getName()));
+        Title title = Title.title(Component.text("You've been smitten.").color(NamedTextColor.RED), Component.text("Be sure to follow the rules!").color(NamedTextColor.YELLOW));
         player.showTitle(title);
 
         if (!silent)
         {
-            PlexUtils.broadcast(messageComponent("smiteBroadcast", player.getName(), reason != null ? reason : messageString("noReasonProvided"), sender.getName()));
+            PlexUtils.broadcast(mmString("<red>" + player.getName() + " has been a naughty, naughty boy."));
+            if (reason != null)
+            {
+                PlexUtils.broadcast(mmString("  <red>Reason: " + "<yellow>" + reason));
+            }
+            PlexUtils.broadcast(mmString("  <red>Smitten by: " + "<yellow>" + sender.getName()));
         }
         else
         {
-            send(sender, messageComponent("smittenQuietly", player.getName()));
+            send(sender, "Smitten " + player.getName() + " quietly.");
         }
 
         // Set gamemode to survival
@@ -122,8 +129,8 @@ public class SmiteCMD extends PlexCommand
         if (reason != null)
         {
             punishment.setReason(reason);
+            send(player, mmString("<red>You've been smitten. Reason: <yellow>" + reason));
         }
-        send(player, messageComponent("smitten", reason != null ? reason : messageString("noReasonProvided")));
         return null;
     }
 

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

@@ -7,8 +7,8 @@ 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.util.PlexUtils;
-import java.util.List;
 import net.kyori.adventure.text.Component;
 import org.bukkit.Bukkit;
 import org.bukkit.GameMode;
@@ -17,6 +17,8 @@ import org.bukkit.entity.Player;
 import org.jetbrains.annotations.NotNull;
 import org.jetbrains.annotations.Nullable;
 
+import java.util.List;
+
 @CommandPermissions(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

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

@@ -7,8 +7,8 @@ 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.util.PlexUtils;
-import java.util.List;
 import net.kyori.adventure.text.Component;
 import org.bukkit.Bukkit;
 import org.bukkit.GameMode;
@@ -17,6 +17,8 @@ import org.bukkit.entity.Player;
 import org.jetbrains.annotations.NotNull;
 import org.jetbrains.annotations.Nullable;
 
+import java.util.List;
+
 @CommandPermissions(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

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

@@ -7,9 +7,7 @@ import dev.plex.command.annotation.CommandPermissions;
 import dev.plex.command.source.RequiredCommandSource;
 import dev.plex.player.PlexPlayer;
 import dev.plex.util.PlexUtils;
-import java.util.Arrays;
-import java.util.Collections;
-import java.util.List;
+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;
@@ -20,6 +18,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;
+
 @CommandPermissions(permission = "plex.tag", source = RequiredCommandSource.ANY)
 @CommandParameters(name = "tag", aliases = "prefix", description = "Set or clear your prefix", usage = "/<command> <set <prefix> | clear <player>>")
 public class TagCMD extends PlexCommand

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

@@ -14,8 +14,6 @@ import dev.plex.util.BungeeUtil;
 import dev.plex.util.PlexLog;
 import dev.plex.util.PlexUtils;
 import dev.plex.util.TimeUtils;
-import java.util.Collections;
-import java.util.List;
 import net.kyori.adventure.text.Component;
 import org.apache.commons.lang3.StringUtils;
 import org.bukkit.Bukkit;
@@ -24,7 +22,10 @@ import org.bukkit.entity.Player;
 import org.jetbrains.annotations.NotNull;
 import org.jetbrains.annotations.Nullable;
 
-@CommandParameters(name = "tempban", usage = "/<command> <player> <time> [reason] [-rb]", description = "Temporarily ban a player")
+import java.util.Collections;
+import java.util.List;
+
+@CommandParameters(name = "tempban", usage = "/<command> <player> <time> [reason]", description = "Temporarily ban a player")
 @CommandPermissions(permission = "plex.tempban", source = RequiredCommandSource.ANY)
 
 public class TempbanCMD extends PlexCommand
@@ -52,17 +53,17 @@ public class TempbanCMD extends PlexCommand
         }
         Punishment punishment = new Punishment(target.getUuid(), getUUID(sender));
         punishment.setType(PunishmentType.TEMPBAN);
-        boolean rollBack = false;
+        boolean rollBack = true;
         if (args.length > 2)
         {
             reason = StringUtils.join(args, " ", 2, args.length);
             String newReason = StringUtils.normalizeSpace(reason.replace("-nrb", ""));
-            punishment.setReason(newReason.trim().isEmpty() ? messageString("noReasonProvided") : newReason);
-            rollBack = reason.startsWith("-rb") || reason.endsWith("-rb");
+            punishment.setReason(newReason.trim().isEmpty() ? "No reason provided." : newReason);
+            rollBack = !reason.startsWith("-nrb") && !reason.endsWith("-nrb");
         }
         else
         {
-            punishment.setReason(messageString("noReasonProvided"));
+            punishment.setReason("No reason provided.");
         }
         punishment.setPunishedUsername(target.getName());
         punishment.setEndDate(TimeUtils.createDate(args[1]));

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

@@ -1,91 +0,0 @@
-package dev.plex.command.impl;
-
-import com.google.common.collect.ImmutableList;
-import dev.plex.command.PlexCommand;
-import dev.plex.command.annotation.CommandParameters;
-import dev.plex.command.annotation.CommandPermissions;
-import dev.plex.player.PlexPlayer;
-import dev.plex.punishment.Punishment;
-import dev.plex.punishment.PunishmentType;
-import dev.plex.util.PlexUtils;
-import dev.plex.util.TimeUtils;
-import java.time.ZonedDateTime;
-import java.util.Arrays;
-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;
-
-@CommandParameters(name = "tempmute", description = "Temporarily mute a player on the server",
-        usage = "/<command> <player> <time> [reason]", aliases = "tmute")
-@CommandPermissions(permission = "plex.tempmute")
-public class TempmuteCMD extends PlexCommand
-{
-    @Override
-    protected Component execute(@NotNull CommandSender sender, @Nullable Player playerSender, String[] args)
-    {
-        if (args.length < 2)
-        {
-            return usage();
-        }
-
-        Player player = getNonNullPlayer(args[0]);
-        PlexPlayer punishedPlayer = getOfflinePlexPlayer(player.getUniqueId());
-
-        if (punishedPlayer.isMuted())
-        {
-            return messageComponent("playerMuted");
-        }
-
-        if (silentCheckPermission(player, "plex.tempmute"))
-        {
-            send(sender, messageComponent("higherRankThanYou"));
-            return null;
-        }
-
-        ZonedDateTime endDate;
-        try
-        {
-            endDate = TimeUtils.createDate(args[1]);
-        }
-        catch (NumberFormatException e)
-        {
-            return messageComponent("invalidTimeFormat");
-        }
-
-        if (endDate.isBefore(ZonedDateTime.now()))
-        {
-            return messageComponent("timeMustBeFuture");
-        }
-
-        ZonedDateTime oneWeekFromNow = ZonedDateTime.now().plusWeeks(1);
-        if (endDate.isAfter(oneWeekFromNow))
-        {
-            return messageComponent("maxTimeExceeded");
-        }
-
-        final String reason = args.length >= 3 ? String.join(" ", Arrays.copyOfRange(args, 2, args.length))
-                : messageString("noReasonProvided");
-
-        Punishment punishment = new Punishment(punishedPlayer.getUuid(), getUUID(sender));
-        punishment.setCustomTime(true);
-        punishment.setEndDate(endDate);
-        punishment.setType(PunishmentType.MUTE);
-        punishment.setPunishedUsername(player.getName());
-        punishment.setIp(player.getAddress().getAddress().getHostAddress().trim());
-        punishment.setReason(reason);
-        punishment.setActive(true);
-
-        plugin.getPunishmentManager().punish(punishedPlayer, punishment);
-        PlexUtils.broadcast(messageComponent("tempMutedPlayer", sender.getName(), player.getName(), TimeUtils.formatRelativeTime(endDate)));
-        return null;
-    }
-
-    @Override
-    public @NotNull List<String> smartTabComplete(@NotNull CommandSender sender, @NotNull String alias, @NotNull String[] args) throws IllegalArgumentException
-    {
-        return args.length == 1 && silentCheckPermission(sender, this.getPermission()) ? PlexUtils.getPlayerNameList() : ImmutableList.of();
-    }
-}

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

@@ -7,7 +7,6 @@ import dev.plex.command.annotation.CommandPermissions;
 import dev.plex.command.source.RequiredCommandSource;
 import dev.plex.menu.impl.ToggleMenu;
 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;
@@ -15,6 +14,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(permission = "plex.toggle", source = RequiredCommandSource.ANY)
 public class ToggleCMD extends PlexCommand
@@ -31,7 +32,6 @@ public class ToggleCMD extends PlexCommand
                 sender.sendMessage(PlexUtils.mmDeserialize("<gray>  - Fluidspread" + status("fluidspread")));
                 sender.sendMessage(PlexUtils.mmDeserialize("<gray>  - Drops" + status("drops")));
                 sender.sendMessage(PlexUtils.mmDeserialize("<gray>  - Redstone" + status("redstone")));
-                sender.sendMessage(PlexUtils.mmDeserialize("<gray>  - PVP" + status("pvp")));
                 sender.sendMessage(PlexUtils.mmDeserialize("<gray>  - Chat" + status("chat")));
                 return null;
             }
@@ -53,10 +53,6 @@ public class ToggleCMD extends PlexCommand
                 {
                     return toggle("redstone");
                 }
-                case "pvp" ->
-                {
-                    return toggle("pvp");
-                }
                 case "chat" ->
                 {
                     PlexUtils.broadcast(PlexUtils.messageComponent("chatToggled", sender.getName(), plugin.toggles.getBoolean("chat") ? "off" : "on"));

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

@@ -10,13 +10,14 @@ import dev.plex.command.exception.PlayerNotFoundException;
 import dev.plex.command.source.RequiredCommandSource;
 import dev.plex.player.PlexPlayer;
 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 = "unban", usage = "/<command> <player>", description = "Unbans a player, offline or online")
 @CommandPermissions(permission = "plex.ban", source = RequiredCommandSource.ANY)
 

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

@@ -10,13 +10,14 @@ import dev.plex.command.exception.PlayerNotFoundException;
 import dev.plex.player.PlexPlayer;
 import dev.plex.punishment.PunishmentType;
 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(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

@@ -10,13 +10,14 @@ import dev.plex.command.exception.PlayerNotFoundException;
 import dev.plex.player.PlexPlayer;
 import dev.plex.punishment.PunishmentType;
 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(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/WhoHasCMD.java

@@ -4,9 +4,6 @@ import com.google.common.collect.ImmutableList;
 import dev.plex.command.PlexCommand;
 import dev.plex.command.annotation.CommandParameters;
 import dev.plex.command.annotation.CommandPermissions;
-import java.util.Arrays;
-import java.util.Collections;
-import java.util.List;
 import net.kyori.adventure.text.Component;
 import net.kyori.adventure.text.JoinConfiguration;
 import net.kyori.adventure.text.TextComponent;
@@ -17,6 +14,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.Collections;
+
 @CommandPermissions(permission = "plex.whohas")
 @CommandParameters(name = "whohas", description = "Returns a list of players with a specific item in their inventory.", usage = "/<command> <material>", aliases = "wh")
 public class WhoHasCMD extends PlexCommand

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

@@ -6,9 +6,6 @@ import dev.plex.command.PlexCommand;
 import dev.plex.command.annotation.CommandParameters;
 import dev.plex.command.annotation.CommandPermissions;
 import dev.plex.command.source.RequiredCommandSource;
-import java.util.List;
-import java.util.UUID;
-import java.util.regex.Pattern;
 import net.kyori.adventure.text.Component;
 import org.bukkit.Bukkit;
 import org.bukkit.World;
@@ -17,6 +14,10 @@ import org.bukkit.entity.Player;
 import org.jetbrains.annotations.NotNull;
 import org.jetbrains.annotations.Nullable;
 
+import java.util.List;
+import java.util.UUID;
+import java.util.regex.Pattern;
+
 @CommandPermissions(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/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

server/src/main/java/dev/plex/hook/CoreProtectHook.java

@@ -1,10 +1,21 @@
 package dev.plex.hook;
 
 import dev.plex.Plex;
+import dev.plex.player.PlexPlayer;
 import dev.plex.util.PlexLog;
+import dev.plex.util.PlexUtils;
+import dev.plex.util.minimessage.SafeMiniMessage;
 import net.coreprotect.CoreProtect;
 import net.coreprotect.CoreProtectAPI;
+import net.kyori.adventure.text.Component;
+import net.milkbowl.vault.chat.Chat;
+import net.milkbowl.vault.permission.Permission;
+import org.bukkit.Bukkit;
+import org.bukkit.OfflinePlayer;
 import org.bukkit.plugin.Plugin;
+import org.bukkit.plugin.RegisteredServiceProvider;
+
+import java.util.UUID;
 
 public class CoreProtectHook
 {

server/src/main/java/dev/plex/hook/VaultHook.java

@@ -4,7 +4,6 @@ import dev.plex.player.PlexPlayer;
 import dev.plex.util.PlexLog;
 import dev.plex.util.PlexUtils;
 import dev.plex.util.minimessage.SafeMiniMessage;
-import java.util.UUID;
 import net.kyori.adventure.text.Component;
 import net.milkbowl.vault.chat.Chat;
 import net.milkbowl.vault.permission.Permission;
@@ -12,6 +11,8 @@ import org.bukkit.Bukkit;
 import org.bukkit.OfflinePlayer;
 import org.bukkit.plugin.RegisteredServiceProvider;
 
+import java.util.UUID;
+
 public class VaultHook
 {
     private static Chat CHAT;

server/src/main/java/dev/plex/listener/impl/AntiNukerListener.java

@@ -2,13 +2,14 @@ package dev.plex.listener.impl;
 
 import dev.plex.listener.PlexListener;
 import dev.plex.services.impl.TimingService;
-import dev.plex.util.PlexUtils;
-import java.util.UUID;
+import net.kyori.adventure.text.Component;
 import org.bukkit.event.EventHandler;
 import org.bukkit.event.EventPriority;
 import org.bukkit.event.block.BlockBreakEvent;
 import org.bukkit.event.block.BlockPlaceEvent;
 
+import java.util.UUID;
+
 public class AntiNukerListener extends PlexListener
 {
     @EventHandler(priority = EventPriority.HIGH)
@@ -18,7 +19,7 @@ public class AntiNukerListener extends PlexListener
         if (getCount(event.getPlayer().getUniqueId()) > 200L)
         {
             TimingService.strikes.merge(event.getPlayer().getUniqueId(), 1L, Long::sum);
-            event.getPlayer().kick(PlexUtils.messageComponent("nukerKickMessage"));
+            event.getPlayer().kick(Component.text("Please turn off your nuker!"));
             event.setCancelled(true);
         }
     }
@@ -30,7 +31,7 @@ public class AntiNukerListener extends PlexListener
         if (getCount(event.getPlayer().getUniqueId()) > 200L)
         {
             TimingService.strikes.merge(event.getPlayer().getUniqueId(), 1L, Long::sum);
-            event.getPlayer().kick(PlexUtils.messageComponent("nukerKickMessage"));
+            event.getPlayer().kick(Component.text("Please turn off your nuker!"));
             event.setCancelled(true);
         }
     }

server/src/main/java/dev/plex/listener/impl/AntiSpamListener.java

@@ -2,13 +2,15 @@ package dev.plex.listener.impl;
 
 import dev.plex.listener.PlexListener;
 import dev.plex.services.impl.TimingService;
-import dev.plex.util.PlexUtils;
 import io.papermc.paper.event.player.AsyncChatEvent;
-import java.util.UUID;
+import net.kyori.adventure.text.Component;
+import net.kyori.adventure.text.format.NamedTextColor;
 import org.bukkit.event.EventHandler;
 import org.bukkit.event.EventPriority;
 import org.bukkit.event.player.PlayerCommandPreprocessEvent;
 
+import java.util.UUID;
+
 public class AntiSpamListener extends PlexListener
 {
     @EventHandler
@@ -17,7 +19,7 @@ public class AntiSpamListener extends PlexListener
         TimingService.spamCooldown.merge(event.getPlayer().getUniqueId(), 1L, Long::sum);
         if (getCount(event.getPlayer().getUniqueId()) > 8L)
         {
-            event.getPlayer().sendMessage(PlexUtils.messageComponent("antiSpamMessage"));
+            event.getPlayer().sendMessage(Component.text("Please refrain from spamming messages.").color(NamedTextColor.GRAY));
             event.setCancelled(true);
         }
     }
@@ -28,7 +30,7 @@ public class AntiSpamListener extends PlexListener
         TimingService.spamCooldown.merge(event.getPlayer().getUniqueId(), 1L, Long::sum);
         if (getCount(event.getPlayer().getUniqueId()) > 8L)
         {
-            event.getPlayer().sendMessage(PlexUtils.messageComponent("antiSpamMessage"));
+            event.getPlayer().sendMessage(Component.text("Please refrain from spamming commands.").color(NamedTextColor.GRAY));
             event.setCancelled(true);
         }
     }

server/src/main/java/dev/plex/listener/impl/BlockListener.java

@@ -2,9 +2,6 @@ package dev.plex.listener.impl;
 
 import dev.plex.listener.PlexListener;
 import dev.plex.util.PlexUtils;
-import java.util.ArrayList;
-import java.util.Arrays;
-import java.util.List;
 import net.kyori.adventure.text.Component;
 import org.bukkit.Material;
 import org.bukkit.block.Block;
@@ -14,6 +11,10 @@ import org.bukkit.event.EventPriority;
 import org.bukkit.event.block.BlockBreakEvent;
 import org.bukkit.event.block.BlockPlaceEvent;
 
+import java.util.ArrayList;
+import java.util.Arrays;
+import java.util.List;
+
 public class BlockListener extends PlexListener
 {
     private static final List<Material> blockedBlocks = new ArrayList<>();

server/src/main/java/dev/plex/listener/impl/ChatListener.java

@@ -10,11 +10,6 @@ import dev.plex.util.minimessage.SafeMiniMessage;
 import dev.plex.util.redis.MessageUtil;
 import io.papermc.paper.chat.ChatRenderer;
 import io.papermc.paper.event.player.AsyncChatEvent;
-
-import java.util.UUID;
-import java.util.function.BiConsumer;
-import java.util.function.Supplier;
-
 import net.kyori.adventure.audience.Audience;
 import net.kyori.adventure.text.Component;
 import net.kyori.adventure.text.TextReplacementConfig;
@@ -25,8 +20,13 @@ import org.bukkit.event.EventHandler;
 import org.bukkit.event.EventPriority;
 import org.jetbrains.annotations.NotNull;
 
+import java.util.UUID;
+import java.util.function.BiConsumer;
+import java.util.function.Supplier;
+
 @Toggleable("chat.enabled")
-public class ChatListener extends PlexListener {
+public class ChatListener extends PlexListener
+{
     public static final TextReplacementConfig URL_REPLACEMENT_CONFIG = TextReplacementConfig
             .builder()
             .match("(https?|ftp|file)://[-a-zA-Z0-9+&@#/%?=~_|!:,.;]*[-a-zA-Z0-9+&@#/%=~_|]")
@@ -38,12 +38,12 @@ public class ChatListener extends PlexListener {
     public static BiConsumer<AsyncChatEvent, PlexPlayer> PRE_RENDERER = ChatListener::defaultChatProcessing;
     private final PlexChatRenderer renderer = new PlexChatRenderer();
 
-    private static final Component format = SafeMiniMessage.mmDeserialize(plugin.config.getString("chat.format"));
-
     @EventHandler(priority = EventPriority.LOWEST)
-    public void onChat(AsyncChatEvent event) {
+    public void onChat(AsyncChatEvent event)
+    {
         PlexPlayer plexPlayer = plugin.getPlayerCache().getPlexPlayerMap().get(event.getPlayer().getUniqueId());
-        if (plexPlayer.isStaffChat()) {
+        if (plexPlayer.isStaffChat())
+        {
             String prefix = PlexUtils.mmSerialize(VaultHook.getPrefix(event.getPlayer())); // Don't use PlexPlayer#getPrefix because that returns their custom set prefix and not their group's
             MessageUtil.sendStaffChat(event.getPlayer(), event.message(), PlexUtils.adminChat(event.getPlayer().getName(), prefix, SafeMiniMessage.mmSerialize(event.message())).toArray(UUID[]::new));
             plugin.getServer().getConsoleSender().sendMessage(PlexUtils.messageComponent("adminChatFormat", event.getPlayer().getName(), prefix, SafeMiniMessage.mmSerialize(event.message().replaceText(URL_REPLACEMENT_CONFIG))));
@@ -52,10 +52,13 @@ public class ChatListener extends PlexListener {
         }
         Component prefix = PlayerMeta.getPrefix(plexPlayer);
 
-        if (prefix != null && !prefix.equals(Component.empty()) && !prefix.equals(Component.space())) {
+        if (prefix != null && !prefix.equals(Component.empty()) && !prefix.equals(Component.space()))
+        {
             renderer.hasPrefix = true;
             renderer.prefix = prefix;
-        } else {
+        }
+        else
+        {
             renderer.hasPrefix = false;
             renderer.prefix = null;
         }
@@ -65,39 +68,42 @@ public class ChatListener extends PlexListener {
         event.renderer(renderer);
     }
 
-    public static class PlexChatRenderer implements ChatRenderer {
+    public static class PlexChatRenderer implements ChatRenderer
+    {
         public boolean hasPrefix;
         public Component prefix;
         public Supplier<Component> before = null;
 
         @Override
-        public @NotNull Component render(@NotNull Player source, @NotNull Component sourceDisplayName, @NotNull Component message, @NotNull Audience viewer) {
-            Component component = format;
+        public @NotNull Component render(@NotNull Player source, @NotNull Component sourceDisplayName, @NotNull Component message, @NotNull Audience viewer)
+        {
+            Component component = Component.empty();
 
-            if (before != null) {
+            if (before != null)
+            {
                 component = component.append(before.get());
             }
-
-            // Substitute the prefix from the config
-            if (hasPrefix) {
-                component = component.replaceText(TextReplacementConfig.builder().matchLiteral("{prefix}").replacement(prefix).build());
+            if (hasPrefix)
+            {
+                component = component.append(prefix).append(Component.space());
             }
-
-            // Substitute the display name from the config
-            component = component.replaceText(TextReplacementConfig.builder().matchLiteral("{name}")
-                    .replacement(sourceDisplayName).build());
-
-            // Substitute the message from the config
-            component = component.replaceText(TextReplacementConfig.builder().matchLiteral("{message}").replacement(message).build());
-
-            // Fix links not being clickable
-            component = component.replaceText(URL_REPLACEMENT_CONFIG);
-
-            return component;
+            return component
+                    .append(Component.empty())
+                    .append(
+                            source.name().equals(sourceDisplayName) ?
+                                    SafeMiniMessage.mmDeserialize(plugin.config.getString("chat.name-color") + SafeMiniMessage.mmSerialize(sourceDisplayName))
+                                    : SafeMiniMessage.mmDeserialize(plugin.config.getString("chat.name-color")).append(sourceDisplayName)
+                    )
+                    .append(Component.space())
+                    .append(Component.text("»").color(NamedTextColor.GRAY))
+                    .append(Component.space())
+                    .append(message)
+                    .replaceText(URL_REPLACEMENT_CONFIG);
         }
     }
 
-    private static void defaultChatProcessing(AsyncChatEvent event, PlexPlayer plexPlayer) {
+    private static void defaultChatProcessing(AsyncChatEvent event, PlexPlayer plexPlayer)
+    {
         String text = PlexUtils.getTextFromComponent(event.message());
         event.message(PlexUtils.stringToComponent(text));
     }

server/src/main/java/dev/plex/listener/impl/CommandListener.java

@@ -5,12 +5,9 @@ import dev.plex.cache.DataUtils;
 import dev.plex.command.blocking.BlockedCommand;
 import dev.plex.listener.PlexListener;
 import dev.plex.player.PlexPlayer;
+
 import dev.plex.services.impl.CommandBlockerService;
 import dev.plex.util.PlexLog;
-import java.util.Locale;
-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.format.NamedTextColor;
 import org.apache.commons.lang3.StringUtils;
@@ -20,6 +17,11 @@ import org.bukkit.event.EventHandler;
 import org.bukkit.event.EventPriority;
 import org.bukkit.event.player.PlayerCommandPreprocessEvent;
 
+import java.util.Locale;
+import java.util.concurrent.atomic.AtomicReference;
+import java.util.regex.Matcher;
+import java.util.regex.Pattern;
+
 public class CommandListener extends PlexListener
 {
     @EventHandler(priority = EventPriority.HIGHEST)

server/src/main/java/dev/plex/listener/impl/MobListener.java

@@ -3,7 +3,6 @@ package dev.plex.listener.impl;
 import dev.plex.listener.PlexListener;
 import dev.plex.util.BlockUtils;
 import dev.plex.util.PlexUtils;
-import org.bukkit.Chunk;
 import org.bukkit.Location;
 import org.bukkit.Material;
 import org.bukkit.block.Block;
@@ -12,7 +11,6 @@ import org.bukkit.entity.Ageable;
 import org.bukkit.entity.Entity;
 import org.bukkit.entity.EntityType;
 import org.bukkit.entity.Player;
-import org.bukkit.entity.LivingEntity;
 import org.bukkit.event.Event;
 import org.bukkit.event.EventHandler;
 import org.bukkit.event.EventPriority;
@@ -36,9 +34,16 @@ public class MobListener extends PlexListener
     {
         EntityType eggType;
         try
+        {
+            if (mat == Material.MOOSHROOM_SPAWN_EGG)
+            {
+                eggType = EntityType.MUSHROOM_COW;
+            }
+            else
             {
                 eggType = EntityType.valueOf(mat.name().substring(0, mat.name().length() - 10));
             }
+        }
         catch (IllegalArgumentException ignored)
         {
             return null;
@@ -49,10 +54,7 @@ public class MobListener extends PlexListener
     @EventHandler
     public void onEntitySpawn(EntitySpawnEvent event)
     {
-        if (event.isCancelled())
-        {
-            return;
-        }
+        if (event.isCancelled()) return;
         if (event.getEntity().getEntitySpawnReason() == CreatureSpawnEvent.SpawnReason.SPAWNER_EGG)
         {
             // for the future, we can instead filter and restrict nbt tags right here.
@@ -68,17 +70,6 @@ public class MobListener extends PlexListener
             Collection<Player> coll = location.getNearbyEntitiesByType(Player.class, 10);
             PlexUtils.disabledEffectMultiple(coll.toArray(new Player[coll.size()]), location); // dont let intellij auto correct toArray to an empty array (for efficiency)
         }
-
-        if (plugin.config.getBoolean("entity_limit.mob_limit_enabled"))
-        {
-            Location location = event.getLocation();
-            Chunk chunk = location.getChunk();
-
-            if (isEntityLimitReached(chunk, plugin.config.getInt("entity_limit.max_mobs_per_chunk")))
-            {
-                event.setCancelled(true);
-            }
-        }
     }
 
     @EventHandler
@@ -102,10 +93,7 @@ public class MobListener extends PlexListener
     @EventHandler(priority = EventPriority.HIGH)
     public void onEntityClick(PlayerInteractEntityEvent event)
     {
-        if (event.isCancelled())
-        {
-            return;
-        }
+        if (event.isCancelled()) return;
         Material handItem = event.getPlayer().getEquipment().getItem(event.getHand()).getType();
         if (event.getRightClicked() instanceof Ageable entity)
         {
@@ -127,14 +115,8 @@ public class MobListener extends PlexListener
     @EventHandler(priority = EventPriority.HIGH)
     public void onPlayerInteract(PlayerInteractEvent event)
     {
-        if (event.useItemInHand() == Event.Result.DENY)
-        {
-            return;
-        }
-        if (event.useInteractedBlock() == Event.Result.DENY)
-        {
-            return;
-        }
+        if (event.useItemInHand() == Event.Result.DENY) return;
+        if (event.useInteractedBlock() == Event.Result.DENY) return;
         if (event.getAction() == Action.RIGHT_CLICK_AIR || event.getAction() == Action.RIGHT_CLICK_BLOCK)
         {
             if (SPAWN_EGGS.contains(event.getMaterial()))
@@ -153,11 +135,4 @@ public class MobListener extends PlexListener
             }
         }
     }
-
-    public static boolean isEntityLimitReached(Chunk chunk, int limit)
-    {
-        return Arrays.stream(chunk.getEntities())
-                .filter(entity -> entity instanceof LivingEntity && !(entity instanceof Player))
-                .count() >= limit;
-    }
 }

server/src/main/java/dev/plex/listener/impl/MuteListener.java

@@ -4,13 +4,14 @@ import dev.plex.listener.PlexListener;
 import dev.plex.util.PlexLog;
 import dev.plex.util.PlexUtils;
 import io.papermc.paper.event.player.AsyncChatEvent;
-import java.util.List;
 import org.bukkit.Bukkit;
 import org.bukkit.command.Command;
 import org.bukkit.event.EventHandler;
 import org.bukkit.event.EventPriority;
 import org.bukkit.event.player.PlayerCommandPreprocessEvent;
 
+import java.util.List;
+
 public class MuteListener extends PlexListener
 {
     List<String> commands = plugin.commands.getStringList("block_on_mute");

server/src/main/java/dev/plex/listener/impl/PlayerListener.java

@@ -7,6 +7,9 @@ import dev.plex.player.PlexPlayer;
 import dev.plex.util.PlexLog;
 import dev.plex.util.PlexUtils;
 import java.util.List;
+import net.kyori.adventure.text.Component;
+import net.kyori.adventure.text.event.ClickEvent;
+import net.kyori.adventure.text.format.NamedTextColor;
 import org.bukkit.Bukkit;
 import org.bukkit.entity.Player;
 import org.bukkit.event.EventHandler;
@@ -68,9 +71,11 @@ public class PlayerListener extends PlexListener
 
         plugin.getSqlNotes().getNotes(plexPlayer.getUuid()).whenComplete((notes, ex) ->
         {
+            String plural = notes.size() == 1 ? "note." : "notes.";
             if (!notes.isEmpty())
             {
-                PlexUtils.broadcastToAdmins(PlexUtils.messageComponent(notes.size() == 1 ? "playerNoteAlert" : "playerNoteAlertPlural", plexPlayer.getName(), notes.size()), "plex.notes.notify");
+                PlexUtils.broadcastToAdmins(Component.text(plexPlayer.getName() + " has " + notes.size() + " " + plural).color(NamedTextColor.GOLD), "plex.notes.notify");
+                PlexUtils.broadcastToAdmins(Component.text("Click to view their " + plural).clickEvent(ClickEvent.runCommand("/notes " + plexPlayer.getName() + " list")).color(NamedTextColor.GOLD), "plex.notes.notify");
             }
         });
     }

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

@@ -4,11 +4,13 @@ import com.destroystokyo.paper.event.server.PaperServerListPingEvent;
 import dev.plex.listener.PlexListener;
 import dev.plex.util.PlexUtils;
 import dev.plex.util.RandomUtil;
-import java.util.concurrent.atomic.AtomicReference;
 import net.kyori.adventure.text.Component;
 import org.bukkit.Bukkit;
 import org.bukkit.event.EventHandler;
 
+import java.util.List;
+import java.util.concurrent.atomic.AtomicReference;
+
 public class ServerListener extends PlexListener
 {
     @EventHandler
@@ -32,7 +34,6 @@ public class ServerListener extends PlexListener
         {
             event.motd(PlexUtils.mmDeserialize(baseMotd.trim()));
         }
-        /* - Broken on 1.20.6
         if (plugin.config.contains("server.sample"))
         {
             List<String> samples = plugin.config.getStringList("server.sample");
@@ -41,6 +42,6 @@ public class ServerListener extends PlexListener
                 event.getPlayerSample().clear();
                 event.getPlayerSample().addAll(samples.stream().map(string -> string.replace("&", "§")).map(Bukkit::createProfile).toList());
             }
-        }*/
+        }
     }
 }

server/src/main/java/dev/plex/listener/impl/TogglesListener.java

@@ -4,28 +4,23 @@ import dev.plex.Plex;
 import dev.plex.listener.PlexListener;
 import dev.plex.util.PlexUtils;
 import io.papermc.paper.event.player.AsyncChatEvent;
-import io.papermc.paper.event.player.PrePlayerAttackEntityEvent;
-import java.util.List;
 import org.bukkit.Bukkit;
 import org.bukkit.command.Command;
 import org.bukkit.entity.Player;
-import org.bukkit.entity.ThrownPotion;
 import org.bukkit.event.EventHandler;
 import org.bukkit.event.block.BlockExplodeEvent;
 import org.bukkit.event.block.BlockFromToEvent;
 import org.bukkit.event.block.BlockRedstoneEvent;
 import org.bukkit.event.entity.EntityExplodeEvent;
 import org.bukkit.event.entity.ExplosionPrimeEvent;
-import org.bukkit.event.entity.PotionSplashEvent;
-import org.bukkit.event.entity.ProjectileHitEvent;
-import org.bukkit.event.player.PlayerCommandPreprocessEvent;
 import org.bukkit.event.player.PlayerDropItemEvent;
-import org.bukkit.projectiles.ProjectileSource;
+import org.bukkit.event.player.PlayerCommandPreprocessEvent;
+
+import java.util.List;
 
 public class TogglesListener extends PlexListener
 {
     List<String> commands = plugin.commands.getStringList("block_on_mute");
-
     @EventHandler
     public void onExplosionPrime(ExplosionPrimeEvent event)
     {
@@ -37,8 +32,7 @@ public class TogglesListener extends PlexListener
     }
 
     @EventHandler
-    public void onBlockExplode(BlockExplodeEvent event)
-    {
+    public void onBlockExplode(BlockExplodeEvent event) {
         if (!plugin.toggles.getBoolean("explosions"))
         {
             event.getBlock().breakNaturally();
@@ -103,12 +97,10 @@ public class TogglesListener extends PlexListener
             for (String command : commands)
             {
                 Command cmd = Bukkit.getCommandMap().getCommand(command);
-                if (cmd == null)
-                {
+                if (cmd == null) {
                     return;
                 }
-                if (cmd.getAliases().contains(message.toLowerCase()))
-                {
+                if (cmd.getAliases().contains(message.toLowerCase())) {
                     event.getPlayer().sendMessage(PlexUtils.messageComponent("chatIsOff"));
                     event.setCancelled(true);
                     return;
@@ -118,56 +110,6 @@ public class TogglesListener extends PlexListener
 
     }
 
-    @EventHandler
-    public void onPlayerAttack(PrePlayerAttackEntityEvent event)
-    {
-        if (!plugin.toggles.getBoolean("pvp"))
-        {
-            if (event.getAttacked() instanceof Player)
-            {
-                event.setCancelled(true);
-
-                event.getPlayer().sendMessage(PlexUtils.messageComponent("pvpDisabled"));
-            }
-        }
-    }
-
-    @EventHandler
-    public void onPotionSplash(PotionSplashEvent event)
-    {
-        if (!plugin.toggles.getBoolean("pvp"))
-        {
-            ProjectileSource shooter = event.getEntity().getShooter();
-            if (shooter instanceof Player)
-            {
-                ThrownPotion potion = event.getPotion();
-                if (potion.getEffects().stream().anyMatch(effect -> effect.getType().getName().startsWith("HARM") ||
-                        effect.getType().getName().startsWith("POISON")) &&
-                        event.getAffectedEntities().stream().anyMatch(entity -> entity instanceof Player))
-                {
-
-                    event.setCancelled(true);
-                    ((Player) shooter).sendMessage(PlexUtils.messageComponent("pvpDisabled"));
-                }
-            }
-        }
-    }
-
-    @EventHandler
-    public void onProjectileHit(ProjectileHitEvent event)
-    {
-        if (!plugin.toggles.getBoolean("pvp"))
-        {
-            ProjectileSource shooter = event.getEntity().getShooter();
-            if (shooter instanceof Player && event.getHitEntity() instanceof Player)
-            {
-                event.setCancelled(true);
-
-                ((Player) shooter).sendMessage(PlexUtils.messageComponent("pvpDisabled"));
-            }
-        }
-    }
-
     /* I have no idea if this is the best way to do this
     There is a very weird bug where if you try to create a loop using two repeaters and a lever, after disabling
     and re-enabling redstone, you are unable to recreate the loop with a lever. Using a redstone torch works fine.

server/src/main/java/dev/plex/listener/impl/WorldListener.java

@@ -1,8 +1,8 @@
 package dev.plex.listener.impl;
 
 import dev.plex.listener.PlexListener;
-import java.util.Arrays;
-import java.util.List;
+import net.kyori.adventure.text.Component;
+import net.kyori.adventure.text.format.NamedTextColor;
 import net.kyori.adventure.text.minimessage.MiniMessage;
 import org.bukkit.Bukkit;
 import org.bukkit.World;
@@ -17,11 +17,10 @@ import org.bukkit.event.block.BlockBreakEvent;
 import org.bukkit.event.block.BlockPlaceEvent;
 import org.bukkit.event.entity.EntityDamageByEntityEvent;
 import org.bukkit.event.entity.EntitySpawnEvent;
-import org.bukkit.event.player.PlayerCommandPreprocessEvent;
-import org.bukkit.event.player.PlayerInteractEntityEvent;
-import org.bukkit.event.player.PlayerInteractEvent;
-import org.bukkit.event.player.PlayerItemDamageEvent;
-import org.bukkit.event.player.PlayerTeleportEvent;
+import org.bukkit.event.player.*;
+
+import java.util.Arrays;
+import java.util.List;
 
 public class WorldListener extends PlexListener
 {
@@ -113,8 +112,7 @@ public class WorldListener extends PlexListener
             boolean isFaweCommand = command instanceof PluginIdentifiableCommand && ((PluginIdentifiableCommand) command).getPlugin().equals(Bukkit.getPluginManager().getPlugin("FastAsyncWorldEdit"));
             if (isWeCommand || isFaweCommand || EDIT_COMMANDS.contains(message.toLowerCase()))
             {
-                String noEdit = plugin.config.getString("worlds." + event.getPlayer().getWorld().getName().toLowerCase() + ".modification.message");
-                event.getPlayer().sendMessage(MiniMessage.miniMessage().deserialize(noEdit));
+                event.getPlayer().sendMessage(Component.text("You do not have permission to use that command in this world.").color(NamedTextColor.RED));
                 event.setCancelled(true);
             }
         }

server/src/main/java/dev/plex/menu/AbstractMenu.java

@@ -2,7 +2,6 @@ package dev.plex.menu;
 
 import com.google.common.collect.Maps;
 import dev.plex.util.minimessage.SafeMiniMessage;
-import java.util.Map;
 import lombok.Getter;
 import lombok.experimental.Accessors;
 import net.kyori.adventure.text.Component;
@@ -12,6 +11,13 @@ import org.bukkit.inventory.Inventory;
 import org.bukkit.inventory.InventoryView;
 import org.bukkit.inventory.ItemStack;
 
+import java.util.Map;
+
+/**
+ * @author Taah
+ * @since 6:49 AM [02-09-2023]
+ */
+
 @Getter
 @Accessors(fluent = true)
 public abstract class AbstractMenu

server/src/main/java/dev/plex/menu/impl/MaterialMenu.java

@@ -3,11 +3,16 @@ package dev.plex.menu.impl;
 import dev.plex.menu.AbstractMenu;
 import dev.plex.menu.pagination.PageableMenu;
 import dev.plex.util.item.ItemBuilder;
-import java.util.Arrays;
-import java.util.List;
 import org.bukkit.Material;
 import org.bukkit.inventory.ItemStack;
 
+import java.util.Arrays;
+import java.util.List;
+
+/**
+ * @author Taah
+ * @since 8:44 AM [02-09-2023]
+ */
 public class MaterialMenu extends PageableMenu<Material>
 {
     public MaterialMenu()

server/src/main/java/dev/plex/menu/impl/PunishedPlayerMenu.java

@@ -7,10 +7,11 @@ import dev.plex.player.PlexPlayer;
 import dev.plex.punishment.Punishment;
 import dev.plex.util.TimeUtils;
 import dev.plex.util.item.ItemBuilder;
-import java.util.List;
 import org.bukkit.Material;
 import org.bukkit.inventory.ItemStack;
 
+import java.util.List;
+
 public class PunishedPlayerMenu extends PageableMenu<Punishment>
 {
     private final PlexPlayer punishedPlayer;

server/src/main/java/dev/plex/menu/impl/PunishmentMenu.java

@@ -6,7 +6,6 @@ import dev.plex.menu.pagination.PageableMenu;
 import dev.plex.player.PlexPlayer;
 import dev.plex.util.PlexLog;
 import dev.plex.util.item.ItemBuilder;
-import java.util.List;
 import net.kyori.adventure.text.Component;
 import net.kyori.adventure.text.format.NamedTextColor;
 import org.bukkit.Bukkit;
@@ -16,6 +15,12 @@ import org.bukkit.entity.Player;
 import org.bukkit.inventory.ItemStack;
 import org.bukkit.inventory.meta.SkullMeta;
 
+import java.util.List;
+
+/**
+ * @author Taah
+ * @since 9:27 AM [02-09-2023]
+ */
 public class PunishmentMenu extends PageableMenu<Player>
 {
     public PunishmentMenu()

server/src/main/java/dev/plex/menu/impl/ToggleMenu.java

@@ -3,15 +3,15 @@ package dev.plex.menu.impl;
 import dev.plex.Plex;
 import dev.plex.menu.AbstractMenu;
 import dev.plex.util.PlexUtils;
-import java.util.List;
 import org.bukkit.Material;
 import org.bukkit.entity.Player;
 import org.bukkit.inventory.Inventory;
 import org.bukkit.inventory.InventoryView;
-import org.bukkit.inventory.ItemFlag;
 import org.bukkit.inventory.ItemStack;
 import org.bukkit.inventory.meta.ItemMeta;
 
+import java.util.List;
+
 public class ToggleMenu extends AbstractMenu
 {
     private final Plex plugin;
@@ -24,7 +24,6 @@ public class ToggleMenu extends AbstractMenu
         resetFluidspreadItem(this.inventory());
         resetDropsItem(this.inventory());
         resetRedstoneItem(this.inventory());
-        resetPVPItem(this.inventory());
         resetChatItem(this.inventory());
     }
 
@@ -68,17 +67,6 @@ public class ToggleMenu extends AbstractMenu
         inventory.setItem(3, redstone);
     }
 
-    private void resetPVPItem(Inventory inventory)
-    {
-        ItemStack pvp = new ItemStack(Material.IRON_SWORD);
-        ItemMeta pvpItemMeta = pvp.getItemMeta();
-        pvpItemMeta.addItemFlags(ItemFlag.HIDE_ATTRIBUTES);
-        pvpItemMeta.displayName(PlexUtils.mmDeserialize("<!italic><light_purple>PVP"));
-        pvpItemMeta.lore(List.of(PlexUtils.mmDeserialize("<!italic><yellow>PVP is " + (plugin.toggles.getBoolean("pvp") ? "<green>enabled" : "<red>disabled"))));
-        pvp.setItemMeta(pvpItemMeta);
-        inventory.setItem(4, pvp);
-    }
-
     private void resetChatItem(Inventory inventory)
     {
         ItemStack chat = new ItemStack(Material.OAK_SIGN);
@@ -86,16 +74,12 @@ public class ToggleMenu extends AbstractMenu
         chatItemMeta.displayName(PlexUtils.mmDeserialize("<!italic><light_purple>Toggle chat"));
         chatItemMeta.lore(List.of(PlexUtils.mmDeserialize("<!italic><yellow>Chat is currently " + (plugin.toggles.getBoolean("chat") ? "<green>on" : "<red>off"))));
         chat.setItemMeta(chatItemMeta);
-        inventory.setItem(5, chat);
+        inventory.setItem(4, chat);
     }
 
     @Override
     public boolean onClick(InventoryView view, Inventory inventory, Player player, ItemStack clicked)
     {
-        if (!player.hasPermission("plex.toggle"))
-        {
-            return false;
-        }
         if (clicked.getType() == Material.TNT)
         {
             plugin.toggles.set("explosions", !plugin.toggles.getBoolean("explosions"));
@@ -120,12 +104,6 @@ public class ToggleMenu extends AbstractMenu
             resetRedstoneItem(inventory);
             player.sendMessage(PlexUtils.mmDeserialize("<gray>Toggled redstone."));
         }
-        if (clicked.getType() == Material.IRON_SWORD)
-        {
-            plugin.toggles.set("pvp", !plugin.toggles.getBoolean("pvp"));
-            resetPVPItem(inventory);
-            player.sendMessage(PlexUtils.mmDeserialize("<gray>Toggled PVP"));
-        }
         if (clicked.getType() == Material.OAK_SIGN)
         {
             plugin.toggles.set("chat", !plugin.toggles.getBoolean("chat"));

server/src/main/java/dev/plex/menu/pagination/PageableMenu.java

@@ -6,8 +6,6 @@ import dev.plex.util.PlexUtils;
 import dev.plex.util.function.ConditionalQuadConsumer;
 import dev.plex.util.item.ItemBuilder;
 import dev.plex.util.minimessage.SafeMiniMessage;
-import java.util.List;
-import java.util.Map;
 import lombok.AccessLevel;
 import lombok.Getter;
 import lombok.Setter;
@@ -21,6 +19,14 @@ import org.bukkit.inventory.Inventory;
 import org.bukkit.inventory.InventoryView;
 import org.bukkit.inventory.ItemStack;
 
+import java.util.List;
+import java.util.Map;
+
+/**
+ * @author Taah
+ * @since 8:04 AM [02-09-2023]
+ */
+
 @Getter
 @Setter
 @Accessors(fluent = true)

server/src/main/java/dev/plex/meta/PlayerMeta.java

@@ -7,6 +7,7 @@ import dev.plex.util.PlexUtils;
 import dev.plex.util.minimessage.SafeMiniMessage;
 import net.kyori.adventure.text.Component;
 import net.kyori.adventure.text.format.NamedTextColor;
+import net.kyori.adventure.text.format.TextColor;
 import net.kyori.adventure.text.minimessage.MiniMessage;
 import org.bukkit.Bukkit;
 import org.bukkit.entity.Player;

server/src/main/java/dev/plex/module/ModuleManager.java

@@ -4,6 +4,10 @@ import com.google.common.collect.Lists;
 import dev.plex.Plex;
 import dev.plex.module.exception.ModuleLoadException;
 import dev.plex.util.PlexLog;
+import lombok.Getter;
+import org.apache.logging.log4j.LogManager;
+import org.bukkit.configuration.file.YamlConfiguration;
+
 import java.io.File;
 import java.io.IOException;
 import java.io.InputStreamReader;
@@ -14,9 +18,6 @@ import java.net.URLClassLoader;
 import java.nio.charset.StandardCharsets;
 import java.util.Arrays;
 import java.util.List;
-import lombok.Getter;
-import org.apache.logging.log4j.LogManager;
-import org.bukkit.configuration.file.YamlConfiguration;
 
 @Getter
 public class ModuleManager

server/src/main/java/dev/plex/module/PlexModule.java

@@ -5,6 +5,14 @@ import dev.plex.Plex;
 import dev.plex.command.PlexCommand;
 import dev.plex.listener.PlexListener;
 import dev.plex.util.PlexLog;
+import lombok.AccessLevel;
+import lombok.Getter;
+import lombok.Setter;
+import org.apache.logging.log4j.Logger;
+import org.bukkit.event.HandlerList;
+import org.jetbrains.annotations.NotNull;
+import org.jetbrains.annotations.Nullable;
+
 import java.io.File;
 import java.io.IOException;
 import java.io.InputStream;
@@ -13,13 +21,6 @@ import java.net.URLConnection;
 import java.util.Arrays;
 import java.util.List;
 import java.util.Locale;
-import lombok.AccessLevel;
-import lombok.Getter;
-import lombok.Setter;
-import org.apache.logging.log4j.Logger;
-import org.bukkit.event.HandlerList;
-import org.jetbrains.annotations.NotNull;
-import org.jetbrains.annotations.Nullable;
 
 @Getter
 @Setter(AccessLevel.MODULE)

server/src/main/java/dev/plex/module/PlexModuleFile.java

@@ -1,9 +1,10 @@
 package dev.plex.module;
 
 import com.google.common.collect.ImmutableList;
-import java.util.List;
 import lombok.Data;
 
+import java.util.List;
+
 @Data
 public class PlexModuleFile
 {

server/src/main/java/dev/plex/player/PlexPlayer.java

@@ -11,17 +11,19 @@ import dev.plex.storage.annotation.PrimaryKey;
 import dev.plex.storage.annotation.SQLTable;
 import dev.plex.storage.annotation.VarcharLimit;
 import dev.plex.util.adapter.ZonedDateTimeAdapter;
-import java.time.ZonedDateTime;
-import java.util.List;
-import java.util.UUID;
 import lombok.AccessLevel;
 import lombok.Getter;
 import lombok.Setter;
 import net.kyori.adventure.text.serializer.plain.PlainTextComponentSerializer;
 import org.bukkit.Bukkit;
 import org.bukkit.entity.Player;
+import org.bukkit.permissions.PermissionAttachment;
 import org.jetbrains.annotations.NotNull;
 
+import java.time.ZonedDateTime;
+import java.util.List;
+import java.util.UUID;
+
 @Getter
 @Setter
 @SQLTable("players")

server/src/main/java/dev/plex/punishment/Punishment.java

@@ -7,13 +7,14 @@ import dev.plex.storage.annotation.SQLTable;
 import dev.plex.util.PlexUtils;
 import dev.plex.util.TimeUtils;
 import dev.plex.util.adapter.ZonedDateTimeAdapter;
-import java.time.ZonedDateTime;
-import java.util.UUID;
 import lombok.Getter;
 import lombok.Setter;
 import net.kyori.adventure.text.Component;
 import org.jetbrains.annotations.NotNull;
 
+import java.time.ZonedDateTime;
+import java.util.UUID;
+
 @Getter
 @Setter
 @SQLTable("punishments")