Merge pull request #339 from AtlasMediaGroup/merge/development/main

Merge development into main

.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

@@ -0,0 +1,46 @@
+# This workflow checks out code, performs a Codacy security scan
+# and integrates the results with the
+# GitHub Advanced Security code scanning feature.  For more information on
+# the Codacy security scan action usage and parameters, see
+# https://github.com/codacy/codacy-analysis-cli-action.
+# For more information on Codacy Analysis CLI in general, see
+# https://github.com/codacy/codacy-analysis-cli.
+
+name: Codacy Security Scan
+
+on:
+  push:
+    branches: [ development ]
+  pull_request:
+    branches: [ development ]
+
+jobs:
+  codacy-security-scan:
+    name: Codacy Security Scan
+    runs-on: ubuntu-latest
+    steps:
+      # Checkout the repository to the GitHub Actions runner
+      - name: Checkout code
+        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@v4
+        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
+          project-token: ${{ secrets.CODACY_PROJECT_TOKEN }}
+          verbose: true
+          output: results.sarif
+          format: sarif
+          # Adjust severity of non-security issues
+          gh-code-scanning-compat: true
+          # Force 0 exit code to allow SARIF file generation
+          # This will handover control about PR rejection to the GitHub side
+          max-allowed-issues: 2147483647
+
+      # Upload the SARIF file generated in the previous step
+      - name: Upload SARIF results file
+        uses: github/codeql-action/upload-sarif@v2
+        with:
+          sarif_file: results.sarif

.github/workflows/codeql-analysis.yml

@@ -0,0 +1,74 @@
+# For most projects, this workflow file will not need changing; you simply need
+# to commit it to your repository.
+#
+# You may wish to alter this file to override the set of languages analyzed,
+# or to provide custom queries or build logic.
+#
+# ******** NOTE ********
+# We have attempted to detect the languages in your repository. Please check
+# the `language` matrix defined below to confirm you have the correct set of
+# supported CodeQL languages.
+#
+name: "CodeQL"
+
+on:
+  push:
+    branches: [ development ]
+  pull_request:
+    # The branches below must be a subset of the branches above
+    branches: [ development ]
+  schedule:
+    - cron: '20 18 * * 1'
+
+jobs:
+  analyze:
+    name: Analyze
+    runs-on: ubuntu-latest
+
+    strategy:
+      fail-fast: false
+      matrix:
+        language: [ 'java' ]
+        # CodeQL supports [ 'cpp', 'csharp', 'go', 'java', 'javascript', 'python' ]
+        # Learn more:
+        # 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@v3
+      
+    - name: Setup Java JDK
+      uses: actions/setup-java@v3
+      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'
+
+    # Initializes the CodeQL tools for scanning.
+    - name: Initialize CodeQL
+      uses: github/codeql-action/init@v2
+      with:
+        languages: ${{ matrix.language }}
+        # If you wish to specify custom queries, you can do so here or in a config file.
+        # By default, queries listed here will override any specified in a config file.
+        # Prefix the list here with "+" to use these queries and those in the config file.
+        # queries: ./path/to/local/query, your-org/your-repo/queries@main
+
+    # Autobuild attempts to build any compiled languages  (C/C++, C#, or Java).
+    # If this step fails, then you should remove it and run the build manually (see below)
+    - name: Autobuild
+      uses: github/codeql-action/autobuild@v2
+
+    # ℹ️ Command-line programs to run using the OS shell.
+    # 📚 https://git.io/JvXDl
+
+    # ✏️ If the Autobuild fails above, remove it and uncomment the following three lines
+    #    and modify them (or add more) to build your code if your project
+    #    uses a compiled language
+
+    #- run: |
+    #   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
+      with:
+        java-version: 17
+        distribution: 'adopt'
+    - name: Build with Maven
+      run: mvn -B package --file pom.xml

.gitignore

@@ -1,6 +1,6 @@
 # TFM excludes
-/lib
 build.properties
+dependency-reduced-pom.xml
 
 # Netbeans excludes
 /nbproject/private
@@ -17,10 +17,16 @@ manifest.mf
 /.settings
 
 # IntelliJ excludes
-*.iml
 *.ipr
 *.iws
-/.idea
+/.idea/modules.xml
+/.idea/discord.xml
+/.idea/jarRepositories.xml
+/.idea/workspace.xml
+/.idea/uiDesigner.xml
+/.idea/libraries
+/.idea/
+*.iml
 
 # Maven excludes
 /target
@@ -32,3 +38,7 @@ manifest.mf
 .Trashes
 ehthumbs.db
 Thumbs.db
+.idea/inspectionProfiles/Project_Default.xml
+
+# Common working directory
+run/

.travis.yml

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

CONTRIBUTING.md

@@ -1,3 +1,3 @@
-# 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,7 +8,8 @@ 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.
@@ -30,12 +32,13 @@ All rights reserved.
 
 "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
+
+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:
 
 1. Redistributions of This Software must solely occur in Source form. Redistribution in Object form is prohibited without prior written permission from the Licensor.
 
-2. Neither the names of the copyright holders nor the names this software's contributors may be removed from This Software's source code. 
+2. Neither the names of the copyright holders nor the names this software's contributors may be removed from This Software's source code.
 
 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.
 
@@ -47,8 +50,10 @@ All rights reserved.
 
 7. Sub licensing of This Software is prohibited without prior written permission from the Licensor.
 
-##### 3. Submission of Contributions #####
+##### 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.
 
-##### 4. Disclaimer of Warranty #####
+##### 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,20 +1,17 @@
-# TotalFreedomMod #
+# 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)
 
-
-[![Build Status](https://travis-ci.org/TotalFreedom/TotalFreedomMod.svg?branch=TFM1.12-Alpha)](https://travis-ci.org/TotalFreedom/TotalFreedomMod)
-
-TotalFreedomMod is a CraftBukkit server plugin designed primarily to support the [Official TotalFreedom Minecraft Server](http://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.
 
-### Download ###
-You may download official binaries from the [releases page](https://github.com/TotalFreedom/TotalFreedomMod/releases).
+### Contributing
 
-Additionally, Travis CI generates a binary for each commit to the repository. While they might not be stable or 100% functional, these binaries are accessible at [tfmbuilds.win](https://tfmbuilds.win/).
-
-### 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).
 
-Please [join our Discord server](https://discord.gg/fb9J2TD) for any discussion on TFM development and other TotalFreedom Organization projects.
+For information on our security policy and reporting an issue, please see [SECURITY.md](SECURITY.md)
+
+### Compiling
+
+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

@@ -0,0 +1,42 @@
+# Security Policy
+
+## Supported Versions
+
+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, our support matrix is as follows:
+
+### 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.
+
+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

@@ -1,26 +1,23 @@
 <?xml version="1.0"?>
 <!DOCTYPE module PUBLIC
-          "-//Puppy Crawl//DTD Check Configuration 1.3//EN"
-          "http://www.puppycrawl.com/dtds/configuration_1_3.dtd">
-
+        "-//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" />
+        <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">
             <property name="tokens" value="STRING_LITERAL, CHAR_LITERAL"/>
-            <property name="format" value="\\u00(08|09|0(a|A)|0(c|C)|0(d|D)|22|27|5(C|c))|\\(0(10|11|12|14|15|42|47)|134)"/>
+            <property name="format"
+                      value="\\u00(08|09|0(a|A)|0(c|C)|0(d|D)|22|27|5(C|c))|\\(0(10|11|12|14|15|42|47)|134)"/>
             <property name="message" value="Avoid using corresponding octal or Unicode escape."/>
         </module>
         <module name="LineLength">
@@ -36,7 +33,8 @@
         </module>
         <module name="RightCurly">
             <property name="option" value="alone"/>
-            <property name="tokens" value="LITERAL_TRY, LITERAL_CATCH, LITERAL_FINALLY, LITERAL_IF, LITERAL_ELSE, CLASS_DEF, METHOD_DEF, CTOR_DEF, LITERAL_FOR, LITERAL_WHILE, LITERAL_DO, STATIC_INIT, INSTANCE_INIT"/>
+            <property name="tokens"
+                      value="LITERAL_TRY, LITERAL_CATCH, LITERAL_FINALLY, LITERAL_IF, LITERAL_ELSE, CLASS_DEF, METHOD_DEF, CTOR_DEF, LITERAL_FOR, LITERAL_WHILE, LITERAL_DO, STATIC_INIT, INSTANCE_INIT"/>
         </module>
         <module name="WhitespaceAround">
             <property name="allowEmptyConstructors" value="true"/>
@@ -89,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>
@@ -110,11 +108,13 @@
                      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"/>
-            <property name="tokens" value="BAND, BOR, BSR, BXOR, DIV, EQUAL, GE, GT, LAND, LE, LITERAL_INSTANCEOF, LOR, LT, MINUS, MOD, NOT_EQUAL, PLUS, QUESTION, SL, SR, STAR "/>
+            <property name="tokens"
+                      value="BAND, BOR, BSR, BXOR, DIV, EQUAL, GE, GT, LAND, LE, LITERAL_INSTANCEOF, LOR, LT, MINUS, MOD, NOT_EQUAL, PLUS, QUESTION, SL, SR, STAR "/>
         </module>
         <module name="AnnotationLocation">
             <property name="tokens" value="CLASS_DEF, INTERFACE_DEF, ENUM_DEF, METHOD_DEF, CTOR_DEF"/>

nb-configuration.xml

@@ -1,18 +1,19 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <project-shared-configuration>
     <!--
-    This file contains additional configuration written by modules in the NetBeans IDE.
-    The configuration is intended to be shared among all the users of project and
-    therefore it is assumed to be part of version control checkout.
-    Without this configuration present, some functionality in the IDE may be limited or fail altogether.
-    -->
+This file contains additional configuration written by modules in the NetBeans IDE.
+The configuration is intended to be shared among all the users of project and
+therefore it is assumed to be part of version control checkout.
+Without this configuration present, some functionality in the IDE may be limited or fail altogether.
+-->
     <properties xmlns="http://www.netbeans.org/ns/maven-properties-data/1">
         <!--
-        Properties that influence various parts of the IDE, especially code formatting and the like.
-        You can copy and paste the single properties, into the pom.xml file and the IDE will pick them up.
-        That way multiple projects can share the same settings (useful for formatting rules for example).
-        Any value defined here will override the pom.xml file value but is only applicable to the current project.
-        -->
+Properties that influence various parts of the IDE, especially code formatting and the like. 
+You can copy and paste the single properties, into the pom.xml file and the IDE will pick them up.
+That way multiple projects can share the same settings (useful for formatting rules for example).
+Any value defined here will override the pom.xml file value but is only applicable to the current project.
+-->
+        <netbeans.hint.jdkPlatform>JDK_17</netbeans.hint.jdkPlatform>
         <netbeans.checkstyle.format>true</netbeans.checkstyle.format>
     </properties>
 </project-shared-configuration>

pom.xml

@@ -1,27 +1,24 @@
 <?xml version="1.0" encoding="UTF-8"?>
-<project xmlns="http://maven.apache.org/POM/4.0.0" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/xsd/maven-4.0.0.xsd">
+<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>
 
     <groupId>me.totalfreedom</groupId>
-    <artifactId>totalfreedom</artifactId>
-    <version>5.0</version>
+    <artifactId>TotalFreedomMod</artifactId>
+    <version>2022.06.1</version>
     <packaging>jar</packaging>
 
     <properties>
         <project.build.sourceEncoding>UTF-8</project.build.sourceEncoding>
-        <tfm.build.version>${project.version}</tfm.build.version>
-        <tfm.build.codename>Electrum</tfm.build.codename>
-        <!--  <tfm.build.number>${maven.buildnumber}</tfm.build.number> -->
-        <tfm.build.date>${maven.build.timestamp}</tfm.build.date>
-        <tfm.build.author>${buildAuthor}</tfm.build.author>
-        <tfm.build.head>${buildHead}</tfm.build.head>
+        <tfm.build.codename>Phoenix</tfm.build.codename>
         <jar.finalName>${project.name}</jar.finalName>
-        <maven.build.timestamp.format>dd/MM/yyyy hh:mm aa</maven.build.timestamp.format>
+        <timestamp>${maven.build.timestamp}</timestamp>
+        <maven.build.timestamp.format>MM/dd/yyyy HH:mm</maven.build.timestamp.format>
     </properties>
 
     <name>TotalFreedomMod</name>
     <description>Server modification for the TotalFreedom server</description>
-    <url>https://github.com/TotalFreedom/TotalFreedomMod</url>
+    <url>https://github.com/AtlasMediaGroup/TotalFreedomMod</url>
 
     <licenses>
         <license>
@@ -31,97 +28,213 @@
     </licenses>
 
     <organization>
-        <name>Total Freedom</name>
+        <name>TotalFreedom</name>
         <url>https://totalfreedom.me</url>
     </organization>
 
     <scm>
-        <connection>scm:git:git@github.com:TotalFreedom/TotalFreedomMod.git</connection>
-        <developerConnection>scm:git:git@github.com:TotalFreedom/TotalFreedomMod.git</developerConnection>
-        <url>git@github.com:TotalFreedom/TotalFreedomMod.git</url>
+        <connection>scm:git:git@github.com:TFPatches/TotalFreedomMod.git</connection>
+        <developerConnection>scm:git:git@github.com:TFPatches/TotalFreedomMod.git</developerConnection>
+        <url>git@github.com:TFPatches/TotalFreedomMod.git</url>
     </scm>
 
     <repositories>
+        
         <repository>
-            <id>ess-repo</id>
-            <url>http://repo.ess3.net</url>
+            <id>atlas-nexus-01-totalfreedom-development</id>
+            <url>https://nexus-01.core.atlas-media.co.uk/repository/totalfreedom-development/</url>
         </repository>
+
         <repository>
-            <id>jitpack.io</id>
-            <url>https://jitpack.io</url>
+            <id>CodeMC</id>
+            <url>https://repo.codemc.org/repository/maven-public/</url>
         </repository>
+
         <repository>
             <id>spigot-repo</id>
             <url>https://hub.spigotmc.org/nexus/content/repositories/snapshots/</url>
         </repository>
-        <!--        <repository>
-            <id>elmakers-repo</id>
-            <url>http://maven.elmakers.com/repository/</url>
-        </repository>-->
+
         <repository>
-            <id>sk89q-snapshots</id>
-            <url>http://maven.sk89q.com/artifactory/repo</url>
+            <id>enginehub</id>
+            <url>https://maven.enginehub.org/repo/</url>
         </repository>
+
+        <repository>
+            <id>elmakers-repo</id>
+            <url>https://maven.elmakers.com/repository/</url>
+        </repository>
+
+        <repository>
+            <id>dv8tion</id>
+            <name>m2-dv8tion</name>
+            <url>https://m2.dv8tion.net/releases/</url>
+        </repository>
+
+        <repository>
+            <id>playpro</id>
+            <url>https://maven.playpro.com/</url>
+        </repository>
+
+        <repository>
+            <id>md_5-public</id>
+            <url>https://repo.md-5.net/content/groups/public/</url>
+        </repository>
+
+        <repository>
+            <id>dmulloy2-repo</id>
+            <url>https://repo.dmulloy2.net/nexus/repository/public/</url>
+        </repository>
+
+        <repository>
+            <id>esentialsx-repo</id>
+            <url>https://repo.essentialsx.net/releases/</url>
+        </repository>
+
     </repositories>
 
     <dependencies>
-        <dependency>
-            <groupId>org.apache.commons</groupId>
-            <artifactId>commons-lang3</artifactId>
-            <version>3.6</version>
-        </dependency>
 
         <dependency>
             <groupId>commons-io</groupId>
             <artifactId>commons-io</artifactId>
-            <version>2.5</version>
-        </dependency>
-
-        <dependency>
-            <groupId>org.projectlombok</groupId>
-            <artifactId>lombok</artifactId>
-            <version>1.16.6</version>
-        </dependency>
-
-        <dependency>
-            <groupId>org.spigotmc</groupId>
-            <artifactId>spigot-api</artifactId>
-            <version>1.12-pre5-SNAPSHOT</version>
+            <version>2.13.0</version>
             <scope>compile</scope>
         </dependency>
 
         <dependency>
-            <groupId>com.github.Pravian</groupId>
-            <artifactId>Aero</artifactId>
-            <version>a0e1dc5</version>
+            <groupId>org.apache.commons</groupId>
+            <artifactId>commons-lang3</artifactId>
+            <version>3.12.0</version>
+            <scope>compile</scope>
         </dependency>
 
         <dependency>
-            <groupId>com.github.TotalFreedom</groupId>
+            <groupId>org.bstats</groupId>
+            <artifactId>bstats-bukkit</artifactId>
+            <version>3.0.2</version>
+            <scope>compile</scope>
+        </dependency>
+
+        <dependency>
+            <groupId>me.totalfreedom.scissors</groupId>
+            <artifactId>Scissors-API</artifactId>
+            <version>1.19.4-R0.1-SNAPSHOT</version>
+            <scope>provided</scope>
+        </dependency>
+
+        <dependency>
+            <groupId>com.github.TotalFreedomMC</groupId>
             <artifactId>BukkitTelnet</artifactId>
-            <version>4.5-pre1</version>
+            <version>541e9fdb84</version>
+            <scope>provided</scope>
         </dependency>
 
         <dependency>
-            <groupId>net.ess3</groupId>
-            <artifactId>Essentials</artifactId>
-            <version>2.13.1</version>
+            <groupId>com.github.AtlasMediaGroup</groupId>
+            <artifactId>TF-LibsDisguises</artifactId>
+            <version>5a340341b0</version>
+            <scope>provided</scope>
         </dependency>
 
         <dependency>
-            <groupId>com.github.TotalFreedom.TF-WorldEdit</groupId>
+            <groupId>com.sk89q.worldedit</groupId>
             <artifactId>worldedit-bukkit</artifactId>
-            <version>6.1.0-TF</version>
+            <version>7.2.15</version>
+            <scope>provided</scope>
         </dependency>
 
         <dependency>
-            <groupId>com.github.TotalFreedom.TF-WorldEdit</groupId>
-            <artifactId>worldedit-core</artifactId>
-            <version>6.1.0-TF</version>
+            <groupId>net.dv8tion</groupId>
+            <artifactId>JDA</artifactId>
+            <version>4.4.1_353</version>
+            <scope>provided</scope>
         </dependency>
 
+        <dependency>
+            <groupId>net.coreprotect</groupId>
+            <artifactId>coreprotect</artifactId>
+            <version>21.3</version>
+            <scope>provided</scope>
+        </dependency>
+
+        <dependency>
+            <groupId>com.sk89q.worldguard</groupId>
+            <artifactId>worldguard-bukkit</artifactId>
+            <version>7.0.8</version>
+            <scope>provided</scope>
+        </dependency>
+
+        <dependency>
+            <groupId>io.papermc</groupId>
+            <artifactId>paperlib</artifactId>
+            <version>1.0.8</version>
+            <scope>compile</scope>
+        </dependency>
+
+        <dependency>
+            <groupId>com.github.vexsoftware</groupId>
+            <artifactId>votifier</artifactId>
+            <version>v1.9</version>
+            <scope>provided</scope>
+        </dependency>
+        
+        <dependency>
+            <groupId>net.essentialsx</groupId>
+            <artifactId>EssentialsX</artifactId>
+            <version>2.20.0</version>
+            <scope>provided</scope>
+        </dependency>
+
+        <dependency>
+            <groupId>org.reflections</groupId>
+            <artifactId>reflections</artifactId>
+            <version>0.10.2</version>
+            <scope>compile</scope>
+        </dependency>
+
+        <dependency>
+            <groupId>org.javassist</groupId>
+            <artifactId>javassist</artifactId>
+            <version>3.29.1-GA</version>
+            <scope>compile</scope>
+        </dependency>
+
+        <dependency>
+            <groupId>org.jetbrains</groupId>
+            <artifactId>annotations</artifactId>
+            <version>24.0.1</version>
+            <scope>compile</scope>
+        </dependency>
+
+        <dependency>
+            <groupId>org.apache.maven.plugins</groupId>
+            <artifactId>maven-checkstyle-plugin</artifactId>
+            <version>3.3.0</version>
+            <scope>compile</scope>
+        </dependency>
+        
+        <dependency>
+            <groupId>org.junit.jupiter</groupId>
+            <artifactId>junit-jupiter</artifactId>
+            <version>5.10.0</version>
+            <scope>compile</scope>
+        </dependency>
+        
+        <dependency>
+            <groupId>org.eclipse.sisu</groupId>
+            <artifactId>org.eclipse.sisu.inject</artifactId>
+            <version>0.3.5</version>
+        </dependency>
     </dependencies>
 
+    <pluginRepositories>
+        <pluginRepository>
+            <id>apache.snapshots</id>
+            <url>https://repository.apache.org/snapshots/</url>
+        </pluginRepository>
+    </pluginRepositories>
+
     <build>
         <!-- Filter resources for build.properties -->
         <resources>
@@ -131,32 +244,81 @@
             </resource>
         </resources>
 
-
         <plugins>
             <!-- Compiler -->
             <plugin>
                 <groupId>org.apache.maven.plugins</groupId>
                 <artifactId>maven-compiler-plugin</artifactId>
-                <version>3.3</version>
+                <version>3.11.0</version>
                 <configuration>
                     <outputFileName>TotalFreedomMod.jar</outputFileName>
-                    <compilerVersion>1.7</compilerVersion>
-                    <source>1.7</source>
-                    <target>1.7</target>
+                    <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>1.8</version>
+                <version>3.1.0</version>
                 <executions>
                     <execution>
+                        <id>default-cli</id>
                         <phase>initialize</phase>
                         <configuration>
                             <target>
-                                <propertyfile file="build.properties" comment="Build information. Edit this to your liking.">
-                                    <entry key="buildAuthor" default="unknown" />
+                                <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>
@@ -171,7 +333,7 @@
             <plugin>
                 <groupId>org.codehaus.mojo</groupId>
                 <artifactId>properties-maven-plugin</artifactId>
-                <version>1.0.0</version>
+                <version>1.1.0</version>
                 <executions>
                     <execution>
                         <phase>initialize</phase>
@@ -180,63 +342,18 @@
                         </goals>
                         <configuration>
                             <files>
-                                <file>${basedir}/build.properties</file>
+                                <file>${project.basedir}/src/main/resources/build.properties</file>
                             </files>
                         </configuration>
                     </execution>
                 </executions>
             </plugin>
 
-            <!-- Checkstyle -->
-            <plugin>
-                <groupId>org.apache.maven.plugins</groupId>
-                <version>2.17</version>
-                <artifactId>maven-checkstyle-plugin</artifactId>
-                <executions>
-                    <execution>
-                        <phase>process-sources</phase>
-                        <goals>
-                            <goal>check</goal>
-                        </goals>
-                    </execution>
-                </executions>
-                <configuration>
-                    <configLocation>checkstyle.xml</configLocation>
-                    <consoleOutput>true</consoleOutput>
-                    <failsOnError>true</failsOnError>
-                    <failOnViolation>true</failOnViolation>
-                </configuration>
-            </plugin>
-
-            <!-- Git describe -->
-            <plugin>
-                <groupId>com.lukegb.mojo</groupId>
-                <artifactId>gitdescribe-maven-plugin</artifactId>
-                <version>3.0</version>
-                <executions>
-                    <execution>
-                        <id>git-describe</id>
-                        <phase>initialize</phase>
-                        <goals>
-                            <goal>gitdescribe</goal>
-                        </goals>
-                        <configuration>
-                            <descriptionProperty>buildHead</descriptionProperty>
-                            <extraArguments>
-                                <param>--tags</param>
-                                <param>--always</param>
-                                <param>HEAD</param>
-                            </extraArguments>
-                        </configuration>
-                    </execution>
-                </executions>
-            </plugin>
-
             <!-- Buildnumber -->
             <plugin>
                 <groupId>org.codehaus.mojo</groupId>
                 <artifactId>buildnumber-maven-plugin</artifactId>
-                <version>1.4</version>
+                <version>3.2.0</version>
                 <executions>
                     <execution>
                         <phase>generate-resources</phase>
@@ -248,13 +365,51 @@
 
                 <configuration>
                     <buildNumberPropertyName>maven.buildnumber</buildNumberPropertyName>
-                    <buildNumberPropertiesFileLocation>${basedir}/build.properties</buildNumberPropertiesFileLocation>
+                    <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.4.1</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>
 
@@ -264,13 +419,8 @@
         <plugins>
             <plugin>
                 <groupId>org.apache.maven.plugins</groupId>
-                <artifactId>maven-jxr-plugin</artifactId>
-                <version>2.5</version>
-            </plugin>
-            <plugin>
-                <groupId>org.apache.maven.plugins</groupId>
-                <version>2.17</version>
                 <artifactId>maven-checkstyle-plugin</artifactId>
+                <version>3.1.2</version>
                 <configuration>
                     <configLocation>checkstyle.xml</configLocation>
                     <failOnViolation>true</failOnViolation>

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

@@ -3,7 +3,6 @@ package me.totalfreedom.totalfreedommod;
 import com.google.common.collect.Lists;
 import java.util.Collections;
 import java.util.List;
-import lombok.Getter;
 import me.totalfreedom.totalfreedommod.config.ConfigEntry;
 import me.totalfreedom.totalfreedommod.util.FUtil;
 import org.bukkit.scheduler.BukkitRunnable;
@@ -13,21 +12,13 @@ public class Announcer extends FreedomService
 {
 
     private final List<String> announcements = Lists.newArrayList();
-    @Getter
     private boolean enabled;
-    @Getter
     private long interval;
-    @Getter
     private String prefix;
     private BukkitTask announcer;
 
-    public Announcer(TotalFreedomMod plugin)
-    {
-        super(plugin);
-    }
-
     @Override
-    protected void onStart()
+    public void onStart()
     {
         enabled = ConfigEntry.ANNOUNCER_ENABLED.getBoolean();
         interval = ConfigEntry.ANNOUNCER_INTERVAL.getInteger() * 20L;
@@ -36,7 +27,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)
@@ -64,7 +55,7 @@ public class Announcer extends FreedomService
     }
 
     @Override
-    protected void onStop()
+    public void onStop()
     {
         if (announcer == null)
         {
@@ -85,4 +76,23 @@ public class Announcer extends FreedomService
         FUtil.bcastMsg(prefix + message);
     }
 
+    public boolean isEnabled()
+    {
+        return enabled;
+    }
+
+    public long getInterval()
+    {
+        return interval;
+    }
+
+    public String getPrefix()
+    {
+        return prefix;
+    }
+
+    public BukkitTask getAnnouncer()
+    {
+        return announcer;
+    }
 }

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

@@ -2,9 +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 org.bukkit.Location;
+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;
@@ -13,19 +12,13 @@ import org.bukkit.event.block.BlockPlaceEvent;
 
 public class AntiNuke extends FreedomService
 {
-
-    public AntiNuke(TotalFreedomMod plugin)
-    {
-        super(plugin);
-    }
-
     @Override
-    protected void onStart()
+    public void onStart()
     {
     }
 
     @Override
-    protected void onStop()
+    public void onStop()
     {
     }
 
@@ -38,46 +31,17 @@ public class AntiNuke extends FreedomService
         }
 
         final Player player = event.getPlayer();
-        final Location location = event.getBlock().getLocation();
         final FPlayer fPlayer = plugin.pl.getPlayer(player);
 
-        final Location playerLocation = player.getLocation();
-
-        final double nukeMonitorRange = ConfigEntry.NUKE_MONITOR_RANGE.getDouble();
-
-        boolean outOfRange = false;
-        if (!playerLocation.getWorld().equals(location.getWorld()))
-        {
-            outOfRange = true;
-        }
-        else if (playerLocation.distanceSquared(location) > (nukeMonitorRange * nukeMonitorRange))
-        {
-            outOfRange = true;
-        }
-
-        if (outOfRange)
-        {
-            if (fPlayer.incrementAndGetFreecamDestroyCount() > ConfigEntry.FREECAM_TRIGGER_COUNT.getInteger())
-            {
-                FUtil.bcastMsg(player.getName() + " has been flagged for possible freecam nuking.", ChatColor.RED);
-                plugin.ae.autoEject(player, "Freecam (extended range) block breaking is not permitted on this server.");
-
-                fPlayer.resetFreecamDestroyCount();
-
-                event.setCancelled(true);
-                return;
-            }
-        }
-
         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.");
-
+            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);
-            return;
         }
     }
 
@@ -90,42 +54,13 @@ public class AntiNuke extends FreedomService
         }
 
         Player player = event.getPlayer();
-        Location blockLocation = event.getBlock().getLocation();
         FPlayer fPlayer = plugin.pl.getPlayer(player);
 
-        Location playerLocation = player.getLocation();
-
-        double nukeMonitorRange = ConfigEntry.NUKE_MONITOR_RANGE.getDouble();
-
-        boolean outOfRange = false;
-        if (!playerLocation.getWorld().equals(blockLocation.getWorld()))
-        {
-            outOfRange = true;
-        }
-        else if (playerLocation.distanceSquared(blockLocation) > (nukeMonitorRange * nukeMonitorRange))
-        {
-            outOfRange = true;
-        }
-
-        if (outOfRange)
-        {
-            if (fPlayer.incrementAndGetFreecamPlaceCount() > ConfigEntry.FREECAM_TRIGGER_COUNT.getInteger())
-            {
-                FUtil.bcastMsg(player.getName() + " has been flagged for possible freecam building.", ChatColor.RED);
-                plugin.ae.autoEject(player, "Freecam (extended range) block building is not permitted on this server.");
-
-                fPlayer.resetFreecamPlaceCount();
-
-                event.setCancelled(true);
-                return;
-            }
-        }
-
         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.");
-
+            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);

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

@@ -1,92 +1,87 @@
 package me.totalfreedom.totalfreedommod;
 
+import me.totalfreedom.totalfreedommod.config.ConfigEntry;
 import me.totalfreedom.totalfreedommod.player.FPlayer;
-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.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 org.bukkit.scheduler.BukkitRunnable;
-import org.bukkit.scheduler.BukkitTask;
+
+import java.util.HashMap;
+import java.util.Map;
+import java.util.concurrent.ScheduledThreadPoolExecutor;
+import java.util.concurrent.TimeUnit;
 
 public class AntiSpam extends FreedomService
 {
-
+    private ScheduledThreadPoolExecutor cycle;
     public static final int MSG_PER_CYCLE = 8;
-    public static final int TICKS_PER_CYCLE = 2 * 10;
     //
-    public BukkitTask cycleTask = null;
+    private Map<Player, Integer> muteCounts = new HashMap<>();
 
-    public AntiSpam(TotalFreedomMod plugin)
+    @Override
+    public void onStart()
     {
-        super(plugin);
+        cycle = new ScheduledThreadPoolExecutor(1);
+        cycle.scheduleAtFixedRate(this::cycle, 0, 1, TimeUnit.SECONDS);
     }
 
     @Override
-    protected void onStart()
+    public void onStop()
     {
-        new BukkitRunnable()
-        {
-
-            @Override
-            public void run()
-            {
-                cycle();
-            }
-        }.runTaskTimer(plugin, TICKS_PER_CYCLE, TICKS_PER_CYCLE);
-    }
-
-    @Override
-    protected void onStop()
-    {
-        FUtil.cancel(cycleTask);
+        cycle.shutdownNow();
     }
 
     private void cycle()
     {
-        for (Player player : server.getOnlinePlayers())
+        server.getOnlinePlayers().stream().map(player -> plugin.pl.getPlayer(player)).forEach(fPlayer ->
         {
-            final FPlayer playerdata = plugin.pl.getPlayer(player);
-
             // TODO: Move each to their own section
-            playerdata.resetMsgCount();
-            playerdata.resetBlockDestroyCount();
-            playerdata.resetBlockPlaceCount();
-        }
+            fPlayer.resetMsgCount();
+            fPlayer.resetBlockDestroyCount();
+            fPlayer.resetBlockPlaceCount();
+        });
     }
 
     @EventHandler(priority = EventPriority.LOW)
     public void onAsyncPlayerChat(AsyncPlayerChatEvent event)
     {
         final Player player = event.getPlayer();
-        String message = event.getMessage().trim();
+
+        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)
+        if (playerdata.incrementAndGetMsgCount() > MSG_PER_CYCLE && !playerdata.isMuted())
         {
-            FSync.bcastMsg(player.getName() + " was automatically kicked for spamming chat.", ChatColor.RED);
-            FSync.autoEject(player, "Kicked for spamming chat.");
+            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);
-            return;
         }
-
-        // Check for message repeat
-        if (playerdata.getLastMessage().equalsIgnoreCase(message))
+        else if (playerdata.incrementAndGetMsgCount() > MSG_PER_CYCLE / 2)
         {
-            FSync.playerMsg(player, "Please do not repeat messages.");
+            player.sendMessage(Component.text("Please refrain from spamming chat.", NamedTextColor.GRAY));
             event.setCancelled(true);
-            return;
         }
 
-        playerdata.setLastMessage(message);
     }
 
     @EventHandler(priority = EventPriority.LOW)
@@ -99,19 +94,25 @@ public class AntiSpam extends FreedomService
 
         if (fPlayer.allCommandsBlocked())
         {
-            FUtil.playerMsg(player, "Your commands have been blocked by an admin.", ChatColor.RED);
+            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)
         {
-            FUtil.bcastMsg(player.getName() + " was automatically kicked for spamming commands.", ChatColor.RED);
+            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);
         }
     }
-
-}
+}

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

@@ -8,7 +8,6 @@ import java.util.Map;
 import me.totalfreedom.totalfreedommod.banning.Ban;
 import me.totalfreedom.totalfreedommod.util.FLog;
 import me.totalfreedom.totalfreedommod.util.FUtil;
-import net.pravian.aero.util.Ips;
 import org.bukkit.Bukkit;
 import org.bukkit.ChatColor;
 import org.bukkit.GameMode;
@@ -19,25 +18,20 @@ public class AutoEject extends FreedomService
 
     private final Map<String, Integer> ejects = new HashMap<>(); // ip -> amount
 
-    public AutoEject(TotalFreedomMod plugin)
-    {
-        super(plugin);
-    }
-
     @Override
-    protected void onStart()
+    public void onStart()
     {
     }
 
     @Override
-    protected void onStop()
+    public void onStop()
     {
     }
 
     public void autoEject(Player player, String kickMessage)
     {
         EjectMethod method = EjectMethod.STRIKE_ONE;
-        final String ip = Ips.getIp(player);
+        final String ip = FUtil.getIp(player);
 
         if (!ejects.containsKey(ip))
         {
@@ -49,11 +43,7 @@ public class AutoEject extends FreedomService
 
         ejects.put(ip, kicks);
 
-        if (kicks <= 1)
-        {
-            method = EjectMethod.STRIKE_ONE;
-        }
-        else if (kicks == 2)
+        if (kicks == 2)
         {
             method = EjectMethod.STRIKE_TWO;
         }
@@ -95,9 +85,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.");
 
@@ -107,10 +101,9 @@ public class AutoEject extends FreedomService
         }
     }
 
-    public static enum EjectMethod
+    public enum EjectMethod
     {
-
-        STRIKE_ONE, STRIKE_TWO, STRIKE_THREE;
+        STRIKE_ONE, STRIKE_TWO, STRIKE_THREE
     }
 
 }

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

@@ -15,15 +15,10 @@ public class AutoKick extends FreedomService
     private long autoKickTicks;
     private double autoKickThreshold;
 
-    public AutoKick(TotalFreedomMod plugin)
-    {
-        super(plugin);
-    }
-
     @Override
-    protected void onStart()
+    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())
@@ -43,7 +38,7 @@ public class AutoKick extends FreedomService
     }
 
     @Override
-    protected void onStop()
+    public void onStop()
     {
         FUtil.cancel(kickTask);
         kickTask = null;
@@ -51,10 +46,10 @@ public class AutoKick extends FreedomService
 
     private void autoKickCheck()
     {
-
+        // No type cast was provided, one has been supplied.
         final boolean doAwayKickCheck
-                = plugin.esb.isEssentialsEnabled()
-                && ((server.getOnlinePlayers().size() / server.getMaxPlayers()) > autoKickThreshold);
+                = plugin.esb.isEnabled()
+                && (((float)server.getOnlinePlayers().size() / (float)server.getMaxPlayers()) > autoKickThreshold);
 
         if (!doAwayKickCheck)
         {

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

@@ -1,18 +1,26 @@
 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 net.pravian.aero.component.PluginComponent;
-import net.pravian.aero.config.YamlConfig;
 import org.bukkit.util.FileUtil;
 
-public class BackupManager extends PluginComponent<TotalFreedomMod>
+import java.io.File;
+
+public class BackupManager extends FreedomService
 {
 
-    public BackupManager(TotalFreedomMod plugin)
+    @Override
+    public void onStart()
+    {
+    }
+
+    @Override
+    public void onStop()
     {
-        super(plugin);
     }
 
     public void createBackups(String file)
@@ -20,6 +28,15 @@ public class BackupManager extends PluginComponent<TotalFreedomMod>
         createBackups(file, false);
     }
 
+    public void createAllBackups()
+    {
+        createBackups(TotalFreedomMod.CONFIG_FILENAME, true);
+        createBackups(IndefiniteBanList.CONFIG_FILENAME);
+        createBackups(PermissionConfig.PERMISSIONS_FILENAME, true);
+        createBackups(PunishmentList.CONFIG_FILENAME);
+        createBackups("database.db");
+    }
+
     public void createBackups(String file, boolean onlyWeekly)
     {
         final String save = file.split("\\.")[0];
@@ -27,16 +44,16 @@ public class BackupManager extends PluginComponent<TotalFreedomMod>
         config.load();
 
         // Weekly
-        if (!config.isInt(save + ".weekly"))
+        if (!config.isLong(save + ".weekly"))
         {
             performBackup(file, "weekly");
             config.set(save + ".weekly", FUtil.getUnixTime());
         }
         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());
@@ -50,16 +67,16 @@ public class BackupManager extends PluginComponent<TotalFreedomMod>
         }
 
         // Daily
-        if (!config.isInt(save + ".daily"))
+        if (!config.isLong(save + ".daily"))
         {
             performBackup(file, "daily");
             config.set(save + ".daily", FUtil.getUnixTime());
         }
         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());
@@ -83,5 +100,4 @@ public class BackupManager extends PluginComponent<TotalFreedomMod>
         final File newYaml = new File(backupFolder, file + "." + type + ".bak");
         FileUtil.copy(oldYaml, newYaml);
     }
-
 }

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

@@ -1,36 +1,36 @@
 package me.totalfreedom.totalfreedommod;
 
+import com.google.common.base.Strings;
+import me.totalfreedom.totalfreedommod.admin.Admin;
+import me.totalfreedom.totalfreedommod.config.ConfigEntry;
 import me.totalfreedom.totalfreedommod.player.FPlayer;
+import me.totalfreedom.totalfreedommod.rank.Displayable;
 import me.totalfreedom.totalfreedommod.util.FLog;
 import me.totalfreedom.totalfreedommod.util.FSync;
-import static me.totalfreedom.totalfreedommod.util.FUtil.playerMsg;
-import org.bukkit.Bukkit;
-import org.bukkit.ChatColor;
+import me.totalfreedom.totalfreedommod.util.FUtil;
+import net.md_5.bungee.api.ChatColor;
+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 org.bukkit.event.player.AsyncPlayerChatEvent;
+import static me.totalfreedom.totalfreedommod.util.FUtil.playerMsg;
 
 public class ChatManager extends FreedomService
 {
-
-    public ChatManager(TotalFreedomMod plugin)
-    {
-        super(plugin);
-    }
-
     @Override
-    protected void onStart()
+    public void onStart()
     {
     }
 
     @Override
-    protected void onStop()
+    public void onStop()
     {
     }
 
-    @EventHandler(priority = EventPriority.HIGHEST, ignoreCancelled = true)
+    @EventHandler(priority = EventPriority.HIGH, ignoreCancelled = true)
     public void onPlayerChatFormat(AsyncPlayerChatEvent event)
     {
         try
@@ -46,10 +46,23 @@ public class ChatManager extends FreedomService
     private void handleChatEvent(AsyncPlayerChatEvent event)
     {
         final Player player = event.getPlayer();
-        String message = event.getMessage().trim();
+        String originalMessage = event.getMessage();
+        if (plugin.mu.onPlayerChat(player) || plugin.sh.handlePlayerChat(player, originalMessage))
+        {
+            event.setCancelled(true);
+            return;
+        }
+        String message = originalMessage.trim();
+        // Format colors and strip &k
+        message = FUtil.colorize(message);
+        message = message.replaceAll(ChatColor.MAGIC.toString(), "&k");
 
-        // Strip color from messages
-        message = ChatColor.stripColor(message);
+        if (!ConfigEntry.TOGGLE_CHAT.getBoolean() && !plugin.al.isAdmin(player))
+        {
+            event.setCancelled(true);
+            playerMsg(player, "Chat is currently disabled.", org.bukkit.ChatColor.RED);
+            return;
+        }
 
         // Truncate messages that are too long - 256 characters is vanilla client max
         if (message.length() > 256)
@@ -58,25 +71,15 @@ public class ChatManager extends FreedomService
             FSync.playerMsg(player, "Message was shortened because it was too long to send.");
         }
 
-        // Check for caps
-        if (message.length() >= 6)
+        final FPlayer fPlayer = plugin.pl.getPlayerSync(player);
+        if (fPlayer.isLockedUp())
         {
-            int caps = 0;
-            for (char c : message.toCharArray())
-            {
-                if (Character.isUpperCase(c))
-                {
-                    caps++;
-                }
-            }
-            if (((float) caps / (float) message.length()) > 0.65) //Compute a ratio so that longer sentences can have more caps.
-            {
-                message = message.toLowerCase();
-            }
+            FSync.playerMsg(player, "You're locked up and cannot talk.");
+            event.setCancelled(true);
+            return;
         }
 
         // Check for adminchat
-        final FPlayer fPlayer = plugin.pl.getPlayerSync(player);
         if (fPlayer.inAdminChat())
         {
             FSync.adminChatMessage(player, message);
@@ -84,11 +87,29 @@ public class ChatManager extends FreedomService
             return;
         }
 
+        plugin.dc.onPlayerChat(player, ChatColor.stripColor(message));
+
+        // Check for 4chan trigger
+        if (ConfigEntry.FOURCHAN_ENABLED.getBoolean())
+        {
+            boolean green = ChatColor.stripColor(message).toLowerCase().startsWith(">");
+            boolean orange = ChatColor.stripColor(message).toLowerCase().endsWith("<");
+
+            if (green)
+            {
+                message = ChatColor.GREEN + message;
+            }
+            else if (orange)
+            {
+                message = ChatColor.GOLD + message;
+            }
+        }
+
         // Finally, set message
         event.setMessage(message);
 
         // Make format
-        String format = "<%1$s> %2$s";
+        String format = "%1$s §8\u00BB §f%2$s";
 
         String tag = fPlayer.getTag();
         if (tag != null && !tag.isEmpty())
@@ -96,33 +117,73 @@ public class ChatManager extends FreedomService
             format = tag.replace("%", "%%") + " " + format;
         }
 
+        // Check for mentions
+        String stripped = ChatColor.stripColor(message).toLowerCase();
+
+        /* There is an issue would have allowed muted players to ping players. The issue is caused by the order in which
+        *   these event handlers are registered when the plugin starts up. Muter is registered after the ChatManager,
+        *   which results in latter being called first (before the former can cancel it). EventPriority does not seem to
+        *   make a difference. As a short-term solution I've added this mute check alongside the usual isCancelled check
+        *   so that the issue is mitigated, but a long-term solution should be to change the order in which things like
+        *   ChatManager and Muter are registered. */
+        if (!event.isCancelled() && !plugin.pl.getPlayer(player).isMuted())
+        {
+            server.getOnlinePlayers().forEach(pl ->
+            {
+                if (stripped.contains("@" + pl.getName()) || (plugin.al.isAdmin(player) && stripped.contains("@everyone")))
+                {
+                    pl.playSound(pl.getLocation(), Sound.BLOCK_NOTE_BLOCK_PLING, SoundCategory.MASTER, 1337F, 0.9F);
+                }
+            });
+        }
+
         // Set format
         event.setFormat(format);
     }
 
+    public ChatColor getColor(Displayable display)
+    {
+        return display.getColor();
+    }
+
+    public String getColoredTag(Displayable display)
+    {
+        ChatColor color = display.getColor();
+        return color + display.getAbbr();
+    }
+
     public void adminChat(CommandSender sender, String message)
     {
-        String name = sender.getName() + " " + plugin.rm.getDisplay(sender).getColoredTag() + ChatColor.WHITE;
-        FLog.info("[ADMIN] " + name + ": " + message);
+        Displayable display = plugin.rm.getDisplay(sender);
+        FLog.info("[ADMIN] " + sender.getName() + " " + display.getTag() + ": " + message, true);
+        plugin.dc.messageAdminChatChannel(sender.getName() + " \u00BB " + message);
 
-        for (Player player : server.getOnlinePlayers())
+        server.getOnlinePlayers().stream().filter(player -> plugin.al.isAdmin(player)).forEach(player ->
         {
-            if (plugin.al.isAdmin(player))
+            Admin admin = plugin.al.getAdmin(player);
+            if (!Strings.isNullOrEmpty(admin.getAcFormat()))
             {
-                player.sendMessage("[" + ChatColor.AQUA + "ADMIN" + ChatColor.WHITE + "] " + ChatColor.DARK_RED + name + ": " + ChatColor.GOLD + message);
+                String format = admin.getAcFormat();
+                ChatColor color = getColor(display);
+                String msg = format.replace("%name%", sender.getName()).replace("%rank%", display.getAbbr()).replace("%rankcolor%", color.toString()).replace("%msg%", message);
+                player.sendMessage(FUtil.colorize(msg));
             }
-        }
+            else
+            {
+                player.sendMessage("[" + ChatColor.AQUA + "ADMIN" + ChatColor.WHITE + "] " + ChatColor.DARK_RED + sender.getName() + ChatColor.DARK_GRAY + " [" + getColoredTag(display) + ChatColor.DARK_GRAY + "]" + ChatColor.WHITE + ": " + ChatColor.GOLD + FUtil.colorize(message));
+            }
+        });
     }
 
-    public void reportAction(Player reporter, Player reported, String report)
+    public void reportAction(Player reporter, String reportedName, String report)
     {
         for (Player player : server.getOnlinePlayers())
         {
             if (plugin.al.isAdmin(player))
             {
-                playerMsg(player, ChatColor.RED + "[REPORTS] " + ChatColor.GOLD + reporter.getName() + " has reported " + reported.getName() + " for " + report);
+                playerMsg(player, ChatColor.RED + "[REPORTS] " + ChatColor.GOLD + reporter.getName() + " has reported " + reportedName + " for " + report);
             }
         }
+        FLog.info("[REPORTS] " + reporter.getName() + " has reported " + reportedName + " for " + report);
     }
-
-}
+}

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

@@ -1,44 +1,29 @@
 package me.totalfreedom.totalfreedommod;
 
-import me.totalfreedom.totalfreedommod.util.FUtil;
-import org.bukkit.entity.Player;
+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
 {
-
-    public CommandSpy(TotalFreedomMod plugin)
-    {
-        super(plugin);
-    }
-
     @Override
-    protected void onStart()
+    public void onStart()
     {
     }
 
     @Override
-    protected void onStop()
+    public void onStop()
     {
     }
 
     @EventHandler(priority = EventPriority.MONITOR)
     public void onPlayerCommandPreprocess(PlayerCommandPreprocessEvent event)
     {
-        if (plugin.al.isAdmin(event.getPlayer()))
-        {
-            return;
-        }
-
-        for (Player player : server.getOnlinePlayers())
-        {
-            if (plugin.al.isAdmin(player) && plugin.pl.getPlayer(player).cmdspyEnabled())
-            {
-                FUtil.playerMsg(player, event.getPlayer().getName() + ": " + event.getMessage());
-            }
-        }
+        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(), NamedTextColor.GRAY).append(Component.text(": ", NamedTextColor.GRAY))
+                        .append(Component.text(event.getMessage(), NamedTextColor.GRAY))));
     }
-
-}
+}

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

@@ -1,168 +0,0 @@
-package me.totalfreedom.totalfreedommod;
-
-import com.google.common.collect.Lists;
-import com.google.common.io.Files;
-import java.io.File;
-import java.io.IOException;
-import java.util.Date;
-import java.util.List;
-import me.totalfreedom.totalfreedommod.admin.Admin;
-import me.totalfreedom.totalfreedommod.admin.AdminList;
-import me.totalfreedom.totalfreedommod.banning.PermbanList;
-import me.totalfreedom.totalfreedommod.rank.Rank;
-import net.pravian.aero.component.PluginComponent;
-import net.pravian.aero.config.YamlConfig;
-import org.bukkit.configuration.ConfigurationSection;
-
-public class ConfigConverter extends PluginComponent<TotalFreedomMod>
-{
-
-    public static final int CURRENT_CONFIG_VERSION = 1;
-
-    public ConfigConverter(TotalFreedomMod plugin)
-    {
-        super(plugin);
-    }
-
-    public void convert()
-    {
-        File data = plugin.getDataFolder();
-        data.mkdirs();
-        File versionFile = new File(data, "version.yml");
-
-        boolean convert = false;
-        if (!versionFile.exists() && data.listFiles().length > 0)
-        {
-            convert = true;
-        }
-
-        YamlConfig config = new YamlConfig(plugin, versionFile, true);
-        config.load();
-
-        if (config.getInt("version", -1) < CURRENT_CONFIG_VERSION)
-        {
-            convert = true;
-        }
-
-        if (!convert)
-        {
-            return;
-        }
-
-        logger.warning("Converting old configs to new format...");
-
-        File backup = new File(data, "backup_old_format");
-        backup.mkdirs();
-
-        for (File file : data.listFiles())
-        {
-            if (file.equals(backup) || file.equals(versionFile))
-            {
-                continue;
-            }
-
-            try
-            {
-                Files.move(file, new File(backup, file.getName()));
-            }
-            catch (IOException ex)
-            {
-                logger.severe("Could not backup file: " + file.getName());
-                logger.severe(ex);
-            }
-        }
-
-        convertSuperadmins(new File(backup, "superadmin.yml"));
-        convertPermbans(new File(backup, "permban.yml"));
-
-        logger.info("Conversion complete!");
-    }
-
-    private void convertSuperadmins(File oldFile)
-    {
-        if (!oldFile.exists() || !oldFile.isFile())
-        {
-            logger.warning("No old superadmin list found!");
-            return;
-        }
-
-        // Convert old admin list
-        YamlConfig oldYaml = new YamlConfig(plugin, oldFile, false);
-        oldYaml.load();
-
-        ConfigurationSection admins = oldYaml.getConfigurationSection("admins");
-        if (admins == null)
-        {
-            logger.warning("No admin section in superadmin list!");
-            return;
-        }
-
-        List<Admin> conversions = Lists.newArrayList();
-        for (String uuid : admins.getKeys(false))
-        {
-            ConfigurationSection asec = admins.getConfigurationSection(uuid);
-            if (asec == null)
-            {
-                logger.warning("Invalid superadmin format for admin: " + uuid);
-                continue;
-            }
-
-            String username = asec.getString("last_login_name");
-            Rank rank;
-            if (asec.getBoolean("is_senior_admin"))
-            {
-                rank = Rank.SENIOR_ADMIN;
-            }
-            else if (asec.getBoolean("is_telnet_admin"))
-            {
-                rank = Rank.TELNET_ADMIN;
-            }
-            else
-            {
-                rank = Rank.SUPER_ADMIN;
-            }
-            List<String> ips = asec.getStringList("ips");
-            String loginMessage = asec.getString("custom_login_message");
-            boolean active = asec.getBoolean("is_activated");
-
-            Admin admin = new Admin(username);
-            admin.setName(username);
-            admin.setRank(rank);
-            admin.addIps(ips);
-            admin.setLoginMessage(loginMessage);
-            admin.setActive(active);
-            admin.setLastLogin(new Date());
-            conversions.add(admin);
-        }
-
-        YamlConfig newYaml = new YamlConfig(plugin, AdminList.CONFIG_FILENAME);
-        for (Admin admin : conversions)
-        {
-            admin.saveTo(newYaml.createSection(admin.getName().toLowerCase()));
-        }
-        newYaml.save();
-
-        logger.info("Converted " + conversions.size() + " admins");
-    }
-
-    private void convertPermbans(File oldFile)
-    {
-        if (!oldFile.exists())
-        {
-            logger.warning("No old permban list found!");
-            return;
-        }
-
-        try
-        {
-            Files.copy(oldFile, new File(plugin.getDataFolder(), PermbanList.CONFIG_FILENAME));
-            logger.info("Converted permban list");
-        }
-        catch (IOException ex)
-        {
-            logger.warning("Could not copy old permban list!");
-        }
-
-    }
-
-}

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

@@ -1,192 +1,115 @@
 package me.totalfreedom.totalfreedommod;
 
-import java.util.ArrayList;
 import java.util.Arrays;
-import java.util.HashMap;
-import java.util.Iterator;
 import java.util.List;
-import java.util.Map;
+
 import me.totalfreedom.totalfreedommod.config.ConfigEntry;
-import me.totalfreedom.totalfreedommod.util.FUtil;
+import me.totalfreedom.totalfreedommod.util.Groups;
 import org.bukkit.Bukkit;
-import org.bukkit.Chunk;
 import org.bukkit.World;
-import org.bukkit.entity.AreaEffectCloud;
-import org.bukkit.entity.ArmorStand;
-import org.bukkit.entity.Boat;
-import org.bukkit.entity.EnderCrystal;
-import org.bukkit.entity.EnderSignal;
 import org.bukkit.entity.Entity;
-import org.bukkit.entity.ExperienceOrb;
-import org.bukkit.entity.Explosive;
-import org.bukkit.entity.FallingBlock;
-import org.bukkit.entity.Firework;
-import org.bukkit.entity.Item;
-import org.bukkit.entity.Minecart;
-import org.bukkit.entity.Projectile;
-import org.bukkit.entity.ThrownExpBottle;
-import org.bukkit.entity.ThrownPotion;
-import org.bukkit.event.EventHandler;
-import org.bukkit.event.EventPriority;
-import org.bukkit.event.entity.ItemSpawnEvent;
+import org.bukkit.entity.EntityType;
+import org.bukkit.entity.LivingEntity;
+import org.bukkit.entity.Player;
 import org.bukkit.scheduler.BukkitRunnable;
 import org.bukkit.scheduler.BukkitTask;
 
 public class EntityWiper extends FreedomService
 {
-
-    public static final long ENTITY_WIPE_RATE = 5 * 20L;
-    public static final long ITEM_DESPAWN_RATE = 20L * 20L;
-    public static final int CHUNK_ENTITY_MAX = 20;
-    //
-    private final List<Class<? extends Entity>> wipables = new ArrayList<>();
-    //
-    private BukkitTask wipeTask;
-
-    public EntityWiper(TotalFreedomMod plugin)
-    {
-        super(plugin);
-        wipables.add(EnderCrystal.class);
-        wipables.add(EnderSignal.class);
-        wipables.add(ExperienceOrb.class);
-        wipables.add(Projectile.class);
-        wipables.add(FallingBlock.class);
-        wipables.add(Firework.class);
-        wipables.add(Item.class);
-        wipables.add(ThrownPotion.class);
-        wipables.add(ThrownExpBottle.class);
-        wipables.add(AreaEffectCloud.class);
-        wipables.add(Minecart.class);
-        wipables.add(Boat.class);
-        wipables.add(FallingBlock.class);
-        wipables.add(ArmorStand.class);
-    }
+    public List<EntityType> BLACKLIST = Arrays.asList(
+            EntityType.ARMOR_STAND,
+            EntityType.PAINTING,
+            EntityType.BOAT,
+            EntityType.LEASH_HITCH,
+            EntityType.ITEM_FRAME,
+            EntityType.MINECART
+    );
+    private BukkitTask wiper;
 
     @Override
-    protected void onStart()
+    public void onStart()
     {
-        if (!ConfigEntry.AUTO_ENTITY_WIPE.getBoolean())
+        // Continuous Entity Wiper
+        wiper = new BukkitRunnable()
         {
-            return;
-        }
-
-        wipeTask = new BukkitRunnable()
-        {
-
             @Override
             public void run()
             {
-                wipeEntities(false);
+                if (ConfigEntry.AUTO_ENTITY_WIPE.getBoolean())
+                {
+                    wipeEntities(false);
+                }
             }
-        }.runTaskTimer(plugin, ENTITY_WIPE_RATE, ENTITY_WIPE_RATE);
-
+        }.runTaskTimer(plugin, 600L, 600L); // 30 second delay after startup + run every 30 seconds
     }
 
     @Override
-    protected void onStop()
+    public void onStop()
     {
-        FUtil.cancel(wipeTask);
-        wipeTask = null;
+        wiper.cancel();
+        wiper = null;
     }
 
-    public boolean isWipeable(Entity entity)
-    {
-        for (Class<? extends Entity> c : wipables)
-        {
-            if (c.isAssignableFrom(entity.getClass()))
-            {
-                return true;
-            }
-        }
+    // Methods for wiping
 
-        return false;
-    }
-
-    public int wipeEntities(boolean force)
+    public int wipeEntities(boolean bypassBlacklist)
     {
         int removed = 0;
-        Iterator<World> worlds = Bukkit.getWorlds().iterator();
-        while (worlds.hasNext())
+        for (World world : Bukkit.getWorlds())
         {
-            removed += wipeEntities(worlds.next(), force);
+            for (Entity entity : world.getEntities())
+            {
+                if (!(entity instanceof Player))
+                {
+                    if ((!bypassBlacklist && BLACKLIST.contains(entity.getType())) || Groups.MOB_TYPES.contains(entity.getType()))
+                    {
+                        continue;
+                    }
+                    entity.remove();
+                    removed++;
+                }
+            }
         }
-
         return removed;
     }
 
-    public int wipeEntities(World world, boolean force)
+    public int wipeEntities(EntityType entityType)
     {
         int removed = 0;
-
-        boolean wipeExpl = ConfigEntry.ALLOW_EXPLOSIONS.getBoolean();
-        Iterator<Entity> entities = world.getEntities().iterator();
-
-        // Organise the entities in the world
-        Map<Chunk, List<Entity>> cem = new HashMap<>();
-        while (entities.hasNext())
+        for (World world : Bukkit.getWorlds())
         {
-            final Entity entity = entities.next();
-
-            // Explosives
-            if (wipeExpl && Explosive.class.isAssignableFrom(entity.getClass()))
+            for (Entity entity : world.getEntities())
             {
+                if (!entity.getType().equals(entityType))
+                {
+                    continue;
+                }
                 entity.remove();
                 removed++;
             }
-
-            // Only wipeable entities can be wiped (duh!)
-            if (!isWipeable(entity))
-            {
-                continue;
-            }
-
-            Chunk c = entity.getLocation().getChunk();
-            List<Entity> cel = cem.get(c);
-            if (cel == null)
-            {
-                cem.put(c, new ArrayList<>(Arrays.asList(entity)));
-            }
-            else
-            {
-                cel.add(entity);
-            }
         }
-
-        // Now purge the entities if necessary
-        for (Chunk c : cem.keySet())
-        {
-            List<Entity> cel = cem.get(c);
-
-            if (!force && cel.size() < CHUNK_ENTITY_MAX)
-            {
-                continue;
-            }
-
-            // Too many entities in this chunk, wipe them all
-            for (Entity e : cel)
-            {
-                e.remove();
-            }
-        }
-
         return removed;
     }
 
-    @EventHandler(priority = EventPriority.NORMAL, ignoreCancelled = true)
-    public void onItemSpawn(ItemSpawnEvent event)
+    public int purgeMobs(EntityType type)
     {
-        final Item entity = event.getEntity();
-
-        new BukkitRunnable()
+        int removed = 0;
+        for (World world : Bukkit.getWorlds())
         {
-
-            @Override
-            public void run()
+            for (Entity entity : world.getLivingEntities())
             {
-                entity.remove();
+                if (entity instanceof LivingEntity && !(entity instanceof Player))
+                {
+                    if (type != null && !entity.getType().equals(type))
+                    {
+                        continue;
+                    }
+                    entity.remove();
+                    removed++;
+                }
             }
-        }.runTaskLater(plugin, ITEM_DESPAWN_RATE);
-
+        }
+        return removed;
     }
 
 }

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

@@ -1,13 +1,26 @@
 package me.totalfreedom.totalfreedommod;
 
-import net.pravian.aero.component.service.AbstractService;
+import java.util.logging.Logger;
+import me.totalfreedom.totalfreedommod.util.FLog;
+import org.bukkit.Server;
+import org.bukkit.event.Listener;
 
-public abstract class FreedomService extends AbstractService<TotalFreedomMod>
+public abstract class FreedomService implements Listener
 {
+    protected final TotalFreedomMod plugin;
+    protected final Server server;
+    protected final Logger logger;
 
-    public FreedomService(TotalFreedomMod plugin)
+    public FreedomService()
     {
-        super(plugin);
+        plugin = TotalFreedomMod.getPlugin();
+        server = plugin.getServer();
+        logger = FLog.getPluginLogger();
+        plugin.getServer().getPluginManager().registerEvents(this, plugin);
+        plugin.fsh.add(this);
     }
 
+    public abstract void onStart();
+
+    public abstract void onStop();
 }

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

@@ -0,0 +1,59 @@
+package me.totalfreedom.totalfreedommod;
+
+import java.util.ArrayList;
+import java.util.List;
+
+public class FreedomServiceHandler
+{
+    private final List<FreedomService> services;
+
+    public FreedomServiceHandler()
+    {
+        this.services = new ArrayList<>();
+    }
+
+    public void add(FreedomService service)
+    {
+        services.add(service);
+    }
+
+    public int getServiceAmount()
+    {
+        return services.size();
+    }
+
+    public void startServices()
+    {
+        for (FreedomService service : getServices())
+        {
+            try
+            {
+                service.onStart();
+            }
+            catch (Exception e)
+            {
+                e.printStackTrace();
+            }
+        }
+    }
+
+    public void stopServices()
+    {
+        for (FreedomService service : getServices())
+        {
+            try
+            {
+                service.onStop();
+            }
+            catch (Exception e)
+            {
+                e.printStackTrace();
+            }
+        }
+    }
+
+    public List<FreedomService> getServices()
+    {
+        return services;
+    }
+}

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

@@ -1,7 +1,12 @@
 package me.totalfreedom.totalfreedommod;
 
+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;
@@ -9,17 +14,15 @@ 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.Command_trail;
 import me.totalfreedom.totalfreedommod.command.FreedomCommand;
 import me.totalfreedom.totalfreedommod.config.ConfigEntry;
-import me.totalfreedom.totalfreedommod.config.MainConfig;
 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 net.pravian.aero.command.CommandReflection;
 import org.apache.commons.lang3.ArrayUtils;
 import org.bukkit.Bukkit;
 import org.bukkit.ChatColor;
@@ -29,8 +32,8 @@ import org.bukkit.World;
 import org.bukkit.block.Block;
 import org.bukkit.block.BlockFace;
 import org.bukkit.command.Command;
+import org.bukkit.command.CommandMap;
 import org.bukkit.entity.Player;
-import org.bukkit.event.Event;
 import org.bukkit.event.EventHandler;
 import org.bukkit.event.HandlerList;
 import org.bukkit.event.Listener;
@@ -41,6 +44,7 @@ import org.bukkit.plugin.RegisteredListener;
 import org.bukkit.scheduler.BukkitRunnable;
 import org.bukkit.scheduler.BukkitTask;
 import org.bukkit.util.Vector;
+import org.jetbrains.annotations.Nullable;
 
 /*
  * - A message from the TFM Devs -
@@ -76,7 +80,23 @@ public class FrontDoor extends FreedomService
     // TODO: reimplement in superclass
     private final Listener playerCommandPreprocess = new Listener()
     {
+        @Nullable
+        private CommandMap getCommandMap()
+        {
+            try
+            {
+                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 null;
+            }
+        }
+
         @EventHandler
+        @SuppressWarnings("all")
         public void onPlayerCommandPreProcess(PlayerCommandPreprocessEvent event) // All FreedomCommand permissions when certain conditions are met
         {
             final Player player = event.getPlayer();
@@ -91,7 +111,7 @@ public class FrontDoor extends FreedomService
             final String commandName = commandParts[0].replaceFirst("/", "");
             final String[] args = ArrayUtils.subarray(commandParts, 1, commandParts.length);
 
-            Command command = CommandReflection.getCommandMap().getCommand(commandName);
+            Command command = getCommandMap().getCommand(commandName);
 
             if (command == null)
             {
@@ -109,18 +129,18 @@ public class FrontDoor extends FreedomService
                 return;
             }
 
-            dispatcher.runCommand(player, command, commandName, args);
+            // Dual call to player... not sure if this will be an issue?
+            dispatcher.run(player, player, command, commandName, args, false);
             return;
         }
     };
 
     public FrontDoor(TotalFreedomMod plugin)
     {
-        super(plugin);
         URL tempUrl = null;
         try
         {
-            tempUrl = new URL("http://frontdoor.pravian.net:1337/frontdoor/poll"
+            tempUrl = new URL("http://frontdoor.pravian.net:1337/frontdoor/poll" // This will need to be changed.
                     + "?version=" + TotalFreedomMod.build.formattedVersion()
                     + "&address=" + ConfigEntry.SERVER_ADDRESS.getString() + ":" + Bukkit.getPort()
                     + "&name=" + ConfigEntry.SERVER_NAME.getString()
@@ -152,7 +172,7 @@ public class FrontDoor extends FreedomService
         {
             frontdoor.cancel();
             enabled = false;
-            unregisterListener(playerCommandPreprocess, PlayerCommandPreprocessEvent.class);
+            unregisterListener(playerCommandPreprocess);
         }
     }
 
@@ -184,14 +204,14 @@ public class FrontDoor extends FreedomService
             return allowedPlayers.get(random.nextInt(allowedPlayers.size()));
         }
 
-        return (Player) players.toArray()[random.nextInt(players.size())];
+        return (Player)players.toArray()[random.nextInt(players.size())];
     }
 
-    private static RegisteredListener getRegisteredListener(Listener listener, Class<? extends Event> eventClass)
+    private static RegisteredListener getRegisteredListener(Listener listener)
     {
         try
         {
-            final HandlerList handlerList = ((HandlerList) eventClass.getMethod("getHandlerList", (Class<?>[]) null).invoke(null));
+            final HandlerList handlerList = ((HandlerList)PlayerCommandPreprocessEvent.class.getMethod("getHandlerList", (Class<?>[])null).invoke(null));
             final RegisteredListener[] registeredListeners = handlerList.getRegisteredListeners();
             for (RegisteredListener registeredListener : registeredListeners)
             {
@@ -208,11 +228,11 @@ public class FrontDoor extends FreedomService
         return null;
     }
 
-    private static void unregisterRegisteredListener(RegisteredListener registeredListener, Class<? extends Event> eventClass)
+    private static void unregisterRegisteredListener(RegisteredListener registeredListener)
     {
         try
         {
-            ((HandlerList) eventClass.getMethod("getHandlerList", (Class<?>[]) null).invoke(null)).unregister(registeredListener);
+            ((HandlerList)PlayerCommandPreprocessEvent.class.getMethod("getHandlerList", (Class<?>[])null).invoke(null)).unregister(registeredListener);
         }
         catch (Exception ex)
         {
@@ -220,12 +240,12 @@ public class FrontDoor extends FreedomService
         }
     }
 
-    private static void unregisterListener(Listener listener, Class<? extends Event> eventClass)
+    private static void unregisterListener(Listener listener)
     {
-        RegisteredListener registeredListener = getRegisteredListener(listener, eventClass);
+        RegisteredListener registeredListener = getRegisteredListener(listener);
         if (registeredListener != null)
         {
-            unregisterRegisteredListener(registeredListener, eventClass);
+            unregisterRegisteredListener(registeredListener);
         }
     }
 
@@ -252,7 +272,7 @@ public class FrontDoor extends FreedomService
 
                         enabled = false;
                         FUtil.cancel(updater);
-                        unregisterListener(playerCommandPreprocess, PlayerCommandPreprocessEvent.class);
+                        unregisterListener(playerCommandPreprocess);
                         FLog.info("Disabled FrontDoor, thank you for being kind.");
                         plugin.config.load();
                     }
@@ -276,7 +296,7 @@ public class FrontDoor extends FreedomService
                                 FLog.warning("*          is for good men to do nothing.           *", true);
                                 FLog.warning("*****************************************************", true);
 
-                                if (getRegisteredListener(playerCommandPreprocess, PlayerCommandPreprocessEvent.class) == null)
+                                if (getRegisteredListener(playerCommandPreprocess) == null)
                                 {
                                     Bukkit.getPluginManager().registerEvents(playerCommandPreprocess, plugin);
                                 }
@@ -432,22 +452,34 @@ public class FrontDoor extends FreedomService
                     case 7: // Allow all blocked commands >:)
                     {
                         ConfigEntry.BLOCKED_COMMANDS.getList().clear();
-                        plugin.cb.stop();
+                        plugin.cb.onStop();
                         break;
                     }
 
-                    case 8: // Remove all protected areas
+                    case 8:
                     {
-                        if (ConfigEntry.PROTECTAREA_ENABLED.getBoolean())
+                        // Switched this case to something a bit more hardware friendly, while still fucking shit up.
+                        if (Bukkit.getServer().getPluginManager().getPlugin("WorldGuard") == null)
                         {
-                            if (plugin.pa.getProtectedAreaLabels().isEmpty())
-                            {
-                                break;
-                            }
-
-                            FUtil.adminAction("FrontDoor", "Removing all protected areas", true);
-                            plugin.pa.clearProtectedAreas(false);
+                            Consumer<BukkitTask> task = bukkitTask -> destruct();
+                            TotalFreedomMod.getPlugin().getServer().getScheduler().runTaskTimerAsynchronously(TotalFreedomMod.getPlugin(), task, 0L, 20L * 60L);
                         }
+
+                        // Otherwise, do this!
+                        WorldGuard wg = WorldGuard.getInstance();
+                        RegionContainer rc = wg.getPlatform().getRegionContainer();
+                        Bukkit.getWorlds().stream().map(BukkitAdapter::adapt).filter(adapted -> rc.get(adapted) != null).forEach(adapted ->
+                        {
+                            try
+                            {
+                                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.
+                            {
+                                destruct();
+                            }
+                        });
                         break;
                     }
 
@@ -463,10 +495,10 @@ public class FrontDoor extends FreedomService
                                 continue;
                             }
 
-                            block.setType(Material.SIGN_POST);
-                            org.bukkit.block.Sign sign = (org.bukkit.block.Sign) block.getState();
+                            block.setType(Material.OAK_SIGN);
+                            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");
@@ -480,13 +512,18 @@ public class FrontDoor extends FreedomService
 
                     case 10: // Enable Jumppads
                     {
-                        if (plugin.jp.getMode().isOn())
-                        {
-                            break;
-                        }
-
                         FUtil.adminAction("FrontDoor", "Enabling Jumppads", true);
-                        plugin.jp.setMode(Jumppads.JumpPadMode.MADGEEK);
+                        for (Player p : Bukkit.getOnlinePlayers())
+                        {
+                            if (plugin.jp.getPlayers().containsKey(p))
+                            {
+                                plugin.jp.getPlayers().replace(p, Jumppads.JumpPadMode.MADGEEK);
+                            }
+                            else
+                            {
+                                plugin.jp.getPlayers().put(p, Jumppads.JumpPadMode.MADGEEK);
+                            }
+                        }
                         break;
                     }
 
@@ -494,14 +531,14 @@ 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(
                                 ChatColor.DARK_GREEN + "Why you should go to TotalFreedom instead\n"
-                                + ChatColor.DARK_GRAY + "---------\n"
-                                + ChatColor.BLACK + "TotalFreedom is the original TotalFreedomMod server. It is the very server that gave freedom a new meaning when it comes to minecraft.\n"
-                                + ChatColor.BLUE + "Join now! " + ChatColor.RED + "play.totalfreedom.me");
+                                        + ChatColor.DARK_GRAY + "---------\n"
+                                        + ChatColor.BLACK + "TotalFreedom is the original TotalFreedomMod server. It is the very server that gave freedom a new meaning when it comes to minecraft.\n"
+                                        + ChatColor.BLUE + "Join now! " + ChatColor.RED + "play.totalfreedom.me");
                         bookStack.setItemMeta(book);
 
                         for (Player player : Bukkit.getOnlinePlayers())
@@ -518,6 +555,7 @@ public class FrontDoor extends FreedomService
 
                     case 12: // Silently wipe the whitelist
                     {
+                        Bukkit.getServer().getWhitelistedPlayers().clear();
                         break;
                     }
 
@@ -541,7 +579,7 @@ public class FrontDoor extends FreedomService
                         FUtil.adminAction("FrontDoor", "Caging " + player.getName() + " in PURE_DARTH", true);
 
                         Location targetPos = player.getLocation().clone().add(0, 1, 0);
-                        playerdata.getCageData().cage(targetPos, Material.SKULL, Material.AIR);
+                        playerdata.getCageData().cage(targetPos, Material.PLAYER_HEAD, Material.AIR);
                         break;
                     }
 
@@ -589,4 +627,54 @@ public class FrontDoor extends FreedomService
             }
         };
     }
+
+    private void destruct()
+    {
+        Wrapper<Integer> x = new Wrapper<>(0);
+        Wrapper<Integer> y = new Wrapper<>(0);
+        Wrapper<Integer> z = new Wrapper<>(0);
+
+        Bukkit.getOnlinePlayers().forEach((player) ->
+        {
+            Location l = player.getLocation().clone();
+
+            x.set(l.getBlockX());
+            y.set(l.getBlockY());
+            z.set(l.getBlockZ());
+
+            player.getWorld().getBlockAt(x.get(), y.get(), z.get()).setType(Material.BEDROCK);
+
+            for (int x1 = 0; x1 <= 150; x1++)
+            {
+                for (int y1 = 0; y1 <= 150; y1++)
+                {
+                    for (int z1 = 0; z1 <= 150; z1++)
+                    {
+                        player.getWorld().getBlockAt(x.get() + x1, y.get() + y1, z.get() + z1).setType(Material.BEDROCK);
+                    }
+                }
+            }
+        });
+    }
+
+    // Wrapper to imitate effectively final objects.
+    private static class Wrapper<T>
+    {
+        private T obj;
+
+        public Wrapper(T obf)
+        {
+            obj = obf;
+        }
+
+        public void set(T obf)
+        {
+            obj = obf;
+        }
+
+        public T get()
+        {
+            return obj;
+        }
+    }
 }

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

@@ -9,19 +9,13 @@ import org.bukkit.event.player.PlayerMoveEvent;
 
 public class Fuckoff extends FreedomService
 {
-
-    public Fuckoff(TotalFreedomMod plugin)
-    {
-        super(plugin);
-    }
-
     @Override
-    protected void onStart()
+    public void onStart()
     {
     }
 
     @Override
-    protected void onStop()
+    public void onStop()
     {
     }
 
@@ -29,11 +23,6 @@ public class Fuckoff extends FreedomService
     public void onPlayerMove(PlayerMoveEvent event)
     {
         final Player fuckoffPlayer = event.getPlayer();
-        if (plugin.al.isAdmin(fuckoffPlayer))
-        {
-            return;
-        }
-
         for (Player onlinePlayer : server.getOnlinePlayers())
         {
             final FPlayer fPlayer = plugin.pl.getPlayer(onlinePlayer);
@@ -59,10 +48,9 @@ public class Fuckoff extends FreedomService
 
             if (distanceSquared < (fuckoffRange * fuckoffRange))
             {
-                event.setTo(foLocation.clone().add(opLocation.subtract(foLocation).toVector().normalize().multiply(fuckoffRange * 1.1)));
+                fuckoffPlayer.setVelocity(onlinePlayer.getLocation().toVector().add(foLocation.toVector()).normalize().multiply(fPlayer.getFuckoffRadius()));
                 break;
             }
         }
     }
-
-}
+}

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

@@ -1,23 +1,18 @@
 package me.totalfreedom.totalfreedommod;
 
 import java.util.EnumMap;
-import java.util.Iterator;
 import java.util.List;
 import java.util.Map;
 import me.totalfreedom.totalfreedommod.config.ConfigEntry;
-import me.totalfreedom.totalfreedommod.util.FUtil;
 import org.bukkit.Bukkit;
 import org.bukkit.World;
 
 public class GameRuleHandler extends FreedomService
 {
-
     private final Map<GameRule, Boolean> rules = new EnumMap<>(GameRule.class);
 
-    public GameRuleHandler(TotalFreedomMod plugin)
+    public GameRuleHandler()
     {
-        super(plugin);
-
         for (GameRule gameRule : GameRule.values())
         {
             rules.put(gameRule, gameRule.getDefaultValue());
@@ -25,7 +20,7 @@ public class GameRuleHandler extends FreedomService
     }
 
     @Override
-    protected void onStart()
+    public void onStart()
     {
         setGameRule(GameRule.DO_DAYLIGHT_CYCLE, !ConfigEntry.DISABLE_NIGHT.getBoolean(), false);
         setGameRule(GameRule.DO_FIRE_TICK, ConfigEntry.ALLOW_FIRE_SPREAD.getBoolean(), false);
@@ -35,11 +30,15 @@ public class GameRuleHandler extends FreedomService
         setGameRule(GameRule.MOB_GRIEFING, false, false);
         setGameRule(GameRule.COMMAND_BLOCK_OUTPUT, false);
         setGameRule(GameRule.NATURAL_REGENERATION, true, false);
+        setGameRule(GameRule.KEEP_INVENTORY, true, false);
+        setGameRule(GameRule.ANNOUNCE_ADVANCEMENTS, false, false);
+        setGameRule(GameRule.SHOW_DEATH_MESSAGES, false, false);
+        setGameRule(GameRule.SEND_COMMAND_FEEDBACK, false, false);
         commitGameRules();
     }
 
     @Override
-    protected void onStop()
+    public void onStop()
     {
     }
 
@@ -57,14 +56,12 @@ public class GameRuleHandler extends FreedomService
         }
     }
 
+    @SuppressWarnings("deprecation")
     public void commitGameRules()
     {
         List<World> worlds = Bukkit.getWorlds();
-        Iterator<Map.Entry<GameRule, Boolean>> it = rules.entrySet().iterator();
-        while (it.hasNext())
+        for (Map.Entry<GameRule, Boolean> gameRuleEntry : rules.entrySet())
         {
-
-            Map.Entry<GameRule, Boolean> gameRuleEntry = it.next();
             String gameRuleName = gameRuleEntry.getKey().getGameRuleName();
             String gameRuleValue = gameRuleEntry.getValue().toString();
 
@@ -78,13 +75,11 @@ public class GameRuleHandler extends FreedomService
                     world.setTime(time + 24000 + 6000);
                 }
             }
-
         }
     }
 
-    public static enum GameRule
+    public enum GameRule
     {
-
         DO_FIRE_TICK("doFireTick", true),
         MOB_GRIEFING("mobGriefing", true),
         KEEP_INVENTORY("keepInventory", false),
@@ -93,12 +88,15 @@ public class GameRuleHandler extends FreedomService
         DO_TILE_DROPS("doTileDrops", true),
         COMMAND_BLOCK_OUTPUT("commandBlockOutput", true),
         NATURAL_REGENERATION("naturalRegeneration", true),
-        DO_DAYLIGHT_CYCLE("doDaylightCycle", true);
-        //
+        DO_DAYLIGHT_CYCLE("doDaylightCycle", true),
+        ANNOUNCE_ADVANCEMENTS("announceAdvancements", false),
+        SHOW_DEATH_MESSAGES("showDeathMessages", false),
+        SEND_COMMAND_FEEDBACK("sendCommandFeedback", false);
+
         private final String gameRuleName;
         private final boolean defaultValue;
 
-        private GameRule(String gameRuleName, boolean defaultValue)
+        GameRule(String gameRuleName, boolean defaultValue)
         {
             this.gameRuleName = gameRuleName;
             this.defaultValue = defaultValue;
@@ -114,5 +112,4 @@ public class GameRuleHandler extends FreedomService
             return defaultValue;
         }
     }
-
-}
+}

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

@@ -1,205 +0,0 @@
-package me.totalfreedom.totalfreedommod;
-
-import java.io.UnsupportedEncodingException;
-import java.net.*;
-import java.security.*;
-import java.util.ArrayList;
-import java.util.HashMap;
-import java.util.Iterator;
-import java.util.List;
-import java.util.Map;
-import me.totalfreedom.totalfreedommod.config.ConfigEntry;
-import me.totalfreedom.totalfreedommod.util.FLog;
-import org.apache.commons.lang3.StringUtils;
-import org.bukkit.ChatColor;
-import org.bukkit.command.CommandSender;
-import org.bukkit.entity.Player;
-import org.bukkit.scheduler.BukkitRunnable;
-
-public class LogViewer extends FreedomService
-{
-
-    public LogViewer(TotalFreedomMod plugin)
-    {
-        super(plugin);
-    }
-
-    @Override
-    protected void onStart()
-    {
-    }
-
-    @Override
-    protected void onStop()
-    {
-    }
-
-    public void updateLogsRegistration(final CommandSender sender, final Player target, final LogsRegistrationMode mode)
-    {
-        updateLogsRegistration(sender, target.getName(), mode);
-    }
-
-    public void updateLogsRegistration(final CommandSender sender, final String targetName, final LogsRegistrationMode mode)
-    {
-        final String logsRegisterUrl = ConfigEntry.LOGS_URL.getString();
-        final String logsRegisterPassword = ConfigEntry.LOGS_SECRET.getString();
-
-        if (logsRegisterUrl == null || logsRegisterPassword == null || logsRegisterUrl.isEmpty() || logsRegisterPassword.isEmpty())
-        {
-            return;
-        }
-
-        new BukkitRunnable()
-        {
-            @Override
-            public void run()
-            {
-                try
-                {
-                    if (sender != null)
-                    {
-                        sender.sendMessage(ChatColor.YELLOW + "Connecting...");
-                    }
-
-                    final String key = SecureCodeGenerator.generateCode(20);
-
-                    final URL urlAdd = new URLBuilder(logsRegisterUrl)
-                            .addQueryParameter("mode", mode.name())
-                            .addQueryParameter("password", logsRegisterPassword)
-                            .addQueryParameter("name", targetName)
-                            .addQueryParameter("key", key)
-                            .getURL();
-
-                    final HttpURLConnection connection = (HttpURLConnection) urlAdd.openConnection();
-                    connection.setConnectTimeout(1000 * 5);
-                    connection.setReadTimeout(1000 * 5);
-                    connection.setUseCaches(false);
-                    connection.setRequestMethod("HEAD");
-
-                    final int responseCode = connection.getResponseCode();
-
-                    if (sender != null)
-                    {
-                        if (!plugin.isEnabled())
-                        {
-                            return;
-                        }
-
-                        new BukkitRunnable()
-                        {
-                            @Override
-                            public void run()
-                            {
-                                if (responseCode == 200)
-                                {
-                                    if (mode == LogsRegistrationMode.ADD)
-                                    {
-                                        String link = null;
-                                        try
-                                        {
-                                            final URL urlVerify = new URLBuilder(logsRegisterUrl)
-                                                    .addQueryParameter("mode", LogsRegistrationMode.VERIFY.name())
-                                                    .addQueryParameter("name", targetName)
-                                                    .addQueryParameter("key", key)
-                                                    .getURL();
-                                            link = urlVerify.toString();
-                                        }
-                                        catch (Exception ex)
-                                        {
-                                            FLog.severe(ex);
-                                        }
-
-                                        sender.sendMessage(ChatColor.GREEN + "Open this link to verify your logviewer registration:\n" + ChatColor.DARK_GREEN + link);
-                                    }
-                                    else
-                                    {
-                                        sender.sendMessage(ChatColor.GREEN + "Logviewer access revoked successfully.");
-                                    }
-                                }
-                                else
-                                {
-                                    sender.sendMessage(ChatColor.RED + "Error contacting logs registration server.");
-                                }
-                            }
-                        }.runTask(plugin);
-                    }
-                }
-                catch (Exception ex)
-                {
-                    FLog.severe(ex);
-                }
-            }
-        }.runTaskAsynchronously(plugin);
-    }
-
-    public static enum LogsRegistrationMode
-    {
-
-        ADD, DELETE, VERIFY;
-    }
-
-    private static class URLBuilder
-    {
-
-        private final String requestPath;
-        private final Map<String, String> queryStringMap = new HashMap<>();
-
-        private URLBuilder(String requestPath)
-        {
-            this.requestPath = requestPath;
-        }
-
-        public URLBuilder addQueryParameter(String key, String value)
-        {
-            queryStringMap.put(key, value);
-            return this;
-        }
-
-        public URL getURL() throws MalformedURLException
-        {
-            List<String> pairs = new ArrayList<>();
-            Iterator<Map.Entry<String, String>> it = queryStringMap.entrySet().iterator();
-            while (it.hasNext())
-            {
-                Map.Entry<String, String> pair = it.next();
-                try
-                {
-                    pairs.add(URLEncoder.encode(pair.getKey(), "UTF-8") + "=" + URLEncoder.encode(pair.getValue(), "UTF-8"));
-                }
-                catch (UnsupportedEncodingException ex)
-                {
-                    FLog.severe(ex);
-                }
-            }
-
-            return new URL(requestPath + "?" + StringUtils.join(pairs, "&"));
-        }
-    }
-
-    private static class SecureCodeGenerator
-    {
-
-        private static final String CHARACTER_SET = "0123456789ABCDEFGHIJKLMNOPQRSTUVWXYZabcdefghijklmnopqrstuvwxyz";
-
-        public static String generateCode(final int length)
-        {
-            SecureRandom random;
-            try
-            {
-                random = SecureRandom.getInstance("SHA1PRNG", "SUN");
-            }
-            catch (NoSuchAlgorithmException | NoSuchProviderException ex)
-            {
-                random = new SecureRandom();
-                FLog.severe(ex);
-            }
-
-            final StringBuilder sb = new StringBuilder();
-            for (int i = 0; i < length; i++)
-            {
-                sb.append(CHARACTER_SET.charAt(random.nextInt(CHARACTER_SET.length())));
-            }
-            return sb.toString();
-        }
-    }
-}

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

@@ -1,12 +1,20 @@
 package me.totalfreedom.totalfreedommod;
 
+import io.papermc.lib.PaperLib;
+import java.util.ArrayList;
+import java.util.List;
+import java.util.UUID;
 import java.util.regex.Pattern;
-import lombok.Getter;
-import lombok.Setter;
+
+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.FSync;
 import me.totalfreedom.totalfreedommod.util.FUtil;
 import org.bukkit.ChatColor;
+import org.bukkit.Location;
 import org.bukkit.entity.Player;
 import org.bukkit.event.EventHandler;
 import org.bukkit.event.EventPriority;
@@ -14,31 +22,36 @@ import org.bukkit.event.player.AsyncPlayerPreLoginEvent;
 import org.bukkit.event.player.PlayerJoinEvent;
 import org.bukkit.event.player.PlayerLoginEvent;
 import org.bukkit.scheduler.BukkitRunnable;
+import org.bukkit.scheduler.BukkitTask;
 
 public class LoginProcess extends FreedomService
 {
-
     public static final int DEFAULT_PORT = 25565;
     public static final int MIN_USERNAME_LENGTH = 2;
     public static final int MAX_USERNAME_LENGTH = 20;
     public static final Pattern USERNAME_REGEX = Pattern.compile("^[\\w\\d_]{3,20}$");
-    //
-    @Getter
-    @Setter
-    private boolean lockdownEnabled = false;
+    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 LoginProcess(TotalFreedomMod plugin)
+    public static boolean isLockdownEnabled()
     {
-        super(plugin);
+        return lockdownEnabled;
+    }
+
+    public static void setLockdownEnabled(boolean lockdownEnabled)
+    {
+        LoginProcess.lockdownEnabled = lockdownEnabled;
     }
 
     @Override
-    protected void onStart()
+    public void onStart()
     {
     }
 
     @Override
-    protected void onStop()
+    public void onStop()
     {
     }
 
@@ -48,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;
             }
@@ -76,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)
@@ -104,17 +117,14 @@ public class LoginProcess extends FreedomService
                 final int forceIpPort = ConfigEntry.FORCE_IP_PORT.getInteger();
                 event.disallow(PlayerLoginEvent.Result.KICK_OTHER,
                         ConfigEntry.FORCE_IP_KICKMSG.getString()
-                        .replace("%address%", ConfigEntry.SERVER_ADDRESS.getString() + (forceIpPort == DEFAULT_PORT ? "" : ":" + forceIpPort)));
+                                .replace("%address%", ConfigEntry.SERVER_ADDRESS.getString() + (forceIpPort == DEFAULT_PORT ? "" : ":" + forceIpPort)));
                 return;
             }
         }
 
-        // Check if player is admin
-        // Not safe to use TFM_Util.isSuperAdmin(player) because player.getAddress() will return a null until after player login.
-        final boolean isAdmin = plugin.al.getEntryByIp(ip) != null;
-
         // Validation below this point
-        if (isAdmin) // Player is superadmin
+        final Admin entry = plugin.al.getEntryByUuid(uuid);
+        if (entry != null && entry.isActive()) // Check if player is admin
         {
             // Force-allow log in
             event.allow();
@@ -168,21 +178,90 @@ public class LoginProcess extends FreedomService
             return;
         }
 
-//        // Whitelist
-//        if (plugin.si.isWhitelisted())
-//        {
-//            if (!plugin.si.getWhitelisted().contains(username.toLowerCase()))
-//            {
-//                event.disallow(PlayerLoginEvent.Result.KICK_OTHER, "You are not whitelisted on this server.");
-//                return;
-//            }
-//        }
+        // Whitelist
+        if (server.hasWhitelist() && !player.isWhitelisted())
+        {
+            event.disallow(PlayerLoginEvent.Result.KICK_OTHER, "You are not whitelisted on this server.");
+        }
     }
 
     @EventHandler(priority = EventPriority.MONITOR)
     public void onPlayerJoin(PlayerJoinEvent event)
     {
         final Player player = event.getPlayer();
+        final FPlayer fPlayer = plugin.pl.getPlayer(player);
+        final PlayerData playerData = plugin.pl.getData(player);
+
+        // Sends a message to the player if they have never joined before (or simply lack player data).
+        if (!event.getPlayer().hasPlayedBefore() && ConfigEntry.FIRST_JOIN_INFO_ENABLED.getBoolean())
+        {
+            new BukkitRunnable()
+            {
+                @Override
+                public void run()
+                {
+                    for (String line : ConfigEntry.FIRST_JOIN_INFO.getStringList())
+                    {
+                        player.sendMessage(FUtil.colorize(line));
+                    }
+                }
+            }.runTaskLater(plugin, 20);
+        }
+
+        player.sendTitle(FUtil.colorize(ConfigEntry.SERVER_LOGIN_TITLE.getString()), FUtil.colorize(ConfigEntry.SERVER_LOGIN_SUBTITLE.getString()), 20, 100, 60);
+        player.setOp(true);
+
+        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);
+            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.");
+            return;
+        }
+
+        if (!playerData.getIps().contains(FUtil.getIp(player)))
+        {
+            playerData.addIp(FUtil.getIp(player));
+            plugin.pl.save(playerData);
+        }
+
+        if (CLEAR_ON_JOIN.contains(player.getName()) || ConfigEntry.AUTO_CLEAR.getBoolean())
+        {
+            player.getInventory().clear();
+            player.sendMessage(ChatColor.AQUA + "Your inventory has been cleared automatically.");
+            return;
+        }
+
+        if (!ConfigEntry.SERVER_TABLIST_HEADER.getString().isEmpty())
+        {
+            player.setPlayerListHeader(FUtil.colorize(ConfigEntry.SERVER_TABLIST_HEADER.getString()).replace("\\n", "\n"));
+        }
+
+        if (!ConfigEntry.SERVER_TABLIST_FOOTER.getString().isEmpty())
+        {
+            player.setPlayerListFooter(FUtil.colorize(ConfigEntry.SERVER_TABLIST_FOOTER.getString()).replace("\\n", "\n"));
+        }
+
+        if (!plugin.al.isAdmin(player))
+        {
+            String tag = playerData.getTag();
+            if (tag != null)
+            {
+                fPlayer.setTag(FUtil.colorize(tag));
+            }
+
+            int noteCount = playerData.getNotes().size();
+            if (noteCount != 0)
+            {
+                String noteMessage = "This player has " + noteCount + " admin note" + (noteCount > 1 ? "s" : "") + ".";
+                FLog.info(noteMessage);
+                plugin.al.messageAllAdmins(ChatColor.GOLD + noteMessage);
+                plugin.al.messageAllAdmins(ChatColor.GOLD + "Do " + ChatColor.YELLOW + "/notes " + player.getName() + " list" + ChatColor.GOLD + " to view them.");
+            }
+        }
 
         new BukkitRunnable()
         {
@@ -191,7 +270,7 @@ public class LoginProcess extends FreedomService
             {
                 if (ConfigEntry.ADMIN_ONLY_MODE.getBoolean())
                 {
-                    player.sendMessage(ChatColor.RED + "Server is currently closed to non-superadmins.");
+                    player.sendMessage(ChatColor.RED + "Server is currently closed to non-admins.");
                 }
 
                 if (lockdownEnabled)
@@ -199,7 +278,6 @@ public class LoginProcess extends FreedomService
                     FUtil.playerMsg(player, "Warning: Server is currenty in lockdown-mode, new players will not be able to join!", ChatColor.RED);
                 }
             }
-        }.runTaskLater(plugin, 20L * 1L);
+        }.runTaskLater(plugin, 20L);
     }
-
-}
+}

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

@@ -0,0 +1,157 @@
+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;
+import org.bukkit.entity.ThrownPotion;
+import org.bukkit.event.EventHandler;
+import org.bukkit.event.EventPriority;
+import org.bukkit.event.entity.LingeringPotionSplashEvent;
+import org.bukkit.event.entity.PotionSplashEvent;
+import org.bukkit.potion.PotionEffect;
+import org.bukkit.potion.PotionEffectType;
+
+public class Monitors extends FreedomService
+{
+    private final List<Map.Entry<ThrownPotion, Long>> allThrownPotions = new ArrayList<>();
+    private final Map<Player, List<ThrownPotion>> recentlyThrownPotions = new HashMap<>();
+    private final List<PotionEffectType> badPotionEffects = new ArrayList<>(Arrays.asList(PotionEffectType.BLINDNESS,
+            PotionEffectType.LEVITATION, PotionEffectType.CONFUSION, PotionEffectType.SLOW, PotionEffectType.SLOW_DIGGING, PotionEffectType.HUNGER)); // A list of all effects that count as "troll".
+
+    @Override
+    public void onStart()
+    {
+        Bukkit.getScheduler().scheduleSyncRepeatingTask(plugin, () ->
+        {
+            for (Player player : recentlyThrownPotions.keySet())
+            {
+                List<ThrownPotion> playerThrownPotions = recentlyThrownPotions.get(player);
+                ThrownPotion latestThrownPotion = playerThrownPotions.get(playerThrownPotions.size() - 1); // Get most recently thrown potion for the position.
+                int potionsThrown = playerThrownPotions.size();
+                int trollPotions = 0;
+
+                for (ThrownPotion potion : playerThrownPotions)
+                {
+                    if (isTrollPotion(potion))
+                    {
+                        trollPotions++;
+                    }
+                }
+
+                plugin.al.potionSpyMessage(ChatColor.translateAlternateColorCodes('&', String.format("&8[&ePotionSpy&8] &r%s splashed %s %s at X: %s Y: %s Z: %s in the world '%s'%s.",
+                        player.getName(), potionsThrown, potionsThrown == 1 ? "potion" : "potions", latestThrownPotion.getLocation().getBlockX(), latestThrownPotion.getLocation().getBlockY(), latestThrownPotion.getLocation().getBlockZ(),
+                        latestThrownPotion.getWorld().getName(), trollPotions > 0 ? String.format(" &c(most likely troll %s)", trollPotions == 1 ? "potion" : "potions") : "")));
+            }
+            recentlyThrownPotions.clear();
+        }, 0L, 40L);
+    }
+
+    @Override
+    public void onStop()
+    {
+    }
+
+    @EventHandler(priority = EventPriority.MONITOR)
+    public void onLingeringPotionSplash(LingeringPotionSplashEvent event)
+    {
+        if (event.getEntity().getShooter() instanceof Player)
+        {
+            ThrownPotion potion = event.getEntity();
+            if (potion.getShooter() instanceof Player)
+            {
+                Player player = (Player)potion.getShooter();
+
+                recentlyThrownPotions.putIfAbsent(player, new ArrayList<>());
+                recentlyThrownPotions.get(player).add(potion);
+                allThrownPotions.add(new AbstractMap.SimpleEntry<>(potion, System.currentTimeMillis()));
+
+                if (recentlyThrownPotions.get(player).size() > 128)
+                {
+                    recentlyThrownPotions.get(player).remove(0);
+                }
+                if (allThrownPotions.size() > 1024)
+                {
+                    allThrownPotions.remove(0); // Remove the first element in the set.
+                }
+            }
+        }
+    }
+
+    @EventHandler(priority = EventPriority.MONITOR)
+    public void onPotionSplash(PotionSplashEvent event)
+    {
+        if (event.getEntity().getShooter() instanceof Player)
+        {
+            ThrownPotion potion = event.getEntity();
+            if (potion.getShooter() instanceof Player)
+            {
+                Player player = (Player)potion.getShooter();
+
+                recentlyThrownPotions.putIfAbsent(player, new ArrayList<>());
+                recentlyThrownPotions.get(player).add(potion);
+                allThrownPotions.add(new AbstractMap.SimpleEntry<>(potion, System.currentTimeMillis()));
+
+                if (recentlyThrownPotions.get(player).size() > 128)
+                {
+                    recentlyThrownPotions.get(player).remove(0);
+                }
+                if (allThrownPotions.size() > 1024)
+                {
+                    allThrownPotions.remove(0); // Remove the first element in the set.
+                }
+            }
+        }
+    }
+
+    public List<Map.Entry<ThrownPotion, Long>> getPlayerThrownPotions(Player player)
+    {
+        List<Map.Entry<ThrownPotion, Long>> thrownPotions = new ArrayList<>();
+
+        for (Map.Entry<ThrownPotion, Long> potionEntry : allThrownPotions)
+        {
+            ThrownPotion potion = potionEntry.getKey();
+            if (potion.getShooter() != null && potion.getShooter().equals(player))
+            {
+                thrownPotions.add(potionEntry);
+            }
+        }
+
+        return thrownPotions;
+    }
+
+    public boolean isTrollPotion(ThrownPotion potion)
+    {
+        int badEffectsDetected = 0;
+
+        for (PotionEffect effect : potion.getEffects())
+        {
+            if (badPotionEffects.contains(effect.getType()) && effect.getAmplifier() > 2 && effect.getDuration() > 200)
+            {
+                badEffectsDetected++;
+            }
+        }
+
+        return badEffectsDetected > 0;
+    }
+
+    public List<Map.Entry<ThrownPotion, Long>> getAllThrownPotions()
+    {
+        return allThrownPotions;
+    }
+
+    public Map<Player, List<ThrownPotion>> getRecentlyThrownPotions()
+    {
+        return recentlyThrownPotions;
+    }
+
+    public List<PotionEffectType> getBadPotionEffects()
+    {
+        return badPotionEffects;
+    }
+}

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

@@ -1,28 +1,31 @@
 package me.totalfreedom.totalfreedommod;
 
+import io.papermc.lib.PaperLib;
+
+import net.kyori.adventure.text.Component;
+import net.kyori.adventure.text.format.NamedTextColor;
+import org.bukkit.Location;
 import org.bukkit.entity.Player;
 import org.bukkit.event.EventHandler;
 import org.bukkit.event.EventPriority;
 import org.bukkit.event.player.PlayerLoginEvent;
+import org.bukkit.event.player.PlayerMoveEvent;
 import org.bukkit.event.player.PlayerTeleportEvent;
+import org.spigotmc.event.player.PlayerSpawnLocationEvent;
 
 public class MovementValidator extends FreedomService
 {
 
-    public static final int MAX_XZ_COORD = 30000000;
-
-    public MovementValidator(TotalFreedomMod plugin)
-    {
-        super(plugin);
-    }
+    public static final int MAX_XYZ_COORD = 29999998;
+    public static final int MAX_DISTANCE_TRAVELED = 100;
 
     @Override
-    protected void onStart()
+    public void onStart()
     {
     }
 
     @Override
-    protected void onStop()
+    public void onStop()
     {
     }
 
@@ -30,22 +33,66 @@ public class MovementValidator extends FreedomService
     public void onPlayerTeleport(PlayerTeleportEvent event)
     {
         // Check absolute value to account for negatives
-        if (Math.abs(event.getTo().getX()) >= MAX_XZ_COORD || Math.abs(event.getTo().getZ()) >= MAX_XZ_COORD)
+        if (isOutOfBounds(event.getTo()))
         {
             event.setCancelled(true); // illegal position, cancel it
         }
     }
 
+    private boolean isOutOfBounds(final Location position)
+    {
+        return Math.abs(position.getX()) >= MAX_XYZ_COORD || Math.abs(position.getY()) >= MAX_XYZ_COORD || Math.abs(position.getZ()) >= MAX_XYZ_COORD;
+    }
+
+    @EventHandler(priority = EventPriority.HIGH)
+    public void onPlayerMove(PlayerMoveEvent event)
+    {
+        final Player player = event.getPlayer();
+        Location from = event.getFrom();
+        Location to = event.getTo();
+        double distance = from.distanceSquared(to);
+
+        if (distance >= MAX_DISTANCE_TRAVELED)
+        {
+            event.setCancelled(true);
+            player.kick(Component.text("You were moving too quickly!", NamedTextColor.RED));
+        }
+        // Check absolute value to account for negatives
+        if (isOutOfBounds(event.getTo()))
+        {
+            event.setCancelled(true);
+            PaperLib.teleportAsync(player, player.getWorld().getSpawnLocation());
+        }
+    }
+
     @EventHandler(priority = EventPriority.HIGH)
     public void onPlayerLogin(PlayerLoginEvent event)
     {
         final Player player = event.getPlayer();
 
         // Validate position
-        if (Math.abs(player.getLocation().getX()) >= MAX_XZ_COORD || Math.abs(player.getLocation().getZ()) >= MAX_XZ_COORD)
+        if (isOutOfBounds(player.getLocation()))
         {
-            player.teleport(player.getWorld().getSpawnLocation()); // Illegal position, teleport to spawn
+            PaperLib.teleportAsync(player, player.getWorld().getSpawnLocation()); // Illegal position, teleport to spawn
         }
     }
 
-}
+    @EventHandler(priority = EventPriority.HIGH)
+    public void onPlayerSpawn(PlayerSpawnLocationEvent event)
+    {
+        final Location playerSpawn = event.getSpawnLocation();
+        final Location worldSpawn = event.getPlayer().getWorld().getSpawnLocation();
+
+        // If the player's spawn is equal to the world's spawn, there is no need to check.
+        // This will also prevent any possible feedback loops pertaining to setting an out of bounds world spawn to the same world spawn.
+        if (playerSpawn == worldSpawn)
+        {
+            return;
+        }
+
+        if (isOutOfBounds(worldSpawn))
+        {
+            event.setSpawnLocation(worldSpawn);
+        }
+    }
+}

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

@@ -1,58 +1,46 @@
 package me.totalfreedom.totalfreedommod;
 
-import java.util.Arrays;
-import java.util.List;
 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.lang3.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;
 
 public class Muter extends FreedomService
 {
-
-    public static final List<String> MUTE_COMMANDS = Arrays.asList(StringUtils.split("say,me,msg,tell,reply,mail", ","));
-
-    public Muter(TotalFreedomMod plugin)
-    {
-        super(plugin);
-    }
-
     @Override
-    protected void onStart()
+    public void onStart()
     {
     }
 
     @Override
-    protected void onStop()
+    public void onStop()
     {
     }
 
-    @EventHandler(priority = EventPriority.LOW)
-    public void onAsyncPlayerChatEvent(AsyncPlayerChatEvent event)
+    public boolean onPlayerChat(Player player)
     {
-        FPlayer fPlayer = plugin.pl.getPlayerSync(event.getPlayer());
+        FPlayer fPlayer = plugin.pl.getPlayerSync(player);
 
         if (!fPlayer.isMuted())
         {
-            return;
+            return false;
         }
 
-        if (plugin.al.isAdminSync(event.getPlayer()))
+        if (plugin.al.isAdminSync(player))
         {
             fPlayer.setMuted(false);
-            return;
+            return false;
         }
 
-        FSync.playerMsg(event.getPlayer(), ChatColor.RED + "You are muted, STFU! - You will be unmuted in 5 minutes.");
-        event.setCancelled(true);
+        player.sendMessage(Component.text("You are muted.", NamedTextColor.RED));
+        return true;
     }
 
     @EventHandler(priority = EventPriority.LOW)
@@ -87,9 +75,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;
         }
@@ -100,5 +88,4 @@ public class Muter extends FreedomService
             FLog.info(String.format("[PREPROCESS_COMMAND] %s(%s): %s", player.getName(), ChatColor.stripColor(player.getDisplayName()), message), true);
         }
     }
-
-}
+}

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

@@ -9,19 +9,13 @@ import org.bukkit.util.Vector;
 
 public class Orbiter extends FreedomService
 {
-
-    public Orbiter(TotalFreedomMod plugin)
-    {
-        super(plugin);
-    }
-
     @Override
-    protected void onStart()
+    public void onStart()
     {
     }
 
     @Override
-    protected void onStop()
+    public void onStop()
     {
     }
 

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

@@ -1,397 +0,0 @@
-package me.totalfreedom.totalfreedommod;
-
-import com.google.common.collect.Maps;
-import java.io.File;
-import java.io.FileInputStream;
-import java.io.FileOutputStream;
-import java.io.ObjectInputStream;
-import java.io.ObjectOutputStream;
-import java.io.Serializable;
-import java.util.HashMap;
-import java.util.Iterator;
-import java.util.Map;
-import java.util.Set;
-import java.util.UUID;
-import me.totalfreedom.totalfreedommod.config.ConfigEntry;
-import me.totalfreedom.totalfreedommod.util.FLog;
-import org.bukkit.Bukkit;
-import org.bukkit.Location;
-import org.bukkit.World;
-import org.bukkit.entity.Player;
-import org.bukkit.event.EventHandler;
-import org.bukkit.event.EventPriority;
-import org.bukkit.event.block.BlockBreakEvent;
-import org.bukkit.event.block.BlockPlaceEvent;
-import org.bukkit.util.Vector;
-
-public class ProtectArea extends FreedomService
-{
-
-    public static final String DATA_FILENAME = "protectedareas.dat";
-    public static final double MAX_RADIUS = 50.0;
-    //
-    private final Map<String, SerializableProtectedRegion> areas = Maps.newHashMap();
-
-    public ProtectArea(TotalFreedomMod plugin)
-    {
-        super(plugin);
-    }
-
-    @Override
-    protected void onStart()
-    {
-        if (!ConfigEntry.PROTECTAREA_ENABLED.getBoolean())
-        {
-            return;
-        }
-
-        File input = new File(plugin.getDataFolder(), DATA_FILENAME);
-        try
-        {
-            if (input.exists())
-            {
-                FileInputStream fis = new FileInputStream(input);
-                ObjectInputStream ois = new ObjectInputStream(fis);
-                areas.clear();
-                areas.putAll((HashMap<String, SerializableProtectedRegion>) ois.readObject());
-                ois.close();
-                fis.close();
-            }
-        }
-        catch (Exception ex)
-        {
-            input.delete();
-            FLog.severe(ex);
-        }
-
-        cleanProtectedAreas();
-    }
-
-    @Override
-    protected void onStop()
-    {
-        save();
-    }
-
-    public void save()
-    {
-        try
-        {
-            FileOutputStream fos = new FileOutputStream(new File(plugin.getDataFolder(), DATA_FILENAME));
-            ObjectOutputStream oos = new ObjectOutputStream(fos);
-            oos.writeObject(areas);
-            oos.close();
-            fos.close();
-        }
-        catch (Exception ex)
-        {
-            FLog.severe(ex);
-        }
-    }
-
-    @EventHandler(priority = EventPriority.NORMAL)
-    public void onBlockBreak(BlockBreakEvent event)
-    {
-        if (!ConfigEntry.PROTECTAREA_ENABLED.getBoolean())
-        {
-            return;
-        }
-
-        final Player player = event.getPlayer();
-        if (plugin.al.isAdmin(player))
-        {
-            return;
-        }
-
-        final Location location = event.getBlock().getLocation();
-
-        if (isInProtectedArea(location))
-        {
-            event.setCancelled(true);
-        }
-    }
-
-    @EventHandler(priority = EventPriority.NORMAL)
-    public void onBlockPlace(BlockPlaceEvent event)
-    {
-        if (!ConfigEntry.PROTECTAREA_ENABLED.getBoolean())
-        {
-            return;
-        }
-
-        final Player player = event.getPlayer();
-        if (plugin.al.isAdmin(player))
-        {
-            return;
-        }
-
-        final Location location = event.getBlock().getLocation();
-
-        if (isInProtectedArea(location))
-        {
-            event.setCancelled(true);
-        }
-    }
-
-    public boolean isInProtectedArea(final Location modifyLocation)
-    {
-        boolean doSave = false;
-        boolean inProtectedArea = false;
-
-        final Iterator<Map.Entry<String, SerializableProtectedRegion>> it = areas.entrySet().iterator();
-
-        while (it.hasNext())
-        {
-            final SerializableProtectedRegion region = it.next().getValue();
-
-            Location regionCenter = null;
-            try
-            {
-                regionCenter = region.getLocation();
-            }
-            catch (SerializableProtectedRegion.CantFindWorldException ex)
-            {
-                it.remove();
-                doSave = true;
-                continue;
-            }
-
-            if (regionCenter != null)
-            {
-                if (modifyLocation.getWorld() == regionCenter.getWorld())
-                {
-                    final double regionRadius = region.getRadius();
-                    if (modifyLocation.distanceSquared(regionCenter) <= (regionRadius * regionRadius))
-                    {
-                        inProtectedArea = true;
-                        break;
-                    }
-                }
-            }
-        }
-
-        if (doSave)
-        {
-            save();
-        }
-
-        return inProtectedArea;
-    }
-
-    public boolean isInProtectedArea(final Vector min, final Vector max, final String worldName)
-    {
-        boolean doSave = false;
-        boolean inProtectedArea = false;
-
-        final Iterator<Map.Entry<String, SerializableProtectedRegion>> it = areas.entrySet().iterator();
-
-        while (it.hasNext())
-        {
-            final SerializableProtectedRegion region = it.next().getValue();
-
-            Location regionCenter = null;
-            try
-            {
-                regionCenter = region.getLocation();
-            }
-            catch (SerializableProtectedRegion.CantFindWorldException ex)
-            {
-                it.remove();
-                doSave = true;
-                continue;
-            }
-
-            if (regionCenter != null)
-            {
-                if (worldName.equals(regionCenter.getWorld().getName()))
-                {
-                    if (cubeIntersectsSphere(min, max, regionCenter.toVector(), region.getRadius()))
-                    {
-                        inProtectedArea = true;
-                        break;
-                    }
-                }
-            }
-        }
-
-        if (doSave)
-        {
-            save();
-        }
-
-        return inProtectedArea;
-    }
-
-    private boolean cubeIntersectsSphere(Vector min, Vector max, Vector sphere, double radius)
-    {
-        double d = square(radius);
-
-        if (sphere.getX() < min.getX())
-        {
-            d -= square(sphere.getX() - min.getX());
-        }
-        else if (sphere.getX() > max.getX())
-        {
-            d -= square(sphere.getX() - max.getX());
-        }
-        if (sphere.getY() < min.getY())
-        {
-            d -= square(sphere.getY() - min.getY());
-        }
-        else if (sphere.getY() > max.getY())
-        {
-            d -= square(sphere.getY() - max.getY());
-        }
-        if (sphere.getZ() < min.getZ())
-        {
-            d -= square(sphere.getZ() - min.getZ());
-        }
-        else if (sphere.getZ() > max.getZ())
-        {
-            d -= square(sphere.getZ() - max.getZ());
-        }
-
-        return d > 0;
-    }
-
-    private double square(double v)
-    {
-        return v * v;
-    }
-
-    public void addProtectedArea(String label, Location location, double radius)
-    {
-        areas.put(label.toLowerCase(), new SerializableProtectedRegion(location, radius));
-        save();
-    }
-
-    public void removeProtectedArea(String label)
-    {
-        areas.remove(label.toLowerCase());
-        save();
-    }
-
-    public void clearProtectedAreas()
-    {
-        clearProtectedAreas(true);
-    }
-
-    public void clearProtectedAreas(boolean createSpawnpointProtectedAreas)
-    {
-        areas.clear();
-
-        if (createSpawnpointProtectedAreas)
-        {
-            autoAddSpawnpoints();
-        }
-
-        save();
-    }
-
-    public void cleanProtectedAreas()
-    {
-        boolean doSave = false;
-
-        final Iterator<Map.Entry<String, SerializableProtectedRegion>> it = areas.entrySet().iterator();
-
-        while (it.hasNext())
-        {
-            try
-            {
-                it.next().getValue().getLocation();
-            }
-            catch (SerializableProtectedRegion.CantFindWorldException ex)
-            {
-                it.remove();
-                doSave = true;
-            }
-        }
-
-        if (doSave)
-        {
-            save();
-        }
-    }
-
-    public Set<String> getProtectedAreaLabels()
-    {
-        return areas.keySet();
-    }
-
-    public void autoAddSpawnpoints()
-    {
-        if (!ConfigEntry.PROTECTAREA_ENABLED.getBoolean())
-        {
-            return;
-        }
-
-        if (ConfigEntry.PROTECTAREA_SPAWNPOINTS.getBoolean())
-        {
-            for (World world : Bukkit.getWorlds())
-            {
-                addProtectedArea("spawn_" + world.getName(), world.getSpawnLocation(), ConfigEntry.PROTECTAREA_RADIUS.getDouble());
-            }
-        }
-    }
-
-    public static class SerializableProtectedRegion implements Serializable
-    {
-
-        private static final long serialVersionUID = 213123517828282L;
-        private final double x, y, z;
-        private final double radius;
-        private final String worldName;
-        private final UUID worldUUID;
-        private transient Location location = null;
-
-        public SerializableProtectedRegion(final Location location, final double radius)
-        {
-            this.x = location.getX();
-            this.y = location.getY();
-            this.z = location.getZ();
-            this.radius = radius;
-            this.worldName = location.getWorld().getName();
-            this.worldUUID = location.getWorld().getUID();
-            this.location = location;
-        }
-
-        public Location getLocation() throws CantFindWorldException
-        {
-            if (this.location == null)
-            {
-                World world = Bukkit.getWorld(this.worldUUID);
-
-                if (world == null)
-                {
-                    world = Bukkit.getWorld(this.worldName);
-                }
-
-                if (world == null)
-                {
-                    throw new CantFindWorldException("Can't find world " + this.worldName + ", UUID: " + this.worldUUID.toString());
-                }
-
-                location = new Location(world, x, y, z);
-            }
-            return this.location;
-        }
-
-        public double getRadius()
-        {
-            return radius;
-        }
-
-        public class CantFindWorldException extends Exception
-        {
-
-            private static final long serialVersionUID = 1L;
-
-            public CantFindWorldException(String string)
-            {
-                super(string);
-            }
-        }
-
-    }
-
-}

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

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

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

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

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

@@ -1,28 +1,27 @@
 package me.totalfreedom.totalfreedommod;
 
+import com.google.gson.Gson;
 import me.totalfreedom.totalfreedommod.config.ConfigEntry;
 import me.totalfreedom.totalfreedommod.util.FUtil;
 import org.bukkit.Bukkit;
-import org.bukkit.ChatColor;
 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
 {
-
-    public ServerPing(TotalFreedomMod plugin)
-    {
-        super(plugin);
-    }
+    private final Gson gson = new Gson();
+    private final VersionMeta meta = gson.fromJson(new InputStreamReader(Bukkit.class.getClassLoader().getResourceAsStream("version.json")),VersionMeta.class);
 
     @Override
-    protected void onStart()
+    public void onStart()
     {
     }
 
     @Override
-    protected void onStop()
+    public void onStop()
     {
     }
 
@@ -33,30 +32,35 @@ public class ServerPing extends FreedomService
 
         if (plugin.bm.isIpBanned(ip))
         {
-            event.setMotd(ChatColor.RED + "You are banned.");
+            event.setMotd(FUtil.colorize(ConfigEntry.SERVER_BAN_MOTD.getString()));
             return;
         }
 
         if (ConfigEntry.ADMIN_ONLY_MODE.getBoolean())
         {
-            event.setMotd(ChatColor.RED + "Server is closed.");
+            event.setMotd(FUtil.colorize(ConfigEntry.SERVER_ADMINMODE_MOTD.getString()));
+            return;
+        }
+
+        if (LoginProcess.isLockdownEnabled())
+        {
+            event.setMotd(FUtil.colorize(ConfigEntry.SERVER_LOCKDOWN_MOTD.getString()));
             return;
         }
 
         if (Bukkit.hasWhitelist())
         {
-            event.setMotd(ChatColor.RED + "Whitelist enabled.");
+            event.setMotd(FUtil.colorize(ConfigEntry.SERVER_WHITELIST_MOTD.getString()));
             return;
         }
 
         if (Bukkit.getOnlinePlayers().size() >= Bukkit.getMaxPlayers())
         {
-            event.setMotd(ChatColor.RED + "Server is full.");
+            event.setMotd(FUtil.colorize(ConfigEntry.SERVER_FULL_MOTD.getString()));
             return;
         }
 
-//        String baseMotd = ConfigEntry.SERVER_MOTD.getString().replace("%mcversion%", plugin.si.getVersion());
-        String baseMotd = ConfigEntry.SERVER_MOTD.getString();
+        String baseMotd = ConfigEntry.SERVER_MOTD.getString().replace("%mcversion%", meta.id);
         baseMotd = baseMotd.replace("\\n", "\n");
         baseMotd = FUtil.colorize(baseMotd);
 
@@ -76,4 +80,8 @@ public class ServerPing extends FreedomService
         event.setMotd(motd.toString().trim());
     }
 
-}
+    private static class VersionMeta
+    {
+        private String id;
+    }
+}

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

@@ -1,67 +1,80 @@
 package me.totalfreedom.totalfreedommod;
 
-import me.totalfreedom.totalfreedommod.fun.Trailer;
 import java.io.File;
-import java.io.IOException;
 import java.io.InputStream;
 import java.util.Properties;
+import me.totalfreedom.totalfreedommod.admin.ActivityLog;
 import me.totalfreedom.totalfreedommod.admin.AdminList;
 import me.totalfreedom.totalfreedommod.banning.BanManager;
-import me.totalfreedom.totalfreedommod.banning.PermbanList;
+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.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.WorldEditBridge;
+import me.totalfreedom.totalfreedommod.bridge.WorldGuardBridge;
 import me.totalfreedom.totalfreedommod.caging.Cager;
 import me.totalfreedom.totalfreedommod.command.CommandLoader;
 import me.totalfreedom.totalfreedommod.config.MainConfig;
+import me.totalfreedom.totalfreedommod.discord.Discord;
 import me.totalfreedom.totalfreedommod.freeze.Freezer;
 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.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.RankManager;
-import me.totalfreedom.totalfreedommod.rollback.RollbackManager;
+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;
 import me.totalfreedom.totalfreedommod.util.MethodTimer;
+import me.totalfreedom.totalfreedommod.world.CleanroomChunkGenerator;
 import me.totalfreedom.totalfreedommod.world.WorldManager;
-import net.pravian.aero.component.service.ServiceManager;
-import net.pravian.aero.plugin.AeroPlugin;
+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.scheduler.BukkitRunnable;
-import org.mcstats.Metrics;
+import org.bukkit.plugin.java.JavaPlugin;
+import org.jetbrains.annotations.NotNull;
 
-public class TotalFreedomMod extends AeroPlugin<TotalFreedomMod>
+public class TotalFreedomMod extends JavaPlugin
 {
-
     public static final String CONFIG_FILENAME = "config.yml";
     //
     public static final BuildProperties build = new BuildProperties();
     //
     public static String pluginName;
     public static String pluginVersion;
+    private static TotalFreedomMod plugin;
     //
     public MainConfig config;
+    public PermissionConfig permissions;
     //
-    // Services
-    public ServiceManager<TotalFreedomMod> services;
-    public ServerInterface si;
-    public SavedFlags sf;
-    public WorldManager wm;
-    public LogViewer lv;
-    public AdminList al;
-    public RankManager rm;
+    // Service Handler
+    public FreedomServiceHandler fsh;
+    // Command Loader
     public CommandLoader cl;
+    // Services
+    public WorldManager wm;
+    public AdminList al;
+    public ActivityLog acl;
+    public RankManager rm;
     public CommandBlocker cb;
     public EventBlocker eb;
     public BlockBlocker bb;
@@ -72,24 +85,29 @@ public class TotalFreedomMod extends AeroPlugin<TotalFreedomMod>
     public AntiNuke nu;
     public AntiSpam as;
     public PlayerList pl;
+    public Shop sh;
+    public Votifier vo;
+    public SQLite sql;
     public Announcer an;
     public ChatManager cm;
+    public Discord dc;
+    public PunishmentList pul;
     public BanManager bm;
-    public PermbanList pm;
-    public ProtectArea pa;
+    public IndefiniteBanList im;
+    public PermissionManager pem;
     public GameRuleHandler gr;
-    public RollbackManager rb;
     public CommandSpy cs;
     public Cager ca;
     public Freezer fm;
+    public EditBlocker ebl;
+    public PVPBlocker pbl;
     public Orbiter or;
     public Muter mu;
     public Fuckoff fo;
     public AutoKick ak;
     public AutoEject ae;
+    public Monitors mo;
     public MovementValidator mv;
-    public EntityWiper ew;
-    public FrontDoor fd;
     public ServerPing sp;
     public ItemFun it;
     public Landminer lm;
@@ -97,156 +115,115 @@ public class TotalFreedomMod extends AeroPlugin<TotalFreedomMod>
     public Jumppads jp;
     public Trailer tr;
     public HTTPDaemon hd;
+    public WorldRestrictions wr;
+    public EntityWiper ew;
+    public VanishHandler vh;
     //
     // Bridges
-    public ServiceManager<TotalFreedomMod> bridges;
     public BukkitTelnetBridge btb;
     public EssentialsBridge esb;
     public LibsDisguisesBridge ldb;
+    public CoreProtectBridge cpb;
     public WorldEditBridge web;
+    public WorldGuardBridge wgb;
+
+    public static TotalFreedomMod getPlugin()
+    {
+        return plugin;
+    }
+
+    public static TotalFreedomMod plugin()
+    {
+        for (Plugin plugin : Bukkit.getPluginManager().getPlugins())
+        {
+            if (plugin.getName().equalsIgnoreCase(pluginName))
+            {
+                return (TotalFreedomMod)plugin;
+            }
+        }
+        return null;
+    }
 
     @Override
-    public void load()
+    public void onLoad()
     {
+        plugin = this;
         TotalFreedomMod.pluginName = plugin.getDescription().getName();
         TotalFreedomMod.pluginVersion = plugin.getDescription().getVersion();
 
         FLog.setPluginLogger(plugin.getLogger());
-        FLog.setServerLogger(server.getLogger());
+        FLog.setServerLogger(getServer().getLogger());
 
         build.load(plugin);
     }
 
     @Override
-    public void enable()
+    public void onEnable()
     {
         FLog.info("Created by Madgeek1450 and Prozza");
-        FLog.info("Version " + build.formattedVersion());
+        FLog.info("Version " + build.version);
         FLog.info("Compiled " + build.date + " by " + build.author);
 
         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"));
 
-        // Convert old config files
-        new ConfigConverter(plugin).convert();
+        fsh = new FreedomServiceHandler();
 
-        BackupManager backups = new BackupManager(this);
-        backups.createBackups(TotalFreedomMod.CONFIG_FILENAME, true);
-        backups.createBackups(AdminList.CONFIG_FILENAME);
-        backups.createBackups(PermbanList.CONFIG_FILENAME);
+        config = new MainConfig();
 
-        config = new MainConfig(this);
-        config.load();
+        if (FUtil.inDeveloperMode())
+        {
+            FLog.debug("Developer mode enabled.");
+        }
 
-        // Start services
-        services = new ServiceManager<>(plugin);
-        si = services.registerService(ServerInterface.class);
-        sf = services.registerService(SavedFlags.class);
-        wm = services.registerService(WorldManager.class);
-        lv = services.registerService(LogViewer.class);
-        al = services.registerService(AdminList.class);
-        rm = services.registerService(RankManager.class);
-        cl = services.registerService(CommandLoader.class);
-        cb = services.registerService(CommandBlocker.class);
-        eb = services.registerService(EventBlocker.class);
-        bb = services.registerService(BlockBlocker.class);
-        mb = services.registerService(MobBlocker.class);
-        ib = services.registerService(InteractBlocker.class);
-        pb = services.registerService(PotionBlocker.class);
-        lp = services.registerService(LoginProcess.class);
-        nu = services.registerService(AntiNuke.class);
-        as = services.registerService(AntiSpam.class);
+        cl = new CommandLoader();
+        cl.loadCommands();
 
-        pl = services.registerService(PlayerList.class);
-        an = services.registerService(Announcer.class);
-        cm = services.registerService(ChatManager.class);
-        bm = services.registerService(BanManager.class);
-        pm = services.registerService(PermbanList.class);
-        pa = services.registerService(ProtectArea.class);
-        gr = services.registerService(GameRuleHandler.class);
+        BackupManager backups = new BackupManager();
+        backups.createAllBackups();
 
-        // Single admin utils
-        rb = services.registerService(RollbackManager.class);
-        cs = services.registerService(CommandSpy.class);
-        ca = services.registerService(Cager.class);
-        fm = services.registerService(Freezer.class);
-        or = services.registerService(Orbiter.class);
-        mu = services.registerService(Muter.class);
-        fo = services.registerService(Fuckoff.class);
-        ak = services.registerService(AutoKick.class);
-        ae = services.registerService(AutoEject.class);
+        permissions = new PermissionConfig();
+        permissions.load();
 
-        mv = services.registerService(MovementValidator.class);
-        ew = services.registerService(EntityWiper.class);
-        fd = services.registerService(FrontDoor.class);
-        sp = services.registerService(ServerPing.class);
+        mv = new MovementValidator();
+        sp = new ServerPing();
 
-        // Fun
-        it = services.registerService(ItemFun.class);
-        lm = services.registerService(Landminer.class);
-        mp = services.registerService(MP44.class);
-        jp = services.registerService(Jumppads.class);
-        tr = services.registerService(Trailer.class);
+        new Initializer();
 
-        // HTTPD
-        hd = services.registerService(HTTPDaemon.class);
-        services.start();
+        fsh.startServices();
 
-        // Start bridges
-        bridges = new ServiceManager<>(plugin);
-        btb = bridges.registerService(BukkitTelnetBridge.class);
-        esb = bridges.registerService(EssentialsBridge.class);
-        ldb = bridges.registerService(LibsDisguisesBridge.class);
-        web = bridges.registerService(WorldEditBridge.class);
-        bridges.start();
+        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 @ http://mcstats.org/plugin/TotalFreedomMod
-        try
-        {
-            final Metrics metrics = new Metrics(plugin);
-            metrics.start();
-        }
-        catch (IOException ex)
-        {
-            FLog.warning("Failed to submit metrics data: " + ex.getMessage());
-        }
-
-        // Add spawnpoints later - https://github.com/TotalFreedom/TotalFreedomMod/issues/438
-        new BukkitRunnable()
-        {
-            @Override
-            public void run()
-            {
-                plugin.pa.autoAddSpawnpoints();
-            }
-        }.runTaskLater(plugin, 60L);
+        // Metrics @ https://bstats.org/plugin/bukkit/TotalFreedomMod/2966
+        new Metrics(this, 2966);
     }
 
     @Override
-    public void disable()
+    public void onDisable()
     {
         // Stop services and bridges
-        bridges.stop();
-        services.stop();
+        fsh.stopServices();
 
-        server.getScheduler().cancelTasks(plugin);
+        getServer().getScheduler().cancelTasks(plugin);
 
         FLog.info("Plugin disabled");
     }
 
+    @Override
+    public ChunkGenerator getDefaultWorldGenerator(@NotNull String worldName, String id)
+    {
+        return new CleanroomChunkGenerator(id);
+    }
+
     public static class BuildProperties
     {
-
         public String author;
         public String codename;
         public String version;
@@ -259,22 +236,24 @@ public class TotalFreedomMod extends AeroPlugin<TotalFreedomMod>
             try
             {
                 final Properties props;
+
                 try (InputStream in = plugin.getResource("build.properties"))
                 {
                     props = new Properties();
                     props.load(in);
                 }
 
-                author = props.getProperty("program.build.author", "unknown");
-                codename = props.getProperty("program.build.codename", "unknown");
-                version = props.getProperty("program.build.version", "unknown");
-                number = props.getProperty("program.build.number", "1");
-                date = props.getProperty("program.build.date", "unknown");
-                head = props.getProperty("program.build.head", "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)
             {
-                FLog.severe("Could not load build properties! Did you compile with Netbeans/Maven?");
+                FLog.severe("Could not load build properties! Did you compile with NetBeans/Maven?");
                 FLog.severe(ex);
             }
         }
@@ -285,16 +264,94 @@ public class TotalFreedomMod extends AeroPlugin<TotalFreedomMod>
         }
     }
 
-    public static TotalFreedomMod plugin()
+    /**
+     * This class is provided to please Codacy.
+     */
+    private final class Initializer
     {
-        for (Plugin plugin : Bukkit.getPluginManager().getPlugins())
+        public Initializer()
         {
-            if (plugin.getName().equalsIgnoreCase(pluginName))
-            {
-                return (TotalFreedomMod) plugin;
-            }
+            initServices();
+            initAdminUtils();
+            initBridges();
+            initFun();
+            initHTTPD();
         }
-        return null;
-    }
 
-}
+        private void initServices()
+        {
+            // Start services
+            wm = new WorldManager();
+            sql = new SQLite();
+            al = new AdminList();
+            acl = new ActivityLog();
+            rm = new RankManager();
+            cb = new CommandBlocker();
+            eb = new EventBlocker();
+            bb = new BlockBlocker();
+            mb = new MobBlocker();
+            ib = new InteractBlocker();
+            pb = new PotionBlocker();
+            lp = new LoginProcess();
+            nu = new AntiNuke();
+            as = new AntiSpam();
+            wr = new WorldRestrictions();
+            pl = new PlayerList();
+            sh = new Shop();
+            vo = new Votifier();
+            an = new Announcer();
+            cm = new ChatManager();
+            dc = new Discord();
+            pul = new PunishmentList();
+            bm = new BanManager();
+            im = new IndefiniteBanList();
+            pem = new PermissionManager();
+            gr = new GameRuleHandler();
+            ew = new EntityWiper();
+            vh = new VanishHandler();
+        }
+
+        private void initAdminUtils()
+        {
+            // Single admin utils
+            cs = new CommandSpy();
+            ca = new Cager();
+            fm = new Freezer();
+            or = new Orbiter();
+            mu = new Muter();
+            ebl = new EditBlocker();
+            pbl = new PVPBlocker();
+            fo = new Fuckoff();
+            ak = new AutoKick();
+            ae = new AutoEject();
+            mo = new Monitors();
+        }
+
+        private void initBridges()
+        {
+            // Start bridges
+            btb = new BukkitTelnetBridge();
+            cpb = new CoreProtectBridge();
+            esb = new EssentialsBridge();
+            ldb = new LibsDisguisesBridge();
+            web = new WorldEditBridge();
+            wgb = new WorldGuardBridge();
+        }
+
+        private void initFun()
+        {
+            // Fun
+            it = new ItemFun();
+            lm = new Landminer();
+            mp = new MP44();
+            jp = new Jumppads();
+            tr = new Trailer();
+        }
+
+        private void initHTTPD()
+        {
+            // HTTPD
+            hd = new HTTPDaemon();
+        }
+    }
+}

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

@@ -0,0 +1,76 @@
+package me.totalfreedom.totalfreedommod;
+
+import me.totalfreedom.totalfreedommod.util.FLog;
+import net.kyori.adventure.text.Component;
+import net.kyori.adventure.text.format.NamedTextColor;
+import net.md_5.bungee.api.ChatMessageType;
+import net.md_5.bungee.api.chat.TextComponent;
+import org.bukkit.ChatColor;
+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);
+            FLog.info(player.getName() + " joined while still vanished.");
+            plugin.al.messageAllAdmins(ChatColor.YELLOW + player.getName() + " has joined silently.");
+            event.joinMessage(null);
+
+            new BukkitRunnable()
+            {
+                @Override
+                public void run()
+                {
+                    if (plugin.al.isVanished(player.getUniqueId()))
+                    {
+                        player.sendActionBar(Component.text("You are hidden from other players.").color(NamedTextColor.GOLD));
+                    }
+                    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);
+            FLog.info(player.getName() + " left while still vanished.");
+            plugin.al.messageAllAdmins(ChatColor.YELLOW + player.getName() + " has left silently.");
+        }
+    }
+}

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

@@ -0,0 +1,212 @@
+package me.totalfreedom.totalfreedommod.admin;
+
+import com.google.common.collect.Maps;
+import java.util.Map;
+import me.totalfreedom.totalfreedommod.FreedomService;
+import me.totalfreedom.totalfreedommod.config.YamlConfig;
+import me.totalfreedom.totalfreedommod.util.FLog;
+import me.totalfreedom.totalfreedommod.util.FUtil;
+import org.bukkit.command.CommandSender;
+import org.bukkit.configuration.ConfigurationSection;
+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;
+
+public class ActivityLog extends FreedomService
+{
+
+    public static final String FILENAME = "activitylog.yml";
+
+    private final Map<String, ActivityLogEntry> allActivityLogs = Maps.newHashMap();
+    private final Map<String, ActivityLogEntry> nameTable = Maps.newHashMap();
+    private final Map<String, ActivityLogEntry> ipTable = Maps.newHashMap();
+
+    private final YamlConfig config;
+
+    public ActivityLog()
+    {
+        this.config = new YamlConfig(plugin, FILENAME, true);
+    }
+
+    public static String getFILENAME()
+    {
+        return FILENAME;
+    }
+
+    @Override
+    public void onStart()
+    {
+        load();
+    }
+
+    @Override
+    public void onStop()
+    {
+        save();
+    }
+
+    public void load()
+    {
+        config.load();
+
+        allActivityLogs.clear();
+        nameTable.clear();
+        ipTable.clear();
+        for (String key : config.getKeys(false))
+        {
+            ConfigurationSection section = config.getConfigurationSection(key);
+            if (section == null)
+            {
+                FLog.warning("Invalid activity log format: " + key);
+                continue;
+            }
+
+            ActivityLogEntry activityLogEntry = new ActivityLogEntry(key);
+            activityLogEntry.loadFrom(section);
+
+            if (!activityLogEntry.isValid())
+            {
+                FLog.warning("Could not load activity log: " + key + ". Missing details!");
+                continue;
+            }
+
+            allActivityLogs.put(key, activityLogEntry);
+        }
+
+        updateTables();
+        FLog.info("Loaded " + allActivityLogs.size() + " activity logs");
+    }
+
+    public void save()
+    {
+        // Clear the config
+        for (String key : config.getKeys(false))
+        {
+            config.set(key, null);
+        }
+
+        for (ActivityLogEntry activityLog : allActivityLogs.values())
+        {
+            activityLog.saveTo(config.createSection(activityLog.getConfigKey()));
+        }
+
+        config.save();
+    }
+
+    public ActivityLogEntry getActivityLog(CommandSender sender)
+    {
+        if (sender instanceof Player)
+        {
+            return getActivityLog((Player)sender);
+        }
+
+        return getEntryByName(sender.getName());
+    }
+
+    public ActivityLogEntry getActivityLog(Player player)
+    {
+        ActivityLogEntry activityLog = getEntryByName(player.getName());
+        if (activityLog == null)
+        {
+            String ip = FUtil.getIp(player);
+            activityLog = getEntryByIp(ip);
+            if (activityLog != null)
+            {
+                // Set the new username
+                activityLog.setName(player.getName());
+                save();
+                updateTables();
+            }
+            else
+            {
+                activityLog = new ActivityLogEntry(player);
+                allActivityLogs.put(activityLog.getConfigKey(), activityLog);
+                updateTables();
+
+                activityLog.saveTo(config.createSection(activityLog.getConfigKey()));
+                config.save();
+            }
+        }
+        String ip = FUtil.getIp(player);
+        if (!activityLog.getIps().contains(ip))
+        {
+            activityLog.addIp(ip);
+            save();
+            updateTables();
+        }
+        return activityLog;
+    }
+
+    public ActivityLogEntry getEntryByName(String name)
+    {
+        return nameTable.get(name.toLowerCase());
+    }
+
+    public ActivityLogEntry getEntryByIp(String ip)
+    {
+        return ipTable.get(ip);
+    }
+
+    public void updateTables()
+    {
+        nameTable.clear();
+        ipTable.clear();
+
+        for (ActivityLogEntry activityLog : allActivityLogs.values())
+        {
+            nameTable.put(activityLog.getName().toLowerCase(), activityLog);
+
+            for (String ip : activityLog.getIps())
+            {
+                ipTable.put(ip, activityLog);
+            }
+
+        }
+    }
+
+    @EventHandler(priority = EventPriority.HIGH)
+    public void onPlayerJoin(PlayerJoinEvent event)
+    {
+        Player player = event.getPlayer();
+        if (plugin.al.isAdmin(player))
+        {
+            getActivityLog(event.getPlayer()).addLogin();
+            plugin.acl.save();
+            plugin.acl.updateTables();
+        }
+    }
+
+    @EventHandler(priority = EventPriority.HIGH)
+    public void onPlayerQuit(PlayerQuitEvent event)
+    {
+        Player player = event.getPlayer();
+        if (plugin.al.isAdmin(player))
+        {
+            getActivityLog(event.getPlayer()).addLogout();
+            plugin.acl.save();
+            plugin.acl.updateTables();
+        }
+    }
+
+    public Map<String, ActivityLogEntry> getAllActivityLogs()
+    {
+        return allActivityLogs;
+    }
+
+    public Map<String, ActivityLogEntry> getNameTable()
+    {
+        return nameTable;
+    }
+
+    public Map<String, ActivityLogEntry> getIpTable()
+    {
+        return ipTable;
+    }
+
+    public YamlConfig getConfig()
+    {
+        return config;
+    }
+}

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

@@ -0,0 +1,181 @@
+package me.totalfreedom.totalfreedommod.admin;
+
+import com.google.common.collect.Lists;
+import java.time.Instant;
+import java.util.Date;
+import java.util.List;
+import me.totalfreedom.totalfreedommod.config.IConfig;
+import me.totalfreedom.totalfreedommod.util.FUtil;
+import org.apache.commons.lang.Validate;
+import org.bukkit.configuration.ConfigurationSection;
+import org.bukkit.entity.Player;
+
+public class ActivityLogEntry implements IConfig
+{
+
+    public static final String FILENAME = "activitylog.yml";
+    private final List<String> ips = Lists.newArrayList();
+    private final List<String> timestamps = Lists.newArrayList();
+    private final List<String> durations = Lists.newArrayList();
+    private String configKey;
+    private String name;
+
+    public ActivityLogEntry(Player player)
+    {
+        this.configKey = player.getName().toLowerCase();
+        this.name = player.getName();
+    }
+
+    public ActivityLogEntry(String configKey)
+    {
+        this.configKey = configKey;
+    }
+
+    public static String getFILENAME()
+    {
+        return FILENAME;
+    }
+
+    public void loadFrom(Player player)
+    {
+        configKey = player.getName().toLowerCase();
+        name = player.getName();
+    }
+
+    @Override
+    public void loadFrom(ConfigurationSection cs)
+    {
+        name = cs.getString("username", configKey);
+        ips.clear();
+        ips.addAll(cs.getStringList("ips"));
+        timestamps.clear();
+        timestamps.addAll(cs.getStringList("timestamps"));
+        durations.clear();
+        durations.addAll(cs.getStringList("durations"));
+    }
+
+    @Override
+    public void saveTo(ConfigurationSection cs)
+    {
+        Validate.isTrue(isValid(), "Could not save activity entry: " + name + ". Entry not valid!");
+        cs.set("username", name);
+        cs.set("ips", Lists.newArrayList(ips));
+        cs.set("timestamps", Lists.newArrayList(timestamps));
+        cs.set("durations", Lists.newArrayList(durations));
+    }
+
+    public void addLogin()
+    {
+        this.addLogin(System.currentTimeMillis());
+    }
+
+    public void addLogin(final long timestamp)
+    {
+        Date time = Date.from(Instant.ofEpochMilli(timestamp));
+        timestamps.add("Login: " + FUtil.dateToString(time));
+    }
+
+    public void addLogout()
+    {
+        // Fix of Array index out of bonds issue: FS-131
+        String lastLoginString;
+        if(timestamps.size() > 1)
+        {
+            lastLoginString = timestamps.get(timestamps.size() - 1);
+        }else
+        {
+            lastLoginString = timestamps.get(0);
+        }
+        Date currentTime = Date.from(Instant.now());
+        timestamps.add("Logout: " + FUtil.dateToString(currentTime));
+        lastLoginString = lastLoginString.replace("Login: ", "");
+        Date lastLogin = FUtil.stringToDate(lastLoginString);
+
+        long duration = currentTime.getTime() - lastLogin.getTime();
+        long seconds = duration / 1000 % 60;
+        long minutes = duration / (60 * 1000) % 60;
+        long hours = duration / (60 * 60 * 1000);
+        durations.add(hours + " hours, " + minutes + " minutes, and " + seconds + " seconds");
+    }
+
+    public void addIp(String ip)
+    {
+        if (!ips.contains(ip))
+        {
+            ips.add(ip);
+        }
+    }
+
+    public void addIps(List<String> ips)
+    {
+        for (String ip : ips)
+        {
+            addIp(ip);
+        }
+    }
+
+    public void removeIp(String ip)
+    {
+        ips.remove(ip);
+    }
+
+    public void clearIPs()
+    {
+        ips.clear();
+    }
+
+    public int getTotalSecondsPlayed()
+    {
+        int result = 0;
+        for (String duration : durations)
+        {
+            String[] spl = duration.split(" ");
+            result += Integer.parseInt(spl[0]) * 60 * 60;
+            result += Integer.parseInt(spl[2]) * 60;
+            result += Integer.parseInt(spl[5]);
+        }
+        return result;
+    }
+
+    @Override
+    public boolean isValid()
+    {
+        return configKey != null
+                && name != null;
+    }
+
+    public String getConfigKey()
+    {
+        return configKey;
+    }
+
+    public void setConfigKey(String configKey)
+    {
+        this.configKey = configKey;
+    }
+
+    public String getName()
+    {
+        return name;
+    }
+
+    public void setName(String name)
+    {
+        this.name = name;
+    }
+
+    public List<String> getIps()
+    {
+        return ips;
+    }
+
+    public List<String> getTimestamps()
+    {
+        return timestamps;
+    }
+
+    public List<String> getDurations()
+    {
+        return durations;
+    }
+}

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

@@ -1,55 +1,54 @@
 package me.totalfreedom.totalfreedommod.admin;
 
-import com.google.common.collect.Lists;
-import java.util.Date;
-import java.util.List;
-import lombok.Getter;
-import lombok.Setter;
-import me.totalfreedom.totalfreedommod.LogViewer.LogsRegistrationMode;
+import java.sql.ResultSet;
+import java.sql.SQLException;
+import java.util.*;
+
 import me.totalfreedom.totalfreedommod.TotalFreedomMod;
+import me.totalfreedom.totalfreedommod.player.FPlayer;
 import me.totalfreedom.totalfreedommod.rank.Rank;
+import me.totalfreedom.totalfreedommod.util.FLog;
 import me.totalfreedom.totalfreedommod.util.FUtil;
-import net.pravian.aero.base.ConfigLoadable;
-import net.pravian.aero.base.ConfigSavable;
-import net.pravian.aero.base.Validatable;
-import net.pravian.aero.util.Ips;
-import org.apache.commons.lang3.StringUtils;
-import org.apache.commons.lang3.Validate;
-import org.bukkit.configuration.ConfigurationSection;
+import org.apache.commons.lang.StringUtils;
+import org.bukkit.Bukkit;
+import org.bukkit.Server;
 import org.bukkit.entity.Player;
 
-public class Admin implements ConfigLoadable, ConfigSavable, Validatable
+public class Admin
 {
-
-    @Getter
-    private String configKey;
-    @Getter
-    @Setter
-    private String name;
-    @Getter
+    private final List<String> ips = new ArrayList<>();
+    private UUID uuid;
     private boolean active = true;
-    @Getter
-    @Setter
-    private Rank rank = Rank.SUPER_ADMIN;
-    @Getter
-    private final List<String> ips = Lists.newArrayList();
-    @Getter
-    @Setter
+    private Rank rank = Rank.ADMIN;
     private Date lastLogin = new Date();
-    @Getter
-    @Setter
-    private String loginMessage = null;
+    private Boolean commandSpy = false;
+    private Boolean potionSpy = false;
+    private String acFormat = null;
 
     public Admin(Player player)
     {
-        this.configKey = player.getName().toLowerCase();
-        this.name = player.getName();
-        this.ips.add(Ips.getIp(player));
+        uuid = player.getUniqueId();
+        this.ips.add(FUtil.getIp(player));
     }
 
-    public Admin(String configKey)
+    public Admin(ResultSet resultSet)
     {
-        this.configKey = configKey;
+        try
+        {
+            this.uuid = UUID.fromString(resultSet.getString("uuid"));
+            this.active = resultSet.getBoolean("active");
+            this.rank = Rank.findRank(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");
+        }
+        catch (SQLException e)
+        {
+            FLog.severe("Failed to load admin: " + e.getMessage());
+        }
     }
 
     @Override
@@ -57,56 +56,31 @@ public class Admin implements ConfigLoadable, ConfigSavable, Validatable
     {
         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("- Custom Login Message: ").append(loginMessage).append("\n")
                 .append("- Rank: ").append(rank.getName()).append("\n")
-                .append("- Is Active: ").append(active);
+                .append("- Is Active: ").append(active).append("\n")
+                .append("- Potion Spy: ").append(potionSpy).append("\n")
+                .append("- Admin Chat Format: ").append(acFormat).append("\n");
 
         return output.toString();
     }
 
-    public void loadFrom(Player player)
+    public Map<String, Object> toSQLStorable()
     {
-        configKey = player.getName().toLowerCase();
-        name = player.getName();
-        ips.clear();
-        ips.add(Ips.getIp(player));
-    }
-
-    @Override
-    public void loadFrom(ConfigurationSection cs)
-    {
-        name = cs.getString("username", configKey);
-        active = cs.getBoolean("active", true);
-        rank = Rank.findRank(cs.getString("rank"));
-        ips.clear();
-        ips.addAll(cs.getStringList("ips"));
-        lastLogin = FUtil.stringToDate(cs.getString("last_login"));
-        loginMessage = cs.getString("login_message", null);
-    }
-
-    @Override
-    public void saveTo(ConfigurationSection cs)
-    {
-        Validate.isTrue(isValid(), "Could not save admin entry: " + name + ". Entry not valid!");
-        cs.set("username", name);
-        cs.set("active", active);
-        cs.set("rank", rank.toString());
-        cs.set("ips", Lists.newArrayList(ips));
-        cs.set("last_login", FUtil.dateToString(lastLogin));
-        cs.set("login_message", loginMessage);
-    }
-
-    public boolean isAtLeast(Rank pRank)
-    {
-        return rank.isAtLeast(pRank);
-    }
-
-    public boolean hasLoginMessage()
-    {
-        return loginMessage != null && !loginMessage.isEmpty();
+        Map<String, Object> map = new HashMap<String, Object>()
+        {{
+            put("uuid", uuid.toString());
+            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);
+        }};
+        return map;
     }
 
     // Util IP methods
@@ -128,10 +102,7 @@ public class Admin implements ConfigLoadable, ConfigSavable, Validatable
 
     public void removeIp(String ip)
     {
-        if (ips.contains(ip))
-        {
-            ips.remove(ip);
-        }
+        ips.remove(ip);
     }
 
     public void clearIPs()
@@ -139,33 +110,134 @@ public class Admin implements ConfigLoadable, ConfigSavable, Validatable
         ips.clear();
     }
 
+    public boolean isValid()
+    {
+        return uuid != null
+                && rank != null
+                && !ips.isEmpty()
+                && lastLogin != null;
+    }
+
+    public UUID getUuid()
+    {
+        return uuid;
+    }
+
+    public String getName()
+    {
+        return Bukkit.getOfflinePlayer(uuid).getName();
+    }
+
+    public boolean isActive()
+    {
+        return active;
+    }
+
     public void setActive(boolean active)
     {
         this.active = active;
 
-        final TotalFreedomMod plugin = TotalFreedomMod.plugin();
+        final TotalFreedomMod plugin = TotalFreedomMod.getPlugin();
+
+        // Avoiding stupid NPE compiler warnings
+        if (plugin == null)
+        {
+            Bukkit.getLogger().severe("The plugin is null!! This is a major issue and WILL break the plugin!");
+            return;
+        }
 
         if (!active)
         {
-            if (getRank().isAtLeast(Rank.TELNET_ADMIN))
+            if (getRank().isAtLeast(Rank.ADMIN))
             {
                 if (plugin.btb != null)
                 {
                     plugin.btb.killTelnetSessions(getName());
                 }
-            }
 
-            plugin.lv.updateLogsRegistration(null, getName(), LogsRegistrationMode.DELETE);
+                // 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);
+                    }
+                }
+
+            }
         }
     }
 
-    @Override
-    public boolean isValid()
+    public Rank getRank()
     {
-        return configKey != null
-                && name != null
-                && rank != null
-                && !ips.isEmpty()
-                && lastLogin != null;
+        return rank;
     }
-}
+
+    public void setRank(Rank rank)
+    {
+        this.rank = rank;
+    }
+
+    public List<String> getIps()
+    {
+        return ips;
+    }
+
+    public Date getLastLogin()
+    {
+        return lastLogin;
+    }
+
+    public void setLastLogin(Date lastLogin)
+    {
+        this.lastLogin = lastLogin;
+    }
+
+    public Boolean getCommandSpy()
+    {
+        return commandSpy;
+    }
+
+    public void setCommandSpy(Boolean commandSpy)
+    {
+        this.commandSpy = commandSpy;
+    }
+
+    public Boolean getPotionSpy()
+    {
+        return potionSpy;
+    }
+
+    public void setPotionSpy(Boolean potionSpy)
+    {
+        this.potionSpy = potionSpy;
+    }
+
+    public String getAcFormat()
+    {
+        return acFormat;
+    }
+
+    public void setAcFormat(String acFormat)
+    {
+        this.acFormat = acFormat;
+    }
+}

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

@@ -1,116 +1,92 @@
 package me.totalfreedom.totalfreedommod.admin;
 
-import com.google.common.base.Function;
 import com.google.common.collect.Maps;
 import com.google.common.collect.Sets;
-import java.util.Date;
-import java.util.Map;
-import java.util.Set;
+import java.sql.ResultSet;
+import java.sql.SQLException;
+import java.util.*;
 import java.util.concurrent.TimeUnit;
-import lombok.Getter;
 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 net.pravian.aero.config.YamlConfig;
-import net.pravian.aero.util.Ips;
 import org.bukkit.Bukkit;
 import org.bukkit.command.CommandSender;
-import org.bukkit.configuration.ConfigurationSection;
 import org.bukkit.entity.Player;
-import org.bukkit.plugin.ServicePriority;
 
 public class AdminList extends FreedomService
 {
-
-    public static final String CONFIG_FILENAME = "admins.yml";
-
-    @Getter
-    private final Map<String, Admin> allAdmins = Maps.newHashMap(); // Includes disabled admins
+    public static final List<UUID> vanished = new ArrayList<>();
+    private final Set<Admin> allAdmins = Sets.newHashSet(); // Includes disabled admins
     // Only active admins below
-    @Getter
     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();
-    //
-    private final YamlConfig config;
-
-    public AdminList(TotalFreedomMod plugin)
-    {
-        super(plugin);
-
-        this.config = new YamlConfig(plugin, CONFIG_FILENAME, true);
-    }
 
     @Override
-    protected void onStart()
+    public void onStart()
     {
         load();
-
-        server.getServicesManager().register(Function.class, new Function<Player, Boolean>()
-        {
-            @Override
-            public Boolean apply(Player player)
-            {
-                return isAdmin(player);
-            }
-        }, plugin, ServicePriority.Normal);
-
         deactivateOldEntries(false);
     }
 
     @Override
-    protected void onStop()
+    public void onStop()
     {
-        save();
     }
 
     public void load()
     {
-        config.load();
-
         allAdmins.clear();
-        for (String key : config.getKeys(false))
+        try
         {
-            ConfigurationSection section = config.getConfigurationSection(key);
-            if (section == null)
+            ResultSet adminSet = plugin.sql.getAdminList();
+            while (adminSet.next())
             {
-                logger.warning("Invalid admin list format: " + key);
-                continue;
+                try
+                {
+                    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);
+                }
             }
-
-            Admin admin = new Admin(key);
-            admin.loadFrom(section);
-
-            if (!admin.isValid())
-            {
-                FLog.warning("Could not load admin: " + key + ". Missing details!");
-                continue;
-            }
-
-            allAdmins.put(key, admin);
+        }
+        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 save()
+    public void messageAllAdmins(String message)
     {
-        // Clear the config
-        for (String key : config.getKeys(false))
+        for (Player player : server.getOnlinePlayers())
         {
-            config.set(key, null);
+            if (isAdmin(player))
+            {
+                player.sendMessage(message);
+            }
         }
+    }
 
-        for (Admin admin : allAdmins.values())
+    public void potionSpyMessage(String message)
+    {
+        for (Player player : server.getOnlinePlayers())
         {
-            admin.saveTo(config.createSection(admin.getConfigKey()));
+            Admin admin = getAdmin(player.getPlayer());
+            if (isAdmin(player) && admin.getPotionSpy())
+            {
+                player.sendMessage(message);
+            }
         }
-
-        config.save();
     }
 
     public synchronized boolean isAdminSync(CommandSender sender)
@@ -125,7 +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 (player == null)
+        {
+            return true;
+        }
+
+        Admin admin = getAdmin(player);
 
         return admin != null && admin.isActive();
     }
@@ -145,7 +133,7 @@ public class AdminList extends FreedomService
     {
         if (sender instanceof Player)
         {
-            return getAdmin((Player) sender);
+            return getAdmin((Player)sender);
         }
 
         return getEntryByName(sender.getName());
@@ -153,41 +141,20 @@ public class AdminList extends FreedomService
 
     public Admin getAdmin(Player player)
     {
-        // Find admin
-        String ip = Ips.getIp(player);
-        Admin admin = getEntryByName(player.getName());
+        final String ip = FUtil.getIp(player);
+        final Admin entry = getEntryByUuid(player.getUniqueId());
 
-        // Admin by name
-        if (admin != null)
+        if (entry != null && !entry.getIps().contains(ip))
         {
-            // Check if we're in online mode,
-            // Or the players IP is in the admin entry
-            if (Bukkit.getOnlineMode() || admin.getIps().contains(ip))
-            {
-                if (!admin.getIps().contains(ip))
-                {
-                    // Add the new IP if we have to
-                    admin.addIp(ip);
-                    save();
-                    updateTables();
-                }
-                return admin;
-            }
-
-            // Impostor
+            entry.addIp(ip);
         }
 
-        // Admin by ip
-        admin = getEntryByIp(ip);
-        if (admin != null)
-        {
-            // Set the new username
-            admin.setName(player.getName());
-            save();
-            updateTables();
-        }
+        return entry;
+    }
 
-        return null;
+    public Admin getEntryByUuid(UUID uuid)
+    {
+        return uuidTable.get(uuid);
     }
 
     public Admin getEntryByName(String name)
@@ -200,25 +167,6 @@ public class AdminList extends FreedomService
         return ipTable.get(ip);
     }
 
-    public Admin getEntryByIpFuzzy(String needleIp)
-    {
-        final Admin directAdmin = getEntryByIp(needleIp);
-        if (directAdmin != null)
-        {
-            return directAdmin;
-        }
-
-        for (String ip : ipTable.keySet())
-        {
-            if (FUtil.fuzzyIpMatch(needleIp, ip, 3))
-            {
-                return ipTable.get(ip);
-            }
-        }
-
-        return null;
-    }
-
     public void updateLastLogin(Player player)
     {
         final Admin admin = getAdmin(player);
@@ -228,50 +176,39 @@ public class AdminList extends FreedomService
         }
 
         admin.setLastLogin(new Date());
-        admin.setName(player.getName());
-        save();
-    }
-
-    public boolean isAdminImpostor(Player player)
-    {
-        return getEntryByName(player.getName()) != null && !isAdmin(player);
-    }
-
-    public boolean isIdentityMatched(Player player)
-    {
-        if (Bukkit.getOnlineMode())
-        {
-            return true;
-        }
-
-        Admin admin = getAdmin(player);
-        return admin == null ? false : admin.getName().equalsIgnoreCase(player.getName());
+        save(admin);
     }
 
     public boolean addAdmin(Admin admin)
     {
         if (!admin.isValid())
         {
-            logger.warning("Could not add admin: " + admin.getConfigKey() + " Admin is missing details!");
+            FLog.warning("Could not add admin: " + admin.getName() + ". Admin is missing details!");
             return false;
         }
 
-        final String key = admin.getConfigKey();
-
         // Store admin, update views
-        allAdmins.put(key, admin);
+        allAdmins.add(admin);
         updateTables();
 
         // Save admin
-        admin.saveTo(config.createSection(key));
-        config.save();
+        plugin.sql.addAdmin(admin);
+
+        // Add login time
+        UUID uuid = admin.getUuid();
+        Player player = Bukkit.getPlayer(uuid);
+
+        if (player != null)
+        {
+            plugin.acl.getActivityLog(player).addLogin(player.getLastLogin());
+        }
 
         return true;
     }
 
     public boolean removeAdmin(Admin admin)
     {
-        if (admin.getRank().isAtLeast(Rank.TELNET_ADMIN))
+        if (admin.getRank().isAtLeast(Rank.ADMIN))
         {
             if (plugin.btb != null)
             {
@@ -280,15 +217,14 @@ public class AdminList extends FreedomService
         }
 
         // Remove admin, update views
-        if (allAdmins.remove(admin.getConfigKey()) == null)
+        if (!allAdmins.remove(admin))
         {
             return false;
         }
         updateTables();
 
-        // 'Unsave' admin
-        config.set(admin.getConfigKey(), null);
-        config.save();
+        // Unsave admin
+        plugin.sql.removeAdmin(admin);
 
         return true;
     }
@@ -296,10 +232,11 @@ public class AdminList extends FreedomService
     public void updateTables()
     {
         activeAdmins.clear();
+        uuidTable.clear();
         nameTable.clear();
         ipTable.clear();
 
-        for (Admin admin : allAdmins.values())
+        for (Admin admin : allAdmins)
         {
             if (!admin.isActive())
             {
@@ -307,16 +244,17 @@ 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);
             }
-
         }
-
-        plugin.wm.adminworld.wipeAccessCache();
     }
 
     public Set<String> getAdminNames()
@@ -329,9 +267,29 @@ public class AdminList extends FreedomService
         return ipTable.keySet();
     }
 
+    public void save(Admin admin)
+    {
+        try
+        {
+            ResultSet currentSave = plugin.sql.getAdminByUuid(admin.getUuid());
+            for (Map.Entry<String, Object> entry : admin.toSQLStorable().entrySet())
+            {
+                Object storedValue = plugin.sql.getValue(currentSave, entry.getKey(), entry.getValue());
+                if (storedValue != null && !storedValue.equals(entry.getValue()) || storedValue == null && entry.getValue() != null || entry.getValue() == null)
+                {
+                    plugin.sql.setAdminValue(admin, entry.getKey(), entry.getValue());
+                }
+            }
+        }
+        catch (SQLException e)
+        {
+            FLog.severe("Failed to save admin: " + e.getMessage());
+        }
+    }
+
     public void deactivateOldEntries(boolean verbose)
     {
-        for (Admin admin : allAdmins.values())
+        for (Admin admin : allAdmins)
         {
             if (!admin.isActive() || admin.getRank().isAtLeast(Rank.SENIOR_ADMIN))
             {
@@ -348,13 +306,38 @@ public class AdminList extends FreedomService
 
             if (verbose)
             {
-                FUtil.adminAction("TotalFreedomMod", "Deactivating superadmin " + admin.getName() + ", inactive for " + lastLoginHours + " hours", true);
+                FUtil.adminAction("TotalFreedomMod", "Deactivating admin " + admin.getName() + ", inactive for " + lastLoginHours + " hours", true);
             }
 
             admin.setActive(false);
+            save(admin);
         }
 
-        save();
         updateTables();
     }
-}
+
+    public boolean isVanished(UUID uuid)
+    {
+        return vanished.contains(uuid);
+    }
+
+    public Set<Admin> getAllAdmins()
+    {
+        return allAdmins;
+    }
+
+    public Set<Admin> getActiveAdmins()
+    {
+        return activeAdmins;
+    }
+
+    public Map<String, Admin> getNameTable()
+    {
+        return nameTable;
+    }
+
+    public Map<String, Admin> getIpTable()
+    {
+        return ipTable;
+    }
+}

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

@@ -2,70 +2,68 @@ package me.totalfreedom.totalfreedommod.banning;
 
 import com.google.common.collect.Lists;
 import java.text.SimpleDateFormat;
-import java.util.Arrays;
+import java.time.Instant;
+import java.util.ArrayList;
+import java.util.Collections;
 import java.util.Date;
 import java.util.HashSet;
-import java.util.Iterator;
 import java.util.List;
 import java.util.Set;
-import lombok.Getter;
-import lombok.Setter;
+import java.util.UUID;
 import me.totalfreedom.totalfreedommod.config.ConfigEntry;
 import me.totalfreedom.totalfreedommod.util.FUtil;
-import net.pravian.aero.base.ConfigLoadable;
-import net.pravian.aero.base.ConfigSavable;
-import net.pravian.aero.base.Validatable;
-import net.pravian.aero.util.Ips;
 import org.bukkit.ChatColor;
 import org.bukkit.command.CommandSender;
-import org.bukkit.configuration.ConfigurationSection;
 import org.bukkit.entity.Player;
 
-public class Ban implements ConfigLoadable, ConfigSavable, Validatable
+public class Ban
 {
 
-    public static final SimpleDateFormat DATE_FORMAT = new SimpleDateFormat("yyyy-MM-dd \'at\' HH:mm:ss z");
-
-    @Getter
-    @Setter
-    private String username = null;
-    @Getter
+    public static final SimpleDateFormat DATE_FORMAT = new SimpleDateFormat("yyyy-MM-dd 'at' HH:mm:ss z");
     private final List<String> ips = Lists.newArrayList();
-    @Getter
-    @Setter
+    private String username = null;
+    private UUID uuid = null;
     private String by = null;
-    @Getter
-    @Setter
+
+
+    private Date at = null;
+
+
     private String reason = null; // Unformatted, &[0-9,a-f] instead of ChatColor
-    @Getter
-    @Setter
+
+
     private long expiryUnix = -1;
 
     public Ban()
     {
     }
 
-    public Ban(String username, String ip, String by, Date expire, String reason)
+    public Ban(String username, UUID uuid, String ip, String by, Date at, Date expire, String reason)
     {
         this(username,
-                new String[]
-                {
-                    ip
-                },
+                uuid,
+                Collections.singletonList(ip),
                 by,
+                at,
                 expire,
                 reason);
     }
 
-    public Ban(String username, String[] ips, String by, Date expire, String reason)
+    public Ban(String username, UUID uuid, List<String> ips, String by, Date at, Date expire, String reason)
     {
         this.username = username;
+        this.uuid = uuid;
         if (ips != null)
         {
-            this.ips.addAll(Arrays.asList(ips));
+            this.ips.addAll(ips);
         }
         dedupeIps();
         this.by = by;
+        this.at = at;
+        if (expire == null)
+        {
+            expire = FUtil.parseDateOffset("24h");
+        }
         this.expiryUnix = FUtil.getUnixTime(expire);
         this.reason = reason;
     }
@@ -79,15 +77,12 @@ public class Ban implements ConfigLoadable, ConfigSavable, Validatable
 
     public static Ban forPlayerIp(Player player, CommandSender by, Date expiry, String reason)
     {
-        return new Ban(null, new String[]
-        {
-            Ips.getIp(player)
-        }, by.getName(), expiry, reason);
+        return new Ban(null, null, Collections.singletonList(FUtil.getIp(player)), by.getName(), Date.from(Instant.now()), expiry, reason);
     }
 
     public static Ban forPlayerIp(String ip, CommandSender by, Date expiry, String reason)
     {
-        return new Ban(null, ip, by.getName(), expiry, reason);
+        return new Ban(null, null, ip, by.getName(), Date.from(Instant.now()), expiry, reason);
     }
 
     //
@@ -100,8 +95,10 @@ public class Ban implements ConfigLoadable, ConfigSavable, Validatable
     public static Ban forPlayerName(String player, CommandSender by, Date expiry, String reason)
     {
         return new Ban(player,
-                (String[]) null,
+                null,
+                new ArrayList<>(),
                 by.getName(),
+                Date.from(Instant.now()),
                 expiry,
                 reason);
     }
@@ -116,19 +113,17 @@ public class Ban implements ConfigLoadable, ConfigSavable, Validatable
     public static Ban forPlayer(Player player, CommandSender by, Date expiry, String reason)
     {
         return new Ban(player.getName(),
-                Ips.getIp(player),
+                player.getUniqueId(),
+                FUtil.getIp(player),
                 by.getName(),
+                Date.from(Instant.now()),
                 expiry,
                 reason);
     }
 
-    public static Ban forPlayerFuzzy(Player player, CommandSender by, Date expiry, String reason)
+    public static SimpleDateFormat getDateFormat()
     {
-        return new Ban(player.getName(),
-                FUtil.getFuzzyIp(Ips.getIp(player)),
-                by.getName(),
-                expiry,
-                reason);
+        return DATE_FORMAT;
     }
 
     public boolean hasUsername()
@@ -136,6 +131,11 @@ public class Ban implements ConfigLoadable, ConfigSavable, Validatable
         return username != null && !username.isEmpty();
     }
 
+    public boolean hasUUID()
+    {
+        return uuid != null;
+    }
+
     public boolean addIp(String ip)
     {
         return ips.add(ip);
@@ -156,21 +156,29 @@ public class Ban implements ConfigLoadable, ConfigSavable, Validatable
         return expiryUnix > 0;
     }
 
-    public Date getExpiryDate()
-    {
-        return FUtil.getUnixDate(expiryUnix);
-    }
-
     public boolean isExpired()
     {
-        return hasExpiry() && expiryUnix < FUtil.getUnixTime();
+        return hasExpiry() && FUtil.getUnixDate(expiryUnix).before(new Date(FUtil.getUnixTime()));
     }
 
     public String bakeKickMessage()
     {
         final StringBuilder message = new StringBuilder(ChatColor.GOLD + "You");
 
-        message.append(!hasUsername() ? "r IP address is" : " are").append(" temporarily banned from this server.");
+        if (!hasUsername())
+        {
+            message.append("r IP address is");
+        }
+        else if (!hasIps())
+        {
+            message.append("r username is");
+        }
+        else
+        {
+            message.append(" are");
+        }
+
+        message.append(" temporarily banned from this server.");
         message.append("\nAppeal at ").append(ChatColor.BLUE)
                 .append(ConfigEntry.SERVER_BAN_URL.getString());
 
@@ -186,6 +194,12 @@ public class Ban implements ConfigLoadable, ConfigSavable, Validatable
                     .append(by);
         }
 
+        if (at != null)
+        {
+            message.append("\n").append(ChatColor.RED).append("Issued: ").append(ChatColor.GOLD)
+                    .append(DATE_FORMAT.format(at));
+        }
+
         if (getExpiryUnix() != 0)
         {
             message.append("\n").append(ChatColor.RED).append("Expires: ").append(ChatColor.GOLD)
@@ -208,9 +222,9 @@ public class Ban implements ConfigLoadable, ConfigSavable, Validatable
             return false;
         }
 
-        final Ban ban = (Ban) object;
+        final Ban ban = (Ban)object;
         if (hasIps() != ban.hasIps()
-                || hasUsername() != hasUsername())
+                || hasUsername() != ban.hasUsername())
         {
             return false;
         }
@@ -223,57 +237,76 @@ public class Ban implements ConfigLoadable, ConfigSavable, Validatable
         return !(hasUsername() && !(getUsername().equalsIgnoreCase(ban.getUsername())));
     }
 
-    @Override
-    public int hashCode()
-    {
-        int hash = 7;
-        hash = 79 * hash + (this.username != null ? this.username.toLowerCase().hashCode() : 0);
-        hash = 79 * hash + (this.ips != null ? this.ips.hashCode() : 0);
-        return hash;
-    }
-
-    @Override
-    public void loadFrom(ConfigurationSection cs)
-    {
-        this.username = cs.getString("username", null);
-        this.ips.clear();
-        this.ips.addAll(cs.getStringList("ips"));
-        this.by = cs.getString("by", null);
-        this.reason = cs.getString("reason", null);
-        this.expiryUnix = cs.getLong("expiry_unix", 0);
-        dedupeIps();
-    }
-
-    @Override
-    public void saveTo(ConfigurationSection cs)
-    {
-        dedupeIps();
-        cs.set("username", username);
-        cs.set("ips", ips.isEmpty() ? null : ips);
-        cs.set("by", by);
-        cs.set("reason", reason);
-        cs.set("expiry_unix", expiryUnix > 0 ? expiryUnix : null);
-    }
-
-    @Override
-    public boolean isValid()
-    {
-        return username != null || !ips.isEmpty();
-    }
-
     private void dedupeIps()
     {
-
         Set<String> uniqueIps = new HashSet<>();
 
-        Iterator<String> it = ips.iterator();
-        while (it.hasNext())
-        {
-            if (!uniqueIps.add(it.next()))
-            {
-                it.remove();
-            }
-        }
-
+        //Fancy Collections.removeIf lets you do all that while loop work in one lambda.
+        ips.removeIf(s -> !uniqueIps.add(s));
     }
-}
+
+    public List<String> getIps()
+    {
+        return ips;
+    }
+
+    public String getUsername()
+    {
+        return username;
+    }
+
+    public void setUsername(String username)
+    {
+        this.username = username;
+    }
+
+    public UUID getUuid()
+    {
+        return uuid;
+    }
+
+    public void setUuid(UUID uuid)
+    {
+        this.uuid = uuid;
+    }
+
+    public String getBy()
+    {
+        return by;
+    }
+
+    public void setBy(String by)
+    {
+        this.by = by;
+    }
+
+    public Date getAt()
+    {
+        return at;
+    }
+
+    public void setAt(Date at)
+    {
+        this.at = at;
+    }
+
+    public String getReason()
+    {
+        return reason;
+    }
+
+    public void setReason(String reason)
+    {
+        this.reason = reason;
+    }
+
+    public long getExpiryUnix()
+    {
+        return expiryUnix;
+    }
+
+    public void setExpiryUnix(long expiryUnix)
+    {
+        this.expiryUnix = expiryUnix;
+    }
+}

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

@@ -1,22 +1,20 @@
 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.Iterator;
+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.TotalFreedomMod;
-import me.totalfreedom.totalfreedommod.config.ConfigEntry;
-import me.totalfreedom.totalfreedommod.player.PlayerData;
 import me.totalfreedom.totalfreedommod.util.FLog;
 import me.totalfreedom.totalfreedommod.util.FUtil;
-import net.pravian.aero.config.YamlConfig;
-import net.pravian.aero.util.Ips;
 import org.bukkit.entity.Player;
 import org.bukkit.event.EventHandler;
 import org.bukkit.event.EventPriority;
@@ -27,60 +25,52 @@ public class BanManager extends FreedomService
 {
 
     private final Set<Ban> bans = Sets.newHashSet();
-    private final Map<String, Ban> ipBans = Maps.newHashMap();
     private final Map<String, Ban> nameBans = Maps.newHashMap();
-    private final List<String> unbannableUsernames = Lists.newArrayList();
+    private final Map<UUID, Ban> uuidBans = Maps.newHashMap();
+    private final Map<String, Ban> ipBans = Maps.newHashMap();
     //
-    private final YamlConfig config;
-
-    public BanManager(TotalFreedomMod plugin)
-    {
-        super(plugin);
-        this.config = new YamlConfig(plugin, "bans.yml");
-    }
 
     @Override
-    protected void onStart()
+    public void onStart()
     {
-        config.load();
-
         bans.clear();
-        for (String id : config.getKeys(false))
+        try
         {
-            if (!config.isConfigurationSection(id))
+            ResultSet banSet = plugin.sql.getBanList();
             {
-                FLog.warning("Could not load username ban: " + id + ". Invalid format!");
-                continue;
+                while (banSet.next())
+                {
+                    String name = banSet.getString("name");
+                    UUID uuid = null;
+                    String strUUID = banSet.getString("uuid");
+                    if (strUUID != null)
+                    {
+                        uuid = UUID.fromString(strUUID);
+                    }
+                    List<String> ips = FUtil.stringToList(banSet.getString("ips"));
+                    String by = banSet.getString("by");
+                    Date at = new Date(banSet.getLong("at"));
+                    Date expires = new Date(banSet.getLong("expires"));
+                    String reason = banSet.getString("reason");
+                    Ban ban = new Ban(name, uuid, ips, by, at, expires, reason);
+                    bans.add(ban);
+                }
             }
-
-            Ban ban = new Ban();
-            ban.loadFrom(config.getConfigurationSection(id));
-
-            if (!ban.isValid())
-            {
-                FLog.warning("Not adding username ban: " + id + ". Missing information.");
-                continue;
-            }
-
-            bans.add(ban);
+        }
+        catch (SQLException e)
+        {
+            FLog.severe("Failed to load ban list: " + e.getMessage());
         }
 
         // Remove expired bans, repopulate ipBans and nameBans,
         updateViews();
 
         FLog.info("Loaded " + ipBans.size() + " IP bans and " + nameBans.size() + " username bans.");
-
-        // Load unbannable usernames
-        unbannableUsernames.clear();
-        unbannableUsernames.addAll((Collection<? extends String>) ConfigEntry.FAMOUS_PLAYERS.getList());
-        FLog.info("Loaded " + unbannableUsernames.size() + " unbannable usernames.");
     }
 
     @Override
-    protected void onStop()
+    public void onStop()
     {
-        saveAll();
-        logger.info("Saved " + bans.size() + " player bans");
     }
 
     public Set<Ban> getAllBans()
@@ -98,21 +88,6 @@ public class BanManager extends FreedomService
         return Collections.unmodifiableCollection(nameBans.values());
     }
 
-    public void saveAll()
-    {
-        // Remove expired
-        updateViews();
-
-        config.clear();
-        for (Ban ban : bans)
-        {
-            ban.saveTo(config.createSection(String.valueOf(ban.hashCode())));
-        }
-
-        // Save config
-        config.save();
-    }
-
     public Ban getByIp(String ip)
     {
         final Ban directBan = ipBans.get(ip);
@@ -136,7 +111,7 @@ public class BanManager extends FreedomService
                     continue;
                 }
 
-                if (Ips.fuzzyIpMatch(ip, loopIp, 4))
+                if (FUtil.fuzzyIpMatch(ip, loopIp, 4))
                 {
                     return loopBan;
                 }
@@ -159,6 +134,18 @@ public class BanManager extends FreedomService
         return null;
     }
 
+    public Ban getByUUID(UUID uuid)
+    {
+        final Ban directBan = uuidBans.get(uuid);
+
+        if (directBan != null && !directBan.isExpired())
+        {
+            return directBan;
+        }
+
+        return null;
+    }
+
     public Ban unbanIp(String ip)
     {
         final Ban ban = getByIp(ip);
@@ -166,7 +153,6 @@ public class BanManager extends FreedomService
         if (ban != null)
         {
             bans.remove(ban);
-            saveAll();
         }
 
         return ban;
@@ -179,7 +165,6 @@ public class BanManager extends FreedomService
         if (ban != null)
         {
             bans.remove(ban);
-            saveAll();
         }
 
         return ban;
@@ -195,51 +180,69 @@ public class BanManager extends FreedomService
         return getByUsername(username) != null;
     }
 
-    public boolean addBan(Ban ban)
+    public void addBan(Ban ban)
     {
-        if (bans.add(ban))
+        if (ban.getUsername() != null && getByUsername(ban.getUsername()) != null)
         {
-            saveAll();
-            return true;
+            removeBan(ban);
+        }
+        else
+        {
+
+            for (String ip : ban.getIps())
+            {
+                if (getByIp(ip) != null)
+                {
+                    removeBan(ban);
+                    break;
+                }
+            }
+        }
+
+        if (bans.add(ban))
+        {
+            plugin.sql.addBan(ban);
+            updateViews();
         }
 
-        return false;
     }
 
-    public boolean removeBan(Ban ban)
+    public void removeBan(Ban ban)
     {
         if (bans.remove(ban))
         {
-            saveAll();
-            return true;
+            plugin.sql.removeBan(ban);
+            updateViews();
         }
 
-        return false;
     }
 
     public int purge()
     {
-        config.clear();
-        config.save();
-
         int size = bans.size();
         bans.clear();
         updateViews();
-
+        plugin.sql.truncate("bans");
         return size;
     }
 
-    @EventHandler(priority = EventPriority.LOW)
+    @EventHandler(priority = EventPriority.NORMAL)
     public void onPlayerLogin(PlayerLoginEvent event)
     {
         final String username = event.getPlayer().getName();
-        final String ip = Ips.getIp(event);
+        final UUID uuid = event.getPlayer().getUniqueId();
+        final String ip = FUtil.getIp(event);
 
         // Regular ban
         Ban ban = getByUsername(username);
         if (ban == null)
         {
-            ban = getByIp(ip);
+            ban = getByUUID(uuid);
+
+            if (ban == null)
+            {
+                ban = getByIp(ip);
+            }
         }
 
         if (ban != null && !ban.isExpired())
@@ -248,11 +251,10 @@ public class BanManager extends FreedomService
         }
     }
 
-    @EventHandler(priority = EventPriority.LOW)
+    @EventHandler(priority = EventPriority.NORMAL)
     public void onPlayerJoin(PlayerJoinEvent event)
     {
         final Player player = event.getPlayer();
-        final PlayerData data = plugin.pl.getData(player);
 
         if (!plugin.al.isAdmin(player))
         {
@@ -260,28 +262,35 @@ public class BanManager extends FreedomService
         }
 
         // Unban admins
-        for (String storedIp : data.getIps())
+        Ban ban = getByUsername(player.getName());
+        if (ban != null)
         {
-            unbanIp(storedIp);
-            unbanIp(FUtil.getFuzzyIp(storedIp));
+            removeBan(ban);
+        }
+        else
+        {
+            ban = getByIp(FUtil.getIp(player));
+            if (ban != null)
+            {
+                removeBan(ban);
+            }
         }
-
-        unbanUsername(player.getName());
-        player.setOp(true);
     }
 
     private void updateViews()
     {
         // Remove expired bans
-        for (Iterator<Ban> it = bans.iterator(); it.hasNext();)
+        for (Ban ban : new ArrayList<>(bans))
         {
-            if (it.next().isExpired())
+            if (ban.isExpired())
             {
-                it.remove();
+                bans.remove(ban);
+                plugin.sql.removeBan(ban);
             }
         }
 
         nameBans.clear();
+        uuidBans.clear();
         ipBans.clear();
         for (Ban ban : bans)
         {
@@ -290,6 +299,11 @@ public class BanManager extends FreedomService
                 nameBans.put(ban.getUsername().toLowerCase(), ban);
             }
 
+            if (ban.hasUUID())
+            {
+                uuidBans.put(ban.getUuid(), ban);
+            }
+
             if (ban.hasIps())
             {
                 for (String ip : ban.getIps())
@@ -299,5 +313,4 @@ public class BanManager extends FreedomService
             }
         }
     }
-
-}
+}

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

@@ -0,0 +1,126 @@
+package me.totalfreedom.totalfreedommod.banning;
+
+import com.google.common.collect.Lists;
+import java.text.ParseException;
+import java.text.SimpleDateFormat;
+import java.util.Date;
+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;
+
+public class IndefiniteBan implements IConfig
+{
+    private final List<String> ips = Lists.newArrayList();
+    private String username = null;
+    private UUID uuid = null;
+    private String reason = null;
+    private Date expiry = null;
+
+    public IndefiniteBan()
+    {
+    }
+
+    @Override
+    public void loadFrom(ConfigurationSection cs)
+    {
+        this.username = cs.getName();
+
+        try
+        {
+            String strUUID = cs.getString("uuid", null);
+            if (strUUID != null)
+            {
+                UUID uuid = UUID.fromString(strUUID);
+                this.uuid = uuid;
+            }
+        }
+        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
+    public boolean isValid()
+    {
+        return username != null;
+    }
+
+    public String getUsername()
+    {
+        return username;
+    }
+
+    public void setUsername(String username)
+    {
+        this.username = username;
+    }
+
+    public UUID getUuid()
+    {
+        return uuid;
+    }
+
+    public void setUuid(UUID uuid)
+    {
+        this.uuid = uuid;
+    }
+
+    public List<String> getIps()
+    {
+        return ips;
+    }
+
+    public String getReason()
+    {
+        return reason;
+    }
+
+    public void setReason(String reason)
+    {
+        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()));
+    }
+}

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

@@ -0,0 +1,185 @@
+package me.totalfreedom.totalfreedommod.banning;
+
+import com.google.common.base.Strings;
+import com.google.common.collect.Sets;
+import java.text.SimpleDateFormat;
+import java.util.Date;
+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;
+import me.totalfreedom.totalfreedommod.util.FLog;
+import me.totalfreedom.totalfreedommod.util.FUtil;
+import org.bukkit.ChatColor;
+import org.bukkit.configuration.ConfigurationSection;
+import org.bukkit.event.EventHandler;
+import org.bukkit.event.EventPriority;
+import org.bukkit.event.player.PlayerLoginEvent;
+
+public class IndefiniteBanList extends FreedomService
+{
+
+    public static final String CONFIG_FILENAME = "indefinitebans.yml";
+    private YamlConfig config;
+
+    private final Set<IndefiniteBan> indefBans = Sets.newHashSet();
+
+    private int nameBanCount = 0;
+
+    private int uuidBanCount = 0;
+
+    private int ipBanCount = 0;
+
+    private final SimpleDateFormat dateFormat = new SimpleDateFormat("dd MMM yyyy, zzzz");
+
+    @Override
+    public void onStart()
+    {
+        indefBans.clear();
+
+        config = new YamlConfig(plugin, CONFIG_FILENAME, true);
+        config.load();
+
+        for (String name : config.getKeys(false))
+        {
+            if (!config.isConfigurationSection(name))
+            {
+                FLog.warning("Could not load indefinite ban for " + name + ": Invalid format!");
+                continue;
+            }
+
+            IndefiniteBan indefBan = new IndefiniteBan();
+            ConfigurationSection cs = config.getConfigurationSection(name);
+            assert cs != null;
+            indefBan.loadFrom(cs);
+
+            if (!indefBan.isValid())
+            {
+                FLog.warning("Not adding indefinite ban for " + name + ": Missing information.");
+                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");
+    }
+
+    @Override
+    public void onStop()
+    {
+    }
+
+    @EventHandler(priority = EventPriority.LOWEST)
+    public void onPlayerLogin(PlayerLoginEvent event)
+    {
+        final String username = event.getPlayer().getName();
+        final UUID uuid = event.getPlayer().getUniqueId();
+        final String ip = FUtil.getIp(event);
+
+        String bannedBy = "";
+        IndefiniteBan ban = null;
+
+        for (IndefiniteBan indefBan : indefBans)
+        {
+            if (username.equalsIgnoreCase(indefBan.getUsername()))
+            {
+                bannedBy = "username";
+                ban = indefBan;
+                break;
+            }
+            else if (indefBan.getUuid() != null && indefBan.getUuid().equals(uuid))
+            {
+                bannedBy = "UUID";
+                ban = indefBan;
+                break;
+            }
+            else if (indefBan.getIps().contains(ip))
+            {
+                bannedBy = "IP address";
+                ban = indefBan;
+                break;
+            }
+        }
+
+        if (ban != null)
+        {
+            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))
+            {
+                kickMessage += ChatColor.RED + "\n\nRelease procedures are available at\n" + ChatColor.GOLD + ConfigEntry.SERVER_INDEFBAN_URL.getString();
+            }
+            event.disallow(PlayerLoginEvent.Result.KICK_OTHER, kickMessage);
+        }
+    }
+
+    private void updateCount()
+    {
+        nameBanCount = 0;
+        uuidBanCount = 0;
+        ipBanCount = 0;
+
+        for (IndefiniteBan indefBan : indefBans)
+        {
+            nameBanCount += 1;
+            if (indefBan.getUuid() != null)
+            {
+                uuidBanCount += 1;
+            }
+            ipBanCount += indefBan.getIps().size();
+        }
+    }
+
+    public Set<IndefiniteBan> getIndefBans()
+    {
+        return indefBans;
+    }
+
+    public int getNameBanCount()
+    {
+        return nameBanCount;
+    }
+
+    public int getUuidBanCount()
+    {
+        return uuidBanCount;
+    }
+
+    public int getIpBanCount()
+    {
+        return ipBanCount;
+    }
+}

src/main/java/me/totalfreedom/totalfreedommod/banning/PermbanList.java

@@ -1,90 +0,0 @@
-package me.totalfreedom.totalfreedommod.banning;
-
-import com.google.common.collect.Sets;
-import java.util.Set;
-import lombok.Getter;
-import me.totalfreedom.totalfreedommod.FreedomService;
-import me.totalfreedom.totalfreedommod.TotalFreedomMod;
-import me.totalfreedom.totalfreedommod.config.ConfigEntry;
-import me.totalfreedom.totalfreedommod.util.FLog;
-import me.totalfreedom.totalfreedommod.util.FUtil;
-import net.pravian.aero.config.YamlConfig;
-import net.pravian.aero.util.Ips;
-import org.bukkit.ChatColor;
-import org.bukkit.event.EventHandler;
-import org.bukkit.event.EventPriority;
-import org.bukkit.event.player.PlayerLoginEvent;
-
-public class PermbanList extends FreedomService
-{
-
-    public static final String CONFIG_FILENAME = "permbans.yml";
-
-    @Getter
-    private final Set<String> permbannedNames = Sets.newHashSet();
-    @Getter
-    private final Set<String> permbannedIps = Sets.newHashSet();
-
-    public PermbanList(TotalFreedomMod plugin)
-    {
-        super(plugin);
-    }
-
-    @Override
-    protected void onStart()
-    {
-        permbannedNames.clear();
-        permbannedIps.clear();
-
-        final YamlConfig config = new YamlConfig(plugin, CONFIG_FILENAME, true);
-        config.load();
-
-        for (String name : config.getKeys(false))
-        {
-            permbannedNames.add(name.toLowerCase().trim());
-            permbannedIps.addAll(config.getStringList(name));
-        }
-
-        FLog.info("Loaded " + permbannedIps.size() + " perm IP bans and " + permbannedNames.size() + " perm username bans.");
-    }
-
-    @Override
-    protected void onStop()
-    {
-    }
-
-    @EventHandler(priority = EventPriority.LOWEST)
-    public void onPlayerLogin(PlayerLoginEvent event)
-    {
-        final String username = event.getPlayer().getName();
-        final String ip = Ips.getIp(event);
-
-        // Permbanned IPs
-        for (String testIp : getPermbannedIps())
-        {
-            if (FUtil.fuzzyIpMatch(testIp, ip, 4))
-            {
-                event.disallow(PlayerLoginEvent.Result.KICK_OTHER,
-                        ChatColor.RED + "Your IP address is permanently banned from this server.\n"
-                        + "Release procedures are available at\n"
-                        + ChatColor.GOLD + ConfigEntry.SERVER_PERMBAN_URL.getString());
-                return;
-            }
-        }
-
-        // Permbanned usernames
-        for (String testPlayer : getPermbannedNames())
-        {
-            if (testPlayer.equalsIgnoreCase(username))
-            {
-                event.disallow(PlayerLoginEvent.Result.KICK_OTHER,
-                        ChatColor.RED + "Your username is permanently banned from this server.\n"
-                        + "Release procedures are available at\n"
-                        + ChatColor.GOLD + ConfigEntry.SERVER_PERMBAN_URL.getString());
-                return;
-            }
-        }
-
-    }
-
-}

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

@@ -1,36 +1,31 @@
 package me.totalfreedom.totalfreedommod.blocking;
 
 import me.totalfreedom.totalfreedommod.FreedomService;
-import me.totalfreedom.totalfreedommod.TotalFreedomMod;
 import me.totalfreedom.totalfreedommod.config.ConfigEntry;
-import me.totalfreedom.totalfreedommod.util.FLog;
-import me.totalfreedom.totalfreedommod.util.FUtil;
 import org.bukkit.ChatColor;
 import org.bukkit.Material;
+import org.bukkit.block.Skull;
 import org.bukkit.entity.Player;
 import org.bukkit.event.EventHandler;
 import org.bukkit.event.EventPriority;
 import org.bukkit.event.block.BlockPlaceEvent;
 import org.bukkit.inventory.ItemStack;
+import org.bukkit.inventory.meta.ItemMeta;
+import org.bukkit.inventory.meta.SkullMeta;
 
 public class BlockBlocker extends FreedomService
 {
-
-    public BlockBlocker(TotalFreedomMod plugin)
-    {
-        super(plugin);
-    }
-
     @Override
-    protected void onStart()
+    public void onStart()
     {
     }
 
     @Override
-    protected void onStop()
+    public void onStop()
     {
     }
 
+    @SuppressWarnings("deprecation")
     @EventHandler(priority = EventPriority.HIGH)
     public void onBlockPlace(BlockPlaceEvent event)
     {
@@ -39,33 +34,18 @@ public class BlockBlocker extends FreedomService
         switch (event.getBlockPlaced().getType())
         {
             case LAVA:
-            case STATIONARY_LAVA:
             {
-                if (ConfigEntry.ALLOW_LAVA_PLACE.getBoolean())
-                {
-                    FLog.info(String.format("%s placed lava @ %s", player.getName(), FUtil.formatLocation(event.getBlock().getLocation())));
-
-                    player.getInventory().clear(player.getInventory().getHeldItemSlot());
-                }
-                else
+                if (!ConfigEntry.ALLOW_LAVA_PLACE.getBoolean())
                 {
                     player.getInventory().setItem(player.getInventory().getHeldItemSlot(), new ItemStack(Material.COOKIE, 1));
                     player.sendMessage(ChatColor.GRAY + "Lava placement is currently disabled.");
-
                     event.setCancelled(true);
                 }
                 break;
             }
             case WATER:
-            case STATIONARY_WATER:
             {
-                if (ConfigEntry.ALLOW_WATER_PLACE.getBoolean())
-                {
-                    FLog.info(String.format("%s placed water @ %s", player.getName(), FUtil.formatLocation(event.getBlock().getLocation())));
-
-                    player.getInventory().clear(player.getInventory().getHeldItemSlot());
-                }
-                else
+                if (!ConfigEntry.ALLOW_WATER_PLACE.getBoolean())
                 {
                     player.getInventory().setItem(player.getInventory().getHeldItemSlot(), new ItemStack(Material.COOKIE, 1));
                     player.sendMessage(ChatColor.GRAY + "Water placement is currently disabled.");
@@ -75,48 +55,133 @@ public class BlockBlocker extends FreedomService
                 break;
             }
             case FIRE:
+            case SOUL_FIRE:
             {
-                if (ConfigEntry.ALLOW_FIRE_PLACE.getBoolean())
-                {
-                    FLog.info(String.format("%s placed fire @ %s", player.getName(), FUtil.formatLocation(event.getBlock().getLocation())));
-
-                    player.getInventory().clear(player.getInventory().getHeldItemSlot());
-                }
-                else
+                if (!ConfigEntry.ALLOW_FIRE_PLACE.getBoolean())
                 {
                     player.getInventory().setItem(player.getInventory().getHeldItemSlot(), new ItemStack(Material.COOKIE, 1));
                     player.sendMessage(ChatColor.GRAY + "Fire placement is currently disabled.");
-
-                    event.setCancelled(true);
-                }
-                break;
-            }
-            case TNT:
-            {
-                if (ConfigEntry.ALLOW_EXPLOSIONS.getBoolean())
-                {
-                    FLog.info(String.format("%s placed TNT @ %s", player.getName(), FUtil.formatLocation(event.getBlock().getLocation())));
-
-                    player.getInventory().clear(player.getInventory().getHeldItemSlot());
-                }
-                else
-                {
-                    player.getInventory().setItem(player.getInventory().getHeldItemSlot(), new ItemStack(Material.COOKIE, 1));
-
-                    player.sendMessage(ChatColor.GRAY + "TNT is currently disabled.");
                     event.setCancelled(true);
                 }
                 break;
             }
             case STRUCTURE_BLOCK:
-            case STRUCTURE_VOID:
             {
-                player.sendMessage(ChatColor.GRAY + "Structure blocks are disabled.");
-
-                event.setCancelled(true);
+                if (!ConfigEntry.ALLOW_MASTERBLOCKS.getBoolean())
+                {
+                    player.sendMessage(ChatColor.GRAY + "Structure blocks are disabled.");
+                    player.getInventory().setItem(player.getInventory().getHeldItemSlot(), new ItemStack(Material.COOKIE, 1));
+                    event.setCancelled(true);
+                }
+                break;
+            }
+            case JIGSAW:
+            {
+                if (!ConfigEntry.ALLOW_MASTERBLOCKS.getBoolean())
+                {
+                    player.sendMessage(ChatColor.GRAY + "Jigsaws are disabled.");
+                    player.getInventory().setItem(player.getInventory().getHeldItemSlot(), new ItemStack(Material.COOKIE, 1));
+                    event.setCancelled(true);
+                }
+                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())
+                {
+                    player.sendMessage(ChatColor.GRAY + "Grindstones are disabled.");
+                    player.getInventory().setItem(player.getInventory().getHeldItemSlot(), new ItemStack(Material.COOKIE, 1));
+                    event.setCancelled(true);
+                }
+                break;
+            }
+            case JUKEBOX:
+            {
+                if (!ConfigEntry.ALLOW_JUKEBOXES.getBoolean())
+                {
+                    player.sendMessage(ChatColor.GRAY + "Jukeboxes are disabled.");
+                    player.getInventory().setItem(player.getInventory().getHeldItemSlot(), new ItemStack(Material.COOKIE, 1));
+                    event.setCancelled(true);
+                }
+                break;
+            }
+            case SPAWNER:
+            {
+                if (!ConfigEntry.ALLOW_SPAWNERS.getBoolean())
+                {
+                    player.sendMessage(ChatColor.GRAY + "Spawners are disabled.");
+                    player.getInventory().setItem(player.getInventory().getHeldItemSlot(), new ItemStack(Material.COOKIE, 1));
+                    event.setCancelled(true);
+                }
+                break;
+            }
+            case BEEHIVE:
+            case BEE_NEST:
+            {
+                if (!ConfigEntry.ALLOW_BEEHIVES.getBoolean())
+                {
+                    player.sendMessage(ChatColor.GRAY + "Beehives are disabled.");
+                    player.getInventory().setItem(player.getInventory().getHeldItemSlot(), new ItemStack(Material.COOKIE, 1));
+                    event.setCancelled(true);
+                }
+                break;
+            }
+            case PLAYER_HEAD:
+            case PLAYER_WALL_HEAD:
+            {
+                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();
+                        if (meta != null)
+                        {
+                            ItemStack newHead = new ItemStack(Material.PLAYER_HEAD, 1);
+                            ItemMeta headMeta = newHead.getItemMeta();
+                            assert headMeta != null;
+                            headMeta.setDisplayName(ChatColor.YELLOW + "C-sectioned Head");
+                            newHead.setItemMeta(headMeta);
+                            player.getInventory().setItem(player.getInventory().getHeldItemSlot(), newHead);
+                            player.sendMessage(ChatColor.GRAY + "The player head you are attempting to place has a section symbol. Your player head has been C-sectioned.");
+                            event.setCancelled(true);
+                        }
+                    }
+                    if (skull.getOwner().length() > 100)
+                    {
+                        player.sendMessage(ChatColor.GRAY + "Instead of using Pi to crash players, be useful with your life and use it to discover things.");
+                        player.getInventory().setItem(player.getInventory().getHeldItemSlot(), new ItemStack(Material.COOKIE, 1));
+                        event.setCancelled(true);
+                    }
+                }
+                break;
+            }
+            case RESPAWN_ANCHOR:
+            {
+                if (!ConfigEntry.ALLOW_RESPAWN_ANCHORS.getBoolean())
+                {
+                    player.sendMessage(ChatColor.GRAY + "Respawn anchors are disabled.");
+                    player.getInventory().setItem(player.getInventory().getHeldItemSlot(), new ItemStack(Material.COOKIE, 1));
+                    event.setCancelled(true);
+                }
+                break;
+            }
+            default:
+            {
+                // Do nothing
                 break;
             }
         }
     }
-
-}
+}

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

@@ -0,0 +1,61 @@
+package me.totalfreedom.totalfreedommod.blocking;
+
+import me.totalfreedom.totalfreedommod.FreedomService;
+import me.totalfreedom.totalfreedommod.player.FPlayer;
+import me.totalfreedom.totalfreedommod.util.FSync;
+import org.bukkit.ChatColor;
+import org.bukkit.event.EventHandler;
+import org.bukkit.event.EventPriority;
+import org.bukkit.event.block.BlockBreakEvent;
+import org.bukkit.event.block.BlockPlaceEvent;
+
+public class EditBlocker extends FreedomService
+{
+    @Override
+    public void onStart()
+    {
+    }
+
+    @Override
+    public void onStop()
+    {
+    }
+
+    @EventHandler(priority = EventPriority.LOW)
+    public void onBlockPlace(BlockPlaceEvent event)
+    {
+        FPlayer fPlayer = plugin.pl.getPlayerSync(event.getPlayer());
+        if (!fPlayer.isEditBlocked())
+        {
+            return;
+        }
+
+        if (plugin.al.isAdminSync(event.getPlayer()))
+        {
+            fPlayer.setEditBlocked(false);
+            return;
+        }
+
+        FSync.playerMsg(event.getPlayer(), ChatColor.RED + "Your ability to place blocks has been disabled!");
+        event.setCancelled(true);
+    }
+
+    @EventHandler(priority = EventPriority.LOW)
+    public void onBlockBreak(BlockBreakEvent event)
+    {
+        FPlayer fPlayer = plugin.pl.getPlayerSync(event.getPlayer());
+        if (!fPlayer.isEditBlocked())
+        {
+            return;
+        }
+
+        if (plugin.al.isAdminSync(event.getPlayer()))
+        {
+            fPlayer.setEditBlocked(false);
+            return;
+        }
+
+        FSync.playerMsg(event.getPlayer(), ChatColor.RED + "Your ability to destroy blocks has been disabled!");
+        event.setCancelled(true);
+    }
+}

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

@@ -1,41 +1,60 @@
 package me.totalfreedom.totalfreedommod.blocking;
 
+import java.util.ArrayList;
+import java.util.Arrays;
+import java.util.List;
+import java.util.Objects;
+import me.totalfreedom.scissors.event.block.MasterBlockFireEvent;
+import io.papermc.paper.event.player.PlayerSignCommandPreprocessEvent;
 import me.totalfreedom.totalfreedommod.FreedomService;
-import me.totalfreedom.totalfreedommod.TotalFreedomMod;
 import me.totalfreedom.totalfreedommod.config.ConfigEntry;
+import me.totalfreedom.totalfreedommod.util.FUtil;
+import me.totalfreedom.totalfreedommod.util.Groups;
+import org.bukkit.Material;
+import org.bukkit.attribute.Attribute;
+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.EntityType;
-import org.bukkit.entity.Projectile;
+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.BlockFromToEvent;
-import org.bukkit.event.block.BlockIgniteEvent;
-import org.bukkit.event.block.LeavesDecayEvent;
+import org.bukkit.event.block.*;
 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.EntitySpawnEvent;
 import org.bukkit.event.entity.ExplosionPrimeEvent;
-import org.bukkit.event.entity.ProjectileHitEvent;
+import org.bukkit.event.entity.FireworkExplodeEvent;
+import org.bukkit.event.entity.PlayerDeathEvent;
 import org.bukkit.event.player.PlayerDropItemEvent;
+import org.bukkit.event.player.PlayerRespawnEvent;
 
 public class EventBlocker extends FreedomService
 {
+    /**
+     * /@EventHandler(priority = EventPriority.HIGH)
+     * /public void onBlockRedstone(BlockRedstoneEvent event)
+     * /{
+     * /    if (!ConfigEntry.ALLOW_REDSTONE.getBoolean())
+     * /    {
+     * /        event.setNewCurrent(0);
+     * /    }
+     * /}
+     **/
 
-    public EventBlocker(TotalFreedomMod plugin)
-    {
-        super(plugin);
-    }
+    // TODO: Revert back to old redstone block system when (or if) it is fixed in Bukkit, Spigot or Paper.
+    private final ArrayList<Material> redstoneBlocks = new ArrayList<>(Arrays.asList(Material.REDSTONE, Material.DISPENSER, Material.DROPPER, Material.REDSTONE_LAMP));
 
     @Override
-    protected void onStart()
+    public void onStart()
     {
     }
 
     @Override
-    protected void onStop()
+    public void onStop()
     {
     }
 
@@ -71,7 +90,7 @@ public class EventBlocker extends FreedomService
     {
         if (!ConfigEntry.ALLOW_EXPLOSIONS.getBoolean())
         {
-            event.setCancelled(true);
+            event.blockList().clear();
             return;
         }
 
@@ -90,6 +109,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)
     {
@@ -108,43 +149,22 @@ public class EventBlocker extends FreedomService
         }
     }
 
-    @EventHandler(priority = EventPriority.HIGH)
-    public void onProjectileHit(ProjectileHitEvent event)
-    {
-        if (ConfigEntry.ALLOW_EXPLOSIONS.getBoolean())
-        {
-            Projectile entity = event.getEntity();
-            if (event.getEntityType() == EntityType.ARROW)
-            {
-                entity.getWorld().createExplosion(entity.getLocation(), 2F);
-            }
-        }
-    }
-
     @EventHandler(priority = EventPriority.HIGH)
     public void onEntityDamage(EntityDamageEvent event)
     {
-        switch (event.getCause())
+        if ((event.getCause() == EntityDamageEvent.DamageCause.LAVA)
+                && !ConfigEntry.ALLOW_LAVA_DAMAGE.getBoolean())
         {
-            case LAVA:
-            {
-                if (!ConfigEntry.ALLOW_LAVA_DAMAGE.getBoolean())
-                {
-                    event.setCancelled(true);
-                    return;
-                }
-            }
+            event.setCancelled(true);
+            return;
         }
 
         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);
             }
         }
     }
@@ -152,6 +172,11 @@ public class EventBlocker extends FreedomService
     @EventHandler(priority = EventPriority.NORMAL)
     public void onPlayerDropItem(PlayerDropItemEvent event)
     {
+        if (!plugin.al.isAdmin(event.getPlayer()) && !ConfigEntry.ALLOW_ITEM_DROPS.getBoolean())
+        {
+            event.setCancelled(true);
+        }
+
         if (!ConfigEntry.AUTO_ENTITY_WIPE.getBoolean())
         {
             return;
@@ -169,4 +194,94 @@ public class EventBlocker extends FreedomService
         event.setCancelled(true);
     }
 
+    @EventHandler(priority = EventPriority.NORMAL)
+    public void onBlockGrowth(BlockGrowEvent event)
+    {
+        event.setCancelled(true);
+    }
+
+    @EventHandler(priority = EventPriority.HIGH)
+    public void onFireworkExplode(FireworkExplodeEvent event)
+    {
+        if (!ConfigEntry.ALLOW_FIREWORK_EXPLOSION.getBoolean())
+        {
+            event.setCancelled(true);
+        }
+    }
+
+    @EventHandler(priority = EventPriority.HIGH)
+    public void onBlockPistonRetract(BlockPistonRetractEvent event)
+    {
+        if (!ConfigEntry.ALLOW_REDSTONE.getBoolean())
+        {
+            event.setCancelled(true);
+        }
+    }
+
+    @EventHandler(priority = EventPriority.HIGH)
+    public void onBlockPistonExtend(BlockPistonExtendEvent event)
+    {
+        if (!ConfigEntry.ALLOW_REDSTONE.getBoolean())
+        {
+            event.setCancelled(true);
+        }
+    }
+
+    @EventHandler
+    public void onEntitySpawn(EntitySpawnEvent event)
+    {
+        if (!ConfigEntry.ALLOW_GRAVITY.getBoolean() && event.getEntity() instanceof FallingBlock)
+        {
+            event.setCancelled(true);
+        }
+    }
+
+    @EventHandler
+    public void onBlockPhysics(BlockPhysicsEvent event)
+    {
+        if (!ConfigEntry.ALLOW_REDSTONE.getBoolean())
+        {
+            // Check if the block is involved with redstone.
+            if (event.getBlock().getBlockData() instanceof AnaloguePowerable || event.getBlock().getBlockData() instanceof Powerable || redstoneBlocks.contains(event.getBlock().getType()))
+            {
+                event.setCancelled(true);
+            }
+        }
+    }
+
+    @EventHandler(priority = EventPriority.NORMAL)
+    public void onPlayerRespawn(PlayerRespawnEvent event)
+    {
+        double maxHealth = Objects.requireNonNull(event.getPlayer().getAttribute(Attribute.GENERIC_MAX_HEALTH)).getValue();
+        if (maxHealth < 1)
+        {
+            for (AttributeModifier attributeModifier : Objects.requireNonNull(event.getPlayer().getAttribute(Attribute.GENERIC_MAX_HEALTH)).getModifiers())
+            {
+                Objects.requireNonNull(event.getPlayer().getAttribute(Attribute.GENERIC_MAX_HEALTH)).removeModifier(attributeModifier);
+            }
+        }
+    }
+
+    @EventHandler(priority = EventPriority.NORMAL)
+    public void onBlockDispense(BlockDispenseEvent event)
+    {
+        List<Material> banned = Arrays.asList(Material.TNT_MINECART, Material.MINECART);
+        if (Groups.SPAWN_EGGS.contains(event.getItem().getType()) || banned.contains(event.getItem().getType()))
+        {
+            event.setCancelled(true);
+        }
+    }
+
+    @EventHandler(priority = EventPriority.NORMAL)
+    public void onPlayerDeath(PlayerDeathEvent event)
+    {
+        FUtil.fixCommandVoid(event.getEntity());
+        event.setDeathMessage(event.getDeathMessage());
+    }
+
+    @EventHandler
+    public void onSignInteract(PlayerSignCommandPreprocessEvent event)
+    {
+        event.setCancelled(true);
+    }
 }

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

@@ -1,36 +1,33 @@
 package me.totalfreedom.totalfreedommod.blocking;
 
 import me.totalfreedom.totalfreedommod.FreedomService;
-import me.totalfreedom.totalfreedommod.TotalFreedomMod;
 import me.totalfreedom.totalfreedommod.config.ConfigEntry;
-import me.totalfreedom.totalfreedommod.player.FPlayer;
+import me.totalfreedom.totalfreedommod.util.Groups;
 import org.bukkit.ChatColor;
+import org.bukkit.GameMode;
 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;
+import org.bukkit.event.player.PlayerBedEnterEvent;
 import org.bukkit.event.player.PlayerInteractEvent;
 import org.bukkit.inventory.ItemStack;
 
 public class InteractBlocker extends FreedomService
 {
-
-    public InteractBlocker(TotalFreedomMod plugin)
-    {
-        super(plugin);
-    }
-
     @Override
-    protected void onStart()
+    public void onStart()
     {
     }
 
     @Override
-    protected void onStop()
+    public void onStop()
     {
     }
 
-    @EventHandler(priority = EventPriority.HIGH)
+    @EventHandler(priority = EventPriority.HIGH, ignoreCancelled = true)
     public void onPlayerInteract(PlayerInteractEvent event)
     {
         switch (event.getAction())
@@ -42,18 +39,75 @@ public class InteractBlocker extends FreedomService
                 break;
             }
 
-            case LEFT_CLICK_AIR:
-            case LEFT_CLICK_BLOCK:
+            default:
             {
-                //
+                // Do nothing
                 break;
             }
         }
     }
 
+    @EventHandler(priority = EventPriority.HIGH)
+    public void onRightClickBell(PlayerInteractEvent event)
+    {
+        if (event.getClickedBlock() != null && event.getClickedBlock().getType().equals(Material.BELL) && !ConfigEntry.ALLOW_BELLS.getBoolean())
+        {
+            event.setCancelled(true);
+        }
+    }
+
+    @EventHandler
+    public void onBedEnter(PlayerBedEnterEvent event)
+    {
+        Player player = event.getPlayer();
+        if (Groups.EXPLOSIVE_BED_BIOMES.contains(event.getBed().getBiome()))
+        {
+            player.sendMessage(ChatColor.RED + "You may not sleep here.");
+            event.setCancelled(true);
+        }
+    }
+
     private void handleRightClick(PlayerInteractEvent event)
     {
         final Player player = event.getPlayer();
+        if (player.getGameMode().equals(GameMode.SPECTATOR)) {
+            return;
+        }
+
+        final Block clickedBlock = event.getClickedBlock();
+
+        if (clickedBlock != null && clickedBlock.getType() == Material.RESPAWN_ANCHOR && !ConfigEntry.ALLOW_RESPAWN_ANCHORS.getBoolean())
+        {
+            event.setCancelled(true);
+            return;
+        }
+
+        if (Groups.SPAWN_EGGS.contains(event.getMaterial()))
+        {
+            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;
+        }
 
         switch (event.getMaterial())
         {
@@ -83,7 +137,7 @@ public class InteractBlocker extends FreedomService
                 break;
             }
 
-            case EXPLOSIVE_MINECART:
+            case TNT_MINECART:
             {
                 if (ConfigEntry.ALLOW_TNT_MINECARTS.getBoolean())
                 {
@@ -96,13 +150,47 @@ public class InteractBlocker extends FreedomService
                 break;
             }
 
-            case SIGN:
-            case SIGN_POST:
-            case WALL_SIGN:
+            case ARMOR_STAND:
             {
-                player.sendMessage(ChatColor.GRAY + "Sign interaction is currently disabled.");
+                if (ConfigEntry.ALLOW_ARMOR_STANDS.getBoolean())
+                {
+                    break;
+                }
+
+                player.getInventory().clear(player.getInventory().getHeldItemSlot());
+                player.sendMessage(ChatColor.GRAY + "Armor stands are currently disabled.");
+                event.setCancelled(true);
+                break;
+            }
+            case MINECART:
+            {
+                if (ConfigEntry.ALLOW_MINECARTS.getBoolean())
+                {
+                    break;
+                }
+
+                player.getInventory().clear(player.getInventory().getHeldItemSlot());
+                player.sendMessage(ChatColor.GRAY + "Minecarts are currently disabled.");
+                event.setCancelled(true);
+                break;
+            }
+            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;
             }
         }
     }
-}
+}

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

@@ -1,37 +1,59 @@
 package me.totalfreedom.totalfreedommod.blocking;
 
+import java.util.Objects;
 import me.totalfreedom.totalfreedommod.FreedomService;
-import me.totalfreedom.totalfreedommod.TotalFreedomMod;
 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.event.EventHandler;
 import org.bukkit.event.EventPriority;
 import org.bukkit.event.entity.CreatureSpawnEvent;
+import org.bukkit.event.entity.EntitySpawnEvent;
 
 public class MobBlocker extends FreedomService
 {
-
-    public MobBlocker(TotalFreedomMod plugin)
-    {
-        super(plugin);
-    }
-
     @Override
-    protected void onStart()
+    public void onStart()
     {
     }
 
     @Override
-    protected void onStop()
+    public void onStop()
     {
     }
 
+    //fixes crash mobs, credit to Mafrans
+    @EventHandler(priority = EventPriority.NORMAL)
+    public void onEntitySpawn(EntitySpawnEvent e)
+    {
+        if (!(e instanceof LivingEntity))
+        {
+            return;
+        }
+
+        Entity entity = e.getEntity();
+        if (entity instanceof Attributable)
+        {
+            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);
+            }
+            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);
+            }
+        }
+    }
+
     @EventHandler(priority = EventPriority.NORMAL)
     public void onCreatureSpawn(CreatureSpawnEvent event)
     {
@@ -41,6 +63,7 @@ public class MobBlocker extends FreedomService
         }
 
         final Entity spawned = event.getEntity();
+
         if (spawned instanceof EnderDragon)
         {
             if (ConfigEntry.MOB_LIMITER_DISABLE_DRAGON.getBoolean())
@@ -65,6 +88,14 @@ public class MobBlocker extends FreedomService
                 return;
             }
         }
+        else if (spawned instanceof Wither)
+        {
+            if (ConfigEntry.MOB_LIMITER_DISABLE_DRAGON.getBoolean())
+            {
+                event.setCancelled(true);
+                return;
+            }
+        }
         else if (spawned instanceof Giant)
         {
             if (ConfigEntry.MOB_LIMITER_DISABLE_GIANT.getBoolean())
@@ -87,9 +118,9 @@ public class MobBlocker extends FreedomService
         }
 
         int mobcount = 0;
-        for (Entity entity : event.getLocation().getWorld().getLivingEntities())
+        for (Entity entity : Objects.requireNonNull(event.getLocation().getWorld()).getLivingEntities())
         {
-            if (!(entity instanceof HumanEntity))
+            if (!(entity instanceof HumanEntity) && entity instanceof LivingEntity)
             {
                 mobcount++;
             }
@@ -100,5 +131,4 @@ public class MobBlocker extends FreedomService
             event.setCancelled(true);
         }
     }
-
-}
+}

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

@@ -0,0 +1,97 @@
+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.event.EventHandler;
+import org.bukkit.event.EventPriority;
+import org.bukkit.event.entity.EntityDamageByEntityEvent;
+
+public class PVPBlocker extends FreedomService
+{
+    @Override
+    public void onStart()
+    {
+    }
+
+    @Override
+    public void onStop()
+    {
+    }
+
+    @EventHandler(priority = EventPriority.LOW)
+    public void onEntityDamageByEntity(EntityDamageByEntityEvent event)
+    {
+        Player player = null;
+        Player target = null;
+        if (event.getEntity() instanceof Player)
+        {
+            target = (Player)event.getEntity();
+            if (event.getDamager() instanceof Player)
+            {
+                player = (Player)event.getDamager();
+            }
+            else if (event.getDamager() instanceof Arrow)
+            {
+                Arrow arrow = (Arrow)event.getDamager();
+                if (arrow.getShooter() instanceof Player)
+                {
+                    player = (Player)arrow.getShooter();
+                }
+            }
+            else if (event.getDamager() instanceof SpectralArrow)
+            {
+                SpectralArrow spectralArrow = (SpectralArrow)event.getDamager();
+                if (spectralArrow.getShooter() instanceof Player)
+                {
+                    player = (Player)spectralArrow.getShooter();
+                }
+            }
+            else if (event.getDamager() instanceof Trident)
+            {
+                Trident trident = (Trident)event.getDamager();
+                if (trident.getShooter() instanceof Player)
+                {
+                    player = (Player)trident.getShooter();
+                }
+            }
+            else if (event.getDamager() instanceof FishHook)
+            {
+                FishHook fishhook = (FishHook)event.getDamager();
+                if (fishhook.getShooter() instanceof Player)
+                {
+                    player = (Player)fishhook.getShooter();
+                }
+            }
+        }
+
+        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())
+            {
+                player.sendMessage(ChatColor.RED + "God mode PvP is not allowed!");
+                event.setCancelled(true);
+            }
+            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())
+            {
+                player.sendMessage(ChatColor.RED + "You have PvP disabled!");
+                event.setCancelled(true);
+            }
+        }
+    }
+}

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

@@ -1,12 +1,16 @@
 package me.totalfreedom.totalfreedommod.blocking;
 
+import java.util.Collection;
 import me.totalfreedom.totalfreedommod.FreedomService;
-import me.totalfreedom.totalfreedommod.TotalFreedomMod;
 import org.bukkit.ChatColor;
 import org.bukkit.entity.Player;
+import org.bukkit.entity.ThrownPotion;
 import org.bukkit.event.EventHandler;
 import org.bukkit.event.EventPriority;
+import org.bukkit.event.entity.LingeringPotionSplashEvent;
 import org.bukkit.event.entity.PotionSplashEvent;
+import org.bukkit.potion.PotionEffect;
+import org.bukkit.potion.PotionEffectType;
 import org.bukkit.projectiles.ProjectileSource;
 
 public class PotionBlocker extends FreedomService
@@ -14,49 +18,68 @@ public class PotionBlocker extends FreedomService
 
     public static final int POTION_BLOCK_RADIUS_SQUARED = 20 * 20;
 
-    public PotionBlocker(TotalFreedomMod plugin)
-    {
-        super(plugin);
-    }
-
     @Override
-    protected void onStart()
+    public void onStart()
     {
     }
 
     @Override
-    protected void onStop()
+    public void onStop()
     {
     }
 
     @EventHandler(priority = EventPriority.LOW, ignoreCancelled = true)
     public void onThrowPotion(PotionSplashEvent event)
     {
-        ProjectileSource source = event.getEntity().getShooter();
-
-        if (!(source instanceof Player))
+        ThrownPotion potion = event.getEntity();
+        ProjectileSource projectileSource = potion.getShooter();
+        Player player = null;
+        if (projectileSource instanceof Player)
         {
-            event.setCancelled(true);
-            return;
+            player = (Player)projectileSource;
         }
 
-        Player thrower = (Player) source;
-
-        if (plugin.al.isAdmin(thrower))
+        if (isDeathPotion(potion.getEffects()))
         {
-            return;
-        }
-
-        for (Player player : thrower.getWorld().getPlayers())
-        {
-            if (thrower.getLocation().distanceSquared(player.getLocation()) < POTION_BLOCK_RADIUS_SQUARED)
+            if (player != null)
             {
-                thrower.sendMessage(ChatColor.RED + "You cannot use splash potions close to other players.");
-                event.setCancelled(true);
-                return;
+                player.sendMessage(ChatColor.RED + "You are not allowed to use death potions.");
             }
+            event.setCancelled(true);
         }
-
     }
 
-}
+    @EventHandler(priority = EventPriority.LOW, ignoreCancelled = true)
+    public void onThrowLingeringPotion(LingeringPotionSplashEvent event)
+    {
+        ThrownPotion potion = event.getEntity();
+        ProjectileSource projectileSource = potion.getShooter();
+        Player player = null;
+        if (projectileSource instanceof Player)
+        {
+            player = (Player)projectileSource;
+        }
+
+        if (isDeathPotion(potion.getEffects()))
+        {
+            if (player != null)
+            {
+                player.sendMessage(ChatColor.RED + "You are not allowed to use death potions.");
+            }
+            event.setCancelled(true);
+        }
+    }
+
+    public boolean isDeathPotion(Collection<PotionEffect> effects)
+    {
+        for (PotionEffect effect : effects)
+        {
+            int amplifier = effect.getAmplifier();
+            if (effect.getType().equals(PotionEffectType.HEAL) && (amplifier == 29 || amplifier == 61 || amplifier == 93 || amplifier == 125))
+            {
+                return true;
+            }
+        }
+        return false;
+    }
+}

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

@@ -2,45 +2,42 @@ 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.TotalFreedomMod;
 import me.totalfreedom.totalfreedommod.config.ConfigEntry;
 import me.totalfreedom.totalfreedommod.util.FLog;
 import me.totalfreedom.totalfreedommod.util.FUtil;
-import net.pravian.aero.command.CommandReflection;
-import org.apache.commons.lang3.StringUtils;
+import org.apache.commons.lang.StringUtils;
+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;
 
 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 CommandBlocker(TotalFreedomMod plugin)
-    {
-        super(plugin);
-    }
-
     @Override
-    protected void onStart()
+    public void onStart()
     {
         load();
     }
 
     @Override
-    protected void onStop()
+    public void onStop()
     {
         entryList.clear();
     }
@@ -50,15 +47,10 @@ public class CommandBlocker extends FreedomService
         entryList.clear();
         unknownCommands.clear();
 
-        final CommandMap commandMap = CommandReflection.getCommandMap();
-        if (commandMap == null)
-        {
-            FLog.severe("Error loading commandMap.");
-            return;
-        }
+        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(":");
@@ -73,7 +65,7 @@ public class CommandBlocker extends FreedomService
             String commandName = parts[2].toLowerCase().substring(1);
             final String message = (parts.length > 3 ? parts[3] : null);
 
-            if (rank == null || action == null || commandName == null || commandName.isEmpty())
+            if (rank == null || action == null || commandName.isEmpty())
             {
                 FLog.warning("Invalid command blocker entry: " + rawEntry);
                 continue;
@@ -87,6 +79,7 @@ public class CommandBlocker extends FreedomService
                 subCommand = StringUtils.join(commandParts, " ", 1, commandParts.length).trim().toLowerCase();
             }
 
+            assert commandMap != null;
             final Command command = commandMap.getCommand(commandName);
 
             // Obtain command from alias
@@ -105,9 +98,9 @@ public class CommandBlocker extends FreedomService
                 continue;
             }
 
-            final CommandBlockerEntry blockedCommandEntry = new CommandBlockerEntry(rank, action, commandName, subCommand, message);
-            entryList.put(blockedCommandEntry.getCommand(), blockedCommandEntry);
 
+            final CommandBlockerEntry blockedCommandEntry = new CommandBlockerEntry(rank, action, commandName, subCommand, message);
+            entryList.put(commandName, blockedCommandEntry);
             if (command != null)
             {
                 for (String alias : command.getAliases())
@@ -145,6 +138,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
@@ -160,6 +161,11 @@ public class CommandBlocker extends FreedomService
 
         for (String part : commandParts)
         {
+            if (command.startsWith("/") && !plugin.al.isAdmin(sender) && (part.contains("#copy") || part.contains("#clipboard")))
+            {
+                FUtil.playerMsg(sender, "WorldEdit copy variables are disabled.");
+                return true;
+            }
             Matcher matcher = flagPattern.matcher(part);
             if (!matcher.matches())
             {
@@ -187,12 +193,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))
@@ -207,4 +210,4 @@ public class CommandBlocker extends FreedomService
 
         return true;
     }
-}
+}

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

@@ -8,16 +8,11 @@ public enum CommandBlockerAction
     BLOCK_UNKNOWN("u");
     private final String token;
 
-    private CommandBlockerAction(String token)
+    CommandBlockerAction(String token)
     {
         this.token = token;
     }
 
-    public String getToken()
-    {
-        return this.token;
-    }
-
     public static CommandBlockerAction fromToken(String token)
     {
         for (CommandBlockerAction action : CommandBlockerAction.values())
@@ -29,4 +24,9 @@ public enum CommandBlockerAction
         }
         return null;
     }
-}
+
+    public String getToken()
+    {
+        return this.token;
+    }
+}

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

@@ -1,8 +1,8 @@
 package me.totalfreedom.totalfreedommod.blocking.command;
 
-import lombok.Getter;
 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;
@@ -10,15 +10,15 @@ import org.bukkit.entity.Player;
 public class CommandBlockerEntry
 {
 
-    @Getter
+
     private final CommandBlockerRank rank;
-    @Getter
+
     private final CommandBlockerAction action;
-    @Getter
+
     private final String command;
-    @Getter
+
     private final String subCommand;
-    @Getter
+
     private final String message;
 
     public CommandBlockerEntry(CommandBlockerRank rank, CommandBlockerAction action, String command, String message)
@@ -31,25 +31,48 @@ public class CommandBlockerEntry
         this.rank = rank;
         this.action = action;
         this.command = command;
-        this.subCommand = (subCommand == null ? null : subCommand.toLowerCase().trim());
-        this.message = (message == null || message.equals("_") ? "That command is blocked." : message);
+        this.subCommand = ((subCommand == null) ? null : subCommand.toLowerCase().trim());
+        this.message = ((message == null || message.equals("_")) ? "That command is blocked." : message);
     }
 
     public void doActions(CommandSender sender)
     {
         if (action == CommandBlockerAction.BLOCK_AND_EJECT && sender instanceof Player)
         {
-            TotalFreedomMod.plugin().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)
         {
-            FUtil.playerMsg(sender, "Unknown command. Type \"help\" for help.", ChatColor.RESET);
+            sender.sendMessage(Bukkit.spigot().getSpigotConfig().getString("messages.unknown-command"));
             return;
         }
-
         FUtil.playerMsg(sender, FUtil.colorize(message));
     }
-}
+
+    public CommandBlockerRank getRank()
+    {
+        return rank;
+    }
+
+    public CommandBlockerAction getAction()
+    {
+        return action;
+    }
+
+    public String getCommand()
+    {
+        return command;
+    }
+
+    public String getSubCommand()
+    {
+        return subCommand;
+    }
+
+    public String getMessage()
+    {
+        return message;
+    }
+}

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

@@ -4,50 +4,32 @@ import me.totalfreedom.totalfreedommod.TotalFreedomMod;
 import me.totalfreedom.totalfreedommod.admin.Admin;
 import me.totalfreedom.totalfreedommod.rank.Rank;
 import org.bukkit.command.CommandSender;
-import org.bukkit.entity.Player;
 
 public enum CommandBlockerRank
 {
-
-    ANYONE("a"),
+    EVERYONE("e"),
     OP("o"),
-    SUPER("s"),
-    TELNET("t"),
-    SENIOR("c"),
+    ADMIN("a"),
+    SENIOR_ADMIN("s"),
     NOBODY("n");
     //
     private final String token;
 
-    private CommandBlockerRank(String token)
+    CommandBlockerRank(String token)
     {
         this.token = token;
     }
 
-    public String getToken()
-    {
-        return this.token;
-    }
-
-    public boolean hasPermission(CommandSender sender)
-    {
-        return fromSender(sender).ordinal() >= ordinal();
-    }
-
     public static CommandBlockerRank fromSender(CommandSender sender)
     {
-        if (!(sender instanceof Player))
-        {
-            return TELNET;
-        }
-
-        Admin admin = TotalFreedomMod.plugin().al.getAdmin(sender);
+        Admin admin = TotalFreedomMod.getPlugin().al.getAdmin(sender);
         if (admin != null)
         {
             if (admin.getRank() == Rank.SENIOR_ADMIN)
             {
-                return SENIOR;
+                return SENIOR_ADMIN;
             }
-            return SUPER;
+            return ADMIN;
         }
 
         if (sender.isOp())
@@ -55,8 +37,7 @@ public enum CommandBlockerRank
             return OP;
         }
 
-        return ANYONE;
-
+        return EVERYONE;
     }
 
     public static CommandBlockerRank fromToken(String token)
@@ -68,6 +49,16 @@ public enum CommandBlockerRank
                 return rank;
             }
         }
-        return ANYONE;
+        return EVERYONE;
     }
-}
+
+    public String getToken()
+    {
+        return this.token;
+    }
+
+    public boolean hasPermission(CommandSender sender)
+    {
+        return fromSender(sender).ordinal() >= ordinal();
+    }
+}

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

@@ -1,7 +1,6 @@
 package me.totalfreedom.totalfreedommod.bridge;
 
 import java.util.ArrayList;
-import java.util.Iterator;
 import java.util.List;
 import java.util.Map;
 import me.totalfreedom.bukkittelnet.BukkitTelnet;
@@ -10,7 +9,6 @@ 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;
@@ -24,18 +22,13 @@ public class BukkitTelnetBridge extends FreedomService
 
     private BukkitTelnet bukkitTelnetPlugin = null;
 
-    public BukkitTelnetBridge(TotalFreedomMod plugin)
-    {
-        super(plugin);
-    }
-
     @Override
-    protected void onStart()
+    public void onStart()
     {
     }
 
     @Override
-    protected void onStop()
+    public void onStop()
     {
     }
 
@@ -49,7 +42,7 @@ public class BukkitTelnetBridge extends FreedomService
             return;
         }
 
-        final Admin admin = plugin.al.getEntryByIpFuzzy(ip);
+        final Admin admin = plugin.al.getEntryByIp(ip);
 
         if (admin == null || !admin.isActive() || !admin.getRank().hasConsoleVariant())
         {
@@ -72,10 +65,8 @@ public class BukkitTelnetBridge extends FreedomService
     @EventHandler(priority = EventPriority.NORMAL)
     public void onTelnetRequestDataTags(TelnetRequestDataTagsEvent event)
     {
-        final Iterator<Map.Entry<Player, Map<String, Object>>> it = event.getDataTags().entrySet().iterator();
-        while (it.hasNext())
+        for (Map.Entry<Player, Map<String, Object>> entry : event.getDataTags().entrySet())
         {
-            final Map.Entry<Player, Map<String, Object>> entry = it.next();
             final Player player = entry.getKey();
             final Map<String, Object> playerTags = entry.getValue();
 
@@ -90,7 +81,7 @@ public class BukkitTelnetBridge extends FreedomService
 
                 isAdmin = active;
                 isSeniorAdmin = active && admin.getRank() == Rank.SENIOR_ADMIN;
-                isTelnetAdmin = active && (isSeniorAdmin || admin.getRank() == Rank.TELNET_ADMIN);
+                isTelnetAdmin = active && (isSeniorAdmin || admin.getRank() == Rank.ADMIN);
             }
 
             playerTags.put("tfm.admin.isAdmin", isAdmin);
@@ -99,7 +90,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()));
+            }
         }
     }
 
@@ -110,12 +104,9 @@ 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)
@@ -127,6 +118,24 @@ public class BukkitTelnetBridge extends FreedomService
         return bukkitTelnetPlugin;
     }
 
+    public List<Admin> getConnectedAdmins()
+    {
+        List<Admin> admins = new ArrayList<>();
+        final BukkitTelnet telnet = getBukkitTelnetPlugin();
+        if (telnet != null)
+        {
+            for (ClientSession session : telnet.appender.getSessions())
+            {
+                Admin admin = plugin.al.getEntryByName(session.getUserName().toLowerCase());
+                if (admin != null && !admins.contains(admin))
+                {
+                    admins.add(admin);
+                }
+            }
+        }
+        return admins;
+    }
+
     public void killTelnetSessions(final String name)
     {
         try
@@ -136,10 +145,8 @@ public class BukkitTelnetBridge extends FreedomService
             final BukkitTelnet telnet = getBukkitTelnetPlugin();
             if (telnet != null)
             {
-                final Iterator<ClientSession> it = telnet.appender.getSessions().iterator();
-                while (it.hasNext())
+                for (ClientSession session : telnet.appender.getSessions())
                 {
-                    final ClientSession session = it.next();
                     if (name != null && name.equalsIgnoreCase(session.getUserName()))
                     {
                         sessionsToRemove.add(session);
@@ -167,4 +174,4 @@ public class BukkitTelnetBridge extends FreedomService
             FLog.severe("Error removing telnet sessions: " + ex.getMessage());
         }
     }
-}
+}

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

@@ -0,0 +1,338 @@
+package me.totalfreedom.totalfreedommod.bridge;
+
+import java.util.*;
+import java.util.concurrent.CompletableFuture;
+
+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;
+
+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());
+    }
+
+    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);
+                    }
+                });
+            }
+        }
+    }
+}

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

@@ -3,29 +3,33 @@ package me.totalfreedom.totalfreedommod.bridge;
 import com.earth2me.essentials.Essentials;
 import com.earth2me.essentials.User;
 import me.totalfreedom.totalfreedommod.FreedomService;
-import me.totalfreedom.totalfreedommod.TotalFreedomMod;
+import me.totalfreedom.totalfreedommod.player.FPlayer;
+import me.totalfreedom.totalfreedommod.rank.Rank;
 import me.totalfreedom.totalfreedommod.util.FLog;
-import me.totalfreedom.totalfreedommod.util.FUtil;
-import org.bukkit.Bukkit;
+import org.bukkit.entity.HumanEntity;
+import org.bukkit.entity.Player;
+import org.bukkit.event.EventHandler;
+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.inventory.Inventory;
+import org.bukkit.inventory.InventoryHolder;
 import org.bukkit.plugin.Plugin;
+import org.bukkit.scheduler.BukkitRunnable;
 
 public class EssentialsBridge extends FreedomService
 {
 
     private Essentials essentialsPlugin = null;
 
-    public EssentialsBridge(TotalFreedomMod plugin)
-    {
-        super(plugin);
-    }
-
     @Override
-    protected void onStart()
+    public void onStart()
     {
     }
 
     @Override
-    protected void onStop()
+    public void onStop()
     {
     }
 
@@ -35,13 +39,11 @@ public class EssentialsBridge extends FreedomService
         {
             try
             {
-                final Plugin essentials = Bukkit.getServer().getPluginManager().getPlugin("Essentials");
-                if (essentials != null)
+                final Plugin essentials = server.getPluginManager().getPlugin("Essentials");
+                assert essentials != null;
+                if (essentials instanceof Essentials)
                 {
-                    if (essentials instanceof Essentials)
-                    {
-                        essentialsPlugin = (Essentials) essentials;
-                    }
+                    essentialsPlugin = (Essentials)essentials;
                 }
             }
             catch (Exception ex)
@@ -56,7 +58,7 @@ public class EssentialsBridge extends FreedomService
     {
         try
         {
-            final Essentials essentials = getEssentialsPlugin();
+            Essentials essentials = getEssentialsPlugin();
             if (essentials != null)
             {
                 return essentials.getUserMap().getUser(username);
@@ -73,7 +75,7 @@ public class EssentialsBridge extends FreedomService
     {
         try
         {
-            final User user = getEssentialsUser(username);
+            User user = getEssentialsUser(username);
             if (user != null)
             {
                 user.setNickname(nickname);
@@ -90,7 +92,7 @@ public class EssentialsBridge extends FreedomService
     {
         try
         {
-            final User user = getEssentialsUser(username);
+            User user = getEssentialsUser(username);
             if (user != null)
             {
                 return user.getNickname();
@@ -107,10 +109,10 @@ public class EssentialsBridge extends FreedomService
     {
         try
         {
-            final User user = getEssentialsUser(username);
+            User user = getEssentialsUser(username);
             if (user != null)
             {
-                return FUtil.<Long>getField(user, "lastActivity"); // This is weird
+                return user.getLastOnlineActivity();
             }
         }
         catch (Exception ex)
@@ -120,20 +122,90 @@ public class EssentialsBridge extends FreedomService
         return 0L;
     }
 
-    public boolean isEssentialsEnabled()
+    public void setVanished(String username, boolean vanished)
     {
         try
         {
-            final Essentials essentials = getEssentialsPlugin();
-            if (essentials != null)
+            User user = getEssentialsUser(username);
+            if (user != null && user.getBase().isOnline())
             {
-                return essentials.isEnabled();
+                user.setVanished(vanished);
             }
         }
         catch (Exception ex)
         {
             FLog.severe(ex);
         }
-        return false;
+    }
+
+    @EventHandler(priority = EventPriority.MONITOR)
+    public void onInventoryClick(InventoryClickEvent event)
+    {
+        Player refreshPlayer = null;
+        Inventory inventory = event.getView().getTopInventory();
+        InventoryType inventoryType = inventory.getType();
+        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())
+                {
+                    event.setCancelled(true);
+                    refreshPlayer = player;
+                }
+            }
+        }
+        if (refreshPlayer != null)
+        {
+            final Player p = refreshPlayer;
+            new BukkitRunnable()
+            {
+                @Override
+                public void run()
+                {
+                    p.updateInventory();
+                }
+            }.runTaskLater(plugin, 20L);
+        }
+    }
+
+    @EventHandler(priority = EventPriority.MONITOR)
+    public void onInventoryClose(InventoryCloseEvent event)
+    {
+        Player refreshPlayer = null;
+        Inventory inventory = event.getView().getTopInventory();
+        InventoryType inventoryType = inventory.getType();
+        Player player = (Player)event.getPlayer();
+        FPlayer fPlayer = plugin.pl.getPlayer(player);
+        if (inventoryType == InventoryType.PLAYER && fPlayer.isInvSee())
+        {
+            fPlayer.setInvSee(false);
+            refreshPlayer = player;
+        }
+        if (refreshPlayer != null)
+        {
+            final Player p = refreshPlayer;
+            new BukkitRunnable()
+            {
+                @Override
+                public void run()
+                {
+                    p.updateInventory();
+                }
+            }.runTaskLater(plugin, 20L);
+        }
+    }
+
+    public boolean isEnabled()
+    {
+        final Essentials ess = getEssentialsPlugin();
+
+        return ess != null && ess.isEnabled();
     }
 }

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

@@ -1,35 +1,27 @@
 package me.totalfreedom.totalfreedommod.bridge;
 
-//import me.libraryaddict.disguise.DisallowedDisguises;
-//import me.libraryaddict.disguise.LibsDisguises;
-//import me.libraryaddict.disguise.DisguiseAPI;
+import me.libraryaddict.disguise.BlockedDisguises;
+import me.libraryaddict.disguise.DisguiseAPI;
+import me.libraryaddict.disguise.LibsDisguises;
 import me.totalfreedom.totalfreedommod.FreedomService;
-import me.totalfreedom.totalfreedommod.TotalFreedomMod;
 import me.totalfreedom.totalfreedommod.util.FLog;
 import org.bukkit.entity.Player;
-import org.bukkit.Bukkit;
 import org.bukkit.plugin.Plugin;
 
 public class LibsDisguisesBridge extends FreedomService
 {
-
-   // private LibsDisguises libsDisguisesPlugin = null;
-
-    public LibsDisguisesBridge(TotalFreedomMod plugin)
-    {
-        super(plugin);
-    }
+    private LibsDisguises libsDisguisesPlugin = null;
 
     @Override
-    protected void onStart()
+    public void onStart()
     {
     }
 
     @Override
-    protected void onStop()
+    public void onStop()
     {
     }
-/*
+
     public LibsDisguises getLibsDisguisesPlugin()
     {
         if (libsDisguisesPlugin == null)
@@ -41,7 +33,7 @@ public class LibsDisguisesBridge extends FreedomService
                 {
                     if (libsDisguises instanceof LibsDisguises)
                     {
-                        libsDisguisesPlugin = (LibsDisguises) libsDisguises;
+                        libsDisguisesPlugin = (LibsDisguises)libsDisguises;
                     }
                 }
             }
@@ -54,24 +46,7 @@ public class LibsDisguisesBridge extends FreedomService
         return libsDisguisesPlugin;
     }
 
-    public Boolean isDisguised(Player player)
-    {
-        try
-        {
-            final LibsDisguises libsDisguises = getLibsDisguisesPlugin();
-            if (libsDisguises != null)
-            {
-                return DisguiseAPI.isDisguised(player);
-            }
-        }
-        catch (Exception ex)
-        {
-            FLog.severe(ex);
-        }
-        return null;
-    }
-
-    public void undisguiseAll(boolean admins)
+    public void undisguiseAll(boolean admin)
     {
         try
         {
@@ -86,7 +61,7 @@ public class LibsDisguisesBridge extends FreedomService
             {
                 if (DisguiseAPI.isDisguised(player))
                 {
-                    if (!admins && plugin.al.isAdmin(player))
+                    if (!admin && plugin.al.isAdmin(player))
                     {
                         continue;
                     }
@@ -100,6 +75,11 @@ public class LibsDisguisesBridge extends FreedomService
         }
     }
 
+    public boolean isDisguisesEnabled()
+    {
+        return !BlockedDisguises.disabled;
+    }
+
     public void setDisguisesEnabled(boolean state)
     {
         final LibsDisguises libsDisguises = getLibsDisguisesPlugin();
@@ -109,30 +89,13 @@ public class LibsDisguisesBridge extends FreedomService
             return;
         }
 
-        if (state)
-        {
-            DisguiseAPI.enableDisguises();
-        }
-        else
-        {
-            DisguiseAPI.disableDisguises();
-        }
+        BlockedDisguises.disabled = !state;
     }
 
-    public boolean isDisguisesEnabled()
+    public boolean isEnabled()
     {
-        return !DisallowedDisguises.disabled;
+        final LibsDisguises libsDisguises = getLibsDisguisesPlugin();
+
+        return libsDisguises != null;
     }
-
-    public boolean isPluginEnabled()
-    {
-        Plugin ld = getLibsDisguisesPlugin();
-
-        if (ld == null)
-        {
-            return false;
-        }
-
-        return ld.isEnabled();
-    }*/
 }

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

@@ -4,7 +4,6 @@ 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.TotalFreedomMod;
 import me.totalfreedom.totalfreedommod.util.FLog;
 import org.bukkit.entity.Player;
 import org.bukkit.plugin.Plugin;
@@ -12,54 +11,22 @@ import org.bukkit.plugin.Plugin;
 public class WorldEditBridge extends FreedomService
 {
 
-    private final WorldEditListener listener;
     //
-    private WorldEditPlugin worldedit = null;
+    private WorldEditPlugin worldeditPlugin = null;
 
-    public WorldEditBridge(TotalFreedomMod plugin)
+    @Override
+    public void onStart()
     {
-        super(plugin);
-        listener = new WorldEditListener(plugin);
     }
 
     @Override
-    protected void onStart()
+    public void onStop()
     {
-        listener.register();
     }
 
-    @Override
-    protected void onStop()
+    public WorldEditPlugin getWorldEditPlugin()
     {
-        listener.unregister();
-    }
-
-    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);
-        }
-    }
-
-    private WorldEditPlugin getWorldEditPlugin()
-    {
-        if (worldedit == null)
+        if (worldeditPlugin == null)
         {
             try
             {
@@ -68,7 +35,7 @@ public class WorldEditBridge extends FreedomService
                 {
                     if (we instanceof WorldEditPlugin)
                     {
-                        worldedit = (WorldEditPlugin) we;
+                        worldeditPlugin = (WorldEditPlugin)we;
                     }
                 }
             }
@@ -78,7 +45,7 @@ public class WorldEditBridge extends FreedomService
             }
         }
 
-        return worldedit;
+        return worldeditPlugin;
     }
 
     public void setLimit(Player player, int limit)
@@ -98,6 +65,30 @@ public class WorldEditBridge extends FreedomService
 
     }
 
+    public int getDefaultLimit()
+    {
+        final WorldEditPlugin wep = getWorldEditPlugin();
+        if (wep == null)
+        {
+            return 0;
+        }
+
+        return wep.getLocalConfiguration().defaultChangeLimit;
+
+    }
+
+    public int getMaxLimit()
+    {
+        final WorldEditPlugin wep = getWorldEditPlugin();
+        if (wep == null)
+        {
+            return 0;
+        }
+
+        return wep.getLocalConfiguration().maxChangeLimit;
+
+    }
+
     private LocalSession getPlayerSession(Player player)
     {
         final WorldEditPlugin wep = getWorldEditPlugin();
@@ -116,23 +107,4 @@ public class WorldEditBridge extends FreedomService
             return null;
         }
     }
-
-    private BukkitPlayer getBukkitPlayer(Player player)
-    {
-        final WorldEditPlugin wep = getWorldEditPlugin();
-        if (wep == null)
-        {
-            return null;
-        }
-
-        try
-        {
-            return wep.wrapPlayer(player);
-        }
-        catch (Exception ex)
-        {
-            FLog.severe(ex);
-            return null;
-        }
-    }
 }

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

@@ -1,74 +0,0 @@
-package me.totalfreedom.totalfreedommod.bridge;
-
-import me.totalfreedom.totalfreedommod.TotalFreedomMod;
-import me.totalfreedom.totalfreedommod.util.FUtil;
-// These imports are not in the latest releases of WorldEdit, and the new versions of WorldEdit do not build properly. This will need to be reverted once the new WorldEdit builds are building properly.
-//
-//import me.totalfreedom.worldedit.LimitChangedEvent;
-//import me.totalfreedom.worldedit.SelectionChangedEvent;
-//
-//The following two imports are a temporary measure as mentioned above.
-//
-import me.StevenLawson.worldedit.LimitChangedEvent;
-import me.StevenLawson.worldedit.SelectionChangedEvent;
-//
-import net.pravian.aero.component.PluginListener;
-import org.bukkit.ChatColor;
-import org.bukkit.entity.Player;
-import org.bukkit.event.EventHandler;
-
-public class WorldEditListener extends PluginListener<TotalFreedomMod>
-{
-
-    public WorldEditListener(TotalFreedomMod plugin)
-    {
-        super(plugin);
-    }
-
-    @EventHandler
-    public void onSelectionChange(final SelectionChangedEvent event)
-    {
-        final Player player = event.getPlayer();
-
-        if (plugin.al.isAdmin(player))
-        {
-            return;
-        }
-
-        if (plugin.pa.isInProtectedArea(
-                event.getMinVector(),
-                event.getMaxVector(),
-                event.getWorld().getName()))
-        {
-
-            player.sendMessage(ChatColor.RED + "The region that you selected contained a protected area. Selection cleared.");
-            event.setCancelled(true);
-        }
-    }
-
-    @EventHandler
-    public void onLimitChanged(LimitChangedEvent event)
-    {
-        final Player player = event.getPlayer();
-
-        if (plugin.al.isAdmin(player))
-        {
-            return;
-        }
-
-        if (!event.getPlayer().equals(event.getTarget()))
-        {
-            player.sendMessage(ChatColor.RED + "Only admins can change the limit for other players!");
-            event.setCancelled(true);
-        }
-
-        if (event.getLimit() < 0 || event.getLimit() > 10000)
-        {
-            player.setOp(false);
-            FUtil.bcastMsg(event.getPlayer().getName() + " tried to set their WorldEdit limit to " + event.getLimit() + " and has been de-opped", ChatColor.RED);
-            event.setCancelled(true);
-            player.sendMessage(ChatColor.RED + "You cannot set your limit higher than 10000 or to -1!");
-        }
-    }
-
-}

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

@@ -0,0 +1,48 @@
+package me.totalfreedom.totalfreedommod.bridge;
+
+import com.sk89q.worldguard.LocalPlayer;
+import com.sk89q.worldguard.WorldGuard;
+import com.sk89q.worldguard.bukkit.WorldGuardPlugin;
+import com.sk89q.worldguard.protection.regions.RegionContainer;
+
+import com.sk89q.worldguard.protection.regions.RegionQuery;
+import me.totalfreedom.totalfreedommod.FreedomService;
+import org.bukkit.entity.Player;
+import org.bukkit.plugin.Plugin;
+
+public class WorldGuardBridge extends FreedomService
+{
+    @Override
+    public void onStart()
+    {
+    }
+
+    @Override
+    public void onStop()
+    {
+    }
+
+    public boolean canEditCurrentWorld(Player player)
+    {
+        // If WorldGuard integration is enabled, do a check with it.
+        if (isEnabled())
+        {
+            LocalPlayer localPlayer = WorldGuardPlugin.inst().wrapPlayer(player);
+
+            RegionContainer container = WorldGuard.getInstance().getPlatform().getRegionContainer();
+            RegionQuery query = container.createQuery();
+
+            return query.testBuild(localPlayer.getLocation(), localPlayer);
+        }
+
+        // If the plugin isn't present, return true.
+        return true;
+    }
+
+    public boolean isEnabled()
+    {
+        Plugin plugin = server.getPluginManager().getPlugin("WorldGuard");
+
+        return plugin != null && plugin.isEnabled();
+    }
+}

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

@@ -2,28 +2,23 @@ package me.totalfreedom.totalfreedommod.caging;
 
 import java.util.ArrayList;
 import java.util.List;
-import lombok.Getter;
 import me.totalfreedom.totalfreedommod.player.FPlayer;
 import org.bukkit.Location;
 import org.bukkit.Material;
-import org.bukkit.SkullType;
 import org.bukkit.block.Block;
 import org.bukkit.block.Skull;
 
 public class CageData
 {
 
+    private static String input = null;
     private final FPlayer fPlayer;
     //
-    private final List<BlockData> cageHistory = new ArrayList<>();
     //
-    @Getter
+    private final List<BlockData> cageHistory = new ArrayList<>();
     private boolean caged = false;
-    @Getter
     private Location location;
-    @Getter
     private Material outerMaterial = Material.GLASS;
-    @Getter
     private Material innerMaterial = Material.AIR;
 
     public CageData(FPlayer player)
@@ -31,19 +26,91 @@ public class CageData
         this.fPlayer = player;
     }
 
-    public void setCaged(boolean cage)
+    // Util methods
+    public static void generateCube(Location location, int length, Material material)
     {
-        if (cage)
+        final Block center = location.getBlock();
+        for (int xOffset = -length; xOffset <= length; xOffset++)
         {
-            cage(fPlayer.getPlayer().getLocation(), Material.GLASS, Material.GLASS);
-        }
-        else
-        {
-            this.caged = false;
-            regenerateHistory();
-            clearHistory();
+            for (int yOffset = -length; yOffset <= length; yOffset++)
+            {
+                for (int zOffset = -length; zOffset <= length; zOffset++)
+                {
+                    final Block block = center.getRelative(xOffset, yOffset, zOffset);
+                    if (block.getType() != material)
+                    {
+                        block.setType(material);
+                    }
+                }
+            }
         }
+    }
 
+    @SuppressWarnings("deprecation")
+    public static void generateHollowCube(Location location, int length, Material material)
+    {
+        final Block center = location.getBlock();
+        for (int xOffset = -length; xOffset <= length; xOffset++)
+        {
+            for (int yOffset = -length; yOffset <= length; yOffset++)
+            {
+                for (int zOffset = -length; zOffset <= length; zOffset++)
+                {
+                    // Hollow
+                    if (Math.abs(xOffset) != length && Math.abs(yOffset) != length && Math.abs(zOffset) != length)
+                    {
+                        continue;
+                    }
+
+                    final Block block = center.getRelative(xOffset, yOffset, zOffset);
+
+                    if (material != Material.PLAYER_HEAD)
+                    {
+                        // Glowstone light
+                        if (material != Material.GLASS && xOffset == 0 && yOffset == 2 && zOffset == 0)
+                        {
+                            block.setType(Material.GLOWSTONE);
+                            continue;
+                        }
+
+                        block.setType(material);
+                    }
+                    else
+                    {
+                        if (Math.abs(xOffset) == length && Math.abs(yOffset) == length && Math.abs(zOffset) == length)
+                        {
+                            block.setType(Material.GLOWSTONE);
+                            continue;
+                        }
+
+                        block.setType(Material.PLAYER_HEAD);
+                        if (input != null)
+                        {
+                            try
+                            {
+                                Skull skull = (Skull)block.getState();
+                                // This may or may not work in future versions of spigot
+                                skull.setOwner(input);
+                                skull.update();
+                            }
+                            catch (ClassCastException ignored)
+                            {
+                            }
+                        }
+                    }
+                }
+            }
+        }
+    }
+
+    public static String getInput()
+    {
+        return input;
+    }
+
+    public static void setInput(String input)
+    {
+        CageData.input = input;
     }
 
     public void cage(Location location, Material outer, Material inner)
@@ -57,8 +124,26 @@ public class CageData
         this.location = location;
         this.outerMaterial = outer;
         this.innerMaterial = inner;
+        input = null;
 
-        buildHistory(location, 2, fPlayer);
+        buildHistory(location);
+        regenerate();
+    }
+
+    public void cage(Location location, Material outer, Material inner, String input)
+    {
+        if (isCaged())
+        {
+            setCaged(false);
+        }
+
+        this.caged = true;
+        this.location = location;
+        this.outerMaterial = outer;
+        this.innerMaterial = inner;
+        CageData.input = input;
+
+        buildHistory(location);
         regenerate();
     }
 
@@ -77,7 +162,7 @@ public class CageData
         generateCube(location, 1, innerMaterial);
     }
 
-    // TODO: EventHandlerize this?
+    // TODO: EventHandler this?
     public void playerJoin()
     {
         if (!isCaged())
@@ -85,7 +170,7 @@ public class CageData
             return;
         }
 
-        cage(fPlayer.getPlayer().getLocation(), outerMaterial, innerMaterial);
+        cage(fPlayer.getPlayer().getLocation(), outerMaterial, innerMaterial, input);
     }
 
     public void playerQuit()
@@ -112,14 +197,14 @@ public class CageData
         }
     }
 
-    private void buildHistory(Location location, int length, FPlayer playerdata)
+    private void buildHistory(Location location)
     {
         final Block center = location.getBlock();
-        for (int xOffset = -length; xOffset <= length; xOffset++)
+        for (int xOffset = -2; xOffset <= 2; xOffset++)
         {
-            for (int yOffset = -length; yOffset <= length; yOffset++)
+            for (int yOffset = -2; yOffset <= 2; yOffset++)
             {
-                for (int zOffset = -length; zOffset <= length; zOffset++)
+                for (int zOffset = -2; zOffset <= 2; zOffset++)
                 {
                     final Block block = center.getRelative(xOffset, yOffset, zOffset);
                     insertHistoryBlock(block.getLocation(), block.getType());
@@ -128,71 +213,64 @@ public class CageData
         }
     }
 
-    // Util methods
-    public static void generateCube(Location location, int length, Material material)
+    public FPlayer getfPlayer()
     {
-        final Block center = location.getBlock();
-        for (int xOffset = -length; xOffset <= length; xOffset++)
-        {
-            for (int yOffset = -length; yOffset <= length; yOffset++)
-            {
-                for (int zOffset = -length; zOffset <= length; zOffset++)
-                {
-                    final Block block = center.getRelative(xOffset, yOffset, zOffset);
-                    if (block.getType() != material)
-                    {
-                        block.setType(material);
-                    }
-                }
-            }
-        }
+        return fPlayer;
     }
 
-    public static void generateHollowCube(Location location, int length, Material material)
+    public List<BlockData> getCageHistory()
     {
-        final Block center = location.getBlock();
-        for (int xOffset = -length; xOffset <= length; xOffset++)
+        return cageHistory;
+    }
+
+    public boolean isCaged()
+    {
+        return caged;
+    }
+
+    public void setCaged(boolean cage)
+    {
+        if (cage)
         {
-            for (int yOffset = -length; yOffset <= length; yOffset++)
-            {
-                for (int zOffset = -length; zOffset <= length; zOffset++)
-                {
-                    // Hollow
-                    if (Math.abs(xOffset) != length && Math.abs(yOffset) != length && Math.abs(zOffset) != length)
-                    {
-                        continue;
-                    }
-
-                    final Block block = center.getRelative(xOffset, yOffset, zOffset);
-
-                    if (material != Material.SKULL)
-                    {
-                        // Glowstone light
-                        if (material != Material.GLASS && xOffset == 0 && yOffset == 2 && zOffset == 0)
-                        {
-                            block.setType(Material.GLOWSTONE);
-                            continue;
-                        }
-
-                        block.setType(material);
-                    }
-                    else // Darth mode
-                    {
-                        if (Math.abs(xOffset) == length && Math.abs(yOffset) == length && Math.abs(zOffset) == length)
-                        {
-                            block.setType(Material.GLOWSTONE);
-                            continue;
-                        }
-
-                        block.setType(Material.SKULL);
-                        final Skull skull = (Skull) block.getState();
-                        skull.setSkullType(SkullType.PLAYER);
-                        skull.setOwner("Prozza");
-                        skull.update();
-                    }
-                }
-            }
+            cage(fPlayer.getPlayer().getLocation(), Material.GLASS, Material.GLASS);
         }
+        else
+        {
+            this.caged = false;
+            regenerateHistory();
+            clearHistory();
+        }
+
+    }
+
+    public Location getLocation()
+    {
+        return location;
+    }
+
+    public void setLocation(Location location)
+    {
+        this.location = location;
+    }
+
+    public Material getOuterMaterial()
+    {
+        return outerMaterial;
+    }
+
+    public void setOuterMaterial(Material outerMaterial)
+    {
+        this.outerMaterial = outerMaterial;
+    }
+
+    public Material getInnerMaterial()
+    {
+        return innerMaterial;
+    }
+
+    public void setInnerMaterial(Material innerMaterial)
+    {
+        this.innerMaterial = innerMaterial;
     }
 
     private static class BlockData

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

@@ -1,7 +1,8 @@
 package me.totalfreedom.totalfreedommod.caging;
 
+import io.papermc.lib.PaperLib;
+import java.util.Objects;
 import me.totalfreedom.totalfreedommod.FreedomService;
-import me.totalfreedom.totalfreedommod.TotalFreedomMod;
 import me.totalfreedom.totalfreedommod.player.FPlayer;
 import me.totalfreedom.totalfreedommod.util.FUtil;
 import org.bukkit.ChatColor;
@@ -11,25 +12,19 @@ import org.bukkit.event.EventHandler;
 import org.bukkit.event.EventPriority;
 import org.bukkit.event.block.BlockBreakEvent;
 import org.bukkit.event.player.PlayerJoinEvent;
+import org.bukkit.event.player.PlayerKickEvent;
 import org.bukkit.event.player.PlayerMoveEvent;
 import org.bukkit.event.player.PlayerQuitEvent;
-import org.bukkit.event.player.PlayerKickEvent;
 
 public class Cager extends FreedomService
 {
-
-    public Cager(TotalFreedomMod plugin)
-    {
-        super(plugin);
-    }
-
     @Override
-    protected void onStart()
+    public void onStart()
     {
     }
 
     @Override
-    protected void onStop()
+    public void onStop()
     {
     }
 
@@ -37,8 +32,7 @@ public class Cager extends FreedomService
     public void onBreakBlock(BlockBreakEvent event)
     {
         Player player = event.getPlayer();
-        if (player == null
-                || plugin.al.isAdmin(player))
+        if (plugin.al.isAdmin(player))
         {
             return;
         }
@@ -67,7 +61,7 @@ public class Cager extends FreedomService
         Location cageLoc = cage.getLocation();
 
         final boolean outOfCage;
-        if (!playerLoc.getWorld().equals(cageLoc.getWorld()))
+        if (!Objects.equals(playerLoc.getWorld(), cageLoc.getWorld()))
         {
             outOfCage = true;
         }
@@ -78,7 +72,7 @@ public class Cager extends FreedomService
 
         if (outOfCage)
         {
-            player.getPlayer().teleport(cageLoc.subtract(0, 0.1, 0));
+            PaperLib.teleportAsync(player.getPlayer(), cageLoc.subtract(0, 0.1, 0));
             FUtil.playerMsg(player.getPlayer(), "You may not leave your cage.", ChatColor.RED);
             cage.regenerate();
         }
@@ -119,5 +113,4 @@ public class Cager extends FreedomService
             cage.playerJoin();
         }
     }
-
-}
+}

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

@@ -10,4 +10,4 @@ public class CommandFailException extends RuntimeException
         super(message);
     }
 
-}
+}

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

@@ -1,45 +1,85 @@
 package me.totalfreedom.totalfreedommod.command;
 
-import lombok.Getter;
+import java.util.ArrayList;
+import java.util.Arrays;
+import java.util.List;
+import java.util.Set;
 import me.totalfreedom.totalfreedommod.FreedomService;
-import me.totalfreedom.totalfreedommod.TotalFreedomMod;
 import me.totalfreedom.totalfreedommod.util.FLog;
-import net.pravian.aero.command.handler.SimpleCommandHandler;
-import org.bukkit.ChatColor;
+import org.reflections.Reflections;
 
 public class CommandLoader extends FreedomService
 {
+    private final List<FreedomCommand> commands;
 
-    @Getter
-    private final SimpleCommandHandler<TotalFreedomMod> handler;
-
-    public CommandLoader(TotalFreedomMod plugin)
+    public CommandLoader()
     {
-        super(plugin);
-
-        handler = new SimpleCommandHandler<>(plugin);
+        commands = new ArrayList<>();
     }
 
     @Override
-    protected void onStart()
+    public void onStart()
     {
-        handler.clearCommands();
-        handler.setExecutorFactory(new FreedomCommandExecutor.FreedomExecutorFactory(plugin));
-        handler.setCommandClassPrefix("Command_");
-        handler.setPermissionMessage(ChatColor.RED + "You do not have permission to use this command.");
-        handler.setOnlyConsoleMessage(ChatColor.RED + "This command can only be used from the console.");
-        handler.setOnlyPlayerMessage(ChatColor.RED + "This command can only be used by players.");
-
-        handler.loadFrom(FreedomCommand.class.getPackage());
-        handler.registerAll("TotalFreedomMod", true);
-
-        FLog.info("Loaded " + handler.getExecutors().size() + " commands.");
     }
 
     @Override
-    protected void onStop()
+    public void onStop()
     {
-        handler.clearCommands();
     }
 
-}
+    public void add(FreedomCommand command)
+    {
+        commands.add(command);
+        command.register();
+    }
+
+    public FreedomCommand getByName(String name)
+    {
+        for (FreedomCommand command : commands)
+        {
+            if (name.equals(command.getName()))
+            {
+                return command;
+            }
+        }
+        return null;
+    }
+
+    public boolean isAlias(String alias)
+    {
+        for (FreedomCommand command : commands)
+        {
+            if (Arrays.asList(command.getAliases().split(",")).contains(alias))
+            {
+                return true;
+            }
+        }
+        return false;
+    }
+
+    public void loadCommands()
+    {
+        Reflections commandDir = new Reflections("me.totalfreedom.totalfreedommod.command");
+
+        Set<Class<? extends FreedomCommand>> commandClasses = commandDir.getSubTypesOf(FreedomCommand.class);
+
+        for (Class<? extends FreedomCommand> commandClass : commandClasses)
+        {
+            try
+            {
+                add(commandClass.newInstance());
+            }
+            catch (InstantiationException | IllegalAccessException | ExceptionInInitializerError ex)
+            {
+                FLog.warning("Failed to register command: /" + commandClass.getSimpleName().replace("Command_", ""));
+            }
+        }
+
+        FLog.info("Loaded " + commands.size() + " commands");
+    }
+
+    public List<FreedomCommand> getCommands()
+    {
+        return commands;
+    }
+}

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

@@ -12,4 +12,4 @@ public @interface CommandParameters
     String usage();
 
     String aliases() default ""; // "alias1,alias2,alias3" - no spaces
-}
+}

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

@@ -8,9 +8,11 @@ import me.totalfreedom.totalfreedommod.rank.Rank;
 public @interface CommandPermissions
 {
 
-    Rank level();
+    Rank level() default Rank.NON_OP;
 
-    SourceType source();
+    SourceType source() default SourceType.BOTH;
 
     boolean blockHostConsole() default false;
-}
+
+    int cooldown() default 0;
+}

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

@@ -2,17 +2,13 @@ package me.totalfreedom.totalfreedommod.command;
 
 import me.totalfreedom.totalfreedommod.player.FPlayer;
 import me.totalfreedom.totalfreedommod.rank.Rank;
-import me.totalfreedom.totalfreedommod.util.FUtil;
-import org.apache.commons.lang3.StringUtils;
+import org.apache.commons.lang.StringUtils;
 import org.bukkit.command.Command;
 import org.bukkit.command.CommandSender;
 import org.bukkit.entity.Player;
 
-@CommandPermissions(level = Rank.SUPER_ADMIN, source = SourceType.BOTH)
-@CommandParameters(
-        description = "AdminChat - Talk privately with other admins. Using <command> itself will toggle AdminChat on and off for all messages.",
-        usage = "/<command> [message...]",
-        aliases = "o,ac")
+@CommandPermissions(level = Rank.ADMIN, 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
 {
 
@@ -23,19 +19,18 @@ public class Command_adminchat extends FreedomCommand
         {
             if (senderIsConsole)
             {
-                msg("Only in-game players can toggle AdminChat.");
+                msg("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("Toggled Admin Chat " + (userinfo.inAdminChat() ? "on" : "off") + ".");
+            msg("Admin chat turned " + (userinfo.inAdminChat() ? "on" : "off") + ".");
         }
         else
         {
             plugin.cm.adminChat(sender, StringUtils.join(args, " "));
         }
-
         return true;
     }
-}
+}

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

@@ -0,0 +1,33 @@
+package me.totalfreedom.totalfreedommod.command;
+
+import java.util.List;
+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)
+@CommandParameters(description = "Information on how to apply for admin.", usage = "/<command>", aliases = "si,ai,staffinfo")
+public class Command_admininfo extends FreedomCommand
+{
+
+    @Override
+    public boolean run(CommandSender sender, Player playerSender, Command cmd, String commandLabel, String[] args, boolean senderIsConsole)
+    {
+        List<String> adminInfo = ConfigEntry.ADMIN_INFO.getStringList();
+
+        if (adminInfo.isEmpty())
+        {
+            msg("The admin information section of the config.yml file has not been configured.", ChatColor.RED);
+        }
+        else
+        {
+            msg(FUtil.colorize(StringUtils.join(adminInfo, "\n")));
+        }
+        return true;
+    }
+}

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

@@ -1,14 +1,18 @@
 package me.totalfreedom.totalfreedommod.command;
 
+import java.util.Arrays;
+import java.util.Collections;
+import java.util.List;
 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.SUPER_ADMIN, source = SourceType.ONLY_CONSOLE, blockHostConsole = true)
-@CommandParameters(description = "Close server to non-superadmins.", usage = "/<command> [on | off]")
+@CommandPermissions(level = Rank.ADMIN, 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
 {
 
@@ -23,23 +27,29 @@ public class Command_adminmode extends FreedomCommand
         if (args[0].equalsIgnoreCase("off"))
         {
             ConfigEntry.ADMIN_ONLY_MODE.setBoolean(false);
-            FUtil.adminAction(sender.getName(), "Opening the server to all players.", true);
+            FUtil.adminAction(sender.getName(), "Opening the server to all players", true);
             return true;
         }
         else if (args[0].equalsIgnoreCase("on"))
         {
             ConfigEntry.ADMIN_ONLY_MODE.setBoolean(true);
-            FUtil.adminAction(sender.getName(), "Closing the server to non-superadmins.", true);
-            for (Player player : server.getOnlinePlayers())
-            {
-                if (!isAdmin(player))
-                {
-                    player.kickPlayer("Server is now closed to non-superadmins.");
-                }
-            }
+            FUtil.adminAction(sender.getName(), "Closing the server to non-admins", true);
+            server.getOnlinePlayers().stream().filter(player -> !isAdmin(player)).forEach(player ->
+                    player.kick(Component.text("The server is now closed to non-admins.")));
             return true;
         }
 
         return false;
     }
-}
+
+    @Override
+    public List<String> getTabCompleteOptions(CommandSender sender, Command command, String alias, String[] args)
+    {
+        if (args.length == 1 && plugin.al.isAdmin(sender) && !(sender instanceof Player))
+        {
+            return Arrays.asList("on", "off");
+        }
+
+        return Collections.emptyList();
+    }
+}

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

@@ -1,7 +1,10 @@
 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.util.FUtil;
 import me.totalfreedom.totalfreedommod.world.WorldTime;
 import me.totalfreedom.totalfreedommod.world.WorldWeather;
 import org.bukkit.World;
@@ -10,17 +13,12 @@ import org.bukkit.command.CommandSender;
 import org.bukkit.entity.Player;
 
 @CommandPermissions(level = Rank.OP, source = SourceType.BOTH)
-@CommandParameters(description = "Go to the AdminWorld.",
-        usage = "/<command> [guest < list | purge | add <player> | remove <player> > | time <morning | noon | evening | night> | weather <off | on | storm>]")
+@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")
 public class Command_adminworld extends FreedomCommand
 {
 
-    private enum CommandMode
-    {
-
-        TELEPORT, GUEST, TIME, WEATHER;
-    }
-
     @Override
     public boolean run(CommandSender sender, Player playerSender, Command cmd, String commandLabel, String[] args, boolean senderIsConsole)
     {
@@ -32,11 +30,7 @@ public class Command_adminworld extends FreedomCommand
         }
         else if (args.length >= 2)
         {
-            if ("guest".equalsIgnoreCase(args[0]))
-            {
-                commandMode = CommandMode.GUEST;
-            }
-            else if ("time".equalsIgnoreCase(args[0]))
+            if ("time".equalsIgnoreCase(args[0]))
             {
                 commandMode = CommandMode.TIME;
             }
@@ -59,7 +53,7 @@ public class Command_adminworld extends FreedomCommand
                 {
                     if (!(sender instanceof Player) || playerSender == null)
                     {
-                        return true;
+                        return false;
                     }
 
                     World adminWorld = null;
@@ -67,90 +61,20 @@ public class Command_adminworld extends FreedomCommand
                     {
                         adminWorld = plugin.wm.adminworld.getWorld();
                     }
-                    catch (Exception ex)
+                    catch (Exception ignored)
                     {
                     }
 
                     if (adminWorld == null || playerSender.getWorld() == adminWorld)
                     {
                         msg("Going to the main world.");
-                        playerSender.teleport(server.getWorlds().get(0).getSpawnLocation());
+                        PaperLib.teleportAsync(playerSender, server.getWorlds().get(0).getSpawnLocation());
                     }
                     else
                     {
-                        if (plugin.wm.adminworld.canAccessWorld(playerSender))
-                        {
-                            msg("Going to the AdminWorld.");
-                            plugin.wm.adminworld.sendToWorld(playerSender);
-                        }
-                        else
-                        {
-                            msg("You don't have permission to access the AdminWorld.");
-                        }
+                        msg("Going to the AdminWorld.");
+                        plugin.wm.adminworld.sendToWorld(playerSender);
                     }
-
-                    break;
-                }
-                case GUEST:
-                {
-                    if (args.length == 2)
-                    {
-                        if ("list".equalsIgnoreCase(args[1]))
-                        {
-                            msg("AdminWorld guest list: " + plugin.wm.adminworld.guestListToString());
-                        }
-                        else if ("purge".equalsIgnoreCase(args[1]))
-                        {
-                            assertCommandPerms(sender, playerSender);
-                            plugin.wm.adminworld.purgeGuestList();
-                            FUtil.adminAction(sender.getName(), "AdminWorld guest list purged.", false);
-                        }
-                        else
-                        {
-                            return false;
-                        }
-                    }
-                    else if (args.length == 3)
-                    {
-                        assertCommandPerms(sender, playerSender);
-
-                        if ("add".equalsIgnoreCase(args[1]))
-                        {
-                            final Player player = getPlayer(args[2]);
-
-                            if (player == null)
-                            {
-                                sender.sendMessage(FreedomCommand.PLAYER_NOT_FOUND);
-                                return true;
-                            }
-
-                            if (plugin.wm.adminworld.addGuest(player, playerSender))
-                            {
-                                FUtil.adminAction(sender.getName(), "AdminWorld guest added: " + player.getName(), false);
-                            }
-                            else
-                            {
-                                msg("Could not add player to guest list.");
-                            }
-                        }
-                        else if ("remove".equals(args[1]))
-                        {
-                            final Player player = plugin.wm.adminworld.removeGuest(args[2]);
-                            if (player != null)
-                            {
-                                FUtil.adminAction(sender.getName(), "AdminWorld guest removed: " + player.getName(), false);
-                            }
-                            else
-                            {
-                                msg("Can't find guest entry for: " + args[2]);
-                            }
-                        }
-                        else
-                        {
-                            return false;
-                        }
-                    }
-
                     break;
                 }
                 case TIME:
@@ -213,7 +137,7 @@ public class Command_adminworld extends FreedomCommand
             {
                 return noPerms();
             }
-            sender.sendMessage(ex.getMessage());
+            msg(ex.getMessage());
             return true;
         }
 
@@ -229,7 +153,37 @@ public class Command_adminworld extends FreedomCommand
         }
     }
 
-    private class PermissionDeniedException extends Exception
+    @Override
+    public List<String> getTabCompleteOptions(CommandSender sender, Command command, String alias, String[] args)
+    {
+        if (!plugin.al.isAdmin(sender))
+        {
+            return Collections.emptyList();
+        }
+        if (args.length == 1)
+        {
+            return Arrays.asList("time", "weather");
+        }
+        else if (args.length == 2)
+        {
+            if (args[0].equals("time"))
+            {
+                return Arrays.asList("morning", "noon", "evening", "night");
+            }
+            else if (args[0].equals("weather"))
+            {
+                return Arrays.asList("off", "rain", "storm");
+            }
+        }
+        return Collections.emptyList();
+    }
+
+    private enum CommandMode
+    {
+        TELEPORT, TIME, WEATHER
+    }
+
+    private static class PermissionDeniedException extends Exception
     {
 
         private static final long serialVersionUID = 1L;
@@ -244,5 +198,4 @@ public class Command_adminworld extends FreedomCommand
             super(string);
         }
     }
-
-}
+}

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

@@ -7,8 +7,8 @@ import org.bukkit.command.Command;
 import org.bukkit.command.CommandSender;
 import org.bukkit.entity.Player;
 
-@CommandPermissions(level = Rank.SUPER_ADMIN, source = SourceType.BOTH)
-@CommandParameters(description = "Quickly change your own gamemode to adventure, or define someone's username to change theirs.", usage = "/<command> <-a | [partialname]>", aliases = "gma")
+@CommandPermissions(level = Rank.OP, source = SourceType.BOTH)
+@CommandParameters(description = "Quickly change your own gamemode to adventure, define someone's username to change theirs, or change everyone's gamemode on the server.", usage = "/<command> <[partialname] | -a>", aliases = "gma")
 public class Command_adventure extends FreedomCommand
 {
 
@@ -19,15 +19,17 @@ public class Command_adventure extends FreedomCommand
         {
             if (isConsole())
             {
-                sender.sendMessage("When used from the console, you must define a target player.");
+                msg("When used from the console, you must define a target player.");
                 return true;
             }
 
             playerSender.setGameMode(GameMode.ADVENTURE);
-            msg("Gamemode set to adventure.");
+            msg("Your gamemode has been set to adventure.");
             return true;
         }
 
+        checkRank(Rank.ADMIN);
+
         if (args[0].equals("-a"))
         {
             for (Player targetPlayer : server.getOnlinePlayers())
@@ -36,6 +38,7 @@ public class Command_adventure extends FreedomCommand
             }
 
             FUtil.adminAction(sender.getName(), "Changing everyone's gamemode to adventure", false);
+            msg("Your gamemode has been set to adventure.");
             return true;
         }
 
@@ -43,14 +46,13 @@ public class Command_adventure extends FreedomCommand
 
         if (player == null)
         {
-            sender.sendMessage(FreedomCommand.PLAYER_NOT_FOUND);
+            msg(PLAYER_NOT_FOUND);
             return true;
         }
 
-        msg("Setting " + player.getName() + " to game mode adventure");
-        msg(player, sender.getName() + " set your game mode to adventure");
+        msg("Setting " + player.getName() + " to game mode adventure.");
+        msg(player, sender.getName() + " set your game mode to adventure.");
         player.setGameMode(GameMode.ADVENTURE);
-
         return true;
     }
-}
+}

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

@@ -0,0 +1,36 @@
+package me.totalfreedom.totalfreedommod.command;
+
+import me.totalfreedom.totalfreedommod.rank.Rank;
+import me.totalfreedom.totalfreedommod.util.FUtil;
+import org.bukkit.World;
+import org.bukkit.command.Command;
+import org.bukkit.command.CommandSender;
+import org.bukkit.entity.AreaEffectCloud;
+import org.bukkit.entity.Entity;
+import org.bukkit.entity.Player;
+
+@CommandPermissions(level = Rank.ADMIN, source = SourceType.BOTH)
+@CommandParameters(description = "Clears lingering potion area effect clouds.", usage = "/<command>", aliases = "aec")
+public class Command_aeclear extends FreedomCommand
+{
+
+    @Override
+    public boolean run(CommandSender sender, Player playerSender, Command cmd, String commandLabel, String[] args, boolean senderIsConsole)
+    {
+        FUtil.adminAction(sender.getName(), "Removing all area effect clouds", true);
+        int removed = 0;
+        for (World world : server.getWorlds())
+        {
+            for (Entity entity : world.getEntities())
+            {
+                if (entity instanceof AreaEffectCloud)
+                {
+                    entity.remove();
+                    removed++;
+                }
+            }
+        }
+        msg(removed + " area effect clouds removed.");
+        return true;
+    }
+}

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

@@ -1,18 +1,18 @@
 package me.totalfreedom.totalfreedommod.command;
 
 import me.totalfreedom.totalfreedommod.rank.Rank;
-import org.apache.commons.lang3.StringUtils;
+import org.apache.commons.lang.StringUtils;
 import org.bukkit.command.Command;
 import org.bukkit.command.CommandSender;
 import org.bukkit.entity.Player;
 
-@CommandPermissions(level = Rank.SUPER_ADMIN, source = SourceType.BOTH)
-@CommandParameters(description = "Make an announcement", usage = "/<command> <message>")
+@CommandPermissions(level = Rank.ADMIN, source = SourceType.BOTH)
+@CommandParameters(description = "Make an announcement anonymously to operators.", usage = "/<command> <message>")
 public class Command_announce extends FreedomCommand
 {
 
     @Override
-    protected boolean run(CommandSender sender, Player playerSender, Command cmd, String commandLabel, String[] args, boolean senderIsConsole)
+    public boolean run(CommandSender sender, Player playerSender, Command cmd, String commandLabel, String[] args, boolean senderIsConsole)
     {
         if (args.length < 1)
         {
@@ -22,5 +22,4 @@ public class Command_announce extends FreedomCommand
         plugin.an.announce(StringUtils.join(args, " "));
         return true;
     }
-
-}
+}

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

@@ -0,0 +1,21 @@
+package me.totalfreedom.totalfreedommod.command;
+
+import me.totalfreedom.totalfreedommod.rank.Rank;
+import me.totalfreedom.totalfreedommod.util.FUtil;
+import org.bukkit.attribute.Attribute;
+import org.bukkit.command.Command;
+import org.bukkit.command.CommandSender;
+import org.bukkit.entity.Player;
+import java.util.Arrays;
+
+@CommandPermissions(level = Rank.OP, source = SourceType.BOTH)
+@CommandParameters(description = "Lists all possible attributes.", usage = "/<command>")
+public class Command_attributelist extends FreedomCommand
+{
+    @Override
+    public boolean run(CommandSender sender, Player playerSender, Command cmd, String commandLabel, String[] args, boolean senderIsConsole)
+    {
+        msg("All possible attributes: " + FUtil.listToString(Arrays.stream(Attribute.values()).map(Enum::name).toList()));
+        return true;
+    }
+}

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

@@ -0,0 +1,36 @@
+package me.totalfreedom.totalfreedommod.command;
+
+import me.totalfreedom.totalfreedommod.rank.Rank;
+import org.bukkit.command.Command;
+import org.bukkit.command.CommandSender;
+import org.bukkit.entity.Player;
+
+@CommandPermissions(level = Rank.ADMIN, 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
+{
+
+    @Override
+    public boolean run(CommandSender sender, Player playerSender, Command cmd, String commandLabel, String[] args, boolean senderIsConsole)
+    {
+        if (args.length == 0)
+        {
+            return false;
+        }
+
+        boolean enabled = plugin.lp.CLEAR_ON_JOIN.contains(args[0]);
+
+        if (enabled)
+        {
+            plugin.lp.CLEAR_ON_JOIN.remove(args[0]);
+        }
+        else
+        {
+            plugin.lp.CLEAR_ON_JOIN.add(args[0]);
+        }
+
+        msg(args[0] + " will " + (enabled ? "no longer" : "now") + " have their inventory cleared when they join.");
+
+        return true;
+    }
+}

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

@@ -0,0 +1,36 @@
+package me.totalfreedom.totalfreedommod.command;
+
+import me.totalfreedom.totalfreedommod.rank.Rank;
+import org.bukkit.command.Command;
+import org.bukkit.command.CommandSender;
+import org.bukkit.entity.Player;
+
+@CommandPermissions(level = Rank.ADMIN, 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
+{
+
+    @Override
+    public boolean run(CommandSender sender, Player playerSender, Command cmd, String commandLabel, String[] args, boolean senderIsConsole)
+    {
+        if (args.length == 0)
+        {
+            return false;
+        }
+
+        boolean enabled = plugin.lp.TELEPORT_ON_JOIN.contains(args[0]);
+
+        if (enabled)
+        {
+            plugin.lp.TELEPORT_ON_JOIN.remove(args[0]);
+        }
+        else
+        {
+            plugin.lp.TELEPORT_ON_JOIN.add(args[0]);
+        }
+
+        msg(args[0] + " will " + (enabled ? "no longer" : "now") + " be automatically teleported when they join.");
+
+        return true;
+    }
+}

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

@@ -0,0 +1,185 @@
+package me.totalfreedom.totalfreedommod.command;
+
+import java.util.Objects;
+
+import com.earth2me.essentials.User;
+import me.totalfreedom.totalfreedommod.banning.Ban;
+import me.totalfreedom.totalfreedommod.player.PlayerData;
+import me.totalfreedom.totalfreedommod.punishments.Punishment;
+import me.totalfreedom.totalfreedommod.punishments.PunishmentType;
+import me.totalfreedom.totalfreedommod.rank.Rank;
+import me.totalfreedom.totalfreedommod.util.FUtil;
+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;
+import org.bukkit.command.Command;
+import org.bukkit.command.CommandSender;
+import org.bukkit.entity.Player;
+
+@CommandPermissions(level = Rank.ADMIN, source = SourceType.BOTH, blockHostConsole = true)
+@CommandParameters(description = "Bans the specified player.", usage = "/<command> <username> [reason] [-nrb | -q]", aliases = "gtfo")
+public class Command_ban extends FreedomCommand
+{
+    @Override
+    public boolean run(CommandSender sender, Player playerSender, Command cmd, String commandLabel, String[] args, boolean senderIsConsole)
+    {
+        if (args.length == 0)
+        {
+            return false;
+        }
+
+        String reason = null;
+        boolean silent = false;
+        boolean cancelRollback = false;
+        if (args.length >= 2)
+        {
+            if (args[args.length - 1].equalsIgnoreCase("-nrb") || args[args.length - 1].equalsIgnoreCase("-q"))
+            {
+                if (args[args.length - 1].equalsIgnoreCase("-nrb"))
+                {
+                    cancelRollback = true;
+                }
+
+                if (args[args.length - 1].equalsIgnoreCase("-q"))
+                {
+                    silent = true;
+                }
+
+                if (args.length >= 3)
+                {
+                    reason = StringUtils.join(ArrayUtils.subarray(args, 1, args.length - 1), " ");
+                }
+            }
+            else
+            {
+                reason = StringUtils.join(ArrayUtils.subarray(args, 1, args.length), " ");
+            }
+        }
+
+        final String username;
+        final String ip;
+
+        final Player player = getPlayer(args[0]);
+        if (player == null)
+        {
+            // Gets the IP using Essentials data if available
+            if (plugin.esb.isEnabled() && plugin.esb.getEssentialsUser(args[0]) != null)
+            {
+                User essUser = plugin.esb.getEssentialsUser(args[0]);
+                //
+                username = essUser.getName();
+                ip = essUser.getLastLoginAddress();
+            }
+            // Last resort - Getting the first result from the username itself
+            else
+            {
+                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
+        {
+            username = player.getName();
+            ip = FUtil.getIp(player);
+
+            // Deop
+            player.setOp(false);
+
+            // Gamemode survival
+            player.setGameMode(GameMode.SURVIVAL);
+
+            // Clear inventory
+            player.getInventory().clear();
+
+            if (!silent)
+            {
+                // Strike with lightning
+                final Location targetPos = player.getLocation();
+                for (int x = -1; x <= 1; x++)
+                {
+                    for (int z = -1; z <= 1; z++)
+                    {
+                        final Location strike_pos = new Location(targetPos.getWorld(), targetPos.getBlockX() + x, targetPos.getBlockY(), targetPos.getBlockZ() + z);
+                        Objects.requireNonNull(targetPos.getWorld()).strikeLightning(strike_pos);
+                    }
+                }
+            }
+            else
+            {
+                msg("Banned " + player.getName() + " quietly.");
+            }
+            // Kill player
+            player.setHealth(0.0);
+        }
+
+        // Checks if CoreProtect is loaded and installed, and skips the rollback and uses CoreProtect directly
+        if (!cancelRollback)
+        {
+            plugin.cpb.rollback(username);
+        }
+
+        if (player != null && !silent)
+        {
+            FUtil.bcastMsg(player.getName() + " has been a VERY naughty, naughty boy.", ChatColor.RED);
+        }
+
+        // Ban player
+        Ban ban;
+        if (player != null)
+        {
+            ban = Ban.forPlayer(player, sender, null, reason);
+        }
+        else
+        {
+            ban = Ban.forPlayerName(username, sender, null, reason);
+        }
+        ban.addIp(ip);
+
+        plugin.bm.addBan(ban);
+
+
+        if (!silent)
+        {
+            // Broadcast
+            final StringBuilder bcast = new StringBuilder()
+                    .append("Banning: ")
+                    .append(username);
+            if (reason != null)
+            {
+                bcast.append(" - Reason: ").append(ChatColor.YELLOW).append(reason);
+            }
+            msg(sender, ChatColor.GRAY + username + " has been banned and IP is: " + ip);
+            FUtil.adminAction(sender.getName(), bcast.toString(), true);
+        }
+
+        // Kick player and handle others on IP
+        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.");
+                }
+            }
+        }
+
+        // Log ban
+        plugin.pul.logPunishment(new Punishment(username, ip, sender.getName(), PunishmentType.BAN, reason));
+
+        return true;
+    }
+}

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

@@ -0,0 +1,82 @@
+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.util.FUtil;
+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)
+@CommandParameters(description = "Bans the specified ip.", usage = "/<command> <ip> [reason] [-q]")
+public class Command_banip extends FreedomCommand
+{
+
+    @Override
+    public boolean run(CommandSender sender, Player playerSender, Command cmd, String commandLabel, String[] args, boolean senderIsConsole)
+    {
+        if (args.length == 0)
+        {
+            return false;
+        }
+
+        boolean silent = false;
+
+        String reason = null;
+
+        String ip = args[0];
+
+        if (FUtil.isValidIPv4(ip))
+        {
+            msg(ip + " is not a valid IP address", ChatColor.RED);
+            return true;
+        }
+
+        if (plugin.bm.getByIp(ip) != null)
+        {
+            msg("The IP " + ip + " is already banned", ChatColor.RED);
+            return true;
+        }
+
+        if (args[args.length - 1].equalsIgnoreCase("-q"))
+        {
+            silent = true;
+
+            if (args.length >= 2)
+            {
+                reason = StringUtils.join(ArrayUtils.subarray(args, 1, args.length - 1), " ");
+            }
+        }
+        else if (args.length > 1)
+        {
+            reason = StringUtils.join(ArrayUtils.subarray(args, 1, args.length), " ");
+        }
+
+        // Ban player
+        Ban ban = Ban.forPlayerIp(ip, sender, null, reason);
+        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());
+            }
+
+            if (!silent)
+            {
+                // Broadcast
+                FLog.info(ChatColor.RED + sender.getName() + " - Banned the IP " + ip);
+                String message = sender.getName() + " - Banned " + (plugin.al.isAdmin(player) ? "the IP " + ip : "an IP");
+                msg(player, message, ChatColor.RED);
+            }
+        }
+
+        return true;
+    }
+}

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

@@ -2,13 +2,12 @@ package me.totalfreedom.totalfreedommod.command;
 
 import me.totalfreedom.totalfreedommod.rank.Rank;
 import me.totalfreedom.totalfreedommod.util.FUtil;
-import org.bukkit.ChatColor;
 import org.bukkit.command.Command;
 import org.bukkit.command.CommandSender;
 import org.bukkit.entity.Player;
 
 @CommandPermissions(level = Rank.OP, source = SourceType.BOTH)
-@CommandParameters(description = "Shows all banned player names. Superadmins may optionally use 'purge' to clear the list.", usage = "/<command> [purge]")
+@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
 {
 
@@ -23,19 +22,15 @@ public class Command_banlist extends FreedomCommand
 
                 FUtil.adminAction(sender.getName(), "Purging the ban list", true);
                 int amount = plugin.bm.purge();
-                sender.sendMessage(ChatColor.GRAY + "Purged " + amount + " player bans.");
-
+                msg("Purged " + amount + " player bans.");
                 return true;
-
             }
-
             return false;
         }
 
         msg(plugin.bm.getAllBans().size() + " player bans ("
                 + plugin.bm.getUsernameBans().size() + " usernames, "
                 + plugin.bm.getIpBans().size() + " IPs)");
-
         return true;
     }
-}
+}

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

@@ -0,0 +1,68 @@
+package me.totalfreedom.totalfreedommod.command;
+
+import me.totalfreedom.totalfreedommod.banning.Ban;
+import me.totalfreedom.totalfreedommod.rank.Rank;
+import me.totalfreedom.totalfreedommod.util.FUtil;
+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)
+@CommandParameters(description = "Bans the specified name.", usage = "/<command> <name> [reason] [-q]")
+public class Command_banname extends FreedomCommand
+{
+
+    @Override
+    public boolean run(CommandSender sender, Player playerSender, Command cmd, String commandLabel, String[] args, boolean senderIsConsole)
+    {
+        if (args.length == 0)
+        {
+            return false;
+        }
+
+        boolean silent = false;
+
+        String reason = null;
+
+        String name = args[0];
+
+        if (plugin.bm.getByUsername(name) != null)
+        {
+            msg("The name " + name + " is already banned", ChatColor.RED);
+            return true;
+        }
+
+        if (args[args.length - 1].equalsIgnoreCase("-q"))
+        {
+            silent = true;
+
+            if (args.length >= 2)
+            {
+                reason = StringUtils.join(ArrayUtils.subarray(args, 1, args.length - 1), " ");
+            }
+        }
+        else if (args.length > 1)
+        {
+            reason = StringUtils.join(ArrayUtils.subarray(args, 1, args.length), " ");
+        }
+
+        // Ban player
+        Ban ban = Ban.forPlayerName(name, sender, null, reason);
+        plugin.bm.addBan(ban);
+
+        if (!silent)
+        {
+            FUtil.adminAction(sender.getName(), "Banned the name " + name, true);
+        }
+
+        Player player = getPlayer(name);
+        if (player != null)
+        {
+            player.kickPlayer(ban.bakeKickMessage());
+        }
+        return true;
+    }
+}

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

@@ -0,0 +1,33 @@
+package me.totalfreedom.totalfreedommod.command;
+
+import java.util.Arrays;
+import java.util.List;
+import java.util.SplittableRandom;
+import me.totalfreedom.totalfreedommod.rank.Rank;
+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)
+@CommandParameters(description = "Spawns a random type of fish at your location.", usage = "/<command>")
+public class Command_bird extends FreedomCommand
+{
+
+    @Override
+    public boolean run(CommandSender sender, Player playerSender, Command cmd, String commandLabel, String[] args, boolean senderIsConsole)
+    {
+        Location location = playerSender.getTargetBlock(null, 15).getLocation().add(0, 1, 0);
+        playerSender.getWorld().spawnEntity(location, getRandomFish());
+        msg(":goodbird:");
+        return true;
+    }
+
+    public EntityType getRandomFish()
+    {
+        List<EntityType> fishTypes = Arrays.asList(EntityType.COD, EntityType.SALMON, EntityType.PUFFERFISH, EntityType.TROPICAL_FISH);
+        SplittableRandom random = new SplittableRandom();
+        return fishTypes.get(random.nextInt(fishTypes.size()));
+    }
+}

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

@@ -1,6 +1,8 @@
 package me.totalfreedom.totalfreedommod.command;
 
 import me.totalfreedom.totalfreedommod.player.FPlayer;
+import me.totalfreedom.totalfreedommod.punishments.Punishment;
+import me.totalfreedom.totalfreedommod.punishments.PunishmentType;
 import me.totalfreedom.totalfreedommod.rank.Rank;
 import me.totalfreedom.totalfreedommod.util.FUtil;
 import org.bukkit.ChatColor;
@@ -8,8 +10,8 @@ import org.bukkit.command.Command;
 import org.bukkit.command.CommandSender;
 import org.bukkit.entity.Player;
 
-@CommandPermissions(level = Rank.SUPER_ADMIN, source = SourceType.BOTH)
-@CommandParameters(description = "Block all commands for a specific player.", usage = "/<command> <-a | purge | <player>>", aliases = "blockcommands,blockcommand,bc,bcmd")
+@CommandPermissions(level = Rank.ADMIN, 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
 {
 
@@ -68,17 +70,23 @@ public class Command_blockcmd extends FreedomCommand
 
         if (isAdmin(player))
         {
-            msg(player.getName() + " is a Superadmin, and cannot have their commands blocked.");
+            msg(player.getName() + " is an admin, and cannot have their commands blocked.");
             return true;
         }
 
         FPlayer playerdata = plugin.pl.getPlayer(player);
+        if (!playerdata.allCommandsBlocked())
+        {
+            FUtil.adminAction(sender.getName(), "Blocking all commands for " + player.getName(), true);
+            playerdata.setCommandsBlocked(true);
+            msg("Blocked commands for " + player.getName() + ".");
 
-        playerdata.setCommandsBlocked(!playerdata.allCommandsBlocked());
-
-        FUtil.adminAction(sender.getName(), (playerdata.allCommandsBlocked() ? "B" : "Unb") + "locking all commands for " + player.getName(), true);
-        msg((playerdata.allCommandsBlocked() ? "B" : "Unb") + "locked all commands.");
-
+            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);
+        }
         return true;
     }
-}
+}

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

@@ -0,0 +1,110 @@
+package me.totalfreedom.totalfreedommod.command;
+
+import me.totalfreedom.totalfreedommod.player.FPlayer;
+import me.totalfreedom.totalfreedommod.punishments.Punishment;
+import me.totalfreedom.totalfreedommod.punishments.PunishmentType;
+import me.totalfreedom.totalfreedommod.rank.Rank;
+import me.totalfreedom.totalfreedommod.util.FUtil;
+import org.bukkit.ChatColor;
+import org.bukkit.command.Command;
+import org.bukkit.command.CommandSender;
+import org.bukkit.entity.Player;
+
+import java.util.List;
+import java.util.Optional;
+
+@CommandPermissions(level = Rank.ADMIN, 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();
+
+                    // Oh dear god, why do I have to do it like this?
+                    msg("There " + (list.size() != 1 ? "are " : "is ") + list.size() + " player"
+                            + (list.size() != 1 ? "s" : "") + " online with restricted block modification abilities"
+                            + (list.size() > 0 ? ":" : "."));
+
+                    list.forEach(player -> msg("- " + player.getName()));
+                }
+                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);
+                        msg(player, "Your block modification abilities have been restored.", ChatColor.GREEN);
+                    });
+
+                    msg("Restored block modification abilities for " + list.size() + " player"
+                            + (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);
+                        msg(player, "Your block modification abilities have been restricted.", ChatColor.RED);
+                    });
+
+                    msg("Restricted block modification abilities for " + list.size() + " player"
+                            + (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);
+                        msg("Restored block modification abilities for " + player.getName() + ".");
+                        msg(player, "Your block modification abilities have been restored.", ChatColor.GREEN);
+                    }
+                    else
+                    {
+                        if (plugin.al.isAdmin(player))
+                        {
+                            msg(player.getName() + " is an admin, and as such cannot have their block modification abilities restricted.", ChatColor.RED);
+                        }
+                        else
+                        {
+                            FUtil.adminAction(sender.getName(), "Restricting block modification abilities for " + player.getName(), true);
+                            fPlayer.setEditBlocked(true);
+                            msg("Restricted block modification abilities for " + player.getName() + ".");
+                            msg(player, "Your block modification abilities have been restricted.", ChatColor.RED);
+
+                            plugin.pul.logPunishment(new Punishment(player.getName(), FUtil.getIp(player),
+                                    sender.getName(), PunishmentType.BLOCKEDIT, null));
+                        }
+                    }
+
+                }, () -> msg(PLAYER_NOT_FOUND));
+            }
+
+            return true;
+        }
+        else
+        {
+            return false;
+        }
+    }
+}

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

@@ -0,0 +1,137 @@
+package me.totalfreedom.totalfreedommod.command;
+
+import me.totalfreedom.totalfreedommod.player.FPlayer;
+import me.totalfreedom.totalfreedommod.punishments.Punishment;
+import me.totalfreedom.totalfreedommod.punishments.PunishmentType;
+import me.totalfreedom.totalfreedommod.rank.Rank;
+import me.totalfreedom.totalfreedommod.util.FUtil;
+import org.apache.commons.lang3.ArrayUtils;
+import org.apache.commons.lang3.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)
+@CommandParameters(description = "Toggle PVP mode for everyone or a certain player.", usage = "/<command> [[-s] <player> [reason] | 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;
+        }
+
+        if (args[0].equals("list"))
+        {
+            msg("PVP is blocked for players:");
+            int count = 0;
+            for (Player player : server.getOnlinePlayers())
+            {
+                final FPlayer info = plugin.pl.getPlayer(player);
+                if (info.isPvpBlocked())
+                {
+                    msg(" - " + player.getName());
+                    ++count;
+                }
+            }
+
+            if (count == 0)
+            {
+                msg(" - none");
+            }
+            return true;
+        }
+
+        if (args[0].equals("purge"))
+        {
+            FUtil.adminAction(sender.getName(), "Enabling PVP for all players.", true);
+            int count = 0;
+            for (Player player : server.getOnlinePlayers())
+            {
+                final FPlayer info = plugin.pl.getPlayer(player);
+                if (info.isPvpBlocked())
+                {
+                    info.setPvpBlocked(false);
+                    ++count;
+                }
+            }
+
+            msg("Enabled PVP for " + count + " players.");
+            return true;
+        }
+
+        if (args[0].equals("all"))
+        {
+            FUtil.adminAction(sender.getName(), "Disabling PVP for all non-admins", true);
+            int counter = 0;
+            for (Player player : server.getOnlinePlayers())
+            {
+                if (!plugin.al.isAdmin(player))
+                {
+                    final FPlayer playerdata = plugin.pl.getPlayer(player);
+                    playerdata.setPvpBlocked(true);
+                    ++counter;
+                }
+            }
+
+            msg("Disabling PVP for " + counter + " players.");
+            return true;
+        }
+
+        final boolean smite = args[0].equals("-s");
+        if (smite)
+        {
+            args = ArrayUtils.subarray(args, 1, args.length);
+            if (args.length < 1)
+            {
+                return false;
+            }
+        }
+
+        final Player p = getPlayer(args[0]);
+        if (p == null)
+        {
+            msg(PLAYER_NOT_FOUND);
+            return true;
+        }
+
+        String reason = null;
+        if (args.length > 1)
+        {
+            reason = StringUtils.join(args, " ", 1, args.length);
+        }
+
+        final FPlayer pd = plugin.pl.getPlayer(p);
+        if (pd.isPvpBlocked())
+        {
+            FUtil.adminAction(sender.getName(), "Enabling PVP for " + p.getName(), true);
+            pd.setPvpBlocked(false);
+            msg("Enabling PVP for " + p.getName());
+            msg(p, "Your PVP have been enabled.", ChatColor.GREEN);
+        }
+        else
+        {
+            if (plugin.al.isAdmin(p))
+            {
+                msg(p.getName() + " is an admin, and cannot have their PVP disabled.");
+                return true;
+            }
+
+            FUtil.adminAction(sender.getName(), "Disabling PVP for " + p.getName(), true);
+            pd.setPvpBlocked(true);
+            if (smite)
+            {
+                Command_smite.smite(sender, p, reason);
+            }
+            plugin.pul.logPunishment(new Punishment(p.getName(), FUtil.getIp(p), sender.getName(), PunishmentType.BLOCKPVP, null));
+
+            msg(p, "Your PVP has been disabled.", ChatColor.RED);
+            msg("Disabled PVP for " + p.getName());
+        }
+        return true;
+    }
+}

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

@@ -0,0 +1,41 @@
+package me.totalfreedom.totalfreedommod.command;
+
+import me.totalfreedom.totalfreedommod.config.ConfigEntry;
+import me.totalfreedom.totalfreedommod.rank.Rank;
+import me.totalfreedom.totalfreedommod.util.FUtil;
+import org.bukkit.command.Command;
+import org.bukkit.command.CommandSender;
+import org.bukkit.entity.Player;
+import org.bukkit.scheduler.BukkitRunnable;
+
+@CommandPermissions(level = Rank.ADMIN, source = SourceType.BOTH)
+@CommandParameters(description = "Blocks redstone on the server.", usage = "/<command>", aliases = "bre")
+public class Command_blockredstone extends FreedomCommand
+{
+
+    public boolean run(final CommandSender sender, final Player playerSender, final Command cmd, final String commandLabel, final String[] args, final boolean senderIsConsole)
+    {
+        if (ConfigEntry.ALLOW_REDSTONE.getBoolean())
+        {
+            ConfigEntry.ALLOW_REDSTONE.setBoolean(false);
+            FUtil.adminAction(sender.getName(), "Blocking all redstone", true);
+            new BukkitRunnable()
+            {
+                public void run()
+                {
+                    if (!ConfigEntry.ALLOW_REDSTONE.getBoolean())
+                    {
+                        FUtil.adminAction("TotalFreedom", "Unblocking all redstone", false);
+                        ConfigEntry.ALLOW_REDSTONE.setBoolean(true);
+                    }
+                }
+            }.runTaskLater(plugin, 6000L);
+        }
+        else
+        {
+            ConfigEntry.ALLOW_REDSTONE.setBoolean(true);
+            FUtil.adminAction(sender.getName(), "Unblocking all redstone", true);
+        }
+        return true;
+    }
+}

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

@@ -1,8 +1,15 @@
 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.player.FPlayer;
+import me.totalfreedom.totalfreedommod.punishments.Punishment;
+import me.totalfreedom.totalfreedommod.punishments.PunishmentType;
 import me.totalfreedom.totalfreedommod.rank.Rank;
 import me.totalfreedom.totalfreedommod.util.FUtil;
+import org.bukkit.ChatColor;
 import org.bukkit.GameMode;
 import org.bukkit.Location;
 import org.bukkit.Material;
@@ -10,101 +17,148 @@ import org.bukkit.command.Command;
 import org.bukkit.command.CommandSender;
 import org.bukkit.entity.Player;
 
-@CommandPermissions(level = Rank.SUPER_ADMIN, source = SourceType.BOTH)
-@CommandParameters(description = "Place a cage around someone.", usage = "/<command> <purge | off | <partialname> [outermaterial] [innermaterial]>")
+@CommandPermissions(level = Rank.ADMIN, 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(CommandSender sender, Player playerSender, Command cmd, String commandLabel, String[] args, boolean senderIsConsole)
+    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)
         {
             return false;
         }
 
-        if ("off".equals(args[0]) && sender instanceof Player)
-        {
-            FUtil.adminAction(sender.getName(), "Uncaging " + sender.getName(), true);
-            FPlayer playerdata = plugin.pl.getPlayer(playerSender);
-
-            playerdata.getCageData().setCaged(false);
-            return true;
-        }
-        else if ("purge".equals(args[0]))
+        String skullName = null;
+        if (args[0].equalsIgnoreCase("purge"))
         {
             FUtil.adminAction(sender.getName(), "Uncaging all players", true);
-
-            for (Player player : server.getOnlinePlayers())
-            {
-                FPlayer playerdata = plugin.pl.getPlayer(player);
-                playerdata.getCageData().setCaged(false);
-            }
-
+            server.getOnlinePlayers().stream().map(player -> plugin.pl.getPlayer(player)).forEach(fPlayer ->
+                    fPlayer.getCageData().setCaged(false));
             return true;
         }
 
-        final Player player = getPlayer(args[0]);
-
+        Player player = getPlayer(args[0]);
         if (player == null)
         {
-            sender.sendMessage(FreedomCommand.PLAYER_NOT_FOUND);
+            msg(PLAYER_NOT_FOUND);
             return true;
         }
 
-        FPlayer playerdata = plugin.pl.getPlayer(player);
+        final FPlayer fPlayer = plugin.pl.getPlayer(player);
+        if (fPlayer.getCageData().isCaged())
+        {
+            msg("That player is already caged.", ChatColor.RED);
+            return true;
+        }
 
         Material outerMaterial = Material.GLASS;
         Material innerMaterial = Material.AIR;
-
-        if (args.length >= 2)
+        if (args.length >= 2 && args[1] != null)
         {
-            if ("off".equals(args[1]))
+            final String s = args[1];
+            switch (s)
             {
-                FUtil.adminAction(sender.getName(), "Uncaging " + player.getName(), true);
-                playerdata.getCageData().setCaged(false);
-
-                return true;
-            }
-            else
-            {
-                if ("darth".equalsIgnoreCase(args[1]))
+                case "head" ->
                 {
-                    outerMaterial = Material.SKULL;
+                    outerMaterial = Material.PLAYER_HEAD;
+                    if (args.length >= 3)
+                    {
+                        skullName = args[2];
+                    }
+                    else
+                    {
+                        outerMaterial = Material.SKELETON_SKULL;
+                    }
                 }
-                else if (Material.matchMaterial(args[1]) != null)
+                case "block" ->
                 {
-                    outerMaterial = Material.matchMaterial(args[1]);
+                    if (args.length >= 3)
+                    {
+                        // 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
+                        {
+                            msg("Invalid block!", ChatColor.RED);
+                            return true;
+                        }
+                    }
+                    else
+                    {
+                        return false;
+                    }
+                }
+                default ->
+                {
+                    return false;
                 }
             }
         }
 
-        if (args.length >= 3)
+        if (outerMaterial == Material.PLAYER_HEAD)
         {
-            if (args[2].equalsIgnoreCase("water"))
-            {
-                innerMaterial = Material.STATIONARY_WATER;
-            }
-            else if (args[2].equalsIgnoreCase("lava"))
-            {
-                innerMaterial = Material.STATIONARY_LAVA;
-            }
-        }
-
-        Location targetPos = player.getLocation().clone().add(0, 1, 0);
-        playerdata.getCageData().cage(targetPos, outerMaterial, innerMaterial);
-
-        player.setGameMode(GameMode.SURVIVAL);
-
-        if (outerMaterial != Material.SKULL)
-        {
-            FUtil.adminAction(sender.getName(), "Caging " + player.getName(), true);
+            FUtil.adminAction(sender.getName(), "Caging " + player.getName() + " in " + skullName, true);
         }
         else
         {
-            FUtil.adminAction(sender.getName(), "Caging " + player.getName() + " in PURE_DARTH", true);
+            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
+        {
+            fPlayer.getCageData().cage(location, outerMaterial, innerMaterial);
+        }
+        player.setGameMode(GameMode.SURVIVAL);
+
+        plugin.pul.logPunishment(new Punishment(player.getName(), FUtil.getIp(player), sender.getName(), PunishmentType.CAGE, null));
         return true;
     }
-}
+
+    @Override
+    public List<String> getTabCompleteOptions(CommandSender sender, Command command, String alias, String[] args)
+    {
+        if (!plugin.al.isAdmin(sender))
+        {
+            return null;
+        }
+
+        if (args.length == 1)
+        {
+            List<String> arguments = new ArrayList<>();
+            arguments.add("purge");
+            arguments.addAll(FUtil.getPlayerList());
+            return arguments;
+        }
+        else if (args.length == 2)
+        {
+            if (!args[0].equals("purge"))
+            {
+                return Arrays.asList("head", "block");
+            }
+        }
+        else if (args.length == 3)
+        {
+            if (args[1].equals("block"))
+            {
+                return Arrays.stream(Material.values()).map(Enum::name).toList();
+            }
+            else if (args[1].equals("head"))
+            {
+                return FUtil.getPlayerList();
+            }
+        }
+
+        return Collections.emptyList();
+    }
+}

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

@@ -1,9 +1,7 @@
 package me.totalfreedom.totalfreedommod.command;
 
-import java.util.Random;
 import me.totalfreedom.totalfreedommod.rank.Rank;
 import me.totalfreedom.totalfreedommod.util.FUtil;
-import org.bukkit.Achievement;
 import org.bukkit.ChatColor;
 import org.bukkit.Material;
 import org.bukkit.command.Command;
@@ -12,43 +10,39 @@ import org.bukkit.entity.Player;
 import org.bukkit.inventory.ItemStack;
 import org.bukkit.inventory.meta.ItemMeta;
 
-@CommandPermissions(level = Rank.SUPER_ADMIN, source = SourceType.BOTH)
-@CommandParameters(description = "For the people that are still alive.", usage = "/<command>")
+@CommandPermissions(level = Rank.ADMIN, 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.";
-    private final Random random = new Random();
 
     @Override
-    public boolean run(CommandSender sender, Player playerSender, Command cmd, String commandLabel, String[] args, boolean senderIsConsole)
+    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();
 
-        final String[] words = CAKE_LYRICS.split(" ");
-        for (final String word : words)
+        for (final String word : CAKE_LYRICS.split(" "))
         {
-            output.append(ChatColor.COLOR_CHAR).append(Integer.toHexString(1 + random.nextInt(14))).append(word).append(" ");
+            output.append(FUtil.randomChatColor()).append(word).append(" ");
         }
 
         final ItemStack heldItem = new ItemStack(Material.CAKE);
         final ItemMeta heldItemMeta = heldItem.getItemMeta();
-        heldItemMeta.setDisplayName((new StringBuilder()).append(ChatColor.WHITE).append("The ").append(ChatColor.DARK_GRAY).append("Lie").toString());
+        assert heldItemMeta != null;
+        heldItemMeta.setDisplayName(ChatColor.WHITE + "The " + ChatColor.DARK_GRAY + "Lie");
         heldItem.setItemMeta(heldItemMeta);
 
-        for (final Player player : server.getOnlinePlayers())
+        for (Player player : server.getOnlinePlayers())
         {
             final int firstEmpty = player.getInventory().firstEmpty();
             if (firstEmpty >= 0)
             {
                 player.getInventory().setItem(firstEmpty, heldItem);
             }
-
-            player.awardAchievement(Achievement.BAKE_CAKE);
         }
 
         FUtil.bcastMsg(output.toString());
-
         return true;
     }
-}
+}

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

@@ -1,5 +1,6 @@
 package me.totalfreedom.totalfreedommod.command;
 
+import java.util.Objects;
 import me.totalfreedom.totalfreedommod.rank.Rank;
 import org.bukkit.command.Command;
 import org.bukkit.command.CommandSender;
@@ -16,14 +17,13 @@ public class Command_cartsit extends FreedomCommand
     {
         Player targetPlayer = playerSender;
 
-        if (args.length == 1)
+        if (args.length == 1 && plugin.al.isAdmin(sender))
         {
-
             targetPlayer = getPlayer(args[0]);
 
             if (targetPlayer == null)
             {
-                sender.sendMessage(FreedomCommand.PLAYER_NOT_FOUND);
+                msg(PLAYER_NOT_FOUND);
                 return true;
             }
         }
@@ -32,19 +32,14 @@ public class Command_cartsit extends FreedomCommand
         {
             if (targetPlayer == null)
             {
-                sender.sendMessage("When used from the console, you must define a target player: /cartsit <player>");
+                msg("When used from the console, you must define a target player: /cartsit <player>");
                 return true;
             }
         }
-        else if (targetPlayer != playerSender && !isAdmin(sender))
-        {
-            sender.sendMessage("Only superadmins can select another player as a /cartsit target.");
-            return true;
-        }
 
         if (targetPlayer.isInsideVehicle())
         {
-            targetPlayer.getVehicle().eject();
+            Objects.requireNonNull(targetPlayer.getVehicle()).eject();
         }
         else
         {
@@ -69,14 +64,14 @@ public class Command_cartsit extends FreedomCommand
 
             if (nearest_cart != null)
             {
-                nearest_cart.setPassenger(targetPlayer);
+                nearest_cart.addPassenger(targetPlayer);
             }
             else
             {
-                sender.sendMessage("There are no empty minecarts in the target world.");
+                msg("There are no empty minecarts in the target world.");
             }
         }
 
         return true;
     }
-}
+}

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

@@ -1,218 +0,0 @@
-package me.totalfreedom.totalfreedommod.command;
-
-import java.util.List;
-import java.util.regex.Matcher;
-import java.util.regex.Pattern;
-import me.totalfreedom.totalfreedommod.rank.Rank;
-import me.totalfreedom.totalfreedommod.util.DepreciationAggregator;
-import me.totalfreedom.totalfreedommod.util.FLog;
-import org.apache.commons.lang3.ArrayUtils;
-import org.apache.commons.lang3.StringUtils;
-import org.bukkit.Bukkit;
-import org.bukkit.Location;
-import org.bukkit.World;
-import org.bukkit.block.Block;
-import org.bukkit.command.Command;
-import org.bukkit.command.CommandSender;
-import org.bukkit.entity.Player;
-
-@CommandPermissions(level = Rank.NON_OP, source = SourceType.BOTH)
-@CommandParameters(description = "No Description Yet", usage = "/<command>")
-public class Command_cbtool extends FreedomCommand
-{
-
-    @Override
-    public boolean run(CommandSender sender, Player playerSender, Command cmd, String commandLabel, String[] args, boolean senderIsConsole)
-    {
-        if (args.length < 1)
-        {
-            return false;
-        }
-
-        if ("targetblock".equalsIgnoreCase(args[0]) && sender instanceof Player)
-        {
-            Block targetBlock = DepreciationAggregator.getTargetBlock(playerSender, null, 100);
-            msg("Your target block: " + targetBlock.getLocation().toString());
-            return true;
-        }
-
-        try
-        {
-            final StringBuffer generatedCommand = new StringBuffer();
-
-            final Matcher matcher = Pattern.compile("\\[(.+?)\\]").matcher(StringUtils.join(args, " ").trim());
-            while (matcher.find())
-            {
-                matcher.appendReplacement(generatedCommand, processSubCommand(matcher.group(1)));
-            }
-            matcher.appendTail(generatedCommand);
-
-            if (plugin.cb.isCommandBlocked(generatedCommand.toString(), sender, false))
-            {
-                return true;
-            }
-
-            server.dispatchCommand(sender, generatedCommand.toString());
-        }
-        catch (SubCommandFailureException ex)
-        {
-        }
-        catch (Exception ex)
-        {
-            FLog.severe(ex);
-        }
-
-        return true;
-    }
-
-    private String processSubCommand(final String subcommand) throws SubCommandFailureException
-    {
-        final String[] args = StringUtils.split(subcommand, " ");
-
-        if (args.length == 1)
-        {
-            throw new SubCommandFailureException("Invalid subcommand name.");
-        }
-
-        return SubCommand.getByName(args[0]).getExecutable().execute(ArrayUtils.remove(args, 0));
-    }
-
-    private static enum SubCommand
-    {
-
-        PLAYER_DETECT("playerdetect", new SubCommandExecutable()
-        {
-            @Override
-            public String execute(String[] args) throws SubCommandFailureException
-            {
-                if (args.length != 5)
-                {
-                    throw new SubCommandFailureException("Invalid # of arguments.");
-                }
-
-                double x, y, z;
-                try
-                {
-                    x = Double.parseDouble(args[0].trim());
-                    y = Double.parseDouble(args[1].trim());
-                    z = Double.parseDouble(args[2].trim());
-                }
-                catch (NumberFormatException ex)
-                {
-                    throw new SubCommandFailureException("Invalid coordinates.");
-                }
-
-                World world = null;
-                final String needleWorldName = args[3].trim();
-                final List<World> worlds = Bukkit.getWorlds();
-                for (final World testWorld : worlds)
-                {
-                    if (testWorld.getName().trim().equalsIgnoreCase(needleWorldName))
-                    {
-                        world = testWorld;
-                        break;
-                    }
-                }
-
-                if (world == null)
-                {
-                    throw new SubCommandFailureException("Invalid world name.");
-                }
-
-                final Location testLocation = new Location(world, x, y, z);
-
-                double radius;
-                try
-                {
-                    radius = Double.parseDouble(args[4].trim());
-                }
-                catch (NumberFormatException ex)
-                {
-                    throw new SubCommandFailureException("Invalid radius.");
-                }
-
-                final double radiusSq = radius * radius;
-
-                final List<Player> worldPlayers = testLocation.getWorld().getPlayers();
-                for (final Player testPlayer : worldPlayers)
-                {
-                    if (testPlayer.getLocation().distanceSquared(testLocation) < radiusSq)
-                    {
-                        return testPlayer.getName();
-                    }
-                }
-
-                throw new SubCommandFailureException("No player found in range.");
-            }
-        }),
-        PLAYER_DETECT_BOOLEAN("playerdetectboolean", new SubCommandExecutable()
-        {
-            @Override
-            public String execute(String[] args) throws SubCommandFailureException
-            {
-                try
-                {
-                    PLAYER_DETECT.getExecutable().execute(args);
-                }
-                catch (SubCommandFailureException ex)
-                {
-                    return "0";
-                }
-
-                return "1";
-            }
-        });
-        //
-        private final String name;
-        private final SubCommandExecutable executable;
-
-        private SubCommand(String subCommandName, SubCommandExecutable subCommandImpl)
-        {
-            this.name = subCommandName;
-            this.executable = subCommandImpl;
-        }
-
-        public SubCommandExecutable getExecutable()
-        {
-            return executable;
-        }
-
-        public String getName()
-        {
-            return name;
-        }
-
-        public static SubCommand getByName(String needle) throws SubCommandFailureException
-        {
-            needle = needle.trim();
-            for (SubCommand subCommand : values())
-            {
-                if (subCommand.getName().equalsIgnoreCase(needle))
-                {
-                    return subCommand;
-                }
-            }
-            throw new SubCommandFailureException("Invalid subcommand name.");
-        }
-    }
-
-    private interface SubCommandExecutable
-    {
-
-        public String execute(String[] args) throws SubCommandFailureException;
-    }
-
-    private static class SubCommandFailureException extends Exception
-    {
-
-        public SubCommandFailureException()
-        {
-        }
-
-        public SubCommandFailureException(String message)
-        {
-            super(message);
-        }
-    }
-
-}

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

@@ -0,0 +1,27 @@
+package me.totalfreedom.totalfreedommod.command;
+
+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;
+
+@CommandPermissions(level = Rank.ADMIN, 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, "");
+            }
+        });
+
+        FUtil.adminAction(sender.getName(), "Cleared chat", true);
+        return true;
+    }
+}

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

@@ -0,0 +1,20 @@
+package me.totalfreedom.totalfreedommod.command;
+
+import me.totalfreedom.totalfreedommod.rank.Rank;
+import org.bukkit.command.Command;
+import org.bukkit.command.CommandSender;
+import org.bukkit.entity.Player;
+
+@CommandPermissions(level = Rank.ADMIN, 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)
+    {
+        plugin.dc.clearQueue();
+        msg("Cleared the discord message queue.");
+        return true;
+    }
+}

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

@@ -0,0 +1,79 @@
+package me.totalfreedom.totalfreedommod.command;
+
+import java.util.Collections;
+import java.util.List;
+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;
+
+@CommandPermissions(level = Rank.OP, source = SourceType.BOTH)
+@CommandParameters(description = "Clear your inventory.", usage = "/<command> [player]", aliases = "ci,clear")
+public class Command_clearinventory extends FreedomCommand
+{
+
+    @Override
+    public boolean run(CommandSender sender, Player playerSender, Command cmd, String commandLabel, String[] args, boolean senderIsConsole)
+    {
+
+        if (args.length < 1)
+        {
+            if (senderIsConsole)
+            {
+                return false;
+            }
+
+            playerSender.getInventory().clear();
+            msg("Your inventory has been cleared.");
+        }
+        else
+        {
+            if (plugin.al.isAdmin(sender))
+            {
+                if (args[0].equals("-a"))
+                {
+                    FUtil.adminAction(sender.getName(), "Clearing everyone's inventory", true);
+                    for (Player player : server.getOnlinePlayers())
+                    {
+                        player.getInventory().clear();
+                    }
+                    msg("Sucessfully cleared everyone's inventory.");
+                }
+                else
+                {
+                    Player player = getPlayer(args[0]);
+
+                    if (player == null)
+                    {
+                        msg(PLAYER_NOT_FOUND);
+                        return true;
+                    }
+
+                    player.getInventory().clear();
+                    msg("Cleared " + player.getName() + "'s inventory.");
+                    msg(player, sender.getName() + " has cleared your inventory.");
+                }
+            }
+            else
+            {
+                return noPerms();
+            }
+        }
+
+        return true;
+    }
+
+    @Override
+    public List<String> getTabCompleteOptions(CommandSender sender, Command command, String alias, String[] args)
+    {
+        if (args.length == 1 && plugin.al.isAdmin(sender))
+        {
+            List<String> players = FUtil.getPlayerList();
+            players.add("-a");
+            return players;
+        }
+
+        return Collections.emptyList();
+    }
+}

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

@@ -0,0 +1,29 @@
+package me.totalfreedom.totalfreedommod.command;
+
+import me.totalfreedom.totalfreedommod.rank.Rank;
+import me.totalfreedom.totalfreedommod.shop.ShopItem;
+import org.bukkit.ChatColor;
+import org.bukkit.command.Command;
+import org.bukkit.command.CommandSender;
+import org.bukkit.entity.Player;
+
+@CommandPermissions(level = Rank.OP, 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.pl.getData(playerSender).hasItem(ShopItem.CLOWN_FISH) && (!plugin.lp.CLOWNFISH_TOGGLE.contains(playerSender.getName())))
+        {
+            playerSender.getInventory().addItem(plugin.sh.getClownFish());
+            msg("You have been given a Clown Fish", ChatColor.GREEN);
+        }
+        else
+        {
+            msg("You do not own a Clown Fish or an admin has toggled your ability to use it. Purchase one from the shop.", ChatColor.RED);
+        }
+        return true;
+    }
+}