Merge pull request #343 from AtlasMediaGroup/port/1.20.1

1.20.1 port

.github/dependabot.yml

@@ -0,0 +1,23 @@
+# To get started with Dependabot version updates, you'll need to specify which
+# package ecosystems to update and where the package manifests are located.
+# Please see the documentation for all configuration options:
+# https://help.github.com/github/administering-a-repository/configuration-options-for-dependency-updates
+
+version: 2
+updates:
+
+  # Maintain Maven Updates
+  - package-ecosystem: "maven" # See documentation for possible values
+    directory: "/" # Location of package manifests
+    target-branch: "development"
+    open-pull-requests-limit: 50
+    schedule:
+      interval: "daily"
+      
+  # Maintain dependencies for GitHub Actions
+  - package-ecosystem: "github-actions"
+    directory: "/"
+    target-branch: "development"
+    open-pull-requests-limit: 50
+    schedule:
+      interval: "daily"

.github/workflows/codacy-analysis.yml

@@ -0,0 +1,46 @@
+# This workflow checks out code, performs a Codacy security scan
+# and integrates the results with the
+# GitHub Advanced Security code scanning feature.  For more information on
+# the Codacy security scan action usage and parameters, see
+# https://github.com/codacy/codacy-analysis-cli-action.
+# For more information on Codacy Analysis CLI in general, see
+# https://github.com/codacy/codacy-analysis-cli.
+
+name: Codacy Security Scan
+
+on:
+  push:
+    branches: [ development ]
+  pull_request:
+    branches: [ development ]
+
+jobs:
+  codacy-security-scan:
+    name: Codacy Security Scan
+    runs-on: ubuntu-latest
+    steps:
+      # Checkout the repository to the GitHub Actions runner
+      - name: Checkout code
+        uses: actions/checkout@v3
+
+      # Execute Codacy Analysis CLI and generate a SARIF output with the security issues identified during the analysis
+      - name: Run Codacy Analysis CLI
+        uses: codacy/codacy-analysis-cli-action@v4
+        with:
+          # Check https://github.com/codacy/codacy-analysis-cli#project-token to get your project token from your Codacy repository
+          # You can also omit the token and run the tools that support default configurations
+          project-token: ${{ secrets.CODACY_PROJECT_TOKEN }}
+          verbose: true
+          output: results.sarif
+          format: sarif
+          # Adjust severity of non-security issues
+          gh-code-scanning-compat: true
+          # Force 0 exit code to allow SARIF file generation
+          # This will handover control about PR rejection to the GitHub side
+          max-allowed-issues: 2147483647
+
+      # Upload the SARIF file generated in the previous step
+      - name: Upload SARIF results file
+        uses: github/codeql-action/upload-sarif@v2
+        with:
+          sarif_file: results.sarif

.github/workflows/codeql-analysis.yml

@@ -0,0 +1,74 @@
+# For most projects, this workflow file will not need changing; you simply need
+# to commit it to your repository.
+#
+# You may wish to alter this file to override the set of languages analyzed,
+# or to provide custom queries or build logic.
+#
+# ******** NOTE ********
+# We have attempted to detect the languages in your repository. Please check
+# the `language` matrix defined below to confirm you have the correct set of
+# supported CodeQL languages.
+#
+name: "CodeQL"
+
+on:
+  push:
+    branches: [ development ]
+  pull_request:
+    # The branches below must be a subset of the branches above
+    branches: [ development ]
+  schedule:
+    - cron: '20 18 * * 1'
+
+jobs:
+  analyze:
+    name: Analyze
+    runs-on: ubuntu-latest
+
+    strategy:
+      fail-fast: false
+      matrix:
+        language: [ 'java' ]
+        # CodeQL supports [ 'cpp', 'csharp', 'go', 'java', 'javascript', 'python' ]
+        # Learn more:
+        # https://docs.github.com/en/free-pro-team@latest/github/finding-security-vulnerabilities-and-errors-in-your-code/configuring-code-scanning#changing-the-languages-that-are-analyzed
+
+    steps:
+    - name: Checkout repository
+      uses: actions/checkout@v3
+      
+    - name: Setup Java JDK
+      uses: actions/setup-java@v3
+      with:
+        # The Java version to make available on the path. Takes a whole or semver Java version, or 1.x syntax (e.g. 1.8 => Java 8.x). Early access versions can be specified in the form of e.g. 14-ea, 14.0.0-ea, or 14.0.0-ea.28
+        java-version: 17
+        distribution: 'adopt'
+
+    # Initializes the CodeQL tools for scanning.
+    - name: Initialize CodeQL
+      uses: github/codeql-action/init@v2
+      with:
+        languages: ${{ matrix.language }}
+        # If you wish to specify custom queries, you can do so here or in a config file.
+        # By default, queries listed here will override any specified in a config file.
+        # Prefix the list here with "+" to use these queries and those in the config file.
+        # queries: ./path/to/local/query, your-org/your-repo/queries@main
+
+    # Autobuild attempts to build any compiled languages  (C/C++, C#, or Java).
+    # If this step fails, then you should remove it and run the build manually (see below)
+    - name: Autobuild
+      uses: github/codeql-action/autobuild@v2
+
+    # ℹ️ Command-line programs to run using the OS shell.
+    # 📚 https://git.io/JvXDl
+
+    # ✏️ If the Autobuild fails above, remove it and uncomment the following three lines
+    #    and modify them (or add more) to build your code if your project
+    #    uses a compiled language
+
+    #- run: |
+    #   make bootstrap
+    #   make release
+
+    - name: Perform CodeQL Analysis
+      uses: github/codeql-action/analyze@v2

.github/workflows/java17-maven.yml

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

.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

@@ -25,6 +25,7 @@ manifest.mf
 /.idea/workspace.xml
 /.idea/uiDesigner.xml
 /.idea/libraries
+/.idea/
 *.iml
 
 # Maven excludes
@@ -37,3 +38,7 @@ manifest.mf
 .Trashes
 ehthumbs.db
 Thumbs.db
+.idea/inspectionProfiles/Project_Default.xml
+
+# Common working directory
+run/

.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,17 +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="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$/src/main/java" charset="UTF-8" />
-    <file url="file://$PROJECT_DIR$/src/main/resources" charset="UTF-8" />
-	<file url="file://$PROJECT_DIR$/src/main/resources" charset="UTF-8" />
-  </component>
-</project>

.idea/misc.xml

@@ -1,16 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<project version="4">
-  <component name="EntryPointsManager">
-    <list size="1">
-      <item index="0" class="java.lang.String" itemvalue="org.bukkit.event.EventHandler" />
-    </list>
-  </component>
-  <component name="MavenProjectsManager">
-    <option name="originalFiles">
-      <list>
-        <option value="$PROJECT_DIR$/pom.xml" />
-      </list>
-    </option>
-  </component>
-  <component name="ProjectRootManager" version="2" languageLevel="JDK_1_8" default="false" project-jdk-name="1.8" project-jdk-type="JavaSDK" />
-</project>

.idea/uiDesigner.xml

@@ -1,124 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<project version="4">
-  <component name="Palette2">
-    <group name="Swing">
-      <item class="com.intellij.uiDesigner.HSpacer" tooltip-text="Horizontal Spacer" icon="/com/intellij/uiDesigner/icons/hspacer.png" removable="false" auto-create-binding="false" can-attach-label="false">
-        <default-constraints vsize-policy="1" hsize-policy="6" anchor="0" fill="1" />
-      </item>
-      <item class="com.intellij.uiDesigner.VSpacer" tooltip-text="Vertical Spacer" icon="/com/intellij/uiDesigner/icons/vspacer.png" removable="false" auto-create-binding="false" can-attach-label="false">
-        <default-constraints vsize-policy="6" hsize-policy="1" anchor="0" fill="2" />
-      </item>
-      <item class="javax.swing.JPanel" icon="/com/intellij/uiDesigner/icons/panel.png" removable="false" auto-create-binding="false" can-attach-label="false">
-        <default-constraints vsize-policy="3" hsize-policy="3" anchor="0" fill="3" />
-      </item>
-      <item class="javax.swing.JScrollPane" icon="/com/intellij/uiDesigner/icons/scrollPane.png" removable="false" auto-create-binding="false" can-attach-label="true">
-        <default-constraints vsize-policy="7" hsize-policy="7" anchor="0" fill="3" />
-      </item>
-      <item class="javax.swing.JButton" icon="/com/intellij/uiDesigner/icons/button.png" removable="false" auto-create-binding="true" can-attach-label="false">
-        <default-constraints vsize-policy="0" hsize-policy="3" anchor="0" fill="1" />
-        <initial-values>
-          <property name="text" value="Button" />
-        </initial-values>
-      </item>
-      <item class="javax.swing.JRadioButton" icon="/com/intellij/uiDesigner/icons/radioButton.png" removable="false" auto-create-binding="true" can-attach-label="false">
-        <default-constraints vsize-policy="0" hsize-policy="3" anchor="8" fill="0" />
-        <initial-values>
-          <property name="text" value="RadioButton" />
-        </initial-values>
-      </item>
-      <item class="javax.swing.JCheckBox" icon="/com/intellij/uiDesigner/icons/checkBox.png" removable="false" auto-create-binding="true" can-attach-label="false">
-        <default-constraints vsize-policy="0" hsize-policy="3" anchor="8" fill="0" />
-        <initial-values>
-          <property name="text" value="CheckBox" />
-        </initial-values>
-      </item>
-      <item class="javax.swing.JLabel" icon="/com/intellij/uiDesigner/icons/label.png" removable="false" auto-create-binding="false" can-attach-label="false">
-        <default-constraints vsize-policy="0" hsize-policy="0" anchor="8" fill="0" />
-        <initial-values>
-          <property name="text" value="Label" />
-        </initial-values>
-      </item>
-      <item class="javax.swing.JTextField" icon="/com/intellij/uiDesigner/icons/textField.png" removable="false" auto-create-binding="true" can-attach-label="true">
-        <default-constraints vsize-policy="0" hsize-policy="6" anchor="8" fill="1">
-          <preferred-size width="150" height="-1" />
-        </default-constraints>
-      </item>
-      <item class="javax.swing.JPasswordField" icon="/com/intellij/uiDesigner/icons/passwordField.png" removable="false" auto-create-binding="true" can-attach-label="true">
-        <default-constraints vsize-policy="0" hsize-policy="6" anchor="8" fill="1">
-          <preferred-size width="150" height="-1" />
-        </default-constraints>
-      </item>
-      <item class="javax.swing.JFormattedTextField" icon="/com/intellij/uiDesigner/icons/formattedTextField.png" removable="false" auto-create-binding="true" can-attach-label="true">
-        <default-constraints vsize-policy="0" hsize-policy="6" anchor="8" fill="1">
-          <preferred-size width="150" height="-1" />
-        </default-constraints>
-      </item>
-      <item class="javax.swing.JTextArea" icon="/com/intellij/uiDesigner/icons/textArea.png" removable="false" auto-create-binding="true" can-attach-label="true">
-        <default-constraints vsize-policy="6" hsize-policy="6" anchor="0" fill="3">
-          <preferred-size width="150" height="50" />
-        </default-constraints>
-      </item>
-      <item class="javax.swing.JTextPane" icon="/com/intellij/uiDesigner/icons/textPane.png" removable="false" auto-create-binding="true" can-attach-label="true">
-        <default-constraints vsize-policy="6" hsize-policy="6" anchor="0" fill="3">
-          <preferred-size width="150" height="50" />
-        </default-constraints>
-      </item>
-      <item class="javax.swing.JEditorPane" icon="/com/intellij/uiDesigner/icons/editorPane.png" removable="false" auto-create-binding="true" can-attach-label="true">
-        <default-constraints vsize-policy="6" hsize-policy="6" anchor="0" fill="3">
-          <preferred-size width="150" height="50" />
-        </default-constraints>
-      </item>
-      <item class="javax.swing.JComboBox" icon="/com/intellij/uiDesigner/icons/comboBox.png" removable="false" auto-create-binding="true" can-attach-label="true">
-        <default-constraints vsize-policy="0" hsize-policy="2" anchor="8" fill="1" />
-      </item>
-      <item class="javax.swing.JTable" icon="/com/intellij/uiDesigner/icons/table.png" removable="false" auto-create-binding="true" can-attach-label="false">
-        <default-constraints vsize-policy="6" hsize-policy="6" anchor="0" fill="3">
-          <preferred-size width="150" height="50" />
-        </default-constraints>
-      </item>
-      <item class="javax.swing.JList" icon="/com/intellij/uiDesigner/icons/list.png" removable="false" auto-create-binding="true" can-attach-label="false">
-        <default-constraints vsize-policy="6" hsize-policy="2" anchor="0" fill="3">
-          <preferred-size width="150" height="50" />
-        </default-constraints>
-      </item>
-      <item class="javax.swing.JTree" icon="/com/intellij/uiDesigner/icons/tree.png" removable="false" auto-create-binding="true" can-attach-label="false">
-        <default-constraints vsize-policy="6" hsize-policy="6" anchor="0" fill="3">
-          <preferred-size width="150" height="50" />
-        </default-constraints>
-      </item>
-      <item class="javax.swing.JTabbedPane" icon="/com/intellij/uiDesigner/icons/tabbedPane.png" removable="false" auto-create-binding="true" can-attach-label="false">
-        <default-constraints vsize-policy="3" hsize-policy="3" anchor="0" fill="3">
-          <preferred-size width="200" height="200" />
-        </default-constraints>
-      </item>
-      <item class="javax.swing.JSplitPane" icon="/com/intellij/uiDesigner/icons/splitPane.png" removable="false" auto-create-binding="false" can-attach-label="false">
-        <default-constraints vsize-policy="3" hsize-policy="3" anchor="0" fill="3">
-          <preferred-size width="200" height="200" />
-        </default-constraints>
-      </item>
-      <item class="javax.swing.JSpinner" icon="/com/intellij/uiDesigner/icons/spinner.png" removable="false" auto-create-binding="true" can-attach-label="true">
-        <default-constraints vsize-policy="0" hsize-policy="6" anchor="8" fill="1" />
-      </item>
-      <item class="javax.swing.JSlider" icon="/com/intellij/uiDesigner/icons/slider.png" removable="false" auto-create-binding="true" can-attach-label="false">
-        <default-constraints vsize-policy="0" hsize-policy="6" anchor="8" fill="1" />
-      </item>
-      <item class="javax.swing.JSeparator" icon="/com/intellij/uiDesigner/icons/separator.png" removable="false" auto-create-binding="false" can-attach-label="false">
-        <default-constraints vsize-policy="6" hsize-policy="6" anchor="0" fill="3" />
-      </item>
-      <item class="javax.swing.JProgressBar" icon="/com/intellij/uiDesigner/icons/progressbar.png" removable="false" auto-create-binding="true" can-attach-label="false">
-        <default-constraints vsize-policy="0" hsize-policy="6" anchor="0" fill="1" />
-      </item>
-      <item class="javax.swing.JToolBar" icon="/com/intellij/uiDesigner/icons/toolbar.png" removable="false" auto-create-binding="false" can-attach-label="false">
-        <default-constraints vsize-policy="0" hsize-policy="6" anchor="0" fill="1">
-          <preferred-size width="-1" height="20" />
-        </default-constraints>
-      </item>
-      <item class="javax.swing.JToolBar$Separator" icon="/com/intellij/uiDesigner/icons/toolbarSeparator.png" removable="false" auto-create-binding="false" can-attach-label="false">
-        <default-constraints vsize-policy="0" hsize-policy="0" anchor="0" fill="1" />
-      </item>
-      <item class="javax.swing.JScrollBar" icon="/com/intellij/uiDesigner/icons/scrollbar.png" removable="false" auto-create-binding="true" can-attach-label="false">
-        <default-constraints vsize-policy="6" hsize-policy="0" anchor="0" fill="2" />
-      </item>
-    </group>
-  </component>
-</project>

.idea/vcs.xml

@@ -1,6 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<project version="4">
-  <component name="VcsDirectoryMappings">
-    <mapping directory="" vcs="Git" />
-  </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=development)](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/java17-maven.yml/badge.svg)](https://github.com/AtlasMediaGroup/TotalFreedomMod/actions/workflows/java17-maven.yml) [![Codacy Badge](https://app.codacy.com/project/badge/Grade/29c0f964da304666bd654bc7b1d556db)](https://www.codacy.com/gh/AtlasMediaGroup/TotalFreedomMod/dashboard?utm_source=github.com&utm_medium=referral&utm_content=AtlasMediaGroup/TotalFreedomMod&utm_campaign=Badge_Grade) [![CodeQL](https://github.com/AtlasMediaGroup/TotalFreedomMod/actions/workflows/codeql-analysis.yml/badge.svg)](https://github.com/AtlasMediaGroup/TotalFreedomMod/actions/workflows/codeql-analysis.yml)
 
-TotalFreedomMod is a CraftBukkit server plugin designed primarily to support the [Official TotalFreedom Minecraft Server](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,42 @@
+# Security Policy
+
+## Supported Versions
+
+We currently support the code running on the "main" branch and "development" branch of this repository. This is supported in addition to those formal releases, but note anything not yet released should be treated as in-development.
+
+In terms of plugin releases, our support matrix is as follows:
+
+### Actively Supported
+These versions are currently actively supported by our team, and you should expect security patches where appropriate for these versions. 
+
+| Version             | Supported  | Support End:                   |
+| ------------------- | ---------- | ------------------------------ |
+| 2022.02             | ✅         | No Earlier than May 2022       |
+
+### Legacy Supported
+These versions are no longer under active development, however we will look to release critical secuirty patches where appropriate. 
+
+| Version             | Supported  | Support End: |
+| ------------------- | ---------- | ------------ |
+| 2021.09             | ⚠️         | April 2022   |
+
+
+### No Longer Supported
+These versions are no longer supported at all. It is strongly advised to update if you are running any of these versions. 
+
+| Version             | Supported          | Support Ended:      |
+| ------------------- | ------------------ | ------------------- |
+| 2021.06             | :x:                | October 2021        |
+| 2021.05             | :x:                | September 2021      |
+| 2021.04             | :x:                | July 2021           |
+| 2021.02             | :x:                | 6 June 2021         |
+| 2020.11             | :x:                | 3 May 2021          |
+| 6.0.x (Pre-Release) | :x:                | December 2020       |
+| < 2020.11           | :x:                | December 2020       |
+| < 5.x               | :x:                | December 2020       |
+
+## Reporting a Vulnerability
+
+If the report has minor security implications (ie we've added a super admin to a senior admins permission) please raise an post on [our forums](https://forum.totalfreedom.me/) in the first instance. If you do not have a forum account and do not wish to sign up, please e-mail us using the e-mail in the next sentence.
+
+For security vulnerabilities that are more severe and that may pose a more significant threat to the servers running this plugin, please e-mail os-security-reports [ AT ] atlas-media.co.uk - You can expect an automated response immediately to acknowledge receipt of your e-mail, and one of our team will aim to respond within 72 hours and will work with you on the best way to address your concerns.

checkstyle.xml

@@ -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_17</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>2020.9</version>
+    <version>2022.06.1</version>
     <packaging>jar</packaging>
 
     <properties>
         <project.build.sourceEncoding>UTF-8</project.build.sourceEncoding>
-        <tfm.build.codename>Antaeus</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/TFPatches/TotalFreedomMod</url>
+    <url>https://github.com/AtlasMediaGroup/TotalFreedomMod</url>
 
     <licenses>
         <license>
@@ -39,14 +39,15 @@
     </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>
+            <url>https://repo.codemc.org/repository/maven-public/</url>
         </repository>
 
         <repository>
@@ -61,18 +62,13 @@
 
         <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>
-        </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>
@@ -82,131 +78,97 @@
 
         <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>
+            <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>
-
-        <repository>
-            <id>ess-repo</id>
-            <url>https://ci.ender.zone/plugin/repository/everything/</url>
-        </repository>
     </repositories>
 
     <dependencies>
-        <dependency>
-            <groupId>org.projectlombok</groupId>
-            <artifactId>lombok</artifactId>
-            <version>1.18.12</version>
-            <scope>provided</scope>
-        </dependency>
 
         <dependency>
             <groupId>commons-io</groupId>
             <artifactId>commons-io</artifactId>
-            <version>2.7</version>
+            <version>2.13.0</version>
             <scope>compile</scope>
         </dependency>
 
         <dependency>
             <groupId>org.apache.commons</groupId>
             <artifactId>commons-lang3</artifactId>
-            <version>3.11</version>
+            <version>3.13.0</version>
             <scope>compile</scope>
         </dependency>
 
         <dependency>
-            <groupId>commons-codec</groupId>
-            <artifactId>commons-codec</artifactId>
-            <version>1.9</version>
+            <groupId>org.bstats</groupId>
+            <artifactId>bstats-bukkit</artifactId>
+            <version>3.0.2</version>
             <scope>compile</scope>
         </dependency>
 
         <dependency>
-            <groupId>org.spigotmc</groupId>
-            <artifactId>spigot</artifactId>
-            <version>1.16.1-R0.1-SNAPSHOT</version>
+            <groupId>me.totalfreedom.scissors</groupId>
+            <artifactId>Scissors-API</artifactId>
+            <version>1.19.4-R0.1-SNAPSHOT</version>
             <scope>provided</scope>
         </dependency>
 
         <dependency>
-            <groupId>com.github.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>0cfa32159a</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.18.0</version>
+            <version>7.2.15</version>
             <scope>provided</scope>
         </dependency>
 
         <dependency>
             <groupId>net.dv8tion</groupId>
             <artifactId>JDA</artifactId>
-            <version>4.2.0_168</version>
+            <version>4.4.1_353</version>
             <scope>provided</scope>
         </dependency>
 
         <dependency>
             <groupId>net.coreprotect</groupId>
             <artifactId>coreprotect</artifactId>
-            <version>2.18.2</version>
+            <version>21.3</version>
             <scope>provided</scope>
         </dependency>
 
         <dependency>
             <groupId>com.sk89q.worldguard</groupId>
             <artifactId>worldguard-bukkit</artifactId>
-            <version>7.0.3</version>
+            <version>7.0.8</version>
             <scope>provided</scope>
         </dependency>
 
         <dependency>
-            <groupId>com.destroystokyo.paper</groupId>
-            <artifactId>paper-api</artifactId>
-            <version>1.16.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.8</version>
             <scope>compile</scope>
         </dependency>
 
@@ -218,52 +180,61 @@
         </dependency>
         
         <dependency>
-            <groupId>org.bukkit</groupId>
-            <artifactId>bukkit</artifactId>
-            <version>1.16.1-R0.1-SNAPSHOT</version>
-            <scope>provided</scope>
-        </dependency>
-
-        <dependency>
-            <groupId>net.goldtreeservers</groupId>
-            <artifactId>worldguardextraflags</artifactId>
-            <version>4.0.0</version>
+            <groupId>net.essentialsx</groupId>
+            <artifactId>EssentialsX</artifactId>
+            <version>2.20.0</version>
             <scope>provided</scope>
         </dependency>
 
         <dependency>
             <groupId>org.reflections</groupId>
             <artifactId>reflections</artifactId>
-            <version>0.9.11</version>
+            <version>0.10.2</version>
+            <scope>compile</scope>
         </dependency>
 
         <dependency>
-            <groupId>javassist</groupId>
+            <groupId>org.javassist</groupId>
             <artifactId>javassist</artifactId>
-            <version>3.12.1.GA</version>
+            <version>3.29.1-GA</version>
+            <scope>compile</scope>
         </dependency>
 
         <dependency>
-            <groupId>com.github.TFPatches</groupId>
-            <artifactId>TFGuilds</artifactId>
-            <version>ad93b9ed00</version>
-            <scope>provided</scope>
+            <groupId>org.jetbrains</groupId>
+            <artifactId>annotations</artifactId>
+            <version>24.0.1</version>
+            <scope>compile</scope>
         </dependency>
 
         <dependency>
             <groupId>org.apache.maven.plugins</groupId>
             <artifactId>maven-checkstyle-plugin</artifactId>
-            <version>3.1.1</version>
+            <version>3.3.0</version>
+            <scope>compile</scope>
         </dependency>
         
         <dependency>
-            <groupId>net.dean.jraw</groupId>
-            <artifactId>JRAW</artifactId>
-            <version>1.1.0</version>
-            <scope>provided</scope>
+            <groupId>org.junit.jupiter</groupId>
+            <artifactId>junit-jupiter</artifactId>
+            <version>5.10.0</version>
+            <scope>compile</scope>
+        </dependency>
+        
+        <dependency>
+            <groupId>org.eclipse.sisu</groupId>
+            <artifactId>org.eclipse.sisu.inject</artifactId>
+            <version>0.3.5</version>
         </dependency>
     </dependencies>
 
+    <pluginRepositories>
+        <pluginRepository>
+            <id>apache.snapshots</id>
+            <url>https://repository.apache.org/snapshots/</url>
+        </pluginRepository>
+    </pluginRepositories>
+
     <build>
         <!-- Filter resources for build.properties -->
         <resources>
@@ -278,12 +249,12 @@
             <plugin>
                 <groupId>org.apache.maven.plugins</groupId>
                 <artifactId>maven-compiler-plugin</artifactId>
-                <version>3.8.1</version>
+                <version>3.11.0</version>
                 <configuration>
                     <outputFileName>TotalFreedomMod.jar</outputFileName>
-                    <compilerVersion>1.8</compilerVersion>
-                    <source>1.8</source>
-                    <target>1.8</target>
+                    <compilerVersion>17</compilerVersion>
+                    <source>17</source>
+                    <target>17</target>
                 </configuration>
             </plugin>
 
@@ -291,7 +262,7 @@
             <plugin>
                 <groupId>pl.project13.maven</groupId>
                 <artifactId>git-commit-id-plugin</artifactId>
-                <version>4.0.1</version>
+                <version>4.9.10</version>
                 <executions>
                     <execution>
                         <id>get-the-git-infos</id>
@@ -332,7 +303,7 @@
             <plugin>
                 <groupId>org.apache.maven.plugins</groupId>
                 <artifactId>maven-antrun-plugin</artifactId>
-                <version>1.8</version>
+                <version>3.1.0</version>
                 <executions>
                     <execution>
                         <id>default-cli</id>
@@ -362,7 +333,7 @@
             <plugin>
                 <groupId>org.codehaus.mojo</groupId>
                 <artifactId>properties-maven-plugin</artifactId>
-                <version>1.0.0</version>
+                <version>1.1.0</version>
                 <executions>
                     <execution>
                         <phase>initialize</phase>
@@ -382,7 +353,7 @@
             <plugin>
                 <groupId>org.codehaus.mojo</groupId>
                 <artifactId>buildnumber-maven-plugin</artifactId>
-                <version>1.4</version>
+                <version>3.2.0</version>
                 <executions>
                     <execution>
                         <phase>generate-resources</phase>
@@ -407,7 +378,7 @@
             <plugin>
                 <groupId>org.apache.maven.plugins</groupId>
                 <artifactId>maven-shade-plugin</artifactId>
-                <version>3.2.4</version>
+                <version>3.4.1</version>
                 <executions>
                     <execution>
                         <phase>package</phase>
@@ -416,14 +387,23 @@
                         </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>javassist:javassist</include>
-                                    <include>me.rayzr522:jsonmessage</include>
+                                    <include>io.papermc:paperlib</include>
+                                    <include>org.bstats:bstats-bukkit</include>
+                                    <include>org.bstats:bstats-base</include>
                                 </includes>
                             </artifactSet>
                         </configuration>
@@ -439,8 +419,8 @@
         <plugins>
             <plugin>
                 <groupId>org.apache.maven.plugins</groupId>
-                <version>3.1.1</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/AMP.java

@@ -1,187 +0,0 @@
-package me.totalfreedom.totalfreedommod;
-
-import java.io.IOException;
-import java.util.Arrays;
-import java.util.List;
-import joptsimple.internal.Strings;
-import lombok.Getter;
-import me.totalfreedom.totalfreedommod.config.ConfigEntry;
-import me.totalfreedom.totalfreedommod.rank.Rank;
-import me.totalfreedom.totalfreedommod.staff.StaffMember;
-import me.totalfreedom.totalfreedommod.util.FLog;
-import me.totalfreedom.totalfreedommod.util.FUtil;
-import org.json.simple.JSONObject;
-import org.json.simple.parser.JSONParser;
-import org.json.simple.parser.ParseException;
-
-public class AMP extends FreedomService
-{
-
-    public String URL = ConfigEntry.AMP_URL.getString();
-    private String API_URL = URL + "/API/Core";
-    private String USERNAME = ConfigEntry.AMP_USERNAME.getString();
-    private String PASSWORD = ConfigEntry.AMP_PASSWORD.getString();
-    private String SESSION_ID;
-
-    @Getter
-    private boolean enabled = !Strings.isNullOrEmpty(URL);
-
-    private final List<String> headers = Arrays.asList("Accept:application/json");
-
-    public void onStart()
-    {
-        if (enabled)
-        {
-            login();
-        }
-    }
-
-    public void onStop()
-    {
-        if (enabled)
-        {
-            logout();
-        }
-    }
-
-    public void login()
-    {
-        JSONObject json = new JSONObject();
-        json.put("username", USERNAME);
-        json.put("password", PASSWORD);
-        json.put("token", "");
-        json.put("rememberMe", false);
-
-        String response;
-        try
-        {
-            response = FUtil.sendRequest(API_URL + "/Login", "POST", headers, json.toJSONString());
-        }
-        catch (IOException e)
-        {
-            e.printStackTrace();
-            return;
-        }
-
-        JSONObject jsonResponse;
-        try
-        {
-            jsonResponse = (JSONObject)new JSONParser().parse(response);
-        }
-        catch (ParseException e)
-        {
-            e.printStackTrace();
-            return;
-        }
-
-        Object sessionID = jsonResponse.get("sessionID");
-        if (sessionID == null)
-        {
-            FLog.warning("Invalid AMP credentials have been specified in the config");
-            enabled = false;
-            return;
-        }
-        SESSION_ID = sessionID.toString();
-        FLog.info("Logged into AMP");
-    }
-
-    public void logout()
-    {
-        JSONObject json = new JSONObject();
-        json.put("SESSIONID", SESSION_ID);
-
-        try
-        {
-            FUtil.sendRequest(API_URL + "/Logout", "POST", headers, json.toJSONString());
-        }
-        catch (IOException e)
-        {
-            e.printStackTrace();
-            return;
-        }
-
-        FLog.info("Logged out of AMP");
-    }
-
-    public void updateAccountStatus(StaffMember staffMember)
-    {
-        String username = staffMember.getAmpUsername();
-
-        if (username == null || !enabled)
-        {
-            return;
-        }
-
-        if (!staffMember.isActive() || staffMember.getRank() != Rank.ADMIN)
-        {
-            FLog.debug("Disabling amp acc");
-            setAccountEnabled(username, false);
-            return;
-        }
-
-        FLog.debug("Enabling amp acc");
-        setAccountEnabled(username, true);
-    }
-
-    public void createAccount(String username, String password)
-    {
-        makeAccount(username);
-        setPassword(username, password);
-    }
-
-    public void setAccountEnabled(String username, boolean enable)
-    {
-        JSONObject json = new JSONObject();
-        json.put("Username", username);
-        json.put("Disabled", !enable);
-        json.put("PasswordExpires", false);
-        json.put("CannotChangePassword", false);
-        json.put("MustChangePassword", false);
-        json.put("SESSIONID", SESSION_ID);
-
-        try
-        {
-            FUtil.sendRequest(API_URL + "/UpdateUserInfo", "POST", headers, json.toJSONString());
-        }
-        catch (IOException e)
-        {
-            e.printStackTrace();
-            return;
-        }
-    }
-
-    private void makeAccount(String username)
-    {
-        JSONObject json = new JSONObject();
-        json.put("Username", username);
-        json.put("SESSIONID", SESSION_ID);
-
-        try
-        {
-            FUtil.sendRequest(API_URL + "/CreateUser", "POST", headers, json.toJSONString());
-        }
-        catch (IOException e)
-        {
-            e.printStackTrace();
-            return;
-        }
-    }
-
-    public void setPassword(String username, String password)
-    {
-        JSONObject json = new JSONObject();
-        json.put("Username", username);
-        json.put("NewPassword", password);
-        json.put("SESSIONID", SESSION_ID);
-
-        try
-        {
-            FUtil.sendRequest(API_URL + "/ResetUserPassword", "POST", headers, json.toJSONString());
-        }
-        catch (IOException e)
-        {
-            e.printStackTrace();
-            return;
-        }
-    }
-}

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,11 +12,8 @@ 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;
 
@@ -80,4 +76,23 @@ public class Announcer extends FreedomService
         FUtil.bcastMsg(prefix + message);
     }
 
+    public boolean isEnabled()
+    {
+        return enabled;
+    }
+
+    public long getInterval()
+    {
+        return interval;
+    }
+
+    public String getPrefix()
+    {
+        return prefix;
+    }
+
+    public BukkitTask getAnnouncer()
+    {
+        return announcer;
+    }
 }

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

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

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

@@ -1,60 +1,49 @@
 package me.totalfreedom.totalfreedommod;
 
-import java.util.ArrayList;
-import java.util.List;
+import me.totalfreedom.totalfreedommod.config.ConfigEntry;
 import me.totalfreedom.totalfreedommod.player.FPlayer;
-import me.totalfreedom.totalfreedommod.util.FSync;
-import me.totalfreedom.totalfreedommod.util.FUtil;
-import org.bukkit.ChatColor;
+import net.kyori.adventure.text.Component;
+import net.kyori.adventure.text.format.NamedTextColor;
 import org.bukkit.entity.Player;
 import org.bukkit.event.EventHandler;
 import org.bukkit.event.EventPriority;
 import org.bukkit.event.player.AsyncPlayerChatEvent;
 import org.bukkit.event.player.PlayerCommandPreprocessEvent;
-import org.bukkit.event.player.PlayerKickEvent;
-import org.bukkit.scheduler.BukkitRunnable;
-import org.bukkit.scheduler.BukkitTask;
+
+import java.util.HashMap;
+import java.util.Map;
+import java.util.concurrent.ScheduledThreadPoolExecutor;
+import java.util.concurrent.TimeUnit;
 
 public class AntiSpam extends FreedomService
 {
-
+    private ScheduledThreadPoolExecutor cycle;
     public static final int MSG_PER_CYCLE = 8;
-    public static final int TICKS_PER_CYCLE = 2 * 10;
-    List<Player> markedForDeath = new ArrayList<>();
     //
-    public BukkitTask cycleTask = null;
+    private Map<Player, Integer> muteCounts = new HashMap<>();
 
     @Override
     public void onStart()
     {
-        new BukkitRunnable()
-        {
-
-            @Override
-            public void run()
-            {
-                cycle();
-            }
-        }.runTaskTimer(plugin, TICKS_PER_CYCLE, TICKS_PER_CYCLE);
+        cycle = new ScheduledThreadPoolExecutor(1);
+        cycle.scheduleAtFixedRate(this::cycle, 0, 1, TimeUnit.SECONDS);
     }
 
     @Override
     public void onStop()
     {
-        FUtil.cancel(cycleTask);
+        cycle.shutdownNow();
     }
 
     private void cycle()
     {
-        for (Player player : server.getOnlinePlayers())
+        server.getOnlinePlayers().stream().map(player -> plugin.pl.getPlayer(player)).forEach(fPlayer ->
         {
-            final FPlayer playerdata = plugin.pl.getPlayer(player);
-
             // TODO: Move each to their own section
-            playerdata.resetMsgCount();
-            playerdata.resetBlockDestroyCount();
-            playerdata.resetBlockPlaceCount();
-        }
+            fPlayer.resetMsgCount();
+            fPlayer.resetBlockDestroyCount();
+            fPlayer.resetBlockPlaceCount();
+        });
     }
 
     @EventHandler(priority = EventPriority.LOW)
@@ -62,33 +51,34 @@ public class AntiSpam extends FreedomService
     {
         final Player player = event.getPlayer();
 
-        if (plugin.sl.isStaff(player))
+        if (plugin.al.isAdmin(player))
         {
             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);
+
+            server.broadcast(Component.text(player.getName()).append(Component.text(" has been automatically muted for "))
+                    .append(Component.text(time)).append(Component.text(" minutes for spamming chat."))
+                    .color(NamedTextColor.RED));
 
             playerdata.resetMsgCount();
-
             event.setCancelled(true);
         }
-            return;
-        }
         else if (playerdata.incrementAndGetMsgCount() > MSG_PER_CYCLE / 2)
         {
-            FUtil.playerMsg(player, "Please refrain from spamming chat.", ChatColor.GRAY);
+            player.sendMessage(Component.text("Please refrain from spamming chat.", NamedTextColor.GRAY));
             event.setCancelled(true);
         }
 
@@ -104,33 +94,25 @@ public class AntiSpam extends FreedomService
 
         if (fPlayer.allCommandsBlocked())
         {
-            FUtil.playerMsg(player, "Your commands have been blocked by an admin.", ChatColor.RED);
+            player.sendMessage(Component.text("Your commands have been blocked by an admin.", NamedTextColor.RED));
             event.setCancelled(true);
             return;
         }
 
-        if (plugin.sl.isStaff(player))
+        if (plugin.al.isAdmin(player))
         {
             return;
         }
 
         if (fPlayer.incrementAndGetMsgCount() > MSG_PER_CYCLE)
         {
-            FUtil.bcastMsg(player.getName() + " was automatically kicked for spamming commands.", ChatColor.RED);
+            server.broadcast(Component.text(player.getName())
+                    .append(Component.text(" was automatically kicked for spamming commands."))
+                    .color(NamedTextColor.RED));
             plugin.ae.autoEject(player, "Kicked for spamming commands.");
 
             fPlayer.resetMsgCount();
             event.setCancelled(true);
         }
     }
-
-    @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

@@ -43,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;
         }
@@ -89,9 +85,13 @@ public class AutoEject extends FreedomService
                 player.kickPlayer(kickMessage);
                 break;
             }
+            default:
+            {
+                FLog.warning("Unrecognized EjectMethod " + method.name() + " found, defaulting to STRIKE_THREE");
+            }
             case STRIKE_THREE:
             {
-                plugin.bm.addBan(Ban.forPlayerFuzzy(player, Bukkit.getConsoleSender(), null, kickMessage));
+                plugin.bm.addBan(Ban.forPlayer(player, Bukkit.getConsoleSender(), null, kickMessage));
 
                 FUtil.bcastMsg(ChatColor.RED + player.getName() + " has been banned.");
 
@@ -101,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

@@ -46,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,6 +1,5 @@
 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;
@@ -9,8 +8,11 @@ import me.totalfreedom.totalfreedommod.util.FLog;
 import me.totalfreedom.totalfreedommod.util.FUtil;
 import org.bukkit.util.FileUtil;
 
+import java.io.File;
+
 public class BackupManager extends FreedomService
 {
+
     @Override
     public void onStart()
     {
@@ -42,16 +44,16 @@ public class BackupManager extends FreedomService
         config.load();
 
         // Weekly
-        if (!config.isInt(save + ".weekly"))
+        if (!config.isLong(save + ".weekly"))
         {
             performBackup(file, "weekly");
             config.set(save + ".weekly", FUtil.getUnixTime());
         }
         else
         {
-            int lastBackupWeekly = config.getInt(save + ".weekly");
+            long lastBackupWeekly = config.getLong(save + ".weekly");
 
-            if (lastBackupWeekly + 3600 * 24 * 7 < FUtil.getUnixTime())
+            if (FUtil.parseLongOffset(lastBackupWeekly, "1w") < FUtil.getUnixTime())
             {
                 performBackup(file, "weekly");
                 config.set(save + ".weekly", FUtil.getUnixTime());
@@ -65,16 +67,16 @@ public class BackupManager extends FreedomService
         }
 
         // Daily
-        if (!config.isInt(save + ".daily"))
+        if (!config.isLong(save + ".daily"))
         {
             performBackup(file, "daily");
             config.set(save + ".daily", FUtil.getUnixTime());
         }
         else
         {
-            int lastBackupDaily = config.getInt(save + ".daily");
+            long lastBackupDaily = config.getLong(save + ".daily");
 
-            if (lastBackupDaily + 3600 * 24 < FUtil.getUnixTime())
+            if (FUtil.parseLongOffset(lastBackupDaily, "1d") < FUtil.getUnixTime())
             {
                 performBackup(file, "daily");
                 config.set(save + ".daily", FUtil.getUnixTime());
@@ -98,5 +100,4 @@ public class BackupManager extends FreedomService
         final File newYaml = new File(backupFolder, file + "." + type + ".bak");
         FileUtil.copy(oldYaml, newYaml);
     }
-
 }

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

@@ -1,16 +1,14 @@
 package me.totalfreedom.totalfreedommod;
 
 import com.google.common.base.Strings;
+import me.totalfreedom.totalfreedommod.admin.Admin;
 import me.totalfreedom.totalfreedommod.config.ConfigEntry;
 import me.totalfreedom.totalfreedommod.player.FPlayer;
-import me.totalfreedom.totalfreedommod.player.PlayerData;
 import me.totalfreedom.totalfreedommod.rank.Displayable;
-import me.totalfreedom.totalfreedommod.staff.StaffMember;
 import me.totalfreedom.totalfreedommod.util.FLog;
 import me.totalfreedom.totalfreedommod.util.FSync;
 import me.totalfreedom.totalfreedommod.util.FUtil;
 import net.md_5.bungee.api.ChatColor;
-import org.bukkit.Bukkit;
 import org.bukkit.Sound;
 import org.bukkit.SoundCategory;
 import org.bukkit.command.CommandSender;
@@ -48,24 +46,18 @@ public class ChatManager extends FreedomService
     private void handleChatEvent(AsyncPlayerChatEvent event)
     {
         final Player player = event.getPlayer();
-        String message = event.getMessage().trim();
-        
+        String originalMessage = event.getMessage();
+        if (plugin.mu.onPlayerChat(player) || plugin.sh.handlePlayerChat(player, originalMessage))
+        {
+            event.setCancelled(true);
+            return;
+        }
+        String message = originalMessage.trim();
         // Format colors and strip &k
         message = FUtil.colorize(message);
         message = message.replaceAll(ChatColor.MAGIC.toString(), "&k");
 
-        if (ConfigEntry.SHOP_ENABLED.getBoolean() && ConfigEntry.SHOP_REACTIONS_ENABLED.getBoolean() && !plugin.sh.reactionString.isEmpty() && message.equals(plugin.sh.reactionString))
-        {
-            event.setCancelled(true);
-            PlayerData data = plugin.pl.getData(player);
-            data.setCoins(data.getCoins() + plugin.sh.coinsPerReactionWin);
-            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;
-        }
-
-        if (!ConfigEntry.TOGGLE_CHAT.getBoolean() && !plugin.sl.isStaff(player))
+        if (!ConfigEntry.TOGGLE_CHAT.getBoolean() && !plugin.al.isAdmin(player))
         {
             event.setCancelled(true);
             playerMsg(player, "Chat is currently disabled.", org.bukkit.ChatColor.RED);
@@ -87,19 +79,22 @@ public class ChatManager extends FreedomService
             return;
         }
 
-        // Check for staffchat
-        if (fPlayer.inStaffChat())
+        // Check for adminchat
+        if (fPlayer.inAdminChat())
         {
-            FSync.staffChatMessage(player, message);
+            FSync.adminChatMessage(player, message);
             event.setCancelled(true);
             return;
         }
 
+        plugin.dc.onPlayerChat(player, ChatColor.stripColor(message));
+
         // Check for 4chan trigger
-        Boolean green = ChatColor.stripColor(message).toLowerCase().startsWith(">");
-        Boolean orange = ChatColor.stripColor(message).toLowerCase().endsWith("<");
         if (ConfigEntry.FOURCHAN_ENABLED.getBoolean())
         {
+            boolean green = ChatColor.stripColor(message).toLowerCase().startsWith(">");
+            boolean orange = ChatColor.stripColor(message).toLowerCase().endsWith("<");
+
             if (green)
             {
                 message = ChatColor.GREEN + message;
@@ -123,29 +118,32 @@ public class ChatManager extends FreedomService
         }
 
         // Check for mentions
-        Boolean mentionEveryone = ChatColor.stripColor(message).toLowerCase().contains("@everyone") && plugin.sl.isStaff(player);
-        for (Player p : server.getOnlinePlayers())
+        String stripped = ChatColor.stripColor(message).toLowerCase();
+
+        /* There is an issue would have allowed muted players to ping players. The issue is caused by the order in which
+        *   these event handlers are registered when the plugin starts up. Muter is registered after the ChatManager,
+        *   which results in latter being called first (before the former can cancel it). EventPriority does not seem to
+        *   make a difference. As a short-term solution I've added this mute check alongside the usual isCancelled check
+        *   so that the issue is mitigated, but a long-term solution should be to change the order in which things like
+        *   ChatManager and Muter are registered. */
+        if (!event.isCancelled() && !plugin.pl.getPlayer(player).isMuted())
         {
-            if (ChatColor.stripColor(message).toLowerCase().contains("@" + p.getName().toLowerCase()) || mentionEveryone)
+            server.getOnlinePlayers().forEach(pl ->
             {
-                p.playSound(p.getLocation(), Sound.BLOCK_NOTE_BLOCK_PLING, SoundCategory.MASTER, 1337F, 0.9F);
+                if (stripped.contains("@" + pl.getName()) || (plugin.al.isAdmin(player) && stripped.contains("@everyone")))
+                {
+                    pl.playSound(pl.getLocation(), Sound.BLOCK_NOTE_BLOCK_PLING, SoundCategory.MASTER, 1337F, 0.9F);
                 }
+            });
         }
 
         // Set format
         event.setFormat(format);
-
-        // Send to discord
-        if (!ConfigEntry.STAFF_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));
-        }
     }
 
     public ChatColor getColor(Displayable display)
     {
-        ChatColor color = display.getColor();
-        return color;
+        return display.getColor();
     }
 
     public String getColoredTag(Displayable display)
@@ -154,40 +152,38 @@ public class ChatManager extends FreedomService
         return color + display.getAbbr();
     }
 
-    public void staffChat(CommandSender sender, String message)
+    public void adminChat(CommandSender sender, String message)
     {
         Displayable display = plugin.rm.getDisplay(sender);
-        FLog.info("[STAFF] " + sender.getName() + " " + display.getTag() + ": " + message, true);
+        FLog.info("[ADMIN] " + sender.getName() + " " + display.getTag() + ": " + message, true);
+        plugin.dc.messageAdminChatChannel(sender.getName() + " \u00BB " + message);
 
-        for (Player player : server.getOnlinePlayers())
+        server.getOnlinePlayers().stream().filter(player -> plugin.al.isAdmin(player)).forEach(player ->
         {
-            if (plugin.sl.isStaff(player))
+            Admin admin = plugin.al.getAdmin(player);
+            if (!Strings.isNullOrEmpty(admin.getAcFormat()))
             {
-                StaffMember staffMember = plugin.sl.getAdmin(player);
-                if (!Strings.isNullOrEmpty(staffMember.getAcFormat()))
-                {
-                    String format = staffMember.getAcFormat();
+                String format = admin.getAcFormat();
                 ChatColor color = getColor(display);
                 String msg = format.replace("%name%", sender.getName()).replace("%rank%", display.getAbbr()).replace("%rankcolor%", color.toString()).replace("%msg%", message);
                 player.sendMessage(FUtil.colorize(msg));
             }
             else
             {
-                    player.sendMessage("[" + ChatColor.AQUA + "STAFF" + ChatColor.WHITE + "] " + ChatColor.DARK_RED + sender.getName() + ChatColor.DARK_GRAY + " [" + getColoredTag(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)
+    public void reportAction(Player reporter, String reportedName, String report)
     {
         for (Player player : server.getOnlinePlayers())
         {
-            if (plugin.sl.isStaff(player))
+            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);
+                playerMsg(player, ChatColor.RED + "[REPORTS] " + ChatColor.GOLD + reporter.getName() + " has reported " + reportedName + " for " + report);
             }
         }
+        FLog.info("[REPORTS] " + reporter.getName() + " has reported " + reportedName + " for " + report);
     }
 }

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

@@ -1,7 +1,7 @@
 package me.totalfreedom.totalfreedommod;
 
-import me.totalfreedom.totalfreedommod.util.FUtil;
-import org.bukkit.entity.Player;
+import net.kyori.adventure.text.Component;
+import net.kyori.adventure.text.format.NamedTextColor;
 import org.bukkit.event.EventHandler;
 import org.bukkit.event.EventPriority;
 import org.bukkit.event.player.PlayerCommandPreprocessEvent;
@@ -21,20 +21,9 @@ public class CommandSpy extends FreedomService
     @EventHandler(priority = EventPriority.MONITOR)
     public void onPlayerCommandPreprocess(PlayerCommandPreprocessEvent event)
     {
-        for (Player player : server.getOnlinePlayers())
-        {
-            if (plugin.sl.isStaff(player) && plugin.sl.getAdmin(player).getCommandSpy())
-            {
-                if (plugin.sl.isStaff(event.getPlayer()) && !plugin.sl.isAdmin(player))
-                {
-                    continue;
-                }
-                if (player != event.getPlayer())
-                {
-                    FUtil.playerMsg(player, event.getPlayer().getName() + ": " + event.getMessage());
+        server.getOnlinePlayers().stream().filter(player -> plugin.al.isAdmin(player)
+                && plugin.al.getAdmin(player).getCommandSpy() && player != event.getPlayer()).forEach(player ->
+                player.sendMessage(Component.text(event.getPlayer().getName(), NamedTextColor.GRAY).append(Component.text(": ", NamedTextColor.GRAY))
+                        .append(Component.text(event.getMessage(), NamedTextColor.GRAY))));
     }
 }
-        }
-    }
-
-}

src/main/java/me/totalfreedom/totalfreedommod/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,8 +16,6 @@ import org.bukkit.scheduler.BukkitTask;
 
 public class EntityWiper extends FreedomService
 {
-    private BukkitTask wiper;
-
     public List<EntityType> BLACKLIST = Arrays.asList(
             EntityType.ARMOR_STAND,
             EntityType.PAINTING,
@@ -24,6 +24,7 @@ public class EntityWiper extends FreedomService
             EntityType.ITEM_FRAME,
             EntityType.MINECART
     );
+    private BukkitTask wiper;
 
     @Override
     public void onStart()
@@ -33,9 +34,12 @@ public class EntityWiper extends FreedomService
         {
             @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
     }
 

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

@@ -1,5 +1,6 @@
 package me.totalfreedom.totalfreedommod;
 
+import java.util.logging.Logger;
 import me.totalfreedom.totalfreedommod.util.FLog;
 import org.bukkit.Server;
 import org.bukkit.event.Listener;
@@ -8,17 +9,18 @@ public abstract class FreedomService implements Listener
 {
     protected final TotalFreedomMod plugin;
     protected final Server server;
-    protected final FLog logger;
+    protected final Logger logger;
 
     public FreedomService()
     {
         plugin = TotalFreedomMod.getPlugin();
         server = plugin.getServer();
-        logger = new FLog();
+        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

@@ -2,12 +2,10 @@ package me.totalfreedom.totalfreedommod;
 
 import java.util.ArrayList;
 import java.util.List;
-import lombok.Getter;
 
 public class FreedomServiceHandler
 {
-    @Getter
-    private List<FreedomService> services;
+    private final List<FreedomService> services;
 
     public FreedomServiceHandler()
     {
@@ -53,4 +51,9 @@ public class FreedomServiceHandler
             }
         }
     }
+
+    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/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,7 +9,6 @@ import org.bukkit.World;
 
 public class GameRuleHandler extends FreedomService
 {
-
     private final Map<GameRule, Boolean> rules = new EnumMap<>(GameRule.class);
 
     public GameRuleHandler()
@@ -58,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();
 
@@ -79,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),
@@ -98,11 +92,11 @@ public class GameRuleHandler extends FreedomService
         ANNOUNCE_ADVANCEMENTS("announceAdvancements", false),
         SHOW_DEATH_MESSAGES("showDeathMessages", false),
         SEND_COMMAND_FEEDBACK("sendCommandFeedback", false);
-        //
+
         private final String gameRuleName;
         private final boolean defaultValue;
 
-        private GameRule(String gameRuleName, boolean defaultValue)
+        GameRule(String gameRuleName, boolean defaultValue)
         {
             this.gameRuleName = gameRuleName;
             this.defaultValue = defaultValue;
@@ -118,5 +112,4 @@ public class GameRuleHandler extends FreedomService
             return defaultValue;
         }
     }
-
 }

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

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

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

@@ -1,11 +1,12 @@
 package me.totalfreedom.totalfreedommod;
 
+import io.papermc.lib.PaperLib;
 import java.util.ArrayList;
 import java.util.List;
+import java.util.UUID;
 import java.util.regex.Pattern;
-import lombok.Getter;
-import lombok.Setter;
-import me.rayzr522.jsonmessage.JSONMessage;
+
+import me.totalfreedom.totalfreedommod.admin.Admin;
 import me.totalfreedom.totalfreedommod.config.ConfigEntry;
 import me.totalfreedom.totalfreedommod.player.FPlayer;
 import me.totalfreedom.totalfreedommod.player.PlayerData;
@@ -21,6 +22,7 @@ import org.bukkit.event.player.AsyncPlayerPreLoginEvent;
 import org.bukkit.event.player.PlayerJoinEvent;
 import org.bukkit.event.player.PlayerLoginEvent;
 import org.bukkit.scheduler.BukkitRunnable;
+import org.bukkit.scheduler.BukkitTask;
 
 public class LoginProcess extends FreedomService
 {
@@ -28,12 +30,20 @@ public class LoginProcess extends FreedomService
     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<>();
+    public List<String> CLOWNFISH_TOGGLE = new ArrayList<>();
 
-    @Getter
-    @Setter
-    private static boolean lockdownEnabled = false;
+    public static boolean isLockdownEnabled()
+    {
+        return lockdownEnabled;
+    }
+
+    public static void setLockdownEnabled(boolean lockdownEnabled)
+    {
+        LoginProcess.lockdownEnabled = lockdownEnabled;
+    }
 
     @Override
     public void onStart()
@@ -51,21 +61,21 @@ public class LoginProcess extends FreedomService
     @EventHandler(priority = EventPriority.NORMAL)
     public void onPlayerPreLogin(AsyncPlayerPreLoginEvent event)
     {
-        final String ip = event.getAddress().getHostAddress().trim();
-        final boolean isStaff = plugin.sl.getEntryByIp(ip) != null;
+        final Admin entry = plugin.al.getEntryByUuid(event.getUniqueId());
+        final boolean isAdmin = entry != null && entry.isActive();
 
         // Check if the player is already online
         for (Player onlinePlayer : server.getOnlinePlayers())
         {
-            if (!onlinePlayer.getName().equalsIgnoreCase(event.getName()))
+            if (!onlinePlayer.getUniqueId().equals(event.getUniqueId()))
             {
                 continue;
             }
 
-            if (isStaff)
+            if (isAdmin)
             {
                 event.allow();
-                FSync.playerKick(onlinePlayer, "A staff member just logged in with the username you are using.");
+                FSync.playerKick(onlinePlayer, "An admin just logged in with the username you are using.");
                 return;
             }
 
@@ -79,7 +89,7 @@ public class LoginProcess extends FreedomService
     {
         final Player player = event.getPlayer();
         final String username = player.getName();
-        final String ip = event.getAddress().getHostAddress().trim();
+        final UUID uuid = player.getUniqueId();
 
         // Check username length
         if (username.length() < MIN_USERNAME_LENGTH || username.length() > MAX_USERNAME_LENGTH)
@@ -112,11 +122,9 @@ public class LoginProcess extends FreedomService
             }
         }
 
-        // Check if player is staff
-        final boolean isStaff = plugin.sl.getEntryByIp(ip) != null;
-
         // Validation below this point
-        if (isStaff) // Player is staff
+        final Admin entry = plugin.al.getEntryByUuid(uuid);
+        if (entry != null && entry.isActive()) // Check if player is admin
         {
             // Force-allow log in
             event.allow();
@@ -126,9 +134,9 @@ public class LoginProcess extends FreedomService
             {
                 for (Player onlinePlayer : server.getOnlinePlayers())
                 {
-                    if (!plugin.sl.isStaff(onlinePlayer))
+                    if (!plugin.al.isAdmin(onlinePlayer))
                     {
-                        onlinePlayer.kickPlayer("You have been kicked to free up room for a staff member.");
+                        onlinePlayer.kickPlayer("You have been kicked to free up room for an admin.");
                         count--;
                     }
 
@@ -148,7 +156,7 @@ public class LoginProcess extends FreedomService
             return;
         }
 
-        // Player is not a staff member
+        // Player is not an admin
         // Server full check
         if (server.getOnlinePlayers().size() >= server.getMaxPlayers())
         {
@@ -156,10 +164,10 @@ public class LoginProcess extends FreedomService
             return;
         }
 
-        // Staff-only mode
-        if (ConfigEntry.STAFF_ONLY_MODE.getBoolean())
+        // Admin-only mode
+        if (ConfigEntry.ADMIN_ONLY_MODE.getBoolean())
         {
-            event.disallow(PlayerLoginEvent.Result.KICK_OTHER, "Server is temporarily open to staff only.");
+            event.disallow(PlayerLoginEvent.Result.KICK_OTHER, "Server is temporarily open to admins only.");
             return;
         }
 
@@ -171,13 +179,9 @@ public class LoginProcess extends FreedomService
         }
 
         // Whitelist
-        if (plugin.si.isWhitelisted())
-        {
-            if (!plugin.si.getWhitelisted().contains(username.toLowerCase()))
+        if (server.hasWhitelist() && !player.isWhitelisted())
         {
             event.disallow(PlayerLoginEvent.Result.KICK_OTHER, "You are not whitelisted on this server.");
-                return;
-            }
         }
     }
 
@@ -188,6 +192,22 @@ public class LoginProcess extends FreedomService
         final FPlayer fPlayer = plugin.pl.getPlayer(player);
         final PlayerData playerData = plugin.pl.getData(player);
 
+        // Sends a message to the player if they have never joined before (or simply lack player data).
+        if (!event.getPlayer().hasPlayedBefore() && ConfigEntry.FIRST_JOIN_INFO_ENABLED.getBoolean())
+        {
+            new BukkitRunnable()
+            {
+                @Override
+                public void run()
+                {
+                    for (String line : ConfigEntry.FIRST_JOIN_INFO.getStringList())
+                    {
+                        player.sendMessage(FUtil.colorize(line));
+                    }
+                }
+            }.runTaskLater(plugin, 20);
+        }
+
         player.sendTitle(FUtil.colorize(ConfigEntry.SERVER_LOGIN_TITLE.getString()), FUtil.colorize(ConfigEntry.SERVER_LOGIN_SUBTITLE.getString()), 20, 100, 60);
         player.setOp(true);
 
@@ -197,12 +217,12 @@ 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)))
+        if (!playerData.getIps().contains(FUtil.getIp(player)))
         {
             playerData.addIp(FUtil.getIp(player));
             plugin.pl.save(playerData);
@@ -225,7 +245,7 @@ public class LoginProcess extends FreedomService
             player.setPlayerListFooter(FUtil.colorize(ConfigEntry.SERVER_TABLIST_FOOTER.getString()).replace("\\n", "\n"));
         }
 
-        if (!plugin.sl.isStaff(player))
+        if (!plugin.al.isAdmin(player))
         {
             String tag = playerData.getTag();
             if (tag != null)
@@ -236,18 +256,10 @@ public class LoginProcess extends FreedomService
             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.sl.isStaffImpostor(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.");
             }
         }
 
@@ -256,9 +268,9 @@ public class LoginProcess extends FreedomService
             @Override
             public void run()
             {
-                if (ConfigEntry.STAFF_ONLY_MODE.getBoolean())
+                if (ConfigEntry.ADMIN_ONLY_MODE.getBoolean())
                 {
-                    player.sendMessage(ChatColor.RED + "Server is currently closed to non-staff.");
+                    player.sendMessage(ChatColor.RED + "Server is currently closed to non-admins.");
                 }
 
                 if (lockdownEnabled)

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

@@ -6,8 +6,6 @@ import java.util.Arrays;
 import java.util.HashMap;
 import java.util.List;
 import java.util.Map;
-import lombok.Getter;
-import me.totalfreedom.totalfreedommod.util.FUtil;
 import org.bukkit.Bukkit;
 import org.bukkit.ChatColor;
 import org.bukkit.entity.Player;
@@ -21,7 +19,6 @@ import org.bukkit.potion.PotionEffectType;
 
 public class Monitors extends FreedomService
 {
-    @Getter
     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,
@@ -47,7 +44,7 @@ public class Monitors extends FreedomService
                     }
                 }
 
-                plugin.sl.messageAllStaff(ChatColor.translateAlternateColorCodes('&', String.format("&8[&ePotionSpy&8] &r%s splashed %s %s at X: %s Y: %s Z: %s in the world '%s'%s.",
+                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") : "")));
             }
@@ -142,4 +139,19 @@ public class Monitors extends FreedomService
 
         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,24 +1,17 @@
 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 java.util.Objects;
-import net.minecraft.server.v1_16_R1.NBTTagCompound;
-import net.minecraft.server.v1_16_R1.NBTTagList;
-import org.bukkit.ChatColor;
+import io.papermc.lib.PaperLib;
+
+import net.kyori.adventure.text.Component;
+import net.kyori.adventure.text.format.NamedTextColor;
 import org.bukkit.Location;
-import org.bukkit.Material;
-import org.bukkit.craftbukkit.v1_16_R1.inventory.CraftItemStack;
 import org.bukkit.entity.Player;
 import org.bukkit.event.EventHandler;
 import org.bukkit.event.EventPriority;
-import org.bukkit.event.player.PlayerItemHeldEvent;
 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.spigotmc.event.player.PlayerSpawnLocationEvent;
 
 public class MovementValidator extends FreedomService
 {
@@ -40,65 +33,35 @@ 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 (isOutOfBounds(event.getTo()))
         {
             event.setCancelled(true); // illegal position, cancel it
         }
     }
 
+    private boolean isOutOfBounds(final Location position)
+    {
+        return Math.abs(position.getX()) >= MAX_XYZ_COORD || Math.abs(position.getY()) >= MAX_XYZ_COORD || Math.abs(position.getZ()) >= MAX_XYZ_COORD;
+    }
+
     @EventHandler(priority = EventPriority.HIGH)
     public void onPlayerMove(PlayerMoveEvent event)
     {
         final Player player = event.getPlayer();
         Location from = event.getFrom();
         Location to = event.getTo();
-        if (to.getX() >= from.getX() + MAX_DISTANCE_TRAVELED || to.getY() >= from.getY() + MAX_DISTANCE_TRAVELED || to.getZ() >= from.getZ() + MAX_DISTANCE_TRAVELED)
+        double distance = from.distanceSquared(to);
+
+        if (distance >= MAX_DISTANCE_TRAVELED)
         {
             event.setCancelled(true);
-            player.kickPlayer(ChatColor.RED + "You were moving too quickly!");
+            player.kick(Component.text("You were moving too quickly!", NamedTextColor.RED));
         }
         // 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 (isOutOfBounds(event.getTo()))
         {
             event.setCancelled(true);
-            player.teleport(player.getWorld().getSpawnLocation());
-        }
-
-        if (exploitItem(event.getPlayer().getInventory().getHelmet()))
-        {
-            event.getPlayer().getInventory().setHelmet(new ItemStack(Material.AIR));
-            event.getPlayer().sendMessage(ChatColor.RED + "An item with both negative infinity and positive infinity attributes was cleared from your helmet slot.");
-            event.setCancelled(true);
-        }
-        if (exploitItem(event.getPlayer().getInventory().getBoots()))
-        {
-            event.getPlayer().getInventory().setBoots(new ItemStack(Material.AIR));
-            event.getPlayer().sendMessage(ChatColor.RED + "An item with both negative infinity and positive infinity attributes was cleared from your boots slot.");
-            event.setCancelled(true);
-        }
-        if (exploitItem(event.getPlayer().getInventory().getLeggings()))
-        {
-            event.getPlayer().getInventory().setLeggings(new ItemStack(Material.AIR));
-            event.getPlayer().sendMessage(ChatColor.RED + "An item with both negative infinity and positive infinity attributes was cleared from your leggings slot.");
-            event.setCancelled(true);
-        }
-        if (exploitItem(event.getPlayer().getInventory().getChestplate()))
-        {
-            event.getPlayer().getInventory().setChestplate(new ItemStack(Material.AIR));
-            event.getPlayer().sendMessage(ChatColor.RED + "An item with both negative infinity and positive infinity attributes was cleared from your chestplate slot.");
-            event.setCancelled(true);
-        }
-        if (exploitItem(event.getPlayer().getInventory().getItemInMainHand()))
-        {
-            event.getPlayer().getInventory().setItemInMainHand(new ItemStack(Material.AIR));
-            event.getPlayer().sendMessage(ChatColor.RED + "An item with both negative infinity and positive infinity attributes was cleared from your hand.");
-            event.setCancelled(true);
-        }
-        if (exploitItem(event.getPlayer().getInventory().getItemInOffHand()))
-        {
-            event.getPlayer().getInventory().setItemInOffHand(new ItemStack(Material.AIR));
-            event.getPlayer().sendMessage(ChatColor.RED + "An item with both negative infinity and positive infinity attributes was cleared from your offhand.");
-            event.setCancelled(true);
+            PaperLib.teleportAsync(player, player.getWorld().getSpawnLocation());
         }
     }
 
@@ -108,79 +71,28 @@ public class MovementValidator extends FreedomService
         final Player player = event.getPlayer();
 
         // 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)
+        if (isOutOfBounds(player.getLocation()))
         {
-            player.teleport(player.getWorld().getSpawnLocation()); // Illegal position, teleport to spawn
+            PaperLib.teleportAsync(player, player.getWorld().getSpawnLocation()); // Illegal position, teleport to spawn
         }
     }
 
-    @EventHandler
-    public void onPlayerHoldItem(PlayerItemHeldEvent event)
+    @EventHandler(priority = EventPriority.HIGH)
+    public void onPlayerSpawn(PlayerSpawnLocationEvent event)
     {
-        if (exploitItem(event.getPlayer().getInventory().getItemInMainHand()))
+        final Location playerSpawn = event.getSpawnLocation();
+        final Location worldSpawn = event.getPlayer().getWorld().getSpawnLocation();
+
+        // If the player's spawn is equal to the world's spawn, there is no need to check.
+        // This will also prevent any possible feedback loops pertaining to setting an out of bounds world spawn to the same world spawn.
+        if (playerSpawn == worldSpawn)
         {
-            event.getPlayer().getInventory().setItemInMainHand(new ItemStack(Material.AIR));
-            event.getPlayer().sendMessage(ChatColor.RED + "An item with both negative infinity and positive infinity attributes was cleared from your hand.");
-        }
-        if (exploitItem(event.getPlayer().getInventory().getItemInOffHand()))
-        {
-            event.getPlayer().getInventory().setItemInOffHand(new ItemStack(Material.AIR));
-            event.getPlayer().sendMessage(ChatColor.RED + "An item with both negative infinity and positive infinity attributes was cleared from your offhand.");
-        }
+            return;
         }
 
-    private Boolean exploitItem(ItemStack item)
+        if (isOutOfBounds(worldSpawn))
         {
-        net.minecraft.server.v1_16_R1.ItemStack nmsStack = CraftItemStack.asNMSCopy(item);
-        NBTTagList modifiers = getAttributeList(nmsStack);
-        MojangsonCompound compound = new MojangsonCompound();
-        boolean foundNegative = false;
-        boolean foundPositive = false;
-        try
-        {
-            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;
+            event.setSpawnLocation(worldSpawn);
         }
     }
 }
-            }
-        }
-        catch (MojangsonParseException e)
-        {
-            e.printStackTrace();
-        }
-        return foundNegative && foundPositive;
-    }
-
-
-    private NBTTagList getAttributeList(net.minecraft.server.v1_16_R1.ItemStack stack)
-    {
-        if (stack.getTag() == null)
-        {
-            stack.setTag(new NBTTagCompound());
-        }
-        NBTTagList attr = stack.getTag().getList("AttributeModifiers", 10);
-        if (attr == null)
-        {
-            stack.getTag().set("AttributeModifiers", new NBTTagList());
-        }
-        return stack.getTag().getList("AttributeModifiers", 10);
-    }
-}
-
-

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

@@ -1,28 +1,19 @@
 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 net.kyori.adventure.text.Component;
+import net.kyori.adventure.text.format.NamedTextColor;
 import org.bukkit.ChatColor;
 import org.bukkit.command.Command;
 import org.bukkit.entity.Player;
 import org.bukkit.event.EventHandler;
 import org.bukkit.event.EventPriority;
-import org.bukkit.event.player.AsyncPlayerChatEvent;
 import org.bukkit.event.player.PlayerCommandPreprocessEvent;
-import org.bukkit.event.player.PlayerJoinEvent;
 
 public class Muter extends FreedomService
 {
-
-    public static final List<String> MUTE_COMMANDS = Arrays.asList(StringUtils.split("say,me,msg,tell,reply,mail", ","));
-    public final List<String> MUTED_PLAYERS = new ArrayList<>();
-
     @Override
     public void onStart()
     {
@@ -33,27 +24,23 @@ public class Muter extends FreedomService
     {
     }
 
-    @EventHandler(priority = EventPriority.HIGHEST)
-    public void onAsyncPlayerChatEvent(AsyncPlayerChatEvent event)
+    public boolean onPlayerChat(Player player)
     {
-        Player player = event.getPlayer();
-
         FPlayer fPlayer = plugin.pl.getPlayerSync(player);
 
         if (!fPlayer.isMuted())
         {
-            return;
+            return false;
         }
 
-        if (plugin.sl.isStaffSync(player))
+        if (plugin.al.isAdminSync(player))
         {
             fPlayer.setMuted(false);
-            MUTED_PLAYERS.remove(player.getName());
-            return;
+            return false;
         }
 
-        FSync.playerMsg(event.getPlayer(), ChatColor.RED + "You are muted.");
-        event.setCancelled(true);
+        player.sendMessage(Component.text("You are muted.", NamedTextColor.RED));
+        return true;
     }
 
     @EventHandler(priority = EventPriority.LOW)
@@ -70,7 +57,7 @@ public class Muter extends FreedomService
         }
 
         String message = event.getMessage();
-        if (plugin.sl.isStaff(player))
+        if (plugin.al.isAdmin(player))
         {
             fPlayer.setMuted(false);
             return;
@@ -88,9 +75,9 @@ public class Muter extends FreedomService
             cmdName = command.getName().toLowerCase();
         }
 
-        if (MUTE_COMMANDS.contains(cmdName))
+        if (ConfigEntry.MUTED_BLOCKED_COMMANDS.getStringList().contains(cmdName))
         {
-            player.sendMessage(ChatColor.RED + "That command is blocked while you are muted.");
+            player.sendMessage(Component.text("That command is blocked while you are muted.", NamedTextColor.RED));
             event.setCancelled(true);
             return;
         }
@@ -101,18 +88,4 @@ public class Muter extends FreedomService
             FLog.info(String.format("[PREPROCESS_COMMAND] %s(%s): %s", player.getName(), ChatColor.stripColor(player.getDisplayName()), message), true);
         }
     }
-
-    @EventHandler(priority = EventPriority.LOW)
-    public void onPlayerJoin(PlayerJoinEvent event)
-    {
-        Player player = event.getPlayer();
-        FPlayer playerdata = plugin.pl.getPlayer(player);
-
-        if (MUTED_PLAYERS.contains(player.getName()))
-        {
-            playerdata.setMuted(true);
-        }
-    }
-
-
 }

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

@@ -1,223 +0,0 @@
-package me.totalfreedom.totalfreedommod;
-
-import com.google.common.base.Strings;
-import java.util.Arrays;
-import java.util.HashMap;
-import java.util.List;
-import java.util.Map;
-import me.totalfreedom.totalfreedommod.config.ConfigEntry;
-import me.totalfreedom.totalfreedommod.player.PlayerData;
-import me.totalfreedom.totalfreedommod.rank.Displayable;
-import me.totalfreedom.totalfreedommod.rank.Rank;
-import me.totalfreedom.totalfreedommod.rank.Title;
-import me.totalfreedom.totalfreedommod.util.FLog;
-import me.totalfreedom.totalfreedommod.util.FUtil;
-import net.dean.jraw.ApiException;
-import net.dean.jraw.RedditClient;
-import net.dean.jraw.http.OkHttpNetworkAdapter;
-import net.dean.jraw.http.UserAgent;
-import net.dean.jraw.models.CurrentFlair;
-import net.dean.jraw.models.Flair;
-import net.dean.jraw.oauth.Credentials;
-import net.dean.jraw.oauth.OAuthHelper;
-import net.dean.jraw.references.SubredditReference;
-import org.bukkit.entity.Player;
-
-public class Reddit extends FreedomService
-{
-    private final String SUBREDDIT_NAME = ConfigEntry.REDDIT_SUBREDDIT_NAME.getString();
-    private final String USERNAME = ConfigEntry.REDDIT_USERNAME.getString();
-    private final String PASSWORD = ConfigEntry.REDDIT_PASSWORD.getString();
-    private final String CLIENT_ID = ConfigEntry.REDDIT_CLIENT_ID.getString();
-    private final String CLIENT_SECRET = ConfigEntry.REDDIT_CLIENT_SECRET.getString();
-
-    private final UserAgent userAgent = new UserAgent("bot", "me.totalfreedom.reddit", plugin.build.version, USERNAME);
-    private final Credentials credentials = Credentials.script(USERNAME, PASSWORD, CLIENT_ID, CLIENT_SECRET);
-
-    private RedditClient reddit = null;
-    private SubredditReference subreddit = null;
-
-    private HashMap<String, PlayerData> linkCodes = new HashMap<>();
-    private HashMap<PlayerData, String> pending = new HashMap<>();
-
-    private Map<Displayable, String> flairList = new HashMap<>();
-
-    private Map<Displayable, String> flairNameList = new HashMap<>();
-
-    private List<Displayable> noFlairDisplays = Arrays.asList(Title.VERIFIED_STAFF, Rank.IMPOSTOR, Rank.NON_OP, Rank.OP);
-
-    public boolean enabled = false;
-
-    @Override
-    public void onStart()
-    {
-        enabled = ConfigEntry.REDDIT_CLIENT_ID.getString() == null;
-        if (!enabled)
-        {
-            return;
-        }
-
-        if (reddit == null)
-        {
-            try
-            {
-                reddit = OAuthHelper.automatic(new OkHttpNetworkAdapter(userAgent), credentials);
-                reddit.setLogHttp(FUtil.inDeveloperMode());
-            }
-            catch (NoClassDefFoundError e)
-            {
-                FLog.warning("The JRAW plugin is not installed, therefore the Reddit service cannot start.");
-                FLog.warning("To resolve this error, please download the latest JRAW from: https://github.com/TFPatches/Minecraft-JRAW/releases");
-                enabled = false;
-                return;
-            }
-            catch (NullPointerException e)
-            {
-                FLog.warning("Invalid Reddit credentials specified, please double check everything in the config.");
-                enabled = false;
-                return;
-            }
-        }
-
-        if (subreddit == null)
-        {
-            subreddit = reddit.subreddit(SUBREDDIT_NAME);
-        }
-
-        loadFlairList();
-    }
-
-    @Override
-    public void onStop()
-    {
-    }
-
-    public void setFlair(String username, String flairID)
-    {
-        List<Flair> flairs = subreddit.userFlairOptions();
-        Flair flair = null;
-        for (Flair f : flairs)
-        {
-            if (f.getId().equals(flairID))
-            {
-                flair = f;
-                break;
-            }
-        }
-
-        if (flair == null)
-        {
-            return;
-        }
-
-        subreddit.otherUserFlair(username).updateToTemplate(flair.getId(), "");
-    }
-
-    public void removeFlair(String username)
-    {
-        subreddit.otherUserFlair(username).updateToTemplate("", "");
-    }
-
-    public void sendModMessage(String username, String subject, String body) throws ApiException
-    {
-        reddit.me().inbox().compose("/r/" + SUBREDDIT_NAME, username, subject, body);
-    }
-
-    public String addLinkCode(PlayerData data, String username)
-    {
-        String code = FUtil.randomAlphanumericString(10);
-        linkCodes.put(code, data);
-        pending.put(data, username);
-        return code;
-    }
-
-    public String checkLinkCode(String code)
-    {
-        PlayerData data = linkCodes.get(code);
-        String username = pending.get(data);
-        if (data == null || username == null)
-        {
-            return null;
-        }
-
-        linkCodes.remove(code);
-        pending.remove(data);
-
-        data.setRedditUsername(username);
-        plugin.pl.save(data);
-
-        return username;
-    }
-
-    public boolean updateFlair(Player player)
-    {
-        if (!enabled)
-        {
-            return false;
-        }
-
-        PlayerData data = plugin.pl.getData(player);
-        String username = data.getRedditUsername();
-        Displayable display = plugin.rm.getDisplay(player);
-        if (username == null)
-        {
-            FLog.debug("No Reddit account");
-            return false;
-        }
-
-        CurrentFlair currentFlair = subreddit.otherUserFlair(username).current();
-        String currentFlairName = currentFlair.getText();
-        String currentFlairID = currentFlair.getId();
-        String neededFlairID = flairList.get(display);
-        String neededFlairName = flairNameList.get(display);
-
-        FLog.debug("Current ID: " + currentFlairID);
-        FLog.debug("Needed ID: " + neededFlairID);
-
-        FLog.debug("Current Name: " + currentFlairName);
-        FLog.debug("Needed Name: " + neededFlairName);
-
-
-        // Work around
-        //if (currentFlairID == null && neededFlairID != null || currentFlairID != null && neededFlairID != null && !currentFlairID.equals(neededFlairID))
-        if (Strings.isNullOrEmpty(currentFlairName) && neededFlairName != null || !Strings.isNullOrEmpty(currentFlairName) && neededFlairName != null && !currentFlairName.equals(neededFlairName))
-        {
-            FLog.debug("Setting flair");
-            setFlair(username, neededFlairID);
-            return true;
-        }
-
-        if (noFlairDisplays.contains(display) && !Strings.isNullOrEmpty(currentFlairName))
-        {
-            FLog.debug("Removing flair");
-            removeFlair(username);
-            return true;
-        }
-
-        return false;
-    }
-
-    public void loadFlairList()
-    {
-        flairList.put(Title.OWNER, ConfigEntry.REDDIT_SERVER_OWNER_FLAIR_ID.getString());
-        flairList.put(Title.EXECUTIVE, ConfigEntry.REDDIT_EXECUTIVE_FLAIR_ID.getString());
-        flairList.put(Title.ASSISTANT_EXECUTIVE, ConfigEntry.REDDIT_ASSISTANT_EXECUTIVE_FLAIR_ID.getString());
-        flairList.put(Title.DEVELOPER, ConfigEntry.REDDIT_DEVELOPER_FLAIR_ID.getString());
-        flairList.put(Rank.ADMIN, ConfigEntry.REDDIT_ADMIN_FLAIR_ID.getString());
-        flairList.put(Rank.MOD, ConfigEntry.REDDIT_MOD_FLAIR_ID.getString());
-        flairList.put(Rank.TRIAL_MOD, ConfigEntry.REDDIT_TRIAL_MOD_FLAIR_ID.getString());
-        flairList.put(Title.MASTER_BUILDER, ConfigEntry.REDDIT_MASTER_BUILDER_FLAIR_ID.getString());
-        flairList.put(Title.DONATOR, ConfigEntry.REDDIT_DONATOR_FLAIR_ID.getString());
-
-        // Work around because the current flair id keeps returning null, either a JRAW bug or a reddit bug
-        flairNameList.put(Title.OWNER, "Server Owner");
-        flairNameList.put(Title.EXECUTIVE, "Executive");
-        flairNameList.put(Title.ASSISTANT_EXECUTIVE, "Assistant Executive");
-        flairNameList.put(Title.DEVELOPER, "Developer");
-        flairNameList.put(Rank.ADMIN, "Admin");
-        flairNameList.put(Rank.MOD, "Mod");
-        flairNameList.put(Rank.TRIAL_MOD, "Trial Mod");
-        flairNameList.put(Title.MASTER_BUILDER, "Master Builder");
-        flairNameList.put(Title.DONATOR, "Premium");
-    }
-}

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

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

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

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

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

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

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

@@ -1,34 +0,0 @@
-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

@@ -3,6 +3,8 @@ package me.totalfreedom.totalfreedommod;
 import java.io.File;
 import java.io.InputStream;
 import java.util.Properties;
+import me.totalfreedom.totalfreedommod.admin.ActivityLog;
+import me.totalfreedom.totalfreedommod.admin.AdminList;
 import me.totalfreedom.totalfreedommod.banning.BanManager;
 import me.totalfreedom.totalfreedommod.banning.IndefiniteBanList;
 import me.totalfreedom.totalfreedommod.blocking.BlockBlocker;
@@ -12,14 +14,11 @@ import me.totalfreedom.totalfreedommod.blocking.InteractBlocker;
 import me.totalfreedom.totalfreedommod.blocking.MobBlocker;
 import me.totalfreedom.totalfreedommod.blocking.PVPBlocker;
 import me.totalfreedom.totalfreedommod.blocking.PotionBlocker;
-import me.totalfreedom.totalfreedommod.blocking.SignBlocker;
 import me.totalfreedom.totalfreedommod.blocking.command.CommandBlocker;
 import me.totalfreedom.totalfreedommod.bridge.BukkitTelnetBridge;
 import me.totalfreedom.totalfreedommod.bridge.CoreProtectBridge;
 import me.totalfreedom.totalfreedommod.bridge.EssentialsBridge;
-import me.totalfreedom.totalfreedommod.bridge.FAWEBridge;
 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,7 +26,6 @@ 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;
@@ -42,36 +40,28 @@ 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.staff.ActivityLog;
-import me.totalfreedom.totalfreedommod.staff.StaffList;
 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 me.totalfreedom.totalfreedommod.world.WorldRestrictions;
-import org.bstats.Metrics;
+import org.bstats.bukkit.Metrics;
 import org.bukkit.Bukkit;
 import org.bukkit.generator.ChunkGenerator;
 import org.bukkit.plugin.Plugin;
 import org.bukkit.plugin.java.JavaPlugin;
-import org.spigotmc.SpigotConfig;
+import org.jetbrains.annotations.NotNull;
 
 public class TotalFreedomMod extends JavaPlugin
 {
-    private static TotalFreedomMod plugin;
-
-    public static TotalFreedomMod getPlugin()
-    {
-        return plugin;
-    }
-
     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;
@@ -81,11 +71,8 @@ public class TotalFreedomMod extends JavaPlugin
     // Command Loader
     public CommandLoader cl;
     // Services
-    public ServerInterface si;
-    public SavedFlags sf;
     public WorldManager wm;
-    public LogViewer lv;
-    public StaffList sl;
+    public AdminList al;
     public ActivityLog acl;
     public RankManager rm;
     public CommandBlocker cb;
@@ -108,7 +95,6 @@ public class TotalFreedomMod extends JavaPlugin
     public BanManager bm;
     public IndefiniteBanList im;
     public PermissionManager pem;
-    public Reddit rd;
     public GameRuleHandler gr;
     public CommandSpy cs;
     public Cager ca;
@@ -123,7 +109,6 @@ public class TotalFreedomMod extends JavaPlugin
     public Monitors mo;
     public MovementValidator mv;
     public ServerPing sp;
-    public CurseListener cul;
     public ItemFun it;
     public Landminer lm;
     public MP44 mp;
@@ -131,24 +116,34 @@ public class TotalFreedomMod extends JavaPlugin
     public Trailer tr;
     public HTTPDaemon hd;
     public WorldRestrictions wr;
-    public SignBlocker snp;
     public EntityWiper ew;
-    public Sitter st;
     public VanishHandler vh;
-    public AMP amp;
-
-    //public HubWorldRestrictions hwr;
     //
     // Bridges
     public BukkitTelnetBridge btb;
     public EssentialsBridge esb;
     public LibsDisguisesBridge ldb;
     public CoreProtectBridge cpb;
-    public TFGuildsBridge tfg;
     public WorldEditBridge web;
-    public FAWEBridge fab;
     public WorldGuardBridge wgb;
 
+    public static TotalFreedomMod getPlugin()
+    {
+        return plugin;
+    }
+
+    public static TotalFreedomMod plugin()
+    {
+        for (Plugin plugin : Bukkit.getPluginManager().getPlugins())
+        {
+            if (plugin.getName().equalsIgnoreCase(pluginName))
+            {
+                return (TotalFreedomMod)plugin;
+            }
+        }
+        return null;
+    }
+
     @Override
     public void onLoad()
     {
@@ -172,9 +167,6 @@ public class TotalFreedomMod extends JavaPlugin
         final MethodTimer timer = new MethodTimer();
         timer.start();
 
-        // Warn if we're running on a wrong version
-        ServerInterface.warnVersion();
-
         // Delete unused files
         FUtil.deleteCoreDumps();
         FUtil.deleteFolder(new File("./_deleteme"));
@@ -182,7 +174,6 @@ public class TotalFreedomMod extends JavaPlugin
         fsh = new FreedomServiceHandler();
 
         config = new MainConfig();
-        config.load();
 
         if (FUtil.inDeveloperMode())
         {
@@ -195,94 +186,23 @@ public class TotalFreedomMod extends JavaPlugin
         BackupManager backups = new BackupManager();
         backups.createAllBackups();
 
-        permissions = new PermissionConfig(this);
+        permissions = new PermissionConfig();
         permissions.load();
 
-        // Start services
-        si = new ServerInterface();
-        sf = new SavedFlags();
-        wm = new WorldManager();
-        lv = new LogViewer();
-        sql = new SQLite();
-        sl = new StaffList();
-        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();
-        rd = new Reddit();
-        gr = new GameRuleHandler();
-        snp = new SignBlocker();
-        ew = new EntityWiper();
-        st = new Sitter();
-        vh = new VanishHandler();
-        amp = new AMP();
-
-        // 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();
-
         mv = new MovementValidator();
         sp = new ServerPing();
 
-        // Fun
-        cul = new CurseListener();
-        it = new ItemFun();
-        lm = new Landminer();
-        mp = new MP44();
-        jp = new Jumppads();
-        tr = new Trailer();
-        // HTTPD
-        hd = new HTTPDaemon();
-
-        // Start bridges
-        btb = new BukkitTelnetBridge();
-        cpb = new CoreProtectBridge();
-        esb = new EssentialsBridge();
-        ldb = new LibsDisguisesBridge();
-        tfg = new TFGuildsBridge();
-        web = new WorldEditBridge();
-        fab = new FAWEBridge();
-        wgb = new WorldGuardBridge();
+        new Initializer();
 
         fsh.startServices();
 
         FLog.info("Started " + fsh.getServiceAmount() + " services.");
 
         timer.update();
-        FLog.info("Version " + pluginVersion + " for " + ServerInterface.COMPILE_NMS_VERSION + " enabled in " + timer.getTotal() + "ms");
+        FLog.info("Version " + pluginVersion + " enabled in " + timer.getTotal() + "ms");
 
         // Metrics @ https://bstats.org/plugin/bukkit/TotalFreedomMod/2966
         new Metrics(this, 2966);
-
-        // little workaround to stop spigot from autorestarting - causing AMP to detach from process.
-        SpigotConfig.config.set("settings.restart-on-crash", false);
     }
 
     @Override
@@ -296,6 +216,12 @@ public class TotalFreedomMod extends JavaPlugin
         FLog.info("Plugin disabled");
     }
 
+    @Override
+    public ChunkGenerator getDefaultWorldGenerator(@NotNull String worldName, String id)
+    {
+        return new CleanroomChunkGenerator(id);
+    }
+
     public static class BuildProperties
     {
         public String author;
@@ -338,21 +264,94 @@ public class TotalFreedomMod extends JavaPlugin
         }
     }
 
-    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
+            wm = new WorldManager();
+            sql = new SQLite();
+            al = new AdminList();
+            acl = new ActivityLog();
+            rm = new RankManager();
+            cb = new CommandBlocker();
+            eb = new EventBlocker();
+            bb = new BlockBlocker();
+            mb = new MobBlocker();
+            ib = new InteractBlocker();
+            pb = new PotionBlocker();
+            lp = new LoginProcess();
+            nu = new AntiNuke();
+            as = new AntiSpam();
+            wr = new WorldRestrictions();
+            pl = new PlayerList();
+            sh = new Shop();
+            vo = new Votifier();
+            an = new Announcer();
+            cm = new ChatManager();
+            dc = new Discord();
+            pul = new PunishmentList();
+            bm = new BanManager();
+            im = new IndefiniteBanList();
+            pem = new PermissionManager();
+            gr = new GameRuleHandler();
+            ew = new EntityWiper();
+            vh = new VanishHandler();
+        }
+
+        private void initAdminUtils()
+        {
+            // Single admin utils
+            cs = new CommandSpy();
+            ca = new Cager();
+            fm = new Freezer();
+            or = new Orbiter();
+            mu = new Muter();
+            ebl = new EditBlocker();
+            pbl = new PVPBlocker();
+            fo = new Fuckoff();
+            ak = new AutoKick();
+            ae = new AutoEject();
+            mo = new Monitors();
+        }
+
+        private void initBridges()
+        {
+            // Start bridges
+            btb = new BukkitTelnetBridge();
+            cpb = new CoreProtectBridge();
+            esb = new EssentialsBridge();
+            ldb = new LibsDisguisesBridge();
+            web = new WorldEditBridge();
+            wgb = new WorldGuardBridge();
+        }
+
+        private void initFun()
+        {
+            // Fun
+            it = new ItemFun();
+            lm = new Landminer();
+            mp = new MP44();
+            jp = new Jumppads();
+            tr = new Trailer();
+        }
+
+        private void initHTTPD()
+        {
+            // HTTPD
+            hd = new HTTPDaemon();
+        }
     }
 }

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

@@ -1,6 +1,8 @@
 package me.totalfreedom.totalfreedommod;
 
 import me.totalfreedom.totalfreedommod.util.FLog;
+import net.kyori.adventure.text.Component;
+import net.kyori.adventure.text.format.NamedTextColor;
 import net.md_5.bungee.api.ChatMessageType;
 import net.md_5.bungee.api.chat.TextComponent;
 import org.bukkit.ChatColor;
@@ -13,7 +15,6 @@ import org.bukkit.scheduler.BukkitRunnable;
 
 public class VanishHandler extends FreedomService
 {
-
     @Override
     public void onStart()
     {
@@ -29,40 +30,32 @@ public class VanishHandler extends FreedomService
     {
         Player player = event.getPlayer();
 
-        for (Player p : server.getOnlinePlayers())
-        {
-            if (!plugin.sl.isStaff(player) && plugin.sl.isVanished(p.getName()))
-            {
-                player.hidePlayer(plugin, p);
-            }
-        }
+        server.getOnlinePlayers().stream().filter(pl -> !plugin.al.isAdmin(player)
+                && plugin.al.isVanished(pl.getUniqueId())).forEach(pl -> player.hidePlayer(plugin, pl));
 
-        for (Player p : server.getOnlinePlayers())
-        {
-            if (!plugin.sl.isStaff(p) && plugin.sl.isVanished(player.getName()))
-            {
-                p.hidePlayer(plugin, player);
-            }
-        }
+        server.getOnlinePlayers().stream().filter(pl -> !plugin.al.isAdmin(pl)
+                && plugin.al.isVanished(player.getUniqueId())).forEach(pl -> pl.hidePlayer(plugin, player));
 
-        if (plugin.sl.isVanished(player.getName()))
+        if (plugin.al.isVanished(player.getUniqueId()))
         {
             plugin.esb.setVanished(player.getName(), true);
             FLog.info(player.getName() + " joined while still vanished.");
-            plugin.sl.messageAllStaff(ChatColor.YELLOW + player.getName() + " has joined silently.");
-            event.setJoinMessage(null);
+            plugin.al.messageAllAdmins(ChatColor.YELLOW + player.getName() + " has joined silently.");
+            event.joinMessage(null);
 
             new BukkitRunnable()
             {
                 @Override
                 public void run()
                 {
-                    if (!plugin.sl.isVanished(player.getName()))
+                    if (plugin.al.isVanished(player.getUniqueId()))
+                    {
+                        player.sendActionBar(Component.text("You are hidden from other players.").color(NamedTextColor.GOLD));
+                    }
+                    else
                     {
                         this.cancel();
                     }
-
-                    player.spigot().sendMessage(ChatMessageType.ACTION_BAR, TextComponent.fromLegacyText(ChatColor.GOLD + "You are hidden from other players."));
                 }
             }.runTaskTimer(plugin, 0L, 4L);
         }
@@ -73,11 +66,11 @@ public class VanishHandler extends FreedomService
     {
         Player player = event.getPlayer();
 
-        if (plugin.sl.isVanished(player.getName()))
+        if (plugin.al.isVanished(player.getUniqueId()))
         {
-            event.setQuitMessage(null);
+            event.quitMessage(null);
             FLog.info(player.getName() + " left while still vanished.");
-            plugin.sl.messageAllStaff(ChatColor.YELLOW + player.getName() + " has left silently.");
+            plugin.al.messageAllAdmins(ChatColor.YELLOW + player.getName() + " has left silently.");
         }
     }
 }

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

@@ -1,8 +1,7 @@
-package me.totalfreedom.totalfreedommod.staff;
+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.config.YamlConfig;
 import me.totalfreedom.totalfreedommod.util.FLog;
@@ -20,7 +19,6 @@ 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();
@@ -32,6 +30,11 @@ public class ActivityLog extends FreedomService
         this.config = new YamlConfig(plugin, FILENAME, true);
     }
 
+    public static String getFILENAME()
+    {
+        return FILENAME;
+    }
+
     @Override
     public void onStart()
     {
@@ -56,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;
             }
 
@@ -167,7 +170,7 @@ public class ActivityLog extends FreedomService
     public void onPlayerJoin(PlayerJoinEvent event)
     {
         Player player = event.getPlayer();
-        if (plugin.sl.isStaff(player))
+        if (plugin.al.isAdmin(player))
         {
             getActivityLog(event.getPlayer()).addLogin();
             plugin.acl.save();
@@ -179,11 +182,31 @@ public class ActivityLog extends FreedomService
     public void onPlayerQuit(PlayerQuitEvent event)
     {
         Player player = event.getPlayer();
-        if (plugin.sl.isStaff(player))
+        if (plugin.al.isAdmin(player))
         {
             getActivityLog(event.getPlayer()).addLogout();
             plugin.acl.save();
             plugin.acl.updateTables();
         }
     }
+
+    public Map<String, ActivityLogEntry> getAllActivityLogs()
+    {
+        return allActivityLogs;
+    }
+
+    public Map<String, ActivityLogEntry> getNameTable()
+    {
+        return nameTable;
+    }
+
+    public Map<String, ActivityLogEntry> getIpTable()
+    {
+        return ipTable;
+    }
+
+    public YamlConfig getConfig()
+    {
+        return config;
+    }
 }

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

@@ -1,11 +1,9 @@
-package me.totalfreedom.totalfreedommod.staff;
+package me.totalfreedom.totalfreedommod.admin;
 
 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 org.apache.commons.lang.Validate;
@@ -15,21 +13,12 @@ import org.bukkit.entity.Player;
 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)
     {
@@ -42,6 +31,11 @@ public class ActivityLogEntry implements IConfig
         this.configKey = configKey;
     }
 
+    public static String getFILENAME()
+    {
+        return FILENAME;
+    }
+
     public void loadFrom(Player player)
     {
         configKey = player.getName().toLowerCase();
@@ -72,12 +66,26 @@ public class ActivityLogEntry implements IConfig
 
     public void addLogin()
     {
-        Date currentTime = Date.from(Instant.now());
-        timestamps.add("Login: " + FUtil.dateToString(currentTime));
+        this.addLogin(System.currentTimeMillis());
     }
+
+    public void addLogin(final long timestamp)
+    {
+        Date time = Date.from(Instant.ofEpochMilli(timestamp));
+        timestamps.add("Login: " + FUtil.dateToString(time));
+    }
+
     public void addLogout()
     {
-        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: ", "");
@@ -107,12 +115,9 @@ public class ActivityLogEntry implements IConfig
     }
 
     public void removeIp(String ip)
-    {
-        if (ips.contains(ip))
     {
         ips.remove(ip);
     }
-    }
 
     public void clearIPs()
     {
@@ -138,4 +143,39 @@ public class ActivityLogEntry implements IConfig
         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,79 +1,53 @@
-package me.totalfreedom.totalfreedommod.staff;
+package me.totalfreedom.totalfreedommod.admin;
 
 import java.sql.ResultSet;
 import java.sql.SQLException;
-import java.util.ArrayList;
-import java.util.Date;
-import java.util.HashMap;
-import java.util.List;
-import java.util.Map;
-import lombok.Getter;
-import lombok.Setter;
-import me.totalfreedom.totalfreedommod.LogViewer.LogsRegistrationMode;
+import java.util.*;
+
 import me.totalfreedom.totalfreedommod.TotalFreedomMod;
+import me.totalfreedom.totalfreedommod.player.FPlayer;
 import me.totalfreedom.totalfreedommod.rank.Rank;
 import me.totalfreedom.totalfreedommod.util.FLog;
 import me.totalfreedom.totalfreedommod.util.FUtil;
 import org.apache.commons.lang.StringUtils;
+import org.bukkit.Bukkit;
+import org.bukkit.Server;
 import org.bukkit.entity.Player;
 
-public class StaffMember
+public class Admin
 {
-
-    @Getter
-    @Setter
-    private String name;
-    @Getter
-    private boolean active = true;
-    @Getter
-    @Setter
-    private Rank rank = Rank.TRIAL_MOD;
-    @Getter
     private final List<String> ips = new ArrayList<>();
-    @Getter
-    @Setter
+    private UUID uuid;
+    private boolean active = true;
+    private Rank rank = Rank.ADMIN;
     private Date lastLogin = new Date();
-    @Getter
-    @Setter
-    private String loginMessage = null;
-    @Getter
-    @Setter
     private Boolean commandSpy = false;
-    @Getter
-    @Setter
     private Boolean potionSpy = false;
-    @Getter
-    @Setter
     private String acFormat = null;
-    @Getter
-    @Setter
-    private String ampUsername = null;
 
-    public StaffMember(Player player)
+    public Admin(Player player)
     {
-        this.name = player.getName();
+        uuid = player.getUniqueId();
         this.ips.add(FUtil.getIp(player));
     }
 
-    public StaffMember(ResultSet resultSet)
+    public Admin(ResultSet resultSet)
     {
         try
         {
-            this.name = resultSet.getString("username");
+            this.uuid = UUID.fromString(resultSet.getString("uuid"));
             this.active = resultSet.getBoolean("active");
             this.rank = Rank.findRank(resultSet.getString("rank"));
             this.ips.clear();
             this.ips.addAll(FUtil.stringToList(resultSet.getString("ips")));
             this.lastLogin = new Date(resultSet.getLong("last_login"));
-            this.loginMessage = resultSet.getString("login_message");
             this.commandSpy = resultSet.getBoolean("command_spy");
             this.potionSpy = resultSet.getBoolean("potion_spy");
             this.acFormat = resultSet.getString("ac_format");
-            this.ampUsername = resultSet.getString("amp_username");
         }
         catch (SQLException e)
         {
-            FLog.severe("Failed to load staff: " + e.getMessage());
+            FLog.severe("Failed to load admin: " + e.getMessage());
         }
     }
 
@@ -82,15 +56,13 @@ public class StaffMember
     {
         final StringBuilder output = new StringBuilder();
 
-        output.append("Staff: ").append(name).append("\n")
+        output.append("Admin: ").append(getName() != null ? getName() : getUuid().toString()).append("\n")
                 .append("- IPs: ").append(StringUtils.join(ips, ", ")).append("\n")
                 .append("- Last Login: ").append(FUtil.dateToString(lastLogin)).append("\n")
-                .append("- Custom Login Message: ").append(loginMessage).append("\n")
                 .append("- Rank: ").append(rank.getName()).append("\n")
                 .append("- Is Active: ").append(active).append("\n")
                 .append("- Potion Spy: ").append(potionSpy).append("\n")
-                .append("- Admin Chat Format: ").append(acFormat).append("\n")
-                .append("- AMP Username: ").append(ampUsername).append("\n");
+                .append("- Admin Chat Format: ").append(acFormat).append("\n");
 
         return output.toString();
     }
@@ -99,25 +71,18 @@ public class StaffMember
     {
         Map<String, Object> map = new HashMap<String, Object>()
         {{
-            put("username", name);
+            put("uuid", uuid.toString());
             put("active", active);
             put("rank", rank.toString());
             put("ips", FUtil.listToString(ips));
             put("last_login", lastLogin.getTime());
-            put("login_message", loginMessage);
             put("command_spy", commandSpy);
             put("potion_spy", potionSpy);
             put("ac_format", acFormat);
-            put("amp_username", ampUsername);
         }};
         return map;
     }
 
-    public boolean hasLoginMessage()
-    {
-        return loginMessage != null && !loginMessage.isEmpty();
-    }
-
     // Util IP methods
     public void addIp(String ip)
     {
@@ -136,43 +101,143 @@ public class StaffMember
     }
 
     public void removeIp(String ip)
-    {
-        if (ips.contains(ip))
     {
         ips.remove(ip);
     }
-    }
 
     public void clearIPs()
     {
         ips.clear();
     }
 
+    public boolean isValid()
+    {
+        return uuid != null
+                && rank != null
+                && !ips.isEmpty()
+                && lastLogin != null;
+    }
+
+    public UUID getUuid()
+    {
+        return uuid;
+    }
+
+    public String getName()
+    {
+        return Bukkit.getOfflinePlayer(uuid).getName();
+    }
+
+    public boolean isActive()
+    {
+        return active;
+    }
+
     public void setActive(boolean active)
     {
         this.active = active;
 
-        final TotalFreedomMod plugin = TotalFreedomMod.plugin();
+        final TotalFreedomMod plugin = TotalFreedomMod.getPlugin();
+
+        // Avoiding stupid NPE compiler warnings
+        if (plugin == null)
+        {
+            Bukkit.getLogger().severe("The plugin is null!! This is a major issue and WILL break the plugin!");
+            return;
+        }
 
         if (!active)
         {
-            if (getRank().isAtLeast(Rank.MOD))
+            if (getRank().isAtLeast(Rank.ADMIN))
             {
                 if (plugin.btb != null)
                 {
                     plugin.btb.killTelnetSessions(getName());
                 }
-            }
 
-            plugin.lv.updateLogsRegistration(null, getName(), LogsRegistrationMode.DELETE);
-        }
-    }
+                // Ensure admins don't have admin functionality when removed (FS-222)
+                AdminList.vanished.remove(getUuid());
 
-    public boolean isValid()
+                if (plugin.esb != null)
                 {
-        return name != null
-                && rank != null
-                && !ips.isEmpty()
-                && lastLogin != null;
+                    plugin.esb.setVanished(getName(), false);
+                }
+
+                setCommandSpy(false);
+                setPotionSpy(false);
+
+                Server server = Bukkit.getServer();
+                Player player = server.getPlayer(getUuid());
+
+                if (player != null)
+                {
+                    // Update chats
+                    FPlayer freedomPlayer = plugin.pl.getPlayer(player);
+                    freedomPlayer.removeAdminFunctionality();
+
+                    // Disable vanish
+                    for (Player player1 : server.getOnlinePlayers())
+                    {
+                        player1.showPlayer(plugin, player);
+                    }
+                }
+
+            }
+        }
+    }
+
+    public Rank getRank()
+    {
+        return rank;
+    }
+
+    public void setRank(Rank rank)
+    {
+        this.rank = rank;
+    }
+
+    public List<String> getIps()
+    {
+        return ips;
+    }
+
+    public Date getLastLogin()
+    {
+        return lastLogin;
+    }
+
+    public void setLastLogin(Date lastLogin)
+    {
+        this.lastLogin = lastLogin;
+    }
+
+    public Boolean getCommandSpy()
+    {
+        return commandSpy;
+    }
+
+    public void setCommandSpy(Boolean commandSpy)
+    {
+        this.commandSpy = commandSpy;
+    }
+
+    public Boolean getPotionSpy()
+    {
+        return potionSpy;
+    }
+
+    public void setPotionSpy(Boolean potionSpy)
+    {
+        this.potionSpy = potionSpy;
+    }
+
+    public String getAcFormat()
+    {
+        return acFormat;
+    }
+
+    public void setAcFormat(String acFormat)
+    {
+        this.acFormat = acFormat;
     }
 }

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

@@ -0,0 +1,343 @@
+package me.totalfreedom.totalfreedommod.admin;
+
+import com.google.common.collect.Maps;
+import com.google.common.collect.Sets;
+import java.sql.ResultSet;
+import java.sql.SQLException;
+import java.util.*;
+import java.util.concurrent.TimeUnit;
+import me.totalfreedom.totalfreedommod.FreedomService;
+import me.totalfreedom.totalfreedommod.config.ConfigEntry;
+import me.totalfreedom.totalfreedommod.rank.Rank;
+import me.totalfreedom.totalfreedommod.util.FLog;
+import me.totalfreedom.totalfreedommod.util.FUtil;
+import org.bukkit.Bukkit;
+import org.bukkit.command.CommandSender;
+import org.bukkit.entity.Player;
+
+public class AdminList extends FreedomService
+{
+    public static final List<UUID> vanished = new ArrayList<>();
+    private final Set<Admin> allAdmins = Sets.newHashSet(); // Includes disabled admins
+    // Only active admins below
+    private final Set<Admin> activeAdmins = Sets.newHashSet();
+    private final Map<UUID, Admin> uuidTable = Maps.newHashMap();
+    private final Map<String, Admin> nameTable = Maps.newHashMap();
+    private final Map<String, Admin> ipTable = Maps.newHashMap();
+
+    @Override
+    public void onStart()
+    {
+        load();
+        deactivateOldEntries(false);
+    }
+
+    @Override
+    public void onStop()
+    {
+    }
+
+    public void load()
+    {
+        allAdmins.clear();
+        try
+        {
+            ResultSet adminSet = plugin.sql.getAdminList();
+            while (adminSet.next())
+            {
+                try
+                {
+                    Admin admin = new Admin(adminSet);
+                    allAdmins.add(admin);
+                }
+                catch (Throwable ex)
+                {
+                    FLog.warning("An error occurred whilst reading the admin entry at row #" + adminSet.getRow());
+                    FLog.warning(ex);
+                }
+            }
+        }
+        catch (SQLException e)
+        {
+            FLog.severe("Failed to load admin list: " + e.getMessage());
+        }
+
+        updateTables();
+        FLog.info("Loaded " + allAdmins.size() + " admins (" + uuidTable.size() + " active, " + ipTable.size() + " IPs)");
+    }
+
+    public void messageAllAdmins(String message)
+    {
+        for (Player player : server.getOnlinePlayers())
+        {
+            if (isAdmin(player))
+            {
+                player.sendMessage(message);
+            }
+        }
+    }
+
+    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);
+    }
+
+    public boolean isAdmin(CommandSender sender)
+    {
+        if (!(sender instanceof Player))
+        {
+            return true;
+        }
+
+        Admin admin = getAdmin((Player)sender);
+
+        return admin != null && admin.isActive();
+    }
+
+    public boolean isAdmin(Player player)
+    {
+        if (player == null)
+        {
+            return true;
+        }
+
+        Admin admin = getAdmin(player);
+
+        return admin != null && admin.isActive();
+    }
+
+    public boolean isSeniorAdmin(CommandSender sender)
+    {
+        Admin admin = getAdmin(sender);
+        if (admin == null)
+        {
+            return false;
+        }
+
+        return admin.getRank().ordinal() >= Rank.SENIOR_ADMIN.ordinal();
+    }
+
+    public Admin getAdmin(CommandSender sender)
+    {
+        if (sender instanceof Player)
+        {
+            return getAdmin((Player)sender);
+        }
+
+        return getEntryByName(sender.getName());
+    }
+
+    public Admin getAdmin(Player player)
+    {
+        final String ip = FUtil.getIp(player);
+        final Admin entry = getEntryByUuid(player.getUniqueId());
+
+        if (entry != null && !entry.getIps().contains(ip))
+        {
+            entry.addIp(ip);
+        }
+
+        return entry;
+    }
+
+    public Admin getEntryByUuid(UUID uuid)
+    {
+        return uuidTable.get(uuid);
+    }
+
+    public Admin getEntryByName(String name)
+    {
+        return nameTable.get(name.toLowerCase());
+    }
+
+    public Admin getEntryByIp(String ip)
+    {
+        return ipTable.get(ip);
+    }
+
+    public void updateLastLogin(Player player)
+    {
+        final Admin admin = getAdmin(player);
+        if (admin == null)
+        {
+            return;
+        }
+
+        admin.setLastLogin(new Date());
+        save(admin);
+    }
+
+    public boolean addAdmin(Admin admin)
+    {
+        if (!admin.isValid())
+        {
+            FLog.warning("Could not add admin: " + admin.getName() + ". Admin is missing details!");
+            return false;
+        }
+
+        // Store admin, update views
+        allAdmins.add(admin);
+        updateTables();
+
+        // Save admin
+        plugin.sql.addAdmin(admin);
+
+        // Add login time
+        UUID uuid = admin.getUuid();
+        Player player = Bukkit.getPlayer(uuid);
+
+        if (player != null)
+        {
+            plugin.acl.getActivityLog(player).addLogin(player.getLastLogin());
+        }
+
+        return true;
+    }
+
+    public boolean removeAdmin(Admin admin)
+    {
+        if (admin.getRank().isAtLeast(Rank.ADMIN))
+        {
+            if (plugin.btb != null)
+            {
+                plugin.btb.killTelnetSessions(admin.getName());
+            }
+        }
+
+        // Remove admin, update views
+        if (!allAdmins.remove(admin))
+        {
+            return false;
+        }
+        updateTables();
+
+        // Unsave admin
+        plugin.sql.removeAdmin(admin);
+
+        return true;
+    }
+
+    public void updateTables()
+    {
+        activeAdmins.clear();
+        uuidTable.clear();
+        nameTable.clear();
+        ipTable.clear();
+
+        for (Admin admin : allAdmins)
+        {
+            if (!admin.isActive())
+            {
+                continue;
+            }
+
+            activeAdmins.add(admin);
+            uuidTable.put(admin.getUuid(), admin);
+            if (admin.getName() != null)
+            {
+                nameTable.put(admin.getName().toLowerCase(), admin);
+            }
+
+            for (String ip : admin.getIps())
+            {
+                ipTable.put(ip, admin);
+            }
+        }
+    }
+
+    public Set<String> getAdminNames()
+    {
+        return nameTable.keySet();
+    }
+
+    public Set<String> getAdminIps()
+    {
+        return ipTable.keySet();
+    }
+
+    public void save(Admin admin)
+    {
+        try
+        {
+            ResultSet currentSave = plugin.sql.getAdminByUuid(admin.getUuid());
+            for (Map.Entry<String, Object> entry : admin.toSQLStorable().entrySet())
+            {
+                Object storedValue = plugin.sql.getValue(currentSave, entry.getKey(), entry.getValue());
+                if (storedValue != null && !storedValue.equals(entry.getValue()) || storedValue == null && entry.getValue() != null || entry.getValue() == null)
+                {
+                    plugin.sql.setAdminValue(admin, entry.getKey(), entry.getValue());
+                }
+            }
+        }
+        catch (SQLException e)
+        {
+            FLog.severe("Failed to save admin: " + e.getMessage());
+        }
+    }
+
+    public void deactivateOldEntries(boolean verbose)
+    {
+        for (Admin admin : allAdmins)
+        {
+            if (!admin.isActive() || admin.getRank().isAtLeast(Rank.SENIOR_ADMIN))
+            {
+                continue;
+            }
+
+            final Date lastLogin = admin.getLastLogin();
+            final long lastLoginHours = TimeUnit.HOURS.convert(new Date().getTime() - lastLogin.getTime(), TimeUnit.MILLISECONDS);
+
+            if (lastLoginHours < ConfigEntry.ADMINLIST_CLEAN_THESHOLD_HOURS.getInteger())
+            {
+                continue;
+            }
+
+            if (verbose)
+            {
+                FUtil.adminAction("TotalFreedomMod", "Deactivating admin " + admin.getName() + ", inactive for " + lastLoginHours + " hours", true);
+            }
+
+            admin.setActive(false);
+            save(admin);
+        }
+
+        updateTables();
+    }
+
+    public boolean isVanished(UUID uuid)
+    {
+        return vanished.contains(uuid);
+    }
+
+    public Set<Admin> getAllAdmins()
+    {
+        return allAdmins;
+    }
+
+    public Set<Admin> getActiveAdmins()
+    {
+        return activeAdmins;
+    }
+
+    public Map<String, Admin> getNameTable()
+    {
+        return nameTable;
+    }
+
+    public Map<String, Admin> getIpTable()
+    {
+        return ipTable;
+    }
+}

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

@@ -4,15 +4,12 @@ import com.google.common.collect.Lists;
 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 java.util.UUID;
-import lombok.Getter;
-import lombok.Setter;
 import me.totalfreedom.totalfreedommod.config.ConfigEntry;
 import me.totalfreedom.totalfreedommod.util.FUtil;
 import org.bukkit.ChatColor;
@@ -22,27 +19,19 @@ import org.bukkit.entity.Player;
 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
-    @Setter
-    private UUID uuid = 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()
@@ -53,7 +42,7 @@ public class Ban
     {
         this(username,
                 uuid,
-                Arrays.asList(ip),
+                Collections.singletonList(ip),
                 by,
                 at,
                 expire,
@@ -71,6 +60,10 @@ public class Ban
         dedupeIps();
         this.by = by;
         this.at = at;
+        if (expire == null)
+        {
+            expire = FUtil.parseDateOffset("24h");
+        }
         this.expiryUnix = FUtil.getUnixTime(expire);
         this.reason = reason;
     }
@@ -84,7 +77,7 @@ public class Ban
 
     public static Ban forPlayerIp(Player player, CommandSender by, Date expiry, String reason)
     {
-        return new Ban(null, null, Arrays.asList(FUtil.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)
@@ -128,15 +121,9 @@ public class Ban
                 reason);
     }
 
-    public static Ban forPlayerFuzzy(Player player, CommandSender by, Date expiry, String reason)
+    public static SimpleDateFormat getDateFormat()
     {
-        return new Ban(player.getName(),
-                player.getUniqueId(),
-                FUtil.getFuzzyIp(FUtil.getIp(player)),
-                by.getName(),
-                Date.from(Instant.now()),
-                expiry,
-                reason);
+        return DATE_FORMAT;
     }
 
     public boolean hasUsername()
@@ -171,7 +158,7 @@ public class Ban
 
     public boolean isExpired()
     {
-        return hasExpiry() && expiryUnix < FUtil.getUnixTime();
+        return hasExpiry() && FUtil.getUnixDate(expiryUnix).before(new Date(FUtil.getUnixTime()));
     }
 
     public String bakeKickMessage()
@@ -252,17 +239,74 @@ public class Ban
 
     private void dedupeIps()
     {
-
         Set<String> uniqueIps = new HashSet<>();
 
-        Iterator<String> it = ips.iterator();
-        while (it.hasNext())
-        {
-            if (!uniqueIps.add(it.next()))
-            {
-                it.remove();
-            }
+        //Fancy Collections.removeIf lets you do all that while loop work in one lambda.
+        ips.removeIf(s -> !uniqueIps.add(s));
     }
 
+    public List<String> getIps()
+    {
+        return ips;
+    }
+
+    public String getUsername()
+    {
+        return username;
+    }
+
+    public void setUsername(String username)
+    {
+        this.username = username;
+    }
+
+    public UUID getUuid()
+    {
+        return uuid;
+    }
+
+    public void setUuid(UUID uuid)
+    {
+        this.uuid = uuid;
+    }
+
+    public String getBy()
+    {
+        return by;
+    }
+
+    public void setBy(String by)
+    {
+        this.by = by;
+    }
+
+    public Date getAt()
+    {
+        return at;
+    }
+
+    public void setAt(Date at)
+    {
+        this.at = at;
+    }
+
+    public String getReason()
+    {
+        return reason;
+    }
+
+    public void setReason(String reason)
+    {
+        this.reason = reason;
+    }
+
+    public long getExpiryUnix()
+    {
+        return expiryUnix;
+    }
+
+    public void setExpiryUnix(long expiryUnix)
+    {
+        this.expiryUnix = expiryUnix;
     }
 }

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

@@ -1,6 +1,5 @@
 package me.totalfreedom.totalfreedommod.banning;
 
-import com.google.common.collect.Lists;
 import com.google.common.collect.Maps;
 import com.google.common.collect.Sets;
 import java.sql.ResultSet;
@@ -14,8 +13,6 @@ import java.util.Map;
 import java.util.Set;
 import java.util.UUID;
 import me.totalfreedom.totalfreedommod.FreedomService;
-import me.totalfreedom.totalfreedommod.config.ConfigEntry;
-import me.totalfreedom.totalfreedommod.player.PlayerData;
 import me.totalfreedom.totalfreedommod.util.FLog;
 import me.totalfreedom.totalfreedommod.util.FUtil;
 import org.bukkit.entity.Player;
@@ -31,8 +28,6 @@ public class BanManager extends FreedomService
     private final Map<String, Ban> nameBans = Maps.newHashMap();
     private final Map<UUID, Ban> uuidBans = Maps.newHashMap();
     private final Map<String, Ban> ipBans = Maps.newHashMap();
-    private final List<String> unbannableUsernames = Lists.newArrayList();
-
     //
 
     @Override
@@ -71,11 +66,6 @@ public class BanManager extends FreedomService
         updateViews();
 
         FLog.info("Loaded " + ipBans.size() + " IP bans and " + nameBans.size() + " username bans.");
-
-        // Load unbannable usernames
-        unbannableUsernames.clear();
-        unbannableUsernames.addAll((Collection<? extends String>)ConfigEntry.FAMOUS_PLAYERS.getList());
-        FLog.info("Loaded " + unbannableUsernames.size() + " unbannable usernames.");
     }
 
     @Override
@@ -190,7 +180,7 @@ public class BanManager extends FreedomService
         return getByUsername(username) != null;
     }
 
-    public boolean addBan(Ban ban)
+    public void addBan(Ban ban)
     {
         if (ban.getUsername() != null && getByUsername(ban.getUsername()) != null)
         {
@@ -213,22 +203,18 @@ public class BanManager extends FreedomService
         {
             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()
@@ -269,9 +255,8 @@ public class BanManager extends FreedomService
     public void onPlayerJoin(PlayerJoinEvent event)
     {
         final Player player = event.getPlayer();
-        final PlayerData data = plugin.pl.getData(player);
 
-        if (!plugin.sl.isStaff(player))
+        if (!plugin.al.isAdmin(player))
         {
             return;
         }
@@ -328,5 +313,4 @@ public class BanManager extends FreedomService
             }
         }
     }
-
 }

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

@@ -1,28 +1,23 @@
 package me.totalfreedom.totalfreedommod.banning;
 
 import com.google.common.collect.Lists;
+import java.text.ParseException;
+import java.text.SimpleDateFormat;
+import java.util.Date;
 import java.util.List;
 import java.util.UUID;
-import lombok.Getter;
-import lombok.Setter;
 import me.totalfreedom.totalfreedommod.config.IConfig;
 import me.totalfreedom.totalfreedommod.util.FLog;
+import me.totalfreedom.totalfreedommod.util.FUtil;
 import org.bukkit.configuration.ConfigurationSection;
 
 public class IndefiniteBan implements IConfig
 {
-
-    @Getter
-    @Setter
-    private String username = null;
-    @Getter
-    @Setter
-    private UUID uuid = null;
-    @Getter
     private final List<String> ips = Lists.newArrayList();
-    @Getter
-    @Setter
+    private String username = null;
+    private UUID uuid = null;
     private String reason = null;
+    private Date expiry = null;
 
     public IndefiniteBan()
     {
@@ -32,6 +27,7 @@ public class IndefiniteBan implements IConfig
     public void loadFrom(ConfigurationSection cs)
     {
         this.username = cs.getName();
+
         try
         {
             String strUUID = cs.getString("uuid", null);
@@ -45,14 +41,26 @@ public class IndefiniteBan implements IConfig
         {
             FLog.warning("Failed to load indefinite banned UUID for " + this.username + ". Make sure the UUID is in the correct format with dashes.");
         }
+
         this.ips.clear();
         this.ips.addAll(cs.getStringList("ips"));
         this.reason = cs.getString("reason", null);
+
+        String date = cs.getString("expiry", null);
+        try
+        {
+            this.expiry = date != null ? new SimpleDateFormat("yyyy-MM-dd").parse(date) : null;
+        }
+        catch (ParseException ex)
+        {
+            FLog.warning("Failed to load indefinite banned expiry for " + this.username + ". Make sure the expiry is in the correct format (yyyy-MM-dd).");
+        }
     }
 
     @Override
     public void saveTo(ConfigurationSection cs)
     {
+        // The indefinite ban list is only intended to be modified manually. It is not intended to save.
     }
 
     @Override
@@ -60,4 +68,59 @@ public class IndefiniteBan implements IConfig
     {
         return username != null;
     }
+
+    public String getUsername()
+    {
+        return username;
+    }
+
+    public void setUsername(String username)
+    {
+        this.username = username;
+    }
+
+    public UUID getUuid()
+    {
+        return uuid;
+    }
+
+    public void setUuid(UUID uuid)
+    {
+        this.uuid = uuid;
+    }
+
+    public List<String> getIps()
+    {
+        return ips;
+    }
+
+    public String getReason()
+    {
+        return reason;
+    }
+
+    public void setReason(String reason)
+    {
+        this.reason = reason;
+    }
+
+    public Date getExpiry()
+    {
+        return expiry;
+    }
+
+    public void setExpiry(Date date)
+    {
+        this.expiry = date;
+    }
+
+    public boolean hasExpiry()
+    {
+        return this.expiry != null;
+    }
+
+    public boolean isExpired()
+    {
+        return hasExpiry() && expiry.before(new Date(FUtil.getUnixTime()));
+    }
 }

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

@@ -2,9 +2,10 @@ package me.totalfreedom.totalfreedommod.banning;
 
 import com.google.common.base.Strings;
 import com.google.common.collect.Sets;
+import java.text.SimpleDateFormat;
+import java.util.Date;
 import java.util.Set;
 import java.util.UUID;
-import lombok.Getter;
 import me.totalfreedom.totalfreedommod.FreedomService;
 import me.totalfreedom.totalfreedommod.config.ConfigEntry;
 import me.totalfreedom.totalfreedommod.config.YamlConfig;
@@ -20,25 +21,24 @@ public class IndefiniteBanList extends FreedomService
 {
 
     public static final String CONFIG_FILENAME = "indefinitebans.yml";
+    private YamlConfig config;
 
-    @Getter
     private final Set<IndefiniteBan> indefBans = Sets.newHashSet();
 
-    @Getter
     private int nameBanCount = 0;
 
-    @Getter
     private int uuidBanCount = 0;
 
-    @Getter
     private int ipBanCount = 0;
 
+    private final SimpleDateFormat dateFormat = new SimpleDateFormat("dd MMM yyyy, zzzz");
+
     @Override
     public void onStart()
     {
         indefBans.clear();
 
-        final YamlConfig config = new YamlConfig(plugin, CONFIG_FILENAME, true);
+        config = new YamlConfig(plugin, CONFIG_FILENAME, true);
         config.load();
 
         for (String name : config.getKeys(false))
@@ -51,6 +51,7 @@ public class IndefiniteBanList extends FreedomService
 
             IndefiniteBan indefBan = new IndefiniteBan();
             ConfigurationSection cs = config.getConfigurationSection(name);
+            assert cs != null;
             indefBan.loadFrom(cs);
 
             if (!indefBan.isValid())
@@ -59,10 +60,18 @@ public class IndefiniteBanList extends FreedomService
                 continue;
             }
 
+            if (indefBan.isExpired())
+            {
+                FLog.info("Removing " + name + " from indefinite ban list as the entry has expired!");
+                config.set(name, null);
+                continue;
+            }
+
             indefBans.add(indefBan);
         }
 
         updateCount();
+        config.save();
 
         FLog.info("Loaded " + nameBanCount + " indefinite name bans, " + uuidBanCount + " UUID bans, and " + ipBanCount + " ip bans");
     }
@@ -84,7 +93,7 @@ public class IndefiniteBanList extends FreedomService
 
         for (IndefiniteBan indefBan : indefBans)
         {
-            if (username.toLowerCase().equals(indefBan.getUsername().toLowerCase()))
+            if (username.equalsIgnoreCase(indefBan.getUsername()))
             {
                 bannedBy = "username";
                 ban = indefBan;
@@ -106,12 +115,28 @@ public class IndefiniteBanList extends FreedomService
 
         if (ban != null)
         {
-            String kickMessage = ChatColor.RED + "Your " + bannedBy + " is indefinitely banned from this server.";
+            if (ban.isExpired())
+            {
+                config.set(ban.getUsername(), null);
+                config.save();
+                return;
+            }
+
+            String kickMessage = ChatColor.RED + "Your " + bannedBy + " is "
+                + (ban.hasExpiry() ? "" : "indefinitely ")
+                + "banned from this server.";
             String reason = ban.getReason();
             if (!Strings.isNullOrEmpty(reason))
             {
                 kickMessage += "\nReason: " + ChatColor.GOLD + reason;
             }
+
+            Date expiry = ban.getExpiry();
+            if (expiry != null)
+            {
+                kickMessage += ChatColor.RED + "\nExpiry: " + ChatColor.GOLD + dateFormat.format(expiry);
+            }
+
             String appealURL = ConfigEntry.SERVER_INDEFBAN_URL.getString();
             if (!Strings.isNullOrEmpty(appealURL))
             {
@@ -137,4 +162,24 @@ public class IndefiniteBanList extends FreedomService
             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/blocking/BlockBlocker.java

@@ -1,14 +1,10 @@
 package me.totalfreedom.totalfreedommod.blocking;
 
-import java.util.List;
 import me.totalfreedom.totalfreedommod.FreedomService;
 import me.totalfreedom.totalfreedommod.config.ConfigEntry;
-import me.totalfreedom.totalfreedommod.util.Groups;
 import org.bukkit.ChatColor;
 import org.bukkit.Material;
-import org.bukkit.block.Banner;
 import org.bukkit.block.Skull;
-import org.bukkit.block.banner.Pattern;
 import org.bukkit.entity.Player;
 import org.bukkit.event.EventHandler;
 import org.bukkit.event.EventPriority;
@@ -29,6 +25,7 @@ public class BlockBlocker extends FreedomService
     {
     }
 
+    @SuppressWarnings("deprecation")
     @EventHandler(priority = EventPriority.HIGH)
     public void onBlockPlace(BlockPlaceEvent event)
     {
@@ -70,7 +67,7 @@ public class BlockBlocker extends FreedomService
             }
             case STRUCTURE_BLOCK:
             {
-                if (!ConfigEntry.ALLOW_STRUCTURE_BLOCKS.getBoolean())
+                if (!ConfigEntry.ALLOW_MASTERBLOCKS.getBoolean())
                 {
                     player.sendMessage(ChatColor.GRAY + "Structure blocks are disabled.");
                     player.getInventory().setItem(player.getInventory().getHeldItemSlot(), new ItemStack(Material.COOKIE, 1));
@@ -80,7 +77,7 @@ public class BlockBlocker extends FreedomService
             }
             case JIGSAW:
             {
-                if (!ConfigEntry.ALLOW_JIGSAWS.getBoolean())
+                if (!ConfigEntry.ALLOW_MASTERBLOCKS.getBoolean())
                 {
                     player.sendMessage(ChatColor.GRAY + "Jigsaws are disabled.");
                     player.getInventory().setItem(player.getInventory().getHeldItemSlot(), new ItemStack(Material.COOKIE, 1));
@@ -88,6 +85,16 @@ public class BlockBlocker extends FreedomService
                 }
                 break;
             }
+            case REPEATING_COMMAND_BLOCK:
+            case CHAIN_COMMAND_BLOCK:
+            case COMMAND_BLOCK:
+                if (!ConfigEntry.ALLOW_MASTERBLOCKS.getBoolean())
+                {
+                    player.sendMessage(ChatColor.GRAY + "Command blocks are disabled.");
+                    player.getInventory().setItem(player.getInventory().getHeldItemSlot(), new ItemStack(Material.COOKIE, 1));
+                    event.setCancelled(true);
+                }
+                break;
             case GRINDSTONE:
             {
                 if (!ConfigEntry.ALLOW_GRINDSTONES.getBoolean())
@@ -143,6 +150,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);
@@ -169,18 +177,11 @@ public class BlockBlocker extends FreedomService
                 }
                 break;
             }
-        }
-
-        if (Groups.BANNERS.contains(event.getBlockPlaced().getType()))
+            default:
             {
-            Banner banner = (Banner) event.getBlockPlaced().getState();
-            List<Pattern> patterns = banner.getPatterns();;
-            if (patterns.size() >= 2)
-            {
-                banner.setPatterns(patterns.subList(0, 2));
-                player.sendMessage(ChatColor.GRAY + "Your banner had too many patterns on it, so some were removed.");
+                // Do nothing
+                break;
             }
         }
-
     }
 }

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

@@ -30,7 +30,7 @@ public class EditBlocker extends FreedomService
             return;
         }
 
-        if (plugin.sl.isStaffSync(event.getPlayer()))
+        if (plugin.al.isAdminSync(event.getPlayer()))
         {
             fPlayer.setEditBlocked(false);
             return;
@@ -49,7 +49,7 @@ public class EditBlocker extends FreedomService
             return;
         }
 
-        if (plugin.sl.isStaffSync(event.getPlayer()))
+        if (plugin.al.isAdminSync(event.getPlayer()))
         {
             fPlayer.setEditBlocked(false);
             return;
@@ -58,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

@@ -3,6 +3,9 @@ package me.totalfreedom.totalfreedommod.blocking;
 import java.util.ArrayList;
 import java.util.Arrays;
 import java.util.List;
+import java.util.Objects;
+import me.totalfreedom.scissors.event.block.MasterBlockFireEvent;
+import io.papermc.paper.event.player.PlayerSignCommandPreprocessEvent;
 import me.totalfreedom.totalfreedommod.FreedomService;
 import me.totalfreedom.totalfreedommod.config.ConfigEntry;
 import me.totalfreedom.totalfreedommod.util.FUtil;
@@ -13,23 +16,16 @@ 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.*;
 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;
@@ -38,6 +34,20 @@ 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);
+     * /    }
+     * /}
+     **/
+
+    // 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
     public void onStart()
     {
@@ -99,6 +109,28 @@ public class EventBlocker extends FreedomService
         event.setRadius(ConfigEntry.EXPLOSIVE_RADIUS.getDouble().floatValue());
     }
 
+    @EventHandler(priority = EventPriority.HIGH)
+    public void onBlockExplode(BlockExplodeEvent event)
+    {
+        if (!ConfigEntry.ALLOW_EXPLOSIONS.getBoolean())
+        {
+            event.setCancelled(true);
+            return;
+        }
+
+        event.setYield(ConfigEntry.EXPLOSIVE_RADIUS.getDouble().floatValue());
+    }
+
+    @EventHandler(priority = EventPriority.HIGHEST)
+    public void onMasterBlockFire(MasterBlockFireEvent event)
+    {
+        if (!ConfigEntry.ALLOW_MASTERBLOCKS.getBoolean())
+        {
+            event.setCancelled(true);
+            event.getAt().getBlock().setType(Material.CAKE);
+        }
+    }
+
     @EventHandler(priority = EventPriority.HIGH)
     public void onEntityCombust(EntityCombustEvent event)
     {
@@ -120,35 +152,27 @@ 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())
         {
             Entity entity = event.getEntity();
-            if (entity instanceof Tameable)
-            {
-                if (((Tameable)entity).isTamed())
+            if (entity instanceof Tameable tameable && tameable.isTamed())
             {
                 event.setCancelled(true);
             }
         }
     }
-    }
 
     @EventHandler(priority = EventPriority.NORMAL)
     public void onPlayerDropItem(PlayerDropItemEvent event)
     {
-        if (!plugin.sl.isStaff(event.getPlayer()))
+        if (!plugin.al.isAdmin(event.getPlayer()) && !ConfigEntry.ALLOW_ITEM_DROPS.getBoolean())
         {
             event.setCancelled(true);
         }
@@ -203,17 +227,15 @@ public class EventBlocker extends FreedomService
         }
     }
 
-    //@EventHandler(priority = EventPriority.HIGH)
-    public void onBlockRedstone(BlockRedstoneEvent event)
+    @EventHandler
+    public void onEntitySpawn(EntitySpawnEvent event)
     {
-        if (!ConfigEntry.ALLOW_REDSTONE.getBoolean())
+        if (!ConfigEntry.ALLOW_GRAVITY.getBoolean() && event.getEntity() instanceof FallingBlock)
         {
-            event.setNewCurrent(0);
+            event.setCancelled(true);
         }
     }
 
-    // TODO: Revert back to old redstone block system when (or if) it is fixed in Bukkit, Spigot or Paper.
-    private ArrayList<Material> redstoneBlocks = new ArrayList<>(Arrays.asList(Material.REDSTONE, Material.DISPENSER, Material.DROPPER, Material.REDSTONE_LAMP));
     @EventHandler
     public void onBlockPhysics(BlockPhysicsEvent event)
     {
@@ -230,15 +252,16 @@ public class EventBlocker extends FreedomService
     @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)
     {
@@ -255,4 +278,10 @@ public class EventBlocker extends FreedomService
         FUtil.fixCommandVoid(event.getEntity());
         event.setDeathMessage(event.getDeathMessage());
     }
+
+    @EventHandler
+    public void onSignInteract(PlayerSignCommandPreprocessEvent event)
+    {
+        event.setCancelled(true);
+    }
 }

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

@@ -4,7 +4,10 @@ import me.totalfreedom.totalfreedommod.FreedomService;
 import me.totalfreedom.totalfreedommod.config.ConfigEntry;
 import me.totalfreedom.totalfreedommod.util.Groups;
 import org.bukkit.ChatColor;
+import org.bukkit.GameMode;
 import org.bukkit.Material;
+import org.bukkit.block.Block;
+import org.bukkit.entity.EntityType;
 import org.bukkit.entity.Player;
 import org.bukkit.event.EventHandler;
 import org.bukkit.event.EventPriority;
@@ -24,7 +27,7 @@ public class InteractBlocker extends FreedomService
     {
     }
 
-    @EventHandler(priority = EventPriority.HIGH)
+    @EventHandler(priority = EventPriority.HIGH, ignoreCancelled = true)
     public void onPlayerInteract(PlayerInteractEvent event)
     {
         switch (event.getAction())
@@ -36,10 +39,9 @@ public class InteractBlocker extends FreedomService
                 break;
             }
 
-            case LEFT_CLICK_AIR:
-            case LEFT_CLICK_BLOCK:
+            default:
             {
-                //
+                // Do nothing
                 break;
             }
         }
@@ -68,21 +70,42 @@ public class InteractBlocker extends FreedomService
     private void handleRightClick(PlayerInteractEvent event)
     {
         final Player player = event.getPlayer();
+        if (player.getGameMode().equals(GameMode.SPECTATOR)) {
+            return;
+        }
 
-        if (event.getClickedBlock() != null)
-        {
-            if (event.getClickedBlock().getType().equals(Material.STRUCTURE_BLOCK) || event.getClickedBlock().getType().equals(Material.JIGSAW) || event.getClickedBlock().getType().equals(Material.RESPAWN_ANCHOR))
+        final Block clickedBlock = event.getClickedBlock();
+
+        if (clickedBlock != null && clickedBlock.getType() == Material.RESPAWN_ANCHOR && !ConfigEntry.ALLOW_RESPAWN_ANCHORS.getBoolean())
         {
             event.setCancelled(true);
-                event.getPlayer().closeInventory();
-            }
+            return;
         }
 
         if (Groups.SPAWN_EGGS.contains(event.getMaterial()))
         {
-            player.getInventory().clear(player.getInventory().getHeldItemSlot());
-            player.sendMessage(ChatColor.GRAY + "Spawn eggs are currently disabled.");
             event.setCancelled(true);
+            EntityType eggType = null;
+            try
+            {
+                Material mat = event.getMaterial();
+                if (mat == Material.MOOSHROOM_SPAWN_EGG)
+                {
+                    eggType = EntityType.MUSHROOM_COW;
+                }
+                else
+                {
+                    eggType = EntityType.valueOf(mat.name().substring(0, mat.name().length() - 10));
+                }
+            }
+            catch (IllegalArgumentException ignored)
+            {
+                //
+            }
+            if (eggType != null && clickedBlock != null)
+            {
+                clickedBlock.getWorld().spawnEntity(clickedBlock.getLocation().add(event.getBlockFace().getDirection()).add(0.5, 0.5, 0.5), eggType);
+            }
             return;
         }
 
@@ -90,7 +113,7 @@ public class InteractBlocker extends FreedomService
         {
             case WATER_BUCKET:
             {
-                if (plugin.sl.isStaff(player) || ConfigEntry.ALLOW_WATER_PLACE.getBoolean())
+                if (plugin.al.isAdmin(player) || ConfigEntry.ALLOW_WATER_PLACE.getBoolean())
                 {
                     break;
                 }
@@ -103,7 +126,7 @@ public class InteractBlocker extends FreedomService
 
             case LAVA_BUCKET:
             {
-                if (plugin.sl.isStaff(player) || ConfigEntry.ALLOW_LAVA_PLACE.getBoolean())
+                if (plugin.al.isAdmin(player) || ConfigEntry.ALLOW_LAVA_PLACE.getBoolean())
                 {
                     break;
                 }
@@ -153,11 +176,21 @@ public class InteractBlocker extends FreedomService
             }
             case WRITTEN_BOOK:
             {
+                if (ConfigEntry.ALLOW_BOOKS.getBoolean())
+                {
+                    break;
+                }
+
                 player.getInventory().clear(player.getInventory().getHeldItemSlot());
                 player.sendMessage(ChatColor.GRAY + "Books are currently disabled.");
                 event.setCancelled(true);
                 break;
             }
+            default:
+            {
+                // Do nothing
+                break;
+            }
         }
     }
 }

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

@@ -1,5 +1,6 @@
 package me.totalfreedom.totalfreedommod.blocking;
 
+import java.util.Objects;
 import me.totalfreedom.totalfreedommod.FreedomService;
 import me.totalfreedom.totalfreedommod.config.ConfigEntry;
 import org.bukkit.attribute.Attributable;
@@ -42,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);
             }
         }
     }
@@ -117,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

@@ -6,6 +6,7 @@ import org.bukkit.GameMode;
 import org.bukkit.entity.Arrow;
 import org.bukkit.entity.FishHook;
 import org.bukkit.entity.Player;
+import org.bukkit.entity.SpectralArrow;
 import org.bukkit.entity.Trident;
 import org.bukkit.event.EventHandler;
 import org.bukkit.event.EventPriority;
@@ -43,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();
@@ -61,7 +70,7 @@ public class PVPBlocker extends FreedomService
             }
         }
 
-        if (player != null & !plugin.sl.isStaff(player))
+        if (player != null & !plugin.al.isAdmin(player))
         {
             if (player.getGameMode() == GameMode.CREATIVE)
             {
@@ -84,7 +93,5 @@ public class PVPBlocker extends FreedomService
                 event.setCancelled(true);
             }
         }
-
     }
-
 }

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

@@ -82,5 +82,4 @@ public class PotionBlocker extends FreedomService
         }
         return false;
     }
-
 }

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

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

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

@@ -24,7 +24,7 @@ import org.bukkit.plugin.SimplePluginManager;
 
 public class CommandBlocker extends FreedomService
 {
-
+    private final Pattern whitespacePattern = Pattern.compile("^/?( +)(.*)?");
     private final Pattern flagPattern = Pattern.compile("(:([0-9]){5,})");
     //
     private final Map<String, CommandBlockerEntry> entryList = Maps.newHashMap();
@@ -42,31 +42,12 @@ public class CommandBlocker extends FreedomService
         entryList.clear();
     }
 
-    public static CommandMap getCommandMap()
-    {
-        try
-        {
-            SimplePluginManager simplePluginManager = (SimplePluginManager) Bukkit.getServer().getPluginManager();
-
-            Field commandMapField = SimplePluginManager.class.getDeclaredField("commandMap");
-            commandMapField.setAccessible(true);
-
-            SimpleCommandMap simpleCommandMap = (SimpleCommandMap) commandMapField.get(simplePluginManager);
-            return simpleCommandMap;
-        }
-        catch (NoSuchFieldException | IllegalArgumentException | IllegalAccessException e)
-        {
-            FLog.severe("Failed to get command map field (" + e.getMessage() + ")");
-        }
-        return null;
-    }
-
     public void load()
     {
         entryList.clear();
         unknownCommands.clear();
 
-        final CommandMap commandMap = getCommandMap();
+        final CommandMap commandMap = Bukkit.getCommandMap();
 
         @SuppressWarnings("unchecked")
         List<String> blockedCommands = (List<String>)ConfigEntry.BLOCKED_COMMANDS.getList();
@@ -84,7 +65,7 @@ public class CommandBlocker extends FreedomService
             String commandName = parts[2].toLowerCase().substring(1);
             final String message = (parts.length > 3 ? parts[3] : null);
 
-            if (rank == null || action == null || commandName == null || commandName.isEmpty())
+            if (rank == null || action == null || commandName.isEmpty())
             {
                 FLog.warning("Invalid command blocker entry: " + rawEntry);
                 continue;
@@ -98,6 +79,7 @@ public class CommandBlocker extends FreedomService
                 subCommand = StringUtils.join(commandParts, " ", 1, commandParts.length).trim().toLowerCase();
             }
 
+            assert commandMap != null;
             final Command command = commandMap.getCommand(commandName);
 
             // Obtain command from alias
@@ -156,6 +138,14 @@ public class CommandBlocker extends FreedomService
 
         // Format
         command = command.toLowerCase().trim();
+
+        // Whitespaces
+        Matcher whitespaceMatcher = whitespacePattern.matcher(command);
+        if (whitespaceMatcher.matches() && whitespaceMatcher.groupCount() == 2)
+        {
+            command = whitespaceMatcher.group(2);
+        }
+
         command = command.startsWith("/") ? command.substring(1) : command;
 
         // Check for plugin specific commands
@@ -171,7 +161,7 @@ public class CommandBlocker extends FreedomService
 
         for (String part : commandParts)
         {
-            if (command.startsWith("/") && !plugin.sl.isStaff(sender) && (part.contains("#copy") || part.contains("#clipboard")))
+            if (command.startsWith("/") && !plugin.al.isAdmin(sender) && (part.contains("#copy") || part.contains("#clipboard")))
             {
                 FUtil.playerMsg(sender, "WorldEdit copy variables are disabled.");
                 return true;
@@ -203,13 +193,10 @@ public class CommandBlocker extends FreedomService
         }
 
         // Validate sub command
-        if (entry.getSubCommand() != null)
-        {
-            if (subCommand == null || !subCommand.startsWith(entry.getSubCommand()))
+        if (entry.getSubCommand() != null && (subCommand == null || !subCommand.startsWith(entry.getSubCommand())))
         {
             return false;
         }
-        }
 
         if (entry.getRank().hasPermission(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,25 +1,24 @@
 package me.totalfreedom.totalfreedommod.blocking.command;
 
-import lombok.Getter;
 import me.totalfreedom.totalfreedommod.TotalFreedomMod;
 import me.totalfreedom.totalfreedommod.util.FUtil;
+import org.bukkit.Bukkit;
 import org.bukkit.ChatColor;
 import org.bukkit.command.CommandSender;
 import org.bukkit.entity.Player;
-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,15 +39,40 @@ 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;
         }
         if (action == CommandBlockerAction.BLOCK_UNKNOWN)
         {
-            sender.sendMessage(SpigotConfig.unknownCommandMessage);
+            sender.sendMessage(Bukkit.spigot().getSpigotConfig().getString("messages.unknown-command"));
             return;
         }
         FUtil.playerMsg(sender, FUtil.colorize(message));
     }
+
+    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

@@ -1,53 +1,35 @@
 package me.totalfreedom.totalfreedommod.blocking.command;
 
 import me.totalfreedom.totalfreedommod.TotalFreedomMod;
+import me.totalfreedom.totalfreedommod.admin.Admin;
 import me.totalfreedom.totalfreedommod.rank.Rank;
-import me.totalfreedom.totalfreedommod.staff.StaffMember;
 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))
+        Admin admin = TotalFreedomMod.getPlugin().al.getAdmin(sender);
+        if (admin != null)
         {
-            return TELNET;
+            if (admin.getRank() == Rank.SENIOR_ADMIN)
+            {
+                return SENIOR_ADMIN;
             }
-
-        StaffMember staffMember = TotalFreedomMod.plugin().sl.getAdmin(sender);
-        if (staffMember != null)
-        {
-            if (staffMember.getRank() == Rank.ADMIN)
-            {
-                return SENIOR;
-            }
-            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,8 +9,8 @@ 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.admin.Admin;
 import me.totalfreedom.totalfreedommod.rank.Rank;
-import me.totalfreedom.totalfreedommod.staff.StaffMember;
 import me.totalfreedom.totalfreedommod.util.FLog;
 import org.bukkit.entity.Player;
 import org.bukkit.event.EventHandler;
@@ -43,15 +42,15 @@ public class BukkitTelnetBridge extends FreedomService
             return;
         }
 
-        final StaffMember staffMember = plugin.sl.getEntryByIpFuzzy(ip);
+        final Admin admin = plugin.al.getEntryByIp(ip);
 
-        if (staffMember == null || !staffMember.isActive() || !staffMember.getRank().hasConsoleVariant())
+        if (admin == null || !admin.isActive() || !admin.getRank().hasConsoleVariant())
         {
             return;
         }
 
         event.setBypassPassword(true);
-        event.setName(staffMember.getName());
+        event.setName(admin.getName());
     }
 
     @EventHandler(priority = EventPriority.NORMAL)
@@ -66,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();
 
@@ -77,14 +74,14 @@ public class BukkitTelnetBridge extends FreedomService
             boolean isTelnetAdmin = false;
             boolean isSeniorAdmin = false;
 
-            final StaffMember staffMember = plugin.sl.getAdmin(player);
-            if (staffMember != null)
+            final Admin admin = plugin.al.getAdmin(player);
+            if (admin != null)
             {
-                boolean active = staffMember.isActive();
+                boolean active = admin.isActive();
 
                 isAdmin = active;
-                isSeniorAdmin = active && staffMember.getRank() == Rank.ADMIN;
-                isTelnetAdmin = active && (isSeniorAdmin || staffMember.getRank() == Rank.MOD);
+                isSeniorAdmin = active && admin.getRank() == Rank.SENIOR_ADMIN;
+                isTelnetAdmin = active && (isSeniorAdmin || admin.getRank() == Rank.ADMIN);
             }
 
             playerTags.put("tfm.admin.isAdmin", isAdmin);
@@ -93,9 +90,12 @@ public class BukkitTelnetBridge extends FreedomService
 
             playerTags.put("tfm.playerdata.getTag", plugin.pl.getPlayer(player).getTag());
 
+            if (server.getPluginManager().isPluginEnabled("Essentials"))
+            {
                 playerTags.put("tfm.essentialsBridge.getNickname", plugin.esb.getNickname(player.getName()));
             }
         }
+    }
 
     public BukkitTelnet getBukkitTelnetPlugin()
     {
@@ -104,14 +104,11 @@ public class BukkitTelnetBridge extends FreedomService
             try
             {
                 final Plugin bukkitTelnet = server.getPluginManager().getPlugin("BukkitTelnet");
-                if (bukkitTelnet != null)
-                {
                 if (bukkitTelnet instanceof BukkitTelnet)
                 {
                     bukkitTelnetPlugin = (BukkitTelnet)bukkitTelnet;
                 }
             }
-            }
             catch (Exception ex)
             {
                 FLog.severe(ex);
@@ -121,22 +118,22 @@ public class BukkitTelnetBridge extends FreedomService
         return bukkitTelnetPlugin;
     }
 
-    public List<StaffMember> getConnectedAdmins()
+    public List<Admin> getConnectedAdmins()
     {
-        List<StaffMember> staffMembers = new ArrayList<>();
+        List<Admin> admins = new ArrayList<>();
         final BukkitTelnet telnet = getBukkitTelnetPlugin();
         if (telnet != null)
         {
             for (ClientSession session : telnet.appender.getSessions())
             {
-                StaffMember staffMember = plugin.sl.getEntryByName(session.getUserName().toLowerCase());
-                if (staffMember != null && !staffMembers.contains(staffMember))
+                Admin admin = plugin.al.getEntryByName(session.getUserName().toLowerCase());
+                if (admin != null && !admins.contains(admin))
                 {
-                    staffMembers.add(staffMember);
+                    admins.add(admin);
                 }
             }
         }
-        return staffMembers;
+        return admins;
     }
 
     public void killTelnetSessions(final String name)
@@ -148,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,35 +1,58 @@
 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.util.Arrays;
-import java.util.List;
+import java.util.*;
+import java.util.concurrent.CompletableFuture;
+
 import me.totalfreedom.totalfreedommod.FreedomService;
-import me.totalfreedom.totalfreedommod.config.ConfigEntry;
 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.World;
+import net.coreprotect.utility.Util;
+import net.kyori.adventure.text.Component;
+import net.kyori.adventure.text.TextComponent;
+import net.kyori.adventure.text.event.ClickEvent;
+import net.kyori.adventure.text.format.NamedTextColor;
+import net.kyori.adventure.text.format.TextColor;
+import net.kyori.adventure.text.format.TextDecoration;
+import org.bukkit.Material;
+import org.bukkit.block.Block;
+import org.bukkit.entity.Player;
+import org.bukkit.event.EventHandler;
+import org.bukkit.event.EventPriority;
+import org.bukkit.event.block.Action;
+import org.bukkit.event.player.PlayerInteractEvent;
+import org.bukkit.inventory.ItemStack;
 import org.bukkit.plugin.Plugin;
 import org.bukkit.scheduler.BukkitRunnable;
-import org.bukkit.scheduler.BukkitTask;
 
 public class CoreProtectBridge extends FreedomService
 {
+    //-- Block Inspector --//
+    private static final Component name = Component.text("Block Inspector").color(TextColor.color(0x30ade4));
+    private static final Component header = Component.text("---- ").append(name)
+            .append(Component.text(" ---- ")).colorIfAbsent(NamedTextColor.WHITE);
+    private static final Component prefix = name.append(Component.text(" - ").color(NamedTextColor.WHITE))
+            .colorIfAbsent(NamedTextColor.WHITE);
+    //--
+    private final HashMap<UUID, Long> cooldownMap = new HashMap<>();
+    private HashMap<UUID, FUtil.PaginationList<CoreProtectAPI.ParseResult>> historyMap;
+
+    //---------------------//
     private CoreProtectAPI coreProtectAPI = null;
 
-    private final List<String> tables = Arrays.asList("co_sign", "co_session", "co_container", "co_block");
-
-    private BukkitTask wiper;
+    public static Long getSecondsLeft(long prevTime, int timeAdd)
+    {
+        return prevTime / 1000L + timeAdd - System.currentTimeMillis() / 1000L;
+    }
 
     @Override
     public void onStart()
     {
+        if (isEnabled())
+        {
+            historyMap = new HashMap<>();
+        }
     }
 
     @Override
@@ -42,9 +65,9 @@ public class CoreProtectBridge extends FreedomService
         CoreProtect coreProtect = null;
         try
         {
-            final Plugin coreProtectPlugin = Bukkit.getServer().getPluginManager().getPlugin("CoreProtect");
-
-            if (coreProtectPlugin != null && coreProtectPlugin instanceof CoreProtect)
+            final Plugin coreProtectPlugin = server.getPluginManager().getPlugin("CoreProtect");
+            assert coreProtectPlugin != null;
+            if (coreProtectPlugin instanceof CoreProtect)
             {
                 coreProtect = (CoreProtect)coreProtectPlugin;
             }
@@ -83,6 +106,11 @@ public class CoreProtectBridge extends FreedomService
 
     public boolean isEnabled()
     {
+        if (!server.getPluginManager().isPluginEnabled("CoreProtect"))
+        {
+            return false;
+        }
+
         final CoreProtect coreProtect = getCoreProtect();
 
         return coreProtect != null && coreProtect.isEnabled();
@@ -91,19 +119,19 @@ public class CoreProtectBridge extends FreedomService
     // Rollback the specified player's edits that were in the last 24 hours.
     public void rollback(final String name)
     {
-        final CoreProtectAPI coreProtect = getCoreProtectAPI();
-
         if (!isEnabled())
         {
             return;
         }
 
+        final CoreProtectAPI coreProtect = getCoreProtectAPI();
+
         new BukkitRunnable()
         {
             @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);
     }
@@ -111,110 +139,200 @@ public class CoreProtectBridge extends FreedomService
     // Reverts a rollback for the specified player's edits that were in the last 24 hours.
     public void restore(final String name)
     {
-        final CoreProtectAPI coreProtect = getCoreProtectAPI();
-
         if (!isEnabled())
         {
             return;
         }
 
+        final CoreProtectAPI coreProtect = getCoreProtectAPI();
+
         new BukkitRunnable()
         {
             @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);
     }
 
-    public File getDatabase()
+    public boolean hasHistory(Player player)
     {
+        return historyMap.containsKey(player.getUniqueId());
+    }
+
+    public FUtil.PaginationList<CoreProtectAPI.ParseResult> getHistoryForPlayer(Player player)
+    {
+        return historyMap.get(player.getUniqueId());
+    }
+
+    public void showPageToPlayer(Player player, FUtil.PaginationList<CoreProtectAPI.ParseResult> results, int pageNum)
+    {
+        if (player == null || !player.isOnline())
+        {
+            return;
+        }
+
+        List<CoreProtectAPI.ParseResult> page = results.getPage(pageNum);
+
+        if (page == null || page.isEmpty())
+        {
+            player.sendMessage(prefix.append(Component.text("No results were found.", NamedTextColor.WHITE)));
+        }
+        else
+        {
+            // This shouldn't change at all in any of the other entries, so this should be safe
+            Component location = Component.text(String.format("(%s, %s, %s)", results.get(0).getX(),
+                    results.get(0).getY(), results.get(0).getZ()));
+            final long time = System.currentTimeMillis() / 1000;
+
+            player.sendMessage(header.append(location.color(NamedTextColor.GRAY).decorate(TextDecoration.ITALIC)));
+            page.forEach(entry ->
+            {
+                TextComponent.Builder line = Component.text();
+
+                // Time
+                line.append(Component.text(Util.getTimeSince(entry.getTime(), time, false))
+                        .color(NamedTextColor.GRAY));
+
+                // Action
+                Component action = Component.text(" interacted with ");
+                Component symbol = Component.text(" - ", NamedTextColor.WHITE);
+                switch (entry.getActionId())
+                {
+                    case 0 ->
+                    {
+                        action = Component.text(" broke ");
+                        symbol = Component.text(" - ", NamedTextColor.RED);
+                    }
+                    case 1 ->
+                    {
+                        action = Component.text(" placed ");
+                        symbol = Component.text(" + ", NamedTextColor.GREEN);
+                    }
+                    case 2 -> action = Component.text(" clicked ");
+                    default ->
+                    {
+                        // Do nothing (shuts Codacy up)
+                    }
+                }
+                // Symbol, player, action, block
+                line.append(symbol).append(Component.text(entry.getPlayer()).color(TextColor.color(0x30ade4)))
+                        .append(action.color(NamedTextColor.WHITE)).append(
+                                Component.text(entry.getBlockData().getMaterial().name().toLowerCase())
+                                .color(TextColor.color(0x30ade4)));
+
+                // Rolled back?
+                if (entry.isRolledBack())
+                {
+                    line.decorate(TextDecoration.STRIKETHROUGH);
+                }
+
+                player.sendMessage(line.append(Component.text(".", NamedTextColor.WHITE)).build());
+            });
+
+            if (results.getPageCount() > 1)
+            {
+                player.sendMessage(Component.text("-----", NamedTextColor.WHITE));
+
+                // Page indicator
+                TextComponent.Builder indicator = Component.text();
+
+                // <-
+                if (pageNum > 1)
+                {
+                    indicator.append(Component.text("◀ ", NamedTextColor.WHITE).clickEvent(
+                            ClickEvent.runCommand("/ins history " + (pageNum - 1))));
+                }
+
+                // Page <current>/<total>
+                indicator.append(Component.text("Page ", TextColor.color(0x30ade4)).append(Component.text(pageNum + "/"
+                        + results.getPageCount(), NamedTextColor.WHITE)));
+
+                // ->
+                if (pageNum < results.getPageCount())
+                {
+                    indicator.append(Component.text(" ▶", NamedTextColor.WHITE).clickEvent(
+                            ClickEvent.runCommand("/ins history  " + (pageNum + 1))));
+                }
+
+                // | Use /ins history <page> for advanced navigation
+                indicator.append(Component.text(" | ", NamedTextColor.GRAY).append(Component.text("Use ", NamedTextColor.WHITE)
+                        .append(Component.text("/ins history <page>", TextColor.color(0x30ade4))
+                                .clickEvent(ClickEvent.suggestCommand("/ins history ")))
+                        .append(Component.text(" for advanced navigation", NamedTextColor.WHITE))));
+
+                player.sendMessage(indicator.build());
+            }
+        }
+    }
+
+    public CompletableFuture<FUtil.PaginationList<CoreProtectAPI.ParseResult>> lookupForPlayer(Block block, Player player)
+    {
+        cooldownMap.put(player.getUniqueId(), System.currentTimeMillis());
+        CoreProtectAPI api = getCoreProtectAPI();
+
+        return CompletableFuture.supplyAsync(() ->
+        {
+            historyMap.remove(player.getUniqueId());
+            FUtil.PaginationList<CoreProtectAPI.ParseResult> pages = new FUtil.PaginationList<>(10);
+            api.blockLookup(block, -1).forEach(stringArray -> pages.add(api.parseResult(stringArray)));
+            historyMap.put(player.getUniqueId(), pages);
+            return pages;
+        });
+    }
+
+    @EventHandler(priority = EventPriority.MONITOR)
+    public void onInteract(PlayerInteractEvent event)
+    {
+        // The inspector only works if we have CoreProtect installed
         if (!isEnabled())
-        {
-            return null;
-        }
-
-        return (new File(getCoreProtect().getDataFolder(), "database.db"));
-    }
-
-    public double getDBSize()
-    {
-        double bytes = getDatabase().length();
-        double kilobytes = (bytes / 1024);
-        double megabytes = (kilobytes / 1024);
-        return (megabytes / 1024);
-    }
-
-    // Wipes DB for the specified world
-    public void clearDatabase(World world)
-    {
-        clearDatabase(world, false);
-    }
-
-    // Wipes DB for the specified world
-    public void clearDatabase(World world, Boolean shutdown)
-    {
-        if (!ConfigEntry.COREPROTECT_MYSQL_ENABLED.getBoolean())
-        {
-            return;
-        }
-        final CoreProtect coreProtect = getCoreProtect();
-
-        if (coreProtect == null)
         {
             return;
         }
 
-        /* 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;
-        try
-        {
-            String host = ConfigEntry.COREPROTECT_MYSQL_HOST.getString();
-            String port = ConfigEntry.COREPROTECT_MYSQL_PORT.getString();
-            String username = ConfigEntry.COREPROTECT_MYSQL_USERNAME.getString();
-            String password = ConfigEntry.COREPROTECT_MYSQL_PASSWORD.getString();
-            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();
-            statement.setQueryTimeout(30);
+        Player player = event.getPlayer();
 
-            // Obtain world ID from CoreProtect database
-            ResultSet resultSet = statement.executeQuery("SELECT id FROM co_world WHERE world = '" + world.getName() + "'");
-            String worldID = null;
-            while (resultSet.next())
+        if ((event.getAction() == Action.RIGHT_CLICK_BLOCK || event.getAction() == Action.LEFT_CLICK_BLOCK)
+                && plugin.pl.getData(player.getUniqueId()).hasInspection())
         {
-                worldID = String.valueOf(resultSet.getInt("id"));
-            }
+            event.setCancelled(true);
+            Block block = event.getClickedBlock();
+            Optional<Long> cooldown = Optional.ofNullable(cooldownMap.get(player.getUniqueId()));
 
-            // Ensure the world ID is not null
-
-            if (worldID == null)
+            if (cooldown.isPresent() && getSecondsLeft(cooldown.get(), 3) > 0L)
             {
-                FLog.warning("Failed to obtain the world ID for the " + world.getName());
+                player.sendMessage(prefix.append(Component.text("You need to wait ")
+                        .append(Component.text(getSecondsLeft(cooldown.get(), 3)))
+                        .append(Component.text(" seconds before you can make another query."))
+                        .color(NamedTextColor.WHITE)));
                 return;
             }
 
-            // Iterate through each table and delete their data if the world ID matches
-            for (String table : tables)
+            // Time to do a look-up.
+            if (block != null)
             {
-                statement.executeQuery("DELETE FROM " + table + " WHERE wid = " + worldID);
+                /* This is a hack to make it so that when you right-click, the coordinates that get used depend on
+                 *  what's in your hand. Non-blocks use the block you clicked directly, but blocks use wherever the
+                 *  block was supposed to be placed. */
+                ItemStack hand = player.getInventory().getItemInMainHand();
+                if (event.getAction() == Action.RIGHT_CLICK_BLOCK && hand.getType().isBlock() && hand.getType() != Material.AIR)
+                {
+                    block = block.getRelative(event.getBlockFace()).getState().getBlock();
                 }
 
-            connection.close();
-
-        }
-        catch (SQLException e)
+                lookupForPlayer(block, player).thenAccept(results ->
                 {
-            FLog.warning("Failed to delete the CoreProtect data for the " + world.getName());
-        }
-
-        // This exits for flatlands wipes
-        if (shutdown)
+                    if (results.isEmpty())
                     {
-            server.shutdown();
+                        player.sendMessage(prefix.append(Component.text("No results were found.").color(NamedTextColor.WHITE)));
+                    }
+                    else
+                    {
+                        showPageToPlayer(player, results, 1);
+                    }
+                });
+            }
         }
     }
 }

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

@@ -6,7 +6,6 @@ import me.totalfreedom.totalfreedommod.FreedomService;
 import me.totalfreedom.totalfreedommod.player.FPlayer;
 import me.totalfreedom.totalfreedommod.rank.Rank;
 import me.totalfreedom.totalfreedommod.util.FLog;
-import me.totalfreedom.totalfreedommod.util.FUtil;
 import org.bukkit.entity.HumanEntity;
 import org.bukkit.entity.Player;
 import org.bukkit.event.EventHandler;
@@ -14,7 +13,6 @@ import org.bukkit.event.EventPriority;
 import org.bukkit.event.inventory.InventoryClickEvent;
 import org.bukkit.event.inventory.InventoryCloseEvent;
 import org.bukkit.event.inventory.InventoryType;
-import org.bukkit.event.player.PlayerQuitEvent;
 import org.bukkit.inventory.Inventory;
 import org.bukkit.inventory.InventoryHolder;
 import org.bukkit.plugin.Plugin;
@@ -42,7 +40,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;
                 }
@@ -113,7 +112,7 @@ public class EssentialsBridge extends FreedomService
             User user = getEssentialsUser(username);
             if (user != null)
             {
-                return FUtil.getField(user, "lastActivity");
+                return user.getLastOnlineActivity();
             }
         }
         catch (Exception ex)
@@ -128,7 +127,7 @@ public class EssentialsBridge extends FreedomService
         try
         {
             User user = getEssentialsUser(username);
-            if (user != null)
+            if (user != null && user.getBase().isOnline())
             {
                 user.setVanished(vanished);
             }
@@ -150,7 +149,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);
@@ -203,12 +202,6 @@ public class EssentialsBridge extends FreedomService
         }
     }
 
-    @EventHandler(priority = EventPriority.MONITOR)
-    public void onPlayerQuit(PlayerQuitEvent event)
-    {
-        Player player = event.getPlayer();
-    }
-
     public boolean isEnabled()
     {
         final Essentials ess = getEssentialsPlugin();

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

@@ -1,177 +0,0 @@
-package me.totalfreedom.totalfreedommod.bridge;
-
-import com.google.gson.Gson;
-import com.sk89q.worldedit.EditSession;
-import com.sk89q.worldedit.function.pattern.Pattern;
-import com.sk89q.worldedit.math.BlockVector3;
-import com.sk89q.worldedit.regions.Region;
-import com.sk89q.worldedit.world.block.BaseBlock;
-import java.util.AbstractMap;
-import java.util.ArrayList;
-import java.util.HashMap;
-import java.util.List;
-import java.util.Map;
-import me.totalfreedom.totalfreedommod.FreedomService;
-import net.coreprotect.CoreProtectAPI;
-import org.bukkit.Location;
-import org.bukkit.Material;
-import org.bukkit.World;
-import org.bukkit.block.Block;
-import org.bukkit.block.data.BlockData;
-
-public class FAWEBridge extends FreedomService
-{
-    private CoreProtectAPI api;
-    private World world = null;
-    private final Map<Map.Entry<String, EditSession>, Map<BlockVector3, String>> blocksBroken = new HashMap<>();
-    private final Map<Map.Entry<String, EditSession>, Map.Entry<Pattern, List<BlockVector3>>> blocksPlaced = new HashMap<>();
-
-    @Override
-    public void onStart()
-    {
-        api = plugin.cpb.getCoreProtectAPI();
-
-        /*
-         * Iterates over blocks placed by GenerationCommands (in the EditSession) and adds them to the CoreProtect logs.
-         */
-        server.getScheduler().scheduleSyncRepeatingTask(plugin, new Runnable()
-        {
-            @Override
-            public void run()
-            {
-                if (!(blocksBroken.isEmpty() && blocksPlaced.isEmpty()))
-                {
-                    // Send all broken blocks from the last ticks to the CoreProtect API.
-                    Map.Entry<String, EditSession> playerAndSessionEntry = null;
-                    for (Map.Entry<Map.Entry<String, EditSession>, Map<BlockVector3, String>> entry : blocksBroken.entrySet())
-                    {
-                        playerAndSessionEntry = entry.getKey();
-                        Map<BlockVector3, String> dataAndVectorEntry = entry.getValue();
-                        List<BlockVector3> blockVector3List = new ArrayList<>();
-                        blockVector3List.addAll(dataAndVectorEntry.keySet()); // Deep clone the block vector to avoid a change later in the code.
-
-                        for (BlockVector3 blockVector3 : blockVector3List)
-                        {
-                            if (blockVector3 != null)
-                            {
-                                EditSession editSession = playerAndSessionEntry.getValue();
-                                World world = server.getWorld(editSession.getWorld().getName());
-                                Location location = new Location(world, blockVector3.getX(), blockVector3.getY(), blockVector3.getZ());
-                                BlockData blockData = server.createBlockData(dataAndVectorEntry.get(blockVector3));
-                                api.logRemoval(playerAndSessionEntry.getKey(), location, blockData.getMaterial(), blockData);
-                            }
-                        }
-                    }
-
-                    // Clear after broken blocks have been updated.
-                    blocksBroken.values().clear();
-                    blocksBroken.putIfAbsent(playerAndSessionEntry, new HashMap<>());
-
-                    // Send all blocks placed to the CoreProtect API (except from the air as it's only a broken block).
-                    for (Map.Entry<Map.Entry<String, EditSession>, Map.Entry<Pattern, List<BlockVector3>>> entry : blocksPlaced.entrySet())
-                    {
-                        playerAndSessionEntry = entry.getKey();
-                        Map.Entry<Pattern, List<BlockVector3>> patternAndListEntry = entry.getValue();
-                        Pattern pattern = patternAndListEntry.getKey();
-                        List<BlockVector3> blockVector3List = new ArrayList<>();
-                        blockVector3List.addAll(patternAndListEntry.getValue()); // Deep clone the block vector to avoid a change later in the code.
-
-                        for (BlockVector3 blockVector3 : blockVector3List)
-                        {
-                            if (blockVector3 != null && !pattern.apply(blockVector3).getBlockType().getMaterial().isAir())
-                            {
-                                World world = server.getWorld(playerAndSessionEntry.getValue().getWorld().getName());
-                                Location location = new Location(world, blockVector3.getX(), blockVector3.getY(), blockVector3.getZ());
-                                BaseBlock block = pattern.apply(blockVector3);
-                                Material material = Material.getMaterial(block.getBlockType().getId().replaceFirst("minecraft:", "").toUpperCase());
-                                api.logPlacement(playerAndSessionEntry.getKey(), location, material, material.createBlockData());
-                            }
-                        }
-                    }
-
-                    blocksPlaced.values().forEach(collection -> collection.getValue().clear());
-                }
-            }
-        }, 0L, 40L);
-    }
-
-    @Override
-    public void onStop()
-    {
-
-    }
-
-
-    public void logBlockEdit(String playerName, EditSession editSession, Pattern pattern, BlockVector3 blockVector3)
-    {
-        // Cache the world used for the next iterations to come.
-        if (world == null || !world.getName().equals(editSession.getWorld().getName()))
-        {
-            world = server.getWorld(editSession.getWorld().getName());
-        }
-
-        Map.Entry<String, EditSession> playerAndSessionEntry = new AbstractMap.SimpleEntry(playerName, editSession);
-        Block block = world.getBlockAt(blockVector3.getBlockX(), blockVector3.getBlockY(), blockVector3.getBlockZ());
-
-        // Add the broken block to CoreProtect if it's not air.
-        if (!block.getType().isAir())
-        {
-            String blockData = block.getBlockData().getAsString();
-            blockData = new Gson().fromJson(new Gson().toJson(blockData), blockData.getClass()); // Overwrite original with deep clones.
-            blockVector3 = new Gson().fromJson(new Gson().toJson(blockVector3), blockVector3.getClass()); // Overwrite original with deep clones.
-            blocksBroken.putIfAbsent(playerAndSessionEntry, new HashMap<>());
-            blocksBroken.get(playerAndSessionEntry).put(blockVector3, blockData);
-        }
-
-        // Add the placed block to CoreProtect if it's not air.
-        if (!pattern.apply(blockVector3).getBlockType().getMaterial().isAir())
-        {
-            blocksPlaced.putIfAbsent(playerAndSessionEntry, new AbstractMap.SimpleEntry<>(pattern, new ArrayList<>()));
-            blocksPlaced.get(playerAndSessionEntry).getValue().add(new Gson().fromJson(new Gson().toJson(blockVector3), blockVector3.getClass()));
-        }
-    }
-
-    public void logBlockEdits(String playerName, EditSession editSession, Region region, Pattern pattern)
-    {
-        // Add the broken blocks to CoreProtect.
-        if (world == null || !world.getName().equals(editSession.getWorld().getName()))
-        {
-            world = server.getWorld(editSession.getWorld().getName());
-        }
-        List<Block> blocks = new ArrayList<>();
-
-        for (BlockVector3 blockVector3 : region)
-        {
-            blocks.add(world.getBlockAt(blockVector3.getBlockX(), blockVector3.getBlockY(), blockVector3.getBlockZ()));
-        }
-
-        logBlockEdit(playerName, editSession, pattern, blocks);
-    }
-
-    public void logBlockEdit(String playerName, EditSession editSession, Pattern pattern, List<Block> blocks)
-    {
-        Map.Entry<String, EditSession> playerAndSessionEntry = new AbstractMap.SimpleEntry(playerName, editSession);
-
-        server.getScheduler().scheduleSyncDelayedTask(plugin, () ->
-        {
-            for (Block block : blocks)
-            {
-                BlockVector3 blockVector3 = BlockVector3.at(block.getX(), block.getY(), block.getZ());
-
-                // Add the broken block to CoreProtect if it's not air.
-                if (!block.getType().isAir())
-                {
-                    api.logRemoval(playerAndSessionEntry.getKey(), block.getLocation(), block.getType(), block.getBlockData());
-                }
-
-                // Add the placed block to CoreProtect if it's not air.
-                BaseBlock baseBlock = pattern.apply(blockVector3);
-                if (!baseBlock.getBlockType().getMaterial().isAir())
-                {
-                    Material material = Material.getMaterial(baseBlock.getBlockType().getId().replaceFirst("minecraft:", "").toUpperCase());
-                    api.logPlacement(playerAndSessionEntry.getKey(), block.getLocation(), material, material.createBlockData());
-                }
-            }
-        }, 0L);
-    }
-}

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

@@ -46,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 staff)
+    public void undisguiseAll(boolean admin)
     {
         try
         {
@@ -78,7 +61,7 @@ public class LibsDisguisesBridge extends FreedomService
             {
                 if (DisguiseAPI.isDisguised(player))
                 {
-                    if (!staff && plugin.sl.isStaff(player))
+                    if (!admin && plugin.al.isAdmin(player))
                     {
                         continue;
                     }
@@ -92,6 +75,11 @@ public class LibsDisguisesBridge extends FreedomService
         }
     }
 
+    public boolean isDisguisesEnabled()
+    {
+        return !BlockedDisguises.disabled;
+    }
+
     public void setDisguisesEnabled(boolean state)
     {
         final LibsDisguises libsDisguises = getLibsDisguisesPlugin();
@@ -104,11 +92,6 @@ public class LibsDisguisesBridge extends FreedomService
         BlockedDisguises.disabled = !state;
     }
 
-    public boolean isDisguisesEnabled()
-    {
-        return !BlockedDisguises.disabled;
-    }
-
     public boolean isEnabled()
     {
         final LibsDisguises libsDisguises = getLibsDisguisesPlugin();

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

@@ -1,59 +0,0 @@
-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.IN_GUILD_CHAT.contains(player);
-    }
-}

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

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

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

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

src/main/java/me/totalfreedom/totalfreedommod/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,5 +1,7 @@
 package me.totalfreedom.totalfreedommod.caging;
 
+import io.papermc.lib.PaperLib;
+import java.util.Objects;
 import me.totalfreedom.totalfreedommod.FreedomService;
 import me.totalfreedom.totalfreedommod.player.FPlayer;
 import me.totalfreedom.totalfreedommod.util.FUtil;
@@ -30,8 +32,7 @@ public class Cager extends FreedomService
     public void onBreakBlock(BlockBreakEvent event)
     {
         Player player = event.getPlayer();
-        if (player == null
-                || plugin.sl.isStaff(player))
+        if (plugin.al.isAdmin(player))
         {
             return;
         }
@@ -60,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;
         }
@@ -71,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();
         }
@@ -112,5 +113,4 @@ public class Cager extends FreedomService
             cage.playerJoin();
         }
     }
-
 }

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

@@ -4,14 +4,12 @@ import java.util.ArrayList;
 import java.util.Arrays;
 import java.util.List;
 import java.util.Set;
-import lombok.Getter;
 import me.totalfreedom.totalfreedommod.FreedomService;
 import me.totalfreedom.totalfreedommod.util.FLog;
 import org.reflections.Reflections;
 
 public class CommandLoader extends FreedomService
 {
-    @Getter
     private final List<FreedomCommand> commands;
 
     public CommandLoader()
@@ -40,8 +38,10 @@ public class CommandLoader extends FreedomService
         for (FreedomCommand command : commands)
         {
             if (name.equals(command.getName()))
+            {
                 return command;
             }
+        }
         return null;
     }
 
@@ -50,8 +50,10 @@ public class CommandLoader extends FreedomService
         for (FreedomCommand command : commands)
         {
             if (Arrays.asList(command.getAliases().split(",")).contains(alias))
+            {
                 return true;
             }
+        }
         return false;
     }
 
@@ -75,4 +77,9 @@ public class CommandLoader extends FreedomService
 
         FLog.info("Loaded " + commands.size() + " commands");
     }
+
+    public List<FreedomCommand> getCommands()
+    {
+        return commands;
+    }
 }

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

@@ -7,9 +7,9 @@ import org.bukkit.command.Command;
 import org.bukkit.command.CommandSender;
 import org.bukkit.entity.Player;
 
-@CommandPermissions(level = Rank.TRIAL_MOD, source = SourceType.BOTH)
-@CommandParameters(description = "Talk privately with other staff on the server.", usage = "/<command> [message]", aliases = "o,sc")
-public class Command_staffchat extends FreedomCommand
+@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
 {
 
     @Override
@@ -19,17 +19,17 @@ public class Command_staffchat extends FreedomCommand
         {
             if (senderIsConsole)
             {
-                msg("You must be in-game to toggle staff chat, it cannot be toggled via CONSOLE or Telnet.");
+                msg("You must be in-game to toggle admin chat, it cannot be toggled via CONSOLE or Telnet.");
                 return true;
             }
 
             FPlayer userinfo = plugin.pl.getPlayer(playerSender);
-            userinfo.setStaffChat(!userinfo.inStaffChat());
-            msg("Toggled your staff chat " + (userinfo.inStaffChat() ? "on" : "off") + ".");
+            userinfo.setAdminChat(!userinfo.inAdminChat());
+            msg("Admin chat turned " + (userinfo.inAdminChat() ? "on" : "off") + ".");
         }
         else
         {
-            plugin.cm.staffChat(sender, StringUtils.join(args, " "));
+            plugin.cm.adminChat(sender, StringUtils.join(args, " "));
         }
         return true;
     }

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

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

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

@@ -6,13 +6,14 @@ import java.util.List;
 import me.totalfreedom.totalfreedommod.config.ConfigEntry;
 import me.totalfreedom.totalfreedommod.rank.Rank;
 import me.totalfreedom.totalfreedommod.util.FUtil;
+import net.kyori.adventure.text.Component;
 import org.bukkit.command.Command;
 import org.bukkit.command.CommandSender;
 import org.bukkit.entity.Player;
 
-@CommandPermissions(level = Rank.MOD, source = SourceType.BOTH)
-@CommandParameters(description = "Denies joining of operators and only allows staff members to join.", usage = "/<command> [on | off]")
-public class Command_staffmode extends FreedomCommand
+@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
 {
 
     @Override
@@ -25,21 +26,16 @@ public class Command_staffmode extends FreedomCommand
 
         if (args[0].equalsIgnoreCase("off"))
         {
-            ConfigEntry.STAFF_ONLY_MODE.setBoolean(false);
-            FUtil.staffAction(sender.getName(), "Opening the server to all players.", true);
+            ConfigEntry.ADMIN_ONLY_MODE.setBoolean(false);
+            FUtil.adminAction(sender.getName(), "Opening the server to all players", true);
             return true;
         }
         else if (args[0].equalsIgnoreCase("on"))
         {
-            ConfigEntry.STAFF_ONLY_MODE.setBoolean(true);
-            FUtil.staffAction(sender.getName(), "Closing the server to non-staff.", true);
-            for (Player player : server.getOnlinePlayers())
-            {
-                if (!isStaff(player))
-                {
-                    player.kickPlayer("Server is now closed to non-staff.");
-                }
-            }
+            ConfigEntry.ADMIN_ONLY_MODE.setBoolean(true);
+            FUtil.adminAction(sender.getName(), "Closing the server to non-admins", true);
+            server.getOnlinePlayers().stream().filter(player -> !isAdmin(player)).forEach(player ->
+                    player.kick(Component.text("The server is now closed to non-admins.")));
             return true;
         }
 
@@ -49,7 +45,7 @@ public class Command_staffmode extends FreedomCommand
     @Override
     public List<String> getTabCompleteOptions(CommandSender sender, Command command, String alias, String[] args)
     {
-        if (args.length == 1 && plugin.sl.isStaff(sender) && !(sender instanceof Player))
+        if (args.length == 1 && plugin.al.isAdmin(sender) && !(sender instanceof Player))
         {
             return Arrays.asList("on", "off");
         }

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

@@ -1,5 +1,6 @@
 package me.totalfreedom.totalfreedommod.command;
 
+import io.papermc.lib.PaperLib;
 import java.util.Arrays;
 import java.util.Collections;
 import java.util.List;
@@ -12,17 +13,12 @@ import org.bukkit.command.CommandSender;
 import org.bukkit.entity.Player;
 
 @CommandPermissions(level = Rank.OP, source = SourceType.BOTH)
-@CommandParameters(description = "Allows for staff to configure time, and weather of the StaffWorld, and allows for staff and ops to go to the StaffWorld.",
+@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")
-public class Command_staffworld extends FreedomCommand
+        aliases = "sw,aw,staffworld")
+public class Command_adminworld extends FreedomCommand
 {
 
-    private enum CommandMode
-    {
-        TELEPORT, TIME, WEATHER
-    }
-
     @Override
     public boolean run(CommandSender sender, Player playerSender, Command cmd, String commandLabel, String[] args, boolean senderIsConsole)
     {
@@ -60,24 +56,24 @@ public class Command_staffworld extends FreedomCommand
                         return false;
                     }
 
-                    World staffWorld = null;
+                    World adminWorld = null;
                     try
                     {
-                        staffWorld = plugin.wm.staffworld.getWorld();
+                        adminWorld = plugin.wm.adminworld.getWorld();
                     }
-                    catch (Exception ex)
+                    catch (Exception ignored)
                     {
                     }
 
-                    if (staffWorld == null || playerSender.getWorld() == staffWorld)
+                    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
                     {
-                        msg("Going to the StaffWorld.");
-                        plugin.wm.staffworld.sendToWorld(playerSender);
+                        msg("Going to the AdminWorld.");
+                        plugin.wm.adminworld.sendToWorld(playerSender);
                     }
                     break;
                 }
@@ -90,8 +86,8 @@ public class Command_staffworld extends FreedomCommand
                         WorldTime timeOfDay = WorldTime.getByAlias(args[1]);
                         if (timeOfDay != null)
                         {
-                            plugin.wm.staffworld.setTimeOfDay(timeOfDay);
-                            msg("StaffWorld time set to: " + timeOfDay.name());
+                            plugin.wm.adminworld.setTimeOfDay(timeOfDay);
+                            msg("AdminWorld time set to: " + timeOfDay.name());
                         }
                         else
                         {
@@ -114,8 +110,8 @@ public class Command_staffworld extends FreedomCommand
                         WorldWeather weatherMode = WorldWeather.getByAlias(args[1]);
                         if (weatherMode != null)
                         {
-                            plugin.wm.staffworld.setWeatherMode(weatherMode);
-                            msg("StaffWorld weather set to: " + weatherMode.name());
+                            plugin.wm.adminworld.setWeatherMode(weatherMode);
+                            msg("AdminWorld weather set to: " + weatherMode.name());
                         }
                         else
                         {
@@ -141,7 +137,7 @@ public class Command_staffworld extends FreedomCommand
             {
                 return noPerms();
             }
-            sender.sendMessage(ex.getMessage());
+            msg(ex.getMessage());
             return true;
         }
 
@@ -151,32 +147,16 @@ public class Command_staffworld extends FreedomCommand
     // TODO: Redo this properly
     private void assertCommandPerms(CommandSender sender, Player playerSender) throws PermissionDeniedException
     {
-        if (!(sender instanceof Player) || playerSender == null || !isStaff(sender))
+        if (!(sender instanceof Player) || playerSender == null || !isAdmin(sender))
         {
             throw new PermissionDeniedException();
         }
     }
 
-    private class PermissionDeniedException extends Exception
-    {
-
-        private static final long serialVersionUID = 1L;
-
-        private PermissionDeniedException()
-        {
-            super("");
-        }
-
-        private PermissionDeniedException(String string)
-        {
-            super(string);
-        }
-    }
-
     @Override
     public List<String> getTabCompleteOptions(CommandSender sender, Command command, String alias, String[] args)
     {
-        if (!plugin.sl.isStaff(sender))
+        if (!plugin.al.isAdmin(sender))
         {
             return Collections.emptyList();
         }
@@ -197,4 +177,25 @@ public class Command_staffworld extends FreedomCommand
         }
         return Collections.emptyList();
     }
+
+    private enum CommandMode
+    {
+        TELEPORT, TIME, WEATHER
+    }
+
+    private static class PermissionDeniedException extends Exception
+    {
+
+        private static final long serialVersionUID = 1L;
+
+        private PermissionDeniedException()
+        {
+            super("");
+        }
+
+        private PermissionDeniedException(String string)
+        {
+            super(string);
+        }
+    }
 }

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.TRIAL_MOD);
+        checkRank(Rank.ADMIN);
 
         if (args[0].equals("-a"))
         {
@@ -37,7 +37,7 @@ public class Command_adventure extends FreedomCommand
                 targetPlayer.setGameMode(GameMode.ADVENTURE);
             }
 
-            FUtil.staffAction(sender.getName(), "Changing everyone's gamemode to adventure", false);
+            FUtil.adminAction(sender.getName(), "Changing everyone's gamemode to adventure", false);
             msg("Your gamemode has been set to adventure.");
             return true;
         }
@@ -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.TRIAL_MOD, 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.staffAction(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_amp.java

@@ -1,101 +0,0 @@
-package me.totalfreedom.totalfreedommod.command;
-
-import java.util.Arrays;
-import java.util.Collections;
-import java.util.List;
-import me.totalfreedom.totalfreedommod.player.PlayerData;
-import me.totalfreedom.totalfreedommod.rank.Rank;
-import me.totalfreedom.totalfreedommod.staff.StaffMember;
-import me.totalfreedom.totalfreedommod.util.FUtil;
-import org.bukkit.ChatColor;
-import org.bukkit.command.Command;
-import org.bukkit.command.CommandSender;
-import org.bukkit.entity.Player;
-
-@CommandPermissions(level = Rank.ADMIN, source = SourceType.ONLY_IN_GAME)
-@CommandParameters(description = "Manage your AMP account", usage = "/<command> <create | resetpassword>")
-public class Command_amp extends FreedomCommand
-{
-
-    @Override
-    public boolean run(CommandSender sender, Player playerSender, Command cmd, String commandLabel, String[] args, boolean senderIsConsole)
-    {
-
-        if (!plugin.amp.isEnabled())
-        {
-            msg("AMP integration is currently disabled.", ChatColor.RED);
-            return true;
-        }
-
-        PlayerData playerData = getData(playerSender);
-
-        if (playerData.getDiscordID() == null)
-        {
-            msg("You must have a linked discord account.", ChatColor.RED);
-            return true;
-        }
-
-        if (args.length == 0)
-        {
-            return false;
-        }
-
-        if (args[0].equals("create"))
-        {
-            msg("Creating your AMP account...", ChatColor.GREEN);
-            StaffMember staffMember = getAdmin(playerSender);
-
-            if (staffMember.getAmpUsername() != null)
-            {
-                msg("You already have an AMP account.", ChatColor.RED);
-                return true;
-            }
-
-            String username = sender.getName();
-            String password = FUtil.randomString(30);
-
-            staffMember.setAmpUsername(username);
-            plugin.sl.save(staffMember);
-            plugin.sl.updateTables();
-
-            plugin.amp.createAccount(username, password);
-            plugin.dc.sendAMPInfo(playerData, username, password);
-            msg("Successfully created your AMP account. Check your DMs from " + plugin.dc.formatBotTag() + " on discord to get your credentials.", ChatColor.GREEN);
-            return true;
-        }
-        else if (args[0].equals("resetpassword"))
-        {
-            StaffMember staffMember = getAdmin(playerSender);
-
-            if (staffMember.getAmpUsername() == null)
-            {
-                msg("You do not have an AMP account.", ChatColor.RED);
-                return true;
-            }
-
-            msg("Resetting your password...", ChatColor.GREEN);
-
-            String username = staffMember.getAmpUsername();
-            String password = FUtil.randomString(30);
-            plugin.amp.setPassword(username,password);
-            plugin.dc.sendAMPInfo(playerData, username, password);
-
-            msg("Successfully reset your AMP account password. Check your DMs from " + plugin.dc.formatBotTag() + " on discord to get your credentials.", ChatColor.GREEN);
-            return true;
-        }
-
-        return false;
-    }
-
-    @Override
-    public List<String> getTabCompleteOptions(CommandSender sender, Command command, String alias, String[] args)
-    {
-        if (args.length == 1 && plugin.sl.isAdmin(sender))
-        {
-            return Arrays.asList("create", "resetpassword");
-        }
-
-        return Collections.emptyList();
-    }
-
-}

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

@@ -6,7 +6,7 @@ import org.bukkit.command.Command;
 import org.bukkit.command.CommandSender;
 import org.bukkit.entity.Player;
 
-@CommandPermissions(level = Rank.MOD, 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
 {
@@ -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

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

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

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

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

@@ -1,7 +1,8 @@
 package me.totalfreedom.totalfreedommod.command;
 
-import java.util.ArrayList;
-import java.util.List;
+import java.util.Objects;
+
+import com.earth2me.essentials.User;
 import me.totalfreedom.totalfreedommod.banning.Ban;
 import me.totalfreedom.totalfreedommod.player.PlayerData;
 import me.totalfreedom.totalfreedommod.punishments.Punishment;
@@ -18,7 +19,7 @@ import org.bukkit.command.Command;
 import org.bukkit.command.CommandSender;
 import org.bukkit.entity.Player;
 
-@CommandPermissions(level = Rank.TRIAL_MOD, source = SourceType.BOTH, blockHostConsole = true)
+@CommandPermissions(level = Rank.ADMIN, source = SourceType.BOTH, blockHostConsole = true)
 @CommandParameters(description = "Bans the specified player.", usage = "/<command> <username> [reason] [-nrb | -q]", aliases = "gtfo")
 public class Command_ban extends FreedomCommand
 {
@@ -31,8 +32,8 @@ public class Command_ban extends FreedomCommand
         }
 
         String reason = null;
-        Boolean silent = false;
-        Boolean cancelRollback = false;
+        boolean silent = false;
+        boolean cancelRollback = false;
         if (args.length >= 2)
         {
             if (args[args.length - 1].equalsIgnoreCase("-nrb") || args[args.length - 1].equalsIgnoreCase("-q"))
@@ -59,28 +60,39 @@ public class Command_ban extends FreedomCommand
         }
 
         final String username;
-        final List<String> ips = new ArrayList<>();
+        final String ip;
 
         final Player player = getPlayer(args[0]);
         if (player == null)
         {
-            final PlayerData entry = plugin.pl.getData(args[0]);
-
+            // Gets the IP using Essentials data if available
+            if (plugin.esb.isEnabled() && plugin.esb.getEssentialsUser(args[0]) != null)
+            {
+                User essUser = plugin.esb.getEssentialsUser(args[0]);
+                //
+                username = essUser.getName();
+                ip = essUser.getLastLoginAddress();
+            }
+            // Last resort - Getting the first result from the username itself
+            else
+            {
+                PlayerData entry = plugin.pl.getData(args[0]);
                 if (entry == null)
                 {
-                msg("Can't find that user. If target is not logged in, make sure that you spelled the name exactly.");
+                    msg(PLAYER_NOT_FOUND);
                     return true;
                 }
-
-            username = entry.getName();
-            ips.addAll(entry.getIps());
-        }
                 else
                 {
-            final PlayerData entry = plugin.pl.getData(player);
+                    username = entry.getName();
+                    ip = entry.getIps().get(0);
+                }
+            }
+        }
+        else
+        {
             username = player.getName();
-            //ips.addAll(entry.getIps());/
-            ips.add(FUtil.getIp(player));
+            ip = FUtil.getIp(player);
 
             // Deop
             player.setOp(false);
@@ -100,7 +112,7 @@ public class Command_ban extends FreedomCommand
                     for (int z = -1; z <= 1; z++)
                     {
                         final Location strike_pos = new Location(targetPos.getWorld(), targetPos.getBlockX() + x, targetPos.getBlockY(), targetPos.getBlockZ() + z);
-                        targetPos.getWorld().strikeLightning(strike_pos);
+                        Objects.requireNonNull(targetPos.getWorld()).strikeLightning(strike_pos);
                     }
                 }
             }
@@ -125,7 +137,6 @@ public class Command_ban extends FreedomCommand
 
         // Ban player
         Ban ban;
-
         if (player != null)
         {
             ban = Ban.forPlayer(player, sender, null, reason);
@@ -134,12 +145,8 @@ public class Command_ban extends FreedomCommand
         {
             ban = Ban.forPlayerName(username, sender, null, reason);
         }
-
-        for (String ip : ips)
-        {
         ban.addIp(ip);
-            ban.addIp(FUtil.getFuzzyIp(ip));
-        }
+
         plugin.bm.addBan(ban);
 
 
@@ -153,8 +160,8 @@ public class Command_ban extends FreedomCommand
             {
                 bcast.append(" - Reason: ").append(ChatColor.YELLOW).append(reason);
             }
-            msg(sender, ChatColor.GRAY + username + " has been banned and IP is: " + StringUtils.join(ips, ", "));
-            FUtil.staffAction(sender.getName(), String.format(bcast.toString()), true);
+            msg(sender, ChatColor.GRAY + username + " has been banned and IP is: " + ip);
+            FUtil.adminAction(sender.getName(), bcast.toString(), true);
         }
 
         // Kick player and handle others on IP
@@ -171,7 +178,7 @@ public class Command_ban extends FreedomCommand
         }
 
         // Log ban
-        plugin.pul.logPunishment(new Punishment(username, ips.get(0), sender.getName(), PunishmentType.BAN, reason));
+        plugin.pul.logPunishment(new Punishment(username, ip, sender.getName(), PunishmentType.BAN, reason));
 
         return true;
     }

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

@@ -11,7 +11,7 @@ import org.bukkit.command.Command;
 import org.bukkit.command.CommandSender;
 import org.bukkit.entity.Player;
 
-@CommandPermissions(level = Rank.TRIAL_MOD, source = SourceType.BOTH, blockHostConsole = true)
+@CommandPermissions(level = Rank.ADMIN, source = SourceType.BOTH, blockHostConsole = true)
 @CommandParameters(description = "Bans the specified ip.", usage = "/<command> <ip> [reason] [-q]")
 public class Command_banip extends FreedomCommand
 {
@@ -30,7 +30,7 @@ public class Command_banip extends FreedomCommand
 
         String ip = args[0];
 
-        if (!FUtil.isValidIPv4(ip))
+        if (FUtil.isValidIPv4(ip))
         {
             msg(ip + " is not a valid IP address", ChatColor.RED);
             return true;
@@ -72,8 +72,8 @@ public class Command_banip extends FreedomCommand
             {
                 // Broadcast
                 FLog.info(ChatColor.RED + sender.getName() + " - Banned the IP " + ip);
-                String message = ChatColor.RED + sender.getName() + " - Banned " + (plugin.sl.isStaff(player) ? "the IP " + ip : "an IP");
-                player.sendMessage(message);
+                String message = sender.getName() + " - Banned " + (plugin.al.isAdmin(player) ? "the IP " + ip : "an IP");
+                msg(player, message, ChatColor.RED);
             }
         }
 

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

@@ -18,9 +18,9 @@ public class Command_banlist extends FreedomCommand
         {
             if (args[0].equalsIgnoreCase("purge"))
             {
-                checkRank(Rank.ADMIN);
+                checkRank(Rank.SENIOR_ADMIN);
 
-                FUtil.staffAction(sender.getName(), "Purging the ban list", true);
+                FUtil.adminAction(sender.getName(), "Purging the ban list", true);
                 int amount = plugin.bm.purge();
                 msg("Purged " + amount + " player bans.");
                 return true;

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

@@ -10,7 +10,7 @@ import org.bukkit.command.Command;
 import org.bukkit.command.CommandSender;
 import org.bukkit.entity.Player;
 
-@CommandPermissions(level = Rank.TRIAL_MOD, source = SourceType.BOTH, blockHostConsole = true)
+@CommandPermissions(level = Rank.ADMIN, source = SourceType.BOTH, blockHostConsole = true)
 @CommandParameters(description = "Bans the specified name.", usage = "/<command> <name> [reason] [-q]")
 public class Command_banname extends FreedomCommand
 {
@@ -27,7 +27,7 @@ public class Command_banname extends FreedomCommand
 
         String reason = null;
 
-        String name = args[0];;
+        String name = args[0];
 
         if (plugin.bm.getByUsername(name) != null)
         {
@@ -55,7 +55,7 @@ public class Command_banname extends FreedomCommand
 
         if (!silent)
         {
-            FUtil.staffAction(sender.getName(), "Banned the name " + name, true);
+            FUtil.adminAction(sender.getName(), "Banned the name " + name, true);
         }
 
         Player player = getPlayer(name);