.editorconfig

@@ -13,5 +13,3 @@ tab_width=4
 indent_style=space
 indent_size=2
 
-[*.xml]
-indent_style = tab

.github/workflows/codeql-analysis.yml

@@ -1,75 +0,0 @@
-# For most projects, this workflow file will not need changing; you simply need
-# to commit it to your repository.
-#
-# You may wish to alter this file to override the set of languages analyzed,
-# or to provide custom queries or build logic.
-name: "CodeQL"
-
-on:
-  push:
-    branches: [ master ]
-  pull_request:
-    # The branches below must be a subset of the branches above
-    branches: [ master ]
-  schedule:
-    - cron: '0 10 * * 1'
-
-jobs:
-  analyze:
-    name: Analyze
-    runs-on: ubuntu-latest
-
-    strategy:
-      fail-fast: false
-      matrix:
-        # Override automatic language detection by changing the below list
-        # Supported options are ['csharp', 'cpp', 'go', 'java', 'javascript', 'python']
-        language: [ 'java' ]
-        # Learn more...
-        # https://docs.github.com/en/github/finding-security-vulnerabilities-and-errors-in-your-code/configuring-code-scanning#overriding-automatic-language-detection
-
-    steps:
-      - name: Setup Java JDK
-        uses: actions/setup-java@v1.3.0
-        with:
-          java-version: 11
-      - name: Checkout repository
-        uses: actions/checkout@v2
-        with:
-          # We must fetch at least the immediate parents so that if this is
-          # a pull request then we can checkout the head.
-          fetch-depth: 2
-
-      # If this run was triggered by a pull request event, then checkout
-      # the head of the pull request instead of the merge commit.
-      - run: git checkout HEAD^2
-        if: ${{ github.event_name == 'pull_request' }}
-
-      # Initializes the CodeQL tools for scanning.
-      - name: Initialize CodeQL
-        uses: github/codeql-action/init@v1
-        with:
-          languages: ${{ matrix.language }}
-          # If you wish to specify custom queries, you can do so here or in a config file.
-          # By default, queries listed here will override any specified in a config file.
-          # Prefix the list here with "+" to use these queries and those in the config file.
-          # queries: ./path/to/local/query, your-org/your-repo/queries@main
-
-      # Autobuild attempts to build any compiled languages  (C/C++, C#, or Java).
-      # If this step fails, then you should remove it and run the build manually (see below)
-      - name: Autobuild
-        uses: github/codeql-action/autobuild@v1
-
-      # ℹ️ Command-line programs to run using the OS shell.
-      # 📚 https://git.io/JvXDl
-
-      # ✏️ If the Autobuild fails above, remove it and uncomment the following three lines
-      #    and modify them (or add more) to build your code if your project
-      #    uses a compiled language
-
-      #- run: |
-      #   make bootstrap
-      #   make release
-
-      - name: Perform CodeQL Analysis
-        uses: github/codeql-action/analyze@v1

.gitignore

@@ -218,7 +218,7 @@ pip-log.txt
 .mr.developer.cfg
 .metadata/*
 TheButtonAutoFlair/out/artifacts/Autoflair/Autoflair.jar
-*.iml
+#*.iml
 *.name
 .idea
 dependency-reduced-pom.xml

.idea/ButtonCore.iml

@@ -0,0 +1,13 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<module org.jetbrains.idea.maven.project.MavenProjectsManager.isMavenModule="true" type="JAVA_MODULE" version="4">
+  <component name="NewModuleRootManager" LANGUAGE_LEVEL="JDK_1_5">
+    <output url="file://$MODULE_DIR$/target/classes" />
+    <output-test url="file://$MODULE_DIR$/target/test-classes" />
+    <content url="file://$MODULE_DIR$">
+      <excludeFolder url="file://$MODULE_DIR$/target" />
+    </content>
+    <orderEntry type="inheritedJdk" />
+    <orderEntry type="sourceFolder" forTests="false" />
+    <orderEntry type="library" scope="TEST" name="Maven: junit:junit:3.8.1" level="project" />
+  </component>
+</module>

.idea/codeStyles/codeStyleConfig.xml

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

.idea/compiler.xml

@@ -0,0 +1,63 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<project version="4">
+  <component name="CompilerConfiguration">
+    <annotationProcessing>
+      <profile default="true" name="Default" enabled="true" />
+      <profile name="Annotation profile for BuildConfigUpdater" enabled="true">
+        <sourceOutputDir name="target/generated-sources/annotations" />
+        <sourceTestOutputDir name="target/generated-test-sources/test-annotations" />
+        <outputRelativeToContentRoot value="true" />
+        <processorPath useClasspath="false">
+          <entry name="$PROJECT_DIR$/ButtonProcessor/target/classes" />
+          <entry name="$MAVEN_REPOSITORY$/org/yaml/snakeyaml/1.21/snakeyaml-1.21.jar" />
+          <entry name="$MAVEN_REPOSITORY$/org/spigotmc/spigot-api/1.12.2-R0.1-SNAPSHOT/spigot-api-1.12.2-R0.1-SNAPSHOT.jar" />
+          <entry name="$MAVEN_REPOSITORY$/commons-lang/commons-lang/2.6/commons-lang-2.6.jar" />
+          <entry name="$MAVEN_REPOSITORY$/com/googlecode/json-simple/json-simple/1.1.1/json-simple-1.1.1.jar" />
+          <entry name="$MAVEN_REPOSITORY$/com/google/guava/guava/21.0/guava-21.0.jar" />
+          <entry name="$MAVEN_REPOSITORY$/com/google/code/gson/gson/2.8.0/gson-2.8.0.jar" />
+          <entry name="$MAVEN_REPOSITORY$/net/md-5/bungeecord-chat/1.12-SNAPSHOT/bungeecord-chat-1.12-20180712.114550-97.jar" />
+        </processorPath>
+        <module name="BuildConfigUpdater" />
+      </profile>
+      <profile name="Annotation profile for ButtonCore Parent" enabled="true">
+        <sourceOutputDir name="target/generated-sources/annotations" />
+        <sourceTestOutputDir name="target/generated-test-sources/test-annotations" />
+        <outputRelativeToContentRoot value="true" />
+        <processor name="com.github.bsideup.jabel.JabelJavacProcessor" />
+        <processor name="lombok.launch.AnnotationProcessorHider$AnnotationProcessor" />
+        <processor name="buttondevteam.buttonproc.ButtonProcessor" />
+        <processorPath useClasspath="false">
+          <entry name="$MAVEN_REPOSITORY$/com/github/bsideup/jabel/jabel-javac-plugin/0.2.0/jabel-javac-plugin-0.2.0.jar" />
+          <entry name="$MAVEN_REPOSITORY$/net/bytebuddy/byte-buddy/1.10.1/byte-buddy-1.10.1.jar" />
+          <entry name="$MAVEN_REPOSITORY$/net/bytebuddy/byte-buddy-agent/1.10.1/byte-buddy-agent-1.10.1.jar" />
+          <entry name="$MAVEN_REPOSITORY$/org/projectlombok/lombok/1.18.10/lombok-1.18.10.jar" />
+          <entry name="$PROJECT_DIR$/ButtonProcessor/target/classes" />
+          <entry name="$MAVEN_REPOSITORY$/org/yaml/snakeyaml/1.21/snakeyaml-1.21.jar" />
+          <entry name="$MAVEN_REPOSITORY$/org/spigotmc/spigot-api/1.12.2-R0.1-SNAPSHOT/spigot-api-1.12.2-R0.1-SNAPSHOT.jar" />
+          <entry name="$MAVEN_REPOSITORY$/commons-lang/commons-lang/2.6/commons-lang-2.6.jar" />
+          <entry name="$MAVEN_REPOSITORY$/com/googlecode/json-simple/json-simple/1.1.1/json-simple-1.1.1.jar" />
+          <entry name="$MAVEN_REPOSITORY$/com/google/guava/guava/21.0/guava-21.0.jar" />
+          <entry name="$MAVEN_REPOSITORY$/com/google/code/gson/gson/2.8.0/gson-2.8.0.jar" />
+          <entry name="$MAVEN_REPOSITORY$/net/md-5/bungeecord-chat/1.12-SNAPSHOT/bungeecord-chat-1.12-20180712.114550-97.jar" />
+        </processorPath>
+        <module name="ButtonCore (1) (com.github.TBMCPlugins.ButtonCore)" />
+      </profile>
+    </annotationProcessing>
+    <bytecodeTargetLevel>
+      <module name="BuildConfigUpdater" target="8" />
+      <module name="ButtonCore" target="1.5" />
+      <module name="ButtonCore (1) (com.github.TBMCPlugins.ButtonCore)" target="11" />
+      <module name="ButtonProcessor" target="8" />
+      <module name="ChunkArchive" target="1.8" />
+      <module name="CorePOM" target="11" />
+      <module name="RandomTeleport" target="1.8" />
+    </bytecodeTargetLevel>
+  </component>
+  <component name="JavacSettings">
+    <option name="ADDITIONAL_OPTIONS_OVERRIDE">
+      <module name="BuildConfigUpdater" options="" />
+      <module name="ButtonCore (1) (com.github.TBMCPlugins.ButtonCore)" options="" />
+      <module name="ButtonProcessor" options="-proc:none" />
+    </option>
+  </component>
+</project>

.idea/encodings.xml

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

.idea/inspectionProfiles/Project_Default.xml

@@ -0,0 +1,11 @@
+<component name="InspectionProjectProfileManager">
+  <profile version="1.0">
+    <option name="myName" value="Project Default" />
+    <inspection_tool class="WeakerAccess" enabled="false" level="WARNING" enabled_by_default="false">
+      <option name="SUGGEST_PACKAGE_LOCAL_FOR_MEMBERS" value="false" />
+      <option name="SUGGEST_PACKAGE_LOCAL_FOR_TOP_CLASSES" value="false" />
+      <option name="SUGGEST_PRIVATE_FOR_INNERS" value="false" />
+      <disabledExtension id="moduleInfo" />
+    </inspection_tool>
+  </profile>
+</component>

.idea/libraries/Maven__org_projectlombok_lombok_1_16_16.xml

@@ -0,0 +1,14 @@
+<component name="libraryTable">
+  <library name="Maven: org.projectlombok:lombok:1.16.16">
+    <CLASSES>
+      <root url="jar://$MAVEN_REPOSITORY$/org/projectlombok/lombok/1.16.16/lombok-1.16.16.jar!/" />
+    </CLASSES>
+    <JAVADOC>
+      <root url="jar://$MAVEN_REPOSITORY$/org/projectlombok/lombok/1.16.16/lombok-1.16.16-javadoc.jar!/" />
+    </JAVADOC>
+    <SOURCES>
+      <root url="jar://$MAVEN_REPOSITORY$/org/projectlombok/lombok/1.16.16/lombok-1.16.16-sources.jar!/" />
+      <root url="jar://$USER_HOME$/.ideaLibSources/lombok-1.16.16-sources.jar!/" />
+    </SOURCES>
+  </library>
+</component>

.idea/markdown-exported-files.xml

@@ -0,0 +1,8 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<project version="4">
+  <component name="MarkdownExportedFiles">
+    <htmlFiles />
+    <imageFiles />
+    <otherFiles />
+  </component>
+</project>

.idea/markdown-navigator.xml

@@ -0,0 +1,82 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<project version="4">
+  <component name="MarkdownProjectSettings" wasCopied="false">
+    <PreviewSettings splitEditorLayout="SPLIT" splitEditorPreview="PREVIEW" useGrayscaleRendering="false" zoomFactor="1.0" maxImageWidth="0" showGitHubPageIfSynced="false" allowBrowsingInPreview="false" synchronizePreviewPosition="true" highlightPreviewType="NONE" highlightFadeOut="5" highlightOnTyping="true" synchronizeSourcePosition="true" verticallyAlignSourceAndPreviewSyncPosition="true" showSearchHighlightsInPreview="false" showSelectionInPreview="true" openRemoteLinks="true" replaceUnicodeEmoji="false" lastLayoutSetsDefault="false">
+      <PanelProvider>
+        <provider providerId="com.vladsch.idea.multimarkdown.editor.swing.html.panel" providerName="Default - Swing" />
+      </PanelProvider>
+    </PreviewSettings>
+    <ParserSettings gitHubSyntaxChange="false" emojiShortcuts="1" emojiImages="0">
+      <PegdownExtensions>
+        <option name="ABBREVIATIONS" value="false" />
+        <option name="ANCHORLINKS" value="true" />
+        <option name="ASIDE" value="false" />
+        <option name="ATXHEADERSPACE" value="true" />
+        <option name="AUTOLINKS" value="true" />
+        <option name="DEFINITIONS" value="false" />
+        <option name="DEFINITION_BREAK_DOUBLE_BLANK_LINE" value="false" />
+        <option name="FENCED_CODE_BLOCKS" value="true" />
+        <option name="FOOTNOTES" value="false" />
+        <option name="HARDWRAPS" value="false" />
+        <option name="HTML_DEEP_PARSER" value="false" />
+        <option name="INSERTED" value="false" />
+        <option name="QUOTES" value="false" />
+        <option name="RELAXEDHRULES" value="true" />
+        <option name="SMARTS" value="false" />
+        <option name="STRIKETHROUGH" value="true" />
+        <option name="SUBSCRIPT" value="false" />
+        <option name="SUPERSCRIPT" value="false" />
+        <option name="SUPPRESS_HTML_BLOCKS" value="false" />
+        <option name="SUPPRESS_INLINE_HTML" value="false" />
+        <option name="TABLES" value="true" />
+        <option name="TASKLISTITEMS" value="true" />
+        <option name="TOC" value="false" />
+        <option name="WIKILINKS" value="true" />
+      </PegdownExtensions>
+      <ParserOptions>
+        <option name="ADMONITION_EXT" value="false" />
+        <option name="ATTRIBUTES_EXT" value="false" />
+        <option name="COMMONMARK_LISTS" value="true" />
+        <option name="DUMMY" value="false" />
+        <option name="EMOJI_SHORTCUTS" value="true" />
+        <option name="ENUMERATED_REFERENCES_EXT" value="false" />
+        <option name="FLEXMARK_FRONT_MATTER" value="false" />
+        <option name="GFM_LOOSE_BLANK_LINE_AFTER_ITEM_PARA" value="false" />
+        <option name="GFM_TABLE_RENDERING" value="true" />
+        <option name="GITBOOK_URL_ENCODING" value="false" />
+        <option name="GITHUB_LISTS" value="false" />
+        <option name="GITHUB_WIKI_LINKS" value="true" />
+        <option name="GITLAB_EXT" value="false" />
+        <option name="GITLAB_MATH_EXT" value="false" />
+        <option name="GITLAB_MERMAID_EXT" value="false" />
+        <option name="HEADER_ID_NO_DUPED_DASHES" value="false" />
+        <option name="JEKYLL_FRONT_MATTER" value="false" />
+        <option name="MACROS_EXT" value="false" />
+        <option name="NO_TEXT_ATTRIBUTES" value="false" />
+        <option name="PARSE_HTML_ANCHOR_ID" value="false" />
+        <option name="SIM_TOC_BLANK_LINE_SPACER" value="true" />
+      </ParserOptions>
+    </ParserSettings>
+    <HtmlSettings headerTopEnabled="false" headerBottomEnabled="false" bodyTopEnabled="false" bodyBottomEnabled="false" embedUrlContent="false" addPageHeader="true" embedImages="false" embedHttpImages="false" imageUriSerials="false" addDocTypeHtml="true">
+      <GeneratorProvider>
+        <provider providerId="com.vladsch.idea.multimarkdown.editor.swing.html.generator" providerName="Default Swing HTML Generator" />
+      </GeneratorProvider>
+      <headerTop />
+      <headerBottom />
+      <bodyTop />
+      <bodyBottom />
+    </HtmlSettings>
+    <CssSettings previewScheme="UI_SCHEME" cssUri="" isCssUriEnabled="false" isCssUriSerial="false" isCssTextEnabled="false" isDynamicPageWidth="true">
+      <StylesheetProvider>
+        <provider providerId="com.vladsch.idea.multimarkdown.editor.swing.html.css" providerName="Default Swing Stylesheet" />
+      </StylesheetProvider>
+      <ScriptProviders />
+      <cssText />
+      <cssUriHistory />
+    </CssSettings>
+    <HtmlExportSettings updateOnSave="false" parentDir="" targetDir="" cssDir="" scriptDir="" plainHtml="false" imageDir="" copyLinkedImages="false" imageUniquifyType="0" targetExt="" useTargetExt="false" noCssNoScripts="false" linkToExportedHtml="true" exportOnSettingsChange="true" regenerateOnProjectOpen="false" linkFormatType="HTTP_ABSOLUTE" />
+    <LinkMapSettings>
+      <textMaps />
+    </LinkMapSettings>
+  </component>
+</project>

.idea/markdown-navigator/profiles_settings.xml

@@ -0,0 +1,3 @@
+<component name="MarkdownNavigator.ProfileManager">
+  <settings default="" pdf-export="" />
+</component>

.idea/misc.xml

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

.idea/modules.xml

@@ -0,0 +1,11 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<project version="4">
+  <component name="ProjectModuleManager">
+    <modules>
+      <module fileurl="file://$PROJECT_DIR$/BuildConfigUpdater/BuildConfigUpdater.iml" filepath="$PROJECT_DIR$/BuildConfigUpdater/BuildConfigUpdater.iml" />
+      <module fileurl="file://$PROJECT_DIR$/ButtonCore/ButtonCore (1) (com.github.TBMCPlugins.ButtonCore).iml" filepath="$PROJECT_DIR$/ButtonCore/ButtonCore (1) (com.github.TBMCPlugins.ButtonCore).iml" />
+      <module fileurl="file://$PROJECT_DIR$/ButtonProcessor/ButtonProcessor.iml" filepath="$PROJECT_DIR$/ButtonProcessor/ButtonProcessor.iml" />
+      <module fileurl="file://$PROJECT_DIR$/CorePOM/CorePOM.iml" filepath="$PROJECT_DIR$/CorePOM/CorePOM.iml" />
+    </modules>
+  </component>
+</project>

.idea/uiDesigner.xml

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

.idea/vcs.xml

@@ -0,0 +1,6 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<project version="4">
+  <component name="VcsDirectoryMappings">
+    <mapping directory="" vcs="Git" />
+  </component>
+</project>

.travis.yml

@@ -12,10 +12,15 @@ jdk:
   - oraclejdk11
 sudo: true
 deploy:
-  - provider: releases
+  # deploy develop to the staging environment
-    api_key:
+  - provider: script
-      secure: "T/ITeRn4JSx4HS4n44P7vy03HWmJGVpYeR6tABu8qOLrwz2MUCFu8xvYqoq4MiqIKqFIKtZHgCSWiB1WsTIJPHm9S2xYs0BFocoQDthE+eCtT2wgCHj/xdo0wBm8uktXr2hxRF5Nd2R/mfSLkoVxAM6otOoSa1SidRGKgDCJxRnsgssk5igQR+tpahZYPvuzM5xJ4G6J07cC+HHM7RLYXkkKrsK3LFugTsnNtctwmxQkm6SqzDcc8YPwoJGhj8PLbXc5S8/KaWT0//LNdypnzeIaRv+aY+ky/zLntXlw3EFOk4erTthAEMSu2x6PgX5B/paMawdwnqKul/L4ynMGojrLH8ha9KM7p/lze2bxCaf08RFVFvTQt6yzmvM1suL4KH6gAF4mKhyaU0kBeOsnTTskoxyGxvbZgdo0Y1V+Yd7w58eu8zfxnauaX7f2DEz7gH4qkSl+hC7HAFoY7m7IXkgVN6Vuv3lGdFO5S15lbGoihOPqt9T79lBxi/efiXEE4BmA1g8MeLsyN8N/EO+LqVr6xXAKJet6YtOAe/iIAqxpNDSuME1szusc6+4q3jOy6cPmB1TKsfnIKQmbT98SHc9wE4/76VLd2PlNPppa0AIG/g+qnjhjpFQxB7LnWdP+D6io9N1FYrvoOX8UVAp4XYhwUMNLUInDT/6P6j8lL7A="
+    script: chmod +x deploy.sh && sh deploy.sh staging
-    file: 'Chroma-Core/target/Chroma-Core.jar'
     on:
-      tags: true
+      branch: dev
+    skip_cleanup: true
+  # deploy master to production
+  - provider: script
+    script: chmod +x deploy.sh && sh deploy.sh production
+    on:
+      branch: master
     skip_cleanup: true

BuildConfigUpdater/BuildConfigUpdater.iml

@@ -0,0 +1,40 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<module org.jetbrains.idea.maven.project.MavenProjectsManager.isMavenModule="true" type="JAVA_MODULE" version="4">
+  <component name="MavenAnnotationProcessors">
+    <modules>
+      <module name="ButtonProcessor" />
+    </modules>
+  </component>
+  <component name="NewModuleRootManager" LANGUAGE_LEVEL="JDK_1_8">
+    <output url="file://$MODULE_DIR$/target/classes" />
+    <output-test url="file://$MODULE_DIR$/target/test-classes" />
+    <content url="file://$MODULE_DIR$">
+      <sourceFolder url="file://$MODULE_DIR$/src/main/java" isTestSource="false" />
+      <sourceFolder url="file://$MODULE_DIR$/src/main/resources" type="java-resource" />
+      <sourceFolder url="file://$MODULE_DIR$/src/test/java" isTestSource="true" />
+      <sourceFolder url="file://$MODULE_DIR$/target/generated-sources/annotations" isTestSource="false" generated="true" />
+      <excludeFolder url="file://$MODULE_DIR$/target" />
+    </content>
+    <orderEntry type="inheritedJdk" />
+    <orderEntry type="sourceFolder" forTests="false" />
+    <orderEntry type="module" module-name="ButtonCore (1) (com.github.TBMCPlugins.ButtonCore)" />
+    <orderEntry type="library" name="Maven: org.reflections:reflections:0.9.10" level="project" />
+    <orderEntry type="library" name="Maven: com.google.code.findbugs:annotations:2.0.1" level="project" />
+    <orderEntry type="library" name="Maven: org.javassist:javassist:3.20.0-GA" level="project" />
+    <orderEntry type="library" name="Maven: org.mockito:mockito-core:3.0.0" level="project" />
+    <orderEntry type="library" name="Maven: net.bytebuddy:byte-buddy:1.9.10" level="project" />
+    <orderEntry type="library" name="Maven: net.bytebuddy:byte-buddy-agent:1.9.10" level="project" />
+    <orderEntry type="library" name="Maven: org.objenesis:objenesis:2.6" level="project" />
+    <orderEntry type="module" module-name="ButtonProcessor" />
+    <orderEntry type="library" name="Maven: org.spigotmc:spigot-api:1.12.2-R0.1-SNAPSHOT" level="project" />
+    <orderEntry type="library" name="Maven: commons-lang:commons-lang:2.6" level="project" />
+    <orderEntry type="library" name="Maven: com.googlecode.json-simple:json-simple:1.1.1" level="project" />
+    <orderEntry type="library" name="Maven: com.google.guava:guava:21.0" level="project" />
+    <orderEntry type="library" name="Maven: com.google.code.gson:gson:2.8.0" level="project" />
+    <orderEntry type="library" name="Maven: org.yaml:snakeyaml:1.19" level="project" />
+    <orderEntry type="library" name="Maven: net.md-5:bungeecord-chat:1.12-SNAPSHOT" level="project" />
+    <orderEntry type="library" name="Maven: commons-io:commons-io:2.6" level="project" />
+    <orderEntry type="library" scope="TEST" name="Maven: junit:junit:3.8.1" level="project" />
+    <orderEntry type="library" scope="PROVIDED" name="Maven: org.projectlombok:lombok:1.18.10" level="project" />
+  </component>
+</module>

BuildConfigUpdater/pom.xml

@@ -0,0 +1,42 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<project xmlns="http://maven.apache.org/POM/4.0.0"
+         xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
+         xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/xsd/maven-4.0.0.xsd">
+    <parent>
+        <artifactId>ButtonCore</artifactId>
+        <groupId>com.github.TBMCPlugins</groupId>
+        <version>master-SNAPSHOT</version>
+    </parent>
+    <modelVersion>4.0.0</modelVersion>
+
+    <artifactId>BuildConfigUpdater</artifactId>
+
+    <repositories>
+        <repository>
+            <id>Jitpack</id>
+            <url>https://jitpack.io/</url>
+        </repository>
+        <repository>
+            <id>spigot-repo</id>
+            <url>https://hub.spigotmc.org/nexus/content/repositories/snapshots/</url>
+        </repository>
+    </repositories>
+
+    <dependencies>
+        <dependency>
+            <groupId>com.github.TBMCPlugins.ButtonCore</groupId>
+            <artifactId>ButtonCore</artifactId>
+            <version>master-SNAPSHOT</version>
+        </dependency>
+        <dependency> <!-- Needed for TBMCCoreAPI -->
+            <groupId>org.spigotmc</groupId>
+            <artifactId>spigot-api</artifactId>
+            <version>1.12.2-R0.1-SNAPSHOT</version>
+        </dependency>
+        <dependency>
+            <groupId>commons-io</groupId>
+            <artifactId>commons-io</artifactId>
+            <version>2.6</version>
+        </dependency>
+    </dependencies>
+</project>

BuildConfigUpdater/src/main/java/BCUMain.java

@@ -0,0 +1,16 @@
+import buttondevteam.core.component.updater.PluginUpdater;
+
+import java.util.List;
+import java.util.stream.Collectors;
+
+public class BCUMain {
+    public static void main(String[] args) {
+        System.out.println("Getting list of repositories...");
+        List<String> plugins = PluginUpdater.GetPluginNames();
+        System.out.println("Removing non-Maven projects...");
+        plugins.removeIf(plugin -> PluginUpdater.isNotMaven(plugin, "master"));
+        System.out.println(plugins.stream().collect(Collectors.joining("\n")));
+        for (String plugin : plugins) { //TODO: We don't want to apply it all at once, especially to unused/unowned repos
+        } //TODO: Add it to ButtonCore - or actually as a plugin or ButtonProcessor
+    }
+}

ButtonCore/.factorypath

@@ -0,0 +1,2 @@
+<factorypath>
+</factorypath>

ButtonCore/.project

@@ -0,0 +1,23 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<projectDescription>
+	<name>ButtonCore</name>
+	<comment></comment>
+	<projects>
+	</projects>
+	<buildSpec>
+		<buildCommand>
+			<name>org.eclipse.jdt.core.javabuilder</name>
+			<arguments>
+			</arguments>
+		</buildCommand>
+		<buildCommand>
+			<name>org.eclipse.m2e.core.maven2Builder</name>
+			<arguments>
+			</arguments>
+		</buildCommand>
+	</buildSpec>
+	<natures>
+		<nature>org.eclipse.m2e.core.maven2Nature</nature>
+		<nature>org.eclipse.jdt.core.javanature</nature>
+	</natures>
+</projectDescription>

ButtonCore/.settings/org.eclipse.core.resources.prefs

@@ -0,0 +1,6 @@
+eclipse.preferences.version=1
+encoding//src/main/java=UTF-8
+encoding//src/main/resources=UTF-8
+encoding//src/test/java=UTF-8
+encoding/<project>=UTF-8
+encoding/src=UTF-8

ButtonCore/.settings/org.eclipse.jdt.apt.core.prefs

@@ -0,0 +1,4 @@
+eclipse.preferences.version=1
+org.eclipse.jdt.apt.aptEnabled=true
+org.eclipse.jdt.apt.genSrcDir=.apt_generated
+org.eclipse.jdt.apt.reconcileEnabled=true

ButtonCore/.settings/org.eclipse.jdt.core.prefs

@@ -0,0 +1,14 @@
+eclipse.preferences.version=1
+org.eclipse.jdt.core.compiler.codegen.inlineJsrBytecode=enabled
+org.eclipse.jdt.core.compiler.codegen.methodParameters=do not generate
+org.eclipse.jdt.core.compiler.codegen.targetPlatform=1.8
+org.eclipse.jdt.core.compiler.codegen.unusedLocal=preserve
+org.eclipse.jdt.core.compiler.compliance=1.8
+org.eclipse.jdt.core.compiler.debug.lineNumber=generate
+org.eclipse.jdt.core.compiler.debug.localVariable=generate
+org.eclipse.jdt.core.compiler.debug.sourceFile=generate
+org.eclipse.jdt.core.compiler.problem.assertIdentifier=error
+org.eclipse.jdt.core.compiler.problem.enumIdentifier=error
+org.eclipse.jdt.core.compiler.problem.forbiddenReference=warning
+org.eclipse.jdt.core.compiler.processAnnotations=enabled
+org.eclipse.jdt.core.compiler.source=1.8

ButtonCore/.settings/org.eclipse.m2e.core.prefs

@@ -0,0 +1,4 @@
+activeProfiles=
+eclipse.preferences.version=1
+resolveWorkspaceProjects=true
+version=1

ButtonCore/README.md

@@ -0,0 +1,2 @@
+# ButtonCore
+A plugin that serves as a container for things common to many of our plugins

ButtonCore/pom.xml

@@ -1,16 +1,15 @@
 <project xmlns="http://maven.apache.org/POM/4.0.0" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
 	xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/xsd/maven-4.0.0.xsd">
 	<modelVersion>4.0.0</modelVersion>
-	<parent>
+    <parent>
-		<groupId>com.github.TBMCPlugins.ChromaCore</groupId>
+        <groupId>com.github.TBMCPlugins.ButtonCore</groupId>
-		<artifactId>CorePOM</artifactId>
+        <artifactId>CorePOM</artifactId>
-		<version>master-SNAPSHOT</version>
+        <version>master-SNAPSHOT</version>
-		<relativePath>../CorePOM</relativePath>
+        <relativePath>../CorePOM</relativePath>
-	</parent>
+    </parent>
-	<artifactId>Chroma-Core</artifactId>
+	<artifactId>ButtonCore</artifactId>
-	<name>Chroma-Core</name>
+	<name>ButtonCore</name>
-	<description>Chroma-Core</description>
+	<description>ButtonCore</description>
-	<version>v${noprefix.version}-SNAPSHOT</version>
 	<build>
 		<sourceDirectory>src/main/java</sourceDirectory>
 		<resources>
@@ -25,33 +24,22 @@
 				<filtering>true</filtering>
 			</resource>
 		</resources>
-		<finalName>Chroma-Core</finalName>
+		<finalName>ButtonCore</finalName>
 		<plugins>
 			<plugin>
 				<groupId>org.apache.maven.plugins</groupId>
 				<artifactId>maven-shade-plugin</artifactId>
-                <version>3.2.1</version>
+				<version>2.4.2</version>
 				<executions>
 					<execution>
 						<phase>package</phase>
 						<goals>
 							<goal>shade</goal>
 						</goals>
-                        <configuration>
+						<configuration>
-                            <artifactSet>
+							<artifactSet>
-                                <includes>
+							</artifactSet>
-									<include>me.lucko:commodore</include>
+						</configuration>
-									<include>org.javatuples:javatuples</include>
-								</includes>
-                            </artifactSet>
-                            <relocations>
-                                <relocation>
-                                    <pattern>me.lucko.commodore</pattern>
-                                    <!-- vvv Replace with the package of your plugin vvv -->
-                                    <shadedPattern>buttondevteam.core.commodore</shadedPattern>
-                                </relocation>
-                            </relocations>
-                        </configuration>
 					</execution>
 				</executions>
 			</plugin>
@@ -118,21 +106,21 @@
 		<repository>
 			<id>ess-repo</id>
             <url>https://ci.ender.zone/plugin/repository/everything/</url>
+		</repository>
+        <repository>
+            <id>Votifier</id>
+            <url>https://dl.bintray.com/nuvotifier/maven/</url>
         </repository>
         <repository>
             <id>Multiverse-Core</id>
-            <url>https://repo.onarandombox.com/content/groups/public/</url>
+            <url>http://repo.onarandombox.com/content/repositories/multiverse/</url>
         </repository>
-        <repository>
+	</repositories>
-            <id>minecraft-repo</id>
-            <url>https://libraries.minecraft.net/</url>
-        </repository>
-    </repositories>
 	<dependencies>
 		<dependency>
 			<groupId>org.reflections</groupId>
 			<artifactId>reflections</artifactId>
-			<version>0.10.2</version>
+			<version>0.9.10</version>
 			<scope>compile</scope>
 		</dependency>
 		<dependency>
@@ -157,49 +145,37 @@
 		<dependency>
 			<groupId>org.javassist</groupId>
 			<artifactId>javassist</artifactId>
-			<version>3.28.0-GA</version>
+			<version>3.20.0-GA</version>
 		</dependency>
 		<dependency>
 			<groupId>org.mockito</groupId>
 			<artifactId>mockito-core</artifactId>
-			<version>4.2.0</version>
+            <version>3.0.0</version>
 		</dependency>
 		<dependency>
-			<groupId>com.github.TBMCPlugins.ChromaCore</groupId>
+			<groupId>com.github.TBMCPlugins.ButtonCore</groupId>
 			<artifactId>ButtonProcessor</artifactId>
 			<version>master-SNAPSHOT</version>
-			<scope>compile</scope>
+            <scope>compile</scope>
 		</dependency>
 		<dependency>
 			<groupId>net.ess3</groupId>
-			<artifactId>EssentialsX</artifactId>
+            <artifactId>EssentialsX</artifactId>
-			<version>2.17.1</version>
+            <version>2.17.1</version>
 			<scope>provided</scope>
 		</dependency>
-		<!-- https://mvnrepository.com/artifact/com.github.NuVotifier.NuVotifier/nuvotifier-bukkit -->
+        <dependency>
-		<dependency>
+            <groupId>com.vexsoftware</groupId>
-			<groupId>com.github.NuVotifier.NuVotifier</groupId>
+            <artifactId>nuvotifier-universal</artifactId>
-			<artifactId>nuvotifier-bukkit</artifactId>
+            <version>2.3.4</version>
-			<version>v2.7.1</version>
+            <scope>provided</scope>
-			<scope>provided</scope>
+        </dependency>
-		</dependency>
+        <dependency>
-		<dependency>
+            <groupId>com.onarandombox.multiversecore</groupId>
-			<groupId>com.onarandombox.multiversecore</groupId>
+            <artifactId>Multiverse-Core</artifactId>
-			<artifactId>Multiverse-Core</artifactId>
+            <version>4.0.1</version>
-			<version>4.3.1</version>
+            <scope>provided</scope>
-			<scope>provided</scope>
+        </dependency>
-		</dependency>
-		<dependency>
-			<groupId>me.lucko</groupId>
-			<artifactId>commodore</artifactId>
-			<version>1.11</version>
-			<scope>compile</scope>
-		</dependency>
-		<dependency>
-			<groupId>org.javatuples</groupId>
-			<artifactId>javatuples</artifactId>
-			<version>1.2</version>
-		</dependency>
 	</dependencies>
 	<organization>
 		<name>TBMCPlugins</name>
@@ -216,7 +192,6 @@
 		<!-- github server corresponds to entry in ~/.m2/settings.xml -->
 		<github.global.server>github</github.global.server>
 		<project.build.sourceEncoding>UTF-8</project.build.sourceEncoding>
-		<noprefix.version>1.0.1</noprefix.version>
 	</properties>
 	<scm>
 		<url>https://github.com/TBMCPlugins/mvn-repo</url>

ButtonCore/src/main/java/buttondevteam/core/ChromaCommand.java

@@ -0,0 +1,17 @@
+package buttondevteam.core;
+
+import buttondevteam.lib.chat.Command2;
+import buttondevteam.lib.chat.CommandClass;
+import buttondevteam.lib.chat.ICommand2MC;
+import org.bukkit.command.CommandSender;
+
+@CommandClass
+public class ChromaCommand extends ICommand2MC {
+	@Command2.Subcommand //TODO: Main permissions (groups) like 'mod'
+	public void reload(CommandSender sender) {
+		if (MainPlugin.Instance.tryReloadConfig())
+			sender.sendMessage("§bCore config reloaded.");
+		else
+			sender.sendMessage("§cFailed to reload config. Check console.");
+	}
+}

ButtonCore/src/main/java/buttondevteam/core/ComponentCommand.java

@@ -6,17 +6,13 @@ import buttondevteam.lib.architecture.Component;
 import buttondevteam.lib.chat.Command2;
 import buttondevteam.lib.chat.Command2.Subcommand;
 import buttondevteam.lib.chat.CommandClass;
-import buttondevteam.lib.chat.CustomTabCompleteMethod;
 import buttondevteam.lib.chat.ICommand2MC;
 import lombok.val;
 import org.bukkit.Bukkit;
 import org.bukkit.command.CommandSender;
 import org.bukkit.plugin.Plugin;
-import org.bukkit.plugin.java.JavaPlugin;
 
-import java.util.Arrays;
 import java.util.Optional;
-import java.util.stream.Stream;
 
 @CommandClass(modOnly = true, helpText = {
 	"Component command",
@@ -24,15 +20,14 @@ import java.util.stream.Stream;
 })
 public class ComponentCommand extends ICommand2MC {
 	public ComponentCommand() {
-		getManager().addParamConverter(Plugin.class, arg -> Bukkit.getPluginManager().getPlugin(arg), "Plugin not found!",
+		getManager().addParamConverter(Plugin.class, arg -> Bukkit.getPluginManager().getPlugin(arg), "Plugin not found!");
-			() -> Arrays.stream(Bukkit.getPluginManager().getPlugins()).map(Plugin::getName)::iterator);
 	}
 
 	@Subcommand(helpText = {
 		"Enable component",
-		"Temporarily or permanently enables a component."
+		"Temporarily enables a component. If you want to permanently enable a component, change it's 'enabled' config option.\""
 	})
-	public boolean enable(CommandSender sender, Plugin plugin, String component, @Command2.OptionalArg boolean permanent) {
+	public boolean enable(CommandSender sender, Plugin plugin, String component) {
 		if (plugin instanceof ButtonPlugin) {
 			if (!((ButtonPlugin) plugin).justReload()) {
 				sender.sendMessage("§cCouldn't reload config, check console.");
@@ -40,15 +35,15 @@ public class ComponentCommand extends ICommand2MC {
 			}
 		} else
 			plugin.reloadConfig(); //Reload config so the new config values are read - All changes are saved to disk on disable
-		return enable_disable(sender, plugin, component, true, permanent);
+		return enable_disable(sender, plugin, component, true);
 	}
 
 	@Subcommand(helpText = {
 		"Disable component",
-		"Temporarily or permanently disables a component."
+		"Temporarily disables a component. If you want to permanently disable a component, change it's 'enabled' config option."
 	})
-	public boolean disable(CommandSender sender, Plugin plugin, String component, @Command2.OptionalArg boolean permanent) {
+	public boolean disable(CommandSender sender, Plugin plugin, String component) {
-		return enable_disable(sender, plugin, component, false, permanent);
+		return enable_disable(sender, plugin, component, false);
 	}
 
 	@Subcommand(helpText = {
@@ -62,41 +57,25 @@ public class ComponentCommand extends ICommand2MC {
 		return true;
 	}
 
-	@CustomTabCompleteMethod(param = "component", subcommand = {"enable", "disable"})
+	private boolean enable_disable(CommandSender sender, Plugin plugin, String component, boolean enable) {
-	public Iterable<String> componentTabcomplete(Plugin plugin) {
-		return getPluginComponents(plugin).map(c -> c.getClass().getSimpleName())::iterator;
-	}
-
-	@CustomTabCompleteMethod(param = "plugin", subcommand = {"list", "enable", "disable"}, ignoreTypeCompletion = true)
-	public Iterable<String> pluginTabcomplete() {
-		return Component.getComponents().values().stream().map(Component::getPlugin)
-			.distinct().map(Plugin::getName)::iterator;
-	}
-
-	private boolean enable_disable(CommandSender sender, Plugin plugin, String component, boolean enable, boolean permanent) {
 		try {
 			val oc = getComponentOrError(plugin, component, sender);
 			if (!oc.isPresent())
 				return true;
 			Component.setComponentEnabled(oc.get(), enable);
-			if (permanent)
+			sender.sendMessage(oc.get().getClass().getSimpleName() + " " + (enable ? "en" : "dis") + "abled.");
-				oc.get().shouldBeEnabled.set(enable);
-			sender.sendMessage(oc.get().getClass().getSimpleName() + " " + (enable ? "en" : "dis") + "abled " + (permanent ? "permanently" : "temporarily") + ".");
 		} catch (Exception e) {
-			TBMCCoreAPI.SendException("Couldn't " + (enable ? "en" : "dis") + "able component " + component + "!", e, (JavaPlugin) plugin);
+			TBMCCoreAPI.SendException("Couldn't " + (enable ? "en" : "dis") + "able component " + component + "!", e);
 		}
 		return true;
 	}
 
-	private Stream<Component<? extends JavaPlugin>> getPluginComponents(Plugin plugin) {
-		return Component.getComponents().values().stream()
-			.filter(c -> plugin.getName().equals(c.getPlugin().getName()));
-	}
-
 	private Optional<Component<?>> getComponentOrError(Plugin plugin, String arg, CommandSender sender) {
-		val oc = getPluginComponents(plugin).filter(c -> c.getClass().getSimpleName().equalsIgnoreCase(arg)).findAny();
+		val oc = Component.getComponents().values().stream()
+			.filter(c -> plugin.getName().equals(c.getPlugin().getName()))
+			.filter(c -> c.getClass().getSimpleName().equalsIgnoreCase(arg)).findAny();
 		if (!oc.isPresent())
 			sender.sendMessage("§cComponent not found!"); //^ Much simpler to solve in the new command system
 		return oc;
-	}
+	} //TODO: Tabcompletion for the new command system
 }

ButtonCore/src/main/java/buttondevteam/core/ComponentManager.java

@@ -21,11 +21,11 @@ public final class ComponentManager {
 	 */
 	public static void enableComponents() {
 		//Component.getComponents().values().stream().filter(c->cs.getConfigurationSection(c.getClass().getSimpleName()).getBoolean("enabled")).forEach(c-> {
-		Component.getComponents().values().stream().filter(c -> c.shouldBeEnabled.get()).forEach(c -> {
+		Component.getComponents().values().stream().filter(c -> c.shouldBeEnabled().get()).forEach(c -> {
 			try {
 				Component.setComponentEnabled(c, true);
 			} catch (Exception | NoClassDefFoundError e) {
-				TBMCCoreAPI.SendException("Failed to enable one of the components: " + c.getClass().getSimpleName(), e, c);
+				TBMCCoreAPI.SendException("Failed to enable one of the components: " + c.getClass().getSimpleName(), e);
 			}
 		});
 		componentsEnabled = true;

ButtonCore/src/main/java/buttondevteam/core/MainPlugin.java

@@ -8,6 +8,9 @@ import buttondevteam.core.component.randomtp.RandomTPComponent;
 import buttondevteam.core.component.restart.RestartComponent;
 import buttondevteam.core.component.spawn.SpawnComponent;
 import buttondevteam.core.component.towny.TownyComponent;
+import buttondevteam.core.component.updater.PluginUpdater;
+import buttondevteam.core.component.updater.PluginUpdaterComponent;
+import buttondevteam.core.component.votifier.VotifierComponent;
 import buttondevteam.lib.TBMCCoreAPI;
 import buttondevteam.lib.architecture.ButtonPlugin;
 import buttondevteam.lib.architecture.Component;
@@ -23,12 +26,10 @@ import lombok.Setter;
 import net.milkbowl.vault.economy.Economy;
 import net.milkbowl.vault.permission.Permission;
 import org.bukkit.Bukkit;
-import org.bukkit.OfflinePlayer;
 import org.bukkit.command.BlockCommandSender;
 import org.bukkit.command.Command;
 import org.bukkit.command.CommandSender;
 import org.bukkit.command.ConsoleCommandSender;
-import org.bukkit.entity.HumanEntity;
 import org.bukkit.entity.Player;
 import org.bukkit.plugin.PluginDescriptionFile;
 import org.bukkit.plugin.RegisteredServiceProvider;
@@ -37,10 +38,10 @@ import javax.annotation.Nullable;
 import java.io.File;
 import java.io.IOException;
 import java.nio.file.Files;
+import java.nio.file.StandardCopyOption;
 import java.util.Arrays;
 import java.util.Optional;
 import java.util.UUID;
-import java.util.function.Supplier;
 import java.util.logging.Logger;
 
 public class MainPlugin extends ButtonPlugin {
@@ -64,35 +65,48 @@ public class MainPlugin extends ButtonPlugin {
 	 * Sets whether the plugin should write a list of installed plugins in a txt file.
 	 * It can be useful if some other software needs to know the plugins.
 	 */
-	private final ConfigData<Boolean> writePluginList = getIConfig().getData("writePluginList", false);
+	private ConfigData<Boolean> writePluginList() {
+		return getIConfig().getData("writePluginList", false);
+	}
 
 	/**
 	 * The chat format to use for messages from other platforms if Chroma-Chat is not installed.
 	 */
-	ConfigData<String> chatFormat = getIConfig().getData("chatFormat", "[{origin}|" +
+	ConfigData<String> chatFormat() {
-		"{channel}] <{name}> {message}");
+		return getIConfig().getData("chatFormat", "[{origin}|" +
+			"{channel}] <{name}> {message}");
+	}
 
 	/**
 	 * Print some debug information.
 	 */
-	public final ConfigData<Boolean> test = getIConfig().getData("test", false);
+	public ConfigData<Boolean> test() {
+		return getIConfig().getData("test", false);
+	}
 
-	/**
+	/*
-	 * If a Chroma command clashes with another plugin's command, this setting determines whether the Chroma command should be executed or the other plugin's.
+	 * By default, the plugin uses Vault for all command permission checks, but this can have issues (with PEX for example) where default permissions aren't granted.
+	 * When this setting is off, the plugin uses Bukkit's built-in way of handling permissions, which usually works fine for players.
+	 * You can also grant chroma.command.* to each player (mod-only commands need another permission, chroma.mod).
 	 */
-	public final ConfigData<Boolean> prioritizeCustomCommands = getIConfig().getData("prioritizeCustomCommands", false);
+	/*public ConfigData<Boolean> useVaultForCommands() {
+		return getIConfig().getData("useVaultForCommands", true);
+	}*/
 
 	@Override
 	public void pluginEnable() {
+		// Logs "Plugin Enabled", registers commands
 		Instance = this;
 		PluginDescriptionFile pdf = getDescription();
 		logger = getLogger();
 		if (!setupPermissions())
 			throw new NullPointerException("No permission plugin found!");
-		if (!setupEconomy()) //Though Essentials always provides economy, but we don't require Essentials
+		if (!setupEconomy()) //Though Essentials always provides economy so this shouldn't happen
 			getLogger().warning("No economy plugin found! Components using economy will not be registered.");
 		saveConfig();
+		Component.registerComponent(this, new PluginUpdaterComponent());
 		Component.registerComponent(this, new RestartComponent());
+		//noinspection unchecked - needed for testing
 		Component.registerComponent(this, new ChannelComponent());
 		Component.registerComponent(this, new RandomTPComponent());
 		Component.registerComponent(this, new MemberComponent());
@@ -100,18 +114,18 @@ public class MainPlugin extends ButtonPlugin {
 			Component.registerComponent(this, new SpawnComponent());
 		if (Bukkit.getPluginManager().isPluginEnabled("Towny")) //It fails to load the component class otherwise
 			Component.registerComponent(this, new TownyComponent());
-		/*if (Bukkit.getPluginManager().isPluginEnabled("Votifier") && economy != null)
+		if (Bukkit.getPluginManager().isPluginEnabled("Votifier") && economy != null)
-			Component.registerComponent(this, new VotifierComponent(economy));*/
+			Component.registerComponent(this, new VotifierComponent(economy));
 		ComponentManager.enableComponents();
-		registerCommand(new ComponentCommand());
+		getCommand2MC().registerCommand(new ComponentCommand());
-		registerCommand(new ChromaCommand());
+		getCommand2MC().registerCommand(new ChromaCommand());
 		TBMCCoreAPI.RegisterEventsForExceptions(new PlayerListener(), this);
 		TBMCCoreAPI.RegisterEventsForExceptions(getCommand2MC(), this);
 		ChromaGamerBase.addConverter(commandSender -> Optional.ofNullable(commandSender instanceof ConsoleCommandSender || commandSender instanceof BlockCommandSender
 			? TBMCPlayer.getPlayer(new UUID(0, 0), TBMCPlayer.class) : null)); //Console & cmdblocks
 		ChromaGamerBase.addConverter(sender -> Optional.ofNullable(sender instanceof Player
 			? TBMCPlayer.getPlayer(((Player) sender).getUniqueId(), TBMCPlayer.class) : null)); //Players, has higher priority
-		TBMCCoreAPI.RegisterUserClass(TBMCPlayerBase.class, TBMCPlayer::new);
+		TBMCCoreAPI.RegisterUserClass(TBMCPlayerBase.class);
 		TBMCChatAPI.RegisterChatChannel(Channel.GlobalChat = new Channel("§fg§f", Color.White, "g", null)); //The /ooc ID has moved to the config
 		TBMCChatAPI.RegisterChatChannel(
 			Channel.AdminChat = new Channel("§cADMIN§f", Color.Red, "a", Channel.inGroupFilter(null)));
@@ -124,26 +138,38 @@ public class MainPlugin extends ButtonPlugin {
 		TBMCChatAPI.RegisterChatChannel(new ChatRoom("§aGREEN§f", Color.Green, "green"));
 		TBMCChatAPI.RegisterChatChannel(new ChatRoom("§bBLUE§f", Color.Blue, "blue"));
 		TBMCChatAPI.RegisterChatChannel(new ChatRoom("§5PURPLE§f", Color.DarkPurple, "purple"));
-		Supplier<Iterable<String>> playerSupplier = () -> Bukkit.getOnlinePlayers().stream().map(HumanEntity::getName)::iterator;
+		if (writePluginList().get()) {
-		getCommand2MC().addParamConverter(OfflinePlayer.class, Bukkit::getOfflinePlayer, "Player not found!", playerSupplier);
-		getCommand2MC().addParamConverter(Player.class, Bukkit::getPlayer, "Online player not found!", playerSupplier);
-		if (writePluginList.get()) {
 			try {
 				Files.write(new File("plugins", "plugins.txt").toPath(), Arrays.stream(Bukkit.getPluginManager().getPlugins()).map(p -> (CharSequence) p.getDataFolder().getName())::iterator);
 			} catch (IOException e) {
-				TBMCCoreAPI.SendException("Failed to write plugin list!", e, this);
+				TBMCCoreAPI.SendException("Failed to write plugin list!", e);
 			}
 		}
 		if (getServer().getPluginManager().isPluginEnabled("Essentials"))
 			ess = Essentials.getPlugin(Essentials.class);
-		logger.info(pdf.getName() + " has been Enabled (V." + pdf.getVersion() + ") Test: " + test.get() + ".");
+		logger.info(pdf.getName() + " has been Enabled (V." + pdf.getVersion() + ") Test: " + test().get() + ".");
 	}
 
 	@Override
 	public void pluginDisable() {
 		logger.info("Saving player data...");
-		ChromaGamerBase.saveUsers();
+		TBMCPlayerBase.savePlayers();
 		logger.info("Player data saved.");
+		new Thread(() -> {
+			File[] files = PluginUpdater.updatedir.listFiles();
+			if (files == null)
+				return;
+			logger.info("Updating " + files.length + " plugins...");
+			for (File file : files) {
+				try {
+					Files.move(file.toPath(), new File("plugins", file.getName()).toPath(), StandardCopyOption.REPLACE_EXISTING);
+					logger.info("Updated " + file.getName());
+				} catch (IOException e) {
+					e.printStackTrace();
+				}
+			}
+			logger.info("Update complete!");
+		}).start();
 	}
 
 	private boolean setupPermissions() {

ButtonCore/src/main/java/buttondevteam/core/PlayerListener.java

@@ -5,7 +5,6 @@ import buttondevteam.lib.architecture.ButtonPlugin;
 import buttondevteam.lib.chat.ChatMessage;
 import buttondevteam.lib.chat.Command2MCSender;
 import buttondevteam.lib.chat.TBMCChatAPI;
-import buttondevteam.lib.player.ChromaGamerBase;
 import buttondevteam.lib.player.TBMCPlayer;
 import buttondevteam.lib.player.TBMCPlayerBase;
 import lombok.val;
@@ -28,32 +27,23 @@ public class PlayerListener implements Listener {
 
 	@EventHandler(priority = EventPriority.NORMAL)
 	public void OnPlayerJoin(PlayerJoinEvent event) {
-		var p = event.getPlayer();
+		TBMCPlayerBase.joinPlayer(event.getPlayer());
-		TBMCPlayer player = TBMCPlayerBase.getPlayer(p.getUniqueId(), TBMCPlayer.class);
-		String pname = player.PlayerName.get();
-		if (pname.length() == 0) {
-			player.PlayerName.set(p.getName());
-			MainPlugin.Instance.getLogger().info("Player name saved: " + player.PlayerName.get());
-		} else if (!p.getName().equals(pname)) {
-			MainPlugin.Instance.getLogger().info(pname + " renamed to " + p.getName());
-			player.PlayerName.set(p.getName());
-		}
 	}
 
 	@EventHandler(priority = EventPriority.NORMAL)
 	public void OnPlayerLeave(PlayerQuitEvent event) {
-		TBMCPlayerBase.getPlayer(event.getPlayer().getUniqueId(), TBMCPlayer.class).uncache();
+		TBMCPlayerBase.quitPlayer(event.getPlayer());
 	}
 
 	@EventHandler(priority = EventPriority.HIGHEST)
 	public void onSystemChat(TBMCSystemChatEvent event) {
-		if (event.isHandled())
+        if (event.isHandled())
-			return; // Only handle here if ButtonChat couldn't - ButtonChat doesn't even handle this
+	        return; // Only handle here if ButtonChat couldn't - ButtonChat doesn't even handle this
 		if (Arrays.stream(event.getExceptions()).anyMatch("Minecraft"::equalsIgnoreCase))
 			return;
-		Bukkit.getOnlinePlayers().stream().filter(event::shouldSendTo)
+        Bukkit.getOnlinePlayers().stream().filter(event::shouldSendTo)
-			.forEach(p -> p.sendMessage(event.getChannel().DisplayName.get().substring(0, 2) + event.getMessage()));
+	        .forEach(p -> p.sendMessage(event.getChannel().DisplayName().get().substring(0, 2) + event.getMessage()));
-	}
+    }
 
 	@EventHandler
 	public void onPlayerChatPreprocess(PlayerCommandPreprocessEvent event) {
@@ -68,9 +58,7 @@ public class PlayerListener implements Listener {
 
 	private void handlePreprocess(CommandSender sender, String message, Cancellable event) {
 		if (event.isCancelled()) return;
-		val cg = ChromaGamerBase.getFromSender(sender);
+		val ev = new TBMCCommandPreprocessEvent(sender, message);
-		if (cg == null) throw new RuntimeException("Couldn't get user from sender for " + sender.getName() + "!");
-		val ev = new TBMCCommandPreprocessEvent(sender, cg.channel.get(), message, sender);
 		Bukkit.getPluginManager().callEvent(ev);
 		if (ev.isCancelled())
 			event.setCancelled(true); //Cancel the original event
@@ -80,9 +68,9 @@ public class PlayerListener implements Listener {
 	public void onTBMCPreprocess(TBMCCommandPreprocessEvent event) {
 		if (event.isCancelled()) return;
 		try {
-			event.setCancelled(ButtonPlugin.getCommand2MC().handleCommand(new Command2MCSender(event.getSender(), event.getChannel(), event.getPermCheck()), event.getMessage()));
+			event.setCancelled(ButtonPlugin.getCommand2MC().handleCommand(new Command2MCSender(event.getSender()), event.getMessage()));
 		} catch (Exception e) {
-			TBMCCoreAPI.SendException("Command processing failed for sender '" + event.getSender() + "' and message '" + event.getMessage() + "'", e, MainPlugin.Instance);
+			TBMCCoreAPI.SendException("Command processing failed for sender '" + event.getSender() + "' and message '" + event.getMessage() + "'", e);
 		}
 	}
 
@@ -102,12 +90,11 @@ public class PlayerListener implements Listener {
 			return;
 		if (!MainPlugin.Instance.isChatHandlerEnabled()) return;
 		if (event.getOrigin().equals("Minecraft")) return; //Let other plugins handle MC messages
-		var channel = event.getChannel();
+		String msg = MainPlugin.Instance.chatFormat().get()
-		String msg = MainPlugin.Instance.chatFormat.get()
+			.replace("{channel}", event.getChannel().DisplayName().get())
-			.replace("{channel}", channel.DisplayName.get())
 			.replace("{origin}", event.getOrigin().substring(0, 1))
 			.replace("{name}", ChromaUtils.getDisplayName(event.getSender()))
-			.replace("{message}", String.format("§%x%s", channel.Color.get().ordinal(), event.getMessage()));
+			.replace("{message}", event.getMessage());
 		for (Player player : Bukkit.getOnlinePlayers())
 			if (event.shouldSendTo(player))
 				player.sendMessage(msg);

ButtonCore/src/main/java/buttondevteam/core/TestPrepare.java

@@ -2,7 +2,6 @@ package buttondevteam.core;
 
 import buttondevteam.core.component.channel.Channel;
 import buttondevteam.core.component.channel.ChannelComponent;
-import buttondevteam.lib.ChromaUtils;
 import buttondevteam.lib.architecture.Component;
 import buttondevteam.lib.chat.Color;
 import buttondevteam.lib.chat.TBMCChatAPI;
@@ -20,13 +19,11 @@ import java.util.Collections;
 import java.util.logging.Logger;
 
 public class TestPrepare {
-
 	public static void PrepareServer() {
-		ChromaUtils.setTest(); //Needs to be in a separate class because of the potential lack of Mockito
 		Bukkit.setServer(Mockito.mock(Server.class, new Answer<Object>() {
 
 			@Override
-			public Object answer(InvocationOnMock invocation) {
+            public Object answer(InvocationOnMock invocation) {
 				if (returns(invocation, String.class))
 					return "test";
 				if (returns(invocation, Logger.class))
@@ -44,6 +41,7 @@ public class TestPrepare {
 				return cl.isAssignableFrom(invocation.getMethod().getReturnType());
 			}
 		}));
+		//noinspection unchecked
 		Component.registerComponent(Mockito.mock(JavaPlugin.class), new ChannelComponent());
 		TBMCChatAPI.RegisterChatChannel(Channel.GlobalChat = new Channel("§fg§f", Color.White, "g", null));
 	}

ButtonCore/src/main/java/buttondevteam/core/component/channel/Channel.java

@@ -0,0 +1,231 @@
+package buttondevteam.core.component.channel;
+
+import buttondevteam.core.ComponentManager;
+import buttondevteam.core.MainPlugin;
+import buttondevteam.lib.architecture.Component;
+import buttondevteam.lib.architecture.ConfigData;
+import buttondevteam.lib.chat.Color;
+import com.google.common.collect.Lists;
+import org.bukkit.Bukkit;
+import org.bukkit.command.CommandSender;
+import org.bukkit.entity.Player;
+
+import javax.annotation.Nullable;
+import java.util.ArrayList;
+import java.util.Collections;
+import java.util.List;
+import java.util.function.BiFunction;
+import java.util.function.BiPredicate;
+import java.util.function.Function;
+import java.util.function.Predicate;
+import java.util.stream.Stream;
+
+public class Channel {
+    /**
+     * Specifies a score that means it's OK to send - but it does not define any groups, only send or not send. See {@link #GROUP_EVERYONE}
+     */
+    public static final int SCORE_SEND_OK = 0;
+    /**
+     * Specifies a score that means the user doesn't have permission to see or send the message. Any negative value has the same effect.
+     */
+    public static final int SCORE_SEND_NOPE = -1;
+    /**
+     * Send the message to everyone <i>who has access to the channel</i> - this does not necessarily mean all players
+     */
+    public static final String GROUP_EVERYONE = "everyone";
+
+	private static ChannelComponent component;
+
+	private String defDisplayName;
+	private Color defColor;
+
+	private void throwGame() {
+		if (component == null) throw new RuntimeException("Cannot access channel properties until registered!");
+	}
+
+	public final ConfigData<Boolean> Enabled() {
+		throwGame();
+		return component.getConfig().getData(ID + ".enabled", true);
+	}
+
+	/**
+	 * Must start with a color code
+	 */
+	public final ConfigData<String> DisplayName() {
+		throwGame();
+		return component.getConfig().getData(ID + ".displayName", defDisplayName); //TODO: Use config map
+	}
+
+	public final ConfigData<Color> Color() {
+		throwGame();
+		return component.getConfig().getData(ID + ".color", defColor, c -> Color.valueOf((String) c), Enum::toString);
+	}
+    public final String ID;
+
+	@SuppressWarnings("unchecked")
+	public ConfigData<String[]> IDs() {
+		throwGame();
+		return component.getConfig().getData(ID + ".IDs", new String[0], l -> ((List<String>) l).toArray(new String[0]), Lists::newArrayList);
+	}
+    /**
+     * Filters both the sender and the targets
+     */
+    private final Function<CommandSender, RecipientTestResult> filteranderrormsg;
+
+    private static final List<Channel> channels = new ArrayList<>();
+
+    /**
+     * Creates a channel.
+     *
+     * @param displayname       The name that should appear at the start of the message. <b>A chat color is expected at the beginning (§9).</b>
+     * @param color             The default color of the messages sent in the channel
+     * @param command           The command to be used for the channel <i>without /</i>. For example "mod". It's also used for scoreboard objective names.
+     * @param filteranderrormsg Checks all senders against the criteria provided here and sends the message if the index matches the sender's - if no score at all, displays the error.<br>
+     *                          May be null to send to everyone.
+     */
+    public Channel(String displayname, Color color, String command,
+                   Function<CommandSender, RecipientTestResult> filteranderrormsg) {
+	    defDisplayName = displayname;
+	    defColor = color;
+        ID = command;
+        this.filteranderrormsg = filteranderrormsg;
+    }
+
+    /**
+     * Must be only called from a subclass - otherwise it'll throw an exception.
+     *
+     * @see Channel#Channel(String, Color, String, Function)
+     */
+    @SuppressWarnings("unchecked")
+    protected <T extends Channel> Channel(String displayname, Color color, String command,
+                                          BiFunction<T, CommandSender, RecipientTestResult> filteranderrormsg) {
+	    defDisplayName = displayname;
+	    defColor = color;
+        ID = command;
+        this.filteranderrormsg = s -> filteranderrormsg.apply((T) this, s);
+    }
+
+    public boolean isGlobal() {
+        return filteranderrormsg == null;
+    }
+
+    /**
+     * Note: Errors are sent to the sender automatically
+     *
+     * @param sender The user we're sending to
+     * @param score  The (source) score to compare with the user's
+     */
+    public boolean shouldSendTo(CommandSender sender, int score) {
+        return score == getMCScore(sender); //If there's any error, the score won't be equal
+    }
+
+    /**
+     * Note: Errors are sent to the sender automatically
+     */
+    public int getMCScore(CommandSender sender) {
+        return getRTR(sender).score; //No need to check if there was an error
+    }
+
+    /**
+     * Note: Errors are sent to the sender automatically<br>
+     * <p>
+     * Null means don't send
+     */
+    @Nullable
+    public String getGroupID(CommandSender sender) {
+        return getRTR(sender).groupID; //No need to check if there was an error
+    }
+
+    public RecipientTestResult getRTR(CommandSender sender) {
+        if (filteranderrormsg == null)
+            return new RecipientTestResult(SCORE_SEND_OK, GROUP_EVERYONE);
+        return filteranderrormsg.apply(sender);
+    }
+
+	/**
+	 * Get a stream of the enabled channels
+	 *
+	 * @return Only the enabled channels
+	 */
+	public static Stream<Channel> getChannels() {
+		return channels.stream().filter(ch -> ch.Enabled().get());
+	}
+
+	/**
+	 * Return all channels whether they're enabled or not
+	 *
+	 * @return A list of all channels
+	 */
+	public static List<Channel> getChannelList() {
+		return Collections.unmodifiableList(channels);
+	}
+
+    /**
+     * Convenience method for the function parameter of {@link #Channel(String, Color, String, Function)}. It checks if the sender is OP or optionally has the specified group. The error message is
+     * generated automatically.
+     *
+     * @param permgroup The group that can access the channel or <b>null</b> to only allow OPs.
+     * @return If has access
+     */
+    public static Function<CommandSender, RecipientTestResult> inGroupFilter(String permgroup) {
+        return noScoreResult(
+                s -> s.isOp() || (permgroup != null && (s instanceof Player && MainPlugin.permission != null && MainPlugin.permission.playerInGroup((Player) s, permgroup))),
+                "You need to be a(n) " + (permgroup != null ? permgroup : "OP") + " to use this channel.");
+    }
+
+    public static Function<CommandSender, RecipientTestResult> noScoreResult(Predicate<CommandSender> filter,
+                                                                             String errormsg) {
+        return s -> filter.test(s) ? new RecipientTestResult(SCORE_SEND_OK, GROUP_EVERYONE) : new RecipientTestResult(errormsg);
+    }
+
+    public static <T extends Channel> BiFunction<T, CommandSender, RecipientTestResult> noScoreResult(
+            BiPredicate<T, CommandSender> filter, String errormsg) {
+        return (this_, s) -> filter.test(this_, s) ? new RecipientTestResult(SCORE_SEND_OK, GROUP_EVERYONE) : new RecipientTestResult(errormsg);
+    }
+
+    public static Channel GlobalChat;
+    public static Channel AdminChat;
+    public static Channel ModChat;
+
+	public static void RegisterChannel(Channel channel) {
+		if (!channel.isGlobal() && !ComponentManager.isEnabled(ChannelComponent.class))
+			return; //Allow registering the global chat (and I guess other chats like the RP chat)
+		if (component == null)
+			component = (ChannelComponent) Component.getComponents().get(ChannelComponent.class);
+		if (component == null)
+			throw new RuntimeException("Attempting to register a channel before the component is registered!");
+		channels.add(channel);
+		Bukkit.getScheduler().runTask(MainPlugin.Instance, () -> Bukkit.getPluginManager().callEvent(new ChatChannelRegisterEvent(channel))); // Wait for server start
+    }
+
+    public static class RecipientTestResult {
+        public final String errormessage;
+        public final int score; // Anything below 0 is "never send"
+        public final String groupID;
+        public static final RecipientTestResult ALL = new RecipientTestResult(SCORE_SEND_OK, GROUP_EVERYONE);
+
+        /**
+         * Creates a result that indicates an <b>error</b>
+         *
+         * @param errormessage The error message to show the sender if they don't meet the criteria.
+         */
+        public RecipientTestResult(String errormessage) {
+            this.errormessage = errormessage;
+            this.score = SCORE_SEND_NOPE;
+            this.groupID = null;
+        }
+
+        /**
+         * Creates a result that indicates a <b>success</b>
+         *
+         * @param score The score that identifies the target group. <b>Must be non-negative.</b> For example, the index of the town or nation to send to.
+         * @param groupID The ID of the target group.
+         */
+        public RecipientTestResult(int score, String groupID) {
+            if (score < 0) throw new IllegalArgumentException("Score must be non-negative!");
+            this.score = score;
+            this.groupID = groupID;
+            this.errormessage = null;
+        }
+    }
+}

ButtonCore/src/main/java/buttondevteam/core/component/channel/ChannelComponent.java

@@ -0,0 +1,34 @@
+package buttondevteam.core.component.channel;
+
+import buttondevteam.lib.TBMCSystemChatEvent;
+import buttondevteam.lib.architecture.Component;
+import org.bukkit.plugin.java.JavaPlugin;
+
+/**
+ * Manages chat channels. If disabled, only global channels will be registered.
+ */
+public class ChannelComponent extends Component {
+	static TBMCSystemChatEvent.BroadcastTarget roomJoinLeave;
+
+	@Override
+	protected void register(JavaPlugin plugin) {
+		super.register(plugin);
+		roomJoinLeave = TBMCSystemChatEvent.BroadcastTarget.add("roomJoinLeave"); //Even if it's disabled, global channels continue to work
+	}
+
+	@Override
+	protected void unregister(JavaPlugin plugin) {
+		super.unregister(plugin);
+		TBMCSystemChatEvent.BroadcastTarget.remove(roomJoinLeave);
+		roomJoinLeave = null;
+	}
+
+	@Override
+	protected void enable() {
+	}
+
+	@Override
+	protected void disable() {
+
+	}
+}

ButtonCore/src/main/java/buttondevteam/core/component/members/MemberCommand.java

@@ -7,11 +7,8 @@ import buttondevteam.lib.chat.ICommand2MC;
 import org.bukkit.Bukkit;
 import org.bukkit.OfflinePlayer;
 import org.bukkit.command.CommandSender;
-import org.bukkit.entity.Player;
 
-import java.util.concurrent.TimeUnit;
+@CommandClass(modOnly = true, path = "member", helpText = { //
-
-@CommandClass(path = "member", helpText = { //
 	"Member command", //
 	"Add or remove server members.", //
 })
@@ -19,15 +16,16 @@ public class MemberCommand extends ICommand2MC {
 	private final MemberComponent component;
 
 	public MemberCommand(MemberComponent component) {
+		getManager().addParamConverter(OfflinePlayer.class, Bukkit::getOfflinePlayer, "Player not found!");
 		this.component = component;
 	}
 
-	@Command2.Subcommand(permGroup = Command2.Subcommand.MOD_GROUP)
+	@Command2.Subcommand
 	public boolean add(CommandSender sender, OfflinePlayer player) {
 		return addRemove(sender, player, true);
 	}
 
-	@Command2.Subcommand(permGroup = Command2.Subcommand.MOD_GROUP)
+	@Command2.Subcommand
 	public boolean remove(CommandSender sender, OfflinePlayer player) {
 		return addRemove(sender, player, false);
 	}
@@ -38,35 +36,12 @@ public class MemberCommand extends ICommand2MC {
 				sender.sendMessage("§cCannot find player or haven't played before.");
 				return;
 			}
-			if (add ? MainPlugin.permission.playerAddGroup(null, op, component.memberGroup.get())
+			if (add ? MainPlugin.permission.playerAddGroup(null, op, component.memberGroup().get())
-				: MainPlugin.permission.playerRemoveGroup(null, op, component.memberGroup.get()))
+				: MainPlugin.permission.playerRemoveGroup(null, op, component.memberGroup().get()))
 				sender.sendMessage("§b" + op.getName() + " " + (add ? "added" : "removed") + " as a member!");
 			else
 				sender.sendMessage("§cFailed to " + (add ? "add" : "remove") + " " + op.getName() + " as a member!");
 		});
 		return true;
 	}
-
-	@Command2.Subcommand
-	public void def(Player player) {
-		String msg;
-		if (!component.checkNotMember(player))
-			msg = "You are a member.";
-		else {
-			double pt = component.getPlayTime(player);
-			long rt = component.getRegTime(player);
-			if (pt == -1 || rt == -1) {
-				Boolean result = component.addPlayerAsMember(player);
-				if (result == null)
-					msg = "Can't assign member group because groups are not supported by the permissions plugin.";
-				else if (result)
-					msg = "You meet all the requirements.";
-				else
-					msg = "You should be a member but failed to add you to the group.";
-			} else
-				msg = String.format("You need to play for %.2f hours total or play for %d more days to become a member.",
-					pt, TimeUnit.MILLISECONDS.toDays(rt));
-		}
-		player.sendMessage(msg);
-	}
 }

ButtonCore/src/main/java/buttondevteam/core/component/members/MemberComponent.java

@@ -0,0 +1,80 @@
+package buttondevteam.core.component.members;
+
+import buttondevteam.core.MainPlugin;
+import buttondevteam.lib.architecture.Component;
+import buttondevteam.lib.architecture.ComponentMetadata;
+import buttondevteam.lib.architecture.ConfigData;
+import org.bukkit.Statistic;
+import org.bukkit.event.EventHandler;
+import org.bukkit.event.Listener;
+import org.bukkit.event.player.PlayerJoinEvent;
+
+import java.time.Instant;
+import java.time.temporal.ChronoUnit;
+import java.util.AbstractMap;
+import java.util.Date;
+
+import static buttondevteam.core.MainPlugin.permission;
+
+/**
+ * Allows giving a 'member' group over some time elapsed OR played.
+ */
+@ComponentMetadata(enabledByDefault = false)
+public class MemberComponent extends Component<MainPlugin> implements Listener {
+	/**
+	 * The permission group to give to the player
+	 */
+	ConfigData<String> memberGroup() {
+		return getConfig().getData("memberGroup", "member");
+	}
+
+	/**
+	 * The amount of hours needed to play before promotion
+	 */
+	private ConfigData<Integer> playedHours() {
+		return getConfig().getData("playedHours", 12);
+	}
+
+	/**
+	 * The amount of days passed since first login
+	 */
+	private ConfigData<Integer> registeredForDays() {
+		return getConfig().getData("registeredForDays", 7);
+	}
+
+	private AbstractMap.SimpleEntry<Statistic, Integer> playtime;
+
+	@Override
+	protected void enable() {
+		registerListener(this);
+		registerCommand(new MemberCommand(this));
+		try {
+			playtime = new AbstractMap.SimpleEntry<>(Statistic.valueOf("PLAY_ONE_MINUTE"), 60); //1.14
+		} catch (IllegalArgumentException e) {
+			playtime = new AbstractMap.SimpleEntry<>(Statistic.valueOf("PLAY_ONE_TICK"), 20 * 3600); //1.12
+		}
+	}
+
+	@Override
+	protected void disable() {
+	}
+
+	@EventHandler
+	public void onPlayerJoin(PlayerJoinEvent event) {
+		if (permission != null && !permission.playerInGroup(event.getPlayer(), memberGroup().get())
+			&& (new Date(event.getPlayer().getFirstPlayed()).toInstant().plus(registeredForDays().get(), ChronoUnit.DAYS).isBefore(Instant.now())
+			|| event.getPlayer().getStatistic(playtime.getKey()) > playtime.getValue() * playedHours().get())) {
+			try {
+				if (permission.playerAddGroup(null, event.getPlayer(), memberGroup().get())) {
+					event.getPlayer().sendMessage("§bYou are a member now. YEEHAW");
+					MainPlugin.Instance.getLogger().info("Added " + event.getPlayer().getName() + " as a member.");
+				} else {
+					MainPlugin.Instance.getLogger().warning("Failed to assign the member role! Please make sure the member group exists or disable the component if it's unused.");
+				}
+			} catch (UnsupportedOperationException e) {
+				MainPlugin.Instance.getLogger().warning("Failed to assign the member role! Groups are not supported by the permissions implementation.");
+			}
+		}
+	}
+
+}

ButtonCore/src/main/java/buttondevteam/core/component/randomtp/RandomTP.java

@@ -59,10 +59,11 @@ public class RandomTP extends ICommand2MC
 	{
 		world = Bukkit.getWorld("World");
 		border = world.getWorldBorder();
-		component.log("Getting new location");
+		Logger logger = component.getPlugin().getLogger();
+		logger.info("Getting new location");
 		if(border.getSize() > 100000)
-			component.logWarn("World border is wide, it may take a minute...");
+			logger.warning("World border is wide, it may take a minute...");
-		component.log("Success: "+newLocation());
+		logger.info("Success: "+newLocation());
 	}
 	
 	/*================================================================================================*/

ButtonCore/src/main/java/buttondevteam/core/component/restart/PrimeRestartCommand.java

@@ -21,7 +21,6 @@ import org.bukkit.command.CommandSender;
 public class PrimeRestartCommand extends ICommand2MC {
 	private final RestartComponent component;
 
-	@Command2.Subcommand
 	public void def(CommandSender sender, @Command2.TextArg @Command2.OptionalArg String somethingrandom) {
 		loud = somethingrandom != null;
 		if (Bukkit.getOnlinePlayers().size() > 0) {

ButtonCore/src/main/java/buttondevteam/core/component/restart/RestartComponent.java

@@ -4,8 +4,6 @@ import buttondevteam.core.MainPlugin;
 import buttondevteam.core.component.channel.Channel;
 import buttondevteam.lib.TBMCSystemChatEvent;
 import buttondevteam.lib.architecture.Component;
-import buttondevteam.lib.architecture.ComponentMetadata;
-import buttondevteam.lib.architecture.ConfigData;
 import buttondevteam.lib.chat.IFakePlayer;
 import buttondevteam.lib.chat.TBMCChatAPI;
 import lombok.Getter;
@@ -15,29 +13,16 @@ import org.bukkit.event.EventHandler;
 import org.bukkit.event.Listener;
 import org.bukkit.event.player.PlayerQuitEvent;
 
-import java.time.ZoneId;
-import java.time.ZoneOffset;
-import java.time.ZonedDateTime;
-
 /**
- * Provides commands such as /schrestart (restart after a countdown) and /primerestart (restart when nobody is online).
+ * Provides commands such as /schrestart (restart after a countdown) and /primerestart (restart when nobody is online)
- * Also can automatically restart at a given time.
  */
-@ComponentMetadata(enabledByDefault = false)
 public class RestartComponent extends Component<MainPlugin> implements Listener {
 	@Override
 	public void enable() {
-		var scheduledRestartCommand = new ScheduledRestartCommand(this);
+		registerCommand(new ScheduledRestartCommand(this));
-		registerCommand(scheduledRestartCommand);
 		registerCommand(new PrimeRestartCommand(this));
 		registerListener(this);
 		restartBroadcast = TBMCSystemChatEvent.BroadcastTarget.add("restartCountdown");
-
-		int restartAt = this.restartAt.get();
-		if (restartAt < 0) return;
-		int restart = syncStart(restartAt);
-		log("Scheduled restart " + (restart / 3600. / 20.) + " hours from now");
-		Bukkit.getScheduler().runTaskLater(getPlugin(), () -> scheduledRestartCommand.def(Bukkit.getConsoleSender(), 0), restart);
 	}
 
 	@Override
@@ -45,28 +30,10 @@ public class RestartComponent extends Component<MainPlugin> implements Listener
 		TBMCSystemChatEvent.BroadcastTarget.remove(restartBroadcast);
 	}
 
-	/**
-	 * Specifies the hour of day when the server should be restarted. Set to -1 to disable.
-	 */
-	private final ConfigData<Integer> restartAt = getConfig().getData("restartAt", 12);
-
 	private long lasttime = 0;
 	@Getter
 	private TBMCSystemChatEvent.BroadcastTarget restartBroadcast;
 
-	private int syncStart(int hour) {
-		var now = ZonedDateTime.now(ZoneId.ofOffset("", ZoneOffset.UTC));
-		int secs = now.getHour() * 3600 + now.getMinute() * 60 + now.getSecond();
-		int diff = secs - hour * 3600;
-		if (diff < 0) {
-			diff += 24 * 3600;
-		}
-		int count = diff / (24 * 3600);
-		int intervalPart = diff - count * 24 * 3600;
-		int remaining = 24 * 3600 - intervalPart;
-		return remaining * 20;
-	}
-
 	@EventHandler
 	public void onPlayerLeave(PlayerQuitEvent event) {
 		if (PrimeRestartCommand.isPlsrestart()
@@ -76,7 +43,7 @@ public class RestartComponent extends Component<MainPlugin> implements Listener
 				if (PrimeRestartCommand.isLoud())
 					TBMCChatAPI.SendSystemMessage(Channel.GlobalChat, Channel.RecipientTestResult.ALL, "§cNobody is online anymore. Restarting.", restartBroadcast);
 				Bukkit.spigot().restart();
-			} else if (!(event.getPlayer() instanceof IFakePlayer) && System.nanoTime() - 10 * 60 * 1000000000L - lasttime > 0) { //10 minutes passed since last reminder
+			} else if (!(event.getPlayer() instanceof IFakePlayer) && System.nanoTime() - 10 * 1000000000L - lasttime > 0) { //Ten seconds passed since last reminder
 				lasttime = System.nanoTime();
 				if (PrimeRestartCommand.isLoud())
 					TBMCChatAPI.SendSystemMessage(Channel.GlobalChat, Channel.RecipientTestResult.ALL, ChatColor.DARK_RED + "The server will restart as soon as nobody is online.", restartBroadcast);

ButtonCore/src/main/java/buttondevteam/core/component/restart/ScheduledRestartCommand.java

@@ -18,8 +18,6 @@ import org.bukkit.boss.BossBar;
 import org.bukkit.command.CommandSender;
 import org.bukkit.scheduler.BukkitTask;
 
-import javax.annotation.Nonnull;
-
 @CommandClass(modOnly = true, path = "schrestart", helpText = {
 	"Scheduled restart", //
 	"This command restarts the server 1 minute after it's executed, warning players every 10 seconds.", //
@@ -33,7 +31,6 @@ public class ScheduledRestartCommand extends ICommand2MC {
 	private BukkitTask restarttask;
 	private volatile BossBar restartbar;
 	@Getter
-	@Nonnull
 	private final RestartComponent component;
 
 	@Command2.Subcommand
@@ -45,20 +42,20 @@ public class ScheduledRestartCommand extends ICommand2MC {
 		}
 		final int restarttime = restartCounter = seconds * 20;
 		restartbar = Bukkit.createBossBar("Server restart in " + seconds + "s", BarColor.RED, BarStyle.SOLID,
-			BarFlag.DARKEN_SKY);
+				BarFlag.DARKEN_SKY);
 		restartbar.setProgress(1);
-		Bukkit.getOnlinePlayers().forEach(p -> restartbar.addPlayer(p));
+        Bukkit.getOnlinePlayers().forEach(p -> restartbar.addPlayer(p));
 		sender.sendMessage("Scheduled restart in " + seconds);
 		ScheduledServerRestartEvent e = new ScheduledServerRestartEvent(restarttime, this);
 		Bukkit.getPluginManager().callEvent(e);
 		restarttask = Bukkit.getScheduler().runTaskTimer(MainPlugin.Instance, () -> {
 			if (restartCounter < 0) {
 				restarttask.cancel();
-				restartbar.getPlayers().forEach(p -> restartbar.removePlayer(p));
+                restartbar.getPlayers().forEach(p -> restartbar.removePlayer(p));
 				Bukkit.spigot().restart();
 			}
-			if (restartCounter % 200 == 0 && Bukkit.getOnlinePlayers().size() > 0)
+			if (restartCounter % 200 == 0)
-				TBMCChatAPI.SendSystemMessage(Channel.GlobalChat, Channel.RecipientTestResult.ALL, "§c-- The server is restarting in " + restartCounter / 20 + " seconds!", component.getRestartBroadcast());
+				TBMCChatAPI.SendSystemMessage(Channel.GlobalChat, Channel.RecipientTestResult.ALL, "§c-- The server is restarting in " + restartCounter / 20 + " seconds! (/press)", component.getRestartBroadcast());
 			restartbar.setProgress(restartCounter / (double) restarttime);
 			restartbar.setTitle(String.format("Server restart in %.2f", restartCounter / 20f));
 			restartCounter--;

ButtonCore/src/main/java/buttondevteam/core/component/spawn/SpawnComponent.java

@@ -2,7 +2,6 @@ package buttondevteam.core.component.spawn;
 
 import buttondevteam.core.MainPlugin;
 import buttondevteam.lib.architecture.Component;
-import buttondevteam.lib.architecture.ComponentMetadata;
 import buttondevteam.lib.architecture.ConfigData;
 import buttondevteam.lib.chat.Command2;
 import buttondevteam.lib.chat.CommandClass;
@@ -24,12 +23,11 @@ import java.math.BigDecimal;
 /**
  * Provides a /spawn command that works with BungeeCord. Make sure to set up on each server.
  */
-@ComponentMetadata(enabledByDefault = false)
 public class SpawnComponent extends Component<MainPlugin> implements PluginMessageListener {
 	@Override
 	protected void enable() {
 		registerCommand(new SpawnCommand());
-		if (targetServer.get().length() == 0) {
+		if (targetServer().get().length() == 0) {
 			spawnloc = MultiverseCore.getPlugin(MultiverseCore.class).getMVWorldManager().getFirstSpawnWorld()
 				.getSpawnLocation();
 		}
@@ -49,13 +47,14 @@ public class SpawnComponent extends Component<MainPlugin> implements PluginMessa
 		if (!channel.equals("BungeeCord")) {
 			return;
 		}
-		if (targetServer.get().length() != 0)
+		if (targetServer().get().length() != 0)
 			return;
 		ByteArrayDataInput in = ByteStreams.newDataInput(message);
 		String subchannel = in.readUTF();
 		if ("ChromaCore-Spawn".equals(subchannel)) {
 			// Use the code sample in the 'Response' sections below to read
 			// the data.
+			System.out.println("Heh nice");
 			short len = in.readShort();
 			byte[] msgbytes = new byte[len];
 			in.readFully(msgbytes);
@@ -78,7 +77,9 @@ public class SpawnComponent extends Component<MainPlugin> implements PluginMessa
 	/**
 	 * The BungeeCord server that has the spawn. Set to empty if this server is the target.
 	 */
-	private final ConfigData<String> targetServer = getConfig().getData("targetServer", "");
+	private ConfigData<String> targetServer() {
+		return getConfig().getData("targetServer", "");
+	}
 
 	private Location spawnloc;
 
@@ -90,7 +91,7 @@ public class SpawnComponent extends Component<MainPlugin> implements PluginMessa
 		@SuppressWarnings("UnstableApiUsage")
 		@Command2.Subcommand
 		public void def(Player player) {
-			if (targetServer.get().length() == 0) {
+			if (targetServer().get().length() == 0) {
 				player.sendMessage("§bTeleporting to spawn...");
 				try {
 					if (MainPlugin.ess != null)
@@ -105,7 +106,7 @@ public class SpawnComponent extends Component<MainPlugin> implements PluginMessa
 			}
 			ByteArrayDataOutput out = ByteStreams.newDataOutput();
 			out.writeUTF("Connect");
-			out.writeUTF(targetServer.get());
+			out.writeUTF(targetServer().get());
 
 			player.sendPluginMessage(getPlugin(), "BungeeCord", out.toByteArray());
 

ButtonCore/src/main/java/buttondevteam/core/component/towny/TownyComponent.java

@@ -0,0 +1,54 @@
+package buttondevteam.core.component.towny;
+
+import buttondevteam.core.ComponentManager;
+import buttondevteam.core.MainPlugin;
+import buttondevteam.lib.TBMCCoreAPI;
+import buttondevteam.lib.architecture.Component;
+import com.palmergames.bukkit.towny.Towny;
+import com.palmergames.bukkit.towny.TownyUniverse;
+import com.palmergames.bukkit.towny.exceptions.AlreadyRegisteredException;
+import com.palmergames.bukkit.towny.exceptions.NotRegisteredException;
+import com.palmergames.bukkit.towny.object.Resident;
+import org.bukkit.Bukkit;
+
+/**
+ * Automatically renames Towny players if they changed their Minecraft name
+ */
+public class TownyComponent extends Component<MainPlugin> {
+	@Override
+	protected void enable() {
+	}
+
+	@Override
+	protected void disable() {
+	}
+
+	/**
+	 * Only renames the resident if this component is enabled. Used to handle name changes.
+	 *
+	 * @param oldName The player's old name as known by us
+	 * @param newName The player's new name
+	 */
+	public static void renameInTowny(String oldName, String newName) {
+		if (!ComponentManager.isEnabled(TownyComponent.class))
+			return;
+		Bukkit.getLogger().info("Renaming" + oldName + " in Towny to " + newName);
+		TownyUniverse tu = Towny.getPlugin(Towny.class).getTownyUniverse();
+		Resident resident = tu.getResidentMap().get(oldName.toLowerCase()); //The map keys are lowercase
+		if (resident == null) {
+			Bukkit.getLogger().warning("Resident not found - couldn't rename in Towny.");
+			TBMCCoreAPI.sendDebugMessage("Resident not found - couldn't rename in Towny.");
+		} else if (tu.getResidentMap().contains(newName.toLowerCase())) {
+			Bukkit.getLogger().warning("Target resident name is already in use."); // TODO: Handle
+			TBMCCoreAPI.sendDebugMessage("Target resident name is already in use.");
+		} else
+			try {
+				tu.getDataSource().renamePlayer(resident, newName); //Fixed in Towny 0.91.1.2
+				Bukkit.getLogger().info("Renaming done.");
+			} catch (AlreadyRegisteredException e) {
+				TBMCCoreAPI.SendException("Failed to rename resident, there's already one with this name.", e);
+			} catch (NotRegisteredException e) {
+				TBMCCoreAPI.SendException("Failed to rename resident, the resident isn't registered.", e);
+			}
+	}
+}

ButtonCore/src/main/java/buttondevteam/core/component/updater/PluginUpdater.java

@@ -0,0 +1,193 @@
+package buttondevteam.core.component.updater;
+
+import buttondevteam.lib.TBMCCoreAPI;
+import com.google.gson.JsonArray;
+import com.google.gson.JsonElement;
+import com.google.gson.JsonObject;
+import com.google.gson.JsonParser;
+import org.bukkit.Bukkit;
+import org.bukkit.command.CommandSender;
+import org.bukkit.event.Event;
+import org.bukkit.event.HandlerList;
+
+import java.io.File;
+import java.io.IOException;
+import java.util.ArrayList;
+import java.util.List;
+import java.util.Optional;
+
+public class PluginUpdater {
+	private PluginUpdater() {
+	}
+
+    public static final File updatedir = new File("TBMC", "pluginupdates");
+	/**
+	 * See {@link TBMCCoreAPI#UpdatePlugin(String, CommandSender, String)}
+	 */
+	public static boolean UpdatePlugin(String name, CommandSender sender, String branch) {
+        if (!updatedir.exists() && !updatedir.mkdirs()) {
+            error(sender, "Failed to create update directory!");
+            return false;
+        }
+		info(sender, "Checking plugin name...");
+		List<String> plugins = GetPluginNames();
+		String correctname = null;
+		for (String plugin : plugins) {
+			if (plugin.equalsIgnoreCase(name)) {
+				correctname = plugin; // Fixes capitalization
+				break;
+			}
+		}
+		if (correctname == null) {
+			error(sender, "Can't find plugin: " + name);
+			return false;
+		}
+		info(sender, "Checking branch name...");
+		if (!TBMCCoreAPI.IsTestServer() && !branch.equalsIgnoreCase("master")) {
+			error(sender, "The server is in production mode, updating only allowed from master!");
+			return false;
+		}
+		Optional<String> correctbranch = GetPluginBranches(correctname).stream().filter(b -> b.equalsIgnoreCase(branch))
+				.findAny();
+		if (!correctbranch.isPresent()) {
+			error(sender, "Can't find branch \"" + branch + "\" for plugin \"" + correctname + "\"");
+			return false;
+		}
+        if (isNotMaven(correctname, correctbranch.get())) {
+			error(sender, "The plugin doesn't appear to have a pom.xml. Make sure it's a Maven project.");
+			return false;
+		}
+		info(sender, "Updating TBMC plugin: " + correctname + " from " + correctbranch.get());
+        return updatePluginJitPack(sender, correctname, correctbranch.get());
+	}
+
+	private static boolean updatePluginJitPack(CommandSender sender, String correctname,
+                                               String correctbranch) {
+		/*URL url;
+        File result = new File(updatedir, correctname + ".jar");
+		try {
+			url = new URL("https://jitpack.io/com/github/TBMCPlugins/"
+					+ (correctname.equals("ButtonCore") ? "ButtonCore/ButtonCore" : correctname) + "/"
+                    + correctbranch + "-SNAPSHOT/" + correctname + "-" + correctbranch + "-SNAPSHOT.jar"); // ButtonCore exception required since it hosts Towny as well
+			FileUtils.copyURLToFile(url, result);
+			if (!result.exists() || result.length() < 25) {
+				result.delete();
+                error(sender, "The downloaded JAR for " + correctname + " from " + correctbranch
+						+ " is too small (smnaller than 25 bytes). Am I downloading from the right place?");
+				return false;
+			} else {
+                info(sender, "Updating plugin " + correctname + " from " + correctbranch + " done!");
+				return true;
+			}
+		} catch (FileNotFoundException e) {
+			error(sender,
+                    "Can't find JAR for " + correctname + " from " + correctbranch
+							+ ", the build probably failed. Build log (scroll to bottom):" + "\n"
+                            + "https://jitpack.io/com/github/TBMCPlugins/" + correctname + "/" + correctbranch
+							+ "-SNAPSHOT/build.log\nIf you'd like to rebuild the same commit, go to:\nhttps://jitpack.io/#TBMCPlugins/"
+							+ correctname + "\nAnd delete the newest build.");
+		} catch (IOException e) {
+			error(sender, "IO error while updating " + correctname + "\n" + e.getMessage());
+		} catch (Exception e) {
+			e.printStackTrace();
+			error(sender, "Unknown error while updating " + correctname + ": " + e); - TODO: Either add Commons or don't use FileUtils
+		}*/
+		info(sender, "Plugin updating is currently not supported");
+		return false;
+	}
+
+	/**
+     * Checks if pom.xml is not present for the project.
+	 * 
+	 * @param pluginname
+	 *            Does not have to match case
+	 * @param branch
+	 *            Does not have to match case
+	 */
+    public static boolean isNotMaven(String pluginname, String branch) {
+		try {
+            return TBMCCoreAPI
+					.DownloadString(
+							"https://raw.githubusercontent.com/TBMCPlugins/" + pluginname + "/" + branch + "/pom.xml")
+					.equals("404: Not Found\n");
+		} catch (IOException e1) {
+            return true;
+		}
+	}
+
+	private static void error(CommandSender sender, String message) {
+		if (!sender.equals(Bukkit.getConsoleSender()))
+			Bukkit.getLogger().warning(message);
+		sender.sendMessage("§c" + message);
+	}
+
+	private static void info(CommandSender sender, String message) {
+		if (!sender.equals(Bukkit.getConsoleSender()))
+			Bukkit.getLogger().info(message);
+		sender.sendMessage("§b" + message);
+	}
+
+	/**
+	 * Retrieves all the repository names from the GitHub organization.
+	 * 
+	 * @return A list of names
+	 */
+	public static List<String> GetPluginNames() {
+		List<String> ret = new ArrayList<>();
+		try {
+			String resp = TBMCCoreAPI.DownloadString("https://api.github.com/orgs/" + "TBMCPlugins" + "/repos"); //TODO: PluginUpdater
+			JsonArray arr = new JsonParser().parse(resp).getAsJsonArray();
+			for (JsonElement obj : arr) {
+				JsonObject jobj = obj.getAsJsonObject();
+				ret.add(jobj.get("name").getAsString());
+			}
+		} catch (Exception e) {
+			e.printStackTrace();
+		}
+		return ret;
+	}
+
+	/**
+	 * Retrieves all the branches from the plugin repository.
+	 * 
+	 * @return A list of names
+	 */
+	public static List<String> GetPluginBranches(String plugin) {
+		List<String> ret = new ArrayList<>();
+		try {
+			String resp = TBMCCoreAPI
+					.DownloadString("https://api.github.com/repos/TBMCPlugins/" + plugin + "/branches");
+			JsonArray arr = new JsonParser().parse(resp).getAsJsonArray();
+			for (JsonElement obj : arr) {
+				JsonObject jobj = obj.getAsJsonObject();
+				ret.add(jobj.get("name").getAsString());
+			}
+		} catch (Exception e) {
+			e.printStackTrace();
+		}
+		return ret;
+	}
+
+	public static class UpdatedEvent extends Event {
+		private static final HandlerList handlers = new HandlerList();
+
+        private final JsonObject data;
+
+		public UpdatedEvent(JsonObject data) {
+			this.data = data;
+		}
+
+		public JsonObject getData() {
+			return data;
+		}
+
+		@Override
+		public HandlerList getHandlers() {
+			return handlers;
+		}
+
+		public static HandlerList getHandlerList() {
+			return handlers;
+		}
+	}
+}

ButtonCore/src/main/java/buttondevteam/core/component/updater/PluginUpdaterComponent.java

@@ -0,0 +1,21 @@
+package buttondevteam.core.component.updater;
+
+import buttondevteam.core.MainPlugin;
+import buttondevteam.lib.architecture.Component;
+import buttondevteam.lib.architecture.ComponentMetadata;
+
+/**
+ * Downloads plugin updates built from their source using JitPack - doesn't work anymore
+ */
+@ComponentMetadata(enabledByDefault = false)
+public class PluginUpdaterComponent extends Component<MainPlugin> { //TODO: Config
+	@Override
+	public void enable() {
+		registerCommand(new UpdatePluginCommand());
+	}
+
+	@Override
+	public void disable() { //Commands are automatically unregistered
+
+	}
+}

ButtonCore/src/main/java/buttondevteam/core/component/updater/UpdatePluginCommand.java

@@ -0,0 +1,42 @@
+package buttondevteam.core.component.updater;
+
+import buttondevteam.core.MainPlugin;
+import buttondevteam.lib.TBMCCoreAPI;
+import buttondevteam.lib.chat.Command2;
+import buttondevteam.lib.chat.CommandClass;
+import buttondevteam.lib.chat.ICommand2MC;
+import org.bukkit.Bukkit;
+import org.bukkit.command.CommandSender;
+
+import java.lang.reflect.Method;
+
+@CommandClass(modOnly = true)
+public class UpdatePluginCommand extends ICommand2MC {
+	public void def(CommandSender sender, @Command2.OptionalArg String plugin, @Command2.OptionalArg String branch) {
+		Bukkit.getScheduler().runTaskAsynchronously(MainPlugin.Instance, () -> {
+			if (plugin == null) {
+				sender.sendMessage("Downloading plugin names...");
+				boolean first = true;
+				for (String plugin2 : PluginUpdater.GetPluginNames()) {
+					if (first) {
+						sender.sendMessage("§6---- Plugin names ----");
+						first = false;
+					}
+					sender.sendMessage("- " + plugin2);
+				}
+			} else {
+				TBMCCoreAPI.UpdatePlugin(plugin, sender, branch == null ? "master" : branch);
+			}
+		});
+	}
+
+	@Override
+	public String[] getHelpText(Method method, Command2.Subcommand ann) {
+		return new String[]{ //
+			"§6---- Update plugin ----", //
+			"This command downloads the latest version of a custom plugin from GitHub", //
+			"To update a plugin: add its name", //
+			"To list the plugin names: don't type a name" //
+		};
+	}
+}

ButtonCore/src/main/java/buttondevteam/core/component/votifier/VotifierComponent.java

@@ -0,0 +1,51 @@
+package buttondevteam.core.component.votifier;
+
+import buttondevteam.core.MainPlugin;
+import buttondevteam.lib.architecture.Component;
+import buttondevteam.lib.architecture.ComponentMetadata;
+import buttondevteam.lib.architecture.ConfigData;
+import com.vexsoftware.votifier.model.Vote;
+import com.vexsoftware.votifier.model.VotifierEvent;
+import lombok.RequiredArgsConstructor;
+import net.milkbowl.vault.economy.Economy;
+import org.bukkit.Bukkit;
+import org.bukkit.entity.Player;
+import org.bukkit.event.EventHandler;
+
+/**
+ * Do not use (EULA)
+ */
+@RequiredArgsConstructor
+@ComponentMetadata(enabledByDefault = false)
+public class VotifierComponent extends Component<MainPlugin> {
+	private final Economy economy;
+
+	private ConfigData<Double> rewardAmount() {
+		return getConfig().getData("rewardAmount", 0.0);
+	}
+
+	@Override
+	protected void enable() {
+
+	}
+
+	@Override
+	protected void disable() {
+
+	}
+
+	@EventHandler
+	@SuppressWarnings("deprecation")
+	public void onVotifierEvent(VotifierEvent event) {
+		Vote vote = event.getVote();
+		getPlugin().getLogger().info("Vote: " + vote);
+		org.bukkit.OfflinePlayer op = Bukkit.getOfflinePlayer(vote.getUsername());
+		Player p = Bukkit.getPlayer(vote.getUsername());
+		/*if (op != null) {
+			economy.depositPlayer(op, rewardAmount().get());
+		}
+		if (p != null) {
+			p.sendMessage("§bThanks for voting! $50 was added to your account.");
+		}*/
+	}
+}

ButtonCore/src/main/java/buttondevteam/lib/ChromaUtils.java

@@ -37,7 +37,7 @@ public final class ChromaUtils {
 		/**
 		 * May return null.
 		 *
-		 * @return The full name that can be used to uniquely identify the user.
+		 * @return The full name that can be used to uniquely indentify the user.
 		 */
 		String getFancyFullName();
 	}
@@ -77,7 +77,7 @@ public final class ChromaUtils {
 	 *
 	 * @param what What to do
 	 * @param def  Default if async
-	 * @return The value supplied by the action or def if async.
+	 * @return The event cancelled state or false if async.
 	 */
 	public static <T> T doItAsync(Supplier<T> what, T def) {
 		if (Bukkit.isPrimaryThread())
@@ -86,16 +86,4 @@ public final class ChromaUtils {
 			return what.get();
 		return def;
 	}
-
-	private static boolean test = false;
-
-	/**
-	 * Returns true while unit testing.
-	 */
-	public static boolean isTest() { return test; }
-
-	/**
-	 * Call when unit testing.
-	 */
-	public static void setTest() { test = true; }
 }

ButtonCore/src/main/java/buttondevteam/lib/EventExceptionCoreHandler.java

@@ -1,13 +1,12 @@
 package buttondevteam.lib;
 
-import org.bukkit.Bukkit;
 import org.bukkit.event.Event;
 
 class EventExceptionCoreHandler extends EventExceptionHandler {
 
 	@Override
 	public boolean handle(Throwable ex, Event event) {
-		TBMCCoreAPI.SendException("An error occured while executing " + event.getEventName() + "!", ex, false, Bukkit.getLogger()::warning);
+		TBMCCoreAPI.SendException("An error occured while executing " + event.getEventName() + "!", ex);
 		return true;
 	}
 

ButtonCore/src/main/java/buttondevteam/lib/TBMCChatEvent.java

@@ -30,6 +30,7 @@ public class TBMCChatEvent extends TBMCChatEventBase {
 	private boolean isIgnoreSenderPermissions() {
 		return cm.getPermCheck() != cm.getSender();
 	}
+	// TODO: Message object with data?
 
     /**
      * This will allow the sender of the message if {@link #isIgnoreSenderPermissions()} is true.

ButtonCore/src/main/java/buttondevteam/lib/TBMCChatEventBase.java

@@ -54,6 +54,6 @@ public abstract class TBMCChatEventBase extends Event implements Cancellable {
      */
     @Nullable
     public String getGroupID(CommandSender sender) {
-	    return channel.getGroupID(sender);
+	    return channel.getGroupID(sender); //TODO: Performance-wise it'd be much better to use serialization for player data - it's only converted once
     }
 }

ButtonCore/src/main/java/buttondevteam/lib/TBMCChatPreprocessEvent.java

@@ -30,9 +30,13 @@ public class TBMCChatPreprocessEvent extends Event implements Cancellable {
 		super(true);
 		this.sender = sender;
 		this.channel = channel;
-		this.message = message;
+		this.message = message; // TODO: Message object with data?
 	}
 
+	/*
+	 * public TBMCPlayer getPlayer() { return TBMCPlayer.getPlayer(sender); // TODO: Get Chroma user }
+	 */
+
 	@Override
 	public HandlerList getHandlers() {
 		return handlers;

ButtonCore/src/main/java/buttondevteam/lib/TBMCCommandPreprocessEvent.java

@@ -1,8 +1,6 @@
 package buttondevteam.lib;
 
-import buttondevteam.core.component.channel.Channel;
 import lombok.Getter;
-import lombok.RequiredArgsConstructor;
 import lombok.Setter;
 import org.bukkit.command.CommandSender;
 import org.bukkit.event.Cancellable;
@@ -16,18 +14,20 @@ import org.bukkit.event.HandlerList;
  * @author NorbiPeti
  */
 @Getter
-@RequiredArgsConstructor
 public class TBMCCommandPreprocessEvent extends Event implements Cancellable {
 	private static final HandlerList handlers = new HandlerList();
 
 	private final CommandSender sender;
-	private final Channel channel;
 	@Setter
-	private final String message;
+	private String message;
-	private final CommandSender permCheck;
 	@Setter
 	private boolean cancelled;
 
+	public TBMCCommandPreprocessEvent(CommandSender sender, String message) {
+		this.sender = sender;
+		this.message = message;
+	}
+
 	@Override
 	public HandlerList getHandlers() {
 		return handlers;

ButtonCore/src/main/java/buttondevteam/lib/TBMCCoreAPI.java

@@ -1,14 +1,14 @@
 package buttondevteam.lib;
 
 import buttondevteam.core.MainPlugin;
-import buttondevteam.lib.architecture.Component;
+import buttondevteam.core.component.updater.PluginUpdater;
 import buttondevteam.lib.player.ChromaGamerBase;
 import buttondevteam.lib.potato.DebugPotato;
 import org.bukkit.Bukkit;
+import org.bukkit.command.CommandSender;
 import org.bukkit.entity.Player;
 import org.bukkit.event.Listener;
 import org.bukkit.plugin.Plugin;
-import org.bukkit.plugin.java.JavaPlugin;
 
 import java.io.IOException;
 import java.io.InputStream;
@@ -16,8 +16,6 @@ import java.net.URL;
 import java.net.URLConnection;
 import java.util.*;
 import java.util.Map.Entry;
-import java.util.function.Consumer;
-import java.util.function.Supplier;
 
 public class TBMCCoreAPI {
 	static final List<String> coders = new ArrayList<String>() {
@@ -32,6 +30,28 @@ public class TBMCCoreAPI {
 		}
 	};
 
+	/**
+	 * Updates or installs the specified plugin. The plugin must use Maven.
+	 *
+	 * @param name   The plugin's repository name.
+	 * @param sender The command sender (if not console, messages will be printed to console as well).
+	 */
+	public static void UpdatePlugin(String name, CommandSender sender) {
+		UpdatePlugin(name, sender, "master");
+	}
+
+	/**
+	 * Updates or installs the specified plugin from the specified branch. The plugin must use Maven.
+	 *
+	 * @param name   The plugin's repository name.
+	 * @param sender The command sender (if not console, messages will be printed to console as well).
+	 * @param branch The branch to download the plugin from.
+	 * @return Success or not
+	 */
+	public static boolean UpdatePlugin(String name, CommandSender sender, String branch) {
+		return PluginUpdater.UpdatePlugin(name, sender, branch);
+	}
+
 	public static String DownloadString(String urlstr) throws IOException {
 		URL url = new URL(urlstr);
 		URLConnection con = url.openConnection();
@@ -54,21 +74,11 @@ public class TBMCCoreAPI {
 	 * @param sourcemsg A message that is shown at the top of the exception (before the exception's message)
 	 * @param e         The exception to send
 	 */
-	public static void SendException(String sourcemsg, Throwable e, Component<?> component) {
+	public static void SendException(String sourcemsg, Throwable e) {
-		SendException(sourcemsg, e, false, component::logWarn);
+		SendException(sourcemsg, e, false);
 	}
 
-	/**
+	public static void SendException(String sourcemsg, Throwable e, boolean debugPotato) {
-	 * Send exception to the {@link TBMCExceptionEvent}.
-	 *
-	 * @param sourcemsg A message that is shown at the top of the exception (before the exception's message)
-	 * @param e         The exception to send
-	 */
-	public static void SendException(String sourcemsg, Throwable e, JavaPlugin plugin) {
-		SendException(sourcemsg, e, false, plugin.getLogger()::warning);
-	}
-
-	public static void SendException(String sourcemsg, Throwable e, boolean debugPotato, Consumer<String> logWarn) {
 		try {
 			SendUnsentExceptions();
 			TBMCExceptionEvent event = new TBMCExceptionEvent(sourcemsg, e);
@@ -77,7 +87,7 @@ public class TBMCCoreAPI {
 				if (!event.isHandled())
 					exceptionsToSend.put(sourcemsg, e);
 			}
-			logWarn.accept(sourcemsg);
+			Bukkit.getLogger().warning(sourcemsg);
 			e.printStackTrace();
 			if (debugPotato) {
 				List<Player> devsOnline = new ArrayList<>();
@@ -118,7 +128,6 @@ public class TBMCCoreAPI {
 	}
 
 	private static EventExceptionCoreHandler eventExceptionCoreHandler;
-
 	/**
 	 * Registers Bukkit events, handling the exceptions occurring in those events
 	 *
@@ -130,8 +139,8 @@ public class TBMCCoreAPI {
 		EventExceptionHandler.registerEvents(listener, plugin, eventExceptionCoreHandler);
 	}
 
-	public static <T extends ChromaGamerBase> void RegisterUserClass(Class<T> userclass, Supplier<T> constructor) {
+	public static <T extends ChromaGamerBase> void RegisterUserClass(Class<T> userclass) {
-		ChromaGamerBase.RegisterPluginUserClass(userclass, constructor);
+		ChromaGamerBase.RegisterPluginUserClass(userclass);
 	}
 
 	/**
@@ -171,6 +180,6 @@ public class TBMCCoreAPI {
 
 	public static boolean IsTestServer() {
 		if (MainPlugin.Instance == null) return true;
-		return MainPlugin.Instance.test.get();
+		return MainPlugin.Instance.test().get();
 	}
 }

ButtonCore/src/main/java/buttondevteam/lib/architecture/ButtonPlugin.java

@@ -4,7 +4,6 @@ import buttondevteam.buttonproc.HasConfig;
 import buttondevteam.core.ComponentManager;
 import buttondevteam.lib.TBMCCoreAPI;
 import buttondevteam.lib.chat.Command2MC;
-import buttondevteam.lib.chat.ICommand2MC;
 import lombok.AccessLevel;
 import lombok.Getter;
 import org.bukkit.configuration.InvalidConfigurationException;
@@ -24,10 +23,10 @@ import java.util.Stack;
 
 @HasConfig(global = true)
 public abstract class ButtonPlugin extends JavaPlugin {
-	@Getter //Needs to be static as we don't know the plugin when a command is handled
+	@Getter
-	private static final Command2MC command2MC = new Command2MC();
+	private static Command2MC command2MC = new Command2MC();
 	@Getter(AccessLevel.PROTECTED)
-	private final IHaveConfig iConfig = new IHaveConfig(this::saveConfig);
+	private IHaveConfig iConfig;
 	private CommentedConfiguration yaml;
 	@Getter(AccessLevel.PROTECTED)
 	private IHaveConfig data; //TODO
@@ -35,7 +34,8 @@ public abstract class ButtonPlugin extends JavaPlugin {
 	 * Used to unregister components in the right order - and to reload configs
 	 */
 	@Getter
-	private final Stack<Component<?>> componentStack = new Stack<>();
+	private Stack<Component<?>> componentStack = new Stack<>();
+	;
 
 	protected abstract void pluginEnable();
 
@@ -59,7 +59,7 @@ public abstract class ButtonPlugin extends JavaPlugin {
 		try {
 			pluginEnable();
 		} catch (Exception e) {
-			TBMCCoreAPI.SendException("Error while enabling plugin " + getName() + "!", e, this);
+			TBMCCoreAPI.SendException("Error while enabling plugin " + getName() + "!", e);
 		}
 		if (configGenAllowed(this)) //If it's not disabled (by default it's not)
 			IHaveConfig.pregenConfig(this, null);
@@ -71,7 +71,7 @@ public abstract class ButtonPlugin extends JavaPlugin {
 			return false;
 		var section = config.getConfigurationSection("global");
 		if (section == null) section = config.createSection("global");
-		iConfig.reset(section);
+		iConfig = new IHaveConfig(section, this::saveConfig);
 		return true;
 	}
 
@@ -83,9 +83,10 @@ public abstract class ButtonPlugin extends JavaPlugin {
 			pluginDisable();
 			if (ConfigData.saveNow(getConfig()))
 				getLogger().info("Saved configuration changes.");
-			getCommand2MC().unregisterCommands(this);
+			iConfig = null; //Clearing the hashmap is not enough, we need to update the section as well
+			//TBMCChatAPI.RemoveCommands(this); - TODO
 		} catch (Exception e) {
-			TBMCCoreAPI.SendException("Error while disabling plugin " + getName() + "!", e, this);
+			TBMCCoreAPI.SendException("Error while disabling plugin " + getName() + "!", e);
 		}
 	}
 
@@ -124,17 +125,15 @@ public abstract class ButtonPlugin extends JavaPlugin {
 		var yc = YamlConfiguration.loadConfiguration(res);
 		for (var kv : yc.getValues(true).entrySet())
 			if (kv.getValue() instanceof String)
-				yaml.addComment(kv.getKey().replace(".generalDescriptionInsteadOfAConfig", ""),
+				yaml.addComment(kv.getKey(), Arrays.stream(((String) kv.getValue()).split("\n"))
-					Arrays.stream(((String) kv.getValue()).split("\n"))
+					.map(str -> "# " + str.trim()).toArray(String[]::new));
-						.map(str -> "# " + str.trim()).toArray(String[]::new));
 		return true;
 	}
 
 	@Override
 	public FileConfiguration getConfig() {
 		if (yaml == null)
-			justReload();
+			justReload(); //TODO: If it fails to load, it'll probably throw an NPE
-		if (yaml == null) return new YamlConfiguration(); //Return a temporary instance
 		return yaml;
 	}
 
@@ -144,20 +143,10 @@ public abstract class ButtonPlugin extends JavaPlugin {
 			if (yaml != null)
 				yaml.save();
 		} catch (Exception e) {
-			TBMCCoreAPI.SendException("Failed to save config", e, this);
+			TBMCCoreAPI.SendException("Failed to save config", e);
 		}
 	}
 
-	/**
-	 * Registers command and sets its plugin.
-	 *
-	 * @param command The command to register
-	 */
-	protected void registerCommand(ICommand2MC command) {
-		command.registerToPlugin(this);
-		getCommand2MC().registerCommand(command);
-	}
-
 	@Retention(RetentionPolicy.RUNTIME)
 	@Target(ElementType.TYPE)
 	public @interface ConfigOpts {

ButtonCore/src/main/java/buttondevteam/lib/architecture/CommentedConfiguration.java

@@ -10,7 +10,6 @@ import org.yaml.snakeyaml.representer.Representer;
 
 import java.io.File;
 import java.io.IOException;
-import java.nio.charset.StandardCharsets;
 import java.nio.file.Files;
 import java.util.HashMap;
 
@@ -20,7 +19,7 @@ import java.util.HashMap;
  *
  * @author dumptruckman & Articdive
  */
-public class CommentedConfiguration extends YamlConfiguration {
+public class CommentedConfiguration extends YamlConfiguration { //TODO: Remove FileMgmt dependency
 	private HashMap<String, String> comments;
 	private File file;
 
@@ -175,7 +174,7 @@ public class CommentedConfiguration extends YamlConfiguration {
 			while (newContents.toString().startsWith(" " + System.getProperty("line.separator"))) {
 				newContents = new StringBuilder(newContents.toString().replaceFirst(" " + System.getProperty("line.separator"), ""));
 			}
-			Files.write(file.toPath(), newContents.toString().getBytes(StandardCharsets.UTF_8));
+			Files.write(file.toPath(), newContents.toString().getBytes());
 		}
 	}
 

ButtonCore/src/main/java/buttondevteam/lib/architecture/Component.java

@@ -24,18 +24,21 @@ import java.util.stream.Collectors;
  */
 @HasConfig(global = false) //Used for obtaining javadoc
 public abstract class Component<TP extends JavaPlugin> {
-	@SuppressWarnings("rawtypes") private static HashMap<Class<? extends Component>, Component<? extends JavaPlugin>> components = new HashMap<>();
+	private static HashMap<Class<? extends Component>, Component<? extends JavaPlugin>> components = new HashMap<>();
 
 	@Getter
 	private boolean enabled = false;
 	@Getter
 	@NonNull
 	private TP plugin;
-	private @Getter final IHaveConfig config = new IHaveConfig(null);
+	@NonNull
+	private @Getter
+	IHaveConfig config;
 	private @Getter IHaveConfig data; //TODO
 
-	public final ConfigData<Boolean> shouldBeEnabled = config.getData("enabled",
+	public final ConfigData<Boolean> shouldBeEnabled() {
-		Optional.ofNullable(getClass().getAnnotation(ComponentMetadata.class)).map(ComponentMetadata::enabledByDefault).orElse(true));
+		return config.getData("enabled", Optional.ofNullable(getClass().getAnnotation(ComponentMetadata.class)).map(ComponentMetadata::enabledByDefault).orElse(true));
+	}
 
 	/**
 	 * Registers a component checking it's dependencies and calling {@link #register(JavaPlugin)}.<br>
@@ -66,7 +69,7 @@ public abstract class Component<TP extends JavaPlugin> {
 		try {
 			val metaAnn = component.getClass().getAnnotation(ComponentMetadata.class);
 			if (metaAnn != null) {
-				@SuppressWarnings("rawtypes") Class<? extends Component>[] dependencies = metaAnn.depends();
+				Class<? extends Component>[] dependencies = metaAnn.depends();
 				for (val dep : dependencies) { //TODO: Support dependencies at enable/disable as well
 					if (!components.containsKey(dep)) {
 						plugin.getLogger().warning("Failed to " + (register ? "" : "un") + "register component " + component.getClassName() + " as a required dependency is missing/disabled: " + dep.getSimpleName());
@@ -76,25 +79,25 @@ public abstract class Component<TP extends JavaPlugin> {
 			}
 			if (register) {
 				if (components.containsKey(component.getClass())) {
-					TBMCCoreAPI.SendException("Failed to register component " + component.getClassName(), new IllegalArgumentException("The component is already registered!"), plugin);
+					TBMCCoreAPI.SendException("Failed to register component " + component.getClassName(), new IllegalArgumentException("The component is already registered!"));
 					return false;
 				}
 				component.plugin = plugin;
-				component.config.setSaveAction(plugin::saveConfig);
 				updateConfig(plugin, component);
 				component.register(plugin);
 				components.put(component.getClass(), component);
 				if (plugin instanceof ButtonPlugin)
 					((ButtonPlugin) plugin).getComponentStack().push(component);
-				if (ComponentManager.areComponentsEnabled() && component.shouldBeEnabled.get()) {
+				if (ComponentManager.areComponentsEnabled() && component.shouldBeEnabled().get()) {
 					try { //Enable components registered after the previous ones getting enabled
 						setComponentEnabled(component, true);
 						return true;
 					} catch (Exception | NoClassDefFoundError e) {
-						TBMCCoreAPI.SendException("Failed to enable component " + component.getClassName() + "!", e, component);
+						TBMCCoreAPI.SendException("Failed to enable component " + component.getClassName() + "!", e);
 						return true;
 					}
 				}
+				return true; //Component shouldn't be enabled
 			} else {
 				if (!components.containsKey(component.getClass()))
 					return true; //Already unregistered
@@ -102,65 +105,56 @@ public abstract class Component<TP extends JavaPlugin> {
 					try {
 						setComponentEnabled(component, false);
 					} catch (Exception | NoClassDefFoundError e) {
-						TBMCCoreAPI.SendException("Failed to disable component " + component.getClassName() + "!", e, component);
+						TBMCCoreAPI.SendException("Failed to disable component " + component.getClassName() + "!", e);
 						return false; //If failed to disable, won't unregister either
 					}
 				}
 				component.unregister(plugin);
 				components.remove(component.getClass());
+				return true;
 			}
-			return true;
 		} catch (Exception e) {
-			TBMCCoreAPI.SendException("Failed to " + (register ? "" : "un") + "register component " + component.getClassName() + "!", e, plugin);
+			TBMCCoreAPI.SendException("Failed to " + (register ? "" : "un") + "register component " + component.getClassName() + "!", e);
 			return false;
 		}
 	}
 
 	/**
-	 * Enables or disables the given component. If the component fails to enable, it will be disabled.
+	 * Registers a component checking it's dependencies and calling {@link #register(JavaPlugin)}.<br>
+	 * Make sure to register the dependencies first.
 	 *
 	 * @param component The component to register
-	 * @param enabled   Whether it's enabled or not
 	 */
-	public static void setComponentEnabled(Component<?> component, boolean enabled) throws UnregisteredComponentException {
+	public static void setComponentEnabled(Component component, boolean enabled) throws UnregisteredComponentException {
 		if (!components.containsKey(component.getClass()))
 			throw new UnregisteredComponentException(component);
 		if (component.enabled == enabled) return; //Don't do anything
 		if (component.enabled = enabled) {
-			try {
+			//System.out.println("Updating config for "+component.getClassName());
-				updateConfig(component.getPlugin(), component);
+			updateConfig(component.getPlugin(), component);
-				component.enable();
+			//System.out.println("Enabling "+component.getClassName());
-				if (ButtonPlugin.configGenAllowed(component)) {
+			component.enable();
-					IHaveConfig.pregenConfig(component, null);
+			if (ButtonPlugin.configGenAllowed(component)) {
-				}
+				//System.out.println("Pregenning config for "+component.getClassName());
-			} catch (Exception e) {
+				IHaveConfig.pregenConfig(component, null);
-				try { //Automatically disable components that fail to enable properly
-					setComponentEnabled(component, false);
-					throw e;
-				} catch (Exception ex) {
-					Throwable t = ex;
-					for (var th = t; th != null; th = th.getCause())
-						t = th; //Set if not null
-					if (t != e)
-						t.initCause(e);
-					throw ex;
-				}
 			}
+			//System.out.println("Done enabling "+component.getClassName());
 		} else {
 			component.disable();
-			ButtonPlugin.getCommand2MC().unregisterCommands(component);
+			//TBMCChatAPI.RemoveCommands(component); - TODO
 		}
 	}
 
-	public static void updateConfig(JavaPlugin plugin, Component<?> component) {
+	public static void updateConfig(JavaPlugin plugin, Component component) {
 		if (plugin.getConfig() != null) { //Production
 			var compconf = plugin.getConfig().getConfigurationSection("components");
 			if (compconf == null) compconf = plugin.getConfig().createSection("components");
 			var configSect = compconf.getConfigurationSection(component.getClassName());
 			if (configSect == null)
 				configSect = compconf.createSection(component.getClassName());
-			component.config.reset(configSect);
+			component.config = new IHaveConfig(configSect, plugin::saveConfig);
-		} //Testing: it's already set
+		} else //Testing
+			component.config = new IHaveConfig(null, plugin::saveConfig);
 	}
 
 	/**
@@ -168,26 +162,17 @@ public abstract class Component<TP extends JavaPlugin> {
 	 *
 	 * @return The currently registered components
 	 */
-	@SuppressWarnings("rawtypes")
 	public static Map<Class<? extends Component>, Component<? extends JavaPlugin>> getComponents() {
 		return Collections.unmodifiableMap(components);
 	}
 
-	public void log(String message) {
-		plugin.getLogger().info("[" + getClassName() + "] " + message);
-	}
-
-	public void logWarn(String message) {
-		plugin.getLogger().warning("[" + getClassName() + "] " + message);
-	}
-
 	/**
 	 * Registers the module, when called by the JavaPlugin class.
 	 * This gets fired when the plugin is enabled. Use {@link #enable()} to register commands and such.
 	 *
 	 * @param plugin Plugin object
 	 */
-	@SuppressWarnings({"unused"})
+	@SuppressWarnings({"unused", "WeakerAccess"})
 	protected void register(JavaPlugin plugin) {
 	}
 
@@ -198,7 +183,7 @@ public abstract class Component<TP extends JavaPlugin> {
 	 *
 	 * @param plugin Plugin object
 	 */
-	@SuppressWarnings({"unused"})
+	@SuppressWarnings({"WeakerAccess", "unused"})
 	protected void unregister(JavaPlugin plugin) {
 	}
 
@@ -217,16 +202,13 @@ public abstract class Component<TP extends JavaPlugin> {
 	protected abstract void disable();
 
 	/**
-	 * Registers a command to the component. Make sure to use {@link buttondevteam.lib.chat.CommandClass} and {@link buttondevteam.lib.chat.Command2.Subcommand}.
+	 * Registers a TBMCCommand to the component. Make sure to use {@link buttondevteam.lib.chat.CommandClass} and {@link buttondevteam.lib.chat.Command2.Subcommand}.
 	 * You don't need to register the command in plugin.yml.
 	 *
-	 * @param command Custom coded command class
+	 * @param commandBase Custom coded command class
 	 */
-	protected final void registerCommand(ICommand2MC command) {
+	protected final void registerCommand(ICommand2MC commandBase) {
-		if (plugin instanceof ButtonPlugin)
+		ButtonPlugin.getCommand2MC().registerCommand(commandBase);
-			command.registerToPlugin((ButtonPlugin) plugin);
-		command.registerToComponent(this);
-		ButtonPlugin.getCommand2MC().registerCommand(command);
 	}
 
 	/**
@@ -252,15 +234,10 @@ public abstract class Component<TP extends JavaPlugin> {
 		var cs = c.getConfigurationSection(key);
 		if (cs == null) cs = c.createSection(key);
 		val res = cs.getValues(false).entrySet().stream().filter(e -> e.getValue() instanceof ConfigurationSection)
-			.collect(Collectors.toMap(Map.Entry::getKey, kv -> {
+			.collect(Collectors.toMap(Map.Entry::getKey, kv -> new IHaveConfig((ConfigurationSection) kv.getValue(), getPlugin()::saveConfig)));
-				var conf = new IHaveConfig(getPlugin()::saveConfig);
-				conf.reset((ConfigurationSection) kv.getValue());
-				return conf;
-			}));
 		if (res.size() == 0) {
 			for (val entry : defaultProvider.entrySet()) {
-				val conf = new IHaveConfig(getPlugin()::saveConfig);
+				val conf = new IHaveConfig(cs.createSection(entry.getKey()), getPlugin()::saveConfig);
-				conf.reset(cs.createSection(entry.getKey()));
 				entry.getValue().accept(conf);
 				res.put(entry.getKey(), conf);
 			}

ButtonCore/src/main/java/buttondevteam/lib/architecture/ConfigData.java

@@ -0,0 +1,159 @@
+package buttondevteam.lib.architecture;
+
+import buttondevteam.core.MainPlugin;
+import buttondevteam.lib.ChromaUtils;
+import lombok.AccessLevel;
+import lombok.AllArgsConstructor;
+import lombok.Getter;
+import lombok.Setter;
+import org.bukkit.Bukkit;
+import org.bukkit.configuration.Configuration;
+import org.bukkit.configuration.ConfigurationSection;
+import org.bukkit.configuration.file.YamlConfiguration;
+import org.bukkit.scheduler.BukkitTask;
+
+import java.lang.reflect.Array;
+import java.util.HashMap;
+import java.util.List;
+import java.util.function.BiFunction;
+import java.util.function.Function;
+
+/**
+ * Use the getter/setter constructor if {@link T} isn't a primitive type or String.<br>
+ * Use {@link Component#getConfig()} or {@link ButtonPlugin#getIConfig()} then {@link IHaveConfig#getData(String, Object)} to get an instance.
+ */
+//@AllArgsConstructor(access = AccessLevel.PACKAGE)
+public class ConfigData<T> {
+	private static final HashMap<Configuration, SaveTask> saveTasks = new HashMap<>();
+	/**
+	 * May be null for testing
+	 */
+	private final ConfigurationSection config;
+	@Getter
+	@Setter(AccessLevel.PACKAGE)
+	private String path;
+	protected final T def;
+	private final Object primitiveDef;
+	private final Runnable saveAction;
+	/**
+	 * The parameter is of a primitive type as returned by {@link YamlConfiguration#get(String)}
+	 */
+	private Function<Object, T> getter;
+	/**
+	 * The result should be a primitive type or string that can be retrieved correctly later
+	 */
+	private Function<T, Object> setter;
+
+	/**
+	 * The config value should not change outside this instance
+	 */
+	private T value;
+
+	//This constructor is needed because it sets the getter and setter
+	ConfigData(ConfigurationSection config, String path, T def, Object primitiveDef, Function<Object, T> getter, Function<T, Object> setter, Runnable saveAction) {
+		this.config = config;
+		this.path = path;
+		this.def = def;
+		this.primitiveDef = primitiveDef;
+		this.getter = getter;
+		this.setter = setter;
+		this.saveAction = saveAction;
+	}
+
+	@java.beans.ConstructorProperties({"config", "path", "def", "primitiveDef", "saveAction"})
+	ConfigData(ConfigurationSection config, String path, T def, Object primitiveDef, Runnable saveAction) {
+		this.config = config;
+		this.path = path;
+		this.def = def;
+		this.primitiveDef = primitiveDef;
+		this.saveAction = saveAction;
+	}
+
+	@Override
+	public String toString() {
+		return "ConfigData{" +
+			"path='" + path + '\'' +
+			", value=" + value +
+			'}';
+	}
+
+	@SuppressWarnings("unchecked")
+	public T get() {
+		if (value != null) return value; //Speed things up
+		Object val;
+		if (config == null || !config.isSet(path)) { //Call set() if config == null
+			val = primitiveDef;
+			if ((def == null || this instanceof ReadOnlyConfigData) && config != null) //In Discord's case def may be null
+				setInternal(primitiveDef); //If read-only then we still need to save the default value so it can be set
+			else
+				set(def); //Save default value - def is always set
+		} else
+			val = config.get(path); //config==null: testing
+		if (val == null) //If it's set to null explicitly
+			val = primitiveDef;
+		BiFunction<Object, Object, Object> convert = (_val, _def) -> {
+			if (_def instanceof Number) //If we expect a number
+				if (_val instanceof Number)
+					_val = ChromaUtils.convertNumber((Number) _val,
+						(Class<? extends Number>) _def.getClass());
+				else
+					_val = _def; //If we didn't get a number, return default (which is a number)
+			else if (_val instanceof List && _def != null && _def.getClass().isArray())
+				_val = ((List<T>) _val).toArray((T[]) Array.newInstance(_def.getClass().getComponentType(), 0));
+			return _val;
+		};
+		if (getter != null) {
+			val = convert.apply(val, primitiveDef);
+			T hmm = getter.apply(val);
+			if (hmm == null) hmm = def; //Set if the getter returned null
+			return hmm;
+		}
+		val = convert.apply(val, def);
+		return value = (T) val; //Always cache, if not cached yet
+	}
+
+	public void set(T value) {
+		if (this instanceof ReadOnlyConfigData)
+			return; //Safety for Discord channel/role data
+		Object val;
+		if (setter != null && value != null)
+			val = setter.apply(value);
+		else val = value;
+		if (config != null)
+			setInternal(val);
+		this.value = value;
+	}
+
+	private void setInternal(Object val) {
+		config.set(path, val);
+		if (!saveTasks.containsKey(config.getRoot())) {
+			synchronized (saveTasks) {
+				saveTasks.put(config.getRoot(), new SaveTask(Bukkit.getScheduler().runTaskLaterAsynchronously(MainPlugin.Instance, () -> {
+					synchronized (saveTasks) {
+						saveTasks.remove(config.getRoot());
+						saveAction.run();
+					}
+				}, 100), saveAction));
+			}
+		}
+	}
+
+	@AllArgsConstructor
+	private static class SaveTask {
+		BukkitTask task;
+		Runnable saveAction;
+	}
+
+	public static boolean saveNow(Configuration config) {
+		synchronized (saveTasks) {
+			SaveTask st = saveTasks.get(config);
+			if (st != null) {
+				st.task.cancel();
+				saveTasks.remove(config);
+				st.saveAction.run();
+				return true;
+			}
+		}
+		return false;
+	}
+}

ButtonCore/src/main/java/buttondevteam/lib/architecture/IHaveConfig.java

@@ -3,11 +3,8 @@ package buttondevteam.lib.architecture;
 import buttondevteam.core.MainPlugin;
 import buttondevteam.lib.TBMCCoreAPI;
 import lombok.Getter;
-import lombok.Setter;
 import lombok.val;
-import org.bukkit.Bukkit;
 import org.bukkit.configuration.ConfigurationSection;
-import org.bukkit.plugin.java.JavaPlugin;
 
 import javax.annotation.Nullable;
 import java.lang.reflect.InvocationTargetException;
@@ -21,41 +18,22 @@ import java.util.stream.Collectors;
  */
 public final class IHaveConfig {
 	private final HashMap<String, ConfigData<?>> datamap = new HashMap<>();
-	/**
-	 * Returns the Bukkit ConfigurationSection. Use {@link #signalChange()} after changing it.
-	 */
 	@Getter
 	private ConfigurationSection config;
-	@Getter
+	private final Runnable saveAction;
-	@Setter
-	private Runnable saveAction;
 
 	/**
 	 * May be used in testing.
 	 *
-	 * @param saveAction What to do to save the config to disk. Don't use get methods until it's non-null.
+	 * @param section May be null for testing
 	 */
-	public IHaveConfig(Runnable saveAction) {
+	IHaveConfig(ConfigurationSection section, Runnable saveAction) {
+		config = section;
 		this.saveAction = saveAction;
 	}
 
 	/**
-	 * Gets a config object for the given path. The def or primitiveDef must be set. If a getter is present, a setter must be present as well.
+	 * This method overload should only be used with primitves or String.
-	 *
-	 * @param path The dot-separated path relative to this config instance
-	 * @param <T>  The runtime type of the config value
-	 * @return A ConfigData builder to set how to obtain the value
-	 */
-	public <T> ConfigData.ConfigDataBuilder<T> getConfig(String path) {
-		return ConfigData.builder(this, path);
-	}
-
-	void onConfigBuild(ConfigData<?> config) {
-		datamap.put(config.getPath(), config);
-	}
-
-	/**
-	 * This method overload should only be used with primitives or String.
 	 *
 	 * @param path The path in config to use
 	 * @param def  The value to use by default
@@ -65,7 +43,7 @@ public final class IHaveConfig {
 	@SuppressWarnings("unchecked")
 	public <T> ConfigData<T> getData(String path, T def) {
 		ConfigData<?> data = datamap.get(path);
-		if (data == null) datamap.put(path, data = new ConfigData<>(this, path, def, def, null, null));
+		if (data == null) datamap.put(path, data = new ConfigData<>(config, path, def, def, saveAction));
 		return (ConfigData<T>) data;
 	}
 
@@ -83,7 +61,7 @@ public final class IHaveConfig {
 	public <T> ConfigData<T> getData(String path, T def, Function<Object, T> getter, Function<T, Object> setter) {
 		ConfigData<?> data = datamap.get(path);
 		if (data == null)
-			datamap.put(path, data = new ConfigData<>(this, path, def, setter.apply(def), getter, setter));
+			datamap.put(path, data = new ConfigData<>(config, path, def, setter.apply(def), getter, setter, saveAction));
 		return (ConfigData<T>) data;
 	}
 
@@ -101,7 +79,7 @@ public final class IHaveConfig {
 	public <T> ConfigData<T> getDataPrimDef(String path, Object primitiveDef, Function<Object, T> getter, Function<T, Object> setter) {
 		ConfigData<?> data = datamap.get(path);
 		if (data == null)
-			datamap.put(path, data = new ConfigData<>(this, path, getter.apply(primitiveDef), primitiveDef, getter, setter));
+			datamap.put(path, data = new ConfigData<>(config, path, getter.apply(primitiveDef), primitiveDef, getter, setter, saveAction));
 		return (ConfigData<T>) data;
 	}
 
@@ -119,7 +97,7 @@ public final class IHaveConfig {
 	public <T> ReadOnlyConfigData<T> getReadOnlyDataPrimDef(String path, Object primitiveDef, Function<Object, T> getter, Function<T, Object> setter) {
 		ConfigData<?> data = datamap.get(path);
 		if (data == null)
-			datamap.put(path, data = new ReadOnlyConfigData<>(this, path, getter.apply(primitiveDef), primitiveDef, getter, setter));
+			datamap.put(path, data = new ReadOnlyConfigData<>(config, path, getter.apply(primitiveDef), primitiveDef, getter, setter, saveAction));
 		return (ReadOnlyConfigData<T>) data;
 	}
 
@@ -136,7 +114,7 @@ public final class IHaveConfig {
 		ConfigData<?> data = datamap.get(path);
 		if (data == null) {
 			val defval = def.get();
-			datamap.put(path, data = new ConfigData<>(this, path, defval, defval, null, null));
+			datamap.put(path, data = new ConfigData<>(config, path, defval, defval, saveAction));
 		}
 		return (ConfigData<T>) data;
 	}
@@ -156,7 +134,7 @@ public final class IHaveConfig {
 		ConfigData<?> data = datamap.get(path);
 		if (data == null) {
 			val defval = def.get();
-			datamap.put(path, data = new ConfigData<>(this, path, defval, setter.apply(defval), getter, setter));
+			datamap.put(path, data = new ConfigData<>(config, path, defval, setter.apply(defval), getter, setter, saveAction));
 		}
 		return (ConfigData<T>) data;
 	}
@@ -172,25 +150,10 @@ public final class IHaveConfig {
 	public <T> ListConfigData<T> getListData(String path) {
 		ConfigData<?> data = datamap.get(path);
 		if (data == null)
-			datamap.put(path, data = new ListConfigData<>(this, path, new ListConfigData.List<T>()));
+			datamap.put(path, data = new ListConfigData<>(config, path, new ListConfigData.List<T>(), saveAction));
 		return (ListConfigData<T>) data;
 	}
 
-	/**
-	 * Schedules a save operation. Use after changing the ConfigurationSection directly.
-	 */
-	public void signalChange() {
-		ConfigData.signalChange(this);
-	}
-
-	/**
-	 * Clears all caches and loads everything from yaml.
-	 */
-	public void reset(ConfigurationSection config) {
-		this.config = config;
-		datamap.forEach((path, data) -> data.reset());
-	}
-
 	/**
 	 * Generates the config YAML.
 	 *
@@ -201,13 +164,6 @@ public final class IHaveConfig {
 		val ms = obj.getClass().getDeclaredMethods();
 		for (val m : ms) {
 			if (!m.getReturnType().getName().equals(ConfigData.class.getName())) continue;
-			final String mName;
-			{
-				var name = m.getName();
-				var ind = name.lastIndexOf('$');
-				if (ind == -1) mName = name;
-				else mName = name.substring(ind + 1);
-			}
 			try {
 				m.setAccessible(true);
 				List<ConfigData<?>> configList;
@@ -220,36 +176,24 @@ public final class IHaveConfig {
 						try {
 							return (ConfigData<?>) m.invoke(obj, kv.getValue());
 						} catch (IllegalAccessException | InvocationTargetException e) {
-							String msg = "Failed to pregenerate " + mName + " for " + obj + " using config " + kv.getKey() + "!";
+							TBMCCoreAPI.SendException("Failed to pregenerate " + m.getName() + " for " + obj + " using config " + kv.getKey() + "!", e);
-							if (obj instanceof Component<?>)
-								TBMCCoreAPI.SendException(msg, e, (Component<?>) obj);
-							else if (obj instanceof JavaPlugin)
-								TBMCCoreAPI.SendException(msg, e, (JavaPlugin) obj);
-							else
-								TBMCCoreAPI.SendException(msg, e, false, Bukkit.getLogger()::warning);
 							return null;
 						}
 					}).filter(Objects::nonNull).collect(Collectors.toList());
 				} else {
 					if (TBMCCoreAPI.IsTestServer())
-						MainPlugin.Instance.getLogger().warning("Method " + mName + " returns a config but its parameters are unknown: " + Arrays.toString(m.getParameterTypes()));
+						MainPlugin.Instance.getLogger().warning("Method " + m.getName() + " returns a config but its parameters are unknown: " + Arrays.toString(m.getParameterTypes()));
 					continue;
 				}
 				for (val c : configList) {
 					if (c.getPath().length() == 0)
-						c.setPath(mName);
+						c.setPath(m.getName());
-					else if (!c.getPath().equals(mName))
+					else if (!c.getPath().equals(m.getName()))
-						MainPlugin.Instance.getLogger().warning("Config name does not match: " + c.getPath() + " instead of " + mName);
+						MainPlugin.Instance.getLogger().warning("Config name does not match: " + c.getPath() + " instead of " + m.getName());
 					c.get(); //Saves the default value if needed - also checks validity
 				}
 			} catch (Exception e) {
-				String msg = "Failed to pregenerate " + mName + " for " + obj + "!";
+				TBMCCoreAPI.SendException("Failed to pregenerate " + m.getName() + " for " + obj + "!", e);
-				if (obj instanceof Component<?>)
-					TBMCCoreAPI.SendException(msg, e, (Component<?>) obj);
-				else if (obj instanceof JavaPlugin)
-					TBMCCoreAPI.SendException(msg, e, (JavaPlugin) obj);
-				else
-					TBMCCoreAPI.SendException(msg, e, false, Bukkit.getLogger()::warning);
 			}
 		}
 	}

ButtonCore/src/main/java/buttondevteam/lib/architecture/ListConfigData.java

@@ -1,6 +1,7 @@
 package buttondevteam.lib.architecture;
 
 import lombok.val;
+import org.bukkit.configuration.ConfigurationSection;
 import org.jetbrains.annotations.NotNull;
 
 import java.util.ArrayList;
@@ -11,12 +12,12 @@ import java.util.function.UnaryOperator;
 
 public class ListConfigData<T> extends ConfigData<ListConfigData.List<T>> {
 	@SuppressWarnings("unchecked")
-	ListConfigData(IHaveConfig config, String path, List<T> def) {
+	ListConfigData(ConfigurationSection config, String path, List<T> def, Runnable saveAction) {
 		super(config, path, def, new ArrayList<>(def), list -> {
 			var l = new List<>((ArrayList<T>) list);
 			l.listConfig = def.listConfig;
 			return l;
-		}, ArrayList::new);
+		}, ArrayList::new, saveAction);
 		def.listConfig = this; //Can't make the List class non-static or pass this in the super() constructor
 	}
 

ButtonCore/src/main/java/buttondevteam/lib/architecture/ReadOnlyConfigData.java

@@ -0,0 +1,15 @@
+package buttondevteam.lib.architecture;
+
+import org.bukkit.configuration.ConfigurationSection;
+
+import java.util.function.Function;
+
+public class ReadOnlyConfigData<T> extends ConfigData<T> {
+	ReadOnlyConfigData(ConfigurationSection config, String path, T def, Object primitiveDef, Function<Object, T> getter, Function<T, Object> setter, Runnable saveAction) {
+		super(config, path, def, primitiveDef, getter, setter, saveAction);
+	}
+
+	ReadOnlyConfigData(ConfigurationSection config, String path, T def, Object primitiveDef, Runnable saveAction) {
+		super(config, path, def, primitiveDef, saveAction);
+	}
+}

ButtonCore/src/main/java/buttondevteam/lib/chat/Color.java

@@ -0,0 +1,20 @@
+package buttondevteam.lib.chat;
+
+import lombok.Getter;
+import lombok.RequiredArgsConstructor;
+
+@RequiredArgsConstructor
+@Getter
+public enum Color implements TellrawSerializableEnum {
+	Black("black", 0, 0, 0), DarkBlue("dark_blue", 0, 0, 170), DarkGreen("dark_green", 0, 170, 0), DarkAqua("dark_aqua",
+			0, 170, 170), DarkRed("dark_red", 170, 0, 0), DarkPurple("dark_purple", 0, 170, 0), Gold("gold", 255, 170,
+					0), Gray("gray", 170, 170, 170), DarkGray("dark_gray", 85, 85, 85), Blue("blue", 85, 85,
+							255), Green("green", 85, 255, 85), Aqua("aqua", 85, 255, 255), Red("red", 255, 85,
+									85), LightPurple("light_purple", 255, 85,
+											255), Yellow("yellow", 255, 255, 85), White("white", 255, 255, 255);
+
+	private final String name;
+	private final int red;
+	private final int green;
+	private final int blue;
+}

ButtonCore/src/main/java/buttondevteam/lib/chat/Command2.java

@@ -11,7 +11,7 @@ import lombok.RequiredArgsConstructor;
 import lombok.val;
 import org.bukkit.Bukkit;
 import org.bukkit.configuration.file.YamlConfiguration;
-import org.jetbrains.annotations.NotNull;
+import org.bukkit.scheduler.BukkitTask;
 
 import java.io.InputStreamReader;
 import java.lang.annotation.ElementType;
@@ -22,18 +22,14 @@ import java.lang.reflect.InvocationTargetException;
 import java.lang.reflect.Method;
 import java.text.NumberFormat;
 import java.text.ParseException;
-import java.util.ArrayList;
+import java.util.*;
-import java.util.Arrays;
-import java.util.HashMap;
-import java.util.List;
 import java.util.function.Function;
-import java.util.function.Supplier;
 
 /**
  * The method name is the subcommand, use underlines (_) to add further subcommands.
  * The args may be null if the conversion failed and it's optional.
  */
-public abstract class Command2<TC extends ICommand2<TP>, TP extends Command2Sender> {
+public abstract class Command2<TC extends ICommand2, TP extends Command2Sender> {
 	protected Command2() {
 		commandHelp.add("§6---- Commands ----");
 	}
@@ -63,12 +59,10 @@ public abstract class Command2<TC extends ICommand2<TP>, TP extends Command2Send
 		String[] helpText() default {};
 
 		/**
-		 * The main permission which allows using this command (individual access can be still revoked with "chroma.command.X").
+		 * The main permission which allows using this command (individual access can be still granted with "chroma.command.X").
 		 * Used to be "tbmc.admin". The {@link #MOD_GROUP} is provided to use with this.
 		 */
-		String permGroup() default "";
+		String permGroup() default ""; //TODO
-
-		String[] aliases() default {};
 	}
 
 	@Target(ElementType.PARAMETER)
@@ -77,14 +71,13 @@ public abstract class Command2<TC extends ICommand2<TP>, TP extends Command2Send
 	}
 
 	@AllArgsConstructor
-	protected static class SubcommandData<T extends ICommand2<?>> {
+	protected static class SubcommandData<T extends ICommand2> {
 		public final Method method;
 		public final T command;
-		public final String[] parameters;
 		public String[] helpText;
 	}
 
-	/*protected static class SubcommandHelpData<T extends ICommand2> extends SubcommandData<T> {
+	protected static class SubcommandHelpData<T extends ICommand2> extends SubcommandData<T> {
 		private final TreeSet<String> ht = new TreeSet<>();
 		private BukkitTask task;
 
@@ -107,47 +100,42 @@ public abstract class Command2<TC extends ICommand2<TP>, TP extends Command2Send
 					task = null; //Run again, if needed
 				});
 		}
-	}*/
+	}
 
 	@RequiredArgsConstructor
 	protected static class ParamConverter<T> {
 		public final Function<String, T> converter;
 		public final String errormsg;
-		public final Supplier<Iterable<String>> allSupplier;
 	}
 
-	protected final HashMap<String, SubcommandData<TC>> subcommands = new HashMap<>();
+	protected HashMap<String, SubcommandData<TC>> subcommands = new HashMap<>();
-	protected final HashMap<Class<?>, ParamConverter<?>> paramConverters = new HashMap<>();
+	private HashMap<Class<?>, ParamConverter<?>> paramConverters = new HashMap<>();
 
-	private final ArrayList<String> commandHelp = new ArrayList<>(); //Mainly needed by Discord
+	private ArrayList<String> commandHelp = new ArrayList<>(); //Mainly needed by Discord
-
-	private char commandChar;
 
 	/**
 	 * Adds a param converter that obtains a specific object from a string parameter.
 	 * The converter may return null.
 	 *
-	 * @param <T>         The type of the result
+	 * @param cl        The class of the result object
-	 * @param cl          The class of the result object
+	 * @param converter The converter to use
-	 * @param converter   The converter to use
+	 * @param <T>       The type of the result
-	 * @param allSupplier The supplier of all possible values (ideally)
 	 */
-	public <T> void addParamConverter(Class<T> cl, Function<String, T> converter, String errormsg,
+	public <T> void addParamConverter(Class<T> cl, Function<String, T> converter, String errormsg) {
-	                                  Supplier<Iterable<String>> allSupplier) {
+		paramConverters.put(cl, new ParamConverter<>(converter, errormsg));
-		paramConverters.put(cl, new ParamConverter<>(converter, errormsg, allSupplier));
 	}
 
 	public boolean handleCommand(TP sender, String commandline) {
 		for (int i = commandline.length(); i != -1; i = commandline.lastIndexOf(' ', i - 1)) {
 			String subcommand = commandline.substring(0, i).toLowerCase();
-			SubcommandData<TC> sd = subcommands.get(subcommand);
+			SubcommandData<TC> sd = subcommands.get(subcommand); //O(1)
 			if (sd == null) continue;
 			boolean sync = Bukkit.isPrimaryThread();
 			Bukkit.getScheduler().runTaskAsynchronously(MainPlugin.Instance, () -> {
 				try {
 					handleCommandAsync(sender, commandline, sd, subcommand, sync);
 				} catch (Exception e) {
-					TBMCCoreAPI.SendException("Command execution failed for sender " + sender.getName() + "(" + sender.getClass().getCanonicalName() + ") and message " + commandline, e, MainPlugin.Instance);
+					TBMCCoreAPI.SendException("Command execution failed for sender " + sender.getName() + "(" + sender.getClass().getCanonicalName() + ") and message " + commandline, e);
 				}
 			});
 			return true; //We found a method
@@ -167,7 +155,7 @@ public abstract class Command2<TC extends ICommand2<TP>, TP extends Command2Send
 	 * @param sync        Whether the command was originally sync
 	 * @throws Exception If something's not right
 	 */
-	private void handleCommandAsync(TP sender, String commandline, SubcommandData<TC> sd, String subcommand, boolean sync) throws Exception {
+	public void handleCommandAsync(TP sender, String commandline, SubcommandData<TC> sd, String subcommand, boolean sync) throws Exception {
 		if (sd.method == null || sd.command == null) { //Main command not registered, but we have subcommands
 			sender.sendMessage(sd.helpText);
 			return;
@@ -195,7 +183,6 @@ public abstract class Command2<TC extends ICommand2<TP>, TP extends Command2Send
 			params.add(cg);
 		else {
 			sender.sendMessage("§cYou need to be a " + sendertype.getSimpleName() + " to use this command.");
-			sender.sendMessage(sd.helpText); //Send what the command is about, could be useful for commands like /member where some subcommands aren't player-only
 			return;
 		}
 		val paramArr = sd.method.getParameters();
@@ -230,18 +217,6 @@ public abstract class Command2<TC extends ICommand2<TP>, TP extends Command2Send
 				continue;
 			} else if (Number.class.isAssignableFrom(cl) || cl.isPrimitive()) {
 				try {
-					if (cl == boolean.class) {
-						params.add(Boolean.parseBoolean(param));
-						continue;
-					}
-					if (cl == char.class) {
-						if (param.length() != 1) {
-							sender.sendMessage("§c'" + param + "' is not a character.");
-							return;
-						}
-						params.add(param.charAt(0));
-						continue;
-					}
 					//noinspection unchecked
 					Number n = ChromaUtils.convertNumber(NumberFormat.getInstance().parse(param), (Class<? extends Number>) cl);
 					params.add(n);
@@ -253,7 +228,7 @@ public abstract class Command2<TC extends ICommand2<TP>, TP extends Command2Send
 			}
 			val conv = paramConverters.get(cl);
 			if (conv == null)
-				throw new Exception("No suitable converter found for parameter type '" + cl.getCanonicalName() + "' for command '" + sd.method + "'");
+				throw new Exception("No suitable converter found for parameter type '" + cl.getCanonicalName() + "' for command '" + sd.method.toString() + "'");
 			val cparam = conv.converter.apply(param);
 			if (cparam == null) {
 				sender.sendMessage(conv.errormsg); //Param conversion failed - ex. plugin not found
@@ -263,7 +238,6 @@ public abstract class Command2<TC extends ICommand2<TP>, TP extends Command2Send
 		}
 		Runnable lol = () -> {
 			try {
-				sd.method.setAccessible(true); //It may be part of a private class
 				val ret = sd.method.invoke(sd.command, params.toArray()); //I FORGOT TO TURN IT INTO AN ARRAY (for a long time)
 				if (ret instanceof Boolean) {
 					if (!(boolean) ret) //Show usage
@@ -271,9 +245,9 @@ public abstract class Command2<TC extends ICommand2<TP>, TP extends Command2Send
 				} else if (ret != null)
 					throw new Exception("Wrong return type! Must return a boolean or void. Return value: " + ret);
 			} catch (InvocationTargetException e) {
-				TBMCCoreAPI.SendException("An error occurred in a command handler for " + subcommand + "!", e.getCause(), MainPlugin.Instance);
+				TBMCCoreAPI.SendException("An error occurred in a command handler!", e.getCause());
 			} catch (Exception e) {
-				TBMCCoreAPI.SendException("Command handling failed for sender " + sender + " and subcommand " + subcommand, e, MainPlugin.Instance);
+				TBMCCoreAPI.SendException("Command handling failed for sender " + sender + " and subcommand " + subcommand, e);
 			}
 		};
 		if (sync)
@@ -284,12 +258,8 @@ public abstract class Command2<TC extends ICommand2<TP>, TP extends Command2Send
 
 	public abstract void registerCommand(TC command);
 
-	protected List<SubcommandData<TC>> registerCommand(TC command, char commandChar) {
+	protected void registerCommand(TC command, @SuppressWarnings("SameParameterValue") char commandChar) {
-		return registerCommand(command, command.getCommandPath(), commandChar);
+		val path = command.getCommandPath();
-	}
-
-	protected List<SubcommandData<TC>> registerCommand(TC command, String path, @SuppressWarnings("SameParameterValue") char commandChar) {
-		this.commandChar = commandChar;
 		int x = path.indexOf(' ');
 		val mainPath = commandChar + path.substring(0, x == -1 ? path.length() : x);
 		//var scmdmap = subcommandStrings.computeIfAbsent(mainPath, k -> new HashSet<>()); //Used to display subcommands
@@ -298,7 +268,7 @@ public abstract class Command2<TC extends ICommand2<TP>, TP extends Command2Send
 		boolean nosubs = true;
 		boolean isSubcommand = x != -1;
 		try { //Register the default handler first so it can be reliably overwritten
-			mainMethod = command.getClass().getMethod("def", Command2Sender.class);
+			mainMethod = command.getClass().getMethod("def", Command2Sender.class, String.class);
 			val cc = command.getClass().getAnnotation(CommandClass.class);
 			var ht = cc == null || isSubcommand ? new String[0] : cc.helpText(); //If it's not the main command, don't add it
 			if (ht.length > 0)
@@ -309,53 +279,46 @@ public abstract class Command2<TC extends ICommand2<TP>, TP extends Command2Send
 			if (!commandHelp.contains(mainPath))
 				commandHelp.add(mainPath);
 		} catch (Exception e) {
-			TBMCCoreAPI.SendException("Could not register default handler for command /" + path, e, MainPlugin.Instance);
+			TBMCCoreAPI.SendException("Could not register default handler for command /" + path, e);
 		}
-		var addedSubcommands = new ArrayList<SubcommandData<TC>>();
 		for (val method : command.getClass().getMethods()) {
 			val ann = method.getAnnotation(Subcommand.class);
 			if (ann == null) continue; //Don't call the method on non-subcommands because they're not in the yaml
 			var ht = command.getHelpText(method, ann);
-			if (ht != null) { //The method is a subcommand
+			if (ht != null) {
 				val subcommand = commandChar + path + //Add command path (class name by default)
-					getCommandPath(method.getName(), ' '); //Add method name, unless it's 'def'
+					(method.getName().equals("def") ? "" : " " + method.getName().replace('_', ' ').toLowerCase()); //Add method name, unless it's 'def'
-				var params = new String[method.getParameterCount() - 1];
+				ht = getParameterHelp(method, ht, subcommand);
-				ht = getParameterHelp(method, ht, subcommand, params);
+				subcommands.put(subcommand, new SubcommandData<>(method, command, ht)); //Result of the above (def) is that it will show the help text
-				var sd = new SubcommandData<>(method, command, params, ht);
-				registerCommand(path, method.getName(), ann, sd);
-				for (String p : command.getCommandPaths())
-					registerCommand(p, method.getName(), ann, sd);
-				addedSubcommands.add(sd);
 				scmdHelpList.add(subcommand);
 				nosubs = false;
 			}
 		}
 		if (nosubs && scmdHelpList.size() > 0)
 			scmdHelpList.remove(scmdHelpList.size() - 1); //Remove Subcommands header
-		if (mainMethod != null && !subcommands.containsKey(commandChar + path)) { //Command specified by the class
+		if (mainMethod != null && !subcommands.containsKey(commandChar + path)) //Command specified by the class
-			var sd = new SubcommandData<>(mainMethod, command, null, scmdHelpList.toArray(new String[0]));
+			subcommands.put(commandChar + path, new SubcommandData<>(mainMethod, command, scmdHelpList.toArray(new String[0])));
-			subcommands.put(commandChar + path, sd);
+		if (mainMethod != null && !mainPath.equals(commandChar + path)) { //Main command, typically the same as the above
-			addedSubcommands.add(sd);
+			if (isSubcommand) { //The class itself is a subcommand
+				val scmd = subcommands.computeIfAbsent(mainPath, p -> new SubcommandData<>(null, null, new String[]{"§6---- Subcommands ----"}));
+				val scmdHelp = Arrays.copyOf(scmd.helpText, scmd.helpText.length + scmdHelpList.size());
+				for (int i = 0; i < scmdHelpList.size(); i++)
+					scmdHelp[scmd.helpText.length + i] = scmdHelpList.get(i);
+				scmd.helpText = scmdHelp;
+			} else if (!subcommands.containsKey(mainPath))
+				subcommands.put(mainPath, new SubcommandData<>(null, null, scmdHelpList.toArray(new String[0])));
 		}
-		if (isSubcommand) { //The class itself is a subcommand
-			val scmd = subcommands.computeIfAbsent(mainPath, p -> new SubcommandData<>(null, null, new String[0], new String[]{"§6---- Subcommands ----"}));
-			val scmdHelp = Arrays.copyOf(scmd.helpText, scmd.helpText.length + scmdHelpList.size());
-			for (int i = 0; i < scmdHelpList.size(); i++)
-				scmdHelp[scmd.helpText.length + i] = scmdHelpList.get(i);
-			scmd.helpText = scmdHelp;
-		}
-		return addedSubcommands;
 	}
 
-	private String[] getParameterHelp(Method method, String[] ht, String subcommand, String[] parameters) {
+	private String[] getParameterHelp(Method method, String[] ht, String subcommand) {
 		val str = method.getDeclaringClass().getResourceAsStream("/commands.yml");
 		if (str == null)
-			TBMCCoreAPI.SendException("Error while getting command data!", new Exception("Resource not found!"), MainPlugin.Instance);
+			TBMCCoreAPI.SendException("Error while getting command data!", new Exception("Resource not found!"));
 		else {
 			if (ht.length > 0)
 				ht[0] = "§6---- " + ht[0] + " ----";
 			YamlConfiguration yc = YamlConfiguration.loadConfiguration(new InputStreamReader(str)); //Generated by ButtonProcessor
-			val ccs = yc.getConfigurationSection(method.getDeclaringClass().getCanonicalName().replace('$', '.'));
+			val ccs = yc.getConfigurationSection(method.getDeclaringClass().getCanonicalName());
 			if (ccs != null) {
 				val cs = ccs.getConfigurationSection(method.getName());
 				if (cs != null) {
@@ -367,26 +330,16 @@ public abstract class Command2<TC extends ICommand2<TP>, TP extends Command2Send
 						String[] both = Arrays.copyOf(ht, ht.length + 1);
 						both[ht.length] = "§6Usage:§r " + subcommand + " " + params;
 						ht = both;
-						var paramArray = params.split(" ");
-						for (int j = 0; j < paramArray.length && j < parameters.length; j++)
-							parameters[j] = paramArray[j];
 					} else
-						TBMCCoreAPI.SendException("Error while getting command data for " + method + "!", new Exception("Method '" + method + "' != " + mname + " or params is " + params), MainPlugin.Instance);
+						TBMCCoreAPI.SendException("Error while getting command data for " + method + "!", new Exception("Method '" + method.toString() + "' != " + mname + " or params is " + params));
 				} else
-					MainPlugin.Instance.getLogger().warning("Failed to get command data for " + method + " (cs is null)! Make sure to use 'clean install' when building the project.");
+					TBMCCoreAPI.SendException("Error while getting command data for " + method + "!", new Exception("cs is " + cs));
 			} else
-				MainPlugin.Instance.getLogger().warning("Failed to get command data for " + method + " (ccs is null)! Make sure to use 'clean install' when building the project.");
+				TBMCCoreAPI.SendException("Error while getting command data for " + method + "!", new Exception("ccs is " + ccs + " - class: " + method.getDeclaringClass().getCanonicalName()));
 		}
 		return ht;
 	}
 
-	private void registerCommand(String path, String methodName, Subcommand ann, SubcommandData<TC> sd) {
-		val subcommand = commandChar + path + getCommandPath(methodName, ' ');
-		subcommands.put(subcommand, sd);
-		for (String alias : ann.aliases())
-			subcommands.put(commandChar + path + alias, sd);
-	}
-
 	public abstract boolean hasPermission(TP sender, TC command, Method subcommand);
 
 	public String[] getCommandsText() {
@@ -402,39 +355,4 @@ public abstract class Command2<TC extends ICommand2<TP>, TP extends Command2Send
 	/*public Set<String> getAllSubcommands() {
 		return Collections.unmodifiableSet(subcommands.keySet());
 	}*/
-
-	/**
-	 * Unregisters all of the subcommands in the given command.
-	 *
-	 * @param command The command object
-	 */
-	public void unregisterCommand(ICommand2<TP> command) {
-		var path = command.getCommandPath();
-		for (val method : command.getClass().getMethods()) {
-			val ann = method.getAnnotation(Subcommand.class);
-			if (ann == null) continue;
-			unregisterCommand(path, method.getName(), ann);
-			for (String p : command.getCommandPaths())
-				unregisterCommand(p, method.getName(), ann);
-		}
-	}
-
-	private void unregisterCommand(String path, String methodName, Subcommand ann) {
-		val subcommand = commandChar + path + getCommandPath(methodName, ' ');
-		subcommands.remove(subcommand);
-		for (String alias : ann.aliases())
-			subcommands.remove(commandChar + path + alias);
-	}
-
-	/**
-	 * It will start with the given replace char.
-	 *
-	 * @param methodName  The method's name, method.getName()
-	 * @param replaceChar The character to use between subcommands
-	 * @return The command path starting with the replace char.
-	 */
-	@NotNull
-	public String getCommandPath(String methodName, char replaceChar) {
-		return methodName.equals("def") ? "" : replaceChar + methodName.replace('_', replaceChar).toLowerCase();
-	}
 }

ButtonCore/src/main/java/buttondevteam/lib/chat/Command2MC.java

@@ -0,0 +1,222 @@
+package buttondevteam.lib.chat;
+
+import buttondevteam.core.MainPlugin;
+import lombok.val;
+import org.bukkit.Bukkit;
+import org.bukkit.OfflinePlayer;
+import org.bukkit.command.CommandSender;
+import org.bukkit.command.ConsoleCommandSender;
+import org.bukkit.entity.Player;
+import org.bukkit.event.EventHandler;
+import org.bukkit.event.Listener;
+import org.bukkit.event.server.TabCompleteEvent;
+import org.bukkit.permissions.Permission;
+import org.bukkit.permissions.PermissionDefault;
+
+import java.lang.annotation.Annotation;
+import java.lang.reflect.Method;
+import java.util.Arrays;
+import java.util.HashMap;
+import java.util.function.Function;
+
+public class Command2MC extends Command2<ICommand2MC, Command2MCSender> implements Listener {
+	@Override
+	public void registerCommand(ICommand2MC command) {
+		super.registerCommand(command, '/');
+		var perm = "chroma.command." + command.getCommandPath().replace(' ', '.');
+		if (Bukkit.getPluginManager().getPermission(perm) == null) //Check needed for plugin reset
+			Bukkit.getPluginManager().addPermission(new Permission(perm,
+				PermissionDefault.TRUE)); //Allow commands by default, it will check mod-only
+		for (val method : command.getClass().getMethods()) {
+			if (!method.isAnnotationPresent(Subcommand.class)) continue;
+			String pg = permGroup(command, method);
+			if (pg.length() == 0) continue;
+			perm = "chroma." + pg;
+			if (Bukkit.getPluginManager().getPermission(perm) == null) //It may occur multiple times
+				Bukkit.getPluginManager().addPermission(new Permission(perm,
+					PermissionDefault.OP)); //Do not allow any commands that belong to a group
+		}
+	}
+
+	@Override
+	public boolean hasPermission(Command2MCSender sender, ICommand2MC command, Method method) {
+		return hasPermission(sender.getSender(), command, method);
+	}
+
+	public boolean hasPermission(CommandSender sender, ICommand2MC command, Method method) {
+		if (sender instanceof ConsoleCommandSender) return true; //Always allow the console
+		String pg;
+		boolean p = true;
+		String[] perms = {
+			"chroma.command." + command.getCommandPath().replace(' ', '.'),
+			(pg = permGroup(command, method)).length() > 0 ? "chroma." + pg : null
+		};
+		for (String perm : perms) {
+			if (perm != null) {
+				if (p) { //Use OfflinePlayer to avoid fetching player data
+					if (sender instanceof OfflinePlayer)
+						p = MainPlugin.permission.playerHas(sender instanceof Player ? ((Player) sender).getLocation().getWorld().getName() : null, (OfflinePlayer) sender, perm);
+					else
+						p = false; //Use sender's method
+					//System.out.println("playerHas " + perm + ": " + p);
+					//System.out.println("hasPermission: " + sender.hasPermission(perm));
+					if (!p) p = sender.hasPermission(perm);
+				} else break; //If any of the permissions aren't granted then don't allow
+			}
+		}
+		return p;
+	}
+
+	/**
+	 * Returns the first group found in the hierarchy starting from the command method <b>or</b> the mod group if <i>any</i></i> of the superclasses are mod only.
+	 *
+	 * @param method The subcommand to check
+	 * @return The permission group for the subcommand or empty string
+	 */
+	private String permGroup(ICommand2MC command, Method method) {
+		val sc = method.getAnnotation(Subcommand.class);
+		if (sc != null && sc.permGroup().length() > 0) {
+			return sc.permGroup();
+		}
+		if (getAnnForValue(command.getClass(), CommandClass.class, CommandClass::modOnly, false))
+			return Subcommand.MOD_GROUP;
+		return getAnnForValue(command.getClass(), CommandClass.class, CommandClass::permGroup, "");
+	}
+
+	/**
+	 * Loops until it finds a value that is <b>not</b> the same as def
+	 *
+	 * @param sourceCl  The class which has the annotation
+	 * @param annCl     The annotation to get
+	 * @param annMethod The annotation method to check
+	 * @param def       The value to ignore when looking for the result
+	 * @param <T>       The annotation type
+	 * @param <V>       The type of the value
+	 * @return The value returned by the first superclass or def
+	 */
+	private <T extends Annotation, V> V getAnnForValue(Class<?> sourceCl, Class<T> annCl, Function<T, V> annMethod, V def) {
+		for (Class<?> cl = sourceCl; cl != null; cl = cl.getSuperclass()) {
+			val cc = cl.getAnnotation(annCl);
+			V r;
+			if (cc != null && (r = annMethod.apply(cc)) != def) return r;
+		}
+		return def;
+	}
+
+	/**
+	 * Automatically colors the message red.
+	 * {@see super#addParamConverter}
+	 */
+	@Override
+	public <T> void addParamConverter(Class<T> cl, Function<String, T> converter, String errormsg) {
+		super.addParamConverter(cl, converter, "§c" + errormsg);
+	}
+
+	@EventHandler
+	private void handleTabComplete(TabCompleteEvent event) {
+		String commandline = event.getBuffer();
+		CommandSender sender = event.getSender();
+		//System.out.println("tab");
+		for (int i = commandline.length(); i != -1; i = commandline.lastIndexOf(' ', i - 1)) {
+			String subcommand = commandline.substring(0, i).toLowerCase();
+			if (subcommand.length() == 0 || subcommand.charAt(0) != '/') subcommand = '/' + subcommand; //Console
+			//System.out.println("Subcommand: " + subcommand);
+			SubcommandData<ICommand2MC> sd = subcommands.get(subcommand); //O(1)
+			if (sd == null) continue;
+			//System.out.println("ht: " + Arrays.toString(sd.helpText));
+			Arrays.stream(sd.helpText).skip(1).map(ht -> new HashMap.SimpleEntry<>(ht, subcommands.get(ht))).filter(e -> e.getValue() != null)
+				.filter(kv -> kv.getKey().startsWith(commandline))
+				.filter(kv -> hasPermission(sender, kv.getValue().command, kv.getValue().method))
+				.forEach(kv -> event.getCompletions().add((kv.getKey()).substring(kv.getKey().lastIndexOf(' ', commandline.length()) + 1)));
+			if (sd.method == null || sd.command == null)
+				return;
+			/*if (!hasPermission(sender, sd.command, sd.method)) { - TODO: Arguments
+				sender.sendMessage("§cYou don't have permission to use this command");
+				return true;
+			}
+			val params = new ArrayList<Object>(sd.method.getParameterCount());
+			int j = subcommand.length(), pj;
+			Class<?>[] parameterTypes = sd.method.getParameterTypes();
+			if (parameterTypes.length == 0)
+				throw new Exception("No sender parameter for method '" + sd.method + "'");
+			val sendertype = parameterTypes[0];
+			final ChromaGamerBase cg;
+			if (sendertype.isAssignableFrom(sender.getClass()))
+				params.add(sender); //The command either expects a CommandSender or it is a Player, or some other expected type
+			else if (sender instanceof Command2MCSender
+				&& sendertype.isAssignableFrom(((Command2MCSender) sender).getSender().getClass()))
+				params.add(((Command2MCSender) sender).getSender());
+			else if (ChromaGamerBase.class.isAssignableFrom(sendertype)
+				&& sender instanceof Command2MCSender
+				&& (cg = ChromaGamerBase.getFromSender(((Command2MCSender) sender).getSender())) != null
+				&& cg.getClass() == sendertype) //The command expects a user of our system
+				params.add(cg);
+			else {
+				sender.sendMessage("§cYou need to be a " + sendertype.getSimpleName() + " to use this command.");
+				return true;
+			}
+			val paramArr = sd.method.getParameters();
+			for (int i1 = 1; i1 < parameterTypes.length; i1++) {
+				Class<?> cl = parameterTypes[i1];
+				pj = j + 1; //Start index
+				if (pj == commandline.length() + 1) { //No param given
+					if (paramArr[i1].isAnnotationPresent(OptionalArg.class)) {
+						if (cl.isPrimitive())
+							params.add(Defaults.defaultValue(cl));
+						else if (Number.class.isAssignableFrom(cl)
+							|| Number.class.isAssignableFrom(cl))
+							params.add(Defaults.defaultValue(Primitives.unwrap(cl)));
+						else
+							params.add(null);
+						continue; //Fill the remaining params with nulls
+					} else {
+						sender.sendMessage(sd.helpText); //Required param missing
+						return true;
+					}
+				}
+				if (paramArr[i1].isVarArgs()) {
+					par0ams.add(commandline.substring(j + 1).split(" +"));
+					continue;
+				}
+				j = commandline.indexOf(' ', j + 1); //End index
+				if (j == -1 || paramArr[i1].isAnnotationPresent(TextArg.class)) //Last parameter
+					j = commandline.length();
+				String param = commandline.substring(pj, j);
+				if (cl == String.class) {
+					params.add(param);
+					continue;
+				} else if (Number.class.isAssignableFrom(cl) || cl.isPrimitive()) {
+					try {
+						//noinspection unchecked
+						Number n = ThorpeUtils.convertNumber(NumberFormat.getInstance().parse(param), (Class<? extends Number>) cl);
+						params.add(n);
+					} catch (ParseException e) {
+						sender.sendMessage("§c'" + param + "' is not a number.");
+						return true;
+					}
+					continue;
+				}
+				val conv = paramConverters.get(cl);
+				if (conv == null)
+					throw new Exception("No suitable converter found for parameter type '" + cl.getCanonicalName() + "' for command '" + sd.method.toString() + "'");
+				val cparam = conv.converter.apply(param);
+				if (cparam == null) {
+					sender.sendMessage(conv.errormsg); //Param conversion failed - ex. plugin not found
+					return true;
+				}
+				params.add(cparam);
+			}
+			try {
+				val ret = sd.method.invoke(sd.command, params.toArray()); //I FORGOT TO TURN IT INTO AN ARRAY (for a long time)
+				if (ret instanceof Boolean) {
+					if (!(boolean) ret) //Show usage
+						sender.sendMessage(sd.helpText);
+				} else if (ret != null)
+					throw new Exception("Wrong return type! Must return a boolean or void. Return value: " + ret);
+				return true; //We found a method
+			} catch (InvocationTargetException e) {
+				TBMCCoreAPI.SendException("An error occurred in a command handler!", e.getCause());
+			}*/
+		}
+	}
+}

ButtonCore/src/main/java/buttondevteam/lib/chat/Command2MCSender.java

@@ -1,6 +1,5 @@
 package buttondevteam.lib.chat;
 
-import buttondevteam.core.component.channel.Channel;
 import lombok.Getter;
 import lombok.RequiredArgsConstructor;
 import org.bukkit.command.CommandSender;
@@ -8,8 +7,6 @@ import org.bukkit.command.CommandSender;
 @RequiredArgsConstructor
 public class Command2MCSender implements Command2Sender {
 	private @Getter final CommandSender sender;
-	private @Getter final Channel channel;
-	private @Getter final CommandSender permCheck;
 
 	@Override
 	public void sendMessage(String message) {

ButtonCore/src/main/java/buttondevteam/lib/chat/ICommand2.java

@@ -12,9 +12,10 @@ public abstract class ICommand2<TP extends Command2Sender> {
 	 * Default handler for commands, can be used to copy the args too.
 	 *
 	 * @param sender The sender which ran the command
+	 * @param args   All of the arguments passed as is
 	 * @return The success of the command
 	 */
-	public boolean def(TP sender) {
+	public boolean def(TP sender, @Command2.TextArg String args) {
 		return false;
 	}
 
@@ -46,7 +47,7 @@ public abstract class ICommand2<TP extends Command2Sender> {
 	@Getter
 	private final Command2<?, TP> manager; //TIL that if I use a raw type on a variable then none of the type args will work (including what's defined on a method, not on the type)
 
-	public <T extends ICommand2<TP>> ICommand2(Command2<T, TP> manager) {
+	public <T extends ICommand2> ICommand2(Command2<T, TP> manager) {
 		path = getcmdpath();
 		this.manager = manager;
 	}
@@ -63,18 +64,6 @@ public abstract class ICommand2<TP extends Command2Sender> {
 		return path;
 	}
 
-	private static final String[] EMPTY_PATHS = new String[0];
-
-	/**
-	 * All of the command's paths it will be invoked on. Does not include aliases or the default path.
-	 * Must be lowercase and must include the full path.
-	 *
-	 * @return The full command paths that this command should be registered under in addition to the default one.
-	 */
-	public String[] getCommandPaths() {
-		return EMPTY_PATHS;
-	}
-
 	private String getcmdpath() {
 		if (!getClass().isAnnotationPresent(CommandClass.class))
 			throw new RuntimeException(

ButtonCore/src/main/java/buttondevteam/lib/chat/ICommand2MC.java

@@ -0,0 +1,9 @@
+package buttondevteam.lib.chat;
+
+import buttondevteam.lib.architecture.ButtonPlugin;
+
+public abstract class ICommand2MC extends ICommand2<Command2MCSender> {
+	public ICommand2MC() {
+		super(ButtonPlugin.getCommand2MC());
+	}
+}

ButtonCore/src/main/java/buttondevteam/lib/chat/TBMCChatAPI.java

@@ -22,7 +22,7 @@ public class TBMCChatAPI {
 	 * @return The event cancelled state
 	 */
 	public static boolean SendChatMessage(ChatMessage cm) {
-		return SendChatMessage(cm, cm.getUser().channel.get());
+		return SendChatMessage(cm, cm.getUser().channel().get());
 	}
 
 	/**
@@ -35,9 +35,9 @@ public class TBMCChatAPI {
 	 */
 	public static boolean SendChatMessage(ChatMessage cm, Channel channel) {
 		if (!Channel.getChannelList().contains(channel))
-			throw new RuntimeException("Channel " + channel.DisplayName.get() + " not registered!");
+			throw new RuntimeException("Channel " + channel.DisplayName().get() + " not registered!");
-		if (!channel.Enabled.get()) {
+		if (!channel.Enabled().get()) {
-			cm.getSender().sendMessage("§cThe channel '" + channel.DisplayName.get() + "' is disabled!");
+			cm.getSender().sendMessage("§cThe channel '" + channel.DisplayName().get() + "' is disabled!");
 			return true; //Cancel sending if channel is disabled
 		}
 		Supplier<Boolean> task = () -> {
@@ -70,11 +70,11 @@ public class TBMCChatAPI {
 	 */
 	public static boolean SendSystemMessage(Channel channel, RecipientTestResult rtr, String message, TBMCSystemChatEvent.BroadcastTarget target, String... exceptions) {
 		if (!Channel.getChannelList().contains(channel))
-			throw new RuntimeException("Channel " + channel.DisplayName.get() + " not registered!");
+			throw new RuntimeException("Channel " + channel.DisplayName().get() + " not registered!");
-		if (!channel.Enabled.get())
+		if (!channel.Enabled().get())
 			return true; //Cancel sending
 		if (!Arrays.asList(exceptions).contains("Minecraft"))
-			Bukkit.getConsoleSender().sendMessage("[" + channel.DisplayName.get() + "] " + message);
+			Bukkit.getConsoleSender().sendMessage("[" + channel.DisplayName().get() + "] " + message);
 		TBMCSystemChatEvent event = new TBMCSystemChatEvent(channel, message, rtr.score, rtr.groupID, exceptions, target);
 		return ChromaUtils.callEventAsync(event);
 	}

ButtonCore/src/main/java/buttondevteam/lib/player/ChannelPlayerData.java

@@ -0,0 +1,25 @@
+package buttondevteam.lib.player;
+
+import buttondevteam.core.component.channel.Channel;
+import org.bukkit.configuration.file.YamlConfiguration;
+
+public class ChannelPlayerData { //I just want this to work
+	private final PlayerData<String> data;
+	private final Channel def;
+
+	public ChannelPlayerData(String name, YamlConfiguration yaml, Channel def) {
+		data = new PlayerData<>(name, yaml, "");
+		this.def = def;
+	}
+
+	public Channel get() {
+		String str = data.get();
+		if (str.isEmpty())
+			return def;
+		return Channel.getChannels().filter(c -> str.equals(c.ID)).findAny().orElse(def);
+	}
+
+	public void set(Channel value) {
+		data.set(value.ID);
+	}
+}

ButtonCore/src/main/java/buttondevteam/lib/player/ChromaGamerBase.java

@@ -0,0 +1,329 @@
+package buttondevteam.lib.player;
+
+import buttondevteam.core.component.channel.Channel;
+import buttondevteam.lib.TBMCCoreAPI;
+import com.google.common.collect.HashBiMap;
+import lombok.val;
+import org.bukkit.Bukkit;
+import org.bukkit.command.CommandSender;
+import org.bukkit.configuration.file.YamlConfiguration;
+
+import javax.annotation.Nullable;
+import java.io.File;
+import java.util.ArrayList;
+import java.util.HashMap;
+import java.util.Optional;
+import java.util.function.Consumer;
+import java.util.function.Function;
+
+@ChromaGamerEnforcer
+public abstract class ChromaGamerBase implements AutoCloseable {
+	public static final String TBMC_PLAYERS_DIR = "TBMC/players/";
+
+	private static final HashBiMap<Class<? extends ChromaGamerBase>, String> playerTypes = HashBiMap.create();
+
+	/**
+	 * Used for connecting with every type of user ({@link #connectWith(ChromaGamerBase)})
+	 */
+	public static void RegisterPluginUserClass(Class<? extends ChromaGamerBase> userclass) {
+		if (userclass.isAnnotationPresent(UserClass.class))
+			playerTypes.put(userclass, userclass.getAnnotation(UserClass.class).foldername());
+		else if (userclass.isAnnotationPresent(AbstractUserClass.class))
+			playerTypes.put(userclass.getAnnotation(AbstractUserClass.class).prototype(),
+					userclass.getAnnotation(AbstractUserClass.class).foldername());
+		else // <-- Really important
+			throw new RuntimeException("Class not registered as a user class! Use @UserClass or TBMCPlayerBase");
+	}
+
+	/**
+	 * Returns the folder name for the given player class.
+	 * 
+	 * @param cl
+	 *            The class to get the folder from (like {@link TBMCPlayerBase} or one of it's subclasses)
+	 * @return The folder name for the given type
+	 * @throws RuntimeException
+	 *             If the class doesn't have the {@link UserClass} annotation.
+	 */
+	public static <T extends ChromaGamerBase> String getFolderForType(Class<T> cl) {
+		if (cl.isAnnotationPresent(UserClass.class))
+			return cl.getAnnotation(UserClass.class).foldername();
+		else if (cl.isAnnotationPresent(AbstractUserClass.class))
+			return cl.getAnnotation(AbstractUserClass.class).foldername();
+		throw new RuntimeException("Class not registered as a user class! Use @UserClass or @AbstractUserClass");
+	}
+
+	/**
+	 * Returns the player class for the given folder name.
+	 * 
+	 * @param foldername
+	 *            The folder to get the class from (like "minecraft")
+	 * @return The type for the given folder name or null if not found
+	 */
+	public static Class<? extends ChromaGamerBase> getTypeForFolder(String foldername) {
+		return playerTypes.inverse().get(foldername);
+	}
+
+	/**
+	 * This method returns the filename for this player data. For example, for Minecraft-related data, MC UUIDs, for Discord data, use Discord IDs, etc.<br>
+	 * <b>Does not include .yml</b>
+	 */
+	public final String getFileName() {
+		return plugindata.getString(getFolder() + "_id");
+	}
+
+	/**
+     * Use {@link #data(Object)} or {@link #data(String, Object)} where possible; the 'id' must be always set
+	 */
+	protected YamlConfiguration plugindata;
+
+	/***
+	 * Loads a user from disk and returns the user object. Make sure to use the subclasses' methods, where possible, like {@link TBMCPlayerBase#getPlayer(java.util.UUID, Class)}
+	 *
+     * @param fname Filename without .yml, usually UUID
+     * @param cl User class
+     * @return The user object
+	 */
+	public static <T extends ChromaGamerBase> T getUser(String fname, Class<T> cl) {
+		try {
+			T obj = cl.newInstance();
+			final String folder = getFolderForType(cl);
+			final File file = new File(TBMC_PLAYERS_DIR + folder, fname + ".yml");
+			file.getParentFile().mkdirs();
+			obj.plugindata = YamlConfiguration.loadConfiguration(file);
+			obj.plugindata.set(folder + "_id", fname);
+			return obj;
+		} catch (Exception e) {
+			TBMCCoreAPI.SendException("An error occured while loading a " + cl.getSimpleName() + "!", e);
+		}
+		return null;
+	}
+
+	private static ArrayList<Function<CommandSender, ? extends Optional<? extends ChromaGamerBase>>> senderConverters = new ArrayList<>();
+
+	/**
+	 * Adds a converter to the start of the list.
+	 *
+	 * @param converter The converter that returns an object corresponding to the sender or null, if it's not the right type.
+	 */
+	public static <T extends ChromaGamerBase> void addConverter(Function<CommandSender, Optional<T>> converter) {
+		senderConverters.add(0, converter);
+	}
+
+	/**
+	 * Get from the given sender. the object's type will depend on the sender's type. May be null, but shouldn't be.
+	 *
+	 * @param sender The sender to use
+	 * @return A user as returned by a converter or null if none can supply it
+	 */
+	public static ChromaGamerBase getFromSender(CommandSender sender) {
+		for (val converter : senderConverters) {
+			val ocg = converter.apply(sender);
+			if (ocg.isPresent())
+				return ocg.get();
+		}
+		return null;
+	}
+
+	/**
+	 * Saves the player. It'll pass all exceptions to the caller. To automatically handle the exception, use {@link #save()} instead.
+	 */
+	@Override
+	public void close() throws Exception {
+		if (plugindata.getKeys(false).size() > 0)
+			plugindata.save(new File(TBMC_PLAYERS_DIR + getFolder(), getFileName() + ".yml"));
+	}
+
+	/**
+	 * Saves the player. It'll handle all exceptions that may happen. To catch the exception, use {@link #close()} instead.
+	 */
+	public void save() {
+		try {
+			close();
+		} catch (Exception e) {
+			TBMCCoreAPI.SendException("Error while saving player to " + getFolder() + "/" + getFileName() + ".yml!", e);
+		}
+	}
+
+	/**
+	 * Connect two accounts. Do not use for connecting two Minecraft accounts or similar. Also make sure you have the "id" tag set
+	 * 
+	 * @param user
+	 *            The account to connect with
+	 */
+	public <T extends ChromaGamerBase> void connectWith(T user) {
+		// Set the ID, go through all linked files and connect them as well
+		if (!playerTypes.containsKey(getClass()))
+			throw new RuntimeException("Class not registered as a user class! Use TBMCCoreAPI.RegisterUserClass");
+		final String ownFolder = getFolder();
+		final String userFolder = user.getFolder();
+		if (ownFolder.equalsIgnoreCase(userFolder))
+			throw new RuntimeException("Do not connect two accounts of the same type! Type: "+ownFolder);
+		user.plugindata.set(ownFolder + "_id", plugindata.getString(ownFolder + "_id"));
+		plugindata.set(userFolder + "_id", user.plugindata.getString(userFolder + "_id"));
+		Consumer<YamlConfiguration> sync = sourcedata -> {
+			final String sourcefolder = sourcedata == plugindata ? ownFolder : userFolder;
+			final String id = sourcedata.getString(sourcefolder + "_id");
+			for (val entry : playerTypes.entrySet()) { // Set our ID in all files we can find, both from our connections and the new ones
+				if (entry.getKey() == getClass() || entry.getKey() == user.getClass())
+					continue;
+				final String otherid = sourcedata.getString(entry.getValue() + "_id");
+				if (otherid == null)
+					continue;
+				try (ChromaGamerBase cg = getUser(otherid, entry.getKey())) {
+					cg.plugindata.set(sourcefolder + "_id", id); // Set new IDs
+					for (val item : playerTypes.entrySet())
+						if (sourcedata.contains(item.getValue() + "_id"))
+							cg.plugindata.set(item.getValue() + "_id", sourcedata.getString(item.getValue() + "_id")); // Set all existing IDs
+				} catch (Exception e) {
+					TBMCCoreAPI.SendException("Failed to update " + sourcefolder + " ID in player files for " + id
+							+ " in folder with " + entry.getValue() + " id " + otherid + "!", e);
+				}
+			}
+		};
+		sync.accept(plugindata);
+		sync.accept(user.plugindata);
+	}
+
+	/**
+	 * Retunrs the ID for the T typed player object connected with this one or null if no connection found.
+	 * 
+	 * @param cl
+	 *            The player class to get the ID from
+	 * @return The ID or null if not found
+	 */
+	public <T extends ChromaGamerBase> String getConnectedID(Class<T> cl) {
+		return plugindata.getString(getFolderForType(cl) + "_id");
+	}
+
+	/**
+	 * Returns this player as a plugin player. This will return a new instance unless the player is online.<br>
+	 * Make sure to close both the returned and this object. A try-with-resources block or two can help.<br>
+	 * 
+	 * @param cl
+	 *            The target player class
+	 * @return The player as a {@link T} object or null if not having an account there
+	 */
+	@SuppressWarnings("unchecked")
+	@Nullable
+	public <T extends ChromaGamerBase> T getAs(Class<T> cl) { // TODO: Provide a way to use TBMCPlayerBase's loaded players
+		if (cl.getSimpleName().equals(getClass().getSimpleName()))
+			return (T) this;
+		String newfolder = getFolderForType(cl);
+		if (newfolder == null)
+			throw new RuntimeException("The specified class " + cl.getSimpleName() + " isn't registered!");
+		if (newfolder.equals(getFolder())) // If in the same folder, the same filename is used
+			return getUser(getFileName(), cl);
+		if (!plugindata.contains(newfolder + "_id"))
+			return null;
+		return getUser(plugindata.getString(newfolder + "_id"), cl);
+	}
+
+	public String getFolder() {
+		return getFolderForType(getClass());
+	}
+
+	private void ThrowIfNoUser() {
+		if (!getClass().isAnnotationPresent(UserClass.class)
+				&& !getClass().isAnnotationPresent(AbstractUserClass.class))
+			throw new RuntimeException("Class not registered as a user class! Use @UserClass");
+	}
+
+	@SuppressWarnings("rawtypes")
+    private final HashMap<String, PlayerData> datamap = new HashMap<>();
+
+	/**
+	 * Use from a data() method, which is in a method with the name of the key. For example, use flair() for the enclosing method of the outer data() to save to and load from "flair"
+	 * 
+	 * @return A data object with methods to get and set
+	 */
+	@SuppressWarnings("unchecked")
+	protected <T> PlayerData<T> data(String sectionname, T def) {
+		ThrowIfNoUser();
+		String mname = sectionname + "." + new Exception().getStackTrace()[2].getMethodName();
+		if (!datamap.containsKey(mname))
+			datamap.put(mname, new PlayerData<T>(mname, plugindata, def));
+		return datamap.get(mname);
+	}
+
+	/**
+	 * Use from a method with the name of the key. For example, use flair() for the enclosing method to save to and load from "flair"
+	 * 
+	 * @return A data object with methods to get and set
+	 */
+	@SuppressWarnings("unchecked")
+	protected <T> PlayerData<T> data(T def) {
+		ThrowIfNoUser();
+		String mname = new Exception().getStackTrace()[1].getMethodName();
+		if (!datamap.containsKey(mname))
+			datamap.put(mname, new PlayerData<T>(mname, plugindata, def));
+		return datamap.get(mname);
+	}
+
+	@SuppressWarnings("rawtypes")
+	private final HashMap<String, EnumPlayerData> dataenummap = new HashMap<>();
+	private ChannelPlayerData datachannel;
+
+	/**
+	 * Use from a data() method, which is in a method with the name of the key. For example, use flair() for the enclosing method of the outer data() to save to and load from "flair"
+	 * 
+	 * @return A data object with methods to get and set
+	 */
+	@SuppressWarnings("unchecked")
+	protected <T extends Enum<T>> EnumPlayerData<T> dataEnum(String sectionname, Class<T> cl, T def) {
+		ThrowIfNoUser();
+		String mname = sectionname + "." + new Exception().getStackTrace()[2].getMethodName();
+		if (!dataenummap.containsKey(mname))
+			dataenummap.put(mname, new EnumPlayerData<T>(mname, plugindata, cl, def));
+		return dataenummap.get(mname);
+	}
+
+	/**
+	 * Use from a method with the name of the key. For example, use flair() for the enclosing method to save to and load from "flair"
+	 *
+	 * @return A data object with methods to get and set
+	 */
+	@SuppressWarnings("unchecked")
+	protected <T extends Enum<T>> EnumPlayerData<T> dataEnum(Class<T> cl, T def) {
+		ThrowIfNoUser();
+		String mname = new Exception().getStackTrace()[1].getMethodName();
+		if (!dataenummap.containsKey(mname))
+			dataenummap.put(mname, new EnumPlayerData<T>(mname, plugindata, cl, def));
+		return dataenummap.get(mname);
+	}
+
+	/**
+	 * Channel
+	 *
+	 * @return A data object with methods to get and set
+	 */
+	@SuppressWarnings("unchecked")
+	protected ChannelPlayerData dataChannel(Channel def) { //TODO: Make interface with fromString() method and require use of that for player data types
+		ThrowIfNoUser();
+		if (datachannel == null)
+			datachannel = new ChannelPlayerData("channel", plugindata, def);
+		return datachannel;
+	}
+
+	/**
+	 * Get player information. This method calls the {@link TBMCPlayerGetInfoEvent} to get all the player information across the TBMC plugins.
+	 * 
+	 * @param target
+	 *            The {@link InfoTarget} to return the info for.
+	 * @return The player information.
+	 */
+	public String getInfo(InfoTarget target) {
+		TBMCPlayerGetInfoEvent event = new TBMCPlayerGetInfoEvent(this, target);
+		Bukkit.getServer().getPluginManager().callEvent(event);
+		return event.getResult();
+	}
+
+	public enum InfoTarget {
+		MCHover, MCCommand, Discord
+	}
+
+	//-----------------------------------------------------------------
+
+	public ChannelPlayerData channel() {
+		return dataChannel(Channel.GlobalChat);
+	}
+}

ButtonCore/src/main/java/buttondevteam/lib/player/EnumPlayerData.java

@@ -0,0 +1,26 @@
+package buttondevteam.lib.player;
+
+import org.bukkit.configuration.file.YamlConfiguration;
+
+public class EnumPlayerData<T extends Enum<T>> {
+	private final PlayerData<String> data;
+	private final Class<T> cl;
+	private final T def;
+
+	public EnumPlayerData(String name, YamlConfiguration yaml, Class<T> cl, T def) {
+		data = new PlayerData<String>(name, yaml, "");
+		this.cl = cl;
+		this.def = def;
+	}
+
+	public T get() {
+		String str = data.get();
+		if (str.isEmpty())
+			return def;
+		return Enum.valueOf(cl, str);
+	}
+
+	public void set(T value) {
+		data.set(value.toString());
+	}
+}

ButtonCore/src/main/java/buttondevteam/lib/player/PlayerData.java

@@ -0,0 +1,37 @@
+package buttondevteam.lib.player;
+
+import org.bukkit.configuration.file.YamlConfiguration;
+
+public class PlayerData<T> {
+	private final String name;
+	private final YamlConfiguration yaml;
+	private final T def;
+
+	public PlayerData(String name, YamlConfiguration yaml, T def) {
+		this.name = name;
+		this.yaml = yaml;
+		this.def = def;
+	}
+
+	@SuppressWarnings("unchecked")
+	// @Deprecated - What was once enforced (2 days ago from now) vanished now
+	public T get() {
+		Object value = yaml.get(name, def);
+		if (value instanceof Integer) {
+			if (def instanceof Short) // If the default is Short the value must be as well because both are T
+				return (T) (Short) ((Integer) value).shortValue();
+			if (def instanceof Long)
+				return (T) (Long) ((Integer) value).longValue();
+		}
+		return (T) value;
+	}
+
+	public void set(T value) {
+		yaml.set(name, value);
+	}
+
+	@Override
+	public String toString() {
+		return get().toString();
+	}
+}

ButtonCore/src/main/java/buttondevteam/lib/player/TBMCPlayer.java

@@ -1,6 +1,6 @@
 package buttondevteam.lib.player;
 
-@PlayerClass(pluginname = "Chroma-Core")
+@PlayerClass(pluginname = "ButtonCore")
 public final class TBMCPlayer extends TBMCPlayerBase {
 
 }

ButtonCore/src/main/java/buttondevteam/lib/player/TBMCPlayerBase.java

@@ -0,0 +1,185 @@
+package buttondevteam.lib.player;
+
+import buttondevteam.core.component.towny.TownyComponent;
+import buttondevteam.lib.TBMCCoreAPI;
+import org.bukkit.Bukkit;
+import org.bukkit.OfflinePlayer;
+import org.bukkit.entity.Player;
+
+import java.util.Set;
+import java.util.UUID;
+import java.util.concurrent.ConcurrentHashMap;
+
+@AbstractUserClass(foldername = "minecraft", prototype = TBMCPlayer.class)
+@TBMCPlayerEnforcer
+public abstract class TBMCPlayerBase extends ChromaGamerBase {
+	protected UUID uuid;
+
+	private String pluginname;
+
+	protected TBMCPlayerBase() {
+		if (getClass().isAnnotationPresent(PlayerClass.class))
+			pluginname = getClass().getAnnotation(PlayerClass.class).pluginname();
+		else
+			throw new RuntimeException("Class not defined as player class! Use @PlayerClass");
+	}
+
+	public UUID getUUID() {
+		if (uuid == null)
+			uuid = UUID.fromString(getFileName());
+		return uuid;
+	}
+
+	public PlayerData<String> PlayerName() {
+		return super.data(null);
+	}
+
+	/**
+	 * Use from a method with the name of the key. For example, use flair() for the enclosing method to save to and load from "flair"
+	 *
+	 * @return A data object with methods to get and set
+	 */
+	@Override
+	protected <T> PlayerData<T> data(T def) {
+		return super.data(pluginname, def);
+	}
+
+	/**
+	 * Use from a method with the name of the key. For example, use flair() for the enclosing method to save to and load from "flair"
+	 *
+	 * @return A data object with methods to get and set
+	 */
+	@Override
+	protected <T extends Enum<T>> EnumPlayerData<T> dataEnum(Class<T> cl, T def) {
+		return super.dataEnum(pluginname, cl, def);
+	}
+
+	/**
+	 * Get player as a plugin player
+	 *
+	 * @param uuid The UUID of the player to get
+	 * @param cl   The type of the player
+	 * @return The requested player object
+	 */
+	@SuppressWarnings("unchecked")
+	public static <T extends TBMCPlayerBase> T getPlayer(UUID uuid, Class<T> cl) {
+		if (playermap.containsKey(uuid + "-" + cl.getSimpleName()))
+			return (T) playermap.get(uuid + "-" + cl.getSimpleName());
+		try {
+			T player;
+			if (playermap.containsKey(uuid + "-" + TBMCPlayer.class.getSimpleName())) {
+				player = cl.newInstance();
+				player.plugindata = playermap.get(uuid + "-" + TBMCPlayer.class.getSimpleName()).plugindata;
+				playermap.put(uuid + "-" + cl.getSimpleName(), player); // It will get removed on player quit
+			} else
+				player = ChromaGamerBase.getUser(uuid.toString(), cl);
+			player.uuid = uuid;
+			return player;
+		} catch (Exception e) {
+			TBMCCoreAPI.SendException(
+				"Failed to get player with UUID " + uuid + " and class " + cl.getSimpleName() + "!", e);
+			return null;
+		}
+	}
+
+	/**
+	 * Key: UUID-Class
+	 */
+	static final ConcurrentHashMap<String, TBMCPlayerBase> playermap = new ConcurrentHashMap<>();
+
+	/**
+	 * Gets the TBMCPlayer object as a specific plugin player, keeping it's data<br>
+	 * Make sure to use try-with-resources with this to save the data, as it may need to load the file
+	 *
+	 * @param cl The TBMCPlayer subclass
+	 */
+	public <T extends TBMCPlayerBase> T asPluginPlayer(Class<T> cl) {
+		return getPlayer(uuid, cl);
+	}
+
+	/**
+	 * Only intended to use from ButtonCore
+	 */
+	public static void savePlayer(TBMCPlayerBase player) {
+		Bukkit.getServer().getPluginManager().callEvent(new TBMCPlayerSaveEvent(player));
+		try {
+			player.close();
+		} catch (Exception e) {
+			new Exception("Failed to save player data for " + player.PlayerName().get(), e).printStackTrace();
+		}
+	}
+
+	/**
+	 * Only intended to use from ButtonCore
+	 */
+	public static void joinPlayer(Player p) {
+		TBMCPlayer player = TBMCPlayerBase.getPlayer(p.getUniqueId(), TBMCPlayer.class);
+		Bukkit.getLogger().info("Loaded player: " + player.PlayerName().get());
+		if (player.PlayerName().get() == null) {
+			player.PlayerName().set(p.getName());
+			Bukkit.getLogger().info("Player name saved: " + player.PlayerName().get());
+		} else if (!p.getName().equals(player.PlayerName().get())) {
+			TownyComponent.renameInTowny(player.PlayerName().get(), p.getName());
+			player.PlayerName().set(p.getName());
+			Bukkit.getLogger().info("Renamed to " + p.getName());
+		}
+		playermap.put(p.getUniqueId() + "-" + TBMCPlayer.class.getSimpleName(), player);
+
+		// Load in other plugins
+		Bukkit.getServer().getPluginManager().callEvent(new TBMCPlayerLoadEvent(player));
+		Bukkit.getServer().getPluginManager().callEvent(new TBMCPlayerJoinEvent(player, p));
+		player.save();
+	}
+
+	/**
+	 * Only intended to use from ButtonCore
+	 */
+	public static void quitPlayer(Player p) {
+		final TBMCPlayerBase player = playermap.get(p.getUniqueId() + "-" + TBMCPlayer.class.getSimpleName());
+		player.save();
+		Bukkit.getServer().getPluginManager().callEvent(new TBMCPlayerQuitEvent(player, p));
+		playermap.entrySet().removeIf(entry -> entry.getKey().startsWith(p.getUniqueId().toString()));
+	}
+
+	public static void savePlayers() {
+		playermap.values().forEach(p -> {
+			try {
+				p.close();
+			} catch (Exception e) {
+				TBMCCoreAPI.SendException("Error while saving player " + p.PlayerName().get() + " (" + p.getFolder()
+					+ "/" + p.getFileName() + ")!", e);
+			}
+		});
+	}
+
+	/**
+	 * This method returns a TBMC player from their name. Calling this method may return an offline player which will load it, therefore it's highly recommended to use {@link #close()} to unload the
+	 * player data. Using try-with-resources may be the easiest way to achieve this. Example:
+	 *
+	 * <pre>
+	 * {@code
+	 * try(TBMCPlayer player = getFromName(p))
+	 * {
+	 * 	...
+	 * }
+	 * </pre>
+	 *
+	 * @param name The player's name
+	 * @return The {@link TBMCPlayer} object for the player
+	 */
+	public static <T extends TBMCPlayerBase> T getFromName(String name, Class<T> cl) {
+		@SuppressWarnings("deprecation")
+		OfflinePlayer p = Bukkit.getOfflinePlayer(name);
+		if (p != null)
+			return getPlayer(p.getUniqueId(), cl);
+		else
+			return null;
+	}
+
+	@Override
+	public void close() throws Exception {
+		Set<String> keys = plugindata.getKeys(false);
+		if (keys.size() > 1) // PlayerName is always saved, but we don't need a file for just that
+			super.close();
+	}
+}

ButtonCore/src/main/java/buttondevteam/lib/player/TBMCPlayerJoinEvent.java

@@ -0,0 +1,34 @@
+package buttondevteam.lib.player;
+
+import org.bukkit.entity.Player;
+import org.bukkit.event.Event;
+import org.bukkit.event.HandlerList;
+
+public class TBMCPlayerJoinEvent extends Event {
+	private static final HandlerList handlers = new HandlerList();
+
+	private final TBMCPlayerBase player;
+	private final Player player_;
+
+	public TBMCPlayerJoinEvent(TBMCPlayerBase player, Player player_) {
+		this.player = player;
+		this.player_ = player_;
+	}
+
+	public TBMCPlayerBase GetPlayer() {
+		return player;
+	}
+
+	public Player getPlayer() { // :P
+		return player_;
+	}
+
+	@Override
+	public HandlerList getHandlers() {
+		return handlers;
+	}
+
+	public static HandlerList getHandlerList() {
+		return handlers;
+	}
+}

ButtonCore/src/main/java/buttondevteam/lib/player/TBMCPlayerLoadEvent.java

@@ -0,0 +1,27 @@
+package buttondevteam.lib.player;
+
+import org.bukkit.event.Event;
+import org.bukkit.event.HandlerList;
+
+public class TBMCPlayerLoadEvent extends Event {
+	private static final HandlerList handlers = new HandlerList();
+
+    private final TBMCPlayerBase player;
+
+	public TBMCPlayerLoadEvent(TBMCPlayerBase player) {
+		this.player = player;
+	}
+
+	public TBMCPlayerBase GetPlayer() {
+		return player;
+	}
+
+	@Override
+	public HandlerList getHandlers() {
+		return handlers;
+	}
+
+	public static HandlerList getHandlerList() {
+		return handlers;
+	}
+}