Update version

Bumps [codacy/codacy-analysis-cli-action](https://github.com/codacy/codacy-analysis-cli-action) from 4.0.2 to 4.1.0.
- [Release notes](https://github.com/codacy/codacy-analysis-cli-action/releases)
- [Commits](https://github.com/codacy/codacy-analysis-cli-action/compare/4.0.2...v4.1.0)

---
updated-dependencies:
- dependency-name: codacy/codacy-analysis-cli-action
  dependency-type: direct:production
  update-type: version-update:semver-minor
...

Signed-off-by: dependabot[bot] <support@github.com>

Co-authored-by: dependabot[bot] <49699333+dependabot[bot]@users.noreply.github.com>

.github/dependabot.yml

@@ -9,11 +9,15 @@ updates:
   # Maintain Maven Updates
   - package-ecosystem: "maven" # See documentation for possible values
     directory: "/" # Location of package manifests
+    target-branch: "development"
+    open-pull-requests-limit: 50
     schedule:
       interval: "daily"
       
   # Maintain dependencies for GitHub Actions
   - package-ecosystem: "github-actions"
     directory: "/"
+    target-branch: "development"
+    open-pull-requests-limit: 50
     schedule:
       interval: "daily"

.github/workflows/codacy-analysis.yml

@@ -21,11 +21,11 @@ jobs:
     steps:
       # Checkout the repository to the GitHub Actions runner
       - name: Checkout code
-        uses: actions/checkout@v2
+        uses: actions/checkout@v3
 
       # Execute Codacy Analysis CLI and generate a SARIF output with the security issues identified during the analysis
       - name: Run Codacy Analysis CLI
-        uses: codacy/codacy-analysis-cli-action@1.1.0
+        uses: codacy/codacy-analysis-cli-action@v4.1.0
         with:
           # Check https://github.com/codacy/codacy-analysis-cli#project-token to get your project token from your Codacy repository
           # You can also omit the token and run the tools that support default configurations
@@ -41,6 +41,6 @@ jobs:
 
       # Upload the SARIF file generated in the previous step
       - name: Upload SARIF results file
-        uses: github/codeql-action/upload-sarif@v1
+        uses: github/codeql-action/upload-sarif@v2
         with:
           sarif_file: results.sarif

.github/workflows/codeql-analysis.yml

@@ -35,17 +35,18 @@ jobs:
 
     steps:
     - name: Checkout repository
-      uses: actions/checkout@v2
+      uses: actions/checkout@v3
       
     - name: Setup Java JDK
-      uses: actions/setup-java@v1.4.3
+      uses: actions/setup-java@v3.3.0
       with:
         # The Java version to make available on the path. Takes a whole or semver Java version, or 1.x syntax (e.g. 1.8 => Java 8.x). Early access versions can be specified in the form of e.g. 14-ea, 14.0.0-ea, or 14.0.0-ea.28
-        java-version: 11
+        java-version: 17
+        distribution: 'adopt'
 
     # Initializes the CodeQL tools for scanning.
     - name: Initialize CodeQL
-      uses: github/codeql-action/init@v1
+      uses: github/codeql-action/init@v2
       with:
         languages: ${{ matrix.language }}
         # If you wish to specify custom queries, you can do so here or in a config file.
@@ -56,7 +57,7 @@ jobs:
     # Autobuild attempts to build any compiled languages  (C/C++, C#, or Java).
     # If this step fails, then you should remove it and run the build manually (see below)
     - name: Autobuild
-      uses: github/codeql-action/autobuild@v1
+      uses: github/codeql-action/autobuild@v2
 
     # ℹ️ Command-line programs to run using the OS shell.
     # 📚 https://git.io/JvXDl
@@ -70,4 +71,4 @@ jobs:
     #   make release
 
     - name: Perform CodeQL Analysis
-      uses: github/codeql-action/analyze@v1
+      uses: github/codeql-action/analyze@v2

.github/workflows/downstream.yml

@@ -18,7 +18,7 @@ jobs:
     steps:
     # Step 1: run a standard checkout action, provided by github
     - name: Checkout main
-      uses: actions/checkout@v2
+      uses: actions/checkout@v3
       with:
         ref: main
         # submodules: 'recursive'     ### may be needed in your situation
@@ -26,11 +26,11 @@ jobs:
     # Step 2: run this sync action - specify the upstream repo, upstream branch to sync with, and target sync branch
     - name: Pull (Fast-Forward) upstream changes
       id: sync
-      uses: aormsby/Fork-Sync-With-Upstream-action@v2.1
+      uses: aormsby/Fork-Sync-With-Upstream-action@v3.3
       with:
         upstream_repository: AtlasMediaGroup/TotalFreedomMod
         upstream_branch: main
-        target_branch: main
+        target_branch: development
         git_pull_args: --ff-only                    # optional arg use, defaults to simple 'pull'
 
     # Step 3: Display a message if 'sync' step had new commits (simple test)

.github/workflows/java17-maven.yml

@@ -0,0 +1,21 @@
+name: Java17-Maven-Build
+
+on: [push]
+
+jobs:
+  build-java-17:
+
+    runs-on: ubuntu-latest
+
+    steps:
+    # Checkout the code
+    - uses: actions/checkout@v3
+
+    # Java 16 Builds
+    - name: Set up JDK 17
+      uses: actions/setup-java@v3.3.0
+      with:
+        java-version: 17
+        distribution: 'adopt'
+    - name: Build with Maven
+      run: mvn -B package --file pom.xml

.github/workflows/maven.yml

@@ -1,27 +0,0 @@
-name: Maven-Build
-
-on: [push]
-
-jobs:
-  build:
-
-    runs-on: ubuntu-latest
-
-    steps:
-    # Java 11 Builds
-    - uses: actions/checkout@v1
-    - name: Set up JDK 11
-      uses: actions/setup-java@v1
-      with:
-        java-version: 11
-    - name: Build with Maven
-      run: mvn -B package --file pom.xml
-
-    # Java 16 Builds
-    - uses: actions/checkout@v1
-    - name: Set up JDK 16
-      uses: actions/setup-java@v1
-      with:
-        java-version: 16
-    - name: Build with Maven
-      run: mvn -B package --file pom.xml

README.md

@@ -1,4 +1,4 @@
-# TotalFreedomMod [![Build Status](https://travis-ci.com/AtlasMediaGroup/TotalFreedomMod.svg?branch=development)](https://travis-ci.com/AtlasMediaGroup/TotalFreedomMod) [![Codacy Badge](https://app.codacy.com/project/badge/Grade/29c0f964da304666bd654bc7b1d556db)](https://www.codacy.com/gh/AtlasMediaGroup/TotalFreedomMod/dashboard?utm_source=github.com&utm_medium=referral&utm_content=AtlasMediaGroup/TotalFreedomMod&utm_campaign=Badge_Grade)
+# TotalFreedomMod [![Maven-Build](https://github.com/AtlasMediaGroup/TotalFreedomMod/actions/workflows/java17-maven.yml/badge.svg)](https://github.com/AtlasMediaGroup/TotalFreedomMod/actions/workflows/java17-maven.yml) [![Codacy Badge](https://app.codacy.com/project/badge/Grade/29c0f964da304666bd654bc7b1d556db)](https://www.codacy.com/gh/AtlasMediaGroup/TotalFreedomMod/dashboard?utm_source=github.com&utm_medium=referral&utm_content=AtlasMediaGroup/TotalFreedomMod&utm_campaign=Badge_Grade) [![CodeQL](https://github.com/AtlasMediaGroup/TotalFreedomMod/actions/workflows/codeql-analysis.yml/badge.svg)](https://github.com/AtlasMediaGroup/TotalFreedomMod/actions/workflows/codeql-analysis.yml)
 
 TotalFreedomMod is a CraftBukkit server plugin designed primarily to support the [Official TotalFreedom Minecraft Server](https://totalfreedom.me/). However, you are more than welcome to adapt the source for your own server.
 
@@ -14,4 +14,4 @@ For information on our security policy and reporting an issue, please see [SECUR
 
 ### Compiling
 
-You need Maven to build. You'd also need to set the JDK version to Java 8 as that is the current standard as of now.
+You need Maven to build. You'd also need to set the JDK version to Java 11 as that is the current standard as of now.

SECURITY.md

@@ -10,22 +10,26 @@ In terms of plugin releases, our support matrix is as follows:
 These versions are currently actively supported by our team, and you should expect security patches where appropriate for these versions. 
 
 | Version             | Supported  | Support End:                   |
-| ------------------- | ------------------ | ------------------------------ |
-| 2021.05             | :white_check_mark: | No Earlier than August 2021    |
+| ------------------- | ---------- | ------------------------------ |
+| 2022.02             | ✅         | No Earlier than May 2022       |
 
 ### Legacy Supported
 These versions are no longer under active development, however we will look to release critical secuirty patches where appropriate. 
 
 | Version             | Supported  | Support End: |
-| ------------------- | ------------------ | ------------ |
-| 2021.04             | :white_check_mark: | July 2021    |
-| 2021.02             | :white_check_mark: | June 2021    |
+| ------------------- | ---------- | ------------ |
+| 2021.09             | ⚠️         | April 2022   |
+
 
 ### No Longer Supported
 These versions are no longer supported at all. It is strongly advised to update if you are running any of these versions. 
 
 | Version             | Supported          | Support Ended:      |
 | ------------------- | ------------------ | ------------------- |
+| 2021.06             | :x:                | October 2021        |
+| 2021.05             | :x:                | September 2021      |
+| 2021.04             | :x:                | July 2021           |
+| 2021.02             | :x:                | 6 June 2021         |
 | 2020.11             | :x:                | 3 May 2021          |
 | 6.0.x (Pre-Release) | :x:                | December 2020       |
 | < 2020.11           | :x:                | December 2020       |

nb-configuration.xml

@@ -13,7 +13,7 @@ You can copy and paste the single properties, into the pom.xml file and the IDE
 That way multiple projects can share the same settings (useful for formatting rules for example).
 Any value defined here will override the pom.xml file value but is only applicable to the current project.
 -->
-        <netbeans.hint.jdkPlatform>JDK_11</netbeans.hint.jdkPlatform>
+        <netbeans.hint.jdkPlatform>JDK_17</netbeans.hint.jdkPlatform>
         <netbeans.checkstyle.format>true</netbeans.checkstyle.format>
     </properties>
 </project-shared-configuration>

pom.xml

@@ -5,7 +5,7 @@
 
     <groupId>me.totalfreedom</groupId>
     <artifactId>TotalFreedomMod</artifactId>
-    <version>2021.04</version>
+    <version>2022.06-RC1</version>
     <packaging>jar</packaging>
 
     <properties>
@@ -39,9 +39,10 @@
     </scm>
 
     <repositories>
+        
         <repository>
-            <id>jitpack.io</id>
-            <url>https://jitpack.io</url>
+            <id>atlas-nexus-01-totalfreedom-development</id>
+            <url>https://nexus-01.core.atlas-media.co.uk/repository/totalfreedom-development/</url>
         </repository>
 
         <repository>
@@ -49,11 +50,6 @@
             <url>https://repo.codemc.org/repository/maven-public/</url>
         </repository>
 
-        <repository>
-            <id>nms-repo</id>
-            <url>https://repo.codemc.org/repository/nms/</url>
-        </repository>
-
         <repository>
             <id>spigot-repo</id>
             <url>https://hub.spigotmc.org/nexus/content/repositories/snapshots/</url>
@@ -101,14 +97,11 @@
         </repository>
 
         <repository>
-            <id>papermc</id>
-            <url>https://papermc.io/repo/repository/maven-public/</url>
+            <id>esentialsx-repo</id>
+            <url>https://repo.essentialsx.net/releases/</url>
         </repository>
         
-        <repository>
-            <id>ess-repo</id>
-            <url>https://ci.ender.zone/plugin/repository/everything/</url>
-        </repository>
+        
     </repositories>
 
     <dependencies>
@@ -116,42 +109,28 @@
         <dependency>
             <groupId>commons-io</groupId>
             <artifactId>commons-io</artifactId>
-            <version>2.8.0</version>
+            <version>2.11.0</version>
             <scope>compile</scope>
         </dependency>
 
         <dependency>
             <groupId>org.apache.commons</groupId>
             <artifactId>commons-lang3</artifactId>
-            <version>3.11</version>
-            <scope>compile</scope>
-        </dependency>
-
-        <dependency>
-            <groupId>commons-codec</groupId>
-            <artifactId>commons-codec</artifactId>
-            <version>1.15</version>
-            <scope>compile</scope>
-        </dependency>
-
-        <dependency>
-            <groupId>com.github.speedxx</groupId>
-            <artifactId>Mojangson</artifactId>
-            <version>1957eef8d6</version>
+            <version>3.12.0</version>
             <scope>compile</scope>
         </dependency>
 
         <dependency>
             <groupId>org.bstats</groupId>
             <artifactId>bstats-bukkit</artifactId>
-            <version>1.8</version>
+            <version>3.0.0</version>
             <scope>compile</scope>
         </dependency>
 
         <dependency>
-            <groupId>org.spigotmc</groupId>
-            <artifactId>spigot</artifactId>
-            <version>1.16.5-R0.1-SNAPSHOT</version>
+            <groupId>io.papermc.paper</groupId>
+            <artifactId>paper-api</artifactId>
+            <version>1.17.1-R0.1-SNAPSHOT</version>
             <scope>provided</scope>
         </dependency>
 
@@ -172,42 +151,35 @@
         <dependency>
             <groupId>com.sk89q.worldedit</groupId>
             <artifactId>worldedit-bukkit</artifactId>
-            <version>7.3.0-SNAPSHOT</version>
-            <scope>provided</scope>
-        </dependency>
-
-        <dependency>
-            <groupId>net.ess3</groupId>
-            <artifactId>EssentialsX</artifactId>
-            <version>2.18.2</version>
+            <version>7.2.10</version>
             <scope>provided</scope>
         </dependency>
 
         <dependency>
             <groupId>net.dv8tion</groupId>
             <artifactId>JDA</artifactId>
-            <version>4.2.1_255</version>
+            <version>4.4.0_352</version>
             <scope>provided</scope>
         </dependency>
 
         <dependency>
             <groupId>net.coreprotect</groupId>
             <artifactId>coreprotect</artifactId>
-            <version>19.3</version>
+            <version>21.2</version>
             <scope>provided</scope>
         </dependency>
 
         <dependency>
             <groupId>com.sk89q.worldguard</groupId>
             <artifactId>worldguard-bukkit</artifactId>
-            <version>7.0.4</version>
+            <version>7.0.7</version>
             <scope>provided</scope>
         </dependency>
 
         <dependency>
             <groupId>io.papermc</groupId>
             <artifactId>paperlib</artifactId>
-            <version>1.0.6</version>
+            <version>1.0.7</version>
             <scope>compile</scope>
         </dependency>
 
@@ -219,59 +191,68 @@
         </dependency>
         
         <dependency>
-            <groupId>net.goldtreeservers</groupId>
-            <artifactId>worldguardextraflags</artifactId>
-            <version>4.0.0</version>
+            <groupId>net.essentialsx</groupId>
+            <artifactId>EssentialsX</artifactId>
+            <version>2.19.4</version>
             <scope>provided</scope>
         </dependency>
 
         <dependency>
             <groupId>org.reflections</groupId>
             <artifactId>reflections</artifactId>
-            <version>0.9.12</version>
+            <version>0.10.2</version>
             <scope>compile</scope>
         </dependency>
 
         <dependency>
             <groupId>org.javassist</groupId>
             <artifactId>javassist</artifactId>
-            <version>3.27.0-GA</version>
+            <version>3.29.0-GA</version>
             <scope>compile</scope>
         </dependency>
 
         <dependency>
-            <groupId>com.github.AtlasMediaGroup</groupId>
-            <artifactId>TFGuilds</artifactId>
-            <version>master-SNAPSHOT</version>
+            <groupId>me.totalfreedom</groupId>
+            <artifactId>tfguilds</artifactId>
+            <version>2021.06-RC2</version>
             <scope>provided</scope>
         </dependency>
 
         <dependency>
             <groupId>org.jetbrains</groupId>
             <artifactId>annotations</artifactId>
-            <version>20.1.0</version>
+            <version>23.0.0</version>
             <scope>compile</scope>
         </dependency>
 
         <dependency>
             <groupId>org.apache.maven.plugins</groupId>
             <artifactId>maven-checkstyle-plugin</artifactId>
-            <version>3.1.1</version>
+            <version>3.1.2</version>
             <scope>compile</scope>
         </dependency>
+        
         <dependency>
             <groupId>org.junit.jupiter</groupId>
             <artifactId>junit-jupiter</artifactId>
-            <version>5.4.2</version>
+            <version>5.8.2</version>
             <scope>compile</scope>
         </dependency>
+        
         <dependency>
             <groupId>org.eclipse.sisu</groupId>
             <artifactId>org.eclipse.sisu.inject</artifactId>
-            <version>0.3.4</version>
+            <version>0.3.5</version>
         </dependency>
     </dependencies>
 
+    <pluginRepositories>
+        <pluginRepository>
+            <id>apache.snapshots</id>
+            <url>https://repository.apache.org/snapshots/</url>
+        </pluginRepository>
+    </pluginRepositories>
+
     <build>
         <!-- Filter resources for build.properties -->
         <resources>
@@ -286,12 +267,12 @@
             <plugin>
                 <groupId>org.apache.maven.plugins</groupId>
                 <artifactId>maven-compiler-plugin</artifactId>
-                <version>3.8.1</version>
+                <version>3.10.1</version>
                 <configuration>
                     <outputFileName>TotalFreedomMod.jar</outputFileName>
-                    <compilerVersion>11</compilerVersion>
-                    <source>11</source>
-                    <target>11</target>
+                    <compilerVersion>17</compilerVersion>
+                    <source>17</source>
+                    <target>17</target>
                 </configuration>
             </plugin>
 
@@ -299,7 +280,7 @@
             <plugin>
                 <groupId>pl.project13.maven</groupId>
                 <artifactId>git-commit-id-plugin</artifactId>
-                <version>4.0.2</version>
+                <version>4.9.10</version>
                 <executions>
                     <execution>
                         <id>get-the-git-infos</id>
@@ -340,7 +321,7 @@
             <plugin>
                 <groupId>org.apache.maven.plugins</groupId>
                 <artifactId>maven-antrun-plugin</artifactId>
-                <version>1.8</version>
+                <version>3.1.0</version>
                 <executions>
                     <execution>
                         <id>default-cli</id>
@@ -370,7 +351,7 @@
             <plugin>
                 <groupId>org.codehaus.mojo</groupId>
                 <artifactId>properties-maven-plugin</artifactId>
-                <version>1.0.0</version>
+                <version>1.1.0</version>
                 <executions>
                     <execution>
                         <phase>initialize</phase>
@@ -390,7 +371,7 @@
             <plugin>
                 <groupId>org.codehaus.mojo</groupId>
                 <artifactId>buildnumber-maven-plugin</artifactId>
-                <version>1.4</version>
+                <version>3.0.0</version>
                 <executions>
                     <execution>
                         <phase>generate-resources</phase>
@@ -415,7 +396,7 @@
             <plugin>
                 <groupId>org.apache.maven.plugins</groupId>
                 <artifactId>maven-shade-plugin</artifactId>
-                <version>3.2.4</version>
+                <version>3.3.0</version>
                 <executions>
                     <execution>
                         <phase>package</phase>
@@ -439,12 +420,11 @@
                                 <includes>
                                     <include>commons-io:commons-io</include>
                                     <include>org.apache.commons:commons-lang3</include>
-                                    <include>commons-codec:commons-codec</include>
                                     <include>org.reflections:reflections</include>
                                     <include>org.javassist:javassist</include>
                                     <include>io.papermc:paperlib</include>
-                                    <include>com.github.speedxx:Mojangson</include>
                                     <include>org.bstats:bstats-bukkit</include>
+                                    <include>org.bstats:bstats-base</include>
                                     <include>org.jetbrains:annotations</include>
                                 </includes>
                             </artifactSet>
@@ -462,7 +442,7 @@
             <plugin>
                 <groupId>org.apache.maven.plugins</groupId>
                 <artifactId>maven-checkstyle-plugin</artifactId>
-                <version>3.1.1</version>
+                <version>3.1.2</version>
                 <configuration>
                     <configLocation>checkstyle.xml</configLocation>
                     <failOnViolation>true</failOnViolation>

src/main/java/me/totalfreedom/totalfreedommod/ChatManager.java

@@ -175,15 +175,15 @@ public class ChatManager extends FreedomService
         });
     }
 
-    public void reportAction(Player reporter, Player reported, String report)
+    public void reportAction(Player reporter, String reportedName, String report)
     {
         for (Player player : server.getOnlinePlayers())
         {
             if (plugin.al.isAdmin(player))
             {
-                playerMsg(player, ChatColor.RED + "[REPORTS] " + ChatColor.GOLD + reporter.getName() + " has reported " + reported.getName() + " for " + report);
+                playerMsg(player, ChatColor.RED + "[REPORTS] " + ChatColor.GOLD + reporter.getName() + " has reported " + reportedName + " for " + report);
             }
         }
-        FLog.info("[REPORTS] " + reporter.getName() + " has reported " + reported.getName() + " for " + report);
+        FLog.info("[REPORTS] " + reporter.getName() + " has reported " + reportedName + " for " + report);
     }
 }

src/main/java/me/totalfreedom/totalfreedommod/LoginProcess.java

@@ -3,7 +3,10 @@ package me.totalfreedom.totalfreedommod;
 import io.papermc.lib.PaperLib;
 import java.util.ArrayList;
 import java.util.List;
+import java.util.UUID;
 import java.util.regex.Pattern;
+
+import me.totalfreedom.totalfreedommod.admin.Admin;
 import me.totalfreedom.totalfreedommod.config.ConfigEntry;
 import me.totalfreedom.totalfreedommod.player.FPlayer;
 import me.totalfreedom.totalfreedommod.player.PlayerData;
@@ -19,6 +22,7 @@ import org.bukkit.event.player.AsyncPlayerPreLoginEvent;
 import org.bukkit.event.player.PlayerJoinEvent;
 import org.bukkit.event.player.PlayerLoginEvent;
 import org.bukkit.scheduler.BukkitRunnable;
+import org.bukkit.scheduler.BukkitTask;
 
 public class LoginProcess extends FreedomService
 {
@@ -57,13 +61,13 @@ public class LoginProcess extends FreedomService
     @EventHandler(priority = EventPriority.NORMAL)
     public void onPlayerPreLogin(AsyncPlayerPreLoginEvent event)
     {
-        final String ip = event.getAddress().getHostAddress().trim();
-        final boolean isAdmin = plugin.al.getEntryByIp(ip) != null;
+        final Admin entry = plugin.al.getEntryByUuid(event.getUniqueId());
+        final boolean isAdmin = entry != null && entry.isActive();
 
         // Check if the player is already online
         for (Player onlinePlayer : server.getOnlinePlayers())
         {
-            if (!onlinePlayer.getName().equalsIgnoreCase(event.getName()))
+            if (!onlinePlayer.getUniqueId().equals(event.getUniqueId()))
             {
                 continue;
             }
@@ -85,7 +89,7 @@ public class LoginProcess extends FreedomService
     {
         final Player player = event.getPlayer();
         final String username = player.getName();
-        final String ip = event.getAddress().getHostAddress().trim();
+        final UUID uuid = player.getUniqueId();
 
         // Check username length
         if (username.length() < MIN_USERNAME_LENGTH || username.length() > MAX_USERNAME_LENGTH)
@@ -119,7 +123,8 @@ public class LoginProcess extends FreedomService
         }
 
         // Validation below this point
-        if (plugin.al.getEntryByIp(ip) != null) // Check if player is admin
+        final Admin entry = plugin.al.getEntryByUuid(uuid);
+        if (entry != null && entry.isActive()) // Check if player is admin
         {
             // Force-allow log in
             event.allow();
@@ -174,14 +179,11 @@ public class LoginProcess extends FreedomService
         }
 
         // Whitelist
-        if (plugin.si.isWhitelisted())
-        {
-            if (!plugin.si.getWhitelisted().contains(username.toLowerCase()))
+        if (server.isWhitelistEnforced() && !player.isWhitelisted())
         {
             event.disallow(PlayerLoginEvent.Result.KICK_OTHER, "You are not whitelisted on this server.");
         }
     }
-    }
 
     @EventHandler(priority = EventPriority.MONITOR)
     public void onPlayerJoin(PlayerJoinEvent event)
@@ -190,6 +192,22 @@ public class LoginProcess extends FreedomService
         final FPlayer fPlayer = plugin.pl.getPlayer(player);
         final PlayerData playerData = plugin.pl.getData(player);
 
+        // Sends a message to the player if they have never joined before (or simply lack player data).
+        if (!event.getPlayer().hasPlayedBefore() && ConfigEntry.FIRST_JOIN_INFO_ENABLED.getBoolean())
+        {
+            new BukkitRunnable()
+            {
+                @Override
+                public void run()
+                {
+                    for (String line : ConfigEntry.FIRST_JOIN_INFO.getStringList())
+                    {
+                        player.sendMessage(FUtil.colorize(line));
+                    }
+                }
+            }.runTaskLater(plugin, 20);
+        }
+
         player.sendTitle(FUtil.colorize(ConfigEntry.SERVER_LOGIN_TITLE.getString()), FUtil.colorize(ConfigEntry.SERVER_LOGIN_SUBTITLE.getString()), 20, 100, 60);
         player.setOp(true);
 
@@ -204,7 +222,7 @@ public class LoginProcess extends FreedomService
             return;
         }
 
-        if (!playerData.hasVerification() && !playerData.getIps().contains(FUtil.getIp(player)))
+        if (!playerData.getIps().contains(FUtil.getIp(player)))
         {
             playerData.addIp(FUtil.getIp(player));
             plugin.pl.save(playerData);

src/main/java/me/totalfreedom/totalfreedommod/MovementValidator.java

@@ -1,17 +1,16 @@
 package me.totalfreedom.totalfreedommod;
 
-import ca.momothereal.mojangson.ex.MojangsonParseException;
-import ca.momothereal.mojangson.value.MojangsonCompound;
-import ca.momothereal.mojangson.value.MojangsonValue;
+import com.google.common.collect.Multimap;
 import io.papermc.lib.PaperLib;
-import java.util.List;
+
+import java.util.Collection;
+import java.util.Map;
 import java.util.Objects;
-import net.minecraft.server.v1_16_R3.NBTTagCompound;
-import net.minecraft.server.v1_16_R3.NBTTagList;
 import org.bukkit.ChatColor;
 import org.bukkit.Location;
 import org.bukkit.Material;
-import org.bukkit.craftbukkit.v1_16_R3.inventory.CraftItemStack;
+import org.bukkit.attribute.Attribute;
+import org.bukkit.attribute.AttributeModifier;
 import org.bukkit.entity.Player;
 import org.bukkit.event.EventHandler;
 import org.bukkit.event.EventPriority;
@@ -20,6 +19,7 @@ import org.bukkit.event.player.PlayerLoginEvent;
 import org.bukkit.event.player.PlayerMoveEvent;
 import org.bukkit.event.player.PlayerTeleportEvent;
 import org.bukkit.inventory.ItemStack;
+import org.bukkit.inventory.meta.ItemMeta;
 
 public class MovementValidator extends FreedomService
 {
@@ -133,55 +133,49 @@ public class MovementValidator extends FreedomService
 
     private Boolean exploitItem(ItemStack item)
     {
-        net.minecraft.server.v1_16_R3.ItemStack nmsStack = CraftItemStack.asNMSCopy(item);
-        NBTTagList modifiers = getAttributeList(nmsStack);
-        MojangsonCompound compound = new MojangsonCompound();
-        boolean foundNegative = false;
-        boolean foundPositive = false;
-        try
+        if (item == null)
         {
-            String mod = modifiers.toString();
-            String fancy = ("{" + (mod.substring(1, mod.length() - 1).replace("{", "").replace("}", "")) + "}");
-            compound.read(fancy);
-            for (String key : compound.keySet())
-            {
-                if (Objects.equals(key, "Amount")) //null-safe .equals()
-                {
-                    @SuppressWarnings("rawtypes")
-                    List<MojangsonValue> values = compound.get(key);
-                    for (MojangsonValue<?> val : values)
-                    {
-                        if (val.getValue().toString().equals("Infinityd"))
-                        {
-                            foundPositive = true;
-                        }
-                        if (val.getValue().toString().equals("-Infinityd"))
-                        {
-                            foundNegative = true;
-                        }
-                    }
-                }
-            }
-        }
-        catch (MojangsonParseException e)
-        {
-            e.printStackTrace();
-        }
-        return foundNegative && foundPositive;
+            return false;
         }
 
+        ItemMeta meta = item.getItemMeta();
+        if (meta != null)
+        {
+            Multimap<Attribute, AttributeModifier> attributes = meta.getAttributeModifiers();
+            if (attributes != null)
+            {
+                Map<Attribute, Collection<AttributeModifier>> attrMap = attributes.asMap();
 
-    private NBTTagList getAttributeList(net.minecraft.server.v1_16_R3.ItemStack stack)
+                // For every attribute...
+                for (Attribute attr : attributes.keySet())
                 {
-        if (stack.getTag() == null)
+                    // Default values
+                    boolean posInf = false;
+                    boolean negInf = false;
+
+                    // For every AttributeModifier...
+                    for (AttributeModifier modifier : attrMap.get(attr))
                     {
-            stack.setTag(new NBTTagCompound());
+                        // Are they ∞ or -∞?
+                        if (modifier.getAmount() == Double.POSITIVE_INFINITY)
+                        {
+                            posInf = true;
                         }
-        NBTTagList attr = stack.getTag().getList("AttributeModifiers", 10);
-        if (attr == null)
+                        else if (modifier.getAmount() == Double.NEGATIVE_INFINITY)
                         {
-            stack.getTag().set("AttributeModifiers", new NBTTagList());
+                            negInf = true;
                         }
-        return stack.getTag().getList("AttributeModifiers", 10);
+                    }
+
+                    // Are both values set as true?
+                    if (posInf && negInf)
+                    {
+                        return true;
+                    }
+                }
+            }
+
+        }
+        return false;
     }
 }

src/main/java/me/totalfreedom/totalfreedommod/Pterodactyl.java

@@ -3,7 +3,7 @@ package me.totalfreedom.totalfreedommod;
 import java.io.IOException;
 import java.util.Arrays;
 import java.util.List;
-import joptsimple.internal.Strings;
+import com.google.common.base.Strings;
 import me.totalfreedom.totalfreedommod.admin.Admin;
 import me.totalfreedom.totalfreedommod.config.ConfigEntry;
 import me.totalfreedom.totalfreedommod.rank.Rank;

src/main/java/me/totalfreedom/totalfreedommod/SavedFlags.java

@@ -1,98 +0,0 @@
-package me.totalfreedom.totalfreedommod;
-
-import java.io.File;
-import java.io.FileInputStream;
-import java.io.FileOutputStream;
-import java.io.ObjectInputStream;
-import java.io.ObjectOutputStream;
-import java.util.HashMap;
-import java.util.Map;
-import me.totalfreedom.totalfreedommod.util.FLog;
-import static me.totalfreedom.totalfreedommod.util.FUtil.SAVED_FLAGS_FILENAME;
-
-public class SavedFlags extends FreedomService
-{
-    @Override
-    public void onStart()
-    {
-    }
-
-    @Override
-    public void onStop()
-    {
-    }
-
-    @SuppressWarnings("unchecked")
-    public Map<String, Boolean> getSavedFlags()
-    {
-        Map<String, Boolean> flags = null;
-        File input = new File(TotalFreedomMod.getPlugin().getDataFolder(), SAVED_FLAGS_FILENAME);
-
-        if (input.exists())
-        {
-            try
-            {
-                try (FileInputStream fis = new FileInputStream(input); ObjectInputStream ois = new ObjectInputStream(fis))
-                {
-                    flags = (HashMap<String, Boolean>)ois.readObject();
-                }
-            }
-            catch (Exception ex)
-            {
-                FLog.severe(ex);
-            }
-        }
-
-        return flags;
-    }
-
-    public boolean getSavedFlag(String flag) throws Exception
-    {
-        Boolean flagValue = null;
-
-        Map<String, Boolean> flags = getSavedFlags();
-
-        if (flags != null)
-        {
-            if (flags.containsKey(flag))
-            {
-                flagValue = flags.get(flag);
-            }
-        }
-
-        if (flagValue != null)
-        {
-            return flagValue;
-        }
-        else
-        {
-            throw new Exception();
-        }
-    }
-
-    public void setSavedFlag(String flag, boolean value)
-    {
-        Map<String, Boolean> flags = getSavedFlags();
-
-        if (flags == null)
-        {
-            flags = new HashMap<>();
-        }
-
-        flags.put(flag, value);
-
-        try
-        {
-            final FileOutputStream fos = new FileOutputStream(new File(plugin.getDataFolder(), SAVED_FLAGS_FILENAME));
-            final ObjectOutputStream oos = new ObjectOutputStream(fos);
-            oos.writeObject(flags);
-            oos.close();
-            fos.close();
-        }
-        catch (Exception ex)
-        {
-            FLog.severe(ex);
-        }
-    }
-
-}

src/main/java/me/totalfreedom/totalfreedommod/ServerInterface.java

@@ -1,83 +0,0 @@
-package me.totalfreedom.totalfreedommod;
-
-import java.util.Arrays;
-import java.util.List;
-import me.totalfreedom.totalfreedommod.util.FLog;
-import me.totalfreedom.totalfreedommod.util.FUtil;
-import net.minecraft.server.v1_16_R3.EntityPlayer;
-import net.minecraft.server.v1_16_R3.MinecraftServer;
-import org.bukkit.Bukkit;
-import org.bukkit.craftbukkit.v1_16_R3.CraftServer;
-
-public class ServerInterface extends FreedomService
-{
-    public static final String COMPILE_NMS_VERSION = "v1_16_R3";
-
-    public static void warnVersion()
-    {
-        final String nms = FUtil.getNMSVersion();
-
-        if (!COMPILE_NMS_VERSION.equals(nms))
-        {
-            FLog.warning(TotalFreedomMod.pluginName + " is compiled for " + COMPILE_NMS_VERSION + " but the server is running version " + nms + "!");
-            FLog.warning("This might result in unexpected behaviour!");
-        }
-    }
-
-    @Override
-    public void onStart()
-    {
-    }
-
-    @Override
-    public void onStop()
-    {
-    }
-
-    public void setOnlineMode(boolean mode)
-    {
-        getServer().setOnlineMode(mode);
-    }
-
-    public int purgeWhitelist()
-    {
-        String[] whitelisted = getServer().getPlayerList().getWhitelisted();
-        int size = whitelisted.length;
-        for (EntityPlayer player : getServer().getPlayerList().players)
-        {
-            getServer().getPlayerList().getWhitelist().remove(player.getProfile());
-        }
-
-        try
-        {
-            getServer().getPlayerList().getWhitelist().save();
-        }
-        catch (Exception ex)
-        {
-            FLog.warning("Could not purge the whitelist!");
-            FLog.warning(ex);
-        }
-        return size;
-    }
-
-    public boolean isWhitelisted()
-    {
-        return getServer().getPlayerList().getHasWhitelist();
-    }
-
-    public List<?> getWhitelisted()
-    {
-        return Arrays.asList(getServer().getPlayerList().getWhitelisted());
-    }
-
-    public String getVersion()
-    {
-        return getServer().getVersion();
-    }
-
-    private MinecraftServer getServer()
-    {
-        return ((CraftServer)Bukkit.getServer()).getServer();
-    }
-
-}

src/main/java/me/totalfreedom/totalfreedommod/ServerPing.java

@@ -1,5 +1,6 @@
 package me.totalfreedom.totalfreedommod;
 
+import com.google.gson.Gson;
 import me.totalfreedom.totalfreedommod.config.ConfigEntry;
 import me.totalfreedom.totalfreedommod.util.FUtil;
 import org.bukkit.Bukkit;
@@ -7,8 +8,13 @@ import org.bukkit.event.EventHandler;
 import org.bukkit.event.EventPriority;
 import org.bukkit.event.server.ServerListPingEvent;
 
+import java.io.InputStreamReader;
+
 public class ServerPing extends FreedomService
 {
+    private final Gson gson = new Gson();
+    private final VersionMeta meta = gson.fromJson(new InputStreamReader(Bukkit.class.getClassLoader().getResourceAsStream("version.json")),VersionMeta.class);
+
     @Override
     public void onStart()
     {
@@ -54,7 +60,7 @@ public class ServerPing extends FreedomService
             return;
         }
 
-        String baseMotd = ConfigEntry.SERVER_MOTD.getString().replace("%mcversion%", plugin.si.getVersion());
+        String baseMotd = ConfigEntry.SERVER_MOTD.getString().replace("%mcversion%", meta.id);
         baseMotd = baseMotd.replace("\\n", "\n");
         baseMotd = FUtil.colorize(baseMotd);
 
@@ -73,4 +79,9 @@ public class ServerPing extends FreedomService
 
         event.setMotd(motd.toString().trim());
     }
+
+    private static class VersionMeta
+    {
+        private String id;
+    }
 }

src/main/java/me/totalfreedom/totalfreedommod/TotalFreedomMod.java

@@ -14,7 +14,6 @@ import me.totalfreedom.totalfreedommod.blocking.InteractBlocker;
 import me.totalfreedom.totalfreedommod.blocking.MobBlocker;
 import me.totalfreedom.totalfreedommod.blocking.PVPBlocker;
 import me.totalfreedom.totalfreedommod.blocking.PotionBlocker;
-import me.totalfreedom.totalfreedommod.blocking.SignBlocker;
 import me.totalfreedom.totalfreedommod.blocking.command.CommandBlocker;
 import me.totalfreedom.totalfreedommod.bridge.BukkitTelnetBridge;
 import me.totalfreedom.totalfreedommod.bridge.CoreProtectBridge;
@@ -54,7 +53,6 @@ import org.bukkit.generator.ChunkGenerator;
 import org.bukkit.plugin.Plugin;
 import org.bukkit.plugin.java.JavaPlugin;
 import org.jetbrains.annotations.NotNull;
-import org.spigotmc.SpigotConfig;
 
 public class TotalFreedomMod extends JavaPlugin
 {
@@ -74,8 +72,6 @@ public class TotalFreedomMod extends JavaPlugin
     // Command Loader
     public CommandLoader cl;
     // Services
-    public ServerInterface si;
-    public SavedFlags sf;
     public WorldManager wm;
     public LogViewer lv;
     public AdminList al;
@@ -122,7 +118,6 @@ public class TotalFreedomMod extends JavaPlugin
     public Trailer tr;
     public HTTPDaemon hd;
     public WorldRestrictions wr;
-    public SignBlocker snp;
     public EntityWiper ew;
     public Sitter st;
     public VanishHandler vh;
@@ -177,9 +172,6 @@ public class TotalFreedomMod extends JavaPlugin
         final MethodTimer timer = new MethodTimer();
         timer.start();
 
-        // Warn if we're running on a wrong version
-        ServerInterface.warnVersion();
-
         // Delete unused files
         FUtil.deleteCoreDumps();
         FUtil.deleteFolder(new File("./_deleteme"));
@@ -187,7 +179,6 @@ public class TotalFreedomMod extends JavaPlugin
         fsh = new FreedomServiceHandler();
 
         config = new MainConfig();
-        config.load();
 
         if (FUtil.inDeveloperMode())
         {
@@ -213,13 +204,10 @@ public class TotalFreedomMod extends JavaPlugin
         FLog.info("Started " + fsh.getServiceAmount() + " services.");
 
         timer.update();
-        FLog.info("Version " + pluginVersion + " for " + ServerInterface.COMPILE_NMS_VERSION + " enabled in " + timer.getTotal() + "ms");
+        FLog.info("Version " + pluginVersion + " enabled in " + timer.getTotal() + "ms");
 
         // Metrics @ https://bstats.org/plugin/bukkit/TotalFreedomMod/2966
         new Metrics(this, 2966);
-
-        // little workaround to stop spigot from autorestarting - causing AMP to detach from process.
-        SpigotConfig.config.set("settings.restart-on-crash", false);
     }
 
     @Override
@@ -298,8 +286,6 @@ public class TotalFreedomMod extends JavaPlugin
         private void initServices()
         {
             // Start services
-            si = new ServerInterface();
-            sf = new SavedFlags();
             wm = new WorldManager();
             lv = new LogViewer();
             sql = new SQLite();
@@ -327,7 +313,6 @@ public class TotalFreedomMod extends JavaPlugin
             im = new IndefiniteBanList();
             pem = new PermissionManager();
             gr = new GameRuleHandler();
-            snp = new SignBlocker();
             ew = new EntityWiper();
             st = new Sitter();
             vh = new VanishHandler();

src/main/java/me/totalfreedom/totalfreedommod/admin/Admin.java

@@ -2,26 +2,23 @@ package me.totalfreedom.totalfreedommod.admin;
 
 import java.sql.ResultSet;
 import java.sql.SQLException;
-import java.util.ArrayList;
-import java.util.Date;
-import java.util.HashMap;
-import java.util.List;
-import java.util.Map;
+import java.util.*;
+
 import me.totalfreedom.totalfreedommod.LogViewer.LogsRegistrationMode;
 import me.totalfreedom.totalfreedommod.TotalFreedomMod;
+import me.totalfreedom.totalfreedommod.player.FPlayer;
 import me.totalfreedom.totalfreedommod.rank.Rank;
 import me.totalfreedom.totalfreedommod.util.FLog;
 import me.totalfreedom.totalfreedommod.util.FUtil;
 import org.apache.commons.lang.StringUtils;
 import org.bukkit.Bukkit;
+import org.bukkit.Server;
 import org.bukkit.entity.Player;
 
 public class Admin
 {
-
-
     private final List<String> ips = new ArrayList<>();
-    private String name;
+    private UUID uuid;
     private boolean active = true;
     private Rank rank = Rank.ADMIN;
     private Date lastLogin = new Date();
@@ -32,7 +29,7 @@ public class Admin
 
     public Admin(Player player)
     {
-        this.name = player.getName();
+        uuid = player.getUniqueId();
         this.ips.add(FUtil.getIp(player));
     }
 
@@ -40,7 +37,7 @@ public class Admin
     {
         try
         {
-            this.name = resultSet.getString("username");
+            this.uuid = UUID.fromString(resultSet.getString("uuid"));
             this.active = resultSet.getBoolean("active");
             this.rank = Rank.findRank(resultSet.getString("rank"));
             this.ips.clear();
@@ -62,7 +59,7 @@ public class Admin
     {
         final StringBuilder output = new StringBuilder();
 
-        output.append("Admin: ").append(name).append("\n")
+        output.append("Admin: ").append(getName()).append("\n")
                 .append("- IPs: ").append(StringUtils.join(ips, ", ")).append("\n")
                 .append("- Last Login: ").append(FUtil.dateToString(lastLogin)).append("\n")
                 .append("- Rank: ").append(rank.getName()).append("\n")
@@ -78,7 +75,7 @@ public class Admin
     {
         Map<String, Object> map = new HashMap<String, Object>()
         {{
-            put("username", name);
+            put("uuid", uuid.toString());
             put("active", active);
             put("rank", rank.toString());
             put("ips", FUtil.listToString(ips));
@@ -120,20 +117,20 @@ public class Admin
 
     public boolean isValid()
     {
-        return name != null
+        return uuid != null
                 && rank != null
                 && !ips.isEmpty()
                 && lastLogin != null;
     }
 
-    public String getName()
+    public UUID getUuid()
     {
-        return name;
+        return uuid;
     }
 
-    public void setName(String name)
+    public String getName()
     {
-        this.name = name;
+        return Bukkit.getOfflinePlayer(uuid).getName();
     }
 
     public boolean isActive()
@@ -162,6 +159,34 @@ public class Admin
                 {
                     plugin.btb.killTelnetSessions(getName());
                 }
+
+                // Ensure admins don't have admin functionality when removed (FS-222)
+                AdminList.vanished.remove(getName());
+
+                if (plugin.esb != null)
+                {
+                    plugin.esb.setVanished(getName(), false);
+                }
+
+                setCommandSpy(false);
+                setPotionSpy(false);
+
+                Server server = Bukkit.getServer();
+                Player player = server.getPlayer(getName());
+
+                if (player != null)
+                {
+                    // Update chats
+                    FPlayer freedomPlayer = plugin.pl.getPlayer(player);
+                    freedomPlayer.removeAdminFunctionality();
+
+                    // Disable vanish
+                    for (Player player1 : server.getOnlinePlayers())
+                    {
+                        player1.showPlayer(plugin, player);
+                    }
+                }
+
             }
 
             plugin.lv.updateLogsRegistration(null, getName(), LogsRegistrationMode.DELETE);

src/main/java/me/totalfreedom/totalfreedommod/admin/AdminList.java

@@ -4,11 +4,7 @@ import com.google.common.collect.Maps;
 import com.google.common.collect.Sets;
 import java.sql.ResultSet;
 import java.sql.SQLException;
-import java.util.ArrayList;
-import java.util.Date;
-import java.util.List;
-import java.util.Map;
-import java.util.Set;
+import java.util.*;
 import java.util.concurrent.TimeUnit;
 import me.totalfreedom.totalfreedommod.FreedomService;
 import me.totalfreedom.totalfreedommod.config.ConfigEntry;
@@ -22,10 +18,10 @@ import org.bukkit.entity.Player;
 public class AdminList extends FreedomService
 {
     public static final List<String> vanished = new ArrayList<>();
-    public final Map<String, List<String>> verifiedNoAdmin = Maps.newHashMap();
     private final Set<Admin> allAdmins = Sets.newHashSet(); // Includes disabled admins
     // Only active admins below
     private final Set<Admin> activeAdmins = Sets.newHashSet();
+    private final Map<UUID, Admin> uuidTable = Maps.newHashMap();
     private final Map<String, Admin> nameTable = Maps.newHashMap();
     private final Map<String, Admin> ipTable = Maps.newHashMap();
 
@@ -66,7 +62,7 @@ public class AdminList extends FreedomService
         }
 
         updateTables();
-        FLog.info("Loaded " + allAdmins.size() + " admins (" + nameTable.size() + " active,  " + ipTable.size() + " IPs)");
+        FLog.info("Loaded " + allAdmins.size() + " admins (" + uuidTable.size() + " active, " + ipTable.size() + " IPs)");
     }
 
     public void messageAllAdmins(String message)
@@ -154,40 +150,20 @@ public class AdminList extends FreedomService
 
     public Admin getAdmin(Player player)
     {
-        // Find admin
-        String ip = FUtil.getIp(player);
-        Admin admin = getEntryByName(player.getName());
+        final String ip = FUtil.getIp(player);
+        final Admin entry = getEntryByUuid(player.getUniqueId());
 
-        // Admin by name
-        if (admin != null)
+        if (entry != null && !entry.getIps().contains(ip))
         {
-            // Check if we're in online mode,
-            // Or the players IP is in the admin entry
-            if (Bukkit.getOnlineMode() || admin.getIps().contains(ip))
-            {
-                if (!admin.getIps().contains(ip))
-                {
-                    // Add the new IP if we have to
-                    admin.addIp(ip);
-                    save(admin);
-                    updateTables();
-                }
-                return admin;
-            }
+            entry.addIp(ip);
         }
 
-        // Admin by ip
-        admin = getEntryByIp(ip);
-        if (admin != null)
-        {
-            // Set the new username
-            String oldName = admin.getName();
-            admin.setName(player.getName());
-            plugin.sql.updateAdminName(oldName, admin.getName());
-            updateTables();
+        return entry;
     }
 
-        return null;
+    public Admin getEntryByUuid(UUID uuid)
+    {
+        return uuidTable.get(uuid);
     }
 
     public Admin getEntryByName(String name)
@@ -200,25 +176,6 @@ public class AdminList extends FreedomService
         return ipTable.get(ip);
     }
 
-    public Admin getEntryByIpFuzzy(String needleIp)
-    {
-        final Admin directAdmin = getEntryByIp(needleIp);
-        if (directAdmin != null)
-        {
-            return directAdmin;
-        }
-
-        for (String ip : ipTable.keySet())
-        {
-            if (FUtil.fuzzyIpMatch(needleIp, ip, 3))
-            {
-                return ipTable.get(ip);
-            }
-        }
-
-        return null;
-    }
-
     public void updateLastLogin(Player player)
     {
         final Admin admin = getAdmin(player);
@@ -228,31 +185,9 @@ public class AdminList extends FreedomService
         }
 
         admin.setLastLogin(new Date());
-        admin.setName(player.getName());
         save(admin);
     }
 
-    public boolean isAdminImpostor(Player player)
-    {
-        return getEntryByName(player.getName()) != null && !isAdmin(player) && !isVerifiedAdmin(player);
-    }
-
-    public boolean isVerifiedAdmin(Player player)
-    {
-        return verifiedNoAdmin.containsKey(player.getName()) && verifiedNoAdmin.get(player.getName()).contains(FUtil.getIp(player));
-    }
-
-    public boolean isIdentityMatched(Player player)
-    {
-        if (Bukkit.getOnlineMode())
-        {
-            return true;
-        }
-
-        Admin admin = getAdmin(player);
-        return admin != null && admin.getName().equalsIgnoreCase(player.getName());
-    }
-
     public boolean addAdmin(Admin admin)
     {
         if (!admin.isValid())
@@ -297,6 +232,7 @@ public class AdminList extends FreedomService
     public void updateTables()
     {
         activeAdmins.clear();
+        uuidTable.clear();
         nameTable.clear();
         ipTable.clear();
 
@@ -308,13 +244,13 @@ public class AdminList extends FreedomService
             }
 
             activeAdmins.add(admin);
+            uuidTable.put(admin.getUuid(), admin);
             nameTable.put(admin.getName().toLowerCase(), admin);
 
             for (String ip : admin.getIps())
             {
                 ipTable.put(ip, admin);
             }
-
         }
     }
 
@@ -332,11 +268,10 @@ public class AdminList extends FreedomService
     {
         try
         {
-            ResultSet currentSave = plugin.sql.getAdminByName(admin.getName());
+            ResultSet currentSave = plugin.sql.getAdminByUuid(admin.getUuid());
             for (Map.Entry<String, Object> entry : admin.toSQLStorable().entrySet())
             {
-                Object storedValue = plugin.sql.getValue(currentSave, entry.getKey(), entry.getValue());
-                if (storedValue != null && !storedValue.equals(entry.getValue()) || storedValue == null && entry.getValue() != null || entry.getValue() == null)
+                Object storedValue = plugin.sql.getValue(currentSave, entry.getKey(), entry.getValue());                if (storedValue != null && !storedValue.equals(entry.getValue()) || storedValue == null && entry.getValue() != null || entry.getValue() == null)
                 {
                     plugin.sql.setAdminValue(admin, entry.getKey(), entry.getValue());
                 }
@@ -401,9 +336,4 @@ public class AdminList extends FreedomService
     {
         return ipTable;
     }
-
-    public Map<String, List<String>> getVerifiedNoAdmin()
-    {
-        return verifiedNoAdmin;
-    }
 }

src/main/java/me/totalfreedom/totalfreedommod/blocking/EventBlocker.java

@@ -4,6 +4,8 @@ import java.util.ArrayList;
 import java.util.Arrays;
 import java.util.List;
 import java.util.Objects;
+
+import io.papermc.paper.event.player.PlayerSignCommandPreprocessEvent;
 import me.totalfreedom.totalfreedommod.FreedomService;
 import me.totalfreedom.totalfreedommod.config.ConfigEntry;
 import me.totalfreedom.totalfreedommod.util.FUtil;
@@ -265,4 +267,10 @@ public class EventBlocker extends FreedomService
         FUtil.fixCommandVoid(event.getEntity());
         event.setDeathMessage(event.getDeathMessage());
     }
+
+    @EventHandler
+    public void onSignInteract(PlayerSignCommandPreprocessEvent event)
+    {
+        event.setCancelled(true);
+    }
 }

src/main/java/me/totalfreedom/totalfreedommod/blocking/InteractBlocker.java

@@ -5,6 +5,8 @@ import me.totalfreedom.totalfreedommod.config.ConfigEntry;
 import me.totalfreedom.totalfreedommod.util.Groups;
 import org.bukkit.ChatColor;
 import org.bukkit.Material;
+import org.bukkit.block.Block;
+import org.bukkit.entity.EntityType;
 import org.bukkit.entity.Player;
 import org.bukkit.event.EventHandler;
 import org.bukkit.event.EventPriority;
@@ -79,9 +81,33 @@ public class InteractBlocker extends FreedomService
 
         if (Groups.SPAWN_EGGS.contains(event.getMaterial()))
         {
-            player.getInventory().clear(player.getInventory().getHeldItemSlot());
-            player.sendMessage(ChatColor.GRAY + "Spawn eggs are currently disabled.");
             event.setCancelled(true);
+            Block clickedBlock = event.getClickedBlock();
+            if (clickedBlock == null)
+            {
+                return;
+            }
+            EntityType eggType = null;
+            try
+            {
+                Material mat = event.getMaterial();
+                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)
+            {
+                //
+            }
+            if (eggType != null)
+            {
+                clickedBlock.getWorld().spawnEntity(clickedBlock.getLocation().add(event.getBlockFace().getDirection()).add(0.5, 0.5, 0.5), eggType);
+            }
             return;
         }
 

src/main/java/me/totalfreedom/totalfreedommod/blocking/SignBlocker.java

@@ -1,67 +0,0 @@
-package me.totalfreedom.totalfreedommod.blocking;
-
-import me.totalfreedom.totalfreedommod.FreedomService;
-import net.minecraft.server.v1_16_R3.NBTTagCompound;
-import org.bukkit.ChatColor;
-import org.bukkit.Tag;
-import org.bukkit.craftbukkit.v1_16_R3.inventory.CraftItemStack;
-import org.bukkit.entity.Player;
-import org.bukkit.event.EventHandler;
-import org.bukkit.event.EventPriority;
-import org.bukkit.event.block.Action;
-import org.bukkit.event.block.BlockPlaceEvent;
-import org.bukkit.event.player.PlayerInteractEvent;
-import org.bukkit.inventory.ItemStack;
-
-//codebeat:disable[LOC,ABC]
-
-public class SignBlocker extends FreedomService
-{
-    @Override
-    public void onStart()
-    {
-    }
-
-    @Override
-    public void onStop()
-    {
-    }
-
-    @EventHandler(priority = EventPriority.NORMAL)
-    public void onPlayerPlaceBlock(BlockPlaceEvent event)
-    {
-
-        final Player player = event.getPlayer();
-        if (Tag.SIGNS.getValues().contains(event.getBlock().getType()))
-        {
-            ItemStack sign = event.getItemInHand();
-            net.minecraft.server.v1_16_R3.ItemStack nmsSign = CraftItemStack.asNMSCopy(sign);
-            NBTTagCompound compound = (nmsSign.hasTag()) ? nmsSign.getTag() : new NBTTagCompound();
-            assert compound != null;
-            NBTTagCompound bet = compound.getCompound("BlockEntityTag");
-            String line1 = bet.getString("Text1");
-            String line2 = bet.getString("Text2");
-            String line3 = bet.getString("Text3");
-            String line4 = bet.getString("Text4");
-            if (line1.contains("run_command") || line2.contains("run_command") || line3.contains("run_command") || line4.contains("run_command"))
-            {
-                player.sendMessage(ChatColor.GRAY + "You are not allowed to place command signs.");
-                event.setCancelled(true);
-            }
-        }
-    }
-
-    @EventHandler(priority = EventPriority.LOWEST)
-    public void onPlayerInteractSign(PlayerInteractEvent event)
-    {
-        if (event.getAction() != Action.RIGHT_CLICK_BLOCK)
-        {
-            return;
-        }
-
-        if (event.getClickedBlock() != null && Tag.SIGNS.getValues().contains(event.getClickedBlock().getType()))
-        {
-            event.setCancelled(true);
-        }
-    }
-}

src/main/java/me/totalfreedom/totalfreedommod/blocking/command/CommandBlockerEntry.java

@@ -2,10 +2,10 @@ package me.totalfreedom.totalfreedommod.blocking.command;
 
 import me.totalfreedom.totalfreedommod.TotalFreedomMod;
 import me.totalfreedom.totalfreedommod.util.FUtil;
+import org.bukkit.Bukkit;
 import org.bukkit.ChatColor;
 import org.bukkit.command.CommandSender;
 import org.bukkit.entity.Player;
-import org.spigotmc.SpigotConfig;
 
 public class CommandBlockerEntry
 {
@@ -45,7 +45,7 @@ public class CommandBlockerEntry
         }
         if (action == CommandBlockerAction.BLOCK_UNKNOWN)
         {
-            sender.sendMessage(SpigotConfig.unknownCommandMessage);
+            sender.sendMessage(Bukkit.spigot().getSpigotConfig().getString("messages.unknown-command"));
             return;
         }
         FUtil.playerMsg(sender, FUtil.colorize(message));

src/main/java/me/totalfreedom/totalfreedommod/bridge/BukkitTelnetBridge.java

@@ -42,7 +42,7 @@ public class BukkitTelnetBridge extends FreedomService
             return;
         }
 
-        final Admin admin = plugin.al.getEntryByIpFuzzy(ip);
+        final Admin admin = plugin.al.getEntryByIp(ip);
 
         if (admin == null || !admin.isActive() || !admin.getRank().hasConsoleVariant())
         {

src/main/java/me/totalfreedom/totalfreedommod/bridge/CoreProtectBridge.java

@@ -192,7 +192,6 @@ public class CoreProtectBridge extends FreedomService
         return (megabytes / 1024);
     }
 
-    // Wipes DB for the specified world
     public void clearDatabase(World world)
     {
         clearDatabase(world, false);
@@ -260,12 +259,6 @@ public class CoreProtectBridge extends FreedomService
         {
             FLog.warning("Failed to delete the CoreProtect data for the " + world.getName());
         }
-
-        // This exits for flatlands wipes
-        if (shutdown)
-        {
-            server.shutdown();
-        }
     }
 
     @EventHandler(priority = EventPriority.MONITOR)
@@ -276,18 +269,14 @@ public class CoreProtectBridge extends FreedomService
         Block block = event.getClickedBlock();
         final CoreProtectAPI coreProtect = getCoreProtectAPI();
 
+        // TODO: Rewrite this
         if (data.hasInspection())
         {
-            if (event.getAction() == Action.LEFT_CLICK_BLOCK)
-            {
-                if (block != null)
-                {
-                    event.setCancelled(true);
-                    List<String[]> lookup = coreProtect.blockLookup(block, -1);
-
             int cooldownTime = 3;
 
-                    if (cooldown.containsKey(player.getName()))
+            // Cooldown check
+            if ((event.getAction() == Action.LEFT_CLICK_BLOCK || event.getAction() == Action.RIGHT_CLICK_BLOCK)
+                    && cooldown.containsKey(player.getName()))
             {
                 long secondsLeft = getSecondsLeft(cooldown.get(player.getName()), cooldownTime);
                 if (secondsLeft > 0L)
@@ -298,6 +287,14 @@ public class CoreProtectBridge extends FreedomService
                 }
             }
 
+            // Actual lookup time
+            if (event.getAction() == Action.LEFT_CLICK_BLOCK)
+            {
+                if (block != null)
+                {
+                    event.setCancelled(true);
+                    List<String[]> lookup = coreProtect.blockLookup(block, -1);
+
                     if (!plugin.al.isAdmin(player))
                     {
                         cooldown.put(player.getName(), System.currentTimeMillis());
@@ -363,8 +360,6 @@ public class CoreProtectBridge extends FreedomService
             else if (event.getAction() == Action.RIGHT_CLICK_BLOCK)
             {
                 if (block != null)
-                {
-                    if (data.hasInspection())
                 {
                     BlockState blockState = block.getRelative(event.getBlockFace()).getState();
                     Block placedBlock = blockState.getBlock();
@@ -376,19 +371,6 @@ public class CoreProtectBridge extends FreedomService
                         lookup = coreProtect.blockLookup(block, -1);
                     }
 
-                        int cooldownTime = 3;
-
-                        if (cooldown.containsKey(player.getName()))
-                        {
-                            long secondsLeft = getSecondsLeft(cooldown.get(player.getName()), cooldownTime);
-                            if (secondsLeft > 0L)
-                            {
-                                event.setCancelled(true);
-                                player.sendMessage(ChatColor.RED + String.valueOf(secondsLeft) + " seconds left before next query.");
-                                return;
-                            }
-                        }
-
                     if (!plugin.al.isAdmin(player))
                     {
                         cooldown.put(player.getName(), System.currentTimeMillis());
@@ -453,5 +435,4 @@ public class CoreProtectBridge extends FreedomService
             }
         }
     }
-    }
 }

src/main/java/me/totalfreedom/totalfreedommod/bridge/EssentialsBridge.java

@@ -114,8 +114,7 @@ public class EssentialsBridge extends FreedomService
             User user = getEssentialsUser(username);
             if (user != null)
             {
-                Long l = FUtil.getField(user, "lastActivity");
-                return (l != null) ? l : 0L;
+                return user.getLastOnlineActivity();
             }
         }
         catch (Exception ex)

src/main/java/me/totalfreedom/totalfreedommod/bridge/WorldEditBridge.java

@@ -48,52 +48,6 @@ public class WorldEditBridge extends FreedomService
         return worldeditPlugin;
     }
 
-    public void undo(Player player, int count)
-    {
-        try
-        {
-            LocalSession session = getPlayerSession(player);
-            if (session != null)
-            {
-                final BukkitPlayer bukkitPlayer = getBukkitPlayer(player);
-                if (bukkitPlayer != null)
-                {
-                    for (int i = 0; i < count; i++)
-                    {
-                        session.undo(session.getBlockBag(bukkitPlayer), bukkitPlayer);
-                    }
-                }
-            }
-        }
-        catch (Exception ex)
-        {
-            FLog.severe(ex);
-        }
-    }
-
-    public void redo(Player player, int count)
-    {
-        try
-        {
-            LocalSession session = getPlayerSession(player);
-            if (session != null)
-            {
-                final BukkitPlayer bukkitPlayer = getBukkitPlayer(player);
-                if (bukkitPlayer != null)
-                {
-                    for (int i = 0; i < count; i++)
-                    {
-                        session.redo(session.getBlockBag(bukkitPlayer), bukkitPlayer);
-                    }
-                }
-            }
-        }
-        catch (Exception ex)
-        {
-            FLog.severe(ex);
-        }
-    }
-
     public void setLimit(Player player, int limit)
     {
         try
@@ -153,23 +107,4 @@ public class WorldEditBridge extends FreedomService
             return null;
         }
     }
-
-    private BukkitPlayer getBukkitPlayer(Player player)
-    {
-        final WorldEditPlugin wep = getWorldEditPlugin();
-        if (wep == null)
-        {
-            return null;
-        }
-
-        try
-        {
-            return wep.wrapPlayer(player);
-        }
-        catch (Exception ex)
-        {
-            FLog.severe(ex);
-            return null;
-        }
-    }
 }

src/main/java/me/totalfreedom/totalfreedommod/bridge/WorldGuardBridge.java

@@ -1,13 +1,13 @@
 package me.totalfreedom.totalfreedommod.bridge;
 
-import com.sk89q.worldedit.bukkit.BukkitAdapter;
+import com.sk89q.worldguard.LocalPlayer;
 import com.sk89q.worldguard.WorldGuard;
-import com.sk89q.worldguard.protection.managers.RegionManager;
-import com.sk89q.worldguard.protection.regions.ProtectedRegion;
+import com.sk89q.worldguard.bukkit.WorldGuardPlugin;
 import com.sk89q.worldguard.protection.regions.RegionContainer;
-import java.util.Map;
+
+import com.sk89q.worldguard.protection.regions.RegionQuery;
 import me.totalfreedom.totalfreedommod.FreedomService;
-import org.bukkit.World;
+import org.bukkit.entity.Player;
 import org.bukkit.plugin.Plugin;
 
 public class WorldGuardBridge extends FreedomService
@@ -15,7 +15,6 @@ public class WorldGuardBridge extends FreedomService
     @Override
     public void onStart()
     {
-        plugin.wr.protectWorld(plugin.wm.masterBuilderWorld.getWorld());
     }
 
     @Override
@@ -23,26 +22,21 @@ public class WorldGuardBridge extends FreedomService
     {
     }
 
-    public RegionManager getRegionManager(World world)
+    public boolean canEditCurrentWorld(Player player)
     {
+        // If WorldGuard integration is enabled, do a check with it.
+        if (isEnabled())
+        {
+            LocalPlayer localPlayer = WorldGuardPlugin.inst().wrapPlayer(player);
+
             RegionContainer container = WorldGuard.getInstance().getPlatform().getRegionContainer();
-        return container.get(BukkitAdapter.adapt(world));
+            RegionQuery query = container.createQuery();
+
+            return query.testBuild(localPlayer.getLocation(), localPlayer);
         }
 
-    public int wipeRegions(World world)
-    {
-        int count = 0;
-        RegionManager regionManager = getRegionManager(world);
-        if (regionManager != null)
-        {
-            Map<String, ProtectedRegion> regions = regionManager.getRegions();
-            for (ProtectedRegion region : regions.values())
-            {
-                regionManager.removeRegion(region.getId());
-                count++;
-            }
-        }
-        return count;
+        // If the plugin isn't present, return true.
+        return true;
     }
 
     public boolean isEnabled()

src/main/java/me/totalfreedom/totalfreedommod/command/Command_ban.java

@@ -1,8 +1,8 @@
 package me.totalfreedom.totalfreedommod.command;
 
-import java.util.ArrayList;
-import java.util.List;
 import java.util.Objects;
+
+import com.earth2me.essentials.User;
 import me.totalfreedom.totalfreedommod.banning.Ban;
 import me.totalfreedom.totalfreedommod.player.PlayerData;
 import me.totalfreedom.totalfreedommod.punishments.Punishment;
@@ -60,28 +60,39 @@ public class Command_ban extends FreedomCommand
         }
 
         final String username;
-        final List<String> ips = new ArrayList<>();
+        final String ip;
 
         final Player player = getPlayer(args[0]);
         if (player == null)
         {
-            final PlayerData entry = plugin.pl.getData(args[0]);
-
+            // Gets the IP using Essentials data if available
+            if (plugin.esb.isEnabled() && plugin.esb.getEssentialsUser(args[0]) != null)
+            {
+                User essUser = plugin.esb.getEssentialsUser(args[0]);
+                //
+                username = essUser.getName();
+                ip = essUser.getLastLoginAddress();
+            }
+            // Last resort - Getting the first result from the username itself
+            else
+            {
+                PlayerData entry = plugin.pl.getData(args[0]);
                 if (entry == null)
                 {
-                msg("Can't find that user. If target is not logged in, make sure that you spelled the name exactly.");
+                    msg(PLAYER_NOT_FOUND);
                     return true;
                 }
-
-            username = entry.getName();
-            ips.addAll(entry.getIps());
-        }
                 else
                 {
-            final PlayerData entry = plugin.pl.getData(player);
+                    username = entry.getName();
+                    ip = entry.getIps().get(0);
+                }
+            }
+        }
+        else
+        {
             username = player.getName();
-            //ips.addAll(entry.getIps());/
-            ips.add(FUtil.getIp(player));
+            ip = FUtil.getIp(player);
 
             // Deop
             player.setOp(false);
@@ -126,7 +137,6 @@ public class Command_ban extends FreedomCommand
 
         // Ban player
         Ban ban;
-
         if (player != null)
         {
             ban = Ban.forPlayer(player, sender, null, reason);
@@ -135,12 +145,8 @@ public class Command_ban extends FreedomCommand
         {
             ban = Ban.forPlayerName(username, sender, null, reason);
         }
-
-        for (String ip : ips)
-        {
         ban.addIp(ip);
-            ban.addIp(FUtil.getFuzzyIp(ip));
-        }
+
         plugin.bm.addBan(ban);
 
 
@@ -154,7 +160,7 @@ public class Command_ban extends FreedomCommand
             {
                 bcast.append(" - Reason: ").append(ChatColor.YELLOW).append(reason);
             }
-            msg(sender, ChatColor.GRAY + username + " has been banned and IP is: " + StringUtils.join(ips, ", "));
+            msg(sender, ChatColor.GRAY + username + " has been banned and IP is: " + ip);
             FUtil.adminAction(sender.getName(), bcast.toString(), true);
         }
 
@@ -172,7 +178,7 @@ public class Command_ban extends FreedomCommand
         }
 
         // Log ban
-        plugin.pul.logPunishment(new Punishment(username, ips.get(0), sender.getName(), PunishmentType.BAN, reason));
+        plugin.pul.logPunishment(new Punishment(username, ip, sender.getName(), PunishmentType.BAN, reason));
 
         return true;
     }

src/main/java/me/totalfreedom/totalfreedommod/command/Command_coins.java

@@ -9,8 +9,11 @@ import org.bukkit.command.Command;
 import org.bukkit.command.CommandSender;
 import org.bukkit.entity.Player;
 
+import java.util.ArrayList;
+import java.util.List;
+
 @CommandPermissions(level = Rank.OP, source = SourceType.BOTH)
-@CommandParameters(description = "Shows the amount of coins you have or another player has", usage = "/<command> [playername]")
+@CommandParameters(description = "Shows the amount of coins you or another player has. Also allows you to give coins to other players.", usage = "/<command> [player] | pay <player> <amount>")
 public class Command_coins extends FreedomCommand
 {
     @Override
@@ -21,34 +24,119 @@ public class Command_coins extends FreedomCommand
             msg("The shop is currently disabled!", ChatColor.RED);
             return true;
         }
-        Player p;
+
         final String prefix = FUtil.colorize(ConfigEntry.SHOP_PREFIX.getString() + " ");
-        if (args.length > 0)
+
+        switch (args.length)
         {
-            if (getPlayer(args[0]) != null)
-            {
-                p = getPlayer(args[0]);
-            }
-            else
-            {
-                msg(PLAYER_NOT_FOUND);
-                return true;
-            }
-        }
-        else
+            // Mode for seeing how many coins the sender has (doesn't work from console)
+            case 0:
             {
                 if (senderIsConsole)
                 {
-                msg(prefix + ChatColor.RED + "You are not a player, use /coins <playername>");
-                return true;
+                    msg("When used from the console, you must define a target player.");
                 }
                 else
                 {
-                p = playerSender;
+                    PlayerData playerData = getData(playerSender);
+                    msg(prefix + ChatColor.GREEN + "You have " + ChatColor.RED + playerData.getCoins() + ChatColor.GREEN
+                            + " coins.");
                 }
-        }
-        PlayerData playerData = plugin.pl.getData(p);
-        msg(prefix + ChatColor.GREEN + (args.length > 0 ? p.getName() + " has " : "You have ") + ChatColor.RED + playerData.getCoins() + ChatColor.GREEN + " coins.");
                 return true;
             }
+
+            // Mode for seeing how many coins a player has.
+            case 1:
+            {
+                Player target = getPlayer(args[0]);
+
+                if (target == null)
+                {
+                    msg(PLAYER_NOT_FOUND);
+                }
+                else
+                {
+                    PlayerData playerData = getData(target);
+                    msg(prefix + ChatColor.GREEN + target.getName() + " has " + ChatColor.RED + playerData.getCoins() + ChatColor.GREEN + " coins.");
+                }
+                return true;
+            }
+
+            // Mode for paying another player coins
+            case 3:
+            {
+                if (args[0].equalsIgnoreCase("pay"))
+                {
+                    checkPlayer();
+
+                    final Player target = getPlayer(args[1]);
+                    final PlayerData senderData = getData(playerSender);
+
+                    int coinsToTransfer;
+
+                    // Processes args[2]
+                    try
+                    {
+                        // Prevents players from trying to be cheeky with negative numbers.
+                        coinsToTransfer = Math.max(Math.abs(Integer.parseInt(args[2])), 1);
+                    }
+                    catch (NumberFormatException ex)
+                    {
+                        msg("Invalid number: " + args[2], ChatColor.RED);
+                        return true;
+                    }
+
+                    // Prevents players from performing transactions they can't afford to do.
+                    if (senderData.getCoins() < coinsToTransfer)
+                    {
+                        msg("You don't have enough coins to perform this transaction.", ChatColor.RED);
+                        return true;
+                    }
+
+                    if (target == null)
+                    {
+                        msg(PLAYER_NOT_FOUND);
+                    }
+                    else
+                    {
+                        PlayerData playerData = getData(target);
+                        playerData.setCoins(playerData.getCoins() + coinsToTransfer);
+                        senderData.setCoins(senderData.getCoins() - coinsToTransfer);
+
+                        msg(target, sender.getName()
+                                + ChatColor.GREEN + " has given you "
+                                + ChatColor.GOLD + coinsToTransfer
+                                + ChatColor.GREEN + " coin" + (coinsToTransfer > 1 ? "s" : "") + "!", ChatColor.GOLD);
+
+                        msg("You have given "
+                                + ChatColor.GOLD + coinsToTransfer
+                                + ChatColor.GREEN + " coin" + (coinsToTransfer > 1 ? "s" : "")
+                                + " to " + ChatColor.GOLD + target.getName() + ChatColor.GREEN + ".", ChatColor.GREEN);
+                    }
+
+                    return true;
+                }
+            }
+
+            default:
+            {
+                return false;
+            }
+        }
+    }
+
+    @Override
+    public List<String> getTabCompleteOptions(CommandSender sender, Command command, String alias, String[] args)
+    {
+        if (args.length == 1)
+        {
+            List<String> options = new ArrayList<>(FUtil.getPlayerList());
+
+            options.add("pay");
+
+            return options;
+        }
+
+        return FUtil.getPlayerList();
+    }
 }

src/main/java/me/totalfreedom/totalfreedommod/command/Command_doom.java

@@ -1,6 +1,5 @@
 package me.totalfreedom.totalfreedommod.command;
 
-import java.util.Objects;
 import me.totalfreedom.totalfreedommod.admin.Admin;
 import me.totalfreedom.totalfreedommod.banning.Ban;
 import me.totalfreedom.totalfreedommod.config.ConfigEntry;
@@ -43,7 +42,7 @@ public class Command_doom extends FreedomCommand
         FUtil.adminAction(sender.getName(), "Casting oblivion over " + player.getName(), true);
         FUtil.bcastMsg(player.getName() + " will be completely obliviated!", ChatColor.RED);
 
-        final String ip = Objects.requireNonNull(player.getAddress()).getAddress().getHostAddress().trim();
+        final String ip = FUtil.getIp(player);
 
         // Remove from admin
         Admin admin = getAdmin(player);
@@ -76,10 +75,7 @@ public class Command_doom extends FreedomCommand
         // Ban player
         Ban ban = Ban.forPlayer(player, sender);
         ban.setReason((reason == null ? "FUCKOFF" : reason));
-        for (String playerIp : plugin.pl.getData(player).getIps())
-        {
-            ban.addIp(playerIp);
-        }
+        ban.addIp(ip);
         plugin.bm.addBan(ban);
 
         // Set gamemode to survival

src/main/java/me/totalfreedom/totalfreedommod/command/Command_eject.java

@@ -1,40 +1,50 @@
 package me.totalfreedom.totalfreedommod.command;
 
-import java.util.ArrayList;
-import java.util.List;
 import me.totalfreedom.totalfreedommod.rank.Rank;
-import org.apache.commons.lang.StringUtils;
 import org.bukkit.ChatColor;
 import org.bukkit.command.Command;
 import org.bukkit.command.CommandSender;
-import org.bukkit.entity.Entity;
 import org.bukkit.entity.Player;
 
 @CommandPermissions(level = Rank.OP, source = SourceType.ONLY_IN_GAME)
-@CommandParameters(description = "Eject players that are riding you.", usage = "/<command>")
+@CommandParameters(description = "Eject any entities that are riding you.", usage = "/<command>")
 public class Command_eject extends FreedomCommand
 {
+    /* Player.getShoulderEntityLeft() and Player.getShoulderEntityRight() are deprecated, however unless
+        Player.getPassengers() also includes shoulders (which isn't likely, given the official documentation doesn't
+        state an alternative method to use instead), these methods will continue to be used here. */
 
+    @SuppressWarnings("deprecation")
     @Override
     public boolean run(CommandSender sender, Player playerSender, Command cmd, String commandLabel, String[] args, boolean senderIsConsole)
     {
+        // Uses the size of the return value of Player.getPassengers() as the starting number of entities ejected
+        int count = playerSender.getPassengers().size();
 
-        List<String> names = new ArrayList<>();
-
-        for (Entity entity : playerSender.getPassengers())
+        // Removes any entities from the sender's shoulders
+        if (playerSender.getShoulderEntityLeft() != null)
         {
-            names.add(entity.getName());
+            playerSender.setShoulderEntityLeft(null);
+            count++;
+        }
+        if (playerSender.getShoulderEntityRight() != null)
+        {
+            playerSender.setShoulderEntityLeft(null);
+            count++;
         }
 
-        if (names.isEmpty())
+        // Removes anything riding the sender
+        playerSender.eject();
+
+        if (count != 0)
+        {
+            msg(count + " entit" + (count == 1 ? "y was" : "ies were") + " ejected.", ChatColor.GREEN);
+        }
+        else
         {
             msg("Nothing was ejected.", ChatColor.GREEN);
-            return true;
         }
 
-        msg("Ejecting " + StringUtils.join(names, ", ") + ".", ChatColor.GREEN);
-        playerSender.eject();
-
         return true;
     }
 }

src/main/java/me/totalfreedom/totalfreedommod/command/Command_linkdiscord.java

@@ -18,7 +18,7 @@ public class Command_linkdiscord extends FreedomCommand
     {
         if (!plugin.dc.enabled)
         {
-            msg("The Discord verification system is currently disabled.", ChatColor.RED);
+            msg("The Discord integration system is currently disabled.", ChatColor.RED);
             return true;
         }
 
@@ -32,7 +32,7 @@ public class Command_linkdiscord extends FreedomCommand
             }
 
             playerData.setDiscordID(args[1]);
-            msg("Linked " + args[0] + "'s discord account.", ChatColor.GREEN);
+            msg("Linked " + args[0] + "'s Discord account.", ChatColor.GREEN);
             return true;
         }
 

src/main/java/me/totalfreedom/totalfreedommod/command/Command_list.java

@@ -15,8 +15,8 @@ import org.bukkit.entity.Player;
 import java.util.ArrayList;
 import java.util.List;
 
-@CommandPermissions(level = Rank.IMPOSTOR, source = SourceType.BOTH)
-@CommandParameters(description = "Lists the real names of all online players.", usage = "/<command> [-s | -i | -f | -v]", aliases = "who,lsit")
+@CommandPermissions(level = Rank.NON_OP, source = SourceType.BOTH)
+@CommandParameters(description = "Lists the real names of all online players.", usage = "/<command> [-s | -f | -v]", aliases = "who,lsit")
 public class Command_list extends FreedomCommand
 {
 
@@ -63,11 +63,6 @@ public class Command_list extends FreedomCommand
                     listFilter = ListFilter.TELNET_SESSIONS;
                     break;
                 }
-                case "-i":
-                {
-                    listFilter = ListFilter.IMPOSTORS;
-                    break;
-                }
                 case "-f":
                 {
                     listFilter = ListFilter.FAMOUS_PLAYERS;
@@ -122,10 +117,6 @@ public class Command_list extends FreedomCommand
                 {
                     continue;
                 }
-                if (listFilter == ListFilter.IMPOSTORS && !plugin.al.isAdminImpostor(p))
-                {
-                    continue;
-                }
                 if (listFilter == ListFilter.FAMOUS_PLAYERS && !ConfigEntry.FAMOUS_PLAYERS.getList().contains(p.getName().toLowerCase()))
                 {
                     continue;
@@ -164,7 +155,6 @@ public class Command_list extends FreedomCommand
         ADMINS,
         VANISHED_ADMINS,
         TELNET_SESSIONS,
-        FAMOUS_PLAYERS,
-        IMPOSTORS
+        FAMOUS_PLAYERS
     }
 }

src/main/java/me/totalfreedom/totalfreedommod/command/Command_makeopregion.java

@@ -1,96 +0,0 @@
-package me.totalfreedom.totalfreedommod.command;
-
-import com.sk89q.worldedit.IncompleteRegionException;
-import com.sk89q.worldedit.LocalSession;
-import com.sk89q.worldedit.regions.Region;
-import com.sk89q.worldguard.domains.DefaultDomain;
-import com.sk89q.worldguard.protection.flags.Flag;
-import com.sk89q.worldguard.protection.flags.Flags;
-import com.sk89q.worldguard.protection.flags.RegionGroup;
-import com.sk89q.worldguard.protection.flags.StateFlag;
-import com.sk89q.worldguard.protection.managers.RegionManager;
-import com.sk89q.worldguard.protection.regions.ProtectedCuboidRegion;
-import com.sk89q.worldguard.protection.regions.ProtectedRegion;
-import java.util.HashMap;
-import java.util.Map;
-import me.totalfreedom.totalfreedommod.rank.Rank;
-import org.bukkit.ChatColor;
-import org.bukkit.command.Command;
-import org.bukkit.command.CommandSender;
-import org.bukkit.entity.Player;
-
-@CommandPermissions(level = Rank.ADMIN, source = SourceType.ONLY_IN_GAME)
-@CommandParameters(description = "Make a WorldGuard region for an OP.", usage = "/<command> <playername> <name>", aliases = "mor")
-public class Command_makeopregion extends FreedomCommand
-{
-
-    final Map<Flag<?>, Object> flags = new HashMap<Flag<?>, Object>()
-    {{
-        put(Flags.BLOCK_PLACE, StateFlag.State.ALLOW);
-        put(Flags.BLOCK_BREAK, StateFlag.State.ALLOW);
-        put(Flags.BUILD, StateFlag.State.ALLOW);
-        put(Flags.PLACE_VEHICLE, StateFlag.State.ALLOW);
-        put(Flags.DESTROY_VEHICLE, StateFlag.State.ALLOW);
-        put(Flags.ENTITY_ITEM_FRAME_DESTROY, StateFlag.State.ALLOW);
-        put(Flags.ENTITY_PAINTING_DESTROY, StateFlag.State.ALLOW);
-        put(net.goldtreeservers.worldguardextraflags.flags.Flags.WORLDEDIT, StateFlag.State.ALLOW);
-    }};
-
-    public boolean run(final CommandSender sender, final Player playerSender, final Command cmd, final String commandLabel, final String[] args, final boolean senderIsConsole)
-    {
-        if (args.length < 2)
-        {
-            return false;
-        }
-
-        final Player player = getPlayer(args[0]);
-
-        if (player == null)
-        {
-            msg(FreedomCommand.PLAYER_NOT_FOUND);
-            return true;
-        }
-
-        String name = args[1];
-
-        LocalSession session = plugin.web.getWorldEditPlugin().getSession(playerSender);
-
-        Region selection;
-
-        try
-        {
-            selection = session.getSelection(session.getSelectionWorld());
-        }
-        catch (IncompleteRegionException e)
-        {
-            msg("Please make a WorldEdit selection", ChatColor.RED);
-            return true;
-        }
-
-        if (selection == null)
-        {
-            msg("Please make a WorldEdit selection", ChatColor.RED);
-            return true;
-        }
-
-        ProtectedRegion region = new ProtectedCuboidRegion(name, selection.getMinimumPoint(), selection.getMaximumPoint());
-
-        DefaultDomain owners = new DefaultDomain();
-        owners.addPlayer(playerSender.getName());
-        owners.addPlayer(player.getName());
-        region.setOwners(owners);
-        region.setFlags(flags);
-
-        for (Flag<?> flag : flags.keySet())
-        {
-            region.setFlag(flag.getRegionGroupFlag(), RegionGroup.MEMBERS);
-        }
-
-        RegionManager regionManager = plugin.wgb.getRegionManager(playerSender.getWorld());
-
-        regionManager.addRegion(region);
-
-        msg("Successfully created the region '" + name + "' for " + player.getName(), ChatColor.GREEN);
-        return true;
-    }
-}

src/main/java/me/totalfreedom/totalfreedommod/command/Command_manuallyverify.java

@@ -1,63 +0,0 @@
-package me.totalfreedom.totalfreedommod.command;
-
-import me.totalfreedom.totalfreedommod.config.ConfigEntry;
-import me.totalfreedom.totalfreedommod.rank.Rank;
-import me.totalfreedom.totalfreedommod.util.FUtil;
-import org.bukkit.ChatColor;
-import org.bukkit.command.Command;
-import org.bukkit.command.CommandSender;
-import org.bukkit.entity.Player;
-
-@CommandPermissions(level = Rank.ADMIN, source = SourceType.BOTH)
-@CommandParameters(description = "Manually verify someone", usage = "/<command> <playername>", aliases = "mv")
-public class Command_manuallyverify extends FreedomCommand
-{
-    @Override
-    public boolean run(CommandSender sender, Player playerSender, Command cmd, String commandLabel, String[] args, boolean senderIsConsole)
-    {
-        boolean verificationEnabled = ConfigEntry.DISCORD_VERIFICATION.getBoolean();
-        if (!plugin.dc.enabled)
-        {
-            msg("The Discord verification system is currently disabled.", ChatColor.RED);
-            return true;
-        }
-
-        if (!verificationEnabled)
-        {
-            msg("The Discord verification system is currently disabled.", ChatColor.RED);
-            return true;
-        }
-
-        if (args.length == 0)
-        {
-            return false;
-        }
-
-        final Player player = getPlayer(args[0]);
-        if (player == null)
-        {
-            msg(FreedomCommand.PLAYER_NOT_FOUND);
-            return true;
-        }
-
-        if (!plugin.pl.IsImpostor(player))
-        {
-            msg("That player is not an impostor.");
-            return true;
-        }
-
-        FUtil.adminAction(sender.getName(), "Manually verifying player " + player.getName(), false);
-        player.setOp(true);
-        msg(player, YOU_ARE_OP);
-
-        if (plugin.pl.getPlayer(player).getFreezeData().isFrozen())
-        {
-            plugin.pl.getPlayer(player).getFreezeData().setFrozen(false);
-            msg(player, "You have been unfrozen.");
-        }
-
-        plugin.pl.verify(player, null);
-        plugin.rm.updateDisplay(player);
-        return true;
-    }
-}

src/main/java/me/totalfreedom/totalfreedommod/command/Command_mbconfig.java

@@ -116,39 +116,21 @@ public class Command_mbconfig extends FreedomCommand
                     return true;
                 }
 
-                if (data.isMasterBuilder() && plugin.pl.isPlayerImpostor(player))
-                {
-                    FUtil.adminAction(sender.getName(), "Re-adding " + data.getName() + " to the Master Builder list", true);
-
-                    if (plugin.pl.getPlayer(player).getFreezeData().isFrozen())
-                    {
-                        plugin.pl.getPlayer(player).getFreezeData().setFrozen(false);
-                    }
-                    if (player != null)
-                    {
-                        plugin.pl.verify(player, null);
-                        plugin.rm.updateDisplay(player);
-                        player.setOp(true);
-                        msg(player, YOU_ARE_OP);
-                    }
-                }
-                else if (!data.isMasterBuilder())
+                if (!data.isMasterBuilder())
                 {
                     FUtil.adminAction(sender.getName(), "Adding " + data.getName() + " to the Master Builder list", true);
                     data.setMasterBuilder(true);
-                    data.setVerification(true);
                     plugin.pl.save(data);
                     if (player != null)
                     {
                         plugin.rm.updateDisplay(player);
                     }
-                    return true;
                 }
                 else
                 {
                     msg("That player is already on the Master Builder list.");
-                    return true;
                 }
+                return true;
             }
             case "remove":
             {
@@ -173,10 +155,6 @@ public class Command_mbconfig extends FreedomCommand
 
                 FUtil.adminAction(sender.getName(), "Removing " + data.getName() + " from the Master Builder list", true);
                 data.setMasterBuilder(false);
-                if (data.getDiscordID() == null)
-                {
-                    data.setVerification(false);
-                }
                 plugin.pl.save(data);
                 if (player != null)
                 {

src/main/java/me/totalfreedom/totalfreedommod/command/Command_modifyitem.java

@@ -1,266 +0,0 @@
-package me.totalfreedom.totalfreedommod.command;
-
-import java.util.ArrayList;
-import java.util.List;
-import java.util.SplittableRandom;
-import me.totalfreedom.totalfreedommod.rank.Rank;
-import me.totalfreedom.totalfreedommod.util.FUtil;
-import net.minecraft.server.v1_16_R3.NBTTagCompound;
-import net.minecraft.server.v1_16_R3.NBTTagList;
-import org.apache.commons.lang.StringUtils;
-import org.bukkit.Material;
-import org.bukkit.command.Command;
-import org.bukkit.command.CommandSender;
-import org.bukkit.craftbukkit.v1_16_R3.inventory.CraftItemStack;
-import org.bukkit.enchantments.Enchantment;
-import org.bukkit.entity.Player;
-import org.bukkit.inventory.ItemStack;
-import org.bukkit.inventory.meta.ItemMeta;
-import org.bukkit.inventory.meta.PotionMeta;
-import org.bukkit.potion.PotionEffectType;
-
-@CommandPermissions(level = Rank.OP, source = SourceType.ONLY_IN_GAME)
-@CommandParameters(description = "Modify the current item you are holding.", usage = "/<command> <name <message> | lore <message> | enchant <enchantment> <level> | potion <effect> <duration> <amplifier> | attribute <name> <amount> | clear>", aliases = "mi")
-public class Command_modifyitem extends FreedomCommand
-{
-
-    @SuppressWarnings("deprecation")
-    @Override
-    public boolean run(final CommandSender sender, final Player playerSender, Command cmd, String commandLabel, String[] args, boolean senderIsConsole)
-    {
-        if (args.length < 1)
-        {
-            return false;
-        }
-
-        ItemStack item = playerSender.getInventory().getItemInMainHand();
-        if (item.getType().equals(Material.AIR))
-        {
-            msg("You must have an item in your hand!");
-            return true;
-        }
-
-        if (args[0].equalsIgnoreCase("clear"))
-        {
-            item.setItemMeta(null);
-            playerSender.getInventory().setItemInMainHand(item);
-            return true;
-        }
-
-        if (args.length < 2)
-        {
-            return false;
-        }
-
-        ItemMeta meta = item.getItemMeta();
-        assert meta != null;
-        switch (args[0])
-        {
-            case "name":
-                String name = FUtil.colorize(StringUtils.join(args, " ", 1, args.length));
-                meta.setDisplayName(name);
-                item.setItemMeta(meta);
-                break;
-
-            case "lore":
-                List<String> lore = new ArrayList<>();
-                for (String line : StringUtils.join(args, " ", 1, args.length).split("\\\\n"))
-                {
-                    lore.add(FUtil.colorize(line));
-                }
-                meta.setLore(lore);
-                item.setItemMeta(meta);
-                break;
-
-            case "enchant":
-                if (args.length < 3)
-                {
-                    return false;
-                }
-
-                Enchantment enchantment = Enchantment.getByName(args[1].toUpperCase());
-                if (enchantment == null)
-                {
-                    msg("Invalid enchantment. Please run /enchant list for a list of valid enchantments.");
-                    return true;
-                }
-
-                int level;
-                try
-                {
-                    level = Integer.parseInt(args[2]);
-                }
-                catch (NumberFormatException ex)
-                {
-                    msg("The level specified is not a valid integer.");
-                    return true;
-                }
-                meta.addEnchant(enchantment, level, true);
-                item.setItemMeta(meta);
-                break;
-
-            case "potion":
-            {
-                if (!item.getType().equals(Material.POTION) & !item.getType().equals(Material.SPLASH_POTION) & !item.getType().equals(Material.LINGERING_POTION) & !item.getType().equals(Material.TIPPED_ARROW))
-                {
-                    msg("This item can not have potion effects added to it.");
-                    return true;
-                }
-
-                if (args.length < 4)
-                {
-                    return false;
-                }
-
-                PotionEffectType type = PotionEffectType.getByName(args[1]);
-                if (type == null)
-                {
-                    msg("Invalid potion effect. Please run /potion list for a list of valid potion effects.");
-                    return true;
-                }
-
-                int duration;
-                try
-                {
-                    duration = Math.max(1, Math.min(1000000, Integer.parseInt(args[2])));
-                }
-                catch (NumberFormatException ex)
-                {
-                    msg("The duration specified is not a valid integer.");
-                    return true;
-                }
-
-                int amplifier;
-                try
-                {
-                    amplifier = Math.max(1, Math.min(256, Integer.parseInt(args[2])));
-                }
-                catch (NumberFormatException ex)
-                {
-                    msg("The amplifier specified is not a valid integer.");
-                    return true;
-                }
-                PotionMeta potionMeta = (PotionMeta)meta;
-                potionMeta.addCustomEffect(type.createEffect(duration, amplifier), true);
-                item.setItemMeta(potionMeta);
-                break;
-            }
-
-            case "attribute":
-                if (args.length < 3)
-                {
-                    return false;
-                }
-                net.minecraft.server.v1_16_R3.ItemStack nmsStack = CraftItemStack.asNMSCopy(item);
-                NBTTagCompound compound = (nmsStack.hasTag()) ? nmsStack.getTag() : new NBTTagCompound();
-                NBTTagList modifiers = getAttributeList(nmsStack);
-                NBTTagCompound cmpnd = new NBTTagCompound();
-                Attribute attribute = Attribute.getByName(args[1].toUpperCase());
-                if (attribute == null)
-                {
-                    msg("Invalid attribute. Please run /attributelist for a list of valid attributes.");
-                    return true;
-                }
-                cmpnd.setString("AttributeName", attribute.getAttribute());
-                cmpnd.setString("Name", attribute.getAttribute());
-                double amount;
-                try
-                {
-                    amount = Double.parseDouble(args[2]);
-                }
-                catch (NumberFormatException ex)
-                {
-                    msg("The amount specified is not a valid integer.");
-                    return true;
-                }
-                if (Double.isNaN(amount))
-                {
-                    msg("The amount specified is illegal.");
-                    return true;
-                }
-                cmpnd.setDouble("Amount", amount);
-                cmpnd.setInt("Operation", 0);
-                SplittableRandom random = new SplittableRandom();
-                cmpnd.setIntArray("UUID", new int[]
-                        {
-                                random.nextInt(),
-                                random.nextInt(),
-                                random.nextInt(),
-                                random.nextInt()
-                        });
-                cmpnd.setString("Slot", "mainhand");
-                modifiers.add(cmpnd);
-                assert compound != null;
-                compound.set("AttributeModifiers", modifiers);
-                nmsStack.setTag(compound);
-                item = CraftItemStack.asBukkitCopy(nmsStack);
-                break;
-            default:
-                return false;
-        }
-        playerSender.getInventory().setItemInMainHand(item);
-        return true;
-    }
-
-    private NBTTagList getAttributeList(net.minecraft.server.v1_16_R3.ItemStack stack)
-    {
-        if (stack.getTag() == null)
-        {
-            stack.setTag(new NBTTagCompound());
-        }
-        NBTTagList attr = stack.getTag().getList("AttributeModifiers", 10);
-        if (attr == null)
-        {
-            stack.getTag().set("AttributeModifiers", new NBTTagList());
-        }
-        return stack.getTag().getList("AttributeModifiers", 10);
-    }
-
-    private enum Attribute
-    {
-        GENERIC_MAX_HEALTH("GENERIC_MAX_HEALTH", "generic.max_health"),
-        GENERIC_FOLLOW_RANGE("GENERIC_FOLLOW_RANGE", "generic.follow_range"),
-        GENERIC_KNOCKBACK_RESISTANCE("GENERIC_KNOCKBACK_RESISTANCE", "generic.knockback_resistance"),
-        GENERIC_MOVEMENT_SPEED("GENERIC_MOVEMENT_SPEED", "generic.movement_speed"),
-        GENERIC_FLYING_SPEED("GENERIC_FLYING_SPEED", "generic.flying_speed"),
-        GENERIC_ATTACK_DAMAGE("GENERIC_ATTACK_DAMAGE", "generic.attack_damage"),
-        GENERIC_ATTACK_SPEED("GENERIC_ATTACK_SPEED", "generic.attack_speed"),
-        GENERIC_ARMOR("GENERIC_ARMOR", "generic.armor"),
-        GENERIC_ARMOR_TOUGHNESS("GENERIC_ARMOR_TOUGHNESS", "generic.armor_toughmess"),
-        GENERIC_LUCK("GENERIC_LUCK", "generic.luck"),
-        HORSE_JUMP_STRENGTH("GENERIC_MAX_HEALTH", "horse.jump_strength"),
-        ZOMBIE_SPAWN_REINFORCEMENTS("ZOMBIE_SPAWN_REINFORCEMENTS", "zombie.spawn_reinforcements");
-
-        private final String name;
-        private final String attribute;
-
-        Attribute(String name, String attribute)
-        {
-            this.name = name;
-            this.attribute = attribute;
-        }
-
-        public static Attribute getByName(String name)
-        {
-            for (Attribute attr : Attribute.values())
-            {
-                if (attr.toString().toUpperCase().equals(name))
-                {
-                    return attr;
-                }
-            }
-            return null;
-        }
-
-        public String getAttribute()
-        {
-            return attribute;
-        }
-
-        @Override
-        public String toString()
-        {
-            return name;
-        }
-    }
-}

src/main/java/me/totalfreedom/totalfreedommod/command/Command_mute.java

@@ -130,17 +130,19 @@ public class Command_mute extends FreedomCommand
         {
             playerdata.setMuted(true);
             player.sendTitle(ChatColor.RED + "You've been muted.", ChatColor.YELLOW + "Be sure to follow the rules!", 20, 100, 60);
+            
+            if (quiet)
+            {
+                msg("Muted " + player.getName() + " quietly");
+                return true;  // doesn't announce reason
+            }
+
+            FUtil.adminAction(sender.getName(), "Muting " + player.getName(), true);
+            
             if (reason != null)
             {
                 msg(player, ChatColor.RED + "Reason: " + ChatColor.YELLOW + reason);
             }
-            if (quiet)
-            {
-                msg("Muted " + player.getName() + " quietly");
-                return true;
-            }
-
-            FUtil.adminAction(sender.getName(), "Muting " + player.getName(), true);
 
             if (smite)
             {

src/main/java/me/totalfreedom/totalfreedommod/command/Command_opall.java

@@ -24,6 +24,10 @@ public class Command_opall extends FreedomCommand
                 msg(player, YOU_ARE_OP);
                 plugin.rm.updateDisplay(player);
             }
+            else
+            {
+                player.recalculatePermissions();
+            }
         }
 
         return true;

src/main/java/me/totalfreedom/totalfreedommod/command/Command_playerverification.java

@@ -1,158 +0,0 @@
-package me.totalfreedom.totalfreedommod.command;
-
-import java.util.ArrayList;
-import java.util.Arrays;
-import java.util.Collections;
-import java.util.List;
-import me.totalfreedom.totalfreedommod.config.ConfigEntry;
-import me.totalfreedom.totalfreedommod.player.PlayerData;
-import me.totalfreedom.totalfreedommod.rank.Rank;
-import me.totalfreedom.totalfreedommod.util.FUtil;
-import org.bukkit.ChatColor;
-import org.bukkit.command.Command;
-import org.bukkit.command.CommandSender;
-import org.bukkit.entity.Player;
-
-@CommandPermissions(level = Rank.OP, source = SourceType.ONLY_IN_GAME)
-@CommandParameters(description = "Manage your verification", usage = "/<command> <enable | disable | clearips | clearip <ip> | status | genbackupcodes>", aliases = "playerverify,pv")
-public class Command_playerverification extends FreedomCommand
-{
-    @Override
-    public boolean run(CommandSender sender, Player playerSender, Command cmd, String commandLabel, String[] args, boolean senderIsConsole)
-    {
-        PlayerData target = plugin.pl.getData(playerSender);
-        boolean verificationEnabled = ConfigEntry.DISCORD_VERIFICATION.getBoolean();
-        List<String> ips = new ArrayList<>(target.getIps());
-
-        if (verificationEnabled)
-        {
-            if (args.length == 1)
-            {
-                if (args[0].equalsIgnoreCase("clearips"))
-                {
-                    int cleared = 0;
-                    for (String ip : ips)
-                    {
-                        if (!ip.equals(FUtil.getIp(playerSender)))
-                        {
-                            target.removeIp(ip);
-                            cleared++;
-                        }
-                    }
-
-                    msg("Cleared all IP's except your current IP \"" + FUtil.getIp(playerSender) + "\"");
-                    msg("Cleared " + cleared + " IP's.");
-                    plugin.pl.save(target);
-                    plugin.pl.syncIps(target);
-                    return true;
-                }
-                else if (args[0].equalsIgnoreCase("clearip"))
-                {
-                    return false;
-                }
-            }
-
-            if (args.length < 1)
-            {
-                return false;
-            }
-
-            PlayerData data = plugin.pl.getData(playerSender);
-
-            switch (args[0].toLowerCase())
-            {
-                case "enable":
-                {
-                    if (!plugin.dc.enabled)
-                    {
-                        msg("The Discord verification system is currently disabled.", ChatColor.RED);
-                        return true;
-                    }
-                    else if (data.hasVerification())
-                    {
-                        msg("Discord verification is already enabled for you.", ChatColor.RED);
-                        return true;
-                    }
-                    else if (data.getDiscordID() == null)
-                    {
-                        msg("Please link a discord account with /linkdiscord.", ChatColor.RED);
-                        return true;
-                    }
-
-                    data.setVerification(true);
-                    plugin.pl.save(data);
-                    msg("Re-enabled Discord verification.", ChatColor.GREEN);
-                    return true;
-                }
-
-                case "disable":
-                {
-                    if (!data.hasVerification())
-                    {
-                        msg("Discord verification is already disabled for you.", ChatColor.RED);
-                        return true;
-                    }
-
-                    data.setVerification(false);
-                    plugin.pl.save(data);
-                    msg("Disabled Discord verification.", ChatColor.GREEN);
-                    return true;
-                }
-
-                case "status":
-                {
-                    boolean enabled = target.hasVerification();
-                    boolean specified = target.getDiscordID() != null;
-                    msg(ChatColor.GRAY + "Discord Verification Enabled: " + (enabled ? ChatColor.GREEN + "true" : ChatColor.RED + "false"));
-                    msg(ChatColor.GRAY + "Discord ID: " + (specified ? ChatColor.GREEN + target.getDiscordID() : ChatColor.RED + "not set"));
-                    msg(ChatColor.GRAY + "Backup Codes: " + data.getBackupCodes().size() + "/" + "10");
-                    return true;
-                }
-
-                case "genbackupcodes":
-                {
-                    if (!plugin.dc.enabled)
-                    {
-                        msg("The Discord verification system is currently disabled.", ChatColor.RED);
-                        return true;
-                    }
-                    else if (!data.hasVerification())
-                    {
-                        msg("Discord verification is not enabled for you.", ChatColor.RED);
-                        return true;
-                    }
-
-                    boolean generated = plugin.dc.sendBackupCodes(data);
-
-                    if (generated)
-                    {
-                        msg("Your backup codes have been sent to your discord account. They can be re-generated at anytime.", ChatColor.GREEN);
-                    }
-                    else
-                    {
-                        msg("Failed to generate backup codes, please contact a developer.", ChatColor.RED);
-                    }
-                    return true;
-                }
-                default:
-                    return false;
-            }
-        }
-        else
-        {
-            msg("The Discord verification system is currently disabled.", ChatColor.RED);
-        }
-        return true;
-    }
-
-    @Override
-    public List<String> getTabCompleteOptions(CommandSender sender, Command command, String alias, String[] args)
-    {
-        if (args.length == 1)
-        {
-            return Arrays.asList("enable", "disable", "status", "clearips", "genbackupcodes");
-        }
-
-        return Collections.emptyList();
-    }
-}

src/main/java/me/totalfreedom/totalfreedommod/command/Command_releaseparrots.java

@@ -1,41 +0,0 @@
-package me.totalfreedom.totalfreedommod.command;
-
-import me.totalfreedom.totalfreedommod.rank.Rank;
-import org.bukkit.command.Command;
-import org.bukkit.command.CommandSender;
-import org.bukkit.entity.Entity;
-import org.bukkit.entity.EntityType;
-import org.bukkit.entity.Player;
-
-@CommandPermissions(level = Rank.OP, source = SourceType.ONLY_IN_GAME)
-@CommandParameters(description = "Release parrots from your shoulders.", usage = "/<command>", aliases = "removeparrots")
-public class Command_releaseparrots extends FreedomCommand
-{
-
-    @SuppressWarnings("deprecation")
-    @Override
-    public boolean run(CommandSender sender, Player playerSender, Command cmd, String commandLabel, String[] args, boolean senderIsConsole)
-    {
-        Entity leftShoulderEntity = playerSender.getShoulderEntityLeft();
-        Entity rightShoulderEntity = playerSender.getShoulderEntityRight();
-
-        if (rightShoulderEntity == null && leftShoulderEntity == null)
-        {
-            msg("No parrots were detected on either of your shoulders.");
-            return true;
-        }
-
-        if (leftShoulderEntity != null && leftShoulderEntity.getType().equals(EntityType.PARROT))
-        {
-            playerSender.setShoulderEntityLeft(null);
-            msg("Removed the parrot on your left shoulder.");
-        }
-
-        if (rightShoulderEntity != null && rightShoulderEntity.getType().equals(EntityType.PARROT))
-        {
-            playerSender.setShoulderEntityRight(null);
-            msg("Removed the parrot on your right shoulder.");
-        }
-        return true;
-    }
-}

src/main/java/me/totalfreedom/totalfreedommod/command/Command_report.java

@@ -4,6 +4,7 @@ import me.totalfreedom.totalfreedommod.rank.Rank;
 import org.apache.commons.lang.ArrayUtils;
 import org.apache.commons.lang.StringUtils;
 import org.bukkit.ChatColor;
+import org.bukkit.OfflinePlayer;
 import org.bukkit.command.Command;
 import org.bukkit.command.CommandSender;
 import org.bukkit.entity.Player;
@@ -22,13 +23,15 @@ public class Command_report extends FreedomCommand
         }
 
         Player player = getPlayer(args[0], true);
+        OfflinePlayer offlinePlayer = getOfflinePlayer(args[0]);
 
-        if (player == null)
+        if (player == null && offlinePlayer == null)
         {
             msg(PLAYER_NOT_FOUND);
             return true;
         }
-
+        else if (player != null)
+        {
             if (sender instanceof Player)
             {
                 if (player.equals(playerSender))
@@ -44,14 +47,16 @@ public class Command_report extends FreedomCommand
                 return true;
             }
 
+        }
+
         String report = StringUtils.join(ArrayUtils.subarray(args, 1, args.length), " ");
-        plugin.cm.reportAction(playerSender, player, report);
+        plugin.cm.reportAction(playerSender, (player == null) ? offlinePlayer.getName() : player.getName(), report);
 
         boolean logged = false;
 
         if (plugin.dc.enabled)
         {
-            logged = plugin.dc.sendReport(playerSender, player, report);
+            logged = (player == null) ? plugin.dc.sendReportOffline(playerSender, offlinePlayer, report) : plugin.dc.sendReport(playerSender, player, report);
         }
 
         msg(ChatColor.GREEN + "Thank you, your report has been successfully logged."

src/main/java/me/totalfreedom/totalfreedommod/command/Command_saconfig.java

@@ -187,12 +187,6 @@ public class Command_saconfig extends FreedomCommand
                     }
                 }
 
-                if (plugin.pl.isPlayerImpostor(player))
-                {
-                    msg("This player was labeled as a Player impostor and is not an admin, therefore they cannot be added to the admin list.", ChatColor.RED);
-                    return true;
-                }
-
                 if (admin == null) // New admin
                 {
 
@@ -205,23 +199,10 @@ public class Command_saconfig extends FreedomCommand
                 else // Existing admin
                 {
                     FUtil.adminAction(sender.getName(), "Re-adding " + player.getName() + " to the admin list", true);
-
-                    String oldName = admin.getName();
-                    if (!oldName.equals(player.getName()))
-                    {
-                        admin.setName(player.getName());
-                        plugin.sql.updateAdminName(oldName, admin.getName());
-                    }
                     admin.addIp(FUtil.getIp(player));
-
                     admin.setActive(true);
                     admin.setLastLogin(new Date());
 
-                    if (plugin.al.isVerifiedAdmin(player))
-                    {
-                        plugin.al.verifiedNoAdmin.remove(player.getName());
-                    }
-
                     plugin.al.save(admin);
                     plugin.al.updateTables();
                     plugin.rm.updateDisplay(player);
@@ -259,7 +240,9 @@ public class Command_saconfig extends FreedomCommand
                 checkRank(Rank.ADMIN);
 
                 Player player = getPlayer(args[1]);
+
                 Admin admin = player != null ? plugin.al.getAdmin(player) : plugin.al.getEntryByName(args[1]);
+                String adminName = admin.getName();
 
                 if (admin == null)
                 {
@@ -272,15 +255,15 @@ public class Command_saconfig extends FreedomCommand
 
                 plugin.al.save(admin);
                 plugin.al.updateTables();
+
                 if (player != null)
                 {
                     plugin.rm.updateDisplay(player);
-                    plugin.pl.getPlayer(player).setAdminChat(false);
                 }
 
                 if (plugin.dc.enabled && ConfigEntry.DISCORD_ROLE_SYNC.getBoolean())
                 {
-                    Discord.syncRoles(admin, plugin.pl.getData(admin.getName()).getDiscordID());
+                    Discord.syncRoles(admin, plugin.pl.getData(adminName).getDiscordID());
                 }
 
                 plugin.ptero.updateAccountStatus(admin);

src/main/java/me/totalfreedom/totalfreedommod/command/Command_setlevel.java

@@ -1,49 +0,0 @@
-package me.totalfreedom.totalfreedommod.command;
-
-import me.totalfreedom.totalfreedommod.rank.Rank;
-import org.bukkit.ChatColor;
-import org.bukkit.command.Command;
-import org.bukkit.command.CommandSender;
-import org.bukkit.entity.Player;
-
-@CommandPermissions(level = Rank.OP, source = SourceType.ONLY_IN_GAME)
-@CommandParameters(description = "Sets your experience level (XP).", usage = "/<command> [level]")
-public class Command_setlevel extends FreedomCommand
-{
-
-    @Override
-    public boolean run(CommandSender sender, Player playerSender, Command cmd, String commandLabel, String[] args, boolean senderIsConsole)
-    {
-        if (args.length != 1)
-        {
-            return false;
-        }
-
-        int new_level;
-
-        try
-        {
-            new_level = Integer.parseInt(args[0]);
-
-            if (new_level < 0)
-            {
-                new_level = 0;
-            }
-            else if (new_level > 50)
-            {
-                new_level = 50;
-            }
-        }
-        catch (NumberFormatException ex)
-        {
-            msg("Invalid level.", ChatColor.RED);
-            return true;
-        }
-
-        playerSender.setLevel(new_level);
-
-        msg("Your XP level is now set to " + ChatColor.GOLD + new_level);
-
-        return true;
-    }
-}

src/main/java/me/totalfreedom/totalfreedommod/command/Command_spawnmob.java

@@ -1,6 +1,8 @@
 package me.totalfreedom.totalfreedommod.command;
 
 import java.util.List;
+
+import me.totalfreedom.totalfreedommod.config.ConfigEntry;
 import me.totalfreedom.totalfreedommod.rank.Rank;
 import org.apache.commons.lang.StringUtils;
 import org.apache.commons.lang3.EnumUtils;
@@ -55,6 +57,7 @@ public class Command_spawnmob extends FreedomCommand
             return true;
         }
 
+        int max = ConfigEntry.SPAWNMOB_MAX.getInteger();
         int amount = 1;
         if (args.length > 1)
         {
@@ -69,9 +72,9 @@ public class Command_spawnmob extends FreedomCommand
             }
         }
 
-        if (amount > 10 || amount < 1)
+        if (amount > max || amount < 1)
         {
-            msg("Invalid amount: " + args[1] + ". Must be 1-10.", ChatColor.RED);
+            msg("Invalid amount: " + args[1] + ". Must be 1-" + max + ".", ChatColor.RED);
             return true;
         }
 

src/main/java/me/totalfreedom/totalfreedommod/command/Command_tban.java

@@ -1,143 +0,0 @@
-package me.totalfreedom.totalfreedommod.command;
-
-import java.util.ArrayList;
-import java.util.List;
-import java.util.Objects;
-import me.totalfreedom.totalfreedommod.banning.Ban;
-import me.totalfreedom.totalfreedommod.player.PlayerData;
-import me.totalfreedom.totalfreedommod.punishments.Punishment;
-import me.totalfreedom.totalfreedommod.punishments.PunishmentType;
-import me.totalfreedom.totalfreedommod.rank.Rank;
-import me.totalfreedom.totalfreedommod.util.FUtil;
-import org.apache.commons.lang.StringUtils;
-import org.bukkit.ChatColor;
-import org.bukkit.Location;
-import org.bukkit.command.Command;
-import org.bukkit.command.CommandSender;
-import org.bukkit.entity.Player;
-
-@CommandPermissions(level = Rank.ADMIN, source = SourceType.BOTH, blockHostConsole = true)
-@CommandParameters(description = "Temporarily bans a player for five minutes.", usage = "/<command> [-q] <username> [reason]", aliases = "noob")
-public class Command_tban extends FreedomCommand
-{
-
-    @Override
-    public boolean run(CommandSender sender, Player playerSender, Command cmd, String commandLabel, String[] args, boolean senderIsConsole)
-    {
-        if (args.length == 0)
-        {
-            return false;
-        }
-
-        boolean quiet = args[0].equalsIgnoreCase("-q");
-        if (quiet)
-        {
-            args = org.apache.commons.lang3.ArrayUtils.subarray(args, 1, args.length);
-
-            if (args.length < 1)
-            {
-                return false;
-            }
-        }
-
-        final String username;
-
-        final Player player = getPlayer(args[0]);
-        final PlayerData entry;
-        if (player == null)
-        {
-            entry = plugin.pl.getData(args[0]);
-
-            if (entry == null)
-            {
-                msg("Can't find that user. If target is not logged in, make sure that you spelled the name exactly.");
-                return true;
-            }
-
-            username = entry.getName();
-        }
-        else
-        {
-            entry = plugin.pl.getData(player);
-            username = player.getName();
-        }
-        final List<String> ips = new ArrayList<>(entry.getIps());
-
-        String reason = null;
-        if (args.length > 1)
-        {
-            reason = StringUtils.join(args, " ", 1, args.length);
-        }
-
-        StringBuilder kick = new StringBuilder()
-                .append(ChatColor.RED)
-                .append("You have been temporarily banned for five minutes. Please read totalfreedom.me for more info.");
-
-        if (!quiet)
-        {
-            // Strike with lightning
-            if (player != null)
-            {
-                final Location targetPos = player.getLocation();
-                for (int x = -1; x <= 1; x++)
-                {
-                    for (int z = -1; z <= 1; z++)
-                    {
-                        final Location strike_pos = new Location(targetPos.getWorld(), targetPos.getBlockX() + x, targetPos.getBlockY(), targetPos.getBlockZ() + z);
-                        Objects.requireNonNull(targetPos.getWorld()).strikeLightning(strike_pos);
-                    }
-                }
-
-                // Kill player
-                player.setHealth(0.0);
-
-                if (reason != null)
-                {
-                    FUtil.adminAction(sender.getName(), "Tempbanning " + player.getName() + " for 5 minutes - Reason: " + reason, true);
-                    kick.append("\n")
-                            .append(ChatColor.RED)
-                            .append("Reason: ")
-                            .append(ChatColor.GOLD)
-                            .append(reason);
-                }
-                else
-                {
-                    FUtil.adminAction(sender.getName(), "Tempbanning " + player.getName() + " for 5 minutes", true);
-                }
-            }
-        }
-        else
-        {
-            if (player != null)
-            {
-                if (reason != null)
-                {
-                    msg("Quietly temporarily banned " + player.getName() + " for 5 minutes.");
-                    kick.append("\n")
-                            .append(ChatColor.RED)
-                            .append("Reason: ")
-                            .append(ChatColor.GOLD)
-                            .append(reason);
-                }
-            }
-        }
-
-        // Ban player
-        Ban ban = Ban.forPlayerName(username, sender, FUtil.parseDateOffset("5m"), reason);
-        for (String ip : ips)
-        {
-            ban.addIp(ip);
-        }
-        plugin.bm.addBan(ban);
-
-        // Kick player
-        if (player != null)
-        {
-            player.kickPlayer(kick.toString());
-        }
-
-        // Log ban
-        plugin.pul.logPunishment(new Punishment(username, ips.get(0), sender.getName(), PunishmentType.TEMPBAN, reason));
-        return true;
-    }
-}

src/main/java/me/totalfreedom/totalfreedommod/command/Command_tempban.java

@@ -1,10 +1,10 @@
 package me.totalfreedom.totalfreedommod.command;
 
 import java.text.SimpleDateFormat;
-import java.util.ArrayList;
 import java.util.Date;
-import java.util.List;
 import java.util.Objects;
+
+import com.earth2me.essentials.User;
 import me.totalfreedom.totalfreedommod.banning.Ban;
 import me.totalfreedom.totalfreedommod.player.PlayerData;
 import me.totalfreedom.totalfreedommod.punishments.Punishment;
@@ -21,7 +21,7 @@ import org.bukkit.command.CommandSender;
 import org.bukkit.entity.Player;
 
 @CommandPermissions(level = Rank.ADMIN, source = SourceType.BOTH)
-@CommandParameters(description = "Temporarily ban someone.", usage = "/<command> [-q] <username> [duration] [reason]")
+@CommandParameters(description = "Temporarily ban someone.", usage = "/<command> [-q] <username> [duration] [reason]", aliases = "tban,noob")
 public class Command_tempban extends FreedomCommand
 {
 
@@ -47,49 +47,72 @@ public class Command_tempban extends FreedomCommand
         }
 
         final String username;
-        final List<String> ips = new ArrayList<>();
+        final String ip;
 
         final Player player = getPlayer(args[0]);
-        final PlayerData entry;
+        PlayerData entry;
         if (player == null)
+        {
+            // Gets the IP using Essentials data if available
+            if (plugin.esb.isEnabled() && plugin.esb.getEssentialsUser(args[0]) != null)
+            {
+                User essUser = plugin.esb.getEssentialsUser(args[0]);
+                //
+                username = essUser.getName();
+                ip = essUser.getLastLoginAddress();
+            }
+            // Last resort - Getting the first result from the username itself
+            else
             {
                 entry = plugin.pl.getData(args[0]);
-
                 if (entry == null)
                 {
-                msg("Can't find that user. If target is not logged in, make sure that you spelled the name exactly.");
+                    msg(PLAYER_NOT_FOUND);
                     return true;
                 }
-
-            username = entry.getName();
-            ips.addAll(entry.getIps());
-        }
                 else
                 {
-            entry = plugin.pl.getData(player);
+                    username = entry.getName();
+                    ip = entry.getIps().get(0);
+                }
+            }
+        }
+        else
+        {
             username = player.getName();
-            ips.add(FUtil.getIp(player));
+            ip = FUtil.getIp(player);
         }
 
         final StringBuilder message = new StringBuilder("Temporarily banned " + username);
 
-        Date expires = FUtil.parseDateOffset("30m");
+        // Default expiration date is 5 minutes
+        Date expires = FUtil.parseDateOffset("5m");
+
+        // Parses what comes after as a duration
+        if (args.length > 1)
+        {
+            try
+            {
+                expires = FUtil.parseDateOffset(args[1]);
+            }
+            catch (NumberFormatException error)
+            {
+                msg("Invalid duration: " + args[1], ChatColor.RED);
+                return true;
+            }
+        }
+
         message.append(" until ").append(date_format.format(expires));
 
+        // If a reason appears to exist, set it.
         String reason = null;
-        if (args.length >= 2)
+        if (args.length > 2)
         {
-            Date parsed_offset = FUtil.parseDateOffset(args[1]);
-            reason = StringUtils.join(ArrayUtils.subarray(args, parsed_offset == null ? 1 : 2, args.length), " ") + " (" + sender.getName() + ")";
-            if (parsed_offset != null)
-            {
-                expires = parsed_offset;
-            }
+            reason = StringUtils.join(ArrayUtils.subarray(args, 2, args.length), " ") + " (" + sender.getName() + ")";
             message.append(", Reason: \"").append(reason).append("\"");
         }
 
         Ban ban;
-
         if (player != null)
         {
             ban = Ban.forPlayer(player, sender, expires, reason);
@@ -98,11 +121,8 @@ public class Command_tempban extends FreedomCommand
         {
             ban = Ban.forPlayerName(username, sender, expires, reason);
         }
-
-        for (String ip : ips)
-        {
         ban.addIp(ip);
-        }
+
         plugin.bm.addBan(ban);
 
         if (!quiet)
@@ -119,6 +139,8 @@ public class Command_tempban extends FreedomCommand
                         Objects.requireNonNull(targetPos.getWorld()).strikeLightningEffect(strike_pos);
                     }
                 }
+
+                player.kickPlayer(ban.bakeKickMessage());
             }
 
             FUtil.adminAction(sender.getName(), message.toString(), true);
@@ -128,19 +150,15 @@ public class Command_tempban extends FreedomCommand
             msg("Quietly temporarily banned " + username + ".");
         }
 
-        if (player != null)
-        {
-            player.kickPlayer(ban.bakeKickMessage());
         for (Player p : Bukkit.getOnlinePlayers())
         {
-                if (FUtil.getIp(p).equals(FUtil.getIp(player)))
+            if (FUtil.getIp(p).equals(ip))
             {
                 p.kickPlayer(ChatColor.RED + "You've been kicked because someone on your IP has been banned.");
             }
         }
-        }
 
-        plugin.pul.logPunishment(new Punishment(username, ips.get(0), sender.getName(), PunishmentType.TEMPBAN, reason));
+        plugin.pul.logPunishment(new Punishment(username, ip, sender.getName(), PunishmentType.TEMPBAN, reason));
         return true;
     }
 }

src/main/java/me/totalfreedom/totalfreedommod/command/Command_trail.java

@@ -1,11 +1,13 @@
 package me.totalfreedom.totalfreedommod.command;
 
 import me.totalfreedom.totalfreedommod.rank.Rank;
+import me.totalfreedom.totalfreedommod.shop.ShopItem;
+import org.bukkit.ChatColor;
 import org.bukkit.command.Command;
 import org.bukkit.command.CommandSender;
 import org.bukkit.entity.Player;
 
-@CommandPermissions(level = Rank.ADMIN, source = SourceType.ONLY_IN_GAME)
+@CommandPermissions(level = Rank.OP, source = SourceType.ONLY_IN_GAME)
 @CommandParameters(description = "Trails rainbow wool behind you as you walk/fly.", usage = "/<command>")
 public class Command_trail extends FreedomCommand
 {
@@ -13,6 +15,12 @@ public class Command_trail extends FreedomCommand
     @Override
     public boolean run(CommandSender sender, Player playerSender, Command cmd, String commandLabel, String[] args, boolean senderIsConsole)
     {
+        if (!plugin.pl.getData(playerSender).hasItem(ShopItem.RAINBOW_TRAIL))
+        {
+            msg("You didn't purchase the ability to have a " + ShopItem.RAINBOW_TRAIL.getName() + "! Purchase it from the shop.", ChatColor.RED);
+            return true;
+        }
+
         if (plugin.tr.contains(playerSender))
         {
             plugin.tr.remove(playerSender);
@@ -21,7 +29,7 @@ public class Command_trail extends FreedomCommand
         else
         {
             plugin.tr.add(playerSender);
-            msg("Trail enabled. Use \"/trail off\" to disable.");
+            msg("Trail enabled. Run this command again to disable it.");
         }
 
         return true;

src/main/java/me/totalfreedom/totalfreedommod/command/Command_unban.java

@@ -1,12 +1,9 @@
 package me.totalfreedom.totalfreedommod.command;
 
-import java.util.ArrayList;
-import java.util.List;
-import me.totalfreedom.totalfreedommod.banning.Ban;
+import com.earth2me.essentials.User;
 import me.totalfreedom.totalfreedommod.player.PlayerData;
 import me.totalfreedom.totalfreedommod.rank.Rank;
 import me.totalfreedom.totalfreedommod.util.FUtil;
-import org.apache.commons.lang.StringUtils;
 import org.bukkit.command.Command;
 import org.bukkit.command.CommandSender;
 import org.bukkit.entity.Player;
@@ -22,20 +19,33 @@ public class Command_unban extends FreedomCommand
         if (args.length > 0)
         {
             String username;
-            final PlayerData entry = plugin.pl.getData(args[0]);
+            String ip;
 
+            // Gets the IP using Essentials data if available
+            if (plugin.esb.isEnabled() && plugin.esb.getEssentialsUser(args[0]) != null)
+            {
+                User essUser = plugin.esb.getEssentialsUser(args[0]);
+                //
+                username = essUser.getName();
+                ip = essUser.getLastLoginAddress();
+            }
+            // Secondary method - using Essentials if available
+            else
+            {
+                final PlayerData entry = plugin.pl.getData(args[0]);
                 if (entry == null)
                 {
-                msg("Can't find that user. If target is not logged in, make sure that you spelled the name exactly.");
+                    msg(PLAYER_NOT_FOUND);
                     return true;
                 }
-
                 username = entry.getName();
-            final List<String> ips = new ArrayList<>(entry.getIps());
+                ip = entry.getIps().get(0);
+            }
 
             FUtil.adminAction(sender.getName(), "Unbanning " + username, true);
-            msg(username + " has been unbanned along with the following IPs: " + StringUtils.join(ips, ", "));
             plugin.bm.removeBan(plugin.bm.getByUsername(username));
+            plugin.bm.removeBan(plugin.bm.getByIp(ip));
+            msg(username + " has been unbanned along with the IP: " + ip);
 
             if (args.length >= 2)
             {
@@ -45,20 +55,6 @@ public class Command_unban extends FreedomCommand
                     msg("Restored edits for: " + username);
                 }
             }
-
-            for (String ip : ips)
-            {
-                Ban ban = plugin.bm.getByIp(ip);
-                if (ban != null)
-                {
-                    plugin.bm.removeBan(ban);
-                }
-                ban = plugin.bm.getByIp(FUtil.getFuzzyIp(ip));
-                if (ban != null)
-                {
-                    plugin.bm.removeBan(ban);
-                }
-            }
             return true;
         }
         return false;

src/main/java/me/totalfreedom/totalfreedommod/command/Command_unlinkdiscord.java

@@ -17,7 +17,7 @@ public class Command_unlinkdiscord extends FreedomCommand
     {
         if (!plugin.dc.enabled)
         {
-            msg("The Discord verification system is currently disabled.", ChatColor.RED);
+            msg("The Discord integration system is currently disabled.", ChatColor.RED);
             return true;
         }
 
@@ -31,7 +31,7 @@ public class Command_unlinkdiscord extends FreedomCommand
             }
 
             playerData.setDiscordID(null);
-            msg("Unlinked " + args[0] + "'s discord account.", ChatColor.GREEN);
+            msg("Unlinked " + args[0] + "'s Discord account.", ChatColor.GREEN);
             return true;
         }
 
@@ -42,7 +42,6 @@ public class Command_unlinkdiscord extends FreedomCommand
             return true;
         }
         data.setDiscordID(null);
-        data.setVerification(false);
         plugin.pl.save(data);
         msg("Your Minecraft account has been successfully unlinked from the Discord account.", ChatColor.GREEN);
         return true;

src/main/java/me/totalfreedom/totalfreedommod/command/Command_vanish.java

@@ -45,7 +45,7 @@ public class Command_vanish extends FreedomCommand
                 msg("You have unvanished.", ChatColor.GOLD);
                 FUtil.bcastMsg(plugin.rm.craftLoginMessage(playerSender, null));
                 FUtil.bcastMsg(playerSender.getName() + " joined the game.", ChatColor.YELLOW);
-                plugin.dc.messageChatChannel("**" + playerSender.getName() + " joined the server" + "**");
+                plugin.dc.messageChatChannel("**" + playerSender.getName() + " joined the server" + "**", true);
             }
 
             PlayerData playerData = plugin.pl.getData(playerSender);
@@ -91,7 +91,7 @@ public class Command_vanish extends FreedomCommand
             {
                 msg("You have vanished.", ChatColor.GOLD);
                 FUtil.bcastMsg(playerSender.getName() + " left the game.", ChatColor.YELLOW);
-                plugin.dc.messageChatChannel("**" + playerSender.getName() + " left the server" + "**");
+                plugin.dc.messageChatChannel("**" + playerSender.getName() + " left the server" + "**", true);
             }
 
             FLog.info(playerSender.getName() + " is now vanished.");

src/main/java/me/totalfreedom/totalfreedommod/command/Command_verify.java

@@ -1,101 +0,0 @@
-package me.totalfreedom.totalfreedommod.command;
-
-import me.totalfreedom.totalfreedommod.config.ConfigEntry;
-import me.totalfreedom.totalfreedommod.discord.Discord;
-import me.totalfreedom.totalfreedommod.player.FPlayer;
-import me.totalfreedom.totalfreedommod.player.PlayerData;
-import me.totalfreedom.totalfreedommod.rank.Rank;
-import me.totalfreedom.totalfreedommod.util.FUtil;
-import org.bukkit.ChatColor;
-import org.bukkit.command.Command;
-import org.bukkit.command.CommandSender;
-import org.bukkit.entity.Player;
-
-@CommandPermissions(level = Rank.IMPOSTOR, source = SourceType.BOTH)
-@CommandParameters(description = "Sends a verification code to the player, or the player can input the sent code. Admins can manually verify a player impostor.", usage = "/<command> <code | <playername>>")
-public class Command_verify extends FreedomCommand
-{
-
-    @Override
-    public boolean run(CommandSender sender, Player playerSender, Command cmd, String commandLabel, String[] args, boolean senderIsConsole)
-    {
-        boolean verificationEnabled = ConfigEntry.DISCORD_VERIFICATION.getBoolean();
-        if (!plugin.dc.enabled)
-        {
-            msg("The Discord verification system is currently disabled.", ChatColor.RED);
-            return true;
-        }
-
-        if (!verificationEnabled)
-        {
-            msg("The Discord verification system is currently disabled.", ChatColor.RED);
-            return true;
-        }
-
-        if (senderIsConsole)
-        {
-            msg("/manuallyverify <playername>", ChatColor.WHITE);
-            return true;
-        }
-
-        if (!plugin.pl.IsImpostor(playerSender))
-        {
-            msg("You are not an impostor, therefore you do not need to verify.", ChatColor.RED);
-            return true;
-        }
-
-        PlayerData playerData = plugin.pl.getData(playerSender);
-        String discordId = playerData.getDiscordID();
-
-        if (playerData.getDiscordID() == null)
-        {
-            msg("You do not have a Discord account linked to your Minecraft account, please verify the manual way.", ChatColor.RED);
-            return true;
-        }
-
-        if (args.length == 0)
-        {
-            String code = plugin.dc.generateCode(10);
-            plugin.dc.addVerificationCode(code, playerData);
-            plugin.dc.getUser(discordId).openPrivateChannel().complete().sendMessage("A user with the IP `" + FUtil.getIp(playerSender) + "` has sent a verification request. Please run the following in-game command: `/verify " + code + "`").complete();
-            msg("A verification code has been sent to your account, please copy the code and run /verify <code>", ChatColor.GREEN);
-            return true;
-        }
-
-        String code = args[0];
-        String backupCode = null;
-
-        if (plugin.pl.IsImpostor(playerSender))
-        {
-            PlayerData mapPlayer = plugin.dc.getVerificationCodes().get(code);
-            if (mapPlayer == null)
-            {
-                if (!playerData.getBackupCodes().contains(Discord.getMD5(code)))
-                {
-                    msg("You have entered an invalid verification code", ChatColor.RED);
-                    return true;
-                }
-                else
-                {
-                    backupCode = Discord.getMD5(code);
-                }
-            }
-            else
-            {
-                plugin.dc.removeVerificationCode(code);
-            }
-
-            final FPlayer fPlayer = plugin.pl.getPlayer(playerSender);
-            if (fPlayer.getFreezeData().isFrozen())
-            {
-                fPlayer.getFreezeData().setFrozen(false);
-                msg("You have been unfrozen.");
-            }
-            FUtil.bcastMsg(playerSender.getName() + " has verified!", ChatColor.GOLD);
-            playerSender.setOp(true);
-            plugin.pl.verify(playerSender, backupCode);
-            return true;
-        }
-        return true;
-    }
-}

src/main/java/me/totalfreedom/totalfreedommod/command/Command_verifynoadmin.java

@@ -1,92 +0,0 @@
-package me.totalfreedom.totalfreedommod.command;
-
-import java.util.ArrayList;
-import java.util.Collections;
-import java.util.List;
-import me.totalfreedom.totalfreedommod.player.FPlayer;
-import me.totalfreedom.totalfreedommod.rank.Rank;
-import me.totalfreedom.totalfreedommod.util.FUtil;
-import org.bukkit.ChatColor;
-import org.bukkit.command.Command;
-import org.bukkit.command.CommandSender;
-import org.bukkit.entity.Player;
-
-@CommandPermissions(level = Rank.ADMIN, source = SourceType.BOTH)
-@CommandParameters(description = "Verify an admin without giving them admin permissions.", usage = "/<command> <player>", aliases = "vns,verifynostaff,vna")
-public class Command_verifynoadmin extends FreedomCommand
-{
-
-    @Override
-    public boolean run(CommandSender sender, Player playerSender, Command cmd, String commandLabel, String[] args, boolean senderIsConsole)
-    {
-        if (args.length < 1)
-        {
-            return false;
-        }
-
-        Player player = getPlayer(args[0]);
-
-        if (player == null)
-        {
-            msg(PLAYER_NOT_FOUND);
-            return true;
-        }
-
-        if (plugin.al.isAdminImpostor(player))
-        {
-            String ip = FUtil.getIp(player);
-            if (!plugin.al.verifiedNoAdmin.containsKey(player.getName()))
-            {
-                List<String> ips = new ArrayList<>();
-                ips.add(ip);
-                plugin.al.verifiedNoAdmin.put(player.getName(), ips);
-            }
-            else
-            {
-                List<String> ips = plugin.al.verifiedNoAdmin.get(player.getName());
-                if (!ips.contains(ip))
-                {
-                    ips.add(ip);
-                    plugin.al.verifiedNoAdmin.remove(player.getName());
-                    plugin.al.verifiedNoAdmin.put(player.getName(), ips);
-                }
-            }
-            plugin.rm.updateDisplay(player);
-            FUtil.adminAction(sender.getName(), "Verified " + player.getName() + ", without admin permissions.", true);
-            player.setOp(true);
-            msg(player, YOU_ARE_OP);
-            final FPlayer fPlayer = plugin.pl.getPlayer(player);
-            if (fPlayer.getFreezeData().isFrozen())
-            {
-                fPlayer.getFreezeData().setFrozen(false);
-                msg(player, "You have been unfrozen.");
-            }
-            msg("Verified " + player.getName() + " but didn't give them admin permissions", ChatColor.GREEN);
-        }
-        else
-        {
-            msg(player.getName() + " is not an admin imposter.", ChatColor.RED);
-        }
-
-        return true;
-    }
-
-    @Override
-    public List<String> getTabCompleteOptions(CommandSender sender, Command command, String alias, String[] args)
-    {
-        if (args.length == 1)
-        {
-            List<String> adminImposters = new ArrayList<>();
-            for (Player player : server.getOnlinePlayers())
-            {
-                if (plugin.al.isAdminImpostor(player))
-                {
-                    adminImposters.add(player.getName());
-                }
-            }
-            return adminImposters;
-        }
-
-        return Collections.emptyList();
-    }
-}

src/main/java/me/totalfreedom/totalfreedommod/command/Command_whitelist.java

@@ -5,7 +5,6 @@ import java.util.Arrays;
 import java.util.Collections;
 import java.util.List;
 import me.totalfreedom.totalfreedommod.rank.Rank;
-import me.totalfreedom.totalfreedommod.util.DepreciationAggregator;
 import me.totalfreedom.totalfreedommod.util.FUtil;
 import org.bukkit.OfflinePlayer;
 import org.bukkit.command.Command;
@@ -95,7 +94,7 @@ public class Command_whitelist extends FreedomCommand
 
             if (player == null)
             {
-                player = DepreciationAggregator.getOfflinePlayer(server, search_name);
+                player = server.getOfflinePlayer(search_name);
             }
 
             FUtil.adminAction(sender.getName(), "Adding " + player.getName() + " to the whitelist", false);
@@ -117,7 +116,7 @@ public class Command_whitelist extends FreedomCommand
 
             if (player == null)
             {
-                player = DepreciationAggregator.getOfflinePlayer(server, search_name);
+                player = server.getOfflinePlayer(search_name);
             }
 
             if (player.isWhitelisted())
@@ -158,7 +157,7 @@ public class Command_whitelist extends FreedomCommand
         if (args[0].equalsIgnoreCase("purge"))
         {
             FUtil.adminAction(sender.getName(), "Removing all players from the whitelist", false);
-            msg("Removed " + plugin.si.purgeWhitelist() + " players from the whitelist.");
+            msg("Removed " + purge() + " players from the whitelist.");
             return true;
         }
         return false;
@@ -198,10 +197,21 @@ public class Command_whitelist extends FreedomCommand
     public List<String> getWhitelistedNames()
     {
         List<String> names = new ArrayList<>();
-        for (Object name : plugin.si.getWhitelisted())
+        for (OfflinePlayer player : server.getWhitelistedPlayers())
         {
-            names.add(String.valueOf(name));
+            names.add(player.getName());
         }
         return names;
     }
+
+    public int purge()
+    {
+        int removed = 0;
+        for (OfflinePlayer player : server.getWhitelistedPlayers())
+        {
+            player.setWhitelisted(false);
+            removed++;
+        }
+        return removed;
+    }
 }

src/main/java/me/totalfreedom/totalfreedommod/command/FreedomCommand.java

@@ -1,33 +1,27 @@
 package me.totalfreedom.totalfreedommod.command;
 
 import com.google.common.collect.Lists;
+
 import java.lang.reflect.Field;
-import java.util.ArrayList;
-import java.util.Arrays;
-import java.util.HashMap;
-import java.util.List;
-import java.util.Map;
-import java.util.Timer;
-import java.util.TimerTask;
+import java.util.*;
+
 import me.totalfreedom.totalfreedommod.TotalFreedomMod;
 import me.totalfreedom.totalfreedommod.admin.Admin;
 import me.totalfreedom.totalfreedommod.player.PlayerData;
 import me.totalfreedom.totalfreedommod.rank.Rank;
+import me.totalfreedom.totalfreedommod.util.FLog;
 import me.totalfreedom.totalfreedommod.util.FUtil;
 import org.apache.commons.lang.StringUtils;
 import org.bukkit.Bukkit;
 import org.bukkit.ChatColor;
+import org.bukkit.OfflinePlayer;
 import org.bukkit.Server;
-import org.bukkit.command.Command;
-import org.bukkit.command.CommandExecutor;
-import org.bukkit.command.CommandMap;
-import org.bukkit.command.CommandSender;
-import org.bukkit.command.ConsoleCommandSender;
-import org.bukkit.command.PluginCommand;
-import org.bukkit.command.TabCompleter;
+import org.bukkit.command.*;
 import org.bukkit.entity.Player;
+import org.bukkit.plugin.Plugin;
 import org.bukkit.util.StringUtil;
 import org.jetbrains.annotations.NotNull;
+import org.jetbrains.annotations.Nullable;
 
 public abstract class FreedomCommand implements CommandExecutor, TabCompleter
 {
@@ -40,7 +34,6 @@ public abstract class FreedomCommand implements CommandExecutor, TabCompleter
     public static final String NO_PERMISSION = ChatColor.RED + "You do not have permission to execute this command.";
     public static final Timer timer = new Timer();
     public static final Map<CommandSender, FreedomCommand> COOLDOWN_TIMERS = new HashMap<>();
-    private static CommandMap commandMap;
     protected final TotalFreedomMod plugin = TotalFreedomMod.getPlugin();
     protected final Server server = plugin.getServer();
     private final String name;
@@ -69,34 +62,22 @@ public abstract class FreedomCommand implements CommandExecutor, TabCompleter
         this.cooldown = perms.cooldown();
     }
 
-    public static CommandMap getCommandMap()
-    {
-        if (commandMap == null)
-        {
-            try
-            {
-                final Field f = Bukkit.getServer().getPluginManager().getClass().getDeclaredField("commandMap");
-                f.setAccessible(true);
-                commandMap = (CommandMap)f.get(Bukkit.getServer().getPluginManager());
-            }
-            catch (Exception e)
-            {
-                e.printStackTrace();
-            }
-        }
-        return commandMap;
-    }
-
     public static FreedomCommand getFrom(Command command)
     {
         try
         {
-            return (FreedomCommand)(((PluginCommand)command).getExecutor());
+            if (command instanceof FCommand)
+            {
+                return ((FCommand) command).getExecutor();
+            }
         }
         catch (Exception ex)
         {
+            FLog.severe(ex);
             return null;
         }
+
+        return null;
     }
 
     public static String getCommandPrefix()
@@ -119,7 +100,7 @@ public abstract class FreedomCommand implements CommandExecutor, TabCompleter
         {
             cmd.setUsage(this.usage);
         }
-        getCommandMap().register("totalfreedommod", cmd);
+        server.getCommandMap().register("totalfreedommod", cmd);
         cmd.setExecutor(this);
     }
 
@@ -246,6 +227,16 @@ public abstract class FreedomCommand implements CommandExecutor, TabCompleter
         return player;
     }
 
+    @Nullable
+    protected OfflinePlayer getOfflinePlayer(String name)
+    {
+        return Arrays.stream(Bukkit.getOfflinePlayers())
+                .filter(player -> player.getName() != null)
+                .filter(player -> player.getName().equalsIgnoreCase(name))
+                .findFirst()
+                .orElse(null);
+    }
+
     protected Admin getAdmin(CommandSender sender)
     {
         return plugin.al.getAdmin(sender);
@@ -316,7 +307,7 @@ public abstract class FreedomCommand implements CommandExecutor, TabCompleter
         return perms;
     }
 
-    private final class FCommand extends Command
+    public final class FCommand extends Command implements PluginIdentifiableCommand
     {
         private FreedomCommand cmd = null;
 
@@ -325,6 +316,11 @@ public abstract class FreedomCommand implements CommandExecutor, TabCompleter
             super(command);
         }
 
+        public final FreedomCommand getExecutor()
+        {
+            return cmd;
+        }
+
         public void setExecutor(FreedomCommand cmd)
         {
             this.cmd = cmd;
@@ -427,5 +423,11 @@ public abstract class FreedomCommand implements CommandExecutor, TabCompleter
             }
             return new ArrayList<>();
         }
+
+        @Override
+        public @NotNull Plugin getPlugin()
+        {
+            return plugin;
+        }
     }
 }

src/main/java/me/totalfreedom/totalfreedommod/config/ConfigEntry.java

@@ -45,6 +45,8 @@ public enum ConfigEntry
     MOB_LIMITER_DISABLE_GIANT(Boolean.class, "moblimiter.disable.giant"),
     MOB_LIMITER_DISABLE_SLIME(Boolean.class, "moblimiter.disable.slime"),
     //
+    SPAWNMOB_MAX(Integer.class, "spawnmob.max"),
+    //
     HTTPD_ENABLED(Boolean.class, "httpd.enabled"),
     HTTPD_HOST(String.class, "httpd.host"),
     HTTPD_PORT(Integer.class, "httpd.port"),
@@ -71,9 +73,10 @@ public enum ConfigEntry
     SERVER_WHITELIST_MOTD(String.class, "server.motds.whitelist"),
     SERVER_FULL_MOTD(String.class, "server.motds.full"),
     //
-    DISCORD_VERIFICATION(Boolean.class, "discord.verification"),
     DISCORD_TOKEN(String.class, "discord.token"),
+    DISCORD_PREFIX(String.class, "discord.prefix"),
     DISCORD_REPORT_CHANNEL_ID(String.class, "discord.report_channel_id"),
+    DISCORD_REPORT_ARCHIVE_CHANNEL_ID(String.class, "discord.report_archive_channel_id"),
     DISCORD_CHAT_CHANNEL_ID(String.class, "discord.chat_channel_id"),
     DISCORD_ADMINCHAT_CHANNEL_ID(String.class, "discord.adminchat_channel_id"),
 
@@ -86,6 +89,7 @@ public enum ConfigEntry
     DISCORD_ASSISTANT_EXECUTIVE_ROLE_ID(String.class, "discord.assistant_executive_role_id"),
     DISCORD_EXECUTIVE_ROLE_ID(String.class, "discord.executive_role_id"),
     DISCORD_SERVER_OWNER_ROLE_ID(String.class, "discord.server_owner_role_id"),
+    DISCORD_INVITE_LINK(String.class, "discord.invite_link"),
     //
     PTERO_URL(String.class, "ptero.url"),
     PTERO_DEFAULT_EMAIL_DOMAIN(String.class, "ptero.default_email_domain"),
@@ -110,6 +114,7 @@ public enum ConfigEntry
     SHOP_PRICES_STACKING_POTATO(Integer.class, "shop.prices.stacking_potato"),
     SHOP_PRICES_CLOWN_FISH(Integer.class, "shop.prices.clown_fish"),
     SHOP_PRICES_LOGIN_MESSAGES(Integer.class, "shop.prices.login_messages"),
+    SHOP_PRICES_RAINBOW_TRAIL(Integer.class, "shop.prices.rainbow_trail"),
     //
     ADMINLIST_CLEAN_THESHOLD_HOURS(Integer.class, "adminlist.clean_threshold_hours"),
     ADMINLIST_CONSOLE_IS_ADMIN(Boolean.class, "adminlist.console_is_admin"),
@@ -165,6 +170,8 @@ public enum ConfigEntry
     ADMIN_INFO(List.class, "admininfo"),
     VOTING_INFO(List.class, "votinginfo"),
     MASTER_BUILDER_INFO(List.class, "masterbuilderinfo"),
+    FIRST_JOIN_INFO(List.class, "first_join_info.text"),
+    FIRST_JOIN_INFO_ENABLED(Boolean.class, "first_join_info.enabled"),
     AUTO_ENTITY_WIPE(Boolean.class, "auto_wipe"),
     TOGGLE_CHAT(Boolean.class, "toggle_chat"),
     DEVELOPER_MODE(Boolean.class, "developer_mode"),

src/main/java/me/totalfreedom/totalfreedommod/discord/Discord.java

@@ -1,9 +1,6 @@
 package me.totalfreedom.totalfreedommod.discord;
 
 import com.google.common.base.Strings;
-import java.io.File;
-import java.io.FileWriter;
-import java.io.IOException;
 import java.time.Instant;
 import java.time.ZonedDateTime;
 import java.util.ArrayList;
@@ -16,13 +13,15 @@ import java.util.concurrent.ScheduledThreadPoolExecutor;
 import java.util.regex.Matcher;
 import java.util.regex.Pattern;
 import javax.security.auth.login.LoginException;
+
+import com.google.common.collect.ImmutableList;
 import me.totalfreedom.totalfreedommod.FreedomService;
 import me.totalfreedom.totalfreedommod.admin.Admin;
 import me.totalfreedom.totalfreedommod.config.ConfigEntry;
+import me.totalfreedom.totalfreedommod.discord.command.DiscordCommandManager;
 import me.totalfreedom.totalfreedommod.player.PlayerData;
 import me.totalfreedom.totalfreedommod.rank.Rank;
 import me.totalfreedom.totalfreedommod.util.FLog;
-import me.totalfreedom.totalfreedommod.util.FUtil;
 import net.dv8tion.jda.api.EmbedBuilder;
 import net.dv8tion.jda.api.JDA;
 import net.dv8tion.jda.api.JDABuilder;
@@ -41,10 +40,14 @@ import net.dv8tion.jda.api.requests.GatewayIntent;
 import net.dv8tion.jda.api.utils.ChunkingFilter;
 import net.dv8tion.jda.api.utils.MemberCachePolicy;
 import net.dv8tion.jda.internal.utils.concurrent.CountingThreadFactory;
-import org.apache.commons.codec.digest.DigestUtils;
+import net.kyori.adventure.text.Component;
+import net.kyori.adventure.text.serializer.legacy.LegacyComponentSerializer;
+import net.kyori.adventure.text.serializer.plain.PlainTextComponentSerializer;
 import org.apache.commons.lang.StringUtils;
 import org.apache.commons.lang.WordUtils;
+import org.apache.commons.lang3.RandomStringUtils;
 import org.bukkit.GameRule;
+import org.bukkit.OfflinePlayer;
 import org.bukkit.entity.Player;
 import org.bukkit.event.EventHandler;
 import org.bukkit.event.EventPriority;
@@ -57,18 +60,14 @@ public class Discord extends FreedomService
 {
 
     public static HashMap<String, PlayerData> LINK_CODES = new HashMap<>();
-    public static HashMap<String, PlayerData> VERIFICATION_CODES = new HashMap<>();
     public static JDA bot = null;
+    public static DiscordCommandManager DISCORD_COMMAND_MANAGER;
     public ScheduledThreadPoolExecutor RATELIMIT_EXECUTOR;
     public List<CompletableFuture<Message>> sentMessages = new ArrayList<>();
     public Boolean enabled = false;
+    private static final ImmutableList<String> DISCORD_SUBDOMAINS = ImmutableList.of("discordapp.com", "discord.com", "discord.gg");
     private final Pattern DISCORD_MENTION_PATTERN = Pattern.compile("(<@!?([0-9]{16,20})>)");
 
-    public static String getMD5(String string)
-    {
-        return DigestUtils.md5Hex(string);
-    }
-
     public static String getCode(PlayerData playerData)
     {
         for (String code : LINK_CODES.keySet())
@@ -157,11 +156,8 @@ public class Discord extends FreedomService
 
     public void startBot()
     {
-        boolean verificationEnabled = ConfigEntry.DISCORD_VERIFICATION.getBoolean();
-        if (!verificationEnabled)
-        {
-            FLog.info("Discord Verification has been manually disabled.");
-        }
+        DISCORD_COMMAND_MANAGER = new DiscordCommandManager();
+        DISCORD_COMMAND_MANAGER.init(this);
 
         enabled = !Strings.isNullOrEmpty(ConfigEntry.DISCORD_TOKEN.getString());
         if (!enabled)
@@ -185,6 +181,7 @@ public class Discord extends FreedomService
                     .addEventListeners(new PrivateMessageListener(),
                             new DiscordToMinecraftListener(),
                             new DiscordToAdminChatListener(),
+                            new MessageReactionListener(),
                             new ListenerAdapter()
                             {
                                 @Override
@@ -199,15 +196,15 @@ public class Discord extends FreedomService
                     .setMemberCachePolicy(MemberCachePolicy.ALL)
                     .enableIntents(GatewayIntent.GUILD_MEMBERS)
                     .build();
-            FLog.info("Discord verification bot has successfully enabled!");
+            FLog.info("Discord integration has successfully enabled!");
         }
         catch (LoginException e)
         {
-            FLog.warning("An invalid token for the discord verification bot, the bot will not enable.");
+            FLog.warning("An invalid token for Discord integration was provided, the bot will not enable.");
         }
         catch (IllegalArgumentException e)
         {
-            FLog.warning("Discord verification bot failed to start.");
+            FLog.warning("Discord integration failed to start.");
         }
         catch (NoClassDefFoundError e)
         {
@@ -232,7 +229,7 @@ public class Discord extends FreedomService
             }
         }
         sentMessages.clear();
-        messageChatChannel("**Message queue cleared**");
+        messageChatChannel("**Message queue cleared**", true);
     }
 
     public void sendPteroInfo(PlayerData playerData, String username, String password)
@@ -261,96 +258,9 @@ public class Discord extends FreedomService
         return member.getUser();
     }
 
-    public boolean sendBackupCodes(PlayerData playerData)
-    {
-        List<String> codes = generateBackupCodes();
-        List<String> encryptedCodes = generateEncryptedBackupCodes(codes);
-        User user = getUser(playerData.getDiscordID());
-        File file = generateBackupCodesFile(playerData.getName(), codes);
-        if (file == null)
-        {
-            return false;
-        }
-        PrivateChannel privateChannel = user.openPrivateChannel().complete();
-        privateChannel.sendMessage("Do not share these codes with anyone as they can be used to impose as you.").addFile(file).complete();
-        playerData.setBackupCodes(encryptedCodes);
-        plugin.pl.save(playerData);
-        //noinspection ResultOfMethodCallIgnored
-        file.delete();
-        return true;
-    }
-
-    public List<String> generateBackupCodes()
-    {
-        List<String> codes = new ArrayList<>();
-        for (int i = 0; i < 10; i++)
-        {
-            codes.add(FUtil.randomAlphanumericString(10));
-        }
-        return codes;
-    }
-
     public String generateCode(int size)
     {
-        StringBuilder code = new StringBuilder();
-        SplittableRandom random = new SplittableRandom();
-        for (int i = 0; i < size; i++)
-        {
-            code.append(random.nextInt(10));
-        }
-        return code.toString();
-    }
-
-    public List<String> generateEncryptedBackupCodes(List<String> codes)
-    {
-        List<String> encryptedCodes = new ArrayList<>();
-        for (String code : codes)
-        {
-            encryptedCodes.add(getMD5(code));
-        }
-        return encryptedCodes;
-    }
-
-    public File generateBackupCodesFile(String name, List<String> codes)
-    {
-        StringBuilder text = new StringBuilder();
-        text.append("Below are your backup codes for use on TotalFreedom in the event you lose access to your discord account.\n")
-                .append("Simply pick a code, and run /verify <code> on the server. Each code is one use, so be sure to cross it off once you use it.\n")
-                .append("To generate new codes, simply run /generatebackupcodes\n\n");
-
-        for (String code : codes)
-        {
-            text.append(code).append("\n");
-        }
-
-        String fileUrl = plugin.getDataFolder().getAbsolutePath() + "/TF-Backup-Codes-" + name + ".txt";
-        try
-        {
-            FileWriter fileWriter = new FileWriter(fileUrl);
-            fileWriter.write(text.toString());
-            fileWriter.close();
-        }
-        catch (IOException e)
-        {
-            FLog.severe("Failed to generate backup codes file: " + e.toString());
-            return null;
-        }
-        return new File(fileUrl);
-    }
-
-    public void addVerificationCode(String code, PlayerData playerData)
-    {
-        VERIFICATION_CODES.put(code, playerData);
-    }
-
-    public void removeVerificationCode(String code)
-    {
-        VERIFICATION_CODES.remove(code);
-    }
-
-    public HashMap<String, PlayerData> getVerificationCodes()
-    {
-        return VERIFICATION_CODES;
+        return RandomStringUtils.randomNumeric(size);
     }
 
     @EventHandler(priority = EventPriority.MONITOR)
@@ -363,9 +273,11 @@ public class Discord extends FreedomService
             return;
         }
 
-        if (event.getDeathMessage() != null)
+        Component deathMessage = event.deathMessage();
+
+        if (deathMessage != null)
         {
-            messageChatChannel("**" + event.getDeathMessage() + "**");
+            messageChatChannel("**" + PlainTextComponentSerializer.plainText().serialize(deathMessage) + "**", true);
         }
     }
 
@@ -380,7 +292,7 @@ public class Discord extends FreedomService
     {
         if (!plugin.al.isVanished(event.getPlayer().getName()))
         {
-            messageChatChannel("**" + event.getPlayer().getName() + " joined the server" + "**");
+            messageChatChannel("**" + event.getPlayer().getName() + " joined the server" + "**", true);
         }
     }
 
@@ -389,69 +301,78 @@ public class Discord extends FreedomService
     {
         if (!plugin.al.isVanished(event.getPlayer().getName()))
         {
-            messageChatChannel("**" + event.getPlayer().getName() + " left the server" + "**");
+            messageChatChannel("**" + event.getPlayer().getName() + " left the server" + "**", true);
         }
     }
 
-    public void messageChatChannel(String message)
+    public static String sanitizeChatMessage(String message)
     {
-        String chat_channel_id = ConfigEntry.DISCORD_CHAT_CHANNEL_ID.getString();
-        if (message.contains("@everyone") || message.contains("@here"))
+        String newMessage = message;
+
+        if (message.contains("@"))
         {
-            message = StringUtils.remove(message, "@");
+            // \u200B is Zero Width Space, invisible on Discord
+            newMessage = message.replaceAll("@", "@\u200B");
         }
 
-        if (message.toLowerCase().contains("discord.gg"))
+        if (message.toLowerCase().contains("discord.gg")) // discord.gg/invite works as an invite
         {
-            return;
+            return "";
+        }
+
+        for (String subdomain : DISCORD_SUBDOMAINS)
+        {
+            if (message.toLowerCase().contains(subdomain + "/invite"))
+            {
+                return "";
+            }
         }
 
         if (message.contains("§"))
         {
-            message = StringUtils.remove(message, "§");
+            newMessage = message.replaceAll("§", "");
         }
 
+        return deformat(newMessage);
+    }
 
-        Matcher DISCORD_MENTION_MATCHER = DISCORD_MENTION_PATTERN.matcher(message);
-
-        while (DISCORD_MENTION_MATCHER.find())
+    public void messageChatChannel(String message)
     {
-            String mention = DISCORD_MENTION_MATCHER.group(1);
-            message = message.replace(mention, mention.replace("@",""));
+        messageChatChannel(message, false);
     }
 
+    public void messageChatChannel(String message, boolean system)
+    {
+        String chat_channel_id = ConfigEntry.DISCORD_CHAT_CHANNEL_ID.getString();
+
+        String sanitizedMessage = (system) ? message : sanitizeChatMessage(message);
+
+        if (sanitizedMessage.isBlank()) return;
+
         if (enabled && !chat_channel_id.isEmpty())
         {
-            CompletableFuture<Message> sentMessage = Objects.requireNonNull(bot.getTextChannelById(chat_channel_id)).sendMessage(deformat(message)).submit(true);
+            CompletableFuture<Message> sentMessage = Objects.requireNonNull(bot.getTextChannelById(chat_channel_id)).sendMessage(sanitizedMessage).submit(true);
             sentMessages.add(sentMessage);
         }
     }
 
     public void messageAdminChatChannel(String message)
+    {
+        messageAdminChatChannel(message, false);
+    }
+
+    public void messageAdminChatChannel(String message, boolean system)
     {
         String chat_channel_id = ConfigEntry.DISCORD_ADMINCHAT_CHANNEL_ID.getString();
-        if (message.contains("@everyone") || message.contains("@here"))
+
+        String sanitizedMessage = sanitizeChatMessage(message);
+
+        if (sanitizedMessage.isBlank()) return;
+
+        if (enabled && !chat_channel_id.isEmpty())
         {
-            message = StringUtils.remove(message, "@");
-        }
-
-        if (message.toLowerCase().contains("discord.gg"))
-        {
-            return;
-        }
-        
-        if (message.contains("§"))
-        {
-            message = StringUtils.remove(message, "§");
-        }
-
-
-        Matcher DISCORD_MENTION_MATCHER = DISCORD_MENTION_PATTERN.matcher(message);
-
-        while (DISCORD_MENTION_MATCHER.find())
-        {
-            String mention = DISCORD_MENTION_MATCHER.group(1);
-            message = message.replace(mention, mention.replace("@",""));
+            CompletableFuture<Message> sentMessage = Objects.requireNonNull(bot.getTextChannelById(chat_channel_id)).sendMessage(sanitizedMessage).submit(true);
+            sentMessages.add(sentMessage);
         }
 
         if (enabled && !chat_channel_id.isEmpty())
@@ -464,7 +385,7 @@ public class Discord extends FreedomService
     public String formatBotTag()
     {
         SelfUser user = bot.getSelfUser();
-        return user.getName() + "#" + user.getDiscriminator();
+        return user.getAsTag();
     }
 
     @Override
@@ -472,18 +393,18 @@ public class Discord extends FreedomService
     {
         if (bot != null)
         {
-            messageChatChannel("**Server has stopped**");
+            messageChatChannel("**Server has stopped**", true);
         }
 
-        FLog.info("Discord verification bot has successfully shutdown.");
+        FLog.info("Discord integration has successfully shutdown.");
     }
 
-    public String deformat(String input)
+    public static String deformat(String input)
     {
-        return input.replace("_", "\\_");
+        return input.replaceAll("([_\\\\`*>|])", "\\\\$1");
     }
 
-    public boolean sendReport(Player reporter, Player reported, String reason)
+    public boolean shouldISendReport()
     {
         if (ConfigEntry.DISCORD_REPORT_CHANNEL_ID.getString().isEmpty())
         {
@@ -498,6 +419,7 @@ public class Discord extends FreedomService
 
         Guild server = bot.getGuildById(ConfigEntry.DISCORD_SERVER_ID.getString());
         if (server == null)
+
         {
             FLog.severe("The Discord server ID specified is invalid, or the bot is not on the server.");
             return false;
@@ -510,7 +432,54 @@ public class Discord extends FreedomService
             return false;
         }
 
-        EmbedBuilder embedBuilder = new EmbedBuilder();
+        return true;
+    }
+
+    public boolean sendReportOffline(Player reporter, OfflinePlayer reported, String reason)
+    {
+        if (!shouldISendReport())
+        {
+            return false;
+        }
+
+        final Guild server = bot.getGuildById(ConfigEntry.DISCORD_SERVER_ID.getString());
+        final TextChannel channel = server.getTextChannelById(ConfigEntry.DISCORD_REPORT_CHANNEL_ID.getString());
+
+        final EmbedBuilder embedBuilder = new EmbedBuilder();
+        embedBuilder.setTitle("Report for " + reported.getName() + " (offline)");
+        embedBuilder.setDescription(reason);
+        embedBuilder.setFooter("Reported by " + reporter.getName(), "https://minotar.net/helm/" + reporter.getName() + ".png");
+        embedBuilder.setTimestamp(Instant.from(ZonedDateTime.now()));
+        com.earth2me.essentials.User user = plugin.esb.getEssentialsUser(reported.getName());
+        String location = "World: " + Objects.requireNonNull(user.getLastLocation().getWorld()).getName() + ", X: " + user.getLastLocation().getBlockX() + ", Y: " + user.getLastLocation().getBlockY() + ", Z: " + user.getLastLocation().getBlockZ();
+        embedBuilder.addField("Location", location, true);
+        embedBuilder.addField("God Mode", WordUtils.capitalizeFully(String.valueOf(user.isGodModeEnabled())), true);
+        if (user.getNickname() != null)
+        {
+            embedBuilder.addField("Nickname", user.getNickname(), true);
+        }
+        MessageEmbed embed = embedBuilder.build();
+        Message message = channel.sendMessage(embed).complete();
+
+        if (!ConfigEntry.DISCORD_REPORT_ARCHIVE_CHANNEL_ID.getString().isEmpty())
+        {
+            message.addReaction("\uD83D\uDCCB").complete();
+        }
+
+        return true;
+    }
+
+    public boolean sendReport(Player reporter, Player reported, String reason)
+    {
+        if (!shouldISendReport())
+        {
+            return false;
+        }
+
+        final Guild server = bot.getGuildById(ConfigEntry.DISCORD_SERVER_ID.getString());
+        final TextChannel channel = server.getTextChannelById(ConfigEntry.DISCORD_REPORT_CHANNEL_ID.getString());
+
+        final EmbedBuilder embedBuilder = new EmbedBuilder();
         embedBuilder.setTitle("Report for " + reported.getName());
         embedBuilder.setDescription(reason);
         embedBuilder.setFooter("Reported by " + reporter.getName(), "https://minotar.net/helm/" + reporter.getName() + ".png");
@@ -525,7 +494,13 @@ public class Discord extends FreedomService
             embedBuilder.addField("Nickname", user.getNickname(), true);
         }
         MessageEmbed embed = embedBuilder.build();
-        channel.sendMessage(embed).complete();
+        Message message = channel.sendMessage(embed).complete();
+
+        if (!ConfigEntry.DISCORD_REPORT_ARCHIVE_CHANNEL_ID.getString().isEmpty())
+        {
+            message.addReaction("\uD83D\uDCCB").complete();
+        }
+
         return true;
     }
 
@@ -534,7 +509,7 @@ public class Discord extends FreedomService
     {
         public void start()
         {
-            messageChatChannel("**Server has started**");
+            messageChatChannel("**Server has started**", true);
         }
     }
 }

src/main/java/me/totalfreedom/totalfreedommod/discord/DiscordToMinecraftListener.java

@@ -2,17 +2,20 @@ package me.totalfreedom.totalfreedommod.discord;
 
 import me.totalfreedom.totalfreedommod.TotalFreedomMod;
 import me.totalfreedom.totalfreedommod.config.ConfigEntry;
+import me.totalfreedom.totalfreedommod.discord.command.DiscordCommandManager;
 import me.totalfreedom.totalfreedommod.rank.Rank;
 import me.totalfreedom.totalfreedommod.rank.Title;
 import me.totalfreedom.totalfreedommod.util.FLog;
-import net.dv8tion.jda.api.entities.Guild;
-import net.dv8tion.jda.api.entities.Member;
-import net.dv8tion.jda.api.entities.Message;
+import me.totalfreedom.totalfreedommod.util.FUtil;
+import net.dv8tion.jda.api.entities.*;
 import net.dv8tion.jda.api.events.message.MessageReceivedEvent;
 import net.dv8tion.jda.api.hooks.ListenerAdapter;
+import net.md_5.bungee.api.chat.BaseComponent;
 import net.md_5.bungee.api.chat.ClickEvent;
 import net.md_5.bungee.api.chat.ComponentBuilder;
+import net.md_5.bungee.api.chat.HoverEvent;
 import net.md_5.bungee.api.chat.TextComponent;
+import net.md_5.bungee.api.chat.hover.content.Text;
 import org.bukkit.Bukkit;
 import org.bukkit.ChatColor;
 import org.bukkit.entity.Player;
@@ -21,50 +24,108 @@ public class DiscordToMinecraftListener extends ListenerAdapter
 {
     public void onMessageReceived(MessageReceivedEvent event)
     {
-        String chat_channel_id = ConfigEntry.DISCORD_CHAT_CHANNEL_ID.getString();
-        if (event.getMember() != null && !chat_channel_id.isEmpty() && event.getChannel().getId().equals(chat_channel_id))
+        final String chat_channel_id = ConfigEntry.DISCORD_CHAT_CHANNEL_ID.getString();
+        final MessageChannel genericChannel = event.getChannel();
+
+        if (event.getMember() == null)
         {
-            if (!event.getAuthor().getId().equals(Discord.bot.getSelfUser().getId()))
+            return;
+        }
+
+        if (chat_channel_id.isEmpty())
         {
-                Member member = event.getMember();
-                String tag = getDisplay(member);
-                StringBuilder message = new StringBuilder(ChatColor.DARK_GRAY + "[" + ChatColor.DARK_AQUA + "Discord" + ChatColor.DARK_GRAY + "]");
-                Message msg = event.getMessage();
+            return;
+        }
+
+        if (event.getAuthor().getId().equals(Discord.bot.getSelfUser().getId()))
+        {
+            return;
+        }
+
+        if (!genericChannel.getId().equals(chat_channel_id))
+        {
+            return;
+        }
+
+        if (!(genericChannel instanceof TextChannel))
+        {
+            return;
+        }
+
+        final TextChannel textChannel = (TextChannel) genericChannel;
+
+        final Member member = event.getMember();
+        final String tag = getDisplay(member);
+        final Message msg = event.getMessage();
+        final String content = msg.getContentStripped();
+
+        if (content.startsWith(ConfigEntry.DISCORD_PREFIX.getString()))
+        {
+            Discord.DISCORD_COMMAND_MANAGER.parse(content, member, textChannel);
+            return;
+        }
+
+        ComponentBuilder emsg = new ComponentBuilder();
+
+        // Prefix
+        emsg.append(ChatColor.DARK_GRAY + "[");
+        TextComponent inviteLink = new TextComponent("Discord");
+        inviteLink.setColor(ChatColor.DARK_AQUA.asBungee());
+        inviteLink.setHoverEvent(new HoverEvent(HoverEvent.Action.SHOW_TEXT,
+                new Text("Click here to get the invite link!")));
+        inviteLink.setClickEvent(new ClickEvent(ClickEvent.Action.OPEN_URL,
+                ConfigEntry.DISCORD_INVITE_LINK.getString()));
+        emsg.append(inviteLink);
+        emsg.append(ChatColor.DARK_GRAY + "] ", ComponentBuilder.FormatRetention.NONE);
+
+        // Tag (if they have one)
         if (tag != null)
         {
-                    message.append(" ").append(tag);
-                }
-                message.append(" ").append(ChatColor.RED).append(ChatColor.stripColor(member.getEffectiveName())).append(ChatColor.DARK_GRAY).append(":").append(ChatColor.RESET);
-                ComponentBuilder builder = new ComponentBuilder(message.toString());
-                if (!msg.getContentDisplay().isEmpty())
-                {
-                    builder.append(" ").append(ChatColor.stripColor(msg.getContentDisplay()));
-                    message.append(" ").append(ChatColor.stripColor(msg.getContentDisplay())); // for logging
+            emsg.append(tag);
         }
+
+        emsg.append(" ");
+
+        // User
+        TextComponent user = new TextComponent(FUtil.stripColors(member.getEffectiveName()));
+        user.setColor(ChatColor.RED.asBungee());
+        emsg.append(user);
+
+        // Message
+        emsg.append(ChatColor.DARK_GRAY + ": " + ChatColor.RESET
+                + FUtil.stripColors(msg.getContentDisplay()), ComponentBuilder.FormatRetention.NONE);
+
+        // Attachments
         if (!msg.getAttachments().isEmpty())
         {
+            if (!msg.getContentDisplay().isEmpty())
+                emsg.append(" ");
+
             for (Message.Attachment attachment : msg.getAttachments())
             {
-                        attachment.getUrl();
-                        builder.append(" ");
-                        TextComponent text = new TextComponent(ChatColor.YELLOW + "[Media]");
-                        text.setClickEvent(new ClickEvent(ClickEvent.Action.OPEN_URL, attachment.getUrl()));
-                        builder.append(text);
-                        message.append(" [Media]"); // for logging
+                TextComponent media = new TextComponent("[Media] ");
+                media.setColor(ChatColor.YELLOW.asBungee());
+                media.setClickEvent(new ClickEvent(ClickEvent.Action.OPEN_URL, attachment.getUrl()));
+                media.setHoverEvent(new HoverEvent(HoverEvent.Action.SHOW_TEXT, new Text(attachment.getUrl())));
+
+                emsg.append(media, ComponentBuilder.FormatRetention.NONE);
             }
         }
+
+        BaseComponent[] components = emsg.create();
+
         for (Player player : Bukkit.getOnlinePlayers())
         {
             if (TotalFreedomMod.getPlugin().pl.getData(player).doesDisplayDiscord())
             {
-                        player.spigot().sendMessage(builder.create());
-                    }
-                }
-                FLog.info(message.toString());
+                player.sendMessage(components);
             }
         }
+
+        FLog.info(TextComponent.toLegacyText(components), true);
     }
 
+
     public String getDisplay(Member member)
     {
         Guild server = Discord.bot.getGuildById(ConfigEntry.DISCORD_SERVER_ID.getString());

src/main/java/me/totalfreedom/totalfreedommod/discord/MessageReactionListener.java

@@ -0,0 +1,68 @@
+package me.totalfreedom.totalfreedommod.discord;
+
+import me.totalfreedom.totalfreedommod.config.ConfigEntry;
+import me.totalfreedom.totalfreedommod.util.FLog;
+import net.dv8tion.jda.api.MessageBuilder;
+import net.dv8tion.jda.api.entities.Member;
+import net.dv8tion.jda.api.entities.Message;
+import net.dv8tion.jda.api.entities.MessageEmbed;
+import net.dv8tion.jda.api.entities.TextChannel;
+import net.dv8tion.jda.api.events.message.react.MessageReactionAddEvent;
+import net.dv8tion.jda.api.hooks.ListenerAdapter;
+
+public class MessageReactionListener extends ListenerAdapter
+{
+    public void onMessageReactionAdd(MessageReactionAddEvent messageReactionAddEvent)
+    {
+        if (!messageReactionAddEvent.isFromGuild())
+        {
+            return;
+        }
+
+        if (messageReactionAddEvent.getMember() == null)
+        {
+            return;
+        }
+
+        if (messageReactionAddEvent.getMember().getUser().getId().equals(Discord.bot.getSelfUser().getId()))
+        {
+            return;
+        }
+
+        if (!messageReactionAddEvent.getChannel().getId().equals(ConfigEntry.DISCORD_REPORT_CHANNEL_ID.getString()))
+        {
+            return;
+        }
+
+        if (!messageReactionAddEvent.getReactionEmote().getEmoji().equals("\uD83D\uDCCB"))
+        {
+            return;
+        }
+
+        final TextChannel archiveChannel = Discord.bot.getTextChannelById(ConfigEntry.DISCORD_REPORT_ARCHIVE_CHANNEL_ID.getString());
+
+        if (archiveChannel == null)
+        {
+            FLog.warning("Report archive channel is defined in the config, yet doesn't actually exist!");
+            return;
+        }
+
+        final Message message = messageReactionAddEvent.retrieveMessage().complete();
+        final Member completer = messageReactionAddEvent.getMember();
+
+        if (!message.getAuthor().getId().equals(Discord.bot.getSelfUser().getId()))
+        {
+            return;
+        }
+
+        // We don't need other embeds... yet?
+        final MessageEmbed embed = message.getEmbeds().get(0);
+        final MessageBuilder archiveMessageBuilder = new MessageBuilder();
+        archiveMessageBuilder.setContent("Report completed by " + completer.getUser().getAsMention() + " (" + Discord.deformat(completer.getUser().getAsTag() + ")"));
+        archiveMessageBuilder.setEmbed(embed);
+        final Message archiveMessage = archiveMessageBuilder.build();
+
+        archiveChannel.sendMessage(archiveMessage).complete();
+        message.delete().complete();
+    }
+}

src/main/java/me/totalfreedom/totalfreedommod/discord/PrivateMessageListener.java

@@ -22,9 +22,8 @@ public class PrivateMessageListener extends ListenerAdapter
                     PlayerData player = Discord.LINK_CODES.get(code);
                     name = player.getName();
                     player.setDiscordID(event.getMessage().getAuthor().getId());
-                    player.setVerification(true);
 
-                    Admin admin = TotalFreedomMod.getPlugin().al.getEntryByName(name);
+                    Admin admin = TotalFreedomMod.getPlugin().al.getEntryByUuid(player.getUuid());
                     if (admin != null)
                     {
                         Discord.syncRoles(admin, player.getDiscordID());
@@ -37,8 +36,7 @@ public class PrivateMessageListener extends ListenerAdapter
                 {
                     return;
                 }
-                event.getChannel().sendMessage("Link successful. Now this Discord account is linked with your Minecraft account **" + name + "**.\n"
-                        + "Now when you are an impostor on the server, you may use `/verify` to verify.").complete();
+                event.getChannel().sendMessage("Link successful. Now this Discord account is linked with your Minecraft account **" + name + "**.").complete();
             }
         }
     }

src/main/java/me/totalfreedom/totalfreedommod/discord/command/DiscordCommand.java

@@ -0,0 +1,25 @@
+package me.totalfreedom.totalfreedommod.discord.command;
+
+import net.dv8tion.jda.api.MessageBuilder;
+import net.dv8tion.jda.api.entities.Guild;
+import net.dv8tion.jda.api.entities.Member;
+import net.dv8tion.jda.api.entities.User;
+
+import java.util.List;
+
+public interface DiscordCommand
+{
+    String getCommandName();
+
+    String getDescription();
+
+    String getCategory();
+
+    List<String> getAliases();
+
+    boolean isAdmin();
+
+    boolean canExecute(Member member);
+
+    MessageBuilder execute(Member member, List<String> args);
+}

src/main/java/me/totalfreedom/totalfreedommod/discord/command/DiscordCommandImpl.java

@@ -0,0 +1,13 @@
+package me.totalfreedom.totalfreedommod.discord.command;
+
+import net.dv8tion.jda.api.entities.Member;
+
+public abstract class DiscordCommandImpl implements DiscordCommand
+{
+    @Override
+    public boolean canExecute(Member member)
+    {
+        //return !isAdmin() || member.getRoles().stream().filter((role -> role.getName().toLowerCase().contains("admin") && !role.getName().toLowerCase().contains("discord"))).toList().size() > 0;
+        return !isAdmin();
+    }
+}

src/main/java/me/totalfreedom/totalfreedommod/discord/command/DiscordCommandManager.java

@@ -0,0 +1,84 @@
+package me.totalfreedom.totalfreedommod.discord.command;
+
+import me.totalfreedom.totalfreedommod.config.ConfigEntry;
+import me.totalfreedom.totalfreedommod.discord.Discord;
+import me.totalfreedom.totalfreedommod.util.FLog;
+import net.dv8tion.jda.api.EmbedBuilder;
+import net.dv8tion.jda.api.MessageBuilder;
+import net.dv8tion.jda.api.entities.Member;
+import net.dv8tion.jda.api.entities.Message;
+import net.dv8tion.jda.api.entities.TextChannel;
+import org.reflections.Reflections;
+
+import java.awt.*;
+import java.util.ArrayList;
+import java.util.Arrays;
+import java.util.List;
+import java.util.Set;
+import java.util.concurrent.CompletableFuture;
+
+public class DiscordCommandManager
+{
+    public static final String PREFIX = ConfigEntry.DISCORD_PREFIX.getString();
+    private Discord discord;
+    public final List<DiscordCommand> commands = new ArrayList<>();
+
+    public void init(Discord discord)
+    {
+        this.discord = discord;
+
+        final Reflections discordCommandsDir = new Reflections("me.totalfreedom.totalfreedommod.discord.commands");
+
+        final Set<Class<? extends DiscordCommand>> commandClasses = discordCommandsDir.getSubTypesOf(DiscordCommand.class);
+
+        for (Class<? extends DiscordCommand> commandClass : commandClasses)
+        {
+            try
+            {
+                commands.add(commandClass.getDeclaredConstructor().newInstance());
+            }
+            catch (Exception e)
+            {
+                FLog.warning("Failed to load Discord command: " + commandClass.getName());
+            }
+        }
+
+        FLog.info("Loaded " + commands.size() + " Discord commands.");
+    }
+
+    public void parse(String content, Member member, TextChannel channel)
+    {
+        List<String> args = new ArrayList<>(Arrays.asList(content.split(" ")));
+
+        final String alias = args.remove(0).split(PREFIX)[1]; // The joys of command parsing
+
+        for (DiscordCommand command : commands)
+        {
+            if (command.getCommandName().equalsIgnoreCase(alias) || command.getAliases().contains(alias.toLowerCase()))
+            {
+                if (command.canExecute(member))
+                {
+                    final MessageBuilder messageBuilder = command.execute(member, args);
+                    final Message message = messageBuilder.build();
+                    final CompletableFuture<Message> futureMessage = channel.sendMessage(message).submit(true);
+
+                    this.discord.sentMessages.add(futureMessage);
+                }
+                else
+                {
+                    final MessageBuilder messageBuilder = new MessageBuilder();
+                    final EmbedBuilder embedBuilder = new EmbedBuilder();
+                    embedBuilder.setTitle("Command error");
+                    embedBuilder.setColor(Color.RED);
+                    embedBuilder.setDescription("You don't have permission to execute this command.");
+                    messageBuilder.setEmbed(embedBuilder.build());
+                    final Message message = messageBuilder.build();
+
+                    final CompletableFuture<Message> futureMessage = channel.sendMessage(message).submit(true);
+
+                    this.discord.sentMessages.add(futureMessage);
+                }
+            }
+        }
+    }
+}

src/main/java/me/totalfreedom/totalfreedommod/discord/commands/HelpCommand.java

@@ -0,0 +1,86 @@
+package me.totalfreedom.totalfreedommod.discord.commands;
+
+import me.totalfreedom.totalfreedommod.discord.Discord;
+import me.totalfreedom.totalfreedommod.discord.command.DiscordCommand;
+import me.totalfreedom.totalfreedommod.discord.command.DiscordCommandImpl;
+import me.totalfreedom.totalfreedommod.discord.command.DiscordCommandManager;
+import net.dv8tion.jda.api.EmbedBuilder;
+import net.dv8tion.jda.api.MessageBuilder;
+import net.dv8tion.jda.api.entities.Member;
+
+import java.awt.*;
+import java.util.ArrayList;
+import java.util.HashMap;
+import java.util.List;
+import java.util.Map;
+
+public class HelpCommand extends DiscordCommandImpl
+{
+    @Override
+    public String getCommandName()
+    {
+        return "help";
+    }
+
+    @Override
+    public String getDescription()
+    {
+        return "Displays the help command";
+    }
+
+    @Override
+    public String getCategory()
+    {
+        return "Help";
+    }
+
+    @Override
+    public List<String> getAliases()
+    {
+        return List.of("cmds", "commands", "elp");
+    }
+
+    @Override
+    public boolean isAdmin()
+    {
+        return false;
+    }
+
+    @Override
+    public MessageBuilder execute(Member member, List<String> args)
+    {
+        final EmbedBuilder embedBuilder = new EmbedBuilder();
+        embedBuilder.setColor(Color.GREEN);
+        embedBuilder.setTitle("Help Command");
+
+        final Map<String, List<DiscordCommand>> commandCategories = new HashMap<>();
+
+        for (DiscordCommand command : Discord.DISCORD_COMMAND_MANAGER.commands)
+        {
+            if (!commandCategories.containsKey(command.getCategory()))
+            {
+                commandCategories.put(command.getCategory(), new ArrayList<>(List.of(command)));
+            }
+            else
+            {
+                commandCategories.get(command.getCategory()).add(command);
+            }
+        }
+
+        for (Map.Entry<String, List<DiscordCommand>> entry : commandCategories.entrySet())
+        {
+            final String category = entry.getKey();
+            final List<DiscordCommand> commands = entry.getValue();
+            final StringBuilder fieldValue = new StringBuilder();
+
+            for (DiscordCommand command : commands)
+            {
+                fieldValue.append("**").append(DiscordCommandManager.PREFIX).append(command.getCommandName()).append("** - ").append(command.getDescription()).append("\n");
+            }
+
+            embedBuilder.addField(category, fieldValue.toString().trim(), false);
+        }
+
+        return new MessageBuilder().setEmbed(embedBuilder.build());
+    }
+}

src/main/java/me/totalfreedom/totalfreedommod/discord/commands/ListCommand.java

@@ -0,0 +1,106 @@
+package me.totalfreedom.totalfreedommod.discord.commands;
+
+import me.totalfreedom.totalfreedommod.TotalFreedomMod;
+import me.totalfreedom.totalfreedommod.admin.AdminList;
+import me.totalfreedom.totalfreedommod.config.ConfigEntry;
+import me.totalfreedom.totalfreedommod.discord.command.DiscordCommand;
+import me.totalfreedom.totalfreedommod.discord.command.DiscordCommandImpl;
+import me.totalfreedom.totalfreedommod.rank.Displayable;
+import me.totalfreedom.totalfreedommod.rank.RankManager;
+import me.totalfreedom.totalfreedommod.util.FUtil;
+import net.dv8tion.jda.api.EmbedBuilder;
+import net.dv8tion.jda.api.MessageBuilder;
+import net.dv8tion.jda.api.entities.Guild;
+import net.dv8tion.jda.api.entities.Member;
+import net.dv8tion.jda.api.entities.User;
+import org.bukkit.Bukkit;
+import org.bukkit.entity.Player;
+
+import java.util.ArrayList;
+import java.util.HashMap;
+import java.util.List;
+import java.util.Map;
+
+public class ListCommand extends DiscordCommandImpl
+{
+    private static final TotalFreedomMod PLUGIN = TotalFreedomMod.plugin();
+
+    @Override
+    public String getCommandName()
+    {
+        return "list";
+    }
+
+    @Override
+    public String getDescription()
+    {
+        return "Gives a list of online players.";
+    }
+
+    @Override
+    public String getCategory()
+    {
+        return "Server Commands";
+    }
+
+    @Override
+    public List<String> getAliases()
+    {
+        return List.of("online", "who", "l", "lsit");
+    }
+
+    @Override
+    public boolean isAdmin()
+    {
+        return false;
+    }
+
+    @Override
+    public MessageBuilder execute(Member member, List<String> args)
+    {
+        if (PLUGIN == null)
+        {
+            throw new IllegalStateException("TotalFreedomMod somehow null while executing a command!");
+        }
+
+        final AdminList adminList = PLUGIN.al;
+        final RankManager rankManager = PLUGIN.rm;
+
+        EmbedBuilder embedBuilder = new EmbedBuilder()
+                .setTitle("Player List - " + ConfigEntry.SERVER_NAME.getString())
+                .setDescription("There are " + FUtil.getFakePlayerCount() + " / " + Bukkit.getMaxPlayers() + " online players");
+
+        Map<Displayable, List<String>> displayables = new HashMap<>();
+
+        for (Player onlinePlayer : Bukkit.getOnlinePlayers())
+        {
+            if (adminList.isVanished(onlinePlayer.getName()))
+            {
+                continue;
+            }
+
+
+            Displayable displayable = rankManager.getDisplay(onlinePlayer);
+
+            if (displayables.containsKey(displayable))
+            {
+                displayables.get(displayable).add(onlinePlayer.getName());
+            }
+            else
+            {
+                displayables.put(displayable, new ArrayList<>(List.of(onlinePlayer.getName())));
+            }
+        }
+
+        for (Map.Entry<Displayable, List<String>> entry : displayables.entrySet())
+        {
+            final Displayable displayable = entry.getKey();
+            final List<String> players = entry.getValue();
+
+            embedBuilder.addField(displayable.getPlural() + " (" + players.size() + ")",
+                    String.join(", ", players), false);
+        }
+
+        return new MessageBuilder().setEmbed(embedBuilder.build());
+    }
+}

src/main/java/me/totalfreedom/totalfreedommod/discord/commands/TPSCommand.java

@@ -0,0 +1,60 @@
+package me.totalfreedom.totalfreedommod.discord.commands;
+
+import me.totalfreedom.totalfreedommod.discord.command.DiscordCommand;
+import me.totalfreedom.totalfreedommod.discord.command.DiscordCommandImpl;
+import me.totalfreedom.totalfreedommod.util.FUtil;
+import net.dv8tion.jda.api.EmbedBuilder;
+import net.dv8tion.jda.api.MessageBuilder;
+import net.dv8tion.jda.api.entities.Member;
+import org.bukkit.Bukkit;
+import org.bukkit.Server;
+
+import java.util.Collections;
+import java.util.List;
+
+public class TPSCommand extends DiscordCommandImpl
+{
+    @Override
+    public String getCommandName()
+    {
+        return "tps";
+    }
+
+    @Override
+    public String getDescription()
+    {
+        return "Lag information regarding the server.";
+    }
+
+    @Override
+    public String getCategory()
+    {
+        return "Server Commands";
+    }
+
+    @Override
+    public List<String> getAliases()
+    {
+        return Collections.singletonList("lag");
+    }
+
+    @Override
+    public boolean isAdmin()
+    {
+        return false;
+    }
+
+    @Override
+    public MessageBuilder execute(Member member, List<String> args)
+    {
+        final EmbedBuilder builder = new EmbedBuilder();
+        builder.setTitle("Server lag information");
+        builder.addField("TPS", String.valueOf(Math.round(FUtil.getMeanAverageDouble(Bukkit.getServer().getTPS()))), false);
+        builder.addField("Uptime", FUtil.getUptime(), false);
+        builder.addField("Maximum Memory", Math.ceil(FUtil.getMaxMem()) + " MB", false);
+        builder.addField("Allocated Memory", Math.ceil(FUtil.getTotalMem()) + " MB", false);
+        builder.addField("Free Memory", Math.ceil(FUtil.getFreeMem()) + " MB", false);
+
+        return new MessageBuilder().setEmbed(builder.build());
+    }
+}

src/main/java/me/totalfreedom/totalfreedommod/discord/commands/UptimeCommand.java

@@ -0,0 +1,79 @@
+package me.totalfreedom.totalfreedommod.discord.commands;
+
+import me.totalfreedom.totalfreedommod.discord.command.DiscordCommandImpl;
+import me.totalfreedom.totalfreedommod.util.FLog;
+import net.dv8tion.jda.api.EmbedBuilder;
+import net.dv8tion.jda.api.MessageBuilder;
+import net.dv8tion.jda.api.entities.Member;
+
+import java.awt.*;
+import java.io.BufferedReader;
+import java.io.InputStreamReader;
+import java.util.Collections;
+import java.util.List;
+
+public class UptimeCommand extends DiscordCommandImpl
+{
+    @Override
+    public String getCommandName()
+    {
+        return "uptime";
+    }
+
+    @Override
+    public String getDescription()
+    {
+        return "Returns the uptime of the host.";
+    }
+
+    @Override
+    public String getCategory()
+    {
+        return "Server Commands";
+    }
+
+    @Override
+    public List<String> getAliases()
+    {
+        return Collections.emptyList();
+    }
+
+    @Override
+    public boolean isAdmin()
+    {
+        return false;
+    }
+
+    @Override
+    public MessageBuilder execute(Member member, List<String> args)
+    {
+        final EmbedBuilder embedBuilder = new EmbedBuilder();
+
+        try
+        {
+            final Process uptimeProcess = Runtime.getRuntime().exec(new String[]{"uptime"});
+            BufferedReader input = new BufferedReader(new InputStreamReader(uptimeProcess.getInputStream()));
+            String line = input.readLine();
+
+            if (line != null)
+            {
+                embedBuilder.setTitle("Host Uptime Information");
+                embedBuilder.setDescription(line.trim());
+            }
+            else
+            {
+                throw new IllegalStateException("No output from uptime command.");
+            }
+        }
+        catch (Exception e)
+        {
+            FLog.warning("Error while executing uptime Discord command");
+            e.printStackTrace();
+            embedBuilder.setTitle("Command error");
+            embedBuilder.setColor(Color.RED);
+            embedBuilder.setDescription("Something went wrong");
+        }
+
+        return new MessageBuilder().setEmbed(embedBuilder.build());
+    }
+}

src/main/java/me/totalfreedom/totalfreedommod/freeze/FreezeData.java

@@ -60,13 +60,10 @@ public class FreezeData
         {
             @Override
             public void run()
-            {
-                if (!Objects.requireNonNull(plugin()).al.isAdminImpostor(player) && Objects.requireNonNull(plugin()).pl.isPlayerImpostor(player))
             {
                 FUtil.adminAction("TotalFreedom", "Unfreezing " + player.getName(), false);
                 setFrozen(false);
             }
-            }
 
         }.runTaskLater(Objects.requireNonNull(plugin()), AUTO_PURGE_TICKS);
     }

src/main/java/me/totalfreedom/totalfreedommod/fun/Trailer.java

@@ -4,7 +4,10 @@ import java.util.HashSet;
 import java.util.Objects;
 import java.util.Set;
 import java.util.SplittableRandom;
+import java.util.UUID;
+
 import me.totalfreedom.totalfreedommod.FreedomService;
+import me.totalfreedom.totalfreedommod.shop.ShopItem;
 import me.totalfreedom.totalfreedommod.util.Groups;
 import org.bukkit.Location;
 import org.bukkit.Material;
@@ -18,7 +21,7 @@ import org.bukkit.event.player.PlayerMoveEvent;
 public class Trailer extends FreedomService
 {
     private final SplittableRandom random = new SplittableRandom();
-    private final Set<String> trailPlayers = new HashSet<>(); // player name
+    private final Set<UUID> trailPlayers = new HashSet<>(); // player UUID
 
     @Override
     public void onStart()
@@ -33,17 +36,17 @@ public class Trailer extends FreedomService
     @EventHandler(priority = EventPriority.MONITOR, ignoreCancelled = true)
     public void onPlayerMove(PlayerMoveEvent event)
     {
-        if (trailPlayers.isEmpty())
-        {
-            return;
-        }
-
-        if (!trailPlayers.contains(event.getPlayer().getName()))
-        {
-            return;
-        }
-
-        if (event.getPlayer().getWorld().equals(plugin.wm.masterBuilderWorld.getWorld()))
+        /* Doesn't continue any further if...
+         * - The trail list is empty
+         * - The player doesn't have their trail enabled in the first place
+         * - The player doesn't have the trail item in the shop at all
+         * - The player doesn't have permission to modify blocks in their current world
+         */
+        if (trailPlayers.isEmpty()
+                || !trailPlayers.contains(event.getPlayer().getUniqueId())
+                || !plugin.pl.getData(event.getPlayer()).hasItem(ShopItem.RAINBOW_TRAIL)
+                || plugin.wr.doRestrict(event.getPlayer())
+                || !plugin.wgb.canEditCurrentWorld(event.getPlayer()))
         {
             return;
         }
@@ -69,7 +72,7 @@ public class Trailer extends FreedomService
             {
                 final Location trail_pos;
                 trail_pos = new Location(event.getPlayer().getWorld(), fromBlock.getX() + x, fromBlock.getY(), fromBlock.getZ() + z);
-                if (trailPlayers.contains(event.getPlayer().getName()) && plugin.cpb.isEnabled())
+                if (trailPlayers.contains(event.getPlayer().getUniqueId()) && plugin.cpb.isEnabled())
                 {
                     plugin.cpb.getCoreProtectAPI().logPlacement(event.getPlayer().getName(), trail_pos, material, data);
                 }
@@ -79,16 +82,16 @@ public class Trailer extends FreedomService
 
     public void remove(Player player)
     {
-        trailPlayers.remove(player.getName());
+        trailPlayers.remove(player.getUniqueId());
     }
 
     public void add(Player player)
     {
-        trailPlayers.add(player.getName());
+        trailPlayers.add(player.getUniqueId());
     }
 
     public boolean contains(Player player)
     {
-        return trailPlayers.contains(player.getName());
+        return trailPlayers.contains(player.getUniqueId());
     }
 }

src/main/java/me/totalfreedom/totalfreedommod/httpd/HTMLGenerationTools.java

@@ -11,9 +11,15 @@ public class HTMLGenerationTools
         return "<p>" + escapeHtml4(data) + "</p>\r\n";
     }
 
+    public static String heading(String data, String id, int level)
+    {
+        return "<h" + level + (id != null ? " id=\"" + id + "\"" : "") + ">" + escapeHtml4(data)
+                + "</h" + level + ">\r\n";
+    }
+
     public static String heading(String data, int level)
     {
-        return "<h" + level + ">" + escapeHtml4(data) + "</h" + level + ">\r\n";
+        return heading(data, null, level);
     }
 
     public static <K, V> String list(Map<K, V> map)

src/main/java/me/totalfreedom/totalfreedommod/httpd/NanoHTTPD.java

@@ -337,12 +337,12 @@ public abstract class NanoHTTPD
      */
     protected String decodePercent(String str)
     {
-        String decoded = null;
+        String decoded = str;
         try
         {
             decoded = URLDecoder.decode(str, "UTF8");
         }
-        catch (UnsupportedEncodingException ignored)
+        catch (UnsupportedEncodingException | IllegalArgumentException ignored)
         {
         }
         return decoded;

src/main/java/me/totalfreedom/totalfreedommod/httpd/module/Module_help.java

@@ -1,52 +1,67 @@
 package me.totalfreedom.totalfreedommod.httpd.module;
 
 import com.google.common.collect.Lists;
+import java.util.ArrayList;
+import java.util.Arrays;
 import java.util.Collection;
 import java.util.Comparator;
 import java.util.HashMap;
 import java.util.List;
 import java.util.Map;
-import java.util.Objects;
-import me.totalfreedom.totalfreedommod.TotalFreedomMod;
 import me.totalfreedom.totalfreedommod.command.FreedomCommand;
 import me.totalfreedom.totalfreedommod.httpd.NanoHTTPD;
-import me.totalfreedom.totalfreedommod.rank.Displayable;
+import me.totalfreedom.totalfreedommod.rank.Rank;
 import org.apache.commons.lang.StringUtils;
+import org.bukkit.Bukkit;
 import org.bukkit.command.Command;
 import org.bukkit.command.CommandMap;
 import org.bukkit.command.PluginIdentifiableCommand;
-import org.bukkit.command.SimpleCommandMap;
+import org.jetbrains.annotations.NotNull;
+import org.jetbrains.annotations.Nullable;
+
 import static me.totalfreedom.totalfreedommod.httpd.HTMLGenerationTools.heading;
 import static me.totalfreedom.totalfreedommod.httpd.HTMLGenerationTools.paragraph;
 import static org.apache.commons.lang3.StringEscapeUtils.escapeHtml4;
 
 public class Module_help extends HTTPDModule
 {
-
     public Module_help(NanoHTTPD.HTTPSession session)
     {
         super(session);
     }
 
-    private static String buildDescription(Command command)
+    private static String buildDescription(@NotNull Command command)
+    {
+        return buildDescription(command.getName(), command.getDescription(), command.getUsage(), StringUtils.join(command.getAliases(), ", "));
+    }
+
+    private static String buildDescription(@NotNull FreedomCommand command)
+    {
+        return buildDescription(command.getName(), command.getDescription(), command.getUsage(), command.getAliases());
+    }
+
+    private static String buildDescription(@NotNull String name, @Nullable String description, @NotNull String usage, @NotNull String aliases)
     {
         StringBuilder sb = new StringBuilder();
 
         sb.append(
                 "<li><span class=\"commandName\">{$CMD_NAME}</span> - Usage: <span class=\"commandUsage\">{$CMD_USAGE}</span>"
-                        .replace("{$CMD_NAME}", escapeHtml4(command.getName().trim()))
-                        .replace("{$CMD_USAGE}", escapeHtml4(command.getUsage().trim())));
+                        .replace("{$CMD_NAME}", escapeHtml4(name.trim()))
+                        .replace("{$CMD_USAGE}", escapeHtml4(usage.trim())));
 
-        if (!command.getAliases().isEmpty())
+        if (!aliases.isEmpty())
         {
             sb.append(
                     " - Aliases: <span class=\"commandAliases\">{$CMD_ALIASES}</span>"
-                            .replace("{$CMD_ALIASES}", escapeHtml4(StringUtils.join(command.getAliases(), ", "))));
+                            .replace("{$CMD_ALIASES}", escapeHtml4(aliases.trim())));
         }
 
+        if (description != null)
+        {
             sb.append(
                     "<br><span class=\"commandDescription\">{$CMD_DESC}</span></li>\r\n"
-                        .replace("{$CMD_DESC}", escapeHtml4(command.getDescription().trim())));
+                            .replace("{$CMD_DESC}", escapeHtml4(description.trim())));
+        }
 
         return sb.toString();
     }
@@ -54,11 +69,7 @@ public class Module_help extends HTTPDModule
     @Override
     public String getBody()
     {
-        final CommandMap map = FreedomCommand.getCommandMap();
-        if (!(map instanceof SimpleCommandMap))
-        {
-            return paragraph("Error loading commands.");
-        }
+        final CommandMap map = Bukkit.getCommandMap();
 
         final StringBuilder responseBody = new StringBuilder()
                 .append(heading("Command Help", 1))
@@ -66,7 +77,7 @@ public class Module_help extends HTTPDModule
                         "This page is an automatically generated listing of all plugin commands that are currently live on the server. "
                                 + "Please note that it does not include vanilla server commands."));
 
-        final Collection<Command> knownCommands = ((SimpleCommandMap)map).getCommands();
+        final Collection<Command> knownCommands = map.getKnownCommands().values();
         final Map<String, List<Command>> commandsByPlugin = new HashMap<>();
 
         for (Command command : knownCommands)
@@ -79,34 +90,47 @@ public class Module_help extends HTTPDModule
 
             List<Command> pluginCommands = commandsByPlugin.computeIfAbsent(pluginName, k -> Lists.newArrayList());
 
+            if (!pluginCommands.contains(command))
+            {
                 pluginCommands.add(command);
             }
+        }
 
+        final CommandComparator comparator = new CommandComparator();
+
+        // For every plugin...
         for (Map.Entry<String, List<Command>> entry : commandsByPlugin.entrySet())
         {
             final String pluginName = entry.getKey();
             final List<Command> commands = entry.getValue();
 
-            commands.sort(new CommandComparator());
+            // Sort them alphabetically
+            commands.sort(comparator);
 
-            responseBody.append(heading(pluginName, 2)).append("<ul>\r\n");
+            responseBody.append(heading(pluginName, pluginName, 2)).append("<ul>\r\n");
 
-            Displayable lastTfmCommandLevel = null;
-            for (Command command : commands)
+            if (!plugin.getName().equals(pluginName))
             {
-                if (!TotalFreedomMod.pluginName.equals(pluginName))
-                {
-                    responseBody.append(buildDescription(command));
-                    continue;
+                commands.forEach((command) -> responseBody.append(buildDescription(command)));
             }
-
-                Displayable tfmCommandLevel = Objects.requireNonNull(FreedomCommand.getFrom(command)).getPerms().level();
-                if (lastTfmCommandLevel == null || lastTfmCommandLevel != tfmCommandLevel)
+            else
             {
-                    responseBody.append("</ul>\r\n").append(heading(tfmCommandLevel.getName(), 3)).append("<ul>\r\n");
-                }
-                lastTfmCommandLevel = tfmCommandLevel;
-                responseBody.append(buildDescription(command));
+                Map<Rank, List<FreedomCommand>> freedomCommands = new HashMap<>();
+
+                // Filters out non-TFM commands
+                commands.stream().filter((cmd) -> cmd instanceof FreedomCommand.FCommand).forEach((tfmCmd) -> {
+                    Rank rank = FreedomCommand.getFrom(tfmCmd).getLevel();
+                    if (!freedomCommands.containsKey(rank))
+                        freedomCommands.put(rank, new ArrayList<>());
+                    freedomCommands.get(rank).add(FreedomCommand.getFrom(tfmCmd));
+                });
+
+                // Finally dumps them to HTML
+                Arrays.stream(Rank.values()).filter(freedomCommands::containsKey)
+                        .sorted(comparator::compare).forEach((rank -> {
+                    responseBody.append("</ul>\r\n").append(heading(rank.getName(), 3)).append("<ul>\r\n");
+                    freedomCommands.get(rank).stream().sorted(comparator::compare).forEach((command) -> responseBody.append(buildDescription(command)));
+                }));
             }
 
             responseBody.append("</ul>\r\n");
@@ -118,7 +142,7 @@ public class Module_help extends HTTPDModule
     @Override
     public String getTitle()
     {
-        return "TotalFreedomMod :: Command Help";
+        return plugin.getName() + " :: Command Help";
     }
 
     @Override
@@ -129,23 +153,23 @@ public class Module_help extends HTTPDModule
 
     public static class CommandComparator implements Comparator<Command>
     {
-
         @Override
         public int compare(Command a, Command b)
-        {
-            FreedomCommand ca = FreedomCommand.getFrom(a);
-            FreedomCommand cb = FreedomCommand.getFrom(b);
-
-            if (ca == null
-                    || cb == null
-                    || ca.getPerms() == null
-                    || cb.getPerms() == null)
         {
             return a.getName().compareTo(b.getName());
         }
 
-            return ca.getPerms().level().getName().compareTo(cb.getPerms().level().getName());
-        }
+        public int compare(FreedomCommand a, FreedomCommand b)
+        {
+            return a.getName().compareTo(b.getName());
         }
 
+        public int compare(Rank a, Rank b)
+        {
+            Integer levelA = a.getLevel();
+            Integer levelB = b.getLevel();
+
+            return levelB.compareTo(levelA);
+        }
+    }
 }

src/main/java/me/totalfreedom/totalfreedommod/httpd/module/Module_list.java

@@ -34,7 +34,6 @@ public class Module_list extends HTTPDModule
             final JSONArray admins = new JSONArray();
             final JSONArray masterbuilders = new JSONArray();
             final JSONArray operators = new JSONArray();
-            final JSONArray imposters = new JSONArray();
 
             for (Player player : Bukkit.getOnlinePlayers())
             {
@@ -43,11 +42,6 @@ public class Module_list extends HTTPDModule
                     continue;
                 }
 
-                if (isImposter(player))
-                {
-                    imposters.add(player.getName());
-                }
-
                 if (plugin.pl.getData(player).isMasterBuilder())
                 {
                     masterbuilders.add(player.getName());
@@ -105,7 +99,6 @@ public class Module_list extends HTTPDModule
             responseObject.put("admins", admins);
             responseObject.put("master_builders", masterbuilders);
             responseObject.put("operators", operators);
-            responseObject.put("imposters", imposters);
             responseObject.put("online", FUtil.getFakePlayerCount());
             responseObject.put("max", server.getMaxPlayers());
 
@@ -141,11 +134,6 @@ public class Module_list extends HTTPDModule
         }
     }
 
-    public boolean isImposter(Player player)
-    {
-        return plugin.al.isAdminImpostor(player) || plugin.pl.isPlayerImpostor(player);
-    }
-
     public boolean hasSpecialTitle(Player player)
     {
         return !FUtil.DEVELOPERS.contains(player.getUniqueId().toString()) && !ConfigEntry.SERVER_EXECUTIVES.getList().contains(player.getName()) && !ConfigEntry.SERVER_OWNERS.getList().contains(player.getName());

src/main/java/me/totalfreedom/totalfreedommod/httpd/module/Module_players.java

@@ -37,7 +37,7 @@ public class Module_players extends HTTPDModule
             if (!plugin.al.isVanished(player.getName()))
             {
                 players.add(player.getName());
-                if (plugin.al.isAdmin(player) && !plugin.al.isAdminImpostor(player))
+                if (plugin.al.isAdmin(player))
                 {
                     onlineadmins.add(player.getName());
                 }

src/main/java/me/totalfreedom/totalfreedommod/player/FPlayer.java

@@ -54,9 +54,6 @@ public class FPlayer
     private String lastMessage = "";
     private boolean inAdminchat = false;
     private boolean allCommandsBlocked = false;
-
-
-    private boolean superadminIdVerified = false;
     private String lastCommand = "";
     private boolean cmdspyEnabled = false;
     private String tag = null;
@@ -115,6 +112,14 @@ public class FPlayer
         this.player = player;
     }
 
+    // Ensure admins don't have admin functionality when removed (FS-222)
+    public void removeAdminFunctionality()
+    {
+        this.setCommandSpy(false);
+        this.setAdminChat(false);
+        this.setFuckoffRadius(0);
+    }
+
     public boolean isOrbiting()
     {
         return isOrbiting;
@@ -648,16 +653,6 @@ public class FPlayer
         this.allCommandsBlocked = allCommandsBlocked;
     }
 
-    public boolean isSuperadminIdVerified()
-    {
-        return superadminIdVerified;
-    }
-
-    public void setSuperadminIdVerified(boolean superadminIdVerified)
-    {
-        this.superadminIdVerified = superadminIdVerified;
-    }
-
     public boolean isCmdspyEnabled()
     {
         return cmdspyEnabled;

src/main/java/me/totalfreedom/totalfreedommod/player/PlayerData.java

@@ -3,30 +3,25 @@ package me.totalfreedom.totalfreedommod.player;
 import com.google.common.collect.Lists;
 import java.sql.ResultSet;
 import java.sql.SQLException;
-import java.util.Collections;
-import java.util.HashMap;
-import java.util.List;
-import java.util.Map;
-import me.totalfreedom.totalfreedommod.TotalFreedomMod;
+import java.util.*;
+
 import me.totalfreedom.totalfreedommod.shop.ShopItem;
 import me.totalfreedom.totalfreedommod.util.FLog;
 import me.totalfreedom.totalfreedommod.util.FUtil;
 import org.apache.commons.lang.StringUtils;
+import org.bukkit.Bukkit;
 import org.bukkit.ChatColor;
 import org.bukkit.entity.Player;
 
 public class PlayerData
 {
+    private UUID uuid;
     private final List<String> ips = Lists.newArrayList();
     private final List<String> notes = Lists.newArrayList();
-    private final List<String> backupCodes = Lists.newArrayList();
-    private String name;
     private String tag = null;
     private String discordID = null;
     private Boolean masterBuilder = false;
 
-    private Boolean verification = false;
-
 
     private String rideMode = "ask";
 
@@ -48,17 +43,14 @@ public class PlayerData
     {
         try
         {
-            name = resultSet.getString("username");
+            uuid = UUID.fromString(resultSet.getString("uuid"));
             ips.clear();
             ips.addAll(FUtil.stringToList(resultSet.getString("ips")));
             notes.clear();
             notes.addAll(FUtil.stringToList(resultSet.getString("notes")));
             tag = resultSet.getString("tag");
             discordID = resultSet.getString("discord_id");
-            backupCodes.clear();
-            backupCodes.addAll(FUtil.stringToList(resultSet.getString("backup_codes")));
             masterBuilder = resultSet.getBoolean("master_builder");
-            verification = resultSet.getBoolean("verification");
             rideMode = resultSet.getString("ride_mode");
             coins = resultSet.getInt("coins");
             items.clear();
@@ -72,40 +64,25 @@ public class PlayerData
         {
             FLog.severe("Failed to load player: " + e.getMessage());
         }
-
-        // Force verification for Master Builders
-        if (masterBuilder && !verification)
-        {
-            verification = true;
-            TotalFreedomMod.getPlugin().pl.save(this);
-        }
-        else if (!masterBuilder && discordID == null && verification)
-        {
-            this.verification = false;
-            TotalFreedomMod.getPlugin().pl.save(this);
-        }
     }
 
     public PlayerData(Player player)
     {
-        this.name = player.getName();
+        this.uuid = player.getUniqueId();
     }
 
     @Override
     public String toString()
     {
-
-        return "Player: " + name + "\n" +
+        return "Player: " + getName() + "\n" +
                 "- IPs: " + StringUtils.join(ips, ", ") + "\n" +
                 "- Discord ID: " + discordID + "\n" +
                 "- Master Builder: " + masterBuilder + "\n" +
-                "- Has Verification: " + verification + "\n" +
                 "- Coins: " + coins + "\n" +
                 "- Total Votes: " + totalVotes + "\n" +
                 "- Display Discord: " + displayDiscord + "\n" +
                 "- Tag: " + FUtil.colorize(tag) + ChatColor.GRAY + "\n" +
                 "- Ride Mode: " + rideMode + "\n" +
-                "- Backup Codes: " + backupCodes.size() + "/10" + "\n" +
                 "- Login Message: " + loginMessage;
     }
 
@@ -154,22 +131,6 @@ public class PlayerData
         notes.clear();
     }
 
-    public List<String> getBackupCodes()
-    {
-        return Collections.unmodifiableList(backupCodes);
-    }
-
-    public void setBackupCodes(List<String> codes)
-    {
-        backupCodes.clear();
-        backupCodes.addAll(codes);
-    }
-
-    public void removeBackupCode(String code)
-    {
-        backupCodes.remove(code);
-    }
-
     public void addNote(String note)
     {
         notes.add(note);
@@ -213,11 +174,6 @@ public class PlayerData
         items.remove(item.getDataName());
     }
 
-    public boolean hasVerification()
-    {
-        return verification;
-    }
-
     public boolean isMasterBuilder()
     {
         return masterBuilder;
@@ -232,14 +188,12 @@ public class PlayerData
     {
         return new HashMap<String, Object>()
         {{
-            put("username", name);
+            put("uuid", uuid.toString());
             put("ips", FUtil.listToString(ips));
             put("notes", FUtil.listToString(notes));
             put("tag", tag);
             put("discord_id", discordID);
-            put("backup_codes", FUtil.listToString(backupCodes));
             put("master_builder", masterBuilder);
-            put("verification", verification);
             put("ride_mode", rideMode);
             put("coins", coins);
             put("items", FUtil.listToString(items));
@@ -255,14 +209,14 @@ public class PlayerData
         return displayDiscord;
     }
 
-    public String getName()
+    public UUID getUuid()
     {
-        return name;
+        return uuid;
     }
 
-    public void setName(String name)
+    public String getName()
     {
-        this.name = name;
+        return Bukkit.getOfflinePlayer(uuid).getName();
     }
 
     public String getTag()
@@ -295,16 +249,6 @@ public class PlayerData
         this.masterBuilder = masterBuilder;
     }
 
-    public Boolean getVerification()
-    {
-        return verification;
-    }
-
-    public void setVerification(Boolean verification)
-    {
-        this.verification = verification;
-    }
-
     public String getRideMode()
     {
         return rideMode;

src/main/java/me/totalfreedom/totalfreedommod/player/PlayerList.java

@@ -3,11 +3,8 @@ package me.totalfreedom.totalfreedommod.player;
 import com.google.common.collect.Maps;
 import java.sql.ResultSet;
 import java.sql.SQLException;
-import java.util.ArrayList;
-import java.util.Date;
-import java.util.List;
-import java.util.Map;
-import java.util.Objects;
+import java.util.*;
+
 import me.totalfreedom.totalfreedommod.FreedomService;
 import me.totalfreedom.totalfreedommod.admin.Admin;
 import me.totalfreedom.totalfreedommod.config.ConfigEntry;
@@ -21,7 +18,7 @@ public class PlayerList extends FreedomService
 {
 
     public final Map<String, FPlayer> playerMap = Maps.newHashMap(); // ip,dataMap
-    public final Map<String, PlayerData> dataMap = Maps.newHashMap(); // username, data
+    public final Map<UUID, PlayerData> dataMap = Maps.newHashMap(); // uuid, data
 
     @Override
     public void onStart()
@@ -57,7 +54,7 @@ public class PlayerList extends FreedomService
             while (resultSet.next())
             {
                 PlayerData playerData = load(resultSet);
-                dataMap.put(playerData.getName(), playerData);
+                dataMap.put(playerData.getUuid(), playerData);
             }
         }
         catch (SQLException e)
@@ -103,7 +100,7 @@ public class PlayerList extends FreedomService
 
     public boolean isTelnetMasterBuilder(PlayerData playerData)
     {
-        Admin admin = plugin.al.getEntryByName(playerData.getName());
+        Admin admin = plugin.al.getEntryByUuid(playerData.getUuid());
         return admin != null && admin.getRank().isAtLeast(Rank.ADMIN) && playerData.isMasterBuilder();
     }
 
@@ -122,9 +119,9 @@ public class PlayerList extends FreedomService
         return tPlayer;
     }
 
-    public PlayerData loadByName(String name)
+    public PlayerData loadByUuid(UUID uuid)
     {
-        return load(plugin.sql.getPlayerByName(name));
+        return load(plugin.sql.getPlayerByUuid(uuid));
     }
 
     public PlayerData loadByIp(String ip)
@@ -141,43 +138,6 @@ public class PlayerList extends FreedomService
         return new PlayerData(resultSet);
     }
 
-    public Boolean isPlayerImpostor(Player player)
-    {
-        PlayerData playerData = getData(player);
-        return plugin.dc.enabled
-                && !plugin.al.isAdmin(player)
-                && (playerData.hasVerification())
-                && !playerData.getIps().contains(FUtil.getIp(player));
-    }
-
-    public boolean IsImpostor(Player player)
-    {
-        return isPlayerImpostor(player) || plugin.al.isAdminImpostor(player);
-    }
-
-    public void verify(Player player, String backupCode)
-    {
-        PlayerData playerData = getData(player);
-        if (backupCode != null)
-        {
-            playerData.removeBackupCode(backupCode);
-        }
-
-        playerData.addIp(FUtil.getIp(player));
-        save(playerData);
-
-        if (plugin.al.isAdminImpostor(player))
-        {
-            Admin admin = plugin.al.getEntryByName(player.getName());
-            admin.setLastLogin(new Date());
-            admin.addIp(FUtil.getIp(player));
-            plugin.al.updateTables();
-            plugin.al.save(admin);
-        }
-
-        plugin.rm.updateDisplay(player);
-    }
-
     public void syncIps(Admin admin)
     {
         PlayerData playerData = getData(admin.getName());
@@ -186,25 +146,11 @@ public class PlayerList extends FreedomService
         plugin.pl.save(playerData);
     }
 
-    public void syncIps(PlayerData playerData)
-    {
-        Admin admin = plugin.al.getEntryByName(playerData.getName());
-
-        if (admin != null && admin.isActive())
-        {
-            admin.clearIPs();
-            admin.addIps(playerData.getIps());
-            plugin.al.updateTables();
-            plugin.al.save(admin);
-        }
-    }
-
-
     public void save(PlayerData player)
     {
         try
         {
-            ResultSet currentSave = plugin.sql.getPlayerByName(player.getName());
+            ResultSet currentSave = plugin.sql.getPlayerByUuid(player.getUuid());
             for (Map.Entry<String, Object> entry : player.toSQLStorable().entrySet())
             {
                 Object storedValue = plugin.sql.getValue(currentSave, entry.getKey(), entry.getValue());
@@ -223,69 +169,56 @@ public class PlayerList extends FreedomService
     public PlayerData getData(Player player)
     {
         // Check for existing data
-        PlayerData playerData = dataMap.get(player.getName());
+        PlayerData playerData = dataMap.get(player.getUniqueId());
         if (playerData != null)
         {
             return playerData;
         }
 
         // Load data
-        playerData = loadByName(player.getName());
+        playerData = loadByUuid(player.getUniqueId());
 
+        // Oh you don't have any data? Well now you do
         if (playerData == null)
         {
-            playerData = loadByIp(FUtil.getIp(player));
-            if (playerData != null)
-            {
-                plugin.sql.updatePlayerName(playerData.getName(), player.getName());
-                playerData.setName(player.getName());
-                dataMap.put(player.getName(), playerData);
-                return playerData;
-            }
-        }
-        else
-        {
-            dataMap.put(player.getName(), playerData);
-            return playerData;
-        }
+            FLog.info("Creating new player data entry for " + player.getName());
 
-        // Create new data if nonexistent
-        FLog.info("Creating new player verification entry for " + player.getName());
-
-        // Create new player
             playerData = new PlayerData(player);
             playerData.addIp(FUtil.getIp(player));
+        }
 
-        // Store player
-        dataMap.put(player.getName(), playerData);
+        // Store it in memory.
+        dataMap.put(player.getUniqueId(), playerData);
 
-        // Save player
+        // Send it to the SQL database.
         plugin.sql.addPlayer(playerData);
-        return playerData;
 
+        // Returns it
+        return playerData;
+    }
+
+    public PlayerData getData(UUID uuid)
+    {
+        PlayerData data = dataMap.get(uuid);
+
+        if (data == null)
+        {
+            data = loadByUuid(uuid);
+        }
+
+        return data;
     }
 
     public PlayerData getData(String username)
     {
-        // Check for existing data
-        PlayerData playerData = dataMap.get(username);
-        if (playerData != null)
+        OfflinePlayer player = server.getPlayer(username);
+
+        if (player == null)
         {
-            return playerData;
+            player = server.getOfflinePlayer(username);
         }
 
-        playerData = loadByName(username);
-
-        if (playerData != null)
-        {
-            dataMap.put(username, playerData);
-        }
-        else
-        {
-            return null;
-        }
-
-        return playerData;
+        return getData(player.getUniqueId());
     }
 
     public PlayerData getDataByIp(String ip)
@@ -294,7 +227,7 @@ public class PlayerList extends FreedomService
 
         if (player != null)
         {
-            dataMap.put(player.getName(), player);
+            dataMap.put(player.getUuid(), player);
         }
 
         return player;
@@ -305,7 +238,7 @@ public class PlayerList extends FreedomService
         return playerMap;
     }
 
-    public Map<String, PlayerData> getDataMap()
+    public Map<UUID, PlayerData> getDataMap()
     {
         return dataMap;
     }

src/main/java/me/totalfreedom/totalfreedommod/rank/Displayable.java

@@ -13,6 +13,8 @@ public interface Displayable
 
     String getAbbr();
 
+    String getPlural();
+
     ChatColor getColor();
 
     org.bukkit.ChatColor getTeamColor();

src/main/java/me/totalfreedom/totalfreedommod/rank/Rank.java

@@ -4,20 +4,19 @@ import net.md_5.bungee.api.ChatColor;
 
 public enum Rank implements Displayable
 {
-    IMPOSTOR("an", "Impostor", Type.PLAYER, "Imp", ChatColor.YELLOW, null, false, false),
-    NON_OP("a", "Non-Op", Type.PLAYER, "", ChatColor.WHITE, null, false, false),
-    OP("an", "Operator", Type.PLAYER, "OP", ChatColor.GREEN, null, false, false),
-    ADMIN("an", "Admin", Type.ADMIN, "Admin", ChatColor.DARK_GREEN, org.bukkit.ChatColor.DARK_GREEN, true, true),
-    SENIOR_ADMIN("a", "Senior Admin", Type.ADMIN, "SrA", ChatColor.GOLD, org.bukkit.ChatColor.GOLD, true, true),
-    ADMIN_CONSOLE("the", "Console", Type.ADMIN_CONSOLE, "Console", ChatColor.DARK_PURPLE, null, false, false),
-    SENIOR_CONSOLE("the", "Console", Type.ADMIN_CONSOLE, "Console", ChatColor.DARK_PURPLE, null, false, false);
+    NON_OP("a", "Non-Op", Type.PLAYER, "", "Non-Ops", ChatColor.WHITE, null, false, false),
+    OP("an", "Operator", Type.PLAYER, "OP", "Operators", ChatColor.GREEN, null, false, false),
+    ADMIN("an", "Admin", Type.ADMIN, "Admin", "Administrators", ChatColor.DARK_GREEN, org.bukkit.ChatColor.DARK_GREEN, true, true),
+    SENIOR_ADMIN("a", "Senior Admin", Type.ADMIN, "SrA", "Senior Administrators", ChatColor.GOLD, org.bukkit.ChatColor.GOLD, true, true),
+    ADMIN_CONSOLE("the", "Console", Type.ADMIN_CONSOLE, "Console", "Administrator Consoles", ChatColor.DARK_PURPLE, null, false, false),
+    SENIOR_CONSOLE("the", "Console", Type.ADMIN_CONSOLE, "Console", "Senior Consoles", ChatColor.DARK_PURPLE, null, false, false);
 
     private final Type type;
 
     private final String name;
 
     private final String abbr;
-
+    private final String plural;
     private final String article;
 
     private final String tag;
@@ -32,11 +31,12 @@ public enum Rank implements Displayable
 
     private final boolean hasDefaultLoginMessage;
 
-    Rank(String article, String name, Type type, String abbr, ChatColor color, org.bukkit.ChatColor teamColor, Boolean hasTeam, Boolean hasDefaultLoginMessage)
+    Rank(String article, String name, Type type, String abbr, String plural, ChatColor color, org.bukkit.ChatColor teamColor, Boolean hasTeam, Boolean hasDefaultLoginMessage)
     {
         this.type = type;
         this.name = name;
         this.abbr = abbr;
+        this.plural = plural;
         this.article = article;
         this.tag = abbr.isEmpty() ? "" : "[" + abbr + "]";
         this.coloredTag = abbr.isEmpty() ? "" : ChatColor.DARK_GRAY + "[" + color + abbr + ChatColor.DARK_GRAY + "]" + color;
@@ -89,6 +89,11 @@ public enum Rank implements Displayable
         return abbr;
     }
 
+    public String getPlural()
+    {
+        return plural;
+    }
+
     public boolean isConsole()
     {
         return getType() == Type.ADMIN_CONSOLE;

src/main/java/me/totalfreedom/totalfreedommod/rank/RankManager.java

@@ -9,7 +9,6 @@ import me.totalfreedom.totalfreedommod.player.PlayerData;
 import me.totalfreedom.totalfreedommod.util.FUtil;
 import org.apache.commons.lang.StringUtils;
 import org.bukkit.ChatColor;
-import org.bukkit.GameMode;
 import org.bukkit.command.CommandSender;
 import org.bukkit.entity.Player;
 import org.bukkit.event.EventHandler;
@@ -39,12 +38,6 @@ public class RankManager extends FreedomService
 
         final Player player = (Player)sender;
 
-        // Display impostors
-        if (plugin.al.isAdminImpostor(player))
-        {
-            return Rank.IMPOSTOR;
-        }
-
         // If the player's an owner, display that
         if (ConfigEntry.SERVER_OWNERS.getList().contains(player.getName()))
         {
@@ -67,11 +60,6 @@ public class RankManager extends FreedomService
             return Title.ASSTEXEC;
         }
 
-        if (plugin.al.isVerifiedAdmin(player))
-        {
-            return Title.VERIFIED_ADMIN;
-        }
-
         // Master builders show up if they are not an admin
         if (plugin.pl.getData(player).isMasterBuilder() && !plugin.al.isAdmin(player))
         {
@@ -137,11 +125,6 @@ public class RankManager extends FreedomService
 
     public Rank getRank(Player player)
     {
-        if (plugin.al.isAdminImpostor(player) || plugin.pl.isPlayerImpostor(player))
-        {
-            return Rank.IMPOSTOR;
-        }
-
         final Admin entry = plugin.al.getAdmin(player);
         if (entry != null)
         {
@@ -193,52 +176,20 @@ public class RankManager extends FreedomService
     public void onPlayerJoin(PlayerJoinEvent event)
     {
         final Player player = event.getPlayer();
-        final FPlayer fPlayer = plugin.pl.getPlayer(player);
         PlayerData target = plugin.pl.getData(player);
 
-        // Unban admins
         boolean isAdmin = plugin.al.isAdmin(player);
+
+        // Updates last login time
         if (isAdmin)
         {
-            // Verify strict IP match
-            if (!plugin.al.isIdentityMatched(player))
-            {
-                FUtil.bcastMsg("Warning: " + player.getName() + " is an admin, but is using an account not registered to one of their ip-list.", ChatColor.RED);
-                fPlayer.setSuperadminIdVerified(false);
-            }
-            else
-            {
-                fPlayer.setSuperadminIdVerified(true);
             plugin.al.updateLastLogin(player);
-            }
-        }
+        } else
+        {
+            // Ensure admins don't have admin functionality when removed (FS-222)
+            FPlayer freedomPlayer = plugin.pl.getPlayer(player);
 
-        if (plugin.al.isVerifiedAdmin(player))
-        {
-            FUtil.bcastMsg("Warning: " + player.getName() + " is an admin, but does not have any admin permissions.", ChatColor.RED);
-        }
-
-        // Handle impostors
-        boolean isImpostor = plugin.al.isAdminImpostor(player) || plugin.pl.isPlayerImpostor(player);
-        if (isImpostor)
-        {
-            FUtil.bcastMsg(ChatColor.AQUA + player.getName() + " is " + Rank.IMPOSTOR.getColoredLoginMessage());
-            if (plugin.al.isAdminImpostor(player))
-            {
-                FUtil.bcastMsg("Warning: " + player.getName() + " has been flagged as an admin impostor and has been frozen!", ChatColor.RED);
-            }
-            else if (plugin.pl.isPlayerImpostor(player))
-            {
-                FUtil.bcastMsg("Warning: " + player.getName() + " has been flagged as a player impostor and has been frozen!", ChatColor.RED);
-            }
-            String displayName = Rank.IMPOSTOR.getColor() + player.getName();
-            player.setPlayerListName(StringUtils.substring(displayName, 0, 16));
-            player.getInventory().clear();
-            player.setOp(false);
-            player.setGameMode(GameMode.SURVIVAL);
-            plugin.pl.getPlayer(player).getFreezeData().setFrozen(true);
-            player.sendMessage(ChatColor.RED + "You are marked as an impostor, please verify yourself!");
-            return;
+            freedomPlayer.removeAdminFunctionality();
         }
 
         // Broadcast login message
@@ -253,14 +204,11 @@ public class RankManager extends FreedomService
         // Set display
         updateDisplay(player);
 
-        if (!plugin.pl.isPlayerImpostor(player) && target.hasVerification())
-        {
         if (target.getTag() != null)
         {
             plugin.pl.getData(player).setTag(FUtil.colorize(target.getTag()));
         }
     }
-    }
 
     public String craftLoginMessage(Player player, String message)
     {

src/main/java/me/totalfreedom/totalfreedommod/rank/Title.java

@@ -5,12 +5,11 @@ import net.md_5.bungee.api.ChatColor;
 public enum Title implements Displayable
 {
 
-    MASTER_BUILDER("a", "Master Builder", ChatColor.DARK_AQUA, org.bukkit.ChatColor.DARK_AQUA, "MB", true, true),
-    VERIFIED_ADMIN("a", "Verified Admin", ChatColor.LIGHT_PURPLE, org.bukkit.ChatColor.LIGHT_PURPLE, "VA", false, true),
-    EXECUTIVE("an", "Executive", ChatColor.RED, org.bukkit.ChatColor.RED, "Exec", true, true),
-    ASSTEXEC("an", "Assistant Executive", ChatColor.RED, org.bukkit.ChatColor.RED, "Asst Exec", true, true),
-    DEVELOPER("a", "Developer", ChatColor.DARK_PURPLE, org.bukkit.ChatColor.DARK_PURPLE, "Dev", true, true),
-    OWNER("the", "Owner", ChatColor.DARK_RED, org.bukkit.ChatColor.DARK_RED, "Owner", true, true);
+    MASTER_BUILDER("a", "Master Builder", "Master Builders", ChatColor.DARK_AQUA, org.bukkit.ChatColor.DARK_AQUA, "MB", true, true),
+    EXECUTIVE("an", "Executive", "Executives", ChatColor.RED, org.bukkit.ChatColor.RED, "Exec", true, true),
+    ASSTEXEC("an", "Assistant Executive", "Assistant Executives", ChatColor.RED, org.bukkit.ChatColor.RED, "Asst Exec", true, true),
+    DEVELOPER("a", "Developer", "Developers", ChatColor.DARK_PURPLE, org.bukkit.ChatColor.DARK_PURPLE, "Dev", true, true),
+    OWNER("the", "Owner", "Owners", ChatColor.DARK_RED, org.bukkit.ChatColor.DARK_RED, "Owner", true, true);
 
 
     private final String article;
@@ -18,6 +17,7 @@ public enum Title implements Displayable
     private final String name;
 
     private final String abbr;
+    private final String plural;
 
     private final String tag;
 
@@ -30,10 +30,11 @@ public enum Title implements Displayable
     private final boolean hasTeam;
     private final boolean hasDefaultLoginMessage;
 
-    Title(String article, String name, ChatColor color, org.bukkit.ChatColor teamColor, String tag, Boolean hasTeam, Boolean hasDefaultLoginMessage)
+    Title(String article, String name, String plural, ChatColor color, org.bukkit.ChatColor teamColor, String tag, Boolean hasTeam, Boolean hasDefaultLoginMessage)
     {
         this.article = article;
         this.name = name;
+        this.plural = plural;
         this.coloredTag = ChatColor.DARK_GRAY + "[" + color + tag + ChatColor.DARK_GRAY + "]" + color;
         this.abbr = tag;
         this.tag = "[" + tag + "]";
@@ -85,6 +86,12 @@ public enum Title implements Displayable
         return abbr;
     }
 
+    @Override
+    public String getPlural()
+    {
+        return plural;
+    }
+
     @Override
     public String getTag()
     {

src/main/java/me/totalfreedom/totalfreedommod/shop/ShopItem.java

@@ -10,19 +10,29 @@ public enum ShopItem
     LIGHTNING_ROD("Lightning Rod", Material.BLAZE_ROD, 12, ConfigEntry.SHOP_PRICES_LIGHTNING_ROD, ChatColor.LIGHT_PURPLE, "lightningRod", "/lightningrod"),
     FIRE_BALL("Fire Ball", Material.FIRE_CHARGE, 14, ConfigEntry.SHOP_PRICES_FIRE_BALL, ChatColor.RED, "fireBall", "/fireball"),
     RIDEABLE_PEARL("Rideable Ender Pearl", Material.ENDER_PEARL, 16, ConfigEntry.SHOP_PRICES_RIDEABLE_PEARL, ChatColor.DARK_PURPLE, "rideablePearl", "/rideablepearl"),
-    STACKING_POTATO("Stacking Potato", Material.POTATO, 20, ConfigEntry.SHOP_PRICES_STACKING_POTATO, ChatColor.YELLOW, "stackingPotato", "/stackingpotato"),
-    CLOWN_FISH("Clown Fish", Material.TROPICAL_FISH, 22, ConfigEntry.SHOP_PRICES_CLOWN_FISH, ChatColor.GOLD, "clownFish", "/clownfish"),
-    LOGIN_MESSAGES("Login Messages", Material.NAME_TAG, 24, ConfigEntry.SHOP_PRICES_LOGIN_MESSAGES, ChatColor.DARK_GREEN, "loginMessages", "/loginmessage");
+    STACKING_POTATO("Stacking Potato", Material.POTATO, 19, ConfigEntry.SHOP_PRICES_STACKING_POTATO, ChatColor.YELLOW, "stackingPotato", "/stackingpotato"),
+    CLOWN_FISH("Clown Fish", Material.TROPICAL_FISH, 21, ConfigEntry.SHOP_PRICES_CLOWN_FISH, ChatColor.GOLD, "clownFish", "/clownfish"),
+    LOGIN_MESSAGES("Login Messages", Material.NAME_TAG, 23, ConfigEntry.SHOP_PRICES_LOGIN_MESSAGES, ChatColor.DARK_GREEN, "loginMessages", "/loginmessage"),
+    RAINBOW_TRAIL("Rainbow Trail", Material.RED_WOOL, 25, ConfigEntry.SHOP_PRICES_RAINBOW_TRAIL, ChatColor.DARK_RED, "rainbowTrail", "/trail");
 
     /*
         Shop GUI Layout:
 
         Dimensions: 9x4 = 36
-        Key: g = Grappling Hook, l = Lightning Rod, f = Fire Ball, r = Rideable Ender Pearl, s = Stacking Potato, c = Clown Fish, x = Login Messages $ = Coins}
+        Key:
+        g = Grappling Hook,
+        l = Lightning Rod
+        f = Fire Ball
+        r = Rideable Ender Pearl
+        s = Stacking Potato
+        c = Clown Fish
+        x = Login Messages
+        t = Rainbow Trail
+        $ = Coins
 
         ---------
         -g-l-f-r-
-        --s-c-x--
+        -s-c-x-t-
         --------$
     */
 

src/main/java/me/totalfreedom/totalfreedommod/sql/SQLite.java

@@ -7,6 +7,8 @@ import java.sql.PreparedStatement;
 import java.sql.ResultSet;
 import java.sql.SQLException;
 import java.text.MessageFormat;
+import java.util.UUID;
+
 import me.totalfreedom.totalfreedommod.FreedomService;
 import me.totalfreedom.totalfreedommod.admin.Admin;
 import me.totalfreedom.totalfreedommod.banning.Ban;
@@ -82,7 +84,7 @@ public class SQLite extends FreedomService
             {
                 try
                 {
-                    connection.createStatement().execute("CREATE TABLE `admins` (`username` VARCHAR NOT NULL, `ips` VARCHAR NOT NULL, `rank` VARCHAR NOT NULL, `active` BOOLEAN NOT NULL, `last_login` LONG NOT NULL, `command_spy` BOOLEAN NOT NULL, `potion_spy` BOOLEAN NOT NULL, `ac_format` VARCHAR, `ptero_id` VARCHAR);");
+                    connection.createStatement().execute("CREATE TABLE `admins` (`uuid` VARCHAR NOT NULL, `ips` VARCHAR NOT NULL, `rank` VARCHAR NOT NULL, `active` BOOLEAN NOT NULL, `last_login` LONG NOT NULL, `command_spy` BOOLEAN NOT NULL, `potion_spy` BOOLEAN NOT NULL, `ac_format` VARCHAR, `ptero_id` VARCHAR);");
                 }
                 catch (SQLException e)
                 {
@@ -93,7 +95,7 @@ public class SQLite extends FreedomService
             {
                 try
                 {
-                    connection.createStatement().execute("CREATE TABLE `players` (`username` VARCHAR NOT NULL, `ips` VARCHAR NOT NULL, `notes` VARCHAR, `tag` VARCHAR, `discord_id` VARCHAR, `backup_codes` VARCHAR, `master_builder` BOOLEAN NOT NULL,`verification` BOOLEAN NOT NULL, `ride_mode` VARCHAR NOT NULL, `coins` INT, `items` VARCHAR, `total_votes` INT NOT NULL, `display_discord` BOOLEAN NOT NULL, `login_message` VARCHAR, `inspect` BOOLEAN NOT NULL);");
+                    connection.createStatement().execute("CREATE TABLE `players` (`uuid` VARCHAR NOT NULL, `ips` VARCHAR NOT NULL, `notes` VARCHAR, `tag` VARCHAR, `discord_id` VARCHAR, `master_builder` BOOLEAN NOT NULL, `ride_mode` VARCHAR NOT NULL, `coins` INT, `items` VARCHAR, `total_votes` INT NOT NULL, `display_discord` BOOLEAN NOT NULL, `login_message` VARCHAR, `inspect` BOOLEAN NOT NULL);");
                 }
                 catch (SQLException e)
                 {
@@ -133,8 +135,8 @@ public class SQLite extends FreedomService
     {
         try
         {
-            Object[] data = {key, admin.getName()};
-            PreparedStatement statement = connection.prepareStatement(MessageFormat.format("UPDATE admins SET {0}=? WHERE username=''{1}''", data));
+            Object[] data = {key, admin.getUuid()};
+            PreparedStatement statement = connection.prepareStatement(MessageFormat.format("UPDATE admins SET {0}=? WHERE uuid=''{1}''", data));
             statement = setUnknownType(statement, 1, value);
             statement.executeUpdate();
 
@@ -151,7 +153,7 @@ public class SQLite extends FreedomService
         try
         {
             Object[] data = {key, player.getName()};
-            PreparedStatement statement = connection.prepareStatement(MessageFormat.format("UPDATE players SET {0}=? WHERE username=''{1}''", data));
+            PreparedStatement statement = connection.prepareStatement(MessageFormat.format("UPDATE players SET {0}=? WHERE uuid=''{1}''", data));
             statement = setUnknownType(statement, 1, value);
             statement.executeUpdate();
 
@@ -162,36 +164,6 @@ public class SQLite extends FreedomService
         }
     }
 
-    public void updateAdminName(String oldName, String newName)
-    {
-        try
-        {
-            PreparedStatement statement = connection.prepareStatement(MessageFormat.format("UPDATE admins SET username=? WHERE username=''{0}''", oldName));
-            statement = setUnknownType(statement, 1, newName);
-            statement.executeUpdate();
-
-        }
-        catch (SQLException e)
-        {
-            FLog.severe("Failed to update admin name: " + e.getMessage());
-        }
-    }
-
-    public void updatePlayerName(String oldName, String newName)
-    {
-        try
-        {
-            PreparedStatement statement = connection.prepareStatement(MessageFormat.format("UPDATE players SET username=? WHERE username=''{0}''", oldName));
-            statement = setUnknownType(statement, 1, newName);
-            statement.executeUpdate();
-
-        }
-        catch (SQLException e)
-        {
-            FLog.severe("Failed to update player name: " + e.getMessage());
-        }
-    }
-
     public PreparedStatement setUnknownType(PreparedStatement statement, int index, Object value) throws SQLException
     {
         if (value == null)
@@ -248,7 +220,7 @@ public class SQLite extends FreedomService
         try
         {
             PreparedStatement statement = connection.prepareStatement("INSERT INTO admins VALUES (?, ?, ?, ?, ?, ?, ?, ?, ?)");
-            statement.setString(1, admin.getName());
+            statement.setString(1, admin.getUuid().toString());
             statement.setString(2, FUtil.listToString(admin.getIps()));
             statement.setString(3, admin.getRank().toString());
             statement.setBoolean(4, admin.isActive());
@@ -270,22 +242,20 @@ public class SQLite extends FreedomService
     {
         try
         {
-            PreparedStatement statement = connection.prepareStatement("INSERT INTO players VALUES (?, ?, ?, ?, ?, ?, ?, ?, ?, ?, ?, ?, ?, ?, ?)");
-            statement.setString(1, player.getName());
+            PreparedStatement statement = connection.prepareStatement("INSERT INTO players VALUES (?, ?, ?, ?, ?, ?, ?, ?, ?, ?, ?, ?, ?)");
+            statement.setString(1, player.getUuid().toString());
             statement.setString(2, FUtil.listToString(player.getIps()));
             statement.setString(3, FUtil.listToString(player.getNotes()));
             statement.setString(4, player.getTag());
             statement.setString(5, player.getDiscordID());
-            statement.setString(6, FUtil.listToString(player.getBackupCodes()));
-            statement.setBoolean(7, player.isMasterBuilder());
-            statement.setBoolean(8, player.hasVerification());
-            statement.setString(9, player.getRideMode());
-            statement.setInt(10, player.getCoins());
-            statement.setString(11, FUtil.listToString(player.getItems()));
-            statement.setInt(12, player.getTotalVotes());
-            statement.setBoolean(13, player.doesDisplayDiscord());
-            statement.setString(14, player.getLoginMessage());
-            statement.setBoolean(15, player.hasInspection());
+            statement.setBoolean(6, player.isMasterBuilder());
+            statement.setString(7, player.getRideMode());
+            statement.setInt(8, player.getCoins());
+            statement.setString(9, FUtil.listToString(player.getItems()));
+            statement.setInt(10, player.getTotalVotes());
+            statement.setBoolean(11, player.doesDisplayDiscord());
+            statement.setString(12, player.getLoginMessage());
+            statement.setBoolean(13, player.hasInspection());
             statement.executeUpdate();
         }
         catch (SQLException e)
@@ -295,11 +265,11 @@ public class SQLite extends FreedomService
         }
     }
 
-    public ResultSet getAdminByName(String name)
+    public ResultSet getAdminByUuid(UUID uuid)
     {
         try
         {
-            ResultSet resultSet = connection.createStatement().executeQuery(MessageFormat.format("SELECT * FROM admins WHERE username=''{0}''", name));
+            ResultSet resultSet = connection.createStatement().executeQuery(MessageFormat.format("SELECT * FROM admins WHERE uuid=''{0}''", uuid.toString()));
             if (resultSet.next())
             {
                 return resultSet;
@@ -314,11 +284,11 @@ public class SQLite extends FreedomService
         return null;
     }
 
-    public ResultSet getPlayerByName(String name)
+    public ResultSet getPlayerByUuid(UUID uuid)
     {
         try
         {
-            ResultSet resultSet = connection.createStatement().executeQuery(MessageFormat.format("SELECT * FROM players WHERE username=''{0}''", name));
+            ResultSet resultSet = connection.createStatement().executeQuery(MessageFormat.format("SELECT * FROM players WHERE uuid=''{0}''", uuid.toString()));
             if (resultSet.next())
             {
                 return resultSet;
@@ -326,7 +296,7 @@ public class SQLite extends FreedomService
         }
         catch (SQLException e)
         {
-            FLog.severe("Failed to get player by name:");
+            FLog.severe("Failed to get player by UUID:");
             FLog.severe(e);
         }
 

src/main/java/me/totalfreedom/totalfreedommod/util/DepreciationAggregator.java

@@ -1,28 +0,0 @@
-package me.totalfreedom.totalfreedommod.util;
-
-import java.util.HashSet;
-import org.bukkit.Material;
-import org.bukkit.OfflinePlayer;
-import org.bukkit.Server;
-import org.bukkit.block.Block;
-import org.bukkit.entity.EntityType;
-import org.bukkit.entity.LivingEntity;
-
-@SuppressWarnings("deprecation")
-public class DepreciationAggregator
-{
-    public static Block getTargetBlock(LivingEntity entity, HashSet<Material> transparent, int maxDistance)
-    {
-        return entity.getTargetBlock(transparent, maxDistance);
-    }
-
-    public static OfflinePlayer getOfflinePlayer(Server server, String name)
-    {
-        return server.getOfflinePlayer(name);
-    }
-
-    public static String getName_EntityType(EntityType et)
-    {
-        return et.getName();
-    }
-}

src/main/java/me/totalfreedom/totalfreedommod/util/FUtil.java

@@ -1,16 +1,12 @@
 package me.totalfreedom.totalfreedommod.util;
 
+import com.earth2me.essentials.utils.DateUtil;
 import me.totalfreedom.totalfreedommod.TotalFreedomMod;
 import me.totalfreedom.totalfreedommod.config.ConfigEntry;
 import org.apache.commons.io.FileUtils;
 import org.apache.commons.lang.StringUtils;
 import org.apache.commons.lang.WordUtils;
-import org.bukkit.Bukkit;
-import org.bukkit.ChatColor;
-import org.bukkit.Color;
-import org.bukkit.Location;
-import org.bukkit.Material;
-import org.bukkit.OfflinePlayer;
+import org.bukkit.*;
 import org.bukkit.command.CommandSender;
 import org.bukkit.entity.Entity;
 import org.bukkit.entity.Player;
@@ -19,10 +15,9 @@ import org.bukkit.inventory.ItemStack;
 import org.bukkit.inventory.meta.ItemMeta;
 import org.bukkit.scheduler.BukkitRunnable;
 import org.bukkit.scheduler.BukkitTask;
-import org.json.simple.JSONArray;
 
 import java.io.*;
-import java.lang.reflect.Field;
+import java.lang.management.ManagementFactory;
 import java.net.HttpURLConnection;
 import java.net.URL;
 import java.text.ParseException;
@@ -36,8 +31,6 @@ import static org.bukkit.Bukkit.getServer;
 
 public class FUtil
 {
-
-    public static final String SAVED_FLAGS_FILENAME = "savedflags.dat";
     /* See https://github.com/TotalFreedom/License - None of the listed names may be removed.
     Leaving this list here for anyone running TFM on a cracked server:
     public static final List<String> DEVELOPERS = Arrays.asList("Madgeek1450", "Prozza", "WickedGamingUK", "Wild1145", "aggelosQQ", "scripthead", "Telesphoreo", "CoolJWB");
@@ -54,13 +47,35 @@ public class FUtil
             "d018f2b8-ce60-4672-a45f-e580e0331299", // speednt
             "458de06f-36a5-4e1b-aaa6-ec1d1751c5b6", // SupItsDillon
             "c8e5af82-6aba-4dd7-83e8-474381380cc9", // Paldiu
-            "38ea7c82-7bdc-4f48-b7fd-0e93fc26813d", // AwesomePinch
             "ba5aafba-9012-418f-9819-a7020d591068",  // TFTWPhoenix
             "d6dd9740-40db-45f5-ab16-4ee16a633009", // Abhi
             "2e06e049-24c8-42e4-8bcf-d35372af31e6", // NotInSync
-            "f97c0d7b-6413-4558-a409-88f09a8f9adb" // videogamesm12
+            "f97c0d7b-6413-4558-a409-88f09a8f9adb", // videogamesm12
+            "78408086-1991-4c33-a571-d8fa325465b2", // Telesphoreo
+            "f5cd54c4-3a24-4213-9a56-c06c49594dff", // Taahh
+            "a52f1f08-a398-400a-bca4-2b74b81feae6", // G6_
+            "ca83b658-c03b-4106-9edc-72f70a80656d" // ayunami2000
     );
-    public static final List<String> DEVELOPER_NAMES = Arrays.asList("Madgeek1450", "Prozza", "WickedGamingUK", "Wild1145", "aggelosQQ", "scripthead", "CoolJWB", "elmon_", "speednt", "SupItsDillon", "Paldiu", "AwesomePinch", "TFTWPhoenix", "abhithedev", "NotInSync", "videogamesm12");
+    public static final List<String> DEVELOPER_NAMES = Arrays.asList(
+            "Madgeek1450",
+            "Prozza",
+            "WickedGamingUK",
+            "Wild1145",
+            "aggelosQQ",
+            "scripthead",
+            "Telesphoreo",
+            "CoolJWB",
+            "elmon_",
+            "speednt",
+            "SupItsDillon",
+            "Paldiu",
+            "TFTWPhoenix",
+            "abhithedev",
+            "NotInSync",
+            "videogamesm12",
+            "Taahh",
+            "G6_",
+            "ayunami2000");
     public static final Map<String, ChatColor> CHAT_COLOR_NAMES = new HashMap<>();
     public static final List<ChatColor> CHAT_COLOR_POOL = Arrays.asList(
             ChatColor.DARK_RED,
@@ -228,33 +243,6 @@ public class FUtil
         return names;
     }
 
-    @SuppressWarnings("unchecked")
-    public static UUID nameToUUID(String name)
-    {
-        try
-        {
-            JSONArray json = new JSONArray();
-            json.add(name);
-            List<String> headers = new ArrayList<>();
-            headers.add("Accept:application/json");
-            headers.add("Content-Type:application/json");
-            Response response = sendRequest("https://api.mojang.com/profiles/minecraft", "POST", headers, json.toString());
-            // Don't care how stupid this looks, couldn't find anything to parse a json string to something readable in java with something not horrendously huge, maybe im just retarded
-            Pattern pattern = Pattern.compile("(?<=\"id\":\")[a-f0-9].{31}");
-            Matcher matcher = pattern.matcher(response.getMessage());
-            if (matcher.find())
-            {
-                String rawUUID = matcher.group(0).replaceFirst("([a-f0-9]{8})([a-f0-9]{4})([a-f0-9]{4})([a-f0-9]{4})([a-f0-9]+)", "$1-$2-$3-$4-$5");
-                return UUID.fromString(rawUUID);
-            }
-        }
-        catch (Exception e)
-        {
-            FLog.severe("Failed to convert name to UUID:\n" + e.toString());
-        }
-        return null;
-    }
-
     public static Response sendRequest(String endpoint, String method, List<String> headers, String body) throws IOException
     {
         URL url = new URL(endpoint);
@@ -540,30 +528,6 @@ public class FUtil
         return ip;
     }
 
-    //getField: Borrowed from WorldEdit
-    @SuppressWarnings("unchecked")
-    public static <T> T getField(Object from, String name)
-    {
-        Class<?> checkClass = from.getClass();
-        do
-        {
-            try
-            {
-                Field field = checkClass.getDeclaredField(name);
-                field.setAccessible(true);
-                return (T) field.get(from);
-
-            }
-            catch (NoSuchFieldException | IllegalAccessException ignored)
-            {
-            }
-        }
-        while (checkClass.getSuperclass() != Object.class
-                && ((checkClass = checkClass.getSuperclass()) != null));
-
-        return null;
-    }
-
     public static ChatColor randomChatColor()
     {
         return CHAT_COLOR_POOL.get(RANDOM.nextInt(CHAT_COLOR_POOL.size()));
@@ -604,6 +568,11 @@ public class FUtil
         return string;
     }
 
+    public static String stripColors(String string)
+    {
+        return string.replaceAll("§", "");
+    }
+
     public static Date getUnixDate(long unix)
     {
         return new Date(unix);
@@ -755,7 +724,7 @@ public class FUtil
 
     public static String getIp(Player player)
     {
-        return Objects.requireNonNull(player.getAddress()).getAddress().getHostAddress().trim();
+        return player.getAddress().getAddress().getHostAddress().trim();
     }
 
     public static String getIp(PlayerLoginEvent event)
@@ -849,6 +818,62 @@ public class FUtil
         return getServer().getOnlinePlayers().size() - i;
     }
 
+    public static double getMeanAverageDouble(double[] doubles)
+    {
+        double total = 0;
+
+        for (double aDouble : doubles)
+        {
+            total += aDouble;
+        }
+
+        return total / doubles.length;
+    }
+
+    public static int getMeanAverageInt(int[] ints)
+    {
+        int total = 0;
+
+        for (int anInt : ints)
+        {
+            total += anInt;
+        }
+
+        return total / ints.length;
+    }
+
+    public static long getMeanAverageLong(long[] longs)
+    {
+        long total = 0;
+
+        for (long aLong : longs)
+        {
+            total += aLong;
+        }
+
+        return total / longs.length;
+    }
+
+    public static String getUptime()
+    {
+        return DateUtil.formatDateDiff(ManagementFactory.getRuntimeMXBean().getStartTime());
+    }
+
+    public static double getMaxMem()
+    {
+        return Runtime.getRuntime().maxMemory() / 1024f / 1024f;
+    }
+
+    public static double getTotalMem()
+    {
+        return Runtime.getRuntime().totalMemory() / 1024f / 1024f;
+    }
+
+    public static double getFreeMem()
+    {
+        return Runtime.getRuntime().freeMemory() / 1024f / 1024f;
+    }
+
     public static class PaginationList<T> extends ArrayList<T>
     {
 

src/main/java/me/totalfreedom/totalfreedommod/util/Groups.java

@@ -8,212 +8,11 @@ import org.bukkit.entity.EntityType;
 
 public class Groups
 {
-    public static final List<Material> WOOL_COLORS = Arrays.asList(
-            Material.WHITE_WOOL,
-            Material.RED_WOOL,
-            Material.ORANGE_WOOL,
-            Material.YELLOW_WOOL,
-            Material.GREEN_WOOL,
-            Material.LIME_WOOL,
-            Material.LIGHT_BLUE_WOOL,
-            Material.CYAN_WOOL,
-            Material.BLUE_WOOL,
-            Material.PURPLE_WOOL,
-            Material.MAGENTA_WOOL,
-            Material.PINK_WOOL,
-            Material.BROWN_WOOL,
-            Material.GRAY_WOOL,
-            Material.LIGHT_GRAY_WOOL,
-            Material.BLACK_WOOL);
-
-    public static final List<Material> SHULKER_BOXES = Arrays.asList(
-            Material.SHULKER_BOX,
-            Material.WHITE_SHULKER_BOX,
-            Material.RED_SHULKER_BOX,
-            Material.ORANGE_SHULKER_BOX,
-            Material.YELLOW_SHULKER_BOX,
-            Material.GREEN_SHULKER_BOX,
-            Material.LIME_SHULKER_BOX,
-            Material.LIGHT_BLUE_SHULKER_BOX,
-            Material.CYAN_SHULKER_BOX,
-            Material.BLUE_SHULKER_BOX,
-            Material.PURPLE_SHULKER_BOX,
-            Material.MAGENTA_SHULKER_BOX,
-            Material.PINK_SHULKER_BOX,
-            Material.BROWN_SHULKER_BOX,
-            Material.GRAY_SHULKER_BOX,
-            Material.LIGHT_GRAY_SHULKER_BOX,
-            Material.BLACK_SHULKER_BOX);
-
-    public static final List<EntityType> MOB_TYPES = Arrays.asList(
-            EntityType.BAT,
-            EntityType.BEE,
-            EntityType.BLAZE,
-            EntityType.CAVE_SPIDER,
-            EntityType.CHICKEN,
-            EntityType.CAT,
-            EntityType.COD,
-            EntityType.COW,
-            EntityType.CREEPER,
-            EntityType.DOLPHIN,
-            EntityType.DONKEY,
-            EntityType.DROWNED,
-            EntityType.ELDER_GUARDIAN,
-            EntityType.ENDERMAN,
-            EntityType.ENDERMITE,
-            EntityType.EVOKER,
-            EntityType.FOX,
-            EntityType.GHAST,
-            EntityType.GUARDIAN,
-            EntityType.HOGLIN,
-            EntityType.HORSE,
-            EntityType.HUSK,
-            EntityType.ILLUSIONER,
-            EntityType.IRON_GOLEM,
-            EntityType.LLAMA,
-            EntityType.MAGMA_CUBE,
-            EntityType.MUSHROOM_COW,
-            EntityType.MULE,
-            EntityType.OCELOT,
-            EntityType.PANDA,
-            EntityType.PARROT,
-            EntityType.PHANTOM,
-            EntityType.PIG,
-            EntityType.PIGLIN,
-            EntityType.PIGLIN_BRUTE,
-            EntityType.PILLAGER,
-            EntityType.POLAR_BEAR,
-            EntityType.PUFFERFISH,
-            EntityType.RABBIT,
-            EntityType.RAVAGER,
-            EntityType.SALMON,
-            EntityType.SHEEP,
-            EntityType.SHULKER,
-            EntityType.SILVERFISH,
-            EntityType.SKELETON,
-            EntityType.SKELETON_HORSE,
-            EntityType.SLIME,
-            EntityType.SNOWMAN,
-            EntityType.SPIDER,
-            EntityType.SQUID,
-            EntityType.STRAY,
-            EntityType.STRIDER,
-            EntityType.TRADER_LLAMA,
-            EntityType.TROPICAL_FISH,
-            EntityType.TURTLE,
-            EntityType.VEX,
-            EntityType.VILLAGER,
-            EntityType.VINDICATOR,
-            EntityType.WANDERING_TRADER,
-            EntityType.WITCH,
-            EntityType.WITHER_SKELETON,
-            EntityType.WOLF,
-            EntityType.ZOGLIN,
-            EntityType.ZOMBIE,
-            EntityType.ZOMBIE_HORSE,
-            EntityType.ZOMBIFIED_PIGLIN,
-            EntityType.ZOMBIE_VILLAGER);
-
-    public static final List<Material> SPAWN_EGGS = Arrays.asList(
-            Material.BAT_SPAWN_EGG,
-            Material.BEE_SPAWN_EGG,
-            Material.BLAZE_SPAWN_EGG,
-            Material.CAVE_SPIDER_SPAWN_EGG,
-            Material.CHICKEN_SPAWN_EGG,
-            Material.CAT_SPAWN_EGG,
-            Material.COD_SPAWN_EGG,
-            Material.COW_SPAWN_EGG,
-            Material.CREEPER_SPAWN_EGG,
-            Material.DOLPHIN_SPAWN_EGG,
-            Material.DONKEY_SPAWN_EGG,
-            Material.DROWNED_SPAWN_EGG,
-            Material.ELDER_GUARDIAN_SPAWN_EGG,
-            Material.ENDERMAN_SPAWN_EGG,
-            Material.ENDERMITE_SPAWN_EGG,
-            Material.EVOKER_SPAWN_EGG,
-            Material.FOX_SPAWN_EGG,
-            Material.GHAST_SPAWN_EGG,
-            Material.GUARDIAN_SPAWN_EGG,
-            Material.HOGLIN_SPAWN_EGG,
-            Material.HORSE_SPAWN_EGG,
-            Material.HUSK_SPAWN_EGG,
-            Material.LLAMA_SPAWN_EGG,
-            Material.MAGMA_CUBE_SPAWN_EGG,
-            Material.MOOSHROOM_SPAWN_EGG,
-            Material.MULE_SPAWN_EGG,
-            Material.OCELOT_SPAWN_EGG,
-            Material.PANDA_SPAWN_EGG,
-            Material.PARROT_SPAWN_EGG,
-            Material.PHANTOM_SPAWN_EGG,
-            Material.PIG_SPAWN_EGG,
-            Material.PIGLIN_SPAWN_EGG,
-            Material.PIGLIN_BRUTE_SPAWN_EGG,
-            Material.PILLAGER_SPAWN_EGG,
-            Material.POLAR_BEAR_SPAWN_EGG,
-            Material.PUFFERFISH_SPAWN_EGG,
-            Material.RABBIT_SPAWN_EGG,
-            Material.RAVAGER_SPAWN_EGG,
-            Material.SALMON_SPAWN_EGG,
-            Material.SHEEP_SPAWN_EGG,
-            Material.SHULKER_SPAWN_EGG,
-            Material.SILVERFISH_SPAWN_EGG,
-            Material.SKELETON_SPAWN_EGG,
-            Material.SKELETON_HORSE_SPAWN_EGG,
-            Material.SLIME_SPAWN_EGG,
-            Material.SPIDER_SPAWN_EGG,
-            Material.SQUID_SPAWN_EGG,
-            Material.STRAY_SPAWN_EGG,
-            Material.STRIDER_SPAWN_EGG,
-            Material.TRADER_LLAMA_SPAWN_EGG,
-            Material.TROPICAL_FISH_SPAWN_EGG,
-            Material.TURTLE_SPAWN_EGG,
-            Material.VEX_SPAWN_EGG,
-            Material.VILLAGER_SPAWN_EGG,
-            Material.VINDICATOR_SPAWN_EGG,
-            Material.WANDERING_TRADER_SPAWN_EGG,
-            Material.WITCH_SPAWN_EGG,
-            Material.WITHER_SKELETON_SPAWN_EGG,
-            Material.WOLF_SPAWN_EGG,
-            Material.ZOGLIN_SPAWN_EGG,
-            Material.ZOMBIE_SPAWN_EGG,
-            Material.ZOMBIE_HORSE_SPAWN_EGG,
-            Material.ZOMBIFIED_PIGLIN_SPAWN_EGG,
-            Material.ZOMBIE_VILLAGER_SPAWN_EGG);
-
-    public static final List<Material> BANNERS = Arrays.asList(
-            Material.BLACK_BANNER,
-            Material.BLACK_WALL_BANNER,
-            Material.BLUE_BANNER,
-            Material.BLUE_WALL_BANNER,
-            Material.BROWN_BANNER,
-            Material.BROWN_WALL_BANNER,
-            Material.CYAN_BANNER,
-            Material.CYAN_WALL_BANNER,
-            Material.GRAY_BANNER,
-            Material.GRAY_WALL_BANNER,
-            Material.GREEN_BANNER,
-            Material.GREEN_WALL_BANNER,
-            Material.LIGHT_BLUE_BANNER,
-            Material.LIGHT_BLUE_WALL_BANNER,
-            Material.LIGHT_GRAY_BANNER,
-            Material.LIGHT_GRAY_WALL_BANNER,
-            Material.LIME_BANNER,
-            Material.LIME_WALL_BANNER,
-            Material.MAGENTA_BANNER,
-            Material.MAGENTA_WALL_BANNER,
-            Material.ORANGE_BANNER,
-            Material.ORANGE_WALL_BANNER,
-            Material.PINK_BANNER,
-            Material.PINK_WALL_BANNER,
-            Material.PURPLE_BANNER,
-            Material.PURPLE_WALL_BANNER,
-            Material.RED_BANNER,
-            Material.RED_WALL_BANNER,
-            Material.WHITE_BANNER,
-            Material.WHITE_WALL_BANNER,
-            Material.YELLOW_BANNER,
-            Material.YELLOW_WALL_BANNER);
-
+    public static final List<Material> WOOL_COLORS = Arrays.stream(Material.values()).filter((m) -> m.name().endsWith("_WOOL")).toList();
+    public static final List<Material> SHULKER_BOXES = Arrays.stream(Material.values()).filter((m) -> m.name().endsWith("SHULKER_BOX")).toList();
+    public static final List<EntityType> MOB_TYPES = Arrays.stream(EntityType.values()).filter(EntityType::isAlive).filter(EntityType::isSpawnable).toList();
+    public static final List<Material> SPAWN_EGGS = Arrays.stream(Material.values()).filter((mat) -> mat.name().endsWith("_SPAWN_EGG")).toList();
+    public static final List<Material> BANNERS = Arrays.stream(Material.values()).filter((m) -> m.name().endsWith("_BANNER")).toList();
     public static final List<Biome> EXPLOSIVE_BED_BIOMES = Arrays.asList(
             Biome.NETHER_WASTES,
             Biome.CRIMSON_FOREST,

src/main/java/me/totalfreedom/totalfreedommod/world/Flatlands.java

@@ -1,9 +1,6 @@
 package me.totalfreedom.totalfreedommod.world;
 
-import java.io.File;
 import me.totalfreedom.totalfreedommod.config.ConfigEntry;
-import me.totalfreedom.totalfreedommod.util.FLog;
-import org.apache.commons.io.FileUtils;
 import org.bukkit.Bukkit;
 import org.bukkit.ChatColor;
 import org.bukkit.Material;
@@ -32,8 +29,6 @@ public class Flatlands extends CustomWorld
             return null;
         }
 
-        wipeFlatlandsIfFlagged();
-
         final WorldCreator worldCreator = new WorldCreator(getName());
         worldCreator.generateStructures(false);
         worldCreator.type(WorldType.NORMAL);
@@ -63,32 +58,4 @@ public class Flatlands extends CustomWorld
 
         return world;
     }
-
-
-    public void wipeFlatlandsIfFlagged()
-    {
-        boolean doFlatlandsWipe = false;
-        try
-        {
-            doFlatlandsWipe = plugin.sf.getSavedFlag("do_wipe_flatlands");
-        }
-        catch (Exception ignored)
-        {
-        }
-
-        if (doFlatlandsWipe)
-        {
-            if (Bukkit.getServer().getWorld("flatlands") == null)
-            {
-                FLog.info("Wiping flatlands.");
-                plugin.sf.setSavedFlag("do_wipe_flatlands", false);
-                FileUtils.deleteQuietly(new File("./flatlands"));
-            }
-            else
-            {
-                FLog.severe("Can't wipe flatlands, it is already loaded.");
-            }
-        }
-    }
-
 }

src/main/java/me/totalfreedom/totalfreedommod/world/WorldRestrictions.java

@@ -32,14 +32,6 @@ public class WorldRestrictions extends FreedomService
     private final List<String> BLOCKED_ESSENTIALS_COMMANDS = Arrays.asList(
             "bigtree", "ebigtree", "largetree", "elargetree");
 
-    private final Map<Flag<?>, Object> flags = new HashMap<Flag<?>, Object>()
-    {{
-        put(Flags.PLACE_VEHICLE, StateFlag.State.DENY);
-        put(Flags.DESTROY_VEHICLE, StateFlag.State.DENY);
-        put(Flags.ENTITY_ITEM_FRAME_DESTROY, StateFlag.State.DENY);
-        put(Flags.ENTITY_PAINTING_DESTROY, StateFlag.State.DENY);
-    }};
-
     @Override
     public void onStart()
     {
@@ -155,20 +147,4 @@ public class WorldRestrictions extends FreedomService
             }
         }
     }
-
-    public void protectWorld(World world)
-    {
-        if (!plugin.wgb.isEnabled())
-        {
-            return;
-        }
-
-        RegionManager regionManager = plugin.wgb.getRegionManager(world);
-
-        GlobalProtectedRegion region = new GlobalProtectedRegion("__global__");
-
-        region.setFlags(flags);
-
-        regionManager.addRegion(region);
-    }
 }

src/main/resources/config.yml

@@ -56,14 +56,16 @@ server:
 
 # Discord
 discord:
-  # Do you want to enable the Discord verification system? (Disabled by default)
-  verification: false
   # If you do not have a token, make a bot account and get one at https://discordapp.com/developers/applications/me
   token: ''
+  # The prefix for the integrated bot commands
+  prefix: 'tf!'
   # The official discord server's ID for this server
   server_id: ''
   # Channel to send /report messages to
   report_channel_id: ''
+  # Channel to send archived reports to
+  report_archive_channel_id: ''
   # Channel for Discord to Minecraft and vice-versa
   chat_channel_id: ''
   # Channel for Discord to AdminChat and vice-versa
@@ -84,6 +86,8 @@ discord:
   executive_role_id: ''
   # Owner role ID
   server_owner_role_id: ''
+  # Invite link for your Discord server
+  invite_link: 'https://discord.com/invite/PW4savJR9a'
 
 # Pterodactyl
 ptero:
@@ -159,6 +163,7 @@ shop:
     stacking_potato: 300
     clown_fish: 1500
     login_messages: 5000
+    rainbow_trail: 1500
 
 # Admin list
 adminlist:
@@ -206,7 +211,7 @@ allow:
   fire_spread: false
   fluid_spread: false
   lava_place: true
-  lava_damage: false
+  lava_damage: true
   water_place: true
   tnt_minecarts: false
   explosions: false
@@ -506,6 +511,10 @@ moblimiter:
     slime: true
     giant: true
 
+# Spawnmob
+spawnmob:
+  max: 25
+
 # Flatlands
 flatlands:
   generate: true
@@ -590,6 +599,14 @@ masterbuilderinfo:
   - ' &2- Template:'
   - '&9https://forum.totalfreedom.me/d/336-master-builder-application-process'
 
+# What new players will see upon joining for the first time.
+first_join_info:
+  enabled: true
+  text:
+    - "&6Welcome to TotalFreedom -- the original Free-OP server!"
+    - "&eThe server's name doesn't mean we have no rules. Do &6/rules &efor a list of them."
+    - "&aNeed help getting started? Do &2/help &aor a list of commands!"
+
 # Famous players - cannot be banned by username
 famous_players:
   - honeydew

src/main/resources/plugin.yml

@@ -14,4 +14,4 @@ softdepend:
   - JDA
   - Votifier
 authors: [Madgeek1450, Prozza]
-api-version: "1.16"
+api-version: "1.17"