i prefer this

.idea/codeStyles/codeStyleConfig.xml

@@ -1,5 +1,5 @@
 <component name="ProjectCodeStyleConfiguration">
-  <code_scheme name="Project" version="173">
+  <code_scheme name="Plexus Code Style" version="1">
     <JavaCodeStyleSettings>
       <option name="CLASS_COUNT_TO_USE_IMPORT_ON_DEMAND" value="20" />
       <option name="IMPORT_LAYOUT_TABLE">
@@ -36,11 +36,14 @@
       <option name="WHILE_ON_NEW_LINE" value="true" />
       <option name="CATCH_ON_NEW_LINE" value="true" />
       <option name="FINALLY_ON_NEW_LINE" value="true" />
-      <option name="SPACE_AFTER_TYPE_CAST" value="false" />
+      <option name="SPACE_AFTER_TYPE_CAST" value="true" />
       <option name="IF_BRACE_FORCE" value="3" />
       <option name="DOWHILE_BRACE_FORCE" value="3" />
       <option name="WHILE_BRACE_FORCE" value="3" />
       <option name="FOR_BRACE_FORCE" value="3" />
+      <option name="BLANK_LINES_AFTER_CLASS_HEADER" value="0" />
+      <option name="KEEP_BLANK_LINES_BEFORE_RBRACE" value="1" />
+      <option name="KEEP_FIRST_COLUMN_COMMENT" value="false" />
     </codeStyleSettings>
   </code_scheme>
 </component>

CONTRIBUTING.md

@@ -1,24 +1,36 @@
-For those who are wanting to contribute, we fully encourage doing so. There are a few rules we require following when contributing however.
+For those who are wanting to contribute, we fully encourage doing so. There are a few rules we require following when
+contributing however.
 
 ## Steps
+
 1. Make an issue and get feedback. It's important to know if your idea will be accepted before writing any code.
+
 - If it is a feature request, describe the feature and be extremely specific.
 - If it is a bug report, ensure you include how to reproduce the bug and the expected outcome
 - If it is an enhancement, describe your proposed changes. Ensure you are extremely specific.
+
 2. Fork this project
-3. Create a new branch that describes the new feature, enhancement, or bug fix. For example, this is good: `feature/add-xyz`. This is bad: `fix-this-lol`.
+3. Create a new branch that describes the new feature, enhancement, or bug fix. For example, this is
+   good: `feature/add-xyz`. This is bad: `fix-this-lol`.
 4. Write the code that addresses your change.
-- Keep in mind that it **must** be formatted correctly. If you are using IntelliJ, there is a `codeStyle.xml` file that tells IntelliJ how to format your code. Check this link for information on how to use the file: https://www.jetbrains.com/help/idea/configuring-code-style.html#import-export-schemes
+
+- Keep in mind that it **must** be formatted correctly. If you are using IntelliJ, there is a `codeStyle.xml` file that
+  tells IntelliJ how to format your code. Check this link for information on how to use the
+  file: https://www.jetbrains.com/help/idea/configuring-code-style.html#import-export-schemes
 - If you are not using IntelliJ, that is fine. We use Allman style so please format your code accordingly.
+
 6. Push your changes to your new branch and make a PR based off of that branch.
 
 ## Requirements for a PR
+
 - The issue must be marked as approved
 - It must only address each specific issue. Don't make one PR for multiple issues.
 - Your PR must compile and work. If it does not compile or work, your PR will most likely be rejected.
 
 ## Code requirements
-- Most importantly, your code must be efficient. Your pull request may be rejected if your code is deemed inefficient or sloppy.
+
+- Most importantly, your code must be efficient. Your pull request may be rejected if your code is deemed inefficient or
+  sloppy.
 - Do not repeat yourself. Create functions as needed if you're using large blocks of code over and over again.
 - Do not use an excessive amount of commits when making your PR. It makes the master branch look messy.
 - Your code must be consistent with Plex's codebase. If a function already exists, use it.

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

@@ -4,8 +4,6 @@ import com.google.inject.Inject;
 import com.velocitypowered.api.event.Subscribe;
 import com.velocitypowered.api.event.proxy.ProxyInitializeEvent;
 import com.velocitypowered.api.plugin.Plugin;
-import com.velocitypowered.api.plugin.PluginDescription;
-import com.velocitypowered.api.plugin.PluginManager;
 import com.velocitypowered.api.plugin.annotation.DataDirectory;
 import com.velocitypowered.api.proxy.ProxyServer;
 import dev.plex.config.TomlConfig;

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

@@ -2,7 +2,6 @@ package dev.plex.command;
 
 import dev.plex.Plex;
 import dev.plex.cache.DataUtils;
-import dev.plex.cache.PlayerCache;
 import dev.plex.command.annotation.CommandParameters;
 import dev.plex.command.annotation.CommandPermissions;
 import dev.plex.command.exception.CommandFailException;

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

@@ -1,6 +1,5 @@
 package dev.plex.command.impl;
 
-import dev.plex.cache.PlayerCache;
 import dev.plex.command.PlexCommand;
 import dev.plex.command.annotation.CommandParameters;
 import dev.plex.command.annotation.CommandPermissions;

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

@@ -10,14 +10,18 @@ public class VaultHook
     private static Chat CHAT;
     private static Permission PERMISSIONS;
 
-    static {
+    static
+    {
         CHAT = setupChat();
         PERMISSIONS = setupPermissions();
     }
 
     private static Chat setupChat()
     {
-        if (!Bukkit.getPluginManager().isPluginEnabled("Vault")) return null;
+        if (!Bukkit.getPluginManager().isPluginEnabled("Vault"))
+        {
+            return null;
+        }
         RegisteredServiceProvider<Chat> rsp = Bukkit.getServicesManager().getRegistration(Chat.class);
         if (rsp == null)
         {
@@ -29,7 +33,10 @@ public class VaultHook
 
     private static Permission setupPermissions()
     {
-        if (!Bukkit.getPluginManager().isPluginEnabled("Vault")) return null;
+        if (!Bukkit.getPluginManager().isPluginEnabled("Vault"))
+        {
+            return null;
+        }
         RegisteredServiceProvider<Permission> rsp = Bukkit.getServicesManager().getRegistration(Permission.class);
         if (rsp == null)
         {

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

@@ -1,7 +1,6 @@
 package dev.plex.listener.impl;
 
 import dev.plex.api.chat.IChatHandler;
-import dev.plex.cache.PlayerCache;
 import dev.plex.listener.PlexListener;
 import dev.plex.listener.annotation.Toggleable;
 import dev.plex.player.PlexPlayer;
@@ -9,6 +8,7 @@ import dev.plex.util.PlexUtils;
 import dev.plex.util.minimessage.SafeMiniMessage;
 import io.papermc.paper.chat.ChatRenderer;
 import io.papermc.paper.event.player.AsyncChatEvent;
+import java.util.function.Supplier;
 import net.kyori.adventure.audience.Audience;
 import net.kyori.adventure.text.Component;
 import net.kyori.adventure.text.TextReplacementConfig;
@@ -17,13 +17,10 @@ import net.kyori.adventure.text.format.NamedTextColor;
 import net.kyori.adventure.text.minimessage.MiniMessage;
 import net.kyori.adventure.text.minimessage.tag.resolver.TagResolver;
 import net.kyori.adventure.text.minimessage.tag.standard.StandardTags;
-import org.apache.commons.lang.StringUtils;
 import org.bukkit.entity.Player;
 import org.bukkit.event.EventHandler;
 import org.jetbrains.annotations.NotNull;
 
-import java.util.function.Supplier;
-
 @Toggleable("chat.enabled")
 public class ChatListener extends PlexListener
 {

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

@@ -1,7 +1,6 @@
 package dev.plex.listener.impl;
 
 import dev.plex.cache.DataUtils;
-import dev.plex.cache.PlayerCache;
 import dev.plex.command.blocking.BlockedCommand;
 import dev.plex.listener.PlexListener;
 import dev.plex.player.PlexPlayer;
@@ -103,11 +102,13 @@ public class CommandListener extends PlexListener
             BlockedCommand cmd = cmdRef.get();
             switch (cmd.getRequiredLevel().toLowerCase(Locale.ROOT))
             {
-                case "e" -> {
+                case "e" ->
+                {
                     event.setCancelled(true);
                     event.getPlayer().sendMessage(cmd.getMessage());
                 }
-                case "a" -> {
+                case "a" ->
+                {
                     if (plexPlayer.isAdminActive() && plexPlayer.getRankFromString().isAtLeast(Rank.ADMIN))
                     {
                         return;
@@ -115,7 +116,8 @@ public class CommandListener extends PlexListener
                     event.setCancelled(true);
                     event.getPlayer().sendMessage(cmd.getMessage());
                 }
-                case "s" -> {
+                case "s" ->
+                {
                     if (plexPlayer.isAdminActive() && plexPlayer.getRankFromString().isAtLeast(Rank.SENIOR_ADMIN))
                     {
                         return;

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

@@ -1,7 +1,6 @@
 package dev.plex.listener.impl;
 
 import dev.plex.cache.DataUtils;
-import dev.plex.cache.PlayerCache;
 import dev.plex.listener.PlexListener;
 import dev.plex.player.PlexPlayer;
 import dev.plex.storage.StorageType;

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

@@ -2,7 +2,6 @@ package dev.plex.listener.impl;
 
 import dev.plex.Plex;
 import dev.plex.cache.DataUtils;
-import dev.plex.cache.PlayerCache;
 import dev.plex.listener.PlexListener;
 import dev.plex.player.PlexPlayer;
 import dev.plex.rank.enums.Rank;

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

@@ -3,7 +3,6 @@ package dev.plex.menu;
 import com.google.common.collect.Lists;
 import dev.plex.Plex;
 import dev.plex.cache.DataUtils;
-import dev.plex.cache.PlayerCache;
 import dev.plex.player.PlexPlayer;
 import dev.plex.punishment.Punishment;
 import dev.plex.util.PlexUtils;
@@ -154,7 +153,6 @@ public class PunishedPlayerMenu extends AbstractMenu
                 openInv((Player) event.getWhoClicked(), getCurrentInventoryIndex(inv) - 1);
             }
 
-
         }
         else if (item.getType() == Material.BARRIER)
         {

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

@@ -140,7 +140,6 @@ public class PunishmentMenu extends AbstractMenu
                 openInv((Player) event.getWhoClicked(), getCurrentInventoryIndex(inv) - 1);
             }
 
-
         }
         else if (item.getType() == Material.PLAYER_HEAD)
         {
@@ -157,7 +156,6 @@ public class PunishmentMenu extends AbstractMenu
             new PunishedPlayerMenu(punishedPlayer).openInv((Player) event.getWhoClicked(), 0);
         }
 
-
     }
 
     public int getCurrentInventoryIndex(Inventory inventory)

server/src/main/java/dev/plex/storage/player/MongoPlayerData.java

@@ -6,7 +6,6 @@ import dev.morphia.query.Update;
 import dev.morphia.query.experimental.filters.Filters;
 import dev.morphia.query.experimental.updates.UpdateOperators;
 import dev.plex.Plex;
-import dev.plex.cache.PlayerCache;
 import dev.plex.player.PlexPlayer;
 import java.util.Collections;
 import java.util.List;

server/src/main/java/dev/plex/storage/player/SQLPlayerData.java

@@ -3,7 +3,6 @@ package dev.plex.storage.player;
 import com.google.common.reflect.TypeToken;
 import com.google.gson.Gson;
 import dev.plex.Plex;
-import dev.plex.cache.PlayerCache;
 import dev.plex.player.PlexPlayer;
 import dev.plex.storage.StorageType;
 import dev.plex.util.PlexLog;

server/src/main/java/dev/plex/util/PlexUtils.java

@@ -2,7 +2,6 @@ package dev.plex.util;
 
 import dev.plex.Plex;
 import dev.plex.PlexBase;
-import dev.plex.cache.PlayerCache;
 import dev.plex.storage.StorageType;
 import java.sql.Connection;
 import java.sql.SQLException;