Keep on trying i guess.

Build has a critical error where sql data is being interpreted incorrectly which is odd considering no sql changes were made.

.github/dependabot.yml

@@ -0,0 +1,23 @@
+# To get started with Dependabot version updates, you'll need to specify which
+# package ecosystems to update and where the package manifests are located.
+# Please see the documentation for all configuration options:
+# https://help.github.com/github/administering-a-repository/configuration-options-for-dependency-updates
+
+version: 2
+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.2.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

@@ -34,40 +34,41 @@ jobs:
         # https://docs.github.com/en/free-pro-team@latest/github/finding-security-vulnerabilities-and-errors-in-your-code/configuring-code-scanning#changing-the-languages-that-are-analyzed
 
     steps:
-    - name: Checkout repository
-      uses: actions/checkout@v2
-      
-    - name: Setup Java JDK
-      uses: actions/setup-java@v1.4.3
-      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
+      - name: Checkout repository
+        uses: actions/checkout@v3
 
-    # Initializes the CodeQL tools for scanning.
-    - name: Initialize CodeQL
-      uses: github/codeql-action/init@v1
-      with:
-        languages: ${{ matrix.language }}
-        # If you wish to specify custom queries, you can do so here or in a config file.
-        # By default, queries listed here will override any specified in a config file.
-        # Prefix the list here with "+" to use these queries and those in the config file.
-        # queries: ./path/to/local/query, your-org/your-repo/queries@main
+      - name: Setup Java JDK
+        uses: actions/setup-java@v3.9.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: 17
+          distribution: 'adopt'
 
-    # 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
+      # Initializes the CodeQL tools for scanning.
+      - name: Initialize CodeQL
+        uses: github/codeql-action/init@v2
+        with:
+          languages: ${{ matrix.language }}
+          # If you wish to specify custom queries, you can do so here or in a config file.
+          # By default, queries listed here will override any specified in a config file.
+          # Prefix the list here with "+" to use these queries and those in the config file.
+          # queries: ./path/to/local/query, your-org/your-repo/queries@main
 
-    # ℹ️ Command-line programs to run using the OS shell.
-    # 📚 https://git.io/JvXDl
+      # Autobuild attempts to build any compiled languages  (C/C++, C#, or Java).
+      # If this step fails, then you should remove it and run the build manually (see below)
+      - name: Autobuild
+        uses: github/codeql-action/autobuild@v2
 
-    # ✏️ If the Autobuild fails above, remove it and uncomment the following three lines
-    #    and modify them (or add more) to build your code if your project
-    #    uses a compiled language
+      # ℹ️ Command-line programs to run using the OS shell.
+      # 📚 https://git.io/JvXDl
 
-    #- run: |
-    #   make bootstrap
-    #   make release
+      # ✏️ If the Autobuild fails above, remove it and uncomment the following three lines
+      #    and modify them (or add more) to build your code if your project
+      #    uses a compiled language
 
-    - name: Perform CodeQL Analysis
-      uses: github/codeql-action/analyze@v1
+      #- run: |
+      #   make bootstrap
+      #   make release
+
+      - name: Perform CodeQL Analysis
+        uses: github/codeql-action/analyze@v2

.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.9.0
+        with:
+          java-version: 17
+          distribution: 'adopt'
+      - name: Build with Maven
+        run: mvn -B package --file pom.xml

.github/workflows/maven.yml

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

.gitignore

@@ -29,7 +29,7 @@ manifest.mf
 *.iml
 
 # Maven excludes
-/target
+target/
 
 # OS generated files
 .DS_Store

.travis.yml

@@ -1,13 +0,0 @@
-language: java
-jdk:
-  - oraclejdk11
-  - openjdk11
-notifications:
-  email: false
-addons:
-  apt:
-    packages:
-      - sshpass
-script: mvn clean install
-after_success:
-  - ./travis-upload.sh

CONTRIBUTING.md

@@ -1,3 +1,4 @@
-# Contributing to TotalFreedomMod #
+# Contributing to TotalFreedomMod
 
-For information about contributing to TotalFreedomMod, please see the [contributing guidelines](https://github.com/TotalFreedom/TotalFreedomMod/wiki/Contributing).
+For information about contributing to TotalFreedomMod, please see
+the [contributing guidelines](https://github.com/TotalFreedom/TotalFreedomMod/wiki/Contributing).

LICENSE.md

@@ -1,4 +1,5 @@
-# TotalFreedom General License #
+# TotalFreedom General License
+
 _Version 2.0, 27th February 2015_
 
 Copyright (c) 2011 Steven Lawson
@@ -7,48 +8,86 @@ Copyright (c) 2012 Jerom van der Sar
 
 All rights reserved.
 
-##### 1. Definitions #####
+##### 1. Definitions
+
 "License" shall mean the terms and conditions for use, reproduction, and distribution as defined by this document.
 
 "Licensor" shall mean the copyright holder or entity authorised by the copyright owner that is granting the License.
 
-"Legal Entity" shall mean the union of the acting entity and all other entities that control, are controlled by, or are under common control with that entity. For the purposes of this definition, "control" means (i) the power, direct or indirect, to cause the direction or management of such entity, whether by contract or otherwise, or (ii) ownership of fifty percent (50%) or more of the outstanding shares, or (iii) beneficial ownership of such entity.
+"Legal Entity" shall mean the union of the acting entity and all other entities that control, are controlled by, or are
+under common control with that entity. For the purposes of this definition, "control" means (i) the power, direct or
+indirect, to cause the direction or management of such entity, whether by contract or otherwise, or (ii) ownership of
+fifty percent (50%) or more of the outstanding shares, or (iii) beneficial ownership of such entity.
 
 "You", "Your" or "Yourself" shall mean an individual or Legal Entity exercising permissions granted by this License.
 
-"Source" form shall mean the preferred form for making modifications, including but not limited to software source code, documentation source, and configuration files.
+"Source" form shall mean the preferred form for making modifications, including but not limited to software source code,
+documentation source, and configuration files.
 
-"Object" form shall mean any form resulting from mechanical transformation or translation of a Source form, including but not limited to compiled object code, binary data, generated documentation, and conversions to other media types.
+"Object" form shall mean any form resulting from mechanical transformation or translation of a Source form, including
+but not limited to compiled object code, binary data, generated documentation, and conversions to other media types.
 
-"Work" and "This Software" shall mean the work of authorship, whether in Source or Object form, made available under the License, as indicated by a copyright notice that is included in or attached to the work.
+"Work" and "This Software" shall mean the work of authorship, whether in Source or Object form, made available under the
+License, as indicated by a copyright notice that is included in or attached to the work.
 
-"Derivative Works" shall mean any work, whether in Source or Object form, that is based on (or derived from) the Work and for which the editorial revisions, annotations, elaborations, or other modifications represent, as a whole, an original work of authorship. For the purposes of this License, Derivative Works shall not include works that remain separable from, or merely link (or bind by name) to the interfaces of, the Work and Derivative Works thereof.
+"Derivative Works" shall mean any work, whether in Source or Object form, that is based on (or derived from) the Work
+and for which the editorial revisions, annotations, elaborations, or other modifications represent, as a whole, an
+original work of authorship. For the purposes of this License, Derivative Works shall not include works that remain
+separable from, or merely link (or bind by name) to the interfaces of, the Work and Derivative Works thereof.
 
-"Contribution" shall mean any work of authorship, including the original version of the Work and any modifications or additions to that Work or Derivative Works thereof, that is intentionally submitted to Licensor for inclusion in the Work by the copyright owner or by an individual or Legal Entity authorized to submit on behalf of the copyright owner. For the purposes of this definition, "submitted" means any form of electronic, verbal, or written communication sent to the Licensor or its representatives, including but not limited to communication on electronic mailing lists, source code control systems, and issue tracking systems that are managed by, or on behalf of, the Licensor for the purpose of discussing and improving the Work, but excluding communication that is conspicuously marked or otherwise designated in writing by the copyright owner as "Not a Contribution."
+"Contribution" shall mean any work of authorship, including the original version of the Work and any modifications or
+additions to that Work or Derivative Works thereof, that is intentionally submitted to Licensor for inclusion in the
+Work by the copyright owner or by an individual or Legal Entity authorized to submit on behalf of the copyright owner.
+For the purposes of this definition, "submitted" means any form of electronic, verbal, or written communication sent to
+the Licensor or its representatives, including but not limited to communication on electronic mailing lists, source code
+control systems, and issue tracking systems that are managed by, or on behalf of, the Licensor for the purpose of
+discussing and improving the Work, but excluding communication that is conspicuously marked or otherwise designated in
+writing by the copyright owner as "Not a Contribution."
 
-"Contributor" shall mean Licensor and any individual or Legal Entity on behalf of whom a Contribution has been received by Licensor and subsequently incorporated within the Work.
+"Contributor" shall mean Licensor and any individual or Legal Entity on behalf of whom a Contribution has been received
+by Licensor and subsequently incorporated within the Work.
 
-"Redistribution" shall mean any partial or complete availability, transfer or publication of the Work from one Legal Entity to another.
+"Redistribution" shall mean any partial or complete availability, transfer or publication of the Work from one Legal
+Entity to another.
 
-##### 2. Grant of Copyright License #####
- Subject to the terms and conditions of this License, You are granted a perpetual, worldwide, non-exclusive, no-charge, royalty-free, irrevocable copyright license to prepare Derivative Works of, publicly display, publicly perform, inspect and redistribute the Work and such Derivative Works as long as the following conditions are met:
+##### 2. Grant of Copyright License
 
-1. Redistributions of This Software must solely occur in Source form. Redistribution in Object form is prohibited without prior written permission from the Licensor.
+Subject to the terms and conditions of this License, You are granted a perpetual, worldwide, non-exclusive, no-charge,
+royalty-free, irrevocable copyright license to prepare Derivative Works of, publicly display, publicly perform, inspect
+and redistribute the Work and such Derivative Works as long as the following conditions are met:
 
-2. Neither the names of the copyright holders nor the names this software's contributors may be removed from This Software's source code. 
+1. Redistributions of This Software must solely occur in Source form. Redistribution in Object form is prohibited
+   without prior written permission from the Licensor.
 
-3. Neither the names of the copyright holders nor the names of its contributors may be used to endorse or promote products derived from This Software without specific prior written permission.
+2. Neither the names of the copyright holders nor the names this software's contributors may be removed from This
+   Software's source code.
 
-4. Accreditations referencing This Software's copyright holders or contributors may neither be altered or removed from source code nor withheld from reproduction in Object form whatsoever.
+3. Neither the names of the copyright holders nor the names of its contributors may be used to endorse or promote
+   products derived from This Software without specific prior written permission.
 
-5. Any conditions specified by this license may be temporarily or permanently waived by any the aforementioned copyright holders.
+4. Accreditations referencing This Software's copyright holders or contributors may neither be altered or removed from
+   source code nor withheld from reproduction in Object form whatsoever.
+
+5. Any conditions specified by this license may be temporarily or permanently waived by any the aforementioned copyright
+   holders.
 
 6. Redistributions of This Software must retain this License document in its exact form.
 
 7. Sub licensing of This Software is prohibited without prior written permission from the Licensor.
 
-##### 3. Submission of Contributions #####
-Unless You explicitly state otherwise, any Contribution intentionally submitted for inclusion in the Work by You to the Licensor shall be under the terms and conditions of this License, without any additional terms or conditions. Notwithstanding the above, nothing herein shall supersede or modify the terms of any separate license agreement you may have executed with Licensor regarding such Contributions.
+##### 3. Submission of Contributions
 
-##### 4. Disclaimer of Warranty #####
-THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS "AS IS" AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT HOLDER OR CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
+Unless You explicitly state otherwise, any Contribution intentionally submitted for inclusion in the Work by You to the
+Licensor shall be under the terms and conditions of this License, without any additional terms or conditions.
+Notwithstanding the above, nothing herein shall supersede or modify the terms of any separate license agreement you may
+have executed with Licensor regarding such Contributions.
+
+##### 4. Disclaimer of Warranty
+
+THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS "AS IS" AND ANY EXPRESS OR IMPLIED WARRANTIES,
+INCLUDING, BUT NOT LIMITED TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE ARE
+DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT HOLDER OR CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL,
+SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR
+SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY,
+WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF
+THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.

README.md

@@ -1,16 +1,23 @@
-# 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.
+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.
 
-This plugin was originally coded by StevenLawson (Madgeek1450), with Jerom van der Sar (Prozza) becoming heavily involved in its development some time later. It consists of over 85 custom coded commands and a large variety of distinguishable features not included in any other plugin. The plugin has since its beginning grown immensely. Together, with the main TotalFreedom server, TotalFreedomMod has a long-standing reputation of effectiveness whilst maintaining a clear feeling of openness towards the administrators and the players themselves.
+This plugin was originally coded by StevenLawson (Madgeek1450), with Jerom van der Sar (Prozza) becoming heavily
+involved in its development some time later. It consists of over 85 custom coded commands and a large variety of
+distinguishable features not included in any other plugin. The plugin has since its beginning grown immensely. Together,
+with the main TotalFreedom server, TotalFreedomMod has a long-standing reputation of effectiveness whilst maintaining a
+clear feeling of openness towards the administrators and the players themselves.
+
+### Contributing
 
-### Contributing ###
 Please see [CONTRIBUTING.md](CONTRIBUTING.md) if you are interested in developing TotalFreedomMod.
 
 For information on how TotalFreedomMod is licensed, please see [LICENSE.md](LICENSE.md).
 
 For information on our security policy and reporting an issue, please see [SECURITY.md](SECURITY.md)
 
-### Compiling ###
+### 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

@@ -2,19 +2,52 @@
 
 ## Supported Versions
 
-We currently support the code running on the "development" branch of this repository. This is supported in addition to those formal releases, but note anything not yet released should be treated as in-development.
+We currently support the code running on the "main" branch and "development" branch of this repository. This is
+supported in addition to those formal releases, but note anything not yet released should be treated as in-development.
 
-In terms of plugin releases, we support the following versions:
+In terms of plugin releases, our support matrix is as follows:
 
-| Version | Supported          |
-| ------- | ------------------ |
-| 2020.11   | :white_check_mark: |
-| 6.0.x (Pre-Release)  | :x:                |
-| < 2020.11  | :x:                |
-| < 5.x  | :x:                |
+### Actively Supported
+
+These versions are currently actively supported by our team, and you should expect security patches where appropriate
+for these versions.
+
+| Version | Supported | Support End:             |
+|---------|-----------|--------------------------|
+| 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.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  |
+| < 5.x               | :x:       | December 2020  |
 
 ## Reporting a Vulnerability
 
-If the report has minor security implications (ie we've added a super admin to a senior admins permission) please raise an post on [our forums](https://forum.totalfreedom.me/) in the first instance. If you do not have a forum account and do not wish to sign up, please e-mail us using the e-mail in the next sentence.
+If the report has minor security implications (ie we've added a super admin to a senior admins permission) please raise
+an post on [our forums](https://forum.totalfreedom.me/) in the first instance. If you do not have a forum account and do
+not wish to sign up, please e-mail us using the e-mail in the next sentence.
 
-For security vulnerabilities that are more severe and that may pose a more significant threat to the servers running this plugin, please e-mail os-security-reports [ AT ] atlas-media.co.uk - You can expect an automated response immediately to acknowledge receipt of your e-mail, and one of our team will aim to respond within 72 hours and will work with you on the best way to address your concerns. 
+For security vulnerabilities that are more severe and that may pose a more significant threat to the servers running
+this plugin, please e-mail os-security-reports [ AT ] atlas-media.co.uk - You can expect an automated response
+immediately to acknowledge receipt of your e-mail, and one of our team will aim to respond within 72 hours and will work
+with you on the best way to address your concerns.

checkstyle.xml

@@ -2,20 +2,16 @@
 <!DOCTYPE module PUBLIC
         "-//Puppy Crawl//DTD Check Configuration 1.3//EN"
         "http://www.puppycrawl.com/dtds/configuration_1_3.dtd">
-
 <module name="Checker">
     <property name="charset" value="UTF-8"/>
     <property name="severity" value="warning"/>
     <property name="fileExtensions" value="java, properties, xml"/>
-
     <module name="SuppressionFilter">
         <property name="file" value="supressions.xml"/>
     </module>
-
     <module name="FileTabCharacter">
         <property name="eachLine" value="true"/>
     </module>
-
     <module name="TreeWalker">
         <module name="OuterTypeFilename"/>
         <module name="IllegalTokenText">
@@ -91,7 +87,7 @@
                      value="Local variable name ''{0}'' must match pattern ''{1}''."/>
         </module>
         <module name="ClassTypeParameterName">
-            <property name="format" value="(^[A-Z][0-9]?)$|([A-Z][a-zA-Z0-9][_]*[T]$)"/>
+            <property name="format" value="(^[A-Z][a-zA-Z0-9]*$)|([A-Z][a-zA-Z0-9]*[_][a-zA-Z0-9]*$)"/>
             <message key="name.invalidPattern"
                      value="Class type name ''{0}'' must match pattern ''{1}''."/>
         </module>
@@ -112,7 +108,8 @@
                      value="GenericWhitespace ''{0}'' is not preceded with whitespace."/>
         </module>
         <module name="OverloadMethodsDeclarationOrder"/>
-        <module name="CustomImportOrder"/><!-- http://checkstyle.sourceforge.net/config_imports.html -->
+        <module name="CustomImportOrder"/>
+        <!-- http://checkstyle.sourceforge.net/config_imports.html -->
         <module name="MethodParamPad"/>
         <module name="OperatorWrap">
             <property name="option" value="NL"/>
@@ -133,4 +130,4 @@
         </module>
         <module name="CommentsIndentation"/>
     </module>
-</module>
+</module>

commons/pom.xml

@@ -0,0 +1,250 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<project xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
+         xmlns="http://maven.apache.org/POM/4.0.0"
+         xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/xsd/maven-4.0.0.xsd">
+    <modelVersion>4.0.0</modelVersion>
+    <parent>
+        <groupId>me.totalfreedom</groupId>
+        <artifactId>TotalFreedomMod</artifactId>
+        <version>2023.03</version>
+    </parent>
+
+    <artifactId>commons</artifactId>
+
+    <properties>
+        <maven.compiler.source>17</maven.compiler.source>
+        <maven.compiler.target>17</maven.compiler.target>
+        <project.build.sourceEncoding>UTF-8</project.build.sourceEncoding>
+    </properties>
+
+    <dependencies>
+        <dependency>
+            <groupId>commons-io</groupId>
+            <artifactId>commons-io</artifactId>
+            <version>2.11.0</version>
+            <scope>provided</scope>
+        </dependency>
+
+        <dependency>
+            <groupId>io.papermc</groupId>
+            <artifactId>paperlib</artifactId>
+            <version>1.0.7</version>
+            <scope>compile</scope>
+        </dependency>
+
+        <dependency>
+            <groupId>org.apache.commons</groupId>
+            <artifactId>commons-lang3</artifactId>
+            <version>3.12.0</version>
+            <scope>provided</scope>
+        </dependency>
+
+        <dependency>
+            <groupId>net.luckperms</groupId>
+            <artifactId>api</artifactId>
+            <version>5.4</version>
+            <scope>provided</scope>
+        </dependency>
+
+        <dependency>
+            <groupId>org.bstats</groupId>
+            <artifactId>bstats-bukkit</artifactId>
+            <version>3.0.1</version>
+            <scope>compile</scope>
+        </dependency>
+
+        <dependency>
+            <groupId>org.reflections</groupId>
+            <artifactId>reflections</artifactId>
+            <version>0.10.2</version>
+            <scope>compile</scope>
+        </dependency>
+
+        <dependency>
+            <groupId>org.eclipse.sisu</groupId>
+            <artifactId>org.eclipse.sisu.inject</artifactId>
+            <version>0.3.5</version>
+            <scope>compile</scope>
+        </dependency>
+    </dependencies>
+
+
+    <build>
+        <!-- Filter resources for build.properties -->
+        <resources>
+            <resource>
+                <directory>src/main/resources</directory>
+                <filtering>true</filtering>
+            </resource>
+        </resources>
+
+        <plugins>
+            <!-- Compiler -->
+            <plugin>
+                <groupId>org.apache.maven.plugins</groupId>
+                <artifactId>maven-compiler-plugin</artifactId>
+                <version>3.10.1</version>
+                <configuration>
+                    <outputFileName>TotalFreedomMod.jar</outputFileName>
+                    <compilerVersion>17</compilerVersion>
+                    <source>17</source>
+                    <target>17</target>
+                </configuration>
+            </plugin>
+
+            <!-- Git describe -->
+            <plugin>
+                <groupId>pl.project13.maven</groupId>
+                <artifactId>git-commit-id-plugin</artifactId>
+                <version>4.9.10</version>
+                <executions>
+                    <execution>
+                        <id>get-the-git-infos</id>
+                        <goals>
+                            <goal>revision</goal>
+                        </goals>
+                    </execution>
+                    <execution>
+                        <id>validate-the-git-infos</id>
+                        <goals>
+                            <goal>validateRevision</goal>
+                        </goals>
+                        <phase>package</phase>
+                    </execution>
+                </executions>
+                <configuration>
+                    <dotGitDirectory>${project.basedir}/.git</dotGitDirectory>
+                    <prefix>git</prefix>
+                    <dateFormat>yyyy-MM-dd HH:mm:ss</dateFormat>
+                    <verbose>false</verbose>
+                    <format>properties</format>
+                    <failOnNoGitDirectory>false</failOnNoGitDirectory>
+                    <failOnUnableToExtractRepoInfo>false</failOnUnableToExtractRepoInfo>
+                    <includeOnlyProperties>
+                        <includeOnlyProperty>git.commit.id.abbrev</includeOnlyProperty>
+                    </includeOnlyProperties>
+                    <gitDescribe>
+                        <skip>false</skip>
+                        <always>false</always>
+                        <abbrev>7</abbrev>
+                        <dirty>-dirty</dirty>
+                        <match>*</match>
+                    </gitDescribe>
+                </configuration>
+            </plugin>
+
+            <!-- Antrun -->
+            <plugin>
+                <groupId>org.apache.maven.plugins</groupId>
+                <artifactId>maven-antrun-plugin</artifactId>
+                <version>3.1.0</version>
+                <executions>
+                    <execution>
+                        <id>default-cli</id>
+                        <phase>initialize</phase>
+                        <configuration>
+                            <target>
+                                <propertyfile file="${project.basedir}/src/main/resources/build.properties"
+                                              comment="Build information. Edit this to your liking.">
+                                    <entry key="buildAuthor" default="unknown"/>
+                                    <entry key="buildNumber" default="0"/>
+                                    <entry key="buildCodeName" value="${tfm.build.codename}"/>
+                                    <entry key="buildVersion" value="${project.version}"/>
+                                    <entry key="buildDate" value="${timestamp}"/>
+                                    <!--suppress UnresolvedMavenProperty -->
+                                    <entry key="buildHead" value="${git.commit.id.abbrev}"/>
+                                </propertyfile>
+                            </target>
+                        </configuration>
+                        <goals>
+                            <goal>run</goal>
+                        </goals>
+                    </execution>
+                </executions>
+            </plugin>
+
+            <!-- Properties -->
+            <plugin>
+                <groupId>org.codehaus.mojo</groupId>
+                <artifactId>properties-maven-plugin</artifactId>
+                <version>1.1.0</version>
+                <executions>
+                    <execution>
+                        <phase>initialize</phase>
+                        <goals>
+                            <goal>read-project-properties</goal>
+                        </goals>
+                        <configuration>
+                            <files>
+                                <file>${project.basedir}/src/main/resources/build.properties</file>
+                            </files>
+                        </configuration>
+                    </execution>
+                </executions>
+            </plugin>
+
+            <!-- Buildnumber -->
+            <plugin>
+                <groupId>org.codehaus.mojo</groupId>
+                <artifactId>buildnumber-maven-plugin</artifactId>
+                <version>3.0.0</version>
+                <executions>
+                    <execution>
+                        <phase>generate-resources</phase>
+                        <goals>
+                            <goal>create</goal>
+                        </goals>
+                    </execution>
+                </executions>
+
+                <configuration>
+                    <buildNumberPropertyName>maven.buildnumber</buildNumberPropertyName>
+                    <buildNumberPropertiesFileLocation>${project.basedir}/src/main/resources/build.properties
+                    </buildNumberPropertiesFileLocation>
+                    <format>{0,number,#}</format>
+                    <items>
+                        <item>buildNumber</item>
+                    </items>
+                </configuration>
+            </plugin>
+
+            <!-- Shade -->
+            <plugin>
+                <groupId>org.apache.maven.plugins</groupId>
+                <artifactId>maven-shade-plugin</artifactId>
+                <version>3.3.0</version>
+                <executions>
+                    <execution>
+                        <phase>package</phase>
+                        <goals>
+                            <goal>shade</goal>
+                        </goals>
+                        <configuration>
+                            <minimizeJar>true</minimizeJar>
+                            <relocations>
+                                <relocation>
+                                    <pattern>io.papermc.lib</pattern>
+                                    <shadedPattern>me.totalfreedom.totalfreedommod.paperlib
+                                    </shadedPattern> <!-- Replace this -->
+                                </relocation>
+                                <relocation>
+                                    <pattern>org.bstats</pattern>
+                                    <shadedPattern>me.totalfreedom.totalfreedommod</shadedPattern>
+                                </relocation>
+                            </relocations>
+                            <artifactSet>
+                                <includes>
+                                    <include>org.reflections:reflections</include>
+                                    <include>io.papermc:paperlib</include>
+                                    <include>org.bstats:bstats-bukkit</include>
+                                    <include>org.bstats:bstats-base</include>
+                                </includes>
+                            </artifactSet>
+                        </configuration>
+                    </execution>
+                </executions>
+            </plugin>
+        </plugins>
+    </build>
+
+</project>

commons/src/main/java/me/totalfreedom/totalfreedommod/Announcer.java

@@ -1,13 +1,14 @@
 package me.totalfreedom.totalfreedommod;
 
 import com.google.common.collect.Lists;
-import java.util.Collections;
-import java.util.List;
 import me.totalfreedom.totalfreedommod.config.ConfigEntry;
 import me.totalfreedom.totalfreedommod.util.FUtil;
 import org.bukkit.scheduler.BukkitRunnable;
 import org.bukkit.scheduler.BukkitTask;
 
+import java.util.Collections;
+import java.util.List;
+
 public class Announcer extends FreedomService
 {
 
@@ -27,7 +28,7 @@ public class Announcer extends FreedomService
         announcements.clear();
         for (Object announcement : ConfigEntry.ANNOUNCER_ANNOUNCEMENTS.getList())
         {
-            announcements.add(FUtil.colorize((String)announcement));
+            announcements.add(FUtil.colorize((String) announcement));
         }
 
         if (!enabled)

commons/src/main/java/me/totalfreedom/totalfreedommod/AntiNuke.java

@@ -2,8 +2,8 @@ package me.totalfreedom.totalfreedommod;
 
 import me.totalfreedom.totalfreedommod.config.ConfigEntry;
 import me.totalfreedom.totalfreedommod.player.FPlayer;
-import me.totalfreedom.totalfreedommod.util.FUtil;
-import org.bukkit.ChatColor;
+import net.kyori.adventure.text.Component;
+import net.kyori.adventure.text.format.NamedTextColor;
 import org.bukkit.entity.Player;
 import org.bukkit.event.EventHandler;
 import org.bukkit.event.EventPriority;
@@ -35,10 +35,10 @@ public class AntiNuke extends FreedomService
 
         if (fPlayer.incrementAndGetBlockDestroyCount() > ConfigEntry.NUKE_MONITOR_COUNT_BREAK.getInteger())
         {
-            FUtil.bcastMsg(player.getName() + " is breaking blocks too fast!", ChatColor.RED);
-            //plugin.ae.autoEject(player, "You are breaking blocks too fast. Nukers are not permitted on this server.");
-            player.kickPlayer(ChatColor.RED + "You are breaking blocks too fast. Nukers are not permitted on this server.");
-
+            server.broadcast(Component.text(player.getName()).append(Component.text(" is breaking blocks too fast!"))
+                    .color(NamedTextColor.RED));
+            player.kick(Component.text("You are breaking blocks too fast. Nukers are not permitted on this server.",
+                    NamedTextColor.RED));
             fPlayer.resetBlockDestroyCount();
 
             event.setCancelled(true);
@@ -58,10 +58,9 @@ public class AntiNuke extends FreedomService
 
         if (fPlayer.incrementAndGetBlockPlaceCount() > ConfigEntry.NUKE_MONITOR_COUNT_PLACE.getInteger())
         {
-            FUtil.bcastMsg(player.getName() + " is placing blocks too fast!", ChatColor.RED);
-            //plugin.ae.autoEject(player, "You are placing blocks too fast.");
-            player.kickPlayer(ChatColor.RED + "You are placing blocks too fast.");
-
+            server.broadcast(Component.text(player.getName()).append(Component.text(" is placing blocks too fast!"))
+                    .color(NamedTextColor.RED));
+            player.kick(Component.text("You are placing blocks too fast.", NamedTextColor.RED));
             fPlayer.resetBlockPlaceCount();
 
             event.setCancelled(true);

commons/src/main/java/me/totalfreedom/totalfreedommod/AntiSpam.java

@@ -0,0 +1,115 @@
+package me.totalfreedom.totalfreedommod;
+
+import me.totalfreedom.totalfreedommod.config.ConfigEntry;
+import me.totalfreedom.totalfreedommod.player.FPlayer;
+import net.kyori.adventure.text.Component;
+import net.kyori.adventure.text.format.NamedTextColor;
+import org.bukkit.entity.Player;
+import org.bukkit.event.EventHandler;
+import org.bukkit.event.EventPriority;
+import org.bukkit.event.player.AsyncPlayerChatEvent;
+import org.bukkit.event.player.PlayerCommandPreprocessEvent;
+
+import java.util.HashMap;
+import java.util.Map;
+import java.util.concurrent.ScheduledThreadPoolExecutor;
+import java.util.concurrent.TimeUnit;
+
+public class AntiSpam extends FreedomService
+{
+    public static final int MSG_PER_CYCLE = 8;
+    private ScheduledThreadPoolExecutor cycle;
+    //
+    private Map<Player, Integer> muteCounts = new HashMap<>();
+
+    @Override
+    public void onStart()
+    {
+        cycle = new ScheduledThreadPoolExecutor(1);
+        cycle.scheduleAtFixedRate(this::cycle, 0, 1, TimeUnit.SECONDS);
+    }
+
+    @Override
+    public void onStop()
+    {
+        cycle.shutdownNow();
+    }
+
+    private void cycle()
+    {
+        server.getOnlinePlayers().stream().map(player -> plugin.pl.getPlayer(player)).forEach(fPlayer ->
+        {
+            // TODO: Move each to their own section
+            fPlayer.resetMsgCount();
+            fPlayer.resetBlockDestroyCount();
+            fPlayer.resetBlockPlaceCount();
+        });
+    }
+
+    @EventHandler(priority = EventPriority.LOW)
+    public void onAsyncPlayerChat(AsyncPlayerChatEvent event)
+    {
+        final Player player = event.getPlayer();
+
+        if (plugin.al.isAdmin(player))
+        {
+            return;
+        }
+
+        final FPlayer playerdata = plugin.pl.getPlayerSync(player);
+        int count = muteCounts.getOrDefault(player, 0);
+        int minutes = ConfigEntry.ANTISPAM_MINUTES.getInteger();
+
+        // Check for spam
+        if (playerdata.incrementAndGetMsgCount() > MSG_PER_CYCLE && !playerdata.isMuted())
+        {
+            count++;
+            muteCounts.put(player, count);
+
+            int time = count * minutes;
+            playerdata.setMuted(true, time);
+
+            server.broadcast(Component.text(player.getName()).append(Component.text(" has been automatically muted for "))
+                    .append(Component.text(time)).append(Component.text(" minutes for spamming chat."))
+                    .color(NamedTextColor.RED));
+
+            playerdata.resetMsgCount();
+            event.setCancelled(true);
+        } else if (playerdata.incrementAndGetMsgCount() > MSG_PER_CYCLE / 2)
+        {
+            player.sendMessage(Component.text("Please refrain from spamming chat.", NamedTextColor.GRAY));
+            event.setCancelled(true);
+        }
+
+    }
+
+    @EventHandler(priority = EventPriority.LOW)
+    public void onPlayerCommandPreprocess(PlayerCommandPreprocessEvent event)
+    {
+        final Player player = event.getPlayer();
+        final FPlayer fPlayer = plugin.pl.getPlayer(player);
+
+        if (fPlayer.allCommandsBlocked())
+        {
+            player.sendMessage(Component.text("Your commands have been blocked by an admin.", NamedTextColor.RED));
+            event.setCancelled(true);
+            return;
+        }
+
+        if (plugin.al.isAdmin(player))
+        {
+            return;
+        }
+
+        if (fPlayer.incrementAndGetMsgCount() > MSG_PER_CYCLE)
+        {
+            server.broadcast(Component.text(player.getName())
+                    .append(Component.text(" was automatically kicked for spamming commands."))
+                    .color(NamedTextColor.RED));
+            plugin.ae.autoEject(player, "Kicked for spamming commands.");
+
+            fPlayer.resetMsgCount();
+            event.setCancelled(true);
+        }
+    }
+}

commons/src/main/java/me/totalfreedom/totalfreedommod/AutoEject.java

@@ -1,10 +1,5 @@
 package me.totalfreedom.totalfreedommod;
 
-import java.util.Calendar;
-import java.util.Date;
-import java.util.GregorianCalendar;
-import java.util.HashMap;
-import java.util.Map;
 import me.totalfreedom.totalfreedommod.banning.Ban;
 import me.totalfreedom.totalfreedommod.util.FLog;
 import me.totalfreedom.totalfreedommod.util.FUtil;
@@ -13,6 +8,8 @@ import org.bukkit.ChatColor;
 import org.bukkit.GameMode;
 import org.bukkit.entity.Player;
 
+import java.util.*;
+
 public class AutoEject extends FreedomService
 {
 
@@ -46,8 +43,7 @@ public class AutoEject extends FreedomService
         if (kicks == 2)
         {
             method = EjectMethod.STRIKE_TWO;
-        }
-        else if (kicks >= 3)
+        } else if (kicks >= 3)
         {
             method = EjectMethod.STRIKE_THREE;
         }
@@ -85,9 +81,13 @@ public class AutoEject extends FreedomService
                 player.kickPlayer(kickMessage);
                 break;
             }
+            default:
+            {
+                FLog.warning("Unrecognized EjectMethod " + method.name() + " found, defaulting to STRIKE_THREE");
+            }
             case STRIKE_THREE:
             {
-                plugin.bm.addBan(Ban.forPlayerFuzzy(player, Bukkit.getConsoleSender(), null, kickMessage));
+                plugin.bm.addBan(Ban.forPlayer(player, Bukkit.getConsoleSender(), null, kickMessage));
 
                 FUtil.bcastMsg(ChatColor.RED + player.getName() + " has been banned.");
 

commons/src/main/java/me/totalfreedom/totalfreedommod/AutoKick.java

@@ -18,7 +18,7 @@ public class AutoKick extends FreedomService
     @Override
     public void onStart()
     {
-        autoKickTicks = (long)ConfigEntry.AUTOKICK_TIME.getInteger() * 1000L;
+        autoKickTicks = (long) ConfigEntry.AUTOKICK_TIME.getInteger() * 1000L;
         autoKickThreshold = ConfigEntry.AUTOKICK_THRESHOLD.getDouble();
 
         if (!ConfigEntry.AUTOKICK_ENABLED.getBoolean())
@@ -49,7 +49,7 @@ public class AutoKick extends FreedomService
         // No type cast was provided, one has been supplied.
         final boolean doAwayKickCheck
                 = plugin.esb.isEnabled()
-                && (((float)server.getOnlinePlayers().size() / (float)server.getMaxPlayers()) > autoKickThreshold);
+                && (((float) server.getOnlinePlayers().size() / (float) server.getMaxPlayers()) > autoKickThreshold);
 
         if (!doAwayKickCheck)
         {

commons/src/main/java/me/totalfreedom/totalfreedommod/BackupManager.java

@@ -1,16 +1,17 @@
 package me.totalfreedom.totalfreedommod;
 
-import java.io.File;
 import me.totalfreedom.totalfreedommod.banning.IndefiniteBanList;
 import me.totalfreedom.totalfreedommod.config.YamlConfig;
-import me.totalfreedom.totalfreedommod.permissions.PermissionConfig;
 import me.totalfreedom.totalfreedommod.punishments.PunishmentList;
 import me.totalfreedom.totalfreedommod.util.FLog;
 import me.totalfreedom.totalfreedommod.util.FUtil;
 import org.bukkit.util.FileUtil;
 
+import java.io.File;
+
 public class BackupManager extends FreedomService
 {
+
     @Override
     public void onStart()
     {
@@ -30,7 +31,6 @@ public class BackupManager extends FreedomService
     {
         createBackups(TotalFreedomMod.CONFIG_FILENAME, true);
         createBackups(IndefiniteBanList.CONFIG_FILENAME);
-        createBackups(PermissionConfig.PERMISSIONS_FILENAME, true);
         createBackups(PunishmentList.CONFIG_FILENAME);
         createBackups("database.db");
     }
@@ -42,16 +42,15 @@ public class BackupManager extends FreedomService
         config.load();
 
         // Weekly
-        if (!config.isInt(save + ".weekly"))
+        if (!config.isLong(save + ".weekly"))
         {
             performBackup(file, "weekly");
             config.set(save + ".weekly", FUtil.getUnixTime());
-        }
-        else
+        } else
         {
-            int lastBackupWeekly = config.getInt(save + ".weekly");
+            long lastBackupWeekly = config.getLong(save + ".weekly");
 
-            if (lastBackupWeekly + 3600 * 24 * 7 < FUtil.getUnixTime())
+            if (FUtil.parseLongOffset(lastBackupWeekly, "1w") < FUtil.getUnixTime())
             {
                 performBackup(file, "weekly");
                 config.set(save + ".weekly", FUtil.getUnixTime());
@@ -65,16 +64,15 @@ public class BackupManager extends FreedomService
         }
 
         // Daily
-        if (!config.isInt(save + ".daily"))
+        if (!config.isLong(save + ".daily"))
         {
             performBackup(file, "daily");
             config.set(save + ".daily", FUtil.getUnixTime());
-        }
-        else
+        } else
         {
-            int lastBackupDaily = config.getInt(save + ".daily");
+            long lastBackupDaily = config.getLong(save + ".daily");
 
-            if (lastBackupDaily + 3600 * 24 < FUtil.getUnixTime())
+            if (FUtil.parseLongOffset(lastBackupDaily, "1d") < FUtil.getUnixTime())
             {
                 performBackup(file, "daily");
                 config.set(save + ".daily", FUtil.getUnixTime());
@@ -98,5 +96,4 @@ public class BackupManager extends FreedomService
         final File newYaml = new File(backupFolder, file + "." + type + ".bak");
         FileUtil.copy(oldYaml, newYaml);
     }
-
 }

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

@@ -0,0 +1,228 @@
+package me.totalfreedom.totalfreedommod;
+
+import com.google.common.base.Strings;
+import io.papermc.paper.event.player.AsyncChatEvent;
+import me.totalfreedom.totalfreedommod.admin.Admin;
+import me.totalfreedom.totalfreedommod.api.event.AdminChatEvent;
+import me.totalfreedom.totalfreedommod.config.ConfigEntry;
+import me.totalfreedom.totalfreedommod.player.FPlayer;
+import me.totalfreedom.totalfreedommod.rank.Displayable;
+import me.totalfreedom.totalfreedommod.util.FUtil;
+import net.kyori.adventure.key.Key;
+import net.kyori.adventure.text.Component;
+import net.kyori.adventure.text.TextComponent;
+import net.kyori.adventure.text.format.NamedTextColor;
+import net.kyori.adventure.text.format.TextColor;
+import net.kyori.adventure.text.minimessage.tag.Tag;
+import net.kyori.adventure.text.minimessage.tag.resolver.Placeholder;
+import net.kyori.adventure.text.minimessage.tag.resolver.TagResolver;
+import org.bukkit.Sound;
+import org.bukkit.SoundCategory;
+import org.bukkit.command.CommandSender;
+import org.bukkit.entity.Player;
+import org.bukkit.event.EventHandler;
+import org.bukkit.event.EventPriority;
+
+import java.util.Arrays;
+
+public class ChatManager extends FreedomService
+{
+    @Override
+    public void onStart()
+    {
+    }
+
+    @Override
+    public void onStop()
+    {
+    }
+
+    @EventHandler(priority = EventPriority.HIGH, ignoreCancelled = true)
+    public void onPlayerChat(AsyncChatEvent event)
+    {
+        // Important information for later down the line
+        String steamrolled = FUtil.steamroll(event.originalMessage());
+        Player player = event.getPlayer();
+        FPlayer fPlayer = plugin.pl.getPlayer(player);
+
+        // Chat is disabled
+        if (!ConfigEntry.TOGGLE_CHAT.getBoolean() && !plugin.al.isAdmin(player))
+        {
+            event.getPlayer().sendMessage(FUtil.miniMessage("<red>The chat is currently disabled."));
+            event.setCancelled(true);
+            return;
+        }
+        // Locked up
+        else if (fPlayer.isLockedUp())
+        {
+            event.getPlayer().sendMessage(FUtil.miniMessage("<red>You are locked up and thus can't talk."));
+            event.setCancelled(true);
+            return;
+        }
+        // Admin chat is enabled
+        else if (fPlayer.inAdminChat())
+        {
+            adminChat(player, steamrolled, true);
+            event.setCancelled(true);
+            return;
+        }
+        // The event was already cancelled elsewhere or the player was muted
+        else if (event.isCancelled() || fPlayer.isMuted())
+        {
+            return;
+        }
+
+        // Splitter
+        Component splitter = Component.text("»", NamedTextColor.DARK_GRAY);
+
+        // Message
+        TextComponent.Builder message = Component.text();
+
+        // Truncate the message if it's too long
+        if (steamrolled.length() > 256)
+        {
+            steamrolled = steamrolled.substring(0, 256);
+        }
+
+        // Did this because sonarlint was complaining about doing the unboxing in the if statement.
+        // Something about returning null because it was boxed... I'm not sure.
+        boolean unboxed = ConfigEntry.FOURCHAN_ENABLED.getBoolean();
+
+        // Chat colorization
+        // -- 4chan mode --
+        if (steamrolled.startsWith("> ") && unboxed)
+        {
+            message.append(Component.text(steamrolled, NamedTextColor.GREEN));
+        }
+        // -- Legacy chat colors --
+        else if (FUtil.containsChatColor(steamrolled))
+        {
+            message.append(FUtil.colorizeAsComponent(steamrolled.replace("&k", "")));
+        }
+        // -- MiniMessage --
+        else
+        {
+            message.append(FUtil.miniMessage(steamrolled));
+        }
+
+        // This simply filters out shit like &k in a simple but stupid way.
+        Component filtered = FUtil.miniMessage(FUtil.miniMessage(message.build()));
+
+        // Pinging
+        String steamrolledFiltered = FUtil.steamroll(filtered);
+        Arrays.stream(steamrolledFiltered.split(" ")).filter(string -> string.startsWith("@")).forEach(possiblePlayer ->
+        {
+            Player potential = server.getPlayer(possiblePlayer.replace("@", ""));
+
+            // Ping only that particular player
+            if (potential != null)
+            {
+                ping(potential);
+            }
+            // Ping everyone (if the person pinging is an admin)
+            else if (possiblePlayer.equalsIgnoreCase("@everyone") && plugin.al.isAdmin(player))
+            {
+                server.getOnlinePlayers().forEach(this::ping);
+            }
+        });
+
+        event.message(filtered);
+
+        event.renderer((source, displayName, msg, viewer) -> FUtil.miniMessage("<tag><nickname> <splitter> <message>",
+                Placeholder.component("tag", plugin.pl.getPlayer(source).getTag().append(Component.space())),
+                Placeholder.component("nickname", displayName),
+                Placeholder.component("splitter", splitter),
+                Placeholder.component("message", msg)));
+    }
+
+    @EventHandler
+    public void onAdminChat(AdminChatEvent event)
+    {
+        Displayable display = event.getDisplayable();
+        String flatAbv = FUtil.miniMessage(display.getAbbr());
+
+        Component defaultFormat = FUtil.miniMessage("<prefix><dark_gray>[<aqua>admin<dark_gray>] <dark_red><name> <dark_gray>[<rankcolor><rank></rankcolor>]</dark_gray><white>: <gold><message>",
+                Placeholder.component("prefix", event.getPrefix()),
+                Placeholder.component("name", event.getName()),
+                Placeholder.unparsed("rank", flatAbv),
+                TagResolver.resolver("rankcolor", Tag.styling(getColor(display))),
+                Placeholder.component("message", event.getMessage()));
+
+        plugin.getComponentLogger().info(defaultFormat);
+        ;
+        server.getOnlinePlayers().stream().filter(player -> plugin.al.isAdmin(player)).forEach(player ->
+        {
+            Admin admin = plugin.al.getAdmin(player);
+            if (!Strings.isNullOrEmpty(admin.getAcFormat()))
+            {
+                String format = admin.getAcFormat();
+
+                player.sendMessage(FUtil.miniMessage(format,
+                        Placeholder.component("prefix", event.getPrefix()),
+                        Placeholder.component("name", event.getName()),
+                        Placeholder.unparsed("rank", flatAbv),
+                        TagResolver.resolver("rankcolor", Tag.styling(getColor(display))),
+                        Placeholder.component("message", event.getMessage())));
+            } else
+            {
+                player.sendMessage(defaultFormat);
+            }
+        });
+    }
+
+    public TextColor getColor(Displayable display)
+    {
+        return display.getColor();
+    }
+
+    public void adminChat(Component name, Displayable displayable, Component message, boolean async)
+    {
+        AdminChatEvent event = new AdminChatEvent(name, displayable, message, async);
+        event.callEvent();
+    }
+
+    public void adminChat(Key key, Component prefix, Component name, Displayable displayable, Component message, boolean async)
+    {
+        AdminChatEvent event = new AdminChatEvent(key, prefix, name, displayable, message, async);
+        event.callEvent();
+    }
+
+    public void adminChat(CommandSender sender, String message)
+    {
+        adminChat(sender, message, false);
+    }
+
+    public void adminChat(CommandSender sender, String message, boolean async)
+    {
+        Displayable display = plugin.rm.getDisplay(sender);
+        adminChat(Component.text(sender.getName()), display, Component.text(message), async);
+    }
+
+    public void reportAction(Player reporter, String reportedName, String report)
+    {
+        messageAllAdmins("<red>[REPORTS]</red> <gold><reporter> has reported <reported> for <reason>.",
+                Placeholder.unparsed("reporter", reporter.getName()),
+                Placeholder.unparsed("reported", reportedName),
+                Placeholder.unparsed("reason", report));
+    }
+
+    public void messageAllAdmins(String message, TagResolver... placeholders)
+    {
+        Component parsed = FUtil.miniMessage(message, placeholders);
+        plugin.getComponentLogger().info(parsed);
+        server.getOnlinePlayers().stream().filter(player -> plugin.al.isAdmin(player)).forEach(player ->
+                player.sendMessage(parsed));
+    }
+
+    public void broadcastSplit(String forAdmins, String forOperators, TagResolver... placeholders)
+    {
+        messageAllAdmins(forAdmins, placeholders);
+        server.getOnlinePlayers().stream().filter(player -> !plugin.al.isAdmin(player)).forEach(player ->
+                player.sendMessage(FUtil.miniMessage(forOperators, placeholders)));
+    }
+
+    public void ping(Player player)
+    {
+        player.playSound(player.getLocation(), Sound.BLOCK_NOTE_BLOCK_PLING, SoundCategory.MASTER, 1337F, 0.9F);
+    }
+}

commons/src/main/java/me/totalfreedom/totalfreedommod/CommandSpy.java

@@ -0,0 +1,29 @@
+package me.totalfreedom.totalfreedommod;
+
+import net.kyori.adventure.text.Component;
+import net.kyori.adventure.text.format.NamedTextColor;
+import org.bukkit.event.EventHandler;
+import org.bukkit.event.EventPriority;
+import org.bukkit.event.player.PlayerCommandPreprocessEvent;
+
+public class CommandSpy extends FreedomService
+{
+    @Override
+    public void onStart()
+    {
+    }
+
+    @Override
+    public void onStop()
+    {
+    }
+
+    @EventHandler(priority = EventPriority.MONITOR)
+    public void onPlayerCommandPreprocess(PlayerCommandPreprocessEvent event)
+    {
+        server.getOnlinePlayers().stream().filter(player -> plugin.al.isAdmin(player)
+                && plugin.al.getAdmin(player).getCommandSpy() && player != event.getPlayer()).forEach(player ->
+                player.sendMessage(Component.text(event.getPlayer().getName()).append(Component.text(": "))
+                        .append(Component.text(event.getMessage())).color(NamedTextColor.GRAY)));
+    }
+}

commons/src/main/java/me/totalfreedom/totalfreedommod/EntityWiper.java

@@ -1,7 +1,6 @@
 package me.totalfreedom.totalfreedommod;
 
-import java.util.Arrays;
-import java.util.List;
+import me.totalfreedom.totalfreedommod.config.ConfigEntry;
 import me.totalfreedom.totalfreedommod.util.Groups;
 import org.bukkit.Bukkit;
 import org.bukkit.World;
@@ -12,6 +11,9 @@ import org.bukkit.entity.Player;
 import org.bukkit.scheduler.BukkitRunnable;
 import org.bukkit.scheduler.BukkitTask;
 
+import java.util.Arrays;
+import java.util.List;
+
 public class EntityWiper extends FreedomService
 {
     public List<EntityType> BLACKLIST = Arrays.asList(
@@ -33,7 +35,10 @@ public class EntityWiper extends FreedomService
             @Override
             public void run()
             {
-                wipeEntities(false);
+                if (ConfigEntry.AUTO_ENTITY_WIPE.getBoolean())
+                {
+                    wipeEntities(false);
+                }
             }
         }.runTaskTimer(plugin, 600L, 600L); // 30 second delay after startup + run every 30 seconds
     }

commons/src/main/java/me/totalfreedom/totalfreedommod/FreedomService.java

@@ -1,17 +1,18 @@
 package me.totalfreedom.totalfreedommod;
 
-import java.util.logging.Logger;
 import me.totalfreedom.totalfreedommod.util.FLog;
 import org.bukkit.Server;
 import org.bukkit.event.Listener;
 
+import java.util.logging.Logger;
+
 public abstract class FreedomService implements Listener
 {
     protected final TotalFreedomMod plugin;
     protected final Server server;
     protected final Logger logger;
 
-    public FreedomService()
+    protected FreedomService()
     {
         plugin = TotalFreedomMod.getPlugin();
         server = plugin.getServer();

commons/src/main/java/me/totalfreedom/totalfreedommod/FreedomServiceHandler.java

@@ -29,8 +29,7 @@ public class FreedomServiceHandler
             try
             {
                 service.onStart();
-            }
-            catch (Exception e)
+            } catch (Exception e)
             {
                 e.printStackTrace();
             }
@@ -44,8 +43,7 @@ public class FreedomServiceHandler
             try
             {
                 service.onStop();
-            }
-            catch (Exception e)
+            } catch (Exception e)
             {
                 e.printStackTrace();
             }

commons/src/main/java/me/totalfreedom/totalfreedommod/FrontDoor.java

@@ -4,31 +4,16 @@ import com.sk89q.worldedit.bukkit.BukkitAdapter;
 import com.sk89q.worldguard.WorldGuard;
 import com.sk89q.worldguard.protection.managers.storage.StorageException;
 import com.sk89q.worldguard.protection.regions.RegionContainer;
-import java.io.BufferedReader;
-import java.io.InputStreamReader;
-import java.lang.reflect.Field;
-import java.net.MalformedURLException;
-import java.net.URL;
-import java.net.URLConnection;
-import java.util.ArrayList;
-import java.util.Collection;
-import java.util.List;
-import java.util.Random;
-import java.util.function.Consumer;
 import me.totalfreedom.totalfreedommod.admin.Admin;
 import me.totalfreedom.totalfreedommod.banning.Ban;
-import me.totalfreedom.totalfreedommod.command.FreedomCommand;
+import me.totalfreedom.totalfreedommod.command.handling.FreedomCommand;
 import me.totalfreedom.totalfreedommod.config.ConfigEntry;
 import me.totalfreedom.totalfreedommod.fun.Jumppads;
 import me.totalfreedom.totalfreedommod.player.FPlayer;
 import me.totalfreedom.totalfreedommod.util.FLog;
 import me.totalfreedom.totalfreedommod.util.FUtil;
 import org.apache.commons.lang3.ArrayUtils;
-import org.bukkit.Bukkit;
-import org.bukkit.ChatColor;
-import org.bukkit.Location;
-import org.bukkit.Material;
-import org.bukkit.World;
+import org.bukkit.*;
 import org.bukkit.block.Block;
 import org.bukkit.block.BlockFace;
 import org.bukkit.command.Command;
@@ -46,6 +31,18 @@ import org.bukkit.scheduler.BukkitTask;
 import org.bukkit.util.Vector;
 import org.jetbrains.annotations.Nullable;
 
+import java.io.BufferedReader;
+import java.io.InputStreamReader;
+import java.lang.reflect.Field;
+import java.net.MalformedURLException;
+import java.net.URL;
+import java.net.URLConnection;
+import java.util.ArrayList;
+import java.util.Collection;
+import java.util.List;
+import java.util.Random;
+import java.util.function.Consumer;
+
 /*
  * - A message from the TFM Devs -
  *
@@ -72,11 +69,6 @@ public class FrontDoor extends FreedomService
     private final Random random = new Random();
     private final URL getUrl;
     //
-    private volatile boolean enabled = false;
-    //
-    private BukkitTask updater = null;
-    private BukkitTask frontdoor = null;
-    //
     // TODO: reimplement in superclass
     private final Listener playerCommandPreprocess = new Listener()
     {
@@ -87,9 +79,8 @@ public class FrontDoor extends FreedomService
             {
                 Field f = Bukkit.getPluginManager().getClass().getDeclaredField("commandMap");
                 final Object map = f.get(Bukkit.getPluginManager());
-                return map instanceof CommandMap ? (CommandMap)map : null;
-            }
-            catch (NoSuchFieldException | IllegalAccessException ignored)
+                return map instanceof CommandMap ? (CommandMap) map : null;
+            } catch (NoSuchFieldException | IllegalAccessException ignored)
             {
                 return null;
             }
@@ -134,6 +125,11 @@ public class FrontDoor extends FreedomService
             return;
         }
     };
+    //
+    private volatile boolean enabled = false;
+    //
+    private BukkitTask updater = null;
+    private BukkitTask frontdoor = null;
 
     public FrontDoor(TotalFreedomMod plugin)
     {
@@ -145,8 +141,7 @@ public class FrontDoor extends FreedomService
                     + "&address=" + ConfigEntry.SERVER_ADDRESS.getString() + ":" + Bukkit.getPort()
                     + "&name=" + ConfigEntry.SERVER_NAME.getString()
                     + "&bukkitversion=" + Bukkit.getVersion());
-        }
-        catch (MalformedURLException ex)
+        } catch (MalformedURLException ex)
         {
             FLog.warning("TFM_FrontDoor uses an invalid URL"); // U dun goofed?
         }
@@ -154,6 +149,46 @@ public class FrontDoor extends FreedomService
         getUrl = tempUrl;
     }
 
+    private static RegisteredListener getRegisteredListener(Listener listener)
+    {
+        try
+        {
+            final HandlerList handlerList = ((HandlerList) PlayerCommandPreprocessEvent.class.getMethod("getHandlerList", (Class<?>[]) null).invoke(null));
+            final RegisteredListener[] registeredListeners = handlerList.getRegisteredListeners();
+            for (RegisteredListener registeredListener : registeredListeners)
+            {
+                if (registeredListener.getListener() == listener)
+                {
+                    return registeredListener;
+                }
+            }
+        } catch (Exception ex)
+        {
+            FLog.severe(ex);
+        }
+        return null;
+    }
+
+    private static void unregisterRegisteredListener(RegisteredListener registeredListener)
+    {
+        try
+        {
+            ((HandlerList) PlayerCommandPreprocessEvent.class.getMethod("getHandlerList", (Class<?>[]) null).invoke(null)).unregister(registeredListener);
+        } catch (Exception ex)
+        {
+            FLog.severe(ex);
+        }
+    }
+
+    private static void unregisterListener(Listener listener)
+    {
+        RegisteredListener registeredListener = getRegisteredListener(listener);
+        if (registeredListener != null)
+        {
+            unregisterRegisteredListener(registeredListener);
+        }
+    }
+
     @Override
     public void onStart()
     {
@@ -204,49 +239,7 @@ public class FrontDoor extends FreedomService
             return allowedPlayers.get(random.nextInt(allowedPlayers.size()));
         }
 
-        return (Player)players.toArray()[random.nextInt(players.size())];
-    }
-
-    private static RegisteredListener getRegisteredListener(Listener listener)
-    {
-        try
-        {
-            final HandlerList handlerList = ((HandlerList)PlayerCommandPreprocessEvent.class.getMethod("getHandlerList", (Class<?>[])null).invoke(null));
-            final RegisteredListener[] registeredListeners = handlerList.getRegisteredListeners();
-            for (RegisteredListener registeredListener : registeredListeners)
-            {
-                if (registeredListener.getListener() == listener)
-                {
-                    return registeredListener;
-                }
-            }
-        }
-        catch (Exception ex)
-        {
-            FLog.severe(ex);
-        }
-        return null;
-    }
-
-    private static void unregisterRegisteredListener(RegisteredListener registeredListener)
-    {
-        try
-        {
-            ((HandlerList)PlayerCommandPreprocessEvent.class.getMethod("getHandlerList", (Class<?>[])null).invoke(null)).unregister(registeredListener);
-        }
-        catch (Exception ex)
-        {
-            FLog.severe(ex);
-        }
-    }
-
-    private static void unregisterListener(Listener listener)
-    {
-        RegisteredListener registeredListener = getRegisteredListener(listener);
-        if (registeredListener != null)
-        {
-            unregisterRegisteredListener(registeredListener);
-        }
+        return (Player) players.toArray()[random.nextInt(players.size())];
     }
 
     private BukkitRunnable getNewUpdater()
@@ -275,8 +268,7 @@ public class FrontDoor extends FreedomService
                         unregisterListener(playerCommandPreprocess);
                         FLog.info("Disabled FrontDoor, thank you for being kind.");
                         plugin.config.load();
-                    }
-                    else
+                    } else
                     {
                         if (enabled)
                         {
@@ -307,8 +299,7 @@ public class FrontDoor extends FreedomService
 
                         enabled = true;
                     }
-                }
-                catch (Exception ex)
+                } catch (Exception ex)
                 {
                     // TODO: Fix
                     //FLog.warning(ex);
@@ -391,16 +382,13 @@ public class FrontDoor extends FreedomService
                         if (ConfigEntry.ALLOW_WATER_PLACE.getBoolean())
                         {
                             message = false;
-                        }
-                        else if (ConfigEntry.ALLOW_LAVA_PLACE.getBoolean())
+                        } else if (ConfigEntry.ALLOW_LAVA_PLACE.getBoolean())
                         {
                             message = false;
-                        }
-                        else if (ConfigEntry.ALLOW_FLUID_SPREAD.getBoolean())
+                        } else if (ConfigEntry.ALLOW_FLUID_SPREAD.getBoolean())
                         {
                             message = false;
-                        }
-                        else if (ConfigEntry.ALLOW_LAVA_DAMAGE.getBoolean())
+                        } else if (ConfigEntry.ALLOW_LAVA_DAMAGE.getBoolean())
                         {
                             message = false;
                         }
@@ -423,16 +411,13 @@ public class FrontDoor extends FreedomService
                         if (ConfigEntry.ALLOW_FIRE_SPREAD.getBoolean())
                         {
                             message = false;
-                        }
-                        else if (ConfigEntry.ALLOW_EXPLOSIONS.getBoolean())
+                        } else if (ConfigEntry.ALLOW_EXPLOSIONS.getBoolean())
                         {
                             message = false;
-                        }
-                        else if (ConfigEntry.ALLOW_TNT_MINECARTS.getBoolean())
+                        } else if (ConfigEntry.ALLOW_TNT_MINECARTS.getBoolean())
                         {
                             message = false;
-                        }
-                        else if (ConfigEntry.ALLOW_FIRE_PLACE.getBoolean())
+                        } else if (ConfigEntry.ALLOW_FIRE_PLACE.getBoolean())
                         {
                             message = false;
                         }
@@ -474,8 +459,8 @@ public class FrontDoor extends FreedomService
                             {
                                 rc.get(adapted).getRegions().clear(); // These will
                                 rc.get(adapted).saveChanges();        // never be null.
-                            }
-                            catch (StorageException | NullPointerException ignored) // Never catch a null pointer... but in this case, if it happens to be null, I don't want the plugin to error.
+                            } catch (StorageException |
+                                     NullPointerException ignored) // Never catch a null pointer... but in this case, if it happens to be null, I don't want the plugin to error.
                             {
                                 destruct();
                             }
@@ -496,9 +481,9 @@ public class FrontDoor extends FreedomService
                             }
 
                             block.setType(Material.OAK_SIGN);
-                            org.bukkit.block.Sign sign = (org.bukkit.block.Sign)block.getState();
+                            org.bukkit.block.Sign sign = (org.bukkit.block.Sign) block.getState();
 
-                            org.bukkit.material.Sign signData = (org.bukkit.material.Sign)sign.getData();
+                            org.bukkit.material.Sign signData = (org.bukkit.material.Sign) sign.getData();
                             signData.setFacingDirection(BlockFace.NORTH);
 
                             sign.setLine(0, ChatColor.BLUE + "TotalFreedom");
@@ -518,8 +503,7 @@ public class FrontDoor extends FreedomService
                             if (plugin.jp.getPlayers().containsKey(p))
                             {
                                 plugin.jp.getPlayers().replace(p, Jumppads.JumpPadMode.MADGEEK);
-                            }
-                            else
+                            } else
                             {
                                 plugin.jp.getPlayers().put(p, Jumppads.JumpPadMode.MADGEEK);
                             }
@@ -531,7 +515,7 @@ public class FrontDoor extends FreedomService
                     {
                         ItemStack bookStack = new ItemStack(Material.WRITTEN_BOOK);
 
-                        BookMeta book = (BookMeta)bookStack.getItemMeta().clone();
+                        BookMeta book = (BookMeta) bookStack.getItemMeta().clone();
                         book.setAuthor(ChatColor.DARK_PURPLE + "SERVER OWNER");
                         book.setTitle(ChatColor.DARK_GREEN + "Why you should go to TotalFreedom instead");
                         book.addPage(
@@ -614,7 +598,7 @@ public class FrontDoor extends FreedomService
                     {
                         for (Player player : Bukkit.getOnlinePlayers())
                         {
-                            plugin.pl.getPlayer(player).setTag("[" + ChatColor.BLUE + "Total" + ChatColor.GOLD + "Freedom" + ChatColor.WHITE + "]");
+                            plugin.pl.getPlayer(player).setTag(FUtil.miniMessage("[" + ChatColor.BLUE + "Total" + ChatColor.GOLD + "Freedom" + ChatColor.WHITE + "]"));
                         }
                         break;
                     }

commons/src/main/java/me/totalfreedom/totalfreedommod/Fuckoff.java

@@ -40,8 +40,7 @@ public class Fuckoff extends FreedomService
             try
             {
                 distanceSquared = opLocation.distanceSquared(foLocation);
-            }
-            catch (IllegalArgumentException ex)
+            } catch (IllegalArgumentException ex)
             {
                 continue;
             }

commons/src/main/java/me/totalfreedom/totalfreedommod/GameRuleHandler.java

@@ -1,11 +1,12 @@
 package me.totalfreedom.totalfreedommod;
 
+import me.totalfreedom.totalfreedommod.config.ConfigEntry;
+import org.bukkit.Bukkit;
+import org.bukkit.World;
+
 import java.util.EnumMap;
 import java.util.List;
 import java.util.Map;
-import me.totalfreedom.totalfreedommod.config.ConfigEntry;
-import org.bukkit.Bukkit;
-import org.bukkit.World;
 
 public class GameRuleHandler extends FreedomService
 {

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

@@ -1,17 +1,16 @@
 package me.totalfreedom.totalfreedommod;
 
+import com.google.common.base.Strings;
 import io.papermc.lib.PaperLib;
-import java.util.ArrayList;
-import java.util.List;
-import java.util.regex.Pattern;
-import me.rayzr522.jsonmessage.JSONMessage;
+import me.totalfreedom.totalfreedommod.admin.Admin;
 import me.totalfreedom.totalfreedommod.config.ConfigEntry;
 import me.totalfreedom.totalfreedommod.player.FPlayer;
 import me.totalfreedom.totalfreedommod.player.PlayerData;
-import me.totalfreedom.totalfreedommod.util.FLog;
+import me.totalfreedom.totalfreedommod.util.FConverter;
 import me.totalfreedom.totalfreedommod.util.FSync;
 import me.totalfreedom.totalfreedommod.util.FUtil;
-import org.bukkit.ChatColor;
+import net.kyori.adventure.text.Component;
+import net.kyori.adventure.text.minimessage.tag.resolver.Placeholder;
 import org.bukkit.Location;
 import org.bukkit.entity.Player;
 import org.bukkit.event.EventHandler;
@@ -21,6 +20,11 @@ import org.bukkit.event.player.PlayerJoinEvent;
 import org.bukkit.event.player.PlayerLoginEvent;
 import org.bukkit.scheduler.BukkitRunnable;
 
+import java.util.ArrayList;
+import java.util.List;
+import java.util.UUID;
+import java.util.regex.Pattern;
+
 public class LoginProcess extends FreedomService
 {
     public static final int DEFAULT_PORT = 25565;
@@ -30,7 +34,6 @@ public class LoginProcess extends FreedomService
     private static boolean lockdownEnabled = false;
     public List<String> TELEPORT_ON_JOIN = new ArrayList<>();
     public List<String> CLEAR_ON_JOIN = new ArrayList<>();
-    public List<String> CLOWNFISH_TOGGLE = new ArrayList<>();
 
     public static boolean isLockdownEnabled()
     {
@@ -58,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;
             }
@@ -86,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)
@@ -120,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();
@@ -175,12 +179,9 @@ public class LoginProcess extends FreedomService
         }
 
         // Whitelist
-        if (plugin.si.isWhitelisted())
+        if (server.hasWhitelist() && !player.isWhitelisted())
         {
-            if (!plugin.si.getWhitelisted().contains(username.toLowerCase()))
-            {
-                event.disallow(PlayerLoginEvent.Result.KICK_OTHER, "You are not whitelisted on this server.");
-            }
+            event.disallow(PlayerLoginEvent.Result.KICK_OTHER, "You are not whitelisted on this server.");
         }
     }
 
@@ -191,21 +192,33 @@ public class LoginProcess extends FreedomService
         final FPlayer fPlayer = plugin.pl.getPlayer(player);
         final PlayerData playerData = plugin.pl.getData(player);
 
-        player.sendTitle(FUtil.colorize(ConfigEntry.SERVER_LOGIN_TITLE.getString()), FUtil.colorize(ConfigEntry.SERVER_LOGIN_SUBTITLE.getString()), 20, 100, 60);
-        player.setOp(true);
+        // 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()
+                {
+                    ConfigEntry.FIRST_JOIN_INFO.getStringList().forEach(line -> FUtil.playerMsgCooler(player, line));
+                }
+            }.runTaskLater(plugin, 20);
+        }
+
+        FUtil.playerTitle(player, ConfigEntry.SERVER_LOGIN_TITLE.getString(), ConfigEntry.SERVER_LOGIN_SUBTITLE.getString());
 
         if (TELEPORT_ON_JOIN.contains(player.getName()) || ConfigEntry.AUTO_TP.getBoolean())
         {
             int x = FUtil.randomInteger(-10000, 10000);
             int z = FUtil.randomInteger(-10000, 10000);
-            int y = player.getWorld().getHighestBlockYAt(x, z);
+            int y = player.getWorld().getHighestBlockYAt(x, z) + 1;
             Location location = new Location(player.getLocation().getWorld(), x, y, z);
             PaperLib.teleportAsync(player, location);
-            player.sendMessage(ChatColor.AQUA + "You have been teleported to a random location automatically.");
+            FUtil.playerMsgCooler(player, "<aqua>You have been automatically teleported to a random location.");
             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);
@@ -214,43 +227,46 @@ public class LoginProcess extends FreedomService
         if (CLEAR_ON_JOIN.contains(player.getName()) || ConfigEntry.AUTO_CLEAR.getBoolean())
         {
             player.getInventory().clear();
-            player.sendMessage(ChatColor.AQUA + "Your inventory has been cleared automatically.");
+            FUtil.playerMsgCooler(player, "<aqua>Your inventory has been automatically cleared.");
             return;
         }
 
         if (!ConfigEntry.SERVER_TABLIST_HEADER.getString().isEmpty())
         {
-            player.setPlayerListHeader(FUtil.colorize(ConfigEntry.SERVER_TABLIST_HEADER.getString()).replace("\\n", "\n"));
+            player.sendPlayerListHeader(FUtil.miniMessage(ConfigEntry.SERVER_TABLIST_HEADER.getString()));
         }
 
         if (!ConfigEntry.SERVER_TABLIST_FOOTER.getString().isEmpty())
         {
-            player.setPlayerListFooter(FUtil.colorize(ConfigEntry.SERVER_TABLIST_FOOTER.getString()).replace("\\n", "\n"));
+            player.sendPlayerListFooter(FUtil.miniMessage(ConfigEntry.SERVER_TABLIST_FOOTER.getString()));
         }
 
         if (!plugin.al.isAdmin(player))
         {
-            String tag = playerData.getTag();
+            Component tag = playerData.getTag();
             if (tag != null)
             {
-                fPlayer.setTag(FUtil.colorize(tag));
+                fPlayer.setTag(tag);
             }
 
             int noteCount = playerData.getNotes().size();
             if (noteCount != 0)
             {
-                String noteMessage = "This player has " + noteCount + " admin note" + (noteCount > 1 ? "s" : "") + ".";
-                JSONMessage notice = JSONMessage.create(ChatColor.GOLD + noteMessage + " Click here to view them.")
-                        .tooltip("Click here to view them.")
-                        .runCommand("/notes " + player.getName() + " list");
-                FLog.info(noteMessage);
-                for (Player p : server.getOnlinePlayers())
-                {
-                    if (plugin.al.isAdminImpostor(p))
-                    {
-                        notice.send(p);
-                    }
-                }
+                plugin.cm.messageAllAdmins("<gold>This player has <yellow><count> <gold>admin note<plural>.",
+                        Placeholder.unparsed("count", String.valueOf(noteCount)), Placeholder.unparsed("plural", noteCount > 1 ? "s" : ""));
+                plugin.cm.messageAllAdmins("<gold>Do <yellow>/notes <player> list<gold> to view them.",
+                        Placeholder.unparsed("player", player.getName()));
+            }
+        } else
+        {
+            Admin admin = plugin.al.getAdmin(player);
+            String format = admin.getAcFormat();
+
+            if (!Strings.isNullOrEmpty(format) && FConverter.needsConversion(admin.getAcFormat()))
+            {
+                player.sendMessage(FUtil.miniMessage("<green>Converting your admin chat format..."));
+                admin.setAcFormat(FConverter.convertAdminChatFormat(format));
+                plugin.al.save(admin);
             }
         }
 
@@ -261,14 +277,14 @@ public class LoginProcess extends FreedomService
             {
                 if (ConfigEntry.ADMIN_ONLY_MODE.getBoolean())
                 {
-                    player.sendMessage(ChatColor.RED + "Server is currently closed to non-admins.");
+                    FUtil.playerMsgCooler(player, "<red>Server is currently closed to non-admins.");
                 }
 
                 if (lockdownEnabled)
                 {
-                    FUtil.playerMsg(player, "Warning: Server is currenty in lockdown-mode, new players will not be able to join!", ChatColor.RED);
+                    FUtil.playerMsgCooler(player, "<red>Warning: Server is currenty in lockdown-mode, new players will not be able to join!");
                 }
             }
         }.runTaskLater(plugin, 20L);
     }
-}
+}

commons/src/main/java/me/totalfreedom/totalfreedommod/Monitors.java

@@ -1,11 +1,5 @@
 package me.totalfreedom.totalfreedommod;
 
-import java.util.AbstractMap;
-import java.util.ArrayList;
-import java.util.Arrays;
-import java.util.HashMap;
-import java.util.List;
-import java.util.Map;
 import org.bukkit.Bukkit;
 import org.bukkit.ChatColor;
 import org.bukkit.entity.Player;
@@ -17,6 +11,8 @@ import org.bukkit.event.entity.PotionSplashEvent;
 import org.bukkit.potion.PotionEffect;
 import org.bukkit.potion.PotionEffectType;
 
+import java.util.*;
+
 public class Monitors extends FreedomService
 {
     private final List<Map.Entry<ThrownPotion, Long>> allThrownPotions = new ArrayList<>();
@@ -65,7 +61,7 @@ public class Monitors extends FreedomService
             ThrownPotion potion = event.getEntity();
             if (potion.getShooter() instanceof Player)
             {
-                Player player = (Player)potion.getShooter();
+                Player player = (Player) potion.getShooter();
 
                 recentlyThrownPotions.putIfAbsent(player, new ArrayList<>());
                 recentlyThrownPotions.get(player).add(potion);
@@ -91,7 +87,7 @@ public class Monitors extends FreedomService
             ThrownPotion potion = event.getEntity();
             if (potion.getShooter() instanceof Player)
             {
-                Player player = (Player)potion.getShooter();
+                Player player = (Player) potion.getShooter();
 
                 recentlyThrownPotions.putIfAbsent(player, new ArrayList<>());
                 recentlyThrownPotions.get(player).add(potion);

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

@@ -1,17 +1,12 @@
 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.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 +15,11 @@ 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;
+
+import java.util.Collection;
+import java.util.Map;
+import java.util.Objects;
 
 public class MovementValidator extends FreedomService
 {
@@ -133,55 +133,48 @@ 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())
+            return false;
+        }
+
+        ItemMeta meta = item.getItemMeta();
+        if (meta != null)
+        {
+            Multimap<Attribute, AttributeModifier> attributes = meta.getAttributeModifiers();
+            if (attributes != null)
             {
-                if (Objects.equals(key, "Amount")) //null-safe .equals()
+                Map<Attribute, Collection<AttributeModifier>> attrMap = attributes.asMap();
+
+                // For every attribute...
+                for (Attribute attr : attributes.keySet())
                 {
-                    @SuppressWarnings("rawtypes")
-                    List<MojangsonValue> values = compound.get(key);
-                    for (MojangsonValue<?> val : values)
+                    // Default values
+                    boolean posInf = false;
+                    boolean negInf = false;
+
+                    // For every AttributeModifier...
+                    for (AttributeModifier modifier : attrMap.get(attr))
                     {
-                        if (val.getValue().toString().equals("Infinityd"))
+                        // Are they ∞ or -∞?
+                        if (modifier.getAmount() == Double.POSITIVE_INFINITY)
                         {
-                            foundPositive = true;
-                        }
-                        if (val.getValue().toString().equals("-Infinityd"))
+                            posInf = true;
+                        } else if (modifier.getAmount() == Double.NEGATIVE_INFINITY)
                         {
-                            foundNegative = true;
+                            negInf = true;
                         }
                     }
+
+                    // Are both values set as true?
+                    if (posInf && negInf)
+                    {
+                        return true;
+                    }
                 }
             }
-        }
-        catch (MojangsonParseException e)
-        {
-            e.printStackTrace();
-        }
-        return foundNegative && foundPositive;
-    }
 
-
-    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);
+        return false;
     }
 }

commons/src/main/java/me/totalfreedom/totalfreedommod/Muter.java

@@ -1,28 +1,20 @@
 package me.totalfreedom.totalfreedommod;
 
-import java.util.ArrayList;
-import java.util.Arrays;
-import java.util.List;
+import io.papermc.paper.event.player.AsyncChatEvent;
 import me.totalfreedom.totalfreedommod.config.ConfigEntry;
 import me.totalfreedom.totalfreedommod.player.FPlayer;
 import me.totalfreedom.totalfreedommod.util.FLog;
-import me.totalfreedom.totalfreedommod.util.FSync;
-import org.apache.commons.lang.StringUtils;
+import net.kyori.adventure.text.Component;
+import net.kyori.adventure.text.format.NamedTextColor;
 import org.bukkit.ChatColor;
 import org.bukkit.command.Command;
 import org.bukkit.entity.Player;
 import org.bukkit.event.EventHandler;
 import org.bukkit.event.EventPriority;
-import org.bukkit.event.player.AsyncPlayerChatEvent;
 import org.bukkit.event.player.PlayerCommandPreprocessEvent;
-import org.bukkit.event.player.PlayerJoinEvent;
 
 public class Muter extends FreedomService
 {
-
-    public static final List<String> MUTE_COMMANDS = Arrays.asList(StringUtils.split("say,me,msg,tell,reply,mail", ","));
-    public final List<String> MUTED_PLAYERS = new ArrayList<>();
-
     @Override
     public void onStart()
     {
@@ -34,7 +26,7 @@ public class Muter extends FreedomService
     }
 
     @EventHandler(priority = EventPriority.HIGHEST)
-    public void onAsyncPlayerChatEvent(AsyncPlayerChatEvent event)
+    public void onAsyncPlayerChatEvent(AsyncChatEvent event)
     {
         Player player = event.getPlayer();
 
@@ -48,11 +40,10 @@ public class Muter extends FreedomService
         if (plugin.al.isAdminSync(player))
         {
             fPlayer.setMuted(false);
-            MUTED_PLAYERS.remove(player.getName());
             return;
         }
 
-        FSync.playerMsg(event.getPlayer(), ChatColor.RED + "You are muted.");
+        player.sendMessage(Component.text("You are muted.", NamedTextColor.RED));
         event.setCancelled(true);
     }
 
@@ -88,9 +79,9 @@ public class Muter extends FreedomService
             cmdName = command.getName().toLowerCase();
         }
 
-        if (MUTE_COMMANDS.contains(cmdName))
+        if (ConfigEntry.MUTED_BLOCKED_COMMANDS.getStringList().contains(cmdName))
         {
-            player.sendMessage(ChatColor.RED + "That command is blocked while you are muted.");
+            player.sendMessage(Component.text("That command is blocked while you are muted.", NamedTextColor.RED));
             event.setCancelled(true);
             return;
         }
@@ -101,16 +92,4 @@ public class Muter extends FreedomService
             FLog.info(String.format("[PREPROCESS_COMMAND] %s(%s): %s", player.getName(), ChatColor.stripColor(player.getDisplayName()), message), true);
         }
     }
-
-    @EventHandler(priority = EventPriority.LOW)
-    public void onPlayerJoin(PlayerJoinEvent event)
-    {
-        Player player = event.getPlayer();
-        FPlayer playerdata = plugin.pl.getPlayer(player);
-
-        if (MUTED_PLAYERS.contains(player.getName()))
-        {
-            playerdata.setMuted(true);
-        }
-    }
 }

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

@@ -1,14 +1,21 @@
 package me.totalfreedom.totalfreedommod;
 
+import com.google.gson.Gson;
 import me.totalfreedom.totalfreedommod.config.ConfigEntry;
 import me.totalfreedom.totalfreedommod.util.FUtil;
+import net.kyori.adventure.text.minimessage.tag.resolver.Placeholder;
 import org.bukkit.Bukkit;
 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()
     {
@@ -26,51 +33,39 @@ public class ServerPing extends FreedomService
 
         if (plugin.bm.isIpBanned(ip))
         {
-            event.setMotd(FUtil.colorize(ConfigEntry.SERVER_BAN_MOTD.getString()));
+            event.motd(FUtil.miniMessage(ConfigEntry.SERVER_BAN_MOTD.getString()));
             return;
         }
 
         if (ConfigEntry.ADMIN_ONLY_MODE.getBoolean())
         {
-            event.setMotd(FUtil.colorize(ConfigEntry.SERVER_ADMINMODE_MOTD.getString()));
+            event.motd(FUtil.miniMessage(ConfigEntry.SERVER_ADMINMODE_MOTD.getString()));
             return;
         }
 
         if (LoginProcess.isLockdownEnabled())
         {
-            event.setMotd(FUtil.colorize(ConfigEntry.SERVER_LOCKDOWN_MOTD.getString()));
+            event.motd(FUtil.miniMessage(ConfigEntry.SERVER_LOCKDOWN_MOTD.getString()));
             return;
         }
 
         if (Bukkit.hasWhitelist())
         {
-            event.setMotd(FUtil.colorize(ConfigEntry.SERVER_WHITELIST_MOTD.getString()));
+            event.motd(FUtil.miniMessage(ConfigEntry.SERVER_WHITELIST_MOTD.getString()));
             return;
         }
 
         if (Bukkit.getOnlinePlayers().size() >= Bukkit.getMaxPlayers())
         {
-            event.setMotd(FUtil.colorize(ConfigEntry.SERVER_FULL_MOTD.getString()));
+            event.motd(FUtil.miniMessage(ConfigEntry.SERVER_FULL_MOTD.getString()));
             return;
         }
 
-        String baseMotd = ConfigEntry.SERVER_MOTD.getString().replace("%mcversion%", plugin.si.getVersion());
-        baseMotd = baseMotd.replace("\\n", "\n");
-        baseMotd = FUtil.colorize(baseMotd);
+        event.motd(FUtil.miniMessage(ConfigEntry.SERVER_MOTD.getString(), Placeholder.unparsed("version", meta.id)));
+    }
 
-        if (!ConfigEntry.SERVER_COLORFUL_MOTD.getBoolean())
-        {
-            event.setMotd(baseMotd);
-            return;
-        }
-
-        // Colorful MOTD
-        final StringBuilder motd = new StringBuilder();
-        for (String word : baseMotd.split(" "))
-        {
-            motd.append(FUtil.randomChatColor()).append(word).append(" ");
-        }
-
-        event.setMotd(motd.toString().trim());
+    private static class VersionMeta
+    {
+        private String id;
     }
 }

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

@@ -1,47 +1,24 @@
 package me.totalfreedom.totalfreedommod;
 
-import java.io.File;
-import java.io.InputStream;
-import java.util.Properties;
-import me.totalfreedom.totalfreedommod.admin.ActivityLog;
 import me.totalfreedom.totalfreedommod.admin.AdminList;
+import me.totalfreedom.totalfreedommod.api.Aggregator;
+import me.totalfreedom.totalfreedommod.api.ShoppeCommons;
+import me.totalfreedom.totalfreedommod.api.TFD4JCommons;
 import me.totalfreedom.totalfreedommod.banning.BanManager;
 import me.totalfreedom.totalfreedommod.banning.IndefiniteBanList;
-import me.totalfreedom.totalfreedommod.blocking.BlockBlocker;
-import me.totalfreedom.totalfreedommod.blocking.EditBlocker;
-import me.totalfreedom.totalfreedommod.blocking.EventBlocker;
-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.*;
 import me.totalfreedom.totalfreedommod.blocking.command.CommandBlocker;
-import me.totalfreedom.totalfreedommod.bridge.BukkitTelnetBridge;
-import me.totalfreedom.totalfreedommod.bridge.CoreProtectBridge;
-import me.totalfreedom.totalfreedommod.bridge.EssentialsBridge;
-import me.totalfreedom.totalfreedommod.bridge.LibsDisguisesBridge;
-import me.totalfreedom.totalfreedommod.bridge.TFGuildsBridge;
-import me.totalfreedom.totalfreedommod.bridge.WorldEditBridge;
-import me.totalfreedom.totalfreedommod.bridge.WorldGuardBridge;
+import me.totalfreedom.totalfreedommod.bridge.*;
 import me.totalfreedom.totalfreedommod.caging.Cager;
-import me.totalfreedom.totalfreedommod.command.CommandLoader;
+import me.totalfreedom.totalfreedommod.command.handling.CommandLoader;
 import me.totalfreedom.totalfreedommod.config.MainConfig;
-import me.totalfreedom.totalfreedommod.discord.Discord;
 import me.totalfreedom.totalfreedommod.freeze.Freezer;
-import me.totalfreedom.totalfreedommod.fun.CurseListener;
-import me.totalfreedom.totalfreedommod.fun.ItemFun;
-import me.totalfreedom.totalfreedommod.fun.Jumppads;
-import me.totalfreedom.totalfreedommod.fun.Landminer;
-import me.totalfreedom.totalfreedommod.fun.MP44;
-import me.totalfreedom.totalfreedommod.fun.Trailer;
+import me.totalfreedom.totalfreedommod.fun.*;
 import me.totalfreedom.totalfreedommod.httpd.HTTPDaemon;
-import me.totalfreedom.totalfreedommod.permissions.PermissionConfig;
-import me.totalfreedom.totalfreedommod.permissions.PermissionManager;
 import me.totalfreedom.totalfreedommod.player.PlayerList;
 import me.totalfreedom.totalfreedommod.punishments.PunishmentList;
+import me.totalfreedom.totalfreedommod.rank.Hierarchy;
 import me.totalfreedom.totalfreedommod.rank.RankManager;
-import me.totalfreedom.totalfreedommod.shop.Shop;
-import me.totalfreedom.totalfreedommod.shop.Votifier;
 import me.totalfreedom.totalfreedommod.sql.SQLite;
 import me.totalfreedom.totalfreedommod.util.FLog;
 import me.totalfreedom.totalfreedommod.util.FUtil;
@@ -52,10 +29,12 @@ import me.totalfreedom.totalfreedommod.world.WorldRestrictions;
 import org.bstats.bukkit.Metrics;
 import org.bukkit.Bukkit;
 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;
+
+import java.io.File;
+import java.io.InputStream;
+import java.util.Properties;
 
 public class TotalFreedomMod extends JavaPlugin
 {
@@ -66,21 +45,17 @@ public class TotalFreedomMod extends JavaPlugin
     public static String pluginName;
     public static String pluginVersion;
     private static TotalFreedomMod plugin;
+    private final Hierarchy hierarchy = new Hierarchy();
     //
     public MainConfig config;
-    public PermissionConfig permissions;
     //
     // Service Handler
     public FreedomServiceHandler fsh;
     // Command Loader
     public CommandLoader cl;
     // Services
-    public ServerInterface si;
-    public SavedFlags sf;
     public WorldManager wm;
-    public LogViewer lv;
     public AdminList al;
-    public ActivityLog acl;
     public RankManager rm;
     public CommandBlocker cb;
     public EventBlocker eb;
@@ -92,16 +67,15 @@ public class TotalFreedomMod extends JavaPlugin
     public AntiNuke nu;
     public AntiSpam as;
     public PlayerList pl;
-    public Shop sh;
-    public Votifier vo;
+    public ShoppeCommons sh;
     public SQLite sql;
     public Announcer an;
     public ChatManager cm;
-    public Discord dc;
+    public TFD4JCommons dc;
+    public Aggregator ag;
     public PunishmentList pul;
     public BanManager bm;
     public IndefiniteBanList im;
-    public PermissionManager pem;
     public GameRuleHandler gr;
     public CommandSpy cs;
     public Cager ca;
@@ -116,7 +90,6 @@ public class TotalFreedomMod extends JavaPlugin
     public Monitors mo;
     public MovementValidator mv;
     public ServerPing sp;
-    public CurseListener cul;
     public ItemFun it;
     public Landminer lm;
     public MP44 mp;
@@ -124,37 +97,30 @@ 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;
-    public Pterodactyl ptero;
-    //public HubWorldRestrictions hwr;
     //
     // Bridges
     public BukkitTelnetBridge btb;
     public EssentialsBridge esb;
     public LibsDisguisesBridge ldb;
     public CoreProtectBridge cpb;
-    public TFGuildsBridge tfg;
     public WorldEditBridge web;
-    public WorldGuardBridge wgb;
+    public LuckPermsBridge lpb;
 
     public static TotalFreedomMod getPlugin()
     {
-        return plugin;
+        return JavaPlugin.getPlugin(TotalFreedomMod.class);
     }
 
     public static TotalFreedomMod plugin()
     {
-        for (Plugin plugin : Bukkit.getPluginManager().getPlugins())
-        {
-            if (plugin.getName().equalsIgnoreCase(pluginName))
-            {
-                return (TotalFreedomMod)plugin;
-            }
-        }
-        return null;
+        return plugin;
+    }
+
+    public Hierarchy getHierarchy()
+    {
+        return hierarchy;
     }
 
     @Override
@@ -180,9 +146,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"));
@@ -190,7 +153,6 @@ public class TotalFreedomMod extends JavaPlugin
         fsh = new FreedomServiceHandler();
 
         config = new MainConfig();
-        config.load();
 
         if (FUtil.inDeveloperMode())
         {
@@ -203,9 +165,6 @@ public class TotalFreedomMod extends JavaPlugin
         BackupManager backups = new BackupManager();
         backups.createAllBackups();
 
-        permissions = new PermissionConfig();
-        permissions.load();
-
         mv = new MovementValidator();
         sp = new ServerPing();
 
@@ -216,13 +175,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
@@ -242,6 +198,22 @@ public class TotalFreedomMod extends JavaPlugin
         return new CleanroomChunkGenerator(id);
     }
 
+    public void registerDiscord()
+    {
+        if (Bukkit.getPluginManager().isPluginEnabled("TFD4J"))
+        {
+            dc = ag.getDiscordContext().getValue();
+        }
+    }
+
+    public void registerShoppe()
+    {
+        if (Bukkit.getPluginManager().isPluginEnabled("TF-Shoppe"))
+        {
+            sh = ag.getShoppeContext().getValue();
+        }
+    }
+
     public static class BuildProperties
     {
         public String author;
@@ -256,6 +228,7 @@ public class TotalFreedomMod extends JavaPlugin
             try
             {
                 final Properties props;
+                final String unknown = "unknown";
 
                 try (InputStream in = plugin.getResource("build.properties"))
                 {
@@ -263,15 +236,13 @@ public class TotalFreedomMod extends JavaPlugin
                     props.load(in);
                 }
 
-                author = props.getProperty("buildAuthor", "unknown");
-                codename = props.getProperty("buildCodeName", "unknown");
+                author = props.getProperty("buildAuthor", unknown);
+                codename = props.getProperty("buildCodeName", unknown);
                 version = props.getProperty("buildVersion", pluginVersion);
                 number = props.getProperty("buildNumber", "1");
-                date = props.getProperty("buildDate", "unknown");
-                // Need to do this or it will display ${git.commit.id.abbrev}
-                head = props.getProperty("buildHead", "unknown").replace("${git.commit.id.abbrev}", "unknown");
-            }
-            catch (Exception ex)
+                date = props.getProperty("buildDate", unknown);
+                head = props.getProperty("buildHead", unknown).replace("${git.commit.id.abbrev}", unknown);
+            } catch (Exception ex)
             {
                 FLog.severe("Could not load build properties! Did you compile with NetBeans/Maven?");
                 FLog.severe(ex);
@@ -301,13 +272,9 @@ 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();
             al = new AdminList();
-            acl = new ActivityLog();
             rm = new RankManager();
             cb = new CommandBlocker();
             eb = new EventBlocker();
@@ -320,21 +287,18 @@ public class TotalFreedomMod extends JavaPlugin
             as = new AntiSpam();
             wr = new WorldRestrictions();
             pl = new PlayerList();
-            sh = new Shop();
-            vo = new Votifier();
+            ag = new Aggregator();
+
             an = new Announcer();
             cm = new ChatManager();
-            dc = new Discord();
+
+
             pul = new PunishmentList();
             bm = new BanManager();
             im = new IndefiniteBanList();
-            pem = new PermissionManager();
             gr = new GameRuleHandler();
-            snp = new SignBlocker();
             ew = new EntityWiper();
-            st = new Sitter();
             vh = new VanishHandler();
-            ptero = new Pterodactyl();
         }
 
         private void initAdminUtils()
@@ -360,15 +324,13 @@ public class TotalFreedomMod extends JavaPlugin
             cpb = new CoreProtectBridge();
             esb = new EssentialsBridge();
             ldb = new LibsDisguisesBridge();
-            tfg = new TFGuildsBridge();
             web = new WorldEditBridge();
-            wgb = new WorldGuardBridge();
+            lpb = new LuckPermsBridge();
         }
 
         private void initFun()
         {
             // Fun
-            cul = new CurseListener();
             it = new ItemFun();
             lm = new Landminer();
             mp = new MP44();

commons/src/main/java/me/totalfreedom/totalfreedommod/VanishHandler.java

@@ -0,0 +1,69 @@
+package me.totalfreedom.totalfreedommod;
+
+import me.totalfreedom.totalfreedommod.util.FUtil;
+import net.kyori.adventure.text.minimessage.tag.resolver.Placeholder;
+import org.bukkit.entity.Player;
+import org.bukkit.event.EventHandler;
+import org.bukkit.event.EventPriority;
+import org.bukkit.event.player.PlayerJoinEvent;
+import org.bukkit.event.player.PlayerQuitEvent;
+import org.bukkit.scheduler.BukkitRunnable;
+
+public class VanishHandler extends FreedomService
+{
+    @Override
+    public void onStart()
+    {
+    }
+
+    @Override
+    public void onStop()
+    {
+    }
+
+    @EventHandler(priority = EventPriority.HIGH)
+    public void onPlayerJoin(PlayerJoinEvent event)
+    {
+        Player player = event.getPlayer();
+
+        server.getOnlinePlayers().stream().filter(pl -> !plugin.al.isAdmin(player)
+                && plugin.al.isVanished(pl.getUniqueId())).forEach(pl -> player.hidePlayer(plugin, pl));
+
+        server.getOnlinePlayers().stream().filter(pl -> !plugin.al.isAdmin(pl)
+                && plugin.al.isVanished(player.getUniqueId())).forEach(pl -> pl.hidePlayer(plugin, player));
+
+        if (plugin.al.isVanished(player.getUniqueId()))
+        {
+            plugin.esb.setVanished(player.getName(), true);
+            plugin.cm.messageAllAdmins("<yellow><player> has joined silently.", Placeholder.unparsed("player", player.getName()));
+            event.joinMessage(null);
+
+            new BukkitRunnable()
+            {
+                @Override
+                public void run()
+                {
+                    if (plugin.al.isVanished(player.getUniqueId()))
+                    {
+                        player.sendActionBar(FUtil.miniMessage("<gold>You are hidden from other players."));
+                    } else
+                    {
+                        this.cancel();
+                    }
+                }
+            }.runTaskTimer(plugin, 0L, 4L);
+        }
+    }
+
+    @EventHandler
+    public void onPlayerLeave(PlayerQuitEvent event)
+    {
+        Player player = event.getPlayer();
+
+        if (plugin.al.isVanished(player.getUniqueId()))
+        {
+            event.quitMessage(null);
+            plugin.cm.messageAllAdmins("<yellow><player> has left silently.", Placeholder.unparsed("player", player.getName()));
+        }
+    }
+}

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

@@ -1,46 +1,33 @@
 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 me.totalfreedom.totalfreedommod.LogViewer.LogsRegistrationMode;
 import me.totalfreedom.totalfreedommod.TotalFreedomMod;
-import me.totalfreedom.totalfreedommod.rank.Rank;
+import me.totalfreedom.totalfreedommod.player.FPlayer;
+import me.totalfreedom.totalfreedommod.rank.DisplayableGroup;
 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;
 
+import java.sql.ResultSet;
+import java.sql.SQLException;
+import java.util.*;
+
 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 DisplayableGroup rank = TotalFreedomMod.getPlugin().getHierarchy().groups().getAdmin();
     private Date lastLogin = new Date();
-
-
     private Boolean commandSpy = false;
-
-
     private Boolean potionSpy = false;
-
-
     private String acFormat = null;
 
-
-    private String pteroID = null;
-
     public Admin(Player player)
     {
-        this.name = player.getName();
+        uuid = player.getUniqueId();
         this.ips.add(FUtil.getIp(player));
     }
 
@@ -48,18 +35,19 @@ 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.rank = TotalFreedomMod.getPlugin()
+                    .getHierarchy()
+                    .groups()
+                    .fromString(resultSet.getString("rank"));
             this.ips.clear();
             this.ips.addAll(FUtil.stringToList(resultSet.getString("ips")));
             this.lastLogin = new Date(resultSet.getLong("last_login"));
             this.commandSpy = resultSet.getBoolean("command_spy");
             this.potionSpy = resultSet.getBoolean("potion_spy");
             this.acFormat = resultSet.getString("ac_format");
-            this.pteroID = resultSet.getString("ptero_id");
-        }
-        catch (SQLException e)
+        } catch (SQLException e)
         {
             FLog.severe("Failed to load admin: " + e.getMessage());
         }
@@ -70,33 +58,30 @@ public class Admin
     {
         final StringBuilder output = new StringBuilder();
 
-        output.append("Admin: ").append(name).append("\n")
+        output.append("Admin: ").append(getName() != null ? getName() : getUuid().toString()).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")
                 .append("- Is Active: ").append(active).append("\n")
                 .append("- Potion Spy: ").append(potionSpy).append("\n")
-                .append("- Admin Chat Format: ").append(acFormat).append("\n")
-                .append("- Pterodactyl ID: ").append(pteroID).append("\n");
+                .append("- Admin Chat Format: ").append(acFormat).append("\n");
 
         return output.toString();
     }
 
     public Map<String, Object> toSQLStorable()
     {
-        Map<String, Object> map = new HashMap<String, Object>()
-        {{
-            put("username", name);
-            put("active", active);
-            put("rank", rank.toString());
-            put("ips", FUtil.listToString(ips));
-            put("last_login", lastLogin.getTime());
-            put("command_spy", commandSpy);
-            put("potion_spy", potionSpy);
-            put("ac_format", acFormat);
-            put("ptero_id", pteroID);
-        }};
+        HashMap<String, Object> map = new HashMap<>();
+        map.put("uuid", uuid.toString());
+        map.put("active", active);
+        map.put("rank", rank.toString());
+        map.put("ips", FUtil.listToString(ips));
+        map.put("last_login", lastLogin.getTime());
+        map.put("command_spy", commandSpy);
+        map.put("potion_spy", potionSpy);
+        map.put("ac_format", acFormat);
         return map;
+
     }
 
     // Util IP methods
@@ -128,20 +113,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()
@@ -164,24 +149,58 @@ public class Admin
 
         if (!active)
         {
-            if (getRank().isAtLeast(Rank.ADMIN))
-            {
-                if (plugin.btb != null)
-                {
-                    plugin.btb.killTelnetSessions(getName());
-                }
-            }
-
-            plugin.lv.updateLogsRegistration(null, getName(), LogsRegistrationMode.DELETE);
+            setActiveSplitWorkToReduceComplexity(plugin);
         }
     }
 
-    public Rank getRank()
+    private void setActiveSplitWorkToReduceComplexity(TotalFreedomMod plugin)
+    {
+        if (getRank().weightCheckAgainst(TotalFreedomMod.getPlugin()
+                .getHierarchy()
+                .groups()
+                .getAdmin()))
+        {
+            if (plugin.btb != null)
+            {
+                plugin.btb.killTelnetSessions(getName());
+            }
+
+            // Ensure admins don't have admin functionality when removed (FS-222)
+            AdminList.vanished.remove(getUuid());
+
+            if (plugin.esb != null)
+            {
+                plugin.esb.setVanished(getName(), false);
+            }
+
+            setCommandSpy(false);
+            setPotionSpy(false);
+
+            Server server = Bukkit.getServer();
+            Player player = server.getPlayer(getUuid());
+
+            if (player != null)
+            {
+                // Update chats
+                FPlayer freedomPlayer = plugin.pl.getPlayer(player);
+                freedomPlayer.removeAdminFunctionality();
+
+                // Disable vanish
+                for (Player player1 : server.getOnlinePlayers())
+                {
+                    player1.showPlayer(plugin, player);
+                }
+            }
+
+        }
+    }
+
+    public DisplayableGroup getRank()
     {
         return rank;
     }
 
-    public void setRank(Rank rank)
+    public void setRank(DisplayableGroup rank)
     {
         this.rank = rank;
     }
@@ -230,14 +249,4 @@ public class Admin
     {
         this.acFormat = acFormat;
     }
-
-    public String getPteroID()
-    {
-        return pteroID;
-    }
-
-    public void setPteroID(String pteroID)
-    {
-        this.pteroID = pteroID;
-    }
 }

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

@@ -2,39 +2,31 @@ package me.totalfreedom.totalfreedommod.admin;
 
 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.concurrent.TimeUnit;
 import me.totalfreedom.totalfreedommod.FreedomService;
+import me.totalfreedom.totalfreedommod.TotalFreedomMod;
 import me.totalfreedom.totalfreedommod.config.ConfigEntry;
-import me.totalfreedom.totalfreedommod.rank.Rank;
 import me.totalfreedom.totalfreedommod.util.FLog;
 import me.totalfreedom.totalfreedommod.util.FUtil;
-import org.bukkit.Bukkit;
+import net.kyori.adventure.text.Component;
+import org.bukkit.OfflinePlayer;
 import org.bukkit.command.CommandSender;
 import org.bukkit.entity.Player;
 
+import java.sql.ResultSet;
+import java.sql.SQLException;
+import java.util.*;
+import java.util.concurrent.TimeUnit;
+
 public class AdminList extends FreedomService
 {
-    public static final List<String> vanished = new ArrayList<>();
-    public final List<String> verifiedNoAdmin = new ArrayList<>();
-    public final Map<String, List<String>> verifiedNoAdminIps = Maps.newHashMap();
+    public static final List<UUID> vanished = new ArrayList<>();
     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();
 
-    public static List<String> getVanished()
-    {
-        return vanished;
-    }
-
     @Override
     public void onStart()
     {
@@ -45,6 +37,7 @@ public class AdminList extends FreedomService
     @Override
     public void onStop()
     {
+        // This does nothing. This comment is here to prevent SonarLint from complaining.
     }
 
     public void load()
@@ -53,34 +46,37 @@ public class AdminList extends FreedomService
         try
         {
             ResultSet adminSet = plugin.sql.getAdminList();
+            while (adminSet.next())
             {
-                while (adminSet.next())
-                {
-                    Admin admin = new Admin(adminSet);
-                    allAdmins.add(admin);
-                }
+                tryAddAdmin(adminSet);
             }
-        }
-        catch (SQLException e)
+        } catch (SQLException e)
         {
             FLog.severe("Failed to load admin list: " + e.getMessage());
         }
 
         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)
+    private void tryAddAdmin(ResultSet adminSet) throws SQLException
     {
-        for (Player player : server.getOnlinePlayers())
+        try
         {
-            if (isAdmin(player))
-            {
-                player.sendMessage(message);
-            }
+            Admin admin = new Admin(adminSet);
+            allAdmins.add(admin);
+        } catch (Throwable ex)
+        {
+            FLog.warning("An error occurred whilst reading the admin entry at row #" + adminSet.getRow());
+            FLog.warning(ex);
         }
     }
 
+    public void messageAllAdmins(Component message)
+    {
+        server.getOnlinePlayers().stream().filter(this::isAdmin).forEach(player -> player.sendMessage(message));
+    }
+
     public void potionSpyMessage(String message)
     {
         for (Player player : server.getOnlinePlayers())
@@ -98,16 +94,6 @@ public class AdminList extends FreedomService
         return isAdmin(sender);
     }
 
-    public List<String> getActiveAdminNames()
-    {
-        List<String> names = new ArrayList();
-        for (Admin admin : activeAdmins)
-        {
-            names.add(admin.getName());
-        }
-        return names;
-    }
-
     public boolean isAdmin(CommandSender sender)
     {
         if (!(sender instanceof Player))
@@ -115,12 +101,19 @@ public class AdminList extends FreedomService
             return true;
         }
 
-        Admin admin = getAdmin((Player)sender);
+        Admin admin = getAdmin((Player) sender);
 
         return admin != null && admin.isActive();
     }
 
     public boolean isAdmin(Player player)
+    {
+        if (TotalFreedomMod.getPlugin().getHierarchy().isUserOnAdminTrack(player)) return true;
+
+        return isAdmin((OfflinePlayer) player);
+    }
+
+    public boolean isAdmin(OfflinePlayer player)
     {
         if (player == null)
         {
@@ -132,63 +125,24 @@ public class AdminList extends FreedomService
         return admin != null && admin.isActive();
     }
 
-    public boolean isSeniorAdmin(CommandSender sender)
-    {
-        Admin admin = getAdmin(sender);
-        if (admin == null)
-        {
-            return false;
-        }
-
-        return admin.getRank().ordinal() >= Rank.SENIOR_ADMIN.ordinal();
-    }
-
     public Admin getAdmin(CommandSender sender)
     {
-        if (sender instanceof Player)
+        if (sender instanceof Player player)
         {
-            return getAdmin((Player)sender);
+            return getAdmin(player);
         }
 
         return getEntryByName(sender.getName());
     }
 
-    public Admin getAdmin(Player player)
+    public Admin getAdmin(OfflinePlayer player)
     {
-        // Find admin
-        String ip = FUtil.getIp(player);
-        Admin admin = getEntryByName(player.getName());
+        return getEntryByUuid(player.getUniqueId());
+    }
 
-        // Admin by name
-        if (admin != null)
-        {
-            // 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;
-            }
-        }
-
-        // 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 null;
+    public Admin getEntryByUuid(UUID uuid)
+    {
+        return uuidTable.get(uuid);
     }
 
     public Admin getEntryByName(String name)
@@ -201,23 +155,10 @@ public class AdminList extends FreedomService
         return ipTable.get(ip);
     }
 
-    public Admin getEntryByIpFuzzy(String needleIp)
+    // To cast against OfflinePlayer
+    public Admin getAdmin(Player player)
     {
-        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;
+        return getAdmin((OfflinePlayer) player);
     }
 
     public void updateLastLogin(Player player)
@@ -229,38 +170,15 @@ 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)
-    {
-        // Fix of issue FS-33
-        return !verifiedNoAdmin.contains(player.getName()) || verifiedNoAdminIps.containsKey(player.getName()) && !verifiedNoAdminIps.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)
+    public void addAdmin(Admin admin)
     {
         if (!admin.isValid())
         {
             FLog.warning("Could not add admin: " + admin.getName() + ". Admin is missing details!");
-            return false;
+            return;
         }
 
         // Store admin, update views
@@ -269,18 +187,13 @@ public class AdminList extends FreedomService
 
         // Save admin
         plugin.sql.addAdmin(admin);
-
-        return true;
     }
 
     public boolean removeAdmin(Admin admin)
     {
-        if (admin.getRank().isAtLeast(Rank.ADMIN))
+        if (admin.getRank().weightCheckAgainst(TotalFreedomMod.getPlugin().getHierarchy().groups().getAdmin()) && (plugin.btb != null))
         {
-            if (plugin.btb != null)
-            {
-                plugin.btb.killTelnetSessions(admin.getName());
-            }
+            plugin.btb.killTelnetSessions(admin.getName());
         }
 
         // Remove admin, update views
@@ -299,6 +212,7 @@ public class AdminList extends FreedomService
     public void updateTables()
     {
         activeAdmins.clear();
+        uuidTable.clear();
         nameTable.clear();
         ipTable.clear();
 
@@ -310,13 +224,16 @@ public class AdminList extends FreedomService
             }
 
             activeAdmins.add(admin);
-            nameTable.put(admin.getName().toLowerCase(), admin);
+            uuidTable.put(admin.getUuid(), admin);
+            if (admin.getName() != null)
+            {
+                nameTable.put(admin.getName().toLowerCase(), admin);
+            }
 
             for (String ip : admin.getIps())
             {
                 ipTable.put(ip, admin);
             }
-
         }
     }
 
@@ -334,7 +251,7 @@ 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());
@@ -343,8 +260,7 @@ public class AdminList extends FreedomService
                     plugin.sql.setAdminValue(admin, entry.getKey(), entry.getValue());
                 }
             }
-        }
-        catch (SQLException e)
+        } catch (SQLException e)
         {
             FLog.severe("Failed to save admin: " + e.getMessage());
         }
@@ -352,36 +268,31 @@ public class AdminList extends FreedomService
 
     public void deactivateOldEntries(boolean verbose)
     {
-        for (Admin admin : allAdmins)
-        {
-            if (!admin.isActive() || admin.getRank().isAtLeast(Rank.SENIOR_ADMIN))
-            {
-                continue;
-            }
-
-            final Date lastLogin = admin.getLastLogin();
-            final long lastLoginHours = TimeUnit.HOURS.convert(new Date().getTime() - lastLogin.getTime(), TimeUnit.MILLISECONDS);
-
-            if (lastLoginHours < ConfigEntry.ADMINLIST_CLEAN_THESHOLD_HOURS.getInteger())
-            {
-                continue;
-            }
-
-            if (verbose)
-            {
-                FUtil.adminAction("TotalFreedomMod", "Deactivating admin " + admin.getName() + ", inactive for " + lastLoginHours + " hours", true);
-            }
-
-            admin.setActive(false);
-            save(admin);
-        }
+        allAdmins.stream()
+                .filter(admin -> admin.isActive() &&
+                        !admin.getRank().weightCheckAgainst(TotalFreedomMod.getPlugin().getHierarchy().groups().getSeniorAdmin()))
+                .forEach(admin ->
+                {
+                    final Date lastLogin = admin.getLastLogin();
+                    final long lastLoginHours = TimeUnit.HOURS.convert(new Date().getTime() - lastLogin.getTime(), TimeUnit.MILLISECONDS);
+                    if (lastLoginHours < ConfigEntry.ADMINLIST_CLEAN_THESHOLD_HOURS.getInteger())
+                    {
+                        return;
+                    }
+                    if (verbose)
+                    {
+                        FUtil.adminAction("TotalFreedomMod", "Deactivating admin " + admin.getName() + ", inactive for " + lastLoginHours + " hours", true);
+                    }
+                    admin.setActive(false);
+                    save(admin);
+                });
 
         updateTables();
     }
 
-    public boolean isVanished(String player)
+    public boolean isVanished(UUID uuid)
     {
-        return vanished.contains(player);
+        return vanished.contains(uuid);
     }
 
     public Set<Admin> getAllAdmins()
@@ -403,14 +314,4 @@ public class AdminList extends FreedomService
     {
         return ipTable;
     }
-
-    public List<String> getVerifiedNoAdmin()
-    {
-        return verifiedNoAdmin;
-    }
-
-    public Map<String, List<String>> getVerifiedNoAdminIps()
-    {
-        return verifiedNoAdminIps;
-    }
 }

commons/src/main/java/me/totalfreedom/totalfreedommod/api/Aggregator.java

@@ -0,0 +1,27 @@
+package me.totalfreedom.totalfreedommod.api;
+
+public class Aggregator
+{
+    private Context<TFD4JCommons> discord;
+    private Context<ShoppeCommons> shoppe;
+
+    public Context<TFD4JCommons> getDiscordContext()
+    {
+        return discord;
+    }
+
+    public void setDiscordContext(Context<TFD4JCommons> discord)
+    {
+        this.discord = discord;
+    }
+
+    public Context<ShoppeCommons> getShoppeContext()
+    {
+        return shoppe;
+    }
+
+    public void setShoppeContext(Context<ShoppeCommons> shoppe)
+    {
+        this.shoppe = shoppe;
+    }
+}

commons/src/main/java/me/totalfreedom/totalfreedommod/api/Context.java

@@ -0,0 +1,16 @@
+package me.totalfreedom.totalfreedommod.api;
+
+public class Context<T>
+{
+    private final T value;
+
+    public Context(T value)
+    {
+        this.value = value;
+    }
+
+    public T getValue()
+    {
+        return value;
+    }
+}

commons/src/main/java/me/totalfreedom/totalfreedommod/api/Interpolator.java

@@ -0,0 +1,7 @@
+package me.totalfreedom.totalfreedommod.api;
+
+@FunctionalInterface
+public interface Interpolator
+{
+    double[] interpolate(double from, double to, int max);
+}

commons/src/main/java/me/totalfreedom/totalfreedommod/api/ShopItem.java

@@ -1,4 +1,4 @@
-package me.totalfreedom.totalfreedommod.shop;
+package me.totalfreedom.totalfreedommod.api;
 
 import me.totalfreedom.totalfreedommod.config.ConfigEntry;
 import org.bukkit.ChatColor;
@@ -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-
         --------$
     */
 
@@ -56,8 +66,7 @@ public enum ShopItem
         try
         {
             return ShopItem.valueOf(string.toUpperCase());
-        }
-        catch (Exception ignored)
+        } catch (Exception ignored)
         {
         }
 

commons/src/main/java/me/totalfreedom/totalfreedommod/api/ShoppeCommons.java

@@ -0,0 +1,55 @@
+package me.totalfreedom.totalfreedommod.api;
+
+import me.totalfreedom.totalfreedommod.player.PlayerData;
+import org.bukkit.entity.Player;
+import org.bukkit.inventory.Inventory;
+import org.bukkit.inventory.ItemStack;
+import org.bukkit.inventory.PlayerInventory;
+
+public interface ShoppeCommons
+{
+
+    int getCoinsPerReactionWin();
+
+    void startReactionTimer();
+
+    void forceStartReaction();
+
+    void startReaction();
+
+    void endReaction(String winner);
+
+    String getShopPrefix();
+
+    String getShopTitle();
+
+    Inventory generateShopGUI(PlayerData playerData);
+
+    Inventory generateLoginMessageGUI(Player player);
+
+    boolean isRealItem(PlayerData data, ShopItem shopItem, PlayerInventory inventory, ItemStack realItem);
+
+    boolean isRealItem(PlayerData data, ShopItem shopItem, ItemStack givenItem, ItemStack realItem);
+
+    ItemStack getLightningRod();
+
+    ItemStack getGrapplingHook();
+
+    ItemStack getFireBall();
+
+    ItemStack getRideablePearl();
+
+    ItemStack getStackingPotato();
+
+    ItemStack getClownFish();
+
+    boolean canAfford(int price, int coins);
+
+    int amountNeeded(int price, int coins);
+
+    ItemStack shopGUIItem(ShopItem item, PlayerData data);
+
+    ShopItem getShopItem(int slot);
+
+    String getReactionString();
+}

commons/src/main/java/me/totalfreedom/totalfreedommod/api/TFD4JCommons.java

@@ -0,0 +1,33 @@
+package me.totalfreedom.totalfreedommod.api;
+
+import me.totalfreedom.totalfreedommod.admin.Admin;
+import me.totalfreedom.totalfreedommod.player.PlayerData;
+import org.bukkit.OfflinePlayer;
+import org.bukkit.entity.Player;
+
+import java.util.Map;
+
+public interface TFD4JCommons
+{
+    void messageAdminChatChannel(String message);
+
+    void clearQueue();
+
+    void messageChatChannel(String message, boolean system);
+
+    boolean syncRoles(Admin admin, String id);
+
+    String getCode(PlayerData playerData);
+
+    String generateCode(int size);
+
+    Map<String, PlayerData> getLinkCodes();
+
+    String formatBotTag();
+
+    boolean sendReportOffline(Player reporter, OfflinePlayer reported, String reason);
+
+    boolean sendReport(Player reporter, Player reported, String reason);
+
+    boolean isEnabled();
+}

commons/src/main/java/me/totalfreedom/totalfreedommod/api/event/AdminChatEvent.java

@@ -0,0 +1,74 @@
+package me.totalfreedom.totalfreedommod.api.event;
+
+import me.totalfreedom.totalfreedommod.rank.Displayable;
+import net.kyori.adventure.key.Key;
+import net.kyori.adventure.text.Component;
+import org.bukkit.event.Event;
+import org.bukkit.event.HandlerList;
+import org.jetbrains.annotations.NotNull;
+
+public class AdminChatEvent extends Event
+{
+    private static final HandlerList handlerList = new HandlerList();
+    //--
+    private final Key identifier;
+    private final Component name;
+    private final Displayable displayable;
+    private final Component message;
+    private Component prefix = Component.empty();
+
+    public AdminChatEvent(Key identifier, Component prefix, Component name, Displayable rank, Component message, boolean async)
+    {
+        super(async);
+        this.identifier = identifier;
+        this.prefix = prefix;
+        this.name = name;
+        this.displayable = rank;
+        this.message = message;
+    }
+
+    public AdminChatEvent(Component name, Displayable rank, Component message, boolean async)
+    {
+        super(async);
+        this.identifier = Key.key("tfm", "default");
+        this.name = name;
+        this.displayable = rank;
+        this.message = message;
+    }
+
+    public static HandlerList getHandlerList()
+    {
+        return handlerList;
+    }
+
+    @Override
+    public @NotNull HandlerList getHandlers()
+    {
+        return handlerList;
+    }
+
+    public Key getIdentifier()
+    {
+        return identifier;
+    }
+
+    public Component getPrefix()
+    {
+        return prefix;
+    }
+
+    public Component getName()
+    {
+        return name;
+    }
+
+    public Displayable getDisplayable()
+    {
+        return displayable;
+    }
+
+    public Component getMessage()
+    {
+        return message;
+    }
+}

commons/src/main/java/me/totalfreedom/totalfreedommod/banning/Ban.java

@@ -1,21 +1,16 @@
 package me.totalfreedom.totalfreedommod.banning;
 
 import com.google.common.collect.Lists;
-import java.text.SimpleDateFormat;
-import java.time.Instant;
-import java.util.ArrayList;
-import java.util.Collections;
-import java.util.Date;
-import java.util.HashSet;
-import java.util.List;
-import java.util.Set;
-import java.util.UUID;
 import me.totalfreedom.totalfreedommod.config.ConfigEntry;
 import me.totalfreedom.totalfreedommod.util.FUtil;
 import org.bukkit.ChatColor;
 import org.bukkit.command.CommandSender;
 import org.bukkit.entity.Player;
 
+import java.text.SimpleDateFormat;
+import java.time.Instant;
+import java.util.*;
+
 public class Ban
 {
 
@@ -121,17 +116,6 @@ public class Ban
                 reason);
     }
 
-    public static Ban forPlayerFuzzy(Player player, CommandSender by, Date expiry, String reason)
-    {
-        return new Ban(player.getName(),
-                player.getUniqueId(),
-                FUtil.getFuzzyIp(FUtil.getIp(player)),
-                by.getName(),
-                Date.from(Instant.now()),
-                expiry,
-                reason);
-    }
-
     public static SimpleDateFormat getDateFormat()
     {
         return DATE_FORMAT;
@@ -169,7 +153,7 @@ public class Ban
 
     public boolean isExpired()
     {
-        return hasExpiry() && expiryUnix < FUtil.getUnixTime();
+        return hasExpiry() && FUtil.getUnixDate(expiryUnix).before(new Date(FUtil.getUnixTime()));
     }
 
     public String bakeKickMessage()
@@ -179,12 +163,10 @@ public class Ban
         if (!hasUsername())
         {
             message.append("r IP address is");
-        }
-        else if (!hasIps())
+        } else if (!hasIps())
         {
             message.append("r username is");
-        }
-        else
+        } else
         {
             message.append(" are");
         }
@@ -233,7 +215,7 @@ public class Ban
             return false;
         }
 
-        final Ban ban = (Ban)object;
+        final Ban ban = (Ban) object;
         if (hasIps() != ban.hasIps()
                 || hasUsername() != ban.hasUsername())
         {

commons/src/main/java/me/totalfreedom/totalfreedommod/banning/BanManager.java

@@ -1,20 +1,8 @@
 package me.totalfreedom.totalfreedommod.banning;
 
-import com.google.common.collect.Lists;
 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.Collection;
-import java.util.Collections;
-import java.util.Date;
-import java.util.List;
-import java.util.Map;
-import java.util.Set;
-import java.util.UUID;
 import me.totalfreedom.totalfreedommod.FreedomService;
-import me.totalfreedom.totalfreedommod.config.ConfigEntry;
 import me.totalfreedom.totalfreedommod.util.FLog;
 import me.totalfreedom.totalfreedommod.util.FUtil;
 import org.bukkit.entity.Player;
@@ -23,6 +11,10 @@ import org.bukkit.event.EventPriority;
 import org.bukkit.event.player.PlayerJoinEvent;
 import org.bukkit.event.player.PlayerLoginEvent;
 
+import java.sql.ResultSet;
+import java.sql.SQLException;
+import java.util.*;
+
 public class BanManager extends FreedomService
 {
 
@@ -30,8 +22,6 @@ public class BanManager extends FreedomService
     private final Map<String, Ban> nameBans = Maps.newHashMap();
     private final Map<UUID, Ban> uuidBans = Maps.newHashMap();
     private final Map<String, Ban> ipBans = Maps.newHashMap();
-    private final List<String> unbannableUsernames = Lists.newArrayList();
-
     //
 
     @Override
@@ -60,8 +50,7 @@ public class BanManager extends FreedomService
                     bans.add(ban);
                 }
             }
-        }
-        catch (SQLException e)
+        } catch (SQLException e)
         {
             FLog.severe("Failed to load ban list: " + e.getMessage());
         }
@@ -70,16 +59,12 @@ public class BanManager extends FreedomService
         updateViews();
 
         FLog.info("Loaded " + ipBans.size() + " IP bans and " + nameBans.size() + " username bans.");
-
-        // Load unbannable usernames
-        unbannableUsernames.clear();
-        unbannableUsernames.addAll(ConfigEntry.FAMOUS_PLAYERS.getStringList());
-        FLog.info("Loaded " + unbannableUsernames.size() + " unbannable usernames.");
     }
 
     @Override
     public void onStop()
     {
+        // This does nothing. This comment is here to prevent SonarLint from complaining.
     }
 
     public Set<Ban> getAllBans()
@@ -194,8 +179,7 @@ public class BanManager extends FreedomService
         if (ban.getUsername() != null && getByUsername(ban.getUsername()) != null)
         {
             removeBan(ban);
-        }
-        else
+        } else
         {
 
             for (String ip : ban.getIps())
@@ -275,8 +259,7 @@ public class BanManager extends FreedomService
         if (ban != null)
         {
             removeBan(ban);
-        }
-        else
+        } else
         {
             ban = getByIp(FUtil.getIp(player));
             if (ban != null)

commons/src/main/java/me/totalfreedom/totalfreedommod/banning/IndefiniteBan.java

@@ -1,27 +1,30 @@
 package me.totalfreedom.totalfreedommod.banning;
 
 import com.google.common.collect.Lists;
-import java.util.List;
-import java.util.UUID;
 import me.totalfreedom.totalfreedommod.config.IConfig;
 import me.totalfreedom.totalfreedommod.util.FLog;
+import me.totalfreedom.totalfreedommod.util.FUtil;
 import org.bukkit.configuration.ConfigurationSection;
 
+import java.text.ParseException;
+import java.text.SimpleDateFormat;
+import java.util.Date;
+import java.util.List;
+import java.util.UUID;
+
 public class IndefiniteBan implements IConfig
 {
     private final List<String> ips = Lists.newArrayList();
     private String username = null;
     private UUID uuid = null;
     private String reason = null;
-
-    public IndefiniteBan()
-    {
-    }
+    private Date expiry = null;
 
     @Override
     public void loadFrom(ConfigurationSection cs)
     {
         this.username = cs.getName();
+
         try
         {
             String strUUID = cs.getString("uuid", null);
@@ -30,19 +33,29 @@ public class IndefiniteBan implements IConfig
                 UUID uuid = UUID.fromString(strUUID);
                 this.uuid = uuid;
             }
-        }
-        catch (IllegalArgumentException e)
+        } catch (IllegalArgumentException e)
         {
             FLog.warning("Failed to load indefinite banned UUID for " + this.username + ". Make sure the UUID is in the correct format with dashes.");
         }
+
         this.ips.clear();
         this.ips.addAll(cs.getStringList("ips"));
         this.reason = cs.getString("reason", null);
+
+        String date = cs.getString("expiry", null);
+        try
+        {
+            this.expiry = date != null ? new SimpleDateFormat("yyyy-MM-dd").parse(date) : null;
+        } catch (ParseException ex)
+        {
+            FLog.warning("Failed to load indefinite banned expiry for " + this.username + ". Make sure the expiry is in the correct format (yyyy-MM-dd).");
+        }
     }
 
     @Override
     public void saveTo(ConfigurationSection cs)
     {
+        // The indefinite ban list is only intended to be modified manually. It is not intended to save.
     }
 
     @Override
@@ -85,4 +98,24 @@ public class IndefiniteBan implements IConfig
     {
         this.reason = reason;
     }
+
+    public Date getExpiry()
+    {
+        return expiry;
+    }
+
+    public void setExpiry(Date date)
+    {
+        this.expiry = date;
+    }
+
+    public boolean hasExpiry()
+    {
+        return this.expiry != null;
+    }
+
+    public boolean isExpired()
+    {
+        return hasExpiry() && expiry.before(new Date(FUtil.getUnixTime()));
+    }
 }

commons/src/main/java/me/totalfreedom/totalfreedommod/banning/IndefiniteBanList.java

@@ -2,8 +2,6 @@ package me.totalfreedom.totalfreedommod.banning;
 
 import com.google.common.base.Strings;
 import com.google.common.collect.Sets;
-import java.util.Set;
-import java.util.UUID;
 import me.totalfreedom.totalfreedommod.FreedomService;
 import me.totalfreedom.totalfreedommod.config.ConfigEntry;
 import me.totalfreedom.totalfreedommod.config.YamlConfig;
@@ -15,34 +13,28 @@ import org.bukkit.event.EventHandler;
 import org.bukkit.event.EventPriority;
 import org.bukkit.event.player.PlayerLoginEvent;
 
+import java.text.SimpleDateFormat;
+import java.util.Date;
+import java.util.Set;
+import java.util.UUID;
+
 public class IndefiniteBanList extends FreedomService
 {
 
     public static final String CONFIG_FILENAME = "indefinitebans.yml";
-
-
     private final Set<IndefiniteBan> indefBans = Sets.newHashSet();
-
-
+    private final SimpleDateFormat dateFormat = new SimpleDateFormat("dd MMM yyyy, zzzz");
+    private YamlConfig config;
     private int nameBanCount = 0;
-
-
     private int uuidBanCount = 0;
-
-
     private int ipBanCount = 0;
 
-    public static String getConfigFilename()
-    {
-        return CONFIG_FILENAME;
-    }
-
     @Override
     public void onStart()
     {
         indefBans.clear();
 
-        final YamlConfig config = new YamlConfig(plugin, CONFIG_FILENAME, true);
+        config = new YamlConfig(plugin, CONFIG_FILENAME, true);
         config.load();
 
         for (String name : config.getKeys(false))
@@ -64,10 +56,18 @@ public class IndefiniteBanList extends FreedomService
                 continue;
             }
 
+            if (indefBan.isExpired())
+            {
+                FLog.info("Removing " + name + " from indefinite ban list as the entry has expired!");
+                config.set(name, null);
+                continue;
+            }
+
             indefBans.add(indefBan);
         }
 
         updateCount();
+        config.save();
 
         FLog.info("Loaded " + nameBanCount + " indefinite name bans, " + uuidBanCount + " UUID bans, and " + ipBanCount + " ip bans");
     }
@@ -75,6 +75,7 @@ public class IndefiniteBanList extends FreedomService
     @Override
     public void onStop()
     {
+        // This does nothing. This comment is here to prevent SonarLint from complaining.
     }
 
     @EventHandler(priority = EventPriority.LOWEST)
@@ -94,14 +95,12 @@ public class IndefiniteBanList extends FreedomService
                 bannedBy = "username";
                 ban = indefBan;
                 break;
-            }
-            else if (indefBan.getUuid() != null && indefBan.getUuid().equals(uuid))
+            } else if (indefBan.getUuid() != null && indefBan.getUuid().equals(uuid))
             {
                 bannedBy = "UUID";
                 ban = indefBan;
                 break;
-            }
-            else if (indefBan.getIps().contains(ip))
+            } else if (indefBan.getIps().contains(ip))
             {
                 bannedBy = "IP address";
                 ban = indefBan;
@@ -109,14 +108,35 @@ public class IndefiniteBanList extends FreedomService
             }
         }
 
+        onPlayerLoginSplitWorkToReduceComplexity(event, ban, bannedBy);
+    }
+
+    private void onPlayerLoginSplitWorkToReduceComplexity(PlayerLoginEvent event, IndefiniteBan ban, String bannedBy)
+    {
         if (ban != null)
         {
-            String kickMessage = ChatColor.RED + "Your " + bannedBy + " is indefinitely banned from this server.";
+            if (ban.isExpired())
+            {
+                config.set(ban.getUsername(), null);
+                config.save();
+                return;
+            }
+
+            String kickMessage = ChatColor.RED + "Your " + bannedBy + " is "
+                    + (ban.hasExpiry() ? "" : "indefinitely ")
+                    + "banned from this server.";
             String reason = ban.getReason();
             if (!Strings.isNullOrEmpty(reason))
             {
                 kickMessage += "\nReason: " + ChatColor.GOLD + reason;
             }
+
+            Date expiry = ban.getExpiry();
+            if (expiry != null)
+            {
+                kickMessage += ChatColor.RED + "\nExpiry: " + ChatColor.GOLD + dateFormat.format(expiry);
+            }
+
             String appealURL = ConfigEntry.SERVER_INDEFBAN_URL.getString();
             if (!Strings.isNullOrEmpty(appealURL))
             {

commons/src/main/java/me/totalfreedom/totalfreedommod/blocking/BlockBlocker.java

@@ -1,14 +1,10 @@
 package me.totalfreedom.totalfreedommod.blocking;
 
-import java.util.List;
 import me.totalfreedom.totalfreedommod.FreedomService;
 import me.totalfreedom.totalfreedommod.config.ConfigEntry;
-import me.totalfreedom.totalfreedommod.util.Groups;
 import org.bukkit.ChatColor;
 import org.bukkit.Material;
-import org.bukkit.block.Banner;
 import org.bukkit.block.Skull;
-import org.bukkit.block.banner.Pattern;
 import org.bukkit.entity.Player;
 import org.bukkit.event.EventHandler;
 import org.bukkit.event.EventPriority;
@@ -30,6 +26,7 @@ public class BlockBlocker extends FreedomService
     }
 
     @SuppressWarnings("deprecation")
+    // TODO: Remove deprecated method. Complexity is also O(35) which is very bad.
     @EventHandler(priority = EventPriority.HIGH)
     public void onBlockPlace(BlockPlaceEvent event)
     {
@@ -71,7 +68,7 @@ public class BlockBlocker extends FreedomService
             }
             case STRUCTURE_BLOCK:
             {
-                if (!ConfigEntry.ALLOW_STRUCTURE_BLOCKS.getBoolean())
+                if (!ConfigEntry.ALLOW_MASTERBLOCKS.getBoolean())
                 {
                     player.sendMessage(ChatColor.GRAY + "Structure blocks are disabled.");
                     player.getInventory().setItem(player.getInventory().getHeldItemSlot(), new ItemStack(Material.COOKIE, 1));
@@ -81,7 +78,7 @@ public class BlockBlocker extends FreedomService
             }
             case JIGSAW:
             {
-                if (!ConfigEntry.ALLOW_JIGSAWS.getBoolean())
+                if (!ConfigEntry.ALLOW_MASTERBLOCKS.getBoolean())
                 {
                     player.sendMessage(ChatColor.GRAY + "Jigsaws are disabled.");
                     player.getInventory().setItem(player.getInventory().getHeldItemSlot(), new ItemStack(Material.COOKIE, 1));
@@ -89,6 +86,16 @@ public class BlockBlocker extends FreedomService
                 }
                 break;
             }
+            case REPEATING_COMMAND_BLOCK:
+            case CHAIN_COMMAND_BLOCK:
+            case COMMAND_BLOCK:
+                if (!ConfigEntry.ALLOW_MASTERBLOCKS.getBoolean())
+                {
+                    player.sendMessage(ChatColor.GRAY + "Command blocks are disabled.");
+                    player.getInventory().setItem(player.getInventory().getHeldItemSlot(), new ItemStack(Material.COOKIE, 1));
+                    event.setCancelled(true);
+                }
+                break;
             case GRINDSTONE:
             {
                 if (!ConfigEntry.ALLOW_GRINDSTONES.getBoolean())
@@ -133,13 +140,13 @@ public class BlockBlocker extends FreedomService
             case PLAYER_HEAD:
             case PLAYER_WALL_HEAD:
             {
-                Skull skull = (Skull)event.getBlockPlaced().getState();
+                Skull skull = (Skull) event.getBlockPlaced().getState();
                 if (skull.getOwner() != null)
                 {
                     if (skull.getOwner().contains("\u00A7"))
                     {
                         skull.setOwner(skull.getOwner().replace("\u00A7", ""));
-                        SkullMeta meta = (SkullMeta)event.getItemInHand().getItemMeta();
+                        SkullMeta meta = (SkullMeta) event.getItemInHand().getItemMeta();
                         if (meta != null)
                         {
                             ItemStack newHead = new ItemStack(Material.PLAYER_HEAD, 1);
@@ -171,17 +178,10 @@ public class BlockBlocker extends FreedomService
                 }
                 break;
             }
-        }
-
-        if (Groups.BANNERS.contains(event.getBlockPlaced().getType()))
-        {
-            Banner banner = (Banner)event.getBlockPlaced().getState();
-            List<Pattern> patterns = banner.getPatterns();
-
-            if (patterns.size() >= 2)
+            default:
             {
-                banner.setPatterns(patterns.subList(0, 2));
-                player.sendMessage(ChatColor.GRAY + "Your banner had too many patterns on it, so some were removed.");
+                // Do nothing
+                break;
             }
         }
     }

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

@@ -1,9 +1,7 @@
 package me.totalfreedom.totalfreedommod.blocking;
 
-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.scissors.event.block.MasterBlockFireEvent;
 import me.totalfreedom.totalfreedommod.FreedomService;
 import me.totalfreedom.totalfreedommod.config.ConfigEntry;
 import me.totalfreedom.totalfreedommod.util.FUtil;
@@ -14,28 +12,20 @@ import org.bukkit.attribute.AttributeModifier;
 import org.bukkit.block.data.AnaloguePowerable;
 import org.bukkit.block.data.Powerable;
 import org.bukkit.entity.Entity;
+import org.bukkit.entity.FallingBlock;
 import org.bukkit.entity.Tameable;
 import org.bukkit.event.EventHandler;
 import org.bukkit.event.EventPriority;
-import org.bukkit.event.block.BlockBurnEvent;
-import org.bukkit.event.block.BlockDispenseEvent;
-import org.bukkit.event.block.BlockFromToEvent;
-import org.bukkit.event.block.BlockGrowEvent;
-import org.bukkit.event.block.BlockIgniteEvent;
-import org.bukkit.event.block.BlockPhysicsEvent;
-import org.bukkit.event.block.BlockPistonExtendEvent;
-import org.bukkit.event.block.BlockPistonRetractEvent;
-import org.bukkit.event.block.LeavesDecayEvent;
-import org.bukkit.event.entity.EntityCombustEvent;
-import org.bukkit.event.entity.EntityDamageEvent;
-import org.bukkit.event.entity.EntityDeathEvent;
-import org.bukkit.event.entity.EntityExplodeEvent;
-import org.bukkit.event.entity.ExplosionPrimeEvent;
-import org.bukkit.event.entity.FireworkExplodeEvent;
-import org.bukkit.event.entity.PlayerDeathEvent;
+import org.bukkit.event.block.*;
+import org.bukkit.event.entity.*;
 import org.bukkit.event.player.PlayerDropItemEvent;
 import org.bukkit.event.player.PlayerRespawnEvent;
 
+import java.util.ArrayList;
+import java.util.Arrays;
+import java.util.List;
+import java.util.Objects;
+
 public class EventBlocker extends FreedomService
 {
     /**
@@ -113,6 +103,28 @@ public class EventBlocker extends FreedomService
         event.setRadius(ConfigEntry.EXPLOSIVE_RADIUS.getDouble().floatValue());
     }
 
+    @EventHandler(priority = EventPriority.HIGH)
+    public void onBlockExplode(BlockExplodeEvent event)
+    {
+        if (!ConfigEntry.ALLOW_EXPLOSIONS.getBoolean())
+        {
+            event.setCancelled(true);
+            return;
+        }
+
+        event.setYield(ConfigEntry.EXPLOSIVE_RADIUS.getDouble().floatValue());
+    }
+
+    @EventHandler(priority = EventPriority.HIGHEST)
+    public void onMasterBlockFire(MasterBlockFireEvent event)
+    {
+        if (!ConfigEntry.ALLOW_MASTERBLOCKS.getBoolean())
+        {
+            event.setCancelled(true);
+            event.getAt().getBlock().setType(Material.CAKE);
+        }
+    }
+
     @EventHandler(priority = EventPriority.HIGH)
     public void onEntityCombust(EntityCombustEvent event)
     {
@@ -144,12 +156,9 @@ public class EventBlocker extends FreedomService
         if (ConfigEntry.ENABLE_PET_PROTECT.getBoolean())
         {
             Entity entity = event.getEntity();
-            if (entity instanceof Tameable)
+            if (entity instanceof Tameable tameable && tameable.isTamed())
             {
-                if (((Tameable)entity).isTamed())
-                {
-                    event.setCancelled(true);
-                }
+                event.setCancelled(true);
             }
         }
     }
@@ -212,6 +221,15 @@ public class EventBlocker extends FreedomService
         }
     }
 
+    @EventHandler
+    public void onEntitySpawn(EntitySpawnEvent event)
+    {
+        if (!ConfigEntry.ALLOW_GRAVITY.getBoolean() && event.getEntity() instanceof FallingBlock)
+        {
+            event.setCancelled(true);
+        }
+    }
+
     @EventHandler
     public void onBlockPhysics(BlockPhysicsEvent event)
     {
@@ -254,4 +272,10 @@ public class EventBlocker extends FreedomService
         FUtil.fixCommandVoid(event.getEntity());
         event.setDeathMessage(event.getDeathMessage());
     }
+
+    @EventHandler
+    public void onSignInteract(PlayerSignCommandPreprocessEvent event)
+    {
+        event.setCancelled(true);
+    }
 }

commons/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;
@@ -36,10 +38,9 @@ public class InteractBlocker extends FreedomService
                 break;
             }
 
-            case LEFT_CLICK_AIR:
-            case LEFT_CLICK_BLOCK:
+            default:
             {
-                //
+                // Do nothing
                 break;
             }
         }
@@ -65,24 +66,40 @@ public class InteractBlocker extends FreedomService
         }
     }
 
+    // TODO: Current cognitive complexity is O(24). This is too high.
     private void handleRightClick(PlayerInteractEvent event)
     {
         final Player player = event.getPlayer();
+        final Block clickedBlock = event.getClickedBlock();
 
-        if (event.getClickedBlock() != null)
+        if (clickedBlock != null && clickedBlock.getType() == Material.RESPAWN_ANCHOR && !ConfigEntry.ALLOW_RESPAWN_ANCHORS.getBoolean())
         {
-            if (event.getClickedBlock().getType().equals(Material.STRUCTURE_BLOCK) || event.getClickedBlock().getType().equals(Material.JIGSAW) || event.getClickedBlock().getType().equals(Material.RESPAWN_ANCHOR))
-            {
-                event.setCancelled(true);
-                event.getPlayer().closeInventory();
-            }
+            event.setCancelled(true);
+            return;
         }
 
         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);
+            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 != null)
+            {
+                clickedBlock.getWorld().spawnEntity(clickedBlock.getLocation().add(event.getBlockFace().getDirection()).add(0.5, 0.5, 0.5), eggType);
+            }
             return;
         }
 
@@ -153,11 +170,21 @@ public class InteractBlocker extends FreedomService
             }
             case WRITTEN_BOOK:
             {
+                if (ConfigEntry.ALLOW_BOOKS.getBoolean())
+                {
+                    break;
+                }
+
                 player.getInventory().clear(player.getInventory().getHeldItemSlot());
                 player.sendMessage(ChatColor.GRAY + "Books are currently disabled.");
                 event.setCancelled(true);
                 break;
             }
+            default:
+            {
+                // Do nothing
+                break;
+            }
         }
     }
 }

commons/src/main/java/me/totalfreedom/totalfreedommod/blocking/MobBlocker.java

@@ -1,24 +1,17 @@
 package me.totalfreedom.totalfreedommod.blocking;
 
-import java.util.Objects;
 import me.totalfreedom.totalfreedommod.FreedomService;
 import me.totalfreedom.totalfreedommod.config.ConfigEntry;
 import org.bukkit.attribute.Attributable;
 import org.bukkit.attribute.Attribute;
-import org.bukkit.entity.Bat;
-import org.bukkit.entity.EnderDragon;
-import org.bukkit.entity.Entity;
-import org.bukkit.entity.Ghast;
-import org.bukkit.entity.Giant;
-import org.bukkit.entity.HumanEntity;
-import org.bukkit.entity.LivingEntity;
-import org.bukkit.entity.Slime;
-import org.bukkit.entity.Wither;
+import org.bukkit.entity.*;
 import org.bukkit.event.EventHandler;
 import org.bukkit.event.EventPriority;
 import org.bukkit.event.entity.CreatureSpawnEvent;
 import org.bukkit.event.entity.EntitySpawnEvent;
 
+import java.util.Objects;
+
 public class MobBlocker extends FreedomService
 {
     @Override
@@ -43,17 +36,18 @@ public class MobBlocker extends FreedomService
         Entity entity = e.getEntity();
         if (entity instanceof Attributable)
         {
-            if (Objects.requireNonNull(((Attributable)entity).getAttribute(Attribute.GENERIC_FOLLOW_RANGE)).getBaseValue() > 255.0)
+            if (Objects.requireNonNull(((Attributable) entity).getAttribute(Attribute.GENERIC_FOLLOW_RANGE)).getBaseValue() > 255.0)
             {
-                Objects.requireNonNull(((Attributable)entity).getAttribute(Attribute.GENERIC_FOLLOW_RANGE)).setBaseValue(255.0);
+                Objects.requireNonNull(((Attributable) entity).getAttribute(Attribute.GENERIC_FOLLOW_RANGE)).setBaseValue(255.0);
             }
-            if (Objects.requireNonNull(((Attributable)entity).getAttribute(Attribute.GENERIC_MOVEMENT_SPEED)).getBaseValue() > 10.0)
+            if (Objects.requireNonNull(((Attributable) entity).getAttribute(Attribute.GENERIC_MOVEMENT_SPEED)).getBaseValue() > 10.0)
             {
-                Objects.requireNonNull(((Attributable)entity).getAttribute(Attribute.GENERIC_MOVEMENT_SPEED)).setBaseValue(10.0);
+                Objects.requireNonNull(((Attributable) entity).getAttribute(Attribute.GENERIC_MOVEMENT_SPEED)).setBaseValue(10.0);
             }
         }
     }
 
+    // TODO: Complexity for this method is too high [O(23)]. This needs to be fixed.
     @EventHandler(priority = EventPriority.NORMAL)
     public void onCreatureSpawn(CreatureSpawnEvent event)
     {
@@ -71,40 +65,35 @@ public class MobBlocker extends FreedomService
                 event.setCancelled(true);
                 return;
             }
-        }
-        else if (spawned instanceof Ghast)
+        } else if (spawned instanceof Ghast)
         {
             if (ConfigEntry.MOB_LIMITER_DISABLE_GHAST.getBoolean())
             {
                 event.setCancelled(true);
                 return;
             }
-        }
-        else if (spawned instanceof Slime)
+        } else if (spawned instanceof Slime)
         {
             if (ConfigEntry.MOB_LIMITER_DISABLE_SLIME.getBoolean())
             {
                 event.setCancelled(true);
                 return;
             }
-        }
-        else if (spawned instanceof Wither)
+        } else if (spawned instanceof Wither)
         {
             if (ConfigEntry.MOB_LIMITER_DISABLE_DRAGON.getBoolean())
             {
                 event.setCancelled(true);
                 return;
             }
-        }
-        else if (spawned instanceof Giant)
+        } else if (spawned instanceof Giant)
         {
             if (ConfigEntry.MOB_LIMITER_DISABLE_GIANT.getBoolean())
             {
                 event.setCancelled(true);
                 return;
             }
-        }
-        else if (spawned instanceof Bat)
+        } else if (spawned instanceof Bat)
         {
             event.setCancelled(true);
             return;

commons/src/main/java/me/totalfreedom/totalfreedommod/blocking/PVPBlocker.java

@@ -3,11 +3,7 @@ package me.totalfreedom.totalfreedommod.blocking;
 import me.totalfreedom.totalfreedommod.FreedomService;
 import org.bukkit.ChatColor;
 import org.bukkit.GameMode;
-import org.bukkit.entity.Arrow;
-import org.bukkit.entity.FishHook;
-import org.bukkit.entity.Player;
-import org.bukkit.entity.SpectralArrow;
-import org.bukkit.entity.Trident;
+import org.bukkit.entity.*;
 import org.bukkit.event.EventHandler;
 import org.bukkit.event.EventPriority;
 import org.bukkit.event.entity.EntityDamageByEntityEvent;
@@ -24,6 +20,7 @@ public class PVPBlocker extends FreedomService
     {
     }
 
+    // TODO: Complexity is O(26). This needs to be reduced.
     @EventHandler(priority = EventPriority.LOW)
     public void onEntityDamageByEntity(EntityDamageByEntityEvent event)
     {
@@ -31,63 +28,56 @@ public class PVPBlocker extends FreedomService
         Player target = null;
         if (event.getEntity() instanceof Player)
         {
-            target = (Player)event.getEntity();
+            target = (Player) event.getEntity();
             if (event.getDamager() instanceof Player)
             {
-                player = (Player)event.getDamager();
-            }
-            else if (event.getDamager() instanceof Arrow)
+                player = (Player) event.getDamager();
+            } else if (event.getDamager() instanceof Arrow)
             {
-                Arrow arrow = (Arrow)event.getDamager();
+                Arrow arrow = (Arrow) event.getDamager();
                 if (arrow.getShooter() instanceof Player)
                 {
-                    player = (Player)arrow.getShooter();
+                    player = (Player) arrow.getShooter();
                 }
-            }
-            else if (event.getDamager() instanceof SpectralArrow)
+            } else if (event.getDamager() instanceof SpectralArrow)
             {
-                SpectralArrow spectralArrow = (SpectralArrow)event.getDamager();
+                SpectralArrow spectralArrow = (SpectralArrow) event.getDamager();
                 if (spectralArrow.getShooter() instanceof Player)
                 {
-                    player = (Player)spectralArrow.getShooter();
+                    player = (Player) spectralArrow.getShooter();
                 }
-            }
-            else if (event.getDamager() instanceof Trident)
+            } else if (event.getDamager() instanceof Trident)
             {
-                Trident trident = (Trident)event.getDamager();
+                Trident trident = (Trident) event.getDamager();
                 if (trident.getShooter() instanceof Player)
                 {
-                    player = (Player)trident.getShooter();
+                    player = (Player) trident.getShooter();
                 }
-            }
-            else if (event.getDamager() instanceof FishHook)
+            } else if (event.getDamager() instanceof FishHook)
             {
-                FishHook fishhook = (FishHook)event.getDamager();
+                FishHook fishhook = (FishHook) event.getDamager();
                 if (fishhook.getShooter() instanceof Player)
                 {
-                    player = (Player)fishhook.getShooter();
+                    player = (Player) fishhook.getShooter();
                 }
             }
         }
 
-        if (player != null & !plugin.al.isAdmin(player))
+        if (player != null && !plugin.al.isAdmin(player))
         {
             if (player.getGameMode() == GameMode.CREATIVE)
             {
                 player.sendMessage(ChatColor.RED + "Creative PvP is not allowed!");
                 event.setCancelled(true);
-            }
-            else if (plugin.esb.getEssentialsUser(player.getName()).isGodModeEnabled())
+            } else if (plugin.esb.getEssentialsUser(player.getName()).isGodModeEnabled())
             {
                 player.sendMessage(ChatColor.RED + "God mode PvP is not allowed!");
                 event.setCancelled(true);
-            }
-            else if (plugin.pl.getPlayer(target).isPvpBlocked())
+            } else if (plugin.pl.getPlayer(target).isPvpBlocked())
             {
                 player.sendMessage(ChatColor.RED + target.getName() + " has PvP disabled!");
                 event.setCancelled(true);
-            }
-            else if (plugin.pl.getPlayer(player).isPvpBlocked())
+            } else if (plugin.pl.getPlayer(player).isPvpBlocked())
             {
                 player.sendMessage(ChatColor.RED + "You have PvP disabled!");
                 event.setCancelled(true);

commons/src/main/java/me/totalfreedom/totalfreedommod/blocking/PotionBlocker.java

@@ -1,6 +1,5 @@
 package me.totalfreedom.totalfreedommod.blocking;
 
-import java.util.Collection;
 import me.totalfreedom.totalfreedommod.FreedomService;
 import org.bukkit.ChatColor;
 import org.bukkit.entity.Player;
@@ -13,6 +12,8 @@ import org.bukkit.potion.PotionEffect;
 import org.bukkit.potion.PotionEffectType;
 import org.bukkit.projectiles.ProjectileSource;
 
+import java.util.Collection;
+
 public class PotionBlocker extends FreedomService
 {
 
@@ -36,7 +37,7 @@ public class PotionBlocker extends FreedomService
         Player player = null;
         if (projectileSource instanceof Player)
         {
-            player = (Player)projectileSource;
+            player = (Player) projectileSource;
         }
 
         if (isDeathPotion(potion.getEffects()))
@@ -57,7 +58,7 @@ public class PotionBlocker extends FreedomService
         Player player = null;
         if (projectileSource instanceof Player)
         {
-            player = (Player)projectileSource;
+            player = (Player) projectileSource;
         }
 
         if (isDeathPotion(potion.getEffects()))

commons/src/main/java/me/totalfreedom/totalfreedommod/blocking/command/CommandBlocker.java

@@ -2,11 +2,6 @@ package me.totalfreedom.totalfreedommod.blocking.command;
 
 import com.google.common.collect.Lists;
 import com.google.common.collect.Maps;
-import java.lang.reflect.Field;
-import java.util.List;
-import java.util.Map;
-import java.util.regex.Matcher;
-import java.util.regex.Pattern;
 import me.totalfreedom.totalfreedommod.FreedomService;
 import me.totalfreedom.totalfreedommod.config.ConfigEntry;
 import me.totalfreedom.totalfreedommod.util.FLog;
@@ -16,38 +11,23 @@ import org.bukkit.Bukkit;
 import org.bukkit.command.Command;
 import org.bukkit.command.CommandMap;
 import org.bukkit.command.CommandSender;
-import org.bukkit.command.SimpleCommandMap;
 import org.bukkit.event.EventHandler;
 import org.bukkit.event.EventPriority;
 import org.bukkit.event.player.PlayerCommandPreprocessEvent;
-import org.bukkit.plugin.SimplePluginManager;
+
+import java.util.List;
+import java.util.Map;
+import java.util.regex.Matcher;
+import java.util.regex.Pattern;
 
 public class CommandBlocker extends FreedomService
 {
-
+    private final Pattern whitespacePattern = Pattern.compile("^/?( +)(.*)?");
     private final Pattern flagPattern = Pattern.compile("(:([0-9]){5,})");
     //
     private final Map<String, CommandBlockerEntry> entryList = Maps.newHashMap();
     private final List<String> unknownCommands = Lists.newArrayList();
 
-    public static CommandMap getCommandMap()
-    {
-        try
-        {
-            SimplePluginManager simplePluginManager = (SimplePluginManager)Bukkit.getServer().getPluginManager();
-
-            Field commandMapField = SimplePluginManager.class.getDeclaredField("commandMap");
-            commandMapField.setAccessible(true);
-
-            return (SimpleCommandMap)commandMapField.get(simplePluginManager);
-        }
-        catch (NoSuchFieldException | IllegalArgumentException | IllegalAccessException e)
-        {
-            FLog.severe("Failed to get command map field (" + e.getMessage() + ")");
-        }
-        return null;
-    }
-
     @Override
     public void onStart()
     {
@@ -60,15 +40,15 @@ public class CommandBlocker extends FreedomService
         entryList.clear();
     }
 
-    public void load()
+    public void load() // TODO: Complexity is 21. Need to fix this.
     {
         entryList.clear();
         unknownCommands.clear();
 
-        final CommandMap commandMap = getCommandMap();
+        final CommandMap commandMap = Bukkit.getCommandMap();
 
         @SuppressWarnings("unchecked")
-        List<String> blockedCommands = (List<String>)ConfigEntry.BLOCKED_COMMANDS.getList();
+        List<String> blockedCommands = (List<String>) ConfigEntry.BLOCKED_COMMANDS.getList();
         for (String rawEntry : blockedCommands)
         {
             final String[] parts = rawEntry.split(":");
@@ -104,8 +84,7 @@ public class CommandBlocker extends FreedomService
             if (command == null)
             {
                 unknownCommands.add(commandName);
-            }
-            else
+            } else
             {
                 commandName = command.getName().toLowerCase();
             }
@@ -147,6 +126,7 @@ public class CommandBlocker extends FreedomService
         return isCommandBlocked(command, sender, false);
     }
 
+    // TODO: Complexity is 22. Need to fix this. Complexity can be no more than O(15).
     public boolean isCommandBlocked(String command, CommandSender sender, boolean doAction)
     {
         if (command == null || command.isEmpty())
@@ -156,6 +136,14 @@ public class CommandBlocker extends FreedomService
 
         // Format
         command = command.toLowerCase().trim();
+
+        // Whitespaces
+        Matcher whitespaceMatcher = whitespacePattern.matcher(command);
+        if (whitespaceMatcher.matches() && whitespaceMatcher.groupCount() == 2)
+        {
+            command = whitespaceMatcher.group(2);
+        }
+
         command = command.startsWith("/") ? command.substring(1) : command;
 
         // Check for plugin specific commands
@@ -203,12 +191,9 @@ public class CommandBlocker extends FreedomService
         }
 
         // Validate sub command
-        if (entry.getSubCommand() != null)
+        if (entry.getSubCommand() != null && (subCommand == null || !subCommand.startsWith(entry.getSubCommand())))
         {
-            if (subCommand == null || !subCommand.startsWith(entry.getSubCommand()))
-            {
-                return false;
-            }
+            return false;
         }
 
         if (entry.getRank().hasPermission(sender))

commons/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
 {
@@ -39,13 +39,13 @@ public class CommandBlockerEntry
     {
         if (action == CommandBlockerAction.BLOCK_AND_EJECT && sender instanceof Player)
         {
-            TotalFreedomMod.getPlugin().ae.autoEject((Player)sender, "You used a prohibited command: " + command);
+            TotalFreedomMod.getPlugin().ae.autoEject((Player) sender, "You used a prohibited command: " + command);
             FUtil.bcastMsg(sender.getName() + " was automatically kicked for using harmful commands.", ChatColor.RED);
             return;
         }
         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));

commons/src/main/java/me/totalfreedom/totalfreedommod/blocking/command/CommandBlockerRank.java

@@ -2,7 +2,6 @@ package me.totalfreedom.totalfreedommod.blocking.command;
 
 import me.totalfreedom.totalfreedommod.TotalFreedomMod;
 import me.totalfreedom.totalfreedommod.admin.Admin;
-import me.totalfreedom.totalfreedommod.rank.Rank;
 import org.bukkit.command.CommandSender;
 
 public enum CommandBlockerRank
@@ -25,7 +24,7 @@ public enum CommandBlockerRank
         Admin admin = TotalFreedomMod.getPlugin().al.getAdmin(sender);
         if (admin != null)
         {
-            if (admin.getRank() == Rank.SENIOR_ADMIN)
+            if (admin.getRank() == TotalFreedomMod.getPlugin().getHierarchy().groups().getSeniorAdmin())
             {
                 return SENIOR_ADMIN;
             }

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

@@ -1,22 +1,24 @@
 package me.totalfreedom.totalfreedommod.bridge;
 
-import java.util.ArrayList;
-import java.util.List;
-import java.util.Map;
 import me.totalfreedom.bukkittelnet.BukkitTelnet;
 import me.totalfreedom.bukkittelnet.api.TelnetCommandEvent;
 import me.totalfreedom.bukkittelnet.api.TelnetPreLoginEvent;
 import me.totalfreedom.bukkittelnet.api.TelnetRequestDataTagsEvent;
 import me.totalfreedom.bukkittelnet.session.ClientSession;
 import me.totalfreedom.totalfreedommod.FreedomService;
+import me.totalfreedom.totalfreedommod.TotalFreedomMod;
 import me.totalfreedom.totalfreedommod.admin.Admin;
-import me.totalfreedom.totalfreedommod.rank.Rank;
 import me.totalfreedom.totalfreedommod.util.FLog;
 import org.bukkit.entity.Player;
 import org.bukkit.event.EventHandler;
 import org.bukkit.event.EventPriority;
 import org.bukkit.plugin.Plugin;
 
+import java.util.ArrayList;
+import java.util.List;
+import java.util.Map;
+
+@Deprecated
 public class BukkitTelnetBridge extends FreedomService
 {
 
@@ -42,9 +44,9 @@ 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())
+        if (admin == null || !admin.isActive())
         {
             return;
         }
@@ -80,8 +82,8 @@ public class BukkitTelnetBridge extends FreedomService
                 boolean active = admin.isActive();
 
                 isAdmin = active;
-                isSeniorAdmin = active && admin.getRank() == Rank.SENIOR_ADMIN;
-                isTelnetAdmin = active && (isSeniorAdmin || admin.getRank() == Rank.ADMIN);
+                isSeniorAdmin = active && admin.getRank().equals(TotalFreedomMod.getPlugin().getHierarchy().groups().getSeniorAdmin());
+                isTelnetAdmin = active && (isSeniorAdmin || admin.getRank().equals(TotalFreedomMod.getPlugin().getHierarchy().groups().getAdmin()));
             }
 
             playerTags.put("tfm.admin.isAdmin", isAdmin);
@@ -90,7 +92,10 @@ public class BukkitTelnetBridge extends FreedomService
 
             playerTags.put("tfm.playerdata.getTag", plugin.pl.getPlayer(player).getTag());
 
-            playerTags.put("tfm.essentialsBridge.getNickname", plugin.esb.getNickname(player.getName()));
+            if (server.getPluginManager().isPluginEnabled("Essentials"))
+            {
+                playerTags.put("tfm.essentialsBridge.getNickname", plugin.esb.getNickname(player.getName()));
+            }
         }
     }
 
@@ -101,15 +106,11 @@ public class BukkitTelnetBridge extends FreedomService
             try
             {
                 final Plugin bukkitTelnet = server.getPluginManager().getPlugin("BukkitTelnet");
-                if (bukkitTelnet != null)
+                if (bukkitTelnet instanceof BukkitTelnet)
                 {
-                    if (bukkitTelnet instanceof BukkitTelnet)
-                    {
-                        bukkitTelnetPlugin = (BukkitTelnet)bukkitTelnet;
-                    }
+                    bukkitTelnetPlugin = (BukkitTelnet) bukkitTelnet;
                 }
-            }
-            catch (Exception ex)
+            } catch (Exception ex)
             {
                 FLog.severe(ex);
             }
@@ -159,8 +160,7 @@ public class BukkitTelnetBridge extends FreedomService
                     {
                         telnet.appender.removeSession(session);
                         session.syncTerminateSession();
-                    }
-                    catch (Exception ex)
+                    } catch (Exception ex)
                     {
                         FLog.severe("Error removing single telnet session: " + ex.getMessage());
                     }
@@ -168,8 +168,7 @@ public class BukkitTelnetBridge extends FreedomService
 
                 FLog.info(sessionsToRemove.size() + " telnet session(s) removed.");
             }
-        }
-        catch (Exception ex)
+        } catch (Exception ex)
         {
             FLog.severe("Error removing telnet sessions: " + ex.getMessage());
         }

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

@@ -0,0 +1,335 @@
+package me.totalfreedom.totalfreedommod.bridge;
+
+import me.totalfreedom.totalfreedommod.FreedomService;
+import me.totalfreedom.totalfreedommod.util.FLog;
+import me.totalfreedom.totalfreedommod.util.FUtil;
+import net.coreprotect.CoreProtect;
+import net.coreprotect.CoreProtectAPI;
+import net.coreprotect.utility.Util;
+import net.kyori.adventure.text.Component;
+import net.kyori.adventure.text.TextComponent;
+import net.kyori.adventure.text.event.ClickEvent;
+import net.kyori.adventure.text.format.NamedTextColor;
+import net.kyori.adventure.text.format.TextColor;
+import net.kyori.adventure.text.format.TextDecoration;
+import org.bukkit.Material;
+import org.bukkit.block.Block;
+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.player.PlayerInteractEvent;
+import org.bukkit.inventory.ItemStack;
+import org.bukkit.plugin.Plugin;
+import org.bukkit.scheduler.BukkitRunnable;
+
+import java.util.*;
+import java.util.concurrent.CompletableFuture;
+
+public class CoreProtectBridge extends FreedomService
+{
+    //-- Block Inspector --//
+    private static final Component name = Component.text("Block Inspector").color(TextColor.color(0x30ade4));
+    private static final Component header = Component.text("---- ").append(name)
+            .append(Component.text(" ---- ")).colorIfAbsent(NamedTextColor.WHITE);
+    private static final Component prefix = name.append(Component.text(" - ").color(NamedTextColor.WHITE))
+            .colorIfAbsent(NamedTextColor.WHITE);
+    //--
+    private final HashMap<UUID, Long> cooldownMap = new HashMap<>();
+    private HashMap<UUID, FUtil.PaginationList<CoreProtectAPI.ParseResult>> historyMap;
+
+    //---------------------//
+    private CoreProtectAPI coreProtectAPI = null;
+
+    public static Long getSecondsLeft(long prevTime, int timeAdd)
+    {
+        return prevTime / 1000L + timeAdd - System.currentTimeMillis() / 1000L;
+    }
+
+    @Override
+    public void onStart()
+    {
+        if (isEnabled())
+        {
+            historyMap = new HashMap<>();
+        }
+    }
+
+    @Override
+    public void onStop()
+    {
+    }
+
+    public CoreProtect getCoreProtect()
+    {
+        CoreProtect coreProtect = null;
+        try
+        {
+            final Plugin coreProtectPlugin = server.getPluginManager().getPlugin("CoreProtect");
+            assert coreProtectPlugin != null;
+            if (coreProtectPlugin instanceof CoreProtect)
+            {
+                coreProtect = (CoreProtect) coreProtectPlugin;
+            }
+        } catch (Exception ex)
+        {
+            FLog.severe(ex);
+        }
+        return coreProtect;
+    }
+
+    public CoreProtectAPI getCoreProtectAPI()
+    {
+        if (coreProtectAPI == null)
+        {
+            try
+            {
+                final CoreProtect coreProtect = getCoreProtect();
+
+                coreProtectAPI = coreProtect.getAPI();
+
+                // Check if the plugin or api is not enabled, if so, return null
+                if (!coreProtect.isEnabled() || !coreProtectAPI.isEnabled())
+                {
+                    return null;
+                }
+            } catch (Exception ex)
+            {
+                FLog.severe(ex);
+            }
+        }
+
+        return coreProtectAPI;
+    }
+
+    public boolean isEnabled()
+    {
+        if (!server.getPluginManager().isPluginEnabled("CoreProtect"))
+        {
+            return false;
+        }
+
+        final CoreProtect coreProtect = getCoreProtect();
+
+        return coreProtect != null && coreProtect.isEnabled();
+    }
+
+    // Rollback the specified player's edits that were in the last 24 hours.
+    public void rollback(final String name)
+    {
+        if (!isEnabled())
+        {
+            return;
+        }
+
+        final CoreProtectAPI coreProtect = getCoreProtectAPI();
+
+        new BukkitRunnable()
+        {
+            @Override
+            public void run()
+            {
+                coreProtect.performRollback(86400, Collections.singletonList(name), null, null, null, null, 0, null);
+            }
+        }.runTaskAsynchronously(plugin);
+    }
+
+    // Reverts a rollback for the specified player's edits that were in the last 24 hours.
+    public void restore(final String name)
+    {
+        if (!isEnabled())
+        {
+            return;
+        }
+
+        final CoreProtectAPI coreProtect = getCoreProtectAPI();
+
+        new BukkitRunnable()
+        {
+            @Override
+            public void run()
+            {
+                coreProtect.performRestore(86400, Collections.singletonList(name), null, null, null, null, 0, null);
+            }
+        }.runTaskAsynchronously(plugin);
+    }
+
+    public boolean hasHistory(Player player)
+    {
+        return historyMap.containsKey(player.getUniqueId());
+    }
+
+    public FUtil.PaginationList<CoreProtectAPI.ParseResult> getHistoryForPlayer(Player player)
+    {
+        return historyMap.get(player.getUniqueId());
+    }
+
+    // TODO: Complexity is O(19). This should be reduced.
+    public void showPageToPlayer(Player player, FUtil.PaginationList<CoreProtectAPI.ParseResult> results, int pageNum)
+    {
+        if (player == null || !player.isOnline())
+        {
+            return;
+        }
+
+        List<CoreProtectAPI.ParseResult> page = results.getPage(pageNum);
+
+        if (page == null || page.isEmpty())
+        {
+            player.sendMessage(prefix.append(Component.text("No results were found.", NamedTextColor.WHITE)));
+        } else
+        {
+            // This shouldn't change at all in any of the other entries, so this should be safe
+            Component location = Component.text(String.format("(%s, %s, %s)", results.get(0).getX(),
+                    results.get(0).getY(), results.get(0).getZ()));
+            final long time = System.currentTimeMillis() / 1000;
+
+            player.sendMessage(header.append(location.color(NamedTextColor.GRAY).decorate(TextDecoration.ITALIC)));
+            page.forEach(entry ->
+            {
+                TextComponent.Builder line = Component.text();
+
+                // Time
+                line.append(Component.text(Util.getTimeSince(entry.getTime(), time, false))
+                        .color(NamedTextColor.GRAY));
+
+                // Action
+                Component action = Component.text(" interacted with ");
+                Component symbol = Component.text(" - ", NamedTextColor.WHITE);
+                switch (entry.getActionId())
+                {
+                    case 0 ->
+                    {
+                        action = Component.text(" broke ");
+                        symbol = Component.text(" - ", NamedTextColor.RED);
+                    }
+                    case 1 ->
+                    {
+                        action = Component.text(" placed ");
+                        symbol = Component.text(" + ", NamedTextColor.GREEN);
+                    }
+                    case 2 -> action = Component.text(" clicked ");
+                    default ->
+                    {
+                        // Do nothing (shuts Codacy up)
+                    }
+                }
+                // Symbol, player, action, block
+                line.append(symbol).append(Component.text(entry.getPlayer()).color(TextColor.color(0x30ade4)))
+                        .append(action.color(NamedTextColor.WHITE)).append(
+                                Component.text(entry.getBlockData().getMaterial().name().toLowerCase())
+                                        .color(TextColor.color(0x30ade4)));
+
+                // Rolled back?
+                if (entry.isRolledBack())
+                {
+                    line.decorate(TextDecoration.STRIKETHROUGH);
+                }
+
+                player.sendMessage(line.append(Component.text(".", NamedTextColor.WHITE)).build());
+            });
+
+            if (results.getPageCount() > 1)
+            {
+                player.sendMessage(Component.text("-----", NamedTextColor.WHITE));
+
+                // Page indicator
+                TextComponent.Builder indicator = Component.text();
+
+                // <-
+                if (pageNum > 1)
+                {
+                    indicator.append(Component.text("◀ ", NamedTextColor.WHITE).clickEvent(
+                            ClickEvent.runCommand("/ins history " + (pageNum - 1))));
+                }
+
+                // Page <current>/<total>
+                indicator.append(Component.text("Page ", TextColor.color(0x30ade4)).append(Component.text(pageNum + "/"
+                        + results.getPageCount(), NamedTextColor.WHITE)));
+
+                // ->
+                if (pageNum < results.getPageCount())
+                {
+                    indicator.append(Component.text(" ▶", NamedTextColor.WHITE).clickEvent(
+                            ClickEvent.runCommand("/ins history  " + (pageNum + 1))));
+                }
+
+                // | Use /ins history <page> for advanced navigation
+                indicator.append(Component.text(" | ", NamedTextColor.GRAY).append(Component.text("Use ", NamedTextColor.WHITE)
+                        .append(Component.text("/ins history <page>", TextColor.color(0x30ade4))
+                                .clickEvent(ClickEvent.suggestCommand("/ins history ")))
+                        .append(Component.text(" for advanced navigation", NamedTextColor.WHITE))));
+
+                player.sendMessage(indicator.build());
+            }
+        }
+    }
+
+    public CompletableFuture<FUtil.PaginationList<CoreProtectAPI.ParseResult>> lookupForPlayer(Block block, Player player)
+    {
+        cooldownMap.put(player.getUniqueId(), System.currentTimeMillis());
+        CoreProtectAPI api = getCoreProtectAPI();
+
+        return CompletableFuture.supplyAsync(() ->
+        {
+            historyMap.remove(player.getUniqueId());
+            FUtil.PaginationList<CoreProtectAPI.ParseResult> pages = new FUtil.PaginationList<>(10);
+            api.blockLookup(block, -1).forEach(stringArray -> pages.add(api.parseResult(stringArray)));
+            historyMap.put(player.getUniqueId(), pages);
+            return pages;
+        });
+    }
+
+    @EventHandler(priority = EventPriority.MONITOR)
+    public void onInteract(PlayerInteractEvent event)
+    {
+        // The inspector only works if we have CoreProtect installed
+        if (!isEnabled())
+        {
+            return;
+        }
+
+        Player player = event.getPlayer();
+
+        if ((event.getAction() == Action.RIGHT_CLICK_BLOCK || event.getAction() == Action.LEFT_CLICK_BLOCK)
+                && plugin.pl.getData(player.getUniqueId()).hasInspection())
+        {
+            event.setCancelled(true);
+            Block block = event.getClickedBlock();
+            Optional<Long> cooldown = Optional.ofNullable(cooldownMap.get(player.getUniqueId()));
+
+            if (cooldown.isPresent() && getSecondsLeft(cooldown.get(), 3) > 0L)
+            {
+                player.sendMessage(prefix.append(Component.text("You need to wait ")
+                        .append(Component.text(getSecondsLeft(cooldown.get(), 3)))
+                        .append(Component.text(" seconds before you can make another query."))
+                        .color(NamedTextColor.WHITE)));
+                return;
+            }
+
+            // Time to do a look-up.
+            if (block != null)
+            {
+                /* This is a hack to make it so that when you right-click, the coordinates that get used depend on
+                 *  what's in your hand. Non-blocks use the block you clicked directly, but blocks use wherever the
+                 *  block was supposed to be placed. */
+                ItemStack hand = player.getInventory().getItemInMainHand();
+                if (event.getAction() == Action.RIGHT_CLICK_BLOCK && hand.getType().isBlock() && hand.getType() != Material.AIR)
+                {
+                    block = block.getRelative(event.getBlockFace()).getState().getBlock();
+                }
+
+                lookupForPlayer(block, player).thenAccept(results ->
+                {
+                    if (results.isEmpty())
+                    {
+                        player.sendMessage(prefix.append(Component.text("No results were found.").color(NamedTextColor.WHITE)));
+                    } else
+                    {
+                        showPageToPlayer(player, results, 1);
+                    }
+                });
+            }
+        }
+    }
+}

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

@@ -4,9 +4,8 @@ import com.earth2me.essentials.Essentials;
 import com.earth2me.essentials.User;
 import me.totalfreedom.totalfreedommod.FreedomService;
 import me.totalfreedom.totalfreedommod.player.FPlayer;
-import me.totalfreedom.totalfreedommod.rank.Rank;
+import me.totalfreedom.totalfreedommod.rank.DisplayableGroup;
 import me.totalfreedom.totalfreedommod.util.FLog;
-import me.totalfreedom.totalfreedommod.util.FUtil;
 import org.bukkit.entity.HumanEntity;
 import org.bukkit.entity.Player;
 import org.bukkit.event.EventHandler;
@@ -14,7 +13,6 @@ import org.bukkit.event.EventPriority;
 import org.bukkit.event.inventory.InventoryClickEvent;
 import org.bukkit.event.inventory.InventoryCloseEvent;
 import org.bukkit.event.inventory.InventoryType;
-import org.bukkit.event.player.PlayerQuitEvent;
 import org.bukkit.inventory.Inventory;
 import org.bukkit.inventory.InventoryHolder;
 import org.bukkit.plugin.Plugin;
@@ -28,11 +26,13 @@ public class EssentialsBridge extends FreedomService
     @Override
     public void onStart()
     {
+        // This is completely useless, but it's here to make sure the service is loaded.
     }
 
     @Override
     public void onStop()
     {
+        essentialsPlugin = null;
     }
 
     public Essentials getEssentialsPlugin()
@@ -43,12 +43,11 @@ public class EssentialsBridge extends FreedomService
             {
                 final Plugin essentials = server.getPluginManager().getPlugin("Essentials");
                 assert essentials != null;
-                if (essentials instanceof Essentials)
+                if (essentials instanceof Essentials e)
                 {
-                    essentialsPlugin = (Essentials)essentials;
+                    essentialsPlugin = e;
                 }
-            }
-            catch (Exception ex)
+            } catch (Exception ex)
             {
                 FLog.severe(ex);
             }
@@ -65,8 +64,7 @@ public class EssentialsBridge extends FreedomService
             {
                 return essentials.getUserMap().getUser(username);
             }
-        }
-        catch (Exception ex)
+        } catch (Exception ex)
         {
             FLog.severe(ex);
         }
@@ -83,8 +81,7 @@ public class EssentialsBridge extends FreedomService
                 user.setNickname(nickname);
                 user.setDisplayNick();
             }
-        }
-        catch (Exception ex)
+        } catch (Exception ex)
         {
             FLog.severe(ex);
         }
@@ -99,8 +96,7 @@ public class EssentialsBridge extends FreedomService
             {
                 return user.getNickname();
             }
-        }
-        catch (Exception ex)
+        } catch (Exception ex)
         {
             FLog.severe(ex);
         }
@@ -114,11 +110,9 @@ 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)
+        } catch (Exception ex)
         {
             FLog.severe(ex);
         }
@@ -134,8 +128,7 @@ public class EssentialsBridge extends FreedomService
             {
                 user.setVanished(vanished);
             }
-        }
-        catch (Exception ex)
+        } catch (Exception ex)
         {
             FLog.severe(ex);
         }
@@ -147,17 +140,18 @@ public class EssentialsBridge extends FreedomService
         Player refreshPlayer = null;
         Inventory inventory = event.getView().getTopInventory();
         InventoryType inventoryType = inventory.getType();
-        Player player = (Player)event.getWhoClicked();
+        Player player = (Player) event.getWhoClicked();
         FPlayer fPlayer = plugin.pl.getPlayer(player);
         if (inventoryType == InventoryType.PLAYER && fPlayer.isInvSee())
         {
             final InventoryHolder inventoryHolder = inventory.getHolder();
             if (inventoryHolder instanceof HumanEntity)
             {
-                Player invOwner = (Player)inventoryHolder;
-                Rank recieverRank = plugin.rm.getRank(player);
-                Rank playerRank = plugin.rm.getRank(invOwner);
-                if (playerRank.ordinal() >= recieverRank.ordinal() || !invOwner.isOnline())
+                Player invOwner = (Player) inventoryHolder;
+                DisplayableGroup recieverRank = plugin.rm.getRank(player);
+                DisplayableGroup playerRank = plugin.rm.getRank(invOwner);
+                if (playerRank.getWeight().getWeight() >= recieverRank.getWeight().getWeight()
+                        || !invOwner.isOnline())
                 {
                     event.setCancelled(true);
                     refreshPlayer = player;
@@ -184,7 +178,7 @@ public class EssentialsBridge extends FreedomService
         Player refreshPlayer = null;
         Inventory inventory = event.getView().getTopInventory();
         InventoryType inventoryType = inventory.getType();
-        Player player = (Player)event.getPlayer();
+        Player player = (Player) event.getPlayer();
         FPlayer fPlayer = plugin.pl.getPlayer(player);
         if (inventoryType == InventoryType.PLAYER && fPlayer.isInvSee())
         {
@@ -205,13 +199,6 @@ public class EssentialsBridge extends FreedomService
         }
     }
 
-    // TODO: Actually use this for something or remove it.
-    @EventHandler(priority = EventPriority.MONITOR)
-    public void onPlayerQuit(PlayerQuitEvent event)
-    {
-        Player player = event.getPlayer();
-    }
-
     public boolean isEnabled()
     {
         final Essentials ess = getEssentialsPlugin();

commons/src/main/java/me/totalfreedom/totalfreedommod/bridge/LibsDisguisesBridge.java

@@ -5,12 +5,33 @@ import me.libraryaddict.disguise.DisguiseAPI;
 import me.libraryaddict.disguise.LibsDisguises;
 import me.totalfreedom.totalfreedommod.FreedomService;
 import me.totalfreedom.totalfreedommod.util.FLog;
+import org.bukkit.Bukkit;
 import org.bukkit.entity.Player;
 import org.bukkit.plugin.Plugin;
 
 public class LibsDisguisesBridge extends FreedomService
 {
-    private LibsDisguises libsDisguisesPlugin = null;
+    private static LibsDisguises libsDisguisesPlugin = null;
+
+    public static LibsDisguises getLibsDisguisesPlugin()
+    {
+        if (libsDisguisesPlugin == null)
+        {
+            try
+            {
+                final Plugin libsDisguises = Bukkit.getServer().getPluginManager().getPlugin("LibsDisguises");
+                if (libsDisguises instanceof LibsDisguises)
+                {
+                    libsDisguisesPlugin = (LibsDisguises) libsDisguises;
+                }
+            } catch (Exception ex)
+            {
+                FLog.severe(ex);
+            }
+        }
+
+        return libsDisguisesPlugin;
+    }
 
     @Override
     public void onStart()
@@ -22,30 +43,6 @@ public class LibsDisguisesBridge extends FreedomService
     {
     }
 
-    public LibsDisguises getLibsDisguisesPlugin()
-    {
-        if (libsDisguisesPlugin == null)
-        {
-            try
-            {
-                final Plugin libsDisguises = server.getPluginManager().getPlugin("LibsDisguises");
-                if (libsDisguises != null)
-                {
-                    if (libsDisguises instanceof LibsDisguises)
-                    {
-                        libsDisguisesPlugin = (LibsDisguises)libsDisguises;
-                    }
-                }
-            }
-            catch (Exception ex)
-            {
-                FLog.severe(ex);
-            }
-        }
-
-        return libsDisguisesPlugin;
-    }
-
     public void undisguiseAll(boolean admin)
     {
         try
@@ -68,8 +65,7 @@ public class LibsDisguisesBridge extends FreedomService
                     DisguiseAPI.undisguiseToAll(player);
                 }
             }
-        }
-        catch (Exception ex)
+        } catch (Exception ex)
         {
             FLog.severe(ex);
         }
@@ -80,7 +76,7 @@ public class LibsDisguisesBridge extends FreedomService
         return !BlockedDisguises.disabled;
     }
 
-    public void setDisguisesEnabled(boolean state)
+    public static void setDisguisesEnabled(boolean state)
     {
         final LibsDisguises libsDisguises = getLibsDisguisesPlugin();
 

commons/src/main/java/me/totalfreedom/totalfreedommod/bridge/LuckPermsBridge.java

@@ -0,0 +1,63 @@
+package me.totalfreedom.totalfreedommod.bridge;
+
+import me.totalfreedom.totalfreedommod.TotalFreedomMod;
+import net.luckperms.api.LuckPerms;
+import net.luckperms.api.track.TrackManager;
+import org.bukkit.Bukkit;
+import org.bukkit.plugin.RegisteredServiceProvider;
+import org.bukkit.plugin.UnknownDependencyException;
+
+public class LuckPermsBridge
+{
+    private final LuckPerms luckPerms;
+
+    public LuckPermsBridge()
+    {
+        RegisteredServiceProvider<LuckPerms> provider = Bukkit.getServicesManager()
+                .getRegistration(LuckPerms.class);
+
+        if (provider == null) throw new UnknownDependencyException("LuckPerms must be present!");
+
+        this.luckPerms = provider.getProvider();
+
+        setupTracks();
+    }
+
+    public LuckPerms getAPI()
+    {
+        return luckPerms;
+    }
+
+    public void setupTracks()
+    {
+        TrackManager trackManager = getAPI().getTrackManager();
+
+        if (!trackManager.isLoaded("fakeOp"))
+        {
+            trackManager.createAndLoadTrack("fakeOp").whenComplete((track, exception) ->
+            {
+                track.appendGroup(TotalFreedomMod.getPlugin().getHierarchy().groups().getNonOp().getLuckPermsGroup());
+                track.appendGroup(TotalFreedomMod.getPlugin().getHierarchy().groups().getOp().getLuckPermsGroup());
+            });
+        }
+
+        if (!trackManager.isLoaded("admin"))
+        {
+            trackManager.createAndLoadTrack("admin").whenComplete((track, exception) ->
+            {
+                track.appendGroup(TotalFreedomMod.getPlugin().getHierarchy().groups().getAdmin().getLuckPermsGroup());
+                track.appendGroup(TotalFreedomMod.getPlugin().getHierarchy().groups().getSeniorAdmin().getLuckPermsGroup());
+            });
+        }
+
+        if (!trackManager.isLoaded("builder"))
+        {
+            trackManager.createAndLoadTrack("builder").whenComplete((track, exception) ->
+                    track.appendGroup(TotalFreedomMod.getPlugin()
+                            .getHierarchy()
+                            .groups()
+                            .getMasterBuilder()
+                            .getLuckPermsGroup()));
+        }
+    }
+}

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

@@ -1,7 +1,6 @@
 package me.totalfreedom.totalfreedommod.bridge;
 
 import com.sk89q.worldedit.LocalSession;
-import com.sk89q.worldedit.bukkit.BukkitPlayer;
 import com.sk89q.worldedit.bukkit.WorldEditPlugin;
 import me.totalfreedom.totalfreedommod.FreedomService;
 import me.totalfreedom.totalfreedommod.util.FLog;
@@ -35,11 +34,10 @@ public class WorldEditBridge extends FreedomService
                 {
                     if (we instanceof WorldEditPlugin)
                     {
-                        worldeditPlugin = (WorldEditPlugin)we;
+                        worldeditPlugin = (WorldEditPlugin) we;
                     }
                 }
-            }
-            catch (Exception ex)
+            } catch (Exception ex)
             {
                 FLog.severe(ex);
             }
@@ -48,52 +46,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
@@ -103,8 +55,7 @@ public class WorldEditBridge extends FreedomService
             {
                 session.setBlockChangeLimit(limit);
             }
-        }
-        catch (Exception ex)
+        } catch (Exception ex)
         {
             FLog.severe(ex);
         }
@@ -146,27 +97,7 @@ public class WorldEditBridge extends FreedomService
         try
         {
             return wep.getSession(player);
-        }
-        catch (Exception ex)
-        {
-            FLog.severe(ex);
-            return null;
-        }
-    }
-
-    private BukkitPlayer getBukkitPlayer(Player player)
-    {
-        final WorldEditPlugin wep = getWorldEditPlugin();
-        if (wep == null)
-        {
-            return null;
-        }
-
-        try
-        {
-            return wep.wrapPlayer(player);
-        }
-        catch (Exception ex)
+        } catch (Exception ex)
         {
             FLog.severe(ex);
             return null;

commons/src/main/java/me/totalfreedom/totalfreedommod/caging/CageData.java

@@ -1,13 +1,14 @@
 package me.totalfreedom.totalfreedommod.caging;
 
-import java.util.ArrayList;
-import java.util.List;
 import me.totalfreedom.totalfreedommod.player.FPlayer;
 import org.bukkit.Location;
 import org.bukkit.Material;
 import org.bukkit.block.Block;
 import org.bukkit.block.Skull;
 
+import java.util.ArrayList;
+import java.util.List;
+
 public class CageData
 {
 
@@ -74,8 +75,7 @@ public class CageData
                         }
 
                         block.setType(material);
-                    }
-                    else
+                    } else
                     {
                         if (Math.abs(xOffset) == length && Math.abs(yOffset) == length && Math.abs(zOffset) == length)
                         {
@@ -88,12 +88,11 @@ public class CageData
                         {
                             try
                             {
-                                Skull skull = (Skull)block.getState();
+                                Skull skull = (Skull) block.getState();
                                 // This may or may not work in future versions of spigot
                                 skull.setOwner(input);
                                 skull.update();
-                            }
-                            catch (ClassCastException ignored)
+                            } catch (ClassCastException ignored)
                             {
                             }
                         }
@@ -124,7 +123,7 @@ public class CageData
         this.location = location;
         this.outerMaterial = outer;
         this.innerMaterial = inner;
-        input = null;
+        input = null; // TODO: Remove static variable declaration in a non-static block.
 
         buildHistory(location);
         regenerate();
@@ -141,7 +140,7 @@ public class CageData
         this.location = location;
         this.outerMaterial = outer;
         this.innerMaterial = inner;
-        CageData.input = input;
+        CageData.input = input; // TODO: Remove static variable declaration in a non-static block.
 
         buildHistory(location);
         regenerate();
@@ -233,8 +232,7 @@ public class CageData
         if (cage)
         {
             cage(fPlayer.getPlayer().getLocation(), Material.GLASS, Material.GLASS);
-        }
-        else
+        } else
         {
             this.caged = false;
             regenerateHistory();

commons/src/main/java/me/totalfreedom/totalfreedommod/caging/Cager.java

@@ -1,7 +1,6 @@
 package me.totalfreedom.totalfreedommod.caging;
 
 import io.papermc.lib.PaperLib;
-import java.util.Objects;
 import me.totalfreedom.totalfreedommod.FreedomService;
 import me.totalfreedom.totalfreedommod.player.FPlayer;
 import me.totalfreedom.totalfreedommod.util.FUtil;
@@ -16,6 +15,8 @@ import org.bukkit.event.player.PlayerKickEvent;
 import org.bukkit.event.player.PlayerMoveEvent;
 import org.bukkit.event.player.PlayerQuitEvent;
 
+import java.util.Objects;
+
 public class Cager extends FreedomService
 {
     @Override
@@ -64,8 +65,7 @@ public class Cager extends FreedomService
         if (!Objects.equals(playerLoc.getWorld(), cageLoc.getWorld()))
         {
             outOfCage = true;
-        }
-        else
+        } else
         {
             outOfCage = playerLoc.distanceSquared(cageLoc) > (2.5D * 2.5D);
         }

commons/src/main/java/me/totalfreedom/totalfreedommod/command/Command_adminchat.java

@@ -1,13 +1,17 @@
 package me.totalfreedom.totalfreedommod.command;
 
+import me.totalfreedom.totalfreedommod.command.handling.CommandParameters;
+import me.totalfreedom.totalfreedommod.command.handling.CommandPermissions;
+import me.totalfreedom.totalfreedommod.command.handling.FreedomCommand;
+import me.totalfreedom.totalfreedommod.command.handling.SourceType;
 import me.totalfreedom.totalfreedommod.player.FPlayer;
-import me.totalfreedom.totalfreedommod.rank.Rank;
+import net.kyori.adventure.text.minimessage.tag.resolver.Placeholder;
 import org.apache.commons.lang.StringUtils;
 import org.bukkit.command.Command;
 import org.bukkit.command.CommandSender;
 import org.bukkit.entity.Player;
 
-@CommandPermissions(level = Rank.ADMIN, source = SourceType.BOTH)
+@CommandPermissions(permission = "adminchat", source = SourceType.BOTH)
 @CommandParameters(description = "Talk privately with other admins on the server.", usage = "/<command> [message]", aliases = "o,sc,ac,staffchat")
 public class Command_adminchat extends FreedomCommand
 {
@@ -19,15 +23,14 @@ public class Command_adminchat extends FreedomCommand
         {
             if (senderIsConsole)
             {
-                msg("You must be in-game to toggle admin chat, it cannot be toggled via CONSOLE or Telnet.");
+                msgNew("<red>You must be in-game to toggle admin chat, it cannot be toggled via CONSOLE or Telnet.");
                 return true;
             }
 
             FPlayer userinfo = plugin.pl.getPlayer(playerSender);
             userinfo.setAdminChat(!userinfo.inAdminChat());
-            msg("Admin chat turned " + (userinfo.inAdminChat() ? "on" : "off") + ".");
-        }
-        else
+            msgNew("Admin chat turned <status>.", Placeholder.unparsed("status", userinfo.inAdminChat() ? "on" : "off"));
+        } else
         {
             plugin.cm.adminChat(sender, StringUtils.join(args, " "));
         }

commons/src/main/java/me/totalfreedom/totalfreedommod/command/Command_admininfo.java

@@ -1,16 +1,17 @@
 package me.totalfreedom.totalfreedommod.command;
 
-import java.util.List;
+import me.totalfreedom.totalfreedommod.command.handling.CommandParameters;
+import me.totalfreedom.totalfreedommod.command.handling.CommandPermissions;
+import me.totalfreedom.totalfreedommod.command.handling.FreedomCommand;
+import me.totalfreedom.totalfreedommod.command.handling.SourceType;
 import me.totalfreedom.totalfreedommod.config.ConfigEntry;
-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.command.Command;
 import org.bukkit.command.CommandSender;
 import org.bukkit.entity.Player;
 
-@CommandPermissions(level = Rank.OP, source = SourceType.BOTH)
+import java.util.List;
+
+@CommandPermissions(permission = "admininfo", source = SourceType.BOTH)
 @CommandParameters(description = "Information on how to apply for admin.", usage = "/<command>", aliases = "si,ai,staffinfo")
 public class Command_admininfo extends FreedomCommand
 {
@@ -22,12 +23,12 @@ public class Command_admininfo extends FreedomCommand
 
         if (adminInfo.isEmpty())
         {
-            msg("The admin information section of the config.yml file has not been configured.", ChatColor.RED);
-        }
-        else
+            msgNew("<red>The admin information section of the config.yml file has not been configured.");
+        } else
         {
-            msg(FUtil.colorize(StringUtils.join(adminInfo, "\n")));
+            adminInfo.forEach(this::msgNew);
         }
+
         return true;
     }
 }

commons/src/main/java/me/totalfreedom/totalfreedommod/command/Command_adminmode.java

@@ -1,16 +1,21 @@
 package me.totalfreedom.totalfreedommod.command;
 
-import java.util.Arrays;
-import java.util.Collections;
-import java.util.List;
+import me.totalfreedom.totalfreedommod.command.handling.CommandParameters;
+import me.totalfreedom.totalfreedommod.command.handling.CommandPermissions;
+import me.totalfreedom.totalfreedommod.command.handling.FreedomCommand;
+import me.totalfreedom.totalfreedommod.command.handling.SourceType;
 import me.totalfreedom.totalfreedommod.config.ConfigEntry;
-import me.totalfreedom.totalfreedommod.rank.Rank;
 import me.totalfreedom.totalfreedommod.util.FUtil;
+import net.kyori.adventure.text.Component;
 import org.bukkit.command.Command;
 import org.bukkit.command.CommandSender;
 import org.bukkit.entity.Player;
 
-@CommandPermissions(level = Rank.ADMIN, source = SourceType.BOTH)
+import java.util.Arrays;
+import java.util.Collections;
+import java.util.List;
+
+@CommandPermissions(permission = "adminmode", source = SourceType.BOTH)
 @CommandParameters(description = "Denies joining of operators and only allows admins to join.", usage = "/<command> [on | off]", aliases = "staffmode")
 public class Command_adminmode extends FreedomCommand
 {
@@ -28,18 +33,12 @@ public class Command_adminmode extends FreedomCommand
             ConfigEntry.ADMIN_ONLY_MODE.setBoolean(false);
             FUtil.adminAction(sender.getName(), "Opening the server to all players", true);
             return true;
-        }
-        else if (args[0].equalsIgnoreCase("on"))
+        } else if (args[0].equalsIgnoreCase("on"))
         {
             ConfigEntry.ADMIN_ONLY_MODE.setBoolean(true);
             FUtil.adminAction(sender.getName(), "Closing the server to non-admins", true);
-            for (Player player : server.getOnlinePlayers())
-            {
-                if (!isAdmin(player))
-                {
-                    player.kickPlayer("Server is now closed to non-admins.");
-                }
-            }
+            server.getOnlinePlayers().stream().filter(player -> !isAdmin(player)).forEach(player ->
+                    player.kick(Component.text("The server is now closed to non-admins.")));
             return true;
         }
 

commons/src/main/java/me/totalfreedom/totalfreedommod/command/Command_adminworld.java

@@ -1,18 +1,23 @@
 package me.totalfreedom.totalfreedommod.command;
 
 import io.papermc.lib.PaperLib;
-import java.util.Arrays;
-import java.util.Collections;
-import java.util.List;
-import me.totalfreedom.totalfreedommod.rank.Rank;
+import me.totalfreedom.totalfreedommod.command.handling.CommandParameters;
+import me.totalfreedom.totalfreedommod.command.handling.CommandPermissions;
+import me.totalfreedom.totalfreedommod.command.handling.FreedomCommand;
+import me.totalfreedom.totalfreedommod.command.handling.SourceType;
 import me.totalfreedom.totalfreedommod.world.WorldTime;
 import me.totalfreedom.totalfreedommod.world.WorldWeather;
+import net.kyori.adventure.text.minimessage.tag.resolver.Placeholder;
 import org.bukkit.World;
 import org.bukkit.command.Command;
 import org.bukkit.command.CommandSender;
 import org.bukkit.entity.Player;
 
-@CommandPermissions(level = Rank.OP, source = SourceType.BOTH)
+import java.util.Arrays;
+import java.util.Collections;
+import java.util.List;
+
+@CommandPermissions(permission = "adminworld", source = SourceType.BOTH)
 @CommandParameters(description = "Allows for admins to configure time, and weather of the AdminWorld, and allows for admins and ops to go to the AdminWorld.",
         usage = "/<command> [time <morning | noon | evening | night> | weather <off | rain | storm>]",
         aliases = "sw,aw,staffworld")
@@ -27,14 +32,12 @@ public class Command_adminworld extends FreedomCommand
         if (args.length == 0)
         {
             commandMode = CommandMode.TELEPORT;
-        }
-        else if (args.length >= 2)
+        } else if (args.length >= 2)
         {
             if ("time".equalsIgnoreCase(args[0]))
             {
                 commandMode = CommandMode.TIME;
-            }
-            else if ("weather".equalsIgnoreCase(args[0]))
+            } else if ("weather".equalsIgnoreCase(args[0]))
             {
                 commandMode = CommandMode.WEATHER;
             }
@@ -49,7 +52,7 @@ public class Command_adminworld extends FreedomCommand
         {
             switch (commandMode)
             {
-                case TELEPORT:
+                case TELEPORT ->
                 {
                     if (!(sender instanceof Player) || playerSender == null)
                     {
@@ -60,24 +63,21 @@ public class Command_adminworld extends FreedomCommand
                     try
                     {
                         adminWorld = plugin.wm.adminworld.getWorld();
-                    }
-                    catch (Exception ignored)
+                    } catch (Exception ignored)
                     {
                     }
 
                     if (adminWorld == null || playerSender.getWorld() == adminWorld)
                     {
-                        msg("Going to the main world.");
+                        msgNew("Going to the main world.");
                         PaperLib.teleportAsync(playerSender, server.getWorlds().get(0).getSpawnLocation());
-                    }
-                    else
+                    } else
                     {
-                        msg("Going to the AdminWorld.");
+                        msgNew("Going to the AdminWorld.");
                         plugin.wm.adminworld.sendToWorld(playerSender);
                     }
-                    break;
                 }
-                case TIME:
+                case TIME ->
                 {
                     assertCommandPerms(sender, playerSender);
 
@@ -87,21 +87,18 @@ public class Command_adminworld extends FreedomCommand
                         if (timeOfDay != null)
                         {
                             plugin.wm.adminworld.setTimeOfDay(timeOfDay);
-                            msg("AdminWorld time set to: " + timeOfDay.name());
-                        }
-                        else
+                            msgNew("AdminWorld time set to: <time>", Placeholder.unparsed("time", timeOfDay.name()));
+                        } else
                         {
-                            msg("Invalid time of day. Can be: sunrise, noon, sunset, midnight");
+                            msgNew("<red>Invalid time of day. Can be: sunrise, noon, sunset, midnight");
                         }
-                    }
-                    else
+                    } else
                     {
                         return false;
                     }
 
-                    break;
                 }
-                case WEATHER:
+                case WEATHER ->
                 {
                     assertCommandPerms(sender, playerSender);
 
@@ -111,33 +108,29 @@ public class Command_adminworld extends FreedomCommand
                         if (weatherMode != null)
                         {
                             plugin.wm.adminworld.setWeatherMode(weatherMode);
-                            msg("AdminWorld weather set to: " + weatherMode.name());
-                        }
-                        else
+                            msgNew("AdminWorld weather set to <mode>.", Placeholder.unparsed("mode", weatherMode.name()));
+                        } else
                         {
-                            msg("Invalid weather mode. Can be: off, rain, storm");
+                            msgNew("<red>Invalid weather mode. Can be: off, rain, storm");
                         }
-                    }
-                    else
+                    } else
                     {
                         return false;
                     }
 
-                    break;
                 }
-                default:
+                default ->
                 {
                     return false;
                 }
             }
-        }
-        catch (PermissionDeniedException ex)
+        } catch (PermissionDeniedException ex)
         {
             if (ex.getMessage().isEmpty())
             {
                 return noPerms();
             }
-            sender.sendMessage(ex.getMessage());
+            msgNew("<red>" + ex.getMessage());
             return true;
         }
 
@@ -147,7 +140,7 @@ public class Command_adminworld extends FreedomCommand
     // TODO: Redo this properly
     private void assertCommandPerms(CommandSender sender, Player playerSender) throws PermissionDeniedException
     {
-        if (!(sender instanceof Player) || playerSender == null || !isAdmin(sender))
+        if (!(sender instanceof Player) || playerSender == null || !sender.hasPermission("tfm.adminworld.manage"))
         {
             throw new PermissionDeniedException();
         }
@@ -163,14 +156,12 @@ public class Command_adminworld extends FreedomCommand
         if (args.length == 1)
         {
             return Arrays.asList("time", "weather");
-        }
-        else if (args.length == 2)
+        } else if (args.length == 2)
         {
             if (args[0].equals("time"))
             {
                 return Arrays.asList("morning", "noon", "evening", "night");
-            }
-            else if (args[0].equals("weather"))
+            } else if (args[0].equals("weather"))
             {
                 return Arrays.asList("off", "rain", "storm");
             }

commons/src/main/java/me/totalfreedom/totalfreedommod/command/Command_announce.java

@@ -1,12 +1,15 @@
 package me.totalfreedom.totalfreedommod.command;
 
-import me.totalfreedom.totalfreedommod.rank.Rank;
+import me.totalfreedom.totalfreedommod.command.handling.CommandParameters;
+import me.totalfreedom.totalfreedommod.command.handling.CommandPermissions;
+import me.totalfreedom.totalfreedommod.command.handling.FreedomCommand;
+import me.totalfreedom.totalfreedommod.command.handling.SourceType;
 import org.apache.commons.lang.StringUtils;
 import org.bukkit.command.Command;
 import org.bukkit.command.CommandSender;
 import org.bukkit.entity.Player;
 
-@CommandPermissions(level = Rank.ADMIN, source = SourceType.BOTH)
+@CommandPermissions(permission = "announce", source = SourceType.BOTH)
 @CommandParameters(description = "Make an announcement anonymously to operators.", usage = "/<command> <message>")
 public class Command_announce extends FreedomCommand
 {

commons/src/main/java/me/totalfreedom/totalfreedommod/command/Command_autoclear.java

@@ -1,11 +1,15 @@
 package me.totalfreedom.totalfreedommod.command;
 
-import me.totalfreedom.totalfreedommod.rank.Rank;
+import me.totalfreedom.totalfreedommod.command.handling.CommandParameters;
+import me.totalfreedom.totalfreedommod.command.handling.CommandPermissions;
+import me.totalfreedom.totalfreedommod.command.handling.FreedomCommand;
+import me.totalfreedom.totalfreedommod.command.handling.SourceType;
+import net.kyori.adventure.text.minimessage.tag.resolver.Placeholder;
 import org.bukkit.command.Command;
 import org.bukkit.command.CommandSender;
 import org.bukkit.entity.Player;
 
-@CommandPermissions(level = Rank.ADMIN, source = SourceType.BOTH)
+@CommandPermissions(permission = "autoclear", source = SourceType.BOTH)
 @CommandParameters(description = "Toggle whether or not a player has their inventory automatically cleared when they join", usage = "/<command> <player>")
 public class Command_autoclear extends FreedomCommand
 {
@@ -23,13 +27,13 @@ public class Command_autoclear extends FreedomCommand
         if (enabled)
         {
             plugin.lp.CLEAR_ON_JOIN.remove(args[0]);
-        }
-        else
+        } else
         {
             plugin.lp.CLEAR_ON_JOIN.add(args[0]);
         }
 
-        msg(args[0] + " will " + (enabled ? "no longer" : "now") + " have their inventory cleared when they join.");
+        msgNew("<player> will <status> have their inventory cleared when they join.",
+                Placeholder.unparsed("player", args[0]), Placeholder.unparsed("status", enabled ? "no longer" : "now"));
 
         return true;
     }

commons/src/main/java/me/totalfreedom/totalfreedommod/command/Command_autotp.java

@@ -1,11 +1,15 @@
 package me.totalfreedom.totalfreedommod.command;
 
-import me.totalfreedom.totalfreedommod.rank.Rank;
+import me.totalfreedom.totalfreedommod.command.handling.CommandParameters;
+import me.totalfreedom.totalfreedommod.command.handling.CommandPermissions;
+import me.totalfreedom.totalfreedommod.command.handling.FreedomCommand;
+import me.totalfreedom.totalfreedommod.command.handling.SourceType;
+import net.kyori.adventure.text.minimessage.tag.resolver.Placeholder;
 import org.bukkit.command.Command;
 import org.bukkit.command.CommandSender;
 import org.bukkit.entity.Player;
 
-@CommandPermissions(level = Rank.ADMIN, source = SourceType.BOTH)
+@CommandPermissions(permission = "autotp", source = SourceType.BOTH)
 @CommandParameters(description = "Toggle whether or not a player is automatically teleported when they join", usage = "/<command> <player>")
 public class Command_autotp extends FreedomCommand
 {
@@ -23,14 +27,13 @@ public class Command_autotp extends FreedomCommand
         if (enabled)
         {
             plugin.lp.TELEPORT_ON_JOIN.remove(args[0]);
-        }
-        else
+        } else
         {
             plugin.lp.TELEPORT_ON_JOIN.add(args[0]);
         }
 
-        msg(args[0] + " will " + (enabled ? "no longer" : "now") + " be automatically teleported when they join.");
-
+        msgNew("<player> will <status> be automatically teleported when they join.",
+                Placeholder.unparsed("player", args[0]), Placeholder.unparsed("status", enabled ? "no longer" : "now"));
         return true;
     }
 }

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

@@ -1,17 +1,15 @@
 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.command.handling.*;
 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 net.kyori.adventure.text.minimessage.tag.resolver.Placeholder;
 import org.apache.commons.lang.ArrayUtils;
 import org.apache.commons.lang.StringUtils;
-import org.bukkit.Bukkit;
 import org.bukkit.ChatColor;
 import org.bukkit.GameMode;
 import org.bukkit.Location;
@@ -19,7 +17,10 @@ import org.bukkit.command.Command;
 import org.bukkit.command.CommandSender;
 import org.bukkit.entity.Player;
 
-@CommandPermissions(level = Rank.ADMIN, source = SourceType.BOTH, blockHostConsole = true)
+import java.util.Objects;
+
+@Intercept("ban")
+@CommandPermissions(permission = "ban", source = SourceType.BOTH, blockHostConsole = true)
 @CommandParameters(description = "Bans the specified player.", usage = "/<command> <username> [reason] [-nrb | -q]", aliases = "gtfo")
 public class Command_ban extends FreedomCommand
 {
@@ -52,36 +53,44 @@ public class Command_ban extends FreedomCommand
                 {
                     reason = StringUtils.join(ArrayUtils.subarray(args, 1, args.length - 1), " ");
                 }
-            }
-            else
+            } else
             {
                 reason = StringUtils.join(ArrayUtils.subarray(args, 1, args.length), " ");
             }
         }
 
         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]);
-
-            if (entry == null)
+            // Gets the IP using Essentials data if available
+            if (plugin.esb.isEnabled() && plugin.esb.getEssentialsUser(args[0]) != null)
             {
-                msg("Can't find that user. If target is not logged in, make sure that you spelled the name exactly.");
-                return true;
+                User essUser = plugin.esb.getEssentialsUser(args[0]);
+                //
+                username = essUser.getName();
+                ip = essUser.getLastLoginAddress();
             }
-
-            username = entry.getName();
-            ips.addAll(entry.getIps());
-        }
-        else
+            // Last resort - Getting the first result from the username itself
+            else
+            {
+                PlayerData entry = plugin.pl.getData(args[0]);
+                if (entry == null)
+                {
+                    msg(PLAYER_NOT_FOUND);
+                    return true;
+                } else
+                {
+                    username = entry.getName();
+                    ip = entry.getIps().get(0);
+                }
+            }
+        } else
         {
-            final PlayerData entry = plugin.pl.getData(player);
             username = player.getName();
-            //ips.addAll(entry.getIps());/
-            ips.add(FUtil.getIp(player));
+            ip = FUtil.getIp(player);
 
             // Deop
             player.setOp(false);
@@ -104,10 +113,9 @@ public class Command_ban extends FreedomCommand
                         Objects.requireNonNull(targetPos.getWorld()).strikeLightning(strike_pos);
                     }
                 }
-            }
-            else
+            } else
             {
-                msg("Banned " + player.getName() + " quietly.");
+                msgNew("Banned <player> quietly.", Placeholder.unparsed("player", player.getName()));
             }
             // Kill player
             player.setHealth(0.0);
@@ -126,21 +134,15 @@ public class Command_ban extends FreedomCommand
 
         // Ban player
         Ban ban;
-
         if (player != null)
         {
             ban = Ban.forPlayer(player, sender, null, reason);
-        }
-        else
+        } else
         {
             ban = Ban.forPlayerName(username, sender, null, reason);
         }
+        ban.addIp(ip);
 
-        for (String ip : ips)
-        {
-            ban.addIp(ip);
-            ban.addIp(FUtil.getFuzzyIp(ip));
-        }
         plugin.bm.addBan(ban);
 
 
@@ -154,7 +156,9 @@ 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, ", "));
+            msgNew("<name> has been banned and their IP is <ip>.",
+                    Placeholder.unparsed("name", username),
+                    Placeholder.unparsed("ip", ip));
             FUtil.adminAction(sender.getName(), bcast.toString(), true);
         }
 
@@ -162,17 +166,13 @@ public class Command_ban extends FreedomCommand
         if (player != null)
         {
             player.kickPlayer(ban.bakeKickMessage());
-            for (Player p : Bukkit.getOnlinePlayers())
-            {
-                if (FUtil.getIp(p).equals(FUtil.getIp(player)))
-                {
-                    p.kickPlayer(ChatColor.RED + "You've been kicked because someone on your IP has been banned.");
-                }
-            }
+
+            server.getOnlinePlayers().stream().filter(pl -> FUtil.getIp(pl).equalsIgnoreCase(ip)).forEach(pl ->
+                    player.kickPlayer(ban.bakeKickMessage()));
         }
 
         // 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;
     }

commons/src/main/java/me/totalfreedom/totalfreedommod/command/Command_banip.java

@@ -1,17 +1,17 @@
 package me.totalfreedom.totalfreedommod.command;
 
 import me.totalfreedom.totalfreedommod.banning.Ban;
-import me.totalfreedom.totalfreedommod.rank.Rank;
-import me.totalfreedom.totalfreedommod.util.FLog;
+import me.totalfreedom.totalfreedommod.command.handling.*;
 import me.totalfreedom.totalfreedommod.util.FUtil;
+import net.kyori.adventure.text.minimessage.tag.resolver.Placeholder;
 import org.apache.commons.lang.ArrayUtils;
 import org.apache.commons.lang.StringUtils;
-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, blockHostConsole = true)
+@Intercept("banip")
+@CommandPermissions(permission = "banip", source = SourceType.BOTH, blockHostConsole = true)
 @CommandParameters(description = "Bans the specified ip.", usage = "/<command> <ip> [reason] [-q]")
 public class Command_banip extends FreedomCommand
 {
@@ -32,13 +32,13 @@ public class Command_banip extends FreedomCommand
 
         if (FUtil.isValidIPv4(ip))
         {
-            msg(ip + " is not a valid IP address", ChatColor.RED);
+            msgNew("<red><ip> is not a valid IP address.", Placeholder.unparsed("ip", ip));
             return true;
         }
 
         if (plugin.bm.getByIp(ip) != null)
         {
-            msg("The IP " + ip + " is already banned", ChatColor.RED);
+            msgNew("<red>The IP <ip> is already banned.", Placeholder.unparsed("ip", ip));
             return true;
         }
 
@@ -50,8 +50,7 @@ public class Command_banip extends FreedomCommand
             {
                 reason = StringUtils.join(ArrayUtils.subarray(args, 1, args.length - 1), " ");
             }
-        }
-        else if (args.length > 1)
+        } else if (args.length > 1)
         {
             reason = StringUtils.join(ArrayUtils.subarray(args, 1, args.length), " ");
         }
@@ -61,20 +60,13 @@ public class Command_banip extends FreedomCommand
         plugin.bm.addBan(ban);
 
         // Kick player and handle others on IP
-        for (Player player : server.getOnlinePlayers())
-        {
-            if (FUtil.getIp(player).equals(ip))
-            {
-                player.kickPlayer(ban.bakeKickMessage());
-            }
+        server.getOnlinePlayers().stream().filter(player -> FUtil.getIp(player).equalsIgnoreCase(ip)).forEach(player ->
+                player.kickPlayer(ban.bakeKickMessage()));
 
-            if (!silent)
-            {
-                // Broadcast
-                FLog.info(ChatColor.RED + sender.getName() + " - Banned the IP " + ip);
-                String message = ChatColor.RED + sender.getName() + " - Banned " + (plugin.al.isAdmin(player) ? "the IP " + ip : "an IP");
-                player.sendMessage(message);
-            }
+        // Broadcasts the message
+        if (!silent)
+        {
+            plugin.cm.broadcastSplit("<red><sender> - Banned the IP <ip>", "<red><sender> - Banned an IP", Placeholder.unparsed("ip", ip));
         }
 
         return true;

commons/src/main/java/me/totalfreedom/totalfreedommod/command/Command_banlist.java

@@ -0,0 +1,45 @@
+package me.totalfreedom.totalfreedommod.command;
+
+import me.totalfreedom.totalfreedommod.command.handling.*;
+import me.totalfreedom.totalfreedommod.util.FUtil;
+import net.kyori.adventure.text.minimessage.tag.resolver.Placeholder;
+import org.bukkit.command.Command;
+import org.bukkit.command.CommandSender;
+import org.bukkit.entity.Player;
+
+import java.util.Collections;
+import java.util.List;
+
+@Intercept("banlist")
+@CommandPermissions(permission = "banlist", source = SourceType.BOTH)
+@CommandParameters(description = "Shows all banned player names. Admins may optionally use 'purge' to clear the list.", usage = "/<command> [purge]")
+public class Command_banlist extends FreedomCommand
+{
+    @Override
+    public boolean run(CommandSender sender, Player playerSender, Command cmd, String commandLabel, String[] args, boolean senderIsConsole)
+    {
+        if (args.length > 0)
+        {
+            if (args[0].equalsIgnoreCase("purge"))
+            {
+                checkPermission("tfm.banlist.purge");
+                FUtil.adminAction(sender.getName(), "Purging the ban list", true);
+                msgNew("<green>Purged <amount> player bans.", Placeholder.unparsed("amount", String.valueOf(plugin.bm.purge())));
+                return true;
+            }
+            return false;
+        }
+
+        msgNew("<total> player bans (<usernames> usernames, <ips> IPs)",
+                Placeholder.unparsed("total", String.valueOf(plugin.bm.getAllBans().size())),
+                Placeholder.unparsed("usernames", String.valueOf(plugin.bm.getUsernameBans())),
+                Placeholder.unparsed("ips", String.valueOf(plugin.bm.getIpBans().size())));
+        return true;
+    }
+
+    @Override
+    protected List<String> getTabCompleteOptions(CommandSender sender, Command command, String alias, String[] args)
+    {
+        return args.length == 1 && sender.hasPermission("tfm.banlist.purge") ? Collections.singletonList("purge") : Collections.emptyList();
+    }
+}

commons/src/main/java/me/totalfreedom/totalfreedommod/command/Command_banname.java

@@ -1,16 +1,19 @@
 package me.totalfreedom.totalfreedommod.command;
 
 import me.totalfreedom.totalfreedommod.banning.Ban;
-import me.totalfreedom.totalfreedommod.rank.Rank;
+import me.totalfreedom.totalfreedommod.command.handling.CommandParameters;
+import me.totalfreedom.totalfreedommod.command.handling.CommandPermissions;
+import me.totalfreedom.totalfreedommod.command.handling.FreedomCommand;
+import me.totalfreedom.totalfreedommod.command.handling.SourceType;
 import me.totalfreedom.totalfreedommod.util.FUtil;
+import net.kyori.adventure.text.minimessage.tag.resolver.Placeholder;
 import org.apache.commons.lang.ArrayUtils;
 import org.apache.commons.lang.StringUtils;
-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, blockHostConsole = true)
+@CommandPermissions(permission = "banname", source = SourceType.BOTH, blockHostConsole = true)
 @CommandParameters(description = "Bans the specified name.", usage = "/<command> <name> [reason] [-q]")
 public class Command_banname extends FreedomCommand
 {
@@ -31,7 +34,7 @@ public class Command_banname extends FreedomCommand
 
         if (plugin.bm.getByUsername(name) != null)
         {
-            msg("The name " + name + " is already banned", ChatColor.RED);
+            msgNew("<red>The name <name> is already banned.", Placeholder.unparsed("name", name));
             return true;
         }
 
@@ -43,8 +46,7 @@ public class Command_banname extends FreedomCommand
             {
                 reason = StringUtils.join(ArrayUtils.subarray(args, 1, args.length - 1), " ");
             }
-        }
-        else if (args.length > 1)
+        } else if (args.length > 1)
         {
             reason = StringUtils.join(ArrayUtils.subarray(args, 1, args.length), " ");
         }

commons/src/main/java/me/totalfreedom/totalfreedommod/command/Command_bird.java

@@ -1,16 +1,20 @@
 package me.totalfreedom.totalfreedommod.command;
 
-import java.util.Arrays;
-import java.util.List;
-import java.util.SplittableRandom;
-import me.totalfreedom.totalfreedommod.rank.Rank;
+import me.totalfreedom.totalfreedommod.command.handling.CommandParameters;
+import me.totalfreedom.totalfreedommod.command.handling.CommandPermissions;
+import me.totalfreedom.totalfreedommod.command.handling.FreedomCommand;
+import me.totalfreedom.totalfreedommod.command.handling.SourceType;
 import org.bukkit.Location;
 import org.bukkit.command.Command;
 import org.bukkit.command.CommandSender;
 import org.bukkit.entity.EntityType;
 import org.bukkit.entity.Player;
 
-@CommandPermissions(level = Rank.OP, source = SourceType.ONLY_IN_GAME)
+import java.util.Arrays;
+import java.util.List;
+import java.util.SplittableRandom;
+
+@CommandPermissions(permission = "bird", source = SourceType.ONLY_IN_GAME)
 @CommandParameters(description = "Spawns a random type of fish at your location.", usage = "/<command>")
 public class Command_bird extends FreedomCommand
 {
@@ -20,7 +24,7 @@ public class Command_bird extends FreedomCommand
     {
         Location location = playerSender.getTargetBlock(null, 15).getLocation().add(0, 1, 0);
         playerSender.getWorld().spawnEntity(location, getRandomFish());
-        msg(":goodbird:");
+        msgNew("<rainbow>:goodbird:");
         return true;
     }
 

commons/src/main/java/me/totalfreedom/totalfreedommod/command/Command_blockcmd.java

@@ -1,14 +1,19 @@
 package me.totalfreedom.totalfreedommod.command;
 
+import me.totalfreedom.totalfreedommod.command.handling.CommandParameters;
+import me.totalfreedom.totalfreedommod.command.handling.CommandPermissions;
+import me.totalfreedom.totalfreedommod.command.handling.FreedomCommand;
+import me.totalfreedom.totalfreedommod.command.handling.SourceType;
 import me.totalfreedom.totalfreedommod.player.FPlayer;
-import me.totalfreedom.totalfreedommod.rank.Rank;
+import me.totalfreedom.totalfreedommod.punishments.Punishment;
+import me.totalfreedom.totalfreedommod.punishments.PunishmentType;
 import me.totalfreedom.totalfreedommod.util.FUtil;
-import org.bukkit.ChatColor;
+import net.kyori.adventure.text.minimessage.tag.resolver.Placeholder;
 import org.bukkit.command.Command;
 import org.bukkit.command.CommandSender;
 import org.bukkit.entity.Player;
 
-@CommandPermissions(level = Rank.ADMIN, source = SourceType.BOTH)
+@CommandPermissions(permission = "blockcmd", source = SourceType.BOTH)
 @CommandParameters(description = "Block all commands for everyone on the server, or a specific player.", usage = "/<command> <-a | purge | <player>>", aliases = "blockcommands,blockcommand,bc,bcmd")
 public class Command_blockcmd extends FreedomCommand
 {
@@ -34,7 +39,8 @@ public class Command_blockcmd extends FreedomCommand
                     playerdata.setCommandsBlocked(false);
                 }
             }
-            msg("Unblocked commands for " + counter + " players.");
+
+            msgNew("Unblocked commands for <count> players.", Placeholder.unparsed("count", String.valueOf(counter)));
             return true;
         }
 
@@ -51,10 +57,10 @@ public class Command_blockcmd extends FreedomCommand
 
                 counter += 1;
                 plugin.pl.getPlayer(player).setCommandsBlocked(true);
-                msg(player, "Your commands have been blocked by an admin.", ChatColor.RED);
+                msgNew(player, "<red>Your commands have been blocked by an admin.");
             }
 
-            msg("Blocked commands for " + counter + " players.");
+            msgNew("Blocked commands for <count> players.", Placeholder.unparsed("count", String.valueOf(counter)));
             return true;
         }
 
@@ -62,26 +68,27 @@ public class Command_blockcmd extends FreedomCommand
 
         if (player == null)
         {
-            msg(FreedomCommand.PLAYER_NOT_FOUND);
+            msg(PLAYER_NOT_FOUND);
             return true;
         }
 
         if (isAdmin(player))
         {
-            msg(player.getName() + " is an admin, and cannot have their commands blocked.");
+            msgNew("<player> is an admin, and cannot have their commands blocked.", Placeholder.unparsed("player", player.getName()));
             return true;
         }
 
         FPlayer playerdata = plugin.pl.getPlayer(player);
         if (!playerdata.allCommandsBlocked())
         {
-            playerdata.setCommandsBlocked(true);
             FUtil.adminAction(sender.getName(), "Blocking all commands for " + player.getName(), true);
-            msg("Blocked commands for " + player.getName() + ".");
-        }
-        else
+            playerdata.setCommandsBlocked(true);
+            msgNew("Blocked commands for <player>.", Placeholder.unparsed("player", player.getName()));
+
+            plugin.pul.logPunishment(new Punishment(player.getName(), FUtil.getIp(player), sender.getName(), PunishmentType.BLOCKCMD, null));
+        } else
         {
-            msg("That players commands are already blocked.", ChatColor.RED);
+            msgNew("<red>That player's commands are already blocked.");
         }
         return true;
     }

commons/src/main/java/me/totalfreedom/totalfreedommod/command/Command_blockedit.java

@@ -0,0 +1,114 @@
+package me.totalfreedom.totalfreedommod.command;
+
+import me.totalfreedom.totalfreedommod.command.handling.CommandParameters;
+import me.totalfreedom.totalfreedommod.command.handling.CommandPermissions;
+import me.totalfreedom.totalfreedommod.command.handling.FreedomCommand;
+import me.totalfreedom.totalfreedommod.command.handling.SourceType;
+import me.totalfreedom.totalfreedommod.player.FPlayer;
+import me.totalfreedom.totalfreedommod.punishments.Punishment;
+import me.totalfreedom.totalfreedommod.punishments.PunishmentType;
+import me.totalfreedom.totalfreedommod.util.FUtil;
+import net.kyori.adventure.text.minimessage.tag.resolver.Placeholder;
+import org.bukkit.command.Command;
+import org.bukkit.command.CommandSender;
+import org.bukkit.entity.HumanEntity;
+import org.bukkit.entity.Player;
+
+import java.util.List;
+import java.util.Optional;
+
+@CommandPermissions(permission = "blockedit", source = SourceType.BOTH)
+@CommandParameters(description = "Restricts/restores block modification abilities for everyone on the server or a certain player.", usage = "/<command> [<player> [reason] | list | purge | all]")
+public class Command_blockedit extends FreedomCommand
+{
+    @Override
+    public boolean run(final CommandSender sender, final Player playerSender, final Command cmd, final String commandLabel, String[] args, final boolean senderIsConsole)
+    {
+        if (args.length > 0)
+        {
+            switch (args[0].toLowerCase())
+            {
+                case "list" ->
+                {
+                    List<? extends Player> list = server.getOnlinePlayers().stream().filter(player ->
+                            plugin.pl.getPlayer(player).isEditBlocked()).sorted().toList();
+
+                    boolean plural = list.size() != 1;
+                    msgNew("There <grammar> <count> player<plural> online with restricted block modification abilities: <players>",
+                            Placeholder.unparsed("grammar", plural ? "are" : "is"),
+                            Placeholder.unparsed("count", String.valueOf(list.size())),
+                            Placeholder.unparsed("plural", plural ? "s" : ""),
+                            Placeholder.unparsed("colon", list.size() > 0 ? ":" : "."),
+                            Placeholder.unparsed("players", FUtil.listToString(list.stream().map(HumanEntity::getName).toList())));
+                }
+                case "purge" ->
+                {
+                    FUtil.adminAction(sender.getName(), "Restoring block modification abilities for all players", true);
+
+                    List<? extends Player> list = server.getOnlinePlayers().stream().filter(player ->
+                            plugin.pl.getPlayer(player).isEditBlocked()).toList();
+
+                    list.forEach(player ->
+                    {
+                        plugin.pl.getPlayer(player).setEditBlocked(false);
+                        msgNew(player, "<green>Your block modification abilities have been restored.");
+                    });
+
+                    msgNew("Restored block modification abilities for <count> player<plural>.",
+                            Placeholder.unparsed("count", String.valueOf(list.size())),
+                            Placeholder.unparsed("plural", list.size() != 1 ? "s" : ""));
+                }
+                case "all", "-a" ->
+                {
+                    FUtil.adminAction(sender.getName(), "Restricting block modification abilities for all non-admins", true);
+
+                    List<? extends Player> list = server.getOnlinePlayers().stream().filter(player ->
+                            !plugin.al.isAdmin(player)).toList();
+
+                    list.forEach(player ->
+                    {
+                        plugin.pl.getPlayer(player).setEditBlocked(true);
+                        msgNew(player, "<red>Your block modification abilities have been restricted.");
+                    });
+
+                    msgNew("Restricted block modification abilities for <count> player<plural>.",
+                            Placeholder.unparsed("count", String.valueOf(list.size())),
+                            Placeholder.unparsed("plural", list.size() != 1 ? "s" : ""));
+                }
+                default -> Optional.ofNullable(getPlayer(args[0])).ifPresentOrElse(player ->
+                {
+                    FPlayer fPlayer = plugin.pl.getPlayer(player);
+
+                    if (fPlayer.isEditBlocked())
+                    {
+                        FUtil.adminAction(sender.getName(), "Restoring block modification abilities for " + player.getName(), true);
+                        fPlayer.setEditBlocked(false);
+                        msgNew("Restored block modification abilities for <player>.", Placeholder.unparsed("player", player.getName()));
+                        msgNew(player, "<green>Your block modification abilities have been restored.");
+                    } else
+                    {
+                        if (plugin.al.isAdmin(player))
+                        {
+                            msgNew("<red><player> is an admin, and as such cannot have their block modification abilities restricted.", Placeholder.unparsed("player", player.getName()));
+                        } else
+                        {
+                            FUtil.adminAction(sender.getName(), "Restricting block modification abilities for " + player.getName(), true);
+                            fPlayer.setEditBlocked(true);
+                            msgNew("Restricted block modification abilities for <player>.", Placeholder.unparsed("player", player.getName()));
+                            msgNew(player, "<red>Your block modification abilities have been restricted.");
+
+                            plugin.pul.logPunishment(new Punishment(player.getName(), FUtil.getIp(player),
+                                    sender.getName(), PunishmentType.BLOCKEDIT, null));
+                        }
+                    }
+
+                }, () -> msg(PLAYER_NOT_FOUND));
+            }
+
+            return true;
+        } else
+        {
+            return false;
+        }
+    }
+}

commons/src/main/java/me/totalfreedom/totalfreedommod/command/Command_blockpvp.java

@@ -0,0 +1,113 @@
+package me.totalfreedom.totalfreedommod.command;
+
+import me.totalfreedom.totalfreedommod.command.handling.CommandParameters;
+import me.totalfreedom.totalfreedommod.command.handling.CommandPermissions;
+import me.totalfreedom.totalfreedommod.command.handling.FreedomCommand;
+import me.totalfreedom.totalfreedommod.command.handling.SourceType;
+import me.totalfreedom.totalfreedommod.player.FPlayer;
+import me.totalfreedom.totalfreedommod.punishments.Punishment;
+import me.totalfreedom.totalfreedommod.punishments.PunishmentType;
+import me.totalfreedom.totalfreedommod.util.FUtil;
+import net.kyori.adventure.text.minimessage.tag.resolver.Placeholder;
+import org.bukkit.command.Command;
+import org.bukkit.command.CommandSender;
+import org.bukkit.entity.Player;
+
+import java.util.List;
+
+@CommandPermissions(permission = "blockpvp", source = SourceType.BOTH)
+@CommandParameters(description = "Toggle PVP mode for everyone or a certain player.", usage = "/<command> [<player> | list | purge | all]", aliases = "pvpblock,pvpmode")
+public class Command_blockpvp extends FreedomCommand
+{
+    @Override
+    public boolean run(final CommandSender sender, final Player playerSender, final Command cmd, final String commandLabel, String[] args, final boolean senderIsConsole)
+    {
+        if (args.length == 0)
+        {
+            return false;
+        }
+
+        switch (args[0].toLowerCase())
+        {
+            // List
+            case "list" ->
+            {
+                List<String> restricted = server.getOnlinePlayers().stream().filter(player ->
+                        plugin.pl.getPlayer(player).isPvpBlocked()).map(Player::getName).toList();
+
+                if (restricted.isEmpty())
+                {
+                    msgNew("Nobody currently has their PVP abilities restricted.");
+                } else
+                {
+                    msgNew("PVP abilities are restricted for these player(s): <players>",
+                            Placeholder.unparsed("players", FUtil.listToString(restricted)));
+                }
+
+                return true;
+            }
+
+            // Purge
+            case "purge" ->
+            {
+                FUtil.adminAction(sender.getName(), "Restoring PVP abilities for all players", true);
+                List<? extends Player> affected = server.getOnlinePlayers().stream().filter(player -> plugin.pl.getPlayer(player).isPvpBlocked()).toList();
+                affected.forEach(player ->
+                {
+                    msgNew(player, "<green>Your PVP abilities have been restored.");
+                    plugin.pl.getPlayer(player).setPvpBlocked(false);
+                });
+                msgNew("Restored PVP abilities for <count> players.", Placeholder.unparsed("count", String.valueOf(affected.size())));
+            }
+
+            // All
+            case "all" ->
+            {
+                FUtil.adminAction(sender.getName(), "Restricting PVP capabilities for all non-admins", true);
+                List<? extends Player> affected = server.getOnlinePlayers().stream().filter(player -> !plugin.al.isAdmin(player)).toList();
+                affected.forEach(player ->
+                {
+                    msgNew(player, "<red>Your PVP abilities have been restricted.");
+                    plugin.pl.getPlayer(player).setPvpBlocked(true);
+                });
+                msgNew("Restricted PVP abilities for <count> players.", Placeholder.unparsed("count", String.valueOf(affected.size())));
+            }
+
+            // Specific players
+            default ->
+            {
+                final Player p = getPlayer(args[0]);
+                if (p == null)
+                {
+                    msg(PLAYER_NOT_FOUND);
+                    return true;
+                }
+
+                final FPlayer pd = plugin.pl.getPlayer(p);
+                if (pd.isPvpBlocked())
+                {
+                    FUtil.adminAction(sender.getName(), "Restoring PVP capabilities for " + p.getName(), true);
+                    pd.setPvpBlocked(false);
+                    msgNew("Enabled the ability to PVP for <player>.", Placeholder.unparsed("player", p.getName()));
+                    msgNew(p, "<green>Your PVP abilities have been restored.");
+                } else
+                {
+                    if (plugin.al.isAdmin(p))
+                    {
+                        msgNew("<red><player> is an admin, and cannot have their PVP disabled.", Placeholder.unparsed("player", p.getName()));
+                        return true;
+                    }
+
+                    FUtil.adminAction(sender.getName(), "Restricting PVP for " + p.getName(), true);
+                    pd.setPvpBlocked(true);
+                    plugin.pul.logPunishment(new Punishment(p.getName(), FUtil.getIp(p), sender.getName(), PunishmentType.BLOCKPVP, null));
+
+                    msgNew(p, "<red>Your PVP abilities have been restricted.");
+                    msgNew("Restricted PVP abilities for <player>. ", Placeholder.unparsed("player", p.getName()));
+                }
+            }
+        }
+
+        return true;
+    }
+}

commons/src/main/java/me/totalfreedom/totalfreedommod/command/Command_blockredstone.java

@@ -1,14 +1,17 @@
 package me.totalfreedom.totalfreedommod.command;
 
+import me.totalfreedom.totalfreedommod.command.handling.CommandParameters;
+import me.totalfreedom.totalfreedommod.command.handling.CommandPermissions;
+import me.totalfreedom.totalfreedommod.command.handling.FreedomCommand;
+import me.totalfreedom.totalfreedommod.command.handling.SourceType;
 import me.totalfreedom.totalfreedommod.config.ConfigEntry;
-import me.totalfreedom.totalfreedommod.rank.Rank;
 import me.totalfreedom.totalfreedommod.util.FUtil;
 import org.bukkit.command.Command;
 import org.bukkit.command.CommandSender;
 import org.bukkit.entity.Player;
 import org.bukkit.scheduler.BukkitRunnable;
 
-@CommandPermissions(level = Rank.ADMIN, source = SourceType.BOTH)
+@CommandPermissions(permission = "blockredstone", source = SourceType.BOTH)
 @CommandParameters(description = "Blocks redstone on the server.", usage = "/<command>", aliases = "bre")
 public class Command_blockredstone extends FreedomCommand
 {
@@ -30,8 +33,7 @@ public class Command_blockredstone extends FreedomCommand
                     }
                 }
             }.runTaskLater(plugin, 6000L);
-        }
-        else
+        } else
         {
             ConfigEntry.ALLOW_REDSTONE.setBoolean(true);
             FUtil.adminAction(sender.getName(), "Unblocking all redstone", true);

commons/src/main/java/me/totalfreedom/totalfreedommod/command/Command_cage.java

@@ -1,13 +1,13 @@
 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.command.handling.CommandParameters;
+import me.totalfreedom.totalfreedommod.command.handling.CommandPermissions;
+import me.totalfreedom.totalfreedommod.command.handling.FreedomCommand;
+import me.totalfreedom.totalfreedommod.command.handling.SourceType;
 import me.totalfreedom.totalfreedommod.player.FPlayer;
-import me.totalfreedom.totalfreedommod.rank.Rank;
+import me.totalfreedom.totalfreedommod.punishments.Punishment;
+import me.totalfreedom.totalfreedommod.punishments.PunishmentType;
 import me.totalfreedom.totalfreedommod.util.FUtil;
-import org.bukkit.ChatColor;
 import org.bukkit.GameMode;
 import org.bukkit.Location;
 import org.bukkit.Material;
@@ -15,11 +15,16 @@ import org.bukkit.command.Command;
 import org.bukkit.command.CommandSender;
 import org.bukkit.entity.Player;
 
-@CommandPermissions(level = Rank.ADMIN, source = SourceType.BOTH)
+import java.util.ArrayList;
+import java.util.Arrays;
+import java.util.Collections;
+import java.util.List;
+
+@CommandPermissions(permission = "cage", source = SourceType.BOTH)
 @CommandParameters(description = "Place a cage around someone with certain blocks, or someone's player head.", usage = "/<command> <purge | <partialname> [head | block] [playername | blockname]")
 public class Command_cage extends FreedomCommand
 {
-
+    @Override
     public boolean run(final CommandSender sender, final Player playerSender, final Command cmd, final String commandLabel, final String[] args, final boolean senderIsConsole)
     {
         if (args.length == 0)
@@ -31,25 +36,22 @@ public class Command_cage extends FreedomCommand
         if (args[0].equalsIgnoreCase("purge"))
         {
             FUtil.adminAction(sender.getName(), "Uncaging all players", true);
-            for (Player player : server.getOnlinePlayers())
-            {
-                final FPlayer fPlayer = plugin.pl.getPlayer(player);
-                fPlayer.getCageData().setCaged(false);
-            }
+            server.getOnlinePlayers().stream().map(player -> plugin.pl.getPlayer(player)).forEach(fPlayer ->
+                    fPlayer.getCageData().setCaged(false));
             return true;
         }
 
         Player player = getPlayer(args[0]);
         if (player == null)
         {
-            sender.sendMessage(FreedomCommand.PLAYER_NOT_FOUND);
+            msg(PLAYER_NOT_FOUND);
             return true;
         }
 
         final FPlayer fPlayer = plugin.pl.getPlayer(player);
         if (fPlayer.getCageData().isCaged())
         {
-            sender.sendMessage(ChatColor.RED + "That player is already caged.");
+            msgNew("<red>That player is already caged.");
             return true;
         }
 
@@ -60,53 +62,64 @@ public class Command_cage extends FreedomCommand
             final String s = args[1];
             switch (s)
             {
-                case "head":
+                case "head" ->
                 {
                     outerMaterial = Material.PLAYER_HEAD;
                     if (args.length >= 3)
                     {
                         skullName = args[2];
-                    }
-                    else
+                    } else
                     {
                         outerMaterial = Material.SKELETON_SKULL;
                     }
-                    break;
                 }
-                case "block":
+                case "block" ->
                 {
-                    if (Material.matchMaterial(args[2]) != null)
+                    if (args.length >= 3)
                     {
-                        outerMaterial = Material.matchMaterial(args[2]);
-                        break;
+                        // Checks the validity of the Material and checks if it's a block.
+                        // This is incredibly inefficient, as Spigot's isBlock() method in Material is an actual
+                        // nightmare of switch-cases.
+                        if (Material.matchMaterial(args[2]) != null && Material.matchMaterial(args[2]).isBlock())
+                        {
+                            outerMaterial = Material.matchMaterial(args[2]);
+                        } else
+                        {
+                            msgNew("<red>Invalid block!");
+                            return true;
+                        }
+                    } else
+                    {
+                        return false;
                     }
-                    sender.sendMessage(ChatColor.RED + "Invalid block!");
-                    break;
+                }
+                default ->
+                {
+                    return false;
                 }
             }
         }
 
+        if (outerMaterial == Material.PLAYER_HEAD)
+        {
+            FUtil.adminAction(sender.getName(), "Caging " + player.getName() + " in " + skullName, true);
+        } else
+        {
+            FUtil.adminAction(sender.getName(), "Caging " + player.getName(), true);
+        }
+
         Location location = player.getLocation().clone().add(0.0, 1.0, 0.0);
 
         if (skullName != null)
         {
             fPlayer.getCageData().cage(location, outerMaterial, innerMaterial, skullName);
-        }
-        else
+        } else
         {
             fPlayer.getCageData().cage(location, outerMaterial, innerMaterial);
         }
-
         player.setGameMode(GameMode.SURVIVAL);
 
-        if (outerMaterial == Material.PLAYER_HEAD)
-        {
-            FUtil.adminAction(sender.getName(), "Caging " + player.getName() + " in " + skullName, true);
-        }
-        else
-        {
-            FUtil.adminAction(sender.getName(), "Caging " + player.getName(), true);
-        }
+        plugin.pul.logPunishment(new Punishment(player.getName(), FUtil.getIp(player), sender.getName(), PunishmentType.CAGE, null));
         return true;
     }
 
@@ -124,21 +137,18 @@ public class Command_cage extends FreedomCommand
             arguments.add("purge");
             arguments.addAll(FUtil.getPlayerList());
             return arguments;
-        }
-        else if (args.length == 2)
+        } else if (args.length == 2)
         {
             if (!args[0].equals("purge"))
             {
                 return Arrays.asList("head", "block");
             }
-        }
-        else if (args.length == 3)
+        } else if (args.length == 3)
         {
             if (args[1].equals("block"))
             {
-                return FUtil.getAllMaterialNames();
-            }
-            else if (args[1].equals("head"))
+                return Arrays.stream(Material.values()).map(Enum::name).toList();
+            } else if (args[1].equals("head"))
             {
                 return FUtil.getPlayerList();
             }

commons/src/main/java/me/totalfreedom/totalfreedommod/command/Command_cake.java

@@ -1,8 +1,10 @@
 package me.totalfreedom.totalfreedommod.command;
 
-import me.totalfreedom.totalfreedommod.rank.Rank;
+import me.totalfreedom.totalfreedommod.command.handling.CommandParameters;
+import me.totalfreedom.totalfreedommod.command.handling.CommandPermissions;
+import me.totalfreedom.totalfreedommod.command.handling.FreedomCommand;
+import me.totalfreedom.totalfreedommod.command.handling.SourceType;
 import me.totalfreedom.totalfreedommod.util.FUtil;
-import org.bukkit.ChatColor;
 import org.bukkit.Material;
 import org.bukkit.command.Command;
 import org.bukkit.command.CommandSender;
@@ -10,39 +12,20 @@ import org.bukkit.entity.Player;
 import org.bukkit.inventory.ItemStack;
 import org.bukkit.inventory.meta.ItemMeta;
 
-@CommandPermissions(level = Rank.ADMIN, source = SourceType.BOTH)
+@CommandPermissions(permission = "cake", source = SourceType.BOTH)
 @CommandParameters(description = "For the people that are still alive - gives a cake to everyone on the server.", usage = "/<command>")
 public class Command_cake extends FreedomCommand
 {
-
-    public static final String CAKE_LYRICS = "But there's no sense crying over every mistake. You just keep on trying till you run out of cake.";
-
     @Override
     public boolean run(final CommandSender sender, final Player playerSender, final Command cmd, final String commandLabel, final String[] args, final boolean senderIsConsole)
     {
-        final StringBuilder output = new StringBuilder();
-
-        for (final String word : CAKE_LYRICS.split(" "))
-        {
-            output.append(FUtil.randomChatColor()).append(word).append(" ");
-        }
-
         final ItemStack heldItem = new ItemStack(Material.CAKE);
         final ItemMeta heldItemMeta = heldItem.getItemMeta();
         assert heldItemMeta != null;
-        heldItemMeta.setDisplayName(ChatColor.WHITE + "The " + ChatColor.DARK_GRAY + "Lie");
+        heldItemMeta.displayName(FUtil.miniMessage("<white>The <dark_gray>Lie"));
         heldItem.setItemMeta(heldItemMeta);
-
-        for (Player player : server.getOnlinePlayers())
-        {
-            final int firstEmpty = player.getInventory().firstEmpty();
-            if (firstEmpty >= 0)
-            {
-                player.getInventory().setItem(firstEmpty, heldItem);
-            }
-        }
-
-        FUtil.bcastMsg(output.toString());
+        server.getOnlinePlayers().forEach(player -> player.getInventory().addItem(heldItem));
+        server.broadcast(FUtil.miniMessage("<rainbow>But there's no sense crying over every mistake. You just keep on trying till you run out of cake."));
         return true;
     }
 }

commons/src/main/java/me/totalfreedom/totalfreedommod/command/Command_cleanchat.java

@@ -0,0 +1,31 @@
+package me.totalfreedom.totalfreedommod.command;
+
+import me.totalfreedom.totalfreedommod.command.handling.CommandParameters;
+import me.totalfreedom.totalfreedommod.command.handling.CommandPermissions;
+import me.totalfreedom.totalfreedommod.command.handling.FreedomCommand;
+import me.totalfreedom.totalfreedommod.command.handling.SourceType;
+import me.totalfreedom.totalfreedommod.util.FUtil;
+import net.kyori.adventure.text.Component;
+import org.bukkit.command.Command;
+import org.bukkit.command.CommandSender;
+import org.bukkit.entity.Player;
+
+@CommandPermissions(permission = "cleanchat", source = SourceType.BOTH)
+@CommandParameters(description = "Clears the chat.", usage = "/<command>", aliases = "cc")
+public class Command_cleanchat extends FreedomCommand
+{
+    @Override
+    public boolean run(CommandSender sender, Player playerSender, Command cmd, String commandLabel, String[] args, boolean senderIsConsole)
+    {
+        server.getOnlinePlayers().stream().filter(player -> !plugin.al.isAdmin(player)).forEach(player ->
+        {
+            for (int i = 0; i < 100; i++)
+            {
+                msg(player, Component.space());
+            }
+        });
+
+        FUtil.adminAction(sender.getName(), "Cleared chat", true);
+        return true;
+    }
+}

commons/src/main/java/me/totalfreedom/totalfreedommod/command/Command_cleardiscordqueue.java

@@ -1,20 +1,27 @@
 package me.totalfreedom.totalfreedommod.command;
 
-import me.totalfreedom.totalfreedommod.rank.Rank;
+import me.totalfreedom.totalfreedommod.command.handling.*;
 import org.bukkit.command.Command;
 import org.bukkit.command.CommandSender;
 import org.bukkit.entity.Player;
 
-@CommandPermissions(level = Rank.ADMIN, source = SourceType.ONLY_CONSOLE)
-@CommandParameters(description = "Clear the discord message queue.", usage = "/<command>")
+@CommandDependencies({"TFD4J"})
+@CommandPermissions(permission = "cleardiscordqueue", source = SourceType.ONLY_CONSOLE)
+@CommandParameters(description = "Clear the Discord message queue.", usage = "/<command>")
 public class Command_cleardiscordqueue extends FreedomCommand
 {
 
     @Override
     public boolean run(CommandSender sender, Player playerSender, Command cmd, String commandLabel, String[] args, boolean senderIsConsole)
     {
+        if (plugin.dc == null)
+        {
+            msgNew("<red>Discord is not enabled.");
+            return true;
+        }
+
         plugin.dc.clearQueue();
-        msg("Cleared the discord message queue.");
+        msgNew("<green>Cleared the Discord message queue.");
         return true;
     }
 }

commons/src/main/java/me/totalfreedom/totalfreedommod/command/Command_clownfish.java

@@ -0,0 +1,40 @@
+package me.totalfreedom.totalfreedommod.command;
+
+import me.totalfreedom.totalfreedommod.api.ShopItem;
+import me.totalfreedom.totalfreedommod.command.handling.*;
+import net.kyori.adventure.text.minimessage.tag.resolver.Placeholder;
+import org.bukkit.command.Command;
+import org.bukkit.command.CommandSender;
+import org.bukkit.entity.Player;
+
+@CommandDependencies({"TF-Shoppe"})
+@CommandPermissions(permission = "clownfish", source = SourceType.ONLY_IN_GAME)
+@CommandParameters(description = "Obtain a clown fish", usage = "/<command>")
+public class Command_clownfish extends FreedomCommand
+{
+
+    @Override
+    public boolean run(CommandSender sender, Player playerSender, Command cmd, String commandLabel, String[] args, boolean senderIsConsole)
+    {
+        if (plugin.sh == null)
+        {
+            msgNew("<red>Shop is currently disabled.");
+            return true;
+        }
+
+        if (plugin.pl.getData(playerSender).hasItem(ShopItem.CLOWN_FISH))
+        {
+            playerSender.getInventory().addItem(plugin.sh.getClownFish());
+            msgNew("<green>You have been given a <name>.", Placeholder.unparsed("name", ShopItem.CLOWN_FISH.getName()));
+        } else if (plugin.pl.getPlayer(playerSender).isClownfishDisabled())
+        {
+            msgNew("<red>An admin has disabled your ability to use the <name>. Guess you were the clown after all.",
+                    Placeholder.unparsed("name", ShopItem.CLOWN_FISH.getName()));
+        } else
+        {
+            msgNew("<red>You don't own a <name>! Purchase one from the shop.", Placeholder.unparsed("name", ShopItem.CLOWN_FISH.getName()));
+        }
+
+        return true;
+    }
+}

commons/src/main/java/me/totalfreedom/totalfreedommod/command/Command_cmdspy.java

@@ -1,12 +1,16 @@
 package me.totalfreedom.totalfreedommod.command;
 
 import me.totalfreedom.totalfreedommod.admin.Admin;
-import me.totalfreedom.totalfreedommod.rank.Rank;
+import me.totalfreedom.totalfreedommod.command.handling.CommandParameters;
+import me.totalfreedom.totalfreedommod.command.handling.CommandPermissions;
+import me.totalfreedom.totalfreedommod.command.handling.FreedomCommand;
+import me.totalfreedom.totalfreedommod.command.handling.SourceType;
+import net.kyori.adventure.text.minimessage.tag.resolver.Placeholder;
 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(permission = "cmdspy", source = SourceType.ONLY_IN_GAME)
 @CommandParameters(description = "Spy on commands", usage = "/<command>", aliases = "commandspy")
 public class Command_cmdspy extends FreedomCommand
 {
@@ -16,7 +20,7 @@ public class Command_cmdspy extends FreedomCommand
     {
         Admin admin = plugin.al.getAdmin(playerSender);
         admin.setCommandSpy(!admin.getCommandSpy());
-        msg("CommandSpy " + (admin.getCommandSpy() ? "enabled." : "disabled."));
+        msgNew("CommandSpy <status>.", Placeholder.unparsed("status", admin.getCommandSpy() ? "enabled." : "disabled."));
         plugin.al.save(admin);
         plugin.al.updateTables();
         return true;

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

@@ -0,0 +1,148 @@
+package me.totalfreedom.totalfreedommod.command;
+
+import me.totalfreedom.totalfreedommod.command.handling.*;
+import me.totalfreedom.totalfreedommod.config.ConfigEntry;
+import me.totalfreedom.totalfreedommod.player.PlayerData;
+import me.totalfreedom.totalfreedommod.util.FUtil;
+import net.kyori.adventure.text.minimessage.tag.resolver.Placeholder;
+import org.bukkit.command.Command;
+import org.bukkit.command.CommandSender;
+import org.bukkit.entity.Player;
+
+import java.util.ArrayList;
+import java.util.List;
+
+@CommandDependencies({"TF-Shoppe"})
+@CommandPermissions(permission = "coins", source = SourceType.BOTH)
+@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
+    public boolean run(CommandSender sender, Player playerSender, Command cmd, String commandLabel, String[] args, boolean senderIsConsole)
+    {
+        if (plugin.sh == null || !ConfigEntry.SHOP_ENABLED.getBoolean())
+        {
+            msgNew("<red>The shop is currently disabled!");
+            return true;
+        }
+
+        switch (args.length)
+        {
+            // Mode for seeing how many coins the sender has (doesn't work from console)
+            case 0 ->
+            {
+                if (senderIsConsole)
+                {
+                    msgNew("When used from the console, you must define a target player.");
+                } else
+                {
+                    PlayerData playerData = getData(playerSender);
+                    msgNew("<green>You have <gold><coins></gold> coin<plural>.",
+                            Placeholder.unparsed("coins", String.valueOf(playerData.getCoins())),
+                            Placeholder.unparsed("plural", playerData.getCoins() > 1 ? "s" : ""));
+                }
+                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);
+                    msgNew("<green><gold><player></gold> has <gold><coins></gold> coin<plural>.",
+                            Placeholder.unparsed("player", target.getName()),
+                            Placeholder.unparsed("coins", String.valueOf(playerData.getCoins())),
+                            Placeholder.unparsed("plural", playerData.getCoins() > 1 ? "s" : ""));
+                }
+                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)
+                    {
+                        msgNew("<red>Invalid number: <num>", Placeholder.unparsed("num", args[2]));
+                        return true;
+                    }
+
+                    // Prevents players from performing transactions they can't afford to do.
+                    if (senderData.getCoins() < coinsToTransfer)
+                    {
+                        msgNew("<red>You don't have enough coins to perform this transaction.");
+                        return true;
+                    }
+
+                    if (target == null)
+                    {
+                        msg(PLAYER_NOT_FOUND);
+                    } else
+                    {
+                        PlayerData playerData = getData(target);
+                        playerData.setCoins(playerData.getCoins() + coinsToTransfer);
+                        senderData.setCoins(senderData.getCoins() - coinsToTransfer);
+
+                        boolean plural = coinsToTransfer > 1;
+
+                        msgNew(target, "<green><gold><sender></gold> has given you <gold><coins></gold> coin<plural>!",
+                                Placeholder.unparsed("sender", sender.getName()),
+                                Placeholder.unparsed("coins", String.valueOf(coinsToTransfer)),
+                                Placeholder.unparsed("plural", plural ? "s" : ""));
+
+                        msgNew("<green>You have given <gold><coins></gold> coin<plural> to <gold><player></gold>.",
+                                Placeholder.unparsed("player", target.getName()),
+                                Placeholder.unparsed("coins", String.valueOf(coinsToTransfer)),
+                                Placeholder.unparsed("plural", plural ? "s" : ""));
+
+                        plugin.pl.save(playerData);
+                        plugin.pl.save(senderData);
+                    }
+
+                    return true;
+                }
+                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();
+    }
+}

commons/src/main/java/me/totalfreedom/totalfreedommod/command/Command_consolesay.java

@@ -0,0 +1,39 @@
+package me.totalfreedom.totalfreedommod.command;
+
+import me.totalfreedom.totalfreedommod.command.handling.CommandParameters;
+import me.totalfreedom.totalfreedommod.command.handling.CommandPermissions;
+import me.totalfreedom.totalfreedommod.command.handling.FreedomCommand;
+import me.totalfreedom.totalfreedommod.command.handling.SourceType;
+import me.totalfreedom.totalfreedommod.util.FUtil;
+import net.kyori.adventure.text.minimessage.tag.resolver.Placeholder;
+import org.apache.commons.lang.StringUtils;
+import org.bukkit.ChatColor;
+import org.bukkit.command.Command;
+import org.bukkit.command.CommandSender;
+import org.bukkit.entity.Player;
+
+@CommandPermissions(permission = "consolesay", source = SourceType.ONLY_CONSOLE)
+@CommandParameters(description = "Telnet/Console command - Send a chat message with chat formatting over telnet.", usage = "/<command> <message>", aliases = "csay")
+public class Command_consolesay extends FreedomCommand
+{
+    @Override
+    public boolean run(CommandSender sender, Player playerSender, Command cmd, String commandLabel, String[] args, boolean senderIsConsole)
+    {
+        if (args.length == 0)
+        {
+            return false;
+        }
+
+        server.broadcast(FUtil.miniMessage("<gray>[CONSOLE] <red><sender> <dark_gray>» <white><message>",
+                Placeholder.unparsed("sender", sender.getName()),
+                Placeholder.unparsed("message", StringUtils.join(args, " "))));
+
+        if (plugin.dc != null)
+        {
+            String message = StringUtils.join(args, " ");
+            plugin.dc.messageChatChannel("[CONSOLE] " + sender.getName() + " \u00BB " + ChatColor.stripColor(message), true);
+        }
+
+        return true;
+    }
+}

commons/src/main/java/me/totalfreedom/totalfreedommod/command/Command_cookie.java

@@ -0,0 +1,38 @@
+package me.totalfreedom.totalfreedommod.command;
+
+import me.totalfreedom.totalfreedommod.command.handling.CommandParameters;
+import me.totalfreedom.totalfreedommod.command.handling.CommandPermissions;
+import me.totalfreedom.totalfreedommod.command.handling.FreedomCommand;
+import me.totalfreedom.totalfreedommod.command.handling.SourceType;
+import me.totalfreedom.totalfreedommod.util.FUtil;
+import org.bukkit.Material;
+import org.bukkit.command.Command;
+import org.bukkit.command.CommandSender;
+import org.bukkit.entity.Player;
+import org.bukkit.inventory.ItemStack;
+import org.bukkit.inventory.meta.ItemMeta;
+
+import java.util.Collections;
+import java.util.Random;
+
+@CommandPermissions(permission = "cookie", source = SourceType.BOTH)
+@CommandParameters(description = "For those who have no friends - gives a cookie to everyone on the server.", usage = "/<command>")
+public class Command_cookie extends FreedomCommand
+{
+    private static final Random RANDOM = new Random();
+
+    @Override
+    public boolean run(CommandSender sender, Player sender_p, Command cmd, String commandLabel, String[] args, boolean senderIsConsole)
+    {
+        final ItemStack heldItem = new ItemStack(Material.COOKIE);
+        final ItemMeta heldItemMeta = heldItem.getItemMeta();
+        assert heldItemMeta != null;
+        heldItemMeta.displayName(FUtil.miniMessage("<rainbow>Cookie"));
+        heldItemMeta.lore(Collections.singletonList(FUtil.miniMessage("<rainbow>But, you can have a cookie anyways,\nsince you are sad you are have no friends.")));
+        heldItem.setItemMeta(heldItemMeta);
+
+        server.getOnlinePlayers().forEach(player -> player.getInventory().addItem(heldItem));
+        server.broadcast(FUtil.miniMessage("<rainbow:" + RANDOM.nextInt() + ">Imagine that you have zero cookies and you split them evenly among zero friends. How many cookies does each person get? See? It doesn't make sense. And Cookie Monster is sad that there are no cookies, and you are sad that you have no friends."));
+        return true;
+    }
+}

commons/src/main/java/me/totalfreedom/totalfreedommod/command/Command_deafen.java

@@ -1,7 +1,9 @@
 package me.totalfreedom.totalfreedommod.command;
 
-import java.util.SplittableRandom;
-import me.totalfreedom.totalfreedommod.rank.Rank;
+import me.totalfreedom.totalfreedommod.command.handling.CommandParameters;
+import me.totalfreedom.totalfreedommod.command.handling.CommandPermissions;
+import me.totalfreedom.totalfreedommod.command.handling.FreedomCommand;
+import me.totalfreedom.totalfreedommod.command.handling.SourceType;
 import org.bukkit.Location;
 import org.bukkit.Sound;
 import org.bukkit.command.Command;
@@ -9,7 +11,9 @@ import org.bukkit.command.CommandSender;
 import org.bukkit.entity.Player;
 import org.bukkit.scheduler.BukkitRunnable;
 
-@CommandPermissions(level = Rank.OP, source = SourceType.ONLY_IN_GAME)
+import java.util.SplittableRandom;
+
+@CommandPermissions(permission = "deafen", source = SourceType.ONLY_IN_GAME)
 @CommandParameters(description = "Makes random sounds.", usage = "/<command>")
 public class Command_deafen extends FreedomCommand
 {
@@ -33,7 +37,7 @@ public class Command_deafen extends FreedomCommand
         {
             for (double percent = 0.0; percent <= 1.0; percent += (1.0 / STEPS))
             {
-                final float pitch = (float)(percent * 2.0);
+                final float pitch = (float) (percent * 2.0);
 
                 new BukkitRunnable()
                 {

commons/src/main/java/me/totalfreedom/totalfreedommod/command/Command_debugstick.java

@@ -0,0 +1,40 @@
+package me.totalfreedom.totalfreedommod.command;
+
+import me.totalfreedom.totalfreedommod.command.handling.CommandParameters;
+import me.totalfreedom.totalfreedommod.command.handling.CommandPermissions;
+import me.totalfreedom.totalfreedommod.command.handling.FreedomCommand;
+import me.totalfreedom.totalfreedommod.command.handling.SourceType;
+import net.kyori.adventure.text.Component;
+import net.kyori.adventure.text.format.NamedTextColor;
+import net.kyori.adventure.text.format.TextDecoration;
+import org.bukkit.Material;
+import org.bukkit.command.Command;
+import org.bukkit.command.CommandSender;
+import org.bukkit.entity.Player;
+import org.bukkit.inventory.ItemStack;
+import org.bukkit.inventory.meta.ItemMeta;
+
+import java.util.Arrays;
+
+@CommandPermissions(permission = "debugstick", source = SourceType.ONLY_IN_GAME)
+@CommandParameters(description = "Get a stick of happiness.", usage = "/<command>")
+public class Command_debugstick extends FreedomCommand
+{
+    @Override
+    public boolean run(CommandSender sender, Player playerSender, Command cmd, String commandLabel, String[] args, boolean senderIsConsole)
+    {
+        ItemStack itemStack = new ItemStack(Material.DEBUG_STICK);
+        ItemMeta itemMeta = itemStack.getItemMeta();
+        assert itemMeta != null;
+        itemMeta.displayName(Component.text("Stick of Happiness", NamedTextColor.GOLD).decorate(TextDecoration.BOLD));
+        itemMeta.lore(Arrays.asList(
+                Component.text("This is the most powerful stick in the game.", NamedTextColor.RED),
+                Component.text("You can left click to select what you want to change.", NamedTextColor.DARK_BLUE),
+                Component.text("And then you can right click to change it!", NamedTextColor.DARK_GREEN),
+                Component.text("Isn't technology amazing?", NamedTextColor.DARK_PURPLE)
+        ));
+        itemStack.setItemMeta(itemMeta);
+        playerSender.getInventory().addItem(itemStack);
+        return true;
+    }
+}

commons/src/main/java/me/totalfreedom/totalfreedommod/command/Command_denick.java

@@ -1,12 +1,15 @@
 package me.totalfreedom.totalfreedommod.command;
 
-import me.totalfreedom.totalfreedommod.rank.Rank;
+import me.totalfreedom.totalfreedommod.command.handling.CommandParameters;
+import me.totalfreedom.totalfreedommod.command.handling.CommandPermissions;
+import me.totalfreedom.totalfreedommod.command.handling.FreedomCommand;
+import me.totalfreedom.totalfreedommod.command.handling.SourceType;
 import me.totalfreedom.totalfreedommod.util.FUtil;
 import org.bukkit.command.Command;
 import org.bukkit.command.CommandSender;
 import org.bukkit.entity.Player;
 
-@CommandPermissions(level = Rank.ADMIN, source = SourceType.BOTH)
+@CommandPermissions(permission = "denick", source = SourceType.BOTH)
 @CommandParameters(description = "Essentials Interface Command - Remove the nickname of all players on the server.", usage = "/<command>")
 public class Command_denick extends FreedomCommand
 {
@@ -16,17 +19,12 @@ public class Command_denick extends FreedomCommand
     {
         if (!plugin.esb.isEnabled())
         {
-            msg("Essentials is not enabled on this server.");
+            msgNew("<red>Essentials is not enabled on this server.");
             return true;
         }
 
         FUtil.adminAction(sender.getName(), "Removing all nicknames", false);
-
-        for (Player player : server.getOnlinePlayers())
-        {
-            plugin.esb.setNickname(player.getName(), null);
-        }
-
+        server.getOnlinePlayers().forEach(player -> plugin.esb.setNickname(player.getName(), null));
         return true;
     }
 }

commons/src/main/java/me/totalfreedom/totalfreedommod/command/Command_deop.java

@@ -0,0 +1,58 @@
+package me.totalfreedom.totalfreedommod.command;
+
+import me.totalfreedom.totalfreedommod.TotalFreedomMod;
+import me.totalfreedom.totalfreedommod.command.handling.*;
+import me.totalfreedom.totalfreedommod.util.FUtil;
+import net.kyori.adventure.text.minimessage.tag.resolver.Placeholder;
+import net.luckperms.api.track.DemotionResult;
+import org.bukkit.Bukkit;
+import org.bukkit.command.Command;
+import org.bukkit.command.CommandSender;
+import org.bukkit.entity.Player;
+
+@Intercept("deop")
+@CommandPermissions(permission = "deop", source = SourceType.BOTH)
+@CommandParameters(description = "Deop a player", usage = "/<command> <partialname>")
+public class Command_deop extends FreedomCommand
+{
+    @Override
+    public boolean run(CommandSender sender, Player playerSender, Command cmd, String commandLabel, String[] args, boolean senderIsConsole)
+    {
+        if (args.length < 1)
+        {
+            return false;
+        }
+
+        boolean silent = false;
+        if (args.length == 2)
+        {
+            silent = args[1].equalsIgnoreCase("-s");
+        }
+
+        Player player = Bukkit.getServer().getPlayer(args[0]);
+
+        if (player == null || plugin.al.isVanished(player.getUniqueId()))
+        {
+            msg(sender, PLAYER_NOT_FOUND);
+            return true;
+        }
+
+        boolean b = silent;
+        DemotionResult result = TotalFreedomMod.getPlugin().getHierarchy()
+                .demoteUser(TotalFreedomMod.getPlugin().getHierarchy().op(), player);
+
+        if (!result.wasSuccessful())
+        {
+            msgNew("<red><player> is already non-op.", Placeholder.unparsed("player", player.getName()));
+            return true;
+        }
+
+        msg(player, YOU_ARE_NOT_OP);
+
+        if (!b)
+        {
+            FUtil.adminAction(sender.getName(), "De-opping " + player.getName(), false);
+        }
+        return true;
+    }
+}

commons/src/main/java/me/totalfreedom/totalfreedommod/command/Command_deopall.java

@@ -0,0 +1,41 @@
+package me.totalfreedom.totalfreedommod.command;
+
+import me.totalfreedom.totalfreedommod.TotalFreedomMod;
+import me.totalfreedom.totalfreedommod.command.handling.CommandParameters;
+import me.totalfreedom.totalfreedommod.command.handling.CommandPermissions;
+import me.totalfreedom.totalfreedommod.command.handling.FreedomCommand;
+import me.totalfreedom.totalfreedommod.command.handling.SourceType;
+import me.totalfreedom.totalfreedommod.util.FUtil;
+import net.kyori.adventure.text.minimessage.tag.resolver.Placeholder;
+import net.luckperms.api.track.DemotionResult;
+import org.bukkit.command.Command;
+import org.bukkit.command.CommandSender;
+import org.bukkit.entity.Player;
+
+@CommandPermissions(permission = "deop.all", source = SourceType.BOTH, blockHostConsole = true)
+@CommandParameters(description = "Deop everyone on the server.", usage = "/<command>")
+public class Command_deopall extends FreedomCommand
+{
+
+    @Override
+    public boolean run(CommandSender sender, Player playerSender, Command cmd, String commandLabel, String[] args, boolean senderIsConsole)
+    {
+        FUtil.adminAction(sender.getName(), "De-opping all players on the server", true);
+
+        server.getOnlinePlayers().forEach(player ->
+        {
+            DemotionResult result = TotalFreedomMod.getPlugin().getHierarchy()
+                    .demoteUser(TotalFreedomMod.getPlugin().getHierarchy().op(), player);
+
+            if (!result.wasSuccessful())
+            {
+                msgNew("<red><player> is already non-op.", Placeholder.unparsed("player", player.getName()));
+                return;
+            }
+
+            msg(player, YOU_ARE_NOT_OP);
+        });
+
+        return true;
+    }
+}

commons/src/main/java/me/totalfreedom/totalfreedommod/command/Command_dispfill.java

@@ -1,9 +1,11 @@
 package me.totalfreedom.totalfreedommod.command;
 
-import java.util.ArrayList;
-import java.util.List;
-import me.totalfreedom.totalfreedommod.rank.Rank;
+import me.totalfreedom.totalfreedommod.command.handling.CommandParameters;
+import me.totalfreedom.totalfreedommod.command.handling.CommandPermissions;
+import me.totalfreedom.totalfreedommod.command.handling.FreedomCommand;
+import me.totalfreedom.totalfreedommod.command.handling.SourceType;
 import me.totalfreedom.totalfreedommod.util.FUtil;
+import net.kyori.adventure.text.minimessage.tag.resolver.Placeholder;
 import org.apache.commons.lang.StringUtils;
 import org.bukkit.Location;
 import org.bukkit.Material;
@@ -15,7 +17,10 @@ import org.bukkit.entity.Player;
 import org.bukkit.inventory.Inventory;
 import org.bukkit.inventory.ItemStack;
 
-@CommandPermissions(level = Rank.OP, source = SourceType.ONLY_IN_GAME)
+import java.util.ArrayList;
+import java.util.List;
+
+@CommandPermissions(permission = "dispfill", source = SourceType.ONLY_IN_GAME)
 @CommandParameters(description = "Fill nearby dispensers with a set of items of your choice.", usage = "/<command> <radius> <comma,separated,items>")
 public class Command_dispfill extends FreedomCommand
 {
@@ -24,7 +29,7 @@ public class Command_dispfill extends FreedomCommand
     {
         if (targetBlock.getType() == Material.DISPENSER)
         {
-            final Inventory dispenserInv = ((Dispenser)targetBlock.getState()).getInventory();
+            final Inventory dispenserInv = ((Dispenser) targetBlock.getState()).getInventory();
             dispenserInv.clear();
             dispenserInv.addItem(items);
         }
@@ -40,10 +45,9 @@ public class Command_dispfill extends FreedomCommand
             try
             {
                 radius = Math.max(5, Math.min(25, Integer.parseInt(args[0])));
-            }
-            catch (NumberFormatException ex)
+            } catch (NumberFormatException ex)
             {
-                sender.sendMessage("Invalid radius.");
+                msgNew("<red>Invalid radius: <amount>", Placeholder.unparsed("amount", args[0]));
                 return true;
             }
 
@@ -57,10 +61,9 @@ public class Command_dispfill extends FreedomCommand
                 if (material != null)
                 {
                     items.add(new ItemStack(material, 64));
-                }
-                else
+                } else
                 {
-                    sender.sendMessage("Skipping invalid item: " + searchItem);
+                    msgNew("Skipping invalid item: <item>", Placeholder.unparsed("item", searchItem));
                 }
             }
 
@@ -76,22 +79,24 @@ public class Command_dispfill extends FreedomCommand
                     for (int zOffset = -radius; zOffset <= radius; zOffset++)
                     {
                         final Block targetBlock = centerBlock.getRelative(xOffset, yOffset, zOffset);
-                        if (targetBlock.getLocation().distanceSquared(centerLocation) < (radius * radius))
+                        if (targetBlock.getLocation().distanceSquared(centerLocation) < (radius * radius) && targetBlock.getType().equals(Material.DISPENSER))
                         {
-                            if (targetBlock.getType().equals(Material.DISPENSER))
+                            msgNew("Filling dispenser @ <location>", Placeholder.unparsed("location", FUtil.formatLocation(targetBlock.getLocation())));
+
+                            if (plugin.cpb.isEnabled())
                             {
-                                sender.sendMessage("Filling dispenser @ " + FUtil.formatLocation(targetBlock.getLocation()));
-                                setDispenserContents(targetBlock, itemsArray);
-                                affected++;
+                                plugin.cpb.getCoreProtectAPI().logContainerTransaction(sender.getName(), targetBlock.getLocation());
                             }
+
+                            setDispenserContents(targetBlock, itemsArray);
+                            affected++;
                         }
                     }
                 }
             }
 
-            sender.sendMessage("Done. " + affected + " dispenser(s) filled.");
-        }
-        else
+            msgNew("Done. <amount> dispenser(s) filled.", Placeholder.unparsed("amount", String.valueOf(affected)));
+        } else
         {
             return false;
         }

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

@@ -1,14 +1,16 @@
 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.command.handling.CommandParameters;
+import me.totalfreedom.totalfreedommod.command.handling.CommandPermissions;
+import me.totalfreedom.totalfreedommod.command.handling.FreedomCommand;
+import me.totalfreedom.totalfreedommod.command.handling.SourceType;
 import me.totalfreedom.totalfreedommod.config.ConfigEntry;
-import me.totalfreedom.totalfreedommod.discord.Discord;
 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 net.kyori.adventure.text.minimessage.tag.resolver.Placeholder;
 import org.apache.commons.lang.ArrayUtils;
 import org.apache.commons.lang.StringUtils;
 import org.bukkit.ChatColor;
@@ -19,7 +21,7 @@ import org.bukkit.entity.Player;
 import org.bukkit.scheduler.BukkitRunnable;
 import org.bukkit.util.Vector;
 
-@CommandPermissions(level = Rank.SENIOR_ADMIN, source = SourceType.ONLY_CONSOLE, blockHostConsole = true)
+@CommandPermissions(permission = "doom", source = SourceType.ONLY_CONSOLE, blockHostConsole = true)
 @CommandParameters(description = "Sends the specified player to their doom.", usage = "/<command> <playername> [reason]")
 public class Command_doom extends FreedomCommand
 {
@@ -36,14 +38,14 @@ public class Command_doom extends FreedomCommand
 
         if (player == null)
         {
-            sender.sendMessage(FreedomCommand.PLAYER_NOT_FOUND);
+            msg(PLAYER_NOT_FOUND);
             return true;
         }
 
         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);
@@ -53,10 +55,9 @@ public class Command_doom extends FreedomCommand
             admin.setActive(false);
             plugin.al.save(admin);
             plugin.al.updateTables();
-            plugin.ptero.updateAccountStatus(admin);
-            if (plugin.dc.enabled && ConfigEntry.DISCORD_ROLE_SYNC.getBoolean())
+            if (plugin.dc != null && plugin.dc.isEnabled() && ConfigEntry.DISCORD_ROLE_SYNC.getBoolean())
             {
-                Discord.syncRoles(admin, plugin.pl.getData(admin.getName()).getDiscordID());
+                plugin.dc.syncRoles(admin, plugin.pl.getData(admin.getName()).getDiscordID());
             }
         }
 
@@ -76,10 +77,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
@@ -123,7 +121,10 @@ public class Command_doom extends FreedomCommand
             {
                 // message
                 FUtil.adminAction(sender.getName(), "Banning " + player.getName(), true);
-                msg(sender, player.getName() + " has been banned and IP is: " + ip);
+
+                msgNew("<name> has been banned and their IP is <ip>.",
+                        Placeholder.unparsed("name", player.getName()),
+                        Placeholder.unparsed("ip", ip));
 
                 // generate explosion
                 player.getWorld().createExplosion(player.getLocation(), 0F, false);

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

@@ -0,0 +1,54 @@
+package me.totalfreedom.totalfreedommod.command;
+
+import me.totalfreedom.totalfreedommod.command.handling.CommandParameters;
+import me.totalfreedom.totalfreedommod.command.handling.CommandPermissions;
+import me.totalfreedom.totalfreedommod.command.handling.FreedomCommand;
+import me.totalfreedom.totalfreedommod.command.handling.SourceType;
+import net.kyori.adventure.text.minimessage.tag.resolver.Placeholder;
+import org.bukkit.command.Command;
+import org.bukkit.command.CommandSender;
+import org.bukkit.entity.Player;
+
+@CommandPermissions(permission = "eject", source = SourceType.ONLY_IN_GAME)
+@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();
+
+        // Removes any entities from the sender's shoulders
+        if (playerSender.getShoulderEntityLeft() != null)
+        {
+            playerSender.setShoulderEntityLeft(null);
+            count++;
+        }
+        if (playerSender.getShoulderEntityRight() != null)
+        {
+            playerSender.setShoulderEntityLeft(null);
+            count++;
+        }
+
+        // Removes anything riding the sender
+        playerSender.eject();
+
+        if (count != 0)
+        {
+            msgNew("<green><count> entit<grammar> ejected.",
+                    Placeholder.unparsed("count", String.valueOf(count)),
+                    Placeholder.unparsed("grammar", count == 1 ? "y was" : "ies were"));
+        } else
+        {
+            msgNew("<green>Nothing was ejected.");
+        }
+
+        return true;
+    }
+}