Start documenting some of the bradle scripts.

Signed-off-by: Gabriel Harris-Rouquette <gabizou@me.com>

.gitignore

@@ -1,54 +1,330 @@
-# Eclipse stuff
-/.classpath
-/.project
-/.settings
-/dependency-reduced-pom.xml
 
-#vs code
+### Eclipse template
-/.vscode
 
-# Maven Depends
+.metadata
-/lib
+bin/
+tmp/
+*.tmp
+*.bak
+*.swp
+*~.nib
+local.properties
+.settings/
+.loadpath
+.recommenders
 
-# gradle
+# External tool builders
-/.gradle
+.externalToolBuilders/
-/mcMMO-core/.gradle
-/mcMMO-core/gradle
 
-# netbeans
+# Locally stored "Eclipse launch configurations"
-/nbproject
+*.launch
 
-# we use maven!
+# PyDev specific (Python IDE for Eclipse)
-/build.xml
+*.pydevproject
 
-# maven
+# CDT-specific (C/C++ Development Tooling)
-/target
+.cproject
 
-# vim
+# CDT- autotools
-.*.sw[a-p]
+.autotools
 
-# various other potential build files
+# Java annotation processor (APT)
-/build
+.factorypath
-/bin
-/dist
-/manifest.mf
 
-/world
+# PDT-specific (PHP Development Tools)
+.buildpath
 
-# Mac filesystem dust
+# sbteclipse plugin
-*.DS_Store
+.target
 
-# intellij
+# Tern plugin
+.tern-project
+
+# TeXlipse plugin
+.texlipse
+
+# STS (Spring Tool Suite)
+.springBeans
+
+# Code Recommenders
+.recommenders/
+
+# Annotation Processing
+.apt_generated/
+
+# Scala IDE specific (Scala & Java development for Eclipse)
+.cache-main
+.scala_dependencies
+.worksheet
+### Android template
+# Built application files
+*.apk
+*.ap_
+
+# Files for the ART/Dalvik VM
+*.dex
+
+# Java class files
+*.class
+
+# Generated files
+gen/
+out/
+
+# Gradle files
+.gradle/
+build/
+
+# Local configuration file (sdk path, etc)
+# Proguard folder generated by Eclipse
+proguard/
+
+# Log Files
+*.log
+
+# Android Studio Navigation editor temp files
+.navigation/
+
+# Android Studio captures folder
+captures/
+
+# IntelliJ
 *.iml
-*.ipr
+.idea/workspace.xml
+.idea/tasks.xml
+.idea/gradle.xml
+.idea/assetWizardSettings.xml
+.idea/dictionaries
+.idea/libraries
+.idea/caches
+
+# Keystore files
+# Uncomment the following line if you do not want to check your keystore files in.
+#*.jks
+
+# External native build folder generated in Android Studio 2.2 and later
+.externalNativeBuild
+
+# Google Services (e.g. APIs or Firebase)
+google-services.json
+
+# Freeline
+freeline.py
+freeline/
+freeline_project_description.json
+
+# fastlane
+fastlane/report.xml
+fastlane/Preview.html
+fastlane/screenshots
+fastlane/test_output
+fastlane/readme.md
+### Dropbox template
+# Dropbox settings and caches
+.dropbox
+.dropbox.attr
+.dropbox.cache
+### Windows template
+# Windows thumbnail cache files
+Thumbs.db
+ehthumbs.db
+ehthumbs_vista.db
+
+# Dump file
+*.stackdump
+
+# Folder config file
+[Dd]esktop.ini
+
+# Recycle Bin used on file shares
+$RECYCLE.BIN/
+
+# Windows Installer files
+*.cab
+*.msi
+*.msix
+*.msm
+*.msp
+
+# Windows shortcuts
+*.lnk
+### Maven template
+target/
+pom.xml.tag
+pom.xml.releaseBackup
+pom.xml.versionsBackup
+pom.xml.next
+release.properties
+dependency-reduced-pom.xml
+buildNumber.properties
+.mvn/timing.properties
+.mvn/wrapper/maven-wrapper.jar
+### NetBeans template
+nbproject/private/
+nbbuild/
+dist/
+nbdist/
+.nb-gradle/
+### macOS template
+# General
+.DS_Store
+.AppleDouble
+.LSOverride
+
+# Icon must end with two \r
+Icon
+
+# Thumbnails
+._*
+
+# Files that might appear in the root of a volume
+.DocumentRevisions-V100
+.fseventsd
+.Spotlight-V100
+.TemporaryItems
+.Trashes
+.VolumeIcon.icns
+.com.apple.timemachine.donotpresent
+
+# Directories potentially created on remote AFP share
+.AppleDB
+.AppleDesktop
+Network Trash Folder
+Temporary Items
+.apdisk
+### Linux template
+*~
+
+# temporary files which can be created if a process still has a handle open of a deleted file
+.fuse_hidden*
+
+# KDE directory preferences
+.directory
+
+# Linux trash folder which might appear on any partition or disk
+.Trash-*
+
+# .nfs files are created when an open file is removed but is still being accessed
+.nfs*
+### GPG template
+secring.*
+
+### Gradle template
+.gradle
+/build/
+
+# Ignore Gradle GUI config
+gradle-app.setting
+
+# Avoid ignoring Gradle wrapper jar file (.jar files are usually ignored)
+!gradle-wrapper.jar
+
+# Cache of project
+.gradletasknamecache
+
+# # Work around https://youtrack.jetbrains.com/issue/IDEA-116898
+# gradle/wrapper/gradle-wrapper.properties
+### SBT template
+# Simple Build Tool
+# http://www.scala-sbt.org/release/docs/Getting-Started/Directories.html#configuring-version-control
+
+dist/*
+lib_managed/
+src_managed/
+project/boot/
+project/plugins/project/
+.history
+.cache
+.lib/
+### Example user template template
+### Example user template
+
+# IntelliJ project files
+.idea
+out
+gen### JetBrains template
+# Covers JetBrains IDEs: IntelliJ, RubyMine, PhpStorm, AppCode, PyCharm, CLion, Android Studio and WebStorm
+# Reference: https://intellij-support.jetbrains.com/hc/en-us/articles/206544839
+
+# User-specific stuff
+.idea/**/workspace.xml
+.idea/**/tasks.xml
+.idea/**/usage.statistics.xml
+.idea/**/dictionaries
+.idea/**/shelf
+
+# Sensitive or high-churn files
+.idea/**/dataSources/
+.idea/**/dataSources.ids
+.idea/**/dataSources.local.xml
+.idea/**/sqlDataSources.xml
+.idea/**/dynamic.xml
+.idea/**/uiDesigner.xml
+.idea/**/dbnavigator.xml
+
+# Gradle
+.idea/**/gradle.xml
+.idea/**/libraries
+
+# Gradle and Maven with auto-import
+# When using Gradle or Maven with auto-import, you should exclude module files,
+# since they will be recreated, and may cause churn.  Uncomment if using
+# auto-import.
+# .idea/modules.xml
+# .idea/*.iml
+# .idea/modules
+
+# CMake
+cmake-build-*/
+
+# Mongo Explorer plugin
+.idea/**/mongoSettings.xml
+
+# File-based project format
 *.iws
-.idea/
 
-# Project Stuff
+# IntelliJ
-/src/main/resources/mcMMO
+# mpeltonen/sbt-idea plugin
+.idea_modules/
 
-# Other Libraries
+# JIRA plugin
+atlassian-ide-plugin.xml
+
+# Cursive Clojure plugin
+.idea/replstate.xml
+
+# Crashlytics plugin (for Android Studio and IntelliJ)
+com_crashlytics_export_strings.xml
+crashlytics.properties
+crashlytics-build.properties
+fabric.properties
+
+# Editor-based Rest Client
+.idea/httpRequests
+### Kotlin template
+# Compiled class file
+# Log file
+# BlueJ files
+*.ctxt
+
+# Mobile Tools for Java (J2ME)
+.mtj.tmp/
+
+# Package Files #
 *.jar
+*.war
+*.nar
+*.ear
+*.zip
+*.tar.gz
+*.rar
 
-# Atlassian Stuff
+# virtual machine crash logs, see http://www.java.com/en/download/help/error_hotspot.xml
-/atlassian-ide-plugin.xml
+hs_err_pid*
+### Java template
+# Compiled class file
+# Log file
+# BlueJ files
+# Mobile Tools for Java (J2ME)
+# Package Files #
+# virtual machine crash logs, see http://www.java.com/en/download/help/error_hotspot.xml

Changelog.txt

@@ -8,6 +8,13 @@ Key:
   - Removal
 
 Version 2.2.0
+    mcMMO has a new config system (WIP)
+    mcMMO for Bukkit no longer requires Spigot in order to play, you can now use Bukkit instead (WIP)
+    mcMMO is now abstracted from the Bukkit API in order to support more platforms (WIP)
+    mcMMO has changed from using maven to gradle!
+    mcMMO is now a gradle project (this makes it much easier for us to support older versions of MC and other APIs)
+
+Version 2.1.12
     Salvage config entries are no longer case sensitive
     Fixed a bug where Fishing was not rewarding vanilla XP orbs
 
@@ -439,7 +446,7 @@ Version 1.4.08
  = Fixed bug which prevented players from gaining Acrobatics XP when the setting 'Prevent_XP_After_Teleport' was set to false
  = Fixed bug where cooldown donor perks were reducing more than expected
  = Fixed bug where disabling hardcore mode for specific skills didn't work
- = Fixed bug which caused the backup cleanup to delete old backups while it should have kept those
+ = Fixed bug which caused the net.shatteredlands.shatt.backup cleanup to delete old backups while it should have kept those
  = Fixed bug where party chat broke if the display name contained special characters
  = Fixed bug where `/addlevels all` and `/skillreset all` didn't work
  = Fixed bug which made it possible to gain XP by taming the same horse multiple times, if a player "untamed" that horse
@@ -787,7 +794,7 @@ Version 1.4.00
  ! Changed Excavation to have individual XP values for each block type, rather than a base XP value.
  ! Changed the way party teleportation works. When using /ptp, the target player needs to confirm the teleport before it takes place. (Configurable)
  ! Changed BeastLore: Now also displays offline player names
- ! Changed backup task to include ALL config files
+ ! Changed net.shatteredlands.shatt.backup task to include ALL config files
  ! Deprecated most functions in ExperienceAPI, replaced them with identical versions that use a String for the SkillName rather than the SkillType enum values
  ! Changed Super Breaker & Giga Drill Breaker to be an enchantment-based boost, rather than an instabreak. Option exists in hidden.yml to change this to an potion-based buff.
  ! Changed locales to fall back on English when translated strings cannot be found.
@@ -1010,7 +1017,7 @@ Version 1.3.07
  + Added permission nodes for Treasure & Magic Hunter for Fishing
  + Added a permission node for Farmer's Diet
  + Added config options for enabling/disabling specific double drops
- + Added automatic zip backup of flatfile database & config files
+ + Added automatic zip net.shatteredlands.shatt.backup of flatfile database & config files
  + Added config options to enable/disable specific skills for PVP & PVE
  = Fixed bug where Tree Feller was looking at the wrong blocks for determining how much to take down.
  = Fixed bug where Green Terra consumed seeds even on Mossy Stone Brick
@@ -1596,7 +1603,7 @@ Fixed bug with randomly receiving Taming XP
 mcmmo.users file moved into /plugins/mcMMO/FlatFileStuff/
 Leaderboard files now moved into /plugins/mcMMO/FlatFileStuff/Leaderboards
 Locale files now have the prefix locale_ instead of messages_
-Locale files are now located inside com/gmail/nossr50/locale/ instead of com/gmail/nossr50/
+Locale files are now located inside com/com.gmail/com.gmail.nossr50/locale/ instead of com/com.gmail/com.gmail.nossr50/
 Updated the code that handles permissions (this may mean 3.1.6 will finally play well!)
 Some more source code organization
 Fixed warnings for compiler

README.md

@@ -8,6 +8,22 @@ You can check it out here http://www.mcmmo.org
 
 I plan to post links to our new wiki (its still under development), downloads, and dev blogs there.
 
+### Contributing
+As the plugin is being developed for multiple Minecraft versions, and multiple Minecraft platforms (read: [sponge](https://spongepowered.org/), [spigot](https://spigotmc.org/), bukkit, and [paper](https://papermc.io)), the
+overall build process is handled by [Gradle](https://gradle.org/) with [Kotlin-dsl](https://github.com/gradle/kotlin-dsl) based scripts.
+As such, an IDE is strongly recommended when attempting to contribute features, additions, changes, bug fixes, etc. to mcMMO as the scripts handle a
+majority of our dependencies and rebuilding a production worthy jar.
+
+To get started, a few things need to be installed:
+- JDK 8 (not 9, 10, 11, or 7)
+- git
+- Your favorite IDE (can be [Eclipse](https://eclipse.org/), [IntelliJ](https://jetbrains.org/)
+- BuildTools.jar from [Spigot](https://www.spigotmc.org/wiki/buildtools/)
+
+##### Using BuildTools
+BuildTools is used to generate the craftbukkit/spigot dependencies used for varoius versions of Minecraft.
+The key with this tool is that it can build and deploy multiple vesions of Minecraft based on "reviewions".
+
 
 ### Builds
 Currently, you can obtain our builds via the Spigot resource page: https://spigot.mcmmo.org
@@ -19,7 +35,7 @@ The goal of mcMMO is to take core Minecraft game mechanics and expand them into
 mcMMO is currently developed by a team of individuals from all over the world.
 
 ### Project Lead & Founder
-[![nossr50](http://www.gravatar.com/avatar/f2ee41eedfd645fb4a3a2c8f6cb1b18c.png)](https://github.com/nossr50)
+[![com.gmail.nossr50](http://www.gravatar.com/avatar/f2ee41eedfd645fb4a3a2c8f6cb1b18c.png)](https://github.com/com.gmail.nossr50)
 
 ### Former Lead
 [![gmcferrin](http://www.gravatar.com/avatar/b64c52daf25d206b27650788b5813b7b.png)](https://github.com/gmcferrin)

build.gradle.kts

@@ -0,0 +1,139 @@
+import com.github.jengelman.gradle.plugins.shadow.tasks.ConfigureShadowRelocation
+import com.github.jengelman.gradle.plugins.shadow.tasks.ShadowJar
+
+/*
+ * Declares the version of the Gradle wrapper. We need 4.9 for now because
+ * ForgeGradle 3+ is a hard dependency for Gradle 4.9, 4.10 is not compatible
+ */
+val wrapper by tasks.getting(Wrapper::class) {
+  gradleVersion = "4.9"
+}
+
+/*
+ * Sets up project references to be used in child scripts, like
+ * ":bukkit", ":core", ":sponge" where these projects need to be
+ * referred to for dependencies, paths, outputs etc.
+ * Projects is specifically an object stored in <root>/buildSrc/src/main/java/Config.kt
+ * It's a nullable variable, but we just store it here and use it elsewhere.
+ */
+Projects.core = project("core")
+Projects.bukkit = project("bukkit")
+Projects.sponge = project("sponge")
+/*
+Declares the various other projects and stores them to Gradle's `extra` properties.
+These are potentially usable for other purposes, but for now, they're here only to
+declare the values for this root project's dependency (for shadowjar)
+ */
+var core: Project by extra { project("core") }
+val bukkit by extra { project("bukkit") }
+val bukkit_18 by extra { bukkit.project("1_8_8") }
+val bukkit_112 by extra { bukkit.project("1_12") }
+val bukkit_113 by extra { bukkit.project("1_13") }
+val sponge by extra { project("sponge") }
+val sponge_7 by extra { sponge.project("api7") }
+
+group = properties["pluginGroup"]!!
+version = properties["pluginVersion"]!!
+
+/*
+Even though all projects declares some of these plugins, we want to declare them the traditional
+way so that we can have IDE utiliziation and processing, it helps with writing these scripts.
+ */
+plugins {
+    `java-library`
+    `maven-publish`
+    id("com.github.johnrengelman.shadow") version "4.0.4"
+}
+
+/*
+Default management for ALL projects, not just root, or ":bukkit", but all projects and
+their children projects.
+ */
+allprojects {
+    /*
+    We need the java library processing, and shadow allows us to run
+    shadowJar to relocate dependencies and bundle dependencies into a fat jar.
+     */
+    apply(plugin="java-library")
+    apply(plugin="com.github.johnrengelman.shadow")
+
+    /*
+    Defines all the repositories for all project dependency resolutions. Some of these
+    repositories are meant for specific dependencies, so the content filters will
+    prevent attempts at resolving those dependencies being requested at those repositories.
+    Constants are defined in <root>/buildSrc/src/main/java/Config.kt
+     */
+    repositories {
+        mavenCentral()
+        maven(Repos.sk89q) // WorldEdit/WorldGuard
+        maven(Repos.bstats) // bstats
+        maven(Repos.sponge) // Sponge, Configurate, and some other things
+        maven(Repos.spigot) // Spigot and Bukkit
+        maven(Repos.sonatype) // General Maven
+        mavenLocal() // For nms packages
+    }
+
+    // Sets all projects compatibility level to Java 8
+    java {
+        sourceCompatibility = JavaVersion.VERSION_1_8
+        targetCompatibility = JavaVersion.VERSION_1_8
+    }
+    // Encoding for all packages is UTF-8
+    tasks.getting(JavaCompile::class) {
+        options.encoding = "UTF-8"
+    }
+    // Default shadow jar configuration. Sub projects will override and add on,
+    // but this sets up at the very least the jdbc connection dependencies to be relocated
+    val shadowJar by tasks.getting(ShadowJar::class) { // Configure basics of relocation
+        relocate(Shadow.Origin.juli, Shadow.Target.juli)
+        relocate(Shadow.Origin.tomcat, Shadow.Target.tomcat)
+        exclude(Shadow.Exclude.ForgeGradle.dummyThing)
+        exclude(Shadow.Exclude.ForgeGradle.template)
+    }
+
+}
+
+/*
+All subprojects shadowjar tasks that will exclude various dependencies, while
+the root project will include some of these dependencies (like jdbc, configurate)
+so that the sub project jars are already somewhat minimized, in the event those
+platform jars are to be deployed individually versus an overall "all platforms"
+jar.
+ */
+subprojects {
+    val shadowJar by tasks.getting(ShadowJar::class) {
+        dependencies {
+            exclude(dependency("${Deps.Groups.sponge}:${Deps.Modules.configurate_yaml}"))
+            exclude(dependency(Shadow.Exclude.guava))
+            exclude(dependency(Shadow.Exclude.snakeyaml))
+            exclude(dependency(Shadow.Exclude.tomcat))
+            exclude(dependency(Shadow.Exclude.juli))
+        }
+    }
+}
+
+// Sets up this root project to depend on all the implementations supported.
+// By default, they all already should have shadow relocations and packaging,
+// and their dependencies should not be leaking into this project.
+dependencies {
+    compile(bukkit)
+    compile(sponge)
+    compile(bukkit_18)
+    compile(bukkit_112)
+    compile(bukkit_113)
+    compile(sponge_7)
+}
+
+// Configure shadow for the root project, we want to relocate bstats-bukkit
+// and whatever else is configured in the allProjects configuration
+val shadowJar by tasks.getting(ShadowJar::class) { // Root shadow relocation
+
+    relocate(Shadow.Origin.bstatsBukkit, Shadow.Target.bstatsBukkit)
+
+    baseName = "mcMMO"
+    classifier = "bundle"
+}
+
+// Tell the build task to depend on shadowjar.
+val build by tasks
+build.dependsOn(shadowJar)

buildSrc/build.gradle.kts

@@ -0,0 +1,8 @@
+plugins {
+    `kotlin-dsl`
+}
+
+repositories {
+    jcenter()
+}
+

buildSrc/src/main/java/Config.kt

@@ -0,0 +1,191 @@
+@file:Suppress("MayBeConstant", "unused")
+
+import org.gradle.api.Project
+
+object Plugins {
+    const val spongeGradleId = "${Deps.Groups.sponge}.plugin"
+
+    object FG2_3 {
+        const val classpath = "net.minecraftforge.gradle:ForgeGradle:${Versions.fg23}"
+        const val extensionName = "minecraft"
+        const val id = "net.minecraftforge.gradle.forge"
+    }
+}
+
+object Repos {
+    const val sk89q = "https://maven.sk89q.com/repo"
+    // bStats
+    const val bstats = "https://repo.codemc.org/repository/maven-public"
+    // configurate
+    const val sponge = "https://repo.spongepowered.org/maven/"
+    const val spigot = "https://hub.spigotmc.org/nexus/content/repositories/snapshots"
+    const val sonatype = "https://oss.sonatype.org/content/repositories/snapshots"
+    const val forge = "https://files.minecraftforge.net/maven/"
+}
+
+object Config {
+
+    object Libs {
+        const val configurate = "${Deps.Groups.sponge}:${Deps.Modules.configurate_yaml}:${Versions.configurate}"
+        const val jdbc = "${Deps.Groups.tomcat}:${Deps.Modules.jdbc}:${Versions.jdbc}"
+        const val juli = "${Deps.Groups.tomcat}:${Deps.Modules.juli}:${Versions.jdbc}"
+        const val junitDep = "${Deps.Groups.junit}:${Deps.Modules.junit}:${Versions.junit}"
+        const val flowmath = "${Deps.Groups.flowpowered}:${Deps.Modules.flowmath}:${Versions.flowmath}"
+
+        object Bukkit {
+            object `1_8` {
+                const val api = "$bukkit:${Versions.bukkit18}"
+                const val spigotApi = "${Bukkit.spigotApi}:${Versions.bukkit18}"
+                const val spigot = "$${Bukkit.spigot}:${Versions.bukkit18}"
+                const val nms = "$craftbukkit:${Versions.bukkit18}"
+                // only legacy existed at this point, no core.
+                const val wgLegacy = "${Bukkit.wgLegacy}:${Versions.wg18}"
+            }
+
+            object `1_12` {
+                const val api = "$bukkit:${Versions.bukkit112}"
+                const val spigotApi = "${Bukkit.spigotApi}:${Versions.bukkit112}"
+                const val spigot = "$${Bukkit.spigot}:${Versions.bukkit112}"
+                const val nms = "$craftbukkit:${Versions.bukkit112}"
+                // only legacy existed at this point, no core.
+                const val wgLegacy = "${Bukkit.wgLegacy}:${Versions.wg112}"
+            }
+
+            object `1_13` {
+                const val api = "$bukkit:${Versions.bukkit113}"
+                const val spigotApi = "${Bukkit.spigotApi}:${Versions.bukkit113}"
+                const val spigot = "$${Bukkit.spigot}:${Versions.bukkit113}"
+                const val nms = "$craftbukkit:${Versions.bukkit113}"
+                const val wgCore = "${Bukkit.wgCore}:${Versions.wg113}"
+                const val wgLegacy = "${Bukkit.wgLegacy}:${Versions.wg113}"
+            }
+
+            const val bukkit = "${Deps.Groups.bukkit}:${Deps.Modules.bukkit}"
+            const val craftbukkit = "${Deps.Groups.bukkit}:${Deps.Modules.craftbukkit}"
+            const val wgCore = "${Deps.Groups.worldguard}:${Deps.Modules.wgCore}"
+            const val wgLegacy = "${Deps.Groups.worldguard}:${Deps.Modules.wgLegacy}"
+            const val spigotApi = "${Deps.Groups.spigot}:${Deps.Modules.spigotApi}"
+            const val spigot = "${Deps.Groups.spigot}:${Deps.Modules.spigot}"
+            const val bstats = "${Deps.Groups.bstats}:${Deps.Modules.bstatsBukit}:${Versions.bstats}"
+        }
+
+        object Sponge {
+            object API7 { // All of these are specific to the API7 module, API8 will change
+                const val forgeGradleId = "net.minecraftforge.gradle.forge"
+                const val spongeGradleId = "${Deps.Groups.sponge}.plugin"
+                const val spongeGradleVersion = "0.9.0"
+                const val api = "${Sponge.api}:${Versions.sapi7}"
+                const val common = "${Sponge.common}:${Versions.spongeImpl7}"
+                const val forge_version = "14.23.5.2768"
+                const val minecraftVersion = "1.12.2-$forge_version"
+                const val mappings = "snapshot_20180808"
+            }
+
+            object Exclude {
+                const val group = Deps.Groups.sponge
+                const val module = Deps.Modules.spongeAPI
+            }
+
+            const val api = "${Deps.Groups.sponge}:${Deps.Modules.spongeAPI}"
+            const val common = "${Deps.Groups.sponge}:${Deps.Modules.spongecommon}"
+            const val bstats = "${Deps.Groups.bstats}:${Deps.Modules.bstatsSponge}:${Versions.bstats}"
+        }
+    }
+}
+
+object Deps {
+    object Groups {
+        const val nossr = "com.gmail.nossr50"
+        const val google = "com.google"
+        const val guava = "com.google.guava"
+        const val gson = "com.google.code.gson"
+        const val yaml = "org.yaml"
+        const val sk89q = "com.sk89q"
+        const val apache = "org.apache"
+        const val worldguard = "$sk89q.worldguard"
+        const val worldedit = "$sk89q.worldedit"
+        const val sponge = "org.spongepowered"
+        const val spigot = "org.spigotmc"
+        const val md5 = "net.md_5"
+        const val bukkit = "org.bukkit"
+        const val bstats = "org.bstats"
+        const val tomcat = "org.apache.tomcat"
+        const val junit = "junit"
+        const val checker = "org.checkerframework"
+        const val flowpowered = "com.flowpowered"
+    }
+
+    object Modules {
+        const val guava = "guava"
+        const val gson = "gson"
+        const val snakeyaml = "snakeyaml"
+        const val wgCore = "worldguard-core"
+        const val wgLegacy = "worldguard-legacy"
+        const val bungeecordChat = "bungeecord-chat"
+        const val spongeAPI = "spongeapi"
+        const val spongecommon = "spongecommon"
+        const val spongeforge = "spongeforge"
+        const val spongevanilla = "spongevanilla"
+        const val bukkit = "bukkit"
+        const val craftbukkit = "craftbukkit"
+        const val bstatsBukit = "bstats-bukkit"
+        const val bstatsSponge = "bstats-sponge"
+        const val spigotApi = "spigot-api"
+        const val spigot = "spigot"
+        const val configurate = "configurate"
+        const val configurate_core = "${configurate}-core"
+        const val configurate_yaml = "${configurate}-yaml"
+        const val jdbc = "tomcat-jdbc"
+        const val juli = "tomcat-juli"
+        const val junit = "junit"
+        const val checker = "checker-qual"
+        const val flowmath = "flow-math"
+    }
+}
+
+object Projects {
+    var core: Project? = null
+    var bukkit: Project? = null
+    var sponge: Project? = null
+}
+
+object Shadow {
+    object Origin {
+        const val juli = "${Deps.Groups.apache}.juli"
+        const val tomcat = "${Deps.Groups.apache}.tomcat"
+        const val apache = "${Deps.Groups.apache}.commons.logging"
+        const val bstatsBukkit = "${Deps.Groups.bstats}.bukkit"
+        const val configurate = "ninja.leaping.configurate"
+        const val checker = "org.checkerframework"
+    }
+
+    object Target {
+        const val juli = "${Deps.Groups.nossr}.database.tomcat.juli"
+        const val tomcat = "${Deps.Groups.nossr}.database.tomcat"
+        const val apache = "${Deps.Groups.nossr}.commons.logging"
+        const val bstatsBukkit = "${Deps.Groups.nossr}.metrics.bstat"
+        const val configurate = "${Deps.Groups.nossr}.${Deps.Modules.configurate}"
+        const val checker = "${Deps.Groups.nossr}.${Deps.Modules.configurate}.checkerframework"
+    }
+
+    object Exclude {
+        const val tomcat = "${Deps.Groups.tomcat}:${Deps.Modules.jdbc}"
+        const val juli = "${Deps.Groups.apache}:${Deps.Modules.juli}"
+        const val guava = "${Deps.Groups.guava}:${Deps.Modules.guava}"
+        const val snakeyaml = "${Deps.Groups.yaml}:${Deps.Modules.snakeyaml}"
+        const val bukkit = Deps.Groups.bukkit
+        const val spigot = Deps.Groups.spigot
+        const val sk89q = "com.sk89q"
+        const val wg = "$sk89q.worldguard"
+        const val intake = "$sk89q.intake"
+        const val flyway = "com.flywaydb"
+        const val khelekore = "org.khelekore"
+        const val findbugs = "com.google.code.findbugs"
+        const val bstats = "${Deps.Groups.bstats}"
+
+        object ForgeGradle {
+            const val dummyThing = "dummyThing"
+            const val template = "Version.java.template"
+        }
+    }
+}

buildSrc/src/main/java/Versions.kt

@@ -0,0 +1,16 @@
+object Versions {
+    const val configurate = "3.6" // Latest configurate
+    const val flowmath = "1.0.4-SNAPSHOT"
+    const val bukkit18 = "1.8.8-R0.1-SNAPSHOT" // Last bukkit 1.8.8
+    const val bukkit112 = "1.12.2-R0.1-SNAPSHOT" // Last bukkit 1.12.2
+    const val bukkit113 = "1.13.2-R0.1-SNAPSHOT" // Latest bukkit
+    const val sapi7 = "7.1.0" // Latest SpongeAPI stable
+    const val spongeImpl7 = "7.1.5" // Latest SpongeCommon stable
+    const val jdbc = "7.0.52"
+    const val junit = "4.12"
+    const val fg23 = "2.3-SNAPSHOT" // ForgeGradle to support MC 1.12.2
+    const val wg18 = "6.1.2" // Bukkit/CraftBukkit/Spigot 1.8.8 supported build, works on newer, but last one to support 1.8.8
+    const val wg112 = "6.2" // Last WorldGuard to support 1.12
+    const val wg113 = "7.0.0-SNAPSHOT" // Latest WorldGuard to support 1.13.2
+    const val bstats = "1.4" // Supports all backwards compatible. Always relocated
+}

bukkit/1_12/build.gradle.kts

@@ -0,0 +1,27 @@
+import Config.Libs.Bukkit.`1_12` as Bukkit
+// Config is located in <root>/buildSrc/src/main/java/Config.kt
+// It provides a bunch of constant values we use as dependency
+// strings, so we don't have to duplicate a bunch of them in
+// various scripts.
+
+plugins {
+    java // This is already provided, but for static compilation,
+    // we declare it here so we can use the IDE static type references
+}
+
+/*
+ Dependency inheritance is as follows
+  - ":core", which provides
+ configurate, tomcat jdbc/juli, and flowmath. It excludes sub
+ dependencies like guava and apache commons lang.
+  - ":bukkit", which provides nothing on it's own, except the
+ core bukkit classes that can be built on 1.13.2 API (which may change).
+ It also defines all subprojects to depend on ":core", and ":bukkit",
+ and bstats-bukkit.
+  */
+dependencies {
+    compileOnly(Bukkit.api) // Bukkit API for 1.12.2
+    compileOnly(Bukkit.nms) // CraftBukkit for 1.12.2
+    compileOnly(Bukkit.wgLegacy) // WorldGuard for 1.12.2 bukkit
+
+}

bukkit/1_12/src/main/java/com/gmail/nossr50/bukkit/v1_12/NmsHandler.java

@@ -0,0 +1,106 @@
+package com.gmail.nossr50.bukkit.v1_12;
+
+import com.gmail.nossr50.VersionedHandler;
+import com.gmail.nossr50.mcMMO;
+import com.google.common.base.Joiner;
+import com.google.common.collect.ImmutableMap;
+import net.minecraft.server.v1_12_R1.Chunk;
+import net.minecraft.server.v1_12_R1.EntityTypes;
+import net.minecraft.server.v1_12_R1.IBlockData;
+import net.minecraft.server.v1_12_R1.IBlockState;
+import net.minecraft.server.v1_12_R1.MinecraftKey;
+import net.minecraft.server.v1_12_R1.RegistryBlocks;
+import net.minecraft.server.v1_12_R1.RegistryMaterials;
+import org.bukkit.block.Block;
+import org.bukkit.block.BlockState;
+import org.bukkit.craftbukkit.v1_12_R1.CraftChunk;
+import org.bukkit.craftbukkit.v1_12_R1.block.CraftBlockState;
+import org.bukkit.craftbukkit.v1_12_R1.entity.CraftEntity;
+import org.bukkit.entity.Entity;
+
+import java.util.ArrayList;
+import java.util.List;
+import java.util.Map;
+
+public class NmsHandler extends VersionedHandler {
+    /**
+     * Static reference to the block registry. Don't really care about the fact that
+     * it is being stored as a reference here, but for imports reasons, it's smaller
+     * line length makes it optimal to read for method usages.
+     */
+    private static final RegistryBlocks<MinecraftKey, net.minecraft.server.v1_12_R1.Block> BLOCK_REGISTRY = net.minecraft.server.v1_12_R1.Block.REGISTRY;
+    /**
+     * We can keep track of block state id's by generating them on demand, i.e., when
+     * they're being requested from Blocks, or BlockDatas.
+     */
+    private static final RegistryMaterials<MinecraftKey, IBlockData> BLOCK_STATE_REGISTRY = new RegistryMaterials<>();
+
+    NmsHandler(mcMMO plugin) {
+        super(plugin);
+    }
+
+    @Override
+    public String getIdFor(Block block) {
+        // We have to get the underlying nms block by the block, which might as well just be the type id.
+        final Chunk chunk = ((CraftChunk) block.getChunk()).getHandle();
+        // Get the block state from the underlying chunk (stored by reference in CraftBlock)
+        final IBlockData blockState = chunk.a(block.getX(), block.getY(), block.getZ());
+        // Sadly, Mojang doesn't store the string id onto blocks, states, or any of their types, they just call the registry.
+        final MinecraftKey key = BLOCK_REGISTRY.b(blockState.getBlock());
+        return key.toString();
+    }
+
+    @Override
+    public String getIdFor(Entity entity) {
+        // Every entity knows it's "type". Here, we just use the right method getter to get the EntityTypes instance for that entity
+        final net.minecraft.server.v1_12_R1.Entity nmsEntity = ((CraftEntity) entity).getHandle();
+        // And then... well. we get the string id from the registry, based on the entity class to id mapping in EntityTypes.
+        final MinecraftKey key = EntityTypes.a(nmsEntity);
+        // If the key is null, well, we've got bigger problems...
+        return key == null ? "minecraft:slime" : key.toString();
+    }
+
+    @SuppressWarnings("Duplicates")
+    @Override
+    public String getIdFor(BlockState block) {
+        // Since we don't really want to trust what "BlockState" gives us, and the API doesn't give us anything but
+        // what the API wants to give us, we have to dig into internals to get the true BlockState representation
+        final CraftBlockState craftState = (CraftBlockState) block;
+        // Because CraftBlock also stores the chunk reference, we can short cut in to use the chunk, instead of pinging
+        // the chunk map on WorldServer
+        final CraftChunk craftChunk = (CraftChunk) craftState.getChunk();
+        // Then query for the block state from the chunk.
+        final IBlockData nmsState = craftChunk.getHandle().a(block.getX(), block.getY(), block.getZ());
+        // And then we're gucci
+        final net.minecraft.server.v1_12_R1.Block nmsBlock = nmsState.getBlock();
+        final MinecraftKey blockKey = BLOCK_REGISTRY.b(nmsBlock);
+        // Now we can check if our blockstate registry actually has the block state.
+        final MinecraftKey stateKey = BLOCK_STATE_REGISTRY.b(nmsState);
+        if (stateKey != null) { // If the state has been registered by the handler, then by all means.
+            return stateKey.toString();
+        }
+        // If not, well, it needs to have a key generated and registered.
+        final String nameSpace = blockKey.getKey();
+        StringBuilder builder = new StringBuilder();
+        builder.append(nameSpace); // We only want to get the block id, not the domain id, since that's going to be appended later
+
+        // Get the full Property -> Value mapping for the block state
+        final ImmutableMap<IBlockState<?>, Comparable<?>> properties = nmsState.t();
+        if (!properties.isEmpty()) {
+            builder.append('[');
+            Joiner joiner = Joiner.on(',');
+            List<String> propertyValues = new ArrayList<>();
+            // Yadadadada, go through all property entries and add each as a string for the "propertyName=value" (like "variant=oak")
+            for (Map.Entry<IBlockState<?>, Comparable<?>> entry : properties.entrySet()) {
+                // a() gets the inputted "name" for the state, the value, well, that gets the value, which is always toStringable.
+                propertyValues.add(entry.getKey().a() + "=" + entry.getValue());
+            }
+            builder.append(joiner.join(propertyValues));
+            builder.append(']');
+        }
+        // Now we can make the MinecraftKey...
+        final MinecraftKey newKey = new MinecraftKey(builder.toString());
+        BLOCK_STATE_REGISTRY.a(newKey, nmsState);
+        return newKey.toString();
+    }
+}

bukkit/1_13/build.gradle.kts

@@ -0,0 +1,27 @@
+import Config.Libs.Bukkit.`1_13` as Bukkit
+// Config is located in <root>/buildSrc/src/main/java/Config.kt
+// It provides a bunch of constant values we use as dependency
+// strings, so we don't have to duplicate a bunch of them in
+// various scripts. The import allows us to "import as" for shorthand
+
+plugins {
+    `java-library` // This is already provided, but for static compilation,
+    // we declare it here so we can use the IDE static type references
+}
+
+/*
+ Dependency inheritance is as follows
+  - ":core", which provides
+ configurate, tomcat jdbc/juli, and flowmath. It excludes sub
+ dependencies like guava and apache commons lang.
+  - ":bukkit", which provides nothing on it's own, except the
+ core bukkit classes that can be built on 1.13.2 API (which may change).
+ It also defines all subprojects to depend on ":core", and ":bukkit",
+ and bstats-bukkit.
+  */
+dependencies {
+    compileOnly(Bukkit.api) // Bukkit API for 1.13.2 - Defined in <root>/buildSrc/src/main/java/Config.kt
+    compileOnly(Bukkit.nms) // CraftBukkit-1.13.2-R0.1-SNAPSHOT - Defined in <root>/buildSrc/src/main/java/Config.kt
+    compileOnly(Bukkit.wgCore) // WorldGuard-core - Defined in <root>/buildSrc/src/main/java/Config.kt
+    compileOnly(Bukkit.wgLegacy) // WorldGuard-legacy - Defined in <root>/buildSrc/src/main/java/Config.kt
+}

bukkit/1_13/src/main/java/com/gmail/nossr50/bukkit/v1_13/NmsHandler.java

@@ -0,0 +1,101 @@
+package com.gmail.nossr50.bukkit.v1_13;
+
+import com.gmail.nossr50.VersionedHandler;
+import com.gmail.nossr50.mcMMO;
+import com.google.common.base.Joiner;
+import com.google.common.collect.ImmutableMap;
+import net.minecraft.server.v1_13_R2.EntityTypes;
+import net.minecraft.server.v1_13_R2.IBlockData;
+import net.minecraft.server.v1_13_R2.IBlockState;
+import net.minecraft.server.v1_13_R2.IRegistry;
+import net.minecraft.server.v1_13_R2.MinecraftKey;
+import net.minecraft.server.v1_13_R2.RegistryMaterials;
+import net.minecraft.server.v1_13_R2.WorldServer;
+import org.bukkit.block.Block;
+import org.bukkit.block.BlockState;
+import org.bukkit.craftbukkit.v1_13_R2.block.CraftBlock;
+import org.bukkit.craftbukkit.v1_13_R2.block.CraftBlockState;
+import org.bukkit.craftbukkit.v1_13_R2.entity.CraftEntity;
+import org.bukkit.entity.Entity;
+
+import java.util.ArrayList;
+import java.util.List;
+import java.util.Map;
+
+public class NmsHandler extends VersionedHandler {
+
+    private static final IRegistry<net.minecraft.server.v1_13_R2.Block> BLOCK_REGISTRY = IRegistry.BLOCK;
+    private static final IRegistry<EntityTypes<?>> ENTITY_REGISTRY = IRegistry.ENTITY_TYPE;
+    /**
+     * We use {@link RegistryMaterials} because we don't want to default to another block state,
+     * if a {@link IBlockData} is not registered, we need to generate an ID and register that key to
+     * that {@link IBlockData}. By default, this should be populated during plugin startup by
+     * calling some init method, but that will be determined later.
+     */
+    private static final IRegistry<IBlockData> BLOCK_STATE_REGISTRY = new RegistryMaterials<>();
+
+    NmsHandler(mcMMO plugin) {
+        super(plugin);
+    }
+
+    @Override
+    public String getIdFor(Block block) {
+        // We have to get the underlying nms block by the block, which might as well just be the type id.
+        final WorldServer world = ((CraftBlock) block).getCraftWorld().getHandle();
+        // The registry.c(T) will return MinecraftKey, and the toString() returns the "$mod:$name", so "minecraft:stone"
+        final IBlockData blockState = world.getType(((CraftBlock) block).getPosition());
+        // Sadly, Mojang doesn't store the string id onto blocks, states, or any of their types, they just call the registry.
+        final MinecraftKey key = BLOCK_REGISTRY.getKey(blockState.getBlock());
+        // Sometimes, there's a rare case with mods where the key is going to be null, but should never happen in bukkit/spigot.
+        return key == null ? "minecraft:air" : key.toString();
+    }
+
+    @Override
+    public String getIdFor(Entity entity) {
+        // Every entity knows it's "type". Here, we just use the right method getter to get the EntityTypes instance for that entity
+        final EntityTypes<?> entityType = ((CraftEntity) entity).getHandle().P();
+        // And then... well. we get the string id from the registry!
+        final MinecraftKey key = ENTITY_REGISTRY.getKey(entityType);
+        // If the key is null, well, we've got bigger problems...
+        return key == null ? "minecraft:slime" : key.toString();
+    }
+
+    @SuppressWarnings("Duplicates")
+    @Override
+    public String getIdFor(BlockState block) {
+        // Much like #getIdFor(Block) except here we have the "state" by numerical id. So.. we have to grab it from
+        // the world.
+        final CraftBlockState craftState = (CraftBlockState) block;
+        final IBlockData nmsState = craftState.getHandle();
+        final net.minecraft.server.v1_13_R2.Block nmsBlock = nmsState.getBlock();
+        final MinecraftKey blockKey = BLOCK_REGISTRY.getKey(nmsBlock);
+        // Now we can check if our blockstate registry actually has the block state.
+        final MinecraftKey stateKey = BLOCK_STATE_REGISTRY.getKey(nmsState);
+        if (stateKey != null) { // If the state has been registered by the handler, then by all means.
+            return stateKey.toString();
+        }
+        // If not, well, it needs to have a key generated and registered.
+        final String nameSpace = blockKey.getKey();
+        StringBuilder builder = new StringBuilder();
+        builder.append(nameSpace); // We only want to get the block id, not the domain id, since that's going to be appended later
+
+        // Get the full Property -> Value mapping for the block state
+        final ImmutableMap<IBlockState<?>, Comparable<?>> properties = nmsState.getStateMap();
+        if (!properties.isEmpty()) {
+            builder.append('[');
+            Joiner joiner = Joiner.on(',');
+            List<String> propertyValues = new ArrayList<>();
+            // Yadadadada, go through all property entries and add each as a string for the "propertyName=value" (like "variant=oak")
+            for (Map.Entry<IBlockState<?>, Comparable<?>> entry : properties.entrySet()) {
+                // a() gets the inputted "name" for the state, the value, well, that gets the value, which is always toStringable.
+                propertyValues.add(entry.getKey().a() + "=" + entry.getValue());
+            }
+            builder.append(joiner.join(propertyValues));
+            builder.append(']');
+        }
+        // Now we can make the MinecraftKey...
+        final MinecraftKey newKey = new MinecraftKey(builder.toString());
+        BLOCK_STATE_REGISTRY.a(newKey, nmsState);
+        return newKey.toString();
+    }
+}

bukkit/1_8_8/build.gradle.kts

@@ -0,0 +1,23 @@
+import Config.Libs.Bukkit.`1_8` as Bukkit
+
+plugins {
+    java
+}
+
+
+/*
+ Dependency inheritance is as follows
+  - ":core", which provides
+ configurate, tomcat jdbc/juli, and flowmath. It excludes sub
+ dependencies like guava and apache commons lang.
+  - ":bukkit", which provides nothing on it's own, except the
+ core bukkit classes that can be built on 1.13.2 API (which may change).
+ It also defines all subprojects to depend on ":core", and ":bukkit",
+ and bstats-bukkit.
+  */
+dependencies {
+    compileOnly(Bukkit.api) // Bukkit API for 1.8.8 - Defined in <root>/buildSrc/src/main/java/Config.kt
+    compileOnly(Bukkit.nms) // CraftBukkit-1.8.8-R0.3-SNAPSHOT - Defined in <root>/buildSrc/src/main/java/Config.kt
+    compileOnly(Bukkit.wgLegacy) // Old worldguard - Defined in <root>/buildSrc/src/main/java/Config.kt
+
+}

bukkit/1_8_8/src/main/java/com/gmail/nossr50/bukkit/v1_8/NmsHandler.java

@@ -0,0 +1,93 @@
+package com.gmail.nossr50.bukkit.v1_8;
+
+import com.gmail.nossr50.VersionedHandler;
+import com.gmail.nossr50.mcMMO;
+import com.google.common.base.Joiner;
+import com.google.common.collect.ImmutableMap;
+import net.minecraft.server.v1_8_R3.Blocks;
+import net.minecraft.server.v1_8_R3.EntityTypes;
+import net.minecraft.server.v1_8_R3.IBlockData;
+import net.minecraft.server.v1_8_R3.IBlockState;
+import net.minecraft.server.v1_8_R3.MinecraftKey;
+import net.minecraft.server.v1_8_R3.RegistryBlocks;
+import org.bukkit.block.Block;
+import org.bukkit.block.BlockState;
+import org.bukkit.craftbukkit.v1_8_R3.entity.CraftEntity;
+import org.bukkit.craftbukkit.v1_8_R3.util.CraftMagicNumbers;
+import org.bukkit.entity.Entity;
+
+import java.util.ArrayList;
+import java.util.List;
+import java.util.Map;
+
+@SuppressWarnings({"unused", "Duplicates"}) // We use reflection to load this handler on 1.8 versions
+public class NmsHandler extends VersionedHandler {
+
+    /**
+     * Static reference to the block registry. Don't really care about the fact that
+     * it is being stored as a reference here, but for imports reasons, it's smaller
+     * line length makes it optimal to read for method usages.
+     */
+    private static final RegistryBlocks<MinecraftKey, net.minecraft.server.v1_8_R3.Block> BLOCK_REGISTRY = net.minecraft.server.v1_8_R3.Block.REGISTRY;
+    /**
+     * We can keep track of block state id's by generating them on demand, i.e., when
+     * they're being requested from Blocks, or BlockDatas.
+     */
+    private static final RegistryBlocks<MinecraftKey, IBlockData> BLOCK_STATE_REGISTRY = new RegistryBlocks<>(BLOCK_REGISTRY.c(Blocks.AIR)); // Default to AIR
+
+    NmsHandler(mcMMO plugin) {
+        super(plugin);
+    }
+
+    @Override
+    public String getIdFor(Block block) {
+        // We have to get the underlying nms block by the block, which might as well just be the type id.
+        final net.minecraft.server.v1_8_R3.Block block1 = CraftMagicNumbers.getBlock(block);
+        // The registry.c(T) will return MinecraftKey, and the toString() returns the "$mod:$name", so "minecraft:stone"
+        final MinecraftKey key = BLOCK_REGISTRY.c(block1);
+        return key.toString();
+    }
+
+    @Override
+    public String getIdFor(Entity entity) {
+        // EntityTypes maintains the maps of Class<? extends nms.Entity> to String for id's and to numerical id numbers.
+        // We of course are using the method that gets us the String id of the entity, such as "minecraft:creeper"
+        return EntityTypes.b(((CraftEntity) entity).getHandle());
+    }
+
+    @Override
+    public String getIdFor(BlockState block) {
+        // Much like #getIdFor(Block) except here we have the "state" by numerical id. So.. we have to grab it from
+        // the world.
+        final net.minecraft.server.v1_8_R3.Block nmsBlock = net.minecraft.server.v1_8_R3.Block.REGISTRY.a(block.getTypeId());
+        final MinecraftKey blockKey = net.minecraft.server.v1_8_R3.Block.REGISTRY.c(nmsBlock);
+        final IBlockData blockState = nmsBlock.fromLegacyData(block.getRawData());
+        // Now we can check if our blockstate registry actually has the block state.
+        final MinecraftKey stateKey = BLOCK_STATE_REGISTRY.c(blockState);
+        if (stateKey != null) { // If the state has been registered by the handler, then by all means.
+            return stateKey.toString();
+        }
+        // If not, well, it needs to have a key generated and registered.
+        final String nameSpace = blockKey.a();
+        StringBuilder builder = new StringBuilder();
+        builder.append(blockKey.a()); // We only want to get the block id, not the domain id, since that's going to be appended later
+
+        // Get the full Property -> Value mapping for the block state
+        final ImmutableMap<IBlockState, Comparable> properties = blockState.b();
+        if (!properties.isEmpty()) {
+            builder.append('[');
+            Joiner joiner = Joiner.on(',');
+            List<String> propertyValues = new ArrayList<>();
+            for (Map.Entry<IBlockState, Comparable> entry : properties.entrySet()) {
+                // a() gets the inputted "name" for the state, the value, well, that gets the value, which is always toStringable.
+                propertyValues.add(entry.getKey().a() + "=" + entry.getValue());
+            }
+            builder.append(joiner.join(propertyValues));
+            builder.append(']');
+        }
+        // Now we can make the MinecraftKey...
+        final MinecraftKey newKey = new MinecraftKey(builder.toString());
+        BLOCK_STATE_REGISTRY.a(newKey, blockState);
+        return newKey.toString();
+    }
+}

bukkit/1_8_8/src/main/java/com/gmail/nossr50/platform/bukkit/Testing18.java

@@ -0,0 +1,12 @@
+package com.gmail.nossr50.platform.bukkit;
+
+import org.bukkit.Material;
+import org.bukkit.craftbukkit.v1_8_R3.block.CraftBlock;
+
+public class Testing18 {
+
+    Material material;
+
+    CraftBlock block;
+
+}

bukkit/build.gradle.kts

@@ -0,0 +1,77 @@
+import com.github.jengelman.gradle.plugins.shadow.tasks.ShadowJar
+import Config.Libs.Bukkit as Bukkit
+// Config is located in <root>/buildSrc/src/main/java/Config.kt
+// It provides a bunch of constant values we use as dependency
+// strings, so we don't have to duplicate a bunch of them in
+// various scripts. The import as allows for shorthand.
+
+val bukkit: Project = Projects.bukkit!! // Static project references
+val core: Project = Projects.core!! // Stored by Config.kt and created in <root>/build.gradle.kts
+
+/* This configures ":bukkit" and it's dependent projects:
+   - ":bukkit:1_8_8"
+   - ":bukkit:1_12"
+   - ":bukkit:1_13"
+   Basically sets up all projects to depend on ":core" and
+   bstats-bukkit. Also sets up shadow to relocate bukkit related
+   packages to limit platform interference
+ */
+allprojects {
+
+    dependencies {
+        compile(core) // includes junit for tests
+        implementation(Bukkit.bstats) // Bukkit bstats
+    }
+
+    // TODO dunno if this works yet... project needs to compile.
+    val shadowJar by tasks.getting(ShadowJar::class) {
+        // Relocate bstats for bukkit, as per requirement for bstats
+        relocate(Shadow.Origin.bstatsBukkit, Shadow.Target.bstatsBukkit)
+        // Relocate the bukkit platform classes of mcmmo so we don't
+        // interfere with other platform classes (or core)
+        relocate(Deps.Groups.nossr, "${Deps.Groups.nossr}.bukkit") {
+            exclude("${Deps.Groups.nossr}.core")
+        }
+    }
+}
+
+// Tells all subprojects of ":bukkit" (":bukkit:1_8_8", ":bukkit:1_12",etc.)
+// to depend on this project (":bukkit") to inherit the dependencies, and
+// does NOT inherit the same configurations (anything configured outside
+// here does not persist to child projects).
+subprojects {
+    dependencies {
+        // Provide the base bukkit plugin dependency for plugin classloading.
+        // All "versioned" implementations will be properly classloaded by the bukkit parent
+        compileOnly(bukkit)
+    }
+}
+plugins {
+    `java-library` // This is already provided, but for static compilation,
+    // we declare it here so we can use the IDE static type references
+}
+dependencies {
+    // Temporary dependencies while things are being moved.
+    compileOnly(Bukkit.`1_13`.spigotApi) { // Spigot API for generic usage. Based on 1.13.2
+        isTransitive = true // We don't want the dependencies
+    }
+    compileOnly(Bukkit.`1_13`.api) { // Bukkit API for generic usage. Based on 1.13.2
+        isTransitive = true // We don't want the dependencies
+
+    }
+    compileOnly(Bukkit.`1_13`.wgCore) { // WorldGuard dependency, again, for 1.13.2
+        isTransitive = true // We don't want the dependencies
+        exclude(group = Shadow.Exclude.sk89q)
+        exclude(group = Shadow.Exclude.intake, module = "intake")
+        exclude(group = Shadow.Exclude.sk89q, module = "squirrelid")
+        exclude(group = Shadow.Exclude.flyway)
+        exclude(group = Shadow.Exclude.khelekore)
+        exclude(group = Shadow.Exclude.findbugs)
+    }
+    compileOnly(Bukkit.`1_13`.wgLegacy) {
+        isTransitive = true // We don't want the dependencies
+        exclude(group = Shadow.Exclude.bukkit)
+        exclude(group = Shadow.Exclude.sk89q, module = "commandbook")
+        exclude(group = Shadow.Exclude.bstats)
+    }
+}

bukkit/src/main/java/com/gmail/nossr50/BukkitBlockType.java

@@ -0,0 +1,12 @@
+package com.gmail.nossr50;
+
+import org.bukkit.Material;
+import org.bukkit.block.data.BlockData;
+
+public class BukkitBlockType {
+
+    private Material material;
+
+    private BlockData blockData;
+
+}

bukkit/src/main/java/com/gmail/nossr50/VersionedHandler.java

@@ -0,0 +1,74 @@
+package com.gmail.nossr50;
+
+import com.sk89q.worldedit.extension.platform.NoCapablePlatformException;
+import org.bukkit.block.Block;
+import org.bukkit.block.BlockState;
+import org.bukkit.entity.Entity;
+
+public abstract class VersionedHandler {
+    private static VersionedHandler instance;
+
+    private final mcMMO plugin;
+
+    protected VersionedHandler(mcMMO plugin) {
+        this.plugin = plugin;
+    }
+
+    /**
+     * Gets the string value id of the BlockType, note that this is not the
+     * blockstate.
+     *
+     * Examples include: "minecraft:stone", "minecraft:chest", "thaumcraft:log2"
+     * BlockStates are more specific like "minecraft:log[variant=oak,axis=x]"
+     *
+     * This should be casting down and retrieving the id from the block registry maintained by vanilla.
+     *
+     * @param block The block instance (holds byte/numerical id or sometimes block state in newer versions)
+     * @return The string id of the block type
+     */
+    public abstract String getIdFor(Block block);
+
+    /**
+     * Gets the string value id of the Entity, much like blocks, this is not
+     * the full string representation of the entity, just the string id of the
+     * TYPE.
+     *
+     * Examples include: "minecraft:creeeper", "minecraft:sheep", "thaumcraft:wisp"
+     *
+     * @param entity The entity instance
+     * @return The string id of the entity's registered type.
+     */
+    public abstract String getIdFor(Entity entity);
+
+    // Technically can be TileEntity snapshot references as well.
+    public abstract String getIdFor(BlockState block);
+
+    /**
+     * Gets the {@link VersionedHandler} instance for this running platform.
+     * Note that all the handler does is perform various operations necessitated
+     * by either a lack of, or bridging an implementation of some API/core aspects
+     * that are not available through Bukkit API (like getting BlockType id's, or
+     * BlockState id's).
+     *
+     * @param plugin The mcmmo plugin
+     * @return The version handler instance
+     */
+    public VersionedHandler getInstance(mcMMO plugin) {
+        if (instance == null) {
+            final String serverPackage = mcMMO.p.getServer().getClass().getPackage().getName();
+            final String serverVersion = serverPackage.substring(serverPackage.lastIndexOf(".") + 1);
+            try {
+                final Class<?> clazz = Class.forName("com.gmail.nossr50.bukkit." + serverVersion + ".NmsHandler");
+                if (VersionedHandler.class.isAssignableFrom(clazz)) {
+                    instance = (VersionedHandler) clazz.getConstructor(mcMMO.class).newInstance(plugin);
+                }
+            } catch (Exception e) {
+                e.printStackTrace();
+                throw new NoCapablePlatformException("Could not discover a valid mcMMO VersionedHandler for version:" + serverVersion);
+            }
+        }
+        return instance;
+    }
+
+
+}

bukkit/src/main/java/com/gmail/nossr50/commands/MHDCommand.java

@@ -1,11 +1,11 @@
 package com.gmail.nossr50.commands;
 
-import com.gmail.nossr50.config.Config;
+import com.gmail.nossr50.core.config.MainConfig;
-import com.gmail.nossr50.database.FlatfileDatabaseManager;
+import com.gmail.nossr50.core.data.UserManager;
-import com.gmail.nossr50.database.SQLDatabaseManager;
+import com.gmail.nossr50.core.data.database.FlatfileDatabaseManager;
-import com.gmail.nossr50.datatypes.player.McMMOPlayer;
+import com.gmail.nossr50.core.data.database.SQLDatabaseManager;
+import com.gmail.nossr50.core.datatypes.player.McMMOPlayer;
 import com.gmail.nossr50.mcMMO;
-import com.gmail.nossr50.util.player.UserManager;
 import com.google.common.collect.ImmutableList;
 import org.bukkit.command.Command;
 import org.bukkit.command.CommandSender;
@@ -21,7 +21,7 @@ public class MHDCommand implements TabExecutor {
             SQLDatabaseManager m = (SQLDatabaseManager) mcMMO.getDatabaseManager();
             m.resetMobHealthSettings();
             for (McMMOPlayer player : UserManager.getPlayers()) {
-                player.getProfile().setMobHealthbarType(Config.getInstance().getMobHealthbarDefault());
+                player.getProfile().setMobHealthbarType(MainConfig.getInstance().getMobHealthbarDefault());
             }
             sender.sendMessage("Mob health reset");
             return true;
@@ -30,7 +30,7 @@ public class MHDCommand implements TabExecutor {
             FlatfileDatabaseManager m = (FlatfileDatabaseManager) mcMMO.getDatabaseManager();
             m.resetMobHealthSettings();
             for (McMMOPlayer player : UserManager.getPlayers()) {
-                player.getProfile().setMobHealthbarType(Config.getInstance().getMobHealthbarDefault());
+                player.getProfile().setMobHealthbarType(MainConfig.getInstance().getMobHealthbarDefault());
             }
             sender.sendMessage("Mob health reset");
             return true;

bukkit/src/main/java/com/gmail/nossr50/commands/McImportCommand.java

@@ -1,8 +1,8 @@
 package com.gmail.nossr50.commands;
 
-import com.gmail.nossr50.datatypes.skills.ModConfigType;
+import com.gmail.nossr50.core.skills.ModConfigType;
+import com.gmail.nossr50.core.util.Misc;
 import com.gmail.nossr50.mcMMO;
-import com.gmail.nossr50.util.Misc;
 import org.bukkit.Material;
 import org.bukkit.command.Command;
 import org.bukkit.command.CommandExecutor;
@@ -71,17 +71,14 @@ public class McImportCommand implements CommandExecutor {
                 materialNames.get(type).add(materialName);
                 continue;
             }
-        }
+        } catch (FileNotFoundException e) {
-        catch (FileNotFoundException e) {
             mcMMO.p.getLogger().warning("Could not find " + importFile.getAbsolutePath() + " ! (No such file or directory)");
             mcMMO.p.getLogger().warning("Copy and paste latest.log to " + importFile.getParentFile().getAbsolutePath() + " and rename it to import.log");
             return false;
-        }
+        } catch (Exception e) {
-        catch (Exception e) {
             e.printStackTrace();
             return false;
-        }
+        } finally {
-        finally {
             tryClose(in);
         }
 
@@ -116,8 +113,7 @@ public class McImportCommand implements CommandExecutor {
         }
         try {
             c.close();
-        }
+        } catch (IOException e) {
-        catch (IOException e) {
             e.printStackTrace();
         }
     }
@@ -169,16 +165,13 @@ public class McImportCommand implements CommandExecutor {
 
                 out = new FileWriter(outputFile);
                 out.write(writer.toString());
-            }
+            } catch (IOException e) {
-            catch (IOException e) {
                 e.printStackTrace();
                 return;
-            }
+            } catch (Exception e) {
-            catch (Exception e) {
                 e.printStackTrace();
                 return;
-            }
+            } finally {
-            finally {
                 tryClose(out);
                 fileAmount++;
             }
@@ -208,14 +201,11 @@ public class McImportCommand implements CommandExecutor {
             String skillName = "UNIDENTIFIED";
             if (materialName.contains("ORE")) {
                 skillName = "Mining";
-            }
+            } else if (materialName.contains("LOG") || materialName.contains("LEAVES")) {
-            else if (materialName.contains("LOG") || materialName.contains("LEAVES")) {
                 skillName = "Woodcutting";
-            }
+            } else if (materialName.contains("GRASS") || materialName.contains("FLOWER") || materialName.contains("CROP")) {
-            else if (materialName.contains("GRASS") || materialName.contains("FLOWER") || materialName.contains("CROP")) {
                 skillName = "Herbalism";
-            }
+            } else if (materialName.contains("DIRT") || materialName.contains("SAND")) {
-            else if (materialName.contains("DIRT") || materialName.contains("SAND")) {
                 skillName = "Excavation";
             }
 
@@ -230,8 +220,7 @@ public class McImportCommand implements CommandExecutor {
 
             if (skillName.equals("Mining")) {
                 skillContents.add("    " + "    " + "Smelting_XP_Gain: 9");
-            }
+            } else if (skillName.equals("Woodcutting")) {
-            else if (skillName.equals("Woodcutting")) {
                 skillContents.add("    " + "    " + "Is_Log: " + materialName.contains("LOG"));
             }
         }
@@ -247,20 +236,15 @@ public class McImportCommand implements CommandExecutor {
             String toolType = "UNIDENTIFIED";
             if (materialName.contains("PICKAXE")) {
                 toolType = "Pickaxes";
-            }
+            } else if (materialName.contains("AXE")) {
-            else if (materialName.contains("AXE")) {
                 toolType = "Axes";
-            }
+            } else if (materialName.contains("BOW")) {
-            else if (materialName.contains("BOW")) {
                 toolType = "Bows";
-            }
+            } else if (materialName.contains("HOE")) {
-            else if (materialName.contains("HOE")) {
                 toolType = "Hoes";
-            }
+            } else if (materialName.contains("SHOVEL") || materialName.contains("SPADE")) {
-            else if (materialName.contains("SHOVEL") || materialName.contains("SPADE")) {
                 toolType = "Shovels";
-            }
+            } else if (materialName.contains("SWORD")) {
-            else if (materialName.contains("SWORD")) {
                 toolType = "Swords";
             }
 
@@ -287,14 +271,11 @@ public class McImportCommand implements CommandExecutor {
             String toolType = "UNIDENTIFIED";
             if (materialName.contains("BOOT") || materialName.contains("SHOE")) {
                 toolType = "Boots";
-            }
+            } else if (materialName.contains("CHESTPLATE") || materialName.contains("CHEST")) {
-            else if (materialName.contains("CHESTPLATE") || materialName.contains("CHEST")) {
                 toolType = "Chestplates";
-            }
+            } else if (materialName.contains("HELM") || materialName.contains("HAT")) {
-            else if (materialName.contains("HELM") || materialName.contains("HAT")) {
                 toolType = "Helmets";
-            }
+            } else if (materialName.contains("LEGGINGS") || materialName.contains("LEGS") || materialName.contains("PANTS")) {
-            else if (materialName.contains("LEGGINGS") || materialName.contains("LEGS") || materialName.contains("PANTS")) {
                 toolType = "Leggings";
             }
 

bukkit/src/main/java/com/gmail/nossr50/commands/McabilityCommand.java

@@ -1,8 +1,8 @@
 package com.gmail.nossr50.commands;
 
-import com.gmail.nossr50.datatypes.player.McMMOPlayer;
+import com.gmail.nossr50.core.datatypes.player.McMMOPlayer;
-import com.gmail.nossr50.locale.LocaleLoader;
+import com.gmail.nossr50.core.locale.LocaleLoader;
-import com.gmail.nossr50.util.Permissions;
+import com.gmail.nossr50.core.util.Permissions;
 import org.bukkit.command.CommandSender;
 
 public class McabilityCommand extends ToggleCommand {

bukkit/src/main/java/com/gmail/nossr50/commands/McconvertCommand.java

@@ -2,9 +2,9 @@ package com.gmail.nossr50.commands;
 
 import com.gmail.nossr50.commands.database.ConvertDatabaseCommand;
 import com.gmail.nossr50.commands.experience.ConvertExperienceCommand;
-import com.gmail.nossr50.database.DatabaseManagerFactory;
+import com.gmail.nossr50.core.data.database.DatabaseManagerFactory;
-import com.gmail.nossr50.datatypes.database.DatabaseType;
+import com.gmail.nossr50.core.datatypes.database.DatabaseType;
-import com.gmail.nossr50.datatypes.experience.FormulaType;
+import com.gmail.nossr50.core.datatypes.experience.FormulaType;
 import com.gmail.nossr50.mcMMO;
 import com.google.common.collect.ImmutableList;
 import org.bukkit.command.Command;
@@ -22,9 +22,6 @@ public class McconvertCommand implements TabExecutor {
     private static final List<String> DATABASE_TYPES;
     private static final List<String> SUBCOMMANDS = ImmutableList.of("database", "experience");
 
-    private CommandExecutor databaseConvertCommand = new ConvertDatabaseCommand();
-    private CommandExecutor experienceConvertCommand = new ConvertExperienceCommand();
-
     static {
         ArrayList<String> formulaTypes = new ArrayList<String>();
         ArrayList<String> databaseTypes = new ArrayList<String>();
@@ -52,14 +49,16 @@ public class McconvertCommand implements TabExecutor {
 
     }
 
+    private CommandExecutor databaseConvertCommand = new ConvertDatabaseCommand();
+    private CommandExecutor experienceConvertCommand = new ConvertExperienceCommand();
+
     @Override
     public boolean onCommand(CommandSender sender, Command command, String label, String[] args) {
         switch (args.length) {
             case 2:
                 if (args[0].equalsIgnoreCase("database") || args[0].equalsIgnoreCase("db")) {
                     return databaseConvertCommand.onCommand(sender, command, label, args);
-                }
+                } else if (args[0].equalsIgnoreCase("experience") || args[0].equalsIgnoreCase("xp") || args[1].equalsIgnoreCase("exp")) {
-                else if (args[0].equalsIgnoreCase("experience") || args[0].equalsIgnoreCase("xp") || args[1].equalsIgnoreCase("exp")) {
                     return experienceConvertCommand.onCommand(sender, command, label, args);
                 }
 

bukkit/src/main/java/com/gmail/nossr50/commands/McgodCommand.java

@@ -1,8 +1,8 @@
 package com.gmail.nossr50.commands;
 
-import com.gmail.nossr50.datatypes.player.McMMOPlayer;
+import com.gmail.nossr50.core.datatypes.player.McMMOPlayer;
-import com.gmail.nossr50.locale.LocaleLoader;
+import com.gmail.nossr50.core.locale.LocaleLoader;
-import com.gmail.nossr50.util.Permissions;
+import com.gmail.nossr50.core.util.Permissions;
 import org.bukkit.command.CommandSender;
 
 public class McgodCommand extends ToggleCommand {

bukkit/src/main/java/com/gmail/nossr50/commands/McmmoCommand.java

@@ -1,10 +1,10 @@
 package com.gmail.nossr50.commands;
 
 import com.gmail.nossr50.commands.party.PartySubcommandType;
-import com.gmail.nossr50.config.Config;
+import com.gmail.nossr50.core.config.MainConfig;
-import com.gmail.nossr50.locale.LocaleLoader;
+import com.gmail.nossr50.core.locale.LocaleLoader;
+import com.gmail.nossr50.core.util.Permissions;
 import com.gmail.nossr50.mcMMO;
-import com.gmail.nossr50.util.Permissions;
 import org.bukkit.ChatColor;
 import org.bukkit.command.Command;
 import org.bukkit.command.CommandExecutor;
@@ -24,9 +24,9 @@ public class McmmoCommand implements CommandExecutor {
                 String[] mcSplit = description.split(",");
                 sender.sendMessage(mcSplit);
 
-                if (Config.getInstance().getDonateMessageEnabled()) {
+                if (MainConfig.getInstance().getDonateMessageEnabled()) {
                     sender.sendMessage(LocaleLoader.getString("MOTD.Donate"));
-                    sender.sendMessage(ChatColor.GOLD + " - " + ChatColor.GREEN + "nossr50@gmail.com" + ChatColor.GOLD + " Paypal");
+                    sender.sendMessage(ChatColor.GOLD + " - " + ChatColor.GREEN + "com.gmail.nossr50@com.gmail.com" + ChatColor.GOLD + " Paypal");
                 }
 
                 if (Permissions.showversion(sender)) {
@@ -71,7 +71,7 @@ public class McmmoCommand implements CommandExecutor {
 
     private void displayOtherCommands(CommandSender sender) {
         //Don't show them this category if they have none of the permissions
-        if(!Permissions.skillreset(sender) && !Permissions.mmoedit(sender) && !Permissions.adminChat(sender) && !Permissions.mcgod(sender))
+        if (!Permissions.skillreset(sender) && !Permissions.mmoedit(sender) && !Permissions.adminChat(sender) && !Permissions.mcgod(sender))
             return;
 
         sender.sendMessage(LocaleLoader.getString("Commands.Other"));

bukkit/src/main/java/com/gmail/nossr50/commands/McnotifyCommand.java

@@ -1,8 +1,8 @@
 package com.gmail.nossr50.commands;
 
-import com.gmail.nossr50.datatypes.player.McMMOPlayer;
+import com.gmail.nossr50.core.data.UserManager;
-import com.gmail.nossr50.locale.LocaleLoader;
+import com.gmail.nossr50.core.datatypes.player.McMMOPlayer;
-import com.gmail.nossr50.util.player.UserManager;
+import com.gmail.nossr50.core.locale.LocaleLoader;
 import com.google.common.collect.ImmutableList;
 import org.bukkit.command.Command;
 import org.bukkit.command.CommandSender;

bukkit/src/main/java/com/gmail/nossr50/commands/McrefreshCommand.java

@@ -1,8 +1,8 @@
 package com.gmail.nossr50.commands;
 
-import com.gmail.nossr50.datatypes.player.McMMOPlayer;
+import com.gmail.nossr50.core.datatypes.player.McMMOPlayer;
-import com.gmail.nossr50.locale.LocaleLoader;
+import com.gmail.nossr50.core.locale.LocaleLoader;
-import com.gmail.nossr50.util.Permissions;
+import com.gmail.nossr50.core.util.Permissions;
 import org.bukkit.command.CommandSender;
 
 public class McrefreshCommand extends ToggleCommand {

bukkit/src/main/java/com/gmail/nossr50/commands/McscoreboardCommand.java

@@ -1,9 +1,9 @@
 package com.gmail.nossr50.commands;
 
-import com.gmail.nossr50.config.Config;
+import com.gmail.nossr50.core.config.MainConfig;
-import com.gmail.nossr50.locale.LocaleLoader;
+import com.gmail.nossr50.core.locale.LocaleLoader;
-import com.gmail.nossr50.util.commands.CommandUtils;
+import com.gmail.nossr50.core.util.commands.CommandUtils;
-import com.gmail.nossr50.util.scoreboards.ScoreboardManager;
+import com.gmail.nossr50.core.util.scoreboards.ScoreboardManager;
 import com.google.common.collect.ImmutableList;
 import org.bukkit.command.Command;
 import org.bukkit.command.CommandSender;
@@ -31,7 +31,7 @@ public class McscoreboardCommand implements TabExecutor {
                 }
 
                 if (args[0].equalsIgnoreCase("keep")) {
-                    if (!Config.getInstance().getAllowKeepBoard() || !Config.getInstance().getScoreboardsEnabled()) {
+                    if (!MainConfig.getInstance().getAllowKeepBoard() || !MainConfig.getInstance().getScoreboardsEnabled()) {
                         sender.sendMessage(LocaleLoader.getString("Commands.Disabled"));
                         return true;
                     }

bukkit/src/main/java/com/gmail/nossr50/commands/ToggleCommand.java

@@ -1,8 +1,8 @@
 package com.gmail.nossr50.commands;
 
-import com.gmail.nossr50.datatypes.player.McMMOPlayer;
+import com.gmail.nossr50.core.data.UserManager;
-import com.gmail.nossr50.util.commands.CommandUtils;
+import com.gmail.nossr50.core.datatypes.player.McMMOPlayer;
-import com.gmail.nossr50.util.player.UserManager;
+import com.gmail.nossr50.core.util.commands.CommandUtils;
 import com.google.common.collect.ImmutableList;
 import org.bukkit.command.Command;
 import org.bukkit.command.CommandSender;
@@ -71,7 +71,10 @@ public abstract class ToggleCommand implements TabExecutor {
     }
 
     protected abstract boolean hasOtherPermission(CommandSender sender);
+
     protected abstract boolean hasSelfPermission(CommandSender sender);
+
     protected abstract void applyCommandAction(McMMOPlayer mcMMOPlayer);
+
     protected abstract void sendSuccessMessage(CommandSender sender, String playerName);
 }

bukkit/src/main/java/com/gmail/nossr50/commands/XprateCommand.java

@@ -1,13 +1,13 @@
 package com.gmail.nossr50.commands;
 
-import com.gmail.nossr50.config.AdvancedConfig;
 import com.gmail.nossr50.config.experience.ExperienceConfig;
-import com.gmail.nossr50.locale.LocaleLoader;
+import com.gmail.nossr50.core.config.AdvancedConfig;
+import com.gmail.nossr50.core.locale.LocaleLoader;
+import com.gmail.nossr50.core.util.Permissions;
+import com.gmail.nossr50.core.util.StringUtils;
+import com.gmail.nossr50.core.util.commands.CommandUtils;
+import com.gmail.nossr50.core.util.player.NotificationManager;
 import com.gmail.nossr50.mcMMO;
-import com.gmail.nossr50.util.Permissions;
-import com.gmail.nossr50.util.StringUtils;
-import com.gmail.nossr50.util.commands.CommandUtils;
-import com.gmail.nossr50.util.player.NotificationManager;
 import com.google.common.collect.ImmutableList;
 import org.bukkit.ChatColor;
 import org.bukkit.command.Command;
@@ -25,7 +25,7 @@ public class XprateCommand implements TabExecutor {
     public boolean onCommand(CommandSender sender, Command command, String label, String[] args) {
         switch (args.length) {
             case 1:
-                if (!args[0].equalsIgnoreCase("reset") &&  !args[0].equalsIgnoreCase("clear")) {
+                if (!args[0].equalsIgnoreCase("reset") && !args[0].equalsIgnoreCase("clear")) {
                     return false;
                 }
 
@@ -36,12 +36,11 @@ public class XprateCommand implements TabExecutor {
 
                 if (mcMMO.p.isXPEventEnabled()) {
 
-                    if(AdvancedConfig.getInstance().useTitlesForXPEvent())
+                    if (AdvancedConfig.getInstance().useTitlesForXPEvent()) {
-                    {
                         NotificationManager.broadcastTitle(mcMMO.p.getServer(),
                                 LocaleLoader.getString("Commands.Event.Stop"),
                                 LocaleLoader.getString("Commands.Event.Stop.Subtitle"),
-                                10, 10*20, 20);
+                                10, 10 * 20, 20);
                     }
 
                     mcMMO.p.getServer().broadcastMessage(LocaleLoader.getString("Commands.Event.Stop"));
@@ -65,36 +64,31 @@ public class XprateCommand implements TabExecutor {
 
                 if (CommandUtils.shouldDisableToggle(args[1])) {
                     mcMMO.p.setXPEventEnabled(false);
-                }
+                } else if (CommandUtils.shouldEnableToggle(args[1])) {
-                else if (CommandUtils.shouldEnableToggle(args[1])) {
                     mcMMO.p.setXPEventEnabled(true);
-                }
+                } else {
-                else {
                     return false;
                 }
 
                 int newXpRate = Integer.parseInt(args[0]);
 
-                if(newXpRate < 0)
+                if (newXpRate < 0) {
-                {
+                    sender.sendMessage(ChatColor.RED + LocaleLoader.getString("Commands.NegativeNumberWarn"));
-                    sender.sendMessage(ChatColor.RED+LocaleLoader.getString("Commands.NegativeNumberWarn"));
                     return true;
                 }
 
                 ExperienceConfig.getInstance().setExperienceGainsGlobalMultiplier(newXpRate);
 
                 if (mcMMO.p.isXPEventEnabled()) {
-                    if(AdvancedConfig.getInstance().useTitlesForXPEvent())
+                    if (AdvancedConfig.getInstance().useTitlesForXPEvent()) {
-                    {
                         NotificationManager.broadcastTitle(mcMMO.p.getServer(),
                                 LocaleLoader.getString("Commands.Event.Start"),
                                 LocaleLoader.getString("Commands.Event.XP", newXpRate),
-                                10, 10*20, 20);
+                                10, 10 * 20, 20);
                     }
                     mcMMO.p.getServer().broadcastMessage(LocaleLoader.getString("Commands.Event.Start"));
                     mcMMO.p.getServer().broadcastMessage(LocaleLoader.getString("Commands.Event.XP", newXpRate));
-                }
+                } else {
-                else {
                     sender.sendMessage(LocaleLoader.getString("Commands.xprate.modified", newXpRate));
                 }
 

bukkit/src/main/java/com/gmail/nossr50/commands/chat/AdminChatCommand.java

@@ -1,6 +1,6 @@
 package com.gmail.nossr50.commands.chat;
 
-import com.gmail.nossr50.datatypes.chat.ChatMode;
+import com.gmail.nossr50.core.datatypes.chat.ChatMode;
 import org.bukkit.command.CommandSender;
 
 public class AdminChatCommand extends ChatCommand {

bukkit/src/main/java/com/gmail/nossr50/commands/chat/ChatCommand.java

@@ -1,15 +1,15 @@
 package com.gmail.nossr50.commands.chat;
 
-import com.gmail.nossr50.chat.ChatManager;
+import com.gmail.nossr50.core.chat.ChatManager;
-import com.gmail.nossr50.chat.ChatManagerFactory;
+import com.gmail.nossr50.core.chat.ChatManagerFactory;
-import com.gmail.nossr50.config.Config;
+import com.gmail.nossr50.core.config.MainConfig;
-import com.gmail.nossr50.datatypes.chat.ChatMode;
+import com.gmail.nossr50.core.data.UserManager;
-import com.gmail.nossr50.datatypes.party.PartyFeature;
+import com.gmail.nossr50.core.datatypes.chat.ChatMode;
-import com.gmail.nossr50.datatypes.player.McMMOPlayer;
+import com.gmail.nossr50.core.datatypes.party.PartyFeature;
-import com.gmail.nossr50.locale.LocaleLoader;
+import com.gmail.nossr50.core.datatypes.player.McMMOPlayer;
+import com.gmail.nossr50.core.locale.LocaleLoader;
+import com.gmail.nossr50.core.util.commands.CommandUtils;
 import com.gmail.nossr50.mcMMO;
-import com.gmail.nossr50.util.commands.CommandUtils;
-import com.gmail.nossr50.util.player.UserManager;
 import com.google.common.collect.ImmutableList;
 import org.bukkit.command.Command;
 import org.bukkit.command.CommandSender;
@@ -21,8 +21,8 @@ import java.util.ArrayList;
 import java.util.List;
 
 public abstract class ChatCommand implements TabExecutor {
-    private ChatMode chatMode;
     protected ChatManager chatManager;
+    private ChatMode chatMode;
 
     public ChatCommand(ChatMode chatMode) {
         this.chatMode = chatMode;
@@ -47,8 +47,7 @@ public abstract class ChatCommand implements TabExecutor {
 
                 if (mcMMOPlayer.isChatEnabled(chatMode)) {
                     disableChatMode(mcMMOPlayer, sender);
-                }
+                } else {
-                else {
                     enableChatMode(mcMMOPlayer, sender);
                 }
 
@@ -119,7 +118,7 @@ public abstract class ChatCommand implements TabExecutor {
             return;
         }
 
-        if (chatMode == ChatMode.PARTY && (mcMMOPlayer.getParty().getLevel() < Config.getInstance().getPartyFeatureUnlockLevel(PartyFeature.CHAT))) {
+        if (chatMode == ChatMode.PARTY && (mcMMOPlayer.getParty().getLevel() < MainConfig.getInstance().getPartyFeatureUnlockLevel(PartyFeature.CHAT))) {
             sender.sendMessage(LocaleLoader.getString("Party.Feature.Disabled.1"));
             return;
         }

bukkit/src/main/java/com/gmail/nossr50/commands/chat/McChatSpy.java

@@ -1,9 +1,9 @@
 package com.gmail.nossr50.commands.chat;
 
 import com.gmail.nossr50.commands.ToggleCommand;
-import com.gmail.nossr50.datatypes.player.McMMOPlayer;
+import com.gmail.nossr50.core.datatypes.player.McMMOPlayer;
-import com.gmail.nossr50.locale.LocaleLoader;
+import com.gmail.nossr50.core.locale.LocaleLoader;
-import com.gmail.nossr50.util.Permissions;
+import com.gmail.nossr50.core.util.Permissions;
 import org.bukkit.command.CommandSender;
 
 public class McChatSpy extends ToggleCommand {

bukkit/src/main/java/com/gmail/nossr50/commands/chat/PartyChatCommand.java

@@ -1,13 +1,13 @@
 package com.gmail.nossr50.commands.chat;
 
-import com.gmail.nossr50.chat.PartyChatManager;
+import com.gmail.nossr50.core.chat.PartyChatManager;
-import com.gmail.nossr50.config.Config;
+import com.gmail.nossr50.core.config.MainConfig;
-import com.gmail.nossr50.datatypes.chat.ChatMode;
+import com.gmail.nossr50.core.data.UserManager;
-import com.gmail.nossr50.datatypes.party.Party;
+import com.gmail.nossr50.core.datatypes.chat.ChatMode;
-import com.gmail.nossr50.datatypes.party.PartyFeature;
+import com.gmail.nossr50.core.datatypes.party.Party;
-import com.gmail.nossr50.locale.LocaleLoader;
+import com.gmail.nossr50.core.datatypes.party.PartyFeature;
-import com.gmail.nossr50.party.PartyManager;
+import com.gmail.nossr50.core.locale.LocaleLoader;
-import com.gmail.nossr50.util.player.UserManager;
+import com.gmail.nossr50.core.party.PartyManager;
 import org.bukkit.command.CommandSender;
 import org.bukkit.entity.Player;
 
@@ -29,14 +29,13 @@ public class PartyChatCommand extends ChatCommand {
                 return;
             }
 
-            if (party.getLevel() < Config.getInstance().getPartyFeatureUnlockLevel(PartyFeature.CHAT)) {
+            if (party.getLevel() < MainConfig.getInstance().getPartyFeatureUnlockLevel(PartyFeature.CHAT)) {
                 sender.sendMessage(LocaleLoader.getString("Party.Feature.Disabled.1"));
                 return;
             }
 
             message = buildChatMessage(args, 0);
-        }
+        } else {
-        else {
             if (args.length < 2) {
                 sender.sendMessage(LocaleLoader.getString("Party.Specify"));
                 return;

bukkit/src/main/java/com/gmail/nossr50/commands/database/ConvertDatabaseCommand.java

@@ -1,14 +1,14 @@
 package com.gmail.nossr50.commands.database;
 
-import com.gmail.nossr50.database.DatabaseManager;
+import com.gmail.nossr50.core.data.UserManager;
-import com.gmail.nossr50.database.DatabaseManagerFactory;
+import com.gmail.nossr50.core.data.database.DatabaseManager;
-import com.gmail.nossr50.datatypes.database.DatabaseType;
+import com.gmail.nossr50.core.data.database.DatabaseManagerFactory;
-import com.gmail.nossr50.datatypes.player.PlayerProfile;
+import com.gmail.nossr50.core.datatypes.database.DatabaseType;
-import com.gmail.nossr50.locale.LocaleLoader;
+import com.gmail.nossr50.core.datatypes.player.PlayerProfile;
+import com.gmail.nossr50.core.locale.LocaleLoader;
+import com.gmail.nossr50.core.runnables.database.DatabaseConversionTask;
+import com.gmail.nossr50.core.runnables.player.PlayerProfileLoadingTask;
 import com.gmail.nossr50.mcMMO;
-import com.gmail.nossr50.runnables.database.DatabaseConversionTask;
-import com.gmail.nossr50.runnables.player.PlayerProfileLoadingTask;
-import com.gmail.nossr50.util.player.UserManager;
 import org.bukkit.command.Command;
 import org.bukkit.command.CommandExecutor;
 import org.bukkit.command.CommandSender;
@@ -41,8 +41,7 @@ public class ConvertDatabaseCommand implements CommandExecutor {
                         }
 
                         oldDatabase = DatabaseManagerFactory.createCustomDatabaseManager((Class<? extends DatabaseManager>) clazz);
-                    }
+                    } catch (Throwable e) {
-                    catch (Throwable e) {
                         e.printStackTrace();
                         sender.sendMessage(LocaleLoader.getString("Commands.mcconvert.Database.InvalidType", args[1]));
                         return true;

bukkit/src/main/java/com/gmail/nossr50/commands/database/McpurgeCommand.java

@@ -1,7 +1,7 @@
 package com.gmail.nossr50.commands.database;
 
-import com.gmail.nossr50.config.Config;
+import com.gmail.nossr50.core.config.MainConfig;
-import com.gmail.nossr50.locale.LocaleLoader;
+import com.gmail.nossr50.core.locale.LocaleLoader;
 import com.gmail.nossr50.mcMMO;
 import com.google.common.collect.ImmutableList;
 import org.bukkit.command.Command;
@@ -17,7 +17,7 @@ public class McpurgeCommand implements TabExecutor {
             case 0:
                 mcMMO.getDatabaseManager().purgePowerlessUsers();
 
-                if (Config.getInstance().getOldUsersCutoff() != -1) {
+                if (MainConfig.getInstance().getOldUsersCutoff() != -1) {
                     mcMMO.getDatabaseManager().purgeOldUsers();
                 }
 

bukkit/src/main/java/com/gmail/nossr50/commands/database/McremoveCommand.java

@@ -1,9 +1,9 @@
 package com.gmail.nossr50.commands.database;
 
-import com.gmail.nossr50.locale.LocaleLoader;
+import com.gmail.nossr50.core.data.UserManager;
+import com.gmail.nossr50.core.locale.LocaleLoader;
+import com.gmail.nossr50.core.util.commands.CommandUtils;
 import com.gmail.nossr50.mcMMO;
-import com.gmail.nossr50.util.commands.CommandUtils;
-import com.gmail.nossr50.util.player.UserManager;
 import com.google.common.collect.ImmutableList;
 import org.bukkit.command.Command;
 import org.bukkit.command.CommandSender;
@@ -26,8 +26,7 @@ public class McremoveCommand implements TabExecutor {
 
                 if (mcMMO.getDatabaseManager().removeUser(playerName)) {
                     sender.sendMessage(LocaleLoader.getString("Commands.mcremove.Success", playerName));
-                }
+                } else {
-                else {
                     sender.sendMessage(playerName + " could not be removed from the database."); // Pretty sure this should NEVER happen.
                 }
 

bukkit/src/main/java/com/gmail/nossr50/commands/database/MmoshowdbCommand.java

@@ -1,8 +1,8 @@
 package com.gmail.nossr50.commands.database;
 
-import com.gmail.nossr50.config.Config;
+import com.gmail.nossr50.core.config.MainConfig;
-import com.gmail.nossr50.database.DatabaseManagerFactory;
+import com.gmail.nossr50.core.data.database.DatabaseManagerFactory;
-import com.gmail.nossr50.locale.LocaleLoader;
+import com.gmail.nossr50.core.locale.LocaleLoader;
 import com.google.common.collect.ImmutableList;
 import org.bukkit.command.Command;
 import org.bukkit.command.CommandSender;
@@ -22,7 +22,7 @@ public class MmoshowdbCommand implements TabExecutor {
                     return true;
                 }
 
-                sender.sendMessage(LocaleLoader.getString("Commands.mmoshowdb", (Config.getInstance().getUseMySQL() ? "sql" : "flatfile")));
+                sender.sendMessage(LocaleLoader.getString("Commands.mmoshowdb", (MainConfig.getInstance().getUseMySQL() ? "sql" : "flatfile")));
                 return true;
 
             default:

bukkit/src/main/java/com/gmail/nossr50/commands/experience/AddlevelsCommand.java

@@ -1,11 +1,11 @@
 package com.gmail.nossr50.commands.experience;
 
-import com.gmail.nossr50.datatypes.experience.XPGainReason;
+import com.gmail.nossr50.core.datatypes.experience.XPGainReason;
-import com.gmail.nossr50.datatypes.player.PlayerProfile;
+import com.gmail.nossr50.core.datatypes.player.PlayerProfile;
-import com.gmail.nossr50.datatypes.skills.PrimarySkillType;
+import com.gmail.nossr50.core.locale.LocaleLoader;
-import com.gmail.nossr50.locale.LocaleLoader;
+import com.gmail.nossr50.core.skills.PrimarySkillType;
-import com.gmail.nossr50.util.EventUtils;
+import com.gmail.nossr50.core.util.EventUtils;
-import com.gmail.nossr50.util.Permissions;
+import com.gmail.nossr50.core.util.Permissions;
 import org.bukkit.command.CommandSender;
 import org.bukkit.entity.Player;
 

bukkit/src/main/java/com/gmail/nossr50/commands/experience/AddxpCommand.java

@@ -1,12 +1,12 @@
 package com.gmail.nossr50.commands.experience;
 
-import com.gmail.nossr50.datatypes.experience.XPGainReason;
+import com.gmail.nossr50.core.data.UserManager;
-import com.gmail.nossr50.datatypes.experience.XPGainSource;
+import com.gmail.nossr50.core.datatypes.experience.XPGainReason;
-import com.gmail.nossr50.datatypes.player.PlayerProfile;
+import com.gmail.nossr50.core.datatypes.experience.XPGainSource;
-import com.gmail.nossr50.datatypes.skills.PrimarySkillType;
+import com.gmail.nossr50.core.datatypes.player.PlayerProfile;
-import com.gmail.nossr50.locale.LocaleLoader;
+import com.gmail.nossr50.core.locale.LocaleLoader;
-import com.gmail.nossr50.util.Permissions;
+import com.gmail.nossr50.core.skills.PrimarySkillType;
-import com.gmail.nossr50.util.player.UserManager;
+import com.gmail.nossr50.core.util.Permissions;
 import org.bukkit.command.CommandSender;
 import org.bukkit.entity.Player;
 
@@ -25,8 +25,7 @@ public class AddxpCommand extends ExperienceCommand {
     protected void handleCommand(Player player, PlayerProfile profile, PrimarySkillType skill, int value) {
         if (player != null) {
             UserManager.getPlayer(player).applyXpGain(skill, value, XPGainReason.COMMAND, XPGainSource.COMMAND);
-        }
+        } else {
-        else {
             profile.addXp(skill, value);
             profile.scheduleAsyncSave();
         }

bukkit/src/main/java/com/gmail/nossr50/commands/experience/ConvertExperienceCommand.java

@@ -1,11 +1,11 @@
 package com.gmail.nossr50.commands.experience;
 
-import com.gmail.nossr50.datatypes.experience.FormulaType;
+import com.gmail.nossr50.core.data.UserManager;
-import com.gmail.nossr50.locale.LocaleLoader;
+import com.gmail.nossr50.core.datatypes.experience.FormulaType;
+import com.gmail.nossr50.core.locale.LocaleLoader;
+import com.gmail.nossr50.core.runnables.database.FormulaConversionTask;
+import com.gmail.nossr50.core.runnables.player.PlayerProfileLoadingTask;
 import com.gmail.nossr50.mcMMO;
-import com.gmail.nossr50.runnables.database.FormulaConversionTask;
-import com.gmail.nossr50.runnables.player.PlayerProfileLoadingTask;
-import com.gmail.nossr50.util.player.UserManager;
 import org.bukkit.command.Command;
 import org.bukkit.command.CommandExecutor;
 import org.bukkit.command.CommandSender;

bukkit/src/main/java/com/gmail/nossr50/commands/experience/ExperienceCommand.java

@@ -1,12 +1,12 @@
 package com.gmail.nossr50.commands.experience;
 
-import com.gmail.nossr50.datatypes.player.McMMOPlayer;
+import com.gmail.nossr50.core.data.UserManager;
-import com.gmail.nossr50.datatypes.player.PlayerProfile;
+import com.gmail.nossr50.core.datatypes.player.McMMOPlayer;
-import com.gmail.nossr50.datatypes.skills.PrimarySkillType;
+import com.gmail.nossr50.core.datatypes.player.PlayerProfile;
-import com.gmail.nossr50.locale.LocaleLoader;
+import com.gmail.nossr50.core.locale.LocaleLoader;
+import com.gmail.nossr50.core.skills.PrimarySkillType;
+import com.gmail.nossr50.core.util.commands.CommandUtils;
 import com.gmail.nossr50.mcMMO;
-import com.gmail.nossr50.util.commands.CommandUtils;
-import com.gmail.nossr50.util.player.UserManager;
 import com.google.common.collect.ImmutableList;
 import org.bukkit.OfflinePlayer;
 import org.bukkit.command.Command;
@@ -20,6 +20,14 @@ import java.util.List;
 import java.util.UUID;
 
 public abstract class ExperienceCommand implements TabExecutor {
+    protected static void handleSenderMessage(CommandSender sender, String playerName, PrimarySkillType skill) {
+        if (skill == null) {
+            sender.sendMessage(LocaleLoader.getString("Commands.addlevels.AwardAll.2", playerName));
+        } else {
+            sender.sendMessage(LocaleLoader.getString("Commands.addlevels.AwardSkill.2", skill.getName(), playerName));
+        }
+    }
+
     @Override
     public boolean onCommand(CommandSender sender, Command command, String label, String[] args) {
         PrimarySkillType skill;
@@ -45,8 +53,7 @@ public abstract class ExperienceCommand implements TabExecutor {
                     skill = null;
                 }
 
-                if (skill != null && skill.isChildSkill())
+                if (skill != null && skill.isChildSkill()) {
-                {
                     sender.sendMessage(LocaleLoader.getString("Commands.Skill.ChildSkill"));
                     return true;
                 }
@@ -70,8 +77,7 @@ public abstract class ExperienceCommand implements TabExecutor {
                     skill = null;
                 }
 
-                if (skill != null && skill.isChildSkill())
+                if (skill != null && skill.isChildSkill()) {
-                {
                     sender.sendMessage(LocaleLoader.getString("Commands.Skill.ChildSkill"));
                     return true;
                 }
@@ -95,8 +101,7 @@ public abstract class ExperienceCommand implements TabExecutor {
                     }
 
                     editValues(null, profile, skill, value);
-                }
+                } else {
-                else {
                     editValues(mcMMOPlayer.getPlayer(), mcMMOPlayer.getProfile(), skill, value);
                 }
 
@@ -122,24 +127,19 @@ public abstract class ExperienceCommand implements TabExecutor {
     }
 
     protected abstract boolean permissionsCheckSelf(CommandSender sender);
+
     protected abstract boolean permissionsCheckOthers(CommandSender sender);
+
     protected abstract void handleCommand(Player player, PlayerProfile profile, PrimarySkillType skill, int value);
+
     protected abstract void handlePlayerMessageAll(Player player, int value);
+
     protected abstract void handlePlayerMessageSkill(Player player, int value, PrimarySkillType skill);
 
     private boolean validateArguments(CommandSender sender, String skillName, String value) {
         return !(CommandUtils.isInvalidInteger(sender, value) || (!skillName.equalsIgnoreCase("all") && CommandUtils.isInvalidSkill(sender, skillName)));
     }
 
-    protected static void handleSenderMessage(CommandSender sender, String playerName, PrimarySkillType skill) {
-        if (skill == null) {
-            sender.sendMessage(LocaleLoader.getString("Commands.addlevels.AwardAll.2", playerName));
-        }
-        else {
-            sender.sendMessage(LocaleLoader.getString("Commands.addlevels.AwardSkill.2", skill.getName(), playerName));
-        }
-    }
-
     protected void editValues(Player player, PlayerProfile profile, PrimarySkillType skill, int value) {
         if (skill == null) {
             for (PrimarySkillType primarySkillType : PrimarySkillType.NON_CHILD_SKILLS) {
@@ -149,8 +149,7 @@ public abstract class ExperienceCommand implements TabExecutor {
             if (player != null) {
                 handlePlayerMessageAll(player, value);
             }
-        }
+        } else {
-        else {
             handleCommand(player, profile, skill, value);
 
             if (player != null) {

bukkit/src/main/java/com/gmail/nossr50/commands/experience/MmoeditCommand.java

@@ -1,11 +1,11 @@
 package com.gmail.nossr50.commands.experience;
 
-import com.gmail.nossr50.datatypes.experience.XPGainReason;
+import com.gmail.nossr50.core.datatypes.experience.XPGainReason;
-import com.gmail.nossr50.datatypes.player.PlayerProfile;
+import com.gmail.nossr50.core.datatypes.player.PlayerProfile;
-import com.gmail.nossr50.datatypes.skills.PrimarySkillType;
+import com.gmail.nossr50.core.locale.LocaleLoader;
-import com.gmail.nossr50.locale.LocaleLoader;
+import com.gmail.nossr50.core.skills.PrimarySkillType;
-import com.gmail.nossr50.util.EventUtils;
+import com.gmail.nossr50.core.util.EventUtils;
-import com.gmail.nossr50.util.Permissions;
+import com.gmail.nossr50.core.util.Permissions;
 import org.bukkit.command.CommandSender;
 import org.bukkit.entity.Player;
 

bukkit/src/main/java/com/gmail/nossr50/commands/experience/SkillresetCommand.java

@@ -1,15 +1,15 @@
 package com.gmail.nossr50.commands.experience;
 
-import com.gmail.nossr50.datatypes.experience.XPGainReason;
+import com.gmail.nossr50.core.data.UserManager;
-import com.gmail.nossr50.datatypes.player.McMMOPlayer;
+import com.gmail.nossr50.core.datatypes.experience.XPGainReason;
-import com.gmail.nossr50.datatypes.player.PlayerProfile;
+import com.gmail.nossr50.core.datatypes.player.McMMOPlayer;
-import com.gmail.nossr50.datatypes.skills.PrimarySkillType;
+import com.gmail.nossr50.core.datatypes.player.PlayerProfile;
-import com.gmail.nossr50.locale.LocaleLoader;
+import com.gmail.nossr50.core.locale.LocaleLoader;
+import com.gmail.nossr50.core.skills.PrimarySkillType;
+import com.gmail.nossr50.core.util.EventUtils;
+import com.gmail.nossr50.core.util.Permissions;
+import com.gmail.nossr50.core.util.commands.CommandUtils;
 import com.gmail.nossr50.mcMMO;
-import com.gmail.nossr50.util.EventUtils;
-import com.gmail.nossr50.util.Permissions;
-import com.gmail.nossr50.util.commands.CommandUtils;
-import com.gmail.nossr50.util.player.UserManager;
 import com.google.common.collect.ImmutableList;
 import org.bukkit.OfflinePlayer;
 import org.bukkit.command.Command;
@@ -27,6 +27,14 @@ import java.util.UUID;
  * value/quantity argument is removed.
  */
 public class SkillresetCommand implements TabExecutor {
+    protected static void handleSenderMessage(CommandSender sender, String playerName, PrimarySkillType skill) {
+        if (skill == null) {
+            sender.sendMessage(LocaleLoader.getString("Commands.addlevels.AwardAll.2", playerName));
+        } else {
+            sender.sendMessage(LocaleLoader.getString("Commands.addlevels.AwardSkill.2", skill.getName(), playerName));
+        }
+    }
+
     @Override
     public boolean onCommand(CommandSender sender, Command command, String label, String[] args) {
         PrimarySkillType skill;
@@ -47,8 +55,7 @@ public class SkillresetCommand implements TabExecutor {
 
                 if (args[0].equalsIgnoreCase("all")) {
                     skill = null;
-                }
+                } else {
-                else {
                     skill = PrimarySkillType.getSkill(args[1]);
                 }
 
@@ -67,8 +74,7 @@ public class SkillresetCommand implements TabExecutor {
 
                 if (args[1].equalsIgnoreCase("all")) {
                     skill = null;
-                }
+                } else {
-                else {
                     skill = PrimarySkillType.getSkill(args[1]);
                 }
 
@@ -89,8 +95,7 @@ public class SkillresetCommand implements TabExecutor {
                     }
 
                     editValues(null, profile, skill);
-                }
+                } else {
-                else {
                     editValues(mcMMOPlayer.getPlayer(), mcMMOPlayer.getProfile(), skill);
                 }
 
@@ -149,15 +154,6 @@ public class SkillresetCommand implements TabExecutor {
         return skillName.equalsIgnoreCase("all") || !CommandUtils.isInvalidSkill(sender, skillName);
     }
 
-    protected static void handleSenderMessage(CommandSender sender, String playerName, PrimarySkillType skill) {
-        if (skill == null) {
-            sender.sendMessage(LocaleLoader.getString("Commands.addlevels.AwardAll.2", playerName));
-        }
-        else {
-            sender.sendMessage(LocaleLoader.getString("Commands.addlevels.AwardSkill.2", skill.getName(), playerName));
-        }
-    }
-
     protected void editValues(Player player, PlayerProfile profile, PrimarySkillType skill) {
         if (skill == null) {
             for (PrimarySkillType primarySkillType : PrimarySkillType.NON_CHILD_SKILLS) {
@@ -167,8 +163,7 @@ public class SkillresetCommand implements TabExecutor {
             if (player != null) {
                 handlePlayerMessageAll(player);
             }
-        }
+        } else {
-        else {
             handleCommand(player, profile, skill);
 
             if (player != null) {

bukkit/src/main/java/com/gmail/nossr50/commands/hardcore/HardcoreCommand.java

@@ -1,10 +1,10 @@
 package com.gmail.nossr50.commands.hardcore;
 
-import com.gmail.nossr50.config.Config;
+import com.gmail.nossr50.core.config.MainConfig;
-import com.gmail.nossr50.datatypes.skills.PrimarySkillType;
+import com.gmail.nossr50.core.locale.LocaleLoader;
-import com.gmail.nossr50.locale.LocaleLoader;
+import com.gmail.nossr50.core.skills.PrimarySkillType;
+import com.gmail.nossr50.core.util.Permissions;
 import com.gmail.nossr50.mcMMO;
-import com.gmail.nossr50.util.Permissions;
 import org.bukkit.command.CommandSender;
 
 public class HardcoreCommand extends HardcoreModeCommand {
@@ -45,7 +45,7 @@ public class HardcoreCommand extends HardcoreModeCommand {
 
     @Override
     protected void modify(CommandSender sender, double newPercentage) {
-        Config.getInstance().setHardcoreDeathStatPenaltyPercentage(newPercentage);
+        MainConfig.getInstance().setHardcoreDeathStatPenaltyPercentage(newPercentage);
         sender.sendMessage(LocaleLoader.getString("Hardcore.DeathStatLoss.PercentageChanged", percent.format(newPercentage / 100.0D)));
     }
 
@@ -54,8 +54,7 @@ public class HardcoreCommand extends HardcoreModeCommand {
             for (PrimarySkillType primarySkillType : PrimarySkillType.NON_CHILD_SKILLS) {
                 primarySkillType.setHardcoreStatLossEnabled(enable);
             }
-        }
+        } else {
-        else {
             skill.setHardcoreStatLossEnabled(enable);
         }
 

bukkit/src/main/java/com/gmail/nossr50/commands/hardcore/HardcoreModeCommand.java

@@ -1,9 +1,9 @@
 package com.gmail.nossr50.commands.hardcore;
 
-import com.gmail.nossr50.datatypes.skills.PrimarySkillType;
+import com.gmail.nossr50.core.skills.PrimarySkillType;
-import com.gmail.nossr50.util.Permissions;
+import com.gmail.nossr50.core.util.Permissions;
-import com.gmail.nossr50.util.StringUtils;
+import com.gmail.nossr50.core.util.StringUtils;
-import com.gmail.nossr50.util.commands.CommandUtils;
+import com.gmail.nossr50.core.util.commands.CommandUtils;
 import com.google.common.collect.ImmutableList;
 import org.bukkit.command.Command;
 import org.bukkit.command.CommandSender;
@@ -28,8 +28,7 @@ public abstract class HardcoreModeCommand implements TabExecutor {
 
                 if (checkEnabled(null)) {
                     disable(null);
-                }
+                } else {
-                else {
                     enable(null);
                 }
 
@@ -122,9 +121,14 @@ public abstract class HardcoreModeCommand implements TabExecutor {
     }
 
     protected abstract boolean checkTogglePermissions(CommandSender sender);
+
     protected abstract boolean checkModifyPermissions(CommandSender sender);
+
     protected abstract boolean checkEnabled(PrimarySkillType skill);
+
     protected abstract void enable(PrimarySkillType skill);
+
     protected abstract void disable(PrimarySkillType skill);
+
     protected abstract void modify(CommandSender sender, double newPercentage);
 }

bukkit/src/main/java/com/gmail/nossr50/commands/hardcore/VampirismCommand.java

@@ -1,10 +1,10 @@
 package com.gmail.nossr50.commands.hardcore;
 
-import com.gmail.nossr50.config.Config;
+import com.gmail.nossr50.core.config.MainConfig;
-import com.gmail.nossr50.datatypes.skills.PrimarySkillType;
+import com.gmail.nossr50.core.locale.LocaleLoader;
-import com.gmail.nossr50.locale.LocaleLoader;
+import com.gmail.nossr50.core.skills.PrimarySkillType;
+import com.gmail.nossr50.core.util.Permissions;
 import com.gmail.nossr50.mcMMO;
-import com.gmail.nossr50.util.Permissions;
 import org.bukkit.command.CommandSender;
 
 public class VampirismCommand extends HardcoreModeCommand {
@@ -45,7 +45,7 @@ public class VampirismCommand extends HardcoreModeCommand {
 
     @Override
     protected void modify(CommandSender sender, double newPercentage) {
-        Config.getInstance().setHardcoreVampirismStatLeechPercentage(newPercentage);
+        MainConfig.getInstance().setHardcoreVampirismStatLeechPercentage(newPercentage);
         sender.sendMessage(LocaleLoader.getString("Hardcore.Vampirism.PercentageChanged", percent.format(newPercentage / 100.0D)));
     }
 
@@ -54,8 +54,7 @@ public class VampirismCommand extends HardcoreModeCommand {
             for (PrimarySkillType primarySkillType : PrimarySkillType.NON_CHILD_SKILLS) {
                 primarySkillType.setHardcoreVampirismEnabled(enable);
             }
-        }
+        } else {
-        else {
             skill.setHardcoreVampirismEnabled(enable);
         }
 

bukkit/src/main/java/com/gmail/nossr50/commands/party/PartyAcceptCommand.java

@@ -1,9 +1,9 @@
 package com.gmail.nossr50.commands.party;
 
-import com.gmail.nossr50.datatypes.player.McMMOPlayer;
+import com.gmail.nossr50.core.data.UserManager;
-import com.gmail.nossr50.locale.LocaleLoader;
+import com.gmail.nossr50.core.datatypes.player.McMMOPlayer;
-import com.gmail.nossr50.party.PartyManager;
+import com.gmail.nossr50.core.locale.LocaleLoader;
-import com.gmail.nossr50.util.player.UserManager;
+import com.gmail.nossr50.core.party.PartyManager;
 import org.bukkit.command.Command;
 import org.bukkit.command.CommandExecutor;
 import org.bukkit.command.CommandSender;

bukkit/src/main/java/com/gmail/nossr50/commands/party/PartyChangeOwnerCommand.java

@@ -1,11 +1,11 @@
 package com.gmail.nossr50.commands.party;
 
-import com.gmail.nossr50.datatypes.party.Party;
+import com.gmail.nossr50.core.data.UserManager;
-import com.gmail.nossr50.locale.LocaleLoader;
+import com.gmail.nossr50.core.datatypes.party.Party;
+import com.gmail.nossr50.core.locale.LocaleLoader;
+import com.gmail.nossr50.core.party.PartyManager;
+import com.gmail.nossr50.core.util.commands.CommandUtils;
 import com.gmail.nossr50.mcMMO;
-import com.gmail.nossr50.party.PartyManager;
-import com.gmail.nossr50.util.commands.CommandUtils;
-import com.gmail.nossr50.util.player.UserManager;
 import org.bukkit.OfflinePlayer;
 import org.bukkit.command.Command;
 import org.bukkit.command.CommandExecutor;

bukkit/src/main/java/com/gmail/nossr50/commands/party/PartyChangePasswordCommand.java

@@ -1,8 +1,8 @@
 package com.gmail.nossr50.commands.party;
 
-import com.gmail.nossr50.datatypes.party.Party;
+import com.gmail.nossr50.core.data.UserManager;
-import com.gmail.nossr50.locale.LocaleLoader;
+import com.gmail.nossr50.core.datatypes.party.Party;
-import com.gmail.nossr50.util.player.UserManager;
+import com.gmail.nossr50.core.locale.LocaleLoader;
 import org.bukkit.command.Command;
 import org.bukkit.command.CommandExecutor;
 import org.bukkit.command.CommandSender;

bukkit/src/main/java/com/gmail/nossr50/commands/party/PartyCommand.java

@@ -3,12 +3,12 @@ package com.gmail.nossr50.commands.party;
 import com.gmail.nossr50.commands.chat.PartyChatCommand;
 import com.gmail.nossr50.commands.party.alliance.PartyAllianceCommand;
 import com.gmail.nossr50.commands.party.teleport.PtpCommand;
-import com.gmail.nossr50.datatypes.party.Party;
+import com.gmail.nossr50.core.data.UserManager;
-import com.gmail.nossr50.datatypes.player.McMMOPlayer;
+import com.gmail.nossr50.core.datatypes.party.Party;
-import com.gmail.nossr50.locale.LocaleLoader;
+import com.gmail.nossr50.core.datatypes.player.McMMOPlayer;
-import com.gmail.nossr50.util.Permissions;
+import com.gmail.nossr50.core.locale.LocaleLoader;
-import com.gmail.nossr50.util.commands.CommandUtils;
+import com.gmail.nossr50.core.util.Permissions;
-import com.gmail.nossr50.util.player.UserManager;
+import com.gmail.nossr50.core.util.commands.CommandUtils;
 import com.google.common.collect.ImmutableList;
 import org.bukkit.command.Command;
 import org.bukkit.command.CommandExecutor;
@@ -38,24 +38,24 @@ public class PartyCommand implements TabExecutor {
         PARTY_SUBCOMMANDS = ImmutableList.copyOf(subcommands);
     }
 
-    private CommandExecutor partyJoinCommand           = new PartyJoinCommand();
+    private CommandExecutor partyJoinCommand = new PartyJoinCommand();
-    private CommandExecutor partyAcceptCommand         = new PartyAcceptCommand();
+    private CommandExecutor partyAcceptCommand = new PartyAcceptCommand();
-    private CommandExecutor partyCreateCommand         = new PartyCreateCommand();
+    private CommandExecutor partyCreateCommand = new PartyCreateCommand();
-    private CommandExecutor partyQuitCommand           = new PartyQuitCommand();
+    private CommandExecutor partyQuitCommand = new PartyQuitCommand();
-    private CommandExecutor partyXpShareCommand        = new PartyXpShareCommand();
+    private CommandExecutor partyXpShareCommand = new PartyXpShareCommand();
-    private CommandExecutor partyItemShareCommand      = new PartyItemShareCommand();
+    private CommandExecutor partyItemShareCommand = new PartyItemShareCommand();
-    private CommandExecutor partyInviteCommand         = new PartyInviteCommand();
+    private CommandExecutor partyInviteCommand = new PartyInviteCommand();
-    private CommandExecutor partyKickCommand           = new PartyKickCommand();
+    private CommandExecutor partyKickCommand = new PartyKickCommand();
-    private CommandExecutor partyDisbandCommand        = new PartyDisbandCommand();
+    private CommandExecutor partyDisbandCommand = new PartyDisbandCommand();
-    private CommandExecutor partyChangeOwnerCommand    = new PartyChangeOwnerCommand();
+    private CommandExecutor partyChangeOwnerCommand = new PartyChangeOwnerCommand();
-    private CommandExecutor partyLockCommand           = new PartyLockCommand();
+    private CommandExecutor partyLockCommand = new PartyLockCommand();
     private CommandExecutor partyChangePasswordCommand = new PartyChangePasswordCommand();
-    private CommandExecutor partyRenameCommand         = new PartyRenameCommand();
+    private CommandExecutor partyRenameCommand = new PartyRenameCommand();
-    private CommandExecutor partyInfoCommand           = new PartyInfoCommand();
+    private CommandExecutor partyInfoCommand = new PartyInfoCommand();
-    private CommandExecutor partyHelpCommand           = new PartyHelpCommand();
+    private CommandExecutor partyHelpCommand = new PartyHelpCommand();
-    private CommandExecutor partyTeleportCommand       = new PtpCommand();
+    private CommandExecutor partyTeleportCommand = new PtpCommand();
-    private CommandExecutor partyChatCommand           = new PartyChatCommand();
+    private CommandExecutor partyChatCommand = new PartyChatCommand();
-    private CommandExecutor partyAllianceCommand       = new PartyAllianceCommand();
+    private CommandExecutor partyAllianceCommand = new PartyAllianceCommand();
 
     @Override
     public boolean onCommand(CommandSender sender, Command command, String label, String[] args) {

bukkit/src/main/java/com/gmail/nossr50/commands/party/PartyCreateCommand.java

@@ -1,9 +1,9 @@
 package com.gmail.nossr50.commands.party;
 
-import com.gmail.nossr50.datatypes.player.McMMOPlayer;
+import com.gmail.nossr50.core.data.UserManager;
-import com.gmail.nossr50.locale.LocaleLoader;
+import com.gmail.nossr50.core.datatypes.player.McMMOPlayer;
-import com.gmail.nossr50.party.PartyManager;
+import com.gmail.nossr50.core.locale.LocaleLoader;
-import com.gmail.nossr50.util.player.UserManager;
+import com.gmail.nossr50.core.party.PartyManager;
 import org.bukkit.command.Command;
 import org.bukkit.command.CommandExecutor;
 import org.bukkit.command.CommandSender;

bukkit/src/main/java/com/gmail/nossr50/commands/party/PartyDisbandCommand.java

@@ -1,10 +1,10 @@
 package com.gmail.nossr50.commands.party;
 
-import com.gmail.nossr50.datatypes.party.Party;
+import com.gmail.nossr50.core.data.UserManager;
-import com.gmail.nossr50.events.party.McMMOPartyChangeEvent.EventReason;
+import com.gmail.nossr50.core.datatypes.party.Party;
-import com.gmail.nossr50.locale.LocaleLoader;
+import com.gmail.nossr50.core.locale.LocaleLoader;
-import com.gmail.nossr50.party.PartyManager;
+import com.gmail.nossr50.core.party.PartyManager;
-import com.gmail.nossr50.util.player.UserManager;
+import com.gmail.nossr50.core.events.party.McMMOPartyChangeEvent.EventReason;
 import org.bukkit.command.Command;
 import org.bukkit.command.CommandExecutor;
 import org.bukkit.command.CommandSender;

bukkit/src/main/java/com/gmail/nossr50/commands/party/PartyHelpCommand.java

@@ -1,6 +1,6 @@
 package com.gmail.nossr50.commands.party;
 
-import com.gmail.nossr50.locale.LocaleLoader;
+import com.gmail.nossr50.core.locale.LocaleLoader;
 import org.bukkit.command.Command;
 import org.bukkit.command.CommandExecutor;
 import org.bukkit.command.CommandSender;

bukkit/src/main/java/com/gmail/nossr50/commands/party/PartyInfoCommand.java

@@ -1,13 +1,13 @@
 package com.gmail.nossr50.commands.party;
 
-import com.gmail.nossr50.config.Config;
+import com.gmail.nossr50.core.config.MainConfig;
-import com.gmail.nossr50.datatypes.party.Party;
+import com.gmail.nossr50.core.data.UserManager;
-import com.gmail.nossr50.datatypes.party.PartyFeature;
+import com.gmail.nossr50.core.datatypes.party.Party;
-import com.gmail.nossr50.datatypes.party.ShareMode;
+import com.gmail.nossr50.core.datatypes.party.PartyFeature;
-import com.gmail.nossr50.datatypes.player.McMMOPlayer;
+import com.gmail.nossr50.core.datatypes.party.ShareMode;
-import com.gmail.nossr50.locale.LocaleLoader;
+import com.gmail.nossr50.core.datatypes.player.McMMOPlayer;
-import com.gmail.nossr50.party.PartyManager;
+import com.gmail.nossr50.core.locale.LocaleLoader;
-import com.gmail.nossr50.util.player.UserManager;
+import com.gmail.nossr50.core.party.PartyManager;
 import org.bukkit.ChatColor;
 import org.bukkit.command.Command;
 import org.bukkit.command.CommandExecutor;
@@ -65,8 +65,7 @@ public class PartyInfoCommand implements CommandExecutor {
 
             if (isUnlockedFeature(party, partyFeature)) {
                 unlockedPartyFeatures.add(partyFeature.getLocaleString());
-            }
+            } else {
-            else {
                 lockedPartyFeatures.add(partyFeature.getFeatureLockedLocaleString());
             }
         }
@@ -79,7 +78,7 @@ public class PartyInfoCommand implements CommandExecutor {
     }
 
     private boolean isUnlockedFeature(Party party, PartyFeature partyFeature) {
-        return party.getLevel() >= Config.getInstance().getPartyFeatureUnlockLevel(partyFeature);
+        return party.getLevel() >= MainConfig.getInstance().getPartyFeatureUnlockLevel(partyFeature);
     }
 
     private void displayShareModeInfo(Player player, Party party) {
@@ -123,7 +122,7 @@ public class PartyInfoCommand implements CommandExecutor {
         int membersOnline = party.getVisibleMembers(player).size();
 
         player.sendMessage(LocaleLoader.getString("Commands.Party.Members.Header"));
-        player.sendMessage(LocaleLoader.getString("Commands.Party.MembersNear", nearMembers.size()+1, membersOnline));
+        player.sendMessage(LocaleLoader.getString("Commands.Party.MembersNear", nearMembers.size() + 1, membersOnline));
         player.sendMessage(party.createMembersList(player));
     }
 }

bukkit/src/main/java/com/gmail/nossr50/commands/party/PartyInviteCommand.java

@@ -1,12 +1,12 @@
 package com.gmail.nossr50.commands.party;
 
-import com.gmail.nossr50.config.Config;
+import com.gmail.nossr50.core.config.MainConfig;
-import com.gmail.nossr50.datatypes.party.Party;
+import com.gmail.nossr50.core.data.UserManager;
-import com.gmail.nossr50.datatypes.player.McMMOPlayer;
+import com.gmail.nossr50.core.datatypes.party.Party;
-import com.gmail.nossr50.locale.LocaleLoader;
+import com.gmail.nossr50.core.datatypes.player.McMMOPlayer;
-import com.gmail.nossr50.party.PartyManager;
+import com.gmail.nossr50.core.locale.LocaleLoader;
-import com.gmail.nossr50.util.commands.CommandUtils;
+import com.gmail.nossr50.core.party.PartyManager;
-import com.gmail.nossr50.util.player.UserManager;
+import com.gmail.nossr50.core.util.commands.CommandUtils;
 import org.bukkit.command.Command;
 import org.bukkit.command.CommandExecutor;
 import org.bukkit.command.CommandSender;
@@ -46,9 +46,8 @@ public class PartyInviteCommand implements CommandExecutor {
 
                 Party playerParty = mcMMOPlayer.getParty();
 
-                if(PartyManager.isPartyFull(target, playerParty))
+                if (PartyManager.isPartyFull(target, playerParty)) {
-                {
+                    player.sendMessage(LocaleLoader.getString("Commands.Party.PartyFull.Invite", target.getName(), playerParty.toString(), MainConfig.getInstance().getPartyMaxSize()));
-                    player.sendMessage(LocaleLoader.getString("Commands.Party.PartyFull.Invite", target.getName(), playerParty.toString(), Config.getInstance().getPartyMaxSize()));
                     return true;
                 }
 

bukkit/src/main/java/com/gmail/nossr50/commands/party/PartyItemShareCommand.java

@@ -1,14 +1,14 @@
 package com.gmail.nossr50.commands.party;
 
-import com.gmail.nossr50.config.Config;
+import com.gmail.nossr50.core.config.MainConfig;
-import com.gmail.nossr50.datatypes.party.ItemShareType;
+import com.gmail.nossr50.core.data.UserManager;
-import com.gmail.nossr50.datatypes.party.Party;
+import com.gmail.nossr50.core.datatypes.party.ItemShareType;
-import com.gmail.nossr50.datatypes.party.PartyFeature;
+import com.gmail.nossr50.core.datatypes.party.Party;
-import com.gmail.nossr50.datatypes.party.ShareMode;
+import com.gmail.nossr50.core.datatypes.party.PartyFeature;
-import com.gmail.nossr50.locale.LocaleLoader;
+import com.gmail.nossr50.core.datatypes.party.ShareMode;
-import com.gmail.nossr50.util.StringUtils;
+import com.gmail.nossr50.core.locale.LocaleLoader;
-import com.gmail.nossr50.util.commands.CommandUtils;
+import com.gmail.nossr50.core.util.StringUtils;
-import com.gmail.nossr50.util.player.UserManager;
+import com.gmail.nossr50.core.util.commands.CommandUtils;
 import org.bukkit.command.Command;
 import org.bukkit.command.CommandExecutor;
 import org.bukkit.command.CommandSender;
@@ -19,7 +19,7 @@ public class PartyItemShareCommand implements CommandExecutor {
     public boolean onCommand(CommandSender sender, Command command, String label, String[] args) {
         Party party = UserManager.getPlayer((Player) sender).getParty();
 
-        if (party.getLevel() < Config.getInstance().getPartyFeatureUnlockLevel(PartyFeature.ITEM_SHARE)) {
+        if (party.getLevel() < MainConfig.getInstance().getPartyFeatureUnlockLevel(PartyFeature.ITEM_SHARE)) {
             sender.sendMessage(LocaleLoader.getString("Party.Feature.Disabled.4"));
             return true;
         }
@@ -41,19 +41,16 @@ public class PartyItemShareCommand implements CommandExecutor {
 
                 if (CommandUtils.shouldEnableToggle(args[2])) {
                     toggle = true;
-                }
+                } else if (CommandUtils.shouldDisableToggle(args[2])) {
-                else if (CommandUtils.shouldDisableToggle(args[2])) {
                     toggle = false;
-                }
+                } else {
-                else {
                     sender.sendMessage(LocaleLoader.getString("Commands.Usage.2", "party", "itemshare", "<loot | mining | herbalism | woodcutting | misc> <true | false>"));
                     return true;
                 }
 
                 try {
                     handleToggleItemShareCategory(party, ItemShareType.valueOf(args[1].toUpperCase()), toggle);
-                }
+                } catch (IllegalArgumentException ex) {
-                catch (IllegalArgumentException ex) {
                     sender.sendMessage(LocaleLoader.getString("Commands.Usage.2", "party", "itemshare", "<loot | mining | herbalism | woodcutting | misc> <true | false>"));
                 }
 

bukkit/src/main/java/com/gmail/nossr50/commands/party/PartyJoinCommand.java

@@ -1,11 +1,11 @@
 package com.gmail.nossr50.commands.party;
 
-import com.gmail.nossr50.datatypes.party.Party;
+import com.gmail.nossr50.core.data.UserManager;
-import com.gmail.nossr50.datatypes.player.McMMOPlayer;
+import com.gmail.nossr50.core.datatypes.party.Party;
-import com.gmail.nossr50.locale.LocaleLoader;
+import com.gmail.nossr50.core.datatypes.player.McMMOPlayer;
-import com.gmail.nossr50.party.PartyManager;
+import com.gmail.nossr50.core.locale.LocaleLoader;
-import com.gmail.nossr50.util.commands.CommandUtils;
+import com.gmail.nossr50.core.party.PartyManager;
-import com.gmail.nossr50.util.player.UserManager;
+import com.gmail.nossr50.core.util.commands.CommandUtils;
 import org.bukkit.command.Command;
 import org.bukkit.command.CommandExecutor;
 import org.bukkit.command.CommandSender;
@@ -54,8 +54,7 @@ public class PartyJoinCommand implements CommandExecutor {
                     return true;
                 }
 
-                if(PartyManager.isPartyFull(player, targetParty))
+                if (PartyManager.isPartyFull(player, targetParty)) {
-                {
                     player.sendMessage(LocaleLoader.getString("Commands.Party.PartyFull", targetParty.toString()));
                     return true;
                 }

bukkit/src/main/java/com/gmail/nossr50/commands/party/PartyKickCommand.java

@@ -1,12 +1,12 @@
 package com.gmail.nossr50.commands.party;
 
-import com.gmail.nossr50.datatypes.party.Party;
+import com.gmail.nossr50.core.data.UserManager;
-import com.gmail.nossr50.events.party.McMMOPartyChangeEvent.EventReason;
+import com.gmail.nossr50.core.datatypes.party.Party;
-import com.gmail.nossr50.locale.LocaleLoader;
+import com.gmail.nossr50.core.locale.LocaleLoader;
+import com.gmail.nossr50.core.party.PartyManager;
+import com.gmail.nossr50.core.util.commands.CommandUtils;
+import com.gmail.nossr50.core.events.party.McMMOPartyChangeEvent.EventReason;
 import com.gmail.nossr50.mcMMO;
-import com.gmail.nossr50.party.PartyManager;
-import com.gmail.nossr50.util.commands.CommandUtils;
-import com.gmail.nossr50.util.player.UserManager;
 import org.bukkit.OfflinePlayer;
 import org.bukkit.command.Command;
 import org.bukkit.command.CommandExecutor;

bukkit/src/main/java/com/gmail/nossr50/commands/party/PartyLockCommand.java

@@ -1,10 +1,10 @@
 package com.gmail.nossr50.commands.party;
 
-import com.gmail.nossr50.datatypes.party.Party;
+import com.gmail.nossr50.core.data.UserManager;
-import com.gmail.nossr50.locale.LocaleLoader;
+import com.gmail.nossr50.core.datatypes.party.Party;
-import com.gmail.nossr50.util.Permissions;
+import com.gmail.nossr50.core.locale.LocaleLoader;
-import com.gmail.nossr50.util.commands.CommandUtils;
+import com.gmail.nossr50.core.util.Permissions;
-import com.gmail.nossr50.util.player.UserManager;
+import com.gmail.nossr50.core.util.commands.CommandUtils;
 import org.bukkit.command.Command;
 import org.bukkit.command.CommandExecutor;
 import org.bukkit.command.CommandSender;
@@ -17,8 +17,7 @@ public class PartyLockCommand implements CommandExecutor {
             case 1:
                 if (args[0].equalsIgnoreCase("lock")) {
                     togglePartyLock(sender, true);
-                }
+                } else if (args[0].equalsIgnoreCase("unlock")) {
-                else if (args[0].equalsIgnoreCase("unlock")) {
                     togglePartyLock(sender, false);
                 }
 
@@ -32,11 +31,9 @@ public class PartyLockCommand implements CommandExecutor {
 
                 if (CommandUtils.shouldEnableToggle(args[1])) {
                     togglePartyLock(sender, true);
-                }
+                } else if (CommandUtils.shouldDisableToggle(args[1])) {
-                else if (CommandUtils.shouldDisableToggle(args[1])) {
                     togglePartyLock(sender, false);
-                }
+                } else {
-                else {
                     sendUsageStrings(sender);
                 }
 

bukkit/src/main/java/com/gmail/nossr50/commands/party/PartyQuitCommand.java

@@ -1,11 +1,11 @@
 package com.gmail.nossr50.commands.party;
 
-import com.gmail.nossr50.datatypes.party.Party;
+import com.gmail.nossr50.core.data.UserManager;
-import com.gmail.nossr50.datatypes.player.McMMOPlayer;
+import com.gmail.nossr50.core.datatypes.party.Party;
-import com.gmail.nossr50.events.party.McMMOPartyChangeEvent.EventReason;
+import com.gmail.nossr50.core.datatypes.player.McMMOPlayer;
-import com.gmail.nossr50.locale.LocaleLoader;
+import com.gmail.nossr50.core.locale.LocaleLoader;
-import com.gmail.nossr50.party.PartyManager;
+import com.gmail.nossr50.core.party.PartyManager;
-import com.gmail.nossr50.util.player.UserManager;
+import com.gmail.nossr50.core.events.party.McMMOPartyChangeEvent.EventReason;
 import org.bukkit.command.Command;
 import org.bukkit.command.CommandExecutor;
 import org.bukkit.command.CommandSender;

bukkit/src/main/java/com/gmail/nossr50/commands/party/PartyRenameCommand.java

@@ -1,11 +1,11 @@
 package com.gmail.nossr50.commands.party;
 
-import com.gmail.nossr50.datatypes.party.Party;
+import com.gmail.nossr50.core.data.UserManager;
-import com.gmail.nossr50.datatypes.player.McMMOPlayer;
+import com.gmail.nossr50.core.datatypes.party.Party;
-import com.gmail.nossr50.events.party.McMMOPartyChangeEvent.EventReason;
+import com.gmail.nossr50.core.datatypes.player.McMMOPlayer;
-import com.gmail.nossr50.locale.LocaleLoader;
+import com.gmail.nossr50.core.locale.LocaleLoader;
-import com.gmail.nossr50.party.PartyManager;
+import com.gmail.nossr50.core.party.PartyManager;
-import com.gmail.nossr50.util.player.UserManager;
+import com.gmail.nossr50.core.events.party.McMMOPartyChangeEvent.EventReason;
 import org.bukkit.command.Command;
 import org.bukkit.command.CommandExecutor;
 import org.bukkit.command.CommandSender;

bukkit/src/main/java/com/gmail/nossr50/commands/party/PartySubcommandType.java

@@ -30,20 +30,15 @@ public enum PartySubcommandType {
 
         if (commandName.equalsIgnoreCase("?")) {
             return HELP;
-        }
+        } else if (commandName.equalsIgnoreCase("q") || commandName.equalsIgnoreCase("leave")) {
-        else if (commandName.equalsIgnoreCase("q") || commandName.equalsIgnoreCase("leave")) {
             return QUIT;
-        }
+        } else if (commandName.equalsIgnoreCase("leader")) {
-        else if (commandName.equalsIgnoreCase("leader")) {
             return OWNER;
-        }
+        } else if (commandName.equalsIgnoreCase("xpshare") || commandName.equalsIgnoreCase("shareexp") || commandName.equalsIgnoreCase("sharexp")) {
-        else if (commandName.equalsIgnoreCase("xpshare") || commandName.equalsIgnoreCase("shareexp") || commandName.equalsIgnoreCase("sharexp")) {
             return XPSHARE;
-        }
+        } else if (commandName.equalsIgnoreCase("shareitem") || commandName.equalsIgnoreCase("shareitems")) {
-        else if (commandName.equalsIgnoreCase("shareitem") || commandName.equalsIgnoreCase("shareitems")) {
             return ITEMSHARE;
-        }
+        } else if (commandName.equalsIgnoreCase("ally")) {
-        else if (commandName.equalsIgnoreCase("ally")) {
             return ALLIANCE;
         }
 

bukkit/src/main/java/com/gmail/nossr50/commands/party/PartyXpShareCommand.java

@@ -1,13 +1,13 @@
 package com.gmail.nossr50.commands.party;
 
-import com.gmail.nossr50.config.Config;
+import com.gmail.nossr50.core.config.MainConfig;
-import com.gmail.nossr50.datatypes.party.Party;
+import com.gmail.nossr50.core.data.UserManager;
-import com.gmail.nossr50.datatypes.party.PartyFeature;
+import com.gmail.nossr50.core.datatypes.party.Party;
-import com.gmail.nossr50.datatypes.party.ShareMode;
+import com.gmail.nossr50.core.datatypes.party.PartyFeature;
-import com.gmail.nossr50.locale.LocaleLoader;
+import com.gmail.nossr50.core.datatypes.party.ShareMode;
-import com.gmail.nossr50.util.StringUtils;
+import com.gmail.nossr50.core.locale.LocaleLoader;
-import com.gmail.nossr50.util.commands.CommandUtils;
+import com.gmail.nossr50.core.util.StringUtils;
-import com.gmail.nossr50.util.player.UserManager;
+import com.gmail.nossr50.core.util.commands.CommandUtils;
 import org.bukkit.command.Command;
 import org.bukkit.command.CommandExecutor;
 import org.bukkit.command.CommandSender;
@@ -18,7 +18,7 @@ public class PartyXpShareCommand implements CommandExecutor {
     public boolean onCommand(CommandSender sender, Command command, String label, String[] args) {
         Party party = UserManager.getPlayer((Player) sender).getParty();
 
-        if (party.getLevel() < Config.getInstance().getPartyFeatureUnlockLevel(PartyFeature.XP_SHARE)) {
+        if (party.getLevel() < MainConfig.getInstance().getPartyFeatureUnlockLevel(PartyFeature.XP_SHARE)) {
             sender.sendMessage(LocaleLoader.getString("Party.Feature.Disabled.5"));
             return true;
         }
@@ -27,11 +27,9 @@ public class PartyXpShareCommand implements CommandExecutor {
             case 2:
                 if (args[1].equalsIgnoreCase("none") || CommandUtils.shouldDisableToggle(args[1])) {
                     handleChangingShareMode(party, ShareMode.NONE);
-                }
+                } else if (args[1].equalsIgnoreCase("equal") || args[1].equalsIgnoreCase("even") || CommandUtils.shouldEnableToggle(args[1])) {
-                else if (args[1].equalsIgnoreCase("equal") || args[1].equalsIgnoreCase("even") || CommandUtils.shouldEnableToggle(args[1])) {
                     handleChangingShareMode(party, ShareMode.EQUAL);
-                }
+                } else {
-                else {
                     sender.sendMessage(LocaleLoader.getString("Commands.Usage.2", "party", "xpshare", "<NONE | EQUAL>"));
                 }
 

bukkit/src/main/java/com/gmail/nossr50/commands/party/alliance/PartyAllianceAcceptCommand.java

@@ -1,9 +1,9 @@
 package com.gmail.nossr50.commands.party.alliance;
 
-import com.gmail.nossr50.datatypes.player.McMMOPlayer;
+import com.gmail.nossr50.core.data.UserManager;
-import com.gmail.nossr50.locale.LocaleLoader;
+import com.gmail.nossr50.core.datatypes.player.McMMOPlayer;
-import com.gmail.nossr50.party.PartyManager;
+import com.gmail.nossr50.core.locale.LocaleLoader;
-import com.gmail.nossr50.util.player.UserManager;
+import com.gmail.nossr50.core.party.PartyManager;
 import org.bukkit.command.Command;
 import org.bukkit.command.CommandExecutor;
 import org.bukkit.command.CommandSender;

bukkit/src/main/java/com/gmail/nossr50/commands/party/alliance/PartyAllianceCommand.java

@@ -1,13 +1,13 @@
 package com.gmail.nossr50.commands.party.alliance;
 
-import com.gmail.nossr50.config.Config;
+import com.gmail.nossr50.core.config.MainConfig;
-import com.gmail.nossr50.datatypes.party.Party;
+import com.gmail.nossr50.core.data.UserManager;
-import com.gmail.nossr50.datatypes.party.PartyFeature;
+import com.gmail.nossr50.core.datatypes.party.Party;
-import com.gmail.nossr50.datatypes.player.McMMOPlayer;
+import com.gmail.nossr50.core.datatypes.party.PartyFeature;
-import com.gmail.nossr50.locale.LocaleLoader;
+import com.gmail.nossr50.core.datatypes.player.McMMOPlayer;
-import com.gmail.nossr50.party.PartyManager;
+import com.gmail.nossr50.core.locale.LocaleLoader;
-import com.gmail.nossr50.util.commands.CommandUtils;
+import com.gmail.nossr50.core.party.PartyManager;
-import com.gmail.nossr50.util.player.UserManager;
+import com.gmail.nossr50.core.util.commands.CommandUtils;
 import com.google.common.collect.ImmutableList;
 import org.bukkit.ChatColor;
 import org.bukkit.command.Command;
@@ -21,12 +21,10 @@ import java.util.ArrayList;
 import java.util.List;
 
 public class PartyAllianceCommand implements TabExecutor {
+    public static final List<String> ALLIANCE_SUBCOMMANDS = ImmutableList.of("invite", "accept", "disband");
     private Player player;
     private Party playerParty;
     private Party targetParty;
-
-    public static final List<String> ALLIANCE_SUBCOMMANDS = ImmutableList.of("invite", "accept", "disband");
-
     private CommandExecutor partyAllianceInviteCommand = new PartyAllianceInviteCommand();
     private CommandExecutor partyAllianceAcceptCommand = new PartyAllianceAcceptCommand();
     private CommandExecutor partyAllianceDisbandCommand = new PartyAllianceDisbandCommand();
@@ -44,7 +42,7 @@ public class PartyAllianceCommand implements TabExecutor {
 
         switch (args.length) {
             case 1:
-                if (playerParty.getLevel() < Config.getInstance().getPartyFeatureUnlockLevel(PartyFeature.ALLIANCE)) {
+                if (playerParty.getLevel() < MainConfig.getInstance().getPartyFeatureUnlockLevel(PartyFeature.ALLIANCE)) {
                     sender.sendMessage(LocaleLoader.getString("Party.Feature.Disabled.3"));
                     return true;
                 }
@@ -62,7 +60,7 @@ public class PartyAllianceCommand implements TabExecutor {
 
             case 2:
             case 3:
-                if (playerParty.getLevel() < Config.getInstance().getPartyFeatureUnlockLevel(PartyFeature.ALLIANCE)) {
+                if (playerParty.getLevel() < MainConfig.getInstance().getPartyFeatureUnlockLevel(PartyFeature.ALLIANCE)) {
                     sender.sendMessage(LocaleLoader.getString("Party.Feature.Disabled.3"));
                     return true;
                 }

bukkit/src/main/java/com/gmail/nossr50/commands/party/alliance/PartyAllianceDisbandCommand.java

@@ -1,10 +1,10 @@
 package com.gmail.nossr50.commands.party.alliance;
 
-import com.gmail.nossr50.datatypes.party.Party;
+import com.gmail.nossr50.core.data.UserManager;
-import com.gmail.nossr50.datatypes.player.McMMOPlayer;
+import com.gmail.nossr50.core.datatypes.party.Party;
-import com.gmail.nossr50.locale.LocaleLoader;
+import com.gmail.nossr50.core.datatypes.player.McMMOPlayer;
-import com.gmail.nossr50.party.PartyManager;
+import com.gmail.nossr50.core.locale.LocaleLoader;
-import com.gmail.nossr50.util.player.UserManager;
+import com.gmail.nossr50.core.party.PartyManager;
 import org.bukkit.command.Command;
 import org.bukkit.command.CommandExecutor;
 import org.bukkit.command.CommandSender;

bukkit/src/main/java/com/gmail/nossr50/commands/party/alliance/PartyAllianceInviteCommand.java

@@ -1,11 +1,11 @@
 package com.gmail.nossr50.commands.party.alliance;
 
-import com.gmail.nossr50.datatypes.party.Party;
+import com.gmail.nossr50.core.data.UserManager;
-import com.gmail.nossr50.datatypes.player.McMMOPlayer;
+import com.gmail.nossr50.core.datatypes.party.Party;
-import com.gmail.nossr50.locale.LocaleLoader;
+import com.gmail.nossr50.core.datatypes.player.McMMOPlayer;
-import com.gmail.nossr50.party.PartyManager;
+import com.gmail.nossr50.core.locale.LocaleLoader;
-import com.gmail.nossr50.util.commands.CommandUtils;
+import com.gmail.nossr50.core.party.PartyManager;
-import com.gmail.nossr50.util.player.UserManager;
+import com.gmail.nossr50.core.util.commands.CommandUtils;
 import org.bukkit.command.Command;
 import org.bukkit.command.CommandExecutor;
 import org.bukkit.command.CommandSender;

bukkit/src/main/java/com/gmail/nossr50/commands/party/teleport/PtpAcceptAnyCommand.java

@@ -1,9 +1,9 @@
 package com.gmail.nossr50.commands.party.teleport;
 
-import com.gmail.nossr50.datatypes.party.PartyTeleportRecord;
+import com.gmail.nossr50.core.data.UserManager;
-import com.gmail.nossr50.locale.LocaleLoader;
+import com.gmail.nossr50.core.datatypes.party.PartyTeleportRecord;
-import com.gmail.nossr50.util.Permissions;
+import com.gmail.nossr50.core.locale.LocaleLoader;
-import com.gmail.nossr50.util.player.UserManager;
+import com.gmail.nossr50.core.util.Permissions;
 import org.bukkit.command.Command;
 import org.bukkit.command.CommandExecutor;
 import org.bukkit.command.CommandSender;
@@ -20,8 +20,7 @@ public class PtpAcceptAnyCommand implements CommandExecutor {
 
         if (ptpRecord.isConfirmRequired()) {
             sender.sendMessage(LocaleLoader.getString("Commands.ptp.AcceptAny.Disabled"));
-        }
+        } else {
-        else {
             sender.sendMessage(LocaleLoader.getString("Commands.ptp.AcceptAny.Enabled"));
         }
 

bukkit/src/main/java/com/gmail/nossr50/commands/party/teleport/PtpAcceptCommand.java

@@ -1,11 +1,11 @@
 package com.gmail.nossr50.commands.party.teleport;
 
-import com.gmail.nossr50.config.Config;
+import com.gmail.nossr50.core.config.MainConfig;
-import com.gmail.nossr50.datatypes.party.PartyTeleportRecord;
+import com.gmail.nossr50.core.data.UserManager;
-import com.gmail.nossr50.locale.LocaleLoader;
+import com.gmail.nossr50.core.datatypes.party.PartyTeleportRecord;
-import com.gmail.nossr50.util.Permissions;
+import com.gmail.nossr50.core.locale.LocaleLoader;
-import com.gmail.nossr50.util.player.UserManager;
+import com.gmail.nossr50.core.util.Permissions;
-import com.gmail.nossr50.util.skills.SkillUtils;
+import com.gmail.nossr50.core.util.skills.SkillUtils;
 import org.bukkit.World;
 import org.bukkit.command.Command;
 import org.bukkit.command.CommandExecutor;
@@ -28,7 +28,7 @@ public class PtpAcceptCommand implements CommandExecutor {
             return true;
         }
 
-        if (SkillUtils.cooldownExpired(ptpRecord.getTimeout(), Config.getInstance().getPTPCommandTimeout())) {
+        if (SkillUtils.cooldownExpired(ptpRecord.getTimeout(), MainConfig.getInstance().getPTPCommandTimeout())) {
             ptpRecord.removeRequest();
             player.sendMessage(LocaleLoader.getString("Commands.ptp.RequestExpired"));
             return true;
@@ -41,7 +41,7 @@ public class PtpAcceptCommand implements CommandExecutor {
             return true;
         }
 
-        if (Config.getInstance().getPTPCommandWorldPermissions()) {
+        if (MainConfig.getInstance().getPTPCommandWorldPermissions()) {
             World targetWorld = target.getWorld();
             World playerWorld = player.getWorld();
 
@@ -49,8 +49,7 @@ public class PtpAcceptCommand implements CommandExecutor {
                 if (!Permissions.partyTeleportWorld(target, targetWorld)) {
                     target.sendMessage(LocaleLoader.getString("Commands.ptp.NoWorldPermissions", targetWorld.getName()));
                     return true;
-                }
+                } else if (targetWorld != playerWorld && !Permissions.partyTeleportWorld(target, playerWorld)) {
-                else if (targetWorld != playerWorld && !Permissions.partyTeleportWorld(target, playerWorld)) {
                     target.sendMessage(LocaleLoader.getString("Commands.ptp.NoWorldPermissions", playerWorld.getName()));
                     return true;
                 }

bukkit/src/main/java/com/gmail/nossr50/commands/party/teleport/PtpCommand.java

@@ -1,23 +1,23 @@
 package com.gmail.nossr50.commands.party.teleport;
 
-import com.gmail.nossr50.config.Config;
+import com.gmail.nossr50.core.config.MainConfig;
-import com.gmail.nossr50.config.WorldBlacklist;
+import com.gmail.nossr50.core.config.WorldBlacklist;
-import com.gmail.nossr50.datatypes.party.Party;
+import com.gmail.nossr50.core.data.UserManager;
-import com.gmail.nossr50.datatypes.party.PartyFeature;
+import com.gmail.nossr50.core.datatypes.party.Party;
-import com.gmail.nossr50.datatypes.party.PartyTeleportRecord;
+import com.gmail.nossr50.core.datatypes.party.PartyFeature;
-import com.gmail.nossr50.datatypes.player.McMMOPlayer;
+import com.gmail.nossr50.core.datatypes.party.PartyTeleportRecord;
-import com.gmail.nossr50.locale.LocaleLoader;
+import com.gmail.nossr50.core.datatypes.player.McMMOPlayer;
+import com.gmail.nossr50.core.locale.LocaleLoader;
+import com.gmail.nossr50.core.party.PartyManager;
+import com.gmail.nossr50.core.runnables.items.TeleportationWarmup;
+import com.gmail.nossr50.core.util.EventUtils;
+import com.gmail.nossr50.core.util.Misc;
+import com.gmail.nossr50.core.util.Permissions;
+import com.gmail.nossr50.core.util.commands.CommandUtils;
+import com.gmail.nossr50.core.util.skills.SkillUtils;
+import com.gmail.nossr50.core.worldguard.WorldGuardManager;
+import com.gmail.nossr50.core.worldguard.WorldGuardUtils;
 import com.gmail.nossr50.mcMMO;
-import com.gmail.nossr50.party.PartyManager;
-import com.gmail.nossr50.runnables.items.TeleportationWarmup;
-import com.gmail.nossr50.util.EventUtils;
-import com.gmail.nossr50.util.Misc;
-import com.gmail.nossr50.util.Permissions;
-import com.gmail.nossr50.util.commands.CommandUtils;
-import com.gmail.nossr50.util.player.UserManager;
-import com.gmail.nossr50.util.skills.SkillUtils;
-import com.gmail.nossr50.worldguard.WorldGuardManager;
-import com.gmail.nossr50.worldguard.WorldGuardUtils;
 import com.google.common.collect.ImmutableList;
 import org.bukkit.command.Command;
 import org.bukkit.command.CommandExecutor;
@@ -36,6 +36,54 @@ public class PtpCommand implements TabExecutor {
     private CommandExecutor ptpAcceptAnyCommand = new PtpAcceptAnyCommand();
     private CommandExecutor ptpAcceptCommand = new PtpAcceptCommand();
 
+    protected static boolean canTeleport(CommandSender sender, Player player, String targetName) {
+        McMMOPlayer mcMMOTarget = UserManager.getPlayer(targetName);
+
+        if (!CommandUtils.checkPlayerExistence(sender, targetName, mcMMOTarget)) {
+            return false;
+        }
+
+        Player target = mcMMOTarget.getPlayer();
+
+        if (player.equals(target)) {
+            player.sendMessage(LocaleLoader.getString("Party.Teleport.Self"));
+            return false;
+        }
+
+        if (!PartyManager.inSameParty(player, target)) {
+            player.sendMessage(LocaleLoader.getString("Party.NotInYourParty", targetName));
+            return false;
+        }
+
+        if (!mcMMOTarget.getPartyTeleportRecord().isEnabled()) {
+            player.sendMessage(LocaleLoader.getString("Party.Teleport.Disabled", targetName));
+            return false;
+        }
+
+        if (!target.isValid()) {
+            player.sendMessage(LocaleLoader.getString("Party.Teleport.Dead"));
+            return false;
+        }
+
+        return true;
+    }
+
+    protected static void handleTeleportWarmup(Player teleportingPlayer, Player targetPlayer) {
+        McMMOPlayer mcMMOPlayer = UserManager.getPlayer(teleportingPlayer);
+        McMMOPlayer mcMMOTarget = UserManager.getPlayer(targetPlayer);
+
+        long warmup = MainConfig.getInstance().getPTPCommandWarmup();
+
+        mcMMOPlayer.actualizeTeleportCommenceLocation(teleportingPlayer);
+
+        if (warmup > 0) {
+            teleportingPlayer.sendMessage(LocaleLoader.getString("Teleport.Commencing", warmup));
+            new TeleportationWarmup(mcMMOPlayer, mcMMOTarget).runTaskLater(mcMMO.p, 20 * warmup);
+        } else {
+            EventUtils.handlePartyTeleportEvent(teleportingPlayer, targetPlayer);
+        }
+    }
+
     @Override
     public boolean onCommand(CommandSender sender, Command command, String label, String[] args) {
         if (CommandUtils.noConsoleUsage(sender)) {
@@ -45,14 +93,13 @@ public class PtpCommand implements TabExecutor {
         Player player = (Player) sender;
 
         /* WORLD GUARD MAIN FLAG CHECK */
-        if(WorldGuardUtils.isWorldGuardLoaded())
+        if (WorldGuardUtils.isWorldGuardLoaded()) {
-        {
+            if (!WorldGuardManager.getInstance().hasMainFlag(player))
-            if(!WorldGuardManager.getInstance().hasMainFlag(player))
                 return true;
         }
 
         /* WORLD BLACKLIST CHECK */
-        if(WorldBlacklist.isWorldBlacklisted(player.getWorld()))
+        if (WorldBlacklist.isWorldBlacklisted(player.getWorld()))
             return true;
 
         if (!UserManager.hasPlayerDataKey(player)) {
@@ -68,7 +115,7 @@ public class PtpCommand implements TabExecutor {
 
         Party party = mcMMOPlayer.getParty();
 
-        if (party.getLevel() < Config.getInstance().getPartyFeatureUnlockLevel(PartyFeature.TELEPORT)) {
+        if (party.getLevel() < MainConfig.getInstance().getPartyFeatureUnlockLevel(PartyFeature.TELEPORT)) {
             sender.sendMessage(LocaleLoader.getString("Party.Feature.Disabled.2"));
             return true;
         }
@@ -84,7 +131,7 @@ public class PtpCommand implements TabExecutor {
                 }
 
                 long recentlyHurt = mcMMOPlayer.getRecentlyHurt();
-                int hurtCooldown = Config.getInstance().getPTPCommandRecentlyHurtCooldown();
+                int hurtCooldown = MainConfig.getInstance().getPTPCommandRecentlyHurtCooldown();
 
                 if (hurtCooldown > 0) {
                     int timeRemaining = SkillUtils.calculateTimeLeft(recentlyHurt * Misc.TIME_CONVERSION_FACTOR, hurtCooldown, player);
@@ -104,7 +151,7 @@ public class PtpCommand implements TabExecutor {
                     return true;
                 }
 
-                int ptpCooldown = Config.getInstance().getPTPCommandCooldown();
+                int ptpCooldown = MainConfig.getInstance().getPTPCommandCooldown();
                 long ptpLastUse = mcMMOPlayer.getPartyTeleportRecord().getLastUse();
 
                 if (ptpCooldown > 0) {
@@ -169,55 +216,6 @@ public class PtpCommand implements TabExecutor {
         player.sendMessage(LocaleLoader.getString("Commands.Invite.Success"));
 
         target.sendMessage(LocaleLoader.getString("Commands.ptp.Request1", player.getName()));
-        target.sendMessage(LocaleLoader.getString("Commands.ptp.Request2", Config.getInstance().getPTPCommandTimeout()));
+        target.sendMessage(LocaleLoader.getString("Commands.ptp.Request2", MainConfig.getInstance().getPTPCommandTimeout()));
-    }
-
-    protected static boolean canTeleport(CommandSender sender, Player player, String targetName) {
-        McMMOPlayer mcMMOTarget = UserManager.getPlayer(targetName);
-
-        if (!CommandUtils.checkPlayerExistence(sender, targetName, mcMMOTarget)) {
-            return false;
-        }
-
-        Player target = mcMMOTarget.getPlayer();
-
-        if (player.equals(target)) {
-            player.sendMessage(LocaleLoader.getString("Party.Teleport.Self"));
-            return false;
-        }
-
-        if (!PartyManager.inSameParty(player, target)) {
-            player.sendMessage(LocaleLoader.getString("Party.NotInYourParty", targetName));
-            return false;
-        }
-
-        if (!mcMMOTarget.getPartyTeleportRecord().isEnabled()) {
-            player.sendMessage(LocaleLoader.getString("Party.Teleport.Disabled", targetName));
-            return false;
-        }
-
-        if (!target.isValid()) {
-            player.sendMessage(LocaleLoader.getString("Party.Teleport.Dead"));
-            return false;
-        }
-
-        return true;
-    }
-
-    protected static void handleTeleportWarmup(Player teleportingPlayer, Player targetPlayer) {
-        McMMOPlayer mcMMOPlayer = UserManager.getPlayer(teleportingPlayer);
-        McMMOPlayer mcMMOTarget = UserManager.getPlayer(targetPlayer);
-
-        long warmup = Config.getInstance().getPTPCommandWarmup();
-
-        mcMMOPlayer.actualizeTeleportCommenceLocation(teleportingPlayer);
-
-        if (warmup > 0) {
-            teleportingPlayer.sendMessage(LocaleLoader.getString("Teleport.Commencing", warmup));
-            new TeleportationWarmup(mcMMOPlayer, mcMMOTarget).runTaskLater(mcMMO.p, 20 * warmup);
-        }
-        else {
-            EventUtils.handlePartyTeleportEvent(teleportingPlayer, targetPlayer);
-        }
     }
 }

bukkit/src/main/java/com/gmail/nossr50/commands/party/teleport/PtpToggleCommand.java

@@ -1,9 +1,9 @@
 package com.gmail.nossr50.commands.party.teleport;
 
-import com.gmail.nossr50.datatypes.party.PartyTeleportRecord;
+import com.gmail.nossr50.core.data.UserManager;
-import com.gmail.nossr50.locale.LocaleLoader;
+import com.gmail.nossr50.core.datatypes.party.PartyTeleportRecord;
-import com.gmail.nossr50.util.Permissions;
+import com.gmail.nossr50.core.locale.LocaleLoader;
-import com.gmail.nossr50.util.player.UserManager;
+import com.gmail.nossr50.core.util.Permissions;
 import org.bukkit.command.Command;
 import org.bukkit.command.CommandExecutor;
 import org.bukkit.command.CommandSender;
@@ -20,8 +20,7 @@ public class PtpToggleCommand implements CommandExecutor {
 
         if (ptpRecord.isEnabled()) {
             sender.sendMessage(LocaleLoader.getString("Commands.ptp.Disabled"));
-        }
+        } else {
-        else {
             sender.sendMessage(LocaleLoader.getString("Commands.ptp.Enabled"));
         }
 

bukkit/src/main/java/com/gmail/nossr50/commands/player/InspectCommand.java

@@ -1,15 +1,15 @@
 package com.gmail.nossr50.commands.player;
 
-import com.gmail.nossr50.config.Config;
+import com.gmail.nossr50.core.config.MainConfig;
-import com.gmail.nossr50.datatypes.player.McMMOPlayer;
+import com.gmail.nossr50.core.data.UserManager;
-import com.gmail.nossr50.datatypes.player.PlayerProfile;
+import com.gmail.nossr50.core.datatypes.player.McMMOPlayer;
-import com.gmail.nossr50.datatypes.skills.PrimarySkillType;
+import com.gmail.nossr50.core.datatypes.player.PlayerProfile;
-import com.gmail.nossr50.locale.LocaleLoader;
+import com.gmail.nossr50.core.locale.LocaleLoader;
+import com.gmail.nossr50.core.skills.PrimarySkillType;
+import com.gmail.nossr50.core.util.Permissions;
+import com.gmail.nossr50.core.util.commands.CommandUtils;
+import com.gmail.nossr50.core.util.scoreboards.ScoreboardManager;
 import com.gmail.nossr50.mcMMO;
-import com.gmail.nossr50.util.Permissions;
-import com.gmail.nossr50.util.commands.CommandUtils;
-import com.gmail.nossr50.util.player.UserManager;
-import com.gmail.nossr50.util.scoreboards.ScoreboardManager;
 import com.google.common.collect.ImmutableList;
 import org.bukkit.command.Command;
 import org.bukkit.command.CommandSender;
@@ -40,10 +40,10 @@ public class InspectCommand implements TabExecutor {
                         return true;
                     }
 
-                    if (Config.getInstance().getScoreboardsEnabled() && sender instanceof Player && Config.getInstance().getInspectUseBoard()) {
+                    if (MainConfig.getInstance().getScoreboardsEnabled() && sender instanceof Player && MainConfig.getInstance().getInspectUseBoard()) {
                         ScoreboardManager.enablePlayerInspectScoreboard((Player) sender, profile);
 
-                        if (!Config.getInstance().getInspectUseChat()) {
+                        if (!MainConfig.getInstance().getInspectUseChat()) {
                             return true;
                         }
                     }
@@ -65,8 +65,7 @@ public class InspectCommand implements TabExecutor {
                         sender.sendMessage(CommandUtils.displaySkill(profile, skill));
                     }
 
-                }
+                } else {
-                else {
                     Player target = mcMMOPlayer.getPlayer();
 
                     if (CommandUtils.hidden(sender, target, Permissions.inspectHidden(sender))) {
@@ -74,15 +73,14 @@ public class InspectCommand implements TabExecutor {
                             sender.sendMessage(LocaleLoader.getString("Inspect.Offline"));
                             return true;
                         }
-                    }
+                    } else if (CommandUtils.tooFar(sender, target, Permissions.inspectFar(sender))) {
-                    else if (CommandUtils.tooFar(sender, target, Permissions.inspectFar(sender))) {
                         return true;
                     }
 
-                    if (Config.getInstance().getScoreboardsEnabled() && sender instanceof Player && Config.getInstance().getInspectUseBoard()) {
+                    if (MainConfig.getInstance().getScoreboardsEnabled() && sender instanceof Player && MainConfig.getInstance().getInspectUseBoard()) {
                         ScoreboardManager.enablePlayerInspectScoreboard((Player) sender, mcMMOPlayer.getProfile());
 
-                        if (!Config.getInstance().getInspectUseChat()) {
+                        if (!MainConfig.getInstance().getInspectUseChat()) {
                             return true;
                         }
                     }

bukkit/src/main/java/com/gmail/nossr50/commands/player/MccooldownCommand.java

@@ -1,12 +1,12 @@
 package com.gmail.nossr50.commands.player;
 
-import com.gmail.nossr50.config.Config;
+import com.gmail.nossr50.core.config.MainConfig;
-import com.gmail.nossr50.datatypes.player.McMMOPlayer;
+import com.gmail.nossr50.core.data.UserManager;
-import com.gmail.nossr50.datatypes.skills.SuperAbilityType;
+import com.gmail.nossr50.core.datatypes.player.McMMOPlayer;
-import com.gmail.nossr50.locale.LocaleLoader;
+import com.gmail.nossr50.core.locale.LocaleLoader;
-import com.gmail.nossr50.util.commands.CommandUtils;
+import com.gmail.nossr50.core.skills.SuperAbilityType;
-import com.gmail.nossr50.util.player.UserManager;
+import com.gmail.nossr50.core.util.commands.CommandUtils;
-import com.gmail.nossr50.util.scoreboards.ScoreboardManager;
+import com.gmail.nossr50.core.util.scoreboards.ScoreboardManager;
 import com.google.common.collect.ImmutableList;
 import org.bukkit.command.Command;
 import org.bukkit.command.CommandSender;
@@ -30,10 +30,10 @@ public class MccooldownCommand implements TabExecutor {
             case 0:
                 Player player = (Player) sender;
 
-                if (Config.getInstance().getScoreboardsEnabled() && Config.getInstance().getCooldownUseBoard()) {
+                if (MainConfig.getInstance().getScoreboardsEnabled() && MainConfig.getInstance().getCooldownUseBoard()) {
                     ScoreboardManager.enablePlayerCooldownScoreboard(player);
 
-                    if (!Config.getInstance().getCooldownUseChat()) {
+                    if (!MainConfig.getInstance().getCooldownUseChat()) {
                         return true;
                     }
                 }
@@ -52,8 +52,7 @@ public class MccooldownCommand implements TabExecutor {
 
                     if (seconds <= 0) {
                         player.sendMessage(LocaleLoader.getString("Commands.Cooldowns.Row.Y", ability.getName()));
-                    }
+                    } else {
-                    else {
                         player.sendMessage(LocaleLoader.getString("Commands.Cooldowns.Row.N", ability.getName(), seconds));
                     }
                 }

bukkit/src/main/java/com/gmail/nossr50/commands/player/McrankCommand.java

@@ -1,13 +1,13 @@
 package com.gmail.nossr50.commands.player;
 
-import com.gmail.nossr50.config.Config;
+import com.gmail.nossr50.core.config.MainConfig;
-import com.gmail.nossr50.datatypes.player.McMMOPlayer;
+import com.gmail.nossr50.core.data.UserManager;
-import com.gmail.nossr50.locale.LocaleLoader;
+import com.gmail.nossr50.core.datatypes.player.McMMOPlayer;
+import com.gmail.nossr50.core.locale.LocaleLoader;
+import com.gmail.nossr50.core.runnables.commands.McrankCommandAsyncTask;
+import com.gmail.nossr50.core.util.Permissions;
+import com.gmail.nossr50.core.util.commands.CommandUtils;
 import com.gmail.nossr50.mcMMO;
-import com.gmail.nossr50.runnables.commands.McrankCommandAsyncTask;
-import com.gmail.nossr50.util.Permissions;
-import com.gmail.nossr50.util.commands.CommandUtils;
-import com.gmail.nossr50.util.player.UserManager;
 import com.google.common.collect.ImmutableList;
 import org.bukkit.command.Command;
 import org.bukkit.command.CommandSender;
@@ -61,8 +61,7 @@ public class McrankCommand implements TabExecutor {
                     if (CommandUtils.tooFar(sender, player, Permissions.mcrankFar(sender))) {
                         return true;
                     }
-                }
+                } else if (CommandUtils.inspectOffline(sender, mcMMO.getDatabaseManager().loadPlayerProfile(playerName, false), Permissions.mcrankOffline(sender))) {
-                else if (CommandUtils.inspectOffline(sender, mcMMO.getDatabaseManager().loadPlayerProfile(playerName, false), Permissions.mcrankOffline(sender))) {
                     return true;
                 }
 
@@ -88,7 +87,7 @@ public class McrankCommand implements TabExecutor {
     private void display(CommandSender sender, String playerName) {
         if (sender instanceof Player) {
             McMMOPlayer mcMMOPlayer = UserManager.getPlayer(sender.getName());
-            long cooldownMillis = Math.max(Config.getInstance().getDatabasePlayerCooldown(), 1750);
+            long cooldownMillis = Math.max(MainConfig.getInstance().getDatabasePlayerCooldown(), 1750);
 
             if (mcMMOPlayer.getDatabaseATS() + cooldownMillis > System.currentTimeMillis()) {
                 sender.sendMessage(LocaleLoader.getString("Commands.Database.Cooldown"));
@@ -105,8 +104,8 @@ public class McrankCommand implements TabExecutor {
             mcMMOPlayer.actualizeDatabaseATS();
         }
 
-        boolean useBoard = Config.getInstance().getScoreboardsEnabled() && (sender instanceof Player) && (Config.getInstance().getRankUseBoard());
+        boolean useBoard = MainConfig.getInstance().getScoreboardsEnabled() && (sender instanceof Player) && (MainConfig.getInstance().getRankUseBoard());
-        boolean useChat = !useBoard || Config.getInstance().getRankUseChat();
+        boolean useChat = !useBoard || MainConfig.getInstance().getRankUseChat();
 
         new McrankCommandAsyncTask(playerName, sender, useBoard, useChat).runTaskAsynchronously(mcMMO.p);
     }

bukkit/src/main/java/com/gmail/nossr50/commands/player/McstatsCommand.java

@@ -1,10 +1,10 @@
 package com.gmail.nossr50.commands.player;
 
-import com.gmail.nossr50.config.Config;
+import com.gmail.nossr50.core.config.MainConfig;
-import com.gmail.nossr50.locale.LocaleLoader;
+import com.gmail.nossr50.core.data.UserManager;
-import com.gmail.nossr50.util.commands.CommandUtils;
+import com.gmail.nossr50.core.locale.LocaleLoader;
-import com.gmail.nossr50.util.player.UserManager;
+import com.gmail.nossr50.core.util.commands.CommandUtils;
-import com.gmail.nossr50.util.scoreboards.ScoreboardManager;
+import com.gmail.nossr50.core.util.scoreboards.ScoreboardManager;
 import com.google.common.collect.ImmutableList;
 import org.bukkit.command.Command;
 import org.bukkit.command.CommandSender;
@@ -28,10 +28,10 @@ public class McstatsCommand implements TabExecutor {
             case 0:
                 Player player = (Player) sender;
 
-                if (Config.getInstance().getStatsUseBoard() && Config.getInstance().getScoreboardsEnabled()) {
+                if (MainConfig.getInstance().getStatsUseBoard() && MainConfig.getInstance().getScoreboardsEnabled()) {
                     ScoreboardManager.enablePlayerStatsScoreboard(player);
 
-                    if (!Config.getInstance().getStatsUseChat()) {
+                    if (!MainConfig.getInstance().getStatsUseChat()) {
                         return true;
                     }
                 }
@@ -43,12 +43,11 @@ public class McstatsCommand implements TabExecutor {
                 CommandUtils.printCombatSkills(player);
                 CommandUtils.printMiscSkills(player);
 
-                int powerLevelCap = Config.getInstance().getPowerLevelCap();
+                int powerLevelCap = MainConfig.getInstance().getPowerLevelCap();
 
                 if (powerLevelCap != Integer.MAX_VALUE) {
                     player.sendMessage(LocaleLoader.getString("Commands.PowerLevel.Capped", UserManager.getPlayer(player).getPowerLevel(), powerLevelCap));
-                }
+                } else {
-                else {
                     player.sendMessage(LocaleLoader.getString("Commands.PowerLevel", UserManager.getPlayer(player).getPowerLevel()));
                 }
 

bukkit/src/main/java/com/gmail/nossr50/commands/player/MctopCommand.java

@@ -1,15 +1,15 @@
 package com.gmail.nossr50.commands.player;
 
-import com.gmail.nossr50.config.Config;
+import com.gmail.nossr50.core.config.MainConfig;
-import com.gmail.nossr50.datatypes.player.McMMOPlayer;
+import com.gmail.nossr50.core.data.UserManager;
-import com.gmail.nossr50.datatypes.skills.PrimarySkillType;
+import com.gmail.nossr50.core.datatypes.player.McMMOPlayer;
-import com.gmail.nossr50.locale.LocaleLoader;
+import com.gmail.nossr50.core.locale.LocaleLoader;
+import com.gmail.nossr50.core.runnables.commands.MctopCommandAsyncTask;
+import com.gmail.nossr50.core.skills.PrimarySkillType;
+import com.gmail.nossr50.core.util.Permissions;
+import com.gmail.nossr50.core.util.StringUtils;
+import com.gmail.nossr50.core.util.commands.CommandUtils;
 import com.gmail.nossr50.mcMMO;
-import com.gmail.nossr50.runnables.commands.MctopCommandAsyncTask;
-import com.gmail.nossr50.util.Permissions;
-import com.gmail.nossr50.util.StringUtils;
-import com.gmail.nossr50.util.commands.CommandUtils;
-import com.gmail.nossr50.util.player.UserManager;
 import com.google.common.collect.ImmutableList;
 import org.bukkit.command.Command;
 import org.bukkit.command.CommandSender;
@@ -87,7 +87,7 @@ public class MctopCommand implements TabExecutor {
             }
 
             McMMOPlayer mcMMOPlayer = UserManager.getPlayer(sender.getName());
-            long cooldownMillis = Math.max(Config.getInstance().getDatabasePlayerCooldown(), 1750);
+            long cooldownMillis = Math.max(MainConfig.getInstance().getDatabasePlayerCooldown(), 1750);
 
             if (mcMMOPlayer.getDatabaseATS() + cooldownMillis > System.currentTimeMillis()) {
                 double seconds = ((mcMMOPlayer.getDatabaseATS() + cooldownMillis) - System.currentTimeMillis()) / 1000;
@@ -113,8 +113,8 @@ public class MctopCommand implements TabExecutor {
     }
 
     private void display(int page, PrimarySkillType skill, CommandSender sender) {
-        boolean useBoard = (sender instanceof Player) && (Config.getInstance().getTopUseBoard());
+        boolean useBoard = (sender instanceof Player) && (MainConfig.getInstance().getTopUseBoard());
-        boolean useChat = !useBoard || Config.getInstance().getTopUseChat();
+        boolean useChat = !useBoard || MainConfig.getInstance().getTopUseChat();
 
         new MctopCommandAsyncTask(page, skill, sender, useBoard, useChat).runTaskAsynchronously(mcMMO.p);
     }

bukkit/src/main/java/com/gmail/nossr50/commands/skills/AcrobaticsCommand.java

@@ -1,14 +1,14 @@
 package com.gmail.nossr50.commands.skills;
 
-import com.gmail.nossr50.datatypes.skills.PrimarySkillType;
+import com.gmail.nossr50.core.locale.LocaleLoader;
-import com.gmail.nossr50.datatypes.skills.SubSkillType;
+import com.gmail.nossr50.core.skills.PrimarySkillType;
-import com.gmail.nossr50.datatypes.skills.subskills.AbstractSubSkill;
+import com.gmail.nossr50.core.skills.SubSkillType;
+import com.gmail.nossr50.core.skills.subskills.AbstractSubSkill;
+import com.gmail.nossr50.core.util.TextComponentFactory;
+import com.gmail.nossr50.core.util.random.RandomChanceSkill;
+import com.gmail.nossr50.core.util.random.RandomChanceUtil;
+import com.gmail.nossr50.core.util.skills.SkillActivationType;
 import com.gmail.nossr50.listeners.InteractionManager;
-import com.gmail.nossr50.locale.LocaleLoader;
-import com.gmail.nossr50.util.TextComponentFactory;
-import com.gmail.nossr50.util.random.RandomChanceSkill;
-import com.gmail.nossr50.util.random.RandomChanceUtil;
-import com.gmail.nossr50.util.skills.SkillActivationType;
 import net.md_5.bungee.api.chat.TextComponent;
 import org.bukkit.entity.Player;
 
@@ -55,26 +55,25 @@ public class AcrobaticsCommand extends SkillCommand {
 
             AbstractSubSkill abstractSubSkill = InteractionManager.getAbstractByName("Roll");
 
-            if(abstractSubSkill != null)
+            if (abstractSubSkill != null) {
-            {
                 double rollChance, graceChance;
 
                 //Chance to roll at half
-                RandomChanceSkill roll_rcs  = new RandomChanceSkill(player, SubSkillType.ACROBATICS_ROLL);
+                RandomChanceSkill roll_rcs = new RandomChanceSkill(player, SubSkillType.ACROBATICS_ROLL);
 
                 //Chance to graceful roll
                 RandomChanceSkill grace_rcs = new RandomChanceSkill(player, SubSkillType.ACROBATICS_ROLL);
                 grace_rcs.setSkillLevel(grace_rcs.getSkillLevel() * 2); //Double Odds
 
                 //Chance Stat Calculations
-                rollChance       = RandomChanceUtil.getRandomChanceExecutionChance(roll_rcs);
+                rollChance = RandomChanceUtil.getRandomChanceExecutionChance(roll_rcs);
-                graceChance      = RandomChanceUtil.getRandomChanceExecutionChance(grace_rcs);
+                graceChance = RandomChanceUtil.getRandomChanceExecutionChance(grace_rcs);
                 //damageThreshold  = AdvancedConfig.getInstance().getRollDamageThreshold();
 
                 String rollStrings[] = getAbilityDisplayValues(SkillActivationType.RANDOM_LINEAR_100_SCALE_WITH_CAP, player, SubSkillType.ACROBATICS_ROLL);
 
                 //Format
-                double rollChanceLucky  = rollChance * 1.333D;
+                double rollChanceLucky = rollChance * 1.333D;
                 double graceChanceLucky = graceChance * 1.333D;
 
                 messages.add(getStatMessage(SubSkillType.ACROBATICS_ROLL, rollStrings[0])

bukkit/src/main/java/com/gmail/nossr50/commands/skills/AlchemyCommand.java

@@ -1,13 +1,13 @@
 package com.gmail.nossr50.commands.skills;
 
-import com.gmail.nossr50.datatypes.skills.PrimarySkillType;
+import com.gmail.nossr50.core.data.UserManager;
-import com.gmail.nossr50.datatypes.skills.SubSkillType;
+import com.gmail.nossr50.core.locale.LocaleLoader;
-import com.gmail.nossr50.locale.LocaleLoader;
+import com.gmail.nossr50.core.skills.PrimarySkillType;
-import com.gmail.nossr50.skills.alchemy.AlchemyManager;
+import com.gmail.nossr50.core.skills.SubSkillType;
-import com.gmail.nossr50.util.Permissions;
+import com.gmail.nossr50.core.skills.primary.alchemy.AlchemyManager;
-import com.gmail.nossr50.util.TextComponentFactory;
+import com.gmail.nossr50.core.util.Permissions;
-import com.gmail.nossr50.util.player.UserManager;
+import com.gmail.nossr50.core.util.TextComponentFactory;
-import com.gmail.nossr50.util.skills.RankUtils;
+import com.gmail.nossr50.core.util.skills.RankUtils;
 import net.md_5.bungee.api.chat.TextComponent;
 import org.bukkit.entity.Player;
 
@@ -18,8 +18,8 @@ public class AlchemyCommand extends SkillCommand {
     private String brewSpeed;
     private String brewSpeedLucky;
 
-    private int    tier;
+    private int tier;
-    private int    ingredientCount;
+    private int ingredientCount;
     private String ingredientList;
 
     private boolean canCatalysis;

bukkit/src/main/java/com/gmail/nossr50/commands/skills/AprilCommand.java

@@ -1,10 +1,10 @@
 package com.gmail.nossr50.commands.skills;
 
-import com.gmail.nossr50.locale.LocaleLoader;
+import com.gmail.nossr50.core.locale.LocaleLoader;
-import com.gmail.nossr50.util.HolidayManager.FakeSkillType;
+import com.gmail.nossr50.core.util.HolidayManager.FakeSkillType;
-import com.gmail.nossr50.util.Misc;
+import com.gmail.nossr50.core.util.Misc;
-import com.gmail.nossr50.util.StringUtils;
+import com.gmail.nossr50.core.util.StringUtils;
-import com.gmail.nossr50.util.commands.CommandUtils;
+import com.gmail.nossr50.core.util.commands.CommandUtils;
 import com.google.common.collect.ImmutableList;
 import org.bukkit.command.Command;
 import org.bukkit.command.CommandSender;
@@ -16,10 +16,9 @@ import java.util.ArrayList;
 import java.util.List;
 
 public class AprilCommand implements TabExecutor {
-    private String skillName;
-
     protected DecimalFormat percent = new DecimalFormat("##0.00%");
     protected DecimalFormat decimal = new DecimalFormat("##0.00");
+    private String skillName;
 
     @Override
     public boolean onCommand(CommandSender sender, Command command, String label, String[] args) {

bukkit/src/main/java/com/gmail/nossr50/commands/skills/ArcheryCommand.java

@@ -1,11 +1,11 @@
 package com.gmail.nossr50.commands.skills;
 
-import com.gmail.nossr50.datatypes.skills.PrimarySkillType;
+import com.gmail.nossr50.core.locale.LocaleLoader;
-import com.gmail.nossr50.datatypes.skills.SubSkillType;
+import com.gmail.nossr50.core.skills.PrimarySkillType;
-import com.gmail.nossr50.locale.LocaleLoader;
+import com.gmail.nossr50.core.skills.SubSkillType;
-import com.gmail.nossr50.skills.archery.Archery;
+import com.gmail.nossr50.core.skills.primary.archery.Archery;
-import com.gmail.nossr50.util.TextComponentFactory;
+import com.gmail.nossr50.core.util.TextComponentFactory;
-import com.gmail.nossr50.util.skills.SkillActivationType;
+import com.gmail.nossr50.core.util.skills.SkillActivationType;
 import net.md_5.bungee.api.chat.TextComponent;
 import org.bukkit.entity.Player;
 

bukkit/src/main/java/com/gmail/nossr50/commands/skills/AxesCommand.java

@@ -1,14 +1,14 @@
 package com.gmail.nossr50.commands.skills;
 
-import com.gmail.nossr50.datatypes.skills.PrimarySkillType;
+import com.gmail.nossr50.core.data.UserManager;
-import com.gmail.nossr50.datatypes.skills.SubSkillType;
+import com.gmail.nossr50.core.locale.LocaleLoader;
-import com.gmail.nossr50.locale.LocaleLoader;
+import com.gmail.nossr50.core.skills.PrimarySkillType;
-import com.gmail.nossr50.skills.axes.Axes;
+import com.gmail.nossr50.core.skills.SubSkillType;
-import com.gmail.nossr50.util.Permissions;
+import com.gmail.nossr50.core.skills.primary.axes.Axes;
-import com.gmail.nossr50.util.TextComponentFactory;
+import com.gmail.nossr50.core.util.Permissions;
-import com.gmail.nossr50.util.player.UserManager;
+import com.gmail.nossr50.core.util.TextComponentFactory;
-import com.gmail.nossr50.util.skills.RankUtils;
+import com.gmail.nossr50.core.util.skills.RankUtils;
-import com.gmail.nossr50.util.skills.SkillActivationType;
+import com.gmail.nossr50.core.util.skills.SkillActivationType;
 import net.md_5.bungee.api.chat.TextComponent;
 import org.bukkit.entity.Player;
 

bukkit/src/main/java/com/gmail/nossr50/commands/skills/ExcavationCommand.java

@@ -1,11 +1,11 @@
 package com.gmail.nossr50.commands.skills;
 
-import com.gmail.nossr50.datatypes.skills.PrimarySkillType;
+import com.gmail.nossr50.core.locale.LocaleLoader;
-import com.gmail.nossr50.datatypes.skills.SubSkillType;
+import com.gmail.nossr50.core.skills.PrimarySkillType;
-import com.gmail.nossr50.locale.LocaleLoader;
+import com.gmail.nossr50.core.skills.SubSkillType;
-import com.gmail.nossr50.util.Permissions;
+import com.gmail.nossr50.core.util.Permissions;
-import com.gmail.nossr50.util.TextComponentFactory;
+import com.gmail.nossr50.core.util.TextComponentFactory;
-import com.gmail.nossr50.util.skills.RankUtils;
+import com.gmail.nossr50.core.util.skills.RankUtils;
 import net.md_5.bungee.api.chat.TextComponent;
 import org.bukkit.entity.Player;
 

bukkit/src/main/java/com/gmail/nossr50/commands/skills/FishingCommand.java

@@ -1,18 +1,18 @@
 package com.gmail.nossr50.commands.skills;
 
-import com.gmail.nossr50.config.AdvancedConfig;
+import com.gmail.nossr50.core.config.AdvancedConfig;
-import com.gmail.nossr50.config.treasure.TreasureConfig;
+import com.gmail.nossr50.core.config.treasure.TreasureConfig;
-import com.gmail.nossr50.datatypes.skills.PrimarySkillType;
+import com.gmail.nossr50.core.data.UserManager;
-import com.gmail.nossr50.datatypes.skills.SubSkillType;
+import com.gmail.nossr50.core.locale.LocaleLoader;
-import com.gmail.nossr50.datatypes.treasure.Rarity;
+import com.gmail.nossr50.core.skills.PrimarySkillType;
-import com.gmail.nossr50.locale.LocaleLoader;
+import com.gmail.nossr50.core.skills.SubSkillType;
-import com.gmail.nossr50.skills.fishing.Fishing;
+import com.gmail.nossr50.core.skills.primary.fishing.Fishing;
-import com.gmail.nossr50.skills.fishing.FishingManager;
+import com.gmail.nossr50.core.skills.primary.fishing.FishingManager;
-import com.gmail.nossr50.util.Permissions;
+import com.gmail.nossr50.core.skills.treasure.Rarity;
-import com.gmail.nossr50.util.TextComponentFactory;
+import com.gmail.nossr50.core.util.Permissions;
-import com.gmail.nossr50.util.player.UserManager;
+import com.gmail.nossr50.core.util.TextComponentFactory;
-import com.gmail.nossr50.util.random.RandomChanceUtil;
+import com.gmail.nossr50.core.util.random.RandomChanceUtil;
-import com.gmail.nossr50.util.skills.RankUtils;
+import com.gmail.nossr50.core.util.skills.RankUtils;
 import net.md_5.bungee.api.chat.TextComponent;
 import org.bukkit.Location;
 import org.bukkit.entity.EntityType;
@@ -57,7 +57,7 @@ public class FishingCommand extends SkillCommand {
         if (canTreasureHunt) {
             lootTier = fishingManager.getLootTier();
 
-            // Item drop rates
+            // ItemStack drop rates
             commonTreasure = percent.format(TreasureConfig.getInstance().getItemDropRate(lootTier, Rarity.COMMON) / 100.0);
             uncommonTreasure = percent.format(TreasureConfig.getInstance().getItemDropRate(lootTier, Rarity.UNCOMMON) / 100.0);
             rareTreasure = percent.format(TreasureConfig.getInstance().getItemDropRate(lootTier, Rarity.RARE) / 100.0);
@@ -74,7 +74,7 @@ public class FishingCommand extends SkillCommand {
                 }
             }
 
-            if(totalEnchantChance >= 1)
+            if (totalEnchantChance >= 1)
                 magicChance = percent.format(totalEnchantChance / 100.0);
             else
                 magicChance = percent.format(0);
@@ -149,7 +149,7 @@ public class FishingCommand extends SkillCommand {
 
         if (canShake) {
             messages.add(getStatMessage(SubSkillType.FISHING_SHAKE, shakeChance)
-            + (isLucky ? LocaleLoader.getString("Perks.Lucky.Bonus", shakeChanceLucky) : ""));
+                    + (isLucky ? LocaleLoader.getString("Perks.Lucky.Bonus", shakeChanceLucky) : ""));
         }
 
         if (canTreasureHunt) {

bukkit/src/main/java/com/gmail/nossr50/commands/skills/HerbalismCommand.java

@@ -1,12 +1,12 @@
 package com.gmail.nossr50.commands.skills;
 
-import com.gmail.nossr50.datatypes.skills.PrimarySkillType;
+import com.gmail.nossr50.core.locale.LocaleLoader;
-import com.gmail.nossr50.datatypes.skills.SubSkillType;
+import com.gmail.nossr50.core.skills.PrimarySkillType;
-import com.gmail.nossr50.locale.LocaleLoader;
+import com.gmail.nossr50.core.skills.SubSkillType;
-import com.gmail.nossr50.util.Permissions;
+import com.gmail.nossr50.core.util.Permissions;
-import com.gmail.nossr50.util.TextComponentFactory;
+import com.gmail.nossr50.core.util.TextComponentFactory;
-import com.gmail.nossr50.util.skills.RankUtils;
+import com.gmail.nossr50.core.util.skills.RankUtils;
-import com.gmail.nossr50.util.skills.SkillActivationType;
+import com.gmail.nossr50.core.util.skills.SkillActivationType;
 import net.md_5.bungee.api.chat.TextComponent;
 import org.bukkit.Material;
 import org.bukkit.entity.Player;
@@ -45,7 +45,8 @@ public class HerbalismCommand extends SkillCommand {
 
         // DOUBLE DROPS
         if (canDoubleDrop) {
-            String[] doubleDropStrings = getAbilityDisplayValues(SkillActivationType.RANDOM_LINEAR_100_SCALE_WITH_CAP, player, SubSkillType.HERBALISM_DOUBLE_DROPS);;
+            String[] doubleDropStrings = getAbilityDisplayValues(SkillActivationType.RANDOM_LINEAR_100_SCALE_WITH_CAP, player, SubSkillType.HERBALISM_DOUBLE_DROPS);
+            ;
             doubleDropChance = doubleDropStrings[0];
             doubleDropChanceLucky = doubleDropStrings[1];
         }
@@ -124,7 +125,7 @@ public class HerbalismCommand extends SkillCommand {
         }
 
         if (canGreenThumbPlants) {
-            messages.add(getStatMessage(true, true,SubSkillType.HERBALISM_GREEN_THUMB, String.valueOf(greenThumbStage)));
+            messages.add(getStatMessage(true, true, SubSkillType.HERBALISM_GREEN_THUMB, String.valueOf(greenThumbStage)));
         }
 
         if (hasHylianLuck) {

bukkit/src/main/java/com/gmail/nossr50/commands/skills/MiningCommand.java

@@ -1,14 +1,14 @@
 package com.gmail.nossr50.commands.skills;
 
-import com.gmail.nossr50.datatypes.skills.PrimarySkillType;
+import com.gmail.nossr50.core.data.UserManager;
-import com.gmail.nossr50.datatypes.skills.SubSkillType;
+import com.gmail.nossr50.core.locale.LocaleLoader;
-import com.gmail.nossr50.locale.LocaleLoader;
+import com.gmail.nossr50.core.skills.PrimarySkillType;
-import com.gmail.nossr50.skills.mining.MiningManager;
+import com.gmail.nossr50.core.skills.SubSkillType;
-import com.gmail.nossr50.util.Permissions;
+import com.gmail.nossr50.core.skills.primary.mining.MiningManager;
-import com.gmail.nossr50.util.TextComponentFactory;
+import com.gmail.nossr50.core.util.Permissions;
-import com.gmail.nossr50.util.player.UserManager;
+import com.gmail.nossr50.core.util.TextComponentFactory;
-import com.gmail.nossr50.util.skills.RankUtils;
+import com.gmail.nossr50.core.util.skills.RankUtils;
-import com.gmail.nossr50.util.skills.SkillActivationType;
+import com.gmail.nossr50.core.util.skills.SkillActivationType;
 import net.md_5.bungee.api.chat.TextComponent;
 import org.bukkit.entity.Player;
 
@@ -90,7 +90,7 @@ public class MiningCommand extends SkillCommand {
             //messages.add(LocaleLoader.getString("Mining.Blast.Rank", blastMiningRank, RankUtils.getHighestRank(SubSkillType.MINING_BLAST_MINING), LocaleLoader.getString("Mining.Blast.Effect", oreBonus, debrisReduction, bonusTNTDrops)));
         }
 
-         if (canDemoExpert) {
+        if (canDemoExpert) {
             messages.add(getStatMessage(SubSkillType.MINING_DEMOLITIONS_EXPERTISE, blastDamageDecrease));
             //messages.add(LocaleLoader.getString("Mining.Effect.Decrease", blastDamageDecrease));
         }

bukkit/src/main/java/com/gmail/nossr50/commands/skills/MmoInfoCommand.java

@@ -1,12 +1,12 @@
 package com.gmail.nossr50.commands.skills;
 
-import com.gmail.nossr50.datatypes.skills.PrimarySkillType;
+import com.gmail.nossr50.core.locale.LocaleLoader;
-import com.gmail.nossr50.datatypes.skills.SubSkillType;
+import com.gmail.nossr50.core.skills.PrimarySkillType;
-import com.gmail.nossr50.datatypes.skills.subskills.AbstractSubSkill;
+import com.gmail.nossr50.core.skills.SubSkillType;
+import com.gmail.nossr50.core.skills.subskills.AbstractSubSkill;
+import com.gmail.nossr50.core.util.Permissions;
+import com.gmail.nossr50.core.util.TextComponentFactory;
 import com.gmail.nossr50.listeners.InteractionManager;
-import com.gmail.nossr50.locale.LocaleLoader;
-import com.gmail.nossr50.util.Permissions;
-import com.gmail.nossr50.util.TextComponentFactory;
 import com.google.common.collect.ImmutableList;
 import org.bukkit.command.Command;
 import org.bukkit.command.CommandSender;
@@ -27,26 +27,22 @@ public class MmoInfoCommand implements TabExecutor {
         /*
          * Only allow players to use this command
          */
-        if(commandSender instanceof Player)
+        if (commandSender instanceof Player) {
-        {
+            if (args.length < 1)
-            if(args.length < 1)
                 return false;
 
             Player player = (Player) commandSender;
-            if(Permissions.mmoinfo(player))
+            if (Permissions.mmoinfo(player)) {
-            {
+                if (args == null || args[0] == null)
-                if(args == null || args[0] == null)
                     return false;
 
-                if(args[0].equalsIgnoreCase( "???"))
+                if (args[0].equalsIgnoreCase("???")) {
-                {
                     player.sendMessage(LocaleLoader.getString("Commands.MmoInfo.Header"));
                     player.sendMessage(LocaleLoader.getString("Commands.MmoInfo.SubSkillHeader", "???"));
                     player.sendMessage(LocaleLoader.getString("Commands.MmoInfo.DetailsHeader"));
                     player.sendMessage(LocaleLoader.getString("Commands.MmoInfo.Mystery"));
                     return true;
-                } else if(InteractionManager.getAbstractByName(args[0]) != null || PrimarySkillType.SUBSKILL_NAMES.contains(args[0]))
+                } else if (InteractionManager.getAbstractByName(args[0]) != null || PrimarySkillType.SUBSKILL_NAMES.contains(args[0])) {
-                {
                     displayInfo(player, args[0]);
                     return true;
                 }
@@ -70,12 +66,10 @@ public class MmoInfoCommand implements TabExecutor {
         }
     }
 
-    private void displayInfo(Player player, String subSkillName)
+    private void displayInfo(Player player, String subSkillName) {
-    {
         //Check to see if the skill exists in the new system
         AbstractSubSkill abstractSubSkill = InteractionManager.getAbstractByName(subSkillName);
-        if(abstractSubSkill != null)
+        if (abstractSubSkill != null) {
-        {
             /* New System Skills are programmable */
             abstractSubSkill.printInfo(player);
             //TextComponentFactory.sendPlayerUrlHeader(player);
@@ -89,9 +83,8 @@ public class MmoInfoCommand implements TabExecutor {
             player.sendMessage(LocaleLoader.getString("Commands.MmoInfo.OldSkill"));
         }
 
-        for(SubSkillType subSkillType : SubSkillType.values())
+        for (SubSkillType subSkillType : SubSkillType.values()) {
-        {
+            if (subSkillType.getNiceNameNoSpaces(subSkillType).equalsIgnoreCase(subSkillName))
-            if(subSkillType.getNiceNameNoSpaces(subSkillType).equalsIgnoreCase(subSkillName))
                 subSkillName = subSkillType.getWikiName(subSkillType.toString());
         }
 

bukkit/src/main/java/com/gmail/nossr50/commands/skills/RepairCommand.java

@@ -1,19 +1,19 @@
 package com.gmail.nossr50.commands.skills;
 
-import com.gmail.nossr50.datatypes.skills.MaterialType;
+import com.gmail.nossr50.core.data.UserManager;
-import com.gmail.nossr50.datatypes.skills.PrimarySkillType;
+import com.gmail.nossr50.core.locale.LocaleLoader;
-import com.gmail.nossr50.datatypes.skills.SubSkillType;
+import com.gmail.nossr50.core.skills.MaterialType;
-import com.gmail.nossr50.locale.LocaleLoader;
+import com.gmail.nossr50.core.skills.PrimarySkillType;
+import com.gmail.nossr50.core.skills.SubSkillType;
+import com.gmail.nossr50.core.skills.primary.repair.ArcaneForging;
+import com.gmail.nossr50.core.skills.primary.repair.Repair;
+import com.gmail.nossr50.core.skills.primary.repair.RepairManager;
+import com.gmail.nossr50.core.skills.primary.repair.repairables.Repairable;
+import com.gmail.nossr50.core.util.Permissions;
+import com.gmail.nossr50.core.util.TextComponentFactory;
+import com.gmail.nossr50.core.util.skills.RankUtils;
+import com.gmail.nossr50.core.util.skills.SkillActivationType;
 import com.gmail.nossr50.mcMMO;
-import com.gmail.nossr50.skills.repair.ArcaneForging;
-import com.gmail.nossr50.skills.repair.Repair;
-import com.gmail.nossr50.skills.repair.RepairManager;
-import com.gmail.nossr50.skills.repair.repairables.Repairable;
-import com.gmail.nossr50.util.Permissions;
-import com.gmail.nossr50.util.TextComponentFactory;
-import com.gmail.nossr50.util.player.UserManager;
-import com.gmail.nossr50.util.skills.RankUtils;
-import com.gmail.nossr50.util.skills.SkillActivationType;
 import net.md_5.bungee.api.chat.TextComponent;
 import org.bukkit.Material;
 import org.bukkit.entity.Player;

bukkit/src/main/java/com/gmail/nossr50/commands/skills/SalvageCommand.java

@@ -1,13 +1,13 @@
 package com.gmail.nossr50.commands.skills;
 
-import com.gmail.nossr50.datatypes.skills.PrimarySkillType;
+import com.gmail.nossr50.core.data.UserManager;
-import com.gmail.nossr50.datatypes.skills.SubSkillType;
+import com.gmail.nossr50.core.locale.LocaleLoader;
-import com.gmail.nossr50.locale.LocaleLoader;
+import com.gmail.nossr50.core.skills.PrimarySkillType;
-import com.gmail.nossr50.skills.salvage.Salvage;
+import com.gmail.nossr50.core.skills.SubSkillType;
-import com.gmail.nossr50.skills.salvage.SalvageManager;
+import com.gmail.nossr50.core.skills.child.salvage.Salvage;
-import com.gmail.nossr50.util.TextComponentFactory;
+import com.gmail.nossr50.core.skills.child.salvage.SalvageManager;
-import com.gmail.nossr50.util.player.UserManager;
+import com.gmail.nossr50.core.util.TextComponentFactory;
-import com.gmail.nossr50.util.skills.RankUtils;
+import com.gmail.nossr50.core.util.skills.RankUtils;
 import net.md_5.bungee.api.chat.TextComponent;
 import org.bukkit.entity.Player;
 

bukkit/src/main/java/com/gmail/nossr50/commands/skills/SkillCommand.java

@@ -1,22 +1,22 @@
 package com.gmail.nossr50.commands.skills;
 
-import com.gmail.nossr50.config.AdvancedConfig;
+import com.gmail.nossr50.core.config.AdvancedConfig;
-import com.gmail.nossr50.config.Config;
+import com.gmail.nossr50.core.config.MainConfig;
-import com.gmail.nossr50.datatypes.player.McMMOPlayer;
+import com.gmail.nossr50.core.data.UserManager;
-import com.gmail.nossr50.datatypes.skills.PrimarySkillType;
+import com.gmail.nossr50.core.datatypes.player.McMMOPlayer;
-import com.gmail.nossr50.datatypes.skills.SubSkillType;
+import com.gmail.nossr50.core.locale.LocaleLoader;
-import com.gmail.nossr50.locale.LocaleLoader;
+import com.gmail.nossr50.core.skills.PrimarySkillType;
-import com.gmail.nossr50.skills.child.FamilyTree;
+import com.gmail.nossr50.core.skills.SubSkillType;
-import com.gmail.nossr50.util.Permissions;
+import com.gmail.nossr50.core.skills.child.FamilyTree;
-import com.gmail.nossr50.util.StringUtils;
+import com.gmail.nossr50.core.util.Permissions;
-import com.gmail.nossr50.util.TextComponentFactory;
+import com.gmail.nossr50.core.util.StringUtils;
-import com.gmail.nossr50.util.commands.CommandUtils;
+import com.gmail.nossr50.core.util.TextComponentFactory;
-import com.gmail.nossr50.util.player.UserManager;
+import com.gmail.nossr50.core.util.commands.CommandUtils;
-import com.gmail.nossr50.util.random.RandomChanceUtil;
+import com.gmail.nossr50.core.util.random.RandomChanceUtil;
-import com.gmail.nossr50.util.scoreboards.ScoreboardManager;
+import com.gmail.nossr50.core.util.scoreboards.ScoreboardManager;
-import com.gmail.nossr50.util.skills.PerksUtils;
+import com.gmail.nossr50.core.util.skills.PerksUtils;
-import com.gmail.nossr50.util.skills.RankUtils;
+import com.gmail.nossr50.core.util.skills.RankUtils;
-import com.gmail.nossr50.util.skills.SkillActivationType;
+import com.gmail.nossr50.core.util.skills.SkillActivationType;
 import com.google.common.collect.ImmutableList;
 import net.md_5.bungee.api.ChatColor;
 import net.md_5.bungee.api.chat.TextComponent;
@@ -33,11 +33,9 @@ import java.util.Set;
 
 public abstract class SkillCommand implements TabExecutor {
     protected PrimarySkillType skill;
-    private String skillName;
-
     protected DecimalFormat percent = new DecimalFormat("##0.00%");
     protected DecimalFormat decimal = new DecimalFormat("##0.00");
-
+    private String skillName;
     private CommandExecutor skillGuideCommand;
 
     public SkillCommand(PrimarySkillType skill) {
@@ -46,6 +44,15 @@ public abstract class SkillCommand implements TabExecutor {
         skillGuideCommand = new SkillGuideCommand(skill);
     }
 
+    public static String[] addItemToFirstPositionOfArray(String itemToAdd, String... existingArray) {
+        String[] newArray = new String[existingArray.length + 1];
+        newArray[0] = itemToAdd;
+
+        System.arraycopy(existingArray, 0, newArray, 1, existingArray.length);
+
+        return newArray;
+    }
+
     @Override
     public boolean onCommand(CommandSender sender, Command command, String label, String[] args) {
         if (CommandUtils.noConsoleUsage(sender)) {
@@ -66,9 +73,8 @@ public abstract class SkillCommand implements TabExecutor {
                 float skillValue = mcMMOPlayer.getSkillLevel(skill);
 
                 //Send the players a few blank lines to make finding the top of the skill command easier
-                if(AdvancedConfig.getInstance().doesSkillCommandSendBlankLines())
+                if (AdvancedConfig.getInstance().doesSkillCommandSendBlankLines())
-                    for(int i = 0; i < 2; i++)
+                    for (int i = 0; i < 2; i++) {
-                    {
                         player.sendMessage("");
                     }
 
@@ -99,14 +105,13 @@ public abstract class SkillCommand implements TabExecutor {
 
 
                 //Link Header
-                if(Config.getInstance().getUrlLinksEnabled())
+                if (MainConfig.getInstance().getUrlLinksEnabled()) {
-                {
                     player.sendMessage(LocaleLoader.getString("Overhaul.mcMMO.Header"));
                     TextComponentFactory.sendPlayerUrlHeader(player);
                 }
 
 
-                if (Config.getInstance().getScoreboardsEnabled() && Config.getInstance().getSkillUseBoard()) {
+                if (MainConfig.getInstance().getScoreboardsEnabled() && MainConfig.getInstance().getSkillUseBoard()) {
                     ScoreboardManager.enablePlayerSkillScoreboard(player, skill);
                 }
 
@@ -138,8 +143,7 @@ public abstract class SkillCommand implements TabExecutor {
 
         player.sendMessage(LocaleLoader.getString("Skills.Overhaul.Header", skillName));
 
-        if(!skill.isChildSkill())
+        if (!skill.isChildSkill()) {
-        {
             /*
              * NON-CHILD SKILLS
              */
@@ -162,17 +166,16 @@ public abstract class SkillCommand implements TabExecutor {
             //TODO: Add JSON here
             for (PrimarySkillType parent : parents) {
                 parentList.add(parent);
-                /*player.sendMessage(parent.getName() + " - " + LocaleLoader.getString("Effects.Level.Overhaul", mcMMOPlayer.getSkillLevel(parent), mcMMOPlayer.getSkillXpLevel(parent), mcMMOPlayer.getXpToLevel(parent)))*/;
+                /*player.sendMessage(parent.getName() + " - " + LocaleLoader.getString("Effects.Level.Overhaul", mcMMOPlayer.getSkillLevel(parent), mcMMOPlayer.getSkillXpLevel(parent), mcMMOPlayer.getXpToLevel(parent)))*/
+                ;
             }
 
             String parentMessage = "";
 
-            for(int i = 0; i < parentList.size(); i++)
+            for (int i = 0; i < parentList.size(); i++) {
-            {
+                if (i + 1 < parentList.size()) {
-                if(i+1 < parentList.size())
-                {
                     parentMessage += LocaleLoader.getString("Effects.Child.ParentList", parentList.get(i).getName(), mcMMOPlayer.getSkillLevel(parentList.get(i)));
-                    parentMessage += ChatColor.GRAY+", ";
+                    parentMessage += ChatColor.GRAY + ", ";
                 } else {
                     parentMessage += LocaleLoader.getString("Effects.Child.ParentList", parentList.get(i).getName(), mcMMOPlayer.getSkillLevel(parentList.get(i)));
                 }
@@ -231,11 +234,9 @@ public abstract class SkillCommand implements TabExecutor {
 
         int length;
 
-        if(abilityLengthCap <= 0)
+        if (abilityLengthCap <= 0) {
-        {
             length = 2 + (int) (skillValue / abilityLengthVar);
-        }
+        } else {
-        else {
             length = 2 + (int) (Math.min(abilityLengthCap, skillValue) / abilityLengthVar);
         }
 
@@ -245,38 +246,27 @@ public abstract class SkillCommand implements TabExecutor {
             length = Math.min(length, maxLength);
         }
 
-        return new String[] { String.valueOf(length), String.valueOf(enduranceLength) };
+        return new String[]{String.valueOf(length), String.valueOf(enduranceLength)};
     }
 
-    protected String getStatMessage(SubSkillType subSkillType, String... vars)
+    protected String getStatMessage(SubSkillType subSkillType, String... vars) {
-    {
         return getStatMessage(false, false, subSkillType, vars);
     }
 
-    protected String getStatMessage(boolean isExtra, boolean isCustom, SubSkillType subSkillType, String... vars)
+    protected String getStatMessage(boolean isExtra, boolean isCustom, SubSkillType subSkillType, String... vars) {
-    {
         String templateKey = isCustom ? "Ability.Generic.Template.Custom" : "Ability.Generic.Template";
         String statDescriptionKey = !isExtra ? subSkillType.getLocaleKeyStatDescription() : subSkillType.getLocaleKeyStatExtraDescription();
 
-        if(isCustom)
+        if (isCustom)
-            return LocaleLoader.getString(templateKey, LocaleLoader.getString(statDescriptionKey, vars));
+            //Cast to Object[] to suppress warnings
-        else
+            return LocaleLoader.getString(templateKey, LocaleLoader.getString(statDescriptionKey, (Object[]) vars));
-        {
+        else {
             String[] mergedList = addItemToFirstPositionOfArray(LocaleLoader.getString(statDescriptionKey), vars);
-            return LocaleLoader.getString(templateKey, mergedList);
+            //Cast to Object[] to suppress warnings
+            return LocaleLoader.getString(templateKey, (Object[]) mergedList);
         }
     }
 
-
-    public static String[] addItemToFirstPositionOfArray(String itemToAdd, String... existingArray) {
-        String[] newArray = new String[existingArray.length + 1];
-        newArray[0] = itemToAdd;
-
-        System.arraycopy(existingArray, 0, newArray, 1, existingArray.length);
-
-        return newArray;
-    }
-
     protected abstract void dataCalculations(Player player, float skillValue);
 
     protected abstract void permissionsCheck(Player player);
@@ -289,12 +279,12 @@ public abstract class SkillCommand implements TabExecutor {
 
     /**
      * Checks if a player can use a skill
-     * @param player target player
+     *
+     * @param player       target player
      * @param subSkillType target subskill
      * @return true if the player has permission and has the skill unlocked
      */
-    protected boolean canUseSubskill(Player player, SubSkillType subSkillType)
+    protected boolean canUseSubskill(Player player, SubSkillType subSkillType) {
-    {
         return Permissions.isSubSkillEnabled(player, subSkillType) && RankUtils.hasUnlockedSubskill(player, subSkillType);
     }
 }

bukkit/src/main/java/com/gmail/nossr50/commands/skills/SkillGuideCommand.java

@@ -1,8 +1,8 @@
 package com.gmail.nossr50.commands.skills;
 
-import com.gmail.nossr50.datatypes.skills.PrimarySkillType;
+import com.gmail.nossr50.core.locale.LocaleLoader;
-import com.gmail.nossr50.locale.LocaleLoader;
+import com.gmail.nossr50.core.skills.PrimarySkillType;
-import com.gmail.nossr50.util.StringUtils;
+import com.gmail.nossr50.core.util.StringUtils;
 import org.bukkit.command.Command;
 import org.bukkit.command.CommandExecutor;
 import org.bukkit.command.CommandSender;
@@ -75,8 +75,7 @@ public class SkillGuideCommand implements CommandExecutor {
         while (allStrings.size() < 9) {
             if (pageIndexStart + allStrings.size() > guide.size()) {
                 allStrings.add("");
-            }
+            } else {
-            else {
                 allStrings.add(guide.get(pageIndexStart + (allStrings.size() - 1)));
             }
         }

bukkit/src/main/java/com/gmail/nossr50/commands/skills/SmeltingCommand.java

@@ -1,14 +1,14 @@
 package com.gmail.nossr50.commands.skills;
 
-import com.gmail.nossr50.datatypes.skills.PrimarySkillType;
+import com.gmail.nossr50.core.data.UserManager;
-import com.gmail.nossr50.datatypes.skills.SubSkillType;
+import com.gmail.nossr50.core.locale.LocaleLoader;
-import com.gmail.nossr50.locale.LocaleLoader;
+import com.gmail.nossr50.core.skills.PrimarySkillType;
-import com.gmail.nossr50.skills.smelting.Smelting;
+import com.gmail.nossr50.core.skills.SubSkillType;
-import com.gmail.nossr50.util.Permissions;
+import com.gmail.nossr50.core.skills.child.smelting.Smelting;
-import com.gmail.nossr50.util.TextComponentFactory;
+import com.gmail.nossr50.core.util.Permissions;
-import com.gmail.nossr50.util.player.UserManager;
+import com.gmail.nossr50.core.util.TextComponentFactory;
-import com.gmail.nossr50.util.skills.RankUtils;
+import com.gmail.nossr50.core.util.skills.RankUtils;
-import com.gmail.nossr50.util.skills.SkillActivationType;
+import com.gmail.nossr50.core.util.skills.SkillActivationType;
 import net.md_5.bungee.api.chat.TextComponent;
 import org.bukkit.entity.Player;
 

bukkit/src/main/java/com/gmail/nossr50/commands/skills/SwordsCommand.java

@@ -1,14 +1,14 @@
 package com.gmail.nossr50.commands.skills;
 
-import com.gmail.nossr50.config.AdvancedConfig;
+import com.gmail.nossr50.core.config.AdvancedConfig;
-import com.gmail.nossr50.datatypes.skills.PrimarySkillType;
+import com.gmail.nossr50.core.data.UserManager;
-import com.gmail.nossr50.datatypes.skills.SubSkillType;
+import com.gmail.nossr50.core.locale.LocaleLoader;
-import com.gmail.nossr50.locale.LocaleLoader;
+import com.gmail.nossr50.core.skills.PrimarySkillType;
-import com.gmail.nossr50.util.Permissions;
+import com.gmail.nossr50.core.skills.SubSkillType;
-import com.gmail.nossr50.util.TextComponentFactory;
+import com.gmail.nossr50.core.util.Permissions;
-import com.gmail.nossr50.util.player.UserManager;
+import com.gmail.nossr50.core.util.TextComponentFactory;
-import com.gmail.nossr50.util.skills.RankUtils;
+import com.gmail.nossr50.core.util.skills.RankUtils;
-import com.gmail.nossr50.util.skills.SkillActivationType;
+import com.gmail.nossr50.core.util.skills.SkillActivationType;
 import net.md_5.bungee.api.chat.TextComponent;
 import org.bukkit.entity.Player;
 
@@ -70,8 +70,8 @@ public class SwordsCommand extends SkillCommand {
         List<String> messages = new ArrayList<String>();
 
         int ruptureTicks = UserManager.getPlayer(player).getSwordsManager().getRuptureBleedTicks();
-        double ruptureDamagePlayers =  RankUtils.getRank(player, SubSkillType.SWORDS_RUPTURE) >= 3 ? AdvancedConfig.getInstance().getRuptureDamagePlayer() * 1.5D : AdvancedConfig.getInstance().getRuptureDamagePlayer();
+        double ruptureDamagePlayers = RankUtils.getRank(player, SubSkillType.SWORDS_RUPTURE) >= 3 ? AdvancedConfig.getInstance().getRuptureDamagePlayer() * 1.5D : AdvancedConfig.getInstance().getRuptureDamagePlayer();
-        double ruptureDamageMobs =  RankUtils.getRank(player, SubSkillType.SWORDS_RUPTURE) >= 3 ? AdvancedConfig.getInstance().getRuptureDamageMobs() * 1.5D : AdvancedConfig.getInstance().getRuptureDamageMobs();
+        double ruptureDamageMobs = RankUtils.getRank(player, SubSkillType.SWORDS_RUPTURE) >= 3 ? AdvancedConfig.getInstance().getRuptureDamageMobs() * 1.5D : AdvancedConfig.getInstance().getRuptureDamageMobs();
 
         if (canCounter) {
             messages.add(getStatMessage(SubSkillType.SWORDS_COUNTER_ATTACK, counterChance)

bukkit/src/main/java/com/gmail/nossr50/commands/skills/TamingCommand.java

@@ -1,12 +1,12 @@
 package com.gmail.nossr50.commands.skills;
 
-import com.gmail.nossr50.datatypes.skills.PrimarySkillType;
+import com.gmail.nossr50.core.locale.LocaleLoader;
-import com.gmail.nossr50.datatypes.skills.SubSkillType;
+import com.gmail.nossr50.core.skills.PrimarySkillType;
-import com.gmail.nossr50.locale.LocaleLoader;
+import com.gmail.nossr50.core.skills.SubSkillType;
-import com.gmail.nossr50.skills.taming.Taming;
+import com.gmail.nossr50.core.skills.primary.taming.Taming;
-import com.gmail.nossr50.util.Permissions;
+import com.gmail.nossr50.core.util.Permissions;
-import com.gmail.nossr50.util.TextComponentFactory;
+import com.gmail.nossr50.core.util.TextComponentFactory;
-import com.gmail.nossr50.util.skills.SkillActivationType;
+import com.gmail.nossr50.core.util.skills.SkillActivationType;
 import net.md_5.bungee.api.chat.TextComponent;
 import org.bukkit.entity.EntityType;
 import org.bukkit.entity.Player;

bukkit/src/main/java/com/gmail/nossr50/commands/skills/UnarmedCommand.java

@@ -1,13 +1,13 @@
 package com.gmail.nossr50.commands.skills;
 
-import com.gmail.nossr50.datatypes.skills.PrimarySkillType;
+import com.gmail.nossr50.core.data.UserManager;
-import com.gmail.nossr50.datatypes.skills.SubSkillType;
+import com.gmail.nossr50.core.locale.LocaleLoader;
-import com.gmail.nossr50.locale.LocaleLoader;
+import com.gmail.nossr50.core.skills.PrimarySkillType;
-import com.gmail.nossr50.util.Permissions;
+import com.gmail.nossr50.core.skills.SubSkillType;
-import com.gmail.nossr50.util.TextComponentFactory;
+import com.gmail.nossr50.core.util.Permissions;
-import com.gmail.nossr50.util.player.UserManager;
+import com.gmail.nossr50.core.util.TextComponentFactory;
-import com.gmail.nossr50.util.skills.RankUtils;
+import com.gmail.nossr50.core.util.skills.RankUtils;
-import com.gmail.nossr50.util.skills.SkillActivationType;
+import com.gmail.nossr50.core.util.skills.SkillActivationType;
 import net.md_5.bungee.api.chat.TextComponent;
 import org.bukkit.entity.Player;
 
@@ -39,7 +39,8 @@ public class UnarmedCommand extends SkillCommand {
     protected void dataCalculations(Player player, float skillValue) {
         // UNARMED_ARROW_DEFLECT
         if (canDeflect) {
-            String[] deflectStrings = getAbilityDisplayValues(SkillActivationType.RANDOM_LINEAR_100_SCALE_WITH_CAP, player, SubSkillType.UNARMED_ARROW_DEFLECT);;
+            String[] deflectStrings = getAbilityDisplayValues(SkillActivationType.RANDOM_LINEAR_100_SCALE_WITH_CAP, player, SubSkillType.UNARMED_ARROW_DEFLECT);
+            ;
             deflectChance = deflectStrings[0];
             deflectChanceLucky = deflectStrings[1];
         }
@@ -53,7 +54,8 @@ public class UnarmedCommand extends SkillCommand {
 
         // UNARMED_DISARM
         if (canDisarm) {
-            String[] disarmStrings = getAbilityDisplayValues(SkillActivationType.RANDOM_LINEAR_100_SCALE_WITH_CAP, player, SubSkillType.UNARMED_DISARM);;
+            String[] disarmStrings = getAbilityDisplayValues(SkillActivationType.RANDOM_LINEAR_100_SCALE_WITH_CAP, player, SubSkillType.UNARMED_DISARM);
+            ;
             disarmChance = disarmStrings[0];
             disarmChanceLucky = disarmStrings[1];
         }

bukkit/src/main/java/com/gmail/nossr50/commands/skills/WoodcuttingCommand.java

@@ -1,12 +1,12 @@
 package com.gmail.nossr50.commands.skills;
 
-import com.gmail.nossr50.datatypes.skills.PrimarySkillType;
+import com.gmail.nossr50.core.locale.LocaleLoader;
-import com.gmail.nossr50.datatypes.skills.SubSkillType;
+import com.gmail.nossr50.core.skills.PrimarySkillType;
-import com.gmail.nossr50.locale.LocaleLoader;
+import com.gmail.nossr50.core.skills.SubSkillType;
-import com.gmail.nossr50.util.Permissions;
+import com.gmail.nossr50.core.util.Permissions;
-import com.gmail.nossr50.util.TextComponentFactory;
+import com.gmail.nossr50.core.util.TextComponentFactory;
-import com.gmail.nossr50.util.skills.RankUtils;
+import com.gmail.nossr50.core.util.skills.RankUtils;
-import com.gmail.nossr50.util.skills.SkillActivationType;
+import com.gmail.nossr50.core.util.skills.SkillActivationType;
 import net.md_5.bungee.api.chat.TextComponent;
 import org.bukkit.entity.Player;
 
@@ -46,7 +46,8 @@ public class WoodcuttingCommand extends SkillCommand {
     }
 
     private void setDoubleDropClassicChanceStrings(Player player) {
-        String[] doubleDropStrings = getAbilityDisplayValues(SkillActivationType.RANDOM_LINEAR_100_SCALE_WITH_CAP, player, SubSkillType.WOODCUTTING_HARVEST_LUMBER);;
+        String[] doubleDropStrings = getAbilityDisplayValues(SkillActivationType.RANDOM_LINEAR_100_SCALE_WITH_CAP, player, SubSkillType.WOODCUTTING_HARVEST_LUMBER);
+        ;
         doubleDropChance = doubleDropStrings[0];
         doubleDropChanceLucky = doubleDropStrings[1];
     }

bukkit/src/main/java/com/gmail/nossr50/listeners/BlockListener.java

@@ -1,34 +1,34 @@
 package com.gmail.nossr50.listeners;
 
-import com.gmail.nossr50.config.Config;
-import com.gmail.nossr50.config.HiddenConfig;
-import com.gmail.nossr50.config.WorldBlacklist;
 import com.gmail.nossr50.config.experience.ExperienceConfig;
-import com.gmail.nossr50.datatypes.player.McMMOPlayer;
+import com.gmail.nossr50.core.config.MainConfig;
-import com.gmail.nossr50.datatypes.skills.PrimarySkillType;
+import com.gmail.nossr50.core.config.ChunkConversionOptions;
-import com.gmail.nossr50.datatypes.skills.SuperAbilityType;
+import com.gmail.nossr50.core.config.WorldBlacklist;
-import com.gmail.nossr50.datatypes.skills.ToolType;
+import com.gmail.nossr50.core.data.UserManager;
-import com.gmail.nossr50.events.fake.FakeBlockBreakEvent;
+import com.gmail.nossr50.core.datatypes.player.McMMOPlayer;
-import com.gmail.nossr50.events.fake.FakeBlockDamageEvent;
+import com.gmail.nossr50.core.skills.PrimarySkillType;
+import com.gmail.nossr50.core.skills.SuperAbilityType;
+import com.gmail.nossr50.core.skills.ToolType;
+import com.gmail.nossr50.core.skills.child.salvage.Salvage;
+import com.gmail.nossr50.core.skills.primary.alchemy.Alchemy;
+import com.gmail.nossr50.core.skills.primary.excavation.ExcavationManager;
+import com.gmail.nossr50.core.skills.primary.herbalism.Herbalism;
+import com.gmail.nossr50.core.skills.primary.herbalism.HerbalismManager;
+import com.gmail.nossr50.core.skills.primary.mining.MiningManager;
+import com.gmail.nossr50.core.skills.primary.repair.Repair;
+import com.gmail.nossr50.core.skills.primary.woodcutting.WoodcuttingManager;
+import com.gmail.nossr50.core.util.BlockUtils;
+import com.gmail.nossr50.core.util.EventUtils;
+import com.gmail.nossr50.core.util.ItemUtils;
+import com.gmail.nossr50.core.util.Permissions;
+import com.gmail.nossr50.core.util.skills.SkillUtils;
+import com.gmail.nossr50.core.util.sounds.SoundManager;
+import com.gmail.nossr50.core.util.sounds.SoundType;
+import com.gmail.nossr50.core.worldguard.WorldGuardManager;
+import com.gmail.nossr50.core.worldguard.WorldGuardUtils;
+import com.gmail.nossr50.core.events.fake.FakeBlockBreakEvent;
+import com.gmail.nossr50.core.events.fake.FakeBlockDamageEvent;
 import com.gmail.nossr50.mcMMO;
-import com.gmail.nossr50.skills.alchemy.Alchemy;
-import com.gmail.nossr50.skills.excavation.ExcavationManager;
-import com.gmail.nossr50.skills.herbalism.Herbalism;
-import com.gmail.nossr50.skills.herbalism.HerbalismManager;
-import com.gmail.nossr50.skills.mining.MiningManager;
-import com.gmail.nossr50.skills.repair.Repair;
-import com.gmail.nossr50.skills.salvage.Salvage;
-import com.gmail.nossr50.skills.woodcutting.WoodcuttingManager;
-import com.gmail.nossr50.util.BlockUtils;
-import com.gmail.nossr50.util.EventUtils;
-import com.gmail.nossr50.util.ItemUtils;
-import com.gmail.nossr50.util.Permissions;
-import com.gmail.nossr50.util.player.UserManager;
-import com.gmail.nossr50.util.skills.SkillUtils;
-import com.gmail.nossr50.util.sounds.SoundManager;
-import com.gmail.nossr50.util.sounds.SoundType;
-import com.gmail.nossr50.worldguard.WorldGuardManager;
-import com.gmail.nossr50.worldguard.WorldGuardUtils;
 import org.bukkit.GameMode;
 import org.bukkit.Location;
 import org.bukkit.Material;
@@ -62,7 +62,7 @@ public class BlockListener implements Listener {
     @EventHandler(priority = EventPriority.MONITOR, ignoreCancelled = true)
     public void onBlockPistonExtend(BlockPistonExtendEvent event) {
         /* WORLD BLACKLIST CHECK */
-        if(WorldBlacklist.isWorldBlacklisted(event.getBlock().getWorld()))
+        if (WorldBlacklist.isWorldBlacklisted(event.getBlock().getWorld()))
             return;
 
         BlockFace direction = event.getDirection();
@@ -85,7 +85,7 @@ public class BlockListener implements Listener {
     @EventHandler(priority = EventPriority.MONITOR, ignoreCancelled = true)
     public void onBlockPistonRetract(BlockPistonRetractEvent event) {
         /* WORLD BLACKLIST CHECK */
-        if(WorldBlacklist.isWorldBlacklisted(event.getBlock().getWorld()))
+        if (WorldBlacklist.isWorldBlacklisted(event.getBlock().getWorld()))
             return;
 
         // Get opposite direction so we get correct block
@@ -105,14 +105,12 @@ public class BlockListener implements Listener {
      * @param event The event to watch
      */
     @EventHandler(priority = EventPriority.MONITOR, ignoreCancelled = true)
-    public void onEntityBlockFormEvent(EntityBlockFormEvent event)
+    public void onEntityBlockFormEvent(EntityBlockFormEvent event) {
-    {
         /* WORLD BLACKLIST CHECK */
-        if(WorldBlacklist.isWorldBlacklisted(event.getBlock().getWorld()))
+        if (WorldBlacklist.isWorldBlacklisted(event.getBlock().getWorld()))
             return;
 
-        if(BlockUtils.shouldBeWatched(event.getBlock().getState()))
+        if (BlockUtils.shouldBeWatched(event.getBlock().getState())) {
-        {
             mcMMO.getPlaceStore().setTrue(event.getBlock());
         }
     }
@@ -125,14 +123,14 @@ public class BlockListener implements Listener {
     @EventHandler(priority = EventPriority.MONITOR, ignoreCancelled = true)
     public void onFallingBlock(EntityChangeBlockEvent event) {
         /* WORLD BLACKLIST CHECK */
-        if(WorldBlacklist.isWorldBlacklisted(event.getBlock().getWorld()))
+        if (WorldBlacklist.isWorldBlacklisted(event.getBlock().getWorld()))
             return;
 
         if (BlockUtils.shouldBeWatched(event.getBlock().getState()) && event.getEntityType().equals(EntityType.FALLING_BLOCK)) {
             if (event.getTo().equals(Material.AIR) && mcMMO.getPlaceStore().isTrue(event.getBlock())) {
-                event.getEntity().setMetadata("mcMMOBlockFall", new FixedMetadataValue( plugin, event.getBlock().getLocation()));
+                event.getEntity().setMetadata("mcMMOBlockFall", new FixedMetadataValue(plugin, event.getBlock().getLocation()));
             } else {
-                List<MetadataValue> values = event.getEntity().getMetadata( "mcMMOBlockFall" );
+                List<MetadataValue> values = event.getEntity().getMetadata("mcMMOBlockFall");
 
                 if (!values.isEmpty()) {
 
@@ -140,8 +138,8 @@ public class BlockListener implements Listener {
                     Block spawn = ((org.bukkit.Location) values.get(0).value()).getBlock();
 
 
-                    mcMMO.getPlaceStore().setTrue( event.getBlock() );
+                    mcMMO.getPlaceStore().setTrue(event.getBlock());
-                    mcMMO.getPlaceStore().setFalse( spawn );
+                    mcMMO.getPlaceStore().setFalse(spawn);
 
                 }
             }
@@ -156,7 +154,7 @@ public class BlockListener implements Listener {
     @EventHandler(priority = EventPriority.MONITOR)
     public void onBlockPlace(BlockPlaceEvent event) {
         /* WORLD BLACKLIST CHECK */
-        if(WorldBlacklist.isWorldBlacklisted(event.getBlock().getWorld()))
+        if (WorldBlacklist.isWorldBlacklisted(event.getBlock().getWorld()))
             return;
 
         Player player = event.getPlayer();
@@ -178,8 +176,7 @@ public class BlockListener implements Listener {
 
         if (blockState.getType() == Repair.anvilMaterial && PrimarySkillType.REPAIR.getPermissions(player)) {
             mcMMOPlayer.getRepairManager().placedAnvilCheck();
-        }
+        } else if (blockState.getType() == Salvage.anvilMaterial && PrimarySkillType.SALVAGE.getPermissions(player)) {
-        else if (blockState.getType() == Salvage.anvilMaterial && PrimarySkillType.SALVAGE.getPermissions(player)) {
             mcMMOPlayer.getSalvageManager().placedAnvilCheck();
         }
     }
@@ -192,7 +189,7 @@ public class BlockListener implements Listener {
     @EventHandler(priority = EventPriority.MONITOR, ignoreCancelled = true)
     public void onBlockMultiPlace(BlockMultiPlaceEvent event) {
         /* WORLD BLACKLIST CHECK */
-        if(WorldBlacklist.isWorldBlacklisted(event.getBlock().getWorld()))
+        if (WorldBlacklist.isWorldBlacklisted(event.getBlock().getWorld()))
             return;
 
         Player player = event.getPlayer();
@@ -201,8 +198,7 @@ public class BlockListener implements Listener {
             return;
         }
 
-        for (BlockState replacedBlockState : event.getReplacedBlockStates())
+        for (BlockState replacedBlockState : event.getReplacedBlockStates()) {
-        {
             BlockState blockState = replacedBlockState.getBlock().getState();
 
             /* Check if the blocks placed should be monitored so they do not give out XP in the future */
@@ -213,10 +209,9 @@ public class BlockListener implements Listener {
     }
 
     @EventHandler(priority = EventPriority.MONITOR, ignoreCancelled = true)
-    public void onBlockGrow(BlockGrowEvent event)
+    public void onBlockGrow(BlockGrowEvent event) {
-    {
         /* WORLD BLACKLIST CHECK */
-        if(WorldBlacklist.isWorldBlacklisted(event.getBlock().getWorld()))
+        if (WorldBlacklist.isWorldBlacklisted(event.getBlock().getWorld()))
             return;
 
         BlockState blockState = event.getBlock().getState();
@@ -236,13 +231,12 @@ public class BlockListener implements Listener {
     @EventHandler(priority = EventPriority.MONITOR, ignoreCancelled = true)
     public void onBlockBreak(BlockBreakEvent event) {
         /* WORLD BLACKLIST CHECK */
-        if(WorldBlacklist.isWorldBlacklisted(event.getBlock().getWorld()))
+        if (WorldBlacklist.isWorldBlacklisted(event.getBlock().getWorld()))
             return;
 
         /* WORLD GUARD MAIN FLAG CHECK */
-        if(WorldGuardUtils.isWorldGuardLoaded())
+        if (WorldGuardUtils.isWorldGuardLoaded()) {
-        {
+            if (!WorldGuardManager.getInstance().hasMainFlag(event.getPlayer()))
-            if(!WorldGuardManager.getInstance().hasMainFlag(event.getPlayer()))
                 return;
         }
 
@@ -300,8 +294,7 @@ public class BlockListener implements Listener {
             WoodcuttingManager woodcuttingManager = mcMMOPlayer.getWoodcuttingManager();
             if (woodcuttingManager.canUseTreeFeller(heldItem)) {
                 woodcuttingManager.processTreeFeller(blockState);
-            }
+            } else {
-            else {
                 woodcuttingManager.woodcuttingBlockCheck(blockState);
             }
         }
@@ -328,13 +321,12 @@ public class BlockListener implements Listener {
     @EventHandler(priority = EventPriority.HIGHEST, ignoreCancelled = true)
     public void onBlockBreakHigher(BlockBreakEvent event) {
         /* WORLD BLACKLIST CHECK */
-        if(WorldBlacklist.isWorldBlacklisted(event.getBlock().getWorld()))
+        if (WorldBlacklist.isWorldBlacklisted(event.getBlock().getWorld()))
             return;
 
         /* WORLD GUARD MAIN FLAG CHECK */
-        if(WorldGuardUtils.isWorldGuardLoaded())
+        if (WorldGuardUtils.isWorldGuardLoaded()) {
-        {
+            if (!WorldGuardManager.getInstance().hasMainFlag(event.getPlayer()))
-            if(!WorldGuardManager.getInstance().hasMainFlag(event.getPlayer()))
                 return;
         }
 
@@ -363,8 +355,7 @@ public class BlockListener implements Listener {
                 if (herbalismManager.processHylianLuck(blockState)) {
                     blockState.update(true);
                     event.setCancelled(true);
-                }
+                } else if (blockState.getType() == Material.FLOWER_POT) {
-                else if (blockState.getType() == Material.FLOWER_POT) {
                     blockState.setType(Material.AIR);
                     blockState.update(true);
                     event.setCancelled(true);
@@ -394,13 +385,12 @@ public class BlockListener implements Listener {
         BlockState blockState = event.getBlock().getState();
 
         /* WORLD BLACKLIST CHECK */
-        if(WorldBlacklist.isWorldBlacklisted(event.getBlock().getWorld()))
+        if (WorldBlacklist.isWorldBlacklisted(event.getBlock().getWorld()))
             return;
 
         /* WORLD GUARD MAIN FLAG CHECK */
-        if(WorldGuardUtils.isWorldGuardLoaded())
+        if (WorldGuardUtils.isWorldGuardLoaded()) {
-        {
+            if (!WorldGuardManager.getInstance().hasMainFlag(event.getPlayer()))
-            if(!WorldGuardManager.getInstance().hasMainFlag(event.getPlayer()))
                 return;
         }
 
@@ -423,17 +413,13 @@ public class BlockListener implements Listener {
 
             if (mcMMOPlayer.getToolPreparationMode(ToolType.HOE) && ItemUtils.isHoe(heldItem) && (BlockUtils.affectedByGreenTerra(blockState) || BlockUtils.canMakeMossy(blockState)) && Permissions.greenTerra(player)) {
                 mcMMOPlayer.checkAbilityActivation(PrimarySkillType.HERBALISM);
-            }
+            } else if (mcMMOPlayer.getToolPreparationMode(ToolType.AXE) && ItemUtils.isAxe(heldItem) && BlockUtils.isLog(blockState) && Permissions.treeFeller(player)) {
-            else if (mcMMOPlayer.getToolPreparationMode(ToolType.AXE) && ItemUtils.isAxe(heldItem) && BlockUtils.isLog(blockState) && Permissions.treeFeller(player)) {
                 mcMMOPlayer.checkAbilityActivation(PrimarySkillType.WOODCUTTING);
-            }
+            } else if (mcMMOPlayer.getToolPreparationMode(ToolType.PICKAXE) && ItemUtils.isPickaxe(heldItem) && BlockUtils.affectedBySuperBreaker(blockState) && Permissions.superBreaker(player)) {
-            else if (mcMMOPlayer.getToolPreparationMode(ToolType.PICKAXE) && ItemUtils.isPickaxe(heldItem) && BlockUtils.affectedBySuperBreaker(blockState) && Permissions.superBreaker(player)) {
                 mcMMOPlayer.checkAbilityActivation(PrimarySkillType.MINING);
-            }
+            } else if (mcMMOPlayer.getToolPreparationMode(ToolType.SHOVEL) && ItemUtils.isShovel(heldItem) && BlockUtils.affectedByGigaDrillBreaker(blockState) && Permissions.gigaDrillBreaker(player)) {
-            else if (mcMMOPlayer.getToolPreparationMode(ToolType.SHOVEL) && ItemUtils.isShovel(heldItem) && BlockUtils.affectedByGigaDrillBreaker(blockState) && Permissions.gigaDrillBreaker(player)) {
                 mcMMOPlayer.checkAbilityActivation(PrimarySkillType.EXCAVATION);
-            }
+            } else if (mcMMOPlayer.getToolPreparationMode(ToolType.FISTS) && heldItem.getType() == Material.AIR && (BlockUtils.affectedByGigaDrillBreaker(blockState) || blockState.getType() == Material.SNOW || BlockUtils.affectedByBlockCracker(blockState) && Permissions.berserk(player))) {
-            else if (mcMMOPlayer.getToolPreparationMode(ToolType.FISTS) && heldItem.getType() == Material.AIR && (BlockUtils.affectedByGigaDrillBreaker(blockState) || blockState.getType() == Material.SNOW || BlockUtils.affectedByBlockCracker(blockState) && Permissions.berserk(player))) {
                 mcMMOPlayer.checkAbilityActivation(PrimarySkillType.UNARMED);
             }
         }
@@ -443,7 +429,7 @@ public class BlockListener implements Listener {
          *
          * We don't need to check permissions here because they've already been checked for the ability to even activate.
          */
-        if (mcMMOPlayer.getAbilityMode(SuperAbilityType.TREE_FELLER) && BlockUtils.isLog(blockState) && Config.getInstance().getTreeFellerSoundsEnabled()) {
+        if (mcMMOPlayer.getAbilityMode(SuperAbilityType.TREE_FELLER) && BlockUtils.isLog(blockState) && MainConfig.getInstance().getTreeFellerSoundsEnabled()) {
             SoundManager.sendSound(player, blockState.getLocation(), SoundType.FIZZ);
         }
     }
@@ -466,13 +452,12 @@ public class BlockListener implements Listener {
     @EventHandler(priority = EventPriority.HIGHEST, ignoreCancelled = true)
     public void onBlockDamageHigher(BlockDamageEvent event) {
         /* WORLD BLACKLIST CHECK */
-        if(WorldBlacklist.isWorldBlacklisted(event.getBlock().getWorld()))
+        if (WorldBlacklist.isWorldBlacklisted(event.getBlock().getWorld()))
             return;
 
         /* WORLD GUARD MAIN FLAG CHECK */
-        if(WorldGuardUtils.isWorldGuardLoaded())
+        if (WorldGuardUtils.isWorldGuardLoaded()) {
-        {
+            if (!WorldGuardManager.getInstance().hasMainFlag(event.getPlayer()))
-            if(!WorldGuardManager.getInstance().hasMainFlag(event.getPlayer()))
                 return;
         }
 
@@ -500,19 +485,16 @@ public class BlockListener implements Listener {
             if (mcMMOPlayer.getHerbalismManager().processGreenTerra(blockState)) {
                 blockState.update(true);
             }
-        }
+        } else if (mcMMOPlayer.getAbilityMode(SuperAbilityType.BERSERK) && heldItem.getType() == Material.AIR) {
-        else if (mcMMOPlayer.getAbilityMode(SuperAbilityType.BERSERK) && heldItem.getType() == Material.AIR) {
             if (SuperAbilityType.BERSERK.blockCheck(block.getState()) && EventUtils.simulateBlockBreak(block, player, true)) {
                 event.setInstaBreak(true);
                 SoundManager.sendSound(player, block.getLocation(), SoundType.POP);
-            }
+            } else if (mcMMOPlayer.getUnarmedManager().canUseBlockCracker() && BlockUtils.affectedByBlockCracker(blockState) && EventUtils.simulateBlockBreak(block, player, true)) {
-            else if (mcMMOPlayer.getUnarmedManager().canUseBlockCracker() && BlockUtils.affectedByBlockCracker(blockState) && EventUtils.simulateBlockBreak(block, player, true)) {
                 if (mcMMOPlayer.getUnarmedManager().blockCrackerCheck(blockState)) {
                     blockState.update();
                 }
             }
-        }
+        } else if (mcMMOPlayer.getWoodcuttingManager().canUseLeafBlower(heldItem) && BlockUtils.isLeaves(blockState) && EventUtils.simulateBlockBreak(block, player, true)) {
-        else if (mcMMOPlayer.getWoodcuttingManager().canUseLeafBlower(heldItem) && BlockUtils.isLeaves(blockState) && EventUtils.simulateBlockBreak(block, player, true)) {
             event.setInstaBreak(true);
             SoundManager.sendSound(player, block.getLocation(), SoundType.POP);
         }
@@ -532,52 +514,45 @@ public class BlockListener implements Listener {
     }
 
     public void debugStickDump(Player player, BlockState blockState) {
-        if(player.getInventory().getItemInMainHand().getType() == Material.DEBUG_STICK)
+        if (player.getInventory().getItemInMainHand().getType() == Material.DEBUG_STICK) {
-        {
+            if (mcMMO.getPlaceStore().isTrue(blockState))
-            if(mcMMO.getPlaceStore().isTrue(blockState))
                 player.sendMessage("[mcMMO DEBUG] This block is not natural and does not reward treasures/XP");
-            else
+            else {
-            {
                 player.sendMessage("[mcMMO DEBUG] This block is considered natural by mcMMO");
                 UserManager.getPlayer(player).getExcavationManager().printExcavationDebug(player, blockState);
             }
 
-            if(WorldGuardUtils.isWorldGuardLoaded())
+            if (WorldGuardUtils.isWorldGuardLoaded()) {
-            {
+                if (WorldGuardManager.getInstance().hasMainFlag(player))
-                if(WorldGuardManager.getInstance().hasMainFlag(player))
                     player.sendMessage("[mcMMO DEBUG] World Guard main flag is permitted for this player in this region");
                 else
                     player.sendMessage("[mcMMO DEBUG] World Guard main flag is DENIED for this player in this region");
 
-                if(WorldGuardManager.getInstance().hasXPFlag(player))
+                if (WorldGuardManager.getInstance().hasXPFlag(player))
                     player.sendMessage("[mcMMO DEBUG] World Guard xp flag is permitted for this player in this region");
                 else
                     player.sendMessage("[mcMMO DEBUG] World Guard xp flag is not permitted for this player in this region");
             }
 
-            if(blockState instanceof Furnace)
+            if (blockState instanceof Furnace) {
-            {
                 Furnace furnace = (Furnace) blockState;
-                if(furnace.hasMetadata(mcMMO.furnaceMetadataKey))
+                if (furnace.hasMetadata(mcMMO.furnaceMetadataKey)) {
-                {
                     player.sendMessage("[mcMMO DEBUG] This furnace has a registered owner");
                     Player furnacePlayer = getPlayerFromFurnace(furnace.getBlock());
-                    if(furnacePlayer != null)
+                    if (furnacePlayer != null) {
-                    {
+                        player.sendMessage("[mcMMO DEBUG] This furnace is owned by player " + furnacePlayer.getName());
-                        player.sendMessage("[mcMMO DEBUG] This furnace is owned by player "+furnacePlayer.getName());
                     }
-                }
+                } else
-                else
                     player.sendMessage("[mcMMO DEBUG] This furnace does not have a registered owner");
             }
 
-            if(ExperienceConfig.getInstance().isExperienceBarsEnabled())
+            if (ExperienceConfig.getInstance().isExperienceBarsEnabled())
                 player.sendMessage("[mcMMO DEBUG] XP bars are enabled, however you should check per-skill settings to make sure those are enabled.");
         }
     }
 
     public void cleanupAbilityTools(Player player, McMMOPlayer mcMMOPlayer, BlockState blockState, ItemStack heldItem) {
-        if (HiddenConfig.getInstance().useEnchantmentBuffs()) {
+        if (ChunkConversionOptions.getInstance().useEnchantmentBuffs()) {
             if ((ItemUtils.isPickaxe(heldItem) && !mcMMOPlayer.getAbilityMode(SuperAbilityType.SUPER_BREAKER)) || (ItemUtils.isShovel(heldItem) && !mcMMOPlayer.getAbilityMode(SuperAbilityType.GIGA_DRILL_BREAKER))) {
                 SkillUtils.removeAbilityBuff(heldItem);
             }

bukkit/src/main/java/com/gmail/nossr50/listeners/EntityListener.java

@@ -1,31 +1,31 @@
 package com.gmail.nossr50.listeners;
 
-import com.gmail.nossr50.config.AdvancedConfig;
+import com.gmail.nossr50.core.config.experience.ExperienceConfig;
-import com.gmail.nossr50.config.Config;
+import com.gmail.nossr50.core.config.AdvancedConfig;
-import com.gmail.nossr50.config.WorldBlacklist;
+import com.gmail.nossr50.core.config.MainConfig;
-import com.gmail.nossr50.config.experience.ExperienceConfig;
+import com.gmail.nossr50.core.config.WorldBlacklist;
-import com.gmail.nossr50.datatypes.meta.OldName;
+import com.gmail.nossr50.core.data.UserManager;
-import com.gmail.nossr50.datatypes.player.McMMOPlayer;
+import com.gmail.nossr50.core.datatypes.meta.OldName;
-import com.gmail.nossr50.datatypes.skills.SubSkillType;
+import com.gmail.nossr50.core.datatypes.player.McMMOPlayer;
-import com.gmail.nossr50.datatypes.skills.subskills.interfaces.InteractType;
+import com.gmail.nossr50.core.party.PartyManager;
-import com.gmail.nossr50.events.fake.FakeEntityDamageByEntityEvent;
+import com.gmail.nossr50.core.skills.SubSkillType;
-import com.gmail.nossr50.events.fake.FakeEntityDamageEvent;
+import com.gmail.nossr50.core.skills.primary.archery.Archery;
-import com.gmail.nossr50.events.fake.FakeEntityTameEvent;
+import com.gmail.nossr50.core.skills.primary.fishing.Fishing;
+import com.gmail.nossr50.core.skills.primary.mining.BlastMining;
+import com.gmail.nossr50.core.skills.primary.mining.MiningManager;
+import com.gmail.nossr50.core.skills.primary.taming.Taming;
+import com.gmail.nossr50.core.skills.primary.taming.TamingManager;
+import com.gmail.nossr50.core.skills.subskills.interfaces.InteractType;
+import com.gmail.nossr50.core.util.BlockUtils;
+import com.gmail.nossr50.core.util.Misc;
+import com.gmail.nossr50.core.util.Permissions;
+import com.gmail.nossr50.core.util.skills.CombatUtils;
+import com.gmail.nossr50.core.worldguard.WorldGuardManager;
+import com.gmail.nossr50.core.worldguard.WorldGuardUtils;
+import com.gmail.nossr50.core.events.fake.FakeEntityDamageByEntityEvent;
+import com.gmail.nossr50.core.events.fake.FakeEntityDamageEvent;
+import com.gmail.nossr50.core.events.fake.FakeEntityTameEvent;
 import com.gmail.nossr50.mcMMO;
-import com.gmail.nossr50.party.PartyManager;
-import com.gmail.nossr50.skills.archery.Archery;
-import com.gmail.nossr50.skills.fishing.Fishing;
-import com.gmail.nossr50.skills.mining.BlastMining;
-import com.gmail.nossr50.skills.mining.MiningManager;
-import com.gmail.nossr50.skills.taming.Taming;
-import com.gmail.nossr50.skills.taming.TamingManager;
-import com.gmail.nossr50.util.BlockUtils;
-import com.gmail.nossr50.util.Misc;
-import com.gmail.nossr50.util.Permissions;
-import com.gmail.nossr50.util.player.UserManager;
-import com.gmail.nossr50.util.skills.CombatUtils;
-import com.gmail.nossr50.worldguard.WorldGuardManager;
-import com.gmail.nossr50.worldguard.WorldGuardUtils;
 import org.bukkit.Material;
 import org.bukkit.OfflinePlayer;
 import org.bukkit.block.Block;
@@ -55,15 +55,13 @@ public class EntityListener implements Listener {
     }
 
     @EventHandler(priority = EventPriority.MONITOR, ignoreCancelled = true)
-    public void onEntityTargetEntity(EntityTargetLivingEntityEvent event)
+    public void onEntityTargetEntity(EntityTargetLivingEntityEvent event) {
-    {
+        if (!ExperienceConfig.getInstance().isEndermanEndermiteFarmingPrevented())
-        if(!ExperienceConfig.getInstance().isEndermanEndermiteFarmingPrevented())
             return;
 
         //Prevent entities from giving XP if they target endermite
-        if(event.getTarget() instanceof Endermite)
+        if (event.getTarget() instanceof Endermite) {
-        {
+            if (event.getEntity().getMetadata(mcMMO.entityMetadataKey) == null || event.getEntity().getMetadata(mcMMO.entityMetadataKey).size() <= 0)
-            if(event.getEntity().getMetadata(mcMMO.entityMetadataKey) == null || event.getEntity().getMetadata(mcMMO.entityMetadataKey).size() <= 0)
                 event.getEntity().setMetadata(mcMMO.entityMetadataKey, mcMMO.metadataValue);
         }
     }
@@ -71,17 +69,15 @@ public class EntityListener implements Listener {
     @EventHandler(priority = EventPriority.MONITOR, ignoreCancelled = true)
     public void onEntityShootBow(EntityShootBowEvent event) {
         /* WORLD BLACKLIST CHECK */
-        if(WorldBlacklist.isWorldBlacklisted(event.getEntity().getWorld()))
+        if (WorldBlacklist.isWorldBlacklisted(event.getEntity().getWorld()))
             return;
 
-        if(event.getEntity() instanceof Player)
+        if (event.getEntity() instanceof Player) {
-        {
             Player player = (Player) event.getEntity();
 
             /* WORLD GUARD MAIN FLAG CHECK */
-            if(WorldGuardUtils.isWorldGuardLoaded())
+            if (WorldGuardUtils.isWorldGuardLoaded()) {
-            {
+                if (!WorldGuardManager.getInstance().hasMainFlag(player))
-                if(!WorldGuardManager.getInstance().hasMainFlag(player))
                     return;
             }
         }
@@ -105,17 +101,15 @@ public class EntityListener implements Listener {
     @EventHandler(priority = EventPriority.MONITOR, ignoreCancelled = true)
     public void onProjectileLaunch(ProjectileLaunchEvent event) {
         /* WORLD BLACKLIST CHECK */
-        if(WorldBlacklist.isWorldBlacklisted(event.getEntity().getWorld()))
+        if (WorldBlacklist.isWorldBlacklisted(event.getEntity().getWorld()))
             return;
 
-        if(event.getEntity() instanceof Player)
+        if (event.getEntity() instanceof Player) {
-        {
             Player player = (Player) event.getEntity();
 
             /* WORLD GUARD MAIN FLAG CHECK */
-            if(WorldGuardUtils.isWorldGuardLoaded())
+            if (WorldGuardUtils.isWorldGuardLoaded()) {
-            {
+                if (!WorldGuardManager.getInstance().hasMainFlag(player))
-                if(!WorldGuardManager.getInstance().hasMainFlag(player))
                     return;
             }
         }
@@ -133,13 +127,12 @@ public class EntityListener implements Listener {
     /**
      * Monitor EntityChangeBlock events.
      *
-     * @param event
+     * @param event The event to watch
-     *            The event to watch
      */
     @EventHandler(priority = EventPriority.MONITOR, ignoreCancelled = true)
     public void onEntityChangeBlock(EntityChangeBlockEvent event) {
         /* WORLD BLACKLIST CHECK */
-        if(WorldBlacklist.isWorldBlacklisted(event.getEntity().getWorld()))
+        if (WorldBlacklist.isWorldBlacklisted(event.getEntity().getWorld()))
             return;
 
         Block block = event.getBlock();
@@ -159,14 +152,12 @@ public class EntityListener implements Listener {
             if (mcMMO.getPlaceStore().isTrue(block) && !isTracked) {
                 mcMMO.getPlaceStore().setFalse(block);
                 entity.setMetadata(mcMMO.entityMetadataKey, mcMMO.metadataValue);
-            }
+            } else if (isTracked) {
-            else if (isTracked) {
                 mcMMO.getPlaceStore().setTrue(block);
             }
         } else if ((block.getType() == Material.REDSTONE_ORE)) {
             return;
-        }
+        } else {
-        else {
             if (mcMMO.getPlaceStore().isTrue(block)) {
                 mcMMO.getPlaceStore().setFalse(block);
             }
@@ -176,13 +167,12 @@ public class EntityListener implements Listener {
     /**
      * Handle EntityDamageByEntity events that involve modifying the event.
      *
-     * @param event
+     * @param event The event to watch
-     *            The event to watch
      */
     @EventHandler(priority = EventPriority.HIGHEST, ignoreCancelled = true)
     public void onEntityDamageByEntity(EntityDamageByEntityEvent event) {
         /* WORLD BLACKLIST CHECK */
-        if(WorldBlacklist.isWorldBlacklisted(event.getEntity().getWorld()))
+        if (WorldBlacklist.isWorldBlacklisted(event.getEntity().getWorld()))
             return;
 
         if (event instanceof FakeEntityDamageByEntityEvent) {
@@ -193,8 +183,7 @@ public class EntityListener implements Listener {
             return;
         }
 
-        if (event.getDamager().hasMetadata(mcMMO.funfettiMetadataKey))
+        if (event.getDamager().hasMetadata(mcMMO.funfettiMetadataKey)) {
-        {
             event.setCancelled(true);
             return;
         }
@@ -203,14 +192,12 @@ public class EntityListener implements Listener {
         Entity defender = event.getEntity();
         Entity attacker = event.getDamager();
 
-        if(attacker instanceof Player)
+        if (attacker instanceof Player) {
-        {
             Player player = (Player) attacker;
 
             /* WORLD GUARD MAIN FLAG CHECK */
-            if(WorldGuardUtils.isWorldGuardLoaded())
+            if (WorldGuardUtils.isWorldGuardLoaded()) {
-            {
+                if (!WorldGuardManager.getInstance().hasMainFlag(player))
-                if(!WorldGuardManager.getInstance().hasMainFlag(player))
                     return;
             }
         }
@@ -221,7 +208,7 @@ public class EntityListener implements Listener {
                 Player attackingPlayer = (Player) attacker;
                 if (event.getDamage(DamageModifier.ABSORPTION) > 0) {
                     //If friendly fire is off don't allow players to hurt one another
-                    if(!Config.getInstance().getPartyFriendlyFire())
+                    if (!MainConfig.getInstance().getPartyFriendlyFire())
                         if ((PartyManager.inSameParty(defendingPlayer, attackingPlayer) || PartyManager.areAllies(defendingPlayer, attackingPlayer)) && !(Permissions.friendlyFire(attackingPlayer) && Permissions.friendlyFire(defendingPlayer))) {
                             event.setCancelled(true);
                             return;
@@ -252,7 +239,6 @@ public class EntityListener implements Listener {
         }
 
 
-
         if (Misc.isNPCEntity(attacker)) {
             return;
         }
@@ -263,15 +249,13 @@ public class EntityListener implements Listener {
             if (projectileSource instanceof LivingEntity) {
                 attacker = (LivingEntity) projectileSource;
             }
-        }
+        } else if (attacker instanceof Tameable) {
-        else if (attacker instanceof Tameable) {
             AnimalTamer animalTamer = ((Tameable) attacker).getOwner();
 
             if (animalTamer != null && ((OfflinePlayer) animalTamer).isOnline()) {
                 attacker = (Entity) animalTamer;
             }
-        }
+        } else if (attacker instanceof TNTPrimed && defender instanceof Player) {
-        else if (attacker instanceof TNTPrimed && defender instanceof Player) {
             if (BlastMining.processBlastMiningExplosion(event, (TNTPrimed) attacker, (Player) defender)) {
                 return;
             }
@@ -292,7 +276,7 @@ public class EntityListener implements Listener {
             }
 
             //Party Friendly Fire
-            if(!Config.getInstance().getPartyFriendlyFire())
+            if (!MainConfig.getInstance().getPartyFriendlyFire())
                 if ((PartyManager.inSameParty(defendingPlayer, attackingPlayer) || PartyManager.areAllies(defendingPlayer, attackingPlayer)) && !(Permissions.friendlyFire(attackingPlayer) && Permissions.friendlyFire(defendingPlayer))) {
                     event.setCancelled(true);
                     return;
@@ -305,17 +289,14 @@ public class EntityListener implements Listener {
         /**
          * This sets entity names back to whatever they are supposed to be
          */
-        if(!(attacker instanceof Player) && defender instanceof Player)
+        if (!(attacker instanceof Player) && defender instanceof Player) {
-        {
+            if (event.getFinalDamage() >= ((LivingEntity) defender).getHealth()) {
-            if(event.getFinalDamage() >= ((LivingEntity) defender).getHealth())
-            {
                 List<MetadataValue> metadataValue = attacker.getMetadata("mcMMO_oldName");
 
-                if(metadataValue.size() <= 0)
+                if (metadataValue.size() <= 0)
                     return;
 
-                if(metadataValue != null)
+                if (metadataValue != null) {
-                {
                     OldName oldName = (OldName) metadataValue.get(0);
                     attacker.setCustomName(oldName.asString());
                     attacker.setCustomNameVisible(false);
@@ -327,22 +308,19 @@ public class EntityListener implements Listener {
     /**
      * Handle EntityDamage events that involve modifying the event.
      *
-     * @param event
+     * @param event The event to modify
-     *            The event to modify
      */
     @EventHandler(priority = EventPriority.HIGHEST, ignoreCancelled = true)
     public void onEntityDamage(EntityDamageEvent event) {
         /* WORLD BLACKLIST CHECK */
-        if(WorldBlacklist.isWorldBlacklisted(event.getEntity().getWorld()))
+        if (WorldBlacklist.isWorldBlacklisted(event.getEntity().getWorld()))
             return;
 
-        if(event.getEntity() instanceof Player)
+        if (event.getEntity() instanceof Player) {
-        {
             Player player = (Player) event.getEntity();
             /* WORLD GUARD MAIN FLAG CHECK */
-            if(WorldGuardUtils.isWorldGuardLoaded())
+            if (WorldGuardUtils.isWorldGuardLoaded()) {
-            {
+                if (!WorldGuardManager.getInstance().hasMainFlag(player))
-                if(!WorldGuardManager.getInstance().hasMainFlag(player))
                     return;
             }
         }
@@ -408,19 +386,15 @@ public class EntityListener implements Listener {
                 mcMMOPlayer.actualizeRecentlyHurt();
             }
 
-        }
+        } else if (livingEntity instanceof Tameable) {
-
-        else if (livingEntity instanceof Tameable) {
             Tameable pet = (Tameable) livingEntity;
             AnimalTamer owner = pet.getOwner();
 
-            if(owner instanceof Player)
+            if (owner instanceof Player) {
-            {
                 Player player = (Player) owner;
                 /* WORLD GUARD MAIN FLAG CHECK */
-                if(WorldGuardUtils.isWorldGuardLoaded())
+                if (WorldGuardUtils.isWorldGuardLoaded()) {
-                {
+                    if (!WorldGuardManager.getInstance().hasMainFlag(player))
-                    if(!WorldGuardManager.getInstance().hasMainFlag(player))
                         return;
                 }
             }
@@ -493,13 +467,12 @@ public class EntityListener implements Listener {
     /**
      * Monitor EntityDeath events.
      *
-     * @param event
+     * @param event The event to watch
-     *            The event to watch
      */
     @EventHandler(priority = EventPriority.LOWEST)
     public void onEntityDeathLowest(EntityDeathEvent event) {
         /* WORLD BLACKLIST CHECK */
-        if(WorldBlacklist.isWorldBlacklisted(event.getEntity().getWorld()))
+        if (WorldBlacklist.isWorldBlacklisted(event.getEntity().getWorld()))
             return;
 
         LivingEntity entity = event.getEntity();
@@ -526,13 +499,12 @@ public class EntityListener implements Listener {
     /**
      * Monitor EntityDeath events.
      *
-     * @param event
+     * @param event The event to watch
-     *            The event to watch
      */
     @EventHandler(priority = EventPriority.MONITOR)
     public void onEntityDeath(EntityDeathEvent event) {
         /* WORLD BLACKLIST CHECK */
-        if(WorldBlacklist.isWorldBlacklisted(event.getEntity().getWorld()))
+        if (WorldBlacklist.isWorldBlacklisted(event.getEntity().getWorld()))
             return;
 
         LivingEntity entity = event.getEntity();
@@ -547,13 +519,12 @@ public class EntityListener implements Listener {
     /**
      * Monitor CreatureSpawn events.
      *
-     * @param event
+     * @param event The event to watch
-     *            The event to watch
      */
     @EventHandler(priority = EventPriority.MONITOR, ignoreCancelled = true)
     public void onCreatureSpawn(CreatureSpawnEvent event) {
         /* WORLD BLACKLIST CHECK */
-        if(WorldBlacklist.isWorldBlacklisted(event.getEntity().getWorld()))
+        if (WorldBlacklist.isWorldBlacklisted(event.getEntity().getWorld()))
             return;
 
         LivingEntity entity = event.getEntity();
@@ -583,13 +554,12 @@ public class EntityListener implements Listener {
     /**
      * Handle ExplosionPrime events that involve modifying the event.
      *
-     * @param event
+     * @param event The event to modify
-     *            The event to modify
      */
     @EventHandler(priority = EventPriority.HIGHEST, ignoreCancelled = true)
     public void onExplosionPrime(ExplosionPrimeEvent event) {
         /* WORLD BLACKLIST CHECK */
-        if(WorldBlacklist.isWorldBlacklisted(event.getEntity().getWorld()))
+        if (WorldBlacklist.isWorldBlacklisted(event.getEntity().getWorld()))
             return;
 
         Entity entity = event.getEntity();
@@ -607,9 +577,8 @@ public class EntityListener implements Listener {
         }
 
         /* WORLD GUARD MAIN FLAG CHECK */
-        if(WorldGuardUtils.isWorldGuardLoaded())
+        if (WorldGuardUtils.isWorldGuardLoaded()) {
-        {
+            if (!WorldGuardManager.getInstance().hasMainFlag(player))
-            if(!WorldGuardManager.getInstance().hasMainFlag(player))
                 return;
         }
 
@@ -623,13 +592,12 @@ public class EntityListener implements Listener {
     /**
      * Handle EntityExplode events that involve modifying the event.
      *
-     * @param event
+     * @param event The event to modify
-     *            The event to modify
      */
     @EventHandler(priority = EventPriority.HIGHEST, ignoreCancelled = true)
     public void onEnitityExplode(EntityExplodeEvent event) {
         /* WORLD BLACKLIST CHECK */
-        if(WorldBlacklist.isWorldBlacklisted(event.getEntity().getWorld()))
+        if (WorldBlacklist.isWorldBlacklisted(event.getEntity().getWorld()))
             return;
 
         Entity entity = event.getEntity();
@@ -647,9 +615,8 @@ public class EntityListener implements Listener {
         }
 
         /* WORLD GUARD MAIN FLAG CHECK */
-        if(WorldGuardUtils.isWorldGuardLoaded())
+        if (WorldGuardUtils.isWorldGuardLoaded()) {
-        {
+            if (!WorldGuardManager.getInstance().hasMainFlag(player))
-            if(!WorldGuardManager.getInstance().hasMainFlag(player))
                 return;
         }
 
@@ -664,13 +631,12 @@ public class EntityListener implements Listener {
     /**
      * Handle EntityExplode events that involve modifying the event.
      *
-     * @param event
+     * @param event The event to modify
-     *            The event to modify
      */
     @EventHandler(priority = EventPriority.LOWEST, ignoreCancelled = true)
     public void onEntityExplodeMonitor(EntityExplodeEvent event) {
         /* WORLD BLACKLIST CHECK */
-        if(WorldBlacklist.isWorldBlacklisted(event.getEntity().getWorld()))
+        if (WorldBlacklist.isWorldBlacklisted(event.getEntity().getWorld()))
             return;
 
         Entity entity = event.getEntity();
@@ -685,13 +651,12 @@ public class EntityListener implements Listener {
     /**
      * Handle FoodLevelChange events that involve modifying the event.
      *
-     * @param event
+     * @param event The event to modify
-     *            The event to modify
      */
     @EventHandler(priority = EventPriority.LOW, ignoreCancelled = true)
     public void onFoodLevelChange(FoodLevelChangeEvent event) {
         /* WORLD BLACKLIST CHECK */
-        if(WorldBlacklist.isWorldBlacklisted(event.getEntity().getWorld()))
+        if (WorldBlacklist.isWorldBlacklisted(event.getEntity().getWorld()))
             return;
 
         Entity entity = event.getEntity();
@@ -703,9 +668,8 @@ public class EntityListener implements Listener {
         Player player = (Player) entity;
 
         /* WORLD GUARD MAIN FLAG CHECK */
-        if(WorldGuardUtils.isWorldGuardLoaded())
+        if (WorldGuardUtils.isWorldGuardLoaded()) {
-        {
+            if (!WorldGuardManager.getInstance().hasMainFlag(player))
-            if(!WorldGuardManager.getInstance().hasMainFlag(player))
                 return;
         }
 
@@ -728,27 +692,27 @@ public class EntityListener implements Listener {
          */
         switch (player.getInventory().getItemInMainHand().getType()) {
             case BAKED_POTATO: /*
-                                * RESTORES 3 HUNGER - RESTORES 5 1/2 HUNGER @
+             * RESTORES 3 HUNGER - RESTORES 5 1/2 HUNGER @
-                                * 1000
+             * 1000
-                                */
+             */
             case BEETROOT:
             case BREAD: /* RESTORES 2 1/2 HUNGER - RESTORES 5 HUNGER @ 1000 */
             case CARROT: /*
-                               * RESTORES 2 HUNGER - RESTORES 4 1/2 HUNGER @
+             * RESTORES 2 HUNGER - RESTORES 4 1/2 HUNGER @
-                               * 1000
+             * 1000
-                               */
+             */
             case GOLDEN_CARROT: /*
-                                 * RESTORES 3 HUNGER - RESTORES 5 1/2 HUNGER @
+             * RESTORES 3 HUNGER - RESTORES 5 1/2 HUNGER @
-                                 * 1000
+             * 1000
-                                 */
+             */
             case MUSHROOM_STEW: /*
-                                 * RESTORES 4 HUNGER - RESTORES 6 1/2 HUNGER @
+             * RESTORES 4 HUNGER - RESTORES 6 1/2 HUNGER @
-                                 * 1000
+             * 1000
-                                 */
+             */
             case PUMPKIN_PIE: /*
-                               * RESTORES 4 HUNGER - RESTORES 6 1/2 HUNGER @
+             * RESTORES 4 HUNGER - RESTORES 6 1/2 HUNGER @
-                               * 1000
+             * 1000
-                               */
+             */
                 if (Permissions.isSubSkillEnabled(player, SubSkillType.HERBALISM_FARMERS_DIET)) {
                     event.setFoodLevel(UserManager.getPlayer(player).getHerbalismManager().farmersDiet(newFoodLevel));
                 }
@@ -757,9 +721,9 @@ public class EntityListener implements Listener {
             case COOKIE: /* RESTORES 1/2 HUNGER - RESTORES 2 HUNGER @ 1000 */
             case MELON_SLICE: /* RESTORES 1 HUNGER - RESTORES 2 1/2 HUNGER @ 1000 */
             case POISONOUS_POTATO: /*
-                                    * RESTORES 1 HUNGER - RESTORES 2 1/2 HUNGER
+             * RESTORES 1 HUNGER - RESTORES 2 1/2 HUNGER
-                                    * @ 1000
+             * @ 1000
-                                    */
+             */
             case POTATO: /* RESTORES 1/2 HUNGER - RESTORES 2 HUNGER @ 1000 */
                 if (Permissions.isSubSkillEnabled(player, SubSkillType.HERBALISM_FARMERS_DIET)) {
                     event.setFoodLevel(UserManager.getPlayer(player).getHerbalismManager().farmersDiet(newFoodLevel));
@@ -767,9 +731,9 @@ public class EntityListener implements Listener {
                 return;
 
             case COOKED_SALMON: /*
-                               * RESTORES 2 1/2 HUNGER - RESTORES 5 HUNGER @
+             * RESTORES 2 1/2 HUNGER - RESTORES 5 HUNGER @
-                               * 1000
+             * 1000
-                               */
+             */
                 if (Permissions.isSubSkillEnabled(player, SubSkillType.FISHING_FISHERMANS_DIET)) {
                     event.setFoodLevel(UserManager.getPlayer(player).getFishingManager().handleFishermanDiet(Fishing.fishermansDietRankLevel1, newFoodLevel));
                 }
@@ -789,13 +753,12 @@ public class EntityListener implements Listener {
     /**
      * Monitor EntityTame events.
      *
-     * @param event
+     * @param event The event to watch
-     *            The event to watch
      */
     @EventHandler(priority = EventPriority.MONITOR, ignoreCancelled = true)
     public void onEntityTame(EntityTameEvent event) {
         /* WORLD BLACKLIST CHECK */
-        if(WorldBlacklist.isWorldBlacklisted(event.getEntity().getWorld()))
+        if (WorldBlacklist.isWorldBlacklisted(event.getEntity().getWorld()))
             return;
 
         if (event instanceof FakeEntityTameEvent) {
@@ -805,9 +768,8 @@ public class EntityListener implements Listener {
         Player player = (Player) event.getOwner();
 
         /* WORLD GUARD MAIN FLAG CHECK */
-        if(WorldGuardUtils.isWorldGuardLoaded())
+        if (WorldGuardUtils.isWorldGuardLoaded()) {
-        {
+            if (!WorldGuardManager.getInstance().hasMainFlag(player))
-            if(!WorldGuardManager.getInstance().hasMainFlag(player))
                 return;
         }
 
@@ -824,13 +786,12 @@ public class EntityListener implements Listener {
     /**
      * Handle EntityTarget events.
      *
-     * @param event
+     * @param event The event to process
-     *            The event to process
      */
     @EventHandler(priority = EventPriority.HIGHEST, ignoreCancelled = true)
     public void onEntityTarget(EntityTargetEvent event) {
         /* WORLD BLACKLIST CHECK */
-        if(WorldBlacklist.isWorldBlacklisted(event.getEntity().getWorld()))
+        if (WorldBlacklist.isWorldBlacklisted(event.getEntity().getWorld()))
             return;
 
         Entity entity = event.getEntity();
@@ -843,9 +804,8 @@ public class EntityListener implements Listener {
         Player player = (Player) target;
 
         /* WORLD GUARD MAIN FLAG CHECK */
-        if(WorldGuardUtils.isWorldGuardLoaded())
+        if (WorldGuardUtils.isWorldGuardLoaded()) {
-        {
+            if (!WorldGuardManager.getInstance().hasMainFlag(player))
-            if(!WorldGuardManager.getInstance().hasMainFlag(player))
                 return;
         }
 
@@ -867,13 +827,12 @@ public class EntityListener implements Listener {
      * Handle PotionSplash events in order to fix broken Splash Potion of
      * Saturation.
      *
-     * @param event
+     * @param event The event to process
-     *            The event to process
      */
     @EventHandler(priority = EventPriority.MONITOR, ignoreCancelled = true)
     public void onPotionSplash(PotionSplashEvent event) {
         /* WORLD BLACKLIST CHECK */
-        if(WorldBlacklist.isWorldBlacklisted(event.getEntity().getWorld()))
+        if (WorldBlacklist.isWorldBlacklisted(event.getEntity().getWorld()))
             return;
 
         for (PotionEffect effect : ((PotionMeta) event.getPotion().getItem().getItemMeta()).getCustomEffects()) {
@@ -891,7 +850,7 @@ public class EntityListener implements Listener {
     @EventHandler(priority = EventPriority.MONITOR, ignoreCancelled = true)
     public void onPigZapEvent(PigZapEvent event) {
         /* WORLD BLACKLIST CHECK */
-        if(WorldBlacklist.isWorldBlacklisted(event.getEntity().getWorld()))
+        if (WorldBlacklist.isWorldBlacklisted(event.getEntity().getWorld()))
             return;
 
         if (event.getEntity().hasMetadata(mcMMO.entityMetadataKey)) {

bukkit/src/main/java/com/gmail/nossr50/listeners/InteractionManager.java

@@ -1,9 +1,9 @@
 package com.gmail.nossr50.listeners;
 
-import com.gmail.nossr50.datatypes.skills.SubSkillType;
+import com.gmail.nossr50.core.skills.SubSkillType;
-import com.gmail.nossr50.datatypes.skills.subskills.AbstractSubSkill;
+import com.gmail.nossr50.core.skills.subskills.AbstractSubSkill;
-import com.gmail.nossr50.datatypes.skills.subskills.interfaces.InteractType;
+import com.gmail.nossr50.core.skills.subskills.interfaces.InteractType;
-import com.gmail.nossr50.datatypes.skills.subskills.interfaces.Interaction;
+import com.gmail.nossr50.core.skills.subskills.interfaces.Interaction;
 import com.gmail.nossr50.mcMMO;
 import org.bukkit.event.Event;
 
@@ -17,26 +17,26 @@ public class InteractionManager {
 
     /**
      * Registers subskills with the Interaction registration
+     *
      * @param abstractSubSkill the target subskill to register
      */
-    public static void registerSubSkill(AbstractSubSkill abstractSubSkill)
+    public static void registerSubSkill(AbstractSubSkill abstractSubSkill) {
-    {
         /* INIT MAPS */
-        if(interactRegister == null)
+        if (interactRegister == null)
             interactRegister = new HashMap<>();
 
-        if(subSkillList == null)
+        if (subSkillList == null)
             subSkillList = new ArrayList<>();
 
-        if(subSkillNameMap == null)
+        if (subSkillNameMap == null)
             subSkillNameMap = new HashMap<>();
 
         //Store a unique copy of each subskill
-        if(!subSkillList.contains(abstractSubSkill))
+        if (!subSkillList.contains(abstractSubSkill))
             subSkillList.add(abstractSubSkill);
 
         //Init ArrayList
-        if(interactRegister.get(abstractSubSkill.getInteractType()) == null)
+        if (interactRegister.get(abstractSubSkill.getInteractType()) == null)
             interactRegister.put(abstractSubSkill.getInteractType(), new ArrayList<>());
 
         //Registration array reference
@@ -48,33 +48,32 @@ public class InteractionManager {
         String lowerCaseName = abstractSubSkill.getConfigKeyName().toLowerCase();
 
         //Register in name map
-        if(subSkillNameMap.get(lowerCaseName) == null)
+        if (subSkillNameMap.get(lowerCaseName) == null)
             subSkillNameMap.put(lowerCaseName, abstractSubSkill);
 
-        System.out.println("[mcMMO] registered subskill: "+ abstractSubSkill.getConfigKeyName());
+        System.out.println("[mcMMO] registered subskill: " + abstractSubSkill.getConfigKeyName());
     }
 
     /**
      * Grabs the registered abstract skill by its name
      * Is not case sensitive
+     *
      * @param name name of subskill, not case sensitive
      * @return null if the subskill is not registered
      */
-    public static AbstractSubSkill getAbstractByName(String name)
+    public static AbstractSubSkill getAbstractByName(String name) {
-    {
         return subSkillNameMap.get(name.toLowerCase());
     }
 
     /**
      * Processes the associated Interactions for this event
-     * @param event target event
+     *
-     * @param plugin instance of mcMMO plugin
+     * @param event           target event
+     * @param plugin          instance of mcMMO plugin
      * @param curInteractType the associated interaction type
      */
-    public static void processEvent(Event event, mcMMO plugin, InteractType curInteractType)
+    public static void processEvent(Event event, mcMMO plugin, InteractType curInteractType) {
-    {
+        for (Interaction interaction : interactRegister.get(curInteractType)) {
-        for(Interaction interaction : interactRegister.get(curInteractType))
-        {
             interaction.doInteraction(event, plugin);
         }
     }
@@ -82,25 +81,24 @@ public class InteractionManager {
     /**
      * Returns the list that contains all unique instances of registered Interaction classes
      * Interactions are extensions of abstract classes that represent modifying behaviours in Minecraft through events
+     *
      * @return the unique collection of all registered Interaction classes
      */
-    public static ArrayList<AbstractSubSkill> getSubSkillList()
+    public static ArrayList<AbstractSubSkill> getSubSkillList() {
-    {
         return subSkillList;
     }
 
-    public static boolean hasSubSkill(String name)
+    public static boolean hasSubSkill(String name) {
-    {
         return getAbstractByName(name) != null;
     }
 
-    public static boolean hasSubSkill(SubSkillType subSkillType)
+    public static boolean hasSubSkill(SubSkillType subSkillType) {
-    {
         return hasSubSkill(subSkillType.getNiceNameNoSpaces(subSkillType));
     }
 
     /**
      * Returns the associative map which contains all registered interactions
+     *
      * @return the interact register
      */
     public static HashMap<InteractType, ArrayList<Interaction>> getInteractRegister() {

bukkit/src/main/java/com/gmail/nossr50/listeners/InventoryListener.java

@@ -1,20 +1,20 @@
 package com.gmail.nossr50.listeners;
 
-import com.gmail.nossr50.config.Config;
+import com.gmail.nossr50.core.config.MainConfig;
-import com.gmail.nossr50.config.WorldBlacklist;
+import com.gmail.nossr50.core.config.WorldBlacklist;
-import com.gmail.nossr50.datatypes.skills.PrimarySkillType;
+import com.gmail.nossr50.core.data.UserManager;
-import com.gmail.nossr50.datatypes.skills.SubSkillType;
+import com.gmail.nossr50.core.runnables.player.PlayerUpdateInventoryTask;
-import com.gmail.nossr50.events.fake.FakeBrewEvent;
+import com.gmail.nossr50.core.skills.PrimarySkillType;
+import com.gmail.nossr50.core.skills.SubSkillType;
+import com.gmail.nossr50.core.skills.primary.alchemy.Alchemy;
+import com.gmail.nossr50.core.skills.primary.alchemy.AlchemyPotionBrewer;
+import com.gmail.nossr50.core.util.ItemUtils;
+import com.gmail.nossr50.core.util.Permissions;
+import com.gmail.nossr50.core.util.skills.SkillUtils;
+import com.gmail.nossr50.core.worldguard.WorldGuardManager;
+import com.gmail.nossr50.core.worldguard.WorldGuardUtils;
+import com.gmail.nossr50.core.events.fake.FakeBrewEvent;
 import com.gmail.nossr50.mcMMO;
-import com.gmail.nossr50.runnables.player.PlayerUpdateInventoryTask;
-import com.gmail.nossr50.skills.alchemy.Alchemy;
-import com.gmail.nossr50.skills.alchemy.AlchemyPotionBrewer;
-import com.gmail.nossr50.util.ItemUtils;
-import com.gmail.nossr50.util.Permissions;
-import com.gmail.nossr50.util.player.UserManager;
-import com.gmail.nossr50.util.skills.SkillUtils;
-import com.gmail.nossr50.worldguard.WorldGuardManager;
-import com.gmail.nossr50.worldguard.WorldGuardUtils;
 import org.bukkit.Location;
 import org.bukkit.Material;
 import org.bukkit.block.Block;
@@ -42,7 +42,7 @@ public class InventoryListener implements Listener {
     @EventHandler(priority = EventPriority.LOW, ignoreCancelled = true)
     public void onInventoryOpen(InventoryOpenEvent event) {
         /* WORLD BLACKLIST CHECK */
-        if(WorldBlacklist.isWorldBlacklisted(event.getPlayer().getWorld()))
+        if (WorldBlacklist.isWorldBlacklisted(event.getPlayer().getWorld()))
             return;
 
         Block furnaceBlock = processInventoryOpenOrCloseEvent(event.getInventory());
@@ -57,14 +57,14 @@ public class InventoryListener implements Listener {
             return;
         }
 
-        if(!furnaceBlock.hasMetadata(mcMMO.furnaceMetadataKey) && furnaceBlock.getMetadata(mcMMO.furnaceMetadataKey).size() == 0)
+        if (!furnaceBlock.hasMetadata(mcMMO.furnaceMetadataKey) && furnaceBlock.getMetadata(mcMMO.furnaceMetadataKey).size() == 0)
             furnaceBlock.setMetadata(mcMMO.furnaceMetadataKey, UserManager.getPlayer((Player) player).getPlayerMetadata());
     }
 
     @EventHandler(priority = EventPriority.MONITOR, ignoreCancelled = true)
     public void onInventoryClose(InventoryCloseEvent event) {
         /* WORLD BLACKLIST CHECK */
-        if(WorldBlacklist.isWorldBlacklisted(event.getPlayer().getWorld()))
+        if (WorldBlacklist.isWorldBlacklisted(event.getPlayer().getWorld()))
             return;
 
         Block furnaceBlock = processInventoryOpenOrCloseEvent(event.getInventory());
@@ -85,7 +85,7 @@ public class InventoryListener implements Listener {
     @EventHandler(priority = EventPriority.HIGHEST, ignoreCancelled = true)
     public void onFurnaceBurnEvent(FurnaceBurnEvent event) {
         /* WORLD BLACKLIST CHECK */
-        if(WorldBlacklist.isWorldBlacklisted(event.getBlock().getWorld()))
+        if (WorldBlacklist.isWorldBlacklisted(event.getBlock().getWorld()))
             return;
 
         Block furnaceBlock = event.getBlock();
@@ -99,9 +99,8 @@ public class InventoryListener implements Listener {
         Player player = getPlayerFromFurnace(furnaceBlock);
 
         /* WORLD GUARD MAIN FLAG CHECK */
-        if(WorldGuardUtils.isWorldGuardLoaded())
+        if (WorldGuardUtils.isWorldGuardLoaded()) {
-        {
+            if (!WorldGuardManager.getInstance().hasMainFlag(player))
-            if(!WorldGuardManager.getInstance().hasMainFlag(player))
                 return;
         }
 
@@ -115,7 +114,7 @@ public class InventoryListener implements Listener {
     @EventHandler(priority = EventPriority.HIGHEST, ignoreCancelled = true)
     public void onFurnaceSmeltEvent(FurnaceSmeltEvent event) {
         /* WORLD BLACKLIST CHECK */
-        if(WorldBlacklist.isWorldBlacklisted(event.getBlock().getWorld()))
+        if (WorldBlacklist.isWorldBlacklisted(event.getBlock().getWorld()))
             return;
 
         Block furnaceBlock = event.getBlock();
@@ -128,9 +127,8 @@ public class InventoryListener implements Listener {
         Player player = getPlayerFromFurnace(furnaceBlock);
 
         /* WORLD GUARD MAIN FLAG CHECK */
-        if(WorldGuardUtils.isWorldGuardLoaded())
+        if (WorldGuardUtils.isWorldGuardLoaded()) {
-        {
+            if (!WorldGuardManager.getInstance().hasMainFlag(player))
-            if(!WorldGuardManager.getInstance().hasMainFlag(player))
                 return;
         }
 
@@ -144,7 +142,7 @@ public class InventoryListener implements Listener {
     @EventHandler(priority = EventPriority.HIGHEST, ignoreCancelled = true)
     public void onFurnaceExtractEvent(FurnaceExtractEvent event) {
         /* WORLD BLACKLIST CHECK */
-        if(WorldBlacklist.isWorldBlacklisted(event.getPlayer().getWorld()))
+        if (WorldBlacklist.isWorldBlacklisted(event.getPlayer().getWorld()))
             return;
 
         Block furnaceBlock = event.getBlock();
@@ -156,9 +154,8 @@ public class InventoryListener implements Listener {
         Player player = getPlayerFromFurnace(furnaceBlock);
 
         /* WORLD GUARD MAIN FLAG CHECK */
-        if(WorldGuardUtils.isWorldGuardLoaded())
+        if (WorldGuardUtils.isWorldGuardLoaded()) {
-        {
+            if (!WorldGuardManager.getInstance().hasMainFlag(player))
-            if(!WorldGuardManager.getInstance().hasMainFlag(player))
                 return;
         }
 
@@ -173,18 +170,16 @@ public class InventoryListener implements Listener {
     @EventHandler(priority = EventPriority.NORMAL, ignoreCancelled = true)
     public void onInventoryClickEventNormal(InventoryClickEvent event) {
         /* WORLD BLACKLIST CHECK */
-        if(WorldBlacklist.isWorldBlacklisted(event.getWhoClicked().getWorld()))
+        if (WorldBlacklist.isWorldBlacklisted(event.getWhoClicked().getWorld()))
             return;
 
         Inventory inventory = event.getInventory();
 
-        if(event.getWhoClicked() instanceof Player)
+        if (event.getWhoClicked() instanceof Player) {
-        {
             Player player = ((Player) event.getWhoClicked()).getPlayer();
             Block furnaceBlock = processInventoryOpenOrCloseEvent(event.getInventory());
 
-            if (furnaceBlock != null)
+            if (furnaceBlock != null) {
-            {
                 if (furnaceBlock.getMetadata(mcMMO.furnaceMetadataKey).size() > 0)
                     furnaceBlock.removeMetadata(mcMMO.furnaceMetadataKey, mcMMO.p);
 
@@ -211,9 +206,8 @@ public class InventoryListener implements Listener {
         Player player = (Player) whoClicked;
 
         /* WORLD GUARD MAIN FLAG CHECK */
-        if(WorldGuardUtils.isWorldGuardLoaded())
+        if (WorldGuardUtils.isWorldGuardLoaded()) {
-        {
+            if (!WorldGuardManager.getInstance().hasMainFlag(player))
-            if(!WorldGuardManager.getInstance().hasMainFlag(player))
                 return;
         }
 
@@ -251,8 +245,7 @@ public class InventoryListener implements Listener {
                 default:
                     return;
             }
-        }
+        } else if (slot == InventoryType.SlotType.FUEL) {
-        else if (slot == InventoryType.SlotType.FUEL) {
             boolean emptyClicked = AlchemyPotionBrewer.isEmpty(clicked);
 
             if (AlchemyPotionBrewer.isEmpty(cursor)) {
@@ -262,8 +255,7 @@ public class InventoryListener implements Listener {
                 }
 
                 AlchemyPotionBrewer.scheduleCheck(player, stand);
-            }
+            } else if (emptyClicked) {
-            else if (emptyClicked) {
                 if (AlchemyPotionBrewer.isValidIngredient(player, cursor)) {
                     int amount = cursor.getAmount();
 
@@ -274,8 +266,7 @@ public class InventoryListener implements Listener {
 
                         AlchemyPotionBrewer.scheduleUpdate(inventory);
                         AlchemyPotionBrewer.scheduleCheck(player, stand);
-                    }
+                    } else if (click == ClickType.RIGHT) {
-                    else if (click == ClickType.RIGHT) {
                         event.setCancelled(true);
 
                         ItemStack one = cursor.clone();
@@ -298,7 +289,7 @@ public class InventoryListener implements Listener {
     @EventHandler(priority = EventPriority.NORMAL, ignoreCancelled = true)
     public void onInventoryDragEvent(InventoryDragEvent event) {
         /* WORLD BLACKLIST CHECK */
-        if(WorldBlacklist.isWorldBlacklisted(event.getWhoClicked().getWorld()))
+        if (WorldBlacklist.isWorldBlacklisted(event.getWhoClicked().getWorld()))
             return;
 
         Inventory inventory = event.getInventory();
@@ -330,9 +321,8 @@ public class InventoryListener implements Listener {
             Player player = (Player) whoClicked;
 
             /* WORLD GUARD MAIN FLAG CHECK */
-            if(WorldGuardUtils.isWorldGuardLoaded())
+            if (WorldGuardUtils.isWorldGuardLoaded()) {
-            {
+                if (!WorldGuardManager.getInstance().hasMainFlag(player))
-                if(!WorldGuardManager.getInstance().hasMainFlag(player))
                     return;
             }
 
@@ -349,10 +339,9 @@ public class InventoryListener implements Listener {
 
     // Apparently sometimes vanilla brewing beats our task listener to the actual brew. We handle this by cancelling the vanilla event and finishing our brew ourselves.
     @EventHandler(priority = EventPriority.LOWEST, ignoreCancelled = true)
-    public void onBrew(BrewEvent event)
+    public void onBrew(BrewEvent event) {
-    {
         /* WORLD BLACKLIST CHECK */
-        if(WorldBlacklist.isWorldBlacklisted(event.getBlock().getWorld()))
+        if (WorldBlacklist.isWorldBlacklisted(event.getBlock().getWorld()))
             return;
 
         if (event instanceof FakeBrewEvent)
@@ -367,7 +356,7 @@ public class InventoryListener implements Listener {
     @EventHandler(priority = EventPriority.NORMAL, ignoreCancelled = true)
     public void onInventoryMoveItemEvent(InventoryMoveItemEvent event) {
         /* WORLD BLACKLIST CHECK */
-        if(WorldBlacklist.isWorldBlacklisted(event.getSource().getLocation().getWorld()))
+        if (WorldBlacklist.isWorldBlacklisted(event.getSource().getLocation().getWorld()))
             return;
 
         Inventory inventory = event.getDestination();
@@ -384,17 +373,17 @@ public class InventoryListener implements Listener {
 
         ItemStack item = event.getItem();
 
-        if (Config.getInstance().getPreventHopperTransferIngredients() && item.getType() != Material.POTION && item.getType() != Material.SPLASH_POTION && item.getType() != Material.LINGERING_POTION) {
+        if (MainConfig.getInstance().getPreventHopperTransferIngredients() && item.getType() != Material.POTION && item.getType() != Material.SPLASH_POTION && item.getType() != Material.LINGERING_POTION) {
             event.setCancelled(true);
             return;
         }
 
-        if (Config.getInstance().getPreventHopperTransferBottles() && (item.getType() == Material.POTION || item.getType() == Material.SPLASH_POTION || item.getType() == Material.LINGERING_POTION)) {
+        if (MainConfig.getInstance().getPreventHopperTransferBottles() && (item.getType() == Material.POTION || item.getType() == Material.SPLASH_POTION || item.getType() == Material.LINGERING_POTION)) {
             event.setCancelled(true);
             return;
         }
 
-        if (Config.getInstance().getEnabledForHoppers() && AlchemyPotionBrewer.isValidIngredient(null, item)) {
+        if (MainConfig.getInstance().getEnabledForHoppers() && AlchemyPotionBrewer.isValidIngredient(null, item)) {
             AlchemyPotionBrewer.scheduleCheck(null, (BrewingStand) holder);
         }
     }
@@ -415,7 +404,7 @@ public class InventoryListener implements Listener {
     @EventHandler(priority = EventPriority.MONITOR, ignoreCancelled = true)
     public void onCraftItem(CraftItemEvent event) {
         /* WORLD BLACKLIST CHECK */
-        if(WorldBlacklist.isWorldBlacklisted(event.getWhoClicked().getWorld()))
+        if (WorldBlacklist.isWorldBlacklisted(event.getWhoClicked().getWorld()))
             return;
 
         final HumanEntity whoClicked = event.getWhoClicked();
@@ -433,9 +422,8 @@ public class InventoryListener implements Listener {
         Player player = (Player) whoClicked;
 
         /* WORLD GUARD MAIN FLAG CHECK */
-        if(WorldGuardUtils.isWorldGuardLoaded())
+        if (WorldGuardUtils.isWorldGuardLoaded()) {
-        {
+            if (!WorldGuardManager.getInstance().hasMainFlag(player))
-            if(!WorldGuardManager.getInstance().hasMainFlag(player))
                 return;
         }
 

bukkit/src/main/java/com/gmail/nossr50/listeners/PlayerListener.java

@@ -1,34 +1,35 @@
 package com.gmail.nossr50.listeners;
 
-import com.gmail.nossr50.chat.ChatManager;
-import com.gmail.nossr50.chat.ChatManagerFactory;
-import com.gmail.nossr50.chat.PartyChatManager;
-import com.gmail.nossr50.config.Config;
-import com.gmail.nossr50.config.WorldBlacklist;
 import com.gmail.nossr50.config.experience.ExperienceConfig;
-import com.gmail.nossr50.datatypes.chat.ChatMode;
+import com.gmail.nossr50.core.chat.ChatManager;
-import com.gmail.nossr50.datatypes.party.Party;
+import com.gmail.nossr50.core.chat.ChatManagerFactory;
-import com.gmail.nossr50.datatypes.player.McMMOPlayer;
+import com.gmail.nossr50.core.chat.PartyChatManager;
-import com.gmail.nossr50.datatypes.skills.PrimarySkillType;
+import com.gmail.nossr50.core.config.MainConfig;
-import com.gmail.nossr50.locale.LocaleLoader;
+import com.gmail.nossr50.core.config.WorldBlacklist;
+import com.gmail.nossr50.core.data.UserManager;
+import com.gmail.nossr50.core.datatypes.chat.ChatMode;
+import com.gmail.nossr50.core.datatypes.party.Party;
+import com.gmail.nossr50.core.datatypes.player.McMMOPlayer;
+import com.gmail.nossr50.core.locale.LocaleLoader;
+import com.gmail.nossr50.core.party.ShareHandler;
+import com.gmail.nossr50.core.runnables.player.PlayerProfileLoadingTask;
+import com.gmail.nossr50.core.skills.PrimarySkillType;
+import com.gmail.nossr50.core.skills.child.salvage.Salvage;
+import com.gmail.nossr50.core.skills.child.salvage.SalvageManager;
+import com.gmail.nossr50.core.skills.primary.fishing.FishingManager;
+import com.gmail.nossr50.core.skills.primary.herbalism.HerbalismManager;
+import com.gmail.nossr50.core.skills.primary.mining.MiningManager;
+import com.gmail.nossr50.core.skills.primary.repair.Repair;
+import com.gmail.nossr50.core.skills.primary.repair.RepairManager;
+import com.gmail.nossr50.core.skills.primary.taming.TamingManager;
+import com.gmail.nossr50.core.util.*;
+import com.gmail.nossr50.core.util.skills.SkillUtils;
+import com.gmail.nossr50.core.util.sounds.SoundManager;
+import com.gmail.nossr50.core.util.sounds.SoundType;
+import com.gmail.nossr50.core.worldguard.WorldGuardManager;
+import com.gmail.nossr50.core.worldguard.WorldGuardUtils;
 import com.gmail.nossr50.mcMMO;
-import com.gmail.nossr50.party.ShareHandler;
-import com.gmail.nossr50.runnables.player.PlayerProfileLoadingTask;
-import com.gmail.nossr50.skills.fishing.FishingManager;
-import com.gmail.nossr50.skills.herbalism.HerbalismManager;
-import com.gmail.nossr50.skills.mining.MiningManager;
-import com.gmail.nossr50.skills.repair.Repair;
-import com.gmail.nossr50.skills.repair.RepairManager;
-import com.gmail.nossr50.skills.salvage.Salvage;
-import com.gmail.nossr50.skills.salvage.SalvageManager;
-import com.gmail.nossr50.skills.taming.TamingManager;
 import com.gmail.nossr50.util.*;
-import com.gmail.nossr50.util.player.UserManager;
-import com.gmail.nossr50.util.skills.SkillUtils;
-import com.gmail.nossr50.util.sounds.SoundManager;
-import com.gmail.nossr50.util.sounds.SoundType;
-import com.gmail.nossr50.worldguard.WorldGuardManager;
-import com.gmail.nossr50.worldguard.WorldGuardUtils;
 import org.bukkit.GameMode;
 import org.bukkit.Material;
 import org.bukkit.block.Block;
@@ -62,19 +63,18 @@ public class PlayerListener implements Listener {
     @EventHandler(priority = EventPriority.MONITOR, ignoreCancelled = true)
     public void onPlayerTeleport(PlayerTeleportEvent event) {
         /* WORLD BLACKLIST CHECK */
-        if(WorldBlacklist.isWorldBlacklisted(event.getPlayer().getWorld()))
+        if (WorldBlacklist.isWorldBlacklisted(event.getPlayer().getWorld()))
             return;
 
         Player player = event.getPlayer();
 
         /* WORLD GUARD MAIN FLAG CHECK */
-        if(WorldGuardUtils.isWorldGuardLoaded())
+        if (WorldGuardUtils.isWorldGuardLoaded()) {
-        {
+            if (!WorldGuardManager.getInstance().hasMainFlag(player))
-            if(!WorldGuardManager.getInstance().hasMainFlag(player))
                 return;
         }
 
-        if (!UserManager.hasPlayerDataKey(player) || Config.getInstance().getXPAfterTeleportCooldown() <= 0 || event.getFrom().equals(event.getTo())) {
+        if (!UserManager.hasPlayerDataKey(player) || MainConfig.getInstance().getXPAfterTeleportCooldown() <= 0 || event.getFrom().equals(event.getTo())) {
             return;
         }
 
@@ -93,15 +93,14 @@ public class PlayerListener implements Listener {
     @EventHandler(priority = EventPriority.LOWEST, ignoreCancelled = true)
     public void onPlayerDeathLowest(PlayerDeathEvent event) {
         /* WORLD BLACKLIST CHECK */
-        if(WorldBlacklist.isWorldBlacklisted(event.getEntity().getWorld()))
+        if (WorldBlacklist.isWorldBlacklisted(event.getEntity().getWorld()))
             return;
 
         String deathMessage = event.getDeathMessage();
 
         /* WORLD GUARD MAIN FLAG CHECK */
-        if(WorldGuardUtils.isWorldGuardLoaded())
+        if (WorldGuardUtils.isWorldGuardLoaded()) {
-        {
+            if (!WorldGuardManager.getInstance().hasMainFlag(event.getEntity()))
-            if(!WorldGuardManager.getInstance().hasMainFlag(event.getEntity()))
                 return;
         }
 
@@ -126,7 +125,7 @@ public class PlayerListener implements Listener {
     @EventHandler(priority = EventPriority.MONITOR, ignoreCancelled = true)
     public void onPlayerDeathMonitor(PlayerDeathEvent event) {
         /* WORLD BLACKLIST CHECK */
-        if(WorldBlacklist.isWorldBlacklisted(event.getEntity().getWorld()))
+        if (WorldBlacklist.isWorldBlacklisted(event.getEntity().getWorld()))
             return;
 
         boolean statLossEnabled = HardcoreManager.isStatLossEnabled();
@@ -145,9 +144,8 @@ public class PlayerListener implements Listener {
         Player killer = killedPlayer.getKiller();
 
         /* WORLD GUARD MAIN FLAG CHECK */
-        if(WorldGuardUtils.isWorldGuardLoaded())
+        if (WorldGuardUtils.isWorldGuardLoaded()) {
-        {
+            if (!WorldGuardManager.getInstance().hasMainFlag(killedPlayer))
-            if(!WorldGuardManager.getInstance().hasMainFlag(killedPlayer))
                 return;
         }
 
@@ -201,13 +199,12 @@ public class PlayerListener implements Listener {
     @EventHandler(priority = EventPriority.MONITOR, ignoreCancelled = true)
     public void onPlayerDropItem(PlayerDropItemEvent event) {
         /* WORLD BLACKLIST CHECK */
-        if(WorldBlacklist.isWorldBlacklisted(event.getPlayer().getWorld()))
+        if (WorldBlacklist.isWorldBlacklisted(event.getPlayer().getWorld()))
             return;
 
         /* WORLD GUARD MAIN FLAG CHECK */
-        if(WorldGuardUtils.isWorldGuardLoaded())
+        if (WorldGuardUtils.isWorldGuardLoaded()) {
-        {
+            if (!WorldGuardManager.getInstance().hasMainFlag(event.getPlayer()))
-            if(!WorldGuardManager.getInstance().hasMainFlag(event.getPlayer()))
                 return;
         }
 
@@ -232,15 +229,14 @@ public class PlayerListener implements Listener {
     @EventHandler(priority = EventPriority.HIGHEST, ignoreCancelled = true)
     public void onPlayerFishHighest(PlayerFishEvent event) {
         /* WORLD BLACKLIST CHECK */
-        if(WorldBlacklist.isWorldBlacklisted(event.getPlayer().getWorld()))
+        if (WorldBlacklist.isWorldBlacklisted(event.getPlayer().getWorld()))
             return;
 
         Player player = event.getPlayer();
 
         /* WORLD GUARD MAIN FLAG CHECK */
-        if(WorldGuardUtils.isWorldGuardLoaded())
+        if (WorldGuardUtils.isWorldGuardLoaded()) {
-        {
+            if (!WorldGuardManager.getInstance().hasMainFlag(player))
-            if(!WorldGuardManager.getInstance().hasMainFlag(player))
                 return;
         }
 
@@ -255,7 +251,7 @@ public class PlayerListener implements Listener {
                 //TODO Update to new API once available! Waiting for case CAUGHT_TREASURE:
                 Item fishingCatch = (Item) event.getCaught();
 
-                if (Config.getInstance().getFishingOverrideTreasures() &&
+                if (MainConfig.getInstance().getFishingOverrideTreasures() &&
                         fishingCatch.getItemStack().getType() != Material.SALMON &&
                         fishingCatch.getItemStack().getType() != Material.COD &&
                         fishingCatch.getItemStack().getType() != Material.TROPICAL_FISH &&
@@ -265,7 +261,7 @@ public class PlayerListener implements Listener {
 
                 if (Permissions.vanillaXpBoost(player, PrimarySkillType.FISHING)) {
                     //Don't modify XP below vanilla values
-                    if(fishingManager.handleVanillaXpBoost(event.getExpToDrop()) > 1)
+                    if (fishingManager.handleVanillaXpBoost(event.getExpToDrop()) > 1)
                         event.setExpToDrop(fishingManager.handleVanillaXpBoost(event.getExpToDrop()));
                 }
                 return;
@@ -303,15 +299,14 @@ public class PlayerListener implements Listener {
     @EventHandler(priority = EventPriority.MONITOR, ignoreCancelled = true)
     public void onPlayerFishMonitor(PlayerFishEvent event) {
         /* WORLD BLACKLIST CHECK */
-        if(WorldBlacklist.isWorldBlacklisted(event.getPlayer().getWorld()))
+        if (WorldBlacklist.isWorldBlacklisted(event.getPlayer().getWorld()))
             return;
 
         Player player = event.getPlayer();
 
         /* WORLD GUARD MAIN FLAG CHECK */
-        if(WorldGuardUtils.isWorldGuardLoaded())
+        if (WorldGuardUtils.isWorldGuardLoaded()) {
-        {
+            if (!WorldGuardManager.getInstance().hasMainFlag(player))
-            if(!WorldGuardManager.getInstance().hasMainFlag(player))
                 return;
         }
 
@@ -333,7 +328,7 @@ public class PlayerListener implements Listener {
                 return;
 
             case CAUGHT_FISH:
-                if(fishingManager.exploitPrevention(event.getHook().getBoundingBox()))
+                if (fishingManager.exploitPrevention(event.getHook().getBoundingBox()))
                     return;
                 fishingManager.handleFishing((Item) caught);
                 fishingManager.setFishingTarget();
@@ -362,17 +357,15 @@ public class PlayerListener implements Listener {
     @EventHandler(priority = EventPriority.HIGHEST, ignoreCancelled = true)
     public void onPlayerPickupItem(EntityPickupItemEvent event) {
         /* WORLD BLACKLIST CHECK */
-        if(WorldBlacklist.isWorldBlacklisted(event.getEntity().getWorld()))
+        if (WorldBlacklist.isWorldBlacklisted(event.getEntity().getWorld()))
             return;
 
-        if(event.getEntity() instanceof Player)
+        if (event.getEntity() instanceof Player) {
-        {
             Player player = (Player) event.getEntity();
 
             /* WORLD GUARD MAIN FLAG CHECK */
-            if(WorldGuardUtils.isWorldGuardLoaded())
+            if (WorldGuardUtils.isWorldGuardLoaded()) {
-            {
+                if (!WorldGuardManager.getInstance().hasMainFlag(player))
-                if(!WorldGuardManager.getInstance().hasMainFlag(player))
                     return;
             }
 
@@ -404,7 +397,7 @@ public class PlayerListener implements Listener {
 
             /*if (player.getInventory().getItemInMainHand().getType() == Material.AIR) {
                 Unarmed.handleItemPickup(player, event);
-                *//*boolean cancel = Config.getInstance().getUnarmedItemPickupDisabled() || pickupSuccess;
+                *//*boolean cancel = MainConfig.getInstance().getUnarmedItemPickupDisabled() || pickupSuccess;
                 event.setCancelled(cancel);
 
                 if (pickupSuccess) {
@@ -455,7 +448,7 @@ public class PlayerListener implements Listener {
 
         new PlayerProfileLoadingTask(player).runTaskLaterAsynchronously(mcMMO.p, 1); // 1 Tick delay to ensure the player is marked as online before we begin loading
 
-        if (Config.getInstance().getMOTDEnabled() && Permissions.motd(player)) {
+        if (MainConfig.getInstance().getMOTDEnabled() && Permissions.motd(player)) {
             Motd.displayAll(player);
         }
 
@@ -492,15 +485,14 @@ public class PlayerListener implements Listener {
     @EventHandler(priority = EventPriority.LOWEST, ignoreCancelled = true)
     public void onPlayerInteractLowest(PlayerInteractEvent event) {
         /* WORLD BLACKLIST CHECK */
-        if(WorldBlacklist.isWorldBlacklisted(event.getPlayer().getWorld()))
+        if (WorldBlacklist.isWorldBlacklisted(event.getPlayer().getWorld()))
             return;
 
         Player player = event.getPlayer();
 
         /* WORLD GUARD MAIN FLAG CHECK */
-        if(WorldGuardUtils.isWorldGuardLoaded())
+        if (WorldGuardUtils.isWorldGuardLoaded()) {
-        {
+            if (!WorldGuardManager.getInstance().hasMainFlag(player))
-            if(!WorldGuardManager.getInstance().hasMainFlag(player))
                 return;
         }
 
@@ -517,7 +509,7 @@ public class PlayerListener implements Listener {
             case RIGHT_CLICK_BLOCK:
                 Material type = block.getType();
 
-                if (!Config.getInstance().getAbilitiesOnlyActivateWhenSneaking() || player.isSneaking()) {
+                if (!MainConfig.getInstance().getAbilitiesOnlyActivateWhenSneaking() || player.isSneaking()) {
                     /* REPAIR CHECKS */
                     if (type == Repair.anvilMaterial && PrimarySkillType.REPAIR.getPermissions(player) && mcMMO.getRepairableManager().isRepairable(heldItem)) {
                         RepairManager repairManager = mcMMOPlayer.getRepairManager();
@@ -546,8 +538,7 @@ public class PlayerListener implements Listener {
                 else if (miningManager.canDetonate()) {
                     if (type == Material.TNT) {
                         event.setCancelled(true); // Don't detonate the TNT if they're too close
-                    }
+                    } else {
-                    else {
                         miningManager.remoteDetonation();
                     }
                 }
@@ -557,7 +548,7 @@ public class PlayerListener implements Listener {
             case LEFT_CLICK_BLOCK:
                 type = block.getType();
 
-                if (!Config.getInstance().getAbilitiesOnlyActivateWhenSneaking() || player.isSneaking()) {
+                if (!MainConfig.getInstance().getAbilitiesOnlyActivateWhenSneaking() || player.isSneaking()) {
                     /* REPAIR CHECKS */
                     if (type == Repair.anvilMaterial && PrimarySkillType.REPAIR.getPermissions(player) && mcMMO.getRepairableManager().isRepairable(heldItem)) {
                         RepairManager repairManager = mcMMOPlayer.getRepairManager();
@@ -595,15 +586,14 @@ public class PlayerListener implements Listener {
     @EventHandler(priority = EventPriority.MONITOR)
     public void onPlayerInteractMonitor(PlayerInteractEvent event) {
         /* WORLD BLACKLIST CHECK */
-        if(WorldBlacklist.isWorldBlacklisted(event.getPlayer().getWorld()))
+        if (WorldBlacklist.isWorldBlacklisted(event.getPlayer().getWorld()))
             return;
 
         Player player = event.getPlayer();
 
         /* WORLD GUARD MAIN FLAG CHECK */
-        if(WorldGuardUtils.isWorldGuardLoaded())
+        if (WorldGuardUtils.isWorldGuardLoaded()) {
-        {
+            if (!WorldGuardManager.getInstance().hasMainFlag(player))
-            if(!WorldGuardManager.getInstance().hasMainFlag(player))
                 return;
         }
 
@@ -616,7 +606,7 @@ public class PlayerListener implements Listener {
 
         switch (event.getAction()) {
             case RIGHT_CLICK_BLOCK:
-                if(player.getInventory().getItemInOffHand().getType() != Material.AIR && !player.isInsideVehicle() && !player.isSneaking()) {
+                if (player.getInventory().getItemInOffHand().getType() != Material.AIR && !player.isInsideVehicle() && !player.isSneaking()) {
                     break;
                 }
 
@@ -625,7 +615,7 @@ public class PlayerListener implements Listener {
 
                 /* ACTIVATION & ITEM CHECKS */
                 if (BlockUtils.canActivateTools(blockState)) {
-                    if (Config.getInstance().getAbilitiesEnabled()) {
+                    if (MainConfig.getInstance().getAbilitiesEnabled()) {
                         if (BlockUtils.canActivateHerbalism(blockState)) {
                             mcMMOPlayer.processAbilityActivation(PrimarySkillType.HERBALISM);
                         }
@@ -674,12 +664,12 @@ public class PlayerListener implements Listener {
                 break;
 
             case RIGHT_CLICK_AIR:
-                if(player.getInventory().getItemInOffHand().getType() != Material.AIR && !player.isInsideVehicle() && !player.isSneaking()) {
+                if (player.getInventory().getItemInOffHand().getType() != Material.AIR && !player.isInsideVehicle() && !player.isSneaking()) {
                     break;
                 }
 
                 /* ACTIVATION CHECKS */
-                if (Config.getInstance().getAbilitiesEnabled()) {
+                if (MainConfig.getInstance().getAbilitiesEnabled()) {
                     mcMMOPlayer.processAbilityActivation(PrimarySkillType.AXES);
                     mcMMOPlayer.processAbilityActivation(PrimarySkillType.EXCAVATION);
                     mcMMOPlayer.processAbilityActivation(PrimarySkillType.HERBALISM);
@@ -711,13 +701,11 @@ public class PlayerListener implements Listener {
                 Material type = heldItem.getType();
                 TamingManager tamingManager = mcMMOPlayer.getTamingManager();
 
-                if (type == Config.getInstance().getTamingCOTWMaterial(EntityType.WOLF)) {
+                if (type == MainConfig.getInstance().getTamingCOTWMaterial(EntityType.WOLF)) {
                     tamingManager.summonWolf();
-                }
+                } else if (type == MainConfig.getInstance().getTamingCOTWMaterial(EntityType.OCELOT)) {
-                else if (type == Config.getInstance().getTamingCOTWMaterial(EntityType.OCELOT)) {
                     tamingManager.summonOcelot();
-                }
+                } else if (type == MainConfig.getInstance().getTamingCOTWMaterial(EntityType.HORSE)) {
-                else if (type == Config.getInstance().getTamingCOTWMaterial(EntityType.HORSE)) {
                     tamingManager.summonHorse();
                 }
 
@@ -762,8 +750,7 @@ public class PlayerListener implements Listener {
 
             chatManager = ChatManagerFactory.getChatManager(plugin, ChatMode.PARTY);
             ((PartyChatManager) chatManager).setParty(party);
-        }
+        } else if (mcMMOPlayer.isChatEnabled(ChatMode.ADMIN)) {
-        else if (mcMMOPlayer.isChatEnabled(ChatMode.ADMIN)) {
             chatManager = ChatManagerFactory.getChatManager(plugin, ChatMode.ADMIN);
         }
 
@@ -780,7 +767,7 @@ public class PlayerListener implements Listener {
      */
     @EventHandler(priority = EventPriority.LOWEST)
     public void onPlayerCommandPreprocess(PlayerCommandPreprocessEvent event) {
-        if (!Config.getInstance().getLocale().equalsIgnoreCase("en_US")) {
+        if (!MainConfig.getInstance().getLocale().equalsIgnoreCase("en_US")) {
             String message = event.getMessage();
             String command = message.substring(1).split(" ")[0];
             String lowerCaseCommand = command.toLowerCase();
@@ -805,7 +792,7 @@ public class PlayerListener implements Listener {
     @EventHandler(priority = EventPriority.MONITOR, ignoreCancelled = true)
     public void onPlayerStatisticIncrementEvent(PlayerStatisticIncrementEvent event) {
         /* WORLD BLACKLIST CHECK */
-        if(WorldBlacklist.isWorldBlacklisted(event.getPlayer().getWorld()))
+        if (WorldBlacklist.isWorldBlacklisted(event.getPlayer().getWorld()))
             return;
 
         if (!mcMMO.getHolidayManager().isAprilFirst()) {