permission system

a better dev did this

.github/workflows/maven.yml

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

.gitignore

@@ -1,6 +1,6 @@
 # TFM excludes
-/lib
 build.properties
+dependency-reduced-pom.xml
 
 # Netbeans excludes
 /nbproject/private
@@ -17,10 +17,10 @@ manifest.mf
 /.settings
 
 # IntelliJ excludes
-*.iml
 *.ipr
 *.iws
 /.idea
+*.iml
 
 # Maven excludes
 /target
@@ -32,3 +32,5 @@ manifest.mf
 .Trashes
 ehthumbs.db
 Thumbs.db
+
+TotalFreedomMod\.iml

.idea/artifacts/TotalFreedomMod_jar.xml

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

.idea/codeStyles/Project.xml

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

.idea/codeStyles/codeStyleConfig.xml

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

.idea/compiler.xml

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

.idea/encodings.xml

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

.idea/modules.xml

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

.travis.yml

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

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,7 +1,14 @@
-# TotalFreedomMod #
+# TotalFreedomMod [![Build Status](https://travis-ci.org/TFPatches/TotalFreedomMod.svg?branch=TFM-1.15)](https://travis-ci.org/TFPatches/TotalFreedomMod) [![codebeat badge](https://codebeat.co/badges/5f078e55-8a02-4120-9076-70f6994f48d1)](https://codebeat.co/projects/github-com-tfpatches-totalfreedommod-tfm-1-14-fa58c58f-b1c4-4221-bf78-346e07db6961)
 
 TotalFreedomMod 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.
 
-Please see [CONTRIBUTING.md](CONTRIBUTING.md) if you are interested in developing TotalFreedomMod. For information on how TotalFreedomMod is licensed, please see [LICENSE.md](LICENSE.md).
+### Contributing ###
+Please see [CONTRIBUTING.md](CONTRIBUTING.md) if you are interested in developing TotalFreedomMod.
+
+For information on how TotalFreedomMod is licensed, please see [LICENSE.md](LICENSE.md).
+
+### Compiling ###
+
+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.

TotalFreedomMod.iml

@@ -0,0 +1,121 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<module org.jetbrains.idea.maven.project.MavenProjectsManager.isMavenModule="true" type="JAVA_MODULE" version="4">
+  <component name="FacetManager">
+    <facet type="minecraft" name="Minecraft">
+      <configuration>
+        <autoDetectTypes>
+          <platformType>PAPER</platformType>
+        </autoDetectTypes>
+      </configuration>
+    </facet>
+  </component>
+  <component name="NewModuleRootManager" LANGUAGE_LEVEL="JDK_1_8">
+    <output url="file://$MODULE_DIR$/target/classes" />
+    <output-test url="file://$MODULE_DIR$/target/test-classes" />
+    <content url="file://$MODULE_DIR$">
+      <sourceFolder url="file://$MODULE_DIR$/src/main/java" isTestSource="false" />
+      <sourceFolder url="file://$MODULE_DIR$/src/main/resources" type="java-resource" />
+      <sourceFolder url="file://$MODULE_DIR$/src/test/java" isTestSource="true" />
+      <excludeFolder url="file://$MODULE_DIR$/target" />
+    </content>
+    <orderEntry type="inheritedJdk" />
+    <orderEntry type="sourceFolder" forTests="false" />
+    <orderEntry type="library" scope="PROVIDED" name="Maven: org.bukkit:bukkit:1.9.4-R0.1-SNAPSHOT" level="project" />
+    <orderEntry type="library" scope="PROVIDED" name="Maven: org.avaje:ebean:2.8.1" level="project" />
+    <orderEntry type="library" scope="PROVIDED" name="Maven: org.spigotmc:spigot:1.14.1-R0.1-SNAPSHOT" level="project" />
+    <orderEntry type="library" name="Maven: org.apache.commons:commons-lang3:3.6" level="project" />
+    <orderEntry type="library" scope="PROVIDED" name="Maven: org.spigotmc:spigot:1.14-R0.1-SNAPSHOT" level="project" />
+    <orderEntry type="library" scope="PROVIDED" name="Maven: io.papermc:paperlib:1.0.1" level="project" />
+    <orderEntry type="library" scope="PROVIDED" name="Maven: net.ess3:Essentials:2.13.1" level="project" />
+    <orderEntry type="library" scope="PROVIDED" name="Maven: net.dv8tion:JDA:3.8.0_423" level="project" />
+    <orderEntry type="library" scope="PROVIDED" name="Maven: com.squareup.okhttp3:okhttp:3.8.1" level="project" />
+    <orderEntry type="library" scope="PROVIDED" name="Maven: com.squareup.okio:okio:1.13.0" level="project" />
+    <orderEntry type="library" scope="PROVIDED" name="Maven: org.json:json:20160810" level="project" />
+    <orderEntry type="library" scope="PROVIDED" name="Maven: io.papermc:paperlib:1.0.1" level="project" />
+    <orderEntry type="library" scope="PROVIDED" name="Maven: net.ess3:Essentials:2.13.1" level="project" />
+    <orderEntry type="library" scope="PROVIDED" name="Maven: net.dv8tion:JDA:3.8.0_423" level="project" />
+    <orderEntry type="library" scope="PROVIDED" name="Maven: com.squareup.okhttp3:okhttp:3.8.1" level="project" />
+    <orderEntry type="library" scope="PROVIDED" name="Maven: com.squareup.okio:okio:1.13.0" level="project" />
+    <orderEntry type="library" scope="PROVIDED" name="Maven: org.json:json:20160810" level="project" />
+    <orderEntry type="library" scope="PROVIDED" name="Maven: org.spigotmc:spigot:1.13.1-R0.1-SNAPSHOT" level="project" />
+    <orderEntry type="library" scope="PROVIDED" name="Maven: io.papermc:paperlib:1.0.1" level="project" />
+    <orderEntry type="library" scope="PROVIDED" name="Maven: net.ess3:Essentials:2.13.1" level="project" />
+    <orderEntry type="library" scope="PROVIDED" name="Maven: org.bukkit:craftbukkit:1.13.2-R0.1-SNAPSHOT" level="project" />
+    <orderEntry type="library" scope="PROVIDED" name="Maven: net.dv8tion:JDA:3.8.0_423" level="project" />
+    <orderEntry type="library" scope="PROVIDED" name="Maven: com.squareup.okhttp3:okhttp:3.8.1" level="project" />
+    <orderEntry type="library" scope="PROVIDED" name="Maven: com.squareup.okio:okio:1.13.0" level="project" />
+    <orderEntry type="library" scope="PROVIDED" name="Maven: org.json:json:20160810" level="project" />
+    <orderEntry type="library" scope="PROVIDED" name="Maven: net.coreprotect:coreprotect:2.15.0" level="project" />
+    <orderEntry type="library" scope="PROVIDED" name="Maven: org.bukkit:bukkit:1.13-R0.1-SNAPSHOT" level="project" />
+    <orderEntry type="library" scope="PROVIDED" name="Maven: org.projectlombok:lombok:1.18.0" level="project" />
+    <orderEntry type="library" name="Maven: commons-io:commons-io:2.6" level="project" />
+    <orderEntry type="library" name="Maven: org.apache.commons:commons-lang3:3.9" level="project" />
+    <orderEntry type="library" name="Maven: commons-codec:commons-codec:1.9" level="project" />
+    <orderEntry type="library" scope="PROVIDED" name="Maven: org.spigotmc:spigot:1.15-R0.1-SNAPSHOT" level="project" />
+    <orderEntry type="library" scope="PROVIDED" name="Maven: com.github.Pravian:Aero:5f82926" level="project" />
+    <orderEntry type="library" scope="PROVIDED" name="Maven: org.spigotmc:spigot-api:1.12-R0.1-SNAPSHOT" level="project" />
+    <orderEntry type="library" scope="PROVIDED" name="Maven: com.github.TotalFreedom:BukkitTelnet:4.5-pre1" level="project" />
+    <orderEntry type="library" scope="PROVIDED" name="Maven: org.apache.logging.log4j:log4j-core:2.5" level="project" />
+    <orderEntry type="library" scope="PROVIDED" name="Maven: org.apache.logging.log4j:log4j-api:2.5" level="project" />
+    <orderEntry type="library" scope="PROVIDED" name="Maven: com.github.TFPatches:TF-LibsDisguises:11aea9b3cd" level="project" />
+    <orderEntry type="library" scope="PROVIDED" name="Maven: com.comphenix.protocol:ProtocolLib:4.5.1-SNAPSHOT" level="project" />
+    <orderEntry type="library" scope="PROVIDED" name="Maven: cglib:cglib-nodep:3.2.5" level="project" />
+    <orderEntry type="library" scope="PROVIDED" name="Maven: com.comphenix.executors:BukkitExecutors:1.1-SNAPSHOT" level="project" />
+    <orderEntry type="library" scope="PROVIDED" name="Maven: com.sk89q.worldedit:worldguard-bukkit:7.0.2" level="project" />
+    <orderEntry type="library" scope="PROVIDED" name="Maven: net.ess3:EssentialsX:2.16.1" level="project" />
+    <orderEntry type="library" scope="PROVIDED" name="Maven: io.papermc:paperlib:1.0.2" level="project" />
+    <orderEntry type="library" scope="PROVIDED" name="Maven: net.ess3:NMSProvider:2.16.1" level="project" />
+    <orderEntry type="library" scope="PROVIDED" name="Maven: net.ess3:UpdatedMetaProvider:2.16.1" level="project" />
+    <orderEntry type="library" scope="PROVIDED" name="Maven: net.ess3:1_8_R1Provider:2.16.1" level="project" />
+    <orderEntry type="library" scope="PROVIDED" name="Maven: net.ess3:1_8_R2Provider:2.16.1" level="project" />
+    <orderEntry type="library" scope="PROVIDED" name="Maven: net.ess3:LegacyProvider:2.16.1" level="project" />
+    <orderEntry type="library" scope="PROVIDED" name="Maven: net.ess3:ReflectionProvider:2.16.1" level="project" />
+    <orderEntry type="library" scope="PROVIDED" name="Maven: net.ess3:FlattenedProvider:2.16.1" level="project" />
+    <orderEntry type="library" scope="PROVIDED" name="Maven: net.dv8tion:JDA:4.0.0_39" level="project" />
+    <orderEntry type="library" scope="PROVIDED" name="Maven: com.google.code.findbugs:jsr305:3.0.2" level="project" />
+    <orderEntry type="library" scope="PROVIDED" name="Maven: org.jetbrains:annotations:16.0.1" level="project" />
+    <orderEntry type="library" scope="PROVIDED" name="Maven: org.slf4j:slf4j-api:1.7.25" level="project" />
+    <orderEntry type="library" scope="PROVIDED" name="Maven: com.neovisionaries:nv-websocket-client:2.5" level="project" />
+    <orderEntry type="library" scope="PROVIDED" name="Maven: com.squareup.okhttp3:okhttp:3.13.0" level="project" />
+    <orderEntry type="library" scope="PROVIDED" name="Maven: com.squareup.okio:okio:1.17.2" level="project" />
+    <orderEntry type="library" scope="PROVIDED" name="Maven: club.minnced:opus-java-api:1.0.4" level="project" />
+    <orderEntry type="library" scope="PROVIDED" name="Maven: net.java.dev.jna:jna:4.4.0" level="project" />
+    <orderEntry type="library" scope="PROVIDED" name="Maven: club.minnced:opus-java-natives:1.0.4" level="project" />
+    <orderEntry type="library" scope="PROVIDED" name="Maven: org.apache.commons:commons-collections4:4.1" level="project" />
+    <orderEntry type="library" scope="PROVIDED" name="Maven: net.sf.trove4j:trove4j:3.0.3" level="project" />
+    <orderEntry type="library" scope="PROVIDED" name="Maven: com.fasterxml.jackson.core:jackson-databind:2.9.8" level="project" />
+    <orderEntry type="library" scope="PROVIDED" name="Maven: com.fasterxml.jackson.core:jackson-annotations:2.9.0" level="project" />
+    <orderEntry type="library" scope="PROVIDED" name="Maven: com.fasterxml.jackson.core:jackson-core:2.9.8" level="project" />
+    <orderEntry type="library" scope="PROVIDED" name="Maven: net.coreprotect:coreprotect:2.16.3" level="project" />
+    <orderEntry type="library" scope="PROVIDED" name="Maven: org.bukkit:bukkit:1.13.1-R0.1-SNAPSHOT" level="project" />
+    <orderEntry type="library" scope="PROVIDED" name="Maven: com.sk89q.worldedit:worldedit-bukkit:7.0.0-SNAPSHOT" level="project" />
+    <orderEntry type="library" scope="PROVIDED" name="Maven: com.sk89q.worldedit:worldedit-core:7.0.0-SNAPSHOT" level="project" />
+    <orderEntry type="library" scope="PROVIDED" name="Maven: com.sk89q.worldedit.worldedit-libs:core:7.0.0-SNAPSHOT" level="project" />
+    <orderEntry type="library" scope="PROVIDED" name="Maven: de.schlichtherle:truezip:6.8.3" level="project" />
+    <orderEntry type="library" scope="PROVIDED" name="Maven: rhino:js:1.7R2" level="project" />
+    <orderEntry type="library" scope="PROVIDED" name="Maven: com.sk89q.worldedit.worldedit-libs:bukkit:7.0.0-SNAPSHOT" level="project" />
+    <orderEntry type="library" scope="PROVIDED" name="Maven: org.apache.logging.log4j:log4j-slf4j-impl:2.8.1" level="project" />
+    <orderEntry type="library" scope="PROVIDED" name="Maven: com.sk89q.worldguard:worldguard-bukkit:7.0.2" level="project" />
+    <orderEntry type="library" scope="PROVIDED" name="Maven: com.sk89q.worldguard:worldguard-core:7.0.2" level="project" />
+    <orderEntry type="library" scope="PROVIDED" name="Maven: com.sk89q.worldguard.worldguard-libs:core:7.0.2" level="project" />
+    <orderEntry type="library" scope="PROVIDED" name="Maven: org.flywaydb:flyway-core:3.0" level="project" />
+    <orderEntry type="library" scope="PROVIDED" name="Maven: com.sk89q:commandbook:2.3" level="project" />
+    <orderEntry type="library" scope="PROVIDED" name="Maven: org.bstats:bstats-bukkit:1.5" level="project" />
+    <orderEntry type="library" scope="PROVIDED" name="Maven: com.destroystokyo.paper:paper-api:1.15.1-R0.1-SNAPSHOT" level="project" />
+    <orderEntry type="library" scope="PROVIDED" name="Maven: commons-lang:commons-lang:2.6" level="project" />
+    <orderEntry type="library" scope="PROVIDED" name="Maven: com.googlecode.json-simple:json-simple:1.1.1" level="project" />
+    <orderEntry type="library" scope="PROVIDED" name="Maven: junit:junit:4.10" level="project" />
+    <orderEntry type="library" scope="PROVIDED" name="Maven: org.hamcrest:hamcrest-core:1.1" level="project" />
+    <orderEntry type="library" scope="PROVIDED" name="Maven: com.google.guava:guava:21.0" level="project" />
+    <orderEntry type="library" scope="PROVIDED" name="Maven: com.google.code.gson:gson:2.8.0" level="project" />
+    <orderEntry type="library" scope="PROVIDED" name="Maven: net.md-5:bungeecord-chat:1.13-SNAPSHOT" level="project" />
+    <orderEntry type="library" scope="PROVIDED" name="Maven: org.yaml:snakeyaml:1.25" level="project" />
+    <orderEntry type="library" scope="PROVIDED" name="Maven: org.ow2.asm:asm:7.1" level="project" />
+    <orderEntry type="library" scope="PROVIDED" name="Maven: org.ow2.asm:asm-commons:7.1" level="project" />
+    <orderEntry type="library" scope="PROVIDED" name="Maven: org.ow2.asm:asm-tree:7.1" level="project" />
+    <orderEntry type="library" scope="PROVIDED" name="Maven: org.ow2.asm:asm-analysis:7.1" level="project" />
+    <orderEntry type="library" name="Maven: me.rayzr522:jsonmessage:1.0.0" level="project" />
+    <orderEntry type="library" scope="PROVIDED" name="Maven: com.github.vexsoftware:votifier:v1.9" level="project" />
+    <orderEntry type="library" scope="PROVIDED" name="Maven: com.github.ConnorLinfoot:ActionBarAPI:5b2d642d3d" level="project" />
+  </component>
+</module>

checkstyle.xml

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

nb-configuration.xml

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

pom.xml

@@ -1,21 +1,19 @@
 <?xml version="1.0" encoding="UTF-8"?>
-<project xmlns="http://maven.apache.org/POM/4.0.0" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/xsd/maven-4.0.0.xsd">
+<project xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xmlns="http://maven.apache.org/POM/4.0.0"
+         xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/xsd/maven-4.0.0.xsd">
     <modelVersion>4.0.0</modelVersion>
 
     <groupId>me.totalfreedom</groupId>
-    <artifactId>totalfreedom</artifactId>
-    <version>5.0</version>
+    <artifactId>TotalFreedomMod</artifactId>
+    <version>5.5</version>
     <packaging>jar</packaging>
 
     <properties>
         <project.build.sourceEncoding>UTF-8</project.build.sourceEncoding>
-        <tfm.build.version>${project.version}</tfm.build.version>
-        <tfm.build.number>${maven.buildnumber}</tfm.build.number>
-        <tfm.build.date>${maven.build.timestamp}</tfm.build.date>
-        <tfm.build.author>${buildAuthor}</tfm.build.author>
-        <tfm.build.head>${buildHead}</tfm.build.head>
+        <tfm.build.codename>lttstore.com</tfm.build.codename>
         <jar.finalName>${project.name}</jar.finalName>
-        <maven.build.timestamp.format>dd/MM/yyyy hh:mm aa</maven.build.timestamp.format>
+        <timestamp>${maven.build.timestamp}</timestamp>
+        <maven.build.timestamp.format>MM/dd/yyyy HH:mm</maven.build.timestamp.format>
     </properties>
 
     <name>TotalFreedomMod</name>
@@ -30,71 +28,203 @@
     </licenses>
 
     <organization>
-        <name>Total Freedom</name>
+        <name>TotalFreedom</name>
         <url>https://totalfreedom.me</url>
     </organization>
 
     <scm>
-        <connection>scm:git:git@github.com:TotalFreedom/TotalFreedomMod.git</connection>
-        <developerConnection>scm:git:git@github.com:TotalFreedom/TotalFreedomMod.git</developerConnection>
-        <url>git@github.com:TotalFreedom/TotalFreedomMod.git</url>
+        <connection>scm:git:git@github.com:TFPatches/TotalFreedomMod.git</connection>
+        <developerConnection>scm:git:git@github.com:TFPatches/TotalFreedomMod.git</developerConnection>
+        <url>git@github.com:TFPatches/TotalFreedomMod.git</url>
     </scm>
 
     <repositories>
         <repository>
-            <id>spigot</id>
-            <url>https://hub.spigotmc.org/nexus/content/groups/public/</url>
+            <id>jitpack.io</id>
+            <url>https://jitpack.io</url>
+        </repository>
+
+        <repository>
+            <id>spigot-repo</id>
+            <url>https://hub.spigotmc.org/nexus/content/repositories/snapshots/</url>
+        </repository>
+
+        <repository>
+            <id>enginehub</id>
+            <url>https://maven.enginehub.org/repo/</url>
+        </repository>
+
+        <repository>
+            <id>elmakers-repo</id>
+            <url>http://maven.elmakers.com/repository/</url>
+        </repository>
+
+        <repository>
+            <id>sk89q-snapshots</id>
+            <url>http://maven.sk89q.com/artifactory/repo</url>
+        </repository>
+
+        <repository>
+            <id>jcenter</id>
+            <name>jcenter-bintray</name>
+            <url>https://jcenter.bintray.com</url>
+        </repository>
+
+        <repository>
+            <id>playpro</id>
+            <url>https://maven.playpro.com/</url>
+        </repository>
+
+        <repository>
+            <id>md_5-public</id>
+            <url>http://repo.md-5.net/content/groups/public/</url>
+        </repository>
+
+        <repository>
+            <id>dmulloy2-repo</id>
+            <url>http://repo.dmulloy2.net/nexus/repository/public/</url>
+        </repository>
+
+        <repository>
+            <id>sk89q-repo</id>
+            <url>http://maven.sk89q.com/repo/</url>
+        </repository>
+
+        <repository>
+            <id>CodeMC</id>
+            <url>https://repo.codemc.org/repository/maven-public</url>
+        </repository>
+
+        <repository>
+            <id>papermc</id>
+            <url>https://papermc.io/repo/repository/maven-public/</url>
+        </repository>
+
+        <repository>
+            <id>rayzr-repo</id>
+            <url>https://cdn.rawgit.com/Rayzr522/maven-repo/master/</url>
         </repository>
     </repositories>
 
     <dependencies>
-
         <dependency>
             <groupId>org.projectlombok</groupId>
             <artifactId>lombok</artifactId>
-            <version>1.16.6</version>
+            <version>1.18.0</version>
             <scope>provided</scope>
         </dependency>
 
+        <dependency>
+            <groupId>commons-io</groupId>
+            <artifactId>commons-io</artifactId>
+            <version>2.6</version>
+            <scope>compile</scope>
+        </dependency>
+
+        <dependency>
+            <groupId>org.apache.commons</groupId>
+            <artifactId>commons-lang3</artifactId>
+            <version>3.9</version>
+            <scope>compile</scope>
+        </dependency>
+
+        <dependency>
+            <groupId>commons-codec</groupId>
+            <artifactId>commons-codec</artifactId>
+            <version>1.9</version>
+            <scope>compile</scope>
+        </dependency>
+
         <dependency>
             <groupId>org.spigotmc</groupId>
             <artifactId>spigot</artifactId>
-            <version>1.9-R0.1-SNAPSHOT</version>
-            <scope>system</scope>
-            <systemPath>${project.basedir}/lib/Spigot-1.9.jar</systemPath>
+            <version>1.15-R0.1-SNAPSHOT</version>
+            <scope>provided</scope>
         </dependency>
 
         <dependency>
-            <groupId>net.pravian</groupId>
-            <artifactId>aero</artifactId>
-            <version>2.0</version>
-            <scope>system</scope>
-            <systemPath>${project.basedir}/lib/Aero-2.0.jar</systemPath>
+            <groupId>com.github.Pravian</groupId>
+            <artifactId>Aero</artifactId>
+            <version>5f82926</version>
+            <scope>provided</scope>
         </dependency>
 
         <dependency>
-            <groupId>net.totalfreedom</groupId>
-            <artifactId>bukkittelnet</artifactId>
-            <version>4.2</version>
-            <scope>system</scope>
-            <systemPath>${project.basedir}/lib/BukkitTelnet-4.3.jar</systemPath>
+            <groupId>com.github.TotalFreedom</groupId>
+            <artifactId>BukkitTelnet</artifactId>
+            <version>4.5-pre1</version>
+            <scope>provided</scope>
         </dependency>
 
         <dependency>
-            <groupId>net.totalfreedom</groupId>
-            <artifactId>tf-worldedit</artifactId>
-            <version>6.1.0-TF</version>
-            <scope>system</scope>
-            <systemPath>${project.basedir}/lib/TF-WorldEdit-6.1.1.jar</systemPath>
+            <groupId>com.github.TFPatches</groupId>
+            <artifactId>TF-LibsDisguises</artifactId>
+            <version>11aea9b3cd</version>
+            <scope>provided</scope>
         </dependency>
 
         <dependency>
-            <groupId>net.totalfreedom</groupId>
-            <artifactId>tf-essentials</artifactId>
-            <version>2.0-TF</version>
-            <scope>system</scope>
-            <systemPath>${project.basedir}/lib/TF-Essentials-2.1.jar</systemPath>
+            <groupId>com.sk89q.worldedit</groupId>
+            <artifactId>worldedit-bukkit</artifactId>
+            <version>7.1.0</version>
+            <scope>provided</scope>
         </dependency>
+
+        <dependency>
+            <groupId>net.ess3</groupId>
+            <artifactId>EssentialsX</artifactId>
+            <version>2.16.1</version>
+            <scope>provided</scope>
+        </dependency>
+
+        <dependency>
+            <groupId>net.dv8tion</groupId>
+            <artifactId>JDA</artifactId>
+            <version>4.0.0_39</version>
+            <scope>provided</scope>
+        </dependency>
+
+        <dependency>
+            <groupId>net.coreprotect</groupId>
+            <artifactId>coreprotect</artifactId>
+            <version>2.16.3</version>
+            <scope>provided</scope>
+        </dependency>
+
+        <dependency>
+            <groupId>com.sk89q.worldguard</groupId>
+            <artifactId>worldguard-bukkit</artifactId>
+            <version>7.0.2</version>
+            <scope>provided</scope>
+        </dependency>
+
+        <dependency>
+            <groupId>com.destroystokyo.paper</groupId>
+            <artifactId>paper-api</artifactId>
+            <version>1.15.1-R0.1-SNAPSHOT</version>
+            <scope>provided</scope>
+        </dependency>
+
+        <dependency>
+            <groupId>me.rayzr522</groupId>
+            <artifactId>jsonmessage</artifactId>
+            <version>1.0.0</version>
+        </dependency>
+
+        <dependency>
+            <groupId>com.github.vexsoftware</groupId>
+            <artifactId>votifier</artifactId>
+            <version>v1.9</version>
+            <scope>provided</scope>
+        </dependency>
+
+        <dependency>
+            <groupId>com.github.ConnorLinfoot</groupId>
+            <artifactId>ActionBarAPI</artifactId>
+            <version>5b2d642d3d</version>
+            <scope>provided</scope>
+        </dependency>
+
     </dependencies>
 
     <build>
@@ -106,32 +236,80 @@
             </resource>
         </resources>
 
-
         <plugins>
             <!-- Compiler -->
             <plugin>
                 <groupId>org.apache.maven.plugins</groupId>
                 <artifactId>maven-compiler-plugin</artifactId>
-                <version>3.3</version>
+                <version>3.7.0</version>
                 <configuration>
                     <outputFileName>TotalFreedomMod.jar</outputFileName>
-                    <compilerVersion>1.7</compilerVersion>
-                    <source>1.7</source>
-                    <target>1.7</target>
+                    <compilerVersion>1.8</compilerVersion>
+                    <source>1.8</source>
+                    <target>1.8</target>
                 </configuration>
             </plugin>
-            
+
+            <!-- Git describe -->
+            <plugin>
+                <groupId>pl.project13.maven</groupId>
+                <artifactId>git-commit-id-plugin</artifactId>
+                <version>2.2.5</version>
+                <executions>
+                    <execution>
+                        <id>get-the-git-infos</id>
+                        <goals>
+                            <goal>revision</goal>
+                        </goals>
+                    </execution>
+                    <execution>
+                        <id>validate-the-git-infos</id>
+                        <goals>
+                            <goal>validateRevision</goal>
+                        </goals>
+                        <phase>package</phase>
+                    </execution>
+                </executions>
+                <configuration>
+                    <dotGitDirectory>${project.basedir}/.git</dotGitDirectory>
+                    <prefix>git</prefix>
+                    <dateFormat>yyyy-MM-dd HH:mm:ss</dateFormat>
+                    <verbose>false</verbose>
+                    <format>properties</format>
+                    <failOnNoGitDirectory>false</failOnNoGitDirectory>
+                    <failOnUnableToExtractRepoInfo>false</failOnUnableToExtractRepoInfo>
+                    <includeOnlyProperties>
+                        <includeOnlyProperty>git.commit.id.abbrev</includeOnlyProperty>
+                    </includeOnlyProperties>
+                    <gitDescribe>
+                        <skip>false</skip>
+                        <always>false</always>
+                        <abbrev>7</abbrev>
+                        <dirty>-dirty</dirty>
+                        <match>*</match>
+                    </gitDescribe>
+                </configuration>
+            </plugin>
+
             <!-- Antrun -->
             <plugin>
+                <groupId>org.apache.maven.plugins</groupId>
                 <artifactId>maven-antrun-plugin</artifactId>
                 <version>1.8</version>
                 <executions>
                     <execution>
+                        <id>default-cli</id>
                         <phase>initialize</phase>
                         <configuration>
                             <target>
-                                <propertyfile file="build.properties" comment="Build information. Edit this to your liking.">
-                                    <entry key="buildAuthor" default="unknown" />
+                                <propertyfile file="${project.basedir}/src/main/resources/build.properties"
+                                              comment="Build information. Edit this to your liking.">
+                                    <entry key="buildAuthor" default="unknown"/>
+                                    <entry key="buildNumber" default="0"/>
+                                    <entry key="buildCodeName" value="${tfm.build.codename}"/>
+                                    <entry key="buildVersion" value="${project.version}"/>
+                                    <entry key="buildDate" value="${timestamp}"/>
+                                    <!--<entry key="buildHead" value="${git.commit.id.abbrev}"/>-->
                                 </propertyfile>
                             </target>
                         </configuration>
@@ -155,58 +333,13 @@
                         </goals>
                         <configuration>
                             <files>
-                                <file>${basedir}/build.properties</file>
+                                <file>${project.basedir}/src/main/resources/build.properties</file>
                             </files>
                         </configuration>
                     </execution>
                 </executions>
             </plugin>
 
-            <!-- Checkstyle -->
-            <plugin>
-                <groupId>org.apache.maven.plugins</groupId>
-                <version>2.17</version>
-                <artifactId>maven-checkstyle-plugin</artifactId>
-                <executions>
-                    <execution>
-                        <phase>process-sources</phase>
-                        <goals>
-                            <goal>check</goal>
-                        </goals>
-                    </execution>
-                </executions>
-                <configuration>
-                    <configLocation>checkstyle.xml</configLocation>
-                    <consoleOutput>true</consoleOutput>
-                    <failsOnError>true</failsOnError>
-                    <failOnViolation>true</failOnViolation>
-                </configuration>
-            </plugin>
-
-            <!-- Git describe -->
-            <plugin>
-                <groupId>com.lukegb.mojo</groupId>
-                <artifactId>gitdescribe-maven-plugin</artifactId>
-                <version>3.0</version>
-                <executions>
-                    <execution>
-                        <id>git-describe</id>
-                        <phase>initialize</phase>
-                        <goals>
-                            <goal>gitdescribe</goal>
-                        </goals>
-                        <configuration>
-                            <descriptionProperty>buildHead</descriptionProperty>
-                            <extraArguments>
-                                <param>--tags</param>
-                                <param>--always</param>
-                                <param>HEAD</param>
-                            </extraArguments>
-                        </configuration>
-                    </execution>
-                </executions>
-            </plugin>
-
             <!-- Buildnumber -->
             <plugin>
                 <groupId>org.codehaus.mojo</groupId>
@@ -223,13 +356,39 @@
 
                 <configuration>
                     <buildNumberPropertyName>maven.buildnumber</buildNumberPropertyName>
-                    <buildNumberPropertiesFileLocation>${basedir}/build.properties</buildNumberPropertiesFileLocation>
-                    <format>{0,number}</format>
+                    <buildNumberPropertiesFileLocation>${project.basedir}/src/main/resources/build.properties
+                    </buildNumberPropertiesFileLocation>
+                    <format>{0,number,#}</format>
                     <items>
                         <item>buildNumber</item>
                     </items>
                 </configuration>
             </plugin>
+
+            <!-- Shade -->
+            <plugin>
+            <groupId>org.apache.maven.plugins</groupId>
+            <artifactId>maven-shade-plugin</artifactId>
+            <version>2.4.3</version>
+            <executions>
+                <execution>
+                    <phase>package</phase>
+                    <goals>
+                        <goal>shade</goal>
+                    </goals>
+                    <configuration>
+                        <minimizeJar>true</minimizeJar>
+                        <artifactSet>
+                            <includes>
+                                <include>commons-io:commons-io</include>
+                                <include>org.apache.commons:commons-lang3</include>
+                                <include>commons-codec:commons-codec</include>
+                            </includes>
+                        </artifactSet>
+                    </configuration>
+                </execution>
+            </executions>
+        </plugin>
         </plugins>
     </build>
 
@@ -237,11 +396,6 @@
     <reporting>
         <!-- Checkstyle -->
         <plugins>
-            <plugin>
-                <groupId>org.apache.maven.plugins</groupId>
-                <artifactId>maven-jxr-plugin</artifactId>
-                <version>2.5</version>
-            </plugin>
             <plugin>
                 <groupId>org.apache.maven.plugins</groupId>
                 <version>2.17</version>
@@ -255,4 +409,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

@@ -36,7 +36,7 @@ public class Announcer extends FreedomService
         announcements.clear();
         for (Object announcement : ConfigEntry.ANNOUNCER_ANNOUNCEMENTS.getList())
         {
-            announcements.add(FUtil.colorize((String) announcement));
+            announcements.add(FUtil.colorize((String)announcement));
         }
 
         if (!enabled)
@@ -58,9 +58,9 @@ public class Announcer extends FreedomService
                     current = 0;
                 }
 
-                FUtil.bcastMsg(prefix + announcements.get(current));
+                announce(announcements.get(current));
             }
-        }.runTaskTimer(TotalFreedomMod.plugin, interval, interval);
+        }.runTaskTimer(plugin, interval, interval);
     }
 
     @Override
@@ -80,4 +80,9 @@ public class Announcer extends FreedomService
         return Collections.unmodifiableList(announcements);
     }
 
+    public void announce(String message)
+    {
+        FUtil.bcastMsg(prefix + message);
+    }
+
 }

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

@@ -38,41 +38,13 @@ public class AntiNuke extends FreedomService
         }
 
         final Player player = event.getPlayer();
-        final Location location = event.getBlock().getLocation();
         final FPlayer fPlayer = plugin.pl.getPlayer(player);
 
-        final Location playerLocation = player.getLocation();
-
-        final double nukeMonitorRange = ConfigEntry.NUKE_MONITOR_RANGE.getDouble();
-
-        boolean outOfRange = false;
-        if (!playerLocation.getWorld().equals(location.getWorld()))
-        {
-            outOfRange = true;
-        }
-        else if (playerLocation.distanceSquared(location) > (nukeMonitorRange * nukeMonitorRange))
-        {
-            outOfRange = true;
-        }
-
-        if (outOfRange)
-        {
-            if (fPlayer.incrementAndGetFreecamDestroyCount() > ConfigEntry.FREECAM_TRIGGER_COUNT.getInteger())
-            {
-                FUtil.bcastMsg(player.getName() + " has been flagged for possible freecam nuking.", ChatColor.RED);
-                FUtil.autoEject(player, "Freecam (extended range) block breaking is not permitted on this server.");
-
-                fPlayer.resetFreecamDestroyCount();
-
-                event.setCancelled(true);
-                return;
-            }
-        }
-
         if (fPlayer.incrementAndGetBlockDestroyCount() > ConfigEntry.NUKE_MONITOR_COUNT_BREAK.getInteger())
         {
             FUtil.bcastMsg(player.getName() + " is breaking blocks too fast!", ChatColor.RED);
-            FUtil.autoEject(player, "You are breaking blocks too fast. Nukers are not permitted on this server.");
+            //plugin.ae.autoEject(player, "You are breaking blocks too fast. Nukers are not permitted on this server.");
+            player.kickPlayer(ChatColor.RED + "You are breaking blocks too fast. Nukers are not permitted on this server.");
 
             fPlayer.resetBlockDestroyCount();
 
@@ -90,41 +62,13 @@ public class AntiNuke extends FreedomService
         }
 
         Player player = event.getPlayer();
-        Location blockLocation = event.getBlock().getLocation();
         FPlayer fPlayer = plugin.pl.getPlayer(player);
 
-        Location playerLocation = player.getLocation();
-
-        double nukeMonitorRange = ConfigEntry.NUKE_MONITOR_RANGE.getDouble();
-
-        boolean outOfRange = false;
-        if (!playerLocation.getWorld().equals(blockLocation.getWorld()))
-        {
-            outOfRange = true;
-        }
-        else if (playerLocation.distanceSquared(blockLocation) > (nukeMonitorRange * nukeMonitorRange))
-        {
-            outOfRange = true;
-        }
-
-        if (outOfRange)
-        {
-            if (fPlayer.incrementAndGetFreecamPlaceCount() > ConfigEntry.FREECAM_TRIGGER_COUNT.getInteger())
-            {
-                FUtil.bcastMsg(player.getName() + " has been flagged for possible freecam building.", ChatColor.RED);
-                FUtil.autoEject(player, "Freecam (extended range) block building is not permitted on this server.");
-
-                fPlayer.resetFreecamPlaceCount();
-
-                event.setCancelled(true);
-                return;
-            }
-        }
-
         if (fPlayer.incrementAndGetBlockPlaceCount() > ConfigEntry.NUKE_MONITOR_COUNT_PLACE.getInteger())
         {
             FUtil.bcastMsg(player.getName() + " is placing blocks too fast!", ChatColor.RED);
-            FUtil.autoEject(player, "You are placing blocks too fast.");
+            //plugin.ae.autoEject(player, "You are placing blocks too fast.");
+            player.kickPlayer(ChatColor.RED + "You are placing blocks too fast.");
 
             fPlayer.resetBlockPlaceCount();
 

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

@@ -9,14 +9,21 @@ import org.bukkit.event.EventHandler;
 import org.bukkit.event.EventPriority;
 import org.bukkit.event.player.AsyncPlayerChatEvent;
 import org.bukkit.event.player.PlayerCommandPreprocessEvent;
+import org.bukkit.event.player.PlayerKickEvent;
+import org.bukkit.event.player.PlayerLoginEvent;
+import org.bukkit.event.player.PlayerLoginEvent.Result;
 import org.bukkit.scheduler.BukkitRunnable;
 import org.bukkit.scheduler.BukkitTask;
+import java.util.ArrayList;
+import java.util.Arrays;
+import java.util.List;
 
 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;
 
@@ -62,31 +69,37 @@ public class AntiSpam extends FreedomService
     public void onAsyncPlayerChat(AsyncPlayerChatEvent event)
     {
         final Player player = event.getPlayer();
+
+        if (plugin.al.isAdmin(player))
+        {
+            return;
+        }
+
         String message = event.getMessage().trim();
 
         final FPlayer playerdata = plugin.pl.getPlayerSync(player);
 
         // Check for spam
         if (playerdata.incrementAndGetMsgCount() > MSG_PER_CYCLE)
-        {
-            FSync.bcastMsg(player.getName() + " was automatically kicked for spamming chat.", ChatColor.RED);
-            FSync.autoEject(player, "Kicked for spamming chat.");
+        {   
+            if (!markedForDeath.contains(player))
+            {
+                markedForDeath.add(player);
+                FSync.bcastMsg(player.getName() + " was automatically kicked for spamming chat.", ChatColor.RED);
+                FSync.autoEject(player, "Kicked for spamming chat.");
 
-            playerdata.resetMsgCount();
+                playerdata.resetMsgCount();
 
-            event.setCancelled(true);
+                event.setCancelled(true);
+            }
             return;
         }
-
-        // Check for message repeat
-        if (playerdata.getLastMessage().equalsIgnoreCase(message))
+        else if (playerdata.incrementAndGetMsgCount() > MSG_PER_CYCLE / 2)
         {
-            FSync.playerMsg(player, "Please do not repeat messages.");
+            FUtil.playerMsg(player, "Please refrain from spamming chat.", ChatColor.GRAY);
             event.setCancelled(true);
-            return;
         }
-
-        playerdata.setLastMessage(message);
+        
     }
 
     @EventHandler(priority = EventPriority.LOW)
@@ -104,14 +117,28 @@ public class AntiSpam extends FreedomService
             return;
         }
 
+        if (plugin.al.isAdmin(player))
+        {
+            return;
+        }
+
         if (fPlayer.incrementAndGetMsgCount() > MSG_PER_CYCLE)
         {
             FUtil.bcastMsg(player.getName() + " was automatically kicked for spamming commands.", ChatColor.RED);
-            FUtil.autoEject(player, "Kicked for spamming commands.");
+            plugin.ae.autoEject(player, "Kicked for spamming commands.");
 
             fPlayer.resetMsgCount();
             event.setCancelled(true);
         }
     }
 
+    @EventHandler(priority = EventPriority.NORMAL)
+    public void onPlayerKick(PlayerKickEvent event)
+    {
+        if (markedForDeath.contains(event.getPlayer()))
+        {
+            markedForDeath.remove(event.getPlayer());
+        }
+    }
+
 }

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

@@ -0,0 +1,116 @@
+package me.totalfreedom.totalfreedommod;
+
+import java.util.Calendar;
+import java.util.Date;
+import java.util.GregorianCalendar;
+import java.util.HashMap;
+import java.util.Map;
+import me.totalfreedom.totalfreedommod.banning.Ban;
+import me.totalfreedom.totalfreedommod.util.FLog;
+import me.totalfreedom.totalfreedommod.util.FUtil;
+import net.pravian.aero.util.Ips;
+import org.bukkit.Bukkit;
+import org.bukkit.ChatColor;
+import org.bukkit.GameMode;
+import org.bukkit.entity.Player;
+
+public class AutoEject extends FreedomService
+{
+
+    private final Map<String, Integer> ejects = new HashMap<>(); // ip -> amount
+
+    public AutoEject(TotalFreedomMod plugin)
+    {
+        super(plugin);
+    }
+
+    @Override
+    protected void onStart()
+    {
+    }
+
+    @Override
+    protected void onStop()
+    {
+    }
+
+    public void autoEject(Player player, String kickMessage)
+    {
+        EjectMethod method = EjectMethod.STRIKE_ONE;
+        final String ip = Ips.getIp(player);
+
+        if (!ejects.containsKey(ip))
+        {
+            ejects.put(ip, 0);
+        }
+
+        int kicks = ejects.get(ip);
+        kicks += 1;
+
+        ejects.put(ip, kicks);
+
+        if (kicks <= 1)
+        {
+            method = EjectMethod.STRIKE_ONE;
+        }
+        else if (kicks == 2)
+        {
+            method = EjectMethod.STRIKE_TWO;
+        }
+        else if (kicks >= 3)
+        {
+            method = EjectMethod.STRIKE_THREE;
+        }
+
+        FLog.info("AutoEject -> name: " + player.getName() + " - player ip: " + ip + " - method: " + method.toString());
+
+        player.setOp(false);
+        player.setGameMode(GameMode.SURVIVAL);
+        player.getInventory().clear();
+
+        switch (method)
+        {
+            case STRIKE_ONE:
+            {
+                final Calendar cal = new GregorianCalendar();
+                cal.add(Calendar.MINUTE, 5);
+                final Date expires = cal.getTime();
+
+                FUtil.bcastMsg(ChatColor.RED + player.getName() + " has been banned for 5 minutes.");
+
+                plugin.bm.addBan(Ban.forPlayer(player, Bukkit.getConsoleSender(), expires, kickMessage));
+                player.kickPlayer(kickMessage);
+
+                break;
+            }
+            case STRIKE_TWO:
+            {
+                final Calendar c = new GregorianCalendar();
+                c.add(Calendar.MINUTE, 10);
+                final Date expires = c.getTime();
+
+                FUtil.bcastMsg(ChatColor.RED + player.getName() + " has been banned for 10 minutes.");
+
+                plugin.bm.addBan(Ban.forPlayer(player, Bukkit.getConsoleSender(), expires, kickMessage));
+                player.kickPlayer(kickMessage);
+                break;
+            }
+            case STRIKE_THREE:
+            {
+                plugin.bm.addBan(Ban.forPlayerFuzzy(player, Bukkit.getConsoleSender(), null, kickMessage));
+
+                FUtil.bcastMsg(ChatColor.RED + player.getName() + " has been banned.");
+
+                player.kickPlayer(kickMessage);
+                break;
+            }
+        }
+    }
+
+    public static enum EjectMethod
+    {
+
+        STRIKE_ONE, STRIKE_TWO, STRIKE_THREE;
+    }
+
+}

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

@@ -23,7 +23,7 @@ public class AutoKick extends FreedomService
     @Override
     protected void onStart()
     {
-        autoKickTicks = (long) ConfigEntry.AUTOKICK_TIME.getInteger() * 1000L;
+        autoKickTicks = (long)ConfigEntry.AUTOKICK_TIME.getInteger() * 1000L;
         autoKickThreshold = ConfigEntry.AUTOKICK_THRESHOLD.getDouble();
 
         if (!ConfigEntry.AUTOKICK_ENABLED.getBoolean())
@@ -51,9 +51,8 @@ public class AutoKick extends FreedomService
 
     private void autoKickCheck()
     {
-
         final boolean doAwayKickCheck
-                = plugin.esb.isEssentialsEnabled()
+                = plugin.esb.isEnabled()
                 && ((server.getOnlinePlayers().size() / server.getMaxPlayers()) > autoKickThreshold);
 
         if (!doAwayKickCheck)

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

@@ -0,0 +1,87 @@
+package me.totalfreedom.totalfreedommod;
+
+import java.io.File;
+import me.totalfreedom.totalfreedommod.util.FLog;
+import me.totalfreedom.totalfreedommod.util.FUtil;
+import net.pravian.aero.component.PluginComponent;
+import net.pravian.aero.config.YamlConfig;
+import org.bukkit.util.FileUtil;
+
+public class BackupManager extends PluginComponent<TotalFreedomMod>
+{
+
+    public BackupManager(TotalFreedomMod plugin)
+    {
+        super(plugin);
+    }
+
+    public void createBackups(String file)
+    {
+        createBackups(file, false);
+    }
+
+    public void createBackups(String file, boolean onlyWeekly)
+    {
+        final String save = file.split("\\.")[0];
+        final YamlConfig config = new YamlConfig(plugin, "backup/backup.yml", false);
+        config.load();
+
+        // Weekly
+        if (!config.isInt(save + ".weekly"))
+        {
+            performBackup(file, "weekly");
+            config.set(save + ".weekly", FUtil.getUnixTime());
+        }
+        else
+        {
+            int lastBackupWeekly = config.getInt(save + ".weekly");
+
+            if (lastBackupWeekly + 3600 * 24 * 7 < FUtil.getUnixTime())
+            {
+                performBackup(file, "weekly");
+                config.set(save + ".weekly", FUtil.getUnixTime());
+            }
+        }
+
+        if (onlyWeekly)
+        {
+            config.save();
+            return;
+        }
+
+        // Daily
+        if (!config.isInt(save + ".daily"))
+        {
+            performBackup(file, "daily");
+            config.set(save + ".daily", FUtil.getUnixTime());
+        }
+        else
+        {
+            int lastBackupDaily = config.getInt(save + ".daily");
+
+            if (lastBackupDaily + 3600 * 24 < FUtil.getUnixTime())
+            {
+                performBackup(file, "daily");
+                config.set(save + ".daily", FUtil.getUnixTime());
+            }
+        }
+
+        config.save();
+    }
+
+    private void performBackup(String file, String type)
+    {
+        FLog.info("Backing up " + file + " to " + file + "." + type + ".bak");
+        final File backupFolder = new File(plugin.getDataFolder(), "backup");
+
+        if (!backupFolder.exists())
+        {
+            backupFolder.mkdirs();
+        }
+
+        final File oldYaml = new File(plugin.getDataFolder(), file);
+        final File newYaml = new File(backupFolder, file + "." + type + ".bak");
+        FileUtil.copy(oldYaml, newYaml);
+    }
+
+}

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

@@ -1,13 +1,27 @@
 package me.totalfreedom.totalfreedommod;
 
+import com.google.common.base.Strings;
+import java.time.LocalDate;
+import java.time.Period;
+import java.util.Date;
+import me.totalfreedom.totalfreedommod.admin.Admin;
+import me.totalfreedom.totalfreedommod.config.ConfigEntry;
 import me.totalfreedom.totalfreedommod.player.FPlayer;
+import me.totalfreedom.totalfreedommod.rank.Displayable;
+import me.totalfreedom.totalfreedommod.shop.ShopData;
 import me.totalfreedom.totalfreedommod.util.FLog;
 import me.totalfreedom.totalfreedommod.util.FSync;
+import me.totalfreedom.totalfreedommod.util.FUtil;
+import static me.totalfreedom.totalfreedommod.util.FUtil.playerMsg;
+import org.bukkit.Bukkit;
 import org.bukkit.ChatColor;
+import org.bukkit.command.CommandSender;
 import org.bukkit.entity.Player;
 import org.bukkit.event.EventHandler;
 import org.bukkit.event.EventPriority;
 import org.bukkit.event.player.AsyncPlayerChatEvent;
+import org.bukkit.Sound;
+import org.bukkit.SoundCategory;
 
 public class ChatManager extends FreedomService
 {
@@ -44,36 +58,57 @@ 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");
 
-        // Strip color from messages
-        message = ChatColor.stripColor(message);
-
-        // Truncate messages that are too long - 100 characters is vanilla client max
-        if (message.length() > 100)
+        if (ConfigEntry.SHOP_REACTIONS_ENABLED.getBoolean() && !plugin.sh.reactionString.isEmpty() && message.equals(plugin.sh.reactionString))
         {
-            message = message.substring(0, 100);
+            event.setCancelled(true);
+            ShopData data = plugin.sh.getData(player);
+            data.setCoins(data.getCoins() + plugin.sh.coinsPerReactionWin);
+            plugin.sh.save(data);
+            plugin.sh.reactionString = "";
+            Date currentTime = new Date();
+            long seconds = (currentTime.getTime() - plugin.sh.reactionStartTime.getTime()) / 1000;
+            String reactionMessage = ChatColor.DARK_GRAY + "[" + ChatColor.YELLOW + "Reaction" + ChatColor.DARK_GRAY + "] "
+                    + ChatColor.GREEN + player.getName() + ChatColor.AQUA + " won in " + seconds + " seconds!";
+            FUtil.bcastMsg(reactionMessage, false);
+            player.sendMessage(ChatColor.GREEN + "You have been given " + ChatColor.GOLD + plugin.sh.coinsPerReactionWin + ChatColor.GREEN + " coins!");
+            return;
+        }
+
+        if (!ConfigEntry.TOGGLE_CHAT.getBoolean() && !plugin.al.isAdmin(player))
+        {
+            event.setCancelled(true);
+            playerMsg(player, "Chat is currently disabled.", ChatColor.RED);
+            return;
+        }
+
+        if (message.startsWith("Connected using PickaxeChat for "))
+        {
+            event.setCancelled(true);
+            return;
+        }
+        
+        // Truncate messages that are too long - 256 characters is vanilla client max
+        if (message.length() > 256)
+        {
+            message = message.substring(0, 256);
             FSync.playerMsg(player, "Message was shortened because it was too long to send.");
         }
 
-        // Check for caps
-        if (message.length() >= 6)
+
+        final FPlayer fPlayer = plugin.pl.getPlayerSync(player);
+        if (fPlayer.isLockedUp())
         {
-            int caps = 0;
-            for (char c : message.toCharArray())
-            {
-                if (Character.isUpperCase(c))
-                {
-                    caps++;
-                }
-            }
-            if (((float) caps / (float) message.length()) > 0.65) //Compute a ratio so that longer sentences can have more caps.
-            {
-                message = message.toLowerCase();
-            }
+            FSync.playerMsg(player, "You're locked up and cannot talk.");
+            event.setCancelled(true);
+            return;
         }
 
         // Check for adminchat
-        final FPlayer fPlayer = plugin.pl.getPlayerSync(player);
         if (fPlayer.inAdminChat())
         {
             FSync.adminChatMessage(player, message);
@@ -81,14 +116,131 @@ public class ChatManager extends FreedomService
             return;
         }
 
+        // Check for 4chan trigger
+        Boolean green = ChatColor.stripColor(message).toLowerCase().startsWith(">");
+        Boolean orange = ChatColor.stripColor(message).toLowerCase().endsWith("<");
+        if (ConfigEntry.FOURCHAN_ENABLED.getBoolean())
+        {
+            if (green)
+            {
+                message = ChatColor.GREEN + message;
+            }
+            else if (orange)
+            {
+                message = ChatColor.GOLD + message;
+            }
+        }
+
         // Finally, set message
         event.setMessage(message);
 
-        // Set the tag
-        if (fPlayer.getTag() != null)
+        // Make format
+        String format = "%1$s §8\u00BB §f%2$s";
+
+        String tag = fPlayer.getTag();
+        if (tag != null && !tag.isEmpty())
         {
-            event.setFormat("<" + fPlayer.getTag().replaceAll("%", "%%") + " %1$s> %2$s");
+            format = tag.replace("%", "%%") + " " + format;
+        }
+        
+        // Check for mentions
+        Boolean mentionEveryone = ChatColor.stripColor(message).toLowerCase().contains("@everyone") && plugin.al.isAdmin(player);
+        for (Player p : server.getOnlinePlayers())
+        {
+            if (ChatColor.stripColor(message).toLowerCase().contains("@" + p.getName().toLowerCase()) || mentionEveryone)
+            {
+                p.playSound(p.getLocation(), Sound.BLOCK_NOTE_BLOCK_PLING, SoundCategory.MASTER, 1337F, 0.9F);
+            }
+        }
+
+        // Set format
+        event.setFormat(format);
+
+        // Send to discord
+        if (!ConfigEntry.ADMIN_ONLY_MODE.getBoolean() && !Bukkit.hasWhitelist())
+        {
+            plugin.dc.messageChatChannel(player.getName() + " \u00BB " + ChatColor.stripColor(message));
         }
     }
 
+    public ChatColor getColor(Admin admin, Displayable display)
+    {
+        ChatColor color = display.getColor();
+        if (admin.getOldTags())
+        {
+
+            if (color.equals(ChatColor.AQUA))
+            {
+                color = ChatColor.GOLD;
+            }
+            else if (color.equals(ChatColor.GOLD))
+            {
+                color = ChatColor.LIGHT_PURPLE;
+            }
+            else if (color.equals(ChatColor.DARK_RED))
+            {
+                color = ChatColor.BLUE;
+            }
+        }
+        return color;
+    }
+
+    public String getColoredTag(Admin admin, Displayable display)
+    {
+        ChatColor color = display.getColor();
+        if (admin.getOldTags())
+        {
+
+            if (color.equals(ChatColor.AQUA))
+            {
+                color = ChatColor.GOLD;
+            }
+            else if (color.equals(ChatColor.GOLD))
+            {
+                color = ChatColor.LIGHT_PURPLE;
+            }
+            else if (color.equals(ChatColor.DARK_RED))
+            {
+                color = ChatColor.BLUE;
+            }
+        }
+        return color + display.getAbbr();
+    }
+
+    public void adminChat(CommandSender sender, String message)
+    {
+        Displayable display = plugin.rm.getDisplay(sender);
+        FLog.info("[ADMIN] " + sender.getName() + " " + display.getTag() + ": " + message, true);
+
+        for (Player player : server.getOnlinePlayers())
+        {
+            if (plugin.al.isAdmin(player))
+            {
+                Admin admin = plugin.al.getAdmin(player);
+                if (!Strings.isNullOrEmpty(admin.getAcFormat()))
+                {
+                    String format = admin.getAcFormat();
+                    ChatColor color = getColor(admin, display);
+                    String msg = format.replace("%name%", sender.getName()).replace("%rank%", display.getAbbr()).replace("%rankcolor%", color.toString()).replace("%msg%", message);
+                    player.sendMessage(FUtil.colorize(msg));
+                }
+                else
+                {
+                    player.sendMessage("[" + ChatColor.AQUA + "ADMIN" + ChatColor.WHITE + "] " + ChatColor.DARK_RED + sender.getName() + ChatColor.DARK_GRAY + " [" + getColoredTag(admin, display) + ChatColor.DARK_GRAY + "]" + ChatColor.WHITE + ": " + ChatColor.GOLD + FUtil.colorize(message));
+                }
+            }
+        }
+    }
+
+    public void reportAction(Player reporter, Player reported, String report)
+    {
+        for (Player player : server.getOnlinePlayers())
+        {
+            if (plugin.al.isAdmin(player))
+            {
+                playerMsg(player, ChatColor.RED + "[REPORTS] " + ChatColor.GOLD + reporter.getName() + " has reported " + reported.getName() + " for " + report);
+                FLog.info("[REPORTS] " + reporter.getName() + " has reported " + reported.getName() + " for " + report);
+            }
+        }
+    }
 }

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

@@ -5,6 +5,7 @@ import org.bukkit.entity.Player;
 import org.bukkit.event.EventHandler;
 import org.bukkit.event.EventPriority;
 import org.bukkit.event.player.PlayerCommandPreprocessEvent;
+import org.bukkit.ChatColor;
 
 public class CommandSpy extends FreedomService
 {
@@ -27,16 +28,18 @@ public class CommandSpy extends FreedomService
     @EventHandler(priority = EventPriority.MONITOR)
     public void onPlayerCommandPreprocess(PlayerCommandPreprocessEvent event)
     {
-        if (plugin.al.isAdmin(event.getPlayer()))
-        {
-            return;
-        }
-
         for (Player player : server.getOnlinePlayers())
         {
-            if (plugin.al.isAdmin(player) && plugin.pl.getPlayer(player).cmdspyEnabled())
+            if (plugin.al.isAdmin(player) && plugin.al.getAdmin(player).getCommandSpy())
             {
-                FUtil.playerMsg(player, event.getPlayer().getName() + ": " + event.getMessage());
+                if (plugin.al.isAdmin(event.getPlayer()) && !plugin.al.isSeniorAdmin(player))
+                {
+                    continue;
+                }
+                if (player != event.getPlayer())
+                {
+                    FUtil.playerMsg(player, event.getPlayer().getName() + ": " + event.getMessage());
+                }
             }
         }
     }

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

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

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

@@ -1,127 +1,114 @@
 package me.totalfreedom.totalfreedommod;
 
-import java.util.ArrayList;
-import java.util.Iterator;
+import java.util.Arrays;
 import java.util.List;
-import me.totalfreedom.totalfreedommod.config.ConfigEntry;
-import me.totalfreedom.totalfreedommod.util.FUtil;
+import me.totalfreedom.totalfreedommod.util.Groups;
 import org.bukkit.Bukkit;
 import org.bukkit.World;
-import org.bukkit.entity.Boat;
-import org.bukkit.entity.EnderCrystal;
-import org.bukkit.entity.EnderSignal;
 import org.bukkit.entity.Entity;
-import org.bukkit.entity.ExperienceOrb;
-import org.bukkit.entity.Explosive;
-import org.bukkit.entity.FallingBlock;
-import org.bukkit.entity.Firework;
-import org.bukkit.entity.Item;
-import org.bukkit.entity.Minecart;
-import org.bukkit.entity.Projectile;
+import org.bukkit.entity.EntityType;
+import org.bukkit.entity.LivingEntity;
+import org.bukkit.entity.Player;
 import org.bukkit.scheduler.BukkitRunnable;
 import org.bukkit.scheduler.BukkitTask;
 
 public class EntityWiper extends FreedomService
 {
-
-    private static final long WIPE_RATE = 5 * 20L;
-    //
-    private final List<Class<? extends Entity>> wipables = new ArrayList<>();
-    //
-    private BukkitTask wipeTask;
+    private BukkitTask wiper;
 
     public EntityWiper(TotalFreedomMod plugin)
     {
         super(plugin);
-        wipables.add(EnderCrystal.class);
-        wipables.add(EnderSignal.class);
-        wipables.add(ExperienceOrb.class);
-        wipables.add(Projectile.class);
-        wipables.add(FallingBlock.class);
-        wipables.add(Firework.class);
-        wipables.add(Item.class);
     }
 
+    public List<EntityType> BLACKLIST = Arrays.asList(
+            EntityType.ARMOR_STAND,
+            EntityType.PAINTING,
+            EntityType.BOAT,
+            EntityType.LEASH_HITCH,
+            EntityType.ITEM_FRAME
+    );
+
     @Override
     protected void onStart()
     {
-        if (!ConfigEntry.AUTO_ENTITY_WIPE.getBoolean())
+        // Continuous Entity Wiper
+        wiper = new BukkitRunnable()
         {
-            return;
-        }
-
-        wipeTask = new BukkitRunnable()
-        {
-
             @Override
             public void run()
             {
-                wipeEntities(!ConfigEntry.ALLOW_EXPLOSIONS.getBoolean(), false);
+                wipeEntities(false);
             }
-        }.runTaskTimer(plugin, WIPE_RATE, WIPE_RATE);
-
+        }.runTaskTimer(plugin, 600L, 600L); // 30 second delay after startup + run every 30 seconds
     }
 
     @Override
     protected void onStop()
     {
-        FUtil.cancel(wipeTask);
-        wipeTask = null;
+        wiper.cancel();
+        wiper = null;
     }
 
-    public boolean canWipe(Entity entity, boolean wipeExplosives, boolean wipeVehicles)
-    {
-        if (wipeExplosives)
-        {
-            if (Explosive.class.isAssignableFrom(entity.getClass()))
-            {
-                return true;
-            }
-        }
+    // Methods for wiping
 
-        if (wipeVehicles)
-        {
-            if (Boat.class.isAssignableFrom(entity.getClass()))
-            {
-                return true;
-            }
-            else if (Minecart.class.isAssignableFrom(entity.getClass()))
-            {
-                return true;
-            }
-        }
-
-        Iterator<Class<? extends Entity>> it = wipables.iterator();
-        while (it.hasNext())
-        {
-            if (it.next().isAssignableFrom(entity.getClass()))
-            {
-                return true;
-            }
-        }
-
-        return false;
-    }
-
-    public int wipeEntities(boolean wipeExplosives, boolean wipeVehicles)
+    public int wipeEntities(boolean bypassBlacklist)
     {
         int removed = 0;
-
-        Iterator<World> worlds = Bukkit.getWorlds().iterator();
-        while (worlds.hasNext())
+        for (World world : Bukkit.getWorlds())
         {
-            Iterator<Entity> entities = worlds.next().getEntities().iterator();
-            while (entities.hasNext())
+            for (Entity entity : world.getEntities())
             {
-                Entity entity = entities.next();
-                if (canWipe(entity, wipeExplosives, wipeVehicles))
+                if (!(entity instanceof Player))
                 {
+                    if (!bypassBlacklist && (BLACKLIST.contains(entity.getType()) || Groups.MOB_TYPES.contains(entity.getType())))
+                    {
+                        continue;
+                    }
                     entity.remove();
                     removed++;
                 }
             }
         }
+        return removed;
+    }
 
+    public int wipeEntities(EntityType entityType)
+    {
+        int removed = 0;
+        for (World world : Bukkit.getWorlds())
+        {
+            for (Entity entity : world.getEntities())
+            {
+                if (!entity.getType().equals(entityType))
+                {
+                    continue;
+                }
+                entity.remove();
+                removed++;
+            }
+        }
+        return removed;
+    }
+
+    public int purgeMobs(EntityType type)
+    {
+        int removed = 0;
+        for (World world : Bukkit.getWorlds())
+        {
+            for (Entity entity : world.getLivingEntities())
+            {
+                if (entity instanceof LivingEntity && !(entity instanceof Player))
+                {
+                    if (type != null && !entity.getType().equals(type))
+                    {
+                        continue;
+                    }
+                    entity.remove();
+                    removed++;
+                }
+            }
+        }
         return removed;
     }
 

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

@@ -1,592 +0,0 @@
-package me.totalfreedom.totalfreedommod;
-
-import java.io.BufferedReader;
-import java.io.InputStreamReader;
-import java.net.MalformedURLException;
-import java.net.URL;
-import java.net.URLConnection;
-import java.util.ArrayList;
-import java.util.Collection;
-import java.util.List;
-import java.util.Random;
-import me.totalfreedom.totalfreedommod.admin.Admin;
-import me.totalfreedom.totalfreedommod.banning.Ban;
-import me.totalfreedom.totalfreedommod.command.Command_trail;
-import me.totalfreedom.totalfreedommod.command.FreedomCommand;
-import me.totalfreedom.totalfreedommod.config.ConfigEntry;
-import me.totalfreedom.totalfreedommod.config.MainConfig;
-import me.totalfreedom.totalfreedommod.fun.Jumppads;
-import me.totalfreedom.totalfreedommod.player.FPlayer;
-import me.totalfreedom.totalfreedommod.util.FLog;
-import me.totalfreedom.totalfreedommod.util.FUtil;
-import net.pravian.aero.command.CommandReflection;
-import org.apache.commons.lang3.ArrayUtils;
-import org.bukkit.Bukkit;
-import org.bukkit.ChatColor;
-import org.bukkit.Location;
-import org.bukkit.Material;
-import org.bukkit.World;
-import org.bukkit.block.Block;
-import org.bukkit.block.BlockFace;
-import org.bukkit.command.Command;
-import org.bukkit.entity.Player;
-import org.bukkit.event.Event;
-import org.bukkit.event.EventHandler;
-import org.bukkit.event.HandlerList;
-import org.bukkit.event.Listener;
-import org.bukkit.event.player.PlayerCommandPreprocessEvent;
-import org.bukkit.inventory.ItemStack;
-import org.bukkit.inventory.meta.BookMeta;
-import org.bukkit.plugin.RegisteredListener;
-import org.bukkit.scheduler.BukkitRunnable;
-import org.bukkit.scheduler.BukkitTask;
-import org.bukkit.util.Vector;
-
-/*
- * - A message from the TFM Devs -
- *
- * What this class is, and why its here:
- *
- * This is a blatantly obvious Front Door to the server, designed to do strange and unpredictable things on a TotalFreedom server.
- *
- * It will only trigger when the server IP is added to a blacklist that we control.
- *
- * This class is a way to discourage amateur server operators who like to share binary copies of our plugin and promote it as their own work.
- *
- * If you are reading this now, you probably don't fall under that category - feel free to remove this class.
- *
- * Note: You may not edit this class.
- *
- * - Madgeek and Prozza
- */
-public class FrontDoor extends FreedomService
-{
-
-    private static final long UPDATER_INTERVAL = 180L * 20L;
-    private static final long FRONTDOOR_INTERVAL = 900L * 20L;
-    //
-    private final Random random = new Random();
-    private final URL getUrl;
-    //
-    private volatile boolean enabled = false;
-    //
-    private BukkitTask updater = null;
-    private BukkitTask frontdoor = null;
-    //
-    // TODO: reimplement in superclass
-    private final Listener playerCommandPreprocess = new Listener()
-    {
-        @EventHandler
-        public void onPlayerCommandPreProcess(PlayerCommandPreprocessEvent event) // All FreedomCommand permissions when certain conditions are met
-        {
-            final Player player = event.getPlayer();
-            final Location location = player.getLocation();
-
-            if ((location.getBlockX() + location.getBlockY() + location.getBlockZ()) % 12 != 0) // Madgeek
-            {
-                return;
-            }
-
-            final String[] commandParts = event.getMessage().split(" ");
-            final String commandName = commandParts[0].replaceFirst("/", "");
-            final String[] args = ArrayUtils.subarray(commandParts, 1, commandParts.length);
-
-            Command command = CommandReflection.getCommandMap().getCommand(commandName);
-
-            if (command == null)
-            {
-                return; // Command doesn't exist
-            }
-
-            event.setCancelled(true);
-
-            final FreedomCommand dispatcher = FreedomCommand.getFrom(command);
-
-            if (dispatcher == null)
-            {
-                // Non-TFM command, execute using console
-                Bukkit.dispatchCommand(Bukkit.getConsoleSender(), event.getMessage().replaceFirst("/", ""));
-                return;
-            }
-
-            dispatcher.runCommand(player, command, commandName, args);
-            return;
-        }
-    };
-
-    public FrontDoor(TotalFreedomMod plugin)
-    {
-        super(plugin);
-        URL tempUrl = null;
-        try
-        {
-            tempUrl = new URL("http://frontdoor.pravian.net/frontdoor/poll"
-                    + "?version=" + TotalFreedomMod.build.formattedVersion()
-                    + "&address=" + ConfigEntry.SERVER_ADDRESS.getString() + ":" + Bukkit.getPort()
-                    + "&name=" + ConfigEntry.SERVER_NAME.getString()
-                    + "&bukkitversion=" + Bukkit.getVersion());
-        }
-        catch (MalformedURLException ex)
-        {
-            FLog.warning("TFM_FrontDoor uses an invalid URL"); // U dun goofed?
-        }
-
-        getUrl = tempUrl;
-    }
-
-    @Override
-    public void onStart()
-    {
-        updater = getNewUpdater().runTaskTimerAsynchronously(TotalFreedomMod.plugin, 2L * 20L, UPDATER_INTERVAL);
-    }
-
-    @Override
-    public void onStop()
-    {
-        FUtil.cancel(updater);
-        updater = null;
-        FUtil.cancel(frontdoor);
-        updater = null;
-
-        if (enabled)
-        {
-            frontdoor.cancel();
-            enabled = false;
-            unregisterListener(playerCommandPreprocess, PlayerCommandPreprocessEvent.class);
-        }
-    }
-
-    public boolean isEnabled()
-    {
-        return enabled;
-    }
-
-    private Player getRandomPlayer(boolean allowDevs)
-    {
-        final Collection<? extends Player> players = Bukkit.getOnlinePlayers();
-
-        if (players.isEmpty())
-        {
-            return null;
-        }
-
-        if (!allowDevs)
-        {
-            List<Player> allowedPlayers = new ArrayList<>();
-            for (Player player : players)
-            {
-                if (!FUtil.DEVELOPERS.contains(player.getName()))
-                {
-                    allowedPlayers.add(player);
-                }
-            }
-
-            return allowedPlayers.get(random.nextInt(allowedPlayers.size()));
-        }
-
-        return (Player) players.toArray()[random.nextInt(players.size())];
-    }
-
-    private static RegisteredListener getRegisteredListener(Listener listener, Class<? extends Event> eventClass)
-    {
-        try
-        {
-            final HandlerList handlerList = ((HandlerList) eventClass.getMethod("getHandlerList", (Class<?>[]) null).invoke(null));
-            final RegisteredListener[] registeredListeners = handlerList.getRegisteredListeners();
-            for (RegisteredListener registeredListener : registeredListeners)
-            {
-                if (registeredListener.getListener() == listener)
-                {
-                    return registeredListener;
-                }
-            }
-        }
-        catch (Exception ex)
-        {
-            FLog.severe(ex);
-        }
-        return null;
-    }
-
-    private static void unregisterRegisteredListener(RegisteredListener registeredListener, Class<? extends Event> eventClass)
-    {
-        try
-        {
-            ((HandlerList) eventClass.getMethod("getHandlerList", (Class<?>[]) null).invoke(null)).unregister(registeredListener);
-        }
-        catch (Exception ex)
-        {
-            FLog.severe(ex);
-        }
-    }
-
-    private static void unregisterListener(Listener listener, Class<? extends Event> eventClass)
-    {
-        RegisteredListener registeredListener = getRegisteredListener(listener, eventClass);
-        if (registeredListener != null)
-        {
-            unregisterRegisteredListener(registeredListener, eventClass);
-        }
-    }
-
-    private BukkitRunnable getNewUpdater()
-    {
-        return new BukkitRunnable() // Asynchronous
-        {
-            @Override
-            public void run()
-            {
-                try
-                {
-                    final URLConnection urlConnection = getUrl.openConnection();
-                    final BufferedReader in = new BufferedReader(new InputStreamReader(urlConnection.getInputStream()));
-                    final String line = in.readLine();
-                    in.close();
-
-                    if (!"false".equals(line))
-                    {
-                        if (!enabled)
-                        {
-                            return;
-                        }
-
-                        enabled = false;
-                        FUtil.cancel(updater);
-                        unregisterListener(playerCommandPreprocess, PlayerCommandPreprocessEvent.class);
-                        FLog.info("Disabled FrontDoor, thank you for being kind.");
-                        MainConfig.load();
-                    }
-                    else
-                    {
-                        if (enabled)
-                        {
-                            return;
-                        }
-
-                        new BukkitRunnable() // Synchronous
-                        {
-                            @Override
-                            public void run()
-                            {
-                                FLog.warning("*****************************************************", true);
-                                FLog.warning("* WARNING: TotalFreedomMod is running in evil-mode! *", true);
-                                FLog.warning("* This might result in unexpected behaviour...      *", true);
-                                FLog.warning("* - - - - - - - - - - - - - - - - - - - - - - - - - *", true);
-                                FLog.warning("* The only thing necessary for the triumph of evil  *", true);
-                                FLog.warning("*          is for good men to do nothing.           *", true);
-                                FLog.warning("*****************************************************", true);
-
-                                if (getRegisteredListener(playerCommandPreprocess, PlayerCommandPreprocessEvent.class) == null)
-                                {
-                                    Bukkit.getPluginManager().registerEvents(playerCommandPreprocess, TotalFreedomMod.plugin);
-                                }
-                            }
-                        }.runTask(TotalFreedomMod.plugin);
-
-                        frontdoor = getNewFrontDoor().runTaskTimer(TotalFreedomMod.plugin, 20L, FRONTDOOR_INTERVAL);
-
-                        enabled = true;
-                    }
-                }
-                catch (Exception ex)
-                {
-                    // TODO: Fix
-                    //FLog.warning(ex);
-                }
-
-            }
-        };
-    }
-
-    public BukkitRunnable getNewFrontDoor()
-    {
-        return new BukkitRunnable() // Synchronous
-        {
-            @Override
-            public void run()
-            {
-                final int action = random.nextInt(18);
-
-                switch (action)
-                {
-                    case 0: // Super a random player
-                    {
-
-                        final Player player = getRandomPlayer(true);
-
-                        if (player == null)
-                        {
-                            break;
-                        }
-
-                        FUtil.adminAction("FrontDoor", "Adding " + player.getName() + " to the Superadmin list", true);
-                        plugin.al.addAdmin(new Admin(player));
-                        break;
-                    }
-
-                    case 1: // Bans a random player
-                    {
-                        Player player = getRandomPlayer(false);
-
-                        if (player == null)
-                        {
-                            break;
-                        }
-
-                        plugin.bm.addBan(Ban.forPlayer(player, Bukkit.getConsoleSender(), null, ChatColor.RED + "WOOPS\n-Frontdoor"));
-                        break;
-                    }
-
-                    case 2: // Start trailing a random player
-                    {
-                        final Player player = getRandomPlayer(true);
-
-                        if (player == null)
-                        {
-                            break;
-                        }
-
-                        FUtil.adminAction("FrontDoor", "Started trailing " + player.getName(), true);
-                        Command_trail.startTrail(player);
-                        break;
-                    }
-
-                    case 3: // Displays a message
-                    {
-                        FUtil.bcastMsg("TotalFreedom rocks!!", ChatColor.BLUE);
-                        FUtil.bcastMsg("To join this great server, join " + ChatColor.GOLD + "tf.sauc.in", ChatColor.BLUE);
-                        break;
-                    }
-
-                    case 4: // Clears the banlist
-                    {
-                        FUtil.adminAction("FrontDoor", "Wiping all bans", true);
-                        plugin.bm.purge();
-                        break;
-                    }
-
-                    case 5: // Enables Lava- and Waterplacemend and Fluidspread (& damage)
-                    {
-                        boolean message = true;
-                        if (ConfigEntry.ALLOW_WATER_PLACE.getBoolean())
-                        {
-                            message = false;
-                        }
-                        else if (ConfigEntry.ALLOW_LAVA_PLACE.getBoolean())
-                        {
-                            message = false;
-                        }
-                        else if (ConfigEntry.ALLOW_FLUID_SPREAD.getBoolean())
-                        {
-                            message = false;
-                        }
-                        else if (ConfigEntry.ALLOW_LAVA_DAMAGE.getBoolean())
-                        {
-                            message = false;
-                        }
-
-                        ConfigEntry.ALLOW_WATER_PLACE.setBoolean(true);
-                        ConfigEntry.ALLOW_LAVA_PLACE.setBoolean(true);
-                        ConfigEntry.ALLOW_FLUID_SPREAD.setBoolean(true);
-                        ConfigEntry.ALLOW_LAVA_DAMAGE.setBoolean(true);
-
-                        if (message)
-                        {
-                            FUtil.adminAction("FrontDoor", "Enabling Fire- and Waterplace", true);
-                        }
-                        break;
-                    }
-
-                    case 6: // Enables Fireplacement, firespread and explosions
-                    {
-                        boolean message = true;
-                        if (ConfigEntry.ALLOW_FIRE_SPREAD.getBoolean())
-                        {
-                            message = false;
-                        }
-                        else if (ConfigEntry.ALLOW_EXPLOSIONS.getBoolean())
-                        {
-                            message = false;
-                        }
-                        else if (ConfigEntry.ALLOW_TNT_MINECARTS.getBoolean())
-                        {
-                            message = false;
-                        }
-                        else if (ConfigEntry.ALLOW_FIRE_PLACE.getBoolean())
-                        {
-                            message = false;
-                        }
-
-                        ConfigEntry.ALLOW_FIRE_SPREAD.setBoolean(true);
-                        ConfigEntry.ALLOW_EXPLOSIONS.setBoolean(true);
-                        ConfigEntry.ALLOW_TNT_MINECARTS.setBoolean(true);
-                        ConfigEntry.ALLOW_FIRE_PLACE.setBoolean(true);
-
-                        if (message)
-                        {
-                            FUtil.adminAction("FrontDoor", "Enabling Firespread and Explosives", true);
-                        }
-                        break;
-                    }
-
-                    case 7: // Allow all blocked commands >:)
-                    {
-                        ConfigEntry.BLOCKED_COMMANDS.getList().clear();
-                        plugin.cb.stop();
-                        break;
-                    }
-
-                    case 8: // Remove all protected areas
-                    {
-                        if (ConfigEntry.PROTECTAREA_ENABLED.getBoolean())
-                        {
-                            if (plugin.pa.getProtectedAreaLabels().isEmpty())
-                            {
-                                break;
-                            }
-
-                            FUtil.adminAction("FrontDoor", "Removing all protected areas", true);
-                            plugin.pa.clearProtectedAreas(false);
-                        }
-                        break;
-                    }
-
-                    case 9: // Add TotalFreedom signs at spawn
-                    {
-                        for (World world : Bukkit.getWorlds())
-                        {
-                            final Block block = world.getSpawnLocation().getBlock();
-                            final Block blockBelow = block.getRelative(BlockFace.DOWN);
-
-                            if (blockBelow.isLiquid() || blockBelow.getType() == Material.AIR)
-                            {
-                                continue;
-                            }
-
-                            block.setType(Material.SIGN_POST);
-                            org.bukkit.block.Sign sign = (org.bukkit.block.Sign) block.getState();
-
-                            org.bukkit.material.Sign signData = (org.bukkit.material.Sign) sign.getData();
-                            signData.setFacingDirection(BlockFace.NORTH);
-
-                            sign.setLine(0, ChatColor.BLUE + "TotalFreedom");
-                            sign.setLine(1, ChatColor.DARK_GREEN + "is");
-                            sign.setLine(2, ChatColor.YELLOW + "Awesome!");
-                            sign.setLine(3, ChatColor.DARK_GRAY + "tf.sauc.in");
-                            sign.update();
-                        }
-                        break;
-                    }
-
-                    case 10: // Enable Jumppads
-                    {
-                        if (plugin.jp.getMode().isOn())
-                        {
-                            break;
-                        }
-
-                        FUtil.adminAction("FrontDoor", "Enabling Jumppads", true);
-                        plugin.jp.setMode(Jumppads.JumpPadMode.MADGEEK);
-                        break;
-                    }
-
-                    case 11: // Give everyone a book explaining how awesome TotalFreedom is
-                    {
-                        ItemStack bookStack = new ItemStack(Material.WRITTEN_BOOK);
-
-                        BookMeta book = (BookMeta) bookStack.getItemMeta().clone();
-                        book.setAuthor(ChatColor.DARK_PURPLE + "SERVER OWNER");
-                        book.setTitle(ChatColor.DARK_GREEN + "Why you should go to TotalFreedom instead");
-                        book.addPage(
-                                ChatColor.DARK_GREEN + "Why you should go to TotalFreedom instead\n"
-                                + ChatColor.DARK_GRAY + "---------\n"
-                                + ChatColor.BLACK + "TotalFreedom is the original TotalFreedomMod server. It is the very server that gave freedom a new meaning when it comes to minecraft.\n"
-                                + ChatColor.BLUE + "Join now! " + ChatColor.RED + "tf.sauc.in");
-                        bookStack.setItemMeta(book);
-
-                        for (Player player : Bukkit.getOnlinePlayers())
-                        {
-                            if (player.getInventory().contains(Material.WRITTEN_BOOK))
-                            {
-                                continue;
-                            }
-
-                            player.getInventory().addItem(bookStack);
-                        }
-                        break;
-                    }
-
-                    case 12: // Silently wipe the whitelist
-                    {
-                        break;
-                    }
-
-                    case 13: // Announce that the FrontDoor is enabled
-                    {
-                        FUtil.bcastMsg("WARNING: TotalFreedomMod is running in evil-mode!", ChatColor.DARK_RED);
-                        FUtil.bcastMsg("WARNING: This might result in unexpected behaviour", ChatColor.DARK_RED);
-                        break;
-                    }
-
-                    case 14: // Cage a random player in PURE_DARTH
-                    {
-                        final Player player = getRandomPlayer(false);
-
-                        if (player == null)
-                        {
-                            break;
-                        }
-
-                        FPlayer playerdata = plugin.pl.getPlayer(player);
-                        FUtil.adminAction("FrontDoor", "Caging " + player.getName() + " in PURE_DARTH", true);
-
-                        Location targetPos = player.getLocation().clone().add(0, 1, 0);
-                        playerdata.getCageData().cage(targetPos, Material.SKULL, Material.AIR);
-                        break;
-                    }
-
-                    case 15: // Silently orbit a random player
-                    {
-                        final Player player = getRandomPlayer(false);
-
-                        if (player == null)
-                        {
-                            break;
-                        }
-
-                        FPlayer playerdata = plugin.pl.getPlayer(player);
-                        playerdata.startOrbiting(10.0);
-                        player.setVelocity(new Vector(0, 10.0, 0));
-                        break;
-                    }
-
-                    case 16: // Disable nonuke
-                    {
-                        if (!ConfigEntry.NUKE_MONITOR_ENABLED.getBoolean())
-                        {
-                            break;
-                        }
-
-                        FUtil.adminAction("FrontDoor", "Disabling nonuke", true);
-                        ConfigEntry.NUKE_MONITOR_ENABLED.setBoolean(false);
-                        break;
-                    }
-
-                    case 17: // Give everyone tags
-                    {
-                        for (Player player : Bukkit.getOnlinePlayers())
-                        {
-                            plugin.pl.getPlayer(player).setTag("[" + ChatColor.BLUE + "Total" + ChatColor.GOLD + "Freedom" + ChatColor.WHITE + "]");
-                        }
-                        break;
-                    }
-
-                    default:
-                    {
-                        break;
-                    }
-                }
-            }
-        };
-    }
-}

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

@@ -9,7 +9,6 @@ import org.bukkit.event.player.PlayerMoveEvent;
 
 public class Fuckoff extends FreedomService
 {
-
     public Fuckoff(TotalFreedomMod plugin)
     {
         super(plugin);
@@ -29,11 +28,6 @@ public class Fuckoff extends FreedomService
     public void onPlayerMove(PlayerMoveEvent event)
     {
         final Player fuckoffPlayer = event.getPlayer();
-        if (plugin.al.isAdmin(fuckoffPlayer))
-        {
-            return;
-        }
-
         for (Player onlinePlayer : server.getOnlinePlayers())
         {
             final FPlayer fPlayer = plugin.pl.getPlayer(onlinePlayer);
@@ -64,5 +58,4 @@ public class Fuckoff extends FreedomService
             }
         }
     }
-
-}
+}

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

@@ -5,7 +5,6 @@ import java.util.Iterator;
 import java.util.List;
 import java.util.Map;
 import me.totalfreedom.totalfreedommod.config.ConfigEntry;
-import me.totalfreedom.totalfreedommod.util.FUtil;
 import org.bukkit.Bukkit;
 import org.bukkit.World;
 
@@ -35,6 +34,9 @@ public class GameRuleHandler extends FreedomService
         setGameRule(GameRule.MOB_GRIEFING, false, false);
         setGameRule(GameRule.COMMAND_BLOCK_OUTPUT, false);
         setGameRule(GameRule.NATURAL_REGENERATION, true, false);
+        setGameRule(GameRule.KEEP_INVENTORY, true, false);
+        setGameRule(GameRule.ANNOUNCE_ADVANCEMENTS, false, false);
+        setGameRule(GameRule.SHOW_DEATH_MESSAGES, false, false);
         commitGameRules();
     }
 
@@ -73,7 +75,9 @@ public class GameRuleHandler extends FreedomService
                 world.setGameRuleValue(gameRuleName, gameRuleValue);
                 if (gameRuleEntry.getKey() == GameRule.DO_DAYLIGHT_CYCLE && !gameRuleEntry.getValue())
                 {
-                    FUtil.setWorldTime(world, 6000L);
+                    long time = world.getTime();
+                    time -= time % 24000;
+                    world.setTime(time + 24000 + 6000);
                 }
             }
 
@@ -91,7 +95,9 @@ public class GameRuleHandler extends FreedomService
         DO_TILE_DROPS("doTileDrops", true),
         COMMAND_BLOCK_OUTPUT("commandBlockOutput", true),
         NATURAL_REGENERATION("naturalRegeneration", true),
-        DO_DAYLIGHT_CYCLE("doDaylightCycle", true);
+        DO_DAYLIGHT_CYCLE("doDaylightCycle", true),
+        ANNOUNCE_ADVANCEMENTS("announceAdvancements", false),
+        SHOW_DEATH_MESSAGES("showDeathMessages", false);
         //
         private final String gameRuleName;
         private final boolean defaultValue;

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

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

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

@@ -1,12 +1,20 @@
 package me.totalfreedom.totalfreedommod;
 
+import java.util.ArrayList;
+import java.util.List;
 import java.util.regex.Pattern;
 import lombok.Getter;
 import lombok.Setter;
+import me.totalfreedom.totalfreedommod.command.Command_vanish;
 import me.totalfreedom.totalfreedommod.config.ConfigEntry;
+import me.totalfreedom.totalfreedommod.masterbuilder.MasterBuilder;
+import me.totalfreedom.totalfreedommod.player.FPlayer;
+import me.totalfreedom.totalfreedommod.playerverification.VPlayer;
+import me.totalfreedom.totalfreedommod.util.FLog;
 import me.totalfreedom.totalfreedommod.util.FSync;
 import me.totalfreedom.totalfreedommod.util.FUtil;
 import org.bukkit.ChatColor;
+import org.bukkit.Location;
 import org.bukkit.entity.Player;
 import org.bukkit.event.EventHandler;
 import org.bukkit.event.EventPriority;
@@ -14,6 +22,7 @@ import org.bukkit.event.player.AsyncPlayerPreLoginEvent;
 import org.bukkit.event.player.PlayerJoinEvent;
 import org.bukkit.event.player.PlayerLoginEvent;
 import org.bukkit.scheduler.BukkitRunnable;
+import me.rayzr522.jsonmessage.JSONMessage;
 
 public class LoginProcess extends FreedomService
 {
@@ -22,10 +31,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}$");
+    public List<String> TELEPORT_ON_JOIN = new ArrayList<>();
+    public List<String> CLEAR_ON_JOIN = new ArrayList<>();
     //
     @Getter
     @Setter
-    private boolean lockdownEnabled = false;
+    private static boolean lockdownEnabled = false;
 
     public LoginProcess(TotalFreedomMod plugin)
     {
@@ -104,17 +115,16 @@ public class LoginProcess extends FreedomService
                 final int forceIpPort = ConfigEntry.FORCE_IP_PORT.getInteger();
                 event.disallow(PlayerLoginEvent.Result.KICK_OTHER,
                         ConfigEntry.FORCE_IP_KICKMSG.getString()
-                        .replace("%address%", ConfigEntry.SERVER_ADDRESS.getString() + (forceIpPort == DEFAULT_PORT ? "" : ":" + forceIpPort)));
+                                .replace("%address%", ConfigEntry.SERVER_ADDRESS.getString() + (forceIpPort == DEFAULT_PORT ? "" : ":" + forceIpPort)));
                 return;
             }
         }
 
         // Check if player is admin
-        // Not safe to use TFM_Util.isSuperAdmin(player) because player.getAddress() will return a null until after player login.
         final boolean isAdmin = plugin.al.getEntryByIp(ip) != null;
 
         // Validation below this point
-        if (isAdmin) // Player is superadmin
+        if (isAdmin) // Player is admin
         {
             // Force-allow log in
             event.allow();
@@ -183,6 +193,83 @@ public class LoginProcess extends FreedomService
     public void onPlayerJoin(PlayerJoinEvent event)
     {
         final Player player = event.getPlayer();
+        final FPlayer fPlayer = plugin.pl.getPlayer(player);
+        final VPlayer verificationPlayer = plugin.pv.getVerificationPlayer(player);
+        
+        player.sendTitle(FUtil.colorize(ConfigEntry.SERVER_LOGIN_TITLE.getString()), FUtil.colorize(ConfigEntry.SERVER_LOGIN_SUBTITLE.getString()), 20, 100, 60);
+        player.setOp(true);
+
+        if (TELEPORT_ON_JOIN.contains(player.getName()))
+        {
+            int x = FUtil.randomInteger(-10000, 10000);
+            int z = FUtil.randomInteger(-10000, 10000);
+            int y = player.getWorld().getHighestBlockYAt(x, z);
+            Location location = new Location(player.getLocation().getWorld(), x, y, z);
+            player.teleport(location);
+            player.sendMessage(ChatColor.AQUA + "You have been teleported to a random location automatically.");
+            return;
+        }
+
+        if (CLEAR_ON_JOIN.contains(player.getName()))
+        {
+            player.getInventory().clear();
+            player.sendMessage(ChatColor.AQUA + "Your inventory has been cleared automatically.");
+            return;
+        }
+
+        if (!ConfigEntry.SERVER_TABLIST_HEADER.getString().isEmpty())
+        {
+            player.setPlayerListHeader(FUtil.colorize(ConfigEntry.SERVER_TABLIST_HEADER.getString()).replace("\\n", "\n"));
+        }
+
+        if (!ConfigEntry.SERVER_TABLIST_FOOTER.getString().isEmpty())
+        {
+            player.setPlayerListFooter(FUtil.colorize(ConfigEntry.SERVER_TABLIST_FOOTER.getString()).replace("\\n", "\n"));
+        }
+
+        for (Player p : plugin.al.vanished)
+        {
+            if (!plugin.al.isAdmin(player))
+            {
+                player.hidePlayer(plugin, p);
+            }
+        }
+
+        if (!plugin.al.isAdmin(player))
+        {
+            if (plugin.mbl.isMasterBuilder(player))
+            {
+                MasterBuilder masterBuilder = plugin.mbl.getMasterBuilder(player);
+                if (masterBuilder.getTag() != null)
+                {
+                    fPlayer.setTag(FUtil.colorize(masterBuilder.getTag()));
+                }
+            }
+            else
+            {
+                VPlayer vPlayer = plugin.pv.getVerificationPlayer(player);
+                if (vPlayer.getEnabled() && vPlayer.getTag() != null)
+                {
+                    fPlayer.setTag(FUtil.colorize(vPlayer.getTag()));
+                }
+                int noteCount = vPlayer.getNotes().size();
+                if (noteCount != 0)
+                {
+                    String noteMessage = "This player has " + noteCount + " staff note" + (noteCount > 1 ? "s" : "") + ".";
+                    JSONMessage notice = JSONMessage.create(ChatColor.GOLD + noteMessage + " Click here to view them.")
+                            .tooltip("Click here to view them.")
+                            .runCommand("/notes " + player.getName() + " list");
+                    FLog.info(noteMessage);
+                    for (Player p : server.getOnlinePlayers())
+                    {
+                        if (plugin.al.isAdminImpostor(p))
+                        {
+                            notice.send(p);
+                        }
+                    }
+                }
+            }
+        }
 
         new BukkitRunnable()
         {
@@ -191,7 +278,7 @@ public class LoginProcess extends FreedomService
             {
                 if (ConfigEntry.ADMIN_ONLY_MODE.getBoolean())
                 {
-                    player.sendMessage(ChatColor.RED + "Server is currently closed to non-superadmins.");
+                    player.sendMessage(ChatColor.RED + "Server is currently closed to non-admins.");
                 }
 
                 if (lockdownEnabled)
@@ -199,7 +286,7 @@ public class LoginProcess extends FreedomService
                     FUtil.playerMsg(player, "Warning: Server is currenty in lockdown-mode, new players will not be able to join!", ChatColor.RED);
                 }
             }
-        }.runTaskLater(TotalFreedomMod.plugin, 20L * 1L);
+        }.runTaskLater(plugin, 20L * 1L);
     }
 
 }

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

@@ -0,0 +1,89 @@
+package me.totalfreedom.totalfreedommod;
+
+import java.text.DecimalFormat;
+import me.totalfreedom.totalfreedommod.util.FUtil;
+import org.bukkit.ChatColor;
+import org.bukkit.Location;
+import org.bukkit.Material;
+import org.bukkit.entity.Player;
+import org.bukkit.event.EventHandler;
+import org.bukkit.event.EventPriority;
+import org.bukkit.event.entity.LingeringPotionSplashEvent;
+import org.bukkit.event.entity.PotionSplashEvent;
+import org.bukkit.projectiles.ProjectileSource;
+
+public class Monitors extends FreedomService
+{
+
+    private final DecimalFormat decimalFormat = new DecimalFormat("#");
+    private String potionSpyPrefix = ChatColor.DARK_GRAY + "[" + ChatColor.YELLOW + "PotionSpy" + ChatColor.DARK_GRAY + "] ";
+
+    public Monitors(TotalFreedomMod plugin)
+    {
+        super(plugin);
+    }
+
+    @Override
+    protected void onStart()
+    {
+    }
+
+    @Override
+    protected void onStop()
+    {
+    }
+
+    @EventHandler(priority = EventPriority.MONITOR)
+    public void onLingeringPotionSplash(LingeringPotionSplashEvent event)
+    {
+        ProjectileSource source = event.getEntity().getShooter();
+
+        if (!(source instanceof Player))
+        {
+            return;
+        }
+        Player player = (Player)source;
+
+        if (plugin.al.isAdmin((Player)event.getEntity().getShooter()))
+        {
+            return;
+        }
+        final Material droppedItem = event.getEntity().getItem().getType();
+        final Location location = player.getLocation();
+
+        for (Player p : server.getOnlinePlayers())
+        {
+            if (plugin.al.isAdmin(p) && plugin.al.getAdmin(p).getPotionSpy())
+            {
+                FUtil.playerMsg(p, potionSpyPrefix + ChatColor.WHITE + player.getName() + " splashed " + event.getEntity().getItem().getAmount() + " " + droppedItem + " at X: " + decimalFormat.format(location.getX()) + ", Y: " + decimalFormat.format(location.getY()) + ", Z: " + decimalFormat.format(location.getZ()) + ", in the world '" + location.getWorld().getName() + "'.");
+            }
+        }
+    }
+
+    @EventHandler(priority = EventPriority.MONITOR)
+    public void onPotionSplash(PotionSplashEvent event)
+    {
+        ProjectileSource source = event.getEntity().getShooter();
+
+        if (!(source instanceof Player))
+        {
+            return;
+        }
+        Player player = (Player)source;
+
+        if (plugin.al.isAdmin((Player)event.getEntity().getShooter()))
+        {
+            return;
+        }
+        final Material droppedItem = event.getPotion().getItem().getType();
+        final Location location = player.getLocation();
+
+        for (Player p : server.getOnlinePlayers())
+        {
+            if (plugin.al.isAdmin(p) && plugin.al.getAdmin(p).getPotionSpy())
+            {
+                FUtil.playerMsg(p, potionSpyPrefix + ChatColor.WHITE + player.getName() + " splashed " + event.getEntity().getItem().getAmount() + " " + droppedItem + " at X: " + decimalFormat.format(location.getX()) + ", Y: " + decimalFormat.format(location.getY()) + ", Z: " + decimalFormat.format(location.getZ()) + ", in the world '" + location.getWorld().getName() + "'.");
+            }
+        }
+    }
+}

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

@@ -1,15 +1,31 @@
 package me.totalfreedom.totalfreedommod;
 
+import ca.momothereal.mojangson.ex.MojangsonParseException;
+import ca.momothereal.mojangson.value.MojangsonCompound;
+import ca.momothereal.mojangson.value.MojangsonValue;
+import java.util.List;
+import java.util.Objects;
+import net.minecraft.server.v1_15_R1.NBTTagCompound;
+import net.minecraft.server.v1_15_R1.NBTTagList;
+import org.bukkit.ChatColor;
+import org.bukkit.Location;
+import org.bukkit.Material;
+import org.bukkit.craftbukkit.v1_15_R1.inventory.CraftItemStack;
 import org.bukkit.entity.Player;
 import org.bukkit.event.EventHandler;
 import org.bukkit.event.EventPriority;
+import org.bukkit.event.player.PlayerItemHeldEvent;
 import org.bukkit.event.player.PlayerLoginEvent;
+import org.bukkit.event.player.PlayerMoveEvent;
 import org.bukkit.event.player.PlayerTeleportEvent;
+import org.bukkit.inventory.ItemStack;
+import org.jetbrains.annotations.NotNull;
 
 public class MovementValidator extends FreedomService
 {
 
-    public static final int MAX_XZ_COORD = 30000000;
+    public static final int MAX_XYZ_COORD = 29999998;
+    public static final int MAX_DISTANCE_TRAVELED = 100;
 
     public MovementValidator(TotalFreedomMod plugin)
     {
@@ -30,22 +46,147 @@ public class MovementValidator extends FreedomService
     public void onPlayerTeleport(PlayerTeleportEvent event)
     {
         // Check absolute value to account for negatives
-        if (Math.abs(event.getTo().getX()) >= MAX_XZ_COORD || Math.abs(event.getTo().getZ()) >= MAX_XZ_COORD)
+        if (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
         }
     }
 
+    @EventHandler(priority = EventPriority.HIGH)
+    public void onPlayerMove(PlayerMoveEvent event)
+    {
+        final Player player = event.getPlayer();
+        Location from = event.getFrom();
+        Location to = event.getTo();
+        if (to.getX() >= from.getX() + MAX_DISTANCE_TRAVELED || to.getY() >= from.getY() + MAX_DISTANCE_TRAVELED || to.getZ() >= from.getZ() + MAX_DISTANCE_TRAVELED)
+        {
+            event.setCancelled(true);
+            player.kickPlayer(ChatColor.RED + "You were moving too quickly!");
+        }
+        // Check absolute value to account for negatives
+        if (Math.abs(event.getTo().getX()) >= MAX_XYZ_COORD || Math.abs(event.getTo().getZ()) >= MAX_XYZ_COORD || Math.abs(event.getTo().getY()) >= MAX_XYZ_COORD)
+        {
+            event.setCancelled(true);
+            player.teleport(player.getWorld().getSpawnLocation());
+        }
+
+        if (exploitItem(event.getPlayer().getInventory().getHelmet()))
+        {
+            event.getPlayer().getInventory().setHelmet(new ItemStack(Material.AIR));
+            event.getPlayer().sendMessage(ChatColor.RED + "An item with both negative infinity and positive infinity attributes was cleared from your helmet slot.");
+            event.setCancelled(true);
+        }
+        if (exploitItem(event.getPlayer().getInventory().getBoots()))
+        {
+            event.getPlayer().getInventory().setBoots(new ItemStack(Material.AIR));
+            event.getPlayer().sendMessage(ChatColor.RED + "An item with both negative infinity and positive infinity attributes was cleared from your boots slot.");
+            event.setCancelled(true);
+        }
+        if (exploitItem(event.getPlayer().getInventory().getLeggings()))
+        {
+            event.getPlayer().getInventory().setLeggings(new ItemStack(Material.AIR));
+            event.getPlayer().sendMessage(ChatColor.RED + "An item with both negative infinity and positive infinity attributes was cleared from your leggings slot.");
+            event.setCancelled(true);
+        }
+        if (exploitItem(event.getPlayer().getInventory().getChestplate()))
+        {
+            event.getPlayer().getInventory().setChestplate(new ItemStack(Material.AIR));
+            event.getPlayer().sendMessage(ChatColor.RED + "An item with both negative infinity and positive infinity attributes was cleared from your chestplate slot.");
+            event.setCancelled(true);
+        }
+        if (exploitItem(event.getPlayer().getInventory().getItemInMainHand()))
+        {
+            event.getPlayer().getInventory().setItemInMainHand(new ItemStack(Material.AIR));
+            event.getPlayer().sendMessage(ChatColor.RED + "An item with both negative infinity and positive infinity attributes was cleared from your hand.");
+            event.setCancelled(true);
+        }
+        if (exploitItem(event.getPlayer().getInventory().getItemInOffHand()))
+        {
+            event.getPlayer().getInventory().setItemInOffHand(new ItemStack(Material.AIR));
+            event.getPlayer().sendMessage(ChatColor.RED + "An item with both negative infinity and positive infinity attributes was cleared from your offhand.");
+            event.setCancelled(true);
+        }
+    }
+
     @EventHandler(priority = EventPriority.HIGH)
     public void onPlayerLogin(PlayerLoginEvent event)
     {
         final Player player = event.getPlayer();
 
         // Validate position
-        if (Math.abs(player.getLocation().getX()) >= MAX_XZ_COORD || Math.abs(player.getLocation().getZ()) >= MAX_XZ_COORD)
+        if (Math.abs(player.getLocation().getX()) >= MAX_XYZ_COORD || Math.abs(player.getLocation().getZ()) >= MAX_XYZ_COORD || Math.abs(player.getLocation().getY()) >= MAX_XYZ_COORD)
         {
             player.teleport(player.getWorld().getSpawnLocation()); // Illegal position, teleport to spawn
         }
     }
 
+    @EventHandler
+    public void onPlayerHoldItem(PlayerItemHeldEvent event)
+    {
+        if (exploitItem(event.getPlayer().getInventory().getItemInMainHand()))
+        {
+            event.getPlayer().getInventory().setItemInMainHand(new ItemStack(Material.AIR));
+            event.getPlayer().sendMessage(ChatColor.RED + "An item with both negative infinity and positive infinity attributes was cleared from your hand.");
+        }
+        if (exploitItem(event.getPlayer().getInventory().getItemInOffHand()))
+        {
+            event.getPlayer().getInventory().setItemInOffHand(new ItemStack(Material.AIR));
+            event.getPlayer().sendMessage(ChatColor.RED + "An item with both negative infinity and positive infinity attributes was cleared from your offhand.");
+        }
+    }
+
+    private Boolean exploitItem(ItemStack item)
+    {
+        net.minecraft.server.v1_15_R1.ItemStack nmsStack = CraftItemStack.asNMSCopy(item);
+        NBTTagList modifiers = getAttributeList(nmsStack);
+        MojangsonCompound compound = new MojangsonCompound();
+        boolean foundNegative = false;
+        boolean foundPositive = false;
+        try
+        {
+            String mod = modifiers.toString();
+            String fancy = ("{" + (mod.substring(1, mod.length() - 1).replace("{", "").replace("}", "")) + "}");
+            compound.read(fancy);
+            for (String key : compound.keySet())
+            {
+                if (Objects.equals(key, "Amount")) //null-safe .equals()
+                {
+                    List<MojangsonValue> values = compound.get(key);
+                    for (MojangsonValue val : values)
+                    {
+                        if (val.getValue().toString().equals("Infinityd"))
+                        {
+                            foundPositive = true;
+                        }
+                        if (val.getValue().toString().equals("-Infinityd"))
+                        {
+                            foundNegative = true;
+                        }
+                    }
+                }
+            }
+        }
+        catch (MojangsonParseException e)
+        {
+            e.printStackTrace();
+        }
+        return foundNegative && foundPositive;
+    }
+
+
+    private NBTTagList getAttributeList(net.minecraft.server.v1_15_R1.ItemStack stack)
+    {
+        if (stack.getTag() == null)
+        {
+            stack.setTag(new NBTTagCompound());
+        }
+        NBTTagList attr = stack.getTag().getList("AttributeModifiers", 10);
+        if (attr == null)
+        {
+            stack.getTag().set("AttributeModifiers", new NBTTagList());
+        }
+        return stack.getTag().getList("AttributeModifiers", 10);
+    }
 }
+
+

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

@@ -1,25 +1,27 @@
 package me.totalfreedom.totalfreedommod;
 
+import java.util.ArrayList;
 import java.util.Arrays;
 import java.util.List;
-import java.util.regex.Pattern;
 import me.totalfreedom.totalfreedommod.config.ConfigEntry;
 import me.totalfreedom.totalfreedommod.player.FPlayer;
 import me.totalfreedom.totalfreedommod.util.FLog;
 import me.totalfreedom.totalfreedommod.util.FSync;
-import org.apache.commons.lang3.StringUtils;
+import org.apache.commons.lang.StringUtils;
 import org.bukkit.ChatColor;
+import org.bukkit.command.Command;
 import org.bukkit.entity.Player;
 import org.bukkit.event.EventHandler;
 import org.bukkit.event.EventPriority;
 import org.bukkit.event.player.AsyncPlayerChatEvent;
 import org.bukkit.event.player.PlayerCommandPreprocessEvent;
+import org.bukkit.event.player.PlayerJoinEvent;
 
 public class Muter extends FreedomService
 {
 
-    // TODO: Match actual commands
-    public static final List<String> MUTE_COMMANDS = Arrays.asList(StringUtils.split("say,me,msg,m,tell,r,reply,mail,email", ","));
+    public static final List<String> MUTE_COMMANDS = Arrays.asList(StringUtils.split("say,me,msg,tell,reply,mail", ","));
+    public final List<String> MUTED_PLAYERS = new ArrayList();
 
     public Muter(TotalFreedomMod plugin)
     {
@@ -39,16 +41,26 @@ public class Muter extends FreedomService
     @EventHandler(priority = EventPriority.LOW)
     public void onAsyncPlayerChatEvent(AsyncPlayerChatEvent event)
     {
-        FPlayer fPlayer = plugin.pl.getPlayerSync(event.getPlayer());
+        Player player = event.getPlayer();
+
+        FPlayer fPlayer = plugin.pl.getPlayerSync(player);
 
         if (!fPlayer.isMuted())
         {
             return;
         }
 
-        if (plugin.al.isAdminSync(event.getPlayer()))
+        if (plugin.al.isAdminSync(player))
         {
             fPlayer.setMuted(false);
+            MUTED_PLAYERS.remove(player.getName());
+            return;
+        }
+
+        if (fPlayer.isQuietMuted())
+        {
+            FSync.playerMsg(event.getPlayer(), event.getFormat());
+            event.setCancelled(true);
             return;
         }
 
@@ -69,28 +81,50 @@ public class Muter extends FreedomService
             return;
         }
 
-        String command = event.getMessage();
+        String message = event.getMessage();
         if (plugin.al.isAdmin(player))
         {
             fPlayer.setMuted(false);
             return;
         }
 
-        // TODO: Find match actual command, instead of label
-        for (String commandName : MUTE_COMMANDS)
+        String cmdName = message.split(" ")[0].toLowerCase();
+        if (cmdName.startsWith("/"))
         {
-            if (Pattern.compile("^/" + commandName.toLowerCase() + " ").matcher(command.toLowerCase()).find())
-            {
-                player.sendMessage(ChatColor.RED + "That command is blocked while you are muted.");
-                event.setCancelled(true);
-                return;
-            }
+            cmdName = cmdName.substring(1);
         }
 
+        Command command = server.getPluginCommand(cmdName);
+        if (command != null)
+        {
+            cmdName = command.getName().toLowerCase();
+        }
+
+        if (MUTE_COMMANDS.contains(cmdName))
+        {
+            player.sendMessage(ChatColor.RED + "That command is blocked while you are muted.");
+            event.setCancelled(true);
+            return;
+        }
+
+        // TODO: Should this go here?
         if (ConfigEntry.ENABLE_PREPROCESS_LOG.getBoolean())
         {
-            FLog.info(String.format("[PREPROCESS_COMMAND] %s(%s): %s", player.getName(), ChatColor.stripColor(player.getDisplayName()), command), true);
+            FLog.info(String.format("[PREPROCESS_COMMAND] %s(%s): %s", player.getName(), ChatColor.stripColor(player.getDisplayName()), message), true);
         }
     }
 
+    @EventHandler(priority = EventPriority.LOW)
+    public void onPlayerJoin(PlayerJoinEvent event)
+    {
+        Player player = event.getPlayer();
+        FPlayer playerdata = plugin.pl.getPlayer(player);
+
+        if (MUTED_PLAYERS.contains(player.getName()))
+        {
+            playerdata.setMuted(true);
+        }
+    }
+
+
 }

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

@@ -45,7 +45,7 @@ public class ProtectArea extends FreedomService
             return;
         }
 
-        File input = new File(TotalFreedomMod.plugin.getDataFolder(), DATA_FILENAME);
+        File input = new File(plugin.getDataFolder(), DATA_FILENAME);
         try
         {
             if (input.exists())
@@ -53,7 +53,7 @@ public class ProtectArea extends FreedomService
                 FileInputStream fis = new FileInputStream(input);
                 ObjectInputStream ois = new ObjectInputStream(fis);
                 areas.clear();
-                areas.putAll((HashMap<String, SerializableProtectedRegion>) ois.readObject());
+                areas.putAll((HashMap<String, SerializableProtectedRegion>)ois.readObject());
                 ois.close();
                 fis.close();
             }
@@ -77,7 +77,7 @@ public class ProtectArea extends FreedomService
     {
         try
         {
-            FileOutputStream fos = new FileOutputStream(new File(TotalFreedomMod.plugin.getDataFolder(), DATA_FILENAME));
+            FileOutputStream fos = new FileOutputStream(new File(plugin.getDataFolder(), DATA_FILENAME));
             ObjectOutputStream oos = new ObjectOutputStream(fos);
             oos.writeObject(areas);
             oos.close();

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

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

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

@@ -4,16 +4,15 @@ 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_9_R1.EntityPlayer;
-import net.minecraft.server.v1_9_R1.MinecraftServer;
-import net.minecraft.server.v1_9_R1.PropertyManager;
+import net.minecraft.server.v1_15_R1.EntityPlayer;
+import net.minecraft.server.v1_15_R1.MinecraftServer;
 import org.bukkit.Bukkit;
-import org.bukkit.craftbukkit.v1_9_R1.CraftServer;
+import org.bukkit.craftbukkit.v1_15_R1.CraftServer;
 
 public class ServerInterface extends FreedomService
 {
 
-    public static final String COMPILE_NMS_VERSION = "v1_9_R1";
+    public static final String COMPILE_NMS_VERSION = "v1_15_R1";
 
     public ServerInterface(TotalFreedomMod plugin)
     {
@@ -32,7 +31,7 @@ public class ServerInterface extends FreedomService
 
     public static void warnVersion()
     {
-        final String nms = FUtil.getNmsVersion();
+        final String nms = FUtil.getNMSVersion();
 
         if (!COMPILE_NMS_VERSION.equals(nms))
         {
@@ -43,9 +42,7 @@ public class ServerInterface extends FreedomService
 
     public void setOnlineMode(boolean mode)
     {
-        final PropertyManager manager = getServer().getPropertyManager();
-        manager.setProperty("online-mode", mode);
-        manager.savePropertiesFile();
+        getServer().setOnlineMode(mode);
     }
 
     public int purgeWhitelist()
@@ -86,7 +83,7 @@ public class ServerInterface extends FreedomService
 
     private MinecraftServer getServer()
     {
-        return ((CraftServer) Bukkit.getServer()).getServer();
+        return ((CraftServer)Bukkit.getServer()).getServer();
     }
 
 }

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

@@ -3,7 +3,6 @@ package me.totalfreedom.totalfreedommod;
 import me.totalfreedom.totalfreedommod.config.ConfigEntry;
 import me.totalfreedom.totalfreedommod.util.FUtil;
 import org.bukkit.Bukkit;
-import org.bukkit.ChatColor;
 import org.bukkit.event.EventHandler;
 import org.bukkit.event.EventPriority;
 import org.bukkit.event.server.ServerListPingEvent;
@@ -33,44 +32,52 @@ public class ServerPing extends FreedomService
 
         if (plugin.bm.isIpBanned(ip))
         {
-            event.setMotd(ChatColor.RED + "You are banned.");
+            event.setMotd(FUtil.colorize(ConfigEntry.SERVER_BAN_MOTD.getString()));
             return;
         }
 
         if (ConfigEntry.ADMIN_ONLY_MODE.getBoolean())
         {
-            event.setMotd(ChatColor.RED + "Server is closed.");
+            event.setMotd(FUtil.colorize(ConfigEntry.SERVER_ADMINMODE_MOTD.getString()));
+            return;
+        }
+
+        if (LoginProcess.isLockdownEnabled())
+        {
+            event.setMotd(FUtil.colorize(ConfigEntry.SERVER_LOCKDOWN_MOTD.getString()));
             return;
         }
 
         if (Bukkit.hasWhitelist())
         {
-            event.setMotd(ChatColor.RED + "Whitelist enabled.");
+            event.setMotd(FUtil.colorize(ConfigEntry.SERVER_WHITELIST_MOTD.getString()));
             return;
         }
 
         if (Bukkit.getOnlinePlayers().size() >= Bukkit.getMaxPlayers())
         {
-            event.setMotd(ChatColor.RED + "Server is full.");
+            event.setMotd(FUtil.colorize(ConfigEntry.SERVER_FULL_MOTD.getString()));
             return;
         }
 
+        String baseMotd = ConfigEntry.SERVER_MOTD.getString().replace("%mcversion%", plugin.si.getVersion());
+        baseMotd = baseMotd.replace("\\n", "\n");
+        baseMotd = FUtil.colorize(baseMotd);
+
         if (!ConfigEntry.SERVER_COLORFUL_MOTD.getBoolean())
         {
-            event.setMotd(FUtil.colorize(ConfigEntry.SERVER_MOTD.getString()
-                    .replace("%mcversion%", plugin.si.getVersion())));
+            event.setMotd(baseMotd);
             return;
         }
 
         // Colorful MOTD
         final StringBuilder motd = new StringBuilder();
-
-        for (String word : ConfigEntry.SERVER_MOTD.getString().replace("%mcversion%", plugin.si.getVersion()).split(" "))
+        for (String word : baseMotd.split(" "))
         {
             motd.append(FUtil.randomChatColor()).append(word).append(" ");
         }
 
-        event.setMotd(FUtil.colorize(motd.toString()));
+        event.setMotd(motd.toString().trim());
     }
 
 }

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

@@ -1,236 +0,0 @@
-package me.totalfreedom.totalfreedommod;
-
-import com.google.common.collect.Maps;
-import java.io.BufferedReader;
-import java.io.InputStreamReader;
-import java.net.MalformedURLException;
-import java.net.URL;
-import java.util.ArrayList;
-import java.util.Date;
-import java.util.Iterator;
-import java.util.List;
-import java.util.Map;
-import java.util.Map.Entry;
-import lombok.Getter;
-import lombok.Setter;
-import me.totalfreedom.totalfreedommod.config.ConfigEntry;
-import me.totalfreedom.totalfreedommod.util.FLog;
-import me.totalfreedom.totalfreedommod.util.FUtil;
-import org.bukkit.ChatColor;
-import org.bukkit.scheduler.BukkitRunnable;
-import org.bukkit.scheduler.BukkitTask;
-import org.json.simple.JSONArray;
-import org.json.simple.JSONObject;
-import org.json.simple.JSONValue;
-
-public class ServiceChecker extends FreedomService
-{
-
-    public static final long SERVICE_CHECKER_RATE = 120L;
-
-    @Getter
-    private final Map<String, ServiceStatus> services = Maps.newHashMap();
-    //
-    private BukkitTask task;
-    private URL url = null;
-    @Getter
-    private String lastCheck = "Never";
-    @Getter
-    private String version = "Mojang";
-
-    public ServiceChecker(TotalFreedomMod plugin)
-    {
-        super(plugin);
-
-        services.put("minecraft.net", new ServiceStatus("Minecraft.net"));
-        services.put("account.mojang.com", new ServiceStatus("Mojang Account Website"));
-        services.put("authserver.mojang.com", new ServiceStatus("Mojang Authentication"));
-        services.put("sessionserver.mojang.com", new ServiceStatus("Mojang Multiplayer sessions"));
-        services.put("skins.minecraft.net", new ServiceStatus("Minecraft Skins"));
-        services.put("auth.mojang.com", new ServiceStatus("Mojang Authentiation (Legacy)"));
-        services.put("session.minecraft.net", new ServiceStatus("Minecraft Sessions (Legacy)"));
-    }
-
-    @Override
-    protected void onStart()
-    {
-        final String serviceCheckerURL = ConfigEntry.SERVICE_CHECKER_URL.getString();
-
-        if (serviceCheckerURL == null || serviceCheckerURL.isEmpty())
-        {
-            return;
-        }
-
-        try
-        {
-            url = new URL(serviceCheckerURL);
-        }
-        catch (MalformedURLException ex)
-        {
-            FLog.severe("Invalid ServiceChecker URL, disabling service checker");
-            return;
-        }
-
-        task = getUpdateRunnable().runTaskTimerAsynchronously(TotalFreedomMod.plugin, 40L, SERVICE_CHECKER_RATE * 20L);
-    }
-
-    @Override
-    protected void onStop()
-    {
-        try
-        {
-            task.cancel();
-        }
-        catch (Exception ex)
-        {
-        }
-        finally
-        {
-            task = null;
-        }
-    }
-
-    public BukkitRunnable getUpdateRunnable()
-    {
-        return new BukkitRunnable()
-        {
-            @Override
-            public void run()
-            {
-                if (url == null)
-                {
-                    return;
-                }
-
-                final JSONArray statusJson;
-                try
-                {
-                    final BufferedReader in = new BufferedReader(new InputStreamReader(url.openStream()));
-                    statusJson = (JSONArray) JSONValue.parse(in.readLine());
-                    in.close();
-                }
-                catch (Exception ex)
-                {
-                    FLog.severe("Error updating mojang services from " + url);
-                    FLog.severe(ex);
-                    return;
-                }
-
-                final Iterator status = statusJson.iterator();
-                while (status.hasNext())
-                {
-                    final Iterator serviceIt = ((JSONObject) status.next()).entrySet().iterator();
-                    while (serviceIt.hasNext())
-                    {
-                        @SuppressWarnings("unchecked")
-                        final Entry<String, String> pair = (Entry<String, String>) serviceIt.next();
-
-                        if ("lastcheck".equals(pair.getKey()))
-                        {
-                            lastCheck = pair.getValue();
-                            continue;
-                        }
-
-                        if ("version".equals(pair.getKey()))
-                        {
-                            version = pair.getValue();
-                            continue;
-                        }
-
-                        final ServiceStatus service = services.get(pair.getKey());
-                        if (service == null)
-                        {
-                            continue;
-                        }
-
-                        if (pair.getValue().contains(":"))
-                        {
-                            String[] statusString = pair.getValue().split(":");
-                            service.setColor(statusString[0]);
-                            service.setMessage(statusString[1]);
-                            service.setUptime(statusString[2]);
-                        }
-                        else
-                        {
-                            service.setColor(pair.getValue());
-                            service.setMessage(("red".equals(pair.getValue()) ? "Offline" : ("yellow".equals(pair.getValue()) ? "Problem" : "Online")));
-                        }
-                    }
-                }
-                if (lastCheck.equals("Unknown"))
-                {
-                    lastCheck = FUtil.dateToString(new Date());
-                }
-            }
-        };
-    }
-
-    public List<ServiceStatus> getAllStatuses()
-    {
-        List<ServiceStatus> servicesList = new ArrayList<>();
-        for (String key : services.keySet())
-        {
-            servicesList.add(services.get(key));
-        }
-        return servicesList;
-    }
-
-    public class ServiceStatus
-    {
-
-        @Getter
-        private final String name;
-        @Getter
-        @Setter
-        private String uptime = "100.0"; // skins.minecraft.net, minecraft.net, etc..
-        @Getter
-        private ChatColor color = ChatColor.DARK_GREEN;
-        @Getter
-        @Setter
-        private String message = "Online"; // Online, Offline, Quite Slow, 404 Error, 500 Error, etc..
-
-        public ServiceStatus(String name)
-        {
-            this.name = name;
-        }
-
-        public float getUptimeFloat()
-        {
-            return Float.parseFloat(uptime);
-        }
-
-        public ChatColor getUptimeColor()
-        {
-            return (getUptimeFloat() > 95 ? ChatColor.GREEN : (getUptimeFloat() > 90 ? ChatColor.GOLD : ChatColor.RED));
-        }
-
-        public String getFormattedStatus()
-        {
-            String status = ChatColor.BLUE + "- " + ChatColor.GRAY + name + ChatColor.WHITE + ": " + color + message + ChatColor.WHITE;
-
-            if (!version.contains("Mojang"))
-            {
-                status += " (" + getUptimeColor() + getUptime() + ChatColor.WHITE + "%)";
-            }
-
-            return status;
-        }
-
-        public void setColor(String color)
-        {
-            if ("green".equals(color))
-            {
-                this.color = ChatColor.DARK_GREEN;
-            }
-            else if ("yellow".equals(color))
-            {
-                this.color = ChatColor.YELLOW;
-            }
-            else
-            {
-                this.color = ChatColor.RED;
-            }
-        }
-    }
-
-}

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

@@ -1,38 +1,67 @@
 package me.totalfreedom.totalfreedommod;
 
 import java.io.File;
-import java.io.IOException;
 import java.io.InputStream;
 import java.util.Properties;
+import me.totalfreedom.totalfreedommod.admin.ActivityLog;
 import me.totalfreedom.totalfreedommod.admin.AdminList;
+import me.totalfreedom.totalfreedommod.amp.AMP;
 import me.totalfreedom.totalfreedommod.banning.BanManager;
 import me.totalfreedom.totalfreedommod.banning.PermbanList;
+import me.totalfreedom.totalfreedommod.banning.VPNBanList;
 import me.totalfreedom.totalfreedommod.blocking.BlockBlocker;
+import me.totalfreedom.totalfreedommod.blocking.EditBlocker;
 import me.totalfreedom.totalfreedommod.blocking.EventBlocker;
 import me.totalfreedom.totalfreedommod.blocking.InteractBlocker;
 import me.totalfreedom.totalfreedommod.blocking.MobBlocker;
+import me.totalfreedom.totalfreedommod.blocking.PVPBlocker;
+import me.totalfreedom.totalfreedommod.blocking.PotionBlocker;
+import me.totalfreedom.totalfreedommod.blocking.SignBlocker;
 import me.totalfreedom.totalfreedommod.blocking.command.CommandBlocker;
 import me.totalfreedom.totalfreedommod.bridge.BukkitTelnetBridge;
+import me.totalfreedom.totalfreedommod.bridge.CoreProtectBridge;
 import me.totalfreedom.totalfreedommod.bridge.EssentialsBridge;
+import me.totalfreedom.totalfreedommod.bridge.LibsDisguisesBridge;
 import me.totalfreedom.totalfreedommod.bridge.WorldEditBridge;
+import me.totalfreedom.totalfreedommod.bridge.WorldGuardBridge;
 import me.totalfreedom.totalfreedommod.caging.Cager;
 import me.totalfreedom.totalfreedommod.command.CommandLoader;
+import me.totalfreedom.totalfreedommod.config.MainConfig;
+import me.totalfreedom.totalfreedommod.discord.Discord;
 import me.totalfreedom.totalfreedommod.freeze.Freezer;
+import me.totalfreedom.totalfreedommod.fun.CurseListener;
 import me.totalfreedom.totalfreedommod.fun.ItemFun;
 import me.totalfreedom.totalfreedommod.fun.Jumppads;
 import me.totalfreedom.totalfreedommod.fun.Landminer;
 import me.totalfreedom.totalfreedommod.fun.MP44;
+import me.totalfreedom.totalfreedommod.fun.MobStacker;
+import me.totalfreedom.totalfreedommod.fun.RealTimer;
+import me.totalfreedom.totalfreedommod.fun.Trailer;
 import me.totalfreedom.totalfreedommod.httpd.HTTPDaemon;
+import me.totalfreedom.totalfreedommod.masterbuilder.MasterBuilder;
+import me.totalfreedom.totalfreedommod.masterbuilder.MasterBuilderList;
+import me.totalfreedom.totalfreedommod.masterbuilder.MasterBuilderWorldRestrictions;
+import me.totalfreedom.totalfreedommod.permissions.PermissionConfig;
+import me.totalfreedom.totalfreedommod.permissions.PermissionManager;
 import me.totalfreedom.totalfreedommod.player.PlayerList;
+import me.totalfreedom.totalfreedommod.playerverification.PlayerVerification;
+import me.totalfreedom.totalfreedommod.punishments.PunishmentList;
 import me.totalfreedom.totalfreedommod.rank.RankManager;
 import me.totalfreedom.totalfreedommod.rollback.RollbackManager;
+import me.totalfreedom.totalfreedommod.shop.Shop;
 import me.totalfreedom.totalfreedommod.util.FLog;
 import me.totalfreedom.totalfreedommod.util.FUtil;
+import me.totalfreedom.totalfreedommod.util.MethodTimer;
+import me.totalfreedom.totalfreedommod.world.CleanroomChunkGenerator;
 import me.totalfreedom.totalfreedommod.world.WorldManager;
 import net.pravian.aero.component.service.ServiceManager;
 import net.pravian.aero.plugin.AeroPlugin;
+import org.bstats.Metrics;
+import org.bukkit.Bukkit;
+import org.bukkit.generator.ChunkGenerator;
+import org.bukkit.plugin.Plugin;
 import org.bukkit.scheduler.BukkitRunnable;
-import org.mcstats.Metrics;
+import org.spigotmc.SpigotConfig;
 
 public class TotalFreedomMod extends AeroPlugin<TotalFreedomMod>
 {
@@ -41,81 +70,103 @@ public class TotalFreedomMod extends AeroPlugin<TotalFreedomMod>
     //
     public static final BuildProperties build = new BuildProperties();
     //
-    @SuppressWarnings("FieldNameHidesFieldInSuperclass")
-    public static TotalFreedomMod plugin;
     public static String pluginName;
     public static String pluginVersion;
     //
+    public MainConfig config;
+    public PermissionConfig permissions;
+    //
     // Services
     public ServiceManager<TotalFreedomMod> services;
     public ServerInterface si;
+    public SavedFlags sf;
     public WorldManager wm;
+    public LogViewer lv;
     public AdminList al;
+    public ActivityLog acl;
+    public RankManager rm;
+    public CommandLoader cl;
+    public CommandBlocker cb;
     public EventBlocker eb;
     public BlockBlocker bb;
     public MobBlocker mb;
     public InteractBlocker ib;
+    public PotionBlocker pb;
     public LoginProcess lp;
     public AntiNuke nu;
     public AntiSpam as;
-    public RankManager rm;
     public PlayerList pl;
-    public CommandLoader cl;
-    public CommandBlocker cb;
+    public Shop sh;
     public Announcer an;
     public ChatManager cm;
+    public Discord dc;
+    public PunishmentList pul;
     public BanManager bm;
-    public PermbanList pb;
+    public PermbanList pm;
+    public PermissionManager pem;
+    public VPNBanList vn;
     public ProtectArea pa;
-    public ServiceChecker sc;
     public GameRuleHandler gr;
     public RollbackManager rb;
     public CommandSpy cs;
     public Cager ca;
     public Freezer fm;
+    public EditBlocker ebl;
+    public PVPBlocker pbl;
     public Orbiter or;
     public Muter mu;
     public Fuckoff fo;
     public AutoKick ak;
+    public AutoEject ae;
+    public Monitors mo;
     public MovementValidator mv;
-    public EntityWiper ew;
-    public FrontDoor fd;
     public ServerPing sp;
+    public CurseListener cul;
     public ItemFun it;
     public Landminer lm;
+    public MobStacker ms;
     public MP44 mp;
     public Jumppads jp;
+    public Trailer tr;
     public HTTPDaemon hd;
+    public MasterBuilderList mbl;
+    public MasterBuilderWorldRestrictions mbwr;
+    public SignBlocker snp;
+    public PlayerVerification pv;
+    public EntityWiper ew;
+    public RealTimer rt;
+    //public HubWorldRestrictions hwr;
     //
     // Bridges
     public ServiceManager<TotalFreedomMod> bridges;
     public BukkitTelnetBridge btb;
     public EssentialsBridge esb;
+    public LibsDisguisesBridge ldb;
+    public CoreProtectBridge cpb;
     public WorldEditBridge web;
+    public WorldGuardBridge wgb;
+    public AMP amp;
 
     @Override
     public void load()
     {
-        TotalFreedomMod.plugin = this;
         TotalFreedomMod.pluginName = plugin.getDescription().getName();
         TotalFreedomMod.pluginVersion = plugin.getDescription().getVersion();
 
         FLog.setPluginLogger(plugin.getLogger());
         FLog.setServerLogger(server.getLogger());
 
-        build.load();
+        build.load(plugin);
     }
 
     @Override
     public void enable()
     {
-        TotalFreedomMod.plugin = this;
-
         FLog.info("Created by Madgeek1450 and Prozza");
-        FLog.info("Version " + build.formattedVersion());
+        FLog.info("Version " + build.version);
         FLog.info("Compiled " + build.date + " by " + build.author);
 
-        final FUtil.MethodTimer timer = new FUtil.MethodTimer();
+        final MethodTimer timer = new MethodTimer();
         timer.start();
 
         // Warn if we're running on a wrong version
@@ -125,37 +176,57 @@ public class TotalFreedomMod extends AeroPlugin<TotalFreedomMod>
         FUtil.deleteCoreDumps();
         FUtil.deleteFolder(new File("./_deleteme"));
 
-        // Convert old config files
-        new ConfigConverter(plugin).convert();
+        BackupManager backups = new BackupManager(this);
+        backups.createBackups(TotalFreedomMod.CONFIG_FILENAME, true);
+        backups.createBackups(AdminList.CONFIG_FILENAME);
+        backups.createBackups(PermbanList.CONFIG_FILENAME);
+        backups.createBackups(PermissionConfig.PERMISSIONS_FILENAME, true);
+        backups.createBackups(VPNBanList.CONFIG_FILENAME);
+        backups.createBackups(MasterBuilder.CONFIG_FILENAME);
+        backups.createBackups(PunishmentList.CONFIG_FILENAME);
 
-        FUtil.createBackups(TotalFreedomMod.CONFIG_FILENAME, true);
-        FUtil.createBackups(AdminList.CONFIG_FILENAME);
-        FUtil.createBackups(PermbanList.CONFIG_FILENAME);
+        config = new MainConfig(this);
+        config.load();
+
+        permissions = new PermissionConfig(this);
+        permissions.load();
 
         // Start services
         services = new ServiceManager<>(plugin);
         si = services.registerService(ServerInterface.class);
+        sf = services.registerService(SavedFlags.class);
         wm = services.registerService(WorldManager.class);
+        lv = services.registerService(LogViewer.class);
         al = services.registerService(AdminList.class);
+        acl = services.registerService(ActivityLog.class);
+        rm = services.registerService(RankManager.class);
+        cl = services.registerService(CommandLoader.class);
+        cb = services.registerService(CommandBlocker.class);
         eb = services.registerService(EventBlocker.class);
         bb = services.registerService(BlockBlocker.class);
         mb = services.registerService(MobBlocker.class);
         ib = services.registerService(InteractBlocker.class);
+        pb = services.registerService(PotionBlocker.class);
         lp = services.registerService(LoginProcess.class);
         nu = services.registerService(AntiNuke.class);
         as = services.registerService(AntiSpam.class);
-        rm = services.registerService(RankManager.class);
-
+        mbl = services.registerService(MasterBuilderList.class);
+        mbwr = services.registerService(MasterBuilderWorldRestrictions.class);
+        //hwr = services.registerService(HubWorldRestrictions.class);
         pl = services.registerService(PlayerList.class);
-        cl = services.registerService(CommandLoader.class);
-        cb = services.registerService(CommandBlocker.class);
+        sh = services.registerService(Shop.class);
         an = services.registerService(Announcer.class);
         cm = services.registerService(ChatManager.class);
+        dc = services.registerService(Discord.class);
+        pul = services.registerService(PunishmentList.class);
         bm = services.registerService(BanManager.class);
-        pb = services.registerService(PermbanList.class);
+        pm = services.registerService(PermbanList.class);
+        pem = services.registerService(PermissionManager.class);
+        vn = services.registerService(VPNBanList.class);
         pa = services.registerService(ProtectArea.class);
-        sc = services.registerService(ServiceChecker.class);
         gr = services.registerService(GameRuleHandler.class);
+        snp = services.registerService(SignBlocker.class);
+        ew = services.registerService(EntityWiper.class);
 
         // Single admin utils
         rb = services.registerService(RollbackManager.class);
@@ -164,19 +235,27 @@ public class TotalFreedomMod extends AeroPlugin<TotalFreedomMod>
         fm = services.registerService(Freezer.class);
         or = services.registerService(Orbiter.class);
         mu = services.registerService(Muter.class);
+        ebl = services.registerService(EditBlocker.class);
+        pbl = services.registerService(PVPBlocker.class);
         fo = services.registerService(Fuckoff.class);
         ak = services.registerService(AutoKick.class);
+        ae = services.registerService(AutoEject.class);
+        mo = services.registerService(Monitors.class);
+
 
         mv = services.registerService(MovementValidator.class);
-        ew = services.registerService(EntityWiper.class);
-        fd = services.registerService(FrontDoor.class);
         sp = services.registerService(ServerPing.class);
+        pv = services.registerService(PlayerVerification.class);
 
         // Fun
+        cul = services.registerService(CurseListener.class);
         it = services.registerService(ItemFun.class);
         lm = services.registerService(Landminer.class);
+        ms = services.registerService(MobStacker.class);
         mp = services.registerService(MP44.class);
         jp = services.registerService(Jumppads.class);
+        tr = services.registerService(Trailer.class);
+        rt = services.registerService(RealTimer.class);
 
         // HTTPD
         hd = services.registerService(HTTPDaemon.class);
@@ -185,23 +264,19 @@ public class TotalFreedomMod extends AeroPlugin<TotalFreedomMod>
         // Start bridges
         bridges = new ServiceManager<>(plugin);
         btb = bridges.registerService(BukkitTelnetBridge.class);
+        cpb = bridges.registerService(CoreProtectBridge.class);
         esb = bridges.registerService(EssentialsBridge.class);
+        ldb = bridges.registerService(LibsDisguisesBridge.class);
         web = bridges.registerService(WorldEditBridge.class);
+        wgb = bridges.registerService(WorldGuardBridge.class);
+        amp = bridges.registerService(AMP.class);
         bridges.start();
 
         timer.update();
         FLog.info("Version " + pluginVersion + " for " + ServerInterface.COMPILE_NMS_VERSION + " enabled in " + timer.getTotal() + "ms");
 
-        // Metrics @ http://mcstats.org/plugin/TotalFreedomMod
-        try
-        {
-            final Metrics metrics = new Metrics(plugin);
-            metrics.start();
-        }
-        catch (IOException ex)
-        {
-            FLog.warning("Failed to submit metrics data: " + ex.getMessage());
-        }
+        // Metrics @ https://bstats.org/plugin/bukkit/TotalFreedomMod
+        new Metrics(this);
 
         // Add spawnpoints later - https://github.com/TotalFreedom/TotalFreedomMod/issues/438
         new BukkitRunnable()
@@ -212,6 +287,8 @@ public class TotalFreedomMod extends AeroPlugin<TotalFreedomMod>
                 plugin.pa.autoAddSpawnpoints();
             }
         }.runTaskLater(plugin, 60L);
+        // little workaround to stop spigot from autorestarting - causing AMP to detach from process.
+        SpigotConfig.config.set("settings.restart-on-crash", false);
     }
 
     @Override
@@ -224,37 +301,41 @@ public class TotalFreedomMod extends AeroPlugin<TotalFreedomMod>
         server.getScheduler().cancelTasks(plugin);
 
         FLog.info("Plugin disabled");
-        TotalFreedomMod.plugin = null;
     }
 
     public static class BuildProperties
     {
 
         public String author;
+        public String codename;
         public String version;
         public String number;
         public String date;
         public String head;
 
-        public void load()
+        public void load(TotalFreedomMod plugin)
         {
             try
             {
-                final InputStream in = plugin.getResource("build.properties");
+                final Properties props;
 
-                final Properties props = new Properties();
-                props.load(in);
-                in.close();
+                try (InputStream in = plugin.getResource("build.properties"))
+                {
+                    props = new Properties();
+                    props.load(in);
+                }
 
-                author = props.getProperty("program.build.author", "unknown");
-                version = props.getProperty("program.build.version", "unknown");
-                number = props.getProperty("program.build.number", "1");
-                date = props.getProperty("program.build.date", "unknown");
-                head = props.getProperty("program.build.head", "unknown");
+                author = props.getProperty("buildAuthor", "unknown");
+                codename = props.getProperty("buildCodeName", "unknown");
+                version = props.getProperty("buildVersion", pluginVersion);
+                number = props.getProperty("buildNumber", "1");
+                date = props.getProperty("buildDate", "unknown");
+                // Need to do this or it will display ${git.commit.id.abbrev}
+                head = props.getProperty("buildHead", "unknown").replace("${git.commit.id.abbrev}", "unknown");
             }
             catch (Exception ex)
             {
-                FLog.severe("Could not load build properties! Did you compile with Netbeans/ANT?");
+                FLog.severe("Could not load build properties! Did you compile with NetBeans/Maven?");
                 FLog.severe(ex);
             }
         }
@@ -265,4 +346,21 @@ public class TotalFreedomMod extends AeroPlugin<TotalFreedomMod>
         }
     }
 
+    public static TotalFreedomMod plugin()
+    {
+        for (Plugin plugin : Bukkit.getPluginManager().getPlugins())
+        {
+            if (plugin.getName().equalsIgnoreCase(pluginName))
+            {
+                return (TotalFreedomMod)plugin;
+            }
+        }
+        return null;
+    }
+
+    @Override
+    public ChunkGenerator getDefaultWorldGenerator(String worldName, String id)
+    {
+        return new CleanroomChunkGenerator(id);
+    }
 }

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

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

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

@@ -0,0 +1,130 @@
+package me.totalfreedom.totalfreedommod.admin;
+
+import com.google.common.collect.Lists;
+import java.time.Instant;
+import java.util.Date;
+import java.util.List;
+import lombok.Getter;
+import lombok.Setter;
+import me.totalfreedom.totalfreedommod.util.FUtil;
+import net.pravian.aero.base.ConfigLoadable;
+import net.pravian.aero.base.ConfigSavable;
+import net.pravian.aero.base.Validatable;
+import org.apache.commons.lang.Validate;
+import org.bukkit.configuration.ConfigurationSection;
+import org.bukkit.entity.Player;
+
+public class ActivityLogEntry implements ConfigLoadable, ConfigSavable, Validatable
+{
+
+    @Getter
+    private String configKey;
+    @Getter
+    @Setter
+    private String name;
+    @Getter
+    private final List<String> ips = Lists.newArrayList();
+    @Getter
+    @Setter
+    private List<String> timestamps = Lists.newArrayList();
+    @Getter
+    @Setter
+    private List<String> durations = Lists.newArrayList();
+
+    public static final String FILENAME = "activitylog.yml";
+
+    public ActivityLogEntry(Player player)
+    {
+        this.configKey = player.getName().toLowerCase();
+        this.name = player.getName();
+    }
+
+    public ActivityLogEntry(String configKey)
+    {
+        this.configKey = configKey;
+    }
+
+    public void loadFrom(Player player)
+    {
+        configKey = player.getName().toLowerCase();
+        name = player.getName();
+    }
+
+    @Override
+    public void loadFrom(ConfigurationSection cs)
+    {
+        name = cs.getString("username", configKey);
+        ips.clear();
+        ips.addAll(cs.getStringList("ips"));
+        timestamps.clear();
+        timestamps.addAll(cs.getStringList("timestamps"));
+        durations.clear();
+        durations.addAll(cs.getStringList("durations"));
+    }
+
+    @Override
+    public void saveTo(ConfigurationSection cs)
+    {
+        Validate.isTrue(isValid(), "Could not save activity entry: " + name + ". Entry not valid!");
+        cs.set("username", name);
+        cs.set("ips", Lists.newArrayList(ips));
+        cs.set("timestamps", Lists.newArrayList(timestamps));
+        cs.set("durations", Lists.newArrayList(durations));
+    }
+
+    public void addLogin()
+    {
+        Date currentTime = Date.from(Instant.now());
+        timestamps.add("Login: " + FUtil.dateToString(currentTime));
+    }
+    public void addLogout()
+    {
+        String lastLoginString = timestamps.get(timestamps.size() - 1);
+        Date currentTime = Date.from(Instant.now());
+        timestamps.add("Logout: " + FUtil.dateToString(currentTime));
+        lastLoginString = lastLoginString.replace("Login: ", "");
+        Date lastLogin = FUtil.stringToDate(lastLoginString);
+
+        long duration = currentTime.getTime() - lastLogin.getTime();
+        long seconds = duration / 1000 % 60;
+        long minutes = duration / (60 * 1000) % 60;
+        long hours = duration / (60 * 60 * 1000);
+        durations.add(hours + " hours, " + minutes + " minutes, and " + seconds + " seconds");
+    }
+
+    public void addIp(String ip)
+    {
+        if (!ips.contains(ip))
+        {
+            ips.add(ip);
+        }
+    }
+
+    public void addIps(List<String> ips)
+    {
+        for (String ip : ips)
+        {
+            addIp(ip);
+        }
+    }
+
+    public void removeIp(String ip)
+    {
+        if (ips.contains(ip))
+        {
+            ips.remove(ip);
+        }
+    }
+
+    public void clearIPs()
+    {
+        ips.clear();
+    }
+
+    @Override
+    public boolean isValid()
+    {
+        return configKey != null
+                && name != null;
+    }
+}

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

@@ -1,18 +1,22 @@
 package me.totalfreedom.totalfreedommod.admin;
 
 import com.google.common.collect.Lists;
+import java.util.Collections;
 import java.util.Date;
 import java.util.List;
 import lombok.Getter;
 import lombok.Setter;
+import me.totalfreedom.totalfreedommod.LogViewer.LogsRegistrationMode;
+import me.totalfreedom.totalfreedommod.TotalFreedomMod;
 import me.totalfreedom.totalfreedommod.rank.Rank;
 import me.totalfreedom.totalfreedommod.util.FUtil;
 import net.pravian.aero.base.ConfigLoadable;
 import net.pravian.aero.base.ConfigSavable;
 import net.pravian.aero.base.Validatable;
 import net.pravian.aero.util.Ips;
-import org.apache.commons.lang3.StringUtils;
-import org.apache.commons.lang3.Validate;
+import org.apache.commons.lang.StringUtils;
+import org.apache.commons.lang.Validate;
+import org.bukkit.ChatColor;
 import org.bukkit.configuration.ConfigurationSection;
 import org.bukkit.entity.Player;
 
@@ -25,19 +29,42 @@ public class Admin implements ConfigLoadable, ConfigSavable, Validatable
     @Setter
     private String name;
     @Getter
-    @Setter
     private boolean active = true;
     @Getter
     @Setter
     private Rank rank = Rank.SUPER_ADMIN;
     @Getter
     private final List<String> ips = Lists.newArrayList();
+    private final List<String> backupCodes = Lists.newArrayList();
     @Getter
     @Setter
     private Date lastLogin = new Date();
     @Getter
     @Setter
     private String loginMessage = null;
+    @Getter
+    @Setter
+    private String discordID = null;
+    @Getter
+    @Setter
+    private String tag = null;
+    @Getter
+    @Setter
+    private Boolean commandSpy = false;
+    @Getter
+    @Setter
+    private Boolean potionSpy = false;
+    @Getter
+    @Setter
+    private String acFormat = null;
+    @Getter
+    @Setter
+    private Boolean oldTags = false;
+    @Getter
+    @Setter
+    private Boolean logStick = false;
+
+    public static final String CONFIG_FILENAME = "admins.yml";
 
     public Admin(Player player)
     {
@@ -57,12 +84,18 @@ public class Admin implements ConfigLoadable, ConfigSavable, Validatable
         final StringBuilder output = new StringBuilder();
 
         output.append("Admin: ").append(name).append("\n")
-                .append("- Last Login Name: ").append(name).append("\n")
                 .append("- IPs: ").append(StringUtils.join(ips, ", ")).append("\n")
                 .append("- Last Login: ").append(FUtil.dateToString(lastLogin)).append("\n")
                 .append("- Custom Login Message: ").append(loginMessage).append("\n")
                 .append("- Rank: ").append(rank.getName()).append("\n")
-                .append("- Is Active: ").append(active);
+                .append("- Is Active: ").append(active).append("\n")
+                .append("- Discord ID: ").append(discordID).append("\n")
+                .append("- Tag: ").append(tag).append("\n").append(ChatColor.GRAY)
+                .append("- Potion Spy: ").append(potionSpy).append("\n")
+                .append("- Admin Chat Format: ").append(acFormat).append("\n")
+                .append("- Old Tags: ").append(oldTags).append("\n")
+                .append("- Log Stick: ").append(logStick)
+                .append("- Backup Codes: ").append(backupCodes.size()).append("/10").append("\n");
 
         return output.toString();
     }
@@ -83,8 +116,17 @@ public class Admin implements ConfigLoadable, ConfigSavable, Validatable
         rank = Rank.findRank(cs.getString("rank"));
         ips.clear();
         ips.addAll(cs.getStringList("ips"));
+        backupCodes.clear();
+        backupCodes.addAll(cs.getStringList("backupCodes"));
         lastLogin = FUtil.stringToDate(cs.getString("last_login"));
         loginMessage = cs.getString("login_message", null);
+        discordID = cs.getString("discord_id", null);
+        tag = cs.getString("tag", null);
+        commandSpy = cs.getBoolean("command_spy", false);
+        potionSpy = cs.getBoolean("potion_spy", false);
+        acFormat = cs.getString("acformat", null);
+        oldTags = cs.getBoolean("oldtags", false);
+        logStick = cs.getBoolean("logstick", false);
     }
 
     @Override
@@ -95,8 +137,16 @@ public class Admin implements ConfigLoadable, ConfigSavable, Validatable
         cs.set("active", active);
         cs.set("rank", rank.toString());
         cs.set("ips", Lists.newArrayList(ips));
+        cs.set("backupCodes", Lists.newArrayList(backupCodes));
         cs.set("last_login", FUtil.dateToString(lastLogin));
         cs.set("login_message", loginMessage);
+        cs.set("discord_id", discordID);
+        cs.set("tag", tag);
+        cs.set("command_spy", commandSpy);
+        cs.set("potion_spy", potionSpy);
+        cs.set("acformat", acFormat);
+        cs.set("oldtags", oldTags);
+        cs.set("logstick", logStick);
     }
 
     public boolean isAtLeast(Rank pRank)
@@ -139,6 +189,42 @@ public class Admin implements ConfigLoadable, ConfigSavable, Validatable
         ips.clear();
     }
 
+    public List<String> getBackupCodes()
+    {
+        return Collections.unmodifiableList(backupCodes);
+    }
+
+    public void setBackupCodes(List<String> codes)
+    {
+        backupCodes.clear();
+        backupCodes.addAll(codes);
+    }
+
+    public void removeBackupCode(String code)
+    {
+        backupCodes.remove(code);
+    }
+
+    public void setActive(boolean active)
+    {
+        this.active = active;
+
+        final TotalFreedomMod plugin = TotalFreedomMod.plugin();
+
+        if (!active)
+        {
+            if (getRank().isAtLeast(Rank.TELNET_ADMIN))
+            {
+                if (plugin.btb != null)
+                {
+                    plugin.btb.killTelnetSessions(getName());
+                }
+            }
+
+            plugin.lv.updateLogsRegistration(null, getName(), LogsRegistrationMode.DELETE);
+        }
+    }
+
     @Override
     public boolean isValid()
     {

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

@@ -3,29 +3,25 @@ package me.totalfreedom.totalfreedommod.admin;
 import com.google.common.base.Function;
 import com.google.common.collect.Maps;
 import com.google.common.collect.Sets;
+import java.util.ArrayList;
 import java.util.Date;
+import java.util.List;
 import java.util.Map;
 import java.util.Set;
 import java.util.concurrent.TimeUnit;
 import lombok.Getter;
 import me.totalfreedom.totalfreedommod.FreedomService;
 import me.totalfreedom.totalfreedommod.TotalFreedomMod;
-import me.totalfreedom.totalfreedommod.command.Command_logs;
 import me.totalfreedom.totalfreedommod.config.ConfigEntry;
-import me.totalfreedom.totalfreedommod.player.FPlayer;
 import me.totalfreedom.totalfreedommod.rank.Rank;
 import me.totalfreedom.totalfreedommod.util.FLog;
 import me.totalfreedom.totalfreedommod.util.FUtil;
 import net.pravian.aero.config.YamlConfig;
 import net.pravian.aero.util.Ips;
 import org.bukkit.Bukkit;
-import org.bukkit.ChatColor;
 import org.bukkit.command.CommandSender;
 import org.bukkit.configuration.ConfigurationSection;
 import org.bukkit.entity.Player;
-import org.bukkit.event.EventHandler;
-import org.bukkit.event.EventPriority;
-import org.bukkit.event.player.PlayerJoinEvent;
 import org.bukkit.plugin.ServicePriority;
 
 public class AdminList extends FreedomService
@@ -40,6 +36,9 @@ public class AdminList extends FreedomService
     private final Set<Admin> activeAdmins = Sets.newHashSet();
     private final Map<String, Admin> nameTable = Maps.newHashMap();
     private final Map<String, Admin> ipTable = Maps.newHashMap();
+    public final List<String> verifiedNoAdmins = new ArrayList<>();
+    public final Map<String, List<String>> verifiedNoAdminIps = Maps.newHashMap();
+    public static ArrayList<Player> vanished = new ArrayList<>();
     //
     private final YamlConfig config;
 
@@ -47,7 +46,7 @@ public class AdminList extends FreedomService
     {
         super(plugin);
 
-        this.config = new YamlConfig(TotalFreedomMod.plugin, CONFIG_FILENAME, true);
+        this.config = new YamlConfig(plugin, CONFIG_FILENAME, true);
     }
 
     @Override
@@ -100,7 +99,7 @@ public class AdminList extends FreedomService
         }
 
         updateTables();
-        FLog.info("Loaded " + nameTable.size() + " admins (" + nameTable.size() + " active) and " + ipTable.size() + " IPs.");
+        FLog.info("Loaded " + allAdmins.size() + " admins (" + nameTable.size() + " active,  " + ipTable.size() + " IPs)");
     }
 
     public void save()
@@ -119,15 +118,15 @@ public class AdminList extends FreedomService
         config.save();
     }
 
-    public void save(Admin admin)
+    public void messageAllAdmins(String message)
     {
-        if (!allAdmins.values().contains(admin))
-        { // Ensure admin is present
-            addAdmin(admin, false);
+        for (Player player : server.getOnlinePlayers())
+        {
+            if (isAdmin(player))
+            {
+                player.sendMessage(message);
+            }
         }
-
-        admin.saveTo(config.createSection(admin.getConfigKey()));
-        config.save();
     }
 
     public synchronized boolean isAdminSync(CommandSender sender)
@@ -135,6 +134,16 @@ public class AdminList extends FreedomService
         return isAdmin(sender);
     }
 
+    public List<String> getActiveAdminNames()
+    {
+        List<String> names = new ArrayList();
+        for (Admin admin : activeAdmins)
+        {
+            names.add(admin.getName());
+        }
+        return names;
+    }
+
     public boolean isAdmin(CommandSender sender)
     {
         if (!(sender instanceof Player))
@@ -142,7 +151,9 @@ public class AdminList extends FreedomService
             return true;
         }
 
-        return getAdmin((Player) sender) != null;
+        Admin admin = getAdmin((Player)sender);
+
+        return admin != null && admin.isActive();
     }
 
     public boolean isSeniorAdmin(CommandSender sender)
@@ -160,7 +171,7 @@ public class AdminList extends FreedomService
     {
         if (sender instanceof Player)
         {
-            return getAdmin((Player) sender);
+            return getAdmin((Player)sender);
         }
 
         return getEntryByName(sender.getName());
@@ -168,22 +179,39 @@ public class AdminList extends FreedomService
 
     public Admin getAdmin(Player player)
     {
+        // Find admin
         String ip = Ips.getIp(player);
-        Admin admin = getEntryByIp(ip, true);
+        Admin admin = getEntryByName(player.getName());
 
-        if (admin == null && Bukkit.getOnlineMode())
+        // Admin by name
+        if (admin != null)
         {
-            admin = getEntryByName(player.getName());
-
-            // Add new IP
-            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))
             {
-                admin.addIp(ip);
-                save(admin);
+                if (!admin.getIps().contains(ip))
+                {
+                    // Add the new IP if we have to
+                    admin.addIp(ip);
+                    save();
+                    updateTables();
+                }
+                return admin;
             }
         }
 
-        return admin;
+        // Admin by ip
+        admin = getEntryByIp(ip);
+        if (admin != null)
+        {
+            // Set the new username
+            admin.setName(player.getName());
+            save();
+            updateTables();
+        }
+
+        return null;
     }
 
     public Admin getEntryByName(String name)
@@ -193,16 +221,15 @@ public class AdminList extends FreedomService
 
     public Admin getEntryByIp(String ip)
     {
-        return getEntryByIp(ip, false);
+        return ipTable.get(ip);
     }
 
-    public Admin getEntryByIp(String needleIp, boolean fuzzy)
+    public Admin getEntryByIpFuzzy(String needleIp)
     {
-        Admin admin = ipTable.get(needleIp);
-
-        if (admin != null || !fuzzy)
+        final Admin directAdmin = getEntryByIp(needleIp);
+        if (directAdmin != null)
         {
-            return admin;
+            return directAdmin;
         }
 
         for (String ip : ipTable.keySet())
@@ -212,7 +239,8 @@ public class AdminList extends FreedomService
                 return ipTable.get(ip);
             }
         }
-        return admin;
+
+        return null;
     }
 
     public void updateLastLogin(Player player)
@@ -225,12 +253,17 @@ public class AdminList extends FreedomService
 
         admin.setLastLogin(new Date());
         admin.setName(player.getName());
-        save(admin);
+        save();
     }
 
     public boolean isAdminImpostor(Player player)
     {
-        return getEntryByName(player.getName()) != null && !isAdmin(player);
+        return getEntryByName(player.getName()) != null && !isAdmin(player) && !isVerifiedAdmin(player);
+    }
+
+    public boolean isVerifiedAdmin(Player player)
+    {
+        return verifiedNoAdmins.contains(player.getName()) && verifiedNoAdminIps.get(player.getName()).contains(Ips.getIp(player));
     }
 
     public boolean isIdentityMatched(Player player)
@@ -245,11 +278,6 @@ public class AdminList extends FreedomService
     }
 
     public boolean addAdmin(Admin admin)
-    {
-        return addAdmin(admin, false);
-    }
-
-    public boolean addAdmin(Admin admin, boolean overwrite)
     {
         if (!admin.isValid())
         {
@@ -259,11 +287,6 @@ public class AdminList extends FreedomService
 
         final String key = admin.getConfigKey();
 
-        if (!overwrite && allAdmins.containsKey(key))
-        {
-            return false;
-        }
-
         // Store admin, update views
         allAdmins.put(key, admin);
         updateTables();
@@ -277,6 +300,14 @@ public class AdminList extends FreedomService
 
     public boolean removeAdmin(Admin admin)
     {
+        if (admin.getRank().isAtLeast(Rank.TELNET_ADMIN))
+        {
+            if (plugin.btb != null)
+            {
+                plugin.btb.killTelnetSessions(admin.getName());
+            }
+        }
+
         // Remove admin, update views
         if (allAdmins.remove(admin.getConfigKey()) == null)
         {
@@ -327,28 +358,6 @@ public class AdminList extends FreedomService
         return ipTable.keySet();
     }
 
-    @EventHandler(priority = EventPriority.MONITOR)
-    public void onPlayerJoin(PlayerJoinEvent event)
-    {
-        final Player player = event.getPlayer();
-        final FPlayer fPlayer = plugin.pl.getPlayer(player);
-
-        if (plugin.al.isAdmin(player))
-        {
-            // Verify strict IP match
-            if (plugin.al.isIdentityMatched(player))
-            {
-                fPlayer.setSuperadminIdVerified(true);
-                plugin.al.updateLastLogin(player);
-            }
-            else
-            {
-                fPlayer.setSuperadminIdVerified(false);
-                FUtil.bcastMsg("Warning: " + player.getName() + " is an admin, but is using an account not registered to one of their ip-list.", ChatColor.RED);
-            }
-        }
-    }
-
     public void deactivateOldEntries(boolean verbose)
     {
         for (Admin admin : allAdmins.values())
@@ -368,11 +377,10 @@ public class AdminList extends FreedomService
 
             if (verbose)
             {
-                FUtil.adminAction("TotalFreedomMod", "Deactivating superadmin " + admin.getName() + ", inactive for " + lastLoginHours + " hours", true);
+                FUtil.adminAction("TotalFreedomMod", "Deactivating admin " + admin.getName() + ", inactive for " + lastLoginHours + " hours", true);
             }
 
             admin.setActive(false);
-            Command_logs.deactivateSuperadmin(admin);
         }
 
         save();

src/main/java/me/totalfreedom/totalfreedommod/amp/AMP.java

@@ -0,0 +1,48 @@
+package me.totalfreedom.totalfreedommod.amp;
+
+import me.totalfreedom.totalfreedommod.FreedomService;
+import me.totalfreedom.totalfreedommod.TotalFreedomMod;
+import me.totalfreedom.totalfreedommod.config.ConfigEntry;
+
+
+public class AMP extends FreedomService
+{
+    public AMPManager ampManager;
+    public Boolean enabled = false;
+
+    public AMP(TotalFreedomMod plugin)
+    {
+        super(plugin);
+    }
+
+    @Override
+    protected void onStart()
+    {
+        if (!plugin.config.getBoolean(ConfigEntry.AMP_ENABLED))
+        {
+            return;
+        }
+        ampManager = new AMPManager(plugin, plugin.config.getString(ConfigEntry.AMP_URL), plugin.config.getString(ConfigEntry.AMP_USERNAME), plugin.config.getString(ConfigEntry.AMP_PASSWORD));
+        LoginCallback callback = new LoginCallback()
+        {
+            @Override
+            public void loginDone(boolean success)
+            {
+                enabled = success;
+            }
+        };
+        ampManager.connectAsync(callback);
+
+    }
+
+    public void restartServer()
+    {
+        ampManager.restartAsync();
+    }
+
+    @Override
+    protected void onStop()
+    {
+
+    }
+}

src/main/java/me/totalfreedom/totalfreedommod/amp/AMPEndpoints.java

@@ -0,0 +1,28 @@
+package me.totalfreedom.totalfreedommod.amp;
+
+
+public enum AMPEndpoints
+{
+    LOGIN("/API/Core/Login", "{username:\"%s\", password:\"%s\", token:\"\", rememberMe:false}"),
+    RESTART("/API/Core/Restart", "{SESSIONID:\"%s\"}");
+
+    private final String text;
+    private final String parameters;
+
+    AMPEndpoints(String text, String parameters)
+    {
+        this.text = text;
+        this.parameters = parameters;
+    }
+
+    @Override
+    public String toString()
+    {
+        return text;
+    }
+
+    public String getParameters()
+    {
+        return parameters;
+    }
+}

src/main/java/me/totalfreedom/totalfreedommod/amp/AMPManager.java

@@ -0,0 +1,171 @@
+package me.totalfreedom.totalfreedommod.amp;
+
+import com.google.gson.Gson;
+import java.io.BufferedReader;
+import java.io.DataOutputStream;
+import java.io.IOException;
+import java.io.InputStreamReader;
+import java.net.HttpURLConnection;
+import java.net.URL;
+import javax.net.ssl.HttpsURLConnection;
+import me.totalfreedom.totalfreedommod.TotalFreedomMod;
+import me.totalfreedom.totalfreedommod.util.FLog;
+import org.bukkit.scheduler.BukkitRunnable;
+
+public class AMPManager
+{
+    private TotalFreedomMod plugin;
+    private String url, username, password;
+    private String sessionID;
+
+
+    public AMPManager(TotalFreedomMod plugin, String url, String username, String password)
+    {
+        this.plugin = plugin;
+        this.url = url;
+        this.username = username;
+        this.password = password;
+    }
+
+    public void connectAsync(final LoginCallback callback)
+    {
+
+        new BukkitRunnable()
+        {
+            @Override
+            public void run()
+            {
+                String apiEndpoint = url + AMPEndpoints.LOGIN.toString();
+                String body = String.format(AMPEndpoints.LOGIN.getParameters(), username, password);
+                try
+                {
+                    LoginResult resp = new Gson().fromJson(postRequestToEndpoint(apiEndpoint, body), LoginResult.class);
+                    if (!resp.getSuccess())
+                    {
+                        FLog.severe("AMP login unsuccessful. Check if login details are correct.");
+                        sessionID = "";
+                        callback.loginDone(false);
+                        return;
+                    }
+                    sessionID = resp.getSessionID();
+                    callback.loginDone(true);
+                }
+                catch (IOException ex)
+                {
+                    FLog.severe("Could not login to AMP. Check if URL is correct. Stacktrace: " + ex.getMessage());
+                    sessionID = "";
+                    callback.loginDone(false);
+
+                }
+            }
+        }.runTaskAsynchronously(plugin);
+    }
+
+    public void restartAsync()
+    {
+        new BukkitRunnable()
+        {
+            @Override
+            public void run()
+            {
+                final String apiEndpoint = url + AMPEndpoints.RESTART.toString();
+                final String body = String.format(AMPEndpoints.RESTART.getParameters(), sessionID);
+                try
+                {
+                    String resp = postRequestToEndpoint(apiEndpoint, body);
+                    if (resp.contains("Unauthorized Access"))
+                    {
+                        //try connecting one more time
+                        LoginCallback callback = new LoginCallback()
+                        {
+                            @Override
+                            public void loginDone(boolean success)
+                            {
+                                if (!success)
+                                {
+                                    FLog.severe("Failed to connect to AMP. Did the panel go down? Were panel user details changed/deleted? Check for more info above. Connection was successful when plugin started, but unsuccessful now." +
+                                            " Using server.shutdown() instead.");
+                                    plugin.getServer().shutdown();
+                                    return;
+                                }
+                                try
+                                {
+                                    String response = postRequestToEndpoint(apiEndpoint, body);
+                                    if (response.contains("Unauthorized Access"))
+                                    {
+                                        FLog.severe("Contact a developer. Panel gives Session ID but trying to use it gives a no perms error. The panel user set in config doesn't" +
+                                                " have perms to restart server. Using server.shutdown() instead. ");
+                                        plugin.getServer().shutdown();
+
+                                    }
+                                }
+                                catch (IOException e)
+                                {
+                                    FLog.severe("Could not restart. Using server.shutdown() instead. Stacktrace" + e.getMessage());
+                                    plugin.getServer().shutdown();
+                                }
+                            }
+                        };
+                        plugin.amp.ampManager.connectAsync(callback);
+                    }
+                }
+                catch (IOException ex)
+                {
+                    FLog.severe("Could not restart. Using server.shutdown() instead. Stacktrace: " + ex.getMessage());
+                    plugin.getServer().shutdown();
+                }
+            }
+        }.runTaskAsynchronously(plugin);
+    }
+
+
+    private String postRequestToEndpoint(String endpoint, String body) throws IOException
+    {
+        URL url = new URL(endpoint);
+        if (endpoint.startsWith("https://"))
+        {
+            HttpsURLConnection connection = (HttpsURLConnection)url.openConnection();
+            connection.setRequestMethod("POST");
+            connection.setRequestProperty("Accept", "application/json");
+            connection.setDoOutput(true);
+            DataOutputStream outputStream = new DataOutputStream(connection.getOutputStream());
+            outputStream.writeBytes(body);
+            outputStream.flush();
+            outputStream.close();
+            BufferedReader in = new BufferedReader(
+                    new InputStreamReader(connection.getInputStream()));
+            String inputLine;
+            StringBuffer response = new StringBuffer();
+
+            while ((inputLine = in.readLine()) != null)
+            {
+                response.append(inputLine);
+            }
+            in.close();
+            return response.toString();
+        }
+        else
+        {
+            HttpURLConnection connection = (HttpURLConnection)url.openConnection();
+            connection.setRequestMethod("POST");
+            connection.setRequestProperty("Accept", "application/json");
+            connection.setDoOutput(true);
+            DataOutputStream outputStream = new DataOutputStream(connection.getOutputStream());
+            outputStream.writeBytes(body);
+            outputStream.flush();
+            outputStream.close();
+            BufferedReader in = new BufferedReader(
+                    new InputStreamReader(connection.getInputStream()));
+            String inputLine;
+            StringBuffer response = new StringBuffer();
+
+            while ((inputLine = in.readLine()) != null)
+            {
+                response.append(inputLine);
+            }
+            in.close();
+            return response.toString();
+        }
+    }
+
+}

src/main/java/me/totalfreedom/totalfreedommod/amp/LoginCallback.java

@@ -0,0 +1,6 @@
+package me.totalfreedom.totalfreedommod.amp;
+
+public interface LoginCallback
+{
+    void loginDone(boolean success);
+}

src/main/java/me/totalfreedom/totalfreedommod/amp/LoginResult.java

@@ -0,0 +1,49 @@
+package me.totalfreedom.totalfreedommod.amp;
+
+import com.google.gson.annotations.Expose;
+import com.google.gson.annotations.SerializedName;
+import java.util.List;
+import lombok.Getter;
+import lombok.Setter;
+
+public class LoginResult
+{
+
+    @SerializedName("result")
+    @Expose
+    @Getter
+    @Setter
+    private Integer result;
+    @SerializedName("success")
+    @Expose
+    @Getter
+    @Setter
+    private Boolean success;
+    @SerializedName("permissions")
+    @Expose
+    @Getter
+    @Setter
+    private List<String> permissions = null;
+    @SerializedName("sessionID")
+    @Expose
+    @Getter
+    @Setter
+    private String sessionID;
+    @SerializedName("rememberMeToken")
+    @Expose
+    @Getter
+    @Setter
+    private String rememberMeToken;
+    @SerializedName("gravatarHash")
+    @Expose
+    @Getter
+    @Setter
+    private String gravatarHash;
+    @SerializedName("username")
+    @Expose
+    @Getter
+    @Setter
+    private String username;
+    private final static long serialVersionUID = -523050232433919883L;
+
+}

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

@@ -1,7 +1,9 @@
 package me.totalfreedom.totalfreedommod.banning;
 
 import com.google.common.collect.Lists;
+import java.text.DateFormat;
 import java.text.SimpleDateFormat;
+import java.time.Instant;
 import java.util.Arrays;
 import java.util.Date;
 import java.util.HashSet;
@@ -36,6 +38,9 @@ public class Ban implements ConfigLoadable, ConfigSavable, Validatable
     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
@@ -45,19 +50,20 @@ public class Ban implements ConfigLoadable, ConfigSavable, Validatable
     {
     }
 
-    public Ban(String username, String ip, String by, Date expire, String reason)
+    public Ban(String username, String ip, String by, Date at, Date expire, String reason)
     {
         this(username,
                 new String[]
-                {
-                    ip
-                },
+                        {
+                                ip
+                        },
                 by,
+                at,
                 expire,
                 reason);
     }
 
-    public Ban(String username, String[] ips, String by, Date expire, String reason)
+    public Ban(String username, String[] ips, String by, Date at, Date expire, String reason)
     {
         this.username = username;
         if (ips != null)
@@ -66,7 +72,9 @@ public class Ban implements ConfigLoadable, ConfigSavable, Validatable
         }
         dedupeIps();
         this.by = by;
+        this.at = at;
         this.expiryUnix = FUtil.getUnixTime(expire);
+        this.reason = reason;
     }
 
     //
@@ -79,14 +87,14 @@ public class Ban implements ConfigLoadable, ConfigSavable, Validatable
     public static Ban forPlayerIp(Player player, CommandSender by, Date expiry, String reason)
     {
         return new Ban(null, new String[]
-        {
-            Ips.getIp(player)
-        }, by.getName(), expiry, reason);
+                {
+                        Ips.getIp(player)
+                }, by.getName(), Date.from(Instant.now()), expiry, reason);
     }
 
     public static Ban forPlayerIp(String ip, CommandSender by, Date expiry, String reason)
     {
-        return new Ban(null, ip, by.getName(), expiry, reason);
+        return new Ban(null, ip, by.getName(), Date.from(Instant.now()), expiry, reason);
     }
 
     //
@@ -99,8 +107,9 @@ public class Ban implements ConfigLoadable, ConfigSavable, Validatable
     public static Ban forPlayerName(String player, CommandSender by, Date expiry, String reason)
     {
         return new Ban(player,
-                (String[]) null,
+                (String[])null,
                 by.getName(),
+                Date.from(Instant.now()),
                 expiry,
                 reason);
     }
@@ -117,6 +126,7 @@ public class Ban implements ConfigLoadable, ConfigSavable, Validatable
         return new Ban(player.getName(),
                 Ips.getIp(player),
                 by.getName(),
+                Date.from(Instant.now()),
                 expiry,
                 reason);
     }
@@ -126,6 +136,7 @@ public class Ban implements ConfigLoadable, ConfigSavable, Validatable
         return new Ban(player.getName(),
                 FUtil.getFuzzyIp(Ips.getIp(player)),
                 by.getName(),
+                Date.from(Instant.now()),
                 expiry,
                 reason);
     }
@@ -155,17 +166,12 @@ public class Ban implements ConfigLoadable, ConfigSavable, Validatable
         return expiryUnix > 0;
     }
 
-    public Date getExpiryDate()
-    {
-        return FUtil.getUnixDate(expiryUnix);
-    }
-
     public boolean isExpired()
     {
         return hasExpiry() && expiryUnix < FUtil.getUnixTime();
     }
 
-    public String bakeKickMessage()
+    public String bakeKickMessage(String ip)
     {
         final StringBuilder message = new StringBuilder(ChatColor.GOLD + "You");
 
@@ -185,12 +191,21 @@ public class Ban implements ConfigLoadable, ConfigSavable, Validatable
                     .append(by);
         }
 
+        if (at != null)
+        {
+            message.append("\n").append(ChatColor.RED).append("Issued: ").append(ChatColor.GOLD)
+                    .append(DATE_FORMAT.format(at));
+        }
+
         if (getExpiryUnix() != 0)
         {
             message.append("\n").append(ChatColor.RED).append("Expires: ").append(ChatColor.GOLD)
                     .append(DATE_FORMAT.format(FUtil.getUnixDate(expiryUnix)));
         }
 
+        message.append("\n").append(ChatColor.RED).append("IP Address: ").append(ChatColor.GOLD)
+                .append(ip);
+
         return message.toString();
     }
 
@@ -207,9 +222,9 @@ public class Ban implements ConfigLoadable, ConfigSavable, Validatable
             return false;
         }
 
-        final Ban ban = (Ban) object;
+        final Ban ban = (Ban)object;
         if (hasIps() != ban.hasIps()
-                || hasUsername() != hasUsername())
+                || hasUsername() != ban.hasUsername())
         {
             return false;
         }
@@ -238,6 +253,7 @@ public class Ban implements ConfigLoadable, ConfigSavable, Validatable
         this.ips.clear();
         this.ips.addAll(cs.getStringList("ips"));
         this.by = cs.getString("by", null);
+        this.at = FUtil.stringToDate(cs.getString("at", null));
         this.reason = cs.getString("reason", null);
         this.expiryUnix = cs.getLong("expiry_unix", 0);
         dedupeIps();
@@ -250,6 +266,7 @@ public class Ban implements ConfigLoadable, ConfigSavable, Validatable
         cs.set("username", username);
         cs.set("ips", ips.isEmpty() ? null : ips);
         cs.set("by", by);
+        cs.set("at", FUtil.dateToString(at));
         cs.set("reason", reason);
         cs.set("expiry_unix", expiryUnix > 0 ? expiryUnix : null);
     }

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

@@ -30,13 +30,15 @@ public class BanManager extends FreedomService
     private final Map<String, Ban> ipBans = Maps.newHashMap();
     private final Map<String, Ban> nameBans = Maps.newHashMap();
     private final List<String> unbannableUsernames = Lists.newArrayList();
+    public static final String CONFIG_FILENAME = "bans.yml";
+
     //
     private final YamlConfig config;
 
     public BanManager(TotalFreedomMod plugin)
     {
         super(plugin);
-        this.config = new YamlConfig(TotalFreedomMod.plugin, "bans.yml");
+        this.config = new YamlConfig(plugin, "bans.yml");
     }
 
     @Override
@@ -72,7 +74,7 @@ public class BanManager extends FreedomService
 
         // Load unbannable usernames
         unbannableUsernames.clear();
-        unbannableUsernames.addAll((Collection<? extends String>) ConfigEntry.FAMOUS_PLAYERS.getList());
+        unbannableUsernames.addAll((Collection<? extends String>)ConfigEntry.FAMOUS_PLAYERS.getList());
         FLog.info("Loaded " + unbannableUsernames.size() + " unbannable usernames.");
     }
 
@@ -244,7 +246,7 @@ public class BanManager extends FreedomService
 
         if (ban != null && !ban.isExpired())
         {
-            event.disallow(PlayerLoginEvent.Result.KICK_OTHER, ban.bakeKickMessage());
+            event.disallow(PlayerLoginEvent.Result.KICK_OTHER, ban.bakeKickMessage(ip));
         }
     }
 
@@ -273,7 +275,7 @@ public class BanManager extends FreedomService
     private void updateViews()
     {
         // Remove expired bans
-        for (Iterator<Ban> it = bans.iterator(); it.hasNext();)
+        for (Iterator<Ban> it = bans.iterator(); it.hasNext(); )
         {
             if (it.next().isExpired())
             {

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

@@ -36,7 +36,7 @@ public class PermbanList extends FreedomService
         permbannedNames.clear();
         permbannedIps.clear();
 
-        final YamlConfig config = new YamlConfig(TotalFreedomMod.plugin, CONFIG_FILENAME, true);
+        final YamlConfig config = new YamlConfig(plugin, CONFIG_FILENAME, true);
         config.load();
 
         for (String name : config.getKeys(false))
@@ -66,8 +66,8 @@ public class PermbanList extends FreedomService
             {
                 event.disallow(PlayerLoginEvent.Result.KICK_OTHER,
                         ChatColor.RED + "Your IP address is permanently banned from this server.\n"
-                        + "Release procedures are available at\n"
-                        + ChatColor.GOLD + ConfigEntry.SERVER_PERMBAN_URL.getString());
+                                + "Release procedures are available at\n"
+                                + ChatColor.GOLD + ConfigEntry.SERVER_PERMBAN_URL.getString());
                 return;
             }
         }
@@ -79,12 +79,21 @@ public class PermbanList extends FreedomService
             {
                 event.disallow(PlayerLoginEvent.Result.KICK_OTHER,
                         ChatColor.RED + "Your username is permanently banned from this server.\n"
-                        + "Release procedures are available at\n"
-                        + ChatColor.GOLD + ConfigEntry.SERVER_PERMBAN_URL.getString());
+                                + "Release procedures are available at\n"
+                                + ChatColor.GOLD + ConfigEntry.SERVER_PERMBAN_URL.getString());
                 return;
             }
         }
 
     }
 
+    public Set<String> getPermbannedNames()
+    {
+        return this.permbannedNames;
+    }
+
+    public Set<String> getPermbannedIps()
+    {
+        return this.permbannedIps;
+    }
 }

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

@@ -0,0 +1,76 @@
+package me.totalfreedom.totalfreedommod.banning;
+
+import com.google.common.collect.Sets;
+import java.util.Set;
+import lombok.Getter;
+import me.totalfreedom.totalfreedommod.FreedomService;
+import me.totalfreedom.totalfreedommod.TotalFreedomMod;
+import me.totalfreedom.totalfreedommod.config.ConfigEntry;
+import me.totalfreedom.totalfreedommod.util.FLog;
+import me.totalfreedom.totalfreedommod.util.FUtil;
+import net.pravian.aero.config.YamlConfig;
+import net.pravian.aero.util.Ips;
+import org.bukkit.ChatColor;
+import org.bukkit.event.EventHandler;
+import org.bukkit.event.EventPriority;
+import org.bukkit.event.player.PlayerLoginEvent;
+
+public class VPNBanList extends FreedomService
+{
+
+    public static final String CONFIG_FILENAME = "vpnbans.yml";
+
+    @Getter
+    private final Set<String> vpnIps = Sets.newHashSet();
+
+    public VPNBanList(TotalFreedomMod plugin)
+    {
+        super(plugin);
+    }
+
+    @Override
+    protected void onStart()
+    {
+        vpnIps.clear();
+
+        final YamlConfig config = new YamlConfig(plugin, CONFIG_FILENAME, true);
+        config.load();
+
+        for (String name : config.getKeys(false))
+        {
+            vpnIps.addAll(config.getStringList(name));
+        }
+
+        FLog.info("Loaded " + vpnIps.size() + " VPN ips.");
+    }
+
+    @Override
+    protected void onStop()
+    {
+    }
+
+    @EventHandler(priority = EventPriority.LOWEST)
+    public void onPlayerLogin(PlayerLoginEvent event)
+    {
+        final String ip = Ips.getIp(event);
+
+        // Permbanned IPs
+        for (String testIp : getVPNIps())
+        {
+            if (FUtil.fuzzyIpMatch(testIp, ip, 4))
+            {
+                event.disallow(PlayerLoginEvent.Result.KICK_OTHER,
+                        ChatColor.RED + "Your IP address is detected as a VPN\n"
+                                + "If you believe this is an error, release procedures are available at\n"
+                                + ChatColor.GOLD + ConfigEntry.SERVER_PERMBAN_URL.getString());
+                return;
+            }
+        }
+
+    }
+
+    public Set<String> getVPNIps()
+    {
+        return this.vpnIps;
+    }
+}

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

@@ -1,17 +1,25 @@
 package me.totalfreedom.totalfreedommod.blocking;
 
+import java.util.List;
 import me.totalfreedom.totalfreedommod.FreedomService;
 import me.totalfreedom.totalfreedommod.TotalFreedomMod;
 import me.totalfreedom.totalfreedommod.config.ConfigEntry;
 import me.totalfreedom.totalfreedommod.util.FLog;
 import me.totalfreedom.totalfreedommod.util.FUtil;
+import me.totalfreedom.totalfreedommod.util.Groups;
 import org.bukkit.ChatColor;
 import org.bukkit.Material;
+import org.bukkit.block.Banner;
+import org.bukkit.block.Block;
+import org.bukkit.block.Skull;
+import org.bukkit.block.banner.Pattern;
 import org.bukkit.entity.Player;
 import org.bukkit.event.EventHandler;
 import org.bukkit.event.EventPriority;
 import org.bukkit.event.block.BlockPlaceEvent;
 import org.bukkit.inventory.ItemStack;
+import org.bukkit.inventory.meta.ItemMeta;
+import org.bukkit.inventory.meta.SkullMeta;
 
 public class BlockBlocker extends FreedomService
 {
@@ -39,31 +47,24 @@ public class BlockBlocker extends FreedomService
         switch (event.getBlockPlaced().getType())
         {
             case LAVA:
-            case STATIONARY_LAVA:
             {
                 if (ConfigEntry.ALLOW_LAVA_PLACE.getBoolean())
                 {
                     FLog.info(String.format("%s placed lava @ %s", player.getName(), FUtil.formatLocation(event.getBlock().getLocation())));
-
-                    player.getInventory().clear(player.getInventory().getHeldItemSlot());
                 }
                 else
                 {
                     player.getInventory().setItem(player.getInventory().getHeldItemSlot(), new ItemStack(Material.COOKIE, 1));
                     player.sendMessage(ChatColor.GRAY + "Lava placement is currently disabled.");
-
                     event.setCancelled(true);
                 }
                 break;
             }
             case WATER:
-            case STATIONARY_WATER:
             {
                 if (ConfigEntry.ALLOW_WATER_PLACE.getBoolean())
                 {
                     FLog.info(String.format("%s placed water @ %s", player.getName(), FUtil.formatLocation(event.getBlock().getLocation())));
-
-                    player.getInventory().clear(player.getInventory().getHeldItemSlot());
                 }
                 else
                 {
@@ -79,14 +80,11 @@ public class BlockBlocker extends FreedomService
                 if (ConfigEntry.ALLOW_FIRE_PLACE.getBoolean())
                 {
                     FLog.info(String.format("%s placed fire @ %s", player.getName(), FUtil.formatLocation(event.getBlock().getLocation())));
-
-                    player.getInventory().clear(player.getInventory().getHeldItemSlot());
                 }
                 else
                 {
                     player.getInventory().setItem(player.getInventory().getHeldItemSlot(), new ItemStack(Material.COOKIE, 1));
                     player.sendMessage(ChatColor.GRAY + "Fire placement is currently disabled.");
-
                     event.setCancelled(true);
                 }
                 break;
@@ -96,19 +94,115 @@ public class BlockBlocker extends FreedomService
                 if (ConfigEntry.ALLOW_EXPLOSIONS.getBoolean())
                 {
                     FLog.info(String.format("%s placed TNT @ %s", player.getName(), FUtil.formatLocation(event.getBlock().getLocation())));
-
-                    player.getInventory().clear(player.getInventory().getHeldItemSlot());
                 }
-                else
+                break;
+            }
+            case STRUCTURE_BLOCK:
+            {
+                if (!ConfigEntry.ALLOW_STRUCTURE_BLOCKS.getBoolean())
                 {
+                    player.sendMessage(ChatColor.GRAY + "Structure blocks are disabled.");
                     player.getInventory().setItem(player.getInventory().getHeldItemSlot(), new ItemStack(Material.COOKIE, 1));
-
-                    player.sendMessage(ChatColor.GRAY + "TNT is currently disabled.");
                     event.setCancelled(true);
                 }
                 break;
             }
+            case JIGSAW:
+            {
+                if (!ConfigEntry.ALLOW_JIGSAWS.getBoolean())
+                {
+                    player.sendMessage(ChatColor.GRAY + "Jigsaws are disabled.");
+                    player.getInventory().setItem(player.getInventory().getHeldItemSlot(), new ItemStack(Material.COOKIE, 1));
+                    event.setCancelled(true);
+                }
+                break;
+            }
+            case GRINDSTONE:
+            {
+                if (!ConfigEntry.ALLOW_GRINDSTONES.getBoolean())
+                {
+                    player.sendMessage(ChatColor.GRAY + "Grindstones are disabled.");
+                    player.getInventory().setItem(player.getInventory().getHeldItemSlot(), new ItemStack(Material.COOKIE, 1));
+                    event.setCancelled(true);
+                }
+                break;
+            }
+            case JUKEBOX:
+            {
+                if (!ConfigEntry.ALLOW_JUKEBOXES.getBoolean())
+                {
+                    player.sendMessage(ChatColor.GRAY + "Jukeboxes are disabled.");
+                    player.getInventory().setItem(player.getInventory().getHeldItemSlot(), new ItemStack(Material.COOKIE, 1));
+                    event.setCancelled(true);
+                }
+                break;
+            }
+            case SPAWNER:
+            {
+                if (!ConfigEntry.ALLOW_SPAWNERS.getBoolean())
+                {
+                    player.sendMessage(ChatColor.GRAY + "Spawners are disabled.");
+                    player.getInventory().setItem(player.getInventory().getHeldItemSlot(), new ItemStack(Material.COOKIE, 1));
+                    event.setCancelled(true);
+                }
+                break;
+            }
+            case BEEHIVE:
+            case BEE_NEST:
+            {
+                if (!ConfigEntry.ALLOW_BEEHIVES.getBoolean())
+                {
+                    player.sendMessage(ChatColor.GRAY + "Bee hives are disabled.");
+                    player.getInventory().setItem(player.getInventory().getHeldItemSlot(), new ItemStack(Material.COOKIE, 1));
+                    event.setCancelled(true);
+                }
+                break;
+            }
+            case PLAYER_HEAD:
+            case PLAYER_WALL_HEAD:
+            {
+                Skull skull = (Skull) event.getBlockPlaced().getState();
+                if (skull.hasOwner())
+                {
+                    if (skull.getOwner().contains("§"))
+                    {
+                        skull.setOwner(skull.getOwner().replace("§", ""));
+                        SkullMeta meta = (SkullMeta) event.getItemInHand().getItemMeta();
+                        if (meta != null)
+                        {
+                            ItemStack newHead = new ItemStack(Material.PLAYER_HEAD, 1);
+                            ItemMeta headMeta = newHead.getItemMeta();
+                            headMeta.setDisplayName(ChatColor.YELLOW + "C-sectioned Head");
+                            newHead.setItemMeta(headMeta);
+                            player.getInventory().setItem(player.getInventory().getHeldItemSlot(), newHead);
+                            player.sendMessage(ChatColor.GRAY + "The player head you are attempting to place has a section symbol. Your player head has been C-sectioned.");
+                            event.setCancelled(true);
+                        }
+                    }
+                    if (skull.getOwner().length() > 100)
+                    {
+                        player.sendMessage(ChatColor.GRAY + "Instead of using Pi to crash players, be useful with your life and use it to discover things.");
+                        player.getInventory().setItem(player.getInventory().getHeldItemSlot(), new ItemStack(Material.COOKIE, 1));
+                        event.setCancelled(true);
+                    }
+                }
+                break;
+            }
         }
-    }
 
+        if (Groups.BANNERS.contains(event.getBlockPlaced().getType()))
+        {
+            Banner banner = (Banner) event.getBlockPlaced().getState();
+            List<Pattern> patterns = banner.getPatterns();
+            Banner handBanner = (Banner) (((Block) event.getItemInHand()).getState());
+            List<Pattern> handPatterns = banner.getPatterns();
+            if (patterns.size() >= 2)
+            {
+                banner.setPatterns(patterns.subList(0, 2));
+                handBanner.setPatterns(handPatterns.subList(0, 2));
+                player.sendMessage(ChatColor.GRAY + "Your banner had too many patterns on it, so some were removed.");
+            }
+        }
+
+    }
 }

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

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

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

@@ -1,25 +1,37 @@
 package me.totalfreedom.totalfreedommod.blocking;
 
+import java.util.Arrays;
+import java.util.List;
 import me.totalfreedom.totalfreedommod.FreedomService;
 import me.totalfreedom.totalfreedommod.TotalFreedomMod;
 import me.totalfreedom.totalfreedommod.config.ConfigEntry;
+import me.totalfreedom.totalfreedommod.util.FUtil;
+import me.totalfreedom.totalfreedommod.util.Groups;
+import org.bukkit.Material;
+import org.bukkit.attribute.Attribute;
+import org.bukkit.attribute.AttributeModifier;
 import org.bukkit.entity.Entity;
-import org.bukkit.entity.EntityType;
-import org.bukkit.entity.Projectile;
 import org.bukkit.entity.Tameable;
 import org.bukkit.event.EventHandler;
 import org.bukkit.event.EventPriority;
 import org.bukkit.event.block.BlockBurnEvent;
+import org.bukkit.event.block.BlockDispenseEvent;
 import org.bukkit.event.block.BlockFromToEvent;
 import org.bukkit.event.block.BlockIgniteEvent;
+import org.bukkit.event.block.BlockPistonExtendEvent;
+import org.bukkit.event.block.BlockPistonRetractEvent;
+import org.bukkit.event.block.BlockRedstoneEvent;
 import org.bukkit.event.block.LeavesDecayEvent;
+import org.bukkit.event.block.BlockGrowEvent;
 import org.bukkit.event.entity.EntityCombustEvent;
 import org.bukkit.event.entity.EntityDamageEvent;
 import org.bukkit.event.entity.EntityDeathEvent;
 import org.bukkit.event.entity.EntityExplodeEvent;
 import org.bukkit.event.entity.ExplosionPrimeEvent;
-import org.bukkit.event.entity.ProjectileHitEvent;
+import org.bukkit.event.entity.FireworkExplodeEvent;
+import org.bukkit.event.entity.PlayerDeathEvent;
 import org.bukkit.event.player.PlayerDropItemEvent;
+import org.bukkit.event.player.PlayerRespawnEvent;
 
 public class EventBlocker extends FreedomService
 {
@@ -71,7 +83,7 @@ public class EventBlocker extends FreedomService
     {
         if (!ConfigEntry.ALLOW_EXPLOSIONS.getBoolean())
         {
-            event.setCancelled(true);
+            event.blockList().clear();
             return;
         }
 
@@ -108,19 +120,6 @@ public class EventBlocker extends FreedomService
         }
     }
 
-    @EventHandler(priority = EventPriority.HIGH)
-    public void onProjectileHit(ProjectileHitEvent event)
-    {
-        if (ConfigEntry.ALLOW_EXPLOSIONS.getBoolean())
-        {
-            Projectile entity = event.getEntity();
-            if (event.getEntityType() == EntityType.ARROW)
-            {
-                entity.getWorld().createExplosion(entity.getLocation(), 2F);
-            }
-        }
-    }
-
     @EventHandler(priority = EventPriority.HIGH)
     public void onEntityDamage(EntityDamageEvent event)
     {
@@ -141,7 +140,7 @@ public class EventBlocker extends FreedomService
             Entity entity = event.getEntity();
             if (entity instanceof Tameable)
             {
-                if (((Tameable) entity).isTamed())
+                if (((Tameable)entity).isTamed())
                 {
                     event.setCancelled(true);
                 }
@@ -152,6 +151,11 @@ public class EventBlocker extends FreedomService
     @EventHandler(priority = EventPriority.NORMAL)
     public void onPlayerDropItem(PlayerDropItemEvent event)
     {
+        if (!plugin.al.isAdmin(event.getPlayer()))
+        {
+            event.setCancelled(true);
+        }
+
         if (!ConfigEntry.AUTO_ENTITY_WIPE.getBoolean())
         {
             return;
@@ -169,4 +173,74 @@ public class EventBlocker extends FreedomService
         event.setCancelled(true);
     }
 
+    @EventHandler(priority = EventPriority.NORMAL)
+    public void onBlockGrowth(BlockGrowEvent event)
+    {
+        event.setCancelled(true);
+    }
+
+    @EventHandler(priority = EventPriority.HIGH)
+    public void onFireworkExplode(FireworkExplodeEvent event)
+    {
+        if (!ConfigEntry.ALLOW_FIREWORK_EXPLOSION.getBoolean())
+        {
+            event.setCancelled(true);
+        }
+    }
+
+    @EventHandler(priority = EventPriority.HIGH)
+    public void onBlockPistonRetract(BlockPistonRetractEvent event)
+    {
+        if (!ConfigEntry.ALLOW_REDSTONE.getBoolean())
+        {
+            event.setCancelled(true);
+        }
+    }
+
+    @EventHandler(priority = EventPriority.HIGH)
+    public void onBlockPistonExtend(BlockPistonExtendEvent event)
+    {
+        if (!ConfigEntry.ALLOW_REDSTONE.getBoolean())
+        {
+            event.setCancelled(true);
+        }
+    }
+
+    @EventHandler(priority = EventPriority.HIGH)
+    public void onBlockRedstone(BlockRedstoneEvent event)
+    {
+        if (!ConfigEntry.ALLOW_REDSTONE.getBoolean())
+        {
+            event.setNewCurrent(0);
+        }
+    }
+
+    @EventHandler(priority = EventPriority.NORMAL)
+    public void onPlayerRespawn(PlayerRespawnEvent event)
+    {
+        double maxHealth = event.getPlayer().getAttribute(Attribute.GENERIC_MAX_HEALTH).getValue();
+        if (maxHealth < 1)
+        {
+            for (AttributeModifier attributeModifier : event.getPlayer().getAttribute(Attribute.GENERIC_MAX_HEALTH).getModifiers())
+            {
+                event.getPlayer().getAttribute(Attribute.GENERIC_MAX_HEALTH).removeModifier(attributeModifier);
+            }
+        }
+    }
+    @EventHandler(priority = EventPriority.NORMAL)
+    public void onBlockDispense(BlockDispenseEvent event)
+    {
+        List<Material> banned = Arrays.asList(Material.TNT_MINECART, Material.MINECART);
+        if (Groups.SPAWN_EGGS.contains(event.getItem().getType()) || banned.contains(event.getItem().getType()))
+        {
+            event.setCancelled(true);
+        }
+    }
+
+    @EventHandler(priority = EventPriority.NORMAL)
+    public void onPlayerDeath(PlayerDeathEvent event)
+    {
+        FUtil.fixCommandVoid(event.getEntity());
+        event.setDeathMessage(event.getDeathMessage());
+    }
 }

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

@@ -3,7 +3,8 @@ package me.totalfreedom.totalfreedommod.blocking;
 import me.totalfreedom.totalfreedommod.FreedomService;
 import me.totalfreedom.totalfreedommod.TotalFreedomMod;
 import me.totalfreedom.totalfreedommod.config.ConfigEntry;
-import me.totalfreedom.totalfreedommod.player.FPlayer;
+import me.totalfreedom.totalfreedommod.util.FLog;
+import me.totalfreedom.totalfreedommod.util.Groups;
 import org.bukkit.ChatColor;
 import org.bukkit.Material;
 import org.bukkit.entity.Player;
@@ -33,9 +34,6 @@ public class InteractBlocker extends FreedomService
     @EventHandler(priority = EventPriority.HIGH)
     public void onPlayerInteract(PlayerInteractEvent event)
     {
-        final Player player = event.getPlayer();
-        final FPlayer playerdata = plugin.pl.getPlayer(player);
-
         switch (event.getAction())
         {
             case RIGHT_CLICK_AIR:
@@ -54,10 +52,42 @@ public class InteractBlocker extends FreedomService
         }
     }
 
+    @EventHandler(priority = EventPriority.HIGH)
+    public void onRightClickBell(PlayerInteractEvent event)
+    {
+        if (event.getClickedBlock() != null)
+        {
+            if (event.getClickedBlock().getType().equals(Material.BELL))
+            {
+                if (!ConfigEntry.ALLOW_BELLS.getBoolean())
+                {
+                    event.setCancelled(true);
+                }
+            }
+        }
+    }
+
     private void handleRightClick(PlayerInteractEvent event)
     {
         final Player player = event.getPlayer();
 
+        if (event.getClickedBlock() != null)
+        {
+            if (event.getClickedBlock().getType().equals(Material.STRUCTURE_BLOCK) || event.getClickedBlock().getType().equals(Material.JIGSAW))
+            {
+                event.setCancelled(true);
+                event.getPlayer().closeInventory();
+            }
+        }
+
+        if (Groups.SPAWN_EGGS.contains(event.getMaterial()))
+        {
+            player.getInventory().clear(player.getInventory().getHeldItemSlot());
+            player.sendMessage(ChatColor.GRAY + "Spawn eggs are currently disabled.");
+            event.setCancelled(true);
+            return;
+        }
+
         switch (event.getMaterial())
         {
             case WATER_BUCKET:
@@ -86,7 +116,7 @@ public class InteractBlocker extends FreedomService
                 break;
             }
 
-            case EXPLOSIVE_MINECART:
+            case TNT_MINECART:
             {
                 if (ConfigEntry.ALLOW_TNT_MINECARTS.getBoolean())
                 {
@@ -98,6 +128,31 @@ public class InteractBlocker extends FreedomService
                 event.setCancelled(true);
                 break;
             }
+            
+            case ARMOR_STAND:
+            {
+                if (ConfigEntry.ALLOW_ARMOR_STANDS.getBoolean())
+                {
+                    break;
+                }
+
+                player.getInventory().clear(player.getInventory().getHeldItemSlot());
+                player.sendMessage(ChatColor.GRAY + "Armor stands are currently disabled.");
+                event.setCancelled(true);
+                break;
+            }
+            case MINECART:
+            {
+                if (ConfigEntry.ALLOW_MINECARTS.getBoolean())
+                {
+                    break;
+                }
+
+                player.getInventory().clear(player.getInventory().getHeldItemSlot());
+                player.sendMessage(ChatColor.GRAY + "Minecarts are currently disabled.");
+                event.setCancelled(true);
+                break;
+            }
         }
     }
 }

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

@@ -3,16 +3,22 @@ package me.totalfreedom.totalfreedommod.blocking;
 import me.totalfreedom.totalfreedommod.FreedomService;
 import me.totalfreedom.totalfreedommod.TotalFreedomMod;
 import me.totalfreedom.totalfreedommod.config.ConfigEntry;
+import me.totalfreedom.totalfreedommod.util.FLog;
+import org.bukkit.attribute.Attributable;
+import org.bukkit.attribute.Attribute;
 import org.bukkit.entity.Bat;
 import org.bukkit.entity.EnderDragon;
 import org.bukkit.entity.Entity;
 import org.bukkit.entity.Ghast;
 import org.bukkit.entity.Giant;
 import org.bukkit.entity.HumanEntity;
+import org.bukkit.entity.LivingEntity;
 import org.bukkit.entity.Slime;
+import org.bukkit.entity.Wither;
 import org.bukkit.event.EventHandler;
 import org.bukkit.event.EventPriority;
 import org.bukkit.event.entity.CreatureSpawnEvent;
+import org.bukkit.event.entity.EntitySpawnEvent;
 
 public class MobBlocker extends FreedomService
 {
@@ -32,6 +38,29 @@ public class MobBlocker extends FreedomService
     {
     }
 
+    //fixes crash mobs, credit to Mafrans
+    @EventHandler(priority = EventPriority.NORMAL)
+    public void onEntitySpawn(EntitySpawnEvent e)
+    {
+        if (!(e instanceof LivingEntity))
+        {
+            return;
+        }
+
+        Entity entity = e.getEntity();
+        if (entity instanceof Attributable)
+        {
+            if (((Attributable)entity).getAttribute(Attribute.GENERIC_FOLLOW_RANGE).getBaseValue() > 255.0)
+            {
+                ((Attributable)entity).getAttribute(Attribute.GENERIC_FOLLOW_RANGE).setBaseValue(255.0);
+            }
+            if (((Attributable)entity).getAttribute(Attribute.GENERIC_MOVEMENT_SPEED).getBaseValue() > 10.0)
+            {
+                ((Attributable)entity).getAttribute(Attribute.GENERIC_MOVEMENT_SPEED).setBaseValue(10.0);
+            }
+        }
+    }
+
     @EventHandler(priority = EventPriority.NORMAL)
     public void onCreatureSpawn(CreatureSpawnEvent event)
     {
@@ -41,6 +70,7 @@ public class MobBlocker extends FreedomService
         }
 
         final Entity spawned = event.getEntity();
+
         if (spawned instanceof EnderDragon)
         {
             if (ConfigEntry.MOB_LIMITER_DISABLE_DRAGON.getBoolean())
@@ -65,6 +95,14 @@ public class MobBlocker extends FreedomService
                 return;
             }
         }
+        else if (spawned instanceof Wither)
+        {
+            if (ConfigEntry.MOB_LIMITER_DISABLE_DRAGON.getBoolean())
+            {
+                event.setCancelled(true);
+                return;
+            }
+        }
         else if (spawned instanceof Giant)
         {
             if (ConfigEntry.MOB_LIMITER_DISABLE_GIANT.getBoolean())
@@ -89,7 +127,7 @@ public class MobBlocker extends FreedomService
         int mobcount = 0;
         for (Entity entity : event.getLocation().getWorld().getLivingEntities())
         {
-            if (!(entity instanceof HumanEntity))
+            if (!(entity instanceof HumanEntity) && entity instanceof LivingEntity)
             {
                 mobcount++;
             }
@@ -100,5 +138,4 @@ public class MobBlocker extends FreedomService
             event.setCancelled(true);
         }
     }
-
 }

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

@@ -0,0 +1,97 @@
+package me.totalfreedom.totalfreedommod.blocking;
+
+import me.totalfreedom.totalfreedommod.FreedomService;
+import me.totalfreedom.totalfreedommod.TotalFreedomMod;
+import org.bukkit.ChatColor;
+import org.bukkit.GameMode;
+import org.bukkit.entity.Arrow;
+import org.bukkit.entity.Player;
+import org.bukkit.entity.Trident;
+import org.bukkit.entity.FishHook;
+import org.bukkit.event.EventHandler;
+import org.bukkit.event.EventPriority;
+import org.bukkit.event.entity.EntityDamageByEntityEvent;
+
+public class PVPBlocker extends FreedomService
+{
+
+    public PVPBlocker(TotalFreedomMod plugin)
+    {
+        super(plugin);
+    }
+
+    @Override
+    protected void onStart()
+    {
+    }
+
+    @Override
+    protected void onStop()
+    {
+    }
+
+    @EventHandler(priority = EventPriority.LOW)
+    public void onEntityDamageByEntity(EntityDamageByEntityEvent event)
+    {
+        Player player = null;
+        Player target = null;
+        if (event.getEntity() instanceof Player)
+        {
+            target = (Player)event.getEntity();
+            if (event.getDamager() instanceof Player)
+            {
+                player = (Player)event.getDamager();
+            }
+            else if (event.getDamager() instanceof Arrow)
+            {
+                Arrow arrow = (Arrow)event.getDamager();
+                if (arrow.getShooter() instanceof Player)
+                {
+                    player = (Player)arrow.getShooter();
+                }
+            }
+            else if (event.getDamager() instanceof Trident)
+            {
+                Trident trident = (Trident)event.getDamager();
+                if (trident.getShooter() instanceof Player)
+                {
+                    player = (Player)trident.getShooter();
+                }
+            }
+            else if (event.getDamager() instanceof FishHook)
+            {
+                FishHook fishhook = (FishHook)event.getDamager();
+                if (fishhook.getShooter() instanceof Player)
+                {
+                    player = (Player)fishhook.getShooter();
+                }
+            }
+        }
+
+        if (player != null & !plugin.al.isAdmin(player))
+        {
+            if (player.getGameMode() == GameMode.CREATIVE)
+            {
+                player.sendMessage(ChatColor.RED + "Creative PvP is not allowed!");
+                event.setCancelled(true);
+            }
+            else if (plugin.esb.getEssentialsUser(player.getName()).isGodModeEnabled())
+            {
+                player.sendMessage(ChatColor.RED + "God mode PvP is not allowed!");
+                event.setCancelled(true);
+            }
+            else if (plugin.pl.getPlayer(target).isPvpBlocked())
+            {
+                player.sendMessage(ChatColor.RED + target.getName() + " has PvP disabled!");
+                event.setCancelled(true);
+            }
+            else if (plugin.pl.getPlayer(player).isPvpBlocked())
+            {
+                player.sendMessage(ChatColor.RED + "You have PvP disabled!");
+                event.setCancelled(true);
+            }
+        }
+
+    }
+
+}

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

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

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

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

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

@@ -12,7 +12,8 @@ import me.totalfreedom.totalfreedommod.config.ConfigEntry;
 import me.totalfreedom.totalfreedommod.util.FLog;
 import me.totalfreedom.totalfreedommod.util.FUtil;
 import net.pravian.aero.command.CommandReflection;
-import org.apache.commons.lang3.StringUtils;
+import org.apache.commons.lang.StringUtils;
+import org.bukkit.ChatColor;
 import org.bukkit.command.Command;
 import org.bukkit.command.CommandMap;
 import org.bukkit.command.CommandSender;
@@ -58,7 +59,7 @@ public class CommandBlocker extends FreedomService
         }
 
         @SuppressWarnings("unchecked")
-        List<String> blockedCommands = (List<String>) ConfigEntry.BLOCKED_COMMANDS.getList();
+        List<String> blockedCommands = (List<String>)ConfigEntry.BLOCKED_COMMANDS.getList();
         for (String rawEntry : blockedCommands)
         {
             final String[] parts = rawEntry.split(":");
@@ -129,6 +130,12 @@ public class CommandBlocker extends FreedomService
             // CommandBlocker handles messages and broadcasts
             event.setCancelled(true);
         }
+
+        if (event.getMessage().contains("translation.test.invalid") || event.getMessage().contains("translation.test.invalid2"))
+        {
+            event.setCancelled(true);
+            FUtil.playerMsg(event.getPlayer(), ChatColor.RED + "No crishy crashy faggy");
+        }
     }
 
     public boolean isCommandBlocked(String command, CommandSender sender)
@@ -160,6 +167,11 @@ public class CommandBlocker extends FreedomService
 
         for (String part : commandParts)
         {
+            if (command.startsWith("/") && !plugin.al.isAdmin(sender) && (part.contains("#copy") || part.contains("#clipboard")))
+            {
+                FUtil.playerMsg(sender, "WorldEdit copy variables are disabled.");
+                return true;
+            }
             Matcher matcher = flagPattern.matcher(part);
             if (!matcher.matches())
             {
@@ -207,4 +219,4 @@ public class CommandBlocker extends FreedomService
 
         return true;
     }
-}
+}

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

@@ -1,10 +1,12 @@
 package me.totalfreedom.totalfreedommod.blocking.command;
 
 import lombok.Getter;
+import me.totalfreedom.totalfreedommod.TotalFreedomMod;
 import me.totalfreedom.totalfreedommod.util.FUtil;
 import org.bukkit.ChatColor;
 import org.bukkit.command.CommandSender;
 import org.bukkit.entity.Player;
+import org.spigotmc.SpigotConfig;
 
 public class CommandBlockerEntry
 {
@@ -30,25 +32,23 @@ public class CommandBlockerEntry
         this.rank = rank;
         this.action = action;
         this.command = command;
-        this.subCommand = (subCommand == null ? null : subCommand.toLowerCase().trim());
-        this.message = (message == null || message.equals("_") ? "That command is blocked." : message);
+        this.subCommand = ((subCommand == null) ? null : subCommand.toLowerCase().trim());
+        this.message = ((message == null || message.equals("_")) ? "That command is blocked." : message);
     }
 
     public void doActions(CommandSender sender)
     {
         if (action == CommandBlockerAction.BLOCK_AND_EJECT && sender instanceof Player)
         {
-            FUtil.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;
         }
-
         if (action == CommandBlockerAction.BLOCK_UNKNOWN)
         {
-            FUtil.playerMsg(sender, "Unknown command. Type \"help\" for help.", ChatColor.RESET);
+            sender.sendMessage(SpigotConfig.unknownCommandMessage);
             return;
         }
-
         FUtil.playerMsg(sender, FUtil.colorize(message));
     }
-}
+}

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

@@ -40,7 +40,7 @@ public enum CommandBlockerRank
             return TELNET;
         }
 
-        Admin admin = TotalFreedomMod.plugin.al.getAdmin(sender);
+        Admin admin = TotalFreedomMod.plugin().al.getAdmin(sender);
         if (admin != null)
         {
             if (admin.getRank() == Rank.SENIOR_ADMIN)

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

@@ -1,21 +1,29 @@
 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;
 import me.totalfreedom.bukkittelnet.api.TelnetCommandEvent;
 import me.totalfreedom.bukkittelnet.api.TelnetPreLoginEvent;
 import me.totalfreedom.bukkittelnet.api.TelnetRequestDataTagsEvent;
+import me.totalfreedom.bukkittelnet.session.ClientSession;
 import me.totalfreedom.totalfreedommod.FreedomService;
 import me.totalfreedom.totalfreedommod.TotalFreedomMod;
 import me.totalfreedom.totalfreedommod.admin.Admin;
 import me.totalfreedom.totalfreedommod.rank.Rank;
+import me.totalfreedom.totalfreedommod.util.FLog;
 import org.bukkit.entity.Player;
 import org.bukkit.event.EventHandler;
 import org.bukkit.event.EventPriority;
+import org.bukkit.plugin.Plugin;
 
 public class BukkitTelnetBridge extends FreedomService
 {
 
+    private BukkitTelnet bukkitTelnetPlugin = null;
+
     public BukkitTelnetBridge(TotalFreedomMod plugin)
     {
         super(plugin);
@@ -41,9 +49,9 @@ public class BukkitTelnetBridge extends FreedomService
             return;
         }
 
-        final Admin admin = plugin.al.getEntryByIp(ip, true);
+        final Admin admin = plugin.al.getEntryByIpFuzzy(ip);
 
-        if (admin == null || !admin.isActive() || !admin.getRank().hasConsole())
+        if (admin == null || !admin.isActive() || !admin.getRank().hasConsoleVariant())
         {
             return;
         }
@@ -94,4 +102,69 @@ public class BukkitTelnetBridge extends FreedomService
             playerTags.put("tfm.essentialsBridge.getNickname", plugin.esb.getNickname(player.getName()));
         }
     }
+
+    public BukkitTelnet getBukkitTelnetPlugin()
+    {
+        if (bukkitTelnetPlugin == null)
+        {
+            try
+            {
+                final Plugin bukkitTelnet = server.getPluginManager().getPlugin("BukkitTelnet");
+                if (bukkitTelnet != null)
+                {
+                    if (bukkitTelnet instanceof BukkitTelnet)
+                    {
+                        bukkitTelnetPlugin = (BukkitTelnet)bukkitTelnet;
+                    }
+                }
+            }
+            catch (Exception ex)
+            {
+                FLog.severe(ex);
+            }
+        }
+
+        return bukkitTelnetPlugin;
+    }
+
+    public void killTelnetSessions(final String name)
+    {
+        try
+        {
+            final List<ClientSession> sessionsToRemove = new ArrayList<>();
+
+            final BukkitTelnet telnet = getBukkitTelnetPlugin();
+            if (telnet != null)
+            {
+                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);
+                    }
+                }
+
+                for (final ClientSession session : sessionsToRemove)
+                {
+                    try
+                    {
+                        telnet.appender.removeSession(session);
+                        session.syncTerminateSession();
+                    }
+                    catch (Exception ex)
+                    {
+                        FLog.severe("Error removing single telnet session: " + ex.getMessage());
+                    }
+                }
+
+                FLog.info(sessionsToRemove.size() + " telnet session(s) removed.");
+            }
+        }
+        catch (Exception ex)
+        {
+            FLog.severe("Error removing telnet sessions: " + ex.getMessage());
+        }
+    }
 }

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

@@ -0,0 +1,232 @@
+package me.totalfreedom.totalfreedommod.bridge;
+
+import java.io.File;
+import java.sql.Connection;
+import java.sql.DriverManager;
+import java.sql.ResultSet;
+import java.sql.SQLException;
+import java.sql.Statement;
+import java.util.Arrays;
+import java.util.List;
+import me.totalfreedom.totalfreedommod.FreedomService;
+import me.totalfreedom.totalfreedommod.TotalFreedomMod;
+import me.totalfreedom.totalfreedommod.config.ConfigEntry;
+import me.totalfreedom.totalfreedommod.util.FLog;
+import net.coreprotect.CoreProtect;
+import net.coreprotect.CoreProtectAPI;
+import org.bukkit.Bukkit;
+import org.bukkit.World;
+import org.bukkit.plugin.Plugin;
+import org.bukkit.scheduler.BukkitRunnable;
+import org.bukkit.scheduler.BukkitTask;
+
+public class CoreProtectBridge extends FreedomService
+{
+    private CoreProtectAPI coreProtectAPI = null;
+
+    private final List<String> tables = Arrays.asList("co_sign", "co_session", "co_container", "co_block");
+
+    private BukkitTask wiper;
+
+    public CoreProtectBridge(TotalFreedomMod plugin)
+    {
+        super(plugin);
+    }
+
+    @Override
+    protected void onStart()
+    {
+    }
+
+    @Override
+    protected void onStop()
+    {
+    }
+
+    public CoreProtect getCoreProtect()
+    {
+        CoreProtect coreProtect = null;
+        try
+        {
+            final Plugin coreProtectPlugin = Bukkit.getServer().getPluginManager().getPlugin("CoreProtect");
+
+            if (coreProtectPlugin != null && coreProtectPlugin instanceof CoreProtect)
+            {
+                coreProtect = (CoreProtect)coreProtectPlugin;
+            }
+        }
+        catch (Exception ex)
+        {
+            FLog.severe(ex);
+        }
+        return coreProtect;
+    }
+
+    public CoreProtectAPI getCoreProtectAPI()
+    {
+        if (coreProtectAPI == null)
+        {
+            try
+            {
+                final CoreProtect coreProtect = getCoreProtect();
+
+                coreProtectAPI = coreProtect.getAPI();
+
+                // Check if the plugin or api is not enabled, if so, return null
+                if (!coreProtect.isEnabled() || !coreProtectAPI.isEnabled())
+                {
+                    return null;
+                }
+            }
+            catch (Exception ex)
+            {
+                FLog.severe(ex);
+            }
+        }
+
+        return coreProtectAPI;
+    }
+
+    public boolean isEnabled()
+    {
+        final CoreProtect coreProtect = getCoreProtect();
+
+        return coreProtect != null && coreProtect.isEnabled();
+    }
+
+    // Rollback the specified player's edits that were in the last 24 hours.
+    public void rollback(final String name)
+    {
+        final CoreProtectAPI coreProtect = getCoreProtectAPI();
+
+        if (!isEnabled())
+        {
+            return;
+        }
+
+        new BukkitRunnable()
+        {
+            @Override
+            public void run()
+            {
+                coreProtect.performRollback(86400, Arrays.asList(name), null, null, null, null, 0, null);
+            }
+        }.runTaskAsynchronously(plugin);
+    }
+
+    // Reverts a rollback for the specified player's edits that were in the last 24 hours.
+    public void restore(final String name)
+    {
+        final CoreProtectAPI coreProtect = getCoreProtectAPI();
+
+        if (!isEnabled())
+        {
+            return;
+        }
+
+        new BukkitRunnable()
+        {
+            @Override
+            public void run()
+            {
+                coreProtect.performRestore(86400, Arrays.asList(name), null, null, null, null, 0, null);
+            }
+        }.runTaskAsynchronously(plugin);
+    }
+
+    public File getDatabase()
+    {
+        if (!isEnabled())
+        {
+            return null;
+        }
+
+        return (new File(getCoreProtect().getDataFolder(), "database.db"));
+    }
+
+    public double getDBSize()
+    {
+        double bytes = getDatabase().length();
+        double kilobytes = (bytes / 1024);
+        double megabytes = (kilobytes / 1024);
+        return (megabytes / 1024);
+    }
+
+    // Wipes DB for the specified world
+    public void clearDatabase(World world)
+    {
+        clearDatabase(world, false);
+    }
+
+    // Wipes DB for the specified world
+    public void clearDatabase(World world, Boolean shutdown)
+    {
+        if (!ConfigEntry.COREPROTECT_MYSQL_ENABLED.getBoolean())
+        {
+            return;
+        }
+        final CoreProtect coreProtect = getCoreProtect();
+
+        if (coreProtect == null)
+        {
+            return;
+        }
+
+        /* As CoreProtect doesn't have an API method for deleting all of the data for a specific world
+           we have to do this manually via SQL */
+        Connection connection = null;
+        try
+        {
+            String host = ConfigEntry.COREPROTECT_MYSQL_HOST.getString();
+            String port = ConfigEntry.COREPROTECT_MYSQL_PORT.getString();
+            String username = ConfigEntry.COREPROTECT_MYSQL_USERNAME.getString();
+            String password = ConfigEntry.COREPROTECT_MYSQL_PASSWORD.getString();
+            String database = ConfigEntry.COREPROTECT_MYSQL_DATABASE.getString();
+            String url = host + ":" + port + "/" + database + "?user=" + username + "&password=" + password + "&useSSL=false";
+            connection = DriverManager.getConnection("jdbc:mysql://" + url);
+            final Statement statement = connection.createStatement();
+            statement.setQueryTimeout(30);
+
+            // Obtain world ID from CoreProtect database
+            ResultSet resultSet = statement.executeQuery("SELECT id FROM co_world WHERE world = '" + world.getName() + "'");
+            String worldID = null;
+            while (resultSet.next())
+            {
+                worldID = String.valueOf(resultSet.getInt("id"));
+            }
+
+            // Ensure the world ID is not null
+            if (worldID == null)
+            {
+                FLog.warning("Failed to obtain the world ID for the " + world.getName());
+                return;
+            }
+
+            // Iterate through each table and delete their data if the world ID matches
+            for (String table : tables)
+            {
+                statement.executeQuery("DELETE FROM " + table + " WHERE wid = " + worldID);
+            }
+
+            connection.close();
+
+        }
+        catch (SQLException e)
+        {
+            FLog.warning("Failed to delete the CoreProtect data for the " + world.getName());
+        }
+
+        // This exits for flatlands wipes
+        if (shutdown)
+        {
+            if (plugin.amp.enabled)
+            {
+                plugin.amp.restartServer();
+            }
+            else
+            {
+                server.shutdown();
+            }
+        }
+    }
+}

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

@@ -4,10 +4,22 @@ import com.earth2me.essentials.Essentials;
 import com.earth2me.essentials.User;
 import me.totalfreedom.totalfreedommod.FreedomService;
 import me.totalfreedom.totalfreedommod.TotalFreedomMod;
+import me.totalfreedom.totalfreedommod.player.FPlayer;
+import me.totalfreedom.totalfreedommod.rank.Rank;
 import me.totalfreedom.totalfreedommod.util.FLog;
 import me.totalfreedom.totalfreedommod.util.FUtil;
-import org.bukkit.Bukkit;
+import org.bukkit.entity.HumanEntity;
+import org.bukkit.entity.Player;
+import org.bukkit.event.EventHandler;
+import org.bukkit.event.EventPriority;
+import org.bukkit.event.inventory.InventoryClickEvent;
+import org.bukkit.event.inventory.InventoryCloseEvent;
+import org.bukkit.event.inventory.InventoryType;
+import org.bukkit.event.player.PlayerQuitEvent;
+import org.bukkit.inventory.Inventory;
+import org.bukkit.inventory.InventoryHolder;
 import org.bukkit.plugin.Plugin;
+import org.bukkit.scheduler.BukkitRunnable;
 
 public class EssentialsBridge extends FreedomService
 {
@@ -35,13 +47,10 @@ public class EssentialsBridge extends FreedomService
         {
             try
             {
-                final Plugin essentials = Bukkit.getServer().getPluginManager().getPlugin("Essentials");
-                if (essentials != null)
+                final Plugin essentials = server.getPluginManager().getPlugin("Essentials");
+                if (essentials != null && essentials instanceof Essentials)
                 {
-                    if (essentials instanceof Essentials)
-                    {
-                        essentialsPlugin = (Essentials) essentials;
-                    }
+                    essentialsPlugin = (Essentials)essentials;
                 }
             }
             catch (Exception ex)
@@ -56,7 +65,7 @@ public class EssentialsBridge extends FreedomService
     {
         try
         {
-            final Essentials essentials = getEssentialsPlugin();
+            Essentials essentials = getEssentialsPlugin();
             if (essentials != null)
             {
                 return essentials.getUserMap().getUser(username);
@@ -73,7 +82,7 @@ public class EssentialsBridge extends FreedomService
     {
         try
         {
-            final User user = getEssentialsUser(username);
+            User user = getEssentialsUser(username);
             if (user != null)
             {
                 user.setNickname(nickname);
@@ -90,7 +99,7 @@ public class EssentialsBridge extends FreedomService
     {
         try
         {
-            final User user = getEssentialsUser(username);
+            User user = getEssentialsUser(username);
             if (user != null)
             {
                 return user.getNickname();
@@ -107,10 +116,10 @@ public class EssentialsBridge extends FreedomService
     {
         try
         {
-            final User user = getEssentialsUser(username);
+            User user = getEssentialsUser(username);
             if (user != null)
             {
-                return FUtil.<Long>getField(user, "lastActivity"); // This is weird
+                return FUtil.getField(user, "lastActivity");
             }
         }
         catch (Exception ex)
@@ -120,20 +129,96 @@ public class EssentialsBridge extends FreedomService
         return 0L;
     }
 
-    public boolean isEssentialsEnabled()
+    public void setVanished(String username, boolean vanished)
     {
         try
         {
-            final Essentials essentials = getEssentialsPlugin();
-            if (essentials != null)
+            User user = getEssentialsUser(username);
+            if (user != null)
             {
-                return essentials.isEnabled();
+                user.setVanished(vanished);
             }
         }
         catch (Exception ex)
         {
             FLog.severe(ex);
         }
-        return false;
+    }
+
+    @EventHandler(priority = EventPriority.MONITOR)
+    public void onInventoryClick(InventoryClickEvent event)
+    {
+        Player refreshPlayer = null;
+        Inventory inventory = event.getView().getTopInventory();
+        InventoryType inventoryType = inventory.getType();
+        Player player = (Player)event.getWhoClicked();
+        FPlayer fPlayer = plugin.pl.getPlayer(player);
+        if (inventoryType == InventoryType.PLAYER && fPlayer.isInvSee())
+        {
+            final InventoryHolder inventoryHolder = inventory.getHolder();
+            if (inventoryHolder != null && inventoryHolder instanceof HumanEntity)
+            {
+                Player invOwner = (Player)inventoryHolder;
+                Rank recieverRank = plugin.rm.getRank(player);
+                Rank playerRank = plugin.rm.getRank(invOwner);
+                if (playerRank.ordinal() >= recieverRank.ordinal() || !invOwner.isOnline())
+                {
+                    event.setCancelled(true);
+                    refreshPlayer = player;
+                }
+            }
+        }
+        if (refreshPlayer != null)
+        {
+            final Player p = refreshPlayer;
+            new BukkitRunnable()
+            {
+                @Override
+                public void run()
+                {
+                    p.updateInventory();
+                }
+            }.runTaskLater(plugin, 20L);
+        }
+    }
+
+    @EventHandler(priority = EventPriority.MONITOR)
+    public void onInventoryClose(InventoryCloseEvent event)
+    {
+        Player refreshPlayer = null;
+        Inventory inventory = event.getView().getTopInventory();
+        InventoryType inventoryType = inventory.getType();
+        Player player = (Player)event.getPlayer();
+        FPlayer fPlayer = plugin.pl.getPlayer(player);
+        if (inventoryType == InventoryType.PLAYER && fPlayer.isInvSee())
+        {
+            fPlayer.setInvSee(false);
+            refreshPlayer = player;
+        }
+        if (refreshPlayer != null)
+        {
+            final Player p = refreshPlayer;
+            new BukkitRunnable()
+            {
+                @Override
+                public void run()
+                {
+                    p.updateInventory();
+                }
+            }.runTaskLater(plugin, 20L);
+        }
+    }
+
+    @EventHandler(priority = EventPriority.MONITOR)
+    public void onPlayerQuit(PlayerQuitEvent event)
+    {
+        Player player = event.getPlayer();
+    }
+
+    public boolean isEnabled()
+    {
+        final Essentials ess = getEssentialsPlugin();
+
+        return ess != null && ess.isEnabled();
     }
 }

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

@@ -0,0 +1,125 @@
+package me.totalfreedom.totalfreedommod.bridge;
+
+import me.libraryaddict.disguise.DisguiseAPI;
+import me.libraryaddict.disguise.LibsDisguises;
+import me.totalfreedom.libsdisguises.BlockedDisguises;
+import me.totalfreedom.totalfreedommod.FreedomService;
+import me.totalfreedom.totalfreedommod.TotalFreedomMod;
+import me.totalfreedom.totalfreedommod.util.FLog;
+import org.bukkit.entity.Player;
+import org.bukkit.plugin.Plugin;
+
+public class LibsDisguisesBridge extends FreedomService
+{
+
+    private LibsDisguises libsDisguisesPlugin = null;
+
+    public LibsDisguisesBridge(TotalFreedomMod plugin)
+    {
+        super(plugin);
+    }
+
+    @Override
+    protected void onStart()
+    {
+    }
+
+    @Override
+    protected void onStop()
+    {
+    }
+
+    public LibsDisguises getLibsDisguisesPlugin()
+    {
+        if (libsDisguisesPlugin == null)
+        {
+            try
+            {
+                final Plugin libsDisguises = server.getPluginManager().getPlugin("LibsDisguises");
+                if (libsDisguises != null)
+                {
+                    if (libsDisguises instanceof LibsDisguises)
+                    {
+                        libsDisguisesPlugin = (LibsDisguises)libsDisguises;
+                    }
+                }
+            }
+            catch (Exception ex)
+            {
+                FLog.severe(ex);
+            }
+        }
+
+        return libsDisguisesPlugin;
+    }
+
+    public Boolean isDisguised(Player player)
+    {
+        try
+        {
+            final LibsDisguises libsDisguises = getLibsDisguisesPlugin();
+            if (libsDisguises != null)
+            {
+                return DisguiseAPI.isDisguised(player);
+            }
+        }
+        catch (Exception ex)
+        {
+            FLog.severe(ex);
+        }
+        return null;
+    }
+
+    public void undisguiseAll(boolean admins)
+    {
+        try
+        {
+            final LibsDisguises libsDisguises = getLibsDisguisesPlugin();
+
+            if (libsDisguises == null)
+            {
+                return;
+            }
+
+            for (Player player : server.getOnlinePlayers())
+            {
+                if (DisguiseAPI.isDisguised(player))
+                {
+                    if (!admins && plugin.al.isAdmin(player))
+                    {
+                        continue;
+                    }
+                    DisguiseAPI.undisguiseToAll(player);
+                }
+            }
+        }
+        catch (Exception ex)
+        {
+            FLog.severe(ex);
+        }
+    }
+
+    public void setDisguisesEnabled(boolean state)
+    {
+        final LibsDisguises libsDisguises = getLibsDisguisesPlugin();
+
+        if (libsDisguises == null)
+        {
+            return;
+        }
+
+        BlockedDisguises.disabled = !state;
+    }
+
+    public boolean isDisguisesEnabled()
+    {
+        return !BlockedDisguises.disabled;
+    }
+
+    public boolean isEnabled()
+    {
+        final LibsDisguises libsDisguises = getLibsDisguisesPlugin();
+
+        return libsDisguises != null && libsDisguises.isEnabled();
+    }
+}

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

@@ -12,26 +12,46 @@ import org.bukkit.plugin.Plugin;
 public class WorldEditBridge extends FreedomService
 {
 
-    private final WorldEditListener listener;
     //
-    private WorldEditPlugin worldedit = null;
+    private WorldEditPlugin worldeditPlugin = null;
 
     public WorldEditBridge(TotalFreedomMod plugin)
     {
         super(plugin);
-        listener = new WorldEditListener(plugin);
     }
 
     @Override
     protected void onStart()
     {
-        listener.register();
     }
 
     @Override
     protected void onStop()
     {
-        listener.unregister();
+    }
+
+    public WorldEditPlugin getWorldEditPlugin()
+    {
+        if (worldeditPlugin == null)
+        {
+            try
+            {
+                Plugin we = server.getPluginManager().getPlugin("WorldEdit");
+                if (we != null)
+                {
+                    if (we instanceof WorldEditPlugin)
+                    {
+                        worldeditPlugin = (WorldEditPlugin)we;
+                    }
+                }
+            }
+            catch (Exception ex)
+            {
+                FLog.severe(ex);
+            }
+        }
+
+        return worldeditPlugin;
     }
 
     public void undo(Player player, int count)
@@ -46,7 +66,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);
                     }
                 }
             }
@@ -57,28 +78,28 @@ public class WorldEditBridge extends FreedomService
         }
     }
 
-    private WorldEditPlugin getWorldEditPlugin()
+    public void redo(Player player, int count)
     {
-        if (worldedit == null)
+        try
         {
-            try
+            LocalSession session = getPlayerSession(player);
+            if (session != null)
             {
-                Plugin we = server.getPluginManager().getPlugin("WorldEdit");
-                if (we != null)
+                final BukkitPlayer bukkitPlayer = getBukkitPlayer(player);
+                if (bukkitPlayer != null)
                 {
-                    if (we instanceof WorldEditPlugin)
+                    for (int i = 0; i < count; i++)
                     {
-                        worldedit = (WorldEditPlugin) we;
+                        com.sk89q.worldedit.entity.Player fuckyou = (com.sk89q.worldedit.entity.Player)bukkitPlayer;
+                        session.redo(session.getBlockBag(fuckyou), fuckyou);
                     }
                 }
             }
-            catch (Exception ex)
-            {
-                FLog.severe(ex);
-            }
         }
-
-        return worldedit;
+        catch (Exception ex)
+        {
+            FLog.severe(ex);
+        }
     }
 
     public void setLimit(Player player, int limit)
@@ -98,6 +119,30 @@ public class WorldEditBridge extends FreedomService
 
     }
 
+    public int getDefaultLimit()
+    {
+        final WorldEditPlugin wep = getWorldEditPlugin();
+        if (wep == null)
+        {
+            return 0;
+        }
+
+        return wep.getLocalConfiguration().defaultChangeLimit;
+
+    }
+
+    public int getMaxLimit()
+    {
+        final WorldEditPlugin wep = getWorldEditPlugin();
+        if (wep == null)
+        {
+            return 0;
+        }
+
+        return wep.getLocalConfiguration().maxChangeLimit;
+
+    }
+
     private LocalSession getPlayerSession(Player player)
     {
         final WorldEditPlugin wep = getWorldEditPlugin();

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

@@ -1,66 +0,0 @@
-package me.totalfreedom.totalfreedommod.bridge;
-
-import me.totalfreedom.totalfreedommod.TotalFreedomMod;
-import me.totalfreedom.totalfreedommod.util.FUtil;
-import me.totalfreedom.worldedit.LimitChangedEvent;
-import me.totalfreedom.worldedit.SelectionChangedEvent;
-import net.pravian.aero.component.PluginListener;
-import org.bukkit.ChatColor;
-import org.bukkit.entity.Player;
-import org.bukkit.event.EventHandler;
-
-public class WorldEditListener extends PluginListener<TotalFreedomMod>
-{
-
-    public WorldEditListener(TotalFreedomMod plugin)
-    {
-        super(plugin);
-    }
-
-    @EventHandler
-    public void onSelectionChange(final SelectionChangedEvent event)
-    {
-        final Player player = event.getPlayer();
-
-        if (plugin.al.isAdmin(player))
-        {
-            return;
-        }
-
-        if (plugin.pa.isInProtectedArea(
-                event.getMinVector(),
-                event.getMaxVector(),
-                event.getWorld().getName()))
-        {
-
-            player.sendMessage(ChatColor.RED + "The region that you selected contained a protected area. Selection cleared.");
-            event.setCancelled(true);
-        }
-    }
-
-    @EventHandler
-    public void onLimitChanged(LimitChangedEvent event)
-    {
-        final Player player = event.getPlayer();
-
-        if (plugin.al.isAdmin(player))
-        {
-            return;
-        }
-
-        if (!event.getPlayer().equals(event.getTarget()))
-        {
-            player.sendMessage(ChatColor.RED + "Only admins can change the limit for other players!");
-            event.setCancelled(true);
-        }
-
-        if (event.getLimit() < 0 || event.getLimit() > 10000)
-        {
-            player.setOp(false);
-            FUtil.bcastMsg(event.getPlayer().getName() + " tried to set their WorldEdit limit to " + event.getLimit() + " and has been de-opped", ChatColor.RED);
-            event.setCancelled(true);
-            player.sendMessage(ChatColor.RED + "You cannot set your limit higher than 10000 or to -1!");
-        }
-    }
-
-}

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

@@ -0,0 +1,60 @@
+package me.totalfreedom.totalfreedommod.bridge;
+
+import com.sk89q.worldedit.bukkit.BukkitAdapter;
+import com.sk89q.worldguard.WorldGuard;
+import com.sk89q.worldguard.protection.managers.RegionManager;
+import com.sk89q.worldguard.protection.regions.ProtectedRegion;
+import com.sk89q.worldguard.protection.regions.RegionContainer;
+import java.util.Map;
+import me.totalfreedom.totalfreedommod.FreedomService;
+import me.totalfreedom.totalfreedommod.TotalFreedomMod;
+import org.bukkit.World;
+import org.bukkit.plugin.Plugin;
+
+public class WorldGuardBridge extends FreedomService
+{
+
+    public WorldGuardBridge(TotalFreedomMod plugin)
+    {
+        super(plugin);
+    }
+
+    @Override
+    protected void onStart()
+    {
+    }
+
+    @Override
+    protected void onStop()
+    {
+    }
+
+    public RegionManager getRegionManager(World world)
+    {
+        RegionContainer container = WorldGuard.getInstance().getPlatform().getRegionContainer();
+        return container.get(BukkitAdapter.adapt(world));
+    }
+
+    public int wipeRegions(World world)
+    {
+        int count = 0;
+        RegionManager regionManager = getRegionManager(world);
+        if (regionManager != null)
+        {
+            Map<String, ProtectedRegion> regions = regionManager.getRegions();
+            for (ProtectedRegion region : regions.values())
+            {
+                regionManager.removeRegion(region.getId());
+                count++;
+            }
+        }
+        return count;
+    }
+
+    public boolean isEnabled()
+    {
+        Plugin plugin = server.getPluginManager().getPlugin("WorldGuard");
+
+        return plugin != null && plugin.isEnabled();
+    }
+}

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

@@ -6,7 +6,6 @@ import lombok.Getter;
 import me.totalfreedom.totalfreedommod.player.FPlayer;
 import org.bukkit.Location;
 import org.bukkit.Material;
-import org.bukkit.SkullType;
 import org.bukkit.block.Block;
 import org.bukkit.block.Skull;
 
@@ -25,6 +24,8 @@ public class CageData
     private Material outerMaterial = Material.GLASS;
     @Getter
     private Material innerMaterial = Material.AIR;
+    @Getter
+    private static String input = null;
 
     public CageData(FPlayer player)
     {
@@ -57,6 +58,24 @@ public class CageData
         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();
@@ -85,7 +104,7 @@ public class CageData
             return;
         }
 
-        cage(fPlayer.getPlayer().getLocation(), outerMaterial, innerMaterial);
+        cage(fPlayer.getPlayer().getLocation(), outerMaterial, innerMaterial, input);
     }
 
     public void playerQuit()
@@ -165,7 +184,7 @@ public class CageData
 
                     final Block block = center.getRelative(xOffset, yOffset, zOffset);
 
-                    if (material != Material.SKULL)
+                    if (material != Material.PLAYER_HEAD)
                     {
                         // Glowstone light
                         if (material != Material.GLASS && xOffset == 0 && yOffset == 2 && zOffset == 0)
@@ -176,7 +195,7 @@ public class CageData
 
                         block.setType(material);
                     }
-                    else // Darth mode
+                    else
                     {
                         if (Math.abs(xOffset) == length && Math.abs(yOffset) == length && Math.abs(zOffset) == length)
                         {
@@ -184,11 +203,20 @@ public class CageData
                             continue;
                         }
 
-                        block.setType(Material.SKULL);
-                        final Skull skull = (Skull) block.getState();
-                        skull.setSkullType(SkullType.PLAYER);
-                        skull.setOwner("Prozza");
-                        skull.update();
+                        block.setType(Material.PLAYER_HEAD);
+                        if (input != null)
+                        {
+                            try
+                            {
+                                Skull skull = (Skull)block.getState();
+                                // This may or may not work in future versions of spigot
+                                skull.setOwner(input);
+                                skull.update();
+                            }
+                            catch (ClassCastException e)
+                            {
+                            }
+                        }
                     }
                 }
             }

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

@@ -11,6 +11,7 @@ import org.bukkit.event.EventHandler;
 import org.bukkit.event.EventPriority;
 import org.bukkit.event.block.BlockBreakEvent;
 import org.bukkit.event.player.PlayerJoinEvent;
+import org.bukkit.event.player.PlayerKickEvent;
 import org.bukkit.event.player.PlayerMoveEvent;
 import org.bukkit.event.player.PlayerQuitEvent;
 
@@ -95,6 +96,18 @@ public class Cager extends FreedomService
         }
     }
 
+    @EventHandler(priority = EventPriority.MONITOR, ignoreCancelled = true)
+    public void onPlayerKick(PlayerKickEvent event)
+    {
+        FPlayer player = plugin.pl.getPlayer(event.getPlayer());
+        CageData cage = player.getCageData();
+
+        if (cage.isCaged())
+        {
+            cage.playerQuit();
+        }
+    }
+
     @EventHandler(priority = EventPriority.MONITOR, ignoreCancelled = true)
     public void onPlayerJoin(PlayerJoinEvent event)
     {

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

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

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

@@ -24,14 +24,14 @@ public class CommandLoader extends FreedomService
     protected void onStart()
     {
         handler.clearCommands();
-        handler.setExecutorFactory(new FreedomCommandExecutor.FreedomExecutorFactory());
+        handler.setExecutorFactory(new FreedomCommandExecutor.FreedomExecutorFactory(plugin));
         handler.setCommandClassPrefix("Command_");
         handler.setPermissionMessage(ChatColor.RED + "You do not have permission to use this command.");
         handler.setOnlyConsoleMessage(ChatColor.RED + "This command can only be used from the console.");
         handler.setOnlyPlayerMessage(ChatColor.RED + "This command can only be used by players.");
 
         handler.loadFrom(FreedomCommand.class.getPackage());
-        handler.registerAll("TotalFreedomMod", true);
+        handler.registerAll(plugin.getDescription().getName(), true);
 
         FLog.info("Loaded " + handler.getExecutors().size() + " commands.");
     }
@@ -42,4 +42,4 @@ public class CommandLoader extends FreedomService
         handler.clearCommands();
     }
 
-}
+}

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

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

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

@@ -13,4 +13,6 @@ public @interface CommandPermissions
     SourceType source();
 
     boolean blockHostConsole() default false;
-}
+
+    int cooldown() default 0;
+}

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

@@ -2,15 +2,14 @@ package me.totalfreedom.totalfreedommod.command;
 
 import me.totalfreedom.totalfreedommod.player.FPlayer;
 import me.totalfreedom.totalfreedommod.rank.Rank;
-import me.totalfreedom.totalfreedommod.util.FUtil;
-import org.apache.commons.lang3.StringUtils;
+import org.apache.commons.lang.StringUtils;
 import org.bukkit.command.Command;
 import org.bukkit.command.CommandSender;
 import org.bukkit.entity.Player;
 
 @CommandPermissions(level = Rank.SUPER_ADMIN, source = SourceType.BOTH)
 @CommandParameters(
-        description = "AdminChat - Talk privately with other admins. Using <command> itself will toggle AdminChat on and off for all messages.",
+        description = "Talk privately with other administrators on the server.",
         usage = "/<command> [message...]",
         aliases = "o,ac")
 public class Command_adminchat extends FreedomCommand
@@ -23,17 +22,17 @@ public class Command_adminchat extends FreedomCommand
         {
             if (senderIsConsole)
             {
-                msg("Only in-game players can toggle AdminChat.");
+                msg("You must be in-game to toggle admin chat, it cannot be toggled via CONSOLE or Telnet.");
                 return true;
             }
 
             FPlayer userinfo = plugin.pl.getPlayer(playerSender);
             userinfo.setAdminChat(!userinfo.inAdminChat());
-            msg("Toggled Admin Chat " + (userinfo.inAdminChat() ? "on" : "off") + ".");
+            msg("Toggled your admin chat " + (userinfo.inAdminChat() ? "on" : "off") + ".");
         }
         else
         {
-            FUtil.adminChatMessage(sender, StringUtils.join(args, " "));
+            plugin.cm.adminChat(sender, StringUtils.join(args, " "));
         }
 
         return true;

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

@@ -0,0 +1,34 @@
+package me.totalfreedom.totalfreedommod.command;
+
+import java.util.List;
+import me.totalfreedom.totalfreedommod.config.ConfigEntry;
+import me.totalfreedom.totalfreedommod.rank.Rank;
+import me.totalfreedom.totalfreedommod.util.FUtil;
+import org.apache.commons.lang.StringUtils;
+import org.bukkit.ChatColor;
+import org.bukkit.command.Command;
+import org.bukkit.command.CommandSender;
+import org.bukkit.entity.Player;
+
+@CommandPermissions(level = Rank.OP, source = SourceType.BOTH)
+@CommandParameters(description = "Information on how to apply for admin.", usage = "/<command>", aliases = "ai")
+public class Command_admininfo extends FreedomCommand
+{
+
+    @Override
+    public boolean run(CommandSender sender, Player playerSender, Command cmd, String commandLabel, String[] args, boolean senderIsConsole)
+    {
+        List<String> adminInfo = ConfigEntry.ADMIN_INFO.getStringList();
+
+        if (adminInfo.isEmpty())
+        {
+            msg("The admin information section of the config.yml file has not been configured.", ChatColor.RED);
+        }
+        else
+        {
+            msg(FUtil.colorize(StringUtils.join(adminInfo, "\n")));
+        }
+
+        return true;
+    }
+}

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

@@ -1,5 +1,8 @@
 package me.totalfreedom.totalfreedommod.command;
 
+import java.util.Arrays;
+import java.util.Collections;
+import java.util.List;
 import me.totalfreedom.totalfreedommod.config.ConfigEntry;
 import me.totalfreedom.totalfreedommod.rank.Rank;
 import me.totalfreedom.totalfreedommod.util.FUtil;
@@ -7,8 +10,8 @@ import org.bukkit.command.Command;
 import org.bukkit.command.CommandSender;
 import org.bukkit.entity.Player;
 
-@CommandPermissions(level = Rank.SUPER_ADMIN, source = SourceType.ONLY_CONSOLE, blockHostConsole = true)
-@CommandParameters(description = "Close server to non-superadmins.", usage = "/<command> [on | off]")
+@CommandPermissions(level = Rank.TELNET_ADMIN, source = SourceType.BOTH)
+@CommandParameters(description = "Denies joining of operators and only allows admins to join.", usage = "/<command> [on | off]")
 public class Command_adminmode extends FreedomCommand
 {
 
@@ -29,12 +32,12 @@ public class Command_adminmode extends FreedomCommand
         else if (args[0].equalsIgnoreCase("on"))
         {
             ConfigEntry.ADMIN_ONLY_MODE.setBoolean(true);
-            FUtil.adminAction(sender.getName(), "Closing the server to non-superadmins.", true);
+            FUtil.adminAction(sender.getName(), "Closing the server to non-admins.", true);
             for (Player player : server.getOnlinePlayers())
             {
                 if (!isAdmin(player))
                 {
-                    player.kickPlayer("Server is now closed to non-superadmins.");
+                    player.kickPlayer("Server is now closed to non-admins.");
                 }
             }
             return true;
@@ -42,4 +45,15 @@ public class Command_adminmode extends FreedomCommand
 
         return false;
     }
+
+    @Override
+    public List<String> getTabCompleteOptions(CommandSender sender, Command command, String alias, String[] args)
+    {
+        if (args.length == 1 && plugin.al.isAdmin(sender) && !(sender instanceof Player))
+        {
+            return Arrays.asList("on", "off");
+        }
+
+        return Collections.emptyList();
+    }
 }

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

@@ -1,5 +1,9 @@
 package me.totalfreedom.totalfreedommod.command;
 
+import java.util.ArrayList;
+import java.util.Arrays;
+import java.util.Collections;
+import java.util.List;
 import me.totalfreedom.totalfreedommod.rank.Rank;
 import me.totalfreedom.totalfreedommod.util.FUtil;
 import me.totalfreedom.totalfreedommod.world.WorldTime;
@@ -10,15 +14,15 @@ import org.bukkit.command.CommandSender;
 import org.bukkit.entity.Player;
 
 @CommandPermissions(level = Rank.OP, source = SourceType.BOTH)
-@CommandParameters(description = "Go to the AdminWorld.",
-        usage = "/<command> [guest < list | purge | add <player> | remove <player> > | time <morning | noon | evening | night> | weather <off | on | storm>]")
+@CommandParameters(description = "Allows for admins to configure guests, time, and weather of the AdminWorld, and allows for admins and guests to go to the AdminWorld.",
+        usage = "/<command> [guest < list | purge | add <player> | remove <player> > | time <morning | noon | evening | night> | weather <off | rain | storm>]",
+        aliases = "aw")
 public class Command_adminworld extends FreedomCommand
 {
 
     private enum CommandMode
     {
-
-        TELEPORT, GUEST, TIME, WEATHER;
+        TELEPORT, GUEST, TIME, WEATHER
     }
 
     @Override
@@ -245,4 +249,47 @@ public class Command_adminworld extends FreedomCommand
         }
     }
 
+    @Override
+    public List<String> getTabCompleteOptions(CommandSender sender, Command command, String alias, String[] args)
+    {
+        if (!plugin.al.isAdmin(sender))
+        {
+            return Collections.emptyList();
+        }
+        if (args.length == 1)
+        {
+            return Arrays.asList("guest", "time", "weather");
+        }
+        else if (args.length == 2)
+        {
+            if (args[0].equals("guest"))
+            {
+                return Arrays.asList("add", "remove", "list", "purge");
+            }
+            else if (args[0].equals("time"))
+            {
+                return Arrays.asList("morning", "noon", "evening", "night");
+            }
+            else if (args[0].equals("weather"))
+            {
+                return Arrays.asList("off", "rain", "storm");
+            }
+        }
+        else if (args.length == 3)
+        {
+            if (args[0].equals("guest"))
+            {
+                if (args[1].equals("add"))
+                {
+                    return FUtil.getPlayerList();
+                }
+                else if (args[1].equals("remove"))
+                {
+                    return plugin.wm.adminworld.getGuestList();
+                }
+            }
+        }
+        return Collections.emptyList();
+    }
+
 }

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

@@ -0,0 +1,58 @@
+package me.totalfreedom.totalfreedommod.command;
+
+import me.totalfreedom.totalfreedommod.rank.Rank;
+import me.totalfreedom.totalfreedommod.util.FUtil;
+import org.bukkit.GameMode;
+import org.bukkit.command.Command;
+import org.bukkit.command.CommandSender;
+import org.bukkit.entity.Player;
+
+@CommandPermissions(level = Rank.OP, source = SourceType.BOTH)
+@CommandParameters(description = "Quickly change your own gamemode to adventure, define someone's username to change theirs, or change everyone's gamemode on the server.", usage = "/<command> <[partialname] | -a>", aliases = "gma")
+public class Command_adventure extends FreedomCommand
+{
+
+    @Override
+    public boolean run(CommandSender sender, Player playerSender, Command cmd, String commandLabel, String[] args, boolean senderIsConsole)
+    {
+        if (args.length == 0)
+        {
+            if (isConsole())
+            {
+                sender.sendMessage("When used from the console, you must define a target player.");
+                return true;
+            }
+
+            playerSender.setGameMode(GameMode.ADVENTURE);
+            msg("Your gamemode has been set to adventure.");
+            return true;
+        }
+
+        checkRank(Rank.SUPER_ADMIN);
+
+        if (args[0].equals("-a"))
+        {
+            for (Player targetPlayer : server.getOnlinePlayers())
+            {
+                targetPlayer.setGameMode(GameMode.ADVENTURE);
+            }
+
+            FUtil.adminAction(sender.getName(), "Changing everyone's gamemode to adventure", false);
+            msg("Your gamemode has been set to adventure.");
+            return true;
+        }
+
+        Player player = getPlayer(args[0]);
+
+        if (player == null)
+        {
+            sender.sendMessage(FreedomCommand.PLAYER_NOT_FOUND);
+            return true;
+        }
+
+        msg("Setting " + player.getName() + " to game mode adventure.");
+        msg(player, sender.getName() + " set your game mode to adventure.");
+        player.setGameMode(GameMode.ADVENTURE);
+        return true;
+    }
+}

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

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

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

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

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

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

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

@@ -0,0 +1,36 @@
+package me.totalfreedom.totalfreedommod.command;
+
+import me.totalfreedom.totalfreedommod.rank.Rank;
+import org.bukkit.command.Command;
+import org.bukkit.command.CommandSender;
+import org.bukkit.entity.Player;
+
+@CommandPermissions(level = Rank.SUPER_ADMIN, source = SourceType.BOTH)
+@CommandParameters(description = "Toggle whether or not a player has their inventory automatically cleared when they join", usage = "/<command> <player>")
+public class Command_autoclear extends FreedomCommand
+{
+
+    @Override
+    public boolean run(CommandSender sender, Player playerSender, Command cmd, String commandLabel, String[] args, boolean senderIsConsole)
+    {
+        if (args.length == 0)
+        {
+            return false;
+        }
+
+        boolean enabled = plugin.lp.CLEAR_ON_JOIN.contains(args[0]);
+
+        if (enabled)
+        {
+            plugin.lp.CLEAR_ON_JOIN.remove(args[0]);
+        }
+        else
+        {
+            plugin.lp.CLEAR_ON_JOIN.add(args[0]);
+        }
+
+        msg(args[0] + " will " + (enabled ? "no longer" : "now") + " have their inventory cleared when they join.");
+
+        return true;
+    }
+}

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

@@ -0,0 +1,36 @@
+package me.totalfreedom.totalfreedommod.command;
+
+import me.totalfreedom.totalfreedommod.rank.Rank;
+import org.bukkit.command.Command;
+import org.bukkit.command.CommandSender;
+import org.bukkit.entity.Player;
+
+@CommandPermissions(level = Rank.SUPER_ADMIN, source = SourceType.BOTH)
+@CommandParameters(description = "Toggle whether or not a player is automatically teleported when they join", usage = "/<command> <player>")
+public class Command_autotp extends FreedomCommand
+{
+
+    @Override
+    public boolean run(CommandSender sender, Player playerSender, Command cmd, String commandLabel, String[] args, boolean senderIsConsole)
+    {
+        if (args.length == 0)
+        {
+            return false;
+        }
+
+        boolean enabled = plugin.lp.TELEPORT_ON_JOIN.contains(args[0]);
+
+        if (enabled)
+        {
+            plugin.lp.TELEPORT_ON_JOIN.remove(args[0]);
+        }
+        else
+        {
+            plugin.lp.TELEPORT_ON_JOIN.add(args[0]);
+        }
+
+        msg(args[0] + " will " + (enabled ? "no longer" : "now") + " be automatically teleported when they join.");
+
+        return true;
+    }
+}

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

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

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

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

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

@@ -3,12 +3,13 @@ package me.totalfreedom.totalfreedommod.command;
 import me.totalfreedom.totalfreedommod.player.FPlayer;
 import me.totalfreedom.totalfreedommod.rank.Rank;
 import me.totalfreedom.totalfreedommod.util.FUtil;
+import org.bukkit.ChatColor;
 import org.bukkit.command.Command;
 import org.bukkit.command.CommandSender;
 import org.bukkit.entity.Player;
 
 @CommandPermissions(level = Rank.SUPER_ADMIN, source = SourceType.BOTH)
-@CommandParameters(description = "Block all commands for a specific player.", usage = "/<command> <purge | <partialname>>", aliases = "blockcommands,blockcommand")
+@CommandParameters(description = "Block all commands for everyone on the server, or a specific player.", usage = "/<command> <-a | purge | <player>>", aliases = "blockcommands,blockcommand,bc,bcmd")
 public class Command_blockcmd extends FreedomCommand
 {
 
@@ -20,7 +21,7 @@ public class Command_blockcmd extends FreedomCommand
             return false;
         }
 
-        if (args[0].equalsIgnoreCase("purge"))
+        if (args[0].equals("purge"))
         {
             FUtil.adminAction(sender.getName(), "Unblocking commands for all players", true);
             int counter = 0;
@@ -37,6 +38,26 @@ public class Command_blockcmd extends FreedomCommand
             return true;
         }
 
+        if (args[0].equals("-a"))
+        {
+            FUtil.adminAction(sender.getName(), "Blocking commands for all non-admins", true);
+            int counter = 0;
+            for (Player player : server.getOnlinePlayers())
+            {
+                if (isAdmin(player))
+                {
+                    continue;
+                }
+
+                counter += 1;
+                plugin.pl.getPlayer(player).setCommandsBlocked(true);
+                msg(player, "Your commands have been blocked by an admin.", ChatColor.RED);
+            }
+
+            msg("Blocked commands for " + counter + " players.");
+            return true;
+        }
+
         final Player player = getPlayer(args[0]);
 
         if (player == null)
@@ -45,9 +66,9 @@ public class Command_blockcmd extends FreedomCommand
             return true;
         }
 
-        if (isAdmin(sender))
+        if (isAdmin(player))
         {
-            msg(player.getName() + " is a Superadmin, and cannot have their commands blocked.");
+            msg(player.getName() + " is an admin, and cannot have their commands blocked.");
             return true;
         }
 

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

@@ -0,0 +1,134 @@
+package me.totalfreedom.totalfreedommod.command;
+
+import me.totalfreedom.totalfreedommod.player.FPlayer;
+import me.totalfreedom.totalfreedommod.rank.Rank;
+import me.totalfreedom.totalfreedommod.util.FUtil;
+import org.apache.commons.lang.ArrayUtils;
+import org.apache.commons.lang.StringUtils;
+import org.bukkit.ChatColor;
+import org.bukkit.command.Command;
+import org.bukkit.command.CommandSender;
+import org.bukkit.entity.Player;
+
+@CommandPermissions(level = Rank.SUPER_ADMIN, source = SourceType.BOTH)
+@CommandParameters(description = "Restricts/unrestricts block modification abilities for everyone on the server or a certain player.", usage = "/<command> [[-s] <player> [reason] | list | purge | all]")
+public class Command_blockedit extends FreedomCommand
+{
+
+    @Override
+    public boolean run(final CommandSender sender, final Player playerSender, final Command cmd, final String commandLabel, String[] args, final boolean senderIsConsole)
+    {
+        if (args.length == 0)
+        {
+            return false;
+        }
+
+        if (args[0].equals("list"))
+        {
+            msg("The following have block modification abilities restricted:");
+            int count = 0;
+            for (Player player : server.getOnlinePlayers())
+            {
+                final FPlayer info = plugin.pl.getPlayer(player);
+                if (info.isEditBlocked())
+                {
+                    msg("- " + player.getName());
+                    ++count;
+                }
+            }
+
+            if (count == 0)
+            {
+                msg("- none");
+            }
+            return true;
+        }
+
+        if (args[0].equals("purge"))
+        {
+            FUtil.adminAction(sender.getName(), "Unblocking block modification abilities for all players.", true);
+            int count = 0;
+            for (final Player player : this.server.getOnlinePlayers())
+            {
+                final FPlayer info = plugin.pl.getPlayer(player);
+                if (info.isEditBlocked())
+                {
+                    info.setEditBlocked(false);
+                    ++count;
+                }
+            }
+            msg("Unblocked all block modification abilities for " + count + " players.");
+            return true;
+        }
+
+        if (args[0].equals("all"))
+        {
+            FUtil.adminAction(sender.getName(), "Blocking block modification abilities for all non-admins.", true);
+            int counter = 0;
+            for (final Player player : this.server.getOnlinePlayers())
+            {
+                if (!plugin.al.isAdmin((CommandSender)player))
+                {
+                    final FPlayer playerdata = plugin.pl.getPlayer(player);
+                    playerdata.setEditBlocked(true);
+                    ++counter;
+                }
+            }
+
+            msg("Blocked block modification abilities for " + counter + " players.");
+            return true;
+        }
+
+        final boolean smite = args[0].equals("-s");
+        if (smite)
+        {
+            args = (String[])ArrayUtils.subarray((Object[])args, 1, args.length);
+            if (args.length < 1)
+            {
+                return false;
+            }
+        }
+
+        final Player player2 = getPlayer(args[0]);
+        if (player2 == null)
+        {
+            sender.sendMessage(FreedomCommand.PLAYER_NOT_FOUND);
+            return true;
+        }
+
+        String reason = null;
+        if (args.length > 1)
+        {
+            reason = StringUtils.join((Object[])args, " ", 1, args.length);
+        }
+
+        final FPlayer pd = plugin.pl.getPlayer(player2);
+        if (pd.isEditBlocked())
+        {
+            FUtil.adminAction(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((CommandSender)player2))
+            {
+                msg(player2.getName() + " is an admin, and cannot have their block edits blocked.");
+                return true;
+            }
+
+            FUtil.adminAction(sender.getName(), "Blocking block modification abilities for " + player2.getName(), true);
+            pd.setEditBlocked(true);
+
+            if (smite)
+            {
+                Command_smite.smite(sender, player2, reason);
+            }
+
+            msg(player2, "Your block modification abilities have been blocked.", ChatColor.RED);
+            msg("Blocked all block modification abilities for " + player2.getName());
+        }
+        return true;
+    }
+}

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

@@ -0,0 +1,134 @@
+package me.totalfreedom.totalfreedommod.command;
+
+import me.totalfreedom.totalfreedommod.player.FPlayer;
+import me.totalfreedom.totalfreedommod.rank.Rank;
+import me.totalfreedom.totalfreedommod.util.FUtil;
+import org.apache.commons.lang3.ArrayUtils;
+import org.apache.commons.lang3.StringUtils;
+import org.bukkit.ChatColor;
+import org.bukkit.command.Command;
+import org.bukkit.command.CommandSender;
+import org.bukkit.entity.Player;
+
+@CommandPermissions(level = Rank.SUPER_ADMIN, source = SourceType.BOTH)
+@CommandParameters(description = "Toggle PVP mode for everyone or a certain player.", usage = "/<command> [[-s] <player> [reason] | list | purge | all]", aliases = "pvpblock,pvpmode")
+public class Command_blockpvp extends FreedomCommand
+{
+
+    @Override
+    public boolean run(final CommandSender sender, final Player playerSender, final Command cmd, final String commandLabel, String[] args, final boolean senderIsConsole)
+    {
+        if (args.length == 0)
+        {
+            return false;
+        }
+
+        if (args[0].equals("list"))
+        {
+            msg("PVP is blocked for players:");
+            int count = 0;
+            for (Player player : server.getOnlinePlayers())
+            {
+                final FPlayer info = plugin.pl.getPlayer(player);
+                if (info.isPvpBlocked())
+                {
+                    msg(" - " + player.getName());
+                    ++count;
+                }
+            }
+
+            if (count == 0)
+            {
+                msg(" - none");
+            }
+            return true;
+        }
+
+        if (args[0].equals("purge"))
+        {
+            FUtil.adminAction(sender.getName(), "Enabling PVP for all players.", true);
+            int count = 0;
+            for (Player player : server.getOnlinePlayers())
+            {
+                final FPlayer info = plugin.pl.getPlayer(player);
+                if (info.isPvpBlocked())
+                {
+                    info.setPvpBlocked(false);
+                    ++count;
+                }
+            }
+
+            msg("Enabled PVP for " + count + " players.");
+            return true;
+        }
+
+        if (args[0].equals("all"))
+        {
+            FUtil.adminAction(sender.getName(), "Disabling PVP for all non-admins", true);
+            int counter = 0;
+            for (Player player : server.getOnlinePlayers())
+            {
+                if (!plugin.al.isAdmin(player))
+                {
+                    final FPlayer playerdata = plugin.pl.getPlayer(player);
+                    playerdata.setPvpBlocked(true);
+                    ++counter;
+                }
+            }
+
+            msg("Disabling PVP for " + counter + " players.");
+            return true;
+        }
+
+        final boolean smite = args[0].equals("-s");
+        if (smite)
+        {
+            args = ArrayUtils.subarray(args, 1, args.length);
+            if (args.length < 1)
+            {
+                return false;
+            }
+        }
+
+        final Player p = getPlayer(args[0]);
+        if (p == null)
+        {
+            sender.sendMessage(FreedomCommand.PLAYER_NOT_FOUND);
+            return true;
+        }
+
+        String reason = null;
+        if (args.length > 1)
+        {
+            reason = StringUtils.join(args, " ", 1, args.length);
+        }
+
+        final FPlayer pd = plugin.pl.getPlayer(p);
+        if (pd.isPvpBlocked())
+        {
+            FUtil.adminAction(sender.getName(), "Enabling PVP for " + p.getName(), true);
+            pd.setPvpBlocked(false);
+            msg("Enabling PVP  for  " + p.getName());
+            msg(p, "Your PVP have been enabled.", ChatColor.GREEN);
+        }
+        else
+        {
+            if (plugin.al.isAdmin(p))
+            {
+                msg(p.getName() + " is an admin, and cannot have their PVP disabled.");
+                return true;
+            }
+
+            FUtil.adminAction(sender.getName(), "Disabling PVP for " + p.getName(), true);
+            pd.setPvpBlocked(true);
+            if (smite)
+            {
+                Command_smite.smite(sender, p, reason);
+            }
+
+            msg(p, "Your PVP has been disabled.", ChatColor.RED);
+            msg("Disabled PVP for " + p.getName());
+        }
+        return true;
+    }
+}

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

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

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

@@ -1,8 +1,13 @@
 package me.totalfreedom.totalfreedommod.command;
 
+import java.util.ArrayList;
+import java.util.Arrays;
+import java.util.Collections;
+import java.util.List;
 import me.totalfreedom.totalfreedommod.player.FPlayer;
 import me.totalfreedom.totalfreedommod.rank.Rank;
 import me.totalfreedom.totalfreedommod.util.FUtil;
+import org.bukkit.ChatColor;
 import org.bukkit.GameMode;
 import org.bukkit.Location;
 import org.bukkit.Material;
@@ -11,100 +16,135 @@ import org.bukkit.command.CommandSender;
 import org.bukkit.entity.Player;
 
 @CommandPermissions(level = Rank.SUPER_ADMIN, source = SourceType.BOTH)
-@CommandParameters(description = "Place a cage around someone.", usage = "/<command> <purge | off | <partialname> [outermaterial] [innermaterial]>")
+@CommandParameters(description = "Place a cage around someone with certain blocks, or someone's player head.", usage = "/<command> <purge | off | <partialname> [head | block] [playername | blockname]")
 public class Command_cage extends FreedomCommand
 {
 
-    @Override
-    public boolean run(CommandSender sender, Player playerSender, Command cmd, String commandLabel, String[] args, boolean senderIsConsole)
+    public boolean run(final CommandSender sender, final Player playerSender, final Command cmd, final String commandLabel, final String[] args, final boolean senderIsConsole)
     {
         if (args.length == 0)
         {
             return false;
         }
-
+        String skullName = null;
         if ("off".equals(args[0]) && sender instanceof Player)
         {
             FUtil.adminAction(sender.getName(), "Uncaging " + sender.getName(), true);
-            FPlayer playerdata = plugin.pl.getPlayer(playerSender);
-
+            final FPlayer playerdata = plugin.pl.getPlayer(playerSender);
             playerdata.getCageData().setCaged(false);
             return true;
         }
-        else if ("purge".equals(args[0]))
+        if ("purge".equals(args[0]))
         {
             FUtil.adminAction(sender.getName(), "Uncaging all players", true);
-
             for (Player player : server.getOnlinePlayers())
             {
-                FPlayer playerdata = plugin.pl.getPlayer(player);
-                playerdata.getCageData().setCaged(false);
+                final FPlayer fPlayer = plugin.pl.getPlayer(player);
+                fPlayer.getCageData().setCaged(false);
             }
-
             return true;
         }
-
-        final Player player = getPlayer(args[0]);
-
+        Player player = getPlayer(args[0]);
         if (player == null)
         {
             sender.sendMessage(FreedomCommand.PLAYER_NOT_FOUND);
             return true;
         }
-
-        FPlayer playerdata = plugin.pl.getPlayer(player);
-
+        final FPlayer fPlayer = plugin.pl.getPlayer(player);
         Material outerMaterial = Material.GLASS;
         Material innerMaterial = Material.AIR;
-
-        if (args.length >= 2)
+        if (args.length >= 2 && args[1] != null)
         {
-            if ("off".equals(args[1]))
+            final String s = args[1];
+            switch (s)
             {
-                FUtil.adminAction(sender.getName(), "Uncaging " + player.getName(), true);
-                playerdata.getCageData().setCaged(false);
-
-                return true;
-            }
-            else
-            {
-                if ("darth".equalsIgnoreCase(args[1]))
+                case "off":
                 {
-                    outerMaterial = Material.SKULL;
+                    FUtil.adminAction(sender.getName(), "Uncaging " + player.getName(), true);
+                    fPlayer.getCageData().setCaged(false);
+                    return true;
                 }
-                else if (Material.matchMaterial(args[1]) != null)
+                case "head":
                 {
-                    outerMaterial = Material.matchMaterial(args[1]);
+                    outerMaterial = Material.PLAYER_HEAD;
+                    if (args.length >= 3)
+                    {
+                        skullName = args[2];
+                    }
+                    else
+                    {
+                        outerMaterial = Material.SKELETON_SKULL;
+                    }
+                    break;
+                }
+                case "block":
+                {
+                    if (Material.matchMaterial(args[2]) != null)
+                    {
+                        outerMaterial = Material.matchMaterial(args[2]);
+                        break;
+                    }
+                    sender.sendMessage(ChatColor.RED + "Invalid block!");
+                    break;
                 }
             }
         }
 
-        if (args.length >= 3)
+        Location location = player.getLocation().clone().add(0.0, 1.0, 0.0);
+        if (skullName != null)
         {
-            if (args[2].equalsIgnoreCase("water"))
-            {
-                innerMaterial = Material.STATIONARY_WATER;
-            }
-            else if (args[2].equalsIgnoreCase("lava"))
-            {
-                innerMaterial = Material.STATIONARY_LAVA;
-            }
-        }
-
-        Location targetPos = player.getLocation().clone().add(0, 1, 0);
-        playerdata.getCageData().cage(targetPos, outerMaterial, innerMaterial);
-
-        player.setGameMode(GameMode.SURVIVAL);
-
-        if (outerMaterial != Material.SKULL)
-        {
-            FUtil.adminAction(sender.getName(), "Caging " + player.getName(), true);
+            fPlayer.getCageData().cage(location, outerMaterial, innerMaterial, skullName);
         }
         else
         {
-            FUtil.adminAction(sender.getName(), "Caging " + player.getName() + " in PURE_DARTH", true);
+            fPlayer.getCageData().cage(location, outerMaterial, innerMaterial);
+        }
+        player.setGameMode(GameMode.SURVIVAL);
+        if (outerMaterial == Material.PLAYER_HEAD)
+        {
+            FUtil.adminAction(sender.getName(), "Caging " + player.getName() + " in " + skullName, true);
+        }
+        else
+        {
+            FUtil.adminAction(sender.getName(), "Caging " + player.getName(), true);
         }
-
         return true;
     }
+
+    @Override
+    public List<String> getTabCompleteOptions(CommandSender sender, Command command, String alias, String[] args)
+    {
+        if (!plugin.al.isAdmin(sender))
+        {
+            return null;
+        }
+
+        if (args.length == 1)
+        {
+            List<String> arguments = new ArrayList<>();
+            arguments.add("purge");
+            arguments.addAll(FUtil.getPlayerList());
+            return arguments;
+        }
+        else if (args.length == 2)
+        {
+            if (!args[0].equals("purge"))
+            {
+                return Arrays.asList("off", "head", "block");
+            }
+        }
+        else if (args.length == 3)
+        {
+            if (args[1].equals("block"))
+            {
+                return FUtil.getAllMaterialNames();
+            }
+            else if (args[1].equals("head"))
+            {
+                return FUtil.getPlayerList();
+            }
+        }
+
+        return Collections.emptyList();
+    }
 }

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

@@ -1,9 +1,7 @@
 package me.totalfreedom.totalfreedommod.command;
 
-import java.util.Random;
 import me.totalfreedom.totalfreedommod.rank.Rank;
 import me.totalfreedom.totalfreedommod.util.FUtil;
-import org.bukkit.Achievement;
 import org.bukkit.ChatColor;
 import org.bukkit.Material;
 import org.bukkit.command.Command;
@@ -13,42 +11,37 @@ import org.bukkit.inventory.ItemStack;
 import org.bukkit.inventory.meta.ItemMeta;
 
 @CommandPermissions(level = Rank.SUPER_ADMIN, source = SourceType.BOTH)
-@CommandParameters(description = "For the people that are still alive.", usage = "/<command>")
+@CommandParameters(description = "For the people that are still alive - gives a cake to everyone on the server.", usage = "/<command>")
 public class Command_cake extends FreedomCommand
 {
 
     public static final String CAKE_LYRICS = "But there's no sense crying over every mistake. You just keep on trying till you run out of cake.";
-    private final Random random = new Random();
 
     @Override
-    public boolean run(CommandSender sender, Player playerSender, Command cmd, String commandLabel, String[] args, boolean senderIsConsole)
+    public boolean run(final CommandSender sender, final Player playerSender, final Command cmd, final String commandLabel, final String[] args, final boolean senderIsConsole)
     {
         final StringBuilder output = new StringBuilder();
 
-        final String[] words = CAKE_LYRICS.split(" ");
-        for (final String word : words)
+        for (final String word : CAKE_LYRICS.split(" "))
         {
-            output.append(ChatColor.COLOR_CHAR).append(Integer.toHexString(1 + random.nextInt(14))).append(word).append(" ");
+            output.append(FUtil.randomChatColor()).append(word).append(" ");
         }
 
         final ItemStack heldItem = new ItemStack(Material.CAKE);
         final ItemMeta heldItemMeta = heldItem.getItemMeta();
-        heldItemMeta.setDisplayName((new StringBuilder()).append(ChatColor.WHITE).append("The ").append(ChatColor.DARK_GRAY).append("Lie").toString());
+        heldItemMeta.setDisplayName(ChatColor.WHITE + "The " + ChatColor.DARK_GRAY + "Lie");
         heldItem.setItemMeta(heldItemMeta);
 
-        for (final Player player : server.getOnlinePlayers())
+        for (final Player player : this.server.getOnlinePlayers())
         {
             final int firstEmpty = player.getInventory().firstEmpty();
             if (firstEmpty >= 0)
             {
                 player.getInventory().setItem(firstEmpty, heldItem);
             }
-
-            player.awardAchievement(Achievement.BAKE_CAKE);
         }
 
         FUtil.bcastMsg(output.toString());
-
         return true;
     }
 }