using newer release option for compiler plugin

# Conflicts:
#	mvnw

.github/workflows/bintray-publish.yml

@@ -1,29 +0,0 @@
-name: Publish to Bintray (Spigot 1.13+)
-
-on:
-  release:
-    types: [created]
-
-jobs:
-  build:
-
-    runs-on: ubuntu-latest
-
-    steps:
-    - uses: actions/checkout@v2
-    - name: Set up JDK 1.8
-      uses: actions/setup-java@v1
-      with:
-        java-version: 1.8
-        server-id: bintray-roinujnosde-bukkit-plugins # Value of the distributionManagement/repository/id field of the pom.xml
-        server-username: MAVEN_USERNAME
-        server-password: MAVEN_PASSWORD
-
-    - name: Build with Maven
-      run: mvn -B package --file pom.xml
-
-    - name: Publish to Bintray
-      run: mvn -B deploy
-      env:
-        MAVEN_USERNAME: ${{ secrets.BINTRAY_USERNAME }}
-        MAVEN_PASSWORD: ${{ secrets.BINTRAY_TOKEN }}

.github/workflows/maven.yml

@@ -1,31 +1,37 @@
 # This workflow will build a Java project with Maven
 # For more information see: https://help.github.com/actions/language-and-framework-guides/building-and-testing-java-with-maven
 
-name: Java CI Dev Build
+name: CI
 
 on:
   push:
-    branches: [ dev ]
+    branches: [ master ]
   pull_request:
-    branches: [ dev ]
+    branches: [ master ]
 
 jobs:
   build:
-
+    strategy:
+      fail-fast: true
+      max-parallel: 4
+      matrix:
+        java-version: [ 16, 17 ]
     runs-on: ubuntu-latest
-
+    name: Java ${{ matrix.java-version }}
     steps:
-    - uses: actions/checkout@v2
-    - name: Set up JDK 1.8
-      uses: actions/setup-java@v1
-      with:
-        java-version: 1.8
-    - name: Build with Maven
-      run: mvn -B package --file pom.xml
-    - name: Create Staging
-      run: mkdir staging && cp target/SimpleClans.jar staging
-    - name: Upload a Build Artifact
-      uses: actions/upload-artifact@v2
-      with:
-        name: SimpleClans
-        path: staging
+      - name: Checkout
+        uses: actions/checkout@v3
+      - name: "Set up JDK ${{ matrix.java-version }}"
+        uses: actions/setup-java@v3
+        with:
+          java-version: "${{ matrix.java-version }}"
+          distribution: 'adopt'
+          cache: 'maven'
+      - name: Build with Maven
+        run: ./mvnw -B -U package --file pom.xml
+      - name: Upload Build Artifact
+        if: "${{ matrix.java-version == 16 }}"
+        uses: actions/upload-artifact@v3
+        with:
+          name: SimpleClans
+          path: target/SimpleClans.jar

.github/workflows/publish_curseforge.yml

@@ -0,0 +1,31 @@
+name: Publish to CurseForge
+on:
+  release:
+    types: [created]
+
+jobs:
+  publish:
+    runs-on: ubuntu-latest
+    steps:
+    - uses: actions/checkout@v3
+    - name: Set up JDK 16
+      uses: actions/setup-java@v3
+      with:
+        java-version: 16
+        cache: 'maven'
+        distribution: 'adopt'
+    - name: Build with Maven
+      run: ./mvnw -B package --file pom.xml
+    - name: Upload artifact
+      uses: itsmeow/curseforge-upload@v3
+      with:
+        token: ${{ secrets.CURSEFORGE_TOKEN }}
+        project_id: 380814
+        game_endpoint: minecraft
+        file_path: target/SimpleClans.jar
+        changelog: ${{ github.event.release.body }}
+        changelog_type: markdown
+        display_name: ${{ github.event.release.tag_name }}
+        game_versions: 8849,8503,7915,7667,7330,7105,6588,630,591,585,531
+        release_type: release
+        relations: vault:optionalDependency,worldguard:optionalDependency,grief-prevention:optionalDependency

.github/workflows/publish_modrinth.yml

@@ -0,0 +1,31 @@
+name: Publish to Modrinth
+on:
+  release:
+    types: [created]
+
+jobs:
+  publish:
+    runs-on: ubuntu-latest
+    steps:
+    - uses: actions/checkout@v3
+    - name: Set up JDK 16
+      uses: actions/setup-java@v3
+      with:
+        java-version: 16
+        cache: 'maven'
+        distribution: 'adopt'
+    - name: Build with Maven
+      run: ./mvnw -B package --file pom.xml
+    - name: Upload artifact
+      uses: RubixDev/modrinth-upload@v1.0.0
+      with:
+        token: ${{ secrets.MODRINTH_TOKEN }}
+        project_id: quLDfyDl
+        file_path: target/SimpleClans.jar
+        changelog: ${{ github.event.release.body }}
+        name: ${{ github.event.release.tag_name }}
+        version: ${{ github.event.release.tag_name }}
+        game_versions: 1.19,1.18,1.17,1.16,1.15,1.14,1.13,1.12,1.11,1.10,1.9,1.8
+        release_type: release
+        loaders: spigot
+        featured: true

.github/workflows/publish_reposilite.yml

@@ -0,0 +1,29 @@
+name: Publish to Reposilite
+on:
+  push:
+    branches:
+      - master
+  workflow_dispatch:
+
+jobs:
+  publish:
+    runs-on: ubuntu-latest
+
+    steps:
+      - uses: actions/checkout@v3
+      - name: Set up JDK 16
+        uses: actions/setup-java@v3
+        with:
+          java-version: 16
+          server-id: reposilite # Value of the distributionManagement/repository/id field of the pom.xml
+          server-username: MAVEN_USERNAME
+          server-password: MAVEN_PASSWORD
+          cache: 'maven'
+          distribution: 'adopt'
+      - name: Build with Maven
+        run: ./mvnw -B package --file pom.xml
+      - name: Publish to Reposilite
+        run: ./mvnw -B deploy
+        env:
+          MAVEN_USERNAME: simpleclans
+          MAVEN_PASSWORD: ${{ secrets.REPOSILITE_TOKEN }}

.github/workflows/release_please.yml

@@ -0,0 +1,15 @@
+on:
+  push:
+    branches:
+      - master
+name: release-please
+jobs:
+  release-please:
+    runs-on: ubuntu-latest
+    steps:
+      - uses: google-github-actions/release-please-action@v3
+        with:
+          release-type: maven
+          package-name: SimpleClans
+          token: ${{ secrets.PAT_TOKEN }}
+          fork: false

.gitignore

@@ -3,6 +3,8 @@
 /bin/
 /.classpath
 /.project
-/dependency-reduced-pom.xml
 *.jar
 .settings
+.factorypath
+SimpleClans.iml
+dependency-reduced-pom.xml

.mvn/wrapper/maven-wrapper.properties

@@ -0,0 +1,18 @@
+# Licensed to the Apache Software Foundation (ASF) under one
+# or more contributor license agreements.  See the NOTICE file
+# distributed with this work for additional information
+# regarding copyright ownership.  The ASF licenses this file
+# to you under the Apache License, Version 2.0 (the
+# "License"); you may not use this file except in compliance
+# with the License.  You may obtain a copy of the License at
+#
+#   http://www.apache.org/licenses/LICENSE-2.0
+#
+# Unless required by applicable law or agreed to in writing,
+# software distributed under the License is distributed on an
+# "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
+# KIND, either express or implied.  See the License for the
+# specific language governing permissions and limitations
+# under the License.
+distributionUrl=https://repo.maven.apache.org/maven2/org/apache/maven/apache-maven/3.9.3/apache-maven-3.9.3-bin.zip
+wrapperUrl=https://repo.maven.apache.org/maven2/org/apache/maven/wrapper/maven-wrapper/3.2.0/maven-wrapper-3.2.0.jar

CHANGELOG.md

@@ -0,0 +1,105 @@
+# Changelog
+
+## [2.19.0](https://github.com/RoinujNosde/SimpleClans/compare/v2.18.1...v2.19.0) (2023-07-27)
+
+
+### Features
+
+* add %simpleclans_has_rank% placeholder ([#379](https://github.com/RoinujNosde/SimpleClans/issues/379)) ([f8ce0f4](https://github.com/RoinujNosde/SimpleClans/commit/f8ce0f415f17748f8b4382e028dd1f5f93cae06a))
+* add a command to set player's locale ([#378](https://github.com/RoinujNosde/SimpleClans/issues/378)) ([5cf64a6](https://github.com/RoinujNosde/SimpleClans/commit/5cf64a672d0a25a62d3abd6720082bb3b4cf056f))
+* add confirmation before reset kdr ([#371](https://github.com/RoinujNosde/SimpleClans/issues/371)) ([d4f1a74](https://github.com/RoinujNosde/SimpleClans/commit/d4f1a74dee9cdeeb458ff6975715a817bfe30fa1))
+* add PlayerResetKdrEvent ([#370](https://github.com/RoinujNosde/SimpleClans/issues/370)) ([d68ec28](https://github.com/RoinujNosde/SimpleClans/commit/d68ec28f8e14926cbe9d13c09a61735e5304a97d))
+* add subcommand /clan mod bb display ([#367](https://github.com/RoinujNosde/SimpleClans/issues/367)) ([105a8ca](https://github.com/RoinujNosde/SimpleClans/commit/105a8cad51b12bf6f487cf6c2b81eb85d966a3cc))
+* adds the possibility to rename a clan ([#360](https://github.com/RoinujNosde/SimpleClans/issues/360)) ([0f69332](https://github.com/RoinujNosde/SimpleClans/commit/0f693329cae81036bfe1423344ed41cf3d535f64))
+* bb message language key ([#358](https://github.com/RoinujNosde/SimpleClans/issues/358)) ([263d129](https://github.com/RoinujNosde/SimpleClans/commit/263d129325888fb1303dda549986ab43ca93ed13))
+* **chat:** adds permissions to use colors and formats ([#341](https://github.com/RoinujNosde/SimpleClans/issues/341)) ([2a139ab](https://github.com/RoinujNosde/SimpleClans/commit/2a139aba03be174086dfb3603007312d0c7a6c33))
+* EconomyTransactionEvent creation ([#384](https://github.com/RoinujNosde/SimpleClans/issues/384)) ([d21dc02](https://github.com/RoinujNosde/SimpleClans/commit/d21dc02dff45f4f20a40303cd26215a71de7dddb))
+* hide reset kdr in main frame if perm denied ([#385](https://github.com/RoinujNosde/SimpleClans/issues/385)) ([ad6bb7b](https://github.com/RoinujNosde/SimpleClans/commit/ad6bb7b13b347be71789fbfb4b8a82f6c5481c96))
+* validating tag by regex ([#363](https://github.com/RoinujNosde/SimpleClans/issues/363)) ([3ef3169](https://github.com/RoinujNosde/SimpleClans/commit/3ef3169942f897280af15040f1243d955df001ab))
+
+
+### Bug Fixes
+
+* added clan suggestion in staff bb commands ([#359](https://github.com/RoinujNosde/SimpleClans/issues/359)) ([442096e](https://github.com/RoinujNosde/SimpleClans/commit/442096e9da98410682c2cd09e0e930454fe0364f))
+* async permission reset & category deletion ([#347](https://github.com/RoinujNosde/SimpleClans/issues/347)) ([7eb748b](https://github.com/RoinujNosde/SimpleClans/commit/7eb748bb9a31a826f53fd7ac6b1eeac64e330467))
+* bump JDK to 16 ([e368ead](https://github.com/RoinujNosde/SimpleClans/commit/e368ead04aa2735f5525d88d5dcb63b78286f80e))
+* **bungee:** removes players from clan on delete ([0258a75](https://github.com/RoinujNosde/SimpleClans/commit/0258a75c819f12e5dbbaf383a572682717f34c59))
+* **bungee:** updates kills count immediately ([ed243f7](https://github.com/RoinujNosde/SimpleClans/commit/ed243f72ecc58a3af11d053d73b315bce9e20e94))
+* default username-regex ([bf1033a](https://github.com/RoinujNosde/SimpleClans/commit/bf1033af769bacbca9a790d2184ec77eeb519485))
+* **discord:** permission overrides reset only existing members ([#349](https://github.com/RoinujNosde/SimpleClans/issues/349)) ([8a35293](https://github.com/RoinujNosde/SimpleClans/commit/8a3529377f5b4a482b530e474e4921b311197a04))
+* display hex message on bulletin board ([#365](https://github.com/RoinujNosde/SimpleClans/issues/365)) ([0b74355](https://github.com/RoinujNosde/SimpleClans/commit/0b74355467625a4901944c72feb84d8de91a4283))
+* invalid colors being used in tags ([2850e59](https://github.com/RoinujNosde/SimpleClans/commit/2850e59d370da34c643de198de85d91744610467))
+* invalid colors being used in tags, pt. 2 ([f98868c](https://github.com/RoinujNosde/SimpleClans/commit/f98868c776a2e275dc7c1647748a0231e935f43e))
+* migrates land permissions on GP claim resize ([2f4ad00](https://github.com/RoinujNosde/SimpleClans/commit/2f4ad00f1c72ee7e3948267965c3a075ec4ef728))
+* NPE on EntityDamageByEntityEvent listener (LandProtection) ([524e407](https://github.com/RoinujNosde/SimpleClans/commit/524e40762011dd500a407286b72b51acf6c357f3))
+* players not able to break vehicles/exit horses ([86d4fac](https://github.com/RoinujNosde/SimpleClans/commit/86d4fac938e353f94c288c39b884027027972bba))
+* players not able to sleep on beds (WorldGuard) ([e9ec283](https://github.com/RoinujNosde/SimpleClans/commit/e9ec283ace55af10abdeb6f937d31d4c2dc198dc))
+* players not able to strip logs/fertilize blocks ([5021b8a](https://github.com/RoinujNosde/SimpleClans/commit/5021b8ad7b5633769bd87af96a0226a53a8b24b4))
+* players not able to use water buckets (WorldGuard) ([807d39a](https://github.com/RoinujNosde/SimpleClans/commit/807d39afeb51d99a96fb793099393b44e2c43b04))
+* players unable to interact with armor stands, paintings, etc ([61dcb3d](https://github.com/RoinujNosde/SimpleClans/commit/61dcb3d440e2eedfb717afcc69687194311a8973))
+* possibly fixes CME on SpyChatHandler ([8a05dbb](https://github.com/RoinujNosde/SimpleClans/commit/8a05dbbf00df97afa7df71a500e2626aaa46ed37))
+* prevent clan name renaming with colors ([#374](https://github.com/RoinujNosde/SimpleClans/issues/374)) ([7fcb964](https://github.com/RoinujNosde/SimpleClans/commit/7fcb964f41118e7d8746e87d5770cc329730834c))
+* remove abandoned channels before validating ([#348](https://github.com/RoinujNosde/SimpleClans/issues/348)) ([5f519c4](https://github.com/RoinujNosde/SimpleClans/commit/5f519c477af3e759596017010d51ddd06e26157e))
+* resets error message when validating a clan tag ([#383](https://github.com/RoinujNosde/SimpleClans/issues/383)) ([8269d80](https://github.com/RoinujNosde/SimpleClans/commit/8269d80831533e517ed2ebd94bec18021de7b0e3))
+* sets duplicate names to something unique ([046aa1d](https://github.com/RoinujNosde/SimpleClans/commit/046aa1d96d58e21496a3361c7d072f3943595304))
+* tnt explosion doesn't count a kill ([#381](https://github.com/RoinujNosde/SimpleClans/issues/381)) ([57b9987](https://github.com/RoinujNosde/SimpleClans/commit/57b9987e9b9dade59c52c88dbfd3b12fdf5eee94))
+* view permission applies only to cached channels ([#346](https://github.com/RoinujNosde/SimpleClans/issues/346)) ([1850701](https://github.com/RoinujNosde/SimpleClans/commit/18507016a843c28efc6d8109f2bb5a5106531f47))
+
+
+### Performance Improvements
+
+* **discord:** remove discord channels from creation ([#353](https://github.com/RoinujNosde/SimpleClans/issues/353)) ([36084db](https://github.com/RoinujNosde/SimpleClans/commit/36084dbfa3e73aedccb156e49af5062e40639927))
+
+
+### Documentation
+
+* author tag isn't available at methods ([f5d547a](https://github.com/RoinujNosde/SimpleClans/commit/f5d547ab27fac7cfe1abd9c819e4f1bb3dd7c624))
+* updated version in README ([#343](https://github.com/RoinujNosde/SimpleClans/issues/343)) ([718868b](https://github.com/RoinujNosde/SimpleClans/commit/718868b2d9eea2aeb6fcfd734e85d16a2cefaa36))
+
+## [2.18.1](https://github.com/RoinujNosde/SimpleClans/compare/v2.18.0...v2.18.1) (2022-11-29)
+
+
+### Bug Fixes
+
+* added check for clan_member on land commands ([fc81e76](https://github.com/RoinujNosde/SimpleClans/commit/fc81e765211bebe22a7a6aa5d5158754580bbdc5))
+* attempt at fixing NPE on getAllClanPlayers ([26ba9f7](https://github.com/RoinujNosde/SimpleClans/commit/26ba9f73296a772eaa698d2ede6fbc3831da850c))
+* **bungee:** error deserializing clan banners ([56c7908](https://github.com/RoinujNosde/SimpleClans/commit/56c7908c332167cec9cca6a4ea054977d0d68b9f))
+* channel auto creation setting not respected on join/link ([7f9d133](https://github.com/RoinujNosde/SimpleClans/commit/7f9d133051b9011837d0a5114abc6c3637a3f02c))
+* default ranks were getting re-added on config load ([7a37382](https://github.com/RoinujNosde/SimpleClans/commit/7a37382264ff4dd5456f6930045b5102bf491897))
+* missing getHandlerList on HomeRegroupEvent ([#338](https://github.com/RoinujNosde/SimpleClans/issues/338)) ([8fa465d](https://github.com/RoinujNosde/SimpleClans/commit/8fa465da385f36b1fb075031c375ef94df78ea52))
+* money was not given back when channel creation failed ([#336](https://github.com/RoinujNosde/SimpleClans/issues/336)) ([d8cb61b](https://github.com/RoinujNosde/SimpleClans/commit/d8cb61b0fc9584bb58f421faf98596816621053f))
+* wrong path of discord economy section ([#334](https://github.com/RoinujNosde/SimpleClans/issues/334)) ([3f1b06d](https://github.com/RoinujNosde/SimpleClans/commit/3f1b06dcf996e51a878b7fc281069e236ebcbfce))
+
+## [2.18.0](https://github.com/RoinujNosde/SimpleClans/compare/v2.17.0...v2.18.0) (2022-10-14)
+
+
+### Features
+
+* add help-size config ([25197cd](https://github.com/RoinujNosde/SimpleClans/commit/25197cdd729cea63d7e223dc1e0aaef830613327))
+* added method for registering protection providers ([2ea7444](https://github.com/RoinujNosde/SimpleClans/commit/2ea744443f502970b15859818e9d5e45ca69d453))
+* adds permission to bypass the teleport delay ([d56a0a9](https://github.com/RoinujNosde/SimpleClans/commit/d56a0a979a47a140115742518e934a2469e6f880))
+* adds PlayerHomeClearEvent ([becb88b](https://github.com/RoinujNosde/SimpleClans/commit/becb88b763380bed5a2e1dd209c32c8363a7f88b))
+* adds starter-ranks ([a440834](https://github.com/RoinujNosde/SimpleClans/commit/a4408343479d7efa6ae5a65894f8b822ecd47ebb))
+* Improves Bungee support ([#327](https://github.com/RoinujNosde/SimpleClans/issues/327)) ([2c9b0f9](https://github.com/RoinujNosde/SimpleClans/commit/2c9b0f98fe3942ea74190c1a81d61be2c8647db8))
+* **lang:** new crowdin updates ([#319](https://github.com/RoinujNosde/SimpleClans/issues/319)) ([87ece22](https://github.com/RoinujNosde/SimpleClans/commit/87ece22036fb674c8c362b6a1b86fe884543e6ad))
+
+
+### Bug Fixes
+
+* changes size of some frames for better visualization on Bedrock ([1adec0b](https://github.com/RoinujNosde/SimpleClans/commit/1adec0b89d676767cdb94dcdf91ba37a231eb4a8))
+* ConfigurationSerializableAdapter NPE ([30a501c](https://github.com/RoinujNosde/SimpleClans/commit/30a501c063aa9dbcf596df83adc2b15baf0e4bb9))
+* getPastClans() preserves the insertion order ([af07988](https://github.com/RoinujNosde/SimpleClans/commit/af079881030bd299b9bae1ebf0cc62353af7e6fc))
+* NoClassDefFoundError in WorldGuard6Provider ([a859928](https://github.com/RoinujNosde/SimpleClans/commit/a8599286225ba603ea124b8b52510245b94ffd24))
+* NPE while collecting fees ([c47289c](https://github.com/RoinujNosde/SimpleClans/commit/c47289c5bf8113a9d6a8e1ee74a5afb0358647b6))
+* NPE while purging data ([f14c425](https://github.com/RoinujNosde/SimpleClans/commit/f14c42548846feef01b484acbb5f02bcbcabd8db))
+* NPE while sending a message to spies ([#322](https://github.com/RoinujNosde/SimpleClans/issues/322)) ([e7f756f](https://github.com/RoinujNosde/SimpleClans/commit/e7f756f3063c646e21415e08eea73f123d2818a0))
+* removes duplicate /clan from help ([f7e7ec6](https://github.com/RoinujNosde/SimpleClans/commit/f7e7ec66243359e26d3c456a9740a53753951c48))
+* removes rank and join date on disband ([2a1ad5b](https://github.com/RoinujNosde/SimpleClans/commit/2a1ad5b5c8d2937a8ee6dd6f7f43d85c86f08307))
+* set useSSL to false ([f484bc1](https://github.com/RoinujNosde/SimpleClans/commit/f484bc16c6176ccd13e05aae2169400e7bcf5d62))
+* supports '.' and '*' as username prefix by default ([37f0ecf](https://github.com/RoinujNosde/SimpleClans/commit/37f0ecff506d06f3047e3598848117a14c2b7ead))
+* updates join date when joining a clan ([#326](https://github.com/RoinujNosde/SimpleClans/issues/326)) ([96a13d8](https://github.com/RoinujNosde/SimpleClans/commit/96a13d8d6cc18c91d4dee20dd632cd5d65db5213))
+
+
+### Performance Improvements
+
+* improved UUID lookup performance ([4ab53d1](https://github.com/RoinujNosde/SimpleClans/commit/4ab53d16135ecf5a4067b1a63d058da392dc5313))

LICENSE

@@ -0,0 +1,674 @@
+                    GNU GENERAL PUBLIC LICENSE
+                       Version 3, 29 June 2007
+
+ Copyright (C) 2007 Free Software Foundation, Inc. <https://fsf.org/>
+ Everyone is permitted to copy and distribute verbatim copies
+ of this license document, but changing it is not allowed.
+
+                            Preamble
+
+  The GNU General Public License is a free, copyleft license for
+software and other kinds of works.
+
+  The licenses for most software and other practical works are designed
+to take away your freedom to share and change the works.  By contrast,
+the GNU General Public License is intended to guarantee your freedom to
+share and change all versions of a program--to make sure it remains free
+software for all its users.  We, the Free Software Foundation, use the
+GNU General Public License for most of our software; it applies also to
+any other work released this way by its authors.  You can apply it to
+your programs, too.
+
+  When we speak of free software, we are referring to freedom, not
+price.  Our General Public Licenses are designed to make sure that you
+have the freedom to distribute copies of free software (and charge for
+them if you wish), that you receive source code or can get it if you
+want it, that you can change the software or use pieces of it in new
+free programs, and that you know you can do these things.
+
+  To protect your rights, we need to prevent others from denying you
+these rights or asking you to surrender the rights.  Therefore, you have
+certain responsibilities if you distribute copies of the software, or if
+you modify it: responsibilities to respect the freedom of others.
+
+  For example, if you distribute copies of such a program, whether
+gratis or for a fee, you must pass on to the recipients the same
+freedoms that you received.  You must make sure that they, too, receive
+or can get the source code.  And you must show them these terms so they
+know their rights.
+
+  Developers that use the GNU GPL protect your rights with two steps:
+(1) assert copyright on the software, and (2) offer you this License
+giving you legal permission to copy, distribute and/or modify it.
+
+  For the developers' and authors' protection, the GPL clearly explains
+that there is no warranty for this free software.  For both users' and
+authors' sake, the GPL requires that modified versions be marked as
+changed, so that their problems will not be attributed erroneously to
+authors of previous versions.
+
+  Some devices are designed to deny users access to install or run
+modified versions of the software inside them, although the manufacturer
+can do so.  This is fundamentally incompatible with the aim of
+protecting users' freedom to change the software.  The systematic
+pattern of such abuse occurs in the area of products for individuals to
+use, which is precisely where it is most unacceptable.  Therefore, we
+have designed this version of the GPL to prohibit the practice for those
+products.  If such problems arise substantially in other domains, we
+stand ready to extend this provision to those domains in future versions
+of the GPL, as needed to protect the freedom of users.
+
+  Finally, every program is threatened constantly by software patents.
+States should not allow patents to restrict development and use of
+software on general-purpose computers, but in those that do, we wish to
+avoid the special danger that patents applied to a free program could
+make it effectively proprietary.  To prevent this, the GPL assures that
+patents cannot be used to render the program non-free.
+
+  The precise terms and conditions for copying, distribution and
+modification follow.
+
+                       TERMS AND CONDITIONS
+
+  0. Definitions.
+
+  "This License" refers to version 3 of the GNU General Public License.
+
+  "Copyright" also means copyright-like laws that apply to other kinds of
+works, such as semiconductor masks.
+
+  "The Program" refers to any copyrightable work licensed under this
+License.  Each licensee is addressed as "you".  "Licensees" and
+"recipients" may be individuals or organizations.
+
+  To "modify" a work means to copy from or adapt all or part of the work
+in a fashion requiring copyright permission, other than the making of an
+exact copy.  The resulting work is called a "modified version" of the
+earlier work or a work "based on" the earlier work.
+
+  A "covered work" means either the unmodified Program or a work based
+on the Program.
+
+  To "propagate" a work means to do anything with it that, without
+permission, would make you directly or secondarily liable for
+infringement under applicable copyright law, except executing it on a
+computer or modifying a private copy.  Propagation includes copying,
+distribution (with or without modification), making available to the
+public, and in some countries other activities as well.
+
+  To "convey" a work means any kind of propagation that enables other
+parties to make or receive copies.  Mere interaction with a user through
+a computer network, with no transfer of a copy, is not conveying.
+
+  An interactive user interface displays "Appropriate Legal Notices"
+to the extent that it includes a convenient and prominently visible
+feature that (1) displays an appropriate copyright notice, and (2)
+tells the user that there is no warranty for the work (except to the
+extent that warranties are provided), that licensees may convey the
+work under this License, and how to view a copy of this License.  If
+the interface presents a list of user commands or options, such as a
+menu, a prominent item in the list meets this criterion.
+
+  1. Source Code.
+
+  The "source code" for a work means the preferred form of the work
+for making modifications to it.  "Object code" means any non-source
+form of a work.
+
+  A "Standard Interface" means an interface that either is an official
+standard defined by a recognized standards body, or, in the case of
+interfaces specified for a particular programming language, one that
+is widely used among developers working in that language.
+
+  The "System Libraries" of an executable work include anything, other
+than the work as a whole, that (a) is included in the normal form of
+packaging a Major Component, but which is not part of that Major
+Component, and (b) serves only to enable use of the work with that
+Major Component, or to implement a Standard Interface for which an
+implementation is available to the public in source code form.  A
+"Major Component", in this context, means a major essential component
+(kernel, window system, and so on) of the specific operating system
+(if any) on which the executable work runs, or a compiler used to
+produce the work, or an object code interpreter used to run it.
+
+  The "Corresponding Source" for a work in object code form means all
+the source code needed to generate, install, and (for an executable
+work) run the object code and to modify the work, including scripts to
+control those activities.  However, it does not include the work's
+System Libraries, or general-purpose tools or generally available free
+programs which are used unmodified in performing those activities but
+which are not part of the work.  For example, Corresponding Source
+includes interface definition files associated with source files for
+the work, and the source code for shared libraries and dynamically
+linked subprograms that the work is specifically designed to require,
+such as by intimate data communication or control flow between those
+subprograms and other parts of the work.
+
+  The Corresponding Source need not include anything that users
+can regenerate automatically from other parts of the Corresponding
+Source.
+
+  The Corresponding Source for a work in source code form is that
+same work.
+
+  2. Basic Permissions.
+
+  All rights granted under this License are granted for the term of
+copyright on the Program, and are irrevocable provided the stated
+conditions are met.  This License explicitly affirms your unlimited
+permission to run the unmodified Program.  The output from running a
+covered work is covered by this License only if the output, given its
+content, constitutes a covered work.  This License acknowledges your
+rights of fair use or other equivalent, as provided by copyright law.
+
+  You may make, run and propagate covered works that you do not
+convey, without conditions so long as your license otherwise remains
+in force.  You may convey covered works to others for the sole purpose
+of having them make modifications exclusively for you, or provide you
+with facilities for running those works, provided that you comply with
+the terms of this License in conveying all material for which you do
+not control copyright.  Those thus making or running the covered works
+for you must do so exclusively on your behalf, under your direction
+and control, on terms that prohibit them from making any copies of
+your copyrighted material outside their relationship with you.
+
+  Conveying under any other circumstances is permitted solely under
+the conditions stated below.  Sublicensing is not allowed; section 10
+makes it unnecessary.
+
+  3. Protecting Users' Legal Rights From Anti-Circumvention Law.
+
+  No covered work shall be deemed part of an effective technological
+measure under any applicable law fulfilling obligations under article
+11 of the WIPO copyright treaty adopted on 20 December 1996, or
+similar laws prohibiting or restricting circumvention of such
+measures.
+
+  When you convey a covered work, you waive any legal power to forbid
+circumvention of technological measures to the extent such circumvention
+is effected by exercising rights under this License with respect to
+the covered work, and you disclaim any intention to limit operation or
+modification of the work as a means of enforcing, against the work's
+users, your or third parties' legal rights to forbid circumvention of
+technological measures.
+
+  4. Conveying Verbatim Copies.
+
+  You may convey verbatim copies of the Program's source code as you
+receive it, in any medium, provided that you conspicuously and
+appropriately publish on each copy an appropriate copyright notice;
+keep intact all notices stating that this License and any
+non-permissive terms added in accord with section 7 apply to the code;
+keep intact all notices of the absence of any warranty; and give all
+recipients a copy of this License along with the Program.
+
+  You may charge any price or no price for each copy that you convey,
+and you may offer support or warranty protection for a fee.
+
+  5. Conveying Modified Source Versions.
+
+  You may convey a work based on the Program, or the modifications to
+produce it from the Program, in the form of source code under the
+terms of section 4, provided that you also meet all of these conditions:
+
+    a) The work must carry prominent notices stating that you modified
+    it, and giving a relevant date.
+
+    b) The work must carry prominent notices stating that it is
+    released under this License and any conditions added under section
+    7.  This requirement modifies the requirement in section 4 to
+    "keep intact all notices".
+
+    c) You must license the entire work, as a whole, under this
+    License to anyone who comes into possession of a copy.  This
+    License will therefore apply, along with any applicable section 7
+    additional terms, to the whole of the work, and all its parts,
+    regardless of how they are packaged.  This License gives no
+    permission to license the work in any other way, but it does not
+    invalidate such permission if you have separately received it.
+
+    d) If the work has interactive user interfaces, each must display
+    Appropriate Legal Notices; however, if the Program has interactive
+    interfaces that do not display Appropriate Legal Notices, your
+    work need not make them do so.
+
+  A compilation of a covered work with other separate and independent
+works, which are not by their nature extensions of the covered work,
+and which are not combined with it such as to form a larger program,
+in or on a volume of a storage or distribution medium, is called an
+"aggregate" if the compilation and its resulting copyright are not
+used to limit the access or legal rights of the compilation's users
+beyond what the individual works permit.  Inclusion of a covered work
+in an aggregate does not cause this License to apply to the other
+parts of the aggregate.
+
+  6. Conveying Non-Source Forms.
+
+  You may convey a covered work in object code form under the terms
+of sections 4 and 5, provided that you also convey the
+machine-readable Corresponding Source under the terms of this License,
+in one of these ways:
+
+    a) Convey the object code in, or embodied in, a physical product
+    (including a physical distribution medium), accompanied by the
+    Corresponding Source fixed on a durable physical medium
+    customarily used for software interchange.
+
+    b) Convey the object code in, or embodied in, a physical product
+    (including a physical distribution medium), accompanied by a
+    written offer, valid for at least three years and valid for as
+    long as you offer spare parts or customer support for that product
+    model, to give anyone who possesses the object code either (1) a
+    copy of the Corresponding Source for all the software in the
+    product that is covered by this License, on a durable physical
+    medium customarily used for software interchange, for a price no
+    more than your reasonable cost of physically performing this
+    conveying of source, or (2) access to copy the
+    Corresponding Source from a network server at no charge.
+
+    c) Convey individual copies of the object code with a copy of the
+    written offer to provide the Corresponding Source.  This
+    alternative is allowed only occasionally and noncommercially, and
+    only if you received the object code with such an offer, in accord
+    with subsection 6b.
+
+    d) Convey the object code by offering access from a designated
+    place (gratis or for a charge), and offer equivalent access to the
+    Corresponding Source in the same way through the same place at no
+    further charge.  You need not require recipients to copy the
+    Corresponding Source along with the object code.  If the place to
+    copy the object code is a network server, the Corresponding Source
+    may be on a different server (operated by you or a third party)
+    that supports equivalent copying facilities, provided you maintain
+    clear directions next to the object code saying where to find the
+    Corresponding Source.  Regardless of what server hosts the
+    Corresponding Source, you remain obligated to ensure that it is
+    available for as long as needed to satisfy these requirements.
+
+    e) Convey the object code using peer-to-peer transmission, provided
+    you inform other peers where the object code and Corresponding
+    Source of the work are being offered to the general public at no
+    charge under subsection 6d.
+
+  A separable portion of the object code, whose source code is excluded
+from the Corresponding Source as a System Library, need not be
+included in conveying the object code work.
+
+  A "User Product" is either (1) a "consumer product", which means any
+tangible personal property which is normally used for personal, family,
+or household purposes, or (2) anything designed or sold for incorporation
+into a dwelling.  In determining whether a product is a consumer product,
+doubtful cases shall be resolved in favor of coverage.  For a particular
+product received by a particular user, "normally used" refers to a
+typical or common use of that class of product, regardless of the status
+of the particular user or of the way in which the particular user
+actually uses, or expects or is expected to use, the product.  A product
+is a consumer product regardless of whether the product has substantial
+commercial, industrial or non-consumer uses, unless such uses represent
+the only significant mode of use of the product.
+
+  "Installation Information" for a User Product means any methods,
+procedures, authorization keys, or other information required to install
+and execute modified versions of a covered work in that User Product from
+a modified version of its Corresponding Source.  The information must
+suffice to ensure that the continued functioning of the modified object
+code is in no case prevented or interfered with solely because
+modification has been made.
+
+  If you convey an object code work under this section in, or with, or
+specifically for use in, a User Product, and the conveying occurs as
+part of a transaction in which the right of possession and use of the
+User Product is transferred to the recipient in perpetuity or for a
+fixed term (regardless of how the transaction is characterized), the
+Corresponding Source conveyed under this section must be accompanied
+by the Installation Information.  But this requirement does not apply
+if neither you nor any third party retains the ability to install
+modified object code on the User Product (for example, the work has
+been installed in ROM).
+
+  The requirement to provide Installation Information does not include a
+requirement to continue to provide support service, warranty, or updates
+for a work that has been modified or installed by the recipient, or for
+the User Product in which it has been modified or installed.  Access to a
+network may be denied when the modification itself materially and
+adversely affects the operation of the network or violates the rules and
+protocols for communication across the network.
+
+  Corresponding Source conveyed, and Installation Information provided,
+in accord with this section must be in a format that is publicly
+documented (and with an implementation available to the public in
+source code form), and must require no special password or key for
+unpacking, reading or copying.
+
+  7. Additional Terms.
+
+  "Additional permissions" are terms that supplement the terms of this
+License by making exceptions from one or more of its conditions.
+Additional permissions that are applicable to the entire Program shall
+be treated as though they were included in this License, to the extent
+that they are valid under applicable law.  If additional permissions
+apply only to part of the Program, that part may be used separately
+under those permissions, but the entire Program remains governed by
+this License without regard to the additional permissions.
+
+  When you convey a copy of a covered work, you may at your option
+remove any additional permissions from that copy, or from any part of
+it.  (Additional permissions may be written to require their own
+removal in certain cases when you modify the work.)  You may place
+additional permissions on material, added by you to a covered work,
+for which you have or can give appropriate copyright permission.
+
+  Notwithstanding any other provision of this License, for material you
+add to a covered work, you may (if authorized by the copyright holders of
+that material) supplement the terms of this License with terms:
+
+    a) Disclaiming warranty or limiting liability differently from the
+    terms of sections 15 and 16 of this License; or
+
+    b) Requiring preservation of specified reasonable legal notices or
+    author attributions in that material or in the Appropriate Legal
+    Notices displayed by works containing it; or
+
+    c) Prohibiting misrepresentation of the origin of that material, or
+    requiring that modified versions of such material be marked in
+    reasonable ways as different from the original version; or
+
+    d) Limiting the use for publicity purposes of names of licensors or
+    authors of the material; or
+
+    e) Declining to grant rights under trademark law for use of some
+    trade names, trademarks, or service marks; or
+
+    f) Requiring indemnification of licensors and authors of that
+    material by anyone who conveys the material (or modified versions of
+    it) with contractual assumptions of liability to the recipient, for
+    any liability that these contractual assumptions directly impose on
+    those licensors and authors.
+
+  All other non-permissive additional terms are considered "further
+restrictions" within the meaning of section 10.  If the Program as you
+received it, or any part of it, contains a notice stating that it is
+governed by this License along with a term that is a further
+restriction, you may remove that term.  If a license document contains
+a further restriction but permits relicensing or conveying under this
+License, you may add to a covered work material governed by the terms
+of that license document, provided that the further restriction does
+not survive such relicensing or conveying.
+
+  If you add terms to a covered work in accord with this section, you
+must place, in the relevant source files, a statement of the
+additional terms that apply to those files, or a notice indicating
+where to find the applicable terms.
+
+  Additional terms, permissive or non-permissive, may be stated in the
+form of a separately written license, or stated as exceptions;
+the above requirements apply either way.
+
+  8. Termination.
+
+  You may not propagate or modify a covered work except as expressly
+provided under this License.  Any attempt otherwise to propagate or
+modify it is void, and will automatically terminate your rights under
+this License (including any patent licenses granted under the third
+paragraph of section 11).
+
+  However, if you cease all violation of this License, then your
+license from a particular copyright holder is reinstated (a)
+provisionally, unless and until the copyright holder explicitly and
+finally terminates your license, and (b) permanently, if the copyright
+holder fails to notify you of the violation by some reasonable means
+prior to 60 days after the cessation.
+
+  Moreover, your license from a particular copyright holder is
+reinstated permanently if the copyright holder notifies you of the
+violation by some reasonable means, this is the first time you have
+received notice of violation of this License (for any work) from that
+copyright holder, and you cure the violation prior to 30 days after
+your receipt of the notice.
+
+  Termination of your rights under this section does not terminate the
+licenses of parties who have received copies or rights from you under
+this License.  If your rights have been terminated and not permanently
+reinstated, you do not qualify to receive new licenses for the same
+material under section 10.
+
+  9. Acceptance Not Required for Having Copies.
+
+  You are not required to accept this License in order to receive or
+run a copy of the Program.  Ancillary propagation of a covered work
+occurring solely as a consequence of using peer-to-peer transmission
+to receive a copy likewise does not require acceptance.  However,
+nothing other than this License grants you permission to propagate or
+modify any covered work.  These actions infringe copyright if you do
+not accept this License.  Therefore, by modifying or propagating a
+covered work, you indicate your acceptance of this License to do so.
+
+  10. Automatic Licensing of Downstream Recipients.
+
+  Each time you convey a covered work, the recipient automatically
+receives a license from the original licensors, to run, modify and
+propagate that work, subject to this License.  You are not responsible
+for enforcing compliance by third parties with this License.
+
+  An "entity transaction" is a transaction transferring control of an
+organization, or substantially all assets of one, or subdividing an
+organization, or merging organizations.  If propagation of a covered
+work results from an entity transaction, each party to that
+transaction who receives a copy of the work also receives whatever
+licenses to the work the party's predecessor in interest had or could
+give under the previous paragraph, plus a right to possession of the
+Corresponding Source of the work from the predecessor in interest, if
+the predecessor has it or can get it with reasonable efforts.
+
+  You may not impose any further restrictions on the exercise of the
+rights granted or affirmed under this License.  For example, you may
+not impose a license fee, royalty, or other charge for exercise of
+rights granted under this License, and you may not initiate litigation
+(including a cross-claim or counterclaim in a lawsuit) alleging that
+any patent claim is infringed by making, using, selling, offering for
+sale, or importing the Program or any portion of it.
+
+  11. Patents.
+
+  A "contributor" is a copyright holder who authorizes use under this
+License of the Program or a work on which the Program is based.  The
+work thus licensed is called the contributor's "contributor version".
+
+  A contributor's "essential patent claims" are all patent claims
+owned or controlled by the contributor, whether already acquired or
+hereafter acquired, that would be infringed by some manner, permitted
+by this License, of making, using, or selling its contributor version,
+but do not include claims that would be infringed only as a
+consequence of further modification of the contributor version.  For
+purposes of this definition, "control" includes the right to grant
+patent sublicenses in a manner consistent with the requirements of
+this License.
+
+  Each contributor grants you a non-exclusive, worldwide, royalty-free
+patent license under the contributor's essential patent claims, to
+make, use, sell, offer for sale, import and otherwise run, modify and
+propagate the contents of its contributor version.
+
+  In the following three paragraphs, a "patent license" is any express
+agreement or commitment, however denominated, not to enforce a patent
+(such as an express permission to practice a patent or covenant not to
+sue for patent infringement).  To "grant" such a patent license to a
+party means to make such an agreement or commitment not to enforce a
+patent against the party.
+
+  If you convey a covered work, knowingly relying on a patent license,
+and the Corresponding Source of the work is not available for anyone
+to copy, free of charge and under the terms of this License, through a
+publicly available network server or other readily accessible means,
+then you must either (1) cause the Corresponding Source to be so
+available, or (2) arrange to deprive yourself of the benefit of the
+patent license for this particular work, or (3) arrange, in a manner
+consistent with the requirements of this License, to extend the patent
+license to downstream recipients.  "Knowingly relying" means you have
+actual knowledge that, but for the patent license, your conveying the
+covered work in a country, or your recipient's use of the covered work
+in a country, would infringe one or more identifiable patents in that
+country that you have reason to believe are valid.
+
+  If, pursuant to or in connection with a single transaction or
+arrangement, you convey, or propagate by procuring conveyance of, a
+covered work, and grant a patent license to some of the parties
+receiving the covered work authorizing them to use, propagate, modify
+or convey a specific copy of the covered work, then the patent license
+you grant is automatically extended to all recipients of the covered
+work and works based on it.
+
+  A patent license is "discriminatory" if it does not include within
+the scope of its coverage, prohibits the exercise of, or is
+conditioned on the non-exercise of one or more of the rights that are
+specifically granted under this License.  You may not convey a covered
+work if you are a party to an arrangement with a third party that is
+in the business of distributing software, under which you make payment
+to the third party based on the extent of your activity of conveying
+the work, and under which the third party grants, to any of the
+parties who would receive the covered work from you, a discriminatory
+patent license (a) in connection with copies of the covered work
+conveyed by you (or copies made from those copies), or (b) primarily
+for and in connection with specific products or compilations that
+contain the covered work, unless you entered into that arrangement,
+or that patent license was granted, prior to 28 March 2007.
+
+  Nothing in this License shall be construed as excluding or limiting
+any implied license or other defenses to infringement that may
+otherwise be available to you under applicable patent law.
+
+  12. No Surrender of Others' Freedom.
+
+  If conditions are imposed on you (whether by court order, agreement or
+otherwise) that contradict the conditions of this License, they do not
+excuse you from the conditions of this License.  If you cannot convey a
+covered work so as to satisfy simultaneously your obligations under this
+License and any other pertinent obligations, then as a consequence you may
+not convey it at all.  For example, if you agree to terms that obligate you
+to collect a royalty for further conveying from those to whom you convey
+the Program, the only way you could satisfy both those terms and this
+License would be to refrain entirely from conveying the Program.
+
+  13. Use with the GNU Affero General Public License.
+
+  Notwithstanding any other provision of this License, you have
+permission to link or combine any covered work with a work licensed
+under version 3 of the GNU Affero General Public License into a single
+combined work, and to convey the resulting work.  The terms of this
+License will continue to apply to the part which is the covered work,
+but the special requirements of the GNU Affero General Public License,
+section 13, concerning interaction through a network will apply to the
+combination as such.
+
+  14. Revised Versions of this License.
+
+  The Free Software Foundation may publish revised and/or new versions of
+the GNU General Public License from time to time.  Such new versions will
+be similar in spirit to the present version, but may differ in detail to
+address new problems or concerns.
+
+  Each version is given a distinguishing version number.  If the
+Program specifies that a certain numbered version of the GNU General
+Public License "or any later version" applies to it, you have the
+option of following the terms and conditions either of that numbered
+version or of any later version published by the Free Software
+Foundation.  If the Program does not specify a version number of the
+GNU General Public License, you may choose any version ever published
+by the Free Software Foundation.
+
+  If the Program specifies that a proxy can decide which future
+versions of the GNU General Public License can be used, that proxy's
+public statement of acceptance of a version permanently authorizes you
+to choose that version for the Program.
+
+  Later license versions may give you additional or different
+permissions.  However, no additional obligations are imposed on any
+author or copyright holder as a result of your choosing to follow a
+later version.
+
+  15. Disclaimer of Warranty.
+
+  THERE IS NO WARRANTY FOR THE PROGRAM, TO THE EXTENT PERMITTED BY
+APPLICABLE LAW.  EXCEPT WHEN OTHERWISE STATED IN WRITING THE COPYRIGHT
+HOLDERS AND/OR OTHER PARTIES PROVIDE THE PROGRAM "AS IS" WITHOUT WARRANTY
+OF ANY KIND, EITHER EXPRESSED OR IMPLIED, INCLUDING, BUT NOT LIMITED TO,
+THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR
+PURPOSE.  THE ENTIRE RISK AS TO THE QUALITY AND PERFORMANCE OF THE PROGRAM
+IS WITH YOU.  SHOULD THE PROGRAM PROVE DEFECTIVE, YOU ASSUME THE COST OF
+ALL NECESSARY SERVICING, REPAIR OR CORRECTION.
+
+  16. Limitation of Liability.
+
+  IN NO EVENT UNLESS REQUIRED BY APPLICABLE LAW OR AGREED TO IN WRITING
+WILL ANY COPYRIGHT HOLDER, OR ANY OTHER PARTY WHO MODIFIES AND/OR CONVEYS
+THE PROGRAM AS PERMITTED ABOVE, BE LIABLE TO YOU FOR DAMAGES, INCLUDING ANY
+GENERAL, SPECIAL, INCIDENTAL OR CONSEQUENTIAL DAMAGES ARISING OUT OF THE
+USE OR INABILITY TO USE THE PROGRAM (INCLUDING BUT NOT LIMITED TO LOSS OF
+DATA OR DATA BEING RENDERED INACCURATE OR LOSSES SUSTAINED BY YOU OR THIRD
+PARTIES OR A FAILURE OF THE PROGRAM TO OPERATE WITH ANY OTHER PROGRAMS),
+EVEN IF SUCH HOLDER OR OTHER PARTY HAS BEEN ADVISED OF THE POSSIBILITY OF
+SUCH DAMAGES.
+
+  17. Interpretation of Sections 15 and 16.
+
+  If the disclaimer of warranty and limitation of liability provided
+above cannot be given local legal effect according to their terms,
+reviewing courts shall apply local law that most closely approximates
+an absolute waiver of all civil liability in connection with the
+Program, unless a warranty or assumption of liability accompanies a
+copy of the Program in return for a fee.
+
+                     END OF TERMS AND CONDITIONS
+
+            How to Apply These Terms to Your New Programs
+
+  If you develop a new program, and you want it to be of the greatest
+possible use to the public, the best way to achieve this is to make it
+free software which everyone can redistribute and change under these terms.
+
+  To do so, attach the following notices to the program.  It is safest
+to attach them to the start of each source file to most effectively
+state the exclusion of warranty; and each file should have at least
+the "copyright" line and a pointer to where the full notice is found.
+
+    <one line to give the program's name and a brief idea of what it does.>
+    Copyright (C) <year>  <name of author>
+
+    This program is free software: you can redistribute it and/or modify
+    it under the terms of the GNU General Public License as published by
+    the Free Software Foundation, either version 3 of the License, or
+    (at your option) any later version.
+
+    This program is distributed in the hope that it will be useful,
+    but WITHOUT ANY WARRANTY; without even the implied warranty of
+    MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+    GNU General Public License for more details.
+
+    You should have received a copy of the GNU General Public License
+    along with this program.  If not, see <https://www.gnu.org/licenses/>.
+
+Also add information on how to contact you by electronic and paper mail.
+
+  If the program does terminal interaction, make it output a short
+notice like this when it starts in an interactive mode:
+
+    <program>  Copyright (C) <year>  <name of author>
+    This program comes with ABSOLUTELY NO WARRANTY; for details type `show w'.
+    This is free software, and you are welcome to redistribute it
+    under certain conditions; type `show c' for details.
+
+The hypothetical commands `show w' and `show c' should show the appropriate
+parts of the General Public License.  Of course, your program's commands
+might be different; for a GUI interface, you would use an "about box".
+
+  You should also get your employer (if you work as a programmer) or school,
+if any, to sign a "copyright disclaimer" for the program, if necessary.
+For more information on this, and how to apply and follow the GNU GPL, see
+<https://www.gnu.org/licenses/>.
+
+  The GNU General Public License does not permit incorporating your program
+into proprietary programs.  If your program is a subroutine library, you
+may consider it more useful to permit linking proprietary applications with
+the library.  If this is what you want to do, use the GNU Lesser General
+Public License instead of this License.  But first, please read
+<https://www.gnu.org/licenses/why-not-lgpl.html>.

README.md

@@ -1,21 +1,48 @@
+[![SimpleClans Logo](https://i.imgur.com/9vgfVdX.png)](https://www.spigotmc.org/resources/simpleclans.71242/)
+
 SimpleClans
 ==========
 
 Full featured clan system for PVP Minecraft Servers!
 
-[![Build Status](https://travis-ci.com/RoinujNosde/SimpleClans.svg?branch=master)](https://travis-ci.com/RoinujNosde/SimpleClans)
+[![Build Status](https://img.shields.io/jenkins/build?jobUrl=https%3A%2F%2Fci.roinujnosde.me%2Fjob%2FSimpleClans%2F)](https://ci.roinujnosde.me/job/SimpleClans/)
 [![Spiget Downloads](https://img.shields.io/spiget/downloads/71242)](https://www.spigotmc.org/resources/simpleclans.71242/)
 [![Issues](https://img.shields.io/github/issues/RoinujNosde/SimpleClans.svg)](https://github.com/RoinujNosde/SimpleClans/issues)
 [![Crowdin](https://badges.crowdin.net/simpleclans/localized.svg)](https://crowdin.com/project/simpleclans)
 [![Discord](https://img.shields.io/discord/719557355917934613?label=discord&logo=discord)](https://discord.gg/CkNwgdE)
+[![bStats Servers](https://img.shields.io/bstats/servers/7131)](https://bstats.org/plugin/bukkit/SimpleClans/7131)
+[![bStats Players](https://img.shields.io/bstats/players/7131)](https://bstats.org/plugin/bukkit/SimpleClans/7131)
+
+
+#### Download Link
+
+* [Download from Spigot](https://www.spigotmc.org/resources/simpleclans.71242/)
 
 #### Documentation 
 
-[Documentation!](https://simpleclans.gitbook.io/simpleclans/)
-[Permissions!](https://simpleclans.gitbook.io/simpleclans/commands-and-permissions/permissions)
-[Commands!](https://simpleclans.gitbook.io/simpleclans/commands-and-permissions/commands)
+* [Documentation](https://simpleclans.gitbook.io/simpleclans/)
+* Commands & Permissions
+  * [Permissions](https://simpleclans.gitbook.io/simpleclans/commands-and-permissions/permissions)
+  * [Commands](https://simpleclans.gitbook.io/simpleclans/commands-and-permissions/commands)
+  * [Clan Alliances and Rivalries](https://simpleclans.gitbook.io/simpleclans/commands-and-permissions/aliances-and-rivalries)
+  * [Clan Ranks with Permissions](https://simpleclans.gitbook.io/simpleclans/commands-and-permissions/ranks-with-permissions)
+* How to Setup
+  * [Configuration](https://simpleclans.gitbook.io/simpleclans/how-to-setup/configuration)
+  * [Translation](https://simpleclans.gitbook.io/simpleclans/how-to-setup/translation)
+  * [Clan Member Fee](https://simpleclans.gitbook.io/simpleclans/how-to-setup/member-fee)
+  * [Clan Upkeep](https://simpleclans.gitbook.io/simpleclans/how-to-setup/clan-upkeep)
+  * [Clan name above players head](https://simpleclans.gitbook.io/simpleclans/how-to-setup/clan-below-players-name)
+  * [Clan name on Tablist](https://simpleclans.gitbook.io/simpleclans/how-to-setup/clan-on-tablist)
+* Plugins & Development 
+  * [SimpleClans API Example](https://simpleclans.gitbook.io/simpleclans/other/simpleclans-api)
+  * [PlaceholderAPI Placeholders](https://simpleclans.gitbook.io/simpleclans/other/placeholderapi-support)
+  * [Land Protection Plugins](https://simpleclans.gitbook.io/simpleclans/other/land-claims)
+  
+#### Support & Suggestions
+
+* [Discord Support](https://discord.gg/CkNwgdE)
+* [Bugs and Suggestions](https://github.com/RoinujNosde/SimpleClans/issues)
 
-Spigot resource page: https://www.spigotmc.org/resources/simpleclans.71242/
 
 #### Developers
 
@@ -23,15 +50,17 @@ Including SimpleClans with Maven:
 ```xml
 <repositories>
     <repository>
-        <id>bintray-roinujnosde-bukkit-plugins</id>
-        <url>https://dl.bintray.com/roinujnosde/bukkit-plugins</url>
+        <id>roinujnosde-repo</id>
+        <url>https://repo.roinujnosde.me/releases/</url>
     </repository>
 </repositories>
+```
+```xml
 <dependencies>
     <dependency>
         <groupId>net.sacredlabyrinth.phaed.simpleclans</groupId>
         <artifactId>SimpleClans</artifactId>
-        <version>2.12.2</version>
+        <version>2.18.1</version> <!-- You can find the latest version at the bottom -->
         <scope>provided</scope>
     </dependency>
 </dependencies>
@@ -41,12 +70,16 @@ Using Gradle:
 ```groovy
 repositories {
     maven {
-        url  "https://dl.bintray.com/roinujnosde/bukkit-plugins" 
+        url  "https://repo.roinujnosde.me/releases/" 
     }
 }
 dependencies {
-    compileOnly "net.sacredlabyrinth.phaed.simpleclans:SimpleClans:2.12.2"
+    compileOnly "net.sacredlabyrinth.phaed.simpleclans:SimpleClans:2.18.1"
 }
 ```
 
-Some examples on how to use the API: https://github.com/RoinujNosde/SimpleClans/wiki/SimpleClans-API-example
+Feel free to learn our [Javadoc](https://ci.roinujnosde.me/job/SimpleClans/Javadoc/).
+##### Latest version:
+[![Maven metadata URL](https://img.shields.io/maven-metadata/v?metadataUrl=https%3A%2F%2Frepo.roinujnosde.me%2Freleases%2Fnet%2Fsacredlabyrinth%2Fphaed%2Fsimpleclans%2FSimpleClans%2Fmaven-metadata.xml)](https://repo.roinujnosde.me/#/releases/net/sacredlabyrinth/phaed/simpleclans/SimpleClans)
+##### API Examples
+* [Examples of how to use the API](https://simpleclans.gitbook.io/simpleclans/other/simpleclans-api)

SimpleClans.iml

@@ -1,46 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<module org.jetbrains.idea.maven.project.MavenProjectsManager.isMavenModule="true" version="4">
-  <component name="NewModuleRootManager" LANGUAGE_LEVEL="JDK_1_8">
-    <output url="file://$MODULE_DIR$/target/classes" />
-    <output-test url="file://$MODULE_DIR$/target/test-classes" />
-    <content url="file://$MODULE_DIR$">
-      <sourceFolder url="file://$MODULE_DIR$/src/main/java" isTestSource="false" />
-      <sourceFolder url="file://$MODULE_DIR$/src/main/resources" type="java-resource" />
-      <sourceFolder url="file://$MODULE_DIR$/src/test/java" isTestSource="true" />
-      <excludeFolder url="file://$MODULE_DIR$/target" />
-    </content>
-    <orderEntry type="inheritedJdk" />
-    <orderEntry type="sourceFolder" forTests="false" />
-    <orderEntry type="library" name="Maven: co.aikar:acf-paper:0.5.0-SNAPSHOT" level="project" />
-    <orderEntry type="library" name="Maven: com.github.cryptomorin:XSeries:7.2.1" level="project" />
-    <orderEntry type="library" name="Maven: org.reflections:reflections:0.9.12" level="project" />
-    <orderEntry type="library" name="Maven: org.javassist:javassist:3.26.0-GA" level="project" />
-    <orderEntry type="library" scope="TEST" name="Maven: org.junit.jupiter:junit-jupiter-api:5.4.0" level="project" />
-    <orderEntry type="library" scope="TEST" name="Maven: org.apiguardian:apiguardian-api:1.0.0" level="project" />
-    <orderEntry type="library" scope="TEST" name="Maven: org.opentest4j:opentest4j:1.1.1" level="project" />
-    <orderEntry type="library" scope="TEST" name="Maven: org.junit.platform:junit-platform-commons:1.4.0" level="project" />
-    <orderEntry type="library" scope="PROVIDED" name="Maven: org.spigotmc:spigot-api:1.13.2-R0.1-SNAPSHOT" level="project" />
-    <orderEntry type="library" scope="PROVIDED" name="Maven: commons-lang:commons-lang:2.6" level="project" />
-    <orderEntry type="library" scope="PROVIDED" name="Maven: com.google.guava:guava:21.0" level="project" />
-    <orderEntry type="library" scope="PROVIDED" name="Maven: com.google.code.gson:gson:2.8.0" level="project" />
-    <orderEntry type="library" scope="PROVIDED" name="Maven: net.md-5:bungeecord-chat:1.13-SNAPSHOT" level="project" />
-    <orderEntry type="library" scope="PROVIDED" name="Maven: org.yaml:snakeyaml:1.23" level="project" />
-    <orderEntry type="library" scope="PROVIDED" name="Maven: com.github.MilkBowl:VaultAPI:1.7" level="project" />
-    <orderEntry type="library" scope="PROVIDED" name="Maven: org.bukkit:bukkit:1.13.1-R0.1-SNAPSHOT" level="project" />
-    <orderEntry type="library" scope="PROVIDED" name="Maven: com.googlecode.json-simple:json-simple:1.1.1" level="project" />
-    <orderEntry type="library" scope="PROVIDED" name="Maven: junit:junit:4.10" level="project" />
-    <orderEntry type="library" scope="PROVIDED" name="Maven: org.hamcrest:hamcrest-core:1.1" level="project" />
-    <orderEntry type="library" name="Maven: org.bstats:bstats-bukkit:1.7" level="project" />
-    <orderEntry type="library" scope="PROVIDED" name="Maven: me.clip:placeholderapi:2.10.9" level="project" />
-    <orderEntry type="library" name="Maven: org.jetbrains:annotations:16.0.2" level="project" />
-    <orderEntry type="library" name="Maven: io.papermc:paperlib:1.0.5" level="project" />
-    <orderEntry type="library" name="Maven: co.aikar:acf-paper:0.5.0-SNAPSHOT" level="project" />
-    <orderEntry type="library" name="Maven: com.github.cryptomorin:XSeries:7.2.1" level="project" />
-    <orderEntry type="library" name="Maven: org.reflections:reflections:0.9.12" level="project" />
-    <orderEntry type="library" name="Maven: org.javassist:javassist:3.26.0-GA" level="project" />
-    <orderEntry type="library" scope="TEST" name="Maven: org.junit.jupiter:junit-jupiter-api:5.4.0" level="project" />
-    <orderEntry type="library" scope="TEST" name="Maven: org.apiguardian:apiguardian-api:1.0.0" level="project" />
-    <orderEntry type="library" scope="TEST" name="Maven: org.opentest4j:opentest4j:1.1.1" level="project" />
-    <orderEntry type="library" scope="TEST" name="Maven: org.junit.platform:junit-platform-commons:1.4.0" level="project" />
-  </component>
-</module>

crowdin.yml

@@ -0,0 +1,7 @@
+pull_request_title: "feat(lang): new crowdin updates"
+pull_request_labels: ["l10n"]
+commit_message: "feat(lang): new translations for %language%"
+append_commit_message: false
+files:
+  - source: src/main/resources/messages.properties
+    translation: /src/main/resources/%file_name%_%locale_with_underscore%.%file_extension%

dependency-reduced-pom.xml

@@ -1,222 +0,0 @@
-<?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/maven-v4_0_0.xsd">
-  <modelVersion>4.0.0</modelVersion>
-  <groupId>net.sacredlabyrinth.phaed.simpleclans</groupId>
-  <artifactId>SimpleClans</artifactId>
-  <name>SimpleClans</name>
-  <version>2.14.2</version>
-  <url>http://dev.bukkit.org/server-mods/simpleclans/</url>
-  <ciManagement>
-    <system>jenkins</system>
-    <url>http://104.236.246.108:8080</url>
-  </ciManagement>
-  <scm>
-    <connection>scm:git:git:@github.com:marcelo-mason/SimpleClans.git</connection>
-    <developerConnection>scm:git:git:@github.com:marcelo-mason/SimpleClans.git</developerConnection>
-    <tag>SimpleClans</tag>
-    <url>http://github.com/marcelo-mason/SimpleClans.git/tree/master/</url>
-  </scm>
-  <build>
-    <resources>
-      <resource>
-        <targetPath>.</targetPath>
-        <filtering>true</filtering>
-        <directory>${basedir}/src/main/resources</directory>
-        <includes>
-          <include>plugin.yml</include>
-          <include>config.yml</include>
-          <include>*.properties</include>
-        </includes>
-      </resource>
-    </resources>
-    <finalName>${project.name}</finalName>
-    <plugins>
-      <plugin>
-        <artifactId>maven-compiler-plugin</artifactId>
-        <version>3.1</version>
-        <configuration>
-          <source>1.8</source>
-          <target>1.8</target>
-          <showDeprecation>true</showDeprecation>
-          <showWarnings>true</showWarnings>
-          <fork>true</fork>
-          <compilerArgs>
-            <arg>-parameters</arg>
-          </compilerArgs>
-        </configuration>
-      </plugin>
-      <plugin>
-        <artifactId>maven-jar-plugin</artifactId>
-        <version>2.4</version>
-      </plugin>
-      <plugin>
-        <artifactId>maven-release-plugin</artifactId>
-        <version>2.3.2</version>
-      </plugin>
-      <plugin>
-        <artifactId>maven-shade-plugin</artifactId>
-        <version>3.1.0</version>
-        <executions>
-          <execution>
-            <phase>package</phase>
-            <goals>
-              <goal>shade</goal>
-            </goals>
-          </execution>
-        </executions>
-        <configuration>
-          <relocations>
-            <relocation>
-              <pattern>org.bstats.bukkit</pattern>
-              <shadedPattern>net.sacredlabyrinth.phaed.simpleclans.metrics</shadedPattern>
-            </relocation>
-            <relocation>
-              <pattern>io.papermc.lib</pattern>
-              <shadedPattern>net.sacredlabyrinth.phaed.simpleclans.paperlib</shadedPattern>
-            </relocation>
-            <relocation>
-              <pattern>co.aikar.commands</pattern>
-              <shadedPattern>net.sacredlabyrinth.phaed.simpleclans.acf</shadedPattern>
-            </relocation>
-            <relocation>
-              <pattern>co.aikar.locales</pattern>
-              <shadedPattern>net.sacredlabyrinth.phaed.simpleclans.locales</shadedPattern>
-            </relocation>
-            <relocation>
-              <pattern>com.cryptomorin.xseries</pattern>
-              <shadedPattern>net.sacredlabyrinth.phaed.simpleclans.xseries</shadedPattern>
-            </relocation>
-          </relocations>
-          <artifactSet>
-            <excludes>
-              <exclude>org.jetbrains:annotations</exclude>
-            </excludes>
-          </artifactSet>
-        </configuration>
-      </plugin>
-    </plugins>
-  </build>
-  <repositories>
-    <repository>
-      <id>spigot-repo</id>
-      <url>https://hub.spigotmc.org/nexus/content/repositories/snapshots/</url>
-    </repository>
-    <repository>
-      <id>placeholderapi-repo</id>
-      <url>https://repo.extendedclip.com/content/repositories/placeholderapi/</url>
-    </repository>
-    <repository>
-      <id>bstats-repo</id>
-      <url>https://repo.codemc.org/repository/maven-public</url>
-    </repository>
-    <repository>
-      <id>jitpack.io</id>
-      <url>https://jitpack.io</url>
-    </repository>
-    <repository>
-      <id>papermc</id>
-      <url>https://papermc.io/repo/repository/maven-public/</url>
-    </repository>
-    <repository>
-      <id>aikar</id>
-      <url>https://repo.aikar.co/content/groups/aikar/</url>
-    </repository>
-  </repositories>
-  <dependencies>
-    <dependency>
-      <groupId>org.spigotmc</groupId>
-      <artifactId>spigot-api</artifactId>
-      <version>1.13.2-R0.1-SNAPSHOT</version>
-      <scope>provided</scope>
-      <exclusions>
-        <exclusion>
-          <artifactId>commons-lang</artifactId>
-          <groupId>commons-lang</groupId>
-        </exclusion>
-        <exclusion>
-          <artifactId>guava</artifactId>
-          <groupId>com.google.guava</groupId>
-        </exclusion>
-        <exclusion>
-          <artifactId>gson</artifactId>
-          <groupId>com.google.code.gson</groupId>
-        </exclusion>
-        <exclusion>
-          <artifactId>bungeecord-chat</artifactId>
-          <groupId>net.md-5</groupId>
-        </exclusion>
-        <exclusion>
-          <artifactId>snakeyaml</artifactId>
-          <groupId>org.yaml</groupId>
-        </exclusion>
-      </exclusions>
-    </dependency>
-    <dependency>
-      <groupId>com.github.MilkBowl</groupId>
-      <artifactId>VaultAPI</artifactId>
-      <version>1.7</version>
-      <scope>provided</scope>
-      <exclusions>
-        <exclusion>
-          <artifactId>bukkit</artifactId>
-          <groupId>org.bukkit</groupId>
-        </exclusion>
-      </exclusions>
-    </dependency>
-    <dependency>
-      <groupId>com.googlecode.json-simple</groupId>
-      <artifactId>json-simple</artifactId>
-      <version>1.1.1</version>
-      <scope>provided</scope>
-      <exclusions>
-        <exclusion>
-          <artifactId>junit</artifactId>
-          <groupId>junit</groupId>
-        </exclusion>
-      </exclusions>
-    </dependency>
-    <dependency>
-      <groupId>me.clip</groupId>
-      <artifactId>placeholderapi</artifactId>
-      <version>2.10.9</version>
-      <scope>provided</scope>
-    </dependency>
-    <dependency>
-      <groupId>org.jetbrains</groupId>
-      <artifactId>annotations</artifactId>
-      <version>16.0.2</version>
-      <scope>compile</scope>
-    </dependency>
-    <dependency>
-      <groupId>org.junit.jupiter</groupId>
-      <artifactId>junit-jupiter-api</artifactId>
-      <version>5.4.0</version>
-      <scope>test</scope>
-      <exclusions>
-        <exclusion>
-          <artifactId>apiguardian-api</artifactId>
-          <groupId>org.apiguardian</groupId>
-        </exclusion>
-        <exclusion>
-          <artifactId>opentest4j</artifactId>
-          <groupId>org.opentest4j</groupId>
-        </exclusion>
-        <exclusion>
-          <artifactId>junit-platform-commons</artifactId>
-          <groupId>org.junit.platform</groupId>
-        </exclusion>
-      </exclusions>
-    </dependency>
-  </dependencies>
-  <distributionManagement>
-    <repository>
-      <id>bintray-roinujnosde-bukkit-plugins</id>
-      <name>roinujnosde-bukkit-plugins</name>
-      <url>https://api.bintray.com/maven/roinujnosde/bukkit-plugins/SimpleClans/;publish=1</url>
-    </repository>
-  </distributionManagement>
-  <properties>
-    <project.build.sourceEncoding>UTF-8</project.build.sourceEncoding>
-  </properties>
-</project>
-

mvnw

@@ -0,0 +1,308 @@
+#!/bin/sh
+# ----------------------------------------------------------------------------
+# Licensed to the Apache Software Foundation (ASF) under one
+# or more contributor license agreements.  See the NOTICE file
+# distributed with this work for additional information
+# regarding copyright ownership.  The ASF licenses this file
+# to you under the Apache License, Version 2.0 (the
+# "License"); you may not use this file except in compliance
+# with the License.  You may obtain a copy of the License at
+#
+#    http://www.apache.org/licenses/LICENSE-2.0
+#
+# Unless required by applicable law or agreed to in writing,
+# software distributed under the License is distributed on an
+# "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
+# KIND, either express or implied.  See the License for the
+# specific language governing permissions and limitations
+# under the License.
+# ----------------------------------------------------------------------------
+
+# ----------------------------------------------------------------------------
+# Apache Maven Wrapper startup batch script, version 3.2.0
+#
+# Required ENV vars:
+# ------------------
+#   JAVA_HOME - location of a JDK home dir
+#
+# Optional ENV vars
+# -----------------
+#   MAVEN_OPTS - parameters passed to the Java VM when running Maven
+#     e.g. to debug Maven itself, use
+#       set MAVEN_OPTS=-Xdebug -Xrunjdwp:transport=dt_socket,server=y,suspend=y,address=8000
+#   MAVEN_SKIP_RC - flag to disable loading of mavenrc files
+# ----------------------------------------------------------------------------
+
+if [ -z "$MAVEN_SKIP_RC" ] ; then
+
+  if [ -f /usr/local/etc/mavenrc ] ; then
+    . /usr/local/etc/mavenrc
+  fi
+
+  if [ -f /etc/mavenrc ] ; then
+    . /etc/mavenrc
+  fi
+
+  if [ -f "$HOME/.mavenrc" ] ; then
+    . "$HOME/.mavenrc"
+  fi
+
+fi
+
+# OS specific support.  $var _must_ be set to either true or false.
+cygwin=false;
+darwin=false;
+mingw=false
+case "$(uname)" in
+  CYGWIN*) cygwin=true ;;
+  MINGW*) mingw=true;;
+  Darwin*) darwin=true
+    # Use /usr/libexec/java_home if available, otherwise fall back to /Library/Java/Home
+    # See https://developer.apple.com/library/mac/qa/qa1170/_index.html
+    if [ -z "$JAVA_HOME" ]; then
+      if [ -x "/usr/libexec/java_home" ]; then
+        JAVA_HOME="$(/usr/libexec/java_home)"; export JAVA_HOME
+      else
+        JAVA_HOME="/Library/Java/Home"; export JAVA_HOME
+      fi
+    fi
+    ;;
+esac
+
+if [ -z "$JAVA_HOME" ] ; then
+  if [ -r /etc/gentoo-release ] ; then
+    JAVA_HOME=$(java-config --jre-home)
+  fi
+fi
+
+# For Cygwin, ensure paths are in UNIX format before anything is touched
+if $cygwin ; then
+  [ -n "$JAVA_HOME" ] &&
+    JAVA_HOME=$(cygpath --unix "$JAVA_HOME")
+  [ -n "$CLASSPATH" ] &&
+    CLASSPATH=$(cygpath --path --unix "$CLASSPATH")
+fi
+
+# For Mingw, ensure paths are in UNIX format before anything is touched
+if $mingw ; then
+  [ -n "$JAVA_HOME" ] && [ -d "$JAVA_HOME" ] &&
+    JAVA_HOME="$(cd "$JAVA_HOME" || (echo "cannot cd into $JAVA_HOME."; exit 1); pwd)"
+fi
+
+if [ -z "$JAVA_HOME" ]; then
+  javaExecutable="$(which javac)"
+  if [ -n "$javaExecutable" ] && ! [ "$(expr "\"$javaExecutable\"" : '\([^ ]*\)')" = "no" ]; then
+    # readlink(1) is not available as standard on Solaris 10.
+    readLink=$(which readlink)
+    if [ ! "$(expr "$readLink" : '\([^ ]*\)')" = "no" ]; then
+      if $darwin ; then
+        javaHome="$(dirname "\"$javaExecutable\"")"
+        javaExecutable="$(cd "\"$javaHome\"" && pwd -P)/javac"
+      else
+        javaExecutable="$(readlink -f "\"$javaExecutable\"")"
+      fi
+      javaHome="$(dirname "\"$javaExecutable\"")"
+      javaHome=$(expr "$javaHome" : '\(.*\)/bin')
+      JAVA_HOME="$javaHome"
+      export JAVA_HOME
+    fi
+  fi
+fi
+
+if [ -z "$JAVACMD" ] ; then
+  if [ -n "$JAVA_HOME"  ] ; then
+    if [ -x "$JAVA_HOME/jre/sh/java" ] ; then
+      # IBM's JDK on AIX uses strange locations for the executables
+      JAVACMD="$JAVA_HOME/jre/sh/java"
+    else
+      JAVACMD="$JAVA_HOME/bin/java"
+    fi
+  else
+    JAVACMD="$(\unset -f command 2>/dev/null; \command -v java)"
+  fi
+fi
+
+if [ ! -x "$JAVACMD" ] ; then
+  echo "Error: JAVA_HOME is not defined correctly." >&2
+  echo "  We cannot execute $JAVACMD" >&2
+  exit 1
+fi
+
+if [ -z "$JAVA_HOME" ] ; then
+  echo "Warning: JAVA_HOME environment variable is not set."
+fi
+
+# traverses directory structure from process work directory to filesystem root
+# first directory with .mvn subdirectory is considered project base directory
+find_maven_basedir() {
+  if [ -z "$1" ]
+  then
+    echo "Path not specified to find_maven_basedir"
+    return 1
+  fi
+
+  basedir="$1"
+  wdir="$1"
+  while [ "$wdir" != '/' ] ; do
+    if [ -d "$wdir"/.mvn ] ; then
+      basedir=$wdir
+      break
+    fi
+    # workaround for JBEAP-8937 (on Solaris 10/Sparc)
+    if [ -d "${wdir}" ]; then
+      wdir=$(cd "$wdir/.." || exit 1; pwd)
+    fi
+    # end of workaround
+  done
+  printf '%s' "$(cd "$basedir" || exit 1; pwd)"
+}
+
+# concatenates all lines of a file
+concat_lines() {
+  if [ -f "$1" ]; then
+    # Remove \r in case we run on Windows within Git Bash
+    # and check out the repository with auto CRLF management
+    # enabled. Otherwise, we may read lines that are delimited with
+    # \r\n and produce $'-Xarg\r' rather than -Xarg due to word
+    # splitting rules.
+    tr -s '\r\n' ' ' < "$1"
+  fi
+}
+
+log() {
+  if [ "$MVNW_VERBOSE" = true ]; then
+    printf '%s\n' "$1"
+  fi
+}
+
+BASE_DIR=$(find_maven_basedir "$(dirname "$0")")
+if [ -z "$BASE_DIR" ]; then
+  exit 1;
+fi
+
+MAVEN_PROJECTBASEDIR=${MAVEN_BASEDIR:-"$BASE_DIR"}; export MAVEN_PROJECTBASEDIR
+log "$MAVEN_PROJECTBASEDIR"
+
+##########################################################################################
+# Extension to allow automatically downloading the maven-wrapper.jar from Maven-central
+# This allows using the maven wrapper in projects that prohibit checking in binary data.
+##########################################################################################
+wrapperJarPath="$MAVEN_PROJECTBASEDIR/.mvn/wrapper/maven-wrapper.jar"
+if [ -r "$wrapperJarPath" ]; then
+    log "Found $wrapperJarPath"
+else
+    log "Couldn't find $wrapperJarPath, downloading it ..."
+
+    if [ -n "$MVNW_REPOURL" ]; then
+      wrapperUrl="$MVNW_REPOURL/org/apache/maven/wrapper/maven-wrapper/3.2.0/maven-wrapper-3.2.0.jar"
+    else
+      wrapperUrl="https://repo.maven.apache.org/maven2/org/apache/maven/wrapper/maven-wrapper/3.2.0/maven-wrapper-3.2.0.jar"
+    fi
+    while IFS="=" read -r key value; do
+      # Remove '\r' from value to allow usage on windows as IFS does not consider '\r' as a separator ( considers space, tab, new line ('\n'), and custom '=' )
+      safeValue=$(echo "$value" | tr -d '\r')
+      case "$key" in (wrapperUrl) wrapperUrl="$safeValue"; break ;;
+      esac
+    done < "$MAVEN_PROJECTBASEDIR/.mvn/wrapper/maven-wrapper.properties"
+    log "Downloading from: $wrapperUrl"
+
+    if $cygwin; then
+      wrapperJarPath=$(cygpath --path --windows "$wrapperJarPath")
+    fi
+
+    if command -v wget > /dev/null; then
+        log "Found wget ... using wget"
+        [ "$MVNW_VERBOSE" = true ] && QUIET="" || QUIET="--quiet"
+        if [ -z "$MVNW_USERNAME" ] || [ -z "$MVNW_PASSWORD" ]; then
+            wget $QUIET "$wrapperUrl" -O "$wrapperJarPath" || rm -f "$wrapperJarPath"
+        else
+            wget $QUIET --http-user="$MVNW_USERNAME" --http-password="$MVNW_PASSWORD" "$wrapperUrl" -O "$wrapperJarPath" || rm -f "$wrapperJarPath"
+        fi
+    elif command -v curl > /dev/null; then
+        log "Found curl ... using curl"
+        [ "$MVNW_VERBOSE" = true ] && QUIET="" || QUIET="--silent"
+        if [ -z "$MVNW_USERNAME" ] || [ -z "$MVNW_PASSWORD" ]; then
+            curl $QUIET -o "$wrapperJarPath" "$wrapperUrl" -f -L || rm -f "$wrapperJarPath"
+        else
+            curl $QUIET --user "$MVNW_USERNAME:$MVNW_PASSWORD" -o "$wrapperJarPath" "$wrapperUrl" -f -L || rm -f "$wrapperJarPath"
+        fi
+    else
+        log "Falling back to using Java to download"
+        javaSource="$MAVEN_PROJECTBASEDIR/.mvn/wrapper/MavenWrapperDownloader.java"
+        javaClass="$MAVEN_PROJECTBASEDIR/.mvn/wrapper/MavenWrapperDownloader.class"
+        # For Cygwin, switch paths to Windows format before running javac
+        if $cygwin; then
+          javaSource=$(cygpath --path --windows "$javaSource")
+          javaClass=$(cygpath --path --windows "$javaClass")
+        fi
+        if [ -e "$javaSource" ]; then
+            if [ ! -e "$javaClass" ]; then
+                log " - Compiling MavenWrapperDownloader.java ..."
+                ("$JAVA_HOME/bin/javac" "$javaSource")
+            fi
+            if [ -e "$javaClass" ]; then
+                log " - Running MavenWrapperDownloader.java ..."
+                ("$JAVA_HOME/bin/java" -cp .mvn/wrapper MavenWrapperDownloader "$wrapperUrl" "$wrapperJarPath") || rm -f "$wrapperJarPath"
+            fi
+        fi
+    fi
+fi
+##########################################################################################
+# End of extension
+##########################################################################################
+
+# If specified, validate the SHA-256 sum of the Maven wrapper jar file
+wrapperSha256Sum=""
+while IFS="=" read -r key value; do
+  case "$key" in (wrapperSha256Sum) wrapperSha256Sum=$value; break ;;
+  esac
+done < "$MAVEN_PROJECTBASEDIR/.mvn/wrapper/maven-wrapper.properties"
+if [ -n "$wrapperSha256Sum" ]; then
+  wrapperSha256Result=false
+  if command -v sha256sum > /dev/null; then
+    if echo "$wrapperSha256Sum  $wrapperJarPath" | sha256sum -c > /dev/null 2>&1; then
+      wrapperSha256Result=true
+    fi
+  elif command -v shasum > /dev/null; then
+    if echo "$wrapperSha256Sum  $wrapperJarPath" | shasum -a 256 -c > /dev/null 2>&1; then
+      wrapperSha256Result=true
+    fi
+  else
+    echo "Checksum validation was requested but neither 'sha256sum' or 'shasum' are available."
+    echo "Please install either command, or disable validation by removing 'wrapperSha256Sum' from your maven-wrapper.properties."
+    exit 1
+  fi
+  if [ $wrapperSha256Result = false ]; then
+    echo "Error: Failed to validate Maven wrapper SHA-256, your Maven wrapper might be compromised." >&2
+    echo "Investigate or delete $wrapperJarPath to attempt a clean download." >&2
+    echo "If you updated your Maven version, you need to update the specified wrapperSha256Sum property." >&2
+    exit 1
+  fi
+fi
+
+MAVEN_OPTS="$(concat_lines "$MAVEN_PROJECTBASEDIR/.mvn/jvm.config") $MAVEN_OPTS"
+
+# For Cygwin, switch paths to Windows format before running java
+if $cygwin; then
+  [ -n "$JAVA_HOME" ] &&
+    JAVA_HOME=$(cygpath --path --windows "$JAVA_HOME")
+  [ -n "$CLASSPATH" ] &&
+    CLASSPATH=$(cygpath --path --windows "$CLASSPATH")
+  [ -n "$MAVEN_PROJECTBASEDIR" ] &&
+    MAVEN_PROJECTBASEDIR=$(cygpath --path --windows "$MAVEN_PROJECTBASEDIR")
+fi
+
+# Provide a "standardized" way to retrieve the CLI args that will
+# work with both Windows and non-Windows executions.
+MAVEN_CMD_LINE_ARGS="$MAVEN_CONFIG $*"
+export MAVEN_CMD_LINE_ARGS
+
+WRAPPER_LAUNCHER=org.apache.maven.wrapper.MavenWrapperMain
+
+# shellcheck disable=SC2086 # safe args
+exec "$JAVACMD" \
+  $MAVEN_OPTS \
+  $MAVEN_DEBUG_OPTS \
+  -classpath "$MAVEN_PROJECTBASEDIR/.mvn/wrapper/maven-wrapper.jar" \
+  "-Dmaven.multiModuleProjectDirectory=${MAVEN_PROJECTBASEDIR}" \
+  ${WRAPPER_LAUNCHER} $MAVEN_CONFIG "$@"

mvnw.cmd

@@ -0,0 +1,205 @@
+@REM ----------------------------------------------------------------------------
+@REM Licensed to the Apache Software Foundation (ASF) under one
+@REM or more contributor license agreements.  See the NOTICE file
+@REM distributed with this work for additional information
+@REM regarding copyright ownership.  The ASF licenses this file
+@REM to you under the Apache License, Version 2.0 (the
+@REM "License"); you may not use this file except in compliance
+@REM with the License.  You may obtain a copy of the License at
+@REM
+@REM    http://www.apache.org/licenses/LICENSE-2.0
+@REM
+@REM Unless required by applicable law or agreed to in writing,
+@REM software distributed under the License is distributed on an
+@REM "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
+@REM KIND, either express or implied.  See the License for the
+@REM specific language governing permissions and limitations
+@REM under the License.
+@REM ----------------------------------------------------------------------------
+
+@REM ----------------------------------------------------------------------------
+@REM Apache Maven Wrapper startup batch script, version 3.2.0
+@REM
+@REM Required ENV vars:
+@REM JAVA_HOME - location of a JDK home dir
+@REM
+@REM Optional ENV vars
+@REM MAVEN_BATCH_ECHO - set to 'on' to enable the echoing of the batch commands
+@REM MAVEN_BATCH_PAUSE - set to 'on' to wait for a keystroke before ending
+@REM MAVEN_OPTS - parameters passed to the Java VM when running Maven
+@REM     e.g. to debug Maven itself, use
+@REM set MAVEN_OPTS=-Xdebug -Xrunjdwp:transport=dt_socket,server=y,suspend=y,address=8000
+@REM MAVEN_SKIP_RC - flag to disable loading of mavenrc files
+@REM ----------------------------------------------------------------------------
+
+@REM Begin all REM lines with '@' in case MAVEN_BATCH_ECHO is 'on'
+@echo off
+@REM set title of command window
+title %0
+@REM enable echoing by setting MAVEN_BATCH_ECHO to 'on'
+@if "%MAVEN_BATCH_ECHO%" == "on"  echo %MAVEN_BATCH_ECHO%
+
+@REM set %HOME% to equivalent of $HOME
+if "%HOME%" == "" (set "HOME=%HOMEDRIVE%%HOMEPATH%")
+
+@REM Execute a user defined script before this one
+if not "%MAVEN_SKIP_RC%" == "" goto skipRcPre
+@REM check for pre script, once with legacy .bat ending and once with .cmd ending
+if exist "%USERPROFILE%\mavenrc_pre.bat" call "%USERPROFILE%\mavenrc_pre.bat" %*
+if exist "%USERPROFILE%\mavenrc_pre.cmd" call "%USERPROFILE%\mavenrc_pre.cmd" %*
+:skipRcPre
+
+@setlocal
+
+set ERROR_CODE=0
+
+@REM To isolate internal variables from possible post scripts, we use another setlocal
+@setlocal
+
+@REM ==== START VALIDATION ====
+if not "%JAVA_HOME%" == "" goto OkJHome
+
+echo.
+echo Error: JAVA_HOME not found in your environment. >&2
+echo Please set the JAVA_HOME variable in your environment to match the >&2
+echo location of your Java installation. >&2
+echo.
+goto error
+
+:OkJHome
+if exist "%JAVA_HOME%\bin\java.exe" goto init
+
+echo.
+echo Error: JAVA_HOME is set to an invalid directory. >&2
+echo JAVA_HOME = "%JAVA_HOME%" >&2
+echo Please set the JAVA_HOME variable in your environment to match the >&2
+echo location of your Java installation. >&2
+echo.
+goto error
+
+@REM ==== END VALIDATION ====
+
+:init
+
+@REM Find the project base dir, i.e. the directory that contains the folder ".mvn".
+@REM Fallback to current working directory if not found.
+
+set MAVEN_PROJECTBASEDIR=%MAVEN_BASEDIR%
+IF NOT "%MAVEN_PROJECTBASEDIR%"=="" goto endDetectBaseDir
+
+set EXEC_DIR=%CD%
+set WDIR=%EXEC_DIR%
+:findBaseDir
+IF EXIST "%WDIR%"\.mvn goto baseDirFound
+cd ..
+IF "%WDIR%"=="%CD%" goto baseDirNotFound
+set WDIR=%CD%
+goto findBaseDir
+
+:baseDirFound
+set MAVEN_PROJECTBASEDIR=%WDIR%
+cd "%EXEC_DIR%"
+goto endDetectBaseDir
+
+:baseDirNotFound
+set MAVEN_PROJECTBASEDIR=%EXEC_DIR%
+cd "%EXEC_DIR%"
+
+:endDetectBaseDir
+
+IF NOT EXIST "%MAVEN_PROJECTBASEDIR%\.mvn\jvm.config" goto endReadAdditionalConfig
+
+@setlocal EnableExtensions EnableDelayedExpansion
+for /F "usebackq delims=" %%a in ("%MAVEN_PROJECTBASEDIR%\.mvn\jvm.config") do set JVM_CONFIG_MAVEN_PROPS=!JVM_CONFIG_MAVEN_PROPS! %%a
+@endlocal & set JVM_CONFIG_MAVEN_PROPS=%JVM_CONFIG_MAVEN_PROPS%
+
+:endReadAdditionalConfig
+
+SET MAVEN_JAVA_EXE="%JAVA_HOME%\bin\java.exe"
+set WRAPPER_JAR="%MAVEN_PROJECTBASEDIR%\.mvn\wrapper\maven-wrapper.jar"
+set WRAPPER_LAUNCHER=org.apache.maven.wrapper.MavenWrapperMain
+
+set WRAPPER_URL="https://repo.maven.apache.org/maven2/org/apache/maven/wrapper/maven-wrapper/3.2.0/maven-wrapper-3.2.0.jar"
+
+FOR /F "usebackq tokens=1,2 delims==" %%A IN ("%MAVEN_PROJECTBASEDIR%\.mvn\wrapper\maven-wrapper.properties") DO (
+    IF "%%A"=="wrapperUrl" SET WRAPPER_URL=%%B
+)
+
+@REM Extension to allow automatically downloading the maven-wrapper.jar from Maven-central
+@REM This allows using the maven wrapper in projects that prohibit checking in binary data.
+if exist %WRAPPER_JAR% (
+    if "%MVNW_VERBOSE%" == "true" (
+        echo Found %WRAPPER_JAR%
+    )
+) else (
+    if not "%MVNW_REPOURL%" == "" (
+        SET WRAPPER_URL="%MVNW_REPOURL%/org/apache/maven/wrapper/maven-wrapper/3.2.0/maven-wrapper-3.2.0.jar"
+    )
+    if "%MVNW_VERBOSE%" == "true" (
+        echo Couldn't find %WRAPPER_JAR%, downloading it ...
+        echo Downloading from: %WRAPPER_URL%
+    )
+
+    powershell -Command "&{"^
+		"$webclient = new-object System.Net.WebClient;"^
+		"if (-not ([string]::IsNullOrEmpty('%MVNW_USERNAME%') -and [string]::IsNullOrEmpty('%MVNW_PASSWORD%'))) {"^
+		"$webclient.Credentials = new-object System.Net.NetworkCredential('%MVNW_USERNAME%', '%MVNW_PASSWORD%');"^
+		"}"^
+		"[Net.ServicePointManager]::SecurityProtocol = [Net.SecurityProtocolType]::Tls12; $webclient.DownloadFile('%WRAPPER_URL%', '%WRAPPER_JAR%')"^
+		"}"
+    if "%MVNW_VERBOSE%" == "true" (
+        echo Finished downloading %WRAPPER_JAR%
+    )
+)
+@REM End of extension
+
+@REM If specified, validate the SHA-256 sum of the Maven wrapper jar file
+SET WRAPPER_SHA_256_SUM=""
+FOR /F "usebackq tokens=1,2 delims==" %%A IN ("%MAVEN_PROJECTBASEDIR%\.mvn\wrapper\maven-wrapper.properties") DO (
+    IF "%%A"=="wrapperSha256Sum" SET WRAPPER_SHA_256_SUM=%%B
+)
+IF NOT %WRAPPER_SHA_256_SUM%=="" (
+    powershell -Command "&{"^
+       "$hash = (Get-FileHash \"%WRAPPER_JAR%\" -Algorithm SHA256).Hash.ToLower();"^
+       "If('%WRAPPER_SHA_256_SUM%' -ne $hash){"^
+       "  Write-Output 'Error: Failed to validate Maven wrapper SHA-256, your Maven wrapper might be compromised.';"^
+       "  Write-Output 'Investigate or delete %WRAPPER_JAR% to attempt a clean download.';"^
+       "  Write-Output 'If you updated your Maven version, you need to update the specified wrapperSha256Sum property.';"^
+       "  exit 1;"^
+       "}"^
+       "}"
+    if ERRORLEVEL 1 goto error
+)
+
+@REM Provide a "standardized" way to retrieve the CLI args that will
+@REM work with both Windows and non-Windows executions.
+set MAVEN_CMD_LINE_ARGS=%*
+
+%MAVEN_JAVA_EXE% ^
+  %JVM_CONFIG_MAVEN_PROPS% ^
+  %MAVEN_OPTS% ^
+  %MAVEN_DEBUG_OPTS% ^
+  -classpath %WRAPPER_JAR% ^
+  "-Dmaven.multiModuleProjectDirectory=%MAVEN_PROJECTBASEDIR%" ^
+  %WRAPPER_LAUNCHER% %MAVEN_CONFIG% %*
+if ERRORLEVEL 1 goto error
+goto end
+
+:error
+set ERROR_CODE=1
+
+:end
+@endlocal & set ERROR_CODE=%ERROR_CODE%
+
+if not "%MAVEN_SKIP_RC%"=="" goto skipRcPost
+@REM check for post script, once with legacy .bat ending and once with .cmd ending
+if exist "%USERPROFILE%\mavenrc_post.bat" call "%USERPROFILE%\mavenrc_post.bat"
+if exist "%USERPROFILE%\mavenrc_post.cmd" call "%USERPROFILE%\mavenrc_post.cmd"
+:skipRcPost
+
+@REM pause the script if MAVEN_BATCH_PAUSE is set to 'on'
+if "%MAVEN_BATCH_PAUSE%"=="on" pause
+
+if "%MAVEN_TERMINATE_CMD%"=="on" exit %ERROR_CODE%
+
+cmd /C exit /B %ERROR_CODE%

org/bukkit/configuration/annotations.xml

@@ -1,7 +1,7 @@
 <root>
     <item name='org.bukkit.configuration.MemorySection java.lang.String getString(java.lang.String, java.lang.String)'>
         <annotation name='org.jetbrains.annotations.Contract'>
-            <val val="&quot;_, _, -&gt; !null&quot;"/>
+            <val val="&quot;_, _ -&gt; !null&quot;"/>
         </annotation>
     </item>
 </root>

pom.xml

@@ -3,9 +3,9 @@
     <modelVersion>4.0.0</modelVersion>
     <groupId>net.sacredlabyrinth.phaed.simpleclans</groupId>
     <artifactId>SimpleClans</artifactId>
-    <version>2.14.3</version>
+    <version>2.19.1-SNAPSHOT</version>
     <name>SimpleClans</name>
-    <url>http://dev.bukkit.org/server-mods/simpleclans/</url>
+    <url>https://www.spigotmc.org/resources/simpleclans.71242/</url>
 
     <build>
         <finalName>${project.name}</finalName>
@@ -30,13 +30,11 @@
             <plugin>
                 <groupId>org.apache.maven.plugins</groupId>
                 <artifactId>maven-compiler-plugin</artifactId>
-                <version>3.1</version>
+                <version>3.11.0</version>
                 <configuration>
-                    <source>1.8</source>
-                    <target>1.8</target>
+                    <release>16</release>
                     <showDeprecation>true</showDeprecation>
                     <showWarnings>true</showWarnings>
-                    <fork>true</fork>
                     <compilerArgs>
                         <arg>-parameters</arg>
                     </compilerArgs>
@@ -47,25 +45,25 @@
             <plugin>
                 <groupId>org.apache.maven.plugins</groupId>
                 <artifactId>maven-jar-plugin</artifactId>
-                <version>2.4</version>
+                <version>3.3.0</version>
             </plugin>
 
             <!-- Release plugin -->
             <plugin>
                 <groupId>org.apache.maven.plugins</groupId>
                 <artifactId>maven-release-plugin</artifactId>
-                <version>2.3.2</version>
+                <version>3.0.1</version>
             </plugin>
-            
+
             <!-- Shade plugin -->
             <plugin>
                 <groupId>org.apache.maven.plugins</groupId>
                 <artifactId>maven-shade-plugin</artifactId>
-                <version>3.1.0</version>
+                <version>3.5.0</version>
                 <configuration>
                     <relocations>
                         <relocation>
-                            <pattern>org.bstats.bukkit</pattern>
+                            <pattern>org.bstats</pattern>
                             <shadedPattern>net.sacredlabyrinth.phaed.simpleclans.metrics</shadedPattern>
                         </relocation>
                         <relocation>
@@ -84,12 +82,23 @@
                             <pattern>com.cryptomorin.xseries</pattern>
                             <shadedPattern>net.sacredlabyrinth.phaed.simpleclans.xseries</shadedPattern>
                         </relocation>
+                        <relocation>
+                            <pattern>com.google.gson</pattern>
+                            <shadedPattern>net.sacredlabyrinth.phaed.simpleclans.gson</shadedPattern>
+                        </relocation>
                     </relocations>
                     <artifactSet>
                         <excludes>
                             <exclude>org.jetbrains:annotations</exclude>
                         </excludes>
                     </artifactSet>
+
+                    <transformers>
+                        <!-- Avoid overlapping MANIFEST.MF file -->
+                        <transformer implementation="org.apache.maven.plugins.shade.resource.DontIncludeResourceTransformer">
+                            <resource>MANIFEST.MF</resource>
+                        </transformer>
+                    </transformers>
                 </configuration>
                 <executions>
                     <execution>
@@ -100,6 +109,74 @@
                     </execution>
                 </executions>
             </plugin>
+
+            <!-- Dependency plugin -->
+            <plugin>
+                <groupId>org.apache.maven.plugins</groupId>
+                <artifactId>maven-dependency-plugin</artifactId>
+                <version>3.6.0</version>
+                <executions>
+                    <execution>
+                        <id>copy-installed</id>
+                        <phase>package</phase>
+                        <goals>
+                            <goal>copy</goal>
+                        </goals>
+                        <configuration>
+                            <artifactItems>
+                                <artifactItem>
+                                    <groupId>${project.groupId}</groupId>
+                                    <artifactId>${project.artifactId}</artifactId>
+                                    <version>${project.version}</version>
+                                    <type>${project.packaging}</type>
+                                </artifactItem>
+                            </artifactItems>
+                            <outputDirectory>${env.TEST_SERVER}\plugins</outputDirectory>
+                            <silent>true</silent>
+                        </configuration>
+                    </execution>
+                </executions>
+            </plugin>
+
+            <plugin>
+                <groupId>pl.project13.maven</groupId>
+                <artifactId>git-commit-id-plugin</artifactId>
+                <version>4.9.10</version>
+                <executions>
+                    <execution>
+                        <goals>
+                            <goal>revision</goal>
+                        </goals>
+                        <phase>validate</phase>
+                    </execution>
+                </executions>
+                <configuration>
+                    <dotGitDirectory>${project.basedir}/.git</dotGitDirectory>
+                </configuration>
+            </plugin>
+
+            <plugin>
+                <groupId>org.apache.maven.plugins</groupId>
+                <artifactId>maven-javadoc-plugin</artifactId>
+                <version>3.5.0</version>
+                <executions>
+                    <execution>
+                        <goals>
+                            <goal>javadoc</goal>
+                        </goals>
+                        <phase>package</phase>
+                    </execution>
+                </executions>
+                <configuration>
+                    <release>16</release>
+                    <doclint>all,-missing</doclint>
+                </configuration>
+            </plugin>
+
+            <plugin>
+                <artifactId>maven-surefire-plugin</artifactId>
+                <version>3.1.2</version>
+            </plugin>
         </plugins>
     </build>
     <!-- Dependencies -->
@@ -107,7 +184,7 @@
         <dependency>
             <groupId>org.spigotmc</groupId>
             <artifactId>spigot-api</artifactId>
-            <version>1.13.2-R0.1-SNAPSHOT</version>
+            <version>1.16.4-R0.1-SNAPSHOT</version>
             <scope>provided</scope>
         </dependency>
         <dependency>
@@ -115,17 +192,18 @@
             <artifactId>VaultAPI</artifactId>
             <version>1.7</version>
             <scope>provided</scope>
-        </dependency>
-        <dependency>
-            <groupId>com.googlecode.json-simple</groupId>
-            <artifactId>json-simple</artifactId>
-            <version>1.1.1</version>
-            <scope>provided</scope>
+            <exclusions>
+                <!-- No idea why, but it fails JUnit 5 tests -->
+                <exclusion>
+                    <groupId>com.googlecode.json-simple</groupId>
+                    <artifactId>json-simple</artifactId>
+                </exclusion>
+            </exclusions>
         </dependency>
         <dependency>
             <groupId>org.bstats</groupId>
             <artifactId>bstats-bukkit</artifactId>
-            <version>1.7</version>
+            <version>2.2.1</version>
             <scope>compile</scope>
         </dependency>
         <dependency>
@@ -137,33 +215,59 @@
         <dependency>
             <groupId>org.jetbrains</groupId>
             <artifactId>annotations</artifactId>
-            <version>16.0.2</version>
+            <version>22.0.0</version>
         </dependency>
         <dependency>
             <groupId>io.papermc</groupId>
             <artifactId>paperlib</artifactId>
-            <version>1.0.5</version>
+            <version>1.0.8-SNAPSHOT</version>
             <scope>compile</scope>
         </dependency>
         <dependency>
             <groupId>co.aikar</groupId>
             <artifactId>acf-paper</artifactId>
-            <version>0.5.0-SNAPSHOT</version>
+            <version>0.5.1-SNAPSHOT</version>
         </dependency>
         <dependency>
             <groupId>com.github.cryptomorin</groupId>
             <artifactId>XSeries</artifactId>
-            <version>7.2.1</version>
+            <version>8.3.0</version>
         </dependency>
         <dependency>
-            <groupId>org.reflections</groupId>
-            <artifactId>reflections</artifactId>
-            <version>0.9.12</version>
+            <groupId>com.sk89q.worldguard</groupId>
+            <artifactId>worldguard-bukkit</artifactId>
+            <version>7.0.4</version>
+            <scope>provided</scope>
         </dependency>
+        <dependency>
+            <groupId>com.github.TechFortress</groupId>
+            <artifactId>GriefPrevention</artifactId>
+            <version>16.18.1</version>
+            <scope>provided</scope>
+        </dependency>
+        <dependency>
+            <groupId>com.discordsrv</groupId>
+            <artifactId>discordsrv</artifactId>
+            <version>1.24.1-SNAPSHOT</version>
+            <scope>provided</scope>
+        </dependency>
+        <dependency>
+            <groupId>biz.princeps</groupId>
+            <artifactId>landlord-latest</artifactId>
+            <version>4.351</version>
+            <scope>provided</scope>
+        </dependency>
+        <dependency>
+            <groupId>com.google.code.gson</groupId>
+            <artifactId>gson</artifactId>
+            <version>2.9.1</version>
+        </dependency>
+
+        <!--    Test frameworks    -->
         <dependency>
             <groupId>org.junit.jupiter</groupId>
             <artifactId>junit-jupiter-api</artifactId>
-            <version>5.4.0</version>
+            <version>5.9.3</version>
             <scope>test</scope>
         </dependency>
     </dependencies>
@@ -182,10 +286,6 @@
             <id>bstats-repo</id>
             <url>https://repo.codemc.org/repository/maven-public</url>
         </repository>
-        <repository>
-            <id>jitpack.io</id>
-            <url>https://jitpack.io</url>
-        </repository>
         <repository>
             <id>papermc</id>
             <url>https://papermc.io/repo/repository/maven-public/</url>
@@ -194,22 +294,24 @@
             <id>aikar</id>
             <url>https://repo.aikar.co/content/groups/aikar/</url>
         </repository>
+        <repository>
+            <id>sk89q-repo</id>
+            <url>https://maven.enginehub.org/repo/</url>
+        </repository>
+        <repository>
+            <id>Scarsz-Nexus</id>
+            <url>https://nexus.scarsz.me/content/groups/public/</url>
+        </repository>
+        <repository>
+            <id>eldonexus</id>
+            <url>https://eldonexus.de/repository/maven-public</url>
+        </repository>
+        <repository>
+            <id>jitpack.io</id>
+            <url>https://jitpack.io</url>
+        </repository>
     </repositories>
 
-    <!-- GitHub/Jenkins -->
-
-    <ciManagement>
-        <system>jenkins</system>
-        <url>http://104.236.246.108:8080</url>
-    </ciManagement>
-
-    <scm>
-        <connection>scm:git:git:@github.com:marcelo-mason/SimpleClans.git</connection>
-        <developerConnection>scm:git:git:@github.com:marcelo-mason/SimpleClans.git</developerConnection>
-        <url>http://github.com/marcelo-mason/SimpleClans.git/tree/master/</url>
-        <tag>SimpleClans</tag>
-    </scm>
-
     <properties>
         <project.build.sourceEncoding>UTF-8</project.build.sourceEncoding>
     </properties>
@@ -218,9 +320,12 @@
 
     <distributionManagement>
         <repository>
-            <id>bintray-roinujnosde-bukkit-plugins</id>
-            <name>roinujnosde-bukkit-plugins</name>
-            <url>https://api.bintray.com/maven/roinujnosde/bukkit-plugins/SimpleClans/;publish=1</url>
+            <id>reposilite</id>
+            <url>https://repo.roinujnosde.me/releases/</url>
         </repository>
+        <snapshotRepository>
+            <id>reposilite</id>
+            <url>https://repo.roinujnosde.me/snapshots/</url>
+        </snapshotRepository>
     </distributionManagement>
 </project>

src/main/java/META-INF/MANIFEST.MF

@@ -1,3 +0,0 @@
-Manifest-Version: 1.0
-Main-Class: net.sacredlabyrinth.phaed.simpleclans.SimpleClans
-

src/main/java/net/sacredlabyrinth/phaed/simpleclans/ChatBlock.java

@@ -1,5 +1,6 @@
 package net.sacredlabyrinth.phaed.simpleclans;
 
+import net.sacredlabyrinth.phaed.simpleclans.utils.ChatUtils;
 import org.bukkit.ChatColor;
 import org.bukkit.command.CommandSender;
 import org.jetbrains.annotations.NotNull;
@@ -9,7 +10,6 @@ import java.util.ArrayList;
 import java.util.Arrays;
 import java.util.LinkedList;
 import java.util.List;
-import java.util.logging.Logger;
 
 import static net.sacredlabyrinth.phaed.simpleclans.SimpleClans.lang;
 
@@ -25,41 +25,28 @@ public class ChatBlock {
     private String color = "";
     private boolean cropRight = true;
     private boolean padRight = true;
-    
-    /**
-     *
-     */
-    public static final Logger LOG = Logger.getLogger("Minecraft");
 
-    
+    @Deprecated
     public void setCropRight(boolean cropRight) {
-    	this.cropRight = cropRight;
+        this.cropRight = cropRight;
     }
-    
+
+    @Deprecated
     public void setPadRight(boolean padRight) {
-    	this.padRight = padRight;
+        this.padRight = padRight;
     }
-    
-    /**
-     * @param columnAlignment
-     */
+
     public void setAlignment(String... columnAlignment) {
         columnAlignments.addAll(Arrays.asList(columnAlignment));
     }
 
-    /**
-     * @param columnFlex
-     */
     public void setFlexibility(boolean... columnFlex) {
         for (boolean flex : columnFlex) {
             columnFlexes.add(flex);
         }
     }
 
-    /**
-     * @param columnPercentages
-     * @param prefix
-     */
+    @Deprecated
     public void setColumnSizes(String prefix, double... columnPercentages) {
         int ll = LINE_LENGTH;
 
@@ -72,73 +59,44 @@ public class ChatBlock {
         }
     }
 
-    /**
-     * @return
-     */
+    @Deprecated
     public boolean hasContent() {
         return !rows.isEmpty();
     }
 
-    /**
-     * @param contents
-     */
     public void addRow(String... contents) {
         rows.add(contents);
     }
 
-    /**
-     * @return
-     */
+
     public int size() {
         return rows.size();
     }
 
-    /**
-     * @return
-     */
+    @Deprecated
     public boolean isEmpty() {
         return rows.isEmpty();
     }
 
-    /**
-     *
-     */
+    @Deprecated
     public void clear() {
         rows.clear();
     }
 
-    /**
-     * @param player
-     * @return
-     */
+    @Deprecated
     public boolean sendBlock(CommandSender player) {
         return sendBlock(player, null, 0);
     }
 
-    /**
-     * @param player
-     * @param prefix
-     * @return
-     */
+    @Deprecated
     public boolean sendBlock(CommandSender player, String prefix) {
         return sendBlock(player, prefix, 0);
     }
 
-    /**
-     * @param player
-     * @param amount
-     * @return
-     */
     public boolean sendBlock(CommandSender player, int amount) {
         return sendBlock(player, null, amount);
     }
 
-    /**
-     * @param player
-     * @param prefix
-     * @param amount
-     * @return
-     */
     boolean sendBlock(CommandSender player, String prefix, int amount) {
         if (player == null) {
             return false;
@@ -199,27 +157,27 @@ public class ChatBlock {
                     }
                 } else if (align.equalsIgnoreCase("l")) {
                     if (msgLength(section) > colsize) {
-                    	if (cropRight) {
-                    		col = cropRightToFit(section, colsize);
+                        if (cropRight) {
+                            col = cropRightToFit(section, colsize);
                         } else {
-                        	col = section;
+                            col = section;
                         }
                     } else if (msgLength(section) < colsize) {
-                    	if (padRight) {
-                    		col = paddRightToFit(section, colsize);
-                    	} else {
-                    		col = section;
-                    	}
+                        if (padRight) {
+                            col = paddRightToFit(section, colsize);
+                        } else {
+                            col = section;
+                        }
                     }
                 } else if (align.equalsIgnoreCase("c")) {
                     if (msgLength(section) > colsize) {
-                    	if (cropRight) {
-                    		col = cropRightToFit(section, colsize);
-                    	} else {
-                    		col = section;
-                    	}
+                        if (cropRight) {
+                            col = cropRightToFit(section, colsize);
+                        } else {
+                            col = section;
+                        }
                     } else if (msgLength(section) < colsize) {
-                    	col = centerInLineOf(section, colsize);
+                        col = centerInLineOf(section, colsize);
                     }
                 }
 
@@ -284,7 +242,7 @@ public class ChatBlock {
             // crop and print out
             String msg = (prefix_used ? empty_prefix : prefix + " ") + finalString;
             if (cropRight) {
-            	msg = cropRightToFit(msg, LINE_LENGTH);
+                msg = cropRightToFit(msg, LINE_LENGTH);
             }
             if (color.length() > 0) {
                 msg = color + msg;
@@ -309,10 +267,6 @@ public class ChatBlock {
         return out;
     }
 
-    /**
-     * @param col
-     * @return
-     */
     int getMaxWidth(int col) {
         double maxWidth = 0;
 
@@ -323,19 +277,11 @@ public class ChatBlock {
         return (int) maxWidth;
     }
 
-    /**
-     * @param msg
-     * @return
-     */
+    @Deprecated
     public static String centerInLine(String msg) {
         return centerInLineOf(msg, LINE_LENGTH);
     }
 
-    /**
-     * @param msg
-     * @param lineLength
-     * @return
-     */
     private static String centerInLineOf(String msg, double lineLength) {
         double length = msgLength(msg);
         double diff = lineLength - length;
@@ -360,10 +306,6 @@ public class ChatBlock {
         return msg;
     }
 
-    /**
-     * @param str
-     * @return
-     */
     public static String makeEmpty(String str) {
         if (str == null) {
             return "";
@@ -372,11 +314,6 @@ public class ChatBlock {
         return paddLeftToFit("", msgLength(str));
     }
 
-    /**
-     * @param msg
-     * @param length
-     * @return
-     */
     private static String cropRightToFit(String msg, double length) {
         if (msg == null || msg.length() == 0 || length == 0) {
             return "";
@@ -389,11 +326,6 @@ public class ChatBlock {
         return msg;
     }
 
-    /**
-     * @param msg
-     * @param length
-     * @return
-     */
     private static String cropLeftToFit(String msg, double length) {
         if (msg == null || msg.length() == 0 || length == 0) {
             return "";
@@ -407,11 +339,11 @@ public class ChatBlock {
     }
 
     /**
-     * Padds left til the string is a certain size
+     * Pads left til the string is a certain size
      *
-     * @param msg
-     * @param length
-     * @return
+     * @param msg    the message to pad
+     * @param length the message length
+     * @return the padded message
      */
     private static String paddLeftToFit(String msg, double length) {
         if (msgLength(msg) >= length) {
@@ -426,11 +358,11 @@ public class ChatBlock {
     }
 
     /**
-     * Padds right til the string is a certain size
+     * Pads right til the string is a certain size
      *
-     * @param msg
-     * @param length
-     * @return
+     * @param msg    the message to pad
+     * @param length the message length
+     * @return the padded message
      */
     private static String paddRightToFit(String msg, double length) {
         if (msgLength(msg) >= length) {
@@ -446,9 +378,6 @@ public class ChatBlock {
 
     /**
      * Finds the length on the screen of a string. Ignores colors.
-     *
-     * @param str
-     * @return
      */
     private static double msgLength(String str) {
         double length = 0;
@@ -469,9 +398,6 @@ public class ChatBlock {
 
     /**
      * Finds the visual length of the character on the screen.
-     *
-     * @param x
-     * @return
      */
     private static int charLength(char x) {
         String normalized = StringSimplifier.simplifiedString(x + "");
@@ -497,15 +423,11 @@ public class ChatBlock {
 
     /**
      * Cuts the message apart into whole words short enough to fit on one line
-     *
-     * @param msg
-     * @return
      */
     private static String[] wordWrap(String msg) {
         // Split each word apart
 
-        ArrayList<String> split = new ArrayList<>();
-        split.addAll(Arrays.asList(msg.split(" ")));
+        ArrayList<String> split = new ArrayList<>(Arrays.asList(msg.split(" ")));
 
         // Create an array list for the output
 
@@ -545,19 +467,15 @@ public class ChatBlock {
 
             // Merge the words into a sentence (that now fits into a single chat line) and add them to the output array.
 
-            String merged = combineSplit(words.toArray(new String[words.size()]));
+            String merged = combineSplit(words.toArray(new String[0]));
             out.add(merged);
         }
 
         // Convert to an array and return
 
-        return out.toArray(new String[out.size()]);
+        return out.toArray(new String[0]);
     }
 
-    /**
-     * @param string
-     * @return
-     */
     private static String combineSplit(String[] string) {
         StringBuilder builder = new StringBuilder();
         for (String aString : string) {
@@ -571,10 +489,6 @@ public class ChatBlock {
 
     /**
      * Cuts apart a word that is too long to fit on one line
-     *
-     * @param lengthBefore
-     * @param str
-     * @return
      */
     private static String[] wordCut(int lengthBefore, String str) {
         int length = lengthBefore;
@@ -609,8 +523,8 @@ public class ChatBlock {
     /**
      * Outputs a single line out, crops overflow
      *
-     * @param receiver
-     * @param msg
+     * @param receiver the receiver
+     * @param msg      the message
      */
     public static void saySingle(CommandSender receiver, String msg) {
         if (receiver == null) {
@@ -623,38 +537,43 @@ public class ChatBlock {
     /**
      * Outputs a message to a user
      *
-     * @param receiver
-     * @param msg
+     * @param receiver the receiver
+     * @param msg      the message
      */
     public static void sendMessage(@Nullable CommandSender receiver, @NotNull String msg) {
         if (receiver == null) {
             return;
         }
 
-        String[] message = colorize(wordWrap(msg));
-
-        for (String out : message) {
-            receiver.sendMessage(out);
-        }
+        receiver.sendMessage(ChatUtils.parseColors(msg));
     }
 
+    public static void sendMessage(@Nullable ClanPlayer receiver, @NotNull String msg) {
+        if (receiver == null) {
+            return;
+        }
+
+        SimpleClans.getInstance().getProxyManager().sendMessage(receiver.getName(), ChatUtils.parseColors(msg));
+    }
+
+    // ClanCommands#setbanner, LandCommands#Allow/BlockCommand/verify, StaffCommands#kick, etc
     public static void sendMessageKey(@Nullable CommandSender receiver, @NotNull String key, @NotNull Object... args) {
         sendMessage(receiver, lang(key, receiver, args));
     }
 
-    /**
-     * Send blank lie
-     *
-     * @param color
-     */
+    public static void sendMessageKey(@NotNull ClanPlayer clanPlayer, @NotNull String key, @NotNull Object... args) {
+        sendMessageKey(clanPlayer.toPlayer(), key, args);
+    }
+
+    @Deprecated
     public void startColor(String color) {
         this.color = color;
     }
 
     /**
-     * Send blank lie
+     * Sends a blank line
      *
-     * @param receiver
+     * @param receiver the receiver
      */
     public static void sendBlank(CommandSender receiver) {
         if (receiver == null) {
@@ -666,22 +585,17 @@ public class ChatBlock {
 
     /**
      * Colors each line
-     *
-     * @param message
-     * @return
      */
+    @Deprecated
     public static String[] say(String message) {
         return colorize(wordWrap(message));
     }
-    
+
+    @Deprecated
     public static String[] getColorizedMessage(String msg) {
         return colorize(wordWrap(msg));
     }
 
-    /**
-     * @param message
-     * @return
-     */
     private static String[] colorize(String[] message) {
         try {
             return colorizeBase(message);
@@ -690,21 +604,12 @@ public class ChatBlock {
         }
     }
 
-    /**
-     * @param message
-     * @return
-     */
-    public static String colorize(String message) {
-        return colorizeBase(new String[]{
-                message
-        })[0];
+    @Deprecated
+    public static @Nullable String colorize(String message) {
+        return colorizeBase(new String[]{message})[0];
     }
 
-    /**
-     * @param message
-     * @return
-     */
-    private static String[] colorizeBase(String[] message) {
+    private static @Nullable String[] colorizeBase(String[] message) {
         if (message != null && message[0] != null && !message[0].isEmpty()) {
             // Go through each line
 
@@ -720,9 +625,8 @@ public class ChatBlock {
                         // advance x to the next character
                         x += 1;
 
-                        try {
-                            lastColor = ChatColor.getByChar(msg.charAt(x)) + "";
-                        } catch (Exception ignored) {
+                        if (x < msg.length()) {
+                            lastColor = ChatColor.COLOR_CHAR + "" + msg.charAt(x);
                         }
                     }
                 }
@@ -734,6 +638,7 @@ public class ChatBlock {
             }
         }
 
+        //noinspection ConstantConditions
         return message;
     }
 }

src/main/java/net/sacredlabyrinth/phaed/simpleclans/ClanRequest.java

@@ -6,5 +6,5 @@ package net.sacredlabyrinth.phaed.simpleclans;
  */
 public enum ClanRequest
 {
-    DEMOTE, PROMOTE, DISBAND, INVITE, CREATE_ALLY, BREAK_RIVALRY, START_WAR, END_WAR
+    DEMOTE, PROMOTE, DISBAND, INVITE, CREATE_ALLY, BREAK_RIVALRY, START_WAR, END_WAR, RENAME
 }

src/main/java/net/sacredlabyrinth/phaed/simpleclans/CommandHelper.java

@@ -1,60 +0,0 @@
-package net.sacredlabyrinth.phaed.simpleclans;
-
-import org.bukkit.Bukkit;
-import org.bukkit.command.CommandMap;
-import org.bukkit.command.PluginCommand;
-import org.bukkit.plugin.Plugin;
-import org.bukkit.plugin.SimplePluginManager;
-
-import java.lang.reflect.Constructor;
-import java.lang.reflect.Field;
-import java.util.Arrays;
-
-public class CommandHelper {
-
-    private CommandHelper() {
-    }
-
-    public static void registerCommand(String... aliases) {
-        if (aliases != null) {
-            PluginCommand command = getCommand(aliases[0], SimpleClans.getInstance());
-
-            if (command != null) {
-                command.setAliases(Arrays.asList(aliases));
-                getCommandMap().register(SimpleClans.getInstance().getDescription().getName(), command);
-            }
-        }
-    }
-
-    private static PluginCommand getCommand(String name, Plugin plugin) {
-        PluginCommand command = null;
-
-        try {
-            Constructor<PluginCommand> c = PluginCommand.class.getDeclaredConstructor(String.class, Plugin.class);
-            c.setAccessible(true);
-
-            command = c.newInstance(name, plugin);
-        } catch (Exception e) {
-            e.printStackTrace();
-        }
-
-        return command;
-    }
-
-    private static CommandMap getCommandMap() {
-        CommandMap commandMap = null;
-
-        try {
-            if (Bukkit.getPluginManager() instanceof SimplePluginManager) {
-                Field f = SimplePluginManager.class.getDeclaredField("commandMap");
-                f.setAccessible(true);
-
-                commandMap = (CommandMap) f.get(Bukkit.getPluginManager());
-            }
-        } catch (Exception e) {
-            e.printStackTrace();
-        }
-
-        return commandMap;
-    }
-}

src/main/java/net/sacredlabyrinth/phaed/simpleclans/DamageRecord.java

@@ -1,65 +0,0 @@
-
-package net.sacredlabyrinth.phaed.simpleclans;
-
-import java.util.Date;
-
-/**
- * @author phaed
- */
-public class DamageRecord {
-    private String victim;
-    private String attacker;
-    private Date time;
-
-    /**
-     * @param victim
-     * @param attacker
-     */
-    public DamageRecord(String victim, String attacker) {
-        this.victim = victim;
-        this.attacker = attacker;
-        this.time = new Date();
-    }
-
-    /**
-     * @return the victim
-     */
-    public String getVictim() {
-        return victim;
-    }
-
-    /**
-     * @param victim the victim to set
-     */
-    public void setVictim(String victim) {
-        this.victim = victim;
-    }
-
-    /**
-     * @return the attacker
-     */
-    public String getAttacker() {
-        return attacker;
-    }
-
-    /**
-     * @param attacker the attacker to set
-     */
-    public void setAttacker(String attacker) {
-        this.attacker = attacker;
-    }
-
-    /**
-     * @return the time
-     */
-    public Date getTime() {
-        return new Date(time.getTime());
-    }
-
-    /**
-     * @param time the time to set
-     */
-    public void setTime(Date time) {
-        this.time = new Date(time.getTime());
-    }
-}

src/main/java/net/sacredlabyrinth/phaed/simpleclans/Dates.java

@@ -15,111 +15,51 @@ public class Dates {
     private Dates() {
     }
 
-    /**
-     * @param date1
-     * @param date2
-     * @return
-     */
     public static double differenceInMonths(Timestamp date1, Timestamp date2) {
         return differenceInMonths(new Date(date1.getTime()), new Date(date2.getTime()));
     }
 
-    /**
-     * @param date1
-     * @param date2
-     * @return
-     */
     public static double differenceInYears(Timestamp date1, Timestamp date2) {
         return differenceInYears(new Date(date1.getTime()), new Date(date2.getTime()));
     }
 
-    /**
-     * @param date1
-     * @param date2
-     * @return
-     */
     public static double differenceInDays(Timestamp date1, Timestamp date2) {
         return differenceInDays(new Date(date1.getTime()), new Date(date2.getTime()));
     }
 
-    /**
-     * @param date1
-     * @param date2
-     * @return
-     */
     public static double differenceInHours(Timestamp date1, Timestamp date2) {
         return differenceInHours(new Date(date1.getTime()), new Date(date2.getTime()));
     }
 
-    /**
-     * @param date1
-     * @param date2
-     * @return
-     */
     public static double differenceInMinutes(Timestamp date1, Timestamp date2) {
         return differenceInMinutes(new Date(date1.getTime()), new Date(date2.getTime()));
     }
 
-    /**
-     * @param date1
-     * @param date2
-     * @return
-     */
     public static double differenceInSeconds(Timestamp date1, Timestamp date2) {
         return differenceInSeconds(new Date(date1.getTime()), new Date(date2.getTime()));
     }
 
-    /**
-     * @param date1
-     * @param date2
-     * @return
-     */
     public static double differenceInMonths(Date date1, Date date2) {
         return differenceInYears(date1, date2) * 12;
     }
 
-    /**
-     * @param date1
-     * @param date2
-     * @return
-     */
     public static double differenceInYears(Date date1, Date date2) {
         double days = differenceInDays(date1, date2);
         return days / 365.2425;
     }
 
-    /**
-     * @param date1
-     * @param date2
-     * @return
-     */
     public static double differenceInDays(Date date1, Date date2) {
         return differenceInHours(date1, date2) / 24.0;
     }
 
-    /**
-     * @param date1
-     * @param date2
-     * @return
-     */
     public static double differenceInHours(Date date1, Date date2) {
         return differenceInMinutes(date1, date2) / 60.0;
     }
 
-    /**
-     * @param date1
-     * @param date2
-     * @return
-     */
     public static double differenceInMinutes(Date date1, Date date2) {
         return differenceInSeconds(date1, date2) / 60.0;
     }
 
-    /**
-     * @param date1
-     * @param date2
-     * @return
-     */
     public static double differenceInSeconds(Date date1, Date date2) {
         return differenceInMilliseconds(date1, date2) / 1000.0;
     }
@@ -135,15 +75,14 @@ public class Dates {
     }
 
     /**
-     * Returns the string representation of the amount of time labeled as days, hours, minutes, seconds
-     * @author RoboMWM, LaxWasHere
+     * <p>
+     * authors: RoboMWM, LaxWasHere
+     * </p>
      * @param seconds the time in seconds
-     * @param depth Max amount of detail (e.g. only display days and hours if set to 1 and seconds > 1 day)
-     * @return
+     * @param depth Max amount of detail (e.g. only display days and hours if set to 1 and seconds {@literal >} 1 day)
+     * @return the string representation of the amount of time labeled as days, hours, minutes, seconds
      */
-    public static String formatTime(Long seconds, int depth)
-    {
-        SimpleClans plugin = SimpleClans.getInstance();
+    public static String formatTime(Long seconds, int depth) {
         if (seconds == null || seconds < 1) {
             return lang("bb.moments");
         }

src/main/java/net/sacredlabyrinth/phaed/simpleclans/EconomyResponse.java

@@ -0,0 +1,5 @@
+package net.sacredlabyrinth.phaed.simpleclans;
+
+public enum EconomyResponse {
+    SUCCESS, NEGATIVE_VALUE, NOT_ENOUGH_BALANCE, CANCELLED
+}

src/main/java/net/sacredlabyrinth/phaed/simpleclans/Flags.java

@@ -0,0 +1,87 @@
+package net.sacredlabyrinth.phaed.simpleclans;
+
+import com.google.gson.Gson;
+import com.google.gson.JsonElement;
+import com.google.gson.JsonObject;
+import org.jetbrains.annotations.NotNull;
+import org.jetbrains.annotations.Nullable;
+
+import java.util.ArrayList;
+import java.util.List;
+
+public class Flags {
+
+    private static final Gson gson = new Gson();
+    private final JsonObject flags;
+
+    public Flags(@Nullable String json) {
+        if (json != null && !json.isEmpty()) {
+            flags = gson.fromJson(json, JsonObject.class);
+        } else {
+            flags = new JsonObject();
+        }
+    }
+
+    @NotNull
+    public List<String> getStringList(@NotNull String key) {
+        JsonElement object = flags.get(key);
+        ArrayList<String> list = new ArrayList<>();
+        if (object != null && object.isJsonArray()) {
+            for (JsonElement element : object.getAsJsonArray()) {
+                list.add(element.getAsString());
+            }
+        }
+        return list;
+    }
+
+    @Nullable
+    public String getString(@NotNull String key) {
+        JsonElement element = flags.get(key);
+        if (element == null || element.isJsonNull()) {
+            return null;
+        }
+        return element.getAsString();
+    }
+
+    @NotNull
+    public String getString(@NotNull String key, @NotNull String def) {
+        String string = getString(key);
+        if (string == null) {
+            return def;
+        }
+        return string;
+    }
+
+    @NotNull
+    public Number getNumber(@NotNull String key) {
+        JsonElement element = flags.get(key);
+        if (element == null || element.isJsonNull()) {
+            return 0;
+        }
+        return element.getAsNumber();
+    }
+
+    public boolean getBoolean(@NotNull String key) {
+        return getBoolean(key, false);
+    }
+
+    public boolean getBoolean(@NotNull String key, boolean def) {
+        JsonElement element = flags.get(key);
+        if (element == null || element.isJsonNull()) {
+            return def;
+        }
+        return element.getAsBoolean();
+    }
+
+    public void put(@NotNull String key, @NotNull List<?> value) {
+        flags.add(key, gson.toJsonTree(value));
+    }
+
+    public void put(@NotNull String key, @NotNull Object object) {
+        flags.add(key, gson.toJsonTree(object));
+    }
+
+    public String toJSONString() {
+        return flags.toString();
+    }
+}

src/main/java/net/sacredlabyrinth/phaed/simpleclans/Helper.java

@@ -1,58 +1,49 @@
 package net.sacredlabyrinth.phaed.simpleclans;
 
-import net.sacredlabyrinth.phaed.simpleclans.managers.SettingsManager;
-import net.sacredlabyrinth.phaed.simpleclans.utils.KDRFormat;
-import org.bukkit.Bukkit;
-import org.bukkit.ChatColor;
+import com.google.gson.Gson;
+import com.google.gson.JsonElement;
+import com.google.gson.JsonObject;
+import com.google.gson.reflect.TypeToken;
+import net.sacredlabyrinth.phaed.simpleclans.managers.PermissionsManager;
 import org.bukkit.Location;
 import org.bukkit.command.CommandSender;
 import org.bukkit.entity.Player;
 import org.jetbrains.annotations.Contract;
 import org.jetbrains.annotations.NotNull;
 import org.jetbrains.annotations.Nullable;
-import org.json.simple.JSONArray;
-import org.json.simple.JSONObject;
-import org.json.simple.parser.JSONParser;
-import org.json.simple.parser.ParseException;
 
 import java.io.IOException;
-import java.lang.reflect.Method;
-import java.net.HttpURLConnection;
-import java.net.URL;
-import java.text.DecimalFormat;
+import java.lang.reflect.Type;
+import java.net.URI;
+import java.net.URISyntaxException;
+import java.nio.file.FileSystem;
+import java.nio.file.FileSystems;
+import java.nio.file.Files;
+import java.nio.file.Path;
 import java.time.LocalDateTime;
 import java.time.LocalTime;
 import java.time.temporal.ChronoUnit;
 import java.util.*;
 import java.util.Map.Entry;
+import java.util.function.Predicate;
+import java.util.logging.Level;
+import java.util.stream.Collectors;
+
+import static net.sacredlabyrinth.phaed.simpleclans.SimpleClans.lang;
+import static net.sacredlabyrinth.phaed.simpleclans.utils.ChatUtils.stripColors;
 
 /**
  * @author phaed
  */
-public class Helper {
 
+public final class Helper {
+
+    private static final Gson GSON = new Gson();
+    private static final Type RANKS_TYPE = TypeToken.getParameterized(List.class, Rank.class).getType();
+    private static final Type RESIGN_TYPE = TypeToken.getParameterized(Map.class, String.class, Long.class).getType();
     private Helper() {
     }
 
-    /**
-     * Dumps stacktrace to log
-     */
-    @Deprecated
-    public static void dumpStackTrace() {
-        for (StackTraceElement el : Thread.currentThread().getStackTrace()) {
-            SimpleClans.debug(el.toString());
-        }
-    }
-
-    /**
-     * @deprecated use {@link KDRFormat}
-     */
-    @Deprecated
-    public static String formatKDR(float kdr) {
-    	DecimalFormat formatter = new DecimalFormat("#.#");
-    	return formatter.format(kdr);
-    }
-
     @NotNull
     public static Locale forLanguageTag(@Nullable String languageTag) {
         Locale defaultLanguage = SimpleClans.getInstance().getSettingsManager().getLanguage();
@@ -61,125 +52,151 @@ public class Helper {
         }
         return Locale.forLanguageTag(languageTag);
     }
-    
-    /**
-     * Gets the Player locale
-     * 
-     * @param player the player
-     * @return the locale
-     */
+
+    @Contract("null -> null")
     @Nullable
-    public static Locale getLocale(@NotNull Player player) {
-        ClanPlayer clanPlayer = SimpleClans.getInstance().getClanManager().getAnyClanPlayer(player.getUniqueId());
-        if (clanPlayer != null) {
-            return clanPlayer.getLocale();
+    public static String toLanguageTag(@Nullable Locale locale) {
+        return locale != null ? locale.toLanguageTag() : null;
+    }
+
+    public static Set<Path> getPathsIn(String path, Predicate<? super Path> filter) {
+        Set<Path> files = new LinkedHashSet<>();
+        String packagePath = path.replace(".", "/");
+
+        try {
+            URI uri = SimpleClans.class.getProtectionDomain().getCodeSource().getLocation().toURI();
+            FileSystem fileSystem = FileSystems.newFileSystem(URI.create("jar:" + uri), Collections.emptyMap());
+            files = Files.walk(fileSystem.getPath(packagePath)).
+                    filter(Objects::nonNull).
+                    filter(filter).
+                    collect(Collectors.toSet());
+            fileSystem.close();
+        } catch (URISyntaxException | IOException ex) {
+            SimpleClans.getInstance().getLogger().
+                    log(Level.WARNING, "An error occurred while trying to load files: " + ex.getMessage(), ex);
+        }
+
+        return files;
+    }
+
+    public static Set<Class<?>> getClasses(String packageName) {
+        Set<Class<?>> classes = new LinkedHashSet<>();
+
+        Predicate<? super Path> filter = entry -> {
+            String path = entry.getFileName().toString();
+            return !path.contains("$") && path.endsWith(".class");
+        };
+
+        for (Path filesPath : getPathsIn(packageName, filter)) {
+            // Compatibility with different Java versions
+            String path = filesPath.toString();
+            if (path.charAt(0) == '/') {
+                path = path.substring(1);
+            }
+
+            String fileName = path.replace("/", ".").split(".class")[0];
+
+            try {
+                Class<?> clazz = Class.forName(fileName);
+                classes.add(clazz);
+            } catch (ClassNotFoundException e) {
+                e.printStackTrace();
+            }
+        }
+
+        return classes;
+    }
+
+    @SuppressWarnings("unchecked")
+    public static <T> Set<Class<? extends T>> getSubTypesOf(String packageName, Class<?> type) {
+        return getClasses(packageName).stream().
+                filter(type::isAssignableFrom).
+                map(aClass -> ((Class<? extends T>) aClass)).
+                collect(Collectors.toSet());
+    }
+
+    /**
+     * Parses a list of ranks from the specified Json String
+     *
+     * @param json the Json String
+     * @return a list of ranks or null if the JSON String is null/empty
+     */
+    public static @Nullable List<Rank> ranksFromJson(@Nullable String json) {
+        if (json != null && !json.isEmpty()) {
+            JsonObject object = GSON.fromJson(json, JsonObject.class);
+            JsonElement ranks = object.get("ranks");
+            return GSON.fromJson(ranks, RANKS_TYPE);
         }
         return null;
     }
-    
+
     /**
-     * Converts a JSON String to a list of Ranks
-     * 
-     * @param json the JSON String
-     * @return a list of ranks or null if the JSON String is null/empty
+     * Parses the default rank from the specified Json String
+     *
+     * @param json the Json String
+     * @return the default rank or null if not found and/or it does not exist
      */
-	public static @Nullable List<Rank> ranksFromJson(String json) {
-    	if (json != null && !json.isEmpty()) {
-	    	try {
-				JSONObject jo = (JSONObject) new JSONParser().parse(json);
-				Object ranks = jo.get("ranks");
-				if (ranks != null) {
-					JSONArray array = (JSONArray) ranks;
-					List<Rank> rankList = new ArrayList<>();
-					for (Object o : array) {
-						JSONObject r = (JSONObject) o;
-						String name = (String) r.get("name");
-						String displayName = (String) r.get("displayName");
-						Set<String> permissions = new HashSet<>();
-						for (Object p : (JSONArray) r.get("permissions")) {
-							permissions.add((String) p);
-						}
-						Rank rank = new Rank(name, displayName, permissions);
-						rankList.add(rank);
-					}
-					
-					return rankList;
-					
-				}
-			} catch (ParseException e) {
-				e.printStackTrace();
-			}
-    	}
-    	return null;
+    public static @Nullable String defaultRankFromJson(@Nullable String json) {
+        if (json != null && !json.isEmpty()) {
+            JsonObject object = GSON.fromJson(json, JsonObject.class);
+            JsonElement defaultRank = object.get("defaultRank");
+            if (defaultRank != null && !defaultRank.isJsonNull()) {
+                return defaultRank.getAsString();
+            }
+        }
+        return null;
     }
-    
+
     /**
-     * Converts a list of Ranks to a JSON String
-     * 
-     * @param ranks
+     * Converts a list of ranks and the default rank to a JSON String
+     *
+     * @param ranks       the ranks
+     * @param defaultRank the default rank
      * @return a JSON String
      */
-    @SuppressWarnings("unchecked")
-	public static String ranksToJson(List<Rank> ranks) {
-    	if (ranks == null)
-    		ranks = new ArrayList<Rank>();
-    	
-    	JSONArray array = new JSONArray();
-    	for (Rank rank : ranks) {
-    		JSONObject o = new JSONObject();
-    		o.put("name", rank.getName());
-    		o.put("displayName", rank.getDisplayName());
-    		JSONArray permArray = new JSONArray();
-    		for (String p : rank.getPermissions()) {
-    			permArray.add(p);
-    		}
-    		o.put("permissions", permArray);
-    		array.add(o);
-    	}
-    	
-    	JSONObject object = new JSONObject();
-    	object.put("ranks", array);
-    	return object.toJSONString();
+    public static String ranksToJson(List<Rank> ranks, @Nullable String defaultRank) {
+        if (ranks == null)
+            ranks = new ArrayList<>();
+
+        JsonObject object = new JsonObject();
+        object.add("ranks", GSON.toJsonTree(ranks));
+        object.addProperty("defaultRank", defaultRank);
+        return object.toString();
     }
-    
+
     /**
      * Converts a resign times map to a JSON String
-     * 
-     * @param resignTimes
+     *
+     * @param resignTimes the resign times
      * @return a JSON String
      */
     public static String resignTimesToJson(Map<String, Long> resignTimes) {
-    	return JSONObject.toJSONString(resignTimes);
+        return GSON.toJson(resignTimes);
     }
-    
+
     /**
      * Converts a JSON String to a resign times map
-     * 
+     *
      * @param json JSON String
      * @return a map
      */
-    @SuppressWarnings("unchecked")
-	public static Map<String, Long> resignTimesFromJson(String json) {
-    	if (json != null) {
-	    	try {
-				return (Map<String, Long>) new JSONParser().parse(json);
-			} catch (ParseException e) {
-				e.printStackTrace();
-			}	
-    	}
-    	return null;
+    public static @Nullable Map<String, Long> resignTimesFromJson(String json) {
+        if (json != null && !json.isEmpty()) {
+            return GSON.fromJson(json, RESIGN_TYPE);
+        }
+        return null;
     }
-    
+
     /**
      * Returns the delay in seconds to the specified hour and minute.
-     * 
-     * @param hour hour
+     *
+     * @param hour   hour
      * @param minute minute
      * @return the delay in seconds
      */
     public static long getDelayTo(int hour, int minute) {
-    	if (hour < 0 || hour > 23) hour = 1;
-    	if (minute < 0 || minute > 59) minute = 0;
+        if (hour < 0 || hour > 23) hour = 1;
+        if (minute < 0 || minute > 59) minute = 0;
         LocalDateTime now = LocalDateTime.now();
         LocalDateTime d = LocalDateTime.of(now.toLocalDate(), LocalTime.of(hour, minute));
         long delay;
@@ -201,194 +218,20 @@ public class Helper {
         List<Player> players = SimpleClans.getInstance().getServer().matchPlayer(playerName);
 
         if (players.size() == 1) {
-            return SimpleClans.getInstance().getPermissionsManager().getPrefix(players.get(0)) + players.get(0).getName() + SimpleClans.getInstance().getPermissionsManager().getSuffix(players.get(0));
+            PermissionsManager pm = SimpleClans.getInstance().getPermissionsManager();
+            return pm.getPrefix(players.get(0)) + players.get(0).getName() + pm.getSuffix(players.get(0));
         }
 
         return playerName;
     }
 
     /**
-     * Check for integer
-     *
-     * @param o
-     * @return
-     */
-    public static boolean isInteger(Object o) {
-        return o instanceof java.lang.Integer;
-    }
-
-    /**
-     * Check for byte
-     *
-     * @param input
-     * @return
-     */
-    public static boolean isByte(String input) {
-        try {
-            Byte.parseByte(input);
-            return true;
-        } catch (Exception ex) {
-            return false;
-        }
-    }
-
-    /**
-     * Check for short
-     *
-     * @param input
-     * @return
-     */
-    public static boolean isShort(String input) {
-        try {
-            Short.parseShort(input);
-            return true;
-        } catch (Exception ex) {
-            return false;
-        }
-    }
-
-    /**
-     * Check for integer
-     *
-     * @param input
-     * @return
-     */
-    public static boolean isInteger(String input) {
-        try {
-            Integer.parseInt(input);
-            return true;
-        } catch (Exception ex) {
-            return false;
-        }
-    }
-
-    /**
-     * Check for float
-     *
-     * @param input
-     * @return
-     */
-    public static boolean isFloat(String input) {
-        try {
-            Float.parseFloat(input);
-            return true;
-        } catch (Exception ex) {
-            return false;
-        }
-    }
-
-    /**
-     * Check for string
-     *
-     * @param o
-     * @return
-     */
-    public static boolean isString(Object o) {
-        return o instanceof java.lang.String;
-    }
-
-    /**
-     * Check for boolean
-     *
-     * @param o
-     * @return
-     */
-    public static boolean isBoolean(Object o) {
-        return o instanceof java.lang.Boolean;
-    }
-
-    /**
-     * Remove a character from a string
-     *
-     * @param s
-     * @param c
-     * @return
-     */
-    public static String removeChar(String s, char c) {
-        String r = "";
-
-        for (int i = 0; i < s.length(); i++) {
-            if (s.charAt(i) != c) {
-                r += s.charAt(i);
-            }
-        }
-
-        return r;
-    }
-
-    /**
-     * Remove first character from a string
-     *
-     * @param s
-     * @param c
-     * @return
-     */
-    public static String removeFirstChar(String s, char c) {
-        String r = "";
-
-        for (int i = 0; i < s.length(); i++) {
-            if (s.charAt(i) != c) {
-                r += s.charAt(i);
-                break;
-            }
-        }
-
-        return r;
-    }
-
-    /**
-     * Capitalize first word of sentence
-     *
-     * @param content
-     * @return
-     */
-    public static String capitalize(String content) {
-        if (content.length() < 2) {
-            return content;
-        }
-
-        String first = content.substring(0, 1).toUpperCase();
-        return first + content.substring(1);
-    }
-
-    /**
-     * Return plural word if count is bigger than one
-     *
-     * @param count
-     * @param word
-     * @param ending
-     * @return
-     */
-    public static String plural(int count, String word, String ending) {
-        return count == 1 ? word : word + ending;
-    }
-
-    /**
-     * Hex value to ChatColor
-     *
-     * @param hexValue
-     * @return
-     */
-    @NotNull
-    public static String toColor(@Nullable String hexValue) {
-        if (hexValue == null) {
-            return "";
-        }
-
-        ChatColor color = ChatColor.getByChar(hexValue);
-        if (color == null) {
-            return "";
-        }
-        return color.toString();
-    }
-
-    /**
-     * Converts string array to ArrayList<String>, remove empty strings
+     * Converts string array to {@literal ArrayList<String>}, remove empty strings
      *
      * @param values
      * @return
      */
-    public static List<String> fromArray(String... values) {
+    public static List<String> fromArrayToList(String... values) {
         List<String> results = new ArrayList<>();
         Collections.addAll(results, values);
         results.remove("");
@@ -396,12 +239,13 @@ public class Helper {
     }
 
     /**
-     * Converts string array to HashSet<String>, remove empty strings
+     * Converts string array to {@literal HashSet<String>}, remove empty strings
      *
      * @param values
      * @return
      */
-    public static Set<String> fromArray2(String... values) {
+    @Deprecated
+    public static Set<String> fromArrayToSet(String... values) {
         HashSet<String> results = new HashSet<>();
         Collections.addAll(results, values);
         results.remove("");
@@ -409,154 +253,27 @@ public class Helper {
     }
 
     /**
-     * Converts a player array to ArrayList<Player>
-     *
-     * @param values
-     * @return
-     */
-    public static List<Player> fromPlayerArray(Player... values) {
-        List<Player> results = new ArrayList<>();
-        Collections.addAll(results, values);
-        return results;
-    }
-
-    /**
-     * Converts ArrayList<String> to string array
+     * Converts  {@literal ArrayList<String>} to string array
      *
      * @param list
      * @return
      */
     public static String[] toArray(List<String> list) {
-        return list.toArray(new String[list.size()]);
+        return list.toArray(new String[0]);
     }
-    
+
     /**
      * Converts the Permission values array to a String array
-     * 
+     *
      * @return
      */
     public static String[] fromPermissionArray() {
-    	RankPermission[] permissions = RankPermission.values();
-    	String[] sa = new String[permissions.length];
-    	for (int i = 0; i < permissions.length; i++) {
-    		sa[i] = permissions[i].toString();
-    	}
-    	return sa;
-    }
-
-    /**
-     * Removes first item from a string array
-     *
-     * @param args
-     * @return
-     */
-    public static String[] removeFirst(String[] args) {
-        List<String> out = fromArray(args);
-
-        if (!out.isEmpty()) {
-            out.remove(0);
+        RankPermission[] permissions = RankPermission.values();
+        String[] sa = new String[permissions.length];
+        for (int i = 0; i < permissions.length; i++) {
+            sa[i] = permissions[i].toString();
         }
-        return toArray(out);
-    }
-
-    /**
-     * Converts a string array to a space separated string
-     *
-     * @param args
-     * @return
-     */
-    public static String toMessage(String[] args) {
-        StringBuilder out = new StringBuilder();
-
-        for (String arg : args) {
-            out.append(arg).append(" ");
-        }
-
-        return out.toString().trim();
-    }
-
-    /**
-     * Converts a string array to a string with custom separators
-     *
-     * @param args
-     * @param sep
-     * @return
-     */
-    public static String toMessage(String[] args, String sep) {
-        String out = "";
-
-        for (String arg : args) {
-            out += arg + ", ";
-        }
-
-        return stripTrailing(out, ", ");
-    }
-
-    /**
-     * Converts a string array to a string with custom separators
-     *
-     * @param args
-     * @param sep
-     * @return
-     */
-    public static String toMessage(List<String> args, String sep) {
-        String out = "";
-
-        for (String arg : args) {
-            out += arg + sep;
-        }
-
-        return stripTrailing(out, sep);
-    }
-
-    /**
-     * Convert color hex values with ampersand to special character
-     *
-     * @param msg
-     * @return
-     */
-    public static String parseColors(String msg) {
-        return msg.replace("&", "\u00a7");
-    }
-
-    /**
-     * Removes color codes from strings
-     *
-     * @param msg
-     * @return
-     */
-    public static String stripColors(String msg) {
-        String out = msg.replaceAll("[&][0-9a-fk-or]", "");
-        out = out.replaceAll(String.valueOf((char) 194), "");
-        return out.replaceAll("[\u00a7][0-9a-fk-or]", "");
-    }
-
-    /*
-     * Retrieves the last color code @param msg @return
-     */
-    /**
-     * @param msg
-     * @return
-     */
-    public static String getLastColorCode(String msg) {
-        msg = msg.replaceAll(String.valueOf((char) 194), "").trim();
-
-        if (msg.length() < 2) {
-            return "";
-        }
-
-        String one = msg.substring(msg.length() - 2, msg.length() - 1);
-        String two = msg.substring(msg.length() - 1);
-
-        if (one.equals("\u00a7")) {
-            return one + two;
-        }
-
-        if (one.equals("&")) {
-            return Helper.toColor(two);
-        }
-
-        return "";
+        return sa;
     }
 
     /**
@@ -569,33 +286,6 @@ public class Helper {
         return stripColors(tag).toLowerCase();
     }
 
-    /**
-     * Removes trailing separators
-     *
-     * @param msg
-     * @param sep
-     * @return
-     */
-    public static String stripTrailing(String msg, String sep) {
-        if (msg.length() < sep.length()) {
-            return msg;
-        }
-
-        String out = msg;
-        String first = msg.substring(0, sep.length());
-        String last = msg.substring(msg.length() - sep.length());
-
-        if (first.equals(sep)) {
-            out = msg.substring(sep.length());
-        }
-
-        if (last.equals(sep)) {
-            out = msg.substring(0, msg.length() - sep.length());
-        }
-
-        return out;
-    }
-
     /**
      * Generates page separator line
      *
@@ -611,43 +301,6 @@ public class Helper {
         return out;
     }
 
-    /**
-     * Check whether a player is online
-     *
-     * @param playerName
-     * @return
-     */
-    @Deprecated
-    public static boolean isOnline(String playerName) {
-        Collection<Player> online = getOnlinePlayers();
-
-        for (Player o : online) {
-            if (o.getName().equalsIgnoreCase(playerName)) {
-                return true;
-            }
-        }
-
-        return false;
-    }
-
-    /**
-     * Check whether a player is online
-     *
-     * @param playerUniqueId
-     * @return
-     */
-    public static boolean isOnline(UUID playerUniqueId) {
-        Collection<Player> online = getOnlinePlayers();
-
-        for (Player o : online) {
-            if (o.getUniqueId().equals(playerUniqueId)) {
-                return true;
-            }
-        }
-
-        return false;
-    }
-
     /**
      * Remove offline players from a ClanPlayer array
      *
@@ -666,28 +319,6 @@ public class Helper {
         return out;
     }
 
-    /**
-     * Test if a url is valid
-     *
-     * @param strUrl
-     * @return
-     */
-    public static boolean testURL(String strUrl) {
-        try {
-            URL url = new URL(strUrl);
-            HttpURLConnection urlConn = (HttpURLConnection) url.openConnection();
-            urlConn.connect();
-
-            if (urlConn.getResponseCode() != HttpURLConnection.HTTP_OK) {
-                return false;
-            }
-        } catch (IOException e) {
-            return false;
-        }
-
-        return true;
-    }
-
     /**
      * Escapes single quotes
      *
@@ -702,7 +333,7 @@ public class Helper {
     }
 
     /**
-     * Returns a prettier coordinate, does not include world
+     * Returns a prettier coordinate
      *
      * @param loc
      * @return
@@ -711,29 +342,6 @@ public class Helper {
         return loc.getBlockX() + " " + loc.getBlockY() + " " + loc.getBlockZ() + " " + loc.getWorld().getName();
     }
 
-    /**
-     * Whether the two locations refer to the same block
-     *
-     * @param loc
-     * @param loc2
-     * @return
-     */
-    public static boolean isSameBlock(Location loc, Location loc2) {
-        return loc.getBlockX() == loc2.getBlockX() && loc.getBlockY() == loc2.getBlockY() && loc.getBlockZ() == loc2.getBlockZ();
-    }
-
-    /**
-     * Whether the two locations refer to the same location, ignoring pitch and
-     * yaw
-     *
-     * @param loc
-     * @param loc2
-     * @return
-     */
-    public static boolean isSameLocation(Location loc, Location loc2) {
-        return loc.getX() == loc2.getX() && loc.getY() == loc2.getY() && loc.getZ() == loc2.getZ();
-    }
-
     /**
      * Sorts a Map by value
      *
@@ -751,124 +359,31 @@ public class Helper {
         return result;
     }
 
-    @Contract("_, null -> false")
-    public static boolean isVanished(@Nullable CommandSender viewer, @Nullable Player player) {
-        if (isVanished(player)) {
-            return true;
-        }
-        if (viewer instanceof Player && player != null) {
-            return !((Player) viewer).canSee(player);
-        }
-
-        return false;
-    }
-
-    @Contract("null -> false")
-    public static boolean isVanished(@Nullable Player player) {
-        if (player != null && player.hasMetadata("vanished") && !player.getMetadata("vanished").isEmpty()) {
-            return player.getMetadata("vanished").get(0).asBoolean();
-        }
-        return false;
-    }
-
-    @SuppressWarnings("unchecked")
-	public static Collection<Player> getOnlinePlayers() {
-        try {
-            Method method = Bukkit.class.getDeclaredMethod("getOnlinePlayers");
-            Object players = method.invoke(null);
-
-            if (players instanceof Player[]) {
-                return new ArrayList<>(Arrays.asList((Player[]) players));
-            } else {
-                return (Collection<Player>) players;
-            }
-        } catch (Exception e) {
-            e.printStackTrace();
-        }
-
-        return new ArrayList<>();
-    }
-
-    @Deprecated
-    @Nullable
-    public static Player getPlayer(String playerName) {
-    	return Bukkit.getPlayerExact(playerName);
-    }
-
     /**
-     * Formats the ally chat
-     * 
-     * @param cp Sender
-     * @param msg The message
-     * @param placeholders The placeholders
-     * @return The formated message
+     * Formats max inactive days to an infinity symbol if it's negative or 0
+     *
+     * @param max inactive days
+     * @return formatted message
      */
-    public static String formatAllyChat(ClanPlayer cp, String msg, Map<String, String> placeholders) {
-        SettingsManager sm = SimpleClans.getInstance().getSettingsManager();
-
-        String leaderColor = sm.getAllyChatLeaderColor();
-        String memberColor = sm.getAllyChatMemberColor();
-        String rank = cp.getRankId().isEmpty() ? null : ChatColor.translateAlternateColorCodes('&', cp.getRankDisplayName());
-        String rankFormat = rank != null ? ChatColor.translateAlternateColorCodes('&', sm.getAllyChatRank()).replace("%rank%", rank) : "";
-
-        String message = replacePlaceholders(sm.getAllyChatFormat(), cp, leaderColor, memberColor, rankFormat, msg);
-        if (placeholders != null) {
-            for (Entry<String, String> e : placeholders.entrySet()) {
-                message = message.replace("%"+e.getKey()+"%", e.getValue());
-            }
-        }
-        return message;
-    }
-
-    private static String replacePlaceholders(String messageFormat, ClanPlayer cp, String leaderColor, String memberColor, String rankFormat, String msg) {
-        return ChatColor.translateAlternateColorCodes('&', messageFormat)
-                .replace("%clan%", Objects.requireNonNull(cp.getClan()).getColorTag())
-                .replace("%nick-color%", (cp.isLeader() ? leaderColor : memberColor))
-                .replace("%player%", cp.getName())
-                .replace("%rank%", rankFormat)
-                .replace("%message%", msg);
-    }
-
-    /**
-     * Formats the clan chat
-     * 
-     * @param cp Sender
-     * @param msg The message
-     * @param placeholders The placeholders
-     * @return The formated message
-     */
-    public static String formatClanChat(ClanPlayer cp, String msg, Map<String, String> placeholders) {
-        SettingsManager sm = SimpleClans.getInstance().getSettingsManager();
-
-        String leaderColor = sm.getClanChatLeaderColor();
-        String memberColor = sm.getClanChatMemberColor();
-        String rank = cp.getRankId().isEmpty() ? null : ChatColor.translateAlternateColorCodes('&', cp.getRankDisplayName());
-        String rankFormat = rank != null ? ChatColor.translateAlternateColorCodes('&', sm.getClanChatRank()).replace("%rank%", rank) : "";
-
-        String message = replacePlaceholders(sm.getClanChatFormat(), cp, leaderColor, memberColor, rankFormat, msg);
-        
-        if (placeholders != null) {
-            for (Entry<String, String> e : placeholders.entrySet()) {
-                message = message.replace("%"+e.getKey()+"%", e.getValue());
-            }
-        }
-        return message;
-    }
-
-    /**
-     * Formats the chat in a way that the Clan Tag is always there, so infractors can be easily identified
-     * 
-     * @param cp Sender
-     * @param msg The chat message
-     * @return The formated message
-     */
-    public static String formatSpyClanChat(ClanPlayer cp, String msg) {
-        msg = stripColors(msg);
-        
-        if (msg.contains(stripColors(cp.getClan().getColorTag()))) {
-            return ChatColor.DARK_GRAY + msg;
+    public static String formatMaxInactiveDays(int max) {
+        if (max <= 0) {
+            return "∞";
         } else {
-            return ChatColor.DARK_GRAY + "[" + cp.getTag() + "] " + msg;
+            return String.valueOf(max);
         }
     }
+
+    @NotNull
+    public static String getFormattedClanStatus(Clan clan, CommandSender sender) {
+        ArrayList<String> statuses = new ArrayList<>();
+        if (clan.isPermanent()) {
+            statuses.add(lang("permanent", sender));
+        }
+        if (clan.isVerified()) {
+            statuses.add(lang("verified", sender));
+        } else {
+            statuses.add(lang("unverified", sender));
+        }
+        return String.join(", ", statuses);
+    }
 }

src/main/java/net/sacredlabyrinth/phaed/simpleclans/Kill.java

@@ -27,7 +27,7 @@ public class Kill {
 	}
 	
 	public enum Type {
-		CIVILIAN("c"), RIVAL("r"), NEUTRAL("n");
+		CIVILIAN("c"), RIVAL("r"), NEUTRAL("n"), ALLY("a");
 		
 		Type(String shortName) {
 			this.shortName = shortName;

src/main/java/net/sacredlabyrinth/phaed/simpleclans/PlayerNameTabCompleter.java

@@ -1,61 +0,0 @@
-package net.sacredlabyrinth.phaed.simpleclans;
-
-import org.bukkit.OfflinePlayer;
-import org.bukkit.command.Command;
-import org.bukkit.command.CommandSender;
-import org.bukkit.command.TabCompleter;
-import org.bukkit.entity.Player;
-import org.jetbrains.annotations.NotNull;
-
-import java.util.ArrayList;
-import java.util.Collections;
-import java.util.List;
-
-import static net.sacredlabyrinth.phaed.simpleclans.SimpleClans.lang;
-
-public class PlayerNameTabCompleter implements TabCompleter {
-    private final SimpleClans plugin;
-
-    public PlayerNameTabCompleter() {
-        plugin = SimpleClans.getInstance();
-    }
-
-    @Override
-    public List<String> onTabComplete(@NotNull CommandSender commandSender, Command command, @NotNull String s, String[] strings) {
-        if (command.getName().equalsIgnoreCase(plugin.getSettingsManager().getCommandClan())) {
-            if (strings.length < 2) {
-                return null;
-            }
-            Player player = null;
-            if (commandSender instanceof Player) {
-                player = (Player) commandSender;
-            }
-
-            if (strings[0].equalsIgnoreCase(lang("lookup.command", player)) ||
-                    strings[0].equalsIgnoreCase(lang("ban.command", player)) ||
-                    strings[0].equalsIgnoreCase(lang("unban.command", player)) ||
-                    strings[0].equalsIgnoreCase(lang("kick.command", player)) ||
-                    strings[0].equalsIgnoreCase(lang("trust.command", player)) ||
-                    strings[0].equalsIgnoreCase(lang("untrust.command", player)) ||
-                    strings[0].equalsIgnoreCase(lang("promote.command", player)) ||
-                    strings[0].equalsIgnoreCase(lang("demote.command", player)) ||
-                    strings[0].equalsIgnoreCase(lang("setrank.command", player)) ||
-                    strings[0].equalsIgnoreCase(lang("place.command", player)) ||
-                    strings[0].equalsIgnoreCase(lang("invite.command", player)) ||
-                    strings[0].equalsIgnoreCase(lang("kills.command", player))) {
-                List<String> list = new ArrayList<>();
-
-                for (Player p : plugin.getServer().getOnlinePlayers()) {
-                    if (p.getName().startsWith(strings[1])) {
-                        list.add(p.getName());
-                    }
-                }
-
-                Collections.sort(list);
-                return list;
-            }
-        }
-
-        return null;
-    }
-}

src/main/java/net/sacredlabyrinth/phaed/simpleclans/Rank.java

@@ -1,5 +1,7 @@
 package net.sacredlabyrinth.phaed.simpleclans;
 
+import org.jetbrains.annotations.Nullable;
+
 import java.util.HashSet;
 import java.util.Set;
 
@@ -15,11 +17,11 @@ public class Rank implements Comparable<Rank> {
 	
 	public Rank(String name) {
 		setName(name);
-		permissions = new HashSet<String>();
+		permissions = new HashSet<>();
 		setDisplayName(displayName);
 	}
 	
-	public Rank(String name, String displayName, Set<String> permissions) {
+	public Rank(String name, @Nullable String displayName, Set<String> permissions) {
 		setName(name);
 		setDisplayName(displayName);
 		setPermissions(permissions);
@@ -32,7 +34,7 @@ public class Rank implements Comparable<Rank> {
 		this.name = name;
 	}
 
-	public void setDisplayName(String displayName) {
+	public void setDisplayName(@Nullable String displayName) {
 		if (displayName == null || displayName.isEmpty()) {
 			displayName = name;
 		}
@@ -41,7 +43,7 @@ public class Rank implements Comparable<Rank> {
 	
 	public void setPermissions(Set<String> permissions) {
 		if (permissions == null) {
-			permissions = new HashSet<String>();
+			permissions = new HashSet<>();
 		}
 		this.permissions = permissions;
 	}

src/main/java/net/sacredlabyrinth/phaed/simpleclans/RankPermission.java

@@ -21,6 +21,7 @@ public enum RankPermission {
 	COORDS("simpleclans.member.coords", PermissionLevel.TRUSTED),
 	FEE_ENABLE("simpleclans.leader.fee", PermissionLevel.LEADER),
 	FEE_SET("simpleclans.leader.fee", PermissionLevel.LEADER),
+	FEE_BYPASS("", PermissionLevel.LEADER),
 	REGROUP_HOME("simpleclans.leader.regroup.home", PermissionLevel.LEADER),
 	REGROUP_ME("simpleclans.leader.regroup.me", PermissionLevel.LEADER),
 	HOME_SET("simpleclans.leader.home-set", PermissionLevel.LEADER),

src/main/java/net/sacredlabyrinth/phaed/simpleclans/Request.java

@@ -6,6 +6,8 @@ import java.util.ArrayList;
 import java.util.Collections;
 import java.util.List;
 
+import static net.sacredlabyrinth.phaed.simpleclans.managers.SettingsManager.ConfigField.REQUEST_MAX;
+
 /**
  * @author phaed
  */
@@ -18,8 +20,7 @@ public final class Request {
     private ClanPlayer requester;
     private int askCount;
 
-    public Request(SimpleClans plugin,
-                   ClanRequest type,
+    public Request(ClanRequest type,
                    @Nullable List<ClanPlayer> acceptors,
                    ClanPlayer requester,
                    String target,
@@ -178,6 +179,6 @@ public final class Request {
     }
 
     public boolean reachedRequestLimit() {
-        return askCount > SimpleClans.getInstance().getSettingsManager().getMaxAsksPerRequest();
+        return askCount > SimpleClans.getInstance().getSettingsManager().getInt(REQUEST_MAX);
     }
 }

src/main/java/net/sacredlabyrinth/phaed/simpleclans/SimpleClans.java

@@ -2,17 +2,26 @@ package net.sacredlabyrinth.phaed.simpleclans;
 
 import co.aikar.commands.BukkitCommandIssuer;
 import net.sacredlabyrinth.phaed.simpleclans.commands.SCCommandManager;
-import net.sacredlabyrinth.phaed.simpleclans.language.LanguageMigration;
+import net.sacredlabyrinth.phaed.simpleclans.hooks.papi.SimpleClansExpansion;
 import net.sacredlabyrinth.phaed.simpleclans.language.LanguageResource;
 import net.sacredlabyrinth.phaed.simpleclans.listeners.*;
+import net.sacredlabyrinth.phaed.simpleclans.loggers.BankLogger;
+import net.sacredlabyrinth.phaed.simpleclans.loggers.CSVBankLogger;
 import net.sacredlabyrinth.phaed.simpleclans.managers.*;
+import net.sacredlabyrinth.phaed.simpleclans.migrations.BbMigration;
+import net.sacredlabyrinth.phaed.simpleclans.migrations.ChatFormatMigration;
+import net.sacredlabyrinth.phaed.simpleclans.migrations.LanguageMigration;
+import net.sacredlabyrinth.phaed.simpleclans.proxy.BungeeManager;
+import net.sacredlabyrinth.phaed.simpleclans.proxy.ProxyManager;
 import net.sacredlabyrinth.phaed.simpleclans.tasks.*;
 import net.sacredlabyrinth.phaed.simpleclans.ui.InventoryController;
-import net.sacredlabyrinth.phaed.simpleclans.utils.ChatFormatMigration;
+import net.sacredlabyrinth.phaed.simpleclans.utils.ChatUtils;
+import net.sacredlabyrinth.phaed.simpleclans.utils.TagValidator;
 import net.sacredlabyrinth.phaed.simpleclans.utils.UpdateChecker;
 import net.sacredlabyrinth.phaed.simpleclans.uuid.UUIDMigration;
 import org.bstats.bukkit.Metrics;
-import org.bukkit.ChatColor;
+import org.bstats.charts.SimplePie;
+import org.bstats.charts.SingleLineChart;
 import org.bukkit.command.CommandSender;
 import org.bukkit.entity.Player;
 import org.bukkit.plugin.PluginManager;
@@ -28,15 +37,19 @@ import java.util.logging.Level;
 import java.util.logging.Logger;
 import java.util.regex.Pattern;
 
+import static net.sacredlabyrinth.phaed.simpleclans.managers.SettingsManager.ConfigField.*;
+import static org.bukkit.Bukkit.getPluginManager;
+
 /**
  * @author Phaed
  */
 public class SimpleClans extends JavaPlugin {
 
     private final ArrayList<String> messages = new ArrayList<>();
+
     private static SimpleClans instance;
     private static LanguageResource languageResource;
-    private static final Logger logger = Logger.getLogger("Minecraft");
+    private static final Logger logger = Logger.getLogger("SimpleClans");
     private SCCommandManager commandManager;
     private ClanManager clanManager;
     private RequestManager requestManager;
@@ -44,7 +57,14 @@ public class SimpleClans extends JavaPlugin {
     private SettingsManager settingsManager;
     private PermissionsManager permissionsManager;
     private TeleportManager teleportManager;
+    private ProtectionManager protectionManager;
+    private ChatManager chatManager;
+    private ProxyManager proxyManager;
     private boolean hasUUID;
+    private static final Pattern ACF_PLACEHOLDER_PATTERN = Pattern.compile("\\{(?<key>[a-zA-Z]+?)}");
+
+    private BankLogger bankLogger;
+    private TagValidator tagValidator;
 
     /**
      * @return the logger
@@ -55,7 +75,7 @@ public class SimpleClans extends JavaPlugin {
     }
 
     public static void debug(String msg) {
-        if (getInstance().getSettingsManager().isDebugging()) {
+        if (getInstance().getSettingsManager().is(DEBUG)) {
             logger.log(Level.INFO, msg);
         }
     }
@@ -80,19 +100,27 @@ public class SimpleClans extends JavaPlugin {
     public void onEnable() {
         instance = this;
         new LanguageMigration(this).migrate();
-        settingsManager = new SettingsManager();
+        settingsManager = new SettingsManager(this);
+        new BbMigration(settingsManager);
+        new ChatFormatMigration(settingsManager);
         languageResource = new LanguageResource();
         this.hasUUID = UUIDMigration.canReturnUUID();
 
         permissionsManager = new PermissionsManager();
         requestManager = new RequestManager();
         clanManager = new ClanManager();
+        proxyManager = new BungeeManager(this);
         storageManager = new StorageManager();
         teleportManager = new TeleportManager();
-        migrateChatFormat();
+        protectionManager = new ProtectionManager();
+        protectionManager.registerListeners();
+        chatManager = new ChatManager(this);
         registerEvents();
         permissionsManager.loadPermissions();
         commandManager = new SCCommandManager(this);
+        bankLogger = new CSVBankLogger(this);
+
+        tagValidator = new TagValidator(settingsManager, permissionsManager);
 
         logStatus();
         startTasks();
@@ -102,83 +130,78 @@ public class SimpleClans extends JavaPlugin {
     }
 
     private void logStatus() {
-        getLogger().info("Multithreading: " + SimpleClans.getInstance().getSettingsManager().getUseThreads());
-        getLogger().info("BungeeCord: " + SimpleClans.getInstance().getSettingsManager().getUseBungeeCord());
+        getLogger().info("Multithreading: " + settingsManager.is(PERFORMANCE_USE_THREADS));
+        getLogger().info("BungeeCord: " + settingsManager.is(PERFORMANCE_USE_BUNGEECORD));
+        getLogger().info("HEX support: " + ChatUtils.HEX_COLOR_SUPPORT);
         getLogger().info("Help us translate SimpleClans to your language! " +
                 "Access https://crowdin.com/project/simpleclans/");
     }
 
     private void registerEvents() {
         PluginManager pm = getServer().getPluginManager();
-        pm.registerEvents(new PlayerDeath(), this);
-        pm.registerEvents(new SCPlayerListener(), this);
+        pm.registerEvents(new PlayerDeath(this), this);
+        pm.registerEvents(new SCPlayerListener(this), this);
         pm.registerEvents(new InventoryController(), this);
         pm.registerEvents(new TamableMobsSharing(this), this);
         pm.registerEvents(new PvPOnlyInWar(this), this);
         pm.registerEvents(new FriendlyFire(this), this);
     }
 
-    private void migrateChatFormat() {
-        ChatFormatMigration chatFormatMigration = new ChatFormatMigration();
-        chatFormatMigration.migrateAllyChat();
-        chatFormatMigration.migrateClanChat();
-    }
-
     private void hookIntoPAPI() {
-        if (getServer().getPluginManager().getPlugin("PlaceholderAPI") != null) {
+        if (getPluginManager().getPlugin("PlaceholderAPI") != null) {
             getLogger().info("PlaceholderAPI found. Registering hook...");
-            new PlaceholdersManager(this).register();
+            new SimpleClansExpansion(this).register();
         }
     }
 
     private void startMetrics() {
-    	Metrics metrics = new Metrics(this, 7131);
-    	SettingsManager sm = getSettingsManager();
-    	ClanManager cm = getClanManager();
-    	String on = "enabled";
-    	String off = "disabled";
-    	
-    	metrics.addCustomChart(new Metrics.SingleLineChart("clans", () -> cm.getClans().size()));
-    	metrics.addCustomChart(new Metrics.SingleLineChart("clan_players", () -> cm.getAllClanPlayers().size()));
-    	metrics.addCustomChart(new Metrics.SimplePie("language", () -> sm.getLanguage().toString()));
-    	metrics.addCustomChart(new Metrics.SimplePie("machine_language", () -> Locale.getDefault().toString()));
-    	metrics.addCustomChart(new Metrics.SimplePie("language_chooser", () -> sm.isLanguagePerPlayer() ? on : off));
-    	metrics.addCustomChart(new Metrics.SimplePie("database", () -> sm.isUseMysql() ? "MySQL" : "SQLite"));
-    	metrics.addCustomChart(new Metrics.SimplePie("save_periodically", () -> sm.isSavePeriodically() ? on : off));
-    	metrics.addCustomChart(new Metrics.SimplePie("save_interval", () -> String.valueOf(sm.getSaveInterval())));
-    	metrics.addCustomChart(new Metrics.SimplePie("upkeep", () -> sm.isClanUpkeep() ? on : off));
-    	metrics.addCustomChart(new Metrics.SimplePie("member_fee", () -> sm.isMemberFee() ? on : off));
-    	metrics.addCustomChart(new Metrics.SimplePie("rejoin_cooldown", () -> sm.isRejoinCooldown() ? on : off));
-    	metrics.addCustomChart(new Metrics.SimplePie("clan_verification", () -> sm.isRequireVerification() ? on : off));
-    	metrics.addCustomChart(new Metrics.SimplePie("money_per_kill", () -> sm.isMoneyPerKill() ? on : off));
-    	metrics.addCustomChart(new Metrics.SimplePie("threads", () -> sm.getUseThreads() ? on : off));
-    	metrics.addCustomChart(new Metrics.SimplePie("bungeecord", () -> sm.getUseBungeeCord() ? on : off));
+        Metrics metrics = new Metrics(this, 7131);
+        SettingsManager sm = getSettingsManager();
+        ClanManager cm = getClanManager();
+        String on = "enabled";
+        String off = "disabled";
+        metrics.addCustomChart(new SingleLineChart("clans", () -> cm.getClans().size()));
+        metrics.addCustomChart(new SingleLineChart("clan_players", () -> cm.getAllClanPlayers().size()));
+        metrics.addCustomChart(new SimplePie("language", () -> sm.getLanguage().toString()));
+        metrics.addCustomChart(new SimplePie("machine_language", () -> Locale.getDefault().toString()));
+        metrics.addCustomChart(new SimplePie("language_chooser", () -> sm.is(LANGUAGE_SELECTOR) ? on : off));
+        metrics.addCustomChart(new SimplePie("database", () -> sm.is(MYSQL_ENABLE) ? "MySQL" : "SQLite"));
+        metrics.addCustomChart(new SimplePie("save_periodically", () -> sm.is(PERFORMANCE_SAVE_PERIODICALLY) ? on : off));
+        metrics.addCustomChart(new SimplePie("save_interval", () -> sm.getString(PERFORMANCE_SAVE_INTERVAL)));
+        metrics.addCustomChart(new SimplePie("upkeep", () -> sm.is(ECONOMY_UPKEEP_ENABLED) ? on : off));
+        metrics.addCustomChart(new SimplePie("member_fee", () -> sm.is(ECONOMY_MEMBER_FEE_ENABLED) ? on : off));
+        metrics.addCustomChart(new SimplePie("rejoin_cooldown", () -> sm.is(ENABLE_REJOIN_COOLDOWN) ? on : off));
+        metrics.addCustomChart(new SimplePie("clan_verification", () -> sm.is(REQUIRE_VERIFICATION) ? on : off));
+        metrics.addCustomChart(new SimplePie("money_per_kill", () -> sm.is(ECONOMY_MONEY_PER_KILL) ? on : off));
+        metrics.addCustomChart(new SimplePie("threads", () -> sm.is(PERFORMANCE_USE_THREADS) ? on : off));
+        metrics.addCustomChart(new SimplePie("bungeecord", () -> sm.is(PERFORMANCE_USE_BUNGEECORD) ? on : off));
+        metrics.addCustomChart(new SimplePie("discord_chat", () -> sm.is(DISCORDCHAT_ENABLE) ? on : off));
     }
 
     private void startTasks() {
-    	if (getSettingsManager().isSavePeriodically()) {
-    		new SaveDataTask().start();
-    	}
-        if (getSettingsManager().isMemberFee()) {
+        if (getSettingsManager().is(PERFORMANCE_SAVE_PERIODICALLY)) {
+            new SaveDataTask().start();
+        }
+        if (getSettingsManager().is(ECONOMY_MEMBER_FEE_ENABLED)) {
             new CollectFeeTask().start();
         }
-        if (getSettingsManager().isClanUpkeep()) {
+        if (getSettingsManager().is(ECONOMY_UPKEEP_ENABLED)) {
             new CollectUpkeepTask().start();
             new UpkeepWarningTask().start();
         }
-        if (getSettingsManager().isCachePlayerHeads()) {
+        if (getSettingsManager().is(PERFORMANCE_HEAD_CACHING)) {
             new PlayerHeadCacheTask(this).start();
         }
     }
 
     @Override
     public void onDisable() {
-        getServer().getScheduler().cancelTasks(this);
-    	if (getSettingsManager().isSavePeriodically()) {
-    		getStorageManager().saveModified();
-    	}
+        if (getSettingsManager().is(PERFORMANCE_SAVE_PERIODICALLY)) {
+            getStorageManager().saveModified();
+        }
         getStorageManager().closeConnection();
         getPermissionsManager().savePermissions();
+        getSettingsManager().loadAndSave();
     }
 
     /**
@@ -221,6 +244,22 @@ public class SimpleClans extends JavaPlugin {
         return commandManager;
     }
 
+    public ProtectionManager getProtectionManager() {
+        return protectionManager;
+    }
+
+    public ChatManager getChatManager() {
+        return chatManager;
+    }
+
+    public ProxyManager getProxyManager() {
+        return proxyManager;
+    }
+
+    public BankLogger getBankLogger() {
+        return bankLogger;
+    }
+
     /**
      * @param key the path within the language file
      * @return the lang
@@ -236,34 +275,43 @@ public class SimpleClans extends JavaPlugin {
     }
 
     @Nullable
-    public static String optionalLang(@NotNull String key, @Nullable Player player, Object... arguments) {
-        Locale locale = getInstance().getSettingsManager().getLanguage();
-        if (player != null && instance.getSettingsManager().isLanguagePerPlayer()) {
-            Locale playerLocale = Helper.getLocale(player);
-            if (playerLocale != null) {
-                locale = playerLocale;
-            }
+    public static String optionalLang(@NotNull String key, @Nullable ClanPlayer clanPlayer, Object... arguments) {
+        Locale locale = instance.getSettingsManager().getLanguage();
+        if (clanPlayer != null && clanPlayer.getLocale() != null && instance.getSettingsManager().is(LANGUAGE_SELECTOR)) {
+            locale = clanPlayer.getLocale();
         }
 
         String lang = languageResource.getLang(key, locale);
         if (lang == null) {
             return null;
         }
-        String message = ChatColor.translateAlternateColorCodes('&', lang);
+        String message = ChatUtils.parseColors(lang);
         // contains acf placeholders like {commandprefix}
-        if (Pattern.compile("\\{(?<key>[a-zA-Z]+?)}").matcher(message).find()) {
+        if (ACF_PLACEHOLDER_PATTERN.matcher(message).find()) {
             return message;
         }
         return MessageFormat.format(message, arguments);
     }
 
+    @Nullable
+    public static String optionalLang(@NotNull String key, @Nullable Player player, Object... arguments) {
+        ClanPlayer clanPlayer = null;
+        if (player != null) {
+            clanPlayer = instance.getClanManager().getAnyClanPlayer(player.getUniqueId());
+        }
+        return optionalLang(key, clanPlayer, arguments);
+    }
+
     @NotNull
     public static String lang(@NotNull String key, @Nullable Player player, Object... arguments) {
         String lang = optionalLang(key, player, arguments);
-        if (lang == null) {
-            return key;
-        }
-        return lang;
+        return (lang == null) ? key : lang;
+    }
+
+    @NotNull
+    public static String lang(@NotNull String key, @Nullable ClanPlayer clanPlayer, Object... arguments) {
+        String lang = optionalLang(key, clanPlayer, arguments);
+        return (lang == null) ? key : lang;
     }
 
     @NotNull
@@ -302,7 +350,12 @@ public class SimpleClans extends JavaPlugin {
         return this.hasUUID;
     }
 
+    @Deprecated
     public void setUUID(boolean trueOrFalse) {
         this.hasUUID = trueOrFalse;
     }
-}
+
+    public TagValidator getTagValidator() {
+        return tagValidator;
+    }
+}

src/main/java/net/sacredlabyrinth/phaed/simpleclans/TeleportState.java

@@ -1,30 +1,31 @@
 package net.sacredlabyrinth.phaed.simpleclans;
 
 import org.bukkit.Location;
+import org.bukkit.OfflinePlayer;
 import org.bukkit.entity.Player;
 import org.jetbrains.annotations.Nullable;
 
-import java.util.UUID;
 
 public class TeleportState {
-    private final UUID playerUniqueId;
-    private final Location playerLocation;
+
+    private final OfflinePlayer offlinePlayer;
+    private final Location origin;
     private final Location destination;
     private int counter;
     private final String clanName;
     private boolean processing;
 
-    public TeleportState(Player player, Location destination, String clanName) {
+    public TeleportState(Player player, Location destination, String clanName, int counter) {
+        this.offlinePlayer = player;
         this.destination = destination;
-        this.playerLocation = player.getLocation();
+        this.origin = player.getLocation();
         this.clanName = clanName;
-        this.counter = SimpleClans.getInstance().getSettingsManager().getWaitSecs();
-        this.playerUniqueId = player.getUniqueId();
+        this.counter = counter;
     }
 
 
     public Location getLocation() {
-        return this.playerLocation;
+        return this.origin;
     }
 
     public boolean isTeleportTime() {
@@ -42,7 +43,7 @@ public class TeleportState {
      * @return the player
      */
     public @Nullable Player getPlayer() {
-    	return SimpleClans.getInstance().getServer().getPlayer(this.playerUniqueId);
+    	return offlinePlayer.getPlayer();
     }
 
     /**
@@ -74,7 +75,4 @@ public class TeleportState {
         this.processing = processing;
     }
 
-    public UUID getUniqueId() {
-        return this.playerUniqueId;
-    }
 }

src/main/java/net/sacredlabyrinth/phaed/simpleclans/VoteResult.java

@@ -2,12 +2,9 @@ package net.sacredlabyrinth.phaed.simpleclans;
 
 /**
  * Possible vote values
- */
-/**
  *
  * @author cc_madelg
  */
-public enum VoteResult
-{
+public enum VoteResult {
     ACCEPT, DENY
 }

src/main/java/net/sacredlabyrinth/phaed/simpleclans/War.java

@@ -0,0 +1,49 @@
+package net.sacredlabyrinth.phaed.simpleclans;
+
+import org.jetbrains.annotations.NotNull;
+
+import java.util.ArrayList;
+import java.util.HashMap;
+import java.util.List;
+import java.util.Map;
+
+public class War {
+    private final Map<Clan, Integer> clans = new HashMap<>();
+
+    public War(@NotNull Clan clan1, @NotNull Clan clan2) {
+        clans.put(clan1, 0);
+        clans.put(clan2, 0);
+    }
+
+    public List<Clan> getClans() {
+        return new ArrayList<>(clans.keySet());
+    }
+
+    public int getTotalCasualties() {
+        return clans.values().stream().mapToInt(value -> value).sum();
+    }
+
+    public int getCasualties(@NotNull Clan clan) {
+        return clans.getOrDefault(clan, 0);
+    }
+
+    public void increaseCasualties(@NotNull Clan clan) {
+        clans.computeIfPresent(clan, (c, i) -> i + 1);
+    }
+
+    @Override
+    public boolean equals(Object obj) {
+        if (this == obj) {
+            return true;
+        }
+        if (obj instanceof War) {
+            return clans.equals(((War) obj).clans);
+        }
+        return false;
+    }
+
+    @Override
+    public int hashCode() {
+        return clans.hashCode();
+    }
+}

src/main/java/net/sacredlabyrinth/phaed/simpleclans/chat/ChatHandler.java

@@ -0,0 +1,18 @@
+package net.sacredlabyrinth.phaed.simpleclans.chat;
+
+import net.sacredlabyrinth.phaed.simpleclans.SimpleClans;
+import net.sacredlabyrinth.phaed.simpleclans.managers.ChatManager;
+import net.sacredlabyrinth.phaed.simpleclans.managers.PermissionsManager;
+import net.sacredlabyrinth.phaed.simpleclans.managers.SettingsManager;
+
+public interface ChatHandler {
+
+    SimpleClans plugin = SimpleClans.getInstance();
+    SettingsManager settingsManager = plugin.getSettingsManager();
+    ChatManager chatManager = plugin.getChatManager();
+    PermissionsManager permissionsManager = plugin.getPermissionsManager();
+
+    void sendMessage(SCMessage message);
+
+    boolean canHandle(SCMessage.Source source);
+}

src/main/java/net/sacredlabyrinth/phaed/simpleclans/chat/SCMessage.java

@@ -0,0 +1,90 @@
+package net.sacredlabyrinth.phaed.simpleclans.chat;
+
+import net.sacredlabyrinth.phaed.simpleclans.ClanPlayer;
+import org.jetbrains.annotations.NotNull;
+
+import java.util.ArrayList;
+import java.util.List;
+
+public class SCMessage implements Cloneable {
+
+    private final Source source;
+    private final ClanPlayer.Channel channel;
+    private final ClanPlayer sender;
+    private List<ClanPlayer> receivers;
+    private String content;
+
+    /**
+     * Creates a message with initial parameters
+     *
+     * @param source    The source of message
+     * @param channel   The channel of clan player
+     * @param sender    The clan player sender
+     * @param content   The content of message
+     * @param receivers The clan players, who will receive the content
+     */
+    public SCMessage(@NotNull Source source, @NotNull ClanPlayer.Channel channel,
+                     @NotNull ClanPlayer sender, String content, @NotNull List<ClanPlayer> receivers) {
+        this.source = source;
+        this.channel = channel;
+        this.sender = sender;
+        this.content = content;
+        this.receivers = receivers;
+    }
+
+    /**
+     * Creates a new SCMessage without receivers
+     *
+     * @see SCMessage#SCMessage(Source, ClanPlayer.Channel, ClanPlayer, String, List) instantiate with initial receievers
+     */
+    public SCMessage(@NotNull Source source, @NotNull ClanPlayer.Channel channel, @NotNull ClanPlayer sender, String content) {
+        this(source, channel, sender, content, new ArrayList<>());
+    }
+
+    public ClanPlayer.Channel getChannel() {
+        return channel;
+    }
+
+    public ClanPlayer getSender() {
+        return sender;
+    }
+
+    public String getContent() {
+        return content;
+    }
+
+    public Source getSource() {
+        return source;
+    }
+
+    public List<ClanPlayer> getReceivers() {
+        return receivers;
+    }
+
+    public void setContent(@NotNull String content) {
+        this.content = content;
+    }
+
+    public void setReceivers(@NotNull List<ClanPlayer> receivers) {
+        this.receivers = receivers;
+    }
+
+    @Override
+    public SCMessage clone() {
+        try {
+            return (SCMessage) super.clone();
+        } catch (CloneNotSupportedException e) {
+            throw new Error(); //never thrown
+        }
+    }
+
+    /**
+     * The place where the message came from.
+     * Used by ChatHandlers to know which SCMessages they can handle.
+     *
+     * @see ChatHandler initiate the handler
+     */
+    public enum Source {
+        SPIGOT, DISCORD, PROXY
+    }
+}

src/main/java/net/sacredlabyrinth/phaed/simpleclans/chat/handlers/DiscordChatHandler.java

@@ -0,0 +1,48 @@
+package net.sacredlabyrinth.phaed.simpleclans.chat.handlers;
+
+import github.scarsz.discordsrv.dependencies.jda.api.entities.TextChannel;
+import github.scarsz.discordsrv.util.DiscordUtil;
+import net.sacredlabyrinth.phaed.simpleclans.Clan;
+import net.sacredlabyrinth.phaed.simpleclans.chat.ChatHandler;
+import net.sacredlabyrinth.phaed.simpleclans.chat.SCMessage;
+import net.sacredlabyrinth.phaed.simpleclans.hooks.discord.DiscordHook;
+import net.sacredlabyrinth.phaed.simpleclans.utils.ChatUtils;
+import org.jetbrains.annotations.NotNull;
+
+import java.util.Objects;
+import java.util.Optional;
+
+import static net.sacredlabyrinth.phaed.simpleclans.ClanPlayer.Channel.CLAN;
+import static net.sacredlabyrinth.phaed.simpleclans.chat.SCMessage.Source;
+import static net.sacredlabyrinth.phaed.simpleclans.chat.SCMessage.Source.SPIGOT;
+import static net.sacredlabyrinth.phaed.simpleclans.managers.SettingsManager.ConfigField.DISCORDCHAT_FORMAT_TO;
+
+/**
+ * Handles delivering messages from {@link Source#SPIGOT} to {@link Source#DISCORD}.
+ */
+public class DiscordChatHandler implements ChatHandler {
+
+    @Override
+    public void sendMessage(@NotNull SCMessage message) {
+        if (message.getChannel() != CLAN) {
+            return;
+        }
+
+        String format = settingsManager.getString(DISCORDCHAT_FORMAT_TO);
+        String formattedMessage = ChatUtils.stripColors(chatManager.parseChatFormat(format, message));
+
+        Clan clan = message.getSender().getClan();
+        if (clan == null) {
+            return;
+        }
+
+        DiscordHook discordHook = Objects.requireNonNull(chatManager.getDiscordHook(), "DiscordHook cannot be null");
+        Optional<TextChannel> channel = discordHook.getCachedChannel(clan.getTag());
+        channel.ifPresent(textChannel -> DiscordUtil.sendMessage(textChannel, formattedMessage));
+    }
+
+    @Override
+    public boolean canHandle(SCMessage.Source source) {
+        return source == SPIGOT && chatManager.isDiscordHookEnabled();
+    }
+}

src/main/java/net/sacredlabyrinth/phaed/simpleclans/chat/handlers/ProxyChatHandler.java

@@ -0,0 +1,20 @@
+package net.sacredlabyrinth.phaed.simpleclans.chat.handlers;
+
+import net.sacredlabyrinth.phaed.simpleclans.chat.ChatHandler;
+import net.sacredlabyrinth.phaed.simpleclans.chat.SCMessage;
+import net.sacredlabyrinth.phaed.simpleclans.chat.SCMessage.Source;
+
+import static net.sacredlabyrinth.phaed.simpleclans.managers.SettingsManager.ConfigField.PERFORMANCE_USE_BUNGEECORD;
+
+public class ProxyChatHandler implements ChatHandler {
+
+    @Override
+    public void sendMessage(SCMessage message) {
+        plugin.getProxyManager().sendMessage(message);
+    }
+
+    @Override
+    public boolean canHandle(Source source) {
+        return source == Source.SPIGOT && settingsManager.is(PERFORMANCE_USE_BUNGEECORD);
+    }
+}

src/main/java/net/sacredlabyrinth/phaed/simpleclans/chat/handlers/SpigotChatHandler.java

@@ -0,0 +1,74 @@
+package net.sacredlabyrinth.phaed.simpleclans.chat.handlers;
+
+import net.sacredlabyrinth.phaed.simpleclans.ChatBlock;
+import net.sacredlabyrinth.phaed.simpleclans.ClanPlayer;
+import net.sacredlabyrinth.phaed.simpleclans.chat.ChatHandler;
+import net.sacredlabyrinth.phaed.simpleclans.chat.SCMessage;
+import net.sacredlabyrinth.phaed.simpleclans.events.ChatEvent;
+import net.sacredlabyrinth.phaed.simpleclans.utils.ChatUtils;
+import org.bukkit.scheduler.BukkitRunnable;
+
+import static net.sacredlabyrinth.phaed.simpleclans.chat.SCMessage.Source.*;
+import static net.sacredlabyrinth.phaed.simpleclans.managers.SettingsManager.ConfigField;
+import static net.sacredlabyrinth.phaed.simpleclans.managers.SettingsManager.ConfigField.PERFORMANCE_USE_BUNGEECORD;
+import static org.bukkit.Bukkit.getPluginManager;
+
+@SuppressWarnings("unused")
+public class SpigotChatHandler implements ChatHandler {
+
+    @Override
+    public void sendMessage(SCMessage message) {
+        /*
+          TODO: Make it async, change Type to Channel in 3.0
+        */
+        new BukkitRunnable() {
+            @Override
+            public void run() {
+                ChatEvent event = new ChatEvent(message.getContent(), message.getSender(), message.getReceivers(),
+                        ChatEvent.Type.valueOf(message.getChannel().name()));
+
+                getPluginManager().callEvent(event);
+                if (event.isCancelled()) {
+                    return;
+                }
+                message.setContent(stripColorsAndFormatsPerPermission(message.getSender(),event.getMessage()));
+
+                ConfigField configField = ConfigField.valueOf(String.format("%sCHAT_FORMAT",
+                        message.getSource() == DISCORD ? "DISCORD" : message.getChannel()));
+
+                String format = settingsManager.getString(configField);
+                String formattedMessage = chatManager.parseChatFormat(format, message, event.getPlaceholders());
+
+                plugin.getLogger().info(ChatUtils.stripColors(formattedMessage));
+
+                for (ClanPlayer cp : message.getReceivers()) {
+                    ChatBlock.sendMessage(cp, formattedMessage);
+                }
+            }
+        }.runTask(plugin);
+    }
+
+    private String stripColorsAndFormatsPerPermission(ClanPlayer sender, String message) {
+        if (!permissionsManager.has(sender.toPlayer(), "simpleclans.member.chat.color")) {
+            message = stripColors(message);
+        }
+        if (!permissionsManager.has(sender.toPlayer(), "simpleclans.member.chat.format")) {
+            message = stripFormats(message);
+        }
+        return message;
+    }
+
+    private String stripColors(String message) {
+        return message.replaceAll("[§&][0-9a-fA-FxX]", "");
+    }
+
+    private String stripFormats(String message) {
+        return message.replaceAll("[§&][k-orK-OR]", "");
+    }
+
+    @Override
+    public boolean canHandle(SCMessage.Source source) {
+        return source == SPIGOT || (source == PROXY && settingsManager.is(PERFORMANCE_USE_BUNGEECORD))
+                || (source == DISCORD && chatManager.isDiscordHookEnabled());
+    }
+}

src/main/java/net/sacredlabyrinth/phaed/simpleclans/chat/handlers/SpyChatHandler.java

@@ -0,0 +1,55 @@
+package net.sacredlabyrinth.phaed.simpleclans.chat.handlers;
+
+import net.sacredlabyrinth.phaed.simpleclans.ChatBlock;
+import net.sacredlabyrinth.phaed.simpleclans.ClanPlayer;
+import net.sacredlabyrinth.phaed.simpleclans.chat.ChatHandler;
+import net.sacredlabyrinth.phaed.simpleclans.chat.SCMessage;
+import net.sacredlabyrinth.phaed.simpleclans.utils.ChatUtils;
+import org.bukkit.Bukkit;
+
+import java.util.ArrayList;
+import java.util.List;
+import java.util.Objects;
+import java.util.stream.Collectors;
+
+import static net.sacredlabyrinth.phaed.simpleclans.chat.SCMessage.Source;
+import static net.sacredlabyrinth.phaed.simpleclans.chat.SCMessage.Source.*;
+import static net.sacredlabyrinth.phaed.simpleclans.managers.SettingsManager.ConfigField;
+import static net.sacredlabyrinth.phaed.simpleclans.managers.SettingsManager.ConfigField.PERFORMANCE_USE_BUNGEECORD;
+
+/**
+ * Handles delivering messages from {@link Source#SPIGOT} or {@link Source#DISCORD} to internal spy chat.
+ */
+public class SpyChatHandler implements ChatHandler {
+
+    @Override
+    public void sendMessage(SCMessage message) {
+        ConfigField formatField = ConfigField.valueOf(String.format("%sCHAT_SPYFORMAT",
+                message.getSource() == DISCORD ? "DISCORD" : message.getChannel()));
+        String format = settingsManager.getString(formatField);
+        message.setContent(ChatUtils.stripColors(message.getContent()));
+        String formattedMessage = chatManager.parseChatFormat(format, message);
+
+        List<ClanPlayer> onlineSpies = getOnlineSpies();
+
+        // Don't send a duplicate message if a spy is inside the clan
+        onlineSpies.removeAll(message.getReceivers());
+        onlineSpies.forEach(receiver -> ChatBlock.sendMessage(receiver, formattedMessage));
+    }
+
+    @Override
+    public boolean canHandle(SCMessage.Source source) {
+        return source == SPIGOT || (source == PROXY && settingsManager.is(PERFORMANCE_USE_BUNGEECORD))
+                || (source == DISCORD && chatManager.isDiscordHookEnabled());
+    }
+
+    private List<ClanPlayer> getOnlineSpies() {
+        return new ArrayList<>(Bukkit.getOnlinePlayers()).stream().
+                filter(Objects::nonNull).
+                filter(player -> permissionsManager.has(player, "simpleclans.admin.all-seeing-eye")).
+                map(player -> plugin.getClanManager().getCreateClanPlayer(player.getUniqueId())).
+                filter(Objects::nonNull).
+                filter(clanPlayer -> !clanPlayer.isMuted()).
+                collect(Collectors.toList());
+    }
+}

src/main/java/net/sacredlabyrinth/phaed/simpleclans/commands/SCCommandManager.java

@@ -6,6 +6,8 @@ import co.aikar.commands.CommandIssuer;
 import co.aikar.commands.PaperCommandManager;
 import co.aikar.locales.MessageKey;
 import co.aikar.locales.MessageKeyProvider;
+import net.sacredlabyrinth.phaed.simpleclans.ClanPlayer;
+import net.sacredlabyrinth.phaed.simpleclans.Helper;
 import net.sacredlabyrinth.phaed.simpleclans.SimpleClans;
 import net.sacredlabyrinth.phaed.simpleclans.commands.completions.AbstractAsyncCompletion;
 import net.sacredlabyrinth.phaed.simpleclans.commands.completions.AbstractCompletion;
@@ -22,7 +24,6 @@ import org.bukkit.Bukkit;
 import org.bukkit.entity.Player;
 import org.jetbrains.annotations.NotNull;
 import org.jetbrains.annotations.Nullable;
-import org.reflections.Reflections;
 
 import java.lang.reflect.Modifier;
 import java.util.Arrays;
@@ -32,6 +33,7 @@ import java.util.logging.Level;
 
 import static net.sacredlabyrinth.phaed.simpleclans.SimpleClans.lang;
 import static net.sacredlabyrinth.phaed.simpleclans.SimpleClans.optionalLang;
+import static net.sacredlabyrinth.phaed.simpleclans.managers.SettingsManager.ConfigField.*;
 
 public class SCCommandManager extends PaperCommandManager {
     private final SimpleClans plugin;
@@ -44,13 +46,14 @@ public class SCCommandManager extends PaperCommandManager {
     }
     
     private void configure() {
-        registerDependencies();
         enableUnstableAPI("help");
+        registerDependencies();
         addCommandReplacements();
         registerContexts();
         registerCommands();
         registerConditions();
         registerCompletions();
+        defaultHelpPerPage = plugin.getSettingsManager().getInt(HELP_SIZE);
     }
 
     private void registerDependencies() {
@@ -59,11 +62,15 @@ public class SCCommandManager extends PaperCommandManager {
         registerDependency(StorageManager.class, plugin.getStorageManager());
         registerDependency(PermissionsManager.class, plugin.getPermissionsManager());
         registerDependency(RequestManager.class, plugin.getRequestManager());
+        registerDependency(ProtectionManager.class, plugin.getProtectionManager());
+        registerDependency(ChatManager.class, plugin.getChatManager());
     }
 
     private void registerCompletions() {
-        Reflections reflections = new Reflections("net.sacredlabyrinth.phaed.simpleclans.commands.completions");
-        Set<Class<? extends AbstractCompletion>> completions = reflections.getSubTypesOf(AbstractCompletion.class);
+        Set<Class<? extends AbstractCompletion>> completions =
+                Helper.getSubTypesOf("net.sacredlabyrinth.phaed.simpleclans.commands.completions",
+                        AbstractCompletion.class);
+        plugin.getLogger().info(String.format("Registering %d command completions...", completions.size()));
         for (Class<? extends AbstractCompletion> c : completions) {
             if (Modifier.isAbstract(c.getModifiers())) {
                 continue;
@@ -88,8 +95,10 @@ public class SCCommandManager extends PaperCommandManager {
 
     @SuppressWarnings("unchecked")
     private void registerConditions() {
-        Reflections reflections = new Reflections("net.sacredlabyrinth.phaed.simpleclans.commands.conditions");
-        Set<Class<? extends AbstractCondition>> conditions = reflections.getSubTypesOf(AbstractCondition.class);
+        Set<Class<? extends AbstractCondition>> conditions =
+                Helper.getSubTypesOf("net.sacredlabyrinth.phaed.simpleclans.commands.conditions",
+                        AbstractCondition.class);
+        plugin.getLogger().info(String.format("Registering %d command conditions...", conditions.size()));
         for (Class<? extends AbstractCondition> c : conditions) {
             if (Modifier.isAbstract(c.getModifiers())) {
                 continue;
@@ -113,8 +122,10 @@ public class SCCommandManager extends PaperCommandManager {
 
     @SuppressWarnings({"rawtypes", "unchecked"})
     private void registerContexts() {
-        Reflections reflections = new Reflections("net.sacredlabyrinth.phaed.simpleclans.commands.contexts");
-        Set<Class<? extends AbstractContextResolver>> resolvers = reflections.getSubTypesOf(AbstractContextResolver.class);
+        Set<Class<? extends AbstractContextResolver>> resolvers =
+                Helper.getSubTypesOf("net.sacredlabyrinth.phaed.simpleclans.commands.contexts",
+                        AbstractContextResolver.class);
+        plugin.getLogger().info(String.format("Registering %d command contexts...", resolvers.size()));
         for (Class<? extends AbstractContextResolver> cr : resolvers) {
             if (Modifier.isAbstract(cr.getModifiers())) {
                 continue;
@@ -134,9 +145,9 @@ public class SCCommandManager extends PaperCommandManager {
     }
 
     private void registerCommands() {
-        boolean forceCommandPriority = plugin.getSettingsManager().isForceCommandPriority();
-        Reflections reflections = new Reflections("net.sacredlabyrinth.phaed.simpleclans.commands");
-        Set<Class<? extends BaseCommand>> commands = reflections.getSubTypesOf(BaseCommand.class);
+        boolean forceCommandPriority = plugin.getSettingsManager().is(COMMANDS_FORCE_PRIORITY);
+        Set<Class<? extends BaseCommand>> commands = Helper.getSubTypesOf("net.sacredlabyrinth.phaed.simpleclans.commands", BaseCommand.class);
+        plugin.getLogger().info(String.format("Registering %d base commands...", commands.size()));
         for (Class<? extends BaseCommand> c : commands) {
             //ACF already registers nested classes
             if (c.isMemberClass() || Modifier.isStatic(c.getModifiers())) {
@@ -155,16 +166,16 @@ public class SCCommandManager extends PaperCommandManager {
         SettingsManager sm = plugin.getSettingsManager();
         getCommandReplacements().addReplacements(
                 "basic_conditions", "not_blacklisted|not_banned",
-                "clan", sm.getCommandClan(),
-                "deny", sm.getCommandDeny(),
-                "more", sm.getCommandMore(),
-                "ally_chat", sm.getCommandAlly(),
-                "accept", sm.getCommandAccept(),
-                "clan_chat", sm.getCommandClanChat()
+                "clan", sm.getString(COMMANDS_CLAN),
+                "deny", sm.getString(COMMANDS_DENY) + "|deny",
+                "more", sm.getString(COMMANDS_MORE),
+                "ally_chat", sm.getString(COMMANDS_ALLY),
+                "accept", sm.getString(COMMANDS_ACCEPT) + "|accept",
+                "clan_chat", sm.getString(COMMANDS_CLAN_CHAT)
         );
 
         SUBCOMMANDS.forEach(s -> {
-            String command = optionalLang(s + ".command", null);
+            String command = optionalLang(s + ".command", (ClanPlayer) null);
             if (command == null) {
                 command = s;
             }
@@ -201,7 +212,6 @@ public class SCCommandManager extends PaperCommandManager {
             };
             //this.locales.loadLanguages();
         }
-
         return this.locales;
     }
 
@@ -209,9 +219,11 @@ public class SCCommandManager extends PaperCommandManager {
         SUBCOMMANDS = Arrays.asList("setbanner", "resetkdr", "place", "rank", "home", "war", "regroup",
                 "mostkilled", "kills", "globalff", "reload", "unban", "ban", "verify", "disband", "resign", "ff",
                 "clanff", "demote", "promote", "untrust", "trust", "purge", "fee", "bank", "kick", "invite", "toggle",
-                "modtag", "bb", "clear", "rival", "ally", "add", "remove", "stats", "coords", "vitals", "rivalries",
+                "modtag", "bb", "display", "clear", "rival", "ally", "add", "remove", "stats", "coords", "vitals", "rivalries",
                 "alliances", "leaderboard", "allow", "block", "auto", "check", "assign", "unassign", "delete", "me",
                 "setdisplayname", "permissions", "tag", "deposit", "withdraw", "set", "status", "tp", "all", "everyone",
-                "lookup", "roster", "profile", "list", "create", "description", "start", "end", "admin", "help");
+                "lookup", "roster", "profile", "list", "create", "description", "start", "end", "admin", "help", "mod",
+                "setdefault", "removedefault", "land", "break", "interact", "place_block", "damage", "interact_entity",
+                "container", "permanent", "take", "give", "join", "leave", "mute", "confirm", "balance", "discord", "rename", "locale");
     }
 }

src/main/java/net/sacredlabyrinth/phaed/simpleclans/commands/clan/AllyChatCommand.java

@@ -2,28 +2,67 @@ package net.sacredlabyrinth.phaed.simpleclans.commands.clan;
 
 import co.aikar.commands.BaseCommand;
 import co.aikar.commands.annotation.*;
-import net.sacredlabyrinth.phaed.simpleclans.managers.ClanManager;
+import net.sacredlabyrinth.phaed.simpleclans.ChatBlock;
+import net.sacredlabyrinth.phaed.simpleclans.ClanPlayer;
+import net.sacredlabyrinth.phaed.simpleclans.managers.ChatManager;
 import net.sacredlabyrinth.phaed.simpleclans.managers.SettingsManager;
-import org.bukkit.entity.Player;
+import net.sacredlabyrinth.phaed.simpleclans.managers.StorageManager;
+
+import static net.sacredlabyrinth.phaed.simpleclans.ClanPlayer.Channel.ALLY;
+import static net.sacredlabyrinth.phaed.simpleclans.ClanPlayer.Channel.NONE;
+import static net.sacredlabyrinth.phaed.simpleclans.SimpleClans.lang;
+import static net.sacredlabyrinth.phaed.simpleclans.chat.SCMessage.Source.SPIGOT;
 
 @CommandAlias("%ally_chat")
 @Description("{@@command.description.ally}")
 @CommandPermission("simpleclans.member.ally")
-@Conditions("%basic_conditions|clan_member|rank:name=ALLY_CHAT")
+@Conditions("%basic_conditions|clan_member|can_chat:type=ALLY|rank:name=ALLY_CHAT")
 public class AllyChatCommand extends BaseCommand {
 
     @Dependency
-    private ClanManager clanManager;
+    private ChatManager chatManager;
     @Dependency
     private SettingsManager settingsManager;
+    @Dependency
+    private StorageManager storageManager;
 
     @Default
     @HelpSearchTags("chat")
-    public void sendMessage(Player player, @Name("message") String message) {
-        if (!settingsManager.isAllyChatEnable()) {
-            return;
-        }
-        clanManager.processAllyChat(player, message);
+    public void sendMessage(ClanPlayer cp, @Name("message") String message) {
+        chatManager.processChat(SPIGOT, ALLY, cp, message);
     }
 
+    @Subcommand("%join")
+    public void join(ClanPlayer clanPlayer) {
+        if (clanPlayer.getChannel() == ALLY) {
+            ChatBlock.sendMessage(clanPlayer, lang("already.joined.ally.chat"));
+            return;
+        }
+
+        clanPlayer.setChannel(ALLY);
+        storageManager.updateClanPlayer(clanPlayer);
+        ChatBlock.sendMessage(clanPlayer, lang("joined.ally.chat"));
+    }
+
+    @Subcommand("%leave")
+    public void leave(ClanPlayer clanPlayer) {
+        if (clanPlayer.getChannel() == ALLY) {
+            clanPlayer.setChannel(NONE);
+            storageManager.updateClanPlayer(clanPlayer);
+            ChatBlock.sendMessage(clanPlayer, lang("left.ally.chat", clanPlayer));
+        } else {
+            ChatBlock.sendMessage(clanPlayer, lang("chat.didnt.join", clanPlayer));
+        }
+    }
+
+    @Subcommand("%mute")
+    public void mute(ClanPlayer clanPlayer) {
+        if (!clanPlayer.isMutedAlly()) {
+            clanPlayer.mute(ALLY, true);
+            ChatBlock.sendMessage(clanPlayer, lang("muted.ally.chat", clanPlayer));
+        } else {
+            clanPlayer.mute(ALLY, false);
+            ChatBlock.sendMessage(clanPlayer, lang("unmuted.ally.chat", clanPlayer));
+        }
+    }
 }

src/main/java/net/sacredlabyrinth/phaed/simpleclans/commands/clan/BankCommand.java

@@ -4,10 +4,18 @@ import co.aikar.commands.BaseCommand;
 import co.aikar.commands.annotation.*;
 import net.sacredlabyrinth.phaed.simpleclans.ChatBlock;
 import net.sacredlabyrinth.phaed.simpleclans.Clan;
+import net.sacredlabyrinth.phaed.simpleclans.EconomyResponse;
+import net.sacredlabyrinth.phaed.simpleclans.events.BankDepositEvent;
+import net.sacredlabyrinth.phaed.simpleclans.events.BankWithdrawEvent;
+import net.sacredlabyrinth.phaed.simpleclans.loggers.BankLogger;
+import net.sacredlabyrinth.phaed.simpleclans.loggers.BankOperator;
 import net.sacredlabyrinth.phaed.simpleclans.managers.PermissionsManager;
+import org.bukkit.Bukkit;
 import org.bukkit.entity.Player;
 
 import static net.sacredlabyrinth.phaed.simpleclans.SimpleClans.lang;
+import static net.sacredlabyrinth.phaed.simpleclans.events.ClanBalanceUpdateEvent.Cause.COMMAND;
+import static net.sacredlabyrinth.phaed.simpleclans.events.ClanBalanceUpdateEvent.Cause.REVERT;
 import static org.bukkit.ChatColor.AQUA;
 import static org.bukkit.ChatColor.RED;
 
@@ -50,7 +58,29 @@ public class BankCommand extends BaseCommand {
             return;
         }
         amount = Math.abs(amount);
-        clan.withdraw(amount, player);
+        /*
+            TODO: Remove at SimpleClans 3.0
+         */
+        BankWithdrawEvent event = new BankWithdrawEvent(player, clan, amount);
+        Bukkit.getPluginManager().callEvent(event);
+        if (event.isCancelled()) {
+            return;
+        }
+        /*
+         * ——————————————————————————————————
+         */
+        BankOperator operator = new BankOperator(player, permissions.playerGetMoney(player));
+        switch (clan.withdraw(operator, COMMAND, amount)) {
+            case SUCCESS -> {
+                if (permissions.grantPlayer(player, amount)) {
+                    player.sendMessage(AQUA + lang("player.clan.withdraw", player, amount));
+                    clan.addBb(player.getName(), lang("bb.clan.withdraw", amount, player.getName()));
+                } else {
+                    clan.setBalance(operator, REVERT, BankLogger.Operation.WITHDRAW, clan.getBalance() + amount);
+                }
+            }
+            case NOT_ENOUGH_BALANCE -> player.sendMessage(lang("clan.bank.not.enough.money", player));
+        }
     }
 
     @Subcommand("%deposit %all")
@@ -77,6 +107,33 @@ public class BankCommand extends BaseCommand {
             return;
         }
         amount = Math.abs(amount);
-        clan.deposit(amount, player);
+
+        /*
+            TODO: Remove at SimpleClans 3.0
+         */
+        BankDepositEvent event = new BankDepositEvent(player, clan, amount);
+        Bukkit.getPluginManager().callEvent(event);
+        if (event.isCancelled()) {
+            return;
+        }
+        /*
+        * ——————————————————————————————————
+        */
+
+        if (!permissions.playerHasMoney(player, amount)) {
+            player.sendMessage(AQUA + lang("not.sufficient.money", player, amount));
+            return;
+        }
+        BankOperator operator = new BankOperator(player, permissions.playerGetMoney(player));
+        EconomyResponse response = clan.deposit(operator, COMMAND, amount);
+        if (response == EconomyResponse.SUCCESS) {
+            if (permissions.chargePlayer(player, amount)) {
+                player.sendMessage(AQUA + lang("player.clan.deposit", player, amount));
+                clan.addBb(player.getName(), lang("bb.clan.deposit", amount, player.getName()));
+            } else {
+                //Reverts the deposit if something went wrong with Vault
+                clan.setBalance(operator, REVERT, BankLogger.Operation.DEPOSIT, clan.getBalance() - amount);
+            }
+        }
     }
 }

src/main/java/net/sacredlabyrinth/phaed/simpleclans/commands/clan/BbCommand.java

@@ -5,13 +5,14 @@ import co.aikar.commands.annotation.*;
 import net.sacredlabyrinth.phaed.simpleclans.ChatBlock;
 import net.sacredlabyrinth.phaed.simpleclans.Clan;
 import net.sacredlabyrinth.phaed.simpleclans.managers.ClanManager;
+import net.sacredlabyrinth.phaed.simpleclans.managers.SettingsManager;
 import net.sacredlabyrinth.phaed.simpleclans.managers.StorageManager;
 import org.bukkit.entity.Player;
 
 import java.util.Objects;
 
 import static net.sacredlabyrinth.phaed.simpleclans.SimpleClans.lang;
-import static org.bukkit.ChatColor.*;
+import static org.bukkit.ChatColor.RED;
 
 @CommandAlias("%clan")
 @Conditions("%basic_conditions|verified")
@@ -21,6 +22,8 @@ public class BbCommand extends BaseCommand {
     private ClanManager cm;
     @Dependency
     private StorageManager storage;
+    @Dependency
+    private SettingsManager settings;
 
     @Subcommand("%bb")
     @CommandPermission("simpleclans.member.bb")
@@ -46,7 +49,8 @@ public class BbCommand extends BaseCommand {
     @Description("{@@command.description.bb.post}")
     public void postMessage(Player player, @Name("message") String msg) {
         Clan clan = Objects.requireNonNull(cm.getClanByPlayerUniqueId(player.getUniqueId()));
-        clan.addBb(player.getName(), AQUA + player.getName() + ": " + WHITE + msg);
+        clan.addBb(lang("bulletin.board.message", player.getName(), msg));
+        clan.displayBb(player);
         storage.updateClan(clan);
     }
 }

src/main/java/net/sacredlabyrinth/phaed/simpleclans/commands/clan/ChatCommand.java

@@ -2,28 +2,64 @@ package net.sacredlabyrinth.phaed.simpleclans.commands.clan;
 
 import co.aikar.commands.BaseCommand;
 import co.aikar.commands.annotation.*;
+import net.sacredlabyrinth.phaed.simpleclans.ChatBlock;
 import net.sacredlabyrinth.phaed.simpleclans.ClanPlayer;
-import net.sacredlabyrinth.phaed.simpleclans.managers.ClanManager;
-import net.sacredlabyrinth.phaed.simpleclans.managers.SettingsManager;
-import org.bukkit.entity.Player;
+import net.sacredlabyrinth.phaed.simpleclans.managers.ChatManager;
+import net.sacredlabyrinth.phaed.simpleclans.managers.StorageManager;
+
+import static net.sacredlabyrinth.phaed.simpleclans.ClanPlayer.Channel.CLAN;
+import static net.sacredlabyrinth.phaed.simpleclans.ClanPlayer.Channel.NONE;
+import static net.sacredlabyrinth.phaed.simpleclans.SimpleClans.lang;
+import static net.sacredlabyrinth.phaed.simpleclans.chat.SCMessage.Source.SPIGOT;
 
 @CommandAlias("%clan_chat")
-@Conditions("%basic_conditions|clan_member")
+@Conditions("%basic_conditions|clan_member|can_chat:type=CLAN")
 @CommandPermission("simpleclans.member.chat")
 @Description("{@@command.description.chat}")
 public class ChatCommand extends BaseCommand {
 
     @Dependency
-    private ClanManager clanManager;
+    private ChatManager chatManager;
     @Dependency
-    private SettingsManager settingsManager;
+    private StorageManager storageManager;
 
     @Default
     @HelpSearchTags("chat")
-    public void sendMessage(Player player, ClanPlayer cp, @Name("message") String message) {
-        if (!settingsManager.getClanChatEnable()) {
+    public void sendMessage(ClanPlayer cp, @Name("message") String message) {
+        chatManager.processChat(SPIGOT, CLAN, cp, message);
+    }
+
+    @Subcommand("%join")
+    public void join(ClanPlayer clanPlayer) {
+        if (clanPlayer.getChannel() == CLAN) {
+            ChatBlock.sendMessage(clanPlayer, lang("already.joined.clan.chat"));
             return;
         }
-        clanManager.processClanChat(player, cp.getTag(), message);
+
+        clanPlayer.setChannel(CLAN);
+        storageManager.updateClanPlayer(clanPlayer);
+        ChatBlock.sendMessage(clanPlayer, lang("joined.clan.chat"));
+    }
+
+    @Subcommand("%leave")
+    public void leave(ClanPlayer clanPlayer) {
+        if (clanPlayer.getChannel() == CLAN) {
+            clanPlayer.setChannel(NONE);
+            storageManager.updateClanPlayer(clanPlayer);
+            ChatBlock.sendMessage(clanPlayer, lang("left.clan.chat", clanPlayer));
+        } else {
+            ChatBlock.sendMessage(clanPlayer, lang("chat.didnt.join", clanPlayer));
+        }
+    }
+
+    @Subcommand("%mute")
+    public void mute(ClanPlayer clanPlayer) {
+        if (!clanPlayer.isMuted()) {
+            clanPlayer.mute(CLAN, true);
+            ChatBlock.sendMessage(clanPlayer, lang("muted.clan.chat", clanPlayer));
+        } else {
+            clanPlayer.mute(CLAN, false);
+            ChatBlock.sendMessage(clanPlayer, lang("unmuted.clan.chat", clanPlayer));
+        }
     }
 }

src/main/java/net/sacredlabyrinth/phaed/simpleclans/commands/clan/ClanCommands.java

@@ -6,17 +6,19 @@ import net.sacredlabyrinth.phaed.simpleclans.*;
 import net.sacredlabyrinth.phaed.simpleclans.commands.ClanInput;
 import net.sacredlabyrinth.phaed.simpleclans.commands.ClanPlayerInput;
 import net.sacredlabyrinth.phaed.simpleclans.conversation.ResignPrompt;
+import net.sacredlabyrinth.phaed.simpleclans.conversation.SCConversation;
 import net.sacredlabyrinth.phaed.simpleclans.events.TagChangeEvent;
 import net.sacredlabyrinth.phaed.simpleclans.managers.*;
-import net.sacredlabyrinth.phaed.simpleclans.utils.TagValidator;
-import org.bukkit.conversations.ConversationFactory;
+import net.sacredlabyrinth.phaed.simpleclans.utils.ChatUtils;
 import org.bukkit.entity.Player;
 import org.bukkit.inventory.ItemStack;
 
 import java.util.List;
 import java.util.Objects;
+import java.util.Optional;
 
 import static net.sacredlabyrinth.phaed.simpleclans.SimpleClans.lang;
+import static net.sacredlabyrinth.phaed.simpleclans.managers.SettingsManager.ConfigField.*;
 import static org.bukkit.ChatColor.AQUA;
 import static org.bukkit.ChatColor.RED;
 
@@ -35,30 +37,29 @@ public class ClanCommands extends BaseCommand {
     private PermissionsManager permissions;
     @Dependency
     private RequestManager requestManager;
+    @Dependency
+    private ProtectionManager protectionManager;
 
     @Subcommand("%war %start")
     @CommandPermission("simpleclans.leader.war")
     @Conditions("verified|rank:name=WAR_START")
     @Description("{@@command.description.war.start}")
     @CommandCompletion("@rivals")
-    public void startWar(Player player, ClanPlayer cp, Clan issuerClan, @Name("clan") ClanInput other) {
-        Clan war = other.getClan();
-        if (!issuerClan.isRival(war.getTag())) {
-            ChatBlock.sendMessage(player, RED + lang("you.can.only.start.war.with.rivals", player));
-            return;
-        }
-        if (!issuerClan.isWarring(war.getTag())) {
-            List<ClanPlayer> onlineLeaders = Helper.stripOffLinePlayers(issuerClan.getLeaders());
+    public void startWar(Player player, ClanPlayer requester, Clan requestClan, @Conditions("can_war_target") @Name("clan") ClanInput targetClanInput) {
+        Clan targetClan = targetClanInput.getClan();
 
+        List<ClanPlayer> onlineLeaders = Helper.stripOffLinePlayers(requestClan.getLeaders());
+
+        if (settings.is(WAR_START_REQUEST_ENABLED)) {
             if (!onlineLeaders.isEmpty()) {
-                requestManager.addWarStartRequest(cp, war, issuerClan);
+                requestManager.addWarStartRequest(requester, targetClan, requestClan);
                 ChatBlock.sendMessage(player, AQUA + lang("leaders.have.been.asked.to.accept.the.war.request",
-                        player, war.getName()));
+                        player, targetClan.getName()));
             } else {
                 ChatBlock.sendMessage(player, RED + lang("at.least.one.leader.accept.the.alliance", player));
             }
         } else {
-            ChatBlock.sendMessage(player, RED + lang("clans.already.at.war", player));
+            protectionManager.addWar(requester, requestClan, targetClan);
         }
     }
 
@@ -67,13 +68,13 @@ public class ClanCommands extends BaseCommand {
     @Conditions("verified|rank:name=WAR_END")
     @Description("{@@command.description.war.end}")
     @CommandCompletion("@warring_clans")
-    public void endWar(Player player, ClanPlayer cp, Clan issuerClan, @Name("clan") ClanInput other) {
+    public void endWar(ClanPlayer cp, Clan issuerClan, @Name("clan") ClanInput other) {
         Clan war = other.getClan();
         if (issuerClan.isWarring(war.getTag())) {
             requestManager.addWarEndRequest(cp, war, issuerClan);
-            ChatBlock.sendMessage(player, AQUA + lang("leaders.asked.to.end.rivalry", player, war.getName()));
+            ChatBlock.sendMessage(cp, AQUA + lang("leaders.asked.to.end.rivalry", cp, war.getName()));
         } else {
-            ChatBlock.sendMessage(player, RED + lang("clans.not.at.war", player));
+            ChatBlock.sendMessage(cp, RED + lang("clans.not.at.war", cp));
         }
     }
 
@@ -90,9 +91,9 @@ public class ClanCommands extends BaseCommand {
         tag = event.getNewTag();
         String cleanTag = Helper.cleanTag(tag);
 
-        TagValidator validator = new TagValidator(plugin, player, tag);
-        if (validator.getErrorMessage() != null) {
-            ChatBlock.sendMessage(player, validator.getErrorMessage());
+        Optional<String> validationError = plugin.getTagValidator().validate(player, tag);
+        if (validationError.isPresent()) {
+            ChatBlock.sendMessage(player, validationError.get());
             return;
         }
 
@@ -102,7 +103,7 @@ public class ClanCommands extends BaseCommand {
             return;
         }
 
-        clan.addBb(player.getName(), AQUA + lang("tag.changed.to.0", Helper.parseColors(tag)));
+        clan.addBb(player.getName(), lang("tag.changed.to.0", ChatUtils.parseColors(tag)));
         clan.changeClanTag(tag);
         cm.updateDisplayName(player);
     }
@@ -126,11 +127,15 @@ public class ClanCommands extends BaseCommand {
 
     @Subcommand("%invite")
     @CommandPermission("simpleclans.leader.invite")
-    @CommandCompletion("@non_members")
+    @CommandCompletion("@non_members:ignore_vanished")
     @Conditions("rank:name=INVITE")
     @Description("{@@command.description.invite}")
     public void invite(Player sender, ClanPlayer cp, Clan clan,
-                       @Conditions("not_banned|not_in_clan|online") @Name("player") ClanPlayerInput invited) {
+                       @Conditions("not_banned|not_in_clan|online:ignore_vanished") @Name("player") ClanPlayerInput invited) {
+        if (!invited.getClanPlayer().isInviteEnabled()) {
+            ChatBlock.sendMessage(sender, RED + lang("invitedplayer.invite.off", sender));
+            return;
+        }
         Player invitedPlayer = invited.getClanPlayer().toPlayer();
         if (invitedPlayer == null) return;
         if (!permissions.has(invitedPlayer, "simpleclans.member.can-join")) {
@@ -149,7 +154,7 @@ public class ClanCommands extends BaseCommand {
             return;
         }
 
-        if (clan.getSize() >= settings.getMaxMembers()) {
+        if (clan.getSize() >= settings.getInt(CLAN_MAX_MEMBERS) && settings.getInt(CLAN_MAX_MEMBERS) > 0) {
             ChatBlock.sendMessage(sender, RED + lang("the.clan.members.reached.limit", sender));
             return;
         }
@@ -176,11 +181,11 @@ public class ClanCommands extends BaseCommand {
 
     @Subcommand("%fee %set")
     @CommandPermission("simpleclans.leader.fee")
-    @Conditions("rank:name=FEE_SET")
+    @Conditions("rank:name=FEE_SET|change_fee")
     @Description("{@@command.description.fee.set}")
     public void setFee(Player player, Clan clan, @Name("fee") double fee) {
         fee = Math.abs(fee);
-        double maxFee = settings.getMaxMemberFee();
+        double maxFee = settings.getDouble(ECONOMY_MAX_MEMBER_FEE);
         if (fee > maxFee) {
             ChatBlock.sendMessage(player, RED
                     + lang("max.fee.allowed.is.0", player, maxFee));
@@ -188,7 +193,7 @@ public class ClanCommands extends BaseCommand {
         }
         if (cm.purchaseMemberFeeSet(player)) {
             clan.setMemberFee(fee);
-            clan.addBb(player.getName(), AQUA + lang("bb.fee.set", fee));
+            clan.addBb(player.getName(), lang("bb.fee.set", fee));
             ChatBlock.sendMessage(player, AQUA + lang("fee.set", player));
             storage.updateClan(clan);
         }
@@ -199,7 +204,7 @@ public class ClanCommands extends BaseCommand {
     @Conditions("rank:name=FRIENDLYFIRE")
     @Description("{@@command.description.clanff.allow}")
     public void allowClanFf(Player player, Clan clan) {
-        clan.addBb(player.getName(), AQUA + lang("clan.wide.friendly.fire.is.allowed"));
+        clan.addBb(player.getName(), lang("clan.wide.friendly.fire.is.allowed"));
         clan.setFriendlyFire(true);
         storage.updateClan(clan);
     }
@@ -208,7 +213,7 @@ public class ClanCommands extends BaseCommand {
     @CommandPermission("simpleclans.leader.ff")
     @Description("{@@command.description.clanff.block}")
     public void blockClanFf(Player player, Clan clan) {
-        clan.addBb(player.getName(), AQUA + lang("clan.wide.friendly.fire.blocked"));
+        clan.addBb(player.getName(), lang("clan.wide.friendly.fire.blocked"));
         clan.setFriendlyFire(false);
         storage.updateClan(clan);
     }
@@ -218,14 +223,14 @@ public class ClanCommands extends BaseCommand {
     @Conditions("verified|rank:name=DESCRIPTION")
     @Description("{@@command.description.description}")
     public void setDescription(Player player, Clan clan, @Name("description") String description) {
-        if (description.length() < settings.getClanMinDescriptionLength()) {
+        if (description.length() < settings.getInt(CLAN_MIN_DESCRIPTION_LENGTH)) {
             ChatBlock.sendMessage(player, RED + lang("your.clan.description.must.be.longer.than",
-                    player, settings.getClanMinDescriptionLength()));
+                    player, settings.getInt(CLAN_MIN_DESCRIPTION_LENGTH)));
             return;
         }
-        if (description.length() > settings.getClanMaxDescriptionLength()) {
+        if (description.length() > settings.getInt(CLAN_MAX_DESCRIPTION_LENGTH)) {
             ChatBlock.sendMessage(player, RED + lang("your.clan.description.cannot.be.longer.than",
-                    player, settings.getClanMaxDescriptionLength()));
+                    player, settings.getInt(CLAN_MAX_DESCRIPTION_LENGTH)));
             return;
         }
         clan.setDescription(description);
@@ -236,7 +241,7 @@ public class ClanCommands extends BaseCommand {
     @Subcommand("%rival %add")
     @CommandPermission("simpleclans.leader.rival")
     @Conditions("verified|rivable|minimum_to_rival|rank:name=RIVAL_ADD")
-    @CommandCompletion("@clans")
+    @CommandCompletion("@clans:hide_own")
     @Description("{@@command.description.rival.add}")
     public void addRival(Player player, Clan issuerClan, @Conditions("verified|different") @Name("clan") ClanInput rival) {
         Clan rivalInput = rival.getClan();
@@ -247,9 +252,9 @@ public class ClanCommands extends BaseCommand {
         if (!issuerClan.reachedRivalLimit()) {
             if (!issuerClan.isRival(rivalInput.getTag())) {
                 issuerClan.addRival(rivalInput);
-                rivalInput.addBb(player.getName(), AQUA + lang("has.initiated.a.rivalry", issuerClan.getName(),
+                rivalInput.addBb(player.getName(), lang("has.initiated.a.rivalry", issuerClan.getName(),
                         rivalInput.getName()), false);
-                issuerClan.addBb(player.getName(), AQUA + lang("has.initiated.a.rivalry", player.getName(),
+                issuerClan.addBb(player.getName(), lang("has.initiated.a.rivalry", player.getName(),
                         rivalInput.getName()));
             } else {
                 ChatBlock.sendMessage(player, RED + lang("your.clans.are.already.rivals", player));
@@ -281,7 +286,7 @@ public class ClanCommands extends BaseCommand {
     @Subcommand("%ally %add")
     @CommandPermission("simpleclans.leader.ally")
     @Conditions("verified|rank:name=ALLY_ADD|minimum_to_ally")
-    @CommandCompletion("@clans")
+    @CommandCompletion("@clans:hide_own")
     @Description("{@@command.description.ally.add}")
     public void addAlly(Player player,
                         ClanPlayer cp,
@@ -292,7 +297,7 @@ public class ClanCommands extends BaseCommand {
             ChatBlock.sendMessage(player, RED + lang("your.clans.are.already.allies", player));
             return;
         }
-        int maxAlliances = settings.getClanMaxAlliances();
+        int maxAlliances = settings.getInt(CLAN_MAX_ALLIANCES);
         if (maxAlliances != -1) {
             if (issuerClan.getAllies().size() >= maxAlliances) {
                 ChatBlock.sendMessage(player, lang("your.clan.reached.max.alliances", player));
@@ -324,15 +329,15 @@ public class ClanCommands extends BaseCommand {
     public void removeAlly(Player player, Clan issuerClan, @Conditions("different|allied_clan") @Name("clan") ClanInput ally) {
         Clan allyInput = ally.getClan();
         issuerClan.removeAlly(allyInput);
-        allyInput.addBb(player.getName(), AQUA + lang("has.broken.the.alliance", issuerClan.getName(),
+        allyInput.addBb(player.getName(), lang("has.broken.the.alliance", issuerClan.getName(),
                 allyInput.getName()), false);
-        issuerClan.addBb(player.getName(), AQUA + lang("has.broken.the.alliance", player.getName(),
+        issuerClan.addBb(player.getName(), lang("has.broken.the.alliance", player.getName(),
                 allyInput.getName()));
     }
 
     @Subcommand("%kick")
     @CommandPermission("simpleclans.leader.kick")
-    @CommandCompletion("@clan_members")
+    @CommandCompletion("@clan_members:hide_own")
     @Conditions("rank:name=KICK")
     @Description("{@@command.description.kick}")
     public void kick(@Conditions("clan_member") Player sender,
@@ -349,19 +354,36 @@ public class ClanCommands extends BaseCommand {
             return;
         }
 
-        clan.addBb(sender.getName(), AQUA + lang("has.been.kicked.by", clanPlayer.getName(),
+        clan.addBb(sender.getName(), lang("has.been.kicked.by", clanPlayer.getName(),
                 sender.getName(), sender));
         clan.removePlayerFromClan(clanPlayer.getUniqueId());
     }
 
+    @Subcommand("%resign %confirm")
+    @CommandPermission("simpleclans.member.resign")
+    @Description("{@@command.description.resign}")
+    @HelpSearchTags("leave")
+    public void resignConfirm(Player player, ClanPlayer cp, Clan clan) {
+        if (clan.isPermanent() || !clan.isLeader(player) || clan.getLeaders().size() > 1) {
+            clan.addBb(player.getName(), lang("0.has.resigned", player.getName()));
+            cp.addResignTime(clan.getTag());
+            clan.removePlayerFromClan(player.getUniqueId());
+
+            ChatBlock.sendMessage(cp, AQUA + lang("resign.success", player));
+        } else if (clan.isLeader(player) && clan.getLeaders().size() == 1) {
+            clan.disband(player, true, false);
+            ChatBlock.sendMessage(cp, RED + lang("clan.has.been.disbanded", player, clan.getName()));
+        } else {
+            ChatBlock.sendMessage(cp, RED +
+                    lang("last.leader.cannot.resign.you.must.appoint.another.leader.or.disband.the.clan", player));
+        }
+    }
+
     @Subcommand("%resign")
     @CommandPermission("simpleclans.member.resign")
     @Description("{@@command.description.resign}")
+    @HelpSearchTags("leave")
     public void resign(@Conditions("clan_member") Player player) {
-        new ConversationFactory(plugin)
-                .withFirstPrompt(new ResignPrompt())
-                .withLocalEcho(true)
-                .withTimeout(10)
-                .buildConversation(player).begin();
+        new SCConversation(plugin, player, new ResignPrompt()).begin();
     }
 }

src/main/java/net/sacredlabyrinth/phaed/simpleclans/commands/clan/DataCommands.java

@@ -6,6 +6,7 @@ import net.sacredlabyrinth.phaed.simpleclans.ChatBlock;
 import net.sacredlabyrinth.phaed.simpleclans.Clan;
 import net.sacredlabyrinth.phaed.simpleclans.SimpleClans;
 import net.sacredlabyrinth.phaed.simpleclans.commands.data.*;
+import net.sacredlabyrinth.phaed.simpleclans.utils.VanishUtils;
 import org.bukkit.command.CommandSender;
 import org.bukkit.entity.Player;
 
@@ -58,7 +59,7 @@ public class DataCommands extends BaseCommand {
     @HelpSearchTags("local location")
     @Description("{@@command.description.coords}")
     public void coords(Player player, Clan clan) {
-        if (clan.getOnlineMembers().size() == 1) {
+        if (VanishUtils.getNonVanished(player, clan).size() == 1) {
             ChatBlock.sendMessage(player, RED + lang("you.are.the.only.member.online", player));
             return;
         }

src/main/java/net/sacredlabyrinth/phaed/simpleclans/commands/clan/HomeCommands.java

@@ -4,12 +4,19 @@ import co.aikar.commands.BaseCommand;
 import co.aikar.commands.annotation.*;
 import net.sacredlabyrinth.phaed.simpleclans.*;
 import net.sacredlabyrinth.phaed.simpleclans.events.HomeRegroupEvent;
+import net.sacredlabyrinth.phaed.simpleclans.events.PlayerHomeClearEvent;
 import net.sacredlabyrinth.phaed.simpleclans.events.PlayerHomeSetEvent;
-import net.sacredlabyrinth.phaed.simpleclans.managers.*;
+import net.sacredlabyrinth.phaed.simpleclans.managers.ClanManager;
+import net.sacredlabyrinth.phaed.simpleclans.managers.PermissionsManager;
+import net.sacredlabyrinth.phaed.simpleclans.managers.ProtectionManager;
+import net.sacredlabyrinth.phaed.simpleclans.managers.SettingsManager;
+import net.sacredlabyrinth.phaed.simpleclans.utils.VanishUtils;
+import org.bukkit.Bukkit;
 import org.bukkit.Location;
 import org.bukkit.entity.Player;
 
 import static net.sacredlabyrinth.phaed.simpleclans.SimpleClans.lang;
+import static net.sacredlabyrinth.phaed.simpleclans.managers.SettingsManager.ConfigField.*;
 import static org.bukkit.ChatColor.*;
 
 @CommandAlias("%clan")
@@ -22,6 +29,8 @@ public class HomeCommands extends BaseCommand {
     @Dependency
     private SettingsManager settings;
     @Dependency
+    private ProtectionManager protection;
+    @Dependency
     private ClanManager cm;
 
     @Subcommand("%regroup %me")
@@ -29,57 +38,47 @@ public class HomeCommands extends BaseCommand {
     @Conditions("rank:name=REGROUP_ME")
     @Description("{@@command.description.regroup.me}")
     public void regroupMe(Player player, ClanPlayer cp, Clan clan) {
-        if (!settings.getAllowReGroupCommand()) {
+        if (!settings.is(ALLOW_REGROUP)) {
             ChatBlock.sendMessage(player, RED + lang("insufficient.permissions", player));
             return;
         }
 
-        processTeleport(player, cp, clan, player.getLocation());
+        processRegroup(player, cp, clan, player.getLocation());
     }
 
-    private void processTeleport(Player player, ClanPlayer cp, Clan clan, Location location) {
-        HomeRegroupEvent homeRegroupEvent = new HomeRegroupEvent(clan, cp, clan.getOnlineMembers(), location);
+    private void processRegroup(Player player, ClanPlayer cp, Clan clan, Location location) {
+        HomeRegroupEvent homeRegroupEvent = new HomeRegroupEvent(clan, cp, VanishUtils.getNonVanished(player, clan), location);
         plugin.getServer().getPluginManager().callEvent(homeRegroupEvent);
 
         if (homeRegroupEvent.isCancelled() || !cm.purchaseHomeRegroup(player)) {
             return;
         }
 
-        plugin.getTeleportManager().teleport(clan, location);
+        plugin.getTeleportManager().teleport(player, clan, location);
     }
 
     @Subcommand("%regroup %home")
     @CommandPermission("simpleclans.leader.regroup.home")
     @Conditions("rank:name=REGROUP_HOME")
     @Description("{@@command.description.regroup.home}")
-    public void regroupHome(Player player, ClanPlayer cp, Clan clan) {
-        if (!settings.getAllowReGroupCommand()) {
+    public void regroupHome(Player player, ClanPlayer cp, @Conditions("can_teleport") Clan clan) {
+        if (!settings.is(ALLOW_REGROUP)) {
             ChatBlock.sendMessage(player, RED + lang("insufficient.permissions", player));
             return;
         }
         Location location = clan.getHomeLocation();
-        if (location == null) {
-            ChatBlock.sendMessage(player, RED + lang("hombase.not.set", player));
-            return;
-        }
-
-        processTeleport(player, cp, clan, location);
+        processRegroup(player, cp, clan, location);
     }
 
     @Subcommand("%home")
     @CommandPermission("simpleclans.member.home")
     @Conditions("rank:name=HOME_TP")
     @Description("{@@command.description.home.tp}")
-    public void teleport(Player player, Clan clan, ClanPlayer cp) {
-        Location loc = clan.getHomeLocation();
-
-        if (loc == null) {
-            ChatBlock.sendMessage(player, RED + lang("hombase.not.set", player));
-            return;
-        }
+    public void teleport(Player player, @Conditions("can_teleport") Clan clan, ClanPlayer cp) {
+        Location homeLocation = clan.getHomeLocation();
 
         if (cm.purchaseHomeTeleport(player)) {
-            plugin.getTeleportManager().addPlayer(player, clan.getHomeLocation(), clan.getName());
+            plugin.getTeleportManager().addPlayer(player, homeLocation, clan.getName());
         }
     }
 
@@ -87,13 +86,19 @@ public class HomeCommands extends BaseCommand {
     @CommandPermission("simpleclans.leader.home-set")
     @Conditions("rank:name=HOME_SET")
     @Description("{@@command.description.home.clear}")
-    public void clear(Player player, Clan clan) {
-        if (settings.isHomebaseSetOnce() && clan.getHomeLocation() != null &&
+    public void clear(Player player, ClanPlayer cp, Clan clan) {
+        if (settings.is(CLAN_HOMEBASE_CAN_BE_SET_ONLY_ONCE) && clan.getHomeLocation() != null &&
                 !permissions.has(player, "simpleclans.mod.home")) {
             ChatBlock.sendMessage(player, RED + lang("home.base.only.once", player));
             return;
         }
 
+        PlayerHomeClearEvent event = new PlayerHomeClearEvent(clan, cp);
+        Bukkit.getPluginManager().callEvent(event);
+        if (event.isCancelled()) {
+            return;
+        }
+
         clan.setHomeLocation(null);
         ChatBlock.sendMessage(player, AQUA + lang("hombase.cleared", player));
     }
@@ -103,11 +108,17 @@ public class HomeCommands extends BaseCommand {
     @CommandPermission("simpleclans.leader.home-set")
     @Description("{@@command.description.home.set}")
     public void set(Player player, ClanPlayer cp, Clan clan) {
-        if (settings.isHomebaseSetOnce() && clan.getHomeLocation() != null &&
+        if (settings.is(CLAN_HOMEBASE_CAN_BE_SET_ONLY_ONCE) && clan.getHomeLocation() != null &&
                 !permissions.has(player, "simpleclans.mod.home")) {
             ChatBlock.sendMessage(player, RED + lang("home.base.only.once", player));
             return;
         }
+        if (settings.is(LAND_SET_BASE_ONLY_IN_LAND)) {
+            if (!protection.isOwner(player, player.getLocation())) {
+                ChatBlock.sendMessageKey(player, "you.can.only.set.base.in.your.land");
+                return;
+            }
+        }
         PlayerHomeSetEvent homeSetEvent = new PlayerHomeSetEvent(clan, cp, player.getLocation());
         plugin.getServer().getPluginManager().callEvent(homeSetEvent);
 

src/main/java/net/sacredlabyrinth/phaed/simpleclans/commands/clan/LandCommand.java

@@ -0,0 +1,178 @@
+package net.sacredlabyrinth.phaed.simpleclans.commands.clan;
+
+import co.aikar.commands.BaseCommand;
+import co.aikar.commands.annotation.*;
+import net.sacredlabyrinth.phaed.simpleclans.ChatBlock;
+import net.sacredlabyrinth.phaed.simpleclans.ClanPlayer;
+import net.sacredlabyrinth.phaed.simpleclans.hooks.protection.Land;
+import net.sacredlabyrinth.phaed.simpleclans.managers.ProtectionManager;
+import net.sacredlabyrinth.phaed.simpleclans.managers.SettingsManager;
+import org.bukkit.Location;
+import org.bukkit.entity.Player;
+
+import java.util.Objects;
+import java.util.Set;
+import java.util.stream.Collectors;
+
+import static net.sacredlabyrinth.phaed.simpleclans.managers.SettingsManager.ConfigField.LAND_EDIT_ALL_LANDS;
+
+@CommandAlias("%clan")
+@Subcommand("%land")
+@Conditions("%basic_conditions|clan_member|land_sharing|own_land")
+@CommandPermission("simpleclans.member.land")
+public class LandCommand extends BaseCommand {
+
+    @Dependency
+    private ProtectionManager protection;
+    @Dependency
+    private SettingsManager settings;
+
+    private Set<Land> getLands(ClanPlayer cp, Location location) {
+        Player player = Objects.requireNonNull(cp.toPlayer());
+        if (settings.is(LAND_EDIT_ALL_LANDS)) {
+            return protection.getLands(player, location);
+        } else {
+            return protection.getLandsAt(location).stream().filter(l -> l.getOwners().contains(player.getUniqueId()))
+                    .collect(Collectors.toSet());
+        }
+    }
+
+    @Subcommand("%allow")
+    public class AllowCommand extends BaseCommand {
+
+        private void allow(ClanPlayer cp, ProtectionManager.Action action, Location location) {
+            allow(cp, action, location, true);
+        }
+
+        private void allow(ClanPlayer cp, ProtectionManager.Action action, Location location, boolean notify) {
+            for (Land land : getLands(cp, location)) {
+                cp.allow(action, land.getId());
+            }
+            if (notify) {
+                ChatBlock.sendMessageKey(cp, "land.allowed.action");
+            }
+        }
+
+        @Subcommand("%container")
+        @Description("{@@command.description.land.allow.container}")
+        @CommandPermission("simpleclans.member.land.allow.container")
+        public void container(Player player, ClanPlayer cp) {
+            allow(cp, ProtectionManager.Action.CONTAINER, player.getLocation());
+        }
+
+        @Subcommand("%place")
+        @Description("{@@command.description.land.allow.place}")
+        @CommandPermission("simpleclans.member.land.allow.place")
+        public void place(Player player, ClanPlayer cp) {
+            allow(cp, ProtectionManager.Action.PLACE, player.getLocation());
+        }
+
+        @Subcommand("%damage")
+        @Description("{@@command.description.land.allow.damage}")
+        @CommandPermission("simpleclans.member.land.allow.damage")
+        public void damage(Player player, ClanPlayer cp) {
+            allow(cp, ProtectionManager.Action.DAMAGE, player.getLocation());
+        }
+
+        @Subcommand("%interact_entity")
+        @Description("{@@command.description.land.allow.interact_entity}")
+        @CommandPermission("simpleclans.member.land.allow.interact_entity")
+        public void interactEntity(Player player, ClanPlayer cp) {
+            allow(cp, ProtectionManager.Action.INTERACT_ENTITY, player.getLocation());
+        }
+
+        @Subcommand("%interact")
+        @Description("{@@command.description.land.allow.interact}")
+        @CommandPermission("simpleclans.member.land.allow.interact")
+        public void interact(Player player, ClanPlayer cp) {
+            allow(cp, ProtectionManager.Action.INTERACT, player.getLocation());
+        }
+
+        @Subcommand("%break")
+        @Description("{@@command.description.land.allow.break}")
+        @CommandPermission("simpleclans.member.land.allow.break")
+        public void allowBreak(Player player, ClanPlayer cp) {
+            allow(cp, ProtectionManager.Action.BREAK, player.getLocation());
+        }
+
+        @Subcommand("%all")
+        @Description("{@@command.description.land.allow.all}")
+        @CommandPermission("simpleclans.member.land.allow.all")
+        public void all(Player player, ClanPlayer cp) {
+            for (ProtectionManager.Action action : ProtectionManager.Action.values()) {
+                allow(cp, action, player.getLocation(), false);
+            }
+            ChatBlock.sendMessageKey(player, "land.allowed.all.actions");
+        }
+    }
+
+    @Subcommand("%block")
+    public class BlockCommand extends BaseCommand {
+
+        private void block(ClanPlayer cp, ProtectionManager.Action action, Location location) {
+            block(cp, action, location, true);
+        }
+
+        private void block(ClanPlayer cp, ProtectionManager.Action action, Location location, boolean notify) {
+            for (Land land : getLands(cp, location)) {
+                cp.disallow(action, land.getId());
+            }
+            if (notify) {
+                ChatBlock.sendMessageKey(cp, "land.blocked.action");
+            }
+        }
+
+        @Subcommand("%container")
+        @Description("{@@command.description.land.block.container}")
+        @CommandPermission("simpleclans.member.land.block.container")
+        public void container(Player player, ClanPlayer cp) {
+            block(cp, ProtectionManager.Action.CONTAINER, player.getLocation());
+        }
+
+        @Subcommand("%place")
+        @Description("{@@command.description.land.block.place}")
+        @CommandPermission("simpleclans.member.land.block.place")
+        public void place(Player player, ClanPlayer cp) {
+            block(cp, ProtectionManager.Action.PLACE, player.getLocation());
+        }
+
+        @Subcommand("%damage")
+        @Description("{@@command.description.land.block.damage}")
+        @CommandPermission("simpleclans.member.land.block.damage")
+        public void damage(Player player, ClanPlayer cp) {
+            block(cp, ProtectionManager.Action.DAMAGE, player.getLocation());
+        }
+
+        @Subcommand("%interact_entity")
+        @Description("{@@command.description.land.block.interact_entity}")
+        @CommandPermission("simpleclans.member.land.block.interact_entity")
+        public void interactEntity(Player player, ClanPlayer cp) {
+            block(cp, ProtectionManager.Action.INTERACT_ENTITY, player.getLocation());
+        }
+
+        @Subcommand("%interact")
+        @Description("{@@command.description.land.block.interact}")
+        @CommandPermission("simpleclans.member.land.block.interact")
+        public void interact(Player player, ClanPlayer cp) {
+            block(cp, ProtectionManager.Action.INTERACT, player.getLocation());
+        }
+
+        @Subcommand("%break")
+        @Description("{@@command.description.land.block.break}")
+        @CommandPermission("simpleclans.member.land.block.break")
+        public void blockBreak(Player player, ClanPlayer cp) {
+            block(cp, ProtectionManager.Action.BREAK, player.getLocation());
+        }
+
+        @Subcommand("%all")
+        @Description("{@@command.description.land.block.all}")
+        @CommandPermission("simpleclans.member.land.block.all")
+        public void all(Player player, ClanPlayer cp) {
+            protection.getLandsAt(player.getLocation());
+            for (ProtectionManager.Action action : ProtectionManager.Action.values()) {
+                block(cp, action, player.getLocation(), false);
+            }
+            ChatBlock.sendMessageKey(player, "land.blocked.all.actions");
+        }
+    }
+}

src/main/java/net/sacredlabyrinth/phaed/simpleclans/commands/clan/LeaderCommands.java

@@ -2,10 +2,12 @@ package net.sacredlabyrinth.phaed.simpleclans.commands.clan;
 
 import co.aikar.commands.BaseCommand;
 import co.aikar.commands.annotation.*;
-import net.sacredlabyrinth.phaed.simpleclans.ChatBlock;
-import net.sacredlabyrinth.phaed.simpleclans.Clan;
-import net.sacredlabyrinth.phaed.simpleclans.ClanPlayer;
+import net.sacredlabyrinth.phaed.simpleclans.*;
 import net.sacredlabyrinth.phaed.simpleclans.commands.ClanPlayerInput;
+import net.sacredlabyrinth.phaed.simpleclans.conversation.DisbandPrompt;
+import net.sacredlabyrinth.phaed.simpleclans.conversation.SCConversation;
+import net.sacredlabyrinth.phaed.simpleclans.hooks.discord.DiscordHook;
+import net.sacredlabyrinth.phaed.simpleclans.hooks.discord.exceptions.DiscordHookException;
 import net.sacredlabyrinth.phaed.simpleclans.managers.*;
 import org.bukkit.ChatColor;
 import org.bukkit.entity.Player;
@@ -13,6 +15,8 @@ import org.bukkit.entity.Player;
 import java.util.Objects;
 
 import static net.sacredlabyrinth.phaed.simpleclans.SimpleClans.lang;
+import static net.sacredlabyrinth.phaed.simpleclans.events.EconomyTransactionEvent.Cause.DISCORD_CREATION;
+import static net.sacredlabyrinth.phaed.simpleclans.managers.SettingsManager.ConfigField.*;
 import static org.bukkit.ChatColor.AQUA;
 import static org.bukkit.ChatColor.RED;
 
@@ -20,6 +24,8 @@ import static org.bukkit.ChatColor.RED;
 @Conditions("%basic_conditions|leader")
 public class LeaderCommands extends BaseCommand {
 
+    @Dependency
+    private SimpleClans plugin;
     @Dependency
     private StorageManager storage;
     @Dependency
@@ -30,6 +36,8 @@ public class LeaderCommands extends BaseCommand {
     private RequestManager requestManager;
     @Dependency
     private ClanManager cm;
+    @Dependency
+    private ChatManager chatManager;
 
     @Subcommand("%demote")
     @CommandCompletion("@clan_leaders")
@@ -48,13 +56,13 @@ public class LeaderCommands extends BaseCommand {
             ChatBlock.sendMessage(player, RED + lang("player.is.not.a.leader.of.your.clan", player));
             return;
         }
-        if (clan.getLeaders().size() > 2 && settings.isConfirmationForDemote()) {
+        if (clan.getLeaders().size() > 2 && settings.is(CLAN_CONFIRMATION_FOR_DEMOTE)) {
             requestManager.addDemoteRequest(cp, otherCp.getName(), clan);
             ChatBlock.sendMessage(player, AQUA + lang("demotion.vote.has.been.requested.from.all.leaders",
                     player));
             return;
         }
-        clan.addBb(player.getName(), AQUA + lang("demoted.back.to.member", otherCp.getName()));
+        clan.addBb(player.getName(), lang("demoted.back.to.member", otherCp.getName()));
         clan.demote(otherCp.getUniqueId());
     }
 
@@ -80,14 +88,14 @@ public class LeaderCommands extends BaseCommand {
             ChatBlock.sendMessage(player, RED + lang("the.player.is.already.a.leader", player));
             return;
         }
-        if (settings.isConfirmationForPromote() && clan.getLeaders().size() > 1) {
-            requestManager.addPromoteRequest(cp, otherPl.getName(), clan);
+        if (settings.is(CLAN_CONFIRMATION_FOR_PROMOTE) && clan.getLeaders().size() > 1) {
+            requestManager.requestAllLeaders(cp, ClanRequest.PROMOTE, otherPl.getName(), "asking.for.the.promotion", otherPl.getName());
             ChatBlock.sendMessage(player, AQUA + lang("promotion.vote.has.been.requested.from.all.leaders",
                     player));
             return;
         }
 
-        clan.addBb(player.getName(), AQUA + lang("promoted.to.leader", otherPl.getName()));
+        clan.addBb(player.getName(), lang("promoted.to.leader", otherPl.getName()));
         clan.promote(otherPl.getUniqueId());
     }
 
@@ -96,14 +104,13 @@ public class LeaderCommands extends BaseCommand {
     @Description("{@@command.description.disband}")
     public void disband(Player player, ClanPlayer cp, Clan clan) {
         if (clan.getLeaders().size() != 1) {
-            requestManager.addDisbandRequest(cp, clan);
+            requestManager.requestAllLeaders(cp, ClanRequest.DISBAND, clan.getTag(), "asking.to.disband");
             ChatBlock.sendMessage(player, AQUA +
                     lang("clan.disband.vote.has.been.requested.from.all.leaders", player));
             return;
         }
 
-        clan.clanAnnounce(player.getName(), AQUA + lang("clan.has.been.disbanded", clan.getName()));
-        clan.disband();
+        new SCConversation(plugin, player, new DisbandPrompt()).begin();
     }
 
     @Subcommand("%verify")
@@ -114,18 +121,18 @@ public class LeaderCommands extends BaseCommand {
             ChatBlock.sendMessageKey(player, "your.clan.already.verified");
             return;
         }
-        if (!settings.isePurchaseVerification()) {
+        if (!settings.is(ECONOMY_PURCHASE_CLAN_VERIFY)) {
             ChatBlock.sendMessageKey(player, "staff.member.verify.clan");
             return;
         }
-        int minToVerify = settings.getMinToVerify();
-        if (minToVerify > clan.getAllMembers().size()) {
+        int minToVerify = settings.getInt(CLAN_MIN_TO_VERIFY);
+        if (minToVerify > clan.getMembers().size()) {
             ChatBlock.sendMessage(player, lang("your.clan.must.have.members.to.verify", player, minToVerify));
             return;
         }
         if (cm.purchaseVerification(player)) {
             clan.verifyClan();
-            clan.addBb(player.getName(), AQUA + lang("clan.0.has.been.verified", clan.getName()));
+            clan.addBb(player.getName(), lang("clan.0.has.been.verified", clan.getName()));
             ChatBlock.sendMessage(player, AQUA + lang("the.clan.has.been.verified", player));
         }
     }
@@ -148,7 +155,7 @@ public class LeaderCommands extends BaseCommand {
             ChatBlock.sendMessage(player, ChatColor.RED + lang("this.player.is.already.trusted", player));
             return;
         }
-        clan.addBb(player.getName(), AQUA + lang("has.been.given.trusted.status.by", trustedInput.getName(),
+        clan.addBb(player.getName(), lang("has.been.given.trusted.status.by", trustedInput.getName(),
                 player.getName()));
         trustedInput.setTrusted(true);
         storage.updateClanPlayer(trustedInput);
@@ -173,9 +180,69 @@ public class LeaderCommands extends BaseCommand {
             return;
         }
 
-        clan.addBb(player.getName(), AQUA + lang("has.been.given.untrusted.status.by", trustedInput.getName(),
+        clan.addBb(player.getName(), lang("has.been.given.untrusted.status.by", trustedInput.getName(),
                 player.getName()));
         trustedInput.setTrusted(false);
         storage.updateClanPlayer(trustedInput);
     }
+
+    @Subcommand("%rename")
+    @CommandPermission("simpleclans.leader.rename")
+    @CommandCompletion("@nothing")
+    @Description("{@@command.description.rename}")
+    public void rename(ClanPlayer cp, Clan clan, @Name("name") String clanName) {
+        if (clanName.contains("&")) {
+            ChatBlock.sendMessageKey(cp, "your.clan.name.cannot.contain.color.codes");
+            return;
+        }
+
+        if (clan.getLeaders().size() != 1) {
+            requestManager.requestAllLeaders(cp, ClanRequest.RENAME, "asking.to.rename", clanName);
+            ChatBlock.sendMessageKey(cp, "rename.vote.has.been.requested.from.all.leaders");
+            return;
+        }
+
+        clan.setName(clanName);
+        storage.updateClan(clan);
+
+        ChatBlock.sendMessageKey(cp, "you.have.successfully.renamed.your.clan", clanName);
+    }
+
+    @Subcommand("%discord %create")
+    @CommandPermission("simpleclans.leader.discord.create")
+    @Description("{@@command.description.discord.create}")
+    @Conditions("verified")
+    public void discord(Player player, Clan clan) {
+        DiscordHook discordHook = chatManager.getDiscordHook();
+        if (discordHook == null) {
+            ChatBlock.sendMessageKey(player, "discordhook.is.disabled");
+            return;
+        }
+
+        double amount = settings.getDouble(ECONOMY_DISCORD_CREATION_PRICE);
+        if (settings.is(ECONOMY_PURCHASE_DISCORD_CREATE)) {
+            if (!permissions.playerHasMoney(player, amount)) {
+                player.sendMessage(AQUA + lang("not.sufficient.money", player, amount));
+                return;
+            }
+
+            if (!permissions.chargePlayer(player, amount, DISCORD_CREATION)) {
+                return;
+            }
+        }
+
+        try {
+            discordHook.createChannel(clan.getTag());
+            ChatBlock.sendMessageKey(player, "discord.created.successfully");
+        } catch (DiscordHookException ex) {
+            // Return player's money if clan creation went wrong
+            if (settings.is(ECONOMY_PURCHASE_DISCORD_CREATE)) {
+                permissions.grantPlayer(player, amount, DISCORD_CREATION);
+            }
+            String messageKey = ex.getMessageKey();
+            if (messageKey != null) {
+                ChatBlock.sendMessage(player, RED + lang(messageKey));
+            }
+        }
+    }
 }

src/main/java/net/sacredlabyrinth/phaed/simpleclans/commands/clan/RankCommand.java

@@ -5,11 +5,15 @@ import co.aikar.commands.annotation.*;
 import net.sacredlabyrinth.phaed.simpleclans.*;
 import net.sacredlabyrinth.phaed.simpleclans.commands.ClanPlayerInput;
 import net.sacredlabyrinth.phaed.simpleclans.conversation.CreateRankNamePrompt;
+import net.sacredlabyrinth.phaed.simpleclans.conversation.RequestCanceller;
+import net.sacredlabyrinth.phaed.simpleclans.conversation.SCConversation;
+import net.sacredlabyrinth.phaed.simpleclans.events.DeleteRankEvent;
+import net.sacredlabyrinth.phaed.simpleclans.events.PlayerRankUpdateEvent;
 import net.sacredlabyrinth.phaed.simpleclans.managers.PermissionsManager;
 import net.sacredlabyrinth.phaed.simpleclans.managers.StorageManager;
+import net.sacredlabyrinth.phaed.simpleclans.utils.ChatUtils;
+import org.bukkit.Bukkit;
 import org.bukkit.ChatColor;
-import org.bukkit.conversations.Conversation;
-import org.bukkit.conversations.ConversationFactory;
 import org.bukkit.entity.Player;
 
 import java.util.Comparator;
@@ -36,11 +40,17 @@ public class RankCommand extends BaseCommand {
     @CommandPermission("simpleclans.leader.rank.assign")
     @CommandCompletion("@clan_members @ranks")
     @Description("{@@command.description.rank.assign}")
-    public void assign(Player player,
+    public void assign(ClanPlayer player,
                        Clan clan,
                        @Name("member") @Conditions("same_clan") ClanPlayerInput member,
                        @Name("rank") Rank rank) {
         ClanPlayer memberInput = member.getClanPlayer();
+
+        PlayerRankUpdateEvent event = new PlayerRankUpdateEvent(player, memberInput, clan, clan.getRank(memberInput.getRankId()), rank);
+        Bukkit.getPluginManager().callEvent(event);
+
+        if (event.isCancelled()) return;
+
         if (memberInput.getRankId().equals(rank.getName())) {
             ChatBlock.sendMessage(player, lang("player.already.has.that.rank", player));
             return;
@@ -55,10 +65,16 @@ public class RankCommand extends BaseCommand {
     @CommandPermission("simpleclans.leader.rank.unassign")
     @CommandCompletion("@clan_members")
     @Description("{@@command.description.rank.unassign}")
-    public void unassign(Player player, @Conditions("same_clan") @Name("member") ClanPlayerInput cp) {
-        ClanPlayer cpInput = cp.getClanPlayer();
-        cpInput.setRank(null);
-        storage.updateClanPlayer(cpInput);
+    public void unassign(ClanPlayer player, Clan clan, @Conditions("same_clan") @Name("member") ClanPlayerInput cp) {
+        ClanPlayer memberInput = cp.getClanPlayer();
+
+        PlayerRankUpdateEvent event = new PlayerRankUpdateEvent(player, memberInput, clan, clan.getRank(memberInput.getRankId()), null);
+        Bukkit.getPluginManager().callEvent(event);
+
+        if (event.isCancelled()) return;
+
+        memberInput.setRank(null);
+        storage.updateClanPlayer(memberInput);
         ChatBlock.sendMessage(player, AQUA + lang("player.unassigned.from.rank", player));
     }
 
@@ -66,8 +82,8 @@ public class RankCommand extends BaseCommand {
     @CommandPermission("simpleclans.leader.rank.create")
     @Description("{@@command.description.rank.create}")
     public void create(Player player, Clan clan) {
-        Conversation conversation = new ConversationFactory(plugin).withFirstPrompt(new CreateRankNamePrompt())
-                .withLocalEcho(true).buildConversation(player);
+        SCConversation conversation = new SCConversation(plugin, player, new CreateRankNamePrompt(), 60);
+        conversation.addConversationCanceller(new RequestCanceller(player, RED + lang("rank.create.request.cancelled", player)));
         conversation.getContext().setSessionData("clan", clan);
         conversation.begin();
     }
@@ -77,9 +93,14 @@ public class RankCommand extends BaseCommand {
     @CommandCompletion("@ranks")
     @Description("{@@command.description.rank.delete}")
     public void delete(Player player, Clan clan, @Name("rank") Rank rank) {
-        clan.deleteRank(rank.getName());
-        storage.updateClan(clan, true);
-        ChatBlock.sendMessage(player, AQUA + lang("rank.0.deleted", player, rank.getDisplayName()));
+        DeleteRankEvent event = new DeleteRankEvent(player, clan, rank);
+        Bukkit.getServer().getPluginManager().callEvent(event);
+
+        if (!event.isCancelled()) {
+            clan.deleteRank(rank.getName());
+            storage.updateClan(clan, true);
+            ChatBlock.sendMessage(player, AQUA + lang("rank.0.deleted", player, rank.getDisplayName()));
+        }
     }
 
     @Subcommand("%list")
@@ -98,7 +119,7 @@ public class RankCommand extends BaseCommand {
         int count = 1;
         for (Rank rank : ranks) {
             ChatBlock.sendMessage(player, AQUA + lang("ranks.list.item", player, count,
-                    Helper.parseColors(rank.getDisplayName()) + AQUA, rank.getName()));
+                    ChatUtils.parseColors(rank.getDisplayName()) + AQUA, rank.getName()));
             count++;
         }
     }
@@ -117,9 +138,26 @@ public class RankCommand extends BaseCommand {
         ChatBlock.sendMessage(player, ChatColor.AQUA + lang("rank.displayname.updated", player));
     }
 
+    @Subcommand("%setdefault")
+    @CommandPermission("simpleclans.leader.rank.setdefault")
+    @CommandCompletion("@ranks")
+    @Description("{@@command.description.rank.setdefault}")
+    public void setDefault(Player player, Clan clan, @Name("rank") Rank rank) {
+        clan.setDefaultRank(rank.getName());
+        ChatBlock.sendMessage(player, AQUA + lang("rank.setdefault", player, rank.getDisplayName()));
+    }
+
+    @Subcommand("%removedefault")
+    @CommandPermission("simpleclans.leader.rank.removedefault")
+    @Description("{@@command.description.rank.removedefault}")
+    public void removeDefault(Player player, Clan clan) {
+        clan.setDefaultRank(null);
+        ChatBlock.sendMessage(player, AQUA + lang("rank.removedefault", player));
+    }
+
     @Subcommand("%permissions")
     public class PermissionsCommand extends BaseCommand {
-        private final String validPermissionsToMessage = Helper.toMessage(Helper.fromPermissionArray(), ",");
+        private final String validPermissionsToMessage = String.join(",", Helper.fromPermissionArray());
 
         @Default
         @CommandPermission("simpleclans.leader.rank.permissions.available")
@@ -140,7 +178,7 @@ public class RankCommand extends BaseCommand {
                 return;
             }
             ChatBlock.sendMessage(player, AQUA + lang("rank.0.permissions", player, rank.getDisplayName()));
-            ChatBlock.sendMessage(player, AQUA + Helper.toMessage(permissions.toArray(new String[0]), ","));
+            ChatBlock.sendMessage(player, AQUA + String.join(",", permissions));
         }
 
         @Subcommand("%add")

src/main/java/net/sacredlabyrinth/phaed/simpleclans/commands/clan/ToggleCommand.java

@@ -16,61 +16,68 @@ import static org.bukkit.ChatColor.AQUA;
 
 @CommandAlias("%clan")
 @Subcommand("%toggle")
-@Conditions("%basic_conditions|verified")
+@Conditions("%basic_conditions")
 public class ToggleCommand extends BaseCommand {
 
     @Dependency
     private StorageManager storage;
 
-    @Subcommand("%bb")
-    @CommandPermission("simpleclans.member.bb-toggle")
-    @Description("{@@command.description.toggle.bb}")
-    public void bb(Player player, ClanPlayer cp) {
-        toggle(player, "bbon", "bboff", cp.isBbEnabled(), cp::setBbEnabled);
+    @Conditions("verified")
+    public class Verified extends BaseCommand {
+        
+        @Subcommand("%bb")
+        @CommandPermission("simpleclans.member.bb-toggle")
+        @Description("{@@command.description.toggle.bb}")
+        public void bb(Player player, ClanPlayer cp) {
+            toggle(player, "bbon", "bboff", cp.isBbEnabled(), cp::setBbEnabled);
+        }
 
-        storage.updateClanPlayer(cp);
+        @Subcommand("%tag")
+        @CommandPermission("simpleclans.member.tag-toggle")
+        @Description("{@@command.description.toggle.tag}")
+        public void tag(Player player, ClanPlayer cp) {
+            toggle(player, "tagon", "tagoff", cp.isTagEnabled(), cp::setTagEnabled);
+        }
+
+        @Subcommand("%deposit")
+        @CommandPermission("simpleclans.leader.deposit-toggle")
+        @Conditions("leader")
+        @Description("{@@command.description.toggle.deposit}")
+        public void deposit(Player player, Clan clan) {
+            toggle(player, "depositon", "depositoff", clan.isAllowDeposit(),
+                    clan::setAllowDeposit);
+
+            storage.updateClan(clan);
+        }
+
+        @Subcommand("%fee")
+        @CommandPermission("simpleclans.leader.fee")
+        @Conditions("rank:name=FEE_ENABLE|change_fee")
+        @Description("{@@command.description.toggle.fee}")
+        public void fee(Player player, Clan clan) {
+            toggle(player, "feeon", "feeoff", clan.isMemberFeeEnabled(),
+                    clan::setMemberFeeEnabled);
+
+            storage.updateClan(clan);
+        }
+
+        @Subcommand("%withdraw")
+        @CommandPermission("simpleclans.leader.withdraw-toggle")
+        @Conditions("leader")
+        @Description("{@@command.description.toggle.withdraw}")
+        public void withdraw(Player player, Clan clan) {
+            toggle(player, "withdrawon", "withdrawoff", clan.isAllowWithdraw(),
+                    clan::setAllowWithdraw);
+
+            storage.updateClan(clan);
+        }
     }
 
-    @Subcommand("%tag")
-    @CommandPermission("simpleclans.member.tag-toggle")
-    @Description("{@@command.description.toggle.tag}")
-    public void tag(Player player, ClanPlayer cp) {
-        toggle(player, "tagon", "tagoff", cp.isTagEnabled(), cp::setTagEnabled);
-
-        storage.updateClanPlayer(cp);
-    }
-
-    @Subcommand("%deposit")
-    @CommandPermission("simpleclans.leader.deposit-toggle")
-    @Conditions("leader")
-    @Description("{@@command.description.toggle.deposit}")
-    public void deposit(Player player, Clan clan) {
-        toggle(player, "depositon", "depositoff", clan.isAllowDeposit(),
-                clan::setAllowDeposit);
-
-        storage.updateClan(clan);
-    }
-
-    @Subcommand("%fee")
-    @CommandPermission("simpleclans.leader.fee")
-    @Conditions("rank:name=FEE_ENABLE")
-    @Description("{@@command.description.toggle.fee}")
-    public void fee(Player player, Clan clan) {
-        toggle(player, "feeon", "feeoff", clan.isMemberFeeEnabled(),
-                clan::setMemberFeeEnabled);
-
-        storage.updateClan(clan);
-    }
-
-    @Subcommand("%withdraw")
-    @CommandPermission("simpleclans.leader.withdraw-toggle")
-    @Conditions("leader")
-    @Description("{@@command.description.toggle.withdraw}")
-    public void withdraw(Player player, Clan clan) {
-        toggle(player, "withdrawon", "withdrawoff", clan.isAllowWithdraw(),
-                clan::setAllowWithdraw);
-
-        storage.updateClan(clan);
+    @Subcommand("%invite")
+    @CommandPermission("simpleclans.anyone.invite-toggle")
+    @Description("{@@command.description.toggle.invite}")
+    public void invite(Player player, ClanPlayer cp) {
+        toggle(player, "inviteon", "inviteoff", cp.isInviteEnabled(), cp::setInviteEnabled);
     }
 
     private void toggle(CommandSender sender, String onMessageKey, String offMessageKey, boolean status,

src/main/java/net/sacredlabyrinth/phaed/simpleclans/commands/completions/ClanMembersCompletion.java

@@ -10,8 +10,10 @@ import org.jetbrains.annotations.NotNull;
 
 import java.util.Collection;
 import java.util.Collections;
+import java.util.List;
 import java.util.stream.Collectors;
 
+@SuppressWarnings("unused")
 public class ClanMembersCompletion extends AbstractSyncCompletion {
     public ClanMembersCompletion(@NotNull SimpleClans plugin) {
         super(plugin);
@@ -23,7 +25,11 @@ public class ClanMembersCompletion extends AbstractSyncCompletion {
         if (player != null) {
             Clan clan = clanManager.getClanByPlayerUniqueId(player.getUniqueId());
             if (clan != null) {
-                return clan.getAllMembers().stream().map(ClanPlayer::getName).collect(Collectors.toList());
+                List<String> list = clan.getMembers().stream().map(ClanPlayer::getName).collect(Collectors.toList());
+                if (c.hasConfig("hide_own")) {
+                    list.remove(player.getName());
+                }
+                return list;
             }
         }
         return Collections.emptyList();

src/main/java/net/sacredlabyrinth/phaed/simpleclans/commands/completions/ClansCompletion.java

@@ -1,14 +1,16 @@
 package net.sacredlabyrinth.phaed.simpleclans.commands.completions;
 
 import co.aikar.commands.BukkitCommandCompletionContext;
+import co.aikar.commands.CommandIssuer;
 import co.aikar.commands.InvalidCommandArgument;
 import net.sacredlabyrinth.phaed.simpleclans.Clan;
 import net.sacredlabyrinth.phaed.simpleclans.SimpleClans;
 import org.jetbrains.annotations.NotNull;
+import org.jetbrains.annotations.Nullable;
 
 import java.util.Collection;
+import java.util.List;
 import java.util.stream.Collectors;
-import java.util.stream.Stream;
 
 public class ClansCompletion extends AbstractSyncCompletion {
     public ClansCompletion(@NotNull SimpleClans plugin) {
@@ -17,18 +19,28 @@ public class ClansCompletion extends AbstractSyncCompletion {
 
     @Override
     public Collection<String> getCompletions(BukkitCommandCompletionContext c) throws InvalidCommandArgument {
-        Stream<Clan> clans = clanManager.getClans().stream();
+        List<Clan> clans = clanManager.getClans();
         if (c.hasConfig("has_home")) {
-            clans = clans.filter(clan -> clan.getHomeLocation() != null);
+            clans.removeIf(clan -> clan.getHomeLocation() == null);
         }
         if (c.hasConfig("unverified")) {
-            clans = clans.filter(clan -> !clan.isVerified());
+            clans.removeIf(Clan::isVerified);
         }
-        return clans.map(Clan::getTag).collect(Collectors.toList());
+        if (c.hasConfig("hide_own")) {
+            Clan clan = getClan(c.getIssuer());
+            if (clan != null) {
+                clans.remove(clan);
+            }
+        }
+        return clans.stream().map(Clan::getTag).collect(Collectors.toList());
     }
 
     @Override
     public @NotNull String getId() {
         return "clans";
     }
+
+    private @Nullable Clan getClan(CommandIssuer issuer) {
+        return clanManager.getClanByPlayerUniqueId(issuer.getUniqueId());
+    }
 }

src/main/java/net/sacredlabyrinth/phaed/simpleclans/commands/completions/LocaleCompletion.java

@@ -0,0 +1,31 @@
+package net.sacredlabyrinth.phaed.simpleclans.commands.completions;
+
+import net.sacredlabyrinth.phaed.simpleclans.SimpleClans;
+import net.sacredlabyrinth.phaed.simpleclans.language.LanguageResource;
+import org.jetbrains.annotations.NotNull;
+
+import java.util.Collection;
+import java.util.List;
+
+@SuppressWarnings("unused")
+public class LocaleCompletion extends AbstractStaticCompletion {
+
+    private final List<String> availableLocales;
+
+    public LocaleCompletion(@NotNull SimpleClans plugin) {
+        super(plugin);
+        availableLocales = LanguageResource.getAvailableLocales().stream().
+                map(locale -> locale.toLanguageTag().replace("-", "_")).
+                toList();
+    }
+
+    @Override
+    public @NotNull Collection<String> getCompletions() {
+        return availableLocales;
+    }
+
+    @Override
+    public @NotNull String getId() {
+        return "locales";
+    }
+}

src/main/java/net/sacredlabyrinth/phaed/simpleclans/commands/completions/NonMembersCompletion.java

@@ -3,12 +3,13 @@ package net.sacredlabyrinth.phaed.simpleclans.commands.completions;
 import co.aikar.commands.BukkitCommandCompletionContext;
 import co.aikar.commands.InvalidCommandArgument;
 import net.sacredlabyrinth.phaed.simpleclans.SimpleClans;
+import net.sacredlabyrinth.phaed.simpleclans.utils.VanishUtils;
 import org.bukkit.Bukkit;
 import org.bukkit.entity.Player;
 import org.jetbrains.annotations.NotNull;
 
+import java.util.ArrayList;
 import java.util.Collection;
-import java.util.stream.Collectors;
 
 @SuppressWarnings("unused")
 public class NonMembersCompletion extends AbstractSyncCompletion {
@@ -23,10 +24,16 @@ public class NonMembersCompletion extends AbstractSyncCompletion {
 
     @Override
     public Collection<String> getCompletions(BukkitCommandCompletionContext c) throws InvalidCommandArgument {
-        Player player = c.getPlayer();
-        return Bukkit.getOnlinePlayers().stream()
-                .filter(p -> clanManager.getClanByPlayerUniqueId(p.getUniqueId()) == null
-                        && (player == null || player.canSee(p)))
-                .map(Player::getName).collect(Collectors.toList());
+        Collection<String> onlinePlayers = new ArrayList<>();
+
+        for (Player onlinePlayer : Bukkit.getOnlinePlayers()) {
+            boolean vanished = VanishUtils.isVanished(c.getSender(), onlinePlayer);
+            if (clanManager.getClanByPlayerUniqueId(onlinePlayer.getUniqueId()) != null || (c.hasConfig("ignore_vanished") && vanished)) {
+                continue;
+            }
+            onlinePlayers.add(onlinePlayer.getName());
+        }
+
+        return onlinePlayers;
     }
 }

src/main/java/net/sacredlabyrinth/phaed/simpleclans/commands/conditions/AbstractCondition.java

@@ -1,10 +1,7 @@
 package net.sacredlabyrinth.phaed.simpleclans.commands.conditions;
 
 import net.sacredlabyrinth.phaed.simpleclans.SimpleClans;
-import net.sacredlabyrinth.phaed.simpleclans.managers.ClanManager;
-import net.sacredlabyrinth.phaed.simpleclans.managers.PermissionsManager;
-import net.sacredlabyrinth.phaed.simpleclans.managers.RequestManager;
-import net.sacredlabyrinth.phaed.simpleclans.managers.SettingsManager;
+import net.sacredlabyrinth.phaed.simpleclans.managers.*;
 import org.jetbrains.annotations.NotNull;
 
 public abstract class AbstractCondition implements IdentifiableCondition {
@@ -14,6 +11,7 @@ public abstract class AbstractCondition implements IdentifiableCondition {
     protected final ClanManager clanManager;
     protected final RequestManager requestManager;
     protected final SettingsManager settingsManager;
+    protected final ProtectionManager protectionManager;
 
     public AbstractCondition(@NotNull SimpleClans plugin) {
         this.plugin = plugin;
@@ -21,5 +19,6 @@ public abstract class AbstractCondition implements IdentifiableCondition {
         clanManager = plugin.getClanManager();
         requestManager = plugin.getRequestManager();
         settingsManager = plugin.getSettingsManager();
+        protectionManager = plugin.getProtectionManager();
     }
 }

src/main/java/net/sacredlabyrinth/phaed/simpleclans/commands/conditions/CanChangeFeeCondition.java

@@ -0,0 +1,56 @@
+package net.sacredlabyrinth.phaed.simpleclans.commands.conditions;
+
+import co.aikar.commands.BukkitCommandIssuer;
+import co.aikar.commands.ConditionContext;
+import co.aikar.commands.ConditionFailedException;
+import co.aikar.commands.InvalidCommandArgument;
+import net.sacredlabyrinth.phaed.simpleclans.SimpleClans;
+import org.jetbrains.annotations.NotNull;
+
+import java.time.LocalDateTime;
+
+import static java.time.temporal.ChronoUnit.MINUTES;
+import static net.sacredlabyrinth.phaed.simpleclans.SimpleClans.lang;
+import static net.sacredlabyrinth.phaed.simpleclans.managers.SettingsManager.ConfigField.*;
+
+@SuppressWarnings("unused")
+public class CanChangeFeeCondition extends AbstractCommandCondition {
+
+    private static final float HOUR_IN_MINUTES = 60;
+
+    public CanChangeFeeCondition(@NotNull SimpleClans plugin) {
+        super(plugin);
+    }
+
+    @Override
+    public void validateCondition(ConditionContext<BukkitCommandIssuer> context) throws InvalidCommandArgument {
+        LocalDateTime now = LocalDateTime.now();
+        LocalDateTime collectTime = getCollectTime();
+        long interval = now.until(collectTime, MINUTES);
+        if (interval <= settingsManager.getInt(ECONOMY_MEMBER_FEE_LAST_MINUTE_CHANGE_INTERVAL) * HOUR_IN_MINUTES) {
+            BukkitCommandIssuer issuer = context.getIssuer();
+            String error = lang("cannot.change.member.fee.now", issuer);
+            if (interval <= 60) {
+                error += lang("cannot.change.member.fee.minutes", issuer, interval);
+            } else {
+                error += lang("cannot.change.member.fee.hours", issuer, Math.ceil(interval / HOUR_IN_MINUTES));
+            }
+            throw new ConditionFailedException(error);
+        }
+    }
+
+    private LocalDateTime getCollectTime() {
+        LocalDateTime now = LocalDateTime.now();
+        LocalDateTime collectTime = now.withHour(settingsManager.getInt(TASKS_COLLECT_FEE_HOUR))
+                .withMinute(settingsManager.getInt(TASKS_COLLECT_FEE_MINUTE));
+        if (collectTime.isBefore(now)) {
+            collectTime = collectTime.plusDays(1);
+        }
+        return collectTime;
+    }
+
+    @Override
+    public @NotNull String getId() {
+        return "change_fee";
+    }
+}

src/main/java/net/sacredlabyrinth/phaed/simpleclans/commands/conditions/CanChatCondition.java

@@ -0,0 +1,31 @@
+package net.sacredlabyrinth.phaed.simpleclans.commands.conditions;
+
+import co.aikar.commands.BukkitCommandIssuer;
+import co.aikar.commands.ConditionContext;
+import co.aikar.commands.ConditionFailedException;
+import co.aikar.commands.InvalidCommandArgument;
+import net.sacredlabyrinth.phaed.simpleclans.SimpleClans;
+import org.jetbrains.annotations.NotNull;
+
+import static net.sacredlabyrinth.phaed.simpleclans.SimpleClans.lang;
+import static net.sacredlabyrinth.phaed.simpleclans.managers.SettingsManager.ConfigField;
+
+public class CanChatCondition extends AbstractCommandCondition {
+    public CanChatCondition(@NotNull SimpleClans plugin) {
+        super(plugin);
+    }
+
+    @Override
+    public void validateCondition(ConditionContext<BukkitCommandIssuer> context) throws InvalidCommandArgument {
+        String type = context.getConfigValue("type", (String) null).toUpperCase();
+        ConfigField chatEnabled = ConfigField.valueOf(type + "CHAT_ENABLE");
+        if (!settingsManager.is(chatEnabled)) {
+            throw new ConditionFailedException(lang(type.toLowerCase() + ".chat.disabled", context.getIssuer()));
+        }
+    }
+
+    @Override
+    public @NotNull String getId() {
+        return "can_chat";
+    }
+}

src/main/java/net/sacredlabyrinth/phaed/simpleclans/commands/conditions/CanVoteCondition.java

@@ -1,6 +1,9 @@
 package net.sacredlabyrinth.phaed.simpleclans.commands.conditions;
 
-import co.aikar.commands.*;
+import co.aikar.commands.BukkitCommandIssuer;
+import co.aikar.commands.ConditionContext;
+import co.aikar.commands.ConditionFailedException;
+import co.aikar.commands.InvalidCommandArgument;
 import net.sacredlabyrinth.phaed.simpleclans.Clan;
 import net.sacredlabyrinth.phaed.simpleclans.ClanPlayer;
 import net.sacredlabyrinth.phaed.simpleclans.SimpleClans;
@@ -23,12 +26,12 @@ public class CanVoteCondition extends AbstractCommandCondition {
         ClanPlayer cp = clanManager.getCreateClanPlayer(player.getUniqueId());
         Clan clan = cp.getClan();
         if (clan != null) {
-            if (!clan.isLeader(player)) {
-                throw new ConditionFailedException(RED + lang("no.leader.permissions", player));
-            }
             if (!requestManager.hasRequest(clan.getTag())) {
                 throw new ConditionFailedException(lang("nothing.to.vote", player));
             }
+            if (!clan.isLeader(player)) {
+                throw new ConditionFailedException(RED + lang("no.leader.permissions", player));
+            }
             if (cp.getVote() != null) {
                 throw new ConditionFailedException(RED + lang("you.have.already.voted", player));
             }

src/main/java/net/sacredlabyrinth/phaed/simpleclans/commands/conditions/CanWarTargetCondition.java

@@ -0,0 +1,51 @@
+package net.sacredlabyrinth.phaed.simpleclans.commands.conditions;
+
+import co.aikar.commands.*;
+import net.sacredlabyrinth.phaed.simpleclans.Clan;
+import net.sacredlabyrinth.phaed.simpleclans.SimpleClans;
+import net.sacredlabyrinth.phaed.simpleclans.commands.ClanInput;
+import org.jetbrains.annotations.NotNull;
+
+import static net.sacredlabyrinth.phaed.simpleclans.SimpleClans.lang;
+import static net.sacredlabyrinth.phaed.simpleclans.managers.SettingsManager.ConfigField.WAR_MAX_MEMBERS_DIFFERENCE;
+import static net.sacredlabyrinth.phaed.simpleclans.managers.SettingsManager.ConfigField.WAR_START_REQUEST_ENABLED;
+
+public class CanWarTargetCondition extends AbstractParameterCondition<ClanInput> {
+    public CanWarTargetCondition(@NotNull SimpleClans plugin) {
+        super(plugin);
+    }
+
+    @Override
+    public Class<ClanInput> getType() {
+        return ClanInput.class;
+    }
+
+    @Override
+    public void validateCondition(ConditionContext<BukkitCommandIssuer> context, BukkitCommandExecutionContext execContext, ClanInput target) throws InvalidCommandArgument {
+        BukkitCommandIssuer issuer = execContext.getIssuer();
+        Clan issuerClan = Conditions.assertClanMember(clanManager, issuer);
+        Clan targetClan = target.getClan();
+
+        if (!issuerClan.isRival(targetClan.getTag())) {
+            throw new ConditionFailedException(lang("you.can.only.start.war.with.rivals", issuer));
+        }
+
+        if (issuerClan.isWarring(targetClan)) {
+            throw new ConditionFailedException(lang("clans.already.at.war", issuer));
+        }
+
+        boolean isWarRequestEnabled = settingsManager.is(WAR_START_REQUEST_ENABLED);
+        int maxDifference = settingsManager.getInt(WAR_MAX_MEMBERS_DIFFERENCE);
+
+        if (!isWarRequestEnabled && maxDifference >= 0) {
+            int difference = Math.abs(issuerClan.getOnlineMembers().size() - targetClan.getOnlineMembers().size());
+            if (difference > maxDifference)
+                throw new ConditionFailedException(lang("you.cant.start.war.online.members.difference", issuer));
+        }
+    }
+
+    @Override
+    public @NotNull String getId() {
+        return "can_war_target";
+    }
+}

src/main/java/net/sacredlabyrinth/phaed/simpleclans/commands/conditions/InputVerifiedCondition.java

@@ -24,7 +24,7 @@ public class InputVerifiedCondition extends AbstractParameterCondition<ClanInput
                                   BukkitCommandExecutionContext execContext,
                                   ClanInput value)
             throws InvalidCommandArgument {
-        if (!value.getClan().isVerified()) {
+        if (!value.getClan().isVerified() && !context.getIssuer().hasPermission("simpleclans.mod.bypass")) {
             throw new ConditionFailedException(lang("other.clan.not.verified", execContext.getSender()));
         }
     }

src/main/java/net/sacredlabyrinth/phaed/simpleclans/commands/conditions/LandSharingCondition.java

@@ -0,0 +1,31 @@
+package net.sacredlabyrinth.phaed.simpleclans.commands.conditions;
+
+import co.aikar.commands.BukkitCommandIssuer;
+import co.aikar.commands.ConditionContext;
+import co.aikar.commands.ConditionFailedException;
+import co.aikar.commands.InvalidCommandArgument;
+import net.sacredlabyrinth.phaed.simpleclans.SimpleClans;
+import org.jetbrains.annotations.NotNull;
+
+import static net.sacredlabyrinth.phaed.simpleclans.SimpleClans.lang;
+import static net.sacredlabyrinth.phaed.simpleclans.managers.SettingsManager.ConfigField.LAND_SHARING;
+
+@SuppressWarnings("unused")
+public class LandSharingCondition extends AbstractCommandCondition {
+
+    public LandSharingCondition(@NotNull SimpleClans plugin) {
+        super(plugin);
+    }
+
+    @Override
+    public void validateCondition(ConditionContext<BukkitCommandIssuer> context) throws InvalidCommandArgument {
+        if (!settingsManager.is(LAND_SHARING)) {
+            throw new ConditionFailedException(lang("land.sharing.disabled", context.getIssuer()));
+        }
+    }
+
+    @Override
+    public @NotNull String getId() {
+        return "land_sharing";
+    }
+}

src/main/java/net/sacredlabyrinth/phaed/simpleclans/commands/conditions/MemberFeeEnabledCondition.java

@@ -9,6 +9,7 @@ import org.bukkit.ChatColor;
 import org.jetbrains.annotations.NotNull;
 
 import static net.sacredlabyrinth.phaed.simpleclans.SimpleClans.lang;
+import static net.sacredlabyrinth.phaed.simpleclans.managers.SettingsManager.ConfigField.ECONOMY_MEMBER_FEE_ENABLED;
 
 public class MemberFeeEnabledCondition extends AbstractCommandCondition {
     public MemberFeeEnabledCondition(@NotNull SimpleClans plugin) {
@@ -17,7 +18,7 @@ public class MemberFeeEnabledCondition extends AbstractCommandCondition {
 
     @Override
     public void validateCondition(ConditionContext<BukkitCommandIssuer> context) throws InvalidCommandArgument {
-        if (!settingsManager.isMemberFee()) {
+        if (!settingsManager.is(ECONOMY_MEMBER_FEE_ENABLED)) {
             throw new ConditionFailedException(ChatColor.RED + lang("disabled.command",
                     context.getIssuer().getIssuer()));
         }

src/main/java/net/sacredlabyrinth/phaed/simpleclans/commands/conditions/MinimumToAllyCondition.java

@@ -6,10 +6,10 @@ import co.aikar.commands.ConditionFailedException;
 import co.aikar.commands.InvalidCommandArgument;
 import net.sacredlabyrinth.phaed.simpleclans.Clan;
 import net.sacredlabyrinth.phaed.simpleclans.SimpleClans;
-import org.bukkit.command.CommandSender;
 import org.jetbrains.annotations.NotNull;
 
 import static net.sacredlabyrinth.phaed.simpleclans.SimpleClans.lang;
+import static net.sacredlabyrinth.phaed.simpleclans.managers.SettingsManager.ConfigField.CLAN_MIN_SIZE_TO_SET_ALLY;
 import static org.bukkit.ChatColor.RED;
 
 @SuppressWarnings("unused")
@@ -21,9 +21,9 @@ public class MinimumToAllyCondition extends AbstractCommandCondition {
     @Override
     public void validateCondition(ConditionContext<BukkitCommandIssuer> context) throws InvalidCommandArgument {
         Clan clan = Conditions.assertClanMember(clanManager, context.getIssuer());
-        if (clan.getSize() < settingsManager.getClanMinSizeToAlly()) {
+        if (clan.getSize() < settingsManager.getInt(CLAN_MIN_SIZE_TO_SET_ALLY)) {
             throw new ConditionFailedException(RED +
-                    lang("minimum.to.make.alliance", context.getIssuer(), settingsManager.getClanMinSizeToAlly()));
+                    lang("minimum.to.make.alliance", context.getIssuer(), settingsManager.getInt(CLAN_MIN_SIZE_TO_SET_ALLY)));
         }
     }
 

src/main/java/net/sacredlabyrinth/phaed/simpleclans/commands/conditions/MinimumToRivalCondition.java

@@ -9,6 +9,7 @@ import net.sacredlabyrinth.phaed.simpleclans.SimpleClans;
 import org.jetbrains.annotations.NotNull;
 
 import static net.sacredlabyrinth.phaed.simpleclans.SimpleClans.lang;
+import static net.sacredlabyrinth.phaed.simpleclans.managers.SettingsManager.ConfigField.CLAN_MIN_SIZE_TO_SET_RIVAL;
 import static org.bukkit.ChatColor.RED;
 
 @SuppressWarnings("unused")
@@ -21,9 +22,9 @@ public class MinimumToRivalCondition extends AbstractCommandCondition {
     public void validateCondition(ConditionContext<BukkitCommandIssuer> context) throws InvalidCommandArgument {
         BukkitCommandIssuer issuer = context.getIssuer();
         Clan clan = Conditions.assertClanMember(clanManager, issuer);
-        if (clan.getSize() < settingsManager.getClanMinSizeToRival()) {
+        if (clan.getSize() < settingsManager.getInt(CLAN_MIN_SIZE_TO_SET_RIVAL)) {
             throw new ConditionFailedException(RED + lang("min.players.rivalries", issuer,
-                    settingsManager.getClanMinSizeToRival()));
+                    settingsManager.getInt(CLAN_MIN_SIZE_TO_SET_RIVAL)));
         }
     }
 

src/main/java/net/sacredlabyrinth/phaed/simpleclans/commands/conditions/NotBlacklistedCondition.java

@@ -9,6 +9,8 @@ import org.bukkit.World;
 import org.bukkit.entity.Player;
 import org.jetbrains.annotations.NotNull;
 
+import static net.sacredlabyrinth.phaed.simpleclans.managers.SettingsManager.ConfigField.BLACKLISTED_WORLDS;
+
 @SuppressWarnings("unused")
 public class NotBlacklistedCondition extends AbstractCommandCondition {
 
@@ -22,7 +24,7 @@ public class NotBlacklistedCondition extends AbstractCommandCondition {
         if (player != null) {
             World world = player.getLocation().getWorld();
             if (world != null) {
-                if (settingsManager.isBlacklistedWorld(world.getName())) {
+                if (settingsManager.getStringList(BLACKLISTED_WORLDS).contains(world.getName())) {
                     throw new ConditionFailedException();
                 }
             }

src/main/java/net/sacredlabyrinth/phaed/simpleclans/commands/conditions/NotInClanCondition.java

@@ -1,10 +1,12 @@
 package net.sacredlabyrinth.phaed.simpleclans.commands.conditions;
 
 import co.aikar.commands.*;
+import net.sacredlabyrinth.phaed.simpleclans.ClanPlayer;
 import net.sacredlabyrinth.phaed.simpleclans.SimpleClans;
 import net.sacredlabyrinth.phaed.simpleclans.commands.ClanPlayerInput;
 import org.jetbrains.annotations.NotNull;
 
+import static net.sacredlabyrinth.phaed.simpleclans.SimpleClans.debug;
 import static net.sacredlabyrinth.phaed.simpleclans.SimpleClans.lang;
 import static org.bukkit.ChatColor.RED;
 
@@ -24,7 +26,9 @@ public class NotInClanCondition extends AbstractParameterCondition<ClanPlayerInp
     public void validateCondition(ConditionContext<BukkitCommandIssuer> context,
                                   BukkitCommandExecutionContext execContext, ClanPlayerInput value)
             throws InvalidCommandArgument {
-        if (value.getClanPlayer().getClan() != null) {
+        ClanPlayer clanPlayer = value.getClanPlayer();
+        debug(String.format("NotInClanCondition -> %s %s", clanPlayer.getName(), clanPlayer.getUniqueId()));
+        if (clanPlayer.getClan() != null) {
             throw new ConditionFailedException(RED + lang("the.player.is.already.member.of.another.clan",
                     execContext.getSender()));
         }

src/main/java/net/sacredlabyrinth/phaed/simpleclans/commands/conditions/OnlineCondition.java

@@ -1,10 +1,14 @@
 package net.sacredlabyrinth.phaed.simpleclans.commands.conditions;
 
 import co.aikar.commands.*;
+import net.sacredlabyrinth.phaed.simpleclans.ClanPlayer;
 import net.sacredlabyrinth.phaed.simpleclans.SimpleClans;
 import net.sacredlabyrinth.phaed.simpleclans.commands.ClanPlayerInput;
+import net.sacredlabyrinth.phaed.simpleclans.utils.VanishUtils;
+import org.bukkit.entity.Player;
 import org.jetbrains.annotations.NotNull;
 
+import static net.sacredlabyrinth.phaed.simpleclans.SimpleClans.debug;
 import static net.sacredlabyrinth.phaed.simpleclans.SimpleClans.lang;
 
 @SuppressWarnings("unused")
@@ -21,9 +25,18 @@ public class OnlineCondition extends AbstractParameterCondition<ClanPlayerInput>
 
     @Override
     public void validateCondition(ConditionContext<BukkitCommandIssuer> context, BukkitCommandExecutionContext execContext, ClanPlayerInput value) throws InvalidCommandArgument {
-        if (value.getClanPlayer().toPlayer() == null) {
-            throw new ConditionFailedException(lang("other.player.must.be.online", execContext.getSender()));
+        ClanPlayer clanPlayer = value.getClanPlayer();
+        debug(String.format("OnlineCondition -> %s %s", clanPlayer.getName(), clanPlayer.getUniqueId()));
+        Player player = clanPlayer.toPlayer();
+
+        if (player != null) {
+            boolean isVanished = VanishUtils.isVanished(execContext.getSender(), player);
+            if (!isVanished || !context.hasConfig("ignore_vanished")) {
+                return;
+            }
         }
+
+        throw new ConditionFailedException(lang("other.player.must.be.online", execContext.getSender()));
     }
 
     @Override

src/main/java/net/sacredlabyrinth/phaed/simpleclans/commands/conditions/OwnLandCondition.java

@@ -0,0 +1,31 @@
+package net.sacredlabyrinth.phaed.simpleclans.commands.conditions;
+
+import co.aikar.commands.BukkitCommandIssuer;
+import co.aikar.commands.ConditionContext;
+import co.aikar.commands.ConditionFailedException;
+import co.aikar.commands.InvalidCommandArgument;
+import net.sacredlabyrinth.phaed.simpleclans.SimpleClans;
+import org.bukkit.entity.Player;
+import org.jetbrains.annotations.NotNull;
+
+import static net.sacredlabyrinth.phaed.simpleclans.SimpleClans.lang;
+
+@SuppressWarnings("unused")
+public class OwnLandCondition extends AbstractCommandCondition {
+    public OwnLandCondition(@NotNull SimpleClans plugin) {
+        super(plugin);
+    }
+
+    @Override
+    public void validateCondition(ConditionContext<BukkitCommandIssuer> context) throws InvalidCommandArgument {
+        Player player = Conditions.assertPlayer(context.getIssuer());
+        if (protectionManager.getLands(player, player.getLocation()).isEmpty()) {
+            throw new ConditionFailedException(lang("you.do.not.own.lands", player));
+        }
+    }
+
+    @Override
+    public @NotNull String getId() {
+        return "own_land";
+    }
+}

src/main/java/net/sacredlabyrinth/phaed/simpleclans/commands/conditions/PlayerClanMemberCondition.java

@@ -8,6 +8,8 @@ import net.sacredlabyrinth.phaed.simpleclans.SimpleClans;
 import org.bukkit.entity.Player;
 import org.jetbrains.annotations.NotNull;
 
+import static net.sacredlabyrinth.phaed.simpleclans.SimpleClans.debug;
+
 @SuppressWarnings("unused")
 public class PlayerClanMemberCondition extends AbstractParameterCondition<Player> {
     public PlayerClanMemberCondition(@NotNull SimpleClans plugin) {
@@ -23,6 +25,7 @@ public class PlayerClanMemberCondition extends AbstractParameterCondition<Player
     public void validateCondition(ConditionContext<BukkitCommandIssuer> context,
                                   BukkitCommandExecutionContext execContext,
                                   Player value) throws InvalidCommandArgument {
+        debug(String.format("PlayerClanMemberCondition -> %s %s", value.getName(), value.getUniqueId()));
         Conditions.assertClanMember(clanManager, context.getIssuer());
     }
 

src/main/java/net/sacredlabyrinth/phaed/simpleclans/commands/conditions/TeleportCondition.java

@@ -0,0 +1,42 @@
+package net.sacredlabyrinth.phaed.simpleclans.commands.conditions;
+
+import co.aikar.commands.*;
+import net.sacredlabyrinth.phaed.simpleclans.Clan;
+import net.sacredlabyrinth.phaed.simpleclans.Flags;
+import net.sacredlabyrinth.phaed.simpleclans.SimpleClans;
+import org.bukkit.entity.Player;
+import org.jetbrains.annotations.NotNull;
+
+import static net.sacredlabyrinth.phaed.simpleclans.SimpleClans.lang;
+
+public class TeleportCondition extends AbstractParameterCondition<Clan> {
+
+    public TeleportCondition(@NotNull SimpleClans plugin) {
+        super(plugin);
+    }
+
+    @Override
+    public Class<Clan> getType() {
+        return Clan.class;
+    }
+
+    @Override
+    public void validateCondition(ConditionContext<BukkitCommandIssuer> context,
+                                  BukkitCommandExecutionContext execContext,
+                                  Clan value) throws InvalidCommandArgument {
+        Player player = execContext.getPlayer();
+        if (value.getHomeLocation() == null) {
+            throw new ConditionFailedException(lang("hombase.not.set", player));
+        }
+        Flags flags = new Flags(value.getFlags());
+        String homeServer = flags.getString("homeServer", "");
+        if (!homeServer.isEmpty() && !plugin.getProxyManager().getServerName().equals(homeServer)) {
+            throw new ConditionFailedException(lang("home.set.in.different.server"));
+        }
+    }
+
+    @Override
+    public @NotNull String getId() {
+        return "can_teleport";
+    }
+}

src/main/java/net/sacredlabyrinth/phaed/simpleclans/commands/conditions/TeleportInputCondition.java

@@ -0,0 +1,31 @@
+package net.sacredlabyrinth.phaed.simpleclans.commands.conditions;
+
+import co.aikar.commands.BukkitCommandExecutionContext;
+import co.aikar.commands.BukkitCommandIssuer;
+import co.aikar.commands.ConditionContext;
+import co.aikar.commands.InvalidCommandArgument;
+import net.sacredlabyrinth.phaed.simpleclans.SimpleClans;
+import net.sacredlabyrinth.phaed.simpleclans.commands.ClanInput;
+import org.jetbrains.annotations.NotNull;
+
+public class TeleportInputCondition extends AbstractParameterCondition<ClanInput> {
+
+    public TeleportInputCondition(@NotNull SimpleClans plugin) {
+        super(plugin);
+    }
+
+    @Override
+    public Class<ClanInput> getType() {
+        return ClanInput.class;
+    }
+
+    @Override
+    public void validateCondition(ConditionContext<BukkitCommandIssuer> context, BukkitCommandExecutionContext execContext, ClanInput value) throws InvalidCommandArgument {
+        new TeleportCondition(plugin).validateCondition(context, execContext, value.getClan());
+    }
+
+    @Override
+    public @NotNull String getId() {
+        return "can_teleport";
+    }
+}

src/main/java/net/sacredlabyrinth/phaed/simpleclans/commands/contexts/ClanPlayerInputContextResolver.java

@@ -2,25 +2,44 @@ package net.sacredlabyrinth.phaed.simpleclans.commands.contexts;
 
 import co.aikar.commands.BukkitCommandExecutionContext;
 import co.aikar.commands.InvalidCommandArgument;
+import co.aikar.commands.MinecraftMessageKeys;
 import net.sacredlabyrinth.phaed.simpleclans.ClanPlayer;
 import net.sacredlabyrinth.phaed.simpleclans.SimpleClans;
 import net.sacredlabyrinth.phaed.simpleclans.commands.ClanPlayerInput;
 import org.bukkit.Bukkit;
-import org.bukkit.OfflinePlayer;
+import org.bukkit.entity.Player;
 import org.jetbrains.annotations.NotNull;
 
+import java.util.regex.Pattern;
+
+import static net.sacredlabyrinth.phaed.simpleclans.SimpleClans.lang;
+import static net.sacredlabyrinth.phaed.simpleclans.managers.SettingsManager.ConfigField.USERNAME_REGEX;
+
 @SuppressWarnings("unused")
 public class ClanPlayerInputContextResolver extends AbstractInputOnlyContextResolver<ClanPlayerInput> {
+
+    private final Pattern validUsername;
+
     public ClanPlayerInputContextResolver(@NotNull SimpleClans plugin) {
         super(plugin);
+        validUsername = Pattern.compile(plugin.getSettingsManager().getString(USERNAME_REGEX));
     }
 
     @Override
     public ClanPlayerInput getContext(BukkitCommandExecutionContext context) throws InvalidCommandArgument {
         String arg = context.popFirstArg();
-        @SuppressWarnings("deprecation")
-        OfflinePlayer offlinePlayer = Bukkit.getOfflinePlayer(arg);
-        ClanPlayer cp = clanManager.getCreateClanPlayer(offlinePlayer.getUniqueId());
+        if (!validUsername.matcher(arg).matches()) {
+            throw new InvalidCommandArgument(MinecraftMessageKeys.IS_NOT_A_VALID_NAME, "{name}", arg);
+        }
+
+        ClanPlayer cp = clanManager.getAnyClanPlayer(arg);
+        if (cp == null) {
+            Player player = Bukkit.getPlayer(arg);
+            if (player == null) {
+                throw new InvalidCommandArgument(lang("user.hasnt.played.before", context.getSender()));
+            }
+            cp = clanManager.getCreateClanPlayer(player.getUniqueId());
+        }
 
         return new ClanPlayerInput(cp);
     }
@@ -29,4 +48,5 @@ public class ClanPlayerInputContextResolver extends AbstractInputOnlyContextReso
     public Class<ClanPlayerInput> getType() {
         return ClanPlayerInput.class;
     }
+
 }

src/main/java/net/sacredlabyrinth/phaed/simpleclans/commands/contexts/Contexts.java

@@ -2,12 +2,12 @@ package net.sacredlabyrinth.phaed.simpleclans.commands.contexts;
 
 import co.aikar.commands.BukkitCommandIssuer;
 import co.aikar.commands.InvalidCommandArgument;
-import co.aikar.commands.MessageKeys;
 import net.sacredlabyrinth.phaed.simpleclans.Clan;
 import net.sacredlabyrinth.phaed.simpleclans.managers.ClanManager;
 import org.bukkit.entity.Player;
 import org.jetbrains.annotations.NotNull;
 
+import static co.aikar.commands.MessageKeys.*;
 import static net.sacredlabyrinth.phaed.simpleclans.SimpleClans.lang;
 
 public class Contexts {
@@ -30,8 +30,17 @@ public class Contexts {
     public static Player assertPlayer(@NotNull BukkitCommandIssuer issuer) {
         Player player = issuer.getPlayer();
         if (player == null) {
-            throw new InvalidCommandArgument(MessageKeys.NOT_ALLOWED_ON_CONSOLE, false);
+            throw new InvalidCommandArgument(NOT_ALLOWED_ON_CONSOLE, false);
         }
         return player;
     }
+
+    public static void validateMinMax(Number val, Number minValue, Number maxValue) throws InvalidCommandArgument {
+        if (maxValue != null && val.doubleValue() > maxValue.doubleValue()) {
+            throw new InvalidCommandArgument(PLEASE_SPECIFY_AT_MOST, "{max}", String.valueOf(maxValue));
+        }
+        if (minValue != null && val.doubleValue() < minValue.doubleValue()) {
+            throw new InvalidCommandArgument(PLEASE_SPECIFY_AT_LEAST, "{min}", String.valueOf(minValue));
+        }
+    }
 }

src/main/java/net/sacredlabyrinth/phaed/simpleclans/commands/contexts/DoubleContextResolver.java

@@ -0,0 +1,16 @@
+package net.sacredlabyrinth.phaed.simpleclans.commands.contexts;
+
+import net.sacredlabyrinth.phaed.simpleclans.SimpleClans;
+import org.jetbrains.annotations.NotNull;
+
+@SuppressWarnings("unused")
+public class DoubleContextResolver extends DoublePrimitiveContextResolver {
+    public DoubleContextResolver(@NotNull SimpleClans plugin) {
+        super(plugin);
+    }
+
+    @Override
+    public Class<Double> getType() {
+        return Double.class;
+    }
+}

src/main/java/net/sacredlabyrinth/phaed/simpleclans/commands/contexts/DoublePrimitiveContextResolver.java

@@ -0,0 +1,39 @@
+package net.sacredlabyrinth.phaed.simpleclans.commands.contexts;
+
+import co.aikar.commands.BukkitCommandExecutionContext;
+import co.aikar.commands.InvalidCommandArgument;
+import co.aikar.commands.MessageKeys;
+import net.sacredlabyrinth.phaed.simpleclans.SimpleClans;
+import org.jetbrains.annotations.NotNull;
+
+import static net.sacredlabyrinth.phaed.simpleclans.commands.contexts.Contexts.validateMinMax;
+
+@SuppressWarnings("unused")
+public class DoublePrimitiveContextResolver extends AbstractInputOnlyContextResolver<Double> {
+
+    public DoublePrimitiveContextResolver(@NotNull SimpleClans plugin) {
+        super(plugin);
+    }
+
+    @Override
+    public Double getContext(BukkitCommandExecutionContext context) throws InvalidCommandArgument {
+        String number = context.popFirstArg();
+        try {
+            double val = Double.parseDouble(number);
+            if (!Double.isFinite(val)) {
+                throw new NumberFormatException();
+            }
+            validateMinMax(val, Double.MIN_VALUE, Double.MAX_VALUE);
+            return val;
+        } catch (NumberFormatException e) {
+            throw new InvalidCommandArgument(MessageKeys.MUST_BE_A_NUMBER, "{num}", number);
+        }
+    }
+
+    @Override
+    public Class<Double> getType() {
+        return double.class;
+    }
+
+
+}

src/main/java/net/sacredlabyrinth/phaed/simpleclans/commands/contexts/FloatContextResolver.java

@@ -0,0 +1,16 @@
+package net.sacredlabyrinth.phaed.simpleclans.commands.contexts;
+
+import net.sacredlabyrinth.phaed.simpleclans.SimpleClans;
+import org.jetbrains.annotations.NotNull;
+
+@SuppressWarnings("unused")
+public class FloatContextResolver extends FloatPrimitiveContextResolver {
+    public FloatContextResolver(@NotNull SimpleClans plugin) {
+        super(plugin);
+    }
+
+    @Override
+    public Class<Float> getType() {
+        return Float.class;
+    }
+}

src/main/java/net/sacredlabyrinth/phaed/simpleclans/commands/contexts/FloatPrimitiveContextResolver.java

@@ -0,0 +1,36 @@
+package net.sacredlabyrinth.phaed.simpleclans.commands.contexts;
+
+import co.aikar.commands.BukkitCommandExecutionContext;
+import co.aikar.commands.InvalidCommandArgument;
+import co.aikar.commands.MessageKeys;
+import net.sacredlabyrinth.phaed.simpleclans.SimpleClans;
+import org.jetbrains.annotations.NotNull;
+
+import static net.sacredlabyrinth.phaed.simpleclans.commands.contexts.Contexts.validateMinMax;
+
+@SuppressWarnings("unused")
+public class FloatPrimitiveContextResolver extends AbstractInputOnlyContextResolver<Float> {
+    public FloatPrimitiveContextResolver(@NotNull SimpleClans plugin) {
+        super(plugin);
+    }
+
+    @Override
+    public Float getContext(BukkitCommandExecutionContext context) throws InvalidCommandArgument {
+        String number = context.popFirstArg();
+        try {
+            float val = Float.parseFloat(number);
+            if (!Float.isFinite(val)) {
+                throw new NumberFormatException();
+            }
+            validateMinMax(val, Float.MIN_VALUE, Float.MAX_VALUE);
+            return val;
+        } catch (NumberFormatException e) {
+            throw new InvalidCommandArgument(MessageKeys.MUST_BE_A_NUMBER, "{num}", number);
+        }
+    }
+
+    @Override
+    public Class<Float> getType() {
+        return float.class;
+    }
+}

src/main/java/net/sacredlabyrinth/phaed/simpleclans/commands/data/Alliances.java

@@ -10,6 +10,8 @@ import org.jetbrains.annotations.NotNull;
 import java.util.List;
 
 import static net.sacredlabyrinth.phaed.simpleclans.SimpleClans.lang;
+import static net.sacredlabyrinth.phaed.simpleclans.managers.SettingsManager.ConfigField.PAGE_SEPARATOR;
+import static net.sacredlabyrinth.phaed.simpleclans.managers.SettingsManager.ConfigField.SERVER_NAME;
 import static org.bukkit.ChatColor.AQUA;
 import static org.bukkit.ChatColor.DARK_GRAY;
 
@@ -30,7 +32,7 @@ public class Alliances extends Sendable {
                 continue;
             }
 
-            chatBlock.addRow("  " + AQUA + clan.getName(), clan.getAllyString(DARK_GRAY + ", "));
+            chatBlock.addRow("  " + AQUA + clan.getName(), clan.getAllyString(DARK_GRAY + ", ", sender));
         }
 
         sendBlock();
@@ -38,9 +40,9 @@ public class Alliances extends Sendable {
 
     private void sendHeader() {
         ChatBlock.sendBlank(sender);
-        ChatBlock.saySingle(sender, sm.getServerName() + subColor + " " +
+        ChatBlock.saySingle(sender, sm.getColored(SERVER_NAME) + subColor + " " +
                 lang("alliances", sender) + " " + headColor +
-                Helper.generatePageSeparator(sm.getPageSep()));
+                Helper.generatePageSeparator(sm.getString(PAGE_SEPARATOR)));
         ChatBlock.sendBlank(sender);
 
         chatBlock.setAlignment("l", "l");

src/main/java/net/sacredlabyrinth/phaed/simpleclans/commands/data/ClanCoords.java

@@ -1,6 +1,7 @@
 package net.sacredlabyrinth.phaed.simpleclans.commands.data;
 
 import net.sacredlabyrinth.phaed.simpleclans.*;
+import net.sacredlabyrinth.phaed.simpleclans.utils.VanishUtils;
 import org.bukkit.Location;
 import org.bukkit.entity.Player;
 import org.jetbrains.annotations.NotNull;
@@ -11,6 +12,7 @@ import java.util.Map;
 import java.util.TreeMap;
 
 import static net.sacredlabyrinth.phaed.simpleclans.SimpleClans.lang;
+import static net.sacredlabyrinth.phaed.simpleclans.managers.SettingsManager.ConfigField.*;
 import static org.bukkit.ChatColor.AQUA;
 import static org.bukkit.ChatColor.WHITE;
 
@@ -27,12 +29,12 @@ public class ClanCoords extends Sendable {
 
     private void populateRows() {
         Map<Integer, List<String>> rows = new TreeMap<>();
-        for (ClanPlayer cpm : clan.getOnlineMembers()) {
+        for (ClanPlayer cpm : VanishUtils.getNonVanished(player, clan)) {
             Player p = cpm.toPlayer();
 
             if (p != null) {
-                String name = (cpm.isLeader() ? sm.getPageLeaderColor() : (cpm.isTrusted() ?
-                        sm.getPageTrustedColor() : sm.getPageUnTrustedColor())) + cpm.getName();
+                String name = (cpm.isLeader() ? sm.getColored(PAGE_LEADER_COLOR) : (cpm.isTrusted() ?
+                        sm.getColored(PAGE_TRUSTED_COLOR) : sm.getColored(PAGE_UNTRUSTED_COLOR))) + cpm.getName();
                 Location loc = p.getLocation();
                 int distance = (int) Math.ceil(loc.toVector().distance(player.getLocation().toVector()));
                 String coords = loc.getBlockX() + " " + loc.getBlockY() + " " + loc.getBlockZ();
@@ -56,8 +58,8 @@ public class ClanCoords extends Sendable {
         chatBlock.setAlignment("l", "c", "c", "c");
 
         ChatBlock.sendBlank(player);
-        ChatBlock.saySingle(player, sm.getPageClanNameColor() + clan.getName() + subColor + " " +
-                lang("coords", player) + " " + headColor + Helper.generatePageSeparator(sm.getPageSep()));
+        ChatBlock.saySingle(player, sm.getColored(PAGE_CLAN_NAME_COLOR) + clan.getName() + subColor + " " +
+                lang("coords", player) + " " + headColor + Helper.generatePageSeparator(sm.getString(PAGE_SEPARATOR)));
         ChatBlock.sendBlank(player);
 
         chatBlock.addRow("  " + headColor + lang("name", player), lang("distance", player),

src/main/java/net/sacredlabyrinth/phaed/simpleclans/commands/data/ClanList.java

@@ -14,6 +14,7 @@ import java.util.List;
 import java.util.stream.Collectors;
 
 import static net.sacredlabyrinth.phaed.simpleclans.SimpleClans.lang;
+import static net.sacredlabyrinth.phaed.simpleclans.managers.SettingsManager.ConfigField.*;
 import static net.sacredlabyrinth.phaed.simpleclans.utils.RankingNumberResolver.RankingType.ORDINAL;
 import static org.bukkit.ChatColor.*;
 
@@ -52,7 +53,7 @@ public class ClanList extends Sendable {
                                                                                     @Nullable String order) {
         boolean ascending = order == null || lang("list.order.asc").equalsIgnoreCase(order);
         if (type == null) {
-            type = sm.getListDefaultOrderBy();
+            type = sm.getString(LIST_DEFAULT_ORDER_BY);
         }
         if (type.equalsIgnoreCase(lang("list.type.size"))) {
             return new RankingNumberResolver<>(clans, Clan::getSize, order != null && ascending, ORDINAL);
@@ -73,15 +74,15 @@ public class ClanList extends Sendable {
     @NotNull
     private List<Clan> getListableClans() {
         List<Clan> clans = plugin.getClanManager().getClans();
-        clans = clans.stream().filter(clan -> clan.isVerified() || sm.isShowUnverifiedOnList())
+        clans = clans.stream().filter(clan -> clan.isVerified() || sm.is(SHOW_UNVERIFIED_ON_LIST))
                 .collect(Collectors.toList());
         return clans;
     }
 
     private void sendHeader(List<Clan> clans) {
         ChatBlock.sendBlank(sender);
-        ChatBlock.saySingle(sender, sm.getServerName() + subColor + " " + lang("clans.lower", sender)
-                + " " + headColor + Helper.generatePageSeparator(sm.getPageSep()));
+        ChatBlock.saySingle(sender, sm.getColored(SERVER_NAME) + subColor + " " + lang("clans.lower", sender)
+                + " " + headColor + Helper.generatePageSeparator(sm.getString(PAGE_SEPARATOR)));
         ChatBlock.sendBlank(sender);
         ChatBlock.sendMessage(sender, headColor + lang("total.clans", sender) + " " + subColor + clans.size());
         ChatBlock.sendBlank(sender);
@@ -91,12 +92,11 @@ public class ClanList extends Sendable {
                 lang("kdr", sender), lang("members", sender));
     }
 
-    @SuppressWarnings("deprecation")
     private void addLine(RankingNumberResolver<Clan, ? extends Comparable<?>> ranking, Clan clan) {
-        String tag = sm.getClanChatBracketColor() + sm.getClanChatTagBracketLeft()
-                + sm.getTagDefaultColor() + clan.getColorTag() + sm.getClanChatBracketColor()
-                + sm.getClanChatTagBracketRight();
-        String name = (clan.isVerified() ? sm.getPageClanNameColor() : GRAY) + clan.getName();
+        String tag = sm.getColored(CLANCHAT_BRACKET_COLOR) + sm.getString(CLANCHAT_BRACKET_LEFT)
+                + sm.getColored(TAG_DEFAULT_COLOR) + clan.getColorTag() + sm.getColored(CLANCHAT_BRACKET_COLOR)
+                + sm.getString(CLANCHAT_BRACKET_RIGHT);
+        String name = (clan.isVerified() ? sm.getColored(PAGE_CLAN_NAME_COLOR) : GRAY) + clan.getName();
         String fullname = tag + " " + name;
         String size = WHITE + "" + clan.getSize();
         String kdr = clan.isVerified() ? YELLOW + "" + KDRFormat.format(clan.getTotalKDR()) : "";

src/main/java/net/sacredlabyrinth/phaed/simpleclans/commands/data/ClanProfile.java

@@ -1,12 +1,15 @@
 package net.sacredlabyrinth.phaed.simpleclans.commands.data;
 
 import net.sacredlabyrinth.phaed.simpleclans.Clan;
+import net.sacredlabyrinth.phaed.simpleclans.Helper;
 import net.sacredlabyrinth.phaed.simpleclans.SimpleClans;
 import net.sacredlabyrinth.phaed.simpleclans.utils.KDRFormat;
+import net.sacredlabyrinth.phaed.simpleclans.utils.VanishUtils;
 import org.bukkit.command.CommandSender;
 import org.jetbrains.annotations.NotNull;
 
 import static net.sacredlabyrinth.phaed.simpleclans.SimpleClans.lang;
+import static net.sacredlabyrinth.phaed.simpleclans.managers.SettingsManager.ConfigField.PAGE_LEADER_COLOR;
 
 public class ClanProfile extends Sendable {
 
@@ -22,42 +25,31 @@ public class ClanProfile extends Sendable {
         String message = lang("clan.profile").replace("%clan_name%", clan.getName())
                 .replace("%clan_color_tag%", clan.getColorTag())
                 .replace("%clan_description%", getDescription())
-                .replace("%clan_verified%", getVerifiedStatus())
-                .replace("%clan_leaders%", clan.getLeadersString(sm.getPageLeaderColor(), subColor + ", "))
-                .replace("%clan_online_count%", String.valueOf(clan.getOnlineMembers().size()))
+                .replace("%clan_status%", Helper.getFormattedClanStatus(clan, sender))
+                .replace("%clan_leaders%", clan.getLeadersString(sm.getColored(PAGE_LEADER_COLOR), subColor + ", "))
+                .replace("%clan_online_count%", String.valueOf(VanishUtils.getNonVanished(sender, clan).size()))
                 .replace("%clan_size%", String.valueOf(clan.getSize()))
                 .replace("%clan_kdr%", KDRFormat.format(clan.getTotalKDR()))
                 .replace("%clan_rival_kills%", String.valueOf(clan.getTotalRival()))
                 .replace("%clan_neutral_kills%", String.valueOf(clan.getTotalNeutral()))
                 .replace("%clan_civilian_kills%", String.valueOf(clan.getTotalCivilian()))
+                .replace("%clan_ally_kills%", String.valueOf(clan.getTotalAlly()))
                 .replace("%clan_deaths%", String.valueOf(clan.getTotalDeaths()))
                 .replace("%clan_fee_enabled%", getFeeEnabled())
                 .replace("%clan_fee_value%", String.valueOf(clan.getMemberFee()))
-                .replace("%clan_allies%", clan.getAllyString(subColor + ", "))
-                .replace("%clan_rivals%", clan.getRivalString(subColor + ", "))
+                .replace("%clan_allies%", clan.getAllyString(subColor + ", ", sender))
+                .replace("%clan_rivals%", clan.getRivalString(subColor + ", ", sender))
                 .replace("%clan_founded%", clan.getFoundedString())
                 .replace("%clan_inactive_days%", String.valueOf(clan.getInactiveDays()))
-                .replace("%clan_max_inactive_days%", getMaxInactiveDays());
+                .replace("%clan_max_inactive_days%", Helper.formatMaxInactiveDays(clan.getMaxInactiveDays()));
         sender.sendMessage(message);
     }
 
-    @NotNull
-    private String getMaxInactiveDays() {
-        return String.valueOf(clan.isVerified() ?
-                sm.getPurgeClan() : sm.getPurgeUnverified());
-    }
-
     @NotNull
     private String getFeeEnabled() {
         return clan.isMemberFeeEnabled() ? lang("fee.enabled", sender) : lang("fee.disabled", sender);
     }
 
-    @NotNull
-    private String getVerifiedStatus() {
-        return clan.isVerified() ? sm.getPageTrustedColor() + lang("verified", sender) :
-                sm.getPageUnTrustedColor() + lang("unverified", sender);
-    }
-
     @NotNull
     private String getDescription() {
         return clan.getDescription() != null && !clan.getDescription().isEmpty() ? clan.getDescription() :

src/main/java/net/sacredlabyrinth/phaed/simpleclans/commands/data/ClanRoster.java

@@ -1,13 +1,15 @@
 package net.sacredlabyrinth.phaed.simpleclans.commands.data;
 
 import net.sacredlabyrinth.phaed.simpleclans.*;
+import net.sacredlabyrinth.phaed.simpleclans.utils.ChatUtils;
+import net.sacredlabyrinth.phaed.simpleclans.utils.VanishUtils;
 import org.bukkit.command.CommandSender;
-import org.bukkit.entity.Player;
 import org.jetbrains.annotations.NotNull;
 
 import java.util.List;
 
 import static net.sacredlabyrinth.phaed.simpleclans.SimpleClans.lang;
+import static net.sacredlabyrinth.phaed.simpleclans.managers.SettingsManager.ConfigField.*;
 import static org.bukkit.ChatColor.*;
 
 public class ClanRoster extends Sendable {
@@ -32,12 +34,10 @@ public class ClanRoster extends Sendable {
         List<ClanPlayer> members = clan.getNonLeaders();
         plugin.getClanManager().sortClanPlayersByLastSeen(members);
         for (ClanPlayer cp : members) {
-            Player p = cp.toPlayer();
+            String name = (cp.isTrusted() ? sm.getColored(PAGE_TRUSTED_COLOR) : sm.getColored(PAGE_UNTRUSTED_COLOR)) + cp.getName();
+            String lastSeen = VanishUtils.isVanished(sender, cp) ? WHITE + cp.getLastSeenDaysString(sender) : GREEN + lang("online", sender);
 
-            String name = (cp.isTrusted() ? sm.getPageTrustedColor() : sm.getPageUnTrustedColor()) + cp.getName();
-            String lastSeen = p != null && p.isOnline() && !Helper.isVanished(sender, p) ? GREEN + lang("online", sender) : WHITE + cp.getLastSeenDaysString(sender);
-
-            chatBlock.addRow("  " + name, YELLOW + Helper.parseColors(cp.getRankDisplayName()) + RESET, lastSeen);
+            chatBlock.addRow("  " + name, YELLOW + ChatUtils.parseColors(cp.getRankDisplayName()) + RESET, lastSeen);
         }
     }
 
@@ -45,24 +45,22 @@ public class ClanRoster extends Sendable {
         List<ClanPlayer> leaders = clan.getLeaders();
         plugin.getClanManager().sortClanPlayersByLastSeen(leaders);
         for (ClanPlayer cp : leaders) {
-            Player p = cp.toPlayer();
+            String name = sm.getColored(PAGE_LEADER_COLOR) + cp.getName();
+            String lastSeen = VanishUtils.isVanished(sender, cp) ? WHITE + cp.getLastSeenDaysString(sender) :
+                    GREEN + lang("online", sender);
 
-            String name = sm.getPageLeaderColor() + cp.getName();
-            String lastSeen = p != null && p.isOnline() && !Helper.isVanished(sender, p) ? GREEN + lang("online", sender)
-                    : WHITE + cp.getLastSeenDaysString(sender);
-
-            chatBlock.addRow("  " + name, YELLOW + Helper.parseColors(cp.getRankDisplayName()) + RESET, lastSeen);
+            chatBlock.addRow("  " + name, YELLOW + ChatUtils.parseColors(cp.getRankDisplayName()) + RESET, lastSeen);
         }
     }
 
     private void configureAndSendHeader() {
         ChatBlock.sendBlank(sender);
-        ChatBlock.saySingle(sender, sm.getPageClanNameColor() + clan.getName() + subColor + " " +
-                lang("roster", sender) + " " + headColor + Helper.generatePageSeparator(sm.getPageSep()));
+        ChatBlock.saySingle(sender, sm.getColored(PAGE_CLAN_NAME_COLOR) + clan.getName() + subColor + " " +
+                lang("roster", sender) + " " + headColor + Helper.generatePageSeparator(sm.getString(PAGE_SEPARATOR)));
         ChatBlock.sendBlank(sender);
-        ChatBlock.sendMessage(sender, headColor + lang("legend", sender) + " " + sm.getPageLeaderColor() +
-                lang("leader", sender) + headColor + ", " + sm.getPageTrustedColor() + lang("trusted", sender) +
-                headColor + ", " + sm.getPageUnTrustedColor() + lang("untrusted", sender));
+        ChatBlock.sendMessage(sender, headColor + lang("legend", sender) + " " + sm.getColored(PAGE_LEADER_COLOR) +
+                lang("leader", sender) + headColor + ", " + sm.getColored(PAGE_TRUSTED_COLOR) + lang("trusted", sender) +
+                headColor + ", " + sm.getColored(PAGE_UNTRUSTED_COLOR) + lang("untrusted", sender));
         ChatBlock.sendBlank(sender);
 
         chatBlock.setFlexibility(false, true, false, true);

src/main/java/net/sacredlabyrinth/phaed/simpleclans/commands/data/ClanStats.java

@@ -9,6 +9,7 @@ import java.text.NumberFormat;
 import java.util.List;
 
 import static net.sacredlabyrinth.phaed.simpleclans.SimpleClans.lang;
+import static net.sacredlabyrinth.phaed.simpleclans.managers.SettingsManager.ConfigField.*;
 import static org.bukkit.ChatColor.*;
 
 public class ClanStats extends Sendable {
@@ -36,15 +37,15 @@ public class ClanStats extends Sendable {
     }
 
     private void configureAndSendHeader() {
-        ChatBlock.saySingle(sender, sm.getPageClanNameColor() + clan.getName() + subColor + " " +
-                lang("stats", sender) + " " + headColor + Helper.generatePageSeparator(sm.getPageSep()));
+        ChatBlock.saySingle(sender, sm.getColored(PAGE_CLAN_NAME_COLOR) + clan.getName() + subColor + " " +
+                lang("stats", sender) + " " + headColor + Helper.generatePageSeparator(sm.getString(PAGE_SEPARATOR)));
         ChatBlock.sendBlank(sender);
         ChatBlock.sendMessage(sender, headColor + lang("kdr", sender) + " = " + subColor +
                 lang("kill.death.ratio", sender));
         ChatBlock.sendMessage(sender, headColor + lang("weights", sender) + " = " + lang("rival", sender)
-                + ": " + subColor + sm.getKwRival() + headColor + " " + lang("neutral", sender) + ": " + subColor +
-                sm.getKwNeutral() + headColor + " " + lang("civilian", sender) + ": " + subColor +
-                sm.getKwCivilian());
+                + ": " + subColor + sm.getDouble(KILL_WEIGHTS_RIVAL) + headColor + " " + lang("neutral", sender) + ": " + subColor +
+                sm.getDouble(KILL_WEIGHTS_NEUTRAL) + headColor + " " + lang("civilian", sender) + ": " + subColor +
+                sm.getDouble(KILL_WEIGHTS_CIVILIAN));
         ChatBlock.sendBlank(sender);
 
         chatBlock.setFlexibility(true, false, false, false, false, false, false);
@@ -56,8 +57,8 @@ public class ClanStats extends Sendable {
 
     private void addRows(List<ClanPlayer> clanPlayers) {
         for (ClanPlayer cpm : clanPlayers) {
-            String name = (cpm.isLeader() ? sm.getPageLeaderColor() : (cpm.isTrusted() ? sm.getPageTrustedColor() :
-                    sm.getPageUnTrustedColor())) + cpm.getName();
+            String name = (cpm.isLeader() ? sm.getColored(PAGE_LEADER_COLOR) : (cpm.isTrusted() ? sm.getColored(PAGE_TRUSTED_COLOR) :
+                    sm.getColored(PAGE_UNTRUSTED_COLOR)) + cpm.getName());
             String rival = NumberFormat.getInstance().format(cpm.getRivalKills());
             String neutral = NumberFormat.getInstance().format(cpm.getNeutralKills());
             String civilian = NumberFormat.getInstance().format(cpm.getCivilianKills());

src/main/java/net/sacredlabyrinth/phaed/simpleclans/commands/data/Kills.java

@@ -11,6 +11,8 @@ import org.jetbrains.annotations.NotNull;
 import java.util.Map;
 
 import static net.sacredlabyrinth.phaed.simpleclans.SimpleClans.lang;
+import static net.sacredlabyrinth.phaed.simpleclans.managers.SettingsManager.ConfigField.PAGE_CLAN_NAME_COLOR;
+import static net.sacredlabyrinth.phaed.simpleclans.managers.SettingsManager.ConfigField.PAGE_SEPARATOR;
 
 public class Kills extends Sendable {
 
@@ -53,9 +55,9 @@ public class Kills extends Sendable {
         chatBlock.setFlexibility(true, false);
         chatBlock.setAlignment("l", "c");
         chatBlock.addRow("  " + headColor + lang("victim", player), lang("killcount", player));
-        ChatBlock.saySingle(player, sm.getPageClanNameColor() + polled + subColor
+        ChatBlock.saySingle(player, sm.getColored(PAGE_CLAN_NAME_COLOR) + polled + subColor
                 + " " + lang("kills", player) + " " + headColor +
-                Helper.generatePageSeparator(sm.getPageSep()));
+                Helper.generatePageSeparator(sm.getString(PAGE_SEPARATOR)));
         ChatBlock.sendBlank(player);
     }
 }

src/main/java/net/sacredlabyrinth/phaed/simpleclans/commands/data/Leaderboard.java

@@ -6,6 +6,7 @@ import net.sacredlabyrinth.phaed.simpleclans.Helper;
 import net.sacredlabyrinth.phaed.simpleclans.SimpleClans;
 import net.sacredlabyrinth.phaed.simpleclans.utils.KDRFormat;
 import net.sacredlabyrinth.phaed.simpleclans.utils.RankingNumberResolver;
+import net.sacredlabyrinth.phaed.simpleclans.utils.VanishUtils;
 import org.bukkit.command.CommandSender;
 import org.jetbrains.annotations.NotNull;
 
@@ -13,6 +14,7 @@ import java.math.BigDecimal;
 import java.util.List;
 
 import static net.sacredlabyrinth.phaed.simpleclans.SimpleClans.lang;
+import static net.sacredlabyrinth.phaed.simpleclans.managers.SettingsManager.ConfigField.*;
 import static org.bukkit.ChatColor.*;
 
 public class Leaderboard extends Sendable {
@@ -36,10 +38,10 @@ public class Leaderboard extends Sendable {
 
     private void addLines() {
         for (ClanPlayer cp : clanPlayers) {
-            boolean online = cp.toPlayer() != null;
+            boolean online = !VanishUtils.isVanished(cp);
 
-            String name = (cp.isLeader() ? sm.getPageLeaderColor() : (cp.isTrusted() ? sm.getPageTrustedColor() :
-                    sm.getPageUnTrustedColor())) + cp.getName();
+            String name = (cp.isLeader() ? sm.getColored(PAGE_LEADER_COLOR) : (cp.isTrusted() ? sm.getColored(PAGE_TRUSTED_COLOR) :
+                    sm.getColored(PAGE_UNTRUSTED_COLOR))) + cp.getName();
             String lastSeen = online ? GREEN + lang("online", sender) : WHITE + cp.getLastSeenDaysString(sender);
 
             String clanTag = WHITE + lang("free.agent", sender);
@@ -55,8 +57,8 @@ public class Leaderboard extends Sendable {
 
     private void configureAndSendHeader() {
         ChatBlock.sendBlank(sender);
-        ChatBlock.saySingle(sender, sm.getServerName() + subColor + " " + lang("leaderboard.command", sender)
-                + " " + headColor + Helper.generatePageSeparator(sm.getPageSep()));
+        ChatBlock.saySingle(sender, sm.getColored(SERVER_NAME) + subColor + " " + lang("leaderboard.command", sender)
+                + " " + headColor + Helper.generatePageSeparator(sm.getString(PAGE_SEPARATOR)));
         ChatBlock.sendBlank(sender);
         ChatBlock.sendMessage(sender, headColor + lang("total.clan.players.0", sender, subColor +
                 clanPlayers.size()));

src/main/java/net/sacredlabyrinth/phaed/simpleclans/commands/data/Lookup.java

@@ -1,6 +1,7 @@
 package net.sacredlabyrinth.phaed.simpleclans.commands.data;
 
 import net.sacredlabyrinth.phaed.simpleclans.*;
+import net.sacredlabyrinth.phaed.simpleclans.utils.ChatUtils;
 import net.sacredlabyrinth.phaed.simpleclans.utils.KDRFormat;
 import org.bukkit.command.CommandSender;
 import org.bukkit.entity.Player;
@@ -10,6 +11,7 @@ import org.jetbrains.annotations.Nullable;
 import java.util.UUID;
 
 import static net.sacredlabyrinth.phaed.simpleclans.SimpleClans.lang;
+import static net.sacredlabyrinth.phaed.simpleclans.managers.SettingsManager.ConfigField.*;
 import static org.bukkit.ChatColor.*;
 
 public class Lookup extends Sendable {
@@ -38,18 +40,19 @@ public class Lookup extends Sendable {
             String lookup = lang("player.lookup", sender)
                     .replace("%player_name%", target.getName())
                     .replace("%clan_name%", getClanName())
-                    .replace("%player_rank%", Helper.parseColors(target.getRankDisplayName()))
+                    .replace("%player_rank%", ChatUtils.parseColors(target.getRankDisplayName()))
                     .replace("%player_status%", getPlayerStatus())
                     .replace("%player_kdr%", KDRFormat.format(target.getKDR()))
                     .replace("%player_rival_kills%", String.valueOf(target.getRivalKills()))
                     .replace("%player_neutral_kills%", String.valueOf(target.getNeutralKills()))
                     .replace("%player_civilian_kills%", String.valueOf(target.getCivilianKills()))
+                    .replace("%player_ally_kills%", String.valueOf(target.getAllyKills()))
                     .replace("%player_deaths%", String.valueOf(target.getDeaths()))
                     .replace("%player_join_date%", target.getJoinDateString())
                     .replace("%player_last_seen%", target.getLastSeenString(sender))
                     .replace("%player_past_clans%", target.getPastClansString(headColor + ", "))
                     .replace("%player_inactive_days%", String.valueOf(target.getInactiveDays()))
-                    .replace("%player_max_inactive_days%", String.valueOf(sm.getPurgePlayers()))
+                    .replace("%player_max_inactive_days%", Helper.formatMaxInactiveDays(sm.getInt(PURGE_INACTIVE_PLAYER_DAYS)))
                     .replace("%kill_type_line%", getKillTypeLine());
             sender.sendMessage(lookup);
         } else {
@@ -75,10 +78,19 @@ public class Lookup extends Sendable {
 
     @NotNull
     private String getPlayerStatus() {
-        return target == null || targetClan == null ? lang("free.agent", sender) : (target.isLeader() ?
-                sm.getPageLeaderColor() + lang("leader", sender) : (target.isTrusted() ?
-                sm.getPageTrustedColor() + lang("trusted", sender) : sm.getPageUnTrustedColor() +
-                lang("untrusted", sender)));
+        if (target == null || targetClan == null) {
+            return lang("free.agent", sender);
+        }
+        if (target.isLeader()) {
+            return sm.getColored(PAGE_LEADER_COLOR) + lang("leader", sender);
+        }
+        if (target.isTrusted()) {
+            return sm.getColored(PAGE_TRUSTED_COLOR) + lang("trusted", sender);
+        }
+        if (!target.getRankId().isEmpty()) {
+            return sm.getColored(PAGE_TRUSTED_COLOR) + lang("in.rank", sender);
+        }
+        return sm.getColored(PAGE_UNTRUSTED_COLOR) + lang("untrusted", sender);
     }
 
     @NotNull
@@ -89,8 +101,13 @@ public class Lookup extends Sendable {
 
             if (targetClan == null) {
                 killType = DARK_GRAY + lang("civilian", sender);
-            } else if (senderClan != null && senderClan.isRival(targetClan.getTag())) {
-                killType = WHITE + lang("rival", sender);
+            } else if (senderClan != null) {
+                if (senderClan.isRival(targetClan.getTag())) {
+                    killType = WHITE + lang("rival", sender);
+                }
+                if (senderClan.equals(targetClan) || senderClan.isAlly(targetClan.getTag())) {
+                    killType = RED + lang("ally", sender);
+                }
             }
 
             killTypeLine = lang("player.lookup.killtype", sender).replace("%player_kill_type%", killType);

src/main/java/net/sacredlabyrinth/phaed/simpleclans/commands/data/MostKilled.java

@@ -10,6 +10,8 @@ import org.jetbrains.annotations.NotNull;
 import java.util.Map;
 
 import static net.sacredlabyrinth.phaed.simpleclans.SimpleClans.lang;
+import static net.sacredlabyrinth.phaed.simpleclans.managers.SettingsManager.ConfigField.PAGE_SEPARATOR;
+import static net.sacredlabyrinth.phaed.simpleclans.managers.SettingsManager.ConfigField.SERVER_NAME;
 import static org.bukkit.ChatColor.*;
 
 public class MostKilled extends Sendable {
@@ -64,8 +66,8 @@ public class MostKilled extends Sendable {
         chatBlock.addRow("  " + headColor + lang("victim", player), headColor +
                 lang("killcount", player), headColor + lang("attacker", player));
 
-        ChatBlock.saySingle(player, sm.getServerName() + subColor + " " + lang("mostkilled",
-                player) + " " + headColor + Helper.generatePageSeparator(sm.getPageSep()));
+        ChatBlock.saySingle(player, sm.getColored(SERVER_NAME) + subColor + " " + lang("mostkilled",
+                player) + " " + headColor + Helper.generatePageSeparator(sm.getString(PAGE_SEPARATOR)));
         ChatBlock.sendBlank(player);
     }
 }

src/main/java/net/sacredlabyrinth/phaed/simpleclans/commands/data/Rivalries.java

@@ -10,6 +10,8 @@ import org.jetbrains.annotations.NotNull;
 import java.util.List;
 
 import static net.sacredlabyrinth.phaed.simpleclans.SimpleClans.lang;
+import static net.sacredlabyrinth.phaed.simpleclans.managers.SettingsManager.ConfigField.PAGE_SEPARATOR;
+import static net.sacredlabyrinth.phaed.simpleclans.managers.SettingsManager.ConfigField.SERVER_NAME;
 import static org.bukkit.ChatColor.*;
 
 public class Rivalries extends Sendable {
@@ -29,7 +31,7 @@ public class Rivalries extends Sendable {
                 continue;
             }
 
-            chatBlock.addRow("  " + AQUA + clan.getName(), clan.getRivalString(DARK_GRAY + ", "));
+            chatBlock.addRow("  " + AQUA + clan.getName(), clan.getRivalString(DARK_GRAY + ", ", sender));
         }
 
         sendBlock();
@@ -37,8 +39,8 @@ public class Rivalries extends Sendable {
 
     private void sendHeader() {
         ChatBlock.sendBlank(sender);
-        ChatBlock.saySingle(sender, sm.getServerName() + subColor + " " +
-                lang("rivalries", sender) + " " + headColor + Helper.generatePageSeparator(sm.getPageSep()));
+        ChatBlock.saySingle(sender, sm.getColored(SERVER_NAME) + subColor + " " +
+                lang("rivalries", sender) + " " + headColor + Helper.generatePageSeparator(sm.getString(PAGE_SEPARATOR)));
         ChatBlock.sendBlank(sender);
         ChatBlock.sendMessage(sender, headColor + lang("legend", sender) + DARK_RED + " [" +
                 lang("war", sender) + "]");

src/main/java/net/sacredlabyrinth/phaed/simpleclans/commands/data/Sendable.java

@@ -8,6 +8,7 @@ import org.bukkit.command.CommandSender;
 import org.jetbrains.annotations.NotNull;
 
 import static net.sacredlabyrinth.phaed.simpleclans.SimpleClans.lang;
+import static net.sacredlabyrinth.phaed.simpleclans.managers.SettingsManager.ConfigField.*;
 
 public abstract class Sendable {
 
@@ -25,19 +26,19 @@ public abstract class Sendable {
         sm = plugin.getSettingsManager();
         cm = plugin.getClanManager();
         this.sender = sender;
-        headColor = sm.getPageHeadingsColor();
-        subColor = sm.getPageSubTitleColor();
+        headColor = sm.getColored(PAGE_HEADINGS_COLOR);
+        subColor = sm.getColored(PAGE_SUBTITLE_COLOR);
     }
 
     protected void sendBlock() {
         SettingsManager sm = plugin.getSettingsManager();
-        boolean more = chatBlock.sendBlock(sender, sm.getPageSize());
+        boolean more = chatBlock.sendBlock(sender, sm.getInt(PAGE_SIZE));
 
         if (more) {
             plugin.getStorageManager().addChatBlock(sender, chatBlock);
             ChatBlock.sendBlank(sender);
-            ChatBlock.sendMessage(sender, sm.getPageHeadingsColor() + lang("view.next.page", sender,
-                    sm.getCommandMore()));
+            ChatBlock.sendMessage(sender, sm.getColored(PAGE_HEADINGS_COLOR) + lang("view.next.page", sender,
+                    sm.getString(COMMANDS_MORE)));
         }
         ChatBlock.sendBlank(sender);
     }

src/main/java/net/sacredlabyrinth/phaed/simpleclans/commands/data/Vitals.java

@@ -9,6 +9,7 @@ import java.util.Collection;
 import java.util.List;
 
 import static net.sacredlabyrinth.phaed.simpleclans.SimpleClans.lang;
+import static net.sacredlabyrinth.phaed.simpleclans.managers.SettingsManager.ConfigField.*;
 import static org.bukkit.ChatColor.*;
 
 public class Vitals extends Sendable {
@@ -38,8 +39,8 @@ public class Vitals extends Sendable {
 
     private void configureAndSendHeader() {
         ChatBlock.sendBlank(sender);
-        ChatBlock.saySingle(sender, sm.getPageClanNameColor() + clan.getName() + subColor + " " +
-                lang("vitals", sender) + " " + headColor + Helper.generatePageSeparator(sm.getPageSep()));
+        ChatBlock.saySingle(sender, sm.getColored(PAGE_CLAN_NAME_COLOR) + clan.getName() + subColor + " " +
+                lang("vitals", sender) + " " + headColor + Helper.generatePageSeparator(sm.getString(PAGE_SEPARATOR)));
         ChatBlock.sendBlank(sender);
         ChatBlock.sendMessage(sender, headColor + lang("weapons", sender) + ": " +
                 lang("0.s.sword.1.2.b.bow.3.4.a.arrow", sender, WHITE, DARK_GRAY, WHITE, DARK_GRAY, WHITE));
@@ -63,10 +64,10 @@ public class Vitals extends Sendable {
             Player p = cpm.toPlayer();
 
             if (p != null) {
-                String name = (cpm.isLeader() ? sm.getPageLeaderColor() : (cpm.isTrusted() ? sm.getPageTrustedColor()
-                        : sm.getPageUnTrustedColor())) + cpm.getName();
-                String health = cm.getHealthString(p.getHealth());
-                String hunger = cm.getHungerString(p.getFoodLevel());
+                String name = (cpm.isLeader() ? sm.getColored(PAGE_LEADER_COLOR) : (cpm.isTrusted() ? sm.getColored(PAGE_TRUSTED_COLOR)
+                        : sm.getColored(PAGE_UNTRUSTED_COLOR))) + cpm.getName();
+                String health = cm.getBar(p.getHealth());
+                String hunger = cm.getBar(p.getFoodLevel());
                 String armor = cm.getArmorString(p.getInventory());
                 String weapons = cm.getWeaponString(p.getInventory());
                 String food = cm.getFoodString(p.getInventory());

src/main/java/net/sacredlabyrinth/phaed/simpleclans/commands/general/GeneralCommands.java

@@ -5,27 +5,34 @@ import co.aikar.commands.CommandHelp;
 import co.aikar.commands.CommandParameter;
 import co.aikar.commands.HelpEntry;
 import co.aikar.commands.annotation.*;
-import net.sacredlabyrinth.phaed.simpleclans.ChatBlock;
-import net.sacredlabyrinth.phaed.simpleclans.Clan;
-import net.sacredlabyrinth.phaed.simpleclans.ClanPlayer;
-import net.sacredlabyrinth.phaed.simpleclans.SimpleClans;
+import net.sacredlabyrinth.phaed.simpleclans.*;
 import net.sacredlabyrinth.phaed.simpleclans.commands.ClanInput;
 import net.sacredlabyrinth.phaed.simpleclans.commands.ClanPlayerInput;
 import net.sacredlabyrinth.phaed.simpleclans.commands.data.*;
 import net.sacredlabyrinth.phaed.simpleclans.conversation.CreateClanTagPrompt;
+import net.sacredlabyrinth.phaed.simpleclans.conversation.RequestCanceller;
+import net.sacredlabyrinth.phaed.simpleclans.conversation.ResetKdrPrompt;
+import net.sacredlabyrinth.phaed.simpleclans.conversation.SCConversation;
+import net.sacredlabyrinth.phaed.simpleclans.events.PlayerResetKdrEvent;
 import net.sacredlabyrinth.phaed.simpleclans.managers.ClanManager;
 import net.sacredlabyrinth.phaed.simpleclans.managers.RequestManager;
 import net.sacredlabyrinth.phaed.simpleclans.managers.SettingsManager;
 import net.sacredlabyrinth.phaed.simpleclans.managers.StorageManager;
 import net.sacredlabyrinth.phaed.simpleclans.ui.InventoryDrawer;
 import net.sacredlabyrinth.phaed.simpleclans.ui.frames.MainFrame;
-import org.bukkit.OfflinePlayer;
+import org.bukkit.Bukkit;
 import org.bukkit.command.CommandSender;
-import org.bukkit.conversations.Conversation;
-import org.bukkit.conversations.ConversationFactory;
 import org.bukkit.entity.Player;
 
+import java.text.MessageFormat;
+import java.util.Comparator;
+import java.util.HashMap;
+import java.util.List;
+
 import static net.sacredlabyrinth.phaed.simpleclans.SimpleClans.lang;
+import static net.sacredlabyrinth.phaed.simpleclans.conversation.CreateClanNamePrompt.NAME_KEY;
+import static net.sacredlabyrinth.phaed.simpleclans.conversation.CreateClanTagPrompt.TAG_KEY;
+import static net.sacredlabyrinth.phaed.simpleclans.managers.SettingsManager.ConfigField.*;
 import static org.bukkit.ChatColor.*;
 
 @CommandAlias("%clan")
@@ -45,10 +52,9 @@ public class GeneralCommands extends BaseCommand {
 
     @Default
     @Description("{@@command.description.clan}")
-    @CommandAlias("%clan")
     @HelpSearchTags("menu gui interface ui")
     public void main(CommandSender sender) {
-        if (sender instanceof Player && settings.isEnableGUI()) {
+        if (sender instanceof Player && settings.is(ENABLE_GUI)) {
             InventoryDrawer.open(new MainFrame((Player) sender));
         } else {
             help(sender, new CommandHelp(getCurrentCommandManager(),
@@ -56,10 +62,21 @@ public class GeneralCommands extends BaseCommand {
         }
     }
 
+    @Subcommand("%locale")
+    @CommandPermission("simpleclans.anyone.locale")
+    @Description("{@@command.description.locale}")
+    @CommandCompletion("@locales")
+    public void locale(ClanPlayer cp, @Values("@locales") @Name("locale") String locale) {
+        cp.setLocale(Helper.forLanguageTag(locale.replace("_", "-")));
+        plugin.getStorageManager().updateClanPlayer(cp);
+
+        ChatBlock.sendMessage(cp, lang("locale.has.been.changed"));
+    }
+
     @Subcommand("%create")
     @CommandPermission("simpleclans.leader.create")
     @Description("{@@command.description.create}")
-    public void create(Player player) {
+    public void create(Player player, @Optional @Name("tag") String tag, @Optional @Name("name") String name) {
         ClanPlayer cp = cm.getAnyClanPlayer(player.getUniqueId());
 
         if (cp != null && cp.getClan() != null) {
@@ -67,9 +84,11 @@ public class GeneralCommands extends BaseCommand {
                     cp.getClan().getName()));
             return;
         }
-
-        Conversation conversation = new ConversationFactory(plugin).withFirstPrompt(new CreateClanTagPrompt())
-                .withLocalEcho(true).buildConversation(player);
+        HashMap<Object, Object> initialData = new HashMap<>();
+        initialData.put(TAG_KEY, tag);
+        initialData.put(NAME_KEY, name);
+        SCConversation conversation = new SCConversation(plugin, player, new CreateClanTagPrompt(), initialData);
+        conversation.addConversationCanceller(new RequestCanceller(player, RED + lang("clan.create.request.cancelled", player)));
         conversation.begin();
     }
 
@@ -85,8 +104,8 @@ public class GeneralCommands extends BaseCommand {
     @CommandCompletion("@players")
     @CommandPermission("simpleclans.anyone.lookup")
     @Description("{@@command.description.lookup.other}")
-    public void lookup(CommandSender sender, @Name("player") OfflinePlayer player) {
-        Lookup l = new Lookup(plugin, sender, player.getUniqueId());
+    public void lookup(CommandSender sender, @Name("player") ClanPlayerInput player) {
+        Lookup l = new Lookup(plugin, sender, player.getClanPlayer().getUniqueId());
         l.send();
     }
 
@@ -114,7 +133,7 @@ public class GeneralCommands extends BaseCommand {
 
     @Subcommand("%profile")
     @CommandPermission("simpleclans.anyone.profile")
-    @CommandCompletion("@clans")
+    @CommandCompletion("@clans:hide_own")
     @Description("{@@command.description.profile.other}")
     public void profile(CommandSender sender, @Conditions("verified") @Name("clan") ClanInput clan) {
         ClanProfile p = new ClanProfile(plugin, sender, clan.getClan());
@@ -122,7 +141,7 @@ public class GeneralCommands extends BaseCommand {
     }
 
     @Subcommand("%roster")
-    @CommandCompletion("@clans")
+    @CommandCompletion("@clans:hide_own")
     @CommandPermission("simpleclans.anyone.roster")
     @Description("{@@command.description.roster.other}")
     public void roster(CommandSender sender, @Conditions("verified") @Name("clan") ClanInput clan) {
@@ -148,17 +167,30 @@ public class GeneralCommands extends BaseCommand {
         ChatBlock.sendMessage(player, AQUA + lang("friendy.fire.is.now.managed.by.your.clan", player));
     }
 
+    @Subcommand("%resetkdr %confirm")
+    @CommandPermission("simpleclans.vip.resetkdr")
+    @Description("{@@command.description.resetkdr}")
+    public void resetKdrConfirm(Player player, ClanPlayer cp) {
+        if (!settings.is(ALLOW_RESET_KDR)) {
+            ChatBlock.sendMessage(player, RED + lang("disabled.command", player));
+            return;
+        }
+        PlayerResetKdrEvent event = new PlayerResetKdrEvent(cp);
+        Bukkit.getServer().getPluginManager().callEvent(event);
+        if (!event.isCancelled() && cm.purchaseResetKdr(player)) {
+            cm.resetKdr(cp);
+            ChatBlock.sendMessage(player, RED + lang("you.have.reseted.your.kdr", player));
+        }
+    }
+
     @Subcommand("%resetkdr")
     @CommandPermission("simpleclans.vip.resetkdr")
     @Description("{@@command.description.resetkdr}")
     public void resetKdr(Player player, ClanPlayer cp) {
-        if (!settings.isAllowResetKdr()) {
+        if (!settings.is(ALLOW_RESET_KDR)) {
             ChatBlock.sendMessage(player, RED + lang("disabled.command", player));
-            return;
-        }
-        if (cm.purchaseResetKdr(player)) {
-            cm.resetKdr(cp);
-            ChatBlock.sendMessage(player, RED + lang("you.have.reseted.your.kdr", player));
+        } else {
+            new SCConversation(plugin, player, new ResetKdrPrompt(cm), 60).begin();
         }
     }
 
@@ -194,12 +226,12 @@ public class GeneralCommands extends BaseCommand {
             return;
         }
 
-        chatBlock.sendBlock(player, settings.getPageSize());
+        chatBlock.sendBlock(player, settings.getInt(PAGE_SIZE));
 
         if (chatBlock.size() > 0) {
             ChatBlock.sendBlank(player);
-            ChatBlock.sendMessage(player, settings.getPageHeadingsColor() + lang("view.next.page", player,
-                    settings.getCommandMore()));
+            ChatBlock.sendMessage(player, settings.getColored(PAGE_HEADINGS_COLOR) + lang("view.next.page", player,
+                    settings.getString(COMMANDS_MORE)));
         }
         ChatBlock.sendBlank(player);
     }
@@ -228,6 +260,31 @@ public class GeneralCommands extends BaseCommand {
         mk.send();
     }
 
+    @Subcommand("%list %balance")
+    @CommandPermission("simpleclans.anyone.list.balance")
+    @Description("{@@command.description.list.balance}")
+    public void listBalance(CommandSender sender) {
+        List<Clan> clans = cm.getClans();
+        if (clans.isEmpty()) {
+            sender.sendMessage(RED + lang("no.clans.have.been.created", sender));
+            return;
+        }
+        clans.sort(Comparator.comparingDouble(Clan::getBalance).reversed());
+
+        sender.sendMessage(lang("clan.list.balance.header", sender, settings.getColored(SERVER_NAME), clans.size()));
+        String lineFormat = lang("clan.list.balance.line", sender);
+
+        String leftBracket = settings.getColored(TAG_BRACKET_COLOR) + settings.getColored(TAG_BRACKET_LEFT);
+        String rightBracket = settings.getColored(TAG_BRACKET_COLOR) + settings.getColored(TAG_BRACKET_RIGHT);
+        for (int i = 0; i < 10 && i < clans.size(); i++) {
+            Clan clan = clans.get(i);
+            String name = " " + (clan.isVerified() ? settings.getColored(PAGE_CLAN_NAME_COLOR) : GRAY) + clan.getName();
+            String line = MessageFormat.format(lineFormat, i + 1, leftBracket, clan.getColorTag(),
+                    rightBracket, name, clan.getBalance());
+            sender.sendMessage(line);
+        }
+    }
+
     @Subcommand("%list")
     @CommandPermission("simpleclans.anyone.list")
     @Description("{@@command.description.list}")

src/main/java/net/sacredlabyrinth/phaed/simpleclans/commands/staff/BankCommand.java

@@ -0,0 +1,89 @@
+package net.sacredlabyrinth.phaed.simpleclans.commands.staff;
+
+import co.aikar.commands.BaseCommand;
+import co.aikar.commands.annotation.*;
+import net.sacredlabyrinth.phaed.simpleclans.ChatBlock;
+import net.sacredlabyrinth.phaed.simpleclans.Clan;
+import net.sacredlabyrinth.phaed.simpleclans.EconomyResponse;
+import net.sacredlabyrinth.phaed.simpleclans.commands.ClanInput;
+import net.sacredlabyrinth.phaed.simpleclans.events.ClanBalanceUpdateEvent;
+import net.sacredlabyrinth.phaed.simpleclans.loggers.BankLogger;
+import net.sacredlabyrinth.phaed.simpleclans.loggers.BankOperator;
+import net.sacredlabyrinth.phaed.simpleclans.managers.PermissionsManager;
+import org.bukkit.command.CommandSender;
+import org.bukkit.entity.Player;
+
+import static net.md_5.bungee.api.ChatColor.RED;
+import static net.sacredlabyrinth.phaed.simpleclans.SimpleClans.lang;
+import static org.bukkit.ChatColor.AQUA;
+
+@CommandAlias("%clan")
+@Conditions("%basic_conditions")
+@Subcommand("%admin %bank")
+public class BankCommand extends BaseCommand {
+
+    @Dependency
+    private PermissionsManager permissions;
+
+    @Subcommand("%status")
+    @CommandPermission("simpleclans.admin.bank.status")
+    @CommandCompletion("@clans")
+    @Description("{@@command.description.bank.admin.status}")
+    public void status(CommandSender sender, @Name("clan") ClanInput clanInput) {
+        Clan clan = clanInput.getClan();
+        ChatBlock.sendMessage(sender, AQUA + lang("clan.admin.balance", sender, clan.getName(), clan.getBalance()));
+    }
+
+    @Subcommand("%take")
+    @CommandPermission("simpleclans.admin.bank.take")
+    @CommandCompletion("@clans")
+    @Description("{@@command.description.bank.admin.take}")
+    public void take(CommandSender sender, @Name("clan") ClanInput clanInput, @Name("amount") double amount) {
+        Clan clan = clanInput.getClan();
+        amount = Math.abs(amount);
+        BankOperator operator = new BankOperator(sender, sender instanceof Player ? permissions.playerGetMoney((Player) sender) : 0);
+
+        EconomyResponse economyResponse = clan.withdraw(operator, ClanBalanceUpdateEvent.Cause.COMMAND, amount);
+        switch (economyResponse) {
+            case SUCCESS:
+                ChatBlock.sendMessage(sender, AQUA + lang("clan.admin.take", sender, amount, clan.getName()));
+                clan.addBb(sender.getName(), lang("bb.clan.take", sender, amount, sender.getName()));
+                break;
+            case NOT_ENOUGH_BALANCE:
+                sender.sendMessage(RED + lang("clan.admin.bank.not.enough.money", sender, clan.getName()));
+                break;
+        }
+    }
+
+    @Subcommand("%give")
+    @CommandPermission("simpleclans.admin.bank.give")
+    @CommandCompletion("@clans")
+    @Description("{@@command.description.bank.admin.give}")
+    public void give(CommandSender sender, @Name("clan") ClanInput clanInput, @Name("amount") double amount) {
+        Clan clan = clanInput.getClan();
+        amount = Math.abs(amount);
+        BankOperator operator = new BankOperator(sender, sender instanceof Player ? permissions.playerGetMoney((Player) sender) : 0);
+
+        EconomyResponse economyResponse = clan.deposit(operator, ClanBalanceUpdateEvent.Cause.COMMAND, amount);
+        if (economyResponse == EconomyResponse.SUCCESS) {
+            ChatBlock.sendMessage(sender, AQUA + lang("clan.admin.give", sender, amount, clan.getName()));
+            clan.addBb(sender.getName(), lang("bb.clan.give", sender, amount, sender.getName()));
+        }
+    }
+
+    @Subcommand("%set")
+    @CommandPermission("simpleclans.admin.bank.set")
+    @CommandCompletion("@clans")
+    @Description("{@@command.description.bank.admin.set}")
+    public void set(CommandSender sender, @Name("clan") ClanInput clanInput, @Name("amount") double amount) {
+        Clan clan = clanInput.getClan();
+        amount = Math.abs(amount);
+        BankOperator operator = new BankOperator(sender, sender instanceof Player ? permissions.playerGetMoney((Player) sender) : 0);
+
+        EconomyResponse response = clan.setBalance(operator, ClanBalanceUpdateEvent.Cause.COMMAND, BankLogger.Operation.SET, amount);
+        if (response == EconomyResponse.SUCCESS) {
+            ChatBlock.sendMessage(sender, AQUA + lang("clan.admin.set", sender, clan.getName(), amount));
+            clan.addBb(sender.getName(), lang("bb.clan.set", sender, amount, sender.getName()));
+        }
+    }
+}

src/main/java/net/sacredlabyrinth/phaed/simpleclans/commands/staff/BbCommand.java

@@ -0,0 +1,57 @@
+package net.sacredlabyrinth.phaed.simpleclans.commands.staff;
+
+import co.aikar.commands.BaseCommand;
+import co.aikar.commands.annotation.*;
+import net.sacredlabyrinth.phaed.simpleclans.ChatBlock;
+import net.sacredlabyrinth.phaed.simpleclans.Clan;
+import net.sacredlabyrinth.phaed.simpleclans.commands.ClanInput;
+import net.sacredlabyrinth.phaed.simpleclans.managers.ClanManager;
+import net.sacredlabyrinth.phaed.simpleclans.managers.SettingsManager;
+import net.sacredlabyrinth.phaed.simpleclans.managers.StorageManager;
+import org.bukkit.entity.Player;
+
+import static net.sacredlabyrinth.phaed.simpleclans.SimpleClans.lang;
+import static org.bukkit.ChatColor.RED;
+
+@CommandAlias("%clan")
+@Conditions("%basic_conditions")
+@Subcommand("%mod %bb")
+public class BbCommand extends BaseCommand {
+
+    @Dependency
+    private StorageManager storage;
+    @Dependency
+    private ClanManager cm;
+
+    @Dependency
+    private SettingsManager settings;
+
+    @Subcommand("%display")
+    @CommandPermission("simpleclans.mod.bb")
+    @CommandCompletion("@clans")
+    @Description("{@@command.description.mod.bb.display}")
+    public void display(Player sender, @Name("clan") ClanInput input) {
+        input.getClan().displayBb(sender);
+    }
+
+    @Subcommand("%clear")
+    @CommandPermission("simpleclans.mod.bb-clear")
+    @CommandCompletion("@clans")
+    @Description("{@@command.description.mod.bb.clear}")
+    public void clear(Player player, @Name("clan") ClanInput input) {
+        input.getClan().clearBb();
+        ChatBlock.sendMessage(player, RED + lang("cleared.bb", player));
+    }
+
+    @Subcommand("%add")
+    @CommandPermission("simpleclans.mod.bb-add")
+    @CommandCompletion("@clans @nothing")
+    @Description("{@@command.description.mod.bb.post}")
+    public void postMessage(Player player, @Name("clan") ClanInput input, @Name("message") String msg) {
+        Clan clan = input.getClan();
+        clan.addBb(lang("bulletin.board.message", player.getName(), msg));
+        clan.displayBb(player);
+        storage.updateClan(clan);
+    }
+
+}

src/main/java/net/sacredlabyrinth/phaed/simpleclans/commands/staff/StaffCommands.java

@@ -2,27 +2,32 @@ package net.sacredlabyrinth.phaed.simpleclans.commands.staff;
 
 import co.aikar.commands.BaseCommand;
 import co.aikar.commands.annotation.*;
-import co.aikar.commands.bukkit.contexts.OnlinePlayer;
 import net.sacredlabyrinth.phaed.simpleclans.*;
 import net.sacredlabyrinth.phaed.simpleclans.commands.ClanInput;
 import net.sacredlabyrinth.phaed.simpleclans.commands.ClanPlayerInput;
+import net.sacredlabyrinth.phaed.simpleclans.events.PlayerHomeSetEvent;
+import net.sacredlabyrinth.phaed.simpleclans.events.PlayerResetKdrEvent;
+import net.sacredlabyrinth.phaed.simpleclans.events.TagChangeEvent;
 import net.sacredlabyrinth.phaed.simpleclans.language.LanguageResource;
 import net.sacredlabyrinth.phaed.simpleclans.managers.ClanManager;
 import net.sacredlabyrinth.phaed.simpleclans.managers.PermissionsManager;
 import net.sacredlabyrinth.phaed.simpleclans.managers.SettingsManager;
 import net.sacredlabyrinth.phaed.simpleclans.managers.StorageManager;
 import net.sacredlabyrinth.phaed.simpleclans.ui.InventoryController;
+import net.sacredlabyrinth.phaed.simpleclans.utils.ChatUtils;
+import net.sacredlabyrinth.phaed.simpleclans.utils.TagValidator;
 import org.bukkit.Bukkit;
 import org.bukkit.ChatColor;
 import org.bukkit.Location;
-import org.bukkit.OfflinePlayer;
 import org.bukkit.command.CommandSender;
 import org.bukkit.entity.Player;
 
 import java.util.Objects;
+import java.util.Optional;
 import java.util.UUID;
 
 import static net.sacredlabyrinth.phaed.simpleclans.SimpleClans.lang;
+import static net.sacredlabyrinth.phaed.simpleclans.managers.SettingsManager.ConfigField.GLOBAL_FRIENDLY_FIRE;
 import static org.bukkit.ChatColor.AQUA;
 import static org.bukkit.ChatColor.RED;
 
@@ -41,48 +46,77 @@ public class StaffCommands extends BaseCommand {
     @Dependency
     private StorageManager storage;
 
-    @Subcommand("%place")
+    @Subcommand("%mod %place")
     @CommandPermission("simpleclans.mod.place")
     @CommandCompletion("@players @clans")
     @HelpSearchTags("move put")
     @Description("{@@command.description.place}")
-    public void place(CommandSender sender, @Name("player") OnlinePlayer onlinePlayer, @Name("clan") ClanInput clan) {
-        Player player = onlinePlayer.getPlayer();
-        ClanPlayer oldCp = cm.getClanPlayer(player);
-        Clan newClanInput = clan.getClan();
+    public void place(CommandSender sender, @Name("player") ClanPlayerInput cpInput, @Name("clan") ClanInput clanInput) {
+        UUID uuid = cpInput.getClanPlayer().getUniqueId();
+        ClanPlayer oldCp = cm.getClanPlayer(uuid);
+        Clan newClan = clanInput.getClan();
+
         if (oldCp != null) {
             Clan oldClan = Objects.requireNonNull(oldCp.getClan());
 
-            if (oldClan.equals(newClanInput)) {
+            if (oldClan.equals(newClan)) {
                 ChatBlock.sendMessage(sender, lang("player.already.in.this.clan", sender));
                 return;
             }
-
-            if (oldClan.isLeader(player) && oldClan.getLeaders().size() <= 1) {
-                oldClan.clanAnnounce(player.getName(), AQUA + lang("clan.has.been.disbanded",
-                        oldClan.getName()));
-                oldClan.disband();
+            if (!oldClan.isPermanent() && oldClan.isLeader(uuid) && oldClan.getLeaders().size() <= 1) {
+                ChatBlock.sendMessage(sender, RED + lang("you.cannot.move.the.last.leader", sender));
+                return;
             } else {
-                oldClan.addBb(player.getName(), AQUA + lang("0.has.resigned", player.getName()));
-                oldClan.removePlayerFromClan(player.getUniqueId());
+                oldClan.addBb(oldCp.getName(), lang("0.has.resigned", oldCp.getName()));
+                oldClan.removePlayerFromClan(uuid);
             }
         }
 
-        ClanPlayer cp = Objects.requireNonNull(cm.getCreateClanPlayerUUID(player.getName()));
+        ClanPlayer cp = cm.getCreateClanPlayer(uuid);
 
-        newClanInput.addBb(AQUA + lang("joined.the.clan", player.getName()));
-        cm.serverAnnounce(lang("has.joined", player.getName(), newClanInput.getName()));
-        newClanInput.addPlayerToClan(cp);
+        newClan.addBb(lang("joined.the.clan", cp.getName()));
+        cm.serverAnnounce(lang("has.joined", cp.getName(), newClan.getName()));
+        newClan.addPlayerToClan(cp);
     }
 
-    @Subcommand("%reload")
+    @Subcommand("%mod %modtag")
+    @CommandPermission("simpleclans.mod.modtag")
+    @Description("{@@command.description.modtag.other}")
+    public void modtag(Player player, @Name("clan") ClanInput clanInput, @Single @Name("tag") String tag) {
+        Clan clan = clanInput.getClan();
+        TagChangeEvent event = new TagChangeEvent(player, clan, tag);
+        plugin.getServer().getPluginManager().callEvent(event);
+        if (event.isCancelled()) {
+            return;
+        }
+        tag = event.getNewTag();
+        String cleanTag = Helper.cleanTag(tag);
+
+        Optional<String> validationError = plugin.getTagValidator().validate(player, tag);
+        if (validationError.isPresent()) {
+            ChatBlock.sendMessage(player, validationError.get());
+            return;
+        }
+
+        if (!cleanTag.equals(clan.getTag())) {
+            ChatBlock.sendMessage(player, RED + lang("you.can.only.modify.the.color.and.case.of.the.tag",
+                    player));
+            return;
+        }
+
+        clan.addBb(player.getName(), lang("tag.changed.to.0", ChatUtils.parseColors(tag)));
+        clan.changeClanTag(tag);
+        player.sendMessage(lang("0.tag.changed.to.1", player, clan.getTag(), tag));
+    }
+
+    @Subcommand("%admin %reload")
     @CommandPermission("simpleclans.admin.reload")
     @Description("{@@command.description.reload}")
     public void reload(CommandSender sender) {
         storage.saveModified();
         plugin.reloadConfig();
         LanguageResource.clearCache();
-        settings.load();
+        settings.loadAndSave();
         storage.importFromDatabase();
         permissions.loadPermissions();
 
@@ -92,39 +126,39 @@ public class StaffCommands extends BaseCommand {
         ChatBlock.sendMessage(sender, AQUA + lang("configuration.reloaded", sender));
     }
 
-    @Subcommand("%home %set")
+    @Subcommand("%mod %home %set")
     @CommandPermission("simpleclans.mod.home")
     @CommandCompletion("@clans")
     @Description("{@@command.description.mod.home.set}")
-    public void homeSet(Player player, @Name("clan") ClanInput clan) {
+    public void homeSet(Player player, ClanPlayer cp, @Name("clan") ClanInput clanInput) {
         Location loc = player.getLocation();
+        Clan clan = clanInput.getClan();
 
-        clan.getClan().setHomeLocation(loc);
-        ChatBlock.sendMessage(player, AQUA + lang("hombase.mod.set", player, clan.getClan().getName()) + " " +
-                ChatColor.YELLOW + Helper.toLocationString(loc));
-    }
-
-    @Subcommand("%home %tp")
-    @CommandCompletion("@clans:has_home")
-    @CommandPermission("simpleclans.mod.hometp")
-    @Description("{@@command.description.mod.home.tp}")
-    public void homeTp(Player player, @Name("clan") ClanInput clan) {
-        Location loc = clan.getClan().getHomeLocation();
-
-        if (loc == null) {
-            ChatBlock.sendMessage(player, ChatColor.RED + lang("hombase.not.set", player));
+        PlayerHomeSetEvent event = new PlayerHomeSetEvent(clan, cp, loc);
+        Bukkit.getPluginManager().callEvent(event);
+        if (event.isCancelled()) {
             return;
         }
 
+        clan.setHomeLocation(loc);
+        ChatBlock.sendMessage(player, AQUA + lang("hombase.mod.set", player, clan.getName()) + " " +
+                ChatColor.YELLOW + Helper.toLocationString(loc));
+    }
+
+    @Subcommand("%mod %home %tp")
+    @CommandCompletion("@clans:has_home")
+    @CommandPermission("simpleclans.mod.hometp")
+    @Description("{@@command.description.mod.home.tp}")
+    public void homeTp(Player player, @Name("clan") @Conditions("can_teleport") ClanInput clan) {
         plugin.getTeleportManager().teleportToHome(player, clan.getClan());
     }
 
-    @Subcommand("%ban")
+    @Subcommand("%mod %ban")
     @CommandPermission("simpleclans.mod.ban")
     @CommandCompletion("@players")
     @Description("{@@command.description.ban}")
-    public void ban(CommandSender sender, @Name("player") OfflinePlayer player) {
-        UUID uuid = player.getUniqueId();
+    public void ban(CommandSender sender, @Name("player") ClanPlayerInput player) {
+        UUID uuid = player.getClanPlayer().getUniqueId();
         if (settings.isBanned(uuid)) {
             ChatBlock.sendMessage(sender, RED + lang("this.player.is.already.banned", sender));
             return;
@@ -139,12 +173,12 @@ public class StaffCommands extends BaseCommand {
         }
     }
 
-    @Subcommand("%unban")
+    @Subcommand("%mod %unban")
     @CommandPermission("simpleclans.mod.ban")
     @CommandCompletion("@players")
     @Description("{@@command.description.unban}")
-    public void unban(CommandSender sender, @Name("player") OfflinePlayer player) {
-        UUID uuid = player.getUniqueId();
+    public void unban(CommandSender sender, @Name("player") ClanPlayerInput player) {
+        UUID uuid = player.getClanPlayer().getUniqueId();
         if (!settings.isBanned(uuid)) {
             ChatBlock.sendMessage(sender, RED + lang("this.player.is.not.banned", sender));
             return;
@@ -159,34 +193,33 @@ public class StaffCommands extends BaseCommand {
         ChatBlock.sendMessage(sender, AQUA + lang("player.removed.from.the.banned.list", sender));
     }
 
-    @Subcommand("%globalff %allow")
+    @Subcommand("%mod %globalff %allow")
     @CommandPermission("simpleclans.mod.globalff")
     @Description("{@@command.description.globalff.allow}")
     public void allowGlobalFf(CommandSender sender) {
-        if (settings.isGlobalff()) {
+        if (settings.is(GLOBAL_FRIENDLY_FIRE)) {
             ChatBlock.sendMessage(sender, AQUA + lang("global.friendly.fire.is.already.being.allowed", sender));
         } else {
-            settings.setGlobalff(true);
+            settings.set(GLOBAL_FRIENDLY_FIRE, true);
             ChatBlock.sendMessage(sender, AQUA + lang("global.friendly.fire.is.set.to.allowed", sender));
         }
     }
 
-    @Subcommand("%globalff %auto")
+    @Subcommand("%mod %globalff %auto")
     @CommandPermission("simpleclans.mod.globalff")
     @Description("{@@command.description.globalff.auto}")
     public void autoGlobalFf(CommandSender sender) {
-        if (!settings.isGlobalff()) {
+        if (!settings.is(GLOBAL_FRIENDLY_FIRE)) {
             ChatBlock.sendMessage(sender, AQUA +
                     lang("global.friendy.fire.is.already.being.managed.by.each.clan", sender));
         } else {
-            settings.setGlobalff(false);
+            settings.set(GLOBAL_FRIENDLY_FIRE, false);
             ChatBlock.sendMessage(sender, AQUA + lang("global.friendy.fire.is.now.managed.by.each.clan",
                     sender));
         }
     }
 
-
-    @Subcommand("%verify")
+    @Subcommand("%mod %verify")
     @CommandPermission("simpleclans.mod.verify")
     @CommandCompletion("@clans:unverified")
     @Description("{@@command.description.mod.verify}")
@@ -195,14 +228,14 @@ public class StaffCommands extends BaseCommand {
 
         if (!clanInput.isVerified()) {
             clanInput.verifyClan();
-            clanInput.addBb(sender.getName(), AQUA + lang("clan.0.has.been.verified", clanInput.getName()));
+            clanInput.addBb(sender.getName(), lang("clan.0.has.been.verified", clanInput.getName()));
             ChatBlock.sendMessage(sender, AQUA + lang("the.clan.has.been.verified", sender));
         } else {
             ChatBlock.sendMessage(sender, RED + lang("the.clan.is.already.verified", sender));
         }
     }
 
-    @Subcommand("%purge")
+    @Subcommand("%admin %purge")
     @CommandPermission("simpleclans.admin.purge")
     @CommandCompletion("@players")
     @Description("{@@command.description.purge}")
@@ -214,19 +247,35 @@ public class StaffCommands extends BaseCommand {
 
         Clan clan = player.getClanPlayer().getClan();
         if (clan != null && clan.getMembers().size() == 1) {
-            clan.disband();
+            clan.disband(sender, false, false);
         }
         cm.deleteClanPlayer(player.getClanPlayer());
         ChatBlock.sendMessage(sender, AQUA + lang("player.purged", sender));
     }
 
-    @Subcommand("%disband")
+    @Subcommand("%mod %kick")
+    @Description("{@@command.description.mod.kick}")
+    @CommandPermission("simpleclans.mod.kick")
+    @CommandCompletion("@all_non_leaders|@all_leaders")
+    public void kick(CommandSender sender, @Conditions("clan_member") @Name("player") ClanPlayerInput cp) {
+        ClanPlayer clanPlayer = cp.getClanPlayer();
+        Clan clan = Objects.requireNonNull(clanPlayer.getClan());
+        if (clanPlayer.isLeader() && clan.getLeaders().size() == 1) {
+            ChatBlock.sendMessageKey(sender, "cannot.kick.last.leader");
+            return;
+        }
+
+        clan.addBb(sender.getName(), lang("has.been.kicked.by", clanPlayer.getName(),
+                sender.getName(), sender));
+        clan.removePlayerFromClan(clanPlayer.getUniqueId());
+    }
+
+    @Subcommand("%mod %disband")
     @CommandCompletion("@clans")
     @CommandPermission("simpleclans.mod.disband")
     @Description("{@@command.description.mod.disband}")
     public void disband(CommandSender sender, @Name("clan") ClanInput clan) {
-        cm.serverAnnounce(AQUA + lang("clan.has.been.disbanded", clan.getClan().getName()));
-        clan.getClan().disband();
+        clan.getClan().disband(sender, true, true);
     }
 
     @Subcommand("%admin %promote")
@@ -234,20 +283,22 @@ public class StaffCommands extends BaseCommand {
     @CommandPermission("simpleclans.admin.promote")
     @Description("{@@command.description.admin.promote}")
     public void promote(CommandSender sender, @Conditions("online|clan_member") @Name("player") ClanPlayerInput promote) {
-        Player promotePl = Objects.requireNonNull(promote.getClanPlayer().toPlayer());
+        ClanPlayer clanPlayer = promote.getClanPlayer();
+        Player promotePl = Objects.requireNonNull(clanPlayer.toPlayer());
         if (!permissions.has(promotePl, "simpleclans.leader.promotable")) {
             ChatBlock.sendMessage(sender, RED + lang("the.player.does.not.have.the.permissions.to.lead.a.clan",
                     sender));
             return;
         }
-        Clan clan = Objects.requireNonNull(promote.getClanPlayer().getClan());
+        Clan clan = Objects.requireNonNull(clanPlayer.getClan());
         if (clan.isLeader(promotePl)) {
             ChatBlock.sendMessage(sender, RED + lang("the.player.is.already.a.leader", sender));
             return;
         }
 
-        clan.addBb(sender.getName(), AQUA + lang("promoted.to.leader", promotePl.getName()));
+        clan.addBb(sender.getName(), lang("promoted.to.leader", promotePl.getName()));
         clan.promote(promotePl.getUniqueId());
+        ChatBlock.sendMessage(sender, AQUA + lang("player.successfully.promoted", sender));
     }
 
     @Subcommand("%admin %demote")
@@ -257,33 +308,82 @@ public class StaffCommands extends BaseCommand {
     public void demote(CommandSender sender, @Conditions("clan_member") @Name("leader") ClanPlayerInput other) {
         ClanPlayer otherCp = other.getClanPlayer();
         Clan clan = Objects.requireNonNull(otherCp.getClan());
-        if (clan.getLeaders().size() == 1) {
+
+        if (!otherCp.isLeader()) {
+            ChatBlock.sendMessage(sender, RED + lang("player.is.not.a.leader", sender));
+            return;
+        }
+
+        if (clan.getLeaders().size() == 1 && !clan.isPermanent()) {
             ChatBlock.sendMessage(sender, RED + lang("you.cannot.demote.the.last.leader", sender));
             return;
         }
         clan.demote(otherCp.getUniqueId());
-
-        clan.addBb(sender.getName(), AQUA + lang("demoted.back.to.member", otherCp.getName()));
+        clan.addBb(sender.getName(), lang("demoted.back.to.member", otherCp.getName()));
         ChatBlock.sendMessage(sender, AQUA + lang("player.successfully.demoted", sender));
     }
 
-    @Subcommand("%resetkdr %everyone")
+    @Subcommand("%admin %resetkdr %everyone")
     @CommandPermission("simpleclans.admin.resetkdr")
     @Description("{@@command.description.resetkdr.everyone}")
     public void resetKdr(CommandSender sender) {
         for (ClanPlayer cp : cm.getAllClanPlayers()) {
-            cm.resetKdr(cp);
+            PlayerResetKdrEvent event = new PlayerResetKdrEvent(cp);
+            Bukkit.getServer().getPluginManager().callEvent(event);
+            if (!event.isCancelled()) {
+                cm.resetKdr(cp);
+            }
         }
         ChatBlock.sendMessage(sender, RED + lang("you.have.reseted.kdr.of.all.players", sender));
     }
 
-    @Subcommand("%resetkdr")
+    @Subcommand("%admin %resetkdr")
     @CommandCompletion("@players")
     @CommandPermission("simpleclans.admin.resetkdr")
     @Description("{@@command.description.resetkdr.player}")
-    public void resetKdr(CommandSender sender, @Name("player") ClanPlayerInput player) {
-        ClanPlayer cp = player.getClanPlayer();
-        cm.resetKdr(cp);
-        ChatBlock.sendMessage(sender, RED + lang("you.have.reseted.0.kdr", sender, cp.getName()));
+    public void resetKdr(CommandSender sender, @Name("player") ClanPlayerInput clanPlayer) {
+        ClanPlayer cp = clanPlayer.getClanPlayer();
+        PlayerResetKdrEvent event = new PlayerResetKdrEvent(cp);
+        Bukkit.getServer().getPluginManager().callEvent(event);
+        if (!event.isCancelled()) {
+            cm.resetKdr(cp);
+            ChatBlock.sendMessage(sender, RED + lang("you.have.reseted.0.kdr", sender, cp.getName()));
+        }
+    }
+
+    @Subcommand("%admin %permanent")
+    @CommandCompletion("@clans")
+    @CommandPermission("simpleclans.admin.permanent")
+    @Description("{@@command.description.admin.permanent}")
+    public void togglePermanent(CommandSender sender, @Name("clan") ClanInput clanInput) {
+        Clan clan = clanInput.getClan();
+        boolean permanent = !clan.isPermanent();
+        clan.setPermanent(permanent);
+        clan.addBb(sender.getName(), lang((permanent) ? "permanent.status.enabled" : "permanent.status.disabled", sender.getName()));
+        ChatBlock.sendMessage(sender, AQUA + lang("you.have.toggled.permanent.status", sender, clan.getName()));
+    }
+
+    @Subcommand("%mod %rename")
+    @CommandCompletion("@clans @nothing")
+    @CommandPermission("simpleclans.mod.rename")
+    @Description("{@@command.description.mod.rename}")
+    public void rename(CommandSender sender, @Name("clan") ClanInput clanInput, @Name("name") String clanName) {
+        Clan clan = clanInput.getClan();
+        clan.setName(clanName);
+        storage.updateClan(clan);
+
+        ChatBlock.sendMessageKey(sender, "you.have.successfully.renamed.the.clan", clanName);
+    }
+
+    @Subcommand("%mod %locale")
+    @CommandPermission("simpleclans.mod.locale")
+    @Description("{@@command.description.mod.locale}")
+    @CommandCompletion("@locales")
+    public void locale(CommandSender sender, @Name("player") ClanPlayerInput input, @Values("@locales") @Name("locale") String locale) {
+        ClanPlayer cp = input.getClanPlayer();
+        cp.setLocale(Helper.forLanguageTag(locale.replace("_", "-")));
+        plugin.getStorageManager().updateClanPlayer(cp);
+
+        ChatBlock.sendMessage(sender, lang("locale.has.been.changed"));
     }
 }