Merge pull request #283 from TFPatches/development

October 2020 Update

.github/workflows/codacy-analysis.yml

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

.github/workflows/codeql-analysis.yml

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

.github/workflows/maven.yml

@@ -1,4 +1,4 @@
-name: Maven-Build
+name: Java CI
 
 on: [push]
 

.gitignore

@@ -37,4 +37,3 @@ manifest.mf
 .Trashes
 ehthumbs.db
 Thumbs.db
-.idea/inspectionProfiles/Project_Default.xml

.idea/codeStyles/Project.xml

@@ -9,6 +9,24 @@
         </value>
       </option>
     </JavaCodeStyleSettings>
+    <JetCodeStyleSettings>
+      <option name="PACKAGES_TO_USE_STAR_IMPORTS">
+        <value>
+          <package name="java.util" alias="false" withSubpackages="false" />
+          <package name="kotlinx.android.synthetic" alias="false" withSubpackages="true" />
+          <package name="io.ktor" alias="false" withSubpackages="true" />
+        </value>
+      </option>
+      <option name="PACKAGES_IMPORT_LAYOUT">
+        <value>
+          <package name="" alias="false" withSubpackages="true" />
+          <package name="java" alias="false" withSubpackages="true" />
+          <package name="javax" alias="false" withSubpackages="true" />
+          <package name="kotlin" alias="false" withSubpackages="true" />
+          <package name="" alias="true" withSubpackages="true" />
+        </value>
+      </option>
+    </JetCodeStyleSettings>
     <codeStyleSettings language="JAVA">
       <option name="BRACE_STYLE" value="2" />
       <option name="CLASS_BRACE_STYLE" value="2" />

.travis.yml

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

Jenkinsfile

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

README.md

@@ -1,6 +1,6 @@
-# TotalFreedomMod [![Build Status](https://travis-ci.com/AtlasMediaGroup/TotalFreedomMod.svg?branch=development)](https://travis-ci.com/AtlasMediaGroup/TotalFreedomMod) [![Codacy Badge](https://app.codacy.com/project/badge/Grade/29c0f964da304666bd654bc7b1d556db)](https://www.codacy.com/gh/AtlasMediaGroup/TotalFreedomMod/dashboard?utm_source=github.com&utm_medium=referral&utm_content=AtlasMediaGroup/TotalFreedomMod&utm_campaign=Badge_Grade)
+# TotalFreedomMod [![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 is a CraftBukkit server plugin designed primarily to support the [Official TotalFreedom Minecraft Server](https://totalfreedom.me/). However, you are more than welcome to adapt the source for your own server.
+TotalFreedomMod is a CraftBukkit server plugin designed primarily to support the [Official TotalFreedom Minecraft Server](http://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.
 
@@ -9,8 +9,6 @@ Please see [CONTRIBUTING.md](CONTRIBUTING.md) if you are interested in developin
 
 For information on how TotalFreedomMod is licensed, please see [LICENSE.md](LICENSE.md).
 
-For information on our security policy and reporting an issue, please see [SECURITY.md](SECURITY.md)
-
 ### Compiling ###
 
 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.

SECURITY.md

@@ -1,20 +0,0 @@
-# Security Policy
-
-## Supported Versions
-
-We currently support the code running on the "development" branch of this repository. This is supported in addition to those formal releases, but note anything not yet released should be treated as in-development.
-
-In terms of plugin releases, we support the following versions:
-
-| Version | Supported          |
-| ------- | ------------------ |
-| 2020.11   | :white_check_mark: |
-| 6.0.x (Pre-Release)  | :x:                |
-| < 2020.11  | :x:                |
-| < 5.x  | :x:                |
-
-## 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

@@ -91,7 +91,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][0-9]?)$|([A-Z][a-zA-Z0-9]*[T]$)"/>
             <message key="name.invalidPattern"
                      value="Class type name ''{0}'' must match pattern ''{1}''."/>
         </module>
@@ -133,4 +133,4 @@
         </module>
         <module name="CommentsIndentation"/>
     </module>
-</module>
+</module>

pom.xml

@@ -5,12 +5,12 @@
 
     <groupId>me.totalfreedom</groupId>
     <artifactId>TotalFreedomMod</artifactId>
-    <version>2021.02-RC01</version>
+    <version>2020.10</version>
     <packaging>jar</packaging>
 
     <properties>
         <project.build.sourceEncoding>UTF-8</project.build.sourceEncoding>
-        <tfm.build.codename>Phoenix</tfm.build.codename>
+        <tfm.build.codename>Antaeus</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/AtlasMediaGroup/TotalFreedomMod</url>
+    <url>https://github.com/TFPatches/TotalFreedomMod</url>
 
     <licenses>
         <license>
@@ -66,12 +66,12 @@
 
         <repository>
             <id>elmakers-repo</id>
-            <url>https://maven.elmakers.com/repository/</url>
+            <url>http://maven.elmakers.com/repository/</url>
         </repository>
 
         <repository>
             <id>sk89q-snapshots</id>
-            <url>https://maven.sk89q.com/artifactory/repo</url>
+            <url>http://maven.sk89q.com/artifactory/repo</url>
         </repository>
 
         <repository>
@@ -87,17 +87,17 @@
 
         <repository>
             <id>md_5-public</id>
-            <url>https://repo.md-5.net/content/groups/public/</url>
+            <url>http://repo.md-5.net/content/groups/public/</url>
         </repository>
 
         <repository>
             <id>dmulloy2-repo</id>
-            <url>https://repo.dmulloy2.net/nexus/repository/public/</url>
+            <url>http://repo.dmulloy2.net/nexus/repository/public/</url>
         </repository>
 
         <repository>
             <id>sk89q-repo</id>
-            <url>https://maven.sk89q.com/repo/</url>
+            <url>http://maven.sk89q.com/repo/</url>
         </repository>
 
         <repository>
@@ -117,11 +117,17 @@
     </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.8.0</version>
+            <version>2.7</version>
             <scope>compile</scope>
         </dependency>
 
@@ -135,84 +141,70 @@
         <dependency>
             <groupId>commons-codec</groupId>
             <artifactId>commons-codec</artifactId>
-            <version>1.15</version>
-            <scope>compile</scope>
-        </dependency>
-
-        <dependency>
-            <groupId>com.github.speedxx</groupId>
-            <artifactId>Mojangson</artifactId>
-            <version>1957eef8d6</version>
-            <scope>compile</scope>
-        </dependency>
-
-        <dependency>
-            <groupId>org.bstats</groupId>
-            <artifactId>bstats-bukkit</artifactId>
-            <version>1.8</version>
+            <version>1.14</version>
             <scope>compile</scope>
         </dependency>
 
         <dependency>
             <groupId>org.spigotmc</groupId>
             <artifactId>spigot</artifactId>
-            <version>1.16.5-R0.1-SNAPSHOT</version>
+            <version>1.16.2-R0.1-SNAPSHOT</version>
             <scope>provided</scope>
         </dependency>
 
         <dependency>
-            <groupId>com.github.TotalFreedomMC</groupId>
+            <groupId>com.github.TotalFreedom</groupId>
             <artifactId>BukkitTelnet</artifactId>
-            <version>541e9fdb84</version>
+            <version>4.5-pre1</version>
             <scope>provided</scope>
         </dependency>
 
         <dependency>
-            <groupId>com.github.TotalFreedomMC</groupId>
+            <groupId>com.github.TFPatches</groupId>
             <artifactId>TF-LibsDisguises</artifactId>
-            <version>48f01cf2fe</version>
+            <version>0cfa32159a</version>
             <scope>provided</scope>
         </dependency>
 
         <dependency>
             <groupId>com.sk89q.worldedit</groupId>
             <artifactId>worldedit-bukkit</artifactId>
-            <version>7.3.0-SNAPSHOT</version>
+            <version>7.1.0</version>
             <scope>provided</scope>
         </dependency>
 
         <dependency>
             <groupId>net.ess3</groupId>
             <artifactId>EssentialsX</artifactId>
-            <version>2.18.2</version>
+            <version>2.18.1</version>
             <scope>provided</scope>
         </dependency>
 
         <dependency>
             <groupId>net.dv8tion</groupId>
             <artifactId>JDA</artifactId>
-            <version>4.2.0_224</version>
+            <version>4.2.0_168</version>
             <scope>provided</scope>
         </dependency>
 
         <dependency>
             <groupId>net.coreprotect</groupId>
             <artifactId>coreprotect</artifactId>
-            <version>19.3</version>
+            <version>19.1</version>
             <scope>provided</scope>
         </dependency>
 
         <dependency>
             <groupId>com.sk89q.worldguard</groupId>
             <artifactId>worldguard-bukkit</artifactId>
-            <version>7.0.4</version>
+            <version>7.0.3</version>
             <scope>provided</scope>
         </dependency>
 
         <dependency>
             <groupId>io.papermc</groupId>
             <artifactId>paperlib</artifactId>
-            <version>1.0.6</version>
+            <version>1.0.5</version>
             <scope>compile</scope>
         </dependency>
 
@@ -240,21 +232,19 @@
         <dependency>
             <groupId>org.reflections</groupId>
             <artifactId>reflections</artifactId>
-            <version>0.9.12</version>
-            <scope>compile</scope>
+            <version>0.9.11</version>
         </dependency>
 
         <dependency>
-            <groupId>org.javassist</groupId>
+            <groupId>javassist</groupId>
             <artifactId>javassist</artifactId>
-            <version>3.27.0-GA</version>
-            <scope>compile</scope>
+            <version>3.12.1.GA</version>
         </dependency>
 
         <dependency>
-            <groupId>com.github.TotalFreedomMC</groupId>
+            <groupId>com.github.TFPatches</groupId>
             <artifactId>TFGuilds</artifactId>
-            <version>db036fb187</version>
+            <version>ad93b9ed00</version>
             <scope>provided</scope>
         </dependency>
 
@@ -262,7 +252,13 @@
             <groupId>org.apache.maven.plugins</groupId>
             <artifactId>maven-checkstyle-plugin</artifactId>
             <version>3.1.1</version>
-            <scope>compile</scope>
+        </dependency>
+
+        <dependency>
+            <groupId>net.dean.jraw</groupId>
+            <artifactId>JRAW</artifactId>
+            <version>1.1.0</version>
+            <scope>provided</scope>
         </dependency>
     </dependencies>
 
@@ -423,10 +419,6 @@
                                     <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>
@@ -434,11 +426,9 @@
                                     <include>org.apache.commons:commons-lang3</include>
                                     <include>commons-codec:commons-codec</include>
                                     <include>org.reflections:reflections</include>
-                                    <include>org.javassist:javassist</include>
+                                    <include>javassist:javassist</include>
                                     <include>me.rayzr522:jsonmessage</include>
                                     <include>io.papermc:paperlib</include>
-                                    <include>com.github.speedxx:Mojangson</include>
-                                    <include>org.bstats:bstats-bukkit</include>
                                 </includes>
                             </artifactSet>
                         </configuration>
@@ -465,4 +455,4 @@
             </plugin>
         </plugins>
     </reporting>
-</project>
+</project>

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

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

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

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

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

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

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

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

@@ -3,6 +3,7 @@ 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;
@@ -12,8 +13,11 @@ 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;
 
@@ -76,23 +80,4 @@ 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

@@ -42,6 +42,7 @@ public class AntiNuke extends FreedomService
             fPlayer.resetBlockDestroyCount();
 
             event.setCancelled(true);
+            return;
         }
     }
 

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

@@ -20,9 +20,9 @@ public class AntiSpam extends FreedomService
 
     public static final int MSG_PER_CYCLE = 8;
     public static final int TICKS_PER_CYCLE = 2 * 10;
+    List<Player> markedForDeath = new ArrayList<>();
     //
     public BukkitTask cycleTask = null;
-    List<Player> markedForDeath = new ArrayList<>();
 
     @Override
     public void onStart()
@@ -62,7 +62,7 @@ public class AntiSpam extends FreedomService
     {
         final Player player = event.getPlayer();
 
-        if (plugin.al.isAdmin(player))
+        if (plugin.sl.isStaff(player))
         {
             return;
         }
@@ -73,7 +73,7 @@ public class AntiSpam extends FreedomService
 
         // Check for spam
         if (playerdata.incrementAndGetMsgCount() > MSG_PER_CYCLE)
-        {
+        {   
             if (!markedForDeath.contains(player))
             {
                 markedForDeath.add(player);
@@ -84,13 +84,14 @@ public class AntiSpam extends FreedomService
 
                 event.setCancelled(true);
             }
+            return;
         }
         else if (playerdata.incrementAndGetMsgCount() > MSG_PER_CYCLE / 2)
         {
             FUtil.playerMsg(player, "Please refrain from spamming chat.", ChatColor.GRAY);
             event.setCancelled(true);
         }
-
+        
     }
 
     @EventHandler(priority = EventPriority.LOW)
@@ -108,7 +109,7 @@ public class AntiSpam extends FreedomService
             return;
         }
 
-        if (plugin.al.isAdmin(player))
+        if (plugin.sl.isStaff(player))
         {
             return;
         }
@@ -126,6 +127,10 @@ public class AntiSpam extends FreedomService
     @EventHandler(priority = EventPriority.NORMAL)
     public void onPlayerKick(PlayerKickEvent event)
     {
-        markedForDeath.remove(event.getPlayer());
+        if (markedForDeath.contains(event.getPlayer()))
+        {
+            markedForDeath.remove(event.getPlayer());
+        }
     }
-}
+
+}

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

@@ -43,7 +43,11 @@ public class AutoEject extends FreedomService
 
         ejects.put(ip, kicks);
 
-        if (kicks == 2)
+        if (kicks <= 1)
+        {
+            method = EjectMethod.STRIKE_ONE;
+        }
+        else if (kicks == 2)
         {
             method = EjectMethod.STRIKE_TWO;
         }
@@ -97,9 +101,10 @@ public class AutoEject extends FreedomService
         }
     }
 
-    public enum EjectMethod
+    public static enum EjectMethod
     {
-        STRIKE_ONE, STRIKE_TWO, STRIKE_THREE
+
+        STRIKE_ONE, STRIKE_TWO, STRIKE_THREE;
     }
 
 }

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

@@ -46,10 +46,9 @@ public class AutoKick extends FreedomService
 
     private void autoKickCheck()
     {
-        // No type cast was provided, one has been supplied.
         final boolean doAwayKickCheck
                 = plugin.esb.isEnabled()
-                && (((float)server.getOnlinePlayers().size() / (float)server.getMaxPlayers()) > autoKickThreshold);
+                && ((server.getOnlinePlayers().size() / server.getMaxPlayers()) > autoKickThreshold);
 
         if (!doAwayKickCheck)
         {

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

@@ -1,11 +1,11 @@
 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;
@@ -49,7 +49,7 @@ public class ChatManager extends FreedomService
     {
         final Player player = event.getPlayer();
         String message = event.getMessage().trim();
-
+        
         // Format colors and strip &k
         message = FUtil.colorize(message);
         message = message.replaceAll(ChatColor.MAGIC.toString(), "&k");
@@ -65,7 +65,7 @@ public class ChatManager extends FreedomService
             return;
         }
 
-        if (!ConfigEntry.TOGGLE_CHAT.getBoolean() && !plugin.al.isAdmin(player))
+        if (!ConfigEntry.TOGGLE_CHAT.getBoolean() && !plugin.sl.isStaff(player))
         {
             event.setCancelled(true);
             playerMsg(player, "Chat is currently disabled.", org.bukkit.ChatColor.RED);
@@ -87,17 +87,17 @@ public class ChatManager extends FreedomService
             return;
         }
 
-        // Check for adminchat
-        if (fPlayer.inAdminChat())
+        // Check for staffchat
+        if (fPlayer.inStaffChat())
         {
-            FSync.adminChatMessage(player, message);
+            FSync.staffChatMessage(player, message);
             event.setCancelled(true);
             return;
         }
 
         // Check for 4chan trigger
-        boolean green = ChatColor.stripColor(message).toLowerCase().startsWith(">");
-        boolean orange = ChatColor.stripColor(message).toLowerCase().endsWith("<");
+        Boolean green = ChatColor.stripColor(message).toLowerCase().startsWith(">");
+        Boolean orange = ChatColor.stripColor(message).toLowerCase().endsWith("<");
         if (ConfigEntry.FOURCHAN_ENABLED.getBoolean())
         {
             if (green)
@@ -121,9 +121,9 @@ public class ChatManager extends FreedomService
         {
             format = tag.replace("%", "%%") + " " + format;
         }
-
+        
         // Check for mentions
-        boolean mentionEveryone = ChatColor.stripColor(message).toLowerCase().contains("@everyone") && plugin.al.isAdmin(player);
+        Boolean mentionEveryone = ChatColor.stripColor(message).toLowerCase().contains("@everyone") && plugin.sl.isStaff(player);
         for (Player p : server.getOnlinePlayers())
         {
             if (ChatColor.stripColor(message).toLowerCase().contains("@" + p.getName().toLowerCase()) || mentionEveryone)
@@ -136,15 +136,16 @@ public class ChatManager extends FreedomService
         event.setFormat(format);
 
         // Send to discord
-        if (!ConfigEntry.ADMIN_ONLY_MODE.getBoolean() && !Bukkit.hasWhitelist() && !plugin.pl.getPlayer(player).isMuted() && !plugin.tfg.inGuildChat(player))
+        if (!ConfigEntry.STAFF_ONLY_MODE.getBoolean() && !Bukkit.hasWhitelist() && !plugin.pl.getPlayer(player).isMuted() && !plugin.tfg.inGuildChat(player))
         {
-            plugin.dc.messageChatChannel(player.getName() + " \u00BB " + ChatColor.stripColor(message));
+            plugin.dc.messageChatChannel(plugin.dc.deformat(player.getName()) + " \u00BB " + ChatColor.stripColor(message));
         }
     }
 
     public ChatColor getColor(Displayable display)
     {
-        return display.getColor();
+        ChatColor color = display.getColor();
+        return color;
     }
 
     public String getColoredTag(Displayable display)
@@ -153,27 +154,26 @@ public class ChatManager extends FreedomService
         return color + display.getAbbr();
     }
 
-    public void adminChat(CommandSender sender, String message)
+    public void staffChat(CommandSender sender, String message)
     {
         Displayable display = plugin.rm.getDisplay(sender);
-        FLog.info("[ADMIN] " + sender.getName() + " " + display.getTag() + ": " + message, true);
-        plugin.dc.messageAdminChatChannel(sender.getName() + " \u00BB " + message);
+        FLog.info("[STAFF] " + sender.getName() + " " + display.getTag() + ": " + message, true);
 
         for (Player player : server.getOnlinePlayers())
         {
-            if (plugin.al.isAdmin(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 = admin.getAcFormat();
+                    String format = staffMember.getAcFormat();
                     ChatColor color = getColor(display);
                     String msg = format.replace("%name%", sender.getName()).replace("%rank%", display.getAbbr()).replace("%rankcolor%", color.toString()).replace("%msg%", message);
                     player.sendMessage(FUtil.colorize(msg));
                 }
                 else
                 {
-                    player.sendMessage("[" + ChatColor.AQUA + "ADMIN" + ChatColor.WHITE + "] " + ChatColor.DARK_RED + sender.getName() + ChatColor.DARK_GRAY + " [" + getColoredTag(display) + ChatColor.DARK_GRAY + "]" + ChatColor.WHITE + ": " + ChatColor.GOLD + FUtil.colorize(message));
+                    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));
                 }
             }
         }
@@ -183,11 +183,11 @@ public class ChatManager extends FreedomService
     {
         for (Player player : server.getOnlinePlayers())
         {
-            if (plugin.al.isAdmin(player))
+            if (plugin.sl.isStaff(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);
             }
         }
-        FLog.info("[REPORTS] " + reporter.getName() + " has reported " + reported.getName() + " for " + report);
     }
 }

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

@@ -23,13 +23,12 @@ public class CommandSpy extends FreedomService
     {
         for (Player player : server.getOnlinePlayers())
         {
-            if (plugin.al.isAdmin(player) && plugin.al.getAdmin(player).getCommandSpy())
+            if (plugin.sl.isStaff(player) && plugin.sl.getAdmin(player).getCommandSpy())
             {
-                if (plugin.al.isAdmin(event.getPlayer()) && !plugin.al.isSeniorAdmin(player))
+                if (plugin.sl.isStaff(event.getPlayer()) && !plugin.sl.isAdmin(player))
                 {
                     continue;
                 }
-
                 if (player != event.getPlayer())
                 {
                     FUtil.playerMsg(player, event.getPlayer().getName() + ": " + event.getMessage());
@@ -37,4 +36,5 @@ public class CommandSpy extends FreedomService
             }
         }
     }
-}
+
+}

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

@@ -14,6 +14,8 @@ import org.bukkit.scheduler.BukkitTask;
 
 public class EntityWiper extends FreedomService
 {
+    private BukkitTask wiper;
+
     public List<EntityType> BLACKLIST = Arrays.asList(
             EntityType.ARMOR_STAND,
             EntityType.PAINTING,
@@ -22,7 +24,6 @@ public class EntityWiper extends FreedomService
             EntityType.ITEM_FRAME,
             EntityType.MINECART
     );
-    private BukkitTask wiper;
 
     @Override
     public void onStart()

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

@@ -1,6 +1,5 @@
 package me.totalfreedom.totalfreedommod;
 
-import java.util.logging.Logger;
 import me.totalfreedom.totalfreedommod.util.FLog;
 import org.bukkit.Server;
 import org.bukkit.event.Listener;
@@ -9,18 +8,17 @@ public abstract class FreedomService implements Listener
 {
     protected final TotalFreedomMod plugin;
     protected final Server server;
-    protected final Logger logger;
+    protected final FLog logger;
 
     public FreedomService()
     {
         plugin = TotalFreedomMod.getPlugin();
         server = plugin.getServer();
-        logger = FLog.getPluginLogger();
+        logger = new FLog();
         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,10 +2,12 @@ package me.totalfreedom.totalfreedommod;
 
 import java.util.ArrayList;
 import java.util.List;
+import lombok.Getter;
 
 public class FreedomServiceHandler
 {
-    private final List<FreedomService> services;
+    @Getter
+    private List<FreedomService> services;
 
     public FreedomServiceHandler()
     {
@@ -51,9 +53,4 @@ public class FreedomServiceHandler
             }
         }
     }
-
-    public List<FreedomService> getServices()
-    {
-        return services;
-    }
 }

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

@@ -1,6 +1,7 @@
 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;
@@ -9,6 +10,7 @@ import org.bukkit.World;
 
 public class GameRuleHandler extends FreedomService
 {
+
     private final Map<GameRule, Boolean> rules = new EnumMap<>(GameRule.class);
 
     public GameRuleHandler()
@@ -56,12 +58,14 @@ public class GameRuleHandler extends FreedomService
         }
     }
 
-    @SuppressWarnings("deprecation")
     public void commitGameRules()
     {
         List<World> worlds = Bukkit.getWorlds();
-        for (Map.Entry<GameRule, Boolean> gameRuleEntry : rules.entrySet())
+        Iterator<Map.Entry<GameRule, Boolean>> it = rules.entrySet().iterator();
+        while (it.hasNext())
         {
+
+            Map.Entry<GameRule, Boolean> gameRuleEntry = it.next();
             String gameRuleName = gameRuleEntry.getKey().getGameRuleName();
             String gameRuleValue = gameRuleEntry.getValue().toString();
 
@@ -75,11 +79,13 @@ public class GameRuleHandler extends FreedomService
                     world.setTime(time + 24000 + 6000);
                 }
             }
+
         }
     }
 
-    public enum GameRule
+    public static enum GameRule
     {
+
         DO_FIRE_TICK("doFireTick", true),
         MOB_GRIEFING("mobGriefing", true),
         KEEP_INVENTORY("keepInventory", false),
@@ -92,11 +98,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;
 
-        GameRule(String gameRuleName, boolean defaultValue)
+        private GameRule(String gameRuleName, boolean defaultValue)
         {
             this.gameRuleName = gameRuleName;
             this.defaultValue = defaultValue;
@@ -112,4 +118,5 @@ public class GameRuleHandler extends FreedomService
             return defaultValue;
         }
     }
-}
+
+}

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

@@ -10,6 +10,7 @@ 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;
@@ -130,10 +131,10 @@ public class LogViewer extends FreedomService
         }.runTaskAsynchronously(plugin);
     }
 
-    public enum LogsRegistrationMode
+    public static enum LogsRegistrationMode
     {
 
-        ADD, DELETE, VERIFY
+        ADD, DELETE, VERIFY;
     }
 
     private static class URLBuilder
@@ -156,8 +157,10 @@ public class LogViewer extends FreedomService
         public URL getURL() throws MalformedURLException
         {
             List<String> pairs = new ArrayList<>();
-            for (Map.Entry<String, String> pair : queryStringMap.entrySet())
+            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"));

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

@@ -4,6 +4,8 @@ import io.papermc.lib.PaperLib;
 import java.util.ArrayList;
 import java.util.List;
 import java.util.regex.Pattern;
+import lombok.Getter;
+import lombok.Setter;
 import me.rayzr522.jsonmessage.JSONMessage;
 import me.totalfreedom.totalfreedommod.config.ConfigEntry;
 import me.totalfreedom.totalfreedommod.player.FPlayer;
@@ -27,20 +29,12 @@ 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<>();
 
-    public static boolean isLockdownEnabled()
-    {
-        return lockdownEnabled;
-    }
-
-    public static void setLockdownEnabled(boolean lockdownEnabled)
-    {
-        LoginProcess.lockdownEnabled = lockdownEnabled;
-    }
+    @Getter
+    @Setter
+    private static boolean lockdownEnabled = false;
 
     @Override
     public void onStart()
@@ -59,7 +53,7 @@ public class LoginProcess extends FreedomService
     public void onPlayerPreLogin(AsyncPlayerPreLoginEvent event)
     {
         final String ip = event.getAddress().getHostAddress().trim();
-        final boolean isAdmin = plugin.al.getEntryByIp(ip) != null;
+        final boolean isStaff = plugin.sl.getEntryByIp(ip) != null;
 
         // Check if the player is already online
         for (Player onlinePlayer : server.getOnlinePlayers())
@@ -69,10 +63,10 @@ public class LoginProcess extends FreedomService
                 continue;
             }
 
-            if (isAdmin)
+            if (isStaff)
             {
                 event.allow();
-                FSync.playerKick(onlinePlayer, "An admin just logged in with the username you are using.");
+                FSync.playerKick(onlinePlayer, "A staff member just logged in with the username you are using.");
                 return;
             }
 
@@ -119,8 +113,11 @@ public class LoginProcess extends FreedomService
             }
         }
 
+        // Check if player is staff
+        final boolean isStaff = plugin.sl.getEntryByIp(ip) != null;
+
         // Validation below this point
-        if (plugin.al.getEntryByIp(ip) != null) // Check if player is admin
+        if (isStaff) // Player is staff
         {
             // Force-allow log in
             event.allow();
@@ -130,9 +127,9 @@ public class LoginProcess extends FreedomService
             {
                 for (Player onlinePlayer : server.getOnlinePlayers())
                 {
-                    if (!plugin.al.isAdmin(onlinePlayer))
+                    if (!plugin.sl.isStaff(onlinePlayer))
                     {
-                        onlinePlayer.kickPlayer("You have been kicked to free up room for an admin.");
+                        onlinePlayer.kickPlayer("You have been kicked to free up room for a staff member.");
                         count--;
                     }
 
@@ -152,7 +149,7 @@ public class LoginProcess extends FreedomService
             return;
         }
 
-        // Player is not an admin
+        // Player is not a staff member
         // Server full check
         if (server.getOnlinePlayers().size() >= server.getMaxPlayers())
         {
@@ -160,10 +157,10 @@ public class LoginProcess extends FreedomService
             return;
         }
 
-        // Admin-only mode
-        if (ConfigEntry.ADMIN_ONLY_MODE.getBoolean())
+        // Staff-only mode
+        if (ConfigEntry.STAFF_ONLY_MODE.getBoolean())
         {
-            event.disallow(PlayerLoginEvent.Result.KICK_OTHER, "Server is temporarily open to admins only.");
+            event.disallow(PlayerLoginEvent.Result.KICK_OTHER, "Server is temporarily open to staff only.");
             return;
         }
 
@@ -180,6 +177,7 @@ public class LoginProcess extends FreedomService
             if (!plugin.si.getWhitelisted().contains(username.toLowerCase()))
             {
                 event.disallow(PlayerLoginEvent.Result.KICK_OTHER, "You are not whitelisted on this server.");
+                return;
             }
         }
     }
@@ -228,7 +226,7 @@ public class LoginProcess extends FreedomService
             player.setPlayerListFooter(FUtil.colorize(ConfigEntry.SERVER_TABLIST_FOOTER.getString()).replace("\\n", "\n"));
         }
 
-        if (!plugin.al.isAdmin(player))
+        if (!plugin.sl.isStaff(player))
         {
             String tag = playerData.getTag();
             if (tag != null)
@@ -239,14 +237,14 @@ public class LoginProcess extends FreedomService
             int noteCount = playerData.getNotes().size();
             if (noteCount != 0)
             {
-                String noteMessage = "This player has " + noteCount + " admin note" + (noteCount > 1 ? "s" : "") + ".";
+                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");
                 FLog.info(noteMessage);
                 for (Player p : server.getOnlinePlayers())
                 {
-                    if (plugin.al.isAdminImpostor(p))
+                    if (plugin.sl.isStaffImpostor(p))
                     {
                         notice.send(p);
                     }
@@ -259,9 +257,9 @@ public class LoginProcess extends FreedomService
             @Override
             public void run()
             {
-                if (ConfigEntry.ADMIN_ONLY_MODE.getBoolean())
+                if (ConfigEntry.STAFF_ONLY_MODE.getBoolean())
                 {
-                    player.sendMessage(ChatColor.RED + "Server is currently closed to non-admins.");
+                    player.sendMessage(ChatColor.RED + "Server is currently closed to non-staff.");
                 }
 
                 if (lockdownEnabled)

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

@@ -6,6 +6,7 @@ import java.util.Arrays;
 import java.util.HashMap;
 import java.util.List;
 import java.util.Map;
+import lombok.Getter;
 import org.bukkit.Bukkit;
 import org.bukkit.ChatColor;
 import org.bukkit.entity.Player;
@@ -19,6 +20,7 @@ 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,
@@ -44,9 +46,9 @@ public class Monitors extends FreedomService
                     }
                 }
 
-                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.",
+                plugin.sl.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") : "")));
+                            latestThrownPotion.getWorld().getName(), trollPotions > 0 ? String.format(" &c(most likely troll %s)", trollPotions == 1 ? "potion" : "potions") : "")));
             }
             recentlyThrownPotions.clear();
         }, 0L, 40L);
@@ -139,19 +141,4 @@ 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

@@ -6,12 +6,12 @@ import ca.momothereal.mojangson.value.MojangsonValue;
 import io.papermc.lib.PaperLib;
 import java.util.List;
 import java.util.Objects;
-import net.minecraft.server.v1_16_R3.NBTTagCompound;
-import net.minecraft.server.v1_16_R3.NBTTagList;
+import net.minecraft.server.v1_16_R2.NBTTagCompound;
+import net.minecraft.server.v1_16_R2.NBTTagList;
 import org.bukkit.ChatColor;
 import org.bukkit.Location;
 import org.bukkit.Material;
-import org.bukkit.craftbukkit.v1_16_R3.inventory.CraftItemStack;
+import org.bukkit.craftbukkit.v1_16_R2.inventory.CraftItemStack;
 import org.bukkit.entity.Player;
 import org.bukkit.event.EventHandler;
 import org.bukkit.event.EventPriority;
@@ -41,7 +41,7 @@ public class MovementValidator extends FreedomService
     public void onPlayerTeleport(PlayerTeleportEvent event)
     {
         // Check absolute value to account for negatives
-        if (Math.abs(Objects.requireNonNull(event.getTo()).getX()) >= MAX_XYZ_COORD || Math.abs(event.getTo().getZ()) >= MAX_XYZ_COORD || Math.abs(event.getTo().getY()) >= MAX_XYZ_COORD)
+        if (Math.abs(event.getTo().getX()) >= MAX_XYZ_COORD || Math.abs(event.getTo().getZ()) >= MAX_XYZ_COORD || Math.abs(event.getTo().getY()) >= MAX_XYZ_COORD)
         {
             event.setCancelled(true); // illegal position, cancel it
         }
@@ -53,7 +53,6 @@ public class MovementValidator extends FreedomService
         final Player player = event.getPlayer();
         Location from = event.getFrom();
         Location to = event.getTo();
-        assert to != null;
         if (to.getX() >= from.getX() + MAX_DISTANCE_TRAVELED || to.getY() >= from.getY() + MAX_DISTANCE_TRAVELED || to.getZ() >= from.getZ() + MAX_DISTANCE_TRAVELED)
         {
             event.setCancelled(true);
@@ -133,7 +132,7 @@ public class MovementValidator extends FreedomService
 
     private Boolean exploitItem(ItemStack item)
     {
-        net.minecraft.server.v1_16_R3.ItemStack nmsStack = CraftItemStack.asNMSCopy(item);
+        net.minecraft.server.v1_16_R2.ItemStack nmsStack = CraftItemStack.asNMSCopy(item);
         NBTTagList modifiers = getAttributeList(nmsStack);
         MojangsonCompound compound = new MojangsonCompound();
         boolean foundNegative = false;
@@ -147,9 +146,8 @@ public class MovementValidator extends FreedomService
             {
                 if (Objects.equals(key, "Amount")) //null-safe .equals()
                 {
-                    @SuppressWarnings("rawtypes")
                     List<MojangsonValue> values = compound.get(key);
-                    for (MojangsonValue<?> val : values)
+                    for (MojangsonValue val : values)
                     {
                         if (val.getValue().toString().equals("Infinityd"))
                         {
@@ -171,7 +169,7 @@ public class MovementValidator extends FreedomService
     }
 
 
-    private NBTTagList getAttributeList(net.minecraft.server.v1_16_R3.ItemStack stack)
+    private NBTTagList getAttributeList(net.minecraft.server.v1_16_R2.ItemStack stack)
     {
         if (stack.getTag() == null)
         {
@@ -184,4 +182,6 @@ public class MovementValidator extends FreedomService
         }
         return stack.getTag().getList("AttributeModifiers", 10);
     }
-}
+}
+
+

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

@@ -45,7 +45,7 @@ public class Muter extends FreedomService
             return;
         }
 
-        if (plugin.al.isAdminSync(player))
+        if (plugin.sl.isStaffSync(player))
         {
             fPlayer.setMuted(false);
             MUTED_PLAYERS.remove(player.getName());
@@ -70,7 +70,7 @@ public class Muter extends FreedomService
         }
 
         String message = event.getMessage();
-        if (plugin.al.isAdmin(player))
+        if (plugin.sl.isStaff(player))
         {
             fPlayer.setMuted(false);
             return;
@@ -113,4 +113,6 @@ public class Muter extends FreedomService
             playerdata.setMuted(true);
         }
     }
-}
+
+
+}

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

@@ -4,9 +4,10 @@ import java.io.IOException;
 import java.util.Arrays;
 import java.util.List;
 import joptsimple.internal.Strings;
-import me.totalfreedom.totalfreedommod.admin.Admin;
+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 me.totalfreedom.totalfreedommod.util.Response;
@@ -22,6 +23,7 @@ public class Pterodactyl extends FreedomService
     private final List<String> SERVER_HEADERS = Arrays.asList("Accept:Application/vnd.pterodactyl.v1+json", "Content-Type:application/json", "Authorization:Bearer " + SERVER_KEY);
     private final List<String> ADMIN_HEADERS = Arrays.asList("Accept:Application/vnd.pterodactyl.v1+json", "Content-Type:application/json", "Authorization:Bearer " + ADMIN_KEY);
 
+    @Getter
     private boolean enabled = !Strings.isNullOrEmpty(URL);
 
     public void onStart()
@@ -32,27 +34,26 @@ public class Pterodactyl extends FreedomService
     {
     }
 
-    public void updateAccountStatus(Admin admin)
+    public void updateAccountStatus(StaffMember staffMember)
     {
-        String id = admin.getPteroID();
+        String id = staffMember.getPteroID();
 
         if (Strings.isNullOrEmpty(id) || !enabled)
         {
             return;
         }
 
-        if (!admin.isActive() || admin.getRank() != Rank.SENIOR_ADMIN)
+        if (!staffMember.isActive() || staffMember.getRank() != Rank.SENIOR_ADMIN)
         {
             FLog.debug("Disabling ptero acc");
             removeAccountFromServer(id);
             return;
         }
 
-        FLog.debug("Enabling ptero acc");
+        FLog.debug("Enabling aptero acc");
         addAccountToServer(id);
     }
 
-    @SuppressWarnings("unchecked")
     public String createAccount(String username, String password)
     {
         JSONObject json = new JSONObject();
@@ -93,7 +94,6 @@ public class Pterodactyl extends FreedomService
         }
     }
 
-    @SuppressWarnings("unchecked")
     public void addAccountToServer(String id)
     {
         String url = URL + "/api/client/servers/" + ConfigEntry.PTERO_SERVER_UUID.getString() + "/users";
@@ -161,7 +161,6 @@ public class Pterodactyl extends FreedomService
     }
 
     // API patch function on users doesnt work rn, it throws 500 errors, so it's probably not written yet
-    @SuppressWarnings("unchecked")
     public void setPassword(String id, String password)
     {
         JSONObject json = new JSONObject();
@@ -176,39 +175,4 @@ public class Pterodactyl extends FreedomService
             FLog.severe(e);
         }
     }
-
-    public String getURL()
-    {
-        return URL;
-    }
-
-    public String getServerKey()
-    {
-        return SERVER_KEY;
-    }
-
-    public String getAdminKey()
-    {
-        return ADMIN_KEY;
-    }
-
-    public List<String> getServerHeaders()
-    {
-        return SERVER_HEADERS;
-    }
-
-    public List<String> getAdminHeaders()
-    {
-        return ADMIN_HEADERS;
-    }
-
-    public boolean isEnabled()
-    {
-        return enabled;
-    }
-
-    public void setEnabled(boolean enabled)
-    {
-        this.enabled = enabled;
-    }
-}
+}

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

@@ -0,0 +1,217 @@
+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", TotalFreedomMod.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.DEVELOPER, ConfigEntry.REDDIT_DEVELOPER_FLAIR_ID.getString());
+        flairList.put(Rank.SENIOR_ADMIN, ConfigEntry.REDDIT_SENIOR_ADMIN_FLAIR_ID.getString());
+        flairList.put(Rank.ADMIN, ConfigEntry.REDDIT_NEW_ADMIN_FLAIR_ID.getString());
+        flairList.put(Title.MASTER_BUILDER, ConfigEntry.REDDIT_MASTER_BUILDER_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.DEVELOPER, "Developer");
+        flairNameList.put(Rank.SENIOR_ADMIN, "Senior Admin");
+        flairNameList.put(Rank.ADMIN, "Admin");
+        flairNameList.put(Title.MASTER_BUILDER, "Master Builder");
+    }
+}

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

@@ -26,8 +26,8 @@ public class SavedFlags extends FreedomService
     public Map<String, Boolean> getSavedFlags()
     {
         Map<String, Boolean> flags = null;
-        File input = new File(TotalFreedomMod.getPlugin().getDataFolder(), SAVED_FLAGS_FILENAME);
 
+        File input = new File(TotalFreedomMod.plugin().getDataFolder(), SAVED_FLAGS_FILENAME);
         if (input.exists())
         {
             try

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

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

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

@@ -30,9 +30,9 @@ public class ServerPing extends FreedomService
             return;
         }
 
-        if (ConfigEntry.ADMIN_ONLY_MODE.getBoolean())
+            if (ConfigEntry.STAFF_ONLY_MODE.getBoolean())
         {
-            event.setMotd(FUtil.colorize(ConfigEntry.SERVER_ADMINMODE_MOTD.getString()));
+            event.setMotd(FUtil.colorize(ConfigEntry.SERVER_STAFFMODE_MOTD.getString()));
             return;
         }
 
@@ -73,4 +73,5 @@ public class ServerPing extends FreedomService
 
         event.setMotd(motd.toString().trim());
     }
-}
+
+}

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

@@ -3,8 +3,6 @@ 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;
@@ -19,6 +17,7 @@ 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;
@@ -43,29 +42,36 @@ 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.bukkit.Metrics;
+import org.bstats.Metrics;
 import org.bukkit.Bukkit;
 import org.bukkit.generator.ChunkGenerator;
 import org.bukkit.plugin.Plugin;
 import org.bukkit.plugin.java.JavaPlugin;
-import org.jetbrains.annotations.NotNull;
 import org.spigotmc.SpigotConfig;
 
 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;
@@ -79,7 +85,7 @@ public class TotalFreedomMod extends JavaPlugin
     public SavedFlags sf;
     public WorldManager wm;
     public LogViewer lv;
-    public AdminList al;
+    public StaffList sl;
     public ActivityLog acl;
     public RankManager rm;
     public CommandBlocker cb;
@@ -102,6 +108,7 @@ 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;
@@ -129,6 +136,7 @@ public class TotalFreedomMod extends JavaPlugin
     public Sitter st;
     public VanishHandler vh;
     public Pterodactyl ptero;
+
     //public HubWorldRestrictions hwr;
     //
     // Bridges
@@ -138,25 +146,9 @@ public class TotalFreedomMod extends JavaPlugin
     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()
     {
@@ -203,13 +195,81 @@ public class TotalFreedomMod extends JavaPlugin
         BackupManager backups = new BackupManager();
         backups.createAllBackups();
 
-        permissions = new PermissionConfig();
+        permissions = new PermissionConfig(this);
         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();
+        ptero = new Pterodactyl();
+
+        // 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();
 
-        new Initializer();
+        // 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();
 
         fsh.startServices();
 
@@ -236,12 +296,6 @@ 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;
@@ -284,102 +338,21 @@ public class TotalFreedomMod extends JavaPlugin
         }
     }
 
-    /**
-     * This class is provided to please Codacy.
-     */
-    private final class Initializer
+    public static TotalFreedomMod plugin()
     {
-        public Initializer()
+        for (Plugin plugin : Bukkit.getPluginManager().getPlugins())
         {
-            initServices();
-            initAdminUtils();
-            initBridges();
-            initFun();
-            initHTTPD();
+            if (plugin.getName().equalsIgnoreCase(pluginName))
+            {
+                return (TotalFreedomMod)plugin;
+            }
         }
+        return null;
+    }
 
-        private void initServices()
-        {
-            // Start services
-            si = new ServerInterface();
-            sf = new SavedFlags();
-            wm = new WorldManager();
-            lv = new LogViewer();
-            sql = new SQLite();
-            al = new AdminList();
-            acl = new ActivityLog();
-            rm = new RankManager();
-            cb = new CommandBlocker();
-            eb = new EventBlocker();
-            bb = new BlockBlocker();
-            mb = new MobBlocker();
-            ib = new InteractBlocker();
-            pb = new PotionBlocker();
-            lp = new LoginProcess();
-            nu = new AntiNuke();
-            as = new AntiSpam();
-            wr = new WorldRestrictions();
-            pl = new PlayerList();
-            sh = new Shop();
-            vo = new Votifier();
-            an = new Announcer();
-            cm = new ChatManager();
-            dc = new Discord();
-            pul = new PunishmentList();
-            bm = new BanManager();
-            im = new IndefiniteBanList();
-            pem = new PermissionManager();
-            gr = new GameRuleHandler();
-            snp = new SignBlocker();
-            ew = new EntityWiper();
-            st = new Sitter();
-            vh = new VanishHandler();
-            ptero = new Pterodactyl();
-        }
-
-        private void initAdminUtils()
-        {
-            // Single admin utils
-            cs = new CommandSpy();
-            ca = new Cager();
-            fm = new Freezer();
-            or = new Orbiter();
-            mu = new Muter();
-            ebl = new EditBlocker();
-            pbl = new PVPBlocker();
-            fo = new Fuckoff();
-            ak = new AutoKick();
-            ae = new AutoEject();
-            mo = new Monitors();
-        }
-
-        private void initBridges()
-        {
-            // Start bridges
-            btb = new BukkitTelnetBridge();
-            cpb = new CoreProtectBridge();
-            esb = new EssentialsBridge();
-            ldb = new LibsDisguisesBridge();
-            tfg = new TFGuildsBridge();
-            web = new WorldEditBridge();
-            wgb = new WorldGuardBridge();
-        }
-
-        private void initFun()
-        {
-            // Fun
-            cul = new CurseListener();
-            it = new ItemFun();
-            lm = new Landminer();
-            mp = new MP44();
-            jp = new Jumppads();
-            tr = new Trailer();
-        }
-
-        private void initHTTPD()
-        {
-            // HTTPD
-            hd = new HTTPDaemon();
-        }
+    @Override
+    public ChunkGenerator getDefaultWorldGenerator(String worldName, String id)
+    {
+        return new CleanroomChunkGenerator(id);
     }
 }

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

@@ -31,7 +31,7 @@ public class VanishHandler extends FreedomService
 
         for (Player p : server.getOnlinePlayers())
         {
-            if (!plugin.al.isAdmin(player) && plugin.al.isVanished(p.getName()))
+            if (!plugin.sl.isStaff(player) && plugin.sl.isVanished(p.getName()))
             {
                 player.hidePlayer(plugin, p);
             }
@@ -39,17 +39,17 @@ public class VanishHandler extends FreedomService
 
         for (Player p : server.getOnlinePlayers())
         {
-            if (!plugin.al.isAdmin(p) && plugin.al.isVanished(player.getName()))
+            if (!plugin.sl.isStaff(p) && plugin.sl.isVanished(player.getName()))
             {
                 p.hidePlayer(plugin, player);
             }
         }
 
-        if (plugin.al.isVanished(player.getName()))
+        if (plugin.sl.isVanished(player.getName()))
         {
             plugin.esb.setVanished(player.getName(), true);
             FLog.info(player.getName() + " joined while still vanished.");
-            plugin.al.messageAllAdmins(ChatColor.YELLOW + player.getName() + " has joined silently.");
+            plugin.sl.messageAllStaff(ChatColor.YELLOW + player.getName() + " has joined silently.");
             event.setJoinMessage(null);
 
             new BukkitRunnable()
@@ -57,7 +57,7 @@ public class VanishHandler extends FreedomService
                 @Override
                 public void run()
                 {
-                    if (!plugin.al.isVanished(player.getName()))
+                    if (!plugin.sl.isVanished(player.getName()))
                     {
                         this.cancel();
                     }
@@ -73,11 +73,11 @@ public class VanishHandler extends FreedomService
     {
         Player player = event.getPlayer();
 
-        if (plugin.al.isVanished(player.getName()))
+        if (plugin.sl.isVanished(player.getName()))
         {
             event.setQuitMessage(null);
             FLog.info(player.getName() + " left while still vanished.");
-            plugin.al.messageAllAdmins(ChatColor.YELLOW + player.getName() + " has left silently.");
+            plugin.sl.messageAllStaff(ChatColor.YELLOW + player.getName() + " has left silently.");
         }
     }
 }

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

@@ -1,415 +0,0 @@
-package me.totalfreedom.totalfreedommod.admin;
-
-import com.google.common.collect.Maps;
-import com.google.common.collect.Sets;
-import java.sql.ResultSet;
-import java.sql.SQLException;
-import java.util.ArrayList;
-import java.util.Date;
-import java.util.List;
-import java.util.Map;
-import java.util.Set;
-import java.util.concurrent.TimeUnit;
-import me.totalfreedom.totalfreedommod.FreedomService;
-import me.totalfreedom.totalfreedommod.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<String> vanished = new ArrayList<>();
-    public final List<String> verifiedNoAdmin = new ArrayList<>();
-    public final Map<String, List<String>> verifiedNoAdminIps = Maps.newHashMap();
-    private final Set<Admin> allAdmins = Sets.newHashSet(); // Includes disabled admins
-    // Only active admins below
-    private final Set<Admin> activeAdmins = Sets.newHashSet();
-    private final Map<String, Admin> nameTable = Maps.newHashMap();
-    private final Map<String, Admin> ipTable = Maps.newHashMap();
-
-    public static List<String> getVanished()
-    {
-        return vanished;
-    }
-
-    @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())
-                {
-                    Admin admin = new Admin(adminSet);
-                    allAdmins.add(admin);
-                }
-            }
-        }
-        catch (SQLException e)
-        {
-            FLog.severe("Failed to load admin list: " + e.getMessage());
-        }
-
-        updateTables();
-        FLog.info("Loaded " + allAdmins.size() + " admins (" + nameTable.size() + " active,  " + ipTable.size() + " IPs)");
-    }
-
-    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 List<String> getActiveAdminNames()
-    {
-        List<String> names = new ArrayList();
-        for (Admin admin : activeAdmins)
-        {
-            names.add(admin.getName());
-        }
-        return names;
-    }
-
-    public boolean isAdmin(CommandSender sender)
-    {
-        if (!(sender instanceof Player))
-        {
-            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)
-    {
-        // Find admin
-        String ip = FUtil.getIp(player);
-        Admin admin = getEntryByName(player.getName());
-
-        // Admin by name
-        if (admin != null)
-        {
-            // Check if we're in online mode,
-            // Or the players IP is in the admin entry
-            if (Bukkit.getOnlineMode() || admin.getIps().contains(ip))
-            {
-                if (!admin.getIps().contains(ip))
-                {
-                    // Add the new IP if we have to
-                    admin.addIp(ip);
-                    save(admin);
-                    updateTables();
-                }
-                return admin;
-            }
-        }
-
-        // Admin by ip
-        admin = getEntryByIp(ip);
-        if (admin != null)
-        {
-            // Set the new username
-            String oldName = admin.getName();
-            admin.setName(player.getName());
-            plugin.sql.updateAdminName(oldName, admin.getName());
-            updateTables();
-        }
-
-        return null;
-    }
-
-    public Admin getEntryByName(String name)
-    {
-        return nameTable.get(name.toLowerCase());
-    }
-
-    public Admin getEntryByIp(String ip)
-    {
-        return ipTable.get(ip);
-    }
-
-    public Admin getEntryByIpFuzzy(String needleIp)
-    {
-        final Admin directAdmin = getEntryByIp(needleIp);
-        if (directAdmin != null)
-        {
-            return directAdmin;
-        }
-
-        for (String ip : ipTable.keySet())
-        {
-            if (FUtil.fuzzyIpMatch(needleIp, ip, 3))
-            {
-                return ipTable.get(ip);
-            }
-        }
-
-        return null;
-    }
-
-    public void updateLastLogin(Player player)
-    {
-        final Admin admin = getAdmin(player);
-        if (admin == null)
-        {
-            return;
-        }
-
-        admin.setLastLogin(new Date());
-        admin.setName(player.getName());
-        save(admin);
-    }
-
-    public boolean isAdminImpostor(Player player)
-    {
-        return getEntryByName(player.getName()) != null && !isAdmin(player) && !isVerifiedAdmin(player);
-    }
-
-    public boolean isVerifiedAdmin(Player player)
-    {
-        return verifiedNoAdmin.contains(player.getName()) && verifiedNoAdminIps.get(player.getName()).contains(FUtil.getIp(player));
-    }
-
-    public boolean isIdentityMatched(Player player)
-    {
-        if (Bukkit.getOnlineMode())
-        {
-            return true;
-        }
-
-        Admin admin = getAdmin(player);
-        return admin != null && admin.getName().equalsIgnoreCase(player.getName());
-    }
-
-    public boolean addAdmin(Admin admin)
-    {
-        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);
-
-        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();
-        nameTable.clear();
-        ipTable.clear();
-
-        for (Admin admin : allAdmins)
-        {
-            if (!admin.isActive())
-            {
-                continue;
-            }
-
-            activeAdmins.add(admin);
-            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.getAdminByName(admin.getName());
-            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(String player)
-    {
-        return vanished.contains(player);
-    }
-
-    public Set<Admin> getAllAdmins()
-    {
-        return allAdmins;
-    }
-
-    public Set<Admin> getActiveAdmins()
-    {
-        return activeAdmins;
-    }
-
-    public Map<String, Admin> getNameTable()
-    {
-        return nameTable;
-    }
-
-    public Map<String, Admin> getIpTable()
-    {
-        return ipTable;
-    }
-
-    public List<String> getVerifiedNoAdmin()
-    {
-        return verifiedNoAdmin;
-    }
-
-    public Map<String, List<String>> getVerifiedNoAdminIps()
-    {
-        return verifiedNoAdminIps;
-    }
-}

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

@@ -4,12 +4,15 @@ import com.google.common.collect.Lists;
 import java.text.SimpleDateFormat;
 import java.time.Instant;
 import java.util.ArrayList;
-import java.util.Collections;
+import java.util.Arrays;
 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;
@@ -19,19 +22,27 @@ import org.bukkit.entity.Player;
 public class Ban
 {
 
-    public static final SimpleDateFormat DATE_FORMAT = new SimpleDateFormat("yyyy-MM-dd 'at' HH:mm:ss z");
-    private final List<String> ips = Lists.newArrayList();
+    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
+    private final List<String> ips = Lists.newArrayList();
+    @Getter
+    @Setter
     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()
@@ -42,7 +53,7 @@ public class Ban
     {
         this(username,
                 uuid,
-                Collections.singletonList(ip),
+                Arrays.asList(ip),
                 by,
                 at,
                 expire,
@@ -77,7 +88,7 @@ public class Ban
 
     public static Ban forPlayerIp(Player player, CommandSender by, Date expiry, String reason)
     {
-        return new Ban(null, null, Collections.singletonList(FUtil.getIp(player)), by.getName(), Date.from(Instant.now()), expiry, reason);
+        return new Ban(null, null, Arrays.asList(FUtil.getIp(player)), by.getName(), Date.from(Instant.now()), expiry, reason);
     }
 
     public static Ban forPlayerIp(String ip, CommandSender by, Date expiry, String reason)
@@ -132,11 +143,6 @@ public class Ban
                 reason);
     }
 
-    public static SimpleDateFormat getDateFormat()
-    {
-        return DATE_FORMAT;
-    }
-
     public boolean hasUsername()
     {
         return username != null && !username.isEmpty();
@@ -250,74 +256,17 @@ public class Ban
 
     private void dedupeIps()
     {
+
         Set<String> uniqueIps = new HashSet<>();
 
-        //Fancy Collections.removeIf lets you do all that while loop work in one lambda.
-        ips.removeIf(s -> !uniqueIps.add(s));
-    }
+        Iterator<String> it = ips.iterator();
+        while (it.hasNext())
+        {
+            if (!uniqueIps.add(it.next()))
+            {
+                it.remove();
+            }
+        }
 
-    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

@@ -15,6 +15,7 @@ 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;
@@ -73,7 +74,7 @@ public class BanManager extends FreedomService
 
         // Load unbannable usernames
         unbannableUsernames.clear();
-        unbannableUsernames.addAll(ConfigEntry.FAMOUS_PLAYERS.getStringList());
+        unbannableUsernames.addAll((Collection<? extends String>)ConfigEntry.FAMOUS_PLAYERS.getList());
         FLog.info("Loaded " + unbannableUsernames.size() + " unbannable usernames.");
     }
 
@@ -189,7 +190,7 @@ public class BanManager extends FreedomService
         return getByUsername(username) != null;
     }
 
-    public void addBan(Ban ban)
+    public boolean addBan(Ban ban)
     {
         if (ban.getUsername() != null && getByUsername(ban.getUsername()) != null)
         {
@@ -212,18 +213,22 @@ public class BanManager extends FreedomService
         {
             plugin.sql.addBan(ban);
             updateViews();
+            return true;
         }
 
+        return false;
     }
 
-    public void removeBan(Ban ban)
+    public boolean removeBan(Ban ban)
     {
         if (bans.remove(ban))
         {
             plugin.sql.removeBan(ban);
             updateViews();
+            return true;
         }
 
+        return false;
     }
 
     public int purge()
@@ -264,8 +269,9 @@ public class BanManager extends FreedomService
     public void onPlayerJoin(PlayerJoinEvent event)
     {
         final Player player = event.getPlayer();
+        final PlayerData data = plugin.pl.getData(player);
 
-        if (!plugin.al.isAdmin(player))
+        if (!plugin.sl.isStaff(player))
         {
             return;
         }
@@ -322,4 +328,5 @@ public class BanManager extends FreedomService
             }
         }
     }
-}
+
+}

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

@@ -3,15 +3,25 @@ package me.totalfreedom.totalfreedommod.banning;
 import com.google.common.collect.Lists;
 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 org.bukkit.configuration.ConfigurationSection;
 
 public class IndefiniteBan implements IConfig
 {
-    private final List<String> ips = Lists.newArrayList();
+
+    @Getter
+    @Setter
     private String username = null;
+    @Getter
+    @Setter
     private UUID uuid = null;
+    @Getter
+    private final List<String> ips = Lists.newArrayList();
+    @Getter
+    @Setter
     private String reason = null;
 
     public IndefiniteBan()
@@ -50,39 +60,4 @@ 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;
-    }
-}
+}

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

@@ -4,6 +4,7 @@ import com.google.common.base.Strings;
 import com.google.common.collect.Sets;
 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,23 +21,18 @@ public class IndefiniteBanList extends FreedomService
 
     public static final String CONFIG_FILENAME = "indefinitebans.yml";
 
-
+    @Getter
     private final Set<IndefiniteBan> indefBans = Sets.newHashSet();
 
-
+    @Getter
     private int nameBanCount = 0;
 
-
+    @Getter
     private int uuidBanCount = 0;
 
-
+    @Getter
     private int ipBanCount = 0;
 
-    public static String getConfigFilename()
-    {
-        return CONFIG_FILENAME;
-    }
-
     @Override
     public void onStart()
     {
@@ -55,7 +51,6 @@ public class IndefiniteBanList extends FreedomService
 
             IndefiniteBan indefBan = new IndefiniteBan();
             ConfigurationSection cs = config.getConfigurationSection(name);
-            assert cs != null;
             indefBan.loadFrom(cs);
 
             if (!indefBan.isValid())
@@ -89,7 +84,7 @@ public class IndefiniteBanList extends FreedomService
 
         for (IndefiniteBan indefBan : indefBans)
         {
-            if (username.equalsIgnoreCase(indefBan.getUsername()))
+            if (username.toLowerCase().equals(indefBan.getUsername().toLowerCase()))
             {
                 bannedBy = "username";
                 ban = indefBan;
@@ -142,24 +137,4 @@ 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

@@ -29,7 +29,6 @@ public class BlockBlocker extends FreedomService
     {
     }
 
-    @SuppressWarnings("deprecation")
     @EventHandler(priority = EventPriority.HIGH)
     public void onBlockPlace(BlockPlaceEvent event)
     {
@@ -133,18 +132,17 @@ public class BlockBlocker extends FreedomService
             case PLAYER_HEAD:
             case PLAYER_WALL_HEAD:
             {
-                Skull skull = (Skull)event.getBlockPlaced().getState();
+                Skull skull = (Skull) event.getBlockPlaced().getState();
                 if (skull.getOwner() != null)
                 {
                     if (skull.getOwner().contains("\u00A7"))
                     {
                         skull.setOwner(skull.getOwner().replace("\u00A7", ""));
-                        SkullMeta meta = (SkullMeta)event.getItemInHand().getItemMeta();
+                        SkullMeta meta = (SkullMeta) event.getItemInHand().getItemMeta();
                         if (meta != null)
                         {
                             ItemStack newHead = new ItemStack(Material.PLAYER_HEAD, 1);
                             ItemMeta headMeta = newHead.getItemMeta();
-                            assert headMeta != null;
                             headMeta.setDisplayName(ChatColor.YELLOW + "C-sectioned Head");
                             newHead.setItemMeta(headMeta);
                             player.getInventory().setItem(player.getInventory().getHeldItemSlot(), newHead);
@@ -175,14 +173,14 @@ public class BlockBlocker extends FreedomService
 
         if (Groups.BANNERS.contains(event.getBlockPlaced().getType()))
         {
-            Banner banner = (Banner)event.getBlockPlaced().getState();
-            List<Pattern> patterns = banner.getPatterns();
-
+            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.");
             }
         }
+
     }
-}
+}

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

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

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

@@ -3,7 +3,6 @@ package me.totalfreedom.totalfreedommod.blocking;
 import java.util.ArrayList;
 import java.util.Arrays;
 import java.util.List;
-import java.util.Objects;
 import me.totalfreedom.totalfreedommod.FreedomService;
 import me.totalfreedom.totalfreedommod.config.ConfigEntry;
 import me.totalfreedom.totalfreedommod.util.FUtil;
@@ -25,6 +24,7 @@ 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.entity.EntityCombustEvent;
 import org.bukkit.event.entity.EntityDamageEvent;
@@ -38,20 +38,6 @@ 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()
     {
@@ -134,11 +120,16 @@ public class EventBlocker extends FreedomService
     @EventHandler(priority = EventPriority.HIGH)
     public void onEntityDamage(EntityDamageEvent event)
     {
-        if ((event.getCause() == EntityDamageEvent.DamageCause.LAVA)
-                && !ConfigEntry.ALLOW_LAVA_DAMAGE.getBoolean())
+        switch (event.getCause())
         {
-            event.setCancelled(true);
-            return;
+            case LAVA:
+            {
+                if (!ConfigEntry.ALLOW_LAVA_DAMAGE.getBoolean())
+                {
+                    event.setCancelled(true);
+                    return;
+                }
+            }
         }
 
         if (ConfigEntry.ENABLE_PET_PROTECT.getBoolean())
@@ -157,7 +148,7 @@ public class EventBlocker extends FreedomService
     @EventHandler(priority = EventPriority.NORMAL)
     public void onPlayerDropItem(PlayerDropItemEvent event)
     {
-        if (!plugin.al.isAdmin(event.getPlayer()))
+        if (!plugin.sl.isStaff(event.getPlayer()))
         {
             event.setCancelled(true);
         }
@@ -212,13 +203,24 @@ 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 ArrayList<Material> redstoneBlocks = new ArrayList<>(Arrays.asList(Material.REDSTONE, Material.DISPENSER, Material.DROPPER, Material.REDSTONE_LAMP));
     @EventHandler
     public void onBlockPhysics(BlockPhysicsEvent event)
     {
         if (!ConfigEntry.ALLOW_REDSTONE.getBoolean())
         {
             // Check if the block is involved with redstone.
-            if (event.getBlock().getBlockData() instanceof AnaloguePowerable || event.getBlock().getBlockData() instanceof Powerable || redstoneBlocks.contains(event.getBlock().getType()))
+            if(event.getBlock().getBlockData() instanceof AnaloguePowerable || event.getBlock().getBlockData() instanceof Powerable || redstoneBlocks.contains(event.getBlock().getType()))
             {
                 event.setCancelled(true);
             }
@@ -228,16 +230,15 @@ public class EventBlocker extends FreedomService
     @EventHandler(priority = EventPriority.NORMAL)
     public void onPlayerRespawn(PlayerRespawnEvent event)
     {
-        double maxHealth = Objects.requireNonNull(event.getPlayer().getAttribute(Attribute.GENERIC_MAX_HEALTH)).getValue();
+        double maxHealth = event.getPlayer().getAttribute(Attribute.GENERIC_MAX_HEALTH).getValue();
         if (maxHealth < 1)
         {
-            for (AttributeModifier attributeModifier : Objects.requireNonNull(event.getPlayer().getAttribute(Attribute.GENERIC_MAX_HEALTH)).getModifiers())
+            for (AttributeModifier attributeModifier : event.getPlayer().getAttribute(Attribute.GENERIC_MAX_HEALTH).getModifiers())
             {
-                Objects.requireNonNull(event.getPlayer().getAttribute(Attribute.GENERIC_MAX_HEALTH)).removeModifier(attributeModifier);
+                event.getPlayer().getAttribute(Attribute.GENERIC_MAX_HEALTH).removeModifier(attributeModifier);
             }
         }
     }
-
     @EventHandler(priority = EventPriority.NORMAL)
     public void onBlockDispense(BlockDispenseEvent event)
     {

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

@@ -90,7 +90,7 @@ public class InteractBlocker extends FreedomService
         {
             case WATER_BUCKET:
             {
-                if (plugin.al.isAdmin(player) || ConfigEntry.ALLOW_WATER_PLACE.getBoolean())
+                if (plugin.sl.isStaff(player) || ConfigEntry.ALLOW_WATER_PLACE.getBoolean())
                 {
                     break;
                 }
@@ -103,7 +103,7 @@ public class InteractBlocker extends FreedomService
 
             case LAVA_BUCKET:
             {
-                if (plugin.al.isAdmin(player) || ConfigEntry.ALLOW_LAVA_PLACE.getBoolean())
+                if (plugin.sl.isStaff(player) || ConfigEntry.ALLOW_LAVA_PLACE.getBoolean())
                 {
                     break;
                 }
@@ -126,7 +126,7 @@ public class InteractBlocker extends FreedomService
                 event.setCancelled(true);
                 break;
             }
-
+            
             case ARMOR_STAND:
             {
                 if (ConfigEntry.ALLOW_ARMOR_STANDS.getBoolean())
@@ -160,4 +160,4 @@ public class InteractBlocker extends FreedomService
             }
         }
     }
-}
+}

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

@@ -1,6 +1,5 @@
 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;
@@ -43,13 +42,13 @@ public class MobBlocker extends FreedomService
         Entity entity = e.getEntity();
         if (entity instanceof Attributable)
         {
-            if (Objects.requireNonNull(((Attributable)entity).getAttribute(Attribute.GENERIC_FOLLOW_RANGE)).getBaseValue() > 255.0)
+            if (((Attributable)entity).getAttribute(Attribute.GENERIC_FOLLOW_RANGE).getBaseValue() > 255.0)
             {
-                Objects.requireNonNull(((Attributable)entity).getAttribute(Attribute.GENERIC_FOLLOW_RANGE)).setBaseValue(255.0);
+                ((Attributable)entity).getAttribute(Attribute.GENERIC_FOLLOW_RANGE).setBaseValue(255.0);
             }
-            if (Objects.requireNonNull(((Attributable)entity).getAttribute(Attribute.GENERIC_MOVEMENT_SPEED)).getBaseValue() > 10.0)
+            if (((Attributable)entity).getAttribute(Attribute.GENERIC_MOVEMENT_SPEED).getBaseValue() > 10.0)
             {
-                Objects.requireNonNull(((Attributable)entity).getAttribute(Attribute.GENERIC_MOVEMENT_SPEED)).setBaseValue(10.0);
+                ((Attributable)entity).getAttribute(Attribute.GENERIC_MOVEMENT_SPEED).setBaseValue(10.0);
             }
         }
     }
@@ -118,7 +117,7 @@ public class MobBlocker extends FreedomService
         }
 
         int mobcount = 0;
-        for (Entity entity : Objects.requireNonNull(event.getLocation().getWorld()).getLivingEntities())
+        for (Entity entity : event.getLocation().getWorld().getLivingEntities())
         {
             if (!(entity instanceof HumanEntity) && entity instanceof LivingEntity)
             {
@@ -131,4 +130,4 @@ public class MobBlocker extends FreedomService
             event.setCancelled(true);
         }
     }
-}
+}

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

@@ -70,7 +70,7 @@ public class PVPBlocker extends FreedomService
             }
         }
 
-        if (player != null & !plugin.al.isAdmin(player))
+        if (player != null & !plugin.sl.isStaff(player))
         {
             if (player.getGameMode() == GameMode.CREATIVE)
             {

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

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

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

@@ -1,10 +1,10 @@
 package me.totalfreedom.totalfreedommod.blocking;
 
 import me.totalfreedom.totalfreedommod.FreedomService;
-import net.minecraft.server.v1_16_R3.NBTTagCompound;
+import net.minecraft.server.v1_16_R2.NBTTagCompound;
 import org.bukkit.ChatColor;
 import org.bukkit.Tag;
-import org.bukkit.craftbukkit.v1_16_R3.inventory.CraftItemStack;
+import org.bukkit.craftbukkit.v1_16_R2.inventory.CraftItemStack;
 import org.bukkit.entity.Player;
 import org.bukkit.event.EventHandler;
 import org.bukkit.event.EventPriority;
@@ -35,9 +35,8 @@ public class SignBlocker extends FreedomService
         if (Tag.SIGNS.getValues().contains(event.getBlock().getType()))
         {
             ItemStack sign = event.getItemInHand();
-            net.minecraft.server.v1_16_R3.ItemStack nmsSign = CraftItemStack.asNMSCopy(sign);
+            net.minecraft.server.v1_16_R2.ItemStack nmsSign = CraftItemStack.asNMSCopy(sign);
             NBTTagCompound compound = (nmsSign.hasTag()) ? nmsSign.getTag() : new NBTTagCompound();
-            assert compound != null;
             NBTTagCompound bet = compound.getCompound("BlockEntityTag");
             String line1 = bet.getString("Text1");
             String line2 = bet.getString("Text2");
@@ -64,4 +63,4 @@ public class SignBlocker extends FreedomService
             event.setCancelled(true);
         }
     }
-}
+}

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

@@ -30,24 +30,6 @@ public class CommandBlocker extends FreedomService
     private final Map<String, CommandBlockerEntry> entryList = Maps.newHashMap();
     private final List<String> unknownCommands = Lists.newArrayList();
 
-    public static CommandMap getCommandMap()
-    {
-        try
-        {
-            SimplePluginManager simplePluginManager = (SimplePluginManager)Bukkit.getServer().getPluginManager();
-
-            Field commandMapField = SimplePluginManager.class.getDeclaredField("commandMap");
-            commandMapField.setAccessible(true);
-
-            return (SimpleCommandMap)commandMapField.get(simplePluginManager);
-        }
-        catch (NoSuchFieldException | IllegalArgumentException | IllegalAccessException e)
-        {
-            FLog.severe("Failed to get command map field (" + e.getMessage() + ")");
-        }
-        return null;
-    }
-
     @Override
     public void onStart()
     {
@@ -60,6 +42,25 @@ 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();
@@ -83,7 +84,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.isEmpty())
+            if (rank == null || action == null || commandName == null || commandName.isEmpty())
             {
                 FLog.warning("Invalid command blocker entry: " + rawEntry);
                 continue;
@@ -97,7 +98,6 @@ 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
@@ -171,7 +171,7 @@ public class CommandBlocker extends FreedomService
 
         for (String part : commandParts)
         {
-            if (command.startsWith("/") && !plugin.al.isAdmin(sender) && (part.contains("#copy") || part.contains("#clipboard")))
+            if (command.startsWith("/") && !plugin.sl.isStaff(sender) && (part.contains("#copy") || part.contains("#clipboard")))
             {
                 FUtil.playerMsg(sender, "WorldEdit copy variables are disabled.");
                 return true;

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

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

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

@@ -1,5 +1,6 @@
 package me.totalfreedom.totalfreedommod.blocking.command;
 
+import lombok.Getter;
 import me.totalfreedom.totalfreedommod.TotalFreedomMod;
 import me.totalfreedom.totalfreedommod.util.FUtil;
 import org.bukkit.ChatColor;
@@ -10,15 +11,15 @@ import org.spigotmc.SpigotConfig;
 public class CommandBlockerEntry
 {
 
-
+    @Getter
     private final CommandBlockerRank rank;
-
+    @Getter
     private final CommandBlockerAction action;
-
+    @Getter
     private final String command;
-
+    @Getter
     private final String subCommand;
-
+    @Getter
     private final String message;
 
     public CommandBlockerEntry(CommandBlockerRank rank, CommandBlockerAction action, String command, String message)
@@ -39,7 +40,7 @@ public class CommandBlockerEntry
     {
         if (action == CommandBlockerAction.BLOCK_AND_EJECT && sender instanceof Player)
         {
-            TotalFreedomMod.getPlugin().ae.autoEject((Player)sender, "You used a prohibited command: " + command);
+            TotalFreedomMod.plugin().ae.autoEject((Player)sender, "You used a prohibited command: " + command);
             FUtil.bcastMsg(sender.getName() + " was automatically kicked for using harmful commands.", ChatColor.RED);
             return;
         }
@@ -50,29 +51,4 @@ public class CommandBlockerEntry
         }
         FUtil.playerMsg(sender, FUtil.colorize(message));
     }
-
-    public CommandBlockerRank getRank()
-    {
-        return rank;
-    }
-
-    public CommandBlockerAction getAction()
-    {
-        return action;
-    }
-
-    public String getCommand()
-    {
-        return command;
-    }
-
-    public String getSubCommand()
-    {
-        return subCommand;
-    }
-
-    public String getMessage()
-    {
-        return message;
-    }
 }

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

@@ -1,57 +1,28 @@
 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
 {
-    EVERYONE("e"),
+
+    ANYONE("a"),
     OP("o"),
-    ADMIN("a"),
-    SENIOR_ADMIN("s"),
+    SUPER("s"),
+    TELNET("t"),
+    SENIOR("c"),
     NOBODY("n");
     //
     private final String token;
 
-    CommandBlockerRank(String token)
+    private CommandBlockerRank(String token)
     {
         this.token = token;
     }
 
-    public static CommandBlockerRank fromSender(CommandSender sender)
-    {
-        Admin admin = TotalFreedomMod.getPlugin().al.getAdmin(sender);
-        if (admin != null)
-        {
-            if (admin.getRank() == Rank.SENIOR_ADMIN)
-            {
-                return SENIOR_ADMIN;
-            }
-            return ADMIN;
-        }
-
-        if (sender.isOp())
-        {
-            return OP;
-        }
-
-        return EVERYONE;
-    }
-
-    public static CommandBlockerRank fromToken(String token)
-    {
-        for (CommandBlockerRank rank : CommandBlockerRank.values())
-        {
-            if (rank.getToken().equalsIgnoreCase(token))
-            {
-                return rank;
-            }
-        }
-        return EVERYONE;
-    }
-
     public String getToken()
     {
         return this.token;
@@ -61,4 +32,42 @@ public enum CommandBlockerRank
     {
         return fromSender(sender).ordinal() >= ordinal();
     }
-}
+
+    public static CommandBlockerRank fromSender(CommandSender sender)
+    {
+        if (!(sender instanceof Player))
+        {
+            return TELNET;
+        }
+
+        StaffMember staffMember = TotalFreedomMod.plugin().sl.getAdmin(sender);
+        if (staffMember != null)
+        {
+            if (staffMember.getRank() == Rank.SENIOR_ADMIN)
+            {
+                return SENIOR;
+            }
+            return SUPER;
+        }
+
+        if (sender.isOp())
+        {
+            return OP;
+        }
+
+        return ANYONE;
+
+    }
+
+    public static CommandBlockerRank fromToken(String token)
+    {
+        for (CommandBlockerRank rank : CommandBlockerRank.values())
+        {
+            if (rank.getToken().equalsIgnoreCase(token))
+            {
+                return rank;
+            }
+        }
+        return ANYONE;
+    }
+}

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

@@ -1,6 +1,7 @@
 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;
@@ -9,8 +10,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;
@@ -42,15 +43,15 @@ public class BukkitTelnetBridge extends FreedomService
             return;
         }
 
-        final Admin admin = plugin.al.getEntryByIpFuzzy(ip);
+        final StaffMember staffMember = plugin.sl.getEntryByIpFuzzy(ip);
 
-        if (admin == null || !admin.isActive() || !admin.getRank().hasConsoleVariant())
+        if (staffMember == null || !staffMember.isActive() || !staffMember.getRank().hasConsoleVariant())
         {
             return;
         }
 
         event.setBypassPassword(true);
-        event.setName(admin.getName());
+        event.setName(staffMember.getName());
     }
 
     @EventHandler(priority = EventPriority.NORMAL)
@@ -65,8 +66,10 @@ public class BukkitTelnetBridge extends FreedomService
     @EventHandler(priority = EventPriority.NORMAL)
     public void onTelnetRequestDataTags(TelnetRequestDataTagsEvent event)
     {
-        for (Map.Entry<Player, Map<String, Object>> entry : event.getDataTags().entrySet())
+        final Iterator<Map.Entry<Player, Map<String, Object>>> it = event.getDataTags().entrySet().iterator();
+        while (it.hasNext())
         {
+            final Map.Entry<Player, Map<String, Object>> entry = it.next();
             final Player player = entry.getKey();
             final Map<String, Object> playerTags = entry.getValue();
 
@@ -74,14 +77,14 @@ public class BukkitTelnetBridge extends FreedomService
             boolean isTelnetAdmin = false;
             boolean isSeniorAdmin = false;
 
-            final Admin admin = plugin.al.getAdmin(player);
-            if (admin != null)
+            final StaffMember staffMember = plugin.sl.getAdmin(player);
+            if (staffMember != null)
             {
-                boolean active = admin.isActive();
+                boolean active = staffMember.isActive();
 
                 isAdmin = active;
-                isSeniorAdmin = active && admin.getRank() == Rank.SENIOR_ADMIN;
-                isTelnetAdmin = active && (isSeniorAdmin || admin.getRank() == Rank.ADMIN);
+                isSeniorAdmin = active && staffMember.getRank() == Rank.SENIOR_ADMIN;
+                isTelnetAdmin = active && (isSeniorAdmin || staffMember.getRank() == Rank.ADMIN);
             }
 
             playerTags.put("tfm.admin.isAdmin", isAdmin);
@@ -118,22 +121,22 @@ public class BukkitTelnetBridge extends FreedomService
         return bukkitTelnetPlugin;
     }
 
-    public List<Admin> getConnectedAdmins()
+    public List<StaffMember> getConnectedAdmins()
     {
-        List<Admin> admins = new ArrayList<>();
+        List<StaffMember> staffMembers = new ArrayList<>();
         final BukkitTelnet telnet = getBukkitTelnetPlugin();
         if (telnet != null)
         {
             for (ClientSession session : telnet.appender.getSessions())
             {
-                Admin admin = plugin.al.getEntryByName(session.getUserName().toLowerCase());
-                if (admin != null && !admins.contains(admin))
+                StaffMember staffMember = plugin.sl.getEntryByName(session.getUserName().toLowerCase());
+                if (staffMember != null && !staffMembers.contains(staffMember))
                 {
-                    admins.add(admin);
+                    staffMembers.add(staffMember);
                 }
             }
         }
-        return admins;
+        return staffMembers;
     }
 
     public void killTelnetSessions(final String name)
@@ -145,8 +148,10 @@ public class BukkitTelnetBridge extends FreedomService
             final BukkitTelnet telnet = getBukkitTelnetPlugin();
             if (telnet != null)
             {
-                for (ClientSession session : telnet.appender.getSessions())
+                final Iterator<ClientSession> it = telnet.appender.getSessions().iterator();
+                while (it.hasNext())
                 {
+                    final ClientSession session = it.next();
                     if (name != null && name.equalsIgnoreCase(session.getUserName()))
                     {
                         sessionsToRemove.add(session);
@@ -174,4 +179,4 @@ public class BukkitTelnetBridge extends FreedomService
             FLog.severe("Error removing telnet sessions: " + ex.getMessage());
         }
     }
-}
+}

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

@@ -6,77 +6,27 @@ import java.sql.DriverManager;
 import java.sql.ResultSet;
 import java.sql.SQLException;
 import java.sql.Statement;
-import java.text.DecimalFormat;
 import java.util.Arrays;
-import java.util.Collections;
-import java.util.HashMap;
 import java.util.List;
-import java.util.Map;
 import me.totalfreedom.totalfreedommod.FreedomService;
 import me.totalfreedom.totalfreedommod.config.ConfigEntry;
-import me.totalfreedom.totalfreedommod.player.PlayerData;
 import me.totalfreedom.totalfreedommod.util.FLog;
-import me.totalfreedom.totalfreedommod.util.FUtil;
 import net.coreprotect.CoreProtect;
 import net.coreprotect.CoreProtectAPI;
 import org.bukkit.Bukkit;
-import org.bukkit.ChatColor;
 import org.bukkit.World;
-import org.bukkit.block.Block;
-import org.bukkit.block.BlockState;
-import org.bukkit.block.data.BlockData;
-import org.bukkit.entity.Player;
-import org.bukkit.event.EventHandler;
-import org.bukkit.event.EventPriority;
-import org.bukkit.event.block.Action;
-import org.bukkit.event.player.PlayerInteractEvent;
 import org.bukkit.plugin.Plugin;
 import org.bukkit.scheduler.BukkitRunnable;
 import org.bukkit.scheduler.BukkitTask;
 
 public class CoreProtectBridge extends FreedomService
 {
-    public static Map<Player, FUtil.PaginationList<String>> HISTORY_MAP = new HashMap<>();
+    private CoreProtectAPI coreProtectAPI = null;
+
     private final List<String> tables = Arrays.asList("co_sign", "co_session", "co_container", "co_block");
 
-    private final HashMap<String, Long> cooldown = new HashMap<>();
-    private CoreProtectAPI coreProtectAPI = null;
     private BukkitTask wiper;
 
-    public static Long getSecondsLeft(long prevTime, int timeAdd)
-    {
-        return prevTime / 1000L + timeAdd - System.currentTimeMillis() / 1000L;
-    }
-
-    // Unix timestamp converter taken from Functions class in CoreProtect, not my code
-    public static String getTimeAgo(int logTime, int currentTime)
-    {
-        StringBuilder message = new StringBuilder();
-        double timeSince = (double)currentTime - ((double)logTime + 0.0D);
-        timeSince /= 60.0D;
-        if (timeSince < 60.0D)
-        {
-            message.append((new DecimalFormat("0.00")).format(timeSince)).append("/m ago");
-        }
-
-        if (message.length() == 0)
-        {
-            timeSince /= 60.0D;
-            if (timeSince < 24.0D)
-            {
-                message.append((new DecimalFormat("0.00")).format(timeSince)).append("/h ago");
-            }
-        }
-
-        if (message.length() == 0)
-        {
-            timeSince /= 24.0D;
-            message.append((new DecimalFormat("0.00")).format(timeSince)).append("/d ago");
-        }
-
-        return message.toString();
-    }
-
     @Override
     public void onStart()
     {
@@ -93,8 +43,8 @@ public class CoreProtectBridge extends FreedomService
         try
         {
             final Plugin coreProtectPlugin = Bukkit.getServer().getPluginManager().getPlugin("CoreProtect");
-            assert coreProtectPlugin != null;
-            if (coreProtectPlugin instanceof CoreProtect)
+
+            if (coreProtectPlugin != null && coreProtectPlugin instanceof CoreProtect)
             {
                 coreProtect = (CoreProtect)coreProtectPlugin;
             }
@@ -153,7 +103,7 @@ public class CoreProtectBridge extends FreedomService
             @Override
             public void run()
             {
-                coreProtect.performRollback(86400, Collections.singletonList(name), null, null, null, null, 0, null);
+                coreProtect.performRollback(86400, Arrays.asList(name), null, null, null, null, 0, null);
             }
         }.runTaskAsynchronously(plugin);
     }
@@ -173,7 +123,7 @@ public class CoreProtectBridge extends FreedomService
             @Override
             public void run()
             {
-                coreProtect.performRestore(86400, Collections.singletonList(name), null, null, null, null, 0, null);
+                coreProtect.performRestore(86400, Arrays.asList(name), null, null, null, null, 0, null);
             }
         }.runTaskAsynchronously(plugin);
     }
@@ -218,7 +168,7 @@ public class CoreProtectBridge extends FreedomService
 
         /* As CoreProtect doesn't have an API method for deleting all of the data for a specific world
            we have to do this manually via SQL */
-        Connection connection;
+        Connection connection = null;
         try
         {
             String host = ConfigEntry.COREPROTECT_MYSQL_HOST.getString();
@@ -267,191 +217,4 @@ public class CoreProtectBridge extends FreedomService
             server.shutdown();
         }
     }
-
-    @EventHandler(priority = EventPriority.MONITOR)
-    public void onPlayerInteract(PlayerInteractEvent event)
-    {
-        Player player = event.getPlayer();
-        PlayerData data = plugin.pl.getData(player);
-        Block block = event.getClickedBlock();
-        final CoreProtectAPI coreProtect = getCoreProtectAPI();
-
-        if (data.hasInspection())
-        {
-            if (event.getAction() == Action.LEFT_CLICK_BLOCK)
-            {
-                if (block != null)
-                {
-                    event.setCancelled(true);
-                    List<String[]> lookup = coreProtect.blockLookup(block, -1);
-
-                    int cooldownTime = 3;
-
-                    if (cooldown.containsKey(player.getName()))
-                    {
-                        long secondsLeft = getSecondsLeft(cooldown.get(player.getName()), cooldownTime);
-                        if (secondsLeft > 0L)
-                        {
-                            event.setCancelled(true);
-                            player.sendMessage(ChatColor.RED + String.valueOf(secondsLeft) + " seconds left before next query.");
-                            return;
-                        }
-                    }
-
-                    if (!plugin.al.isAdmin(player))
-                    {
-                        cooldown.put(player.getName(), System.currentTimeMillis());
-                    }
-
-                    if (lookup != null)
-                    {
-                        if (lookup.isEmpty())
-                        {
-                            player.sendMessage(net.md_5.bungee.api.ChatColor.of("#30ade4") + "Block Inspector " + ChatColor.WHITE + "- " + "No block data found for this location");
-                            return;
-                        }
-
-                        HISTORY_MAP.remove(event.getPlayer());
-                        HISTORY_MAP.put(event.getPlayer(), new FUtil.PaginationList<>(10));
-                        FUtil.PaginationList<String> paged = HISTORY_MAP.get(event.getPlayer());
-
-                        player.sendMessage("---- " + net.md_5.bungee.api.ChatColor.of("#30ade4") + "Block Inspector" + ChatColor.WHITE + " ---- " +
-                                ChatColor.GRAY + "(x" + block.getX() + "/" + "y" + block.getY() + "/" + "z" + block.getZ() + ")");
-
-                        for (String[] value : lookup)
-                        {
-                            CoreProtectAPI.ParseResult result = coreProtect.parseResult(value);
-                            BlockData bl = result.getBlockData();
-
-                            String s;
-                            String st = "";
-
-                            if (result.getActionString().equals("Placement"))
-                            {
-                                s = " placed ";
-                            }
-                            else if (result.getActionString().equals("Removal"))
-                            {
-                                s = " broke ";
-                            }
-                            else
-                            {
-                                s = " interacted with ";
-                            }
-
-                            if (result.isRolledBack())
-                            {
-                                st += "§m";
-                            }
-
-                            int time = (int)(System.currentTimeMillis() / 1000L);
-
-                            paged.add(ChatColor.GRAY + getTimeAgo(result.getTime(), time) + ChatColor.WHITE + " - " + net.md_5.bungee.api.ChatColor.of("#30ade4") +
-                                    st + result.getPlayer() + ChatColor.WHITE + st + s + net.md_5.bungee.api.ChatColor.of("#30ade4") + st + bl.getMaterial().toString().toLowerCase());
-                        }
-
-                        List<String> page = paged.getPage(1);
-                        for (String entries : page)
-                        {
-                            player.sendMessage(entries);
-                        }
-
-                        player.sendMessage("Page 1/" + paged.getPageCount() + " | To index through the pages, type " + net.md_5.bungee.api.ChatColor.of("#30ade4") + "/ins history <page>");
-                    }
-                }
-            }
-            else if (event.getAction() == Action.RIGHT_CLICK_BLOCK)
-            {
-                if (block != null)
-                {
-                    if (data.hasInspection())
-                    {
-                        BlockState blockState = block.getRelative(event.getBlockFace()).getState();
-                        Block placedBlock = blockState.getBlock();
-                        event.setCancelled(true);
-                        List<String[]> lookup = coreProtect.blockLookup(placedBlock, -1);
-
-                        if (lookup.isEmpty())
-                        {
-                            lookup = coreProtect.blockLookup(block, -1);
-                        }
-
-                        int cooldownTime = 3;
-
-                        if (cooldown.containsKey(player.getName()))
-                        {
-                            long secondsLeft = getSecondsLeft(cooldown.get(player.getName()), cooldownTime);
-                            if (secondsLeft > 0L)
-                            {
-                                event.setCancelled(true);
-                                player.sendMessage(ChatColor.RED + String.valueOf(secondsLeft) + " seconds left before next query.");
-                                return;
-                            }
-                        }
-
-                        if (!plugin.al.isAdmin(player))
-                        {
-                            cooldown.put(player.getName(), System.currentTimeMillis());
-                        }
-
-                        if (lookup != null)
-                        {
-                            if (lookup.isEmpty())
-                            {
-                                player.sendMessage(net.md_5.bungee.api.ChatColor.of("#30ade4") + "Block Inspector " + ChatColor.WHITE + "- " + "No block data found for this location");
-                                return;
-                            }
-
-                            HISTORY_MAP.remove(event.getPlayer());
-                            HISTORY_MAP.put(event.getPlayer(), new FUtil.PaginationList<>(10));
-                            FUtil.PaginationList<String> paged = HISTORY_MAP.get(event.getPlayer());
-
-                            player.sendMessage("---- " + net.md_5.bungee.api.ChatColor.of("#30ade4") + "Block Inspector" + ChatColor.WHITE + " ---- " +
-                                    ChatColor.GRAY + "(x" + block.getX() + "/" + "y" + block.getY() + "/" + "z" + block.getZ() + ")");
-
-                            for (String[] value : lookup)
-                            {
-                                CoreProtectAPI.ParseResult result = coreProtect.parseResult(value);
-                                BlockData bl = result.getBlockData();
-
-                                String s;
-                                String st = "";
-
-                                if (result.getActionString().equals("Placement"))
-                                {
-                                    s = " placed ";
-                                }
-                                else if (result.getActionString().equals("Removal"))
-                                {
-                                    s = " broke ";
-                                }
-                                else
-                                {
-                                    s = " interacted with ";
-                                }
-
-                                if (result.isRolledBack())
-                                {
-                                    st += "§m";
-                                }
-
-                                int time = (int)(System.currentTimeMillis() / 1000L);
-
-                                paged.add(ChatColor.GRAY + getTimeAgo(result.getTime(), time) + ChatColor.WHITE + " - " + net.md_5.bungee.api.ChatColor.of("#30ade4") +
-                                        st + result.getPlayer() + ChatColor.WHITE + st + s + net.md_5.bungee.api.ChatColor.of("#30ade4") + st + bl.getMaterial().toString().toLowerCase());
-                            }
-
-                            List<String> page = paged.getPage(1);
-                            for (String entries : page)
-                            {
-                                player.sendMessage(entries);
-                            }
-
-                            player.sendMessage("Page 1/" + paged.getPageCount() + " | To index through the pages, type " + net.md_5.bungee.api.ChatColor.of("#30ade4") + "/ins history <page>");
-                        }
-                    }
-                }
-            }
-        }
-    }
 }

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

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

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

@@ -0,0 +1,185 @@
+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.CoreProtect;
+import net.coreprotect.CoreProtectAPI;
+import org.bukkit.Bukkit;
+import org.bukkit.Location;
+import org.bukkit.Material;
+import org.bukkit.World;
+import org.bukkit.block.Block;
+import org.bukkit.block.BlockState;
+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 = ((CoreProtect)Bukkit.getPluginManager().getPlugin("CoreProtect")).getAPI();
+
+        /*
+         * 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<>()));
+            BlockVector3 vectorClone = new Gson().fromJson(new Gson().toJson(blockVector3), blockVector3.getClass());
+
+            if (!blocksPlaced.get(playerAndSessionEntry).getValue().contains(vectorClone))
+            {
+                blocksPlaced.get(playerAndSessionEntry).getValue().add(vectorClone);
+            }
+        }
+    }
+
+    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<BlockState> blocks = new ArrayList<>();
+
+        for (BlockVector3 blockVector3 : region)
+        {
+            blocks.add(world.getBlockAt(blockVector3.getBlockX(), blockVector3.getBlockY(), blockVector3.getBlockZ()).getState());
+        }
+
+        logBlockEdit(playerName, editSession, pattern, blocks);
+    }
+
+    public void logBlockEdit(String playerName, EditSession editSession, Pattern pattern, List<BlockState> blocks)
+    {
+        Map.Entry<String, EditSession> playerAndSessionEntry = new AbstractMap.SimpleEntry(playerName, editSession);
+
+        server.getScheduler().scheduleAsyncDelayedTask(plugin, () ->
+        {
+            for (BlockState 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,7 +46,7 @@ public class LibsDisguisesBridge extends FreedomService
         return libsDisguisesPlugin;
     }
 
-    public void undisguiseAll(boolean admin)
+    public void undisguiseAll(boolean staff)
     {
         try
         {
@@ -61,7 +61,7 @@ public class LibsDisguisesBridge extends FreedomService
             {
                 if (DisguiseAPI.isDisguised(player))
                 {
-                    if (!admin && plugin.al.isAdmin(player))
+                    if (!staff && plugin.sl.isStaff(player))
                     {
                         continue;
                     }
@@ -75,11 +75,6 @@ public class LibsDisguisesBridge extends FreedomService
         }
     }
 
-    public boolean isDisguisesEnabled()
-    {
-        return !BlockedDisguises.disabled;
-    }
-
     public void setDisguisesEnabled(boolean state)
     {
         final LibsDisguises libsDisguises = getLibsDisguisesPlugin();
@@ -92,6 +87,11 @@ 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

@@ -8,6 +8,7 @@ import org.bukkit.plugin.Plugin;
 
 public class TFGuildsBridge extends FreedomService
 {
+
     public boolean enabled = false;
 
     @Override
@@ -55,4 +56,4 @@ public class TFGuildsBridge extends FreedomService
         }
         return Common.IN_GUILD_CHAT.contains(player);
     }
-}
+}

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

@@ -60,7 +60,8 @@ public class WorldEditBridge extends FreedomService
                 {
                     for (int i = 0; i < count; i++)
                     {
-                        session.undo(session.getBlockBag(bukkitPlayer), bukkitPlayer);
+                        com.sk89q.worldedit.entity.Player fuckyou = (com.sk89q.worldedit.entity.Player)bukkitPlayer;
+                        session.undo(session.getBlockBag(fuckyou), fuckyou);
                     }
                 }
             }
@@ -83,7 +84,8 @@ public class WorldEditBridge extends FreedomService
                 {
                     for (int i = 0; i < count; i++)
                     {
-                        session.redo(session.getBlockBag(bukkitPlayer), bukkitPlayer);
+                        com.sk89q.worldedit.entity.Player fuckyou = (com.sk89q.worldedit.entity.Player)bukkitPlayer;
+                        session.redo(session.getBlockBag(fuckyou), fuckyou);
                     }
                 }
             }

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

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

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

@@ -1,7 +1,6 @@
 package me.totalfreedom.totalfreedommod.caging;
 
 import io.papermc.lib.PaperLib;
-import java.util.Objects;
 import me.totalfreedom.totalfreedommod.FreedomService;
 import me.totalfreedom.totalfreedommod.player.FPlayer;
 import me.totalfreedom.totalfreedommod.util.FUtil;
@@ -32,7 +31,8 @@ public class Cager extends FreedomService
     public void onBreakBlock(BlockBreakEvent event)
     {
         Player player = event.getPlayer();
-        if (plugin.al.isAdmin(player))
+        if (player == null
+                || plugin.sl.isStaff(player))
         {
             return;
         }
@@ -61,7 +61,7 @@ public class Cager extends FreedomService
         Location cageLoc = cage.getLocation();
 
         final boolean outOfCage;
-        if (!Objects.equals(playerLoc.getWorld(), cageLoc.getWorld()))
+        if (!playerLoc.getWorld().equals(cageLoc.getWorld()))
         {
             outOfCage = true;
         }
@@ -113,4 +113,5 @@ public class Cager extends FreedomService
             cage.playerJoin();
         }
     }
-}
+
+}

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

@@ -4,12 +4,14 @@ 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()
@@ -38,9 +40,7 @@ public class CommandLoader extends FreedomService
         for (FreedomCommand command : commands)
         {
             if (name.equals(command.getName()))
-            {
                 return command;
-            }
         }
         return null;
     }
@@ -50,9 +50,7 @@ public class CommandLoader extends FreedomService
         for (FreedomCommand command : commands)
         {
             if (Arrays.asList(command.getAliases().split(",")).contains(alias))
-            {
                 return true;
-            }
         }
         return false;
     }
@@ -71,15 +69,10 @@ public class CommandLoader extends FreedomService
             }
             catch (InstantiationException | IllegalAccessException | ExceptionInInitializerError ex)
             {
-                FLog.warning("Failed to register command: /" + commandClass.getSimpleName().replace("Command_", ""));
+                FLog.warning("Failed to register command: /" + commandClass.getSimpleName().replace("Command_" , ""));
             }
         }
 
         FLog.info("Loaded " + commands.size() + " commands");
     }
-
-    public List<FreedomCommand> getCommands()
-    {
-        return commands;
-    }
 }

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

@@ -37,7 +37,7 @@ public class Command_adventure extends FreedomCommand
                 targetPlayer.setGameMode(GameMode.ADVENTURE);
             }
 
-            FUtil.adminAction(sender.getName(), "Changing everyone's gamemode to adventure", false);
+            FUtil.staffAction(sender.getName(), "Changing everyone's gamemode to adventure", false);
             msg("Your gamemode has been set to adventure.");
             return true;
         }
@@ -55,4 +55,4 @@ public class Command_adventure extends FreedomCommand
         player.setGameMode(GameMode.ADVENTURE);
         return true;
     }
-}
+}

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

@@ -17,7 +17,7 @@ public class Command_aeclear extends FreedomCommand
     @Override
     public boolean run(CommandSender sender, Player playerSender, Command cmd, String commandLabel, String[] args, boolean senderIsConsole)
     {
-        FUtil.adminAction(sender.getName(), "Removing all area effect clouds", true);
+        FUtil.staffAction(sender.getName(), "Removing all area effect clouds.", true);
         int removed = 0;
         for (World world : server.getWorlds())
         {
@@ -33,4 +33,4 @@ public class Command_aeclear extends FreedomCommand
         msg(removed + " area effect clouds removed.");
         return true;
     }
-}
+}

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

@@ -22,4 +22,5 @@ public class Command_announce extends FreedomCommand
         plugin.an.announce(StringUtils.join(args, " "));
         return true;
     }
-}
+
+}

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

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

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

@@ -2,7 +2,6 @@ package me.totalfreedom.totalfreedommod.command;
 
 import java.util.ArrayList;
 import java.util.List;
-import java.util.Objects;
 import me.totalfreedom.totalfreedommod.banning.Ban;
 import me.totalfreedom.totalfreedommod.player.PlayerData;
 import me.totalfreedom.totalfreedommod.punishments.Punishment;
@@ -32,8 +31,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"))
@@ -101,7 +100,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);
-                        Objects.requireNonNull(targetPos.getWorld()).strikeLightning(strike_pos);
+                        targetPos.getWorld().strikeLightning(strike_pos);
                     }
                 }
             }
@@ -155,7 +154,7 @@ public class Command_ban extends FreedomCommand
                 bcast.append(" - Reason: ").append(ChatColor.YELLOW).append(reason);
             }
             msg(sender, ChatColor.GRAY + username + " has been banned and IP is: " + StringUtils.join(ips, ", "));
-            FUtil.adminAction(sender.getName(), bcast.toString(), true);
+            FUtil.staffAction(sender.getName(), String.format(bcast.toString()), true);
         }
 
         // Kick player and handle others on IP

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

@@ -27,10 +27,10 @@ public class Command_banip extends FreedomCommand
         boolean silent = false;
 
         String reason = null;
-
+        
         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,7 +72,7 @@ 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.al.isAdmin(player) ? "the IP " + ip : "an IP");
+                String message = ChatColor.RED + sender.getName() + " - Banned " + (plugin.sl.isStaff(player) ? "the IP " + ip : "an IP");
                 player.sendMessage(message);
             }
         }

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

@@ -20,7 +20,7 @@ public class Command_banlist extends FreedomCommand
             {
                 checkRank(Rank.SENIOR_ADMIN);
 
-                FUtil.adminAction(sender.getName(), "Purging the ban list", true);
+                FUtil.staffAction(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

@@ -26,8 +26,8 @@ public class Command_banname extends FreedomCommand
         boolean silent = false;
 
         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.adminAction(sender.getName(), "Banned the name " + name, true);
+            FUtil.staffAction(sender.getName(), "Banned the name " + name, true);
         }
 
         Player player = getPlayer(name);

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

@@ -2,7 +2,7 @@ package me.totalfreedom.totalfreedommod.command;
 
 import java.util.Arrays;
 import java.util.List;
-import java.util.SplittableRandom;
+import java.util.Random;
 import me.totalfreedom.totalfreedommod.rank.Rank;
 import org.bukkit.Location;
 import org.bukkit.command.Command;
@@ -27,7 +27,7 @@ public class Command_bird extends FreedomCommand
     public EntityType getRandomFish()
     {
         List<EntityType> fishTypes = Arrays.asList(EntityType.COD, EntityType.SALMON, EntityType.PUFFERFISH, EntityType.TROPICAL_FISH);
-        SplittableRandom random = new SplittableRandom();
+        Random random = new Random();
         return fishTypes.get(random.nextInt(fishTypes.size()));
     }
 }

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

@@ -23,7 +23,7 @@ public class Command_blockcmd extends FreedomCommand
 
         if (args[0].equals("purge"))
         {
-            FUtil.adminAction(sender.getName(), "Unblocking commands for all players", true);
+            FUtil.staffAction(sender.getName(), "Unblocking commands for all players", true);
             int counter = 0;
             for (Player player : server.getOnlinePlayers())
             {
@@ -40,18 +40,18 @@ public class Command_blockcmd extends FreedomCommand
 
         if (args[0].equals("-a"))
         {
-            FUtil.adminAction(sender.getName(), "Blocking commands for all non-admins", true);
+            FUtil.staffAction(sender.getName(), "Blocking commands for all non-staff", true);
             int counter = 0;
             for (Player player : server.getOnlinePlayers())
             {
-                if (isAdmin(player))
+                if (isStaff(player))
                 {
                     continue;
                 }
 
                 counter += 1;
                 plugin.pl.getPlayer(player).setCommandsBlocked(true);
-                msg(player, "Your commands have been blocked by an admin.", ChatColor.RED);
+                msg(player, "Your commands have been blocked by a staff member.", ChatColor.RED);
             }
 
             msg("Blocked commands for " + counter + " players.");
@@ -66,9 +66,9 @@ public class Command_blockcmd extends FreedomCommand
             return true;
         }
 
-        if (isAdmin(player))
+        if (isStaff(player))
         {
-            msg(player.getName() + " is an admin, and cannot have their commands blocked.");
+            msg(player.getName() + " is a staff member, and cannot have their commands blocked.");
             return true;
         }
 
@@ -76,7 +76,7 @@ public class Command_blockcmd extends FreedomCommand
         if (!playerdata.allCommandsBlocked())
         {
             playerdata.setCommandsBlocked(true);
-            FUtil.adminAction(sender.getName(), "Blocking all commands for " + player.getName(), true);
+            FUtil.staffAction(sender.getName(), "Blocking all commands for " + player.getName(), true);
             msg("Blocked commands for " + player.getName() + ".");
         }
         else

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

@@ -46,7 +46,7 @@ public class Command_blockedit extends FreedomCommand
 
         if (args[0].equals("purge"))
         {
-            FUtil.adminAction(sender.getName(), "Unblocking block modification abilities for all players", true);
+            FUtil.staffAction(sender.getName(), "Unblocking block modification abilities for all players.", true);
             int count = 0;
             for (final Player player : this.server.getOnlinePlayers())
             {
@@ -63,11 +63,11 @@ public class Command_blockedit extends FreedomCommand
 
         if (args[0].equals("all"))
         {
-            FUtil.adminAction(sender.getName(), "Blocking block modification abilities for all non-admins", true);
+            FUtil.staffAction(sender.getName(), "Blocking block modification abilities for all non-staff.", true);
             int counter = 0;
             for (final Player player : this.server.getOnlinePlayers())
             {
-                if (!plugin.al.isAdmin(player))
+                if (!plugin.sl.isStaff(player))
                 {
                     final FPlayer playerdata = plugin.pl.getPlayer(player);
                     playerdata.setEditBlocked(true);
@@ -105,20 +105,20 @@ public class Command_blockedit extends FreedomCommand
         final FPlayer pd = plugin.pl.getPlayer(player2);
         if (pd.isEditBlocked())
         {
-            FUtil.adminAction(sender.getName(), "Unblocking block modification abilities for " + player2.getName(), true);
+            FUtil.staffAction(sender.getName(), "Unblocking block modification abilities for " + player2.getName(), true);
             pd.setEditBlocked(false);
             msg("Unblocking block modification abilities for " + player2.getName());
             msg(player2, "Your block modification abilities have been restored.", ChatColor.RED);
         }
         else
         {
-            if (plugin.al.isAdmin(player2))
+            if (plugin.sl.isStaff(player2))
             {
-                msg(player2.getName() + " is an admin, and cannot have their block edits blocked.");
+                msg(player2.getName() + " is a staff member, and cannot have their block edits blocked.");
                 return true;
             }
 
-            FUtil.adminAction(sender.getName(), "Blocking block modification abilities for " + player2.getName(), true);
+            FUtil.staffAction(sender.getName(), "Blocking block modification abilities for " + player2.getName(), true);
             pd.setEditBlocked(true);
 
             if (smite)

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

@@ -46,7 +46,7 @@ public class Command_blockpvp extends FreedomCommand
 
         if (args[0].equals("purge"))
         {
-            FUtil.adminAction(sender.getName(), "Enabling PVP for all players.", true);
+            FUtil.staffAction(sender.getName(), "Enabling PVP for all players.", true);
             int count = 0;
             for (Player player : server.getOnlinePlayers())
             {
@@ -64,11 +64,11 @@ public class Command_blockpvp extends FreedomCommand
 
         if (args[0].equals("all"))
         {
-            FUtil.adminAction(sender.getName(), "Disabling PVP for all non-admins", true);
+            FUtil.staffAction(sender.getName(), "Disabling PVP for all non-staff", true);
             int counter = 0;
             for (Player player : server.getOnlinePlayers())
             {
-                if (!plugin.al.isAdmin(player))
+                if (!plugin.sl.isStaff(player))
                 {
                     final FPlayer playerdata = plugin.pl.getPlayer(player);
                     playerdata.setPvpBlocked(true);
@@ -106,20 +106,20 @@ public class Command_blockpvp extends FreedomCommand
         final FPlayer pd = plugin.pl.getPlayer(p);
         if (pd.isPvpBlocked())
         {
-            FUtil.adminAction(sender.getName(), "Enabling PVP for " + p.getName(), true);
+            FUtil.staffAction(sender.getName(), "Enabling PVP for " + p.getName(), true);
             pd.setPvpBlocked(false);
-            msg("Enabling PVP for " + p.getName());
+            msg("Enabling PVP  for  " + p.getName());
             msg(p, "Your PVP have been enabled.", ChatColor.GREEN);
         }
         else
         {
-            if (plugin.al.isAdmin(p))
+            if (plugin.sl.isStaff(p))
             {
-                msg(p.getName() + " is an admin, and cannot have their PVP disabled.");
+                msg(p.getName() + " is a staff member, and cannot have their PVP disabled.");
                 return true;
             }
 
-            FUtil.adminAction(sender.getName(), "Disabling PVP for " + p.getName(), true);
+            FUtil.staffAction(sender.getName(), "Disabling PVP for " + p.getName(), true);
             pd.setPvpBlocked(true);
             if (smite)
             {

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

@@ -18,14 +18,14 @@ public class Command_blockredstone extends FreedomCommand
         if (ConfigEntry.ALLOW_REDSTONE.getBoolean())
         {
             ConfigEntry.ALLOW_REDSTONE.setBoolean(false);
-            FUtil.adminAction(sender.getName(), "Blocking all redstone", true);
+            FUtil.staffAction(sender.getName(), "Blocking all redstone", true);
             new BukkitRunnable()
             {
                 public void run()
                 {
                     if (!ConfigEntry.ALLOW_REDSTONE.getBoolean())
                     {
-                        FUtil.adminAction("TotalFreedom", "Unblocking all redstone", false);
+                        FUtil.staffAction("TotalFreedom", "Unblocking all redstone", false);
                         ConfigEntry.ALLOW_REDSTONE.setBoolean(true);
                     }
                 }
@@ -34,8 +34,8 @@ public class Command_blockredstone extends FreedomCommand
         else
         {
             ConfigEntry.ALLOW_REDSTONE.setBoolean(true);
-            FUtil.adminAction(sender.getName(), "Unblocking all redstone", true);
+            FUtil.staffAction(sender.getName(), "Unblocking all redstone", true);
         }
         return true;
     }
-}
+}

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

@@ -28,9 +28,9 @@ public class Command_cage extends FreedomCommand
         }
 
         String skullName = null;
-        if (args[0].equalsIgnoreCase("purge"))
+        if ("purge".equals(args[0]))
         {
-            FUtil.adminAction(sender.getName(), "Uncaging all players", true);
+            FUtil.staffAction(sender.getName(), "Uncaging all players", true);
             for (Player player : server.getOnlinePlayers())
             {
                 final FPlayer fPlayer = plugin.pl.getPlayer(player);
@@ -101,11 +101,11 @@ public class Command_cage extends FreedomCommand
 
         if (outerMaterial == Material.PLAYER_HEAD)
         {
-            FUtil.adminAction(sender.getName(), "Caging " + player.getName() + " in " + skullName, true);
+            FUtil.staffAction(sender.getName(), "Caging " + player.getName() + " in " + skullName, true);
         }
         else
         {
-            FUtil.adminAction(sender.getName(), "Caging " + player.getName(), true);
+            FUtil.staffAction(sender.getName(), "Caging " + player.getName(), true);
         }
         return true;
     }
@@ -113,7 +113,7 @@ public class Command_cage extends FreedomCommand
     @Override
     public List<String> getTabCompleteOptions(CommandSender sender, Command command, String alias, String[] args)
     {
-        if (!plugin.al.isAdmin(sender))
+        if (!plugin.sl.isStaff(sender))
         {
             return null;
         }
@@ -146,4 +146,4 @@ public class Command_cage extends FreedomCommand
 
         return Collections.emptyList();
     }
-}
+}

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

@@ -29,7 +29,6 @@ public class Command_cake extends FreedomCommand
 
         final ItemStack heldItem = new ItemStack(Material.CAKE);
         final ItemMeta heldItemMeta = heldItem.getItemMeta();
-        assert heldItemMeta != null;
         heldItemMeta.setDisplayName(ChatColor.WHITE + "The " + ChatColor.DARK_GRAY + "Lie");
         heldItem.setItemMeta(heldItemMeta);
 

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

@@ -1,6 +1,5 @@
 package me.totalfreedom.totalfreedommod.command;
 
-import java.util.Objects;
 import me.totalfreedom.totalfreedommod.rank.Rank;
 import org.bukkit.command.Command;
 import org.bukkit.command.CommandSender;
@@ -17,8 +16,9 @@ public class Command_cartsit extends FreedomCommand
     {
         Player targetPlayer = playerSender;
 
-        if (args.length == 1 && plugin.al.isAdmin(sender))
+        if (args.length == 1 && plugin.sl.isStaff(sender))
         {
+
             targetPlayer = getPlayer(args[0]);
 
             if (targetPlayer == null)
@@ -39,7 +39,7 @@ public class Command_cartsit extends FreedomCommand
 
         if (targetPlayer.isInsideVehicle())
         {
-            Objects.requireNonNull(targetPlayer.getVehicle()).eject();
+            targetPlayer.getVehicle().eject();
         }
         else
         {
@@ -74,4 +74,4 @@ public class Command_cartsit extends FreedomCommand
 
         return true;
     }
-}
+}

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

@@ -16,7 +16,7 @@ public class Command_clearchat extends FreedomCommand
     {
         for (Player player : server.getOnlinePlayers())
         {
-            if (!plugin.al.isAdmin(player))
+            if (!plugin.sl.isStaff(player))
             {
                 for (int i = 0; i < 100; i++)
                 {
@@ -24,7 +24,7 @@ public class Command_clearchat extends FreedomCommand
                 }
             }
         }
-        FUtil.adminAction(sender.getName(), "Cleared chat", true);
+        FUtil.staffAction(sender.getName(), "Cleared chat", true);
         return true;
     }
-}
+}

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

@@ -5,7 +5,7 @@ import org.bukkit.command.Command;
 import org.bukkit.command.CommandSender;
 import org.bukkit.entity.Player;
 
-@CommandPermissions(level = Rank.ADMIN, source = SourceType.ONLY_CONSOLE)
+@CommandPermissions(level = Rank.SENIOR_ADMIN, source = SourceType.ONLY_CONSOLE)
 @CommandParameters(description = "Clear the discord message queue.", usage = "/<command>")
 public class Command_cleardiscordqueue extends FreedomCommand
 {
@@ -17,4 +17,4 @@ public class Command_cleardiscordqueue extends FreedomCommand
         msg("Cleared the discord message queue.");
         return true;
     }
-}
+}

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

@@ -29,11 +29,11 @@ public class Command_clearinventory extends FreedomCommand
         }
         else
         {
-            if (plugin.al.isAdmin(sender))
+            if (plugin.sl.isStaff(sender))
             {
                 if (args[0].equals("-a"))
                 {
-                    FUtil.adminAction(sender.getName(), "Clearing everyone's inventory", true);
+                    FUtil.staffAction(sender.getName(), "Clearing everyone's inventory", true);
                     for (Player player : server.getOnlinePlayers())
                     {
                         player.getInventory().clear();
@@ -67,7 +67,7 @@ public class Command_clearinventory extends FreedomCommand
     @Override
     public List<String> getTabCompleteOptions(CommandSender sender, Command command, String alias, String[] args)
     {
-        if (args.length == 1 && plugin.al.isAdmin(sender))
+        if (args.length == 1 && plugin.sl.isStaff(sender))
         {
             List<String> players = FUtil.getPlayerList();
             players.add("-a");
@@ -76,4 +76,4 @@ public class Command_clearinventory extends FreedomCommand
 
         return Collections.emptyList();
     }
-}
+}

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

@@ -15,14 +15,14 @@ public class Command_clownfish extends FreedomCommand
     @Override
     public boolean run(CommandSender sender, Player playerSender, Command cmd, String commandLabel, String[] args, boolean senderIsConsole)
     {
-        if (plugin.pl.getData(playerSender).hasItem(ShopItem.CLOWN_FISH) && (!plugin.lp.CLOWNFISH_TOGGLE.contains(playerSender.getName())))
+        if (plugin.pl.getData(playerSender).hasItem(ShopItem.CLOWN_FISH))
         {
             playerSender.getInventory().addItem(plugin.sh.getClownFish());
             msg("You have been given a Clown Fish", ChatColor.GREEN);
         }
         else
         {
-            msg("You do not own a Clown Fish or an admin has toggled your ability to use it. Purchase one from the shop.", ChatColor.RED);
+            msg("You do not own a Clown Fish! Purchase one from the shop.", ChatColor.RED);
         }
         return true;
     }

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

@@ -1,7 +1,7 @@
 package me.totalfreedom.totalfreedommod.command;
 
-import me.totalfreedom.totalfreedommod.admin.Admin;
 import me.totalfreedom.totalfreedommod.rank.Rank;
+import me.totalfreedom.totalfreedommod.staff.StaffMember;
 import org.bukkit.command.Command;
 import org.bukkit.command.CommandSender;
 import org.bukkit.entity.Player;
@@ -14,11 +14,12 @@ public class Command_cmdspy extends FreedomCommand
     @Override
     public boolean run(CommandSender sender, Player playerSender, Command cmd, String commandLabel, String[] args, boolean senderIsConsole)
     {
-        Admin admin = plugin.al.getAdmin(playerSender);
-        admin.setCommandSpy(!admin.getCommandSpy());
-        msg("CommandSpy " + (admin.getCommandSpy() ? "enabled." : "disabled."));
-        plugin.al.save(admin);
-        plugin.al.updateTables();
+        StaffMember staffMember = plugin.sl.getAdmin(playerSender);
+        staffMember.setCommandSpy(!staffMember.getCommandSpy());
+        msg("CommandSpy " + (staffMember.getCommandSpy() ? "enabled." : "disabled."));
+        plugin.sl.save(staffMember);
+        plugin.sl.updateTables();
+
         return true;
     }
-}
+}

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

@@ -1,54 +1,55 @@
-package me.totalfreedom.totalfreedommod.command;
-
-import me.totalfreedom.totalfreedommod.config.ConfigEntry;
-import me.totalfreedom.totalfreedommod.player.PlayerData;
-import me.totalfreedom.totalfreedommod.rank.Rank;
-import me.totalfreedom.totalfreedommod.util.FUtil;
-import org.bukkit.ChatColor;
-import org.bukkit.command.Command;
-import org.bukkit.command.CommandSender;
-import org.bukkit.entity.Player;
-
-@CommandPermissions(level = Rank.OP, source = SourceType.BOTH)
-@CommandParameters(description = "Shows the amount of coins you have or another player has", usage = "/<command> [playername]")
-public class Command_coins extends FreedomCommand
-{
-    @Override
-    public boolean run(CommandSender sender, Player playerSender, Command cmd, String commandLabel, String[] args, boolean senderIsConsole)
-    {
-        if (!ConfigEntry.SHOP_ENABLED.getBoolean())
-        {
-            msg("The shop is currently disabled!", ChatColor.RED);
-            return true;
-        }
-        Player p;
-        final String prefix = FUtil.colorize(ConfigEntry.SHOP_PREFIX.getString() + " ");
-        if (args.length > 0)
-        {
-            if (getPlayer(args[0]) != null)
-            {
-                p = getPlayer(args[0]);
-            }
-            else
-            {
-                msg(PLAYER_NOT_FOUND);
-                return true;
-            }
-        }
-        else
-        {
-            if (senderIsConsole)
-            {
-                msg(prefix + ChatColor.RED + "You are not a player, use /coins <playername>");
-                return true;
-            }
-            else
-            {
-                p = playerSender;
-            }
-        }
-        PlayerData playerData = plugin.pl.getData(p);
-        msg(prefix + ChatColor.GREEN + (args.length > 0 ? p.getName() + " has " : "You have ") + ChatColor.RED + playerData.getCoins() + ChatColor.GREEN + " coins.");
-        return true;
-    }
+package me.totalfreedom.totalfreedommod.command;
+
+import me.totalfreedom.totalfreedommod.config.ConfigEntry;
+import me.totalfreedom.totalfreedommod.player.PlayerData;
+import me.totalfreedom.totalfreedommod.rank.Rank;
+import me.totalfreedom.totalfreedommod.util.FUtil;
+import org.bukkit.ChatColor;
+import org.bukkit.command.Command;
+import org.bukkit.command.CommandSender;
+import org.bukkit.entity.Player;
+
+@CommandPermissions(level = Rank.OP, source = SourceType.BOTH)
+@CommandParameters(description = "Shows the amount of coins you have or another player has", usage = "/<command> [playername]")
+public class Command_coins extends FreedomCommand
+{
+
+    @Override
+    public boolean run(CommandSender sender, Player playerSender, Command cmd, String commandLabel, String[] args, boolean senderIsConsole)
+    {
+        if (!ConfigEntry.SHOP_ENABLED.getBoolean())
+        {
+            msg("The shop is currently disabled!", ChatColor.RED);
+            return true;
+        }
+        Player p;
+        final String prefix = FUtil.colorize(ConfigEntry.SHOP_PREFIX.getString() + " ");
+        if (args.length > 0)
+        {
+            if (getPlayer(args[0]) != null)
+            {
+                p = getPlayer(args[0]);
+            }
+            else
+            {
+                msg(PLAYER_NOT_FOUND);
+                return true;
+            }
+        }
+        else
+        {
+            if (senderIsConsole)
+            {
+                msg(prefix + ChatColor.RED + "You are not a player, use /coins <playername>");
+                return true;
+            }
+            else
+            {
+                p = playerSender;
+            }
+        }
+        PlayerData playerData = plugin.pl.getData(p);
+        msg(prefix + ChatColor.GREEN + (args.length > 0 ? p.getName() + " has " : "You have ") + ChatColor.RED + playerData.getCoins() + ChatColor.GREEN + " coins.");
+        return true;
+    }
 }

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

@@ -1,5 +1,6 @@
 package me.totalfreedom.totalfreedommod.command;
 
+import java.util.Iterator;
 import java.util.Map;
 import me.totalfreedom.totalfreedommod.rank.Rank;
 import me.totalfreedom.totalfreedommod.util.FUtil;
@@ -22,7 +23,7 @@ public class Command_colorme extends FreedomCommand
             return false;
         }
 
-        if (args[0].equalsIgnoreCase("list"))
+        if ("list".equalsIgnoreCase(args[0]))
         {
             msg("Colors: " + StringUtils.join(FUtil.CHAT_COLOR_NAMES.keySet(), ", "));
             return true;
@@ -30,8 +31,10 @@ public class Command_colorme extends FreedomCommand
 
         final String needle = args[0].trim().toLowerCase();
         ChatColor color = null;
-        for (Map.Entry<String, ChatColor> entry : FUtil.CHAT_COLOR_NAMES.entrySet())
+        final Iterator<Map.Entry<String, ChatColor>> it = FUtil.CHAT_COLOR_NAMES.entrySet().iterator();
+        while (it.hasNext())
         {
+            final Map.Entry<String, ChatColor> entry = it.next();
             if (entry.getKey().contains(needle))
             {
                 color = entry.getValue();
@@ -50,6 +53,7 @@ public class Command_colorme extends FreedomCommand
         plugin.esb.setNickname(sender.getName(), newNick);
 
         msg("Your nickname is now: " + newNick);
+
         return true;
     }
-}
+}

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

@@ -30,13 +30,16 @@ public class Command_commandlist extends FreedomCommand
                 PluginDescriptionFile desc = targetPlugin.getDescription();
                 Map<String, Map<String, Object>> map = desc.getCommands();
 
-                for (Entry<String, Map<String, Object>> entry : map.entrySet())
+                if (map != null)
                 {
-                    String command_name = entry.getKey();
-                    commands.add(command_name);
+                    for (Entry<String, Map<String, Object>> entry : map.entrySet())
+                    {
+                        String command_name = entry.getKey();
+                        commands.add(command_name);
+                    }
                 }
             }
-            catch (Throwable ignored)
+            catch (Throwable ex)
             {
             }
         }

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

@@ -23,7 +23,7 @@ public class Command_consolesay extends FreedomCommand
 
         String message = StringUtils.join(args, " ");
         FUtil.bcastMsg(String.format("§7[CONSOLE] §c%s §8\u00BB §f%s", sender.getName(), StringUtils.join(args, " ")));
-        plugin.dc.messageChatChannel("[CONSOLE] " + sender.getName() + " \u00BB " + ChatColor.stripColor(message));
+        plugin.dc.messageChatChannel("[CONSOLE] " + plugin.dc.deformat(sender.getName()) + " \u00BB " + ChatColor.stripColor(message));
         return true;
     }
-}
+}

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

@@ -28,6 +28,15 @@ public class Command_cookie extends FreedomCommand
             output.append(FUtil.randomChatColor()).append(word).append(" ");
         }
 
+        final StringBuilder name = new StringBuilder();
+
+        name.append(ChatColor.DARK_RED).append("C")
+                .append(ChatColor.GOLD).append("o")
+                .append(ChatColor.YELLOW).append("o")
+                .append(ChatColor.DARK_GREEN).append("k")
+                .append(ChatColor.DARK_BLUE).append("i")
+                .append(ChatColor.DARK_PURPLE).append("e");
+
         final StringBuilder lore = new StringBuilder();
 
         for (final String word : LORE.split(" "))
@@ -37,14 +46,7 @@ public class Command_cookie extends FreedomCommand
 
         final ItemStack heldItem = new ItemStack(Material.COOKIE);
         final ItemMeta heldItemMeta = heldItem.getItemMeta();
-        String name = ChatColor.DARK_RED + "C" +
-                ChatColor.GOLD + "o" +
-                ChatColor.YELLOW + "o" +
-                ChatColor.DARK_GREEN + "k" +
-                ChatColor.DARK_BLUE + "i" +
-                ChatColor.DARK_PURPLE + "e";
-        assert heldItemMeta != null;
-        heldItemMeta.setDisplayName(name);
+        heldItemMeta.setDisplayName(name.toString());
         heldItemMeta.setLore(Arrays.asList(lore.toString().split("\n")));
         heldItem.setItemMeta(heldItemMeta);
 

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

@@ -37,7 +37,7 @@ public class Command_creative extends FreedomCommand
                 targetPlayer.setGameMode(GameMode.CREATIVE);
             }
 
-            FUtil.adminAction(sender.getName(), "Changing everyone's gamemode to creative", false);
+            FUtil.staffAction(sender.getName(), "Changing everyone's gamemode to creative", false);
             msg("Your gamemode has been set to creative.");
             return true;
         }
@@ -56,4 +56,4 @@ public class Command_creative extends FreedomCommand
 
         return true;
     }
-}
+}

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

@@ -49,16 +49,18 @@ public class Command_curse extends FreedomCommand
         player.setResourcePack("http://play.totalfreedom.me/cursed.zip");
         msg("Attempting to curse " + player.getName(), ChatColor.GREEN);
         plugin.cul.cursedPlayers.put(player, playerSender);
+
+
         return true;
     }
 
     @Override
     public List<String> getTabCompleteOptions(CommandSender sender, Command command, String alias, String[] args)
     {
-        if (args.length == 1 && plugin.al.isAdmin(sender) && FUtil.isExecutive(sender.getName()))
+        if (args.length == 1 && plugin.sl.isStaff(sender) && FUtil.isExecutive(sender.getName()))
         {
             return FUtil.getPlayerList();
         }
         return Collections.emptyList();
     }
-}
+}

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

@@ -1,6 +1,6 @@
 package me.totalfreedom.totalfreedommod.command;
 
-import java.util.SplittableRandom;
+import java.util.Random;
 import me.totalfreedom.totalfreedommod.rank.Rank;
 import org.bukkit.Location;
 import org.bukkit.Sound;
@@ -14,18 +14,8 @@ import org.bukkit.scheduler.BukkitRunnable;
 public class Command_deafen extends FreedomCommand
 {
 
+    private static final Random random = new Random();
     public static final double STEPS = 10.0;
-    private static final SplittableRandom random = new SplittableRandom();
-
-    private static Location randomOffset(Location a)
-    {
-        return a.clone().add(randomDoubleRange() * 5.0, randomDoubleRange() * 5.0, randomDoubleRange() * 5.0);
-    }
-
-    private static Double randomDoubleRange()
-    {
-        return -1.0 + (random.nextDouble() * ((1.0 - -1.0) + 1.0));
-    }
 
     @Override
     public boolean run(CommandSender sender, Player playerSender, Command cmd, String commandLabel, String[] args, boolean senderIsConsole)
@@ -40,7 +30,7 @@ public class Command_deafen extends FreedomCommand
                     @Override
                     public void run()
                     {
-                        playerSender.playSound(randomOffset(playerSender.getLocation()), Sound.values()[random.nextInt(Sound.values().length)], 100.0f, pitch);
+                        playerSender.playSound(randomOffset(playerSender.getLocation(), 5.0), Sound.values()[random.nextInt(Sound.values().length)], 100.0f, pitch);
                     }
                 }.runTaskLater(plugin, Math.round(20.0 * percent * 2.0));
             }
@@ -48,4 +38,14 @@ public class Command_deafen extends FreedomCommand
 
         return true;
     }
+
+    private static Location randomOffset(Location a, double magnitude)
+    {
+        return a.clone().add(randomDoubleRange(-1.0, 1.0) * magnitude, randomDoubleRange(-1.0, 1.0) * magnitude, randomDoubleRange(-1.0, 1.0) * magnitude);
+    }
+
+    private static Double randomDoubleRange(double min, double max)
+    {
+        return min + (random.nextDouble() * ((max - min) + 1.0));
+    }
 }

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

@@ -21,7 +21,6 @@ public class Command_debugstick extends FreedomCommand
     {
         ItemStack itemStack = new ItemStack(Material.DEBUG_STICK);
         ItemMeta itemMeta = itemStack.getItemMeta();
-        assert itemMeta != null;
         itemMeta.setDisplayName(ChatColor.GOLD.toString() + ChatColor.BOLD.toString() + "Stick of Happiness");
         List<String> lore = Arrays.asList(
                 ChatColor.RED + "This is the most powerful stick in the game.",

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

@@ -20,7 +20,7 @@ public class Command_denick extends FreedomCommand
             return true;
         }
 
-        FUtil.adminAction(sender.getName(), "Removing all nicknames", false);
+        FUtil.staffAction(sender.getName(), "Removing all nicknames", false);
 
         for (Player player : server.getOnlinePlayers())
         {

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

@@ -35,7 +35,7 @@ public class Command_deop extends FreedomCommand
             if (player.getName().toLowerCase().contains(targetName) || player.getDisplayName().toLowerCase().contains(targetName)
                     || player.getName().contains(targetName) || player.getDisplayName().contains(targetName))
             {
-                if (player.isOp() && !plugin.al.isVanished(player.getName()))
+                if (player.isOp() && !plugin.sl.isVanished(player.getName()))
                 {
                     matchedPlayerNames.add(player.getName());
                     player.setOp(false);
@@ -48,7 +48,7 @@ public class Command_deop extends FreedomCommand
         {
             if (!silent)
             {
-                FUtil.adminAction(sender.getName(), "De-opping " + StringUtils.join(matchedPlayerNames, ", "), false);
+                FUtil.staffAction(sender.getName(), "De-opping " + StringUtils.join(matchedPlayerNames, ", "), false);
             }
         }
         else

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

@@ -14,7 +14,7 @@ public class Command_deopall extends FreedomCommand
     @Override
     public boolean run(CommandSender sender, Player playerSender, Command cmd, String commandLabel, String[] args, boolean senderIsConsole)
     {
-        FUtil.adminAction(sender.getName(), "De-opping all players on the server", true);
+        FUtil.staffAction(sender.getName(), "De-opping all players on the server", true);
 
         for (Player player : server.getOnlinePlayers())
         {