Bump version to 2.7.9 release

Allow unrented event to use placeholders

.github/ISSUE_TEMPLATE/bug_report.md

@@ -0,0 +1,39 @@
+---
+name: Bug report
+about: Report a problem in the plugin
+title: ''
+labels: 'NEW, Type: Bug'
+assignees: ''
+
+---
+
+**Current behavior**
+<!--- Tell what happens currently and/or show the stacktrace if an error occured -->
+
+
+**Expected behavior**
+<!--- Tell what you expected to happen instead -->
+
+
+**Steps to reproduce**
+<!--- Exactly show how this bug can be triggered -->
+1. 
+2. 
+3. 
+4. 
+
+
+**Your environment**
+<!--- Indicate which versions you use -->
+<!--- Attention: "LATEST" or "NEWEST" are invalid answers! -->
+<!--- Use '/version' for the Platform version and '/version <plugin>' for plugin versions -->
+* Server platform (Bukkit, Spigot, etc.): 
+* Server version: 
+* AreaShop version: 
+* WorldEdit version: 
+* WorldGuard version: 
+* Vault version: 
+
+
+**Your config files**
+<!--- Attach a '.zip' file of the '/plugins/AreaShop' and '/plugins/WorldGuard' directories to show your configuration setup -->

.github/ISSUE_TEMPLATE/feature_request.md

@@ -0,0 +1,15 @@
+---
+name: Feature request
+about: Suggest an idea
+title: ''
+labels: 'NEW, Type: Feature'
+assignees: ''
+
+---
+
+**Describe the problem you are trying to solve with this feature request**
+<!-- When I know the problem you are trying to solve I can help you to think about the best solution -->
+
+
+**Describe the solution you'd like**
+<!-- Describe the config settings, commands and other features that should be added -->

.github/ISSUE_TEMPLATE/support-question.md

@@ -0,0 +1,31 @@
+---
+name: Support question
+about: Ask help with the setup or usage of the plugin
+title: ''
+labels: 'NEW, Type: Support'
+assignees: ''
+
+---
+
+**Current behavior**
+<!--- Tell what happens currently -->
+
+
+**Desired behavior**
+<!--- Tell what you want to happen instead -->
+
+
+**Your environment**
+<!--- Indicate which versions you use -->
+<!--- Attention: "LATEST" or "NEWEST" are invalid answers! -->
+<!--- Use '/version' for the Platform version and '/version <plugin>' for plugin versions -->
+* Server platform (Bukkit, Spigot, etc.): 
+* Server version: 
+* AreaShop version: 
+* WorldEdit version: 
+* WorldGuard version: 
+* Vault version: 
+
+
+**Your config files**
+<!--- Attach a '.zip' file of the '/plugins/AreaShop' and '/plugins/WorldGuard' directories to show your configuration setup -->

.github/workflows/gradle.yml

@@ -0,0 +1,23 @@
+name: Java CI with Gradle
+
+on: [ push, pull_request ]
+
+jobs:
+  build:
+    # Only run on PRs if the source branch is on someone else's repo
+    if: ${{ github.event_name != 'pull_request' || github.repository != github.event.pull_request.head.repo.full_name }}
+    strategy:
+      matrix:
+        os: ["ubuntu-latest", "windows-latest"]
+    runs-on: "${{ matrix.os }}"
+    steps:
+      - uses: actions/checkout@v2
+      - uses: gradle/wrapper-validation-action@v1.0.4
+      - name: Set up JDK 17
+        uses: actions/setup-java@v2
+        with:
+          java-version: '17'
+          distribution: 'zulu'
+          cache: 'gradle'
+      - name: Build with Gradle
+        run: ./gradlew clean build

.gitignore

@@ -1,33 +1,194 @@
-# Maven stuff
-/target
 
-*.pydevproject
-.project
-.metadata
-bin/
-tmp/
-*.tmp
-*.bak
-*.swp
-*~.nib
-local.properties
-.classpath
-.settings/
-.loadpath
+# Created by https://www.toptal.com/developers/gitignore/api/macos,windows,intellij+all,gradle,maven
+# Edit at https://www.toptal.com/developers/gitignore?templates=macos,windows,intellij+all,gradle,maven
 
-# External tool builders
-.externalToolBuilders/
+### Intellij+all ###
+# Covers JetBrains IDEs: IntelliJ, RubyMine, PhpStorm, AppCode, PyCharm, CLion, Android Studio, WebStorm and Rider
+# Reference: https://intellij-support.jetbrains.com/hc/en-us/articles/206544839
 
-# Locally stored "Eclipse launch configurations"
-*.launch
+# User-specific stuff
+.idea/**/workspace.xml
+.idea/**/tasks.xml
+.idea/**/usage.statistics.xml
+.idea/**/dictionaries
+.idea/**/shelf
 
-# CDT-specific
-.cproject
+# AWS User-specific
+.idea/**/aws.xml
 
-# PDT-specific
-.buildpath
+# Generated files
+.idea/**/contentModel.xml
+
+# Sensitive or high-churn files
+.idea/**/dataSources/
+.idea/**/dataSources.ids
+.idea/**/dataSources.local.xml
+.idea/**/sqlDataSources.xml
+.idea/**/dynamic.xml
+.idea/**/uiDesigner.xml
+.idea/**/dbnavigator.xml
+
+# Gradle
+.idea/**/gradle.xml
+.idea/**/libraries
+
+# Gradle and Maven with auto-import
+# When using Gradle or Maven with auto-import, you should exclude module files,
+# since they will be recreated, and may cause churn.  Uncomment if using
+# auto-import.
+# .idea/artifacts
+# .idea/compiler.xml
+# .idea/jarRepositories.xml
+# .idea/modules.xml
+# .idea/*.iml
+# .idea/modules
+# *.iml
+# *.ipr
+
+# CMake
+cmake-build-*/
+
+# Mongo Explorer plugin
+.idea/**/mongoSettings.xml
+
+# File-based project format
+*.iws
+
+# IntelliJ
+out/
+
+# mpeltonen/sbt-idea plugin
+.idea_modules/
+
+# JIRA plugin
+atlassian-ide-plugin.xml
+
+# Cursive Clojure plugin
+.idea/replstate.xml
+
+# SonarLint plugin
+.idea/sonarlint/
+
+# Crashlytics plugin (for Android Studio and IntelliJ)
+com_crashlytics_export_strings.xml
+crashlytics.properties
+crashlytics-build.properties
+fabric.properties
+
+# Editor-based Rest Client
+.idea/httpRequests
+
+# Android studio 3.1+ serialized cache file
+.idea/caches/build_file_checksums.ser
+
+### Intellij+all Patch ###
+# Ignores the whole .idea folder and all .iml files
+# See https://github.com/joeblau/gitignore.io/issues/186 and https://github.com/joeblau/gitignore.io/issues/360
+
+.idea/*
+
+# Reason: https://github.com/joeblau/gitignore.io/issues/186#issuecomment-249601023
 
-# IntelliJ IDEA
 *.iml
-.idea
-dependency-reduced-pom.xml
+modules.xml
+.idea/misc.xml
+*.ipr
+
+# Sonarlint plugin
+.idea/sonarlint
+
+### macOS ###
+# General
+.DS_Store
+.AppleDouble
+.LSOverride
+
+# Icon must end with two \r
+Icon
+
+
+# Thumbnails
+._*
+
+# Files that might appear in the root of a volume
+.DocumentRevisions-V100
+.fseventsd
+.Spotlight-V100
+.TemporaryItems
+.Trashes
+.VolumeIcon.icns
+.com.apple.timemachine.donotpresent
+
+# Directories potentially created on remote AFP share
+.AppleDB
+.AppleDesktop
+Network Trash Folder
+Temporary Items
+.apdisk
+
+### Maven ###
+target/
+pom.xml.tag
+pom.xml.releaseBackup
+pom.xml.versionsBackup
+pom.xml.next
+release.properties
+dependency-reduced-pom.xml
+buildNumber.properties
+.mvn/timing.properties
+# https://github.com/takari/maven-wrapper#usage-without-binary-jar
+.mvn/wrapper/maven-wrapper.jar
+
+# Eclipse m2e generated files
+# Eclipse Core
+.project
+# JDT-specific (Eclipse Java Development Tools)
+.classpath
+
+### Windows ###
+# Windows thumbnail cache files
+Thumbs.db
+Thumbs.db:encryptable
+ehthumbs.db
+ehthumbs_vista.db
+
+# Dump file
+*.stackdump
+
+# Folder config file
+[Dd]esktop.ini
+
+# Recycle Bin used on file shares
+$RECYCLE.BIN/
+
+# Windows Installer files
+*.cab
+*.msi
+*.msix
+*.msm
+*.msp
+
+# Windows shortcuts
+*.lnk
+
+### Gradle ###
+.gradle
+build/
+build-cache/
+
+# Ignore Gradle GUI config
+gradle-app.setting
+
+# Avoid ignoring Gradle wrapper jar file (.jar files are usually ignored)
+!gradle-wrapper.jar
+
+# Cache of project
+.gradletasknamecache
+
+# # Work around https://youtrack.jetbrains.com/issue/IDEA-116898
+# gradle/wrapper/gradle-wrapper.properties
+
+### Gradle Patch ###
+**/build/
+
+# End of https://www.toptal.com/developers/gitignore/api/macos,windows,intellij+all,gradle,maven

AreaShop/.gitignore

@@ -1 +0,0 @@
-/target

AreaShop/build.gradle.kts

@@ -0,0 +1,96 @@
+plugins {
+    id("com.github.johnrengelman.shadow") version "7.1.2"
+}
+
+description = "AreaShop"
+
+dependencies {
+    // Platform
+    compileOnlyApi(libs.spigot)
+    compileOnlyApi(libs.worldeditCore) {
+        exclude("com.google.guava", "guava")
+    }
+    compileOnlyApi(libs.worldeditBukkit) {
+        exclude("com.google.guava", "guava")
+    }
+    compileOnlyApi(libs.worldguardCore) {
+        exclude("com.google.guava", "guava")
+    }
+    compileOnlyApi(libs.worldguardBukkit) {
+        exclude("com.google.guava", "guava")
+    }
+    compileOnlyApi("com.github.MilkBowl:VaultAPI:1.7") {
+        exclude("com.google.guava", "guava")
+    }
+
+    // 3rd party libraries
+    implementation(libs.findbugs)
+    implementation("io.papermc:paperlib:1.0.7")
+    implementation("com.github.NLthijs48:InteractiveMessenger:e7749258ca")
+    implementation("com.github.NLthijs48:BukkitDo:819d51ec2b")
+    implementation("io.github.baked-libs:dough-data:1.0.3")
+    implementation("com.google.inject:guice:5.1.0") {
+        exclude("com.google.guava", "guava")
+    }
+    implementation("com.google.inject.extensions:guice-assistedinject:5.1.0") {
+        exclude("com.google.guava", "guava")
+    }
+
+    // Project submodules
+    implementation(projects.areashopInterface)
+    implementation(projects.areashopNms)
+    implementation(projects.adapters.platform.platformInterface)
+    implementation(projects.adapters.platform.paper)
+    // Adapters
+    runtimeOnly(projects.adapters.plugins.worldedit)
+    runtimeOnly(projects.adapters.plugins.worldguard)
+    runtimeOnly(projects.adapters.plugins.fastasyncworldedit)
+    runtimeOnly(project(":adapters:platform:bukkit-1-17", "reobf"))
+    runtimeOnly(project(":adapters:platform:bukkit-1-18", "reobf"))
+    runtimeOnly(project(":adapters:platform:bukkit-1-19", "reobf"))
+}
+
+repositories {
+    mavenCentral()
+}
+
+tasks {
+    processResources {
+        filesMatching("plugin.yml") {
+            expand("version" to project.version)
+        }
+    }
+
+    assemble {
+        dependsOn(shadowJar)
+    }
+
+    jar {
+        archiveClassifier.set("original")
+    }
+
+    java {
+        withSourcesJar()
+    }
+
+    val javaComponent = project.components["java"] as AdhocComponentWithVariants
+    javaComponent.withVariantsFromConfiguration(configurations["shadowRuntimeElements"]) {
+        skip()
+    }
+
+    shadowJar {
+        archiveClassifier.set("")
+        base {
+            archiveBaseName.set("AreaShop")
+        }
+        val base = "me.wiefferink.areashop.libraries"
+        relocate("me.wiefferink.interactivemessenger", "${base}.interactivemessenger")
+        relocate("me.wiefferink.bukkitdo", "${base}.bukkitdo")
+        relocate("io.papermc.lib", "${base}.paperlib")
+        relocate("io.github.bakedlibs.dough", "${base}.dough")
+        relocate("com.google.inject", "${base}.inject")
+        relocate("org.aopalliance", "${base}.aopalliance")
+        relocate("javax.annotation", "${base}.javax.annotation")
+        relocate("javax.inject", "${base}.javax.inject")
+    }
+}

AreaShop/pom.xml

@@ -1,230 +0,0 @@
-<project xmlns="http://maven.apache.org/POM/4.0.0" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
-  xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/xsd/maven-4.0.0.xsd">
-  <modelVersion>4.0.0</modelVersion>
-  <artifactId>areashop</artifactId>
-  <packaging>jar</packaging>
-  <name>AreaShop</name>
-  <version>2.3.0</version> <!-- Main plugin version -->
-
-  <parent>
-    <groupId>me.wiefferink</groupId>
-    <artifactId>areashop-parent</artifactId>
-    <version>parent</version>
-  </parent>
-
-  <dependencies>
-    <dependency>
-      <groupId>org.bukkit</groupId>
-      <artifactId>bukkit</artifactId>
-      <version>1.7.9-R0.2</version>
-      <type>jar</type>
-      <scope>provided</scope>
-      <optional>true</optional>
-    </dependency>
-    <dependency>
-      <groupId>me.wiefferink</groupId>
-      <artifactId>areashop-worldguard-5</artifactId>
-      <version>WorldGuard-5</version>
-      <type>jar</type>
-      <scope>compile</scope>
-      <optional>true</optional>
-    </dependency>
-    <dependency>
-      <groupId>me.wiefferink</groupId>
-      <artifactId>areashop-worldguard-6</artifactId>
-      <version>WorldGuard-6</version>
-      <type>jar</type>
-      <scope>compile</scope>
-      <optional>true</optional>
-    </dependency>
-    <dependency>
-      <groupId>me.wiefferink</groupId>
-      <artifactId>areashop-worldguard-6_1_3</artifactId>
-      <version>WorldGuard-6_1_3</version>
-      <type>jar</type>
-      <scope>compile</scope>
-      <optional>true</optional>
-    </dependency>
-    <dependency>
-      <groupId>me.wiefferink</groupId>
-      <artifactId>areashop-interface</artifactId>
-      <version>AreaShopInterface</version>
-      <type>jar</type>
-      <scope>compile</scope>
-      <optional>true</optional>
-    </dependency>
-    <dependency>
-      <groupId>me.wiefferink</groupId>
-      <artifactId>areashop-worldedit-5</artifactId>
-      <version>WorldEdit-5</version>
-      <type>jar</type>
-      <scope>compile</scope>
-      <optional>true</optional>
-    </dependency>
-    <dependency>
-      <groupId>me.wiefferink</groupId>
-      <artifactId>areashop-worldedit-6</artifactId>
-      <version>WorldEdit-6</version>
-      <type>jar</type>
-      <scope>compile</scope>
-      <optional>true</optional>
-    </dependency>
-    <dependency>
-      <groupId>com.sk89q</groupId>
-      <artifactId>worldedit</artifactId>
-      <version>6.0.0-SNAPSHOT</version>
-      <scope>provided</scope>
-      <type>jar</type>
-    </dependency>
-    <dependency>
-      <groupId>com.sk89q</groupId>
-      <artifactId>worldguard</artifactId>
-      <version>6.0.0-SNAPSHOT</version>
-      <scope>provided</scope>
-      <type>jar</type>
-    </dependency>
-    <dependency>
-      <groupId>net.milkbowl.vault</groupId>
-      <artifactId>VaultAPI</artifactId>
-      <version>1.4</version>
-      <scope>provided</scope>
-    </dependency>
-  </dependencies>
-
-  <profiles>
-    <!-- Copy the jar file to a test server, activate by using -DcopyResult="/path/to/test/server" -->
-    <profile>
-      <id>test-locally</id>
-      <activation>
-        <property>
-          <name>copyResult</name>
-        </property>
-      </activation>
-      <build>
-        <plugins>
-          <plugin>
-            <artifactId>maven-antrun-plugin</artifactId>
-            <version>1.8</version>
-            <configuration>
-              <target>
-                <copy file="./target/${project.build.finalName}.jar" tofile="${copyResult}\${project.build.finalName}.jar"/>
-              </target>
-            </configuration>
-            <executions>
-              <execution>
-                <phase>package</phase>
-                <goals>
-                  <goal>run</goal>
-                </goals>
-              </execution>
-            </executions>
-          </plugin>
-        </plugins>
-      </build>
-    </profile>
-
-    <!-- Package the source files in a jar, activate by using -Dsources -->
-    <profile>
-      <id>package-sources</id>
-      <activation>
-        <property>
-          <name>sources</name>
-        </property>
-      </activation>
-      <build>
-        <plugins>
-          <plugin>
-            <groupId>org.apache.maven.plugins</groupId>
-            <artifactId>maven-source-plugin</artifactId>
-            <version>3.0.0</version>
-            <executions>
-              <execution>
-                <phase>package</phase>
-                <id>attach-sources</id>
-                <goals>
-                  <goal>jar</goal>
-                </goals>
-              </execution>
-            </executions>
-          </plugin>
-        </plugins>
-      </build>
-    </profile>
-
-    <!-- Produce javadoc files, activate by using -Djavadoc -->
-    <profile>
-      <id>generate-javadoc</id>
-      <activation>
-        <property>
-          <name>javadoc</name>
-        </property>
-      </activation>
-      <build>
-        <plugins>
-          <plugin>
-            <groupId>org.apache.maven.plugins</groupId>
-            <artifactId>maven-javadoc-plugin</artifactId>
-            <version>2.10.4</version>
-            <executions>
-              <execution>
-                <phase>package</phase>
-                <id>attach-javadocs</id>
-                <goals>
-                  <goal>jar</goal>
-                </goals>
-              </execution>
-            </executions>
-            <configuration>
-              <excludePackageNames>me.wiefferink.areashop.lib</excludePackageNames>
-              <destDir>${javadoc}</destDir>
-              <links>
-                <link>https://hub.spigotmc.org/javadocs/bukkit/</link>
-                <link>http://docs.sk89q.com/worldedit/apidocs/</link>
-                <link>http://docs.sk89q.com/worldguard/apidocs/</link>
-              </links>
-            </configuration>
-          </plugin>
-        </plugins>
-      </build>
-    </profile>
-  </profiles>
-
-  <build>
-    <directory>target</directory>
-    <finalName>AreaShop</finalName>
-    <resources>
-      <resource>
-        <targetPath>.</targetPath>
-        <filtering>true</filtering>
-        <directory>src/main/resources</directory>
-        <includes>
-          <include>plugin.yml</include>
-          <include>config.yml</include>
-          <include>hiddenConfig.yml</include>
-          <include>default.yml</include>
-          <include>README.md</include>
-          <include>lang/*.yml</include>
-        </includes>
-      </resource>
-    </resources>
-    <plugins>
-      <plugin>
-        <groupId>org.apache.maven.plugins</groupId>
-        <artifactId>maven-shade-plugin</artifactId>
-        <version>2.4.3</version>
-        <executions>
-          <execution>
-            <phase>package</phase>
-            <goals>
-              <goal>shade</goal>
-            </goals>
-          </execution>
-        </executions>
-      </plugin>
-      <plugin>
-        <artifactId>maven-compiler-plugin</artifactId>
-        <version>3.5.1</version>
-      </plugin>
-    </plugins>
-  </build>
-</project>

AreaShop/src/main/java/me/wiefferink/areashop/AreaShopApi.java

@@ -0,0 +1,39 @@
+package me.wiefferink.areashop;
+
+import me.wiefferink.areashop.features.signs.SignManager;
+import me.wiefferink.areashop.interfaces.AreaShopInterface;
+import me.wiefferink.areashop.managers.CommandManager;
+import me.wiefferink.areashop.managers.FeatureManager;
+import me.wiefferink.areashop.managers.SignLinkerManager;
+
+import javax.annotation.Nonnull;
+
+public interface AreaShopApi extends AreaShopInterface {
+
+    /**
+     * Function to get the CommandManager.
+     *
+     * @return the CommandManager
+     */
+    @Nonnull CommandManager getCommandManager();
+
+    /**
+     * Get the SignLinkerManager.
+     * Handles sign linking mode.
+     *
+     * @return The SignLinkerManager
+     */
+    @Nonnull SignLinkerManager getSignlinkerManager();
+
+    /**
+     * Get the FeatureManager.
+     * Manages region specific features.
+     *
+     * @return The FeatureManager
+     */
+    @Nonnull FeatureManager getFeatureManager();
+
+
+    @Nonnull SignManager getSignManager();
+
+}

AreaShop/src/main/java/me/wiefferink/areashop/MessageBridge.java

@@ -0,0 +1,21 @@
+package me.wiefferink.areashop;
+
+public interface MessageBridge {
+    /**
+     * Send a message to a target without a prefix.
+     *
+     * @param target       The target to send the message to
+     * @param key          The key of the language string
+     * @param replacements The replacements to insert in the message
+     */
+    void messageNoPrefix(Object target, String key, Object... replacements);
+
+    /**
+     * Send a message to a target, prefixed by the default chat prefix.
+     *
+     * @param target       The target to send the message to
+     * @param key          The key of the language string
+     * @param replacements The replacements to insert in the message
+     */
+    void message(Object target, String key, Object... replacements);
+}

AreaShop/src/main/java/me/wiefferink/areashop/commands/AddCommand.java

@@ -1,37 +1,68 @@
 package me.wiefferink.areashop.commands;
 
-import com.sk89q.worldedit.bukkit.selections.Selection;
 import com.sk89q.worldguard.protection.regions.ProtectedRegion;
 import me.wiefferink.areashop.AreaShop;
-import me.wiefferink.areashop.Utils;
-import me.wiefferink.areashop.managers.FileManager;
+import me.wiefferink.areashop.MessageBridge;
+import me.wiefferink.areashop.events.ask.AddingRegionEvent;
+import me.wiefferink.areashop.events.ask.BuyingRegionEvent;
+import me.wiefferink.areashop.events.ask.RentingRegionEvent;
+import me.wiefferink.areashop.events.notify.BoughtRegionEvent;
+import me.wiefferink.areashop.events.notify.RentedRegionEvent;
+import me.wiefferink.areashop.interfaces.WorldEditInterface;
+import me.wiefferink.areashop.interfaces.WorldEditSelection;
+import me.wiefferink.areashop.interfaces.WorldGuardInterface;
+import me.wiefferink.areashop.managers.IFileManager;
 import me.wiefferink.areashop.regions.BuyRegion;
 import me.wiefferink.areashop.regions.GeneralRegion;
+import me.wiefferink.areashop.regions.RegionFactory;
 import me.wiefferink.areashop.regions.RentRegion;
+import me.wiefferink.areashop.tools.Utils;
+import me.wiefferink.bukkitdo.Do;
 import org.bukkit.Bukkit;
+import org.bukkit.OfflinePlayer;
 import org.bukkit.World;
 import org.bukkit.command.CommandSender;
 import org.bukkit.entity.Player;
-import org.bukkit.scheduler.BukkitRunnable;
 
+import javax.inject.Inject;
+import javax.inject.Singleton;
 import java.util.ArrayList;
+import java.util.Calendar;
+import java.util.HashMap;
 import java.util.List;
+import java.util.Map;
 import java.util.TreeSet;
+import java.util.UUID;
+import java.util.stream.Collectors;
 
+@Singleton
 public class AddCommand extends CommandAreaShop {
 
-	public AddCommand(AreaShop plugin) {
-		super(plugin);
-	}
+	@Inject
+	private MessageBridge messageBridge;
+	@Inject
+	private AreaShop plugin;
+	@Inject
+	private WorldEditInterface worldEditInterface;
+	@Inject
+	private WorldGuardInterface worldGuardInterface;
+	@Inject
+	private RegionFactory regionFactory;
 	
 	@Override
 	public String getCommandStart() {
 		return "areashop add";
 	}
-	
+
 	@Override
 	public String getHelp(CommandSender target) {
-		if(target.hasPermission("areashop.createrent") || target.hasPermission("areashop.createbuy")) {
+		if(target.hasPermission("areashop.createrent")
+				|| target.hasPermission("areashop.createrent.member")
+				|| target.hasPermission("areashop.createrent.owner")
+
+				|| target.hasPermission("areashop.createbuy")
+				|| target.hasPermission("areashop.createbuy.member")
+				|| target.hasPermission("areashop.createbuy.owner")) {
 			return "help-add";
 		}
 		return null;
@@ -39,22 +70,22 @@ public class AddCommand extends CommandAreaShop {
 
 	@Override
 	public void execute(final CommandSender sender, final String[] args) {
-		if(		   !sender.hasPermission("areashop.createrent") 
+		if(!sender.hasPermission("areashop.createrent")
 				&& !sender.hasPermission("areashop.createrent.member")
 				&& !sender.hasPermission("areashop.createrent.owner")
-				
+
 				&& !sender.hasPermission("areashop.createbuy")
 				&& !sender.hasPermission("areashop.createbuy.member")
 				&& !sender.hasPermission("areashop.createbuy.owner")) {
-			plugin.message(sender, "add-noPermission");
+			messageBridge.message(sender, "add-noPermission");
 			return;
 		}
-		
-		if(args.length < 2 || args[1] == null || (!"rent".equals(args[1].toLowerCase()) && !"buy".equals(args[1].toLowerCase()))) {
-			plugin.message(sender, "add-help");
+
+		if(args.length < 2 || args[1] == null || (!"rent".equalsIgnoreCase(args[1]) && !"buy".equalsIgnoreCase(args[1]))) {
+			messageBridge.message(sender, "add-help");
 			return;
 		}
-		List<ProtectedRegion> regions = new ArrayList<>();
+		Map<String, ProtectedRegion> regions = new HashMap<>();
 		World world;
 		Player player = null;
 		if(sender instanceof Player) {
@@ -62,18 +93,18 @@ public class AddCommand extends CommandAreaShop {
 		}
 		if(args.length == 2) {
 			if(player == null) {
-				plugin.message(sender, "cmd-weOnlyByPlayer");
+				messageBridge.message(sender, "cmd-weOnlyByPlayer");
 				return;
-			}		
-			Selection selection = plugin.getWorldEdit().getSelection(player);
+			}
+			WorldEditSelection selection = worldEditInterface.getPlayerSelection(player);
 			if(selection == null) {
-				plugin.message(player, "cmd-noSelection");
+				messageBridge.message(player, "cmd-noSelection");
 				return;
 			}
 			world = selection.getWorld();
-			regions = Utils.getWERegionsInSelection(selection);
-			if(regions.size() == 0) {
-				plugin.message(player, "cmd-noWERegionsFound");
+			regions = Utils.getWorldEditRegionsInSelection(selection).stream().collect(Collectors.toMap(ProtectedRegion::getId, region -> region));
+			if(regions.isEmpty()) {
+				messageBridge.message(player, "cmd-noWERegionsFound");
 				return;
 			}
 		} else {
@@ -81,7 +112,7 @@ public class AddCommand extends CommandAreaShop {
 				if(args.length == 4) {
 					world = Bukkit.getWorld(args[3]);
 					if(world == null) {
-						plugin.message(sender, "add-incorrectWorld", args[3]);
+						messageBridge.message(sender, "add-incorrectWorld", args[3]);
 						return;
 					}
 				} else {
@@ -89,120 +120,196 @@ public class AddCommand extends CommandAreaShop {
 				}
 			} else {
 				if(args.length < 4) {
-					plugin.message(sender, "add-specifyWorld");
+					messageBridge.message(sender, "add-specifyWorld");
 					return;
 				} else {
 					world = Bukkit.getWorld(args[3]);
 					if(world == null) {
-						plugin.message(sender, "add-incorrectWorld", args[3]);
+						messageBridge.message(sender, "add-incorrectWorld", args[3]);
 						return;
 					}
 				}
 			}
-			ProtectedRegion region = plugin.getWorldGuard().getRegionManager(world).getRegion(args[2]);
+			ProtectedRegion region = plugin.getRegionManager(world).getRegion(args[2]);
 			if(region == null) {
-				plugin.message(sender, "add-noRegion", args[2]);
+				messageBridge.message(sender, "cmd-noRegion", args[2]);
 				return;
 			}
-			regions.add(region);
+			regions.put(args[2], region);
 		}
-		final boolean isRent = "rent".equals(args[1].toLowerCase());
-		final List<ProtectedRegion> finalRegions = regions;
+		final boolean isRent = "rent".equalsIgnoreCase(args[1]);
 		final Player finalPlayer = player;
-		final World finalWorld = world;
 		AreaShop.debug("Starting add task with " + regions.size() + " regions");
-        new BukkitRunnable() {
-			private int current = 0;
-			private TreeSet<GeneralRegion> regionsSuccess = new TreeSet<>();
-			private TreeSet<GeneralRegion> regionsAlready = new TreeSet<>();
-			private TreeSet<String> namesBlacklisted = new TreeSet<>();
-			private TreeSet<String> namesNoPermission = new TreeSet<>();
-			private TreeSet<String> namesExternal = new TreeSet<>();
-			
-			@Override
-			public void run() {
-				for(int i=0; i<plugin.getConfig().getInt("adding.regionsPerTick"); i++) {
-					if(current < finalRegions.size()) {
-						ProtectedRegion region = finalRegions.get(current);
-						// Determine if the player is an owner or member of the region
-						boolean isMember = finalPlayer != null && plugin.getWorldGuardHandler().containsMember(region, finalPlayer.getUniqueId());
-						boolean isOwner = finalPlayer != null && plugin.getWorldGuardHandler().containsMember(region, finalPlayer.getUniqueId());
-						String type;
-						if(isRent) {
-							type = "rent";
-						} else {
-							type = "buy";
+
+		TreeSet<GeneralRegion> regionsSuccess = new TreeSet<>();
+		TreeSet<GeneralRegion> regionsAlready = new TreeSet<>();
+		TreeSet<GeneralRegion> regionsAlreadyOtherWorld = new TreeSet<>();
+		TreeSet<GeneralRegion> regionsRentCancelled = new TreeSet<>(); // Denied by an event listener
+		TreeSet<GeneralRegion> regionsBuyCancelled = new TreeSet<>(); // Denied by an event listener
+		TreeSet<String> namesBlacklisted = new TreeSet<>();
+		TreeSet<String> namesNoPermission = new TreeSet<>();
+		TreeSet<String> namesAddCancelled = new TreeSet<>(); // Denied by an event listener
+		Do.forAll(
+			plugin.getConfig().getInt("adding.regionsPerTick"),
+			regions.entrySet(),
+			regionEntry -> {
+				String regionName = regionEntry.getKey();
+				ProtectedRegion region = regionEntry.getValue();
+				// Determine if the player is an owner or member of the region
+				boolean isMember = finalPlayer != null && worldGuardInterface.containsMember(region, finalPlayer.getUniqueId());
+				boolean isOwner = finalPlayer != null && worldGuardInterface.containsOwner(region, finalPlayer.getUniqueId());
+				String type;
+				if(isRent) {
+					type = "rent";
+				} else {
+					type = "buy";
+				}
+				IFileManager.AddResult result = plugin.getFileManager().checkRegionAdd(sender, region, world, isRent ? GeneralRegion.RegionType.RENT : GeneralRegion.RegionType.BUY);
+				if(result == IFileManager.AddResult.ALREADYADDED) {
+					regionsAlready.add(plugin.getFileManager().getRegion(regionName));
+				} else if(result == IFileManager.AddResult.ALREADYADDEDOTHERWORLD) {
+					regionsAlreadyOtherWorld.add(plugin.getFileManager().getRegion(regionName));
+				} else if(result == IFileManager.AddResult.BLACKLISTED) {
+					namesBlacklisted.add(regionName);
+				} else if(result == IFileManager.AddResult.NOPERMISSION) {
+					namesNoPermission.add(regionName);
+				} else {
+					// Check if the player should be landlord
+					boolean landlord = (!sender.hasPermission("areashop.create" + type)
+							&& ((sender.hasPermission("areashop.create" + type + ".owner") && isOwner)
+							|| (sender.hasPermission("areashop.create" + type + ".member") && isMember)));
+					List<UUID> existing = new ArrayList<>();
+					existing.addAll(worldGuardInterface.getOwners(region).asUniqueIdList());
+					existing.addAll(worldGuardInterface.getMembers(region).asUniqueIdList());
+
+					AreaShop.debug("regionAddLandlordStatus:", regionName,
+							"landlord:", landlord,
+							"existing:", existing,
+							"isMember:", isMember,
+							"isOwner:", isOwner,
+							"createPermission:", sender.hasPermission("areashop.create" + type),
+							"ownerPermission:", sender.hasPermission("areashop.create" + type + ".owner"),
+							"memberPermission:", sender.hasPermission("areashop.create" + type + ".member"));
+
+					if(isRent) {
+						RentRegion rent = regionFactory.createRentRegion(regionName, world);
+						// Set landlord
+						if(landlord) {
+							rent.setLandlord(finalPlayer.getUniqueId(), finalPlayer.getName());
 						}
-						FileManager.AddResult result = plugin.getFileManager().checkRegionAdd(sender, region, isRent ? GeneralRegion.RegionType.RENT : GeneralRegion.RegionType.BUY);
-						if(result == FileManager.AddResult.ALREADYADDED) {
-							regionsAlready.add(plugin.getFileManager().getRegion(region.getId()));
-						} else if(result == FileManager.AddResult.BLACKLISTED) {
-							namesBlacklisted.add(region.getId());
-						} else if(result == FileManager.AddResult.NOPERMISSION) {
-							namesNoPermission.add(region.getId());
-						} else {
-							// Check if the player should be landlord
-							boolean landlord = (!sender.hasPermission("areashop.create" + type)
-								&& ((sender.hasPermission("areashop.create" + type + ".owner") && isOwner)
-									|| (sender.hasPermission("areashop.create" + type + ".member") && isMember)));
-							if(isRent) {
-								RentRegion rent = new RentRegion(plugin, region.getId(), finalWorld);
-								// Set landlord
-								if(landlord) {
-									rent.setLandlord(finalPlayer.getUniqueId(), finalPlayer.getName());
-								}
-								// Run commands
-								rent.runEventCommands(GeneralRegion.RegionEvent.CREATED, true);
-								plugin.getFileManager().addRent(rent);
-								rent.handleSchematicEvent(GeneralRegion.RegionEvent.CREATED);
 
-								rent.update();
+						AddingRegionEvent event = plugin.getFileManager().addRegion(rent);
+						if (event.isCancelled()) {
+							namesAddCancelled.add(rent.getName());
+							return;
+						}
+						rent.handleSchematicEvent(GeneralRegion.RegionEvent.CREATED);
+						rent.update();
 
-								// Run commands
-								rent.runEventCommands(GeneralRegion.RegionEvent.CREATED, false);
-								regionsSuccess.add(rent);
+						// Add existing owners/members if any
+						if(!landlord && !existing.isEmpty()) {
+							UUID rentBy = existing.remove(0);
+							OfflinePlayer rentByPlayer = Bukkit.getOfflinePlayer(rentBy);
+
+							RentingRegionEvent rentingRegionEvent = new RentingRegionEvent(rent, rentByPlayer, false);
+							Bukkit.getPluginManager().callEvent(rentingRegionEvent);
+							if(rentingRegionEvent.isCancelled()) {
+								regionsRentCancelled.add(rent);
 							} else {
-								BuyRegion buy = new BuyRegion(plugin, region.getId(), finalWorld);
-								// Set landlord
-								if(landlord) {
-									buy.setLandlord(finalPlayer.getUniqueId(), finalPlayer.getName());
+								// Add values to the rent and send it to FileManager
+								rent.setRentedUntil(Calendar.getInstance().getTimeInMillis() + rent.getDuration());
+								rent.setRenter(rentBy);
+								rent.updateLastActiveTime();
+
+								// Fire schematic event and updated times extended
+								rent.handleSchematicEvent(GeneralRegion.RegionEvent.RENTED);
+
+								// Add others as friends
+								for(UUID friend : existing) {
+									rent.getFriendsFeature().addFriend(friend, null);
 								}
-								// Run commands
-								buy.runEventCommands(GeneralRegion.RegionEvent.CREATED, true);
-								
-								plugin.getFileManager().addBuy(buy);
-								buy.handleSchematicEvent(GeneralRegion.RegionEvent.CREATED);
 
-								buy.update();
-
-								// Run commands
-								buy.runEventCommands(GeneralRegion.RegionEvent.CREATED, false);
-								regionsSuccess.add(buy);
+								rent.notifyAndUpdate(new RentedRegionEvent(rent, false));
 							}
 						}
-						current++;
+
+						regionsSuccess.add(rent);
+					} else {
+						BuyRegion buy = regionFactory.createBuyRegion(regionName, world);
+						// Set landlord
+						if(landlord) {
+							buy.setLandlord(finalPlayer.getUniqueId(), finalPlayer.getName());
+						}
+
+						AddingRegionEvent event = plugin.getFileManager().addRegion(buy);
+						if (event.isCancelled()) {
+							namesAddCancelled.add(buy.getName());
+							return;
+						}
+
+						buy.handleSchematicEvent(GeneralRegion.RegionEvent.CREATED);
+						buy.update();
+
+						// Add existing owners/members if any
+						if(!landlord && !existing.isEmpty()) {
+							UUID buyBy = existing.remove(0);
+							OfflinePlayer buyByPlayer = Bukkit.getOfflinePlayer(buyBy);
+
+							BuyingRegionEvent buyingRegionEvent = new BuyingRegionEvent(buy, buyByPlayer);
+							Bukkit.getPluginManager().callEvent(buyingRegionEvent);
+							if(buyingRegionEvent.isCancelled()) {
+								regionsBuyCancelled.add(buy);
+							} else {
+								// Set the owner
+								buy.setBuyer(buyBy);
+								buy.updateLastActiveTime();
+
+								// Update everything
+								buy.handleSchematicEvent(GeneralRegion.RegionEvent.BOUGHT);
+
+								// Add others as friends
+								for (UUID friend : existing) {
+									buy.getFriendsFeature().addFriend(friend, null);
+								}
+
+								buy.notifyAndUpdate(new BoughtRegionEvent(buy));
+							}
+						}
+
+						regionsSuccess.add(buy);
 					}
 				}
-				if(current >= finalRegions.size()) {
-					if(!regionsSuccess.isEmpty()) {
-						plugin.message(sender, "add-success", args[1], Utils.combinedMessage(regionsSuccess, "region"));
-					}
-					if(!regionsAlready.isEmpty()) {
-						plugin.message(sender, "add-failed", Utils.combinedMessage(regionsAlready, "region"));
-					}
-					if(!namesBlacklisted.isEmpty()) {
-						plugin.message(sender, "add-blacklisted", Utils.createCommaSeparatedList(namesBlacklisted));
-					}
-					if(!namesNoPermission.isEmpty()) {
-						plugin.message(sender, "add-noPermissionRegions", Utils.createCommaSeparatedList(namesNoPermission));
-						plugin.message(sender, "add-noPermissionOwnerMember");
-					}
-					this.cancel();
+			},
+			() -> {
+				if(!regionsSuccess.isEmpty()) {
+					messageBridge.message(sender, "add-success", args[1], Utils.combinedMessage(regionsSuccess, "region"));
+				}
+				if(!regionsAlready.isEmpty()) {
+					messageBridge.message(sender, "add-failed", Utils.combinedMessage(regionsAlready, "region"));
+				}
+				if(!regionsAlreadyOtherWorld.isEmpty()) {
+					messageBridge.message(sender, "add-failedOtherWorld", Utils.combinedMessage(regionsAlreadyOtherWorld, "region"));
+				}
+				if(!regionsRentCancelled.isEmpty()) {
+					messageBridge.message(sender, "add-rentCancelled", Utils.combinedMessage(regionsRentCancelled, "region"));
+				}
+				if(!regionsBuyCancelled.isEmpty()) {
+					messageBridge.message(sender, "add-buyCancelled", Utils.combinedMessage(regionsBuyCancelled, "region"));
+				}
+				if(!namesBlacklisted.isEmpty()) {
+					messageBridge.message(sender, "add-blacklisted", Utils.createCommaSeparatedList(namesBlacklisted));
+				}
+				if(!namesNoPermission.isEmpty()) {
+					messageBridge.message(sender, "add-noPermissionRegions", Utils.createCommaSeparatedList(namesNoPermission));
+					messageBridge.message(sender, "add-noPermissionOwnerMember");
+				}
+				if(!namesAddCancelled.isEmpty()) {
+					messageBridge.message(sender, "add-rentCancelled", Utils.createCommaSeparatedList(namesAddCancelled));
 				}
 			}
-        }.runTaskTimer(plugin, 1, 1);
+		);
 	}
-	
+
 	@Override
 	public List<String> getTabCompleteList(int toComplete, String[] start, CommandSender sender) {
 		List<String> result = new ArrayList<>();
@@ -214,10 +321,9 @@ public class AddCommand extends CommandAreaShop {
 				result.add("buy");
 			}
 		} else if(toComplete == 3) {
-			if(sender instanceof Player) {
-				Player player = (Player)sender;
+			if(sender instanceof Player player) {
 				if(sender.hasPermission("areashop.createrent") || sender.hasPermission("areashop.createbuy")) {
-					for(ProtectedRegion region : plugin.getWorldGuard().getRegionManager(player.getWorld()).getRegions().values()) {
+					for(ProtectedRegion region : plugin.getRegionManager(player.getWorld()).getRegions().values()) {
 						result.add(region.getId());
 					}
 				}

AreaShop/src/main/java/me/wiefferink/areashop/commands/AddfriendCommand.java

@@ -1,140 +1,142 @@
 package me.wiefferink.areashop.commands;
 
-import me.wiefferink.areashop.AreaShop;
-import me.wiefferink.areashop.Utils;
+import me.wiefferink.areashop.MessageBridge;
+import me.wiefferink.areashop.adapters.platform.OfflinePlayerHelper;
+import me.wiefferink.areashop.managers.IFileManager;
 import me.wiefferink.areashop.regions.BuyRegion;
 import me.wiefferink.areashop.regions.GeneralRegion;
 import me.wiefferink.areashop.regions.RentRegion;
-import org.bukkit.Bukkit;
-import org.bukkit.OfflinePlayer;
+import me.wiefferink.areashop.tools.BukkitSchedulerExecutor;
+import me.wiefferink.areashop.tools.Utils;
 import org.bukkit.command.CommandSender;
 import org.bukkit.entity.Player;
+import org.bukkit.plugin.Plugin;
 
+import javax.inject.Inject;
+import javax.inject.Singleton;
 import java.util.ArrayList;
 import java.util.List;
 
+@Singleton
 public class AddfriendCommand extends CommandAreaShop {
 
-	public AddfriendCommand(AreaShop plugin) {
-		super(plugin);
-	}
-	
-	@Override
-	public String getCommandStart() {
-		return "areashop addfriend";
-	}
+    @Inject
+    private MessageBridge messageBridge;
+    @Inject
+    private IFileManager fileManager;
+    @Inject
+    private Plugin plugin;
 
-	@Override
-	public String getHelp(CommandSender target) {
-		if(target.hasPermission("areashop.addfriendall") || target.hasPermission("areashop.addfriend")) {
-			return "help-addFriend";
-		}
-		return null;
-	}
-	
-	@SuppressWarnings("deprecation")
-	@Override
-	public void execute(CommandSender sender, String[] args) {
-		if(!sender.hasPermission("areashop.addfriend") && !sender.hasPermission("areashop.addfriendall")) {
-			plugin.message(sender, "addfriend-noPermission");
-			return;
-		}
-		
-		if(args.length < 2) {
-			plugin.message(sender, "addfriend-help");
-			return;
-		}
+    @Inject
+    private OfflinePlayerHelper offlinePlayerHelper;
 
-		GeneralRegion region;
-		if(args.length <= 2) {
-			if (sender instanceof Player) {
-				// get the region by location
-				List<GeneralRegion> regions = Utils.getAllApplicableRegions(((Player) sender).getLocation());
-				if (regions.isEmpty()) {
-					plugin.message(sender, "cmd-noRegionsAtLocation");
-					return;
-				} else if (regions.size() > 1) {
-					plugin.message(sender, "cmd-moreRegionsAtLocation");
-					return;
-				} else {
-					region = regions.get(0);
-				}
-			} else {
-				plugin.message(sender, "cmd-automaticRegionOnlyByPlayer");
-				return;
-			}	
-		} else {
-			region = plugin.getFileManager().getRegion(args[2]);
-			if(region == null) {
-				plugin.message(sender, "cmd-notRegistered", args[2]);
-				return;
-			}
-		}
-		if(sender.hasPermission("areashop.addfriendall")) {
-			if((region.isRentRegion() && !((RentRegion)region).isRented())
-					|| (region.isBuyRegion() && !((BuyRegion)region).isSold())) {
-				plugin.message(sender, "addfriend-noOwner", region);
-				return;
-			}	
-			OfflinePlayer friend = Bukkit.getOfflinePlayer(args[1]);
-			if(friend.getLastPlayed() == 0 && !plugin.getConfig().getBoolean("addFriendNotExistingPlayers")) {
-				plugin.message(sender, "addfriend-notVisited", args[1], region);
-				return;
-			}
-			if(region.getFriendsFeature().getFriends().contains(friend.getUniqueId())) {
-				plugin.message(sender, "addfriend-alreadyAdded", friend.getName(), region);
-				return;
-			}
-			if(region.isOwner(friend.getUniqueId())) {
-				plugin.message(sender, "addfriend-self", friend.getName(), region);
-				return;
-			}
-			if(region.getFriendsFeature().addFriend(friend.getUniqueId(), sender)) {
-				region.update();
-				plugin.message(sender, "addfriend-successOther", friend.getName(), region);
-			}
-		} else {
-			if(sender.hasPermission("areashop.addfriend") && sender instanceof Player) {
-				if(region.isOwner((Player)sender)) {
-					OfflinePlayer friend = Bukkit.getOfflinePlayer(args[1]);
-					if(friend.getLastPlayed() == 0 && !plugin.getConfig().getBoolean("addFriendNotExistingPlayers")) {
-						plugin.message(sender, "addfriend-notVisited", args[1], region);
-						return;
-					}
-					if(region.getFriendsFeature().getFriends().contains(friend.getUniqueId())) {
-						plugin.message(sender, "addfriend-alreadyAdded", friend.getName(), region);
-						return;
-					}
-					if(region.isOwner(friend.getUniqueId())) {
-						plugin.message(sender, "addfriend-self", friend.getName(), region);
-						return;
-					}
+    @Inject
+    private BukkitSchedulerExecutor executor;
 
-					if(region.getFriendsFeature().addFriend(friend.getUniqueId(), sender)) {
-						region.update();
-						plugin.message(sender, "addfriend-success", friend.getName(), region);
-					}
-				} else {
-					plugin.message(sender, "addfriend-noPermissionOther", region);
-				}
-			} else {
-				plugin.message(sender, "addfriend-noPermission", region);
-			}
-		}
-	}
-	
-	@Override
-	public List<String> getTabCompleteList(int toComplete, String[] start, CommandSender sender) {
-		ArrayList<String> result = new ArrayList<>();
-		if(toComplete == 2) {
-			for(Player player : Utils.getOnlinePlayers()) {
-				result.add(player.getName());
-			}
-		} else if(toComplete == 3) {
-			result.addAll(plugin.getFileManager().getRegionNames());
-		}
-		return result;
-	}
+    @Override
+    public String getCommandStart() {
+        return "areashop addfriend";
+    }
+
+    @Override
+    public String getHelp(CommandSender target) {
+        if (target.hasPermission("areashop.addfriendall") || target.hasPermission("areashop.addfriend")) {
+            return "help-addFriend";
+        }
+        return null;
+    }
+
+    @Override
+    public void execute(CommandSender sender, String[] args) {
+        if (!sender.hasPermission("areashop.addfriend") && !sender.hasPermission("areashop.addfriendall")) {
+            messageBridge.message(sender, "addfriend-noPermission");
+            return;
+        }
+
+        if (args.length < 2) {
+            messageBridge.message(sender, "addfriend-help");
+            return;
+        }
+
+        GeneralRegion region;
+        if (args.length == 2) {
+            if (sender instanceof Player player) {
+                // get the region by location
+                List<GeneralRegion> regions = Utils.getImportantRegions(player.getLocation());
+                if (regions.isEmpty()) {
+                    messageBridge.message(sender, "cmd-noRegionsAtLocation");
+                    return;
+                } else if (regions.size() > 1) {
+                    messageBridge.message(sender, "cmd-moreRegionsAtLocation");
+                    return;
+                } else {
+                    region = regions.get(0);
+                }
+            } else {
+                messageBridge.message(sender, "cmd-automaticRegionOnlyByPlayer");
+                return;
+            }
+        } else {
+            region = fileManager.getRegion(args[2]);
+            if (region == null) {
+                messageBridge.message(sender, "cmd-notRegistered", args[2]);
+                return;
+            }
+        }
+        if (sender.hasPermission("areashop.addfriendall")) {
+            if ((region instanceof RentRegion rentRegion && !rentRegion.isRented())
+                    || (region instanceof BuyRegion buyRegion && !buyRegion.isSold())) {
+                messageBridge.message(sender, "addfriend-noOwner", region);
+                return;
+            }
+            this.offlinePlayerHelper.lookupOfflinePlayerAsync(args[1]).thenAcceptAsync(friend -> {
+                if (friend.hasPlayedBefore() && !friend.isOnline() && !plugin.getConfig().getBoolean("addFriendNotExistingPlayers")) {
+                    messageBridge.message(sender, "addfriend-notVisited", args[1], region);
+                } else if (region.getFriendsFeature().getFriends().contains(friend.getUniqueId())) {
+                    messageBridge.message(sender, "addfriend-alreadyAdded", friend.getName(), region);
+                } else if (region.isOwner(friend.getUniqueId())) {
+                    messageBridge.message(sender, "addfriend-self", friend.getName(), region);
+                } else if (region.getFriendsFeature().addFriend(friend.getUniqueId(), sender)) {
+                    region.update();
+                    messageBridge.message(sender, "addfriend-successOther", friend.getName(), region);
+                }
+            }, this.executor);
+            return;
+        }
+        if (!sender.hasPermission("areashop.addfriend") || !(sender instanceof Player player)) {
+            messageBridge.message(sender, "addfriend-noPermission", region);
+            return;
+        }
+        if (!region.isOwner(player)) {
+            messageBridge.message(sender, "addfriend-noPermissionOther", region);
+            return;
+        }
+        this.offlinePlayerHelper.lookupOfflinePlayerAsync(args[1]).thenAcceptAsync(friend -> {
+            if (friend.getLastPlayed() == 0 && !friend.isOnline() && !plugin.getConfig().getBoolean("addFriendNotExistingPlayers")) {
+                messageBridge.message(sender, "addfriend-notVisited", args[1], region);
+            } else if (region.getFriendsFeature().getFriends().contains(friend.getUniqueId())) {
+                messageBridge.message(sender, "addfriend-alreadyAdded", friend.getName(), region);
+            } else if (region.isOwner(friend.getUniqueId())) {
+                messageBridge.message(sender, "addfriend-self", friend.getName(), region);
+            } else if (region.getFriendsFeature().addFriend(friend.getUniqueId(), sender)) {
+                region.update();
+                messageBridge.message(sender, "addfriend-success", friend.getName(), region);
+            }
+        }, this.executor);
+    }
+
+    @Override
+    public List<String> getTabCompleteList(int toComplete, String[] start, CommandSender sender) {
+        ArrayList<String> result = new ArrayList<>();
+        if (toComplete == 2) {
+            for (Player player : Utils.getOnlinePlayers()) {
+                result.add(player.getName());
+            }
+        } else if (toComplete == 3) {
+            result.addAll(fileManager.getRegionNames());
+        }
+        return result;
+    }
 }
 
 

AreaShop/src/main/java/me/wiefferink/areashop/commands/AddsignCommand.java

@@ -1,32 +1,44 @@
 package me.wiefferink.areashop.commands;
 
-import com.sk89q.worldedit.bukkit.selections.CuboidSelection;
-import me.wiefferink.areashop.AreaShop;
-import me.wiefferink.areashop.Utils;
-import me.wiefferink.areashop.features.SignsFeature;
+import me.wiefferink.areashop.MessageBridge;
+import me.wiefferink.areashop.features.signs.RegionSign;
+import me.wiefferink.areashop.features.signs.SignManager;
+import me.wiefferink.areashop.managers.IFileManager;
 import me.wiefferink.areashop.regions.GeneralRegion;
+import me.wiefferink.areashop.tools.Materials;
+import me.wiefferink.areashop.tools.SignUtils;
+import me.wiefferink.areashop.tools.Utils;
 import org.bukkit.Material;
 import org.bukkit.block.Block;
 import org.bukkit.command.CommandSender;
 import org.bukkit.entity.Player;
-import org.bukkit.material.Sign;
+import org.bukkit.plugin.Plugin;
 import org.bukkit.util.BlockIterator;
 
+import javax.inject.Inject;
+import javax.inject.Singleton;
 import java.util.ArrayList;
 import java.util.List;
+import java.util.Optional;
 import java.util.Set;
 
+@Singleton
 public class AddsignCommand extends CommandAreaShop {
 
-	public AddsignCommand(AreaShop plugin) {
-		super(plugin);
-	}
-	
+	@Inject
+	private MessageBridge messageBridge;
+	@Inject
+	private IFileManager fileManager;
+	@Inject
+	private SignManager signManager;
+	@Inject
+	private Plugin plugin;
+
 	@Override
 	public String getCommandStart() {
 		return "areashop addsign";
 	}
-	
+
 	@Override
 	public String getHelp(CommandSender target) {
 		if(target.hasPermission("areashop.addsign")) {
@@ -38,14 +50,13 @@ public class AddsignCommand extends CommandAreaShop {
 	@Override
 	public void execute(CommandSender sender, String[] args) {
 		if(!sender.hasPermission("areashop.addsign")) {
-			plugin.message(sender, "addsign-noPermission");
+			messageBridge.message(sender, "addsign-noPermission");
 			return;
-		}		
-		if (!(sender instanceof Player)) {
-			plugin.message(sender, "cmd-onlyByPlayer");
+		}
+		if(!(sender instanceof Player player)) {
+			messageBridge.message(sender, "cmd-onlyByPlayer");
 			return;
-		}	
-		Player player = (Player)sender;
+		}
 
 		// Get the sign
 		Block block = null;
@@ -56,61 +67,61 @@ public class AddsignCommand extends CommandAreaShop {
 				block = next;
 			}
 		}
-		if(block == null || !(block.getType() == Material.WALL_SIGN || block.getType() == Material.SIGN_POST)) {
-			plugin.message(sender, "addsign-noSign");
+		if(block == null || !Materials.isSign(block.getType())) {
+			messageBridge.message(sender, "addsign-noSign");
 			return;
 		}
 
 		GeneralRegion region;
 		if(args.length > 1) {
 			// Get region by argument
-			region = plugin.getFileManager().getRegion(args[1]);
+			region = fileManager.getRegion(args[1]);
 			if(region == null) {
-				plugin.message(sender, "cmd-notRegistered", args[1]);
+				messageBridge.message(sender, "cmd-notRegistered", args[1]);
 				return;
-			}			
+			}
 		} else {
 			// Get region by sign position
-			List<GeneralRegion> regions = Utils.getASRegionsInSelection(new CuboidSelection(block.getWorld(), block.getLocation(), block.getLocation()));
+			List<GeneralRegion> regions = Utils.getImportantRegions(block.getLocation());
 			if(regions.isEmpty()) {
-				plugin.message(sender, "addsign-noRegions");
+				messageBridge.message(sender, "addsign-noRegions");
 				return;
 			} else if(regions.size() > 1) {
-				plugin.message(sender, "addsign-couldNotDetect", regions.get(0).getName(), regions.get(1).getName());
+				messageBridge.message(sender, "addsign-couldNotDetect", regions.get(0).getName(), regions.get(1).getName());
 				return;
 			}
 			region = regions.get(0);
 		}
-		Sign sign = (Sign)block.getState().getData();
 		String profile = null;
 		if(args.length > 2) {
 			profile = args[2];
 			Set<String> profiles = plugin.getConfig().getConfigurationSection("signProfiles").getKeys(false);
 			if(!profiles.contains(profile)) {
-				plugin.message(sender, "addsign-wrongProfile", Utils.createCommaSeparatedList(profiles), region);
+				messageBridge.message(sender, "addsign-wrongProfile", Utils.createCommaSeparatedList(profiles), region);
 				return;
 			}
 		}
-		SignsFeature.RegionSign regionSign = SignsFeature.getSignByLocation(block.getLocation());
-		if(regionSign != null) {
-			plugin.message(sender, "addsign-alreadyRegistered", regionSign.getRegion());
+		Optional<RegionSign> optionalRegionSign = signManager.signFromLocation(block.getLocation());
+		if(optionalRegionSign.isPresent()) {
+			RegionSign regionSign = optionalRegionSign.get();
+			messageBridge.message(sender, "addsign-alreadyRegistered", regionSign.getRegion());
 			return;
 		}
 
-		region.getSignsFeature().addSign(block.getLocation(), block.getType(), sign.getFacing(), profile);
+		region.getSignsFeature().addSign(block.getLocation(), block.getType(), SignUtils.getSignFacing(block), profile);
 		if(profile == null) {
-			plugin.message(sender, "addsign-success", region);
+			messageBridge.message(sender, "addsign-success", region);
 		} else {
-			plugin.message(sender, "addsign-successProfile", profile, region);
+			messageBridge.message(sender, "addsign-successProfile", profile, region);
 		}
 		region.update();
 	}
-	
+
 	@Override
 	public List<String> getTabCompleteList(int toComplete, String[] start, CommandSender sender) {
 		List<String> result = new ArrayList<>();
 		if(toComplete == 2) {
-			result.addAll(plugin.getFileManager().getRegionNames());
+			result.addAll(fileManager.getRegionNames());
 		} else if(toComplete == 3) {
 			result.addAll(plugin.getConfig().getStringList("signProfiles"));
 		}

AreaShop/src/main/java/me/wiefferink/areashop/commands/BuyCommand.java

@@ -1,20 +1,28 @@
 package me.wiefferink.areashop.commands;
 
-import me.wiefferink.areashop.AreaShop;
-import me.wiefferink.areashop.Utils;
+import me.wiefferink.areashop.MessageBridge;
+import me.wiefferink.areashop.managers.IFileManager;
 import me.wiefferink.areashop.regions.BuyRegion;
+import me.wiefferink.areashop.tools.Utils;
 import org.bukkit.command.CommandSender;
 import org.bukkit.entity.Player;
+import org.bukkit.plugin.Plugin;
 
+import javax.inject.Inject;
+import javax.inject.Singleton;
 import java.util.ArrayList;
 import java.util.List;
 
+@Singleton
 public class BuyCommand extends CommandAreaShop {
 
-	public BuyCommand(AreaShop plugin) {
-		super(plugin);
-	}	
-	
+	@Inject
+	private MessageBridge messageBridge;
+	@Inject
+	private Plugin plugin;
+	@Inject
+	private IFileManager fileManager;
+
 	@Override
 	public String getCommandStart() {
 		return "areashop buy";
@@ -27,32 +35,31 @@ public class BuyCommand extends CommandAreaShop {
 		}
 		return null;
 	}
-	
+
 	@Override
 	public void execute(CommandSender sender, String[] args) {
 		if(!sender.hasPermission("areashop.buy")) {
-			plugin.message(sender, "buy-noPermission");
+			messageBridge.message(sender, "buy-noPermission");
 			return;
 		}
-		if (!(sender instanceof Player)) {
-			plugin.message(sender, "cmd-onlyByPlayer");
+		if(!(sender instanceof Player player)) {
+			messageBridge.message(sender, "cmd-onlyByPlayer");
 			return;
 		}
-		Player player = (Player)sender;
 		if(args.length > 1 && args[1] != null) {
-			BuyRegion region = plugin.getFileManager().getBuy(args[1]);
+			BuyRegion region = fileManager.getBuy(args[1]);
 			if(region == null) {
-				plugin.message(player, "buy-notBuyable");
+				messageBridge.message(player, "buy-notBuyable", args[1]);
 			} else {
 				region.buy(player);
 			}
 		} else {
 			// get the region by location
-			List<BuyRegion> regions = Utils.getApplicableBuyRegions(((Player) sender).getLocation());
-			if (regions.isEmpty()) {
-				plugin.message(sender, "cmd-noRegionsAtLocation");
-			} else if (regions.size() > 1) {
-				plugin.message(sender, "cmd-moreRegionsAtLocation");
+			List<BuyRegion> regions = Utils.getImportantBuyRegions(((Player)sender).getLocation());
+			if(regions.isEmpty()) {
+				messageBridge.message(sender, "cmd-noRegionsAtLocation");
+			} else if(regions.size() > 1) {
+				messageBridge.message(sender, "cmd-moreRegionsAtLocation");
 			} else {
 				regions.get(0).buy(player);
 			}
@@ -63,7 +70,7 @@ public class BuyCommand extends CommandAreaShop {
 	public List<String> getTabCompleteList(int toComplete, String[] start, CommandSender sender) {
 		ArrayList<String> result = new ArrayList<>();
 		if(toComplete == 2) {
-			for(BuyRegion region : plugin.getFileManager().getBuys()) {
+			for(BuyRegion region : fileManager.getBuysRef()) {
 				if(!region.isSold()) {
 					result.add(region.getName());
 				}

AreaShop/src/main/java/me/wiefferink/areashop/commands/CommandAreaShop.java

@@ -1,68 +1,99 @@
 package me.wiefferink.areashop.commands;
 
-import me.wiefferink.areashop.AreaShop;
+import me.wiefferink.interactivemessenger.processing.Message;
+import org.apache.commons.lang.StringUtils;
 import org.bukkit.command.Command;
 import org.bukkit.command.CommandSender;
 
 import java.util.ArrayList;
+import java.util.HashMap;
 import java.util.List;
+import java.util.Map;
 
 /**
- * Abstract class for generalising command classes
+ * Abstract class for generalising command classes.
  */
 public abstract class CommandAreaShop {
-	AreaShop plugin;
-	
-	/**
-	 * Save the instance of the main plugin class
-	 * @param plugin The main plugin
-	 */
-	public CommandAreaShop(AreaShop plugin) {
-		this.plugin = plugin;
+
+	private final Map<String, CommandTime> lastUsed;
+
+	protected CommandAreaShop() {
+		lastUsed = new HashMap<>();
 	}
-	
+
+	/**
+	 * Check if this Command instance can execute the given command and arguments.
+	 * @param command The command to check for execution
+	 * @param args    The arguments to check
+	 * @return true if it can execute the command, false otherwise
+	 */
 	public boolean canExecute(Command command, String[] args) {
-		String commandString = command.getName();
-		for(String argument : args) {
-			commandString += " " + argument;
-		}
+		String commandString = command.getName() + " " + StringUtils.join(args, " ");
 		if(commandString.length() > getCommandStart().length()) {
 			return commandString.toLowerCase().startsWith(getCommandStart().toLowerCase() + " ");
 		}
 		return commandString.toLowerCase().startsWith(getCommandStart().toLowerCase());
 	}
-	
+
 	/**
-	 * Get a list of string to complete a command with (raw list, not matching ones not filtered out)
+	 * Get a list of string to complete a command with (raw list, not matching ones not filtered out).
 	 * @param toComplete The number of the argument that has to be completed
-	 * @param start The already given start of the command
-	 * @param sender The CommandSender that wants to tab complete
+	 * @param start      The already given start of the command
+	 * @param sender     The CommandSender that wants to tab complete
 	 * @return A collection with all the possibilities for argument to complete
 	 */
 	public List<String> getTabCompleteList(int toComplete, String[] start, CommandSender sender) {
 		return new ArrayList<>();
 	}
-	
+
 	/**
-	 * Get the argument that comes after the base command that this command reacts to
+	 * Get the argument that comes after the base command that this command reacts to.
 	 * @return The string that should be in front of the command for this class to act
 	 */
 	public abstract String getCommandStart();
-	
+
 	/**
-	 * Returns the correct help string key to be used on the help page
+	 * Returns the correct help string key to be used on the help page.
 	 * @param target The CommandSender that the help message is for
 	 * @return The help message key according to the permissions of the reciever
 	 */
 	public abstract String getHelp(CommandSender target);
-	
+
 	/**
-	 * Execute a (sub)command if the conditions are met
+	 * Execute a (sub)command if the conditions are met.
 	 * @param sender The commandSender that executed the command
-	 * @param args The arguments that are given
+	 * @param args   The arguments that are given
 	 */
 	public abstract void execute(CommandSender sender, String[] args);
-	
-	
-	
+
+	/**
+	 * Confirm a command.
+	 * @param sender To confirm it for, or send a message to confirm
+	 * @param args Command args
+	 * @param message Message to send when confirmation is required
+	 * @return true if confirmed, false if confirmation is required
+	 */
+	public boolean confirm(CommandSender sender, String[] args, Message message) {
+		String command = "/" + getCommandStart() + " " + StringUtils.join(args, " ", 1, args.length);
+		long now = System.currentTimeMillis();
+		CommandTime last = lastUsed.get(sender.getName());
+		if(last != null && last.command.equalsIgnoreCase(command) && last.time > (now - 1000 * 60)) {
+			return true;
+		}
+
+		message.prefix().append(Message.fromKey("confirm-yes").replacements(command)).send(sender);
+		lastUsed.put(sender.getName(), new CommandTime(command, now));
+		return false;
+	}
+
+	private static class CommandTime {
+		public final String command;
+		public final long time;
+
+		CommandTime(String command, long time) {
+			this.command = command;
+			this.time = time;
+		}
+	}
+
 }

AreaShop/src/main/java/me/wiefferink/areashop/commands/DelCommand.java

@@ -1,32 +1,41 @@
 package me.wiefferink.areashop.commands;
 
-import com.sk89q.worldedit.bukkit.selections.Selection;
-import me.wiefferink.areashop.AreaShop;
-import me.wiefferink.areashop.Utils;
+import me.wiefferink.areashop.MessageBridge;
+import me.wiefferink.areashop.events.ask.DeletingRegionEvent;
+import me.wiefferink.areashop.interfaces.WorldEditInterface;
+import me.wiefferink.areashop.interfaces.WorldEditSelection;
+import me.wiefferink.areashop.managers.IFileManager;
 import me.wiefferink.areashop.regions.BuyRegion;
 import me.wiefferink.areashop.regions.GeneralRegion;
 import me.wiefferink.areashop.regions.RentRegion;
+import me.wiefferink.areashop.tools.Utils;
 import org.bukkit.command.CommandSender;
 import org.bukkit.entity.Player;
 
+import javax.inject.Inject;
+import javax.inject.Singleton;
 import java.util.ArrayList;
 import java.util.List;
 import java.util.TreeSet;
 
+@Singleton
 public class DelCommand extends CommandAreaShop {
 
-	public DelCommand(AreaShop plugin) {
-		super(plugin);
-	}
+	@Inject
+	private MessageBridge messageBridge;
+	@Inject
+	private WorldEditInterface worldEditInterface;
+	@Inject
+	private IFileManager fileManager;
 	
 	@Override
 	public String getCommandStart() {
 		return "areashop del";
 	}
-	
+
 	@Override
 	public String getHelp(CommandSender target) {
-		if(target.hasPermission("areashop.destroyrent") || target.hasPermission("areashop.destroybuy")) {
+		if(target.hasPermission("areashop.destroyrent") || target.hasPermission("areashop.destroybuy") || target.hasPermission("areashop.destroyrent.landlord") || target.hasPermission("areashop.destroybuy.landlord")) {
 			return "help-del";
 		}
 		return null;
@@ -34,91 +43,106 @@ public class DelCommand extends CommandAreaShop {
 
 	@Override
 	public void execute(CommandSender sender, String[] args) {
-		if(		   !sender.hasPermission("areashop.destroybuy")
+		if(!sender.hasPermission("areashop.destroybuy")
 				&& !sender.hasPermission("areashop.destroybuy.landlord")
-			
+
 				&& !sender.hasPermission("areashop.destroyrent")
 				&& !sender.hasPermission("areashop.destroyrent.landlord")) {
-			plugin.message(sender, "del-noPermission");
+			messageBridge.message(sender, "del-noPermission");
 			return;
 		}
 		if(args.length < 2) {
 			// Only players can have a selection
-			if(!(sender instanceof Player)) {
-				plugin.message(sender, "cmd-weOnlyByPlayer");
+			if(!(sender instanceof Player player)) {
+				messageBridge.message(sender, "cmd-weOnlyByPlayer");
 				return;
 			}
-			Player player = (Player)sender;
-			Selection selection = plugin.getWorldEdit().getSelection(player);
+			WorldEditSelection selection = worldEditInterface.getPlayerSelection(player);
 			if(selection == null) {
-				plugin.message(player, "cmd-noSelection");
+				messageBridge.message(player, "cmd-noSelection");
 				return;
-			}			
-			List<GeneralRegion> regions = Utils.getASRegionsInSelection(selection);
-			if(regions == null || regions.size() == 0) {
-				plugin.message(player, "cmd-noRegionsFound");
+			}
+			List<GeneralRegion> regions = Utils.getRegionsInSelection(selection);
+			if(regions == null || regions.isEmpty()) {
+				messageBridge.message(player, "cmd-noRegionsFound");
 				return;
 			}
 			// Start removing the regions that he has permission for
 			ArrayList<String> namesSuccess = new ArrayList<>();
-			TreeSet<GeneralRegion> namesFailed = new TreeSet<>();
+			TreeSet<GeneralRegion> regionsFailed = new TreeSet<>();
+			TreeSet<GeneralRegion> regionsCancelled = new TreeSet<>();
 			for(GeneralRegion region : regions) {
 				boolean isLandlord = region.isLandlord(((Player)sender).getUniqueId());
-				if(region.isRentRegion()) {
+				if(region instanceof RentRegion) {
 					if(!sender.hasPermission("areashop.destroyrent") && !(isLandlord && sender.hasPermission("areashop.destroyrent.landlord"))) {
-						namesFailed.add(region);
-					} else {
-						plugin.getFileManager().removeRent((RentRegion)region, true);
-						namesSuccess.add(region.getName());
-					}					
-				} else if(region.isBuyRegion()) {
+						regionsFailed.add(region);
+						continue;
+					}
+				} else if(region instanceof BuyRegion) {
 					if(!sender.hasPermission("areashop.destroybuy") && !(isLandlord && sender.hasPermission("areashop.destroybuy.landlord"))) {
-						namesFailed.add(region);
-					} else {
-						plugin.getFileManager().removeBuy((BuyRegion)region, true);
-						namesSuccess.add(region.getName());
+						regionsFailed.add(region);
+						continue;
 					}
 				}
+
+				DeletingRegionEvent event = fileManager.deleteRegion(region, true);
+				if (event.isCancelled()) {
+					regionsCancelled.add(region);
+				} else {
+					namesSuccess.add(region.getName());
+				}
 			}
-			// send messages
-			if(namesSuccess.size() != 0) {
-				plugin.message(sender, "del-success", Utils.createCommaSeparatedList(namesSuccess));
+
+			// Send messages
+			if(!namesSuccess.isEmpty()) {
+				messageBridge.message(sender, "del-success", Utils.createCommaSeparatedList(namesSuccess));
 			}
-			if(namesFailed.size() != 0) {
-				plugin.message(sender, "del-failed", Utils.combinedMessage(namesFailed, "region"));
+			if(!regionsFailed.isEmpty()) {
+				messageBridge.message(sender, "del-failed", Utils.combinedMessage(regionsFailed, "region"));
+			}
+			if(!regionsCancelled.isEmpty()) {
+				messageBridge.message(sender, "del-cancelled", Utils.combinedMessage(regionsCancelled, "region"));
 			}
 		} else {
-			GeneralRegion region = plugin.getFileManager().getRegion(args[1]);
+			GeneralRegion region = fileManager.getRegion(args[1]);
 			if(region == null) {
-				plugin.message(sender, "cmd-notRegistered", args[1]);
+				messageBridge.message(sender, "cmd-notRegistered", args[1]);
 				return;
 			}
 			boolean isLandlord = sender instanceof Player && region.isLandlord(((Player)sender).getUniqueId());
-			if(region.isRentRegion()) {
+			if(region instanceof RentRegion) {
 				// Remove the rent if the player has permission
 				if(sender.hasPermission("areashop.destroyrent") || (isLandlord && sender.hasPermission("areashop.destroyrent.landlord"))) {
-					plugin.getFileManager().removeRent((RentRegion)region, true);
-					plugin.message(sender, "destroy-successRent", region);
+					DeletingRegionEvent event = fileManager.deleteRegion(region, true);
+					if (event.isCancelled()) {
+						messageBridge.message(sender, "general-cancelled", event.getReason());
+					} else {
+						messageBridge.message(sender, "destroy-successRent", region);
+					}
 				} else {
-					plugin.message(sender, "destroy-noPermissionRent", region);
+					messageBridge.message(sender, "destroy-noPermissionRent", region);
 				}
-			} else if(region.isBuyRegion()) {
+			} else if(region instanceof BuyRegion) {
 				// Remove the buy if the player has permission
 				if(sender.hasPermission("areashop.destroybuy") || (isLandlord && sender.hasPermission("areashop.destroybuy.landlord"))) {
-					plugin.getFileManager().removeBuy((BuyRegion)region, true);
-					plugin.message(sender, "destroy-successBuy", region);
+					DeletingRegionEvent event = fileManager.deleteRegion(region, true);
+					if (event.isCancelled()) {
+						messageBridge.message(sender, "general-cancelled", event.getReason());
+					} else {
+						messageBridge.message(sender, "destroy-successBuy", region);
+					}
 				} else {
-					plugin.message(sender, "destroy-noPermissionBuy", region);
+					messageBridge.message(sender, "destroy-noPermissionBuy", region);
 				}
 			}
 		}
 	}
-	
+
 	@Override
 	public List<String> getTabCompleteList(int toComplete, String[] start, CommandSender sender) {
 		List<String> result = new ArrayList<>();
 		if(toComplete == 2) {
-			result = plugin.getFileManager().getRegionNames();
+			result = fileManager.getRegionNames();
 		}
 		return result;
 	}

AreaShop/src/main/java/me/wiefferink/areashop/commands/DelfriendCommand.java

@@ -1,126 +1,138 @@
 package me.wiefferink.areashop.commands;
 
-import me.wiefferink.areashop.AreaShop;
-import me.wiefferink.areashop.Utils;
+import me.wiefferink.areashop.MessageBridge;
+import me.wiefferink.areashop.adapters.platform.OfflinePlayerHelper;
+import me.wiefferink.areashop.managers.IFileManager;
 import me.wiefferink.areashop.regions.BuyRegion;
 import me.wiefferink.areashop.regions.GeneralRegion;
 import me.wiefferink.areashop.regions.RentRegion;
+import me.wiefferink.areashop.tools.BukkitSchedulerExecutor;
+import me.wiefferink.areashop.tools.Utils;
 import org.bukkit.Bukkit;
 import org.bukkit.OfflinePlayer;
 import org.bukkit.command.CommandSender;
 import org.bukkit.entity.Player;
 
+import javax.inject.Inject;
+import javax.inject.Singleton;
 import java.util.ArrayList;
 import java.util.List;
+import java.util.stream.Collectors;
 
+@Singleton
 public class DelfriendCommand extends CommandAreaShop {
 
-	public DelfriendCommand(AreaShop plugin) {
-		super(plugin);
-	}
-	
-	@Override
-	public String getCommandStart() {
-		return "areashop delfriend";
-	}
+    @Inject
+    private MessageBridge messageBridge;
+    @Inject
+    private IFileManager fileManager;
 
-	@Override
-	public String getHelp(CommandSender target) {
-		if(target.hasPermission("areashop.delfriendall") || target.hasPermission("areashop.delfriend")) {
-			return "help-delFriend";
-		}
-		return null;
-	}
+    @Inject
+    private OfflinePlayerHelper offlinePlayerHelper;
+
+    @Inject
+    private BukkitSchedulerExecutor executor;
+
+    @Override
+    public String getCommandStart() {
+        return "areashop delfriend";
+    }
+
+    @Override
+    public String getHelp(CommandSender target) {
+        if (target.hasPermission("areashop.delfriendall") || target.hasPermission("areashop.delfriend")) {
+            return "help-delFriend";
+        }
+        return null;
+    }
+
+    /**
+     * Check if a person can remove friends.
+     *
+     * @param person The person to check
+     * @param region The region to check for
+     * @return true if the person can remove friends, otherwise false
+     */
+    public static boolean canUse(CommandSender person, GeneralRegion region) {
+        if (person.hasPermission("areashop.delfriendall")) {
+            return true;
+        }
+        if (person instanceof Player player) {
+            return region.isOwner(player) && player.hasPermission("areashop.delfriend");
+        }
+        return false;
+    }
+
+    @Override
+    public void execute(CommandSender sender, String[] args) {
+        if (!sender.hasPermission("areashop.delfriend") && !sender.hasPermission("areashop.delfriendall")) {
+            messageBridge.message(sender, "delfriend-noPermission");
+            return;
+        }
+        if (args.length < 2) {
+            messageBridge.message(sender, "delfriend-help");
+            return;
+        }
+        GeneralRegion region;
+        if (args.length == 2) {
+            if (!(sender instanceof Player player)) {
+                messageBridge.message(sender, "cmd-automaticRegionOnlyByPlayer");
+                return;
+            }
+            // get the region by location
+            List<GeneralRegion> regions = Utils.getImportantRegions(player.getLocation());
+            if (regions.isEmpty()) {
+                messageBridge.message(sender, "cmd-noRegionsAtLocation");
+                return;
+            } else if (regions.size() > 1) {
+                messageBridge.message(sender, "cmd-moreRegionsAtLocation");
+                return;
+            } else {
+                region = regions.get(0);
+            }
+        } else {
+            region = fileManager.getRegion(args[2]);
+            if (region == null) {
+                messageBridge.message(sender, "cmd-notRegistered", args[2]);
+                return;
+            }
+        }
+        if (sender.hasPermission("areashop.delfriendall")) {
+            if ((region instanceof RentRegion rentRegion && !rentRegion.isRented())
+                    || (region instanceof BuyRegion buyRegion && !buyRegion.isSold())) {
+                messageBridge.message(sender, "delfriend-noOwner", region);
+                return;
+            }
+            this.offlinePlayerHelper.lookupOfflinePlayerAsync(args[1]).thenAcceptAsync(friend -> {
+                if (!region.getFriendsFeature().getFriends().contains(friend.getUniqueId())) {
+                    messageBridge.message(sender, "delfriend-notAdded", friend.getName(), region);
+                    return;
+                }
+                if (region.getFriendsFeature().deleteFriend(friend.getUniqueId(), sender)) {
+                    region.update();
+                    messageBridge.message(sender, "delfriend-successOther", friend.getName(), region);
+                }
+            }, this.executor);
+            return;
+        }
+        if (!sender.hasPermission("areashop.delfriend") || !(sender instanceof Player player)) {
+            messageBridge.message(sender, "delfriend-noPermission", region);
+            return;
+        }
+        if (!region.isOwner(player)) {
+            messageBridge.message(sender, "delfriend-noPermissionOther", region);
+            return;
+        }
+        this.offlinePlayerHelper.lookupOfflinePlayerAsync(args[1]).thenAcceptAsync(friend -> {
+            if (!region.getFriendsFeature().getFriends().contains(friend.getUniqueId())) {
+                messageBridge.message(sender, "delfriend-notAdded", friend.getName(), region);
+            } else if (region.getFriendsFeature().deleteFriend(friend.getUniqueId(), sender)) {
+                region.update();
+                messageBridge.message(sender, "delfriend-success", friend.getName(), region);
+            }
+        }, this.executor);
+    }
 
-	/**
-	 * Check if a person can remove friends
-	 * @param person The person to check
-	 * @param region The region to check for
-	 * @return true if the person can remove friends, otherwise false
-	 */
-	public static boolean canUse(CommandSender person, GeneralRegion region) {
-		if(person.hasPermission("areashop.delfriendall")) {
-			return true;
-		}
-		if(person instanceof Player) {
-			Player player = (Player)person;
-			return region.isOwner(player) && player.hasPermission("areashop.delfriend");
-		}
-		return false;
-	}
-	
-	@SuppressWarnings("deprecation")
-	@Override
-	public void execute(CommandSender sender, String[] args) {
-		if(!sender.hasPermission("areashop.delfriend") && !sender.hasPermission("areashop.delfriendall")) {
-			plugin.message(sender, "delfriend-noPermission");
-			return;
-		}		
-		if(args.length < 2) {
-			plugin.message(sender, "delfriend-help");
-			return;
-		}
-		GeneralRegion region;
-		if(args.length <= 2) {
-			if (sender instanceof Player) {
-				// get the region by location
-				List<GeneralRegion> regions = Utils.getAllApplicableRegions(((Player) sender).getLocation());
-				if (regions.isEmpty()) {
-					plugin.message(sender, "cmd-noRegionsAtLocation");
-					return;
-				} else if (regions.size() > 1) {
-					plugin.message(sender, "cmd-moreRegionsAtLocation");
-					return;
-				} else {
-					region = regions.get(0);
-				}
-			} else {
-				plugin.message(sender, "cmd-automaticRegionOnlyByPlayer");
-				return;
-			}	
-		} else {
-			region = plugin.getFileManager().getRegion(args[2]);
-			if(region == null) {
-				plugin.message(sender, "cmd-notRegistered", args[2]);
-				return;
-			}
-		}
-		if(sender.hasPermission("areashop.delfriendall")) {
-			if((region.isRentRegion() && !((RentRegion)region).isRented())
-					|| (region.isBuyRegion() && !((BuyRegion)region).isSold())) {
-				plugin.message(sender, "delfriend-noOwner", region);
-				return;
-			}		
-			OfflinePlayer friend = Bukkit.getOfflinePlayer(args[1]);
-			if(!region.getFriendsFeature().getFriends().contains(friend.getUniqueId())) {
-				plugin.message(sender, "delfriend-notAdded", friend.getName(), region);
-				return;
-			}
-			if(region.getFriendsFeature().deleteFriend(friend.getUniqueId(), sender)) {
-				region.update();
-				plugin.message(sender, "delfriend-successOther", friend.getName(), region);
-			}
-		} else {
-			if(sender.hasPermission("areashop.delfriend") && sender instanceof Player) {
-				if(region.isOwner((Player)sender)) {
-					OfflinePlayer friend = Bukkit.getOfflinePlayer(args[1]);
-					if(!region.getFriendsFeature().getFriends().contains(friend.getUniqueId())) {
-						plugin.message(sender, "delfriend-notAdded", friend.getName(), region);
-						return;
-					}
-					if(region.getFriendsFeature().deleteFriend(friend.getUniqueId(), sender)) {
-						region.update();
-						plugin.message(sender, "delfriend-success", friend.getName(), region);
-					}
-				} else {
-					plugin.message(sender, "delfriend-noPermissionOther", region);
-				}
-			} else {
-				plugin.message(sender, "delfriend-noPermission", region);
-			}
-		}
-	}
-	
 	@Override
 	public List<String> getTabCompleteList(int toComplete, String[] start, CommandSender sender) {
 		ArrayList<String> result = new ArrayList<>();
@@ -129,7 +141,7 @@ public class DelfriendCommand extends CommandAreaShop {
 				result.add(player.getName());
 			}
 		} else if(toComplete == 3) {
-			result.addAll(plugin.getFileManager().getRegionNames());
+			result.addAll(fileManager.getRegionNames());
 		}
 		return result;
 	}

AreaShop/src/main/java/me/wiefferink/areashop/commands/DelsignCommand.java

@@ -1,27 +1,35 @@
 package me.wiefferink.areashop.commands;
 
-import me.wiefferink.areashop.AreaShop;
-import me.wiefferink.areashop.features.SignsFeature;
+import me.wiefferink.areashop.MessageBridge;
+import me.wiefferink.areashop.features.signs.RegionSign;
+import me.wiefferink.areashop.features.signs.SignManager;
+import me.wiefferink.areashop.features.signs.SignsFeature;
+import me.wiefferink.areashop.tools.Materials;
 import org.bukkit.Material;
 import org.bukkit.block.Block;
 import org.bukkit.command.CommandSender;
 import org.bukkit.entity.Player;
 import org.bukkit.util.BlockIterator;
 
+import javax.inject.Inject;
+import javax.inject.Singleton;
 import java.util.ArrayList;
 import java.util.List;
+import java.util.Optional;
 
+@Singleton
 public class DelsignCommand extends CommandAreaShop {
 
-	public DelsignCommand(AreaShop plugin) {
-		super(plugin);
-	}
+	@Inject
+	private MessageBridge messageBridge;
+	@Inject
+	private SignManager signManager;
 	
 	@Override
 	public String getCommandStart() {
 		return "areashop delsign";
 	}
-	
+
 	@Override
 	public String getHelp(CommandSender target) {
 		if(target.hasPermission("areashop.delsign")) {
@@ -33,37 +41,39 @@ public class DelsignCommand extends CommandAreaShop {
 	@Override
 	public void execute(CommandSender sender, String[] args) {
 		if(!sender.hasPermission("areashop.delsign")) {
-			plugin.message(sender, "delsign-noPermission");
+			messageBridge.message(sender, "delsign-noPermission");
 			return;
 		}
-		if (!(sender instanceof Player)) {
-			plugin.message(sender, "cmd-onlyByPlayer");
+		if(!(sender instanceof Player player)) {
+			messageBridge.message(sender, "cmd-onlyByPlayer");
 			return;
-		}			
-		Player player = (Player)sender;
+		}
 
 		// Get the sign
 		Block block = null;
 		BlockIterator blockIterator = new BlockIterator(player, 100);
 		while(blockIterator.hasNext() && block == null) {
 			Block next = blockIterator.next();
-			if(next.getType() != Material.AIR) {
+			if(!next.getType().isAir()) {
 				block = next;
 			}
 		}
-		if(block == null || !(block.getType() == Material.WALL_SIGN || block.getType() == Material.SIGN_POST)) {
-			plugin.message(sender, "delsign-noSign");
+		if(block == null || !Materials.isSign(block.getType())) {
+			messageBridge.message(sender, "delsign-noSign");
 			return;
 		}
-		SignsFeature.RegionSign regionSign = SignsFeature.getSignByLocation(block.getLocation());
-		if(regionSign == null) {
-			plugin.message(sender, "delsign-noRegion");
+		Optional<RegionSign> optionalSign = signManager.removeSign(block.getLocation());
+		if(optionalSign.isEmpty()) {
+			messageBridge.message(sender, "delsign-noRegion");
 			return;
 		}
-		plugin.message(sender, "delsign-success", regionSign.getRegion());
+		RegionSign regionSign = optionalSign.get();
+		messageBridge.message(sender, "delsign-success", regionSign.getRegion());
 		regionSign.remove();
+		// Sometimes the RegionSign data is corrupted. Forcefully set the block to air
+		block.setType(Material.AIR);
 	}
-	
+
 	@Override
 	public List<String> getTabCompleteList(int toComplete, String[] start, CommandSender sender) {
 		return new ArrayList<>();

AreaShop/src/main/java/me/wiefferink/areashop/commands/FindCommand.java

@@ -1,29 +1,39 @@
 package me.wiefferink.areashop.commands;
 
-import me.wiefferink.areashop.AreaShop;
-import me.wiefferink.areashop.Utils;
-import me.wiefferink.areashop.messages.Message;
+import me.wiefferink.areashop.MessageBridge;
+import me.wiefferink.areashop.managers.IFileManager;
 import me.wiefferink.areashop.regions.BuyRegion;
 import me.wiefferink.areashop.regions.RegionGroup;
 import me.wiefferink.areashop.regions.RentRegion;
+import me.wiefferink.areashop.tools.Utils;
+import me.wiefferink.interactivemessenger.processing.Message;
+import net.milkbowl.vault.economy.Economy;
 import org.bukkit.command.CommandSender;
 import org.bukkit.entity.Player;
 
+import javax.inject.Inject;
+import javax.inject.Singleton;
 import java.util.ArrayList;
+import java.util.Collection;
+import java.util.LinkedList;
 import java.util.List;
 import java.util.Random;
 
+@Singleton
 public class FindCommand extends CommandAreaShop {
 
-	public FindCommand(AreaShop plugin) {
-		super(plugin);
-	}
-	
+	@Inject
+	private MessageBridge messageBridge;
+	@Inject
+	private Economy economy;
+	@Inject
+	private IFileManager fileManager;
+
 	@Override
 	public String getCommandStart() {
 		return "areashop find";
 	}
-	
+
 	@Override
 	public String getHelp(CommandSender target) {
 		if(target.hasPermission("areashop.find")) {
@@ -35,21 +45,20 @@ public class FindCommand extends CommandAreaShop {
 	@Override
 	public void execute(CommandSender sender, String[] args) {
 		if(!sender.hasPermission("areashop.find")) {
-			plugin.message(sender, "find-noPermission");
-			return;
-		}	
-		if (!(sender instanceof Player)) {
-			plugin.message(sender, "cmd-onlyByPlayer");
-			return;
-		}		
-		if(args.length <= 1 || args[1] == null || (!args[1].equalsIgnoreCase("buy") && !args[1].equalsIgnoreCase("rent"))) {
-			plugin.message(sender, "find-help");
+			messageBridge.message(sender, "find-noPermission");
+			return;
+		}
+		if(!(sender instanceof Player player)) {
+			messageBridge.message(sender, "cmd-onlyByPlayer");
+			return;
+		}
+		if(args.length <= 1 || args[1] == null || (!args[1].equalsIgnoreCase("buy") && !args[1].equalsIgnoreCase("rent"))) {
+			messageBridge.message(sender, "find-help");
 			return;
 		}
-		Player player = (Player)sender;
 		double balance = 0.0;
-		if(plugin.getEconomy() != null) {
-			balance = plugin.getEconomy().getBalance(player);
+		if(economy != null) {
+			balance = economy.getBalance(player);
 		}
 		double maxPrice = 0;
 		boolean maxPriceSet = false;
@@ -60,90 +69,101 @@ public class FindCommand extends CommandAreaShop {
 				maxPrice = Double.parseDouble(args[2]);
 				maxPriceSet = true;
 			} catch(NumberFormatException e) {
-				plugin.message(sender, "find-wrongMaxPrice", args[2]);
+				messageBridge.message(sender, "find-wrongMaxPrice", args[2]);
 				return;
 			}
 		}
 		// Parse optional group argument
 		if(args.length >= 4) {
-			group = plugin.getFileManager().getGroup(args[3]);
+			group = fileManager.getGroup(args[3]);
 			if(group == null) {
-				plugin.message(sender, "find-wrongGroup", args[3]);
+				messageBridge.message(sender, "find-wrongGroup", args[3]);
 				return;
 			}
 		}
+
+		// Find buy regions
 		if(args[1].equalsIgnoreCase("buy")) {
-			List<BuyRegion> regions = plugin.getFileManager().getBuys();
-			List<BuyRegion> results = new ArrayList<>();
+			Collection<BuyRegion> regions = fileManager.getBuysRef();
+			List<BuyRegion> results = new LinkedList<>();
 			for(BuyRegion region : regions) {
-				if(!region.isSold() 
-						&& ((region.getPrice() <= balance && !maxPriceSet) || (region.getPrice() <= maxPrice && maxPriceSet)) 
-						&& (group == null || group.isMember(region))) {
+				if(!region.isSold()
+						&& ((region.getPrice() <= balance && !maxPriceSet) || (region.getPrice() <= maxPrice && maxPriceSet))
+						&& (group == null || group.isMember(region))
+						&& (region.getBooleanSetting("general.findCrossWorld") || player.getWorld().equals(region.getWorld()))) {
 					results.add(region);
 				}
 			}
 			if(!results.isEmpty()) {
 				// Draw a random one
 				BuyRegion region = results.get(new Random().nextInt(results.size()));
-				Message onlyInGroup = Message.none();
+				Message onlyInGroup = Message.empty();
 				if(group != null) {
 					onlyInGroup = Message.fromKey("find-onlyInGroup").replacements(args[3]);
 				}
+
+				// Teleport
 				if(maxPriceSet) {
-					plugin.message(player, "find-successMax", "buy", Utils.formatCurrency(maxPrice), onlyInGroup, region);
+					messageBridge.message(player, "find-successMax", "buy", Utils.formatCurrency(maxPrice), onlyInGroup, region);
 				} else {
-					plugin.message(player, "find-success", "buy", Utils.formatCurrency(balance), onlyInGroup, region);
+					messageBridge.message(player, "find-success", "buy", Utils.formatCurrency(balance), onlyInGroup, region);
 				}
-				region.teleportPlayer(player, region.getBooleanSetting("general.findTeleportToSign"), false);		
+				region.getTeleportFeature().teleportPlayer(player, region.getBooleanSetting("general.findTeleportToSign"), false);
 			} else {
-				Message onlyInGroup = Message.none();
+				Message onlyInGroup = Message.empty();
 				if(group != null) {
 					onlyInGroup = Message.fromKey("find-onlyInGroup").replacements(args[3]);
 				}
 				if(maxPriceSet) {
-					plugin.message(player, "find-noneFoundMax", "buy", Utils.formatCurrency(maxPrice), onlyInGroup);
+					messageBridge.message(player, "find-noneFoundMax", "buy", Utils.formatCurrency(maxPrice), onlyInGroup);
 				} else {
-					plugin.message(player, "find-noneFound", "buy", Utils.formatCurrency(balance), onlyInGroup);
+					messageBridge.message(player, "find-noneFound", "buy", Utils.formatCurrency(balance), onlyInGroup);
 				}
 			}
-		} else {
-			List<RentRegion> regions = plugin.getFileManager().getRents();
-			List<RentRegion> results = new ArrayList<>();
+		}
+
+		// Find rental regions
+		else {
+			Collection<RentRegion> regions = fileManager.getRentsRef();
+			List<RentRegion> results = new LinkedList<>();
 			for(RentRegion region : regions) {
-				if(!region.isRented() 
+				if(!region.isRented()
 						&& ((region.getPrice() <= balance && !maxPriceSet) || (region.getPrice() <= maxPrice && maxPriceSet))
-						&& (group == null || group.isMember(region))) {
+						&& (group == null || group.isMember(region))
+						&& (region.getBooleanSetting("general.findCrossWorld") || player.getWorld().equals(region.getWorld()))) {
 					results.add(region);
 				}
 			}
 			if(!results.isEmpty()) {
 				// Draw a random one
 				RentRegion region = results.get(new Random().nextInt(results.size()));
-				Message onlyInGroup = Message.none();
+				Message onlyInGroup = Message.empty();
 				if(group != null) {
 					onlyInGroup = Message.fromKey("find-onlyInGroup").replacements(args[3]);
 				}
+
+				// Teleport
 				if(maxPriceSet) {
-					plugin.message(player, "find-successMax", "rent", Utils.formatCurrency(maxPrice), onlyInGroup, region);
+					messageBridge.message(player, "find-successMax", "rent", Utils.formatCurrency(maxPrice), onlyInGroup, region);
 				} else {
-					plugin.message(player, "find-success", "rent", Utils.formatCurrency(balance), onlyInGroup, region);
+					messageBridge.message(player, "find-success", "rent", Utils.formatCurrency(balance), onlyInGroup, region);
 				}
-				region.teleportPlayer(player, region.getBooleanSetting("general.findTeleportToSign"), false);		
+				region.getTeleportFeature().teleportPlayer(player, region.getBooleanSetting("general.findTeleportToSign"), false);
 			} else {
-				Message onlyInGroup = Message.none();
+				Message onlyInGroup = Message.empty();
 				if(group != null) {
 					onlyInGroup = Message.fromKey("find-onlyInGroup").replacements(args[3]);
 				}
 				if(maxPriceSet) {
-					plugin.message(player, "find-noneFoundMax", "rent", Utils.formatCurrency(maxPrice), onlyInGroup);
+					messageBridge.message(player, "find-noneFoundMax", "rent", Utils.formatCurrency(maxPrice), onlyInGroup);
 				} else {
-					plugin.message(player, "find-noneFound", "rent", Utils.formatCurrency(balance), onlyInGroup);
+					messageBridge.message(player, "find-noneFound", "rent", Utils.formatCurrency(balance), onlyInGroup);
 				}
 			}
 		}
 
 	}
-	
+
 	@Override
 	public List<String> getTabCompleteList(int toComplete, String[] start, CommandSender sender) {
 		ArrayList<String> result = new ArrayList<>();

AreaShop/src/main/java/me/wiefferink/areashop/commands/GroupaddCommand.java

@@ -1,28 +1,40 @@
 package me.wiefferink.areashop.commands;
 
-import com.sk89q.worldedit.bukkit.selections.Selection;
-import me.wiefferink.areashop.AreaShop;
-import me.wiefferink.areashop.Utils;
+import me.wiefferink.areashop.MessageBridge;
+import me.wiefferink.areashop.interfaces.WorldEditInterface;
+import me.wiefferink.areashop.interfaces.WorldEditSelection;
+import me.wiefferink.areashop.managers.IFileManager;
 import me.wiefferink.areashop.regions.GeneralRegion;
+import me.wiefferink.areashop.regions.RegionFactory;
 import me.wiefferink.areashop.regions.RegionGroup;
+import me.wiefferink.areashop.tools.Utils;
 import org.bukkit.command.CommandSender;
 import org.bukkit.entity.Player;
 
+import javax.inject.Inject;
+import javax.inject.Singleton;
 import java.util.ArrayList;
 import java.util.List;
 import java.util.TreeSet;
 
+@Singleton
 public class GroupaddCommand extends CommandAreaShop {
 
-	public GroupaddCommand(AreaShop plugin) {
-		super(plugin);
-	}
+	@Inject
+	private MessageBridge messageBridge;
+	@Inject
+	private IFileManager fileManager;
+	@Inject
+	private RegionFactory regionFactory;
+	@Inject
+	private WorldEditInterface worldEditInterface;
+	
 	
 	@Override
 	public String getCommandStart() {
 		return "areashop groupadd";
 	}
-	
+
 	@Override
 	public String getHelp(CommandSender target) {
 		if(target.hasPermission("areashop.groupadd")) {
@@ -34,32 +46,31 @@ public class GroupaddCommand extends CommandAreaShop {
 	@Override
 	public void execute(CommandSender sender, String[] args) {
 		if(!sender.hasPermission("areashop.groupadd")) {
-			plugin.message(sender, "groupadd-noPermission");
+			messageBridge.message(sender, "groupadd-noPermission");
 			return;
-		}		
+		}
 		if(args.length < 2 || args[1] == null) {
-			plugin.message(sender, "groupadd-help");
+			messageBridge.message(sender, "groupadd-help");
 			return;
-		}		
-		RegionGroup group = plugin.getFileManager().getGroup(args[1]);
+		}
+		RegionGroup group = fileManager.getGroup(args[1]);
 		if(group == null) {
-			group = new RegionGroup(plugin, args[1]);
-			plugin.getFileManager().addGroup(group);
+			group = regionFactory.createRegionGroup(args[1]);
+			fileManager.addGroup(group);
 		}
 		if(args.length == 2) {
-			if(!(sender instanceof Player)) {
-				plugin.message(sender, "cmd-weOnlyByPlayer");
+			if(!(sender instanceof Player player)) {
+				messageBridge.message(sender, "cmd-weOnlyByPlayer");
 				return;
 			}
-			Player player = (Player)sender;
-			Selection selection = plugin.getWorldEdit().getSelection(player);
+			WorldEditSelection selection = worldEditInterface.getPlayerSelection(player);
 			if(selection == null) {
-				plugin.message(player, "cmd-noSelection");
+				messageBridge.message(player, "cmd-noSelection");
 				return;
 			}
-			List<GeneralRegion> regions = Utils.getASRegionsInSelection(selection);
-			if(regions.size() == 0) {
-				plugin.message(player, "cmd-noRegionsFound");
+			List<GeneralRegion> regions = Utils.getRegionsInSelection(selection);
+			if(regions.isEmpty()) {
+				messageBridge.message(player, "cmd-noRegionsFound");
 				return;
 			}
 			TreeSet<GeneralRegion> regionsSuccess = new TreeSet<>();
@@ -71,36 +82,36 @@ public class GroupaddCommand extends CommandAreaShop {
 					regionsFailed.add(region);
 				}
 			}
-			if(regionsSuccess.size() != 0) {
-				plugin.message(player, "groupadd-weSuccess", group.getName(), Utils.combinedMessage(regionsSuccess, "region"));
+			if(!regionsSuccess.isEmpty()) {
+				messageBridge.message(player, "groupadd-weSuccess", group.getName(), Utils.combinedMessage(regionsSuccess, "region"));
 			}
-			if(regionsFailed.size() != 0) {
-				plugin.message(player, "groupadd-weFailed", group.getName(), Utils.combinedMessage(regionsFailed, "region"));
+			if(!regionsFailed.isEmpty()) {
+				messageBridge.message(player, "groupadd-weFailed", group.getName(), Utils.combinedMessage(regionsFailed, "region"));
 			}
 			// Update all regions, this does it in a task, updating them without lag
-			plugin.getFileManager().updateRegions(new ArrayList<>(regionsSuccess), player);
+			fileManager.updateRegions(new ArrayList<>(regionsSuccess), player);
 		} else {
-			GeneralRegion region = plugin.getFileManager().getRegion(args[2]);
+			GeneralRegion region = fileManager.getRegion(args[2]);
 			if(region == null) {
-				plugin.message(sender, "cmd-notRegistered", args[2]);
+				messageBridge.message(sender, "cmd-notRegistered", args[2]);
 				return;
 			}
 			if(group.addMember(region)) {
 				region.update();
-				plugin.message(sender, "groupadd-success", group.getName(), group.getMembers().size(), region);
+				messageBridge.message(sender, "groupadd-success", group.getName(), group.getMembers().size(), region);
 			} else {
-				plugin.message(sender, "groupadd-failed", group.getName(), region);
+				messageBridge.message(sender, "groupadd-failed", group.getName(), region);
 			}
 		}
 	}
-	
+
 	@Override
 	public List<String> getTabCompleteList(int toComplete, String[] start, CommandSender sender) {
 		List<String> result = new ArrayList<>();
 		if(toComplete == 2) {
-			result = plugin.getFileManager().getGroupNames();
+			result = fileManager.getGroupNames();
 		} else if(toComplete == 3) {
-			result = plugin.getFileManager().getRegionNames();	
+			result = fileManager.getRegionNames();
 		}
 		return result;
 	}

AreaShop/src/main/java/me/wiefferink/areashop/commands/GroupdelCommand.java

@@ -1,28 +1,39 @@
 package me.wiefferink.areashop.commands;
 
-import com.sk89q.worldedit.bukkit.selections.Selection;
-import me.wiefferink.areashop.AreaShop;
-import me.wiefferink.areashop.Utils;
+import me.wiefferink.areashop.MessageBridge;
+import me.wiefferink.areashop.interfaces.WorldEditInterface;
+import me.wiefferink.areashop.interfaces.WorldEditSelection;
+import me.wiefferink.areashop.managers.IFileManager;
 import me.wiefferink.areashop.regions.GeneralRegion;
+import me.wiefferink.areashop.regions.RegionFactory;
 import me.wiefferink.areashop.regions.RegionGroup;
+import me.wiefferink.areashop.tools.Utils;
 import org.bukkit.command.CommandSender;
 import org.bukkit.entity.Player;
 
+import javax.inject.Inject;
+import javax.inject.Singleton;
 import java.util.ArrayList;
 import java.util.List;
 import java.util.TreeSet;
 
+@Singleton
 public class GroupdelCommand extends CommandAreaShop {
 
-	public GroupdelCommand(AreaShop plugin) {
-		super(plugin);
-	}
+	@Inject
+	private MessageBridge messageBridge;
+	@Inject
+	private IFileManager fileManager;
+	@Inject
+	private RegionFactory regionFactory;
+	@Inject
+	private WorldEditInterface worldEditInterface;
 	
 	@Override
 	public String getCommandStart() {
 		return "areashop groupdel";
 	}
-	
+
 	@Override
 	public String getHelp(CommandSender target) {
 		if(target.hasPermission("areashop.groupdel")) {
@@ -34,32 +45,32 @@ public class GroupdelCommand extends CommandAreaShop {
 	@Override
 	public void execute(CommandSender sender, String[] args) {
 		if(!sender.hasPermission("areashop.groupdel")) {
-			plugin.message(sender, "groupdel-noPermission");
+			messageBridge.message(sender, "groupdel-noPermission");
 			return;
-		}		
-		if(args.length < 2 || args[1] == null) {
-			plugin.message(sender, "groupdel-help");
-			return;
-		}	
-		RegionGroup group = plugin.getFileManager().getGroup(args[1]);
-		if(group == null) {
-			group = new RegionGroup(plugin, args[1]);
-			plugin.getFileManager().addGroup(group);
 		}
+		if(args.length < 2 || args[1] == null) {
+			messageBridge.message(sender, "groupdel-help");
+			return;
+		}
+		RegionGroup group = fileManager.getGroup(args[1]);
+		if(group == null) {
+			messageBridge.message(sender, "groupdel-wrongGroup", args[1]);
+			return;
+		}
+
 		if(args.length == 2) {
-			if(!(sender instanceof Player)) {
-				plugin.message(sender, "cmd-weOnlyByPlayer");
+			if(!(sender instanceof Player player)) {
+				messageBridge.message(sender, "cmd-weOnlyByPlayer");
 				return;
 			}
-			Player player = (Player)sender;
-			Selection selection = plugin.getWorldEdit().getSelection(player);
+			WorldEditSelection selection = worldEditInterface.getPlayerSelection(player);
 			if(selection == null) {
-				plugin.message(player, "cmd-noSelection");
+				messageBridge.message(player, "cmd-noSelection");
 				return;
 			}
-			List<GeneralRegion> regions = Utils.getASRegionsInSelection(selection);
-			if(regions.size() == 0) {
-				plugin.message(player, "cmd-noRegionsFound");
+			List<GeneralRegion> regions = Utils.getRegionsInSelection(selection);
+			if(regions.isEmpty()) {
+				messageBridge.message(player, "cmd-noRegionsFound");
 				return;
 			}
 			TreeSet<GeneralRegion> regionsSuccess = new TreeSet<>();
@@ -71,37 +82,37 @@ public class GroupdelCommand extends CommandAreaShop {
 					regionsFailed.add(region);
 				}
 			}
-			if(regionsSuccess.size() != 0) {
-				plugin.message(player, "groupdel-weSuccess", group.getName(), Utils.combinedMessage(regionsSuccess, "region"));
+			if(!regionsSuccess.isEmpty()) {
+				messageBridge.message(player, "groupdel-weSuccess", group.getName(), Utils.combinedMessage(regionsSuccess, "region"));
 			}
-			if(regionsFailed.size() != 0) {
-				plugin.message(player, "groupdel-weFailed", group.getName(), Utils.combinedMessage(regionsFailed, "region"));
+			if(!regionsFailed.isEmpty()) {
+				messageBridge.message(player, "groupdel-weFailed", group.getName(), Utils.combinedMessage(regionsFailed, "region"));
 			}
 			// Update all regions, this does it in a task, updating them without lag
-			plugin.getFileManager().updateRegions(new ArrayList<>(regionsSuccess), player);
+			fileManager.updateRegions(regionsSuccess, player);
 			group.saveRequired();
 		} else {
-			GeneralRegion region = plugin.getFileManager().getRegion(args[2]);
+			GeneralRegion region = fileManager.getRegion(args[2]);
 			if(region == null) {
-				plugin.message(sender, "cmd-notRegistered", args[2]);
+				messageBridge.message(sender, "cmd-notRegistered", args[2]);
 				return;
-			}	
+			}
 			if(group.removeMember(region)) {
 				region.update();
-				plugin.message(sender, "groupdel-success", group.getName(), group.getMembers().size(), region);
+				messageBridge.message(sender, "groupdel-success", group.getName(), group.getMembers().size(), region);
 			} else {
-				plugin.message(sender, "groupdel-failed", group.getName(), region);
+				messageBridge.message(sender, "groupdel-failed", group.getName(), region);
 			}
 		}
 	}
-	
+
 	@Override
 	public List<String> getTabCompleteList(int toComplete, String[] start, CommandSender sender) {
 		List<String> result = new ArrayList<>();
 		if(toComplete == 2) {
-			result = plugin.getFileManager().getGroupNames();		
+			result = fileManager.getGroupNames();
 		} else if(toComplete == 3) {
-			result = plugin.getFileManager().getRegionNames();
+			result = fileManager.getRegionNames();
 		}
 		return result;
 	}

AreaShop/src/main/java/me/wiefferink/areashop/commands/GroupinfoCommand.java

@@ -1,24 +1,30 @@
 package me.wiefferink.areashop.commands;
 
-import me.wiefferink.areashop.AreaShop;
-import me.wiefferink.areashop.Utils;
+import me.wiefferink.areashop.MessageBridge;
+import me.wiefferink.areashop.managers.IFileManager;
 import me.wiefferink.areashop.regions.RegionGroup;
+import me.wiefferink.areashop.tools.Utils;
 import org.bukkit.command.CommandSender;
 
+import javax.inject.Inject;
+import javax.inject.Singleton;
 import java.util.ArrayList;
 import java.util.List;
+import java.util.Set;
 
+@Singleton
 public class GroupinfoCommand extends CommandAreaShop {
 
-	public GroupinfoCommand(AreaShop plugin) {
-		super(plugin);
-	}
+	@Inject
+	private MessageBridge messageBridge;
+	@Inject
+	private IFileManager fileManager;
 	
 	@Override
 	public String getCommandStart() {
 		return "areashop groupinfo";
 	}
-	
+
 	@Override
 	public String getHelp(CommandSender target) {
 		if(target.hasPermission("areashop.groupinfo")) {
@@ -31,31 +37,31 @@ public class GroupinfoCommand extends CommandAreaShop {
 	@Override
 	public void execute(CommandSender sender, String[] args) {
 		if(!sender.hasPermission("areashop.groupinfo")) {
-			plugin.message(sender, "groupinfo-noPermission");
-			return;
-		}		
-		if(args.length < 2 || args[1] == null) {
-			plugin.message(sender, "groupinfo-help");
-			return;
-		}		
-		RegionGroup group = plugin.getFileManager().getGroup(args[1]);
-		if(group == null) {
-			plugin.message(sender, "groupinfo-noGroup", args[1]);
+			messageBridge.message(sender, "groupinfo-noPermission");
 			return;
 		}
-		List<String> members = group.getMembers();
-		if(members.size() == 0) {
-			plugin.message(sender, "groupinfo-noMembers", group.getName());
+		if(args.length < 2 || args[1] == null) {
+			messageBridge.message(sender, "groupinfo-help");
+			return;
+		}
+		RegionGroup group = fileManager.getGroup(args[1]);
+		if(group == null) {
+			messageBridge.message(sender, "groupinfo-noGroup", args[1]);
+			return;
+		}
+		Set<String> members = group.getMembers();
+		if(members.isEmpty()) {
+			messageBridge.message(sender, "groupinfo-noMembers", group.getName());
 		} else {
-			plugin.message(sender, "groupinfo-members", group.getName(), Utils.createCommaSeparatedList(members));
+			messageBridge.message(sender, "groupinfo-members", group.getName(), Utils.createCommaSeparatedList(members));
 		}
 	}
-	
+
 	@Override
 	public List<String> getTabCompleteList(int toComplete, String[] start, CommandSender sender) {
 		List<String> result = new ArrayList<>();
 		if(toComplete == 2) {
-			result = plugin.getFileManager().getGroupNames();
+			result = fileManager.getGroupNames();
 		}
 		return result;
 	}

AreaShop/src/main/java/me/wiefferink/areashop/commands/GrouplistCommand.java

@@ -1,23 +1,28 @@
 package me.wiefferink.areashop.commands;
 
-import me.wiefferink.areashop.AreaShop;
-import me.wiefferink.areashop.Utils;
+import me.wiefferink.areashop.MessageBridge;
+import me.wiefferink.areashop.managers.IFileManager;
+import me.wiefferink.areashop.tools.Utils;
 import org.bukkit.command.CommandSender;
 
+import javax.inject.Inject;
+import javax.inject.Singleton;
 import java.util.ArrayList;
 import java.util.List;
 
+@Singleton
 public class GrouplistCommand extends CommandAreaShop {
 
-	public GrouplistCommand(AreaShop plugin) {
-		super(plugin);
-	}
+	@Inject
+	private MessageBridge messageBridge;
+	@Inject
+	private IFileManager fileManager;
 	
 	@Override
 	public String getCommandStart() {
 		return "areashop grouplist";
 	}
-	
+
 	@Override
 	public String getHelp(CommandSender target) {
 		if(target.hasPermission("areashop.grouplist")) {
@@ -29,17 +34,17 @@ public class GrouplistCommand extends CommandAreaShop {
 	@Override
 	public void execute(CommandSender sender, String[] args) {
 		if(!sender.hasPermission("areashop.grouplist")) {
-			plugin.message(sender, "grouplist-noPermission");
+			messageBridge.message(sender, "grouplist-noPermission");
 			return;
 		}
-		List<String> groups = plugin.getFileManager().getGroupNames();
-		if(groups.size() == 0) {
-			plugin.message(sender, "grouplist-noGroups");
+		List<String> groups = fileManager.getGroupNames();
+		if(groups.isEmpty()) {
+			messageBridge.message(sender, "grouplist-noGroups");
 		} else {
-			plugin.message(sender, "grouplist-success", Utils.createCommaSeparatedList(groups));
+			messageBridge.message(sender, "grouplist-success", Utils.createCommaSeparatedList(groups));
 		}
 	}
-	
+
 	@Override
 	public List<String> getTabCompleteList(int toComplete, String[] start, CommandSender sender) {
 		return new ArrayList<>();

AreaShop/src/main/java/me/wiefferink/areashop/commands/HelpCommand.java

@@ -1,19 +1,25 @@
 package me.wiefferink.areashop.commands;
 
-import me.wiefferink.areashop.AreaShop;
+import com.google.inject.Inject;
+import com.google.inject.Singleton;
+import me.wiefferink.areashop.managers.CommandManager;
 import org.bukkit.command.CommandSender;
 
+import javax.annotation.Nonnull;
+
 public class HelpCommand extends CommandAreaShop {
 
-	public HelpCommand(AreaShop plugin) {
-		super(plugin);
+	private final CommandManager commandManager;
+
+	public HelpCommand(@Nonnull CommandManager commandManager) {
+		this.commandManager = commandManager;
 	}
-	
+
 	@Override
 	public String getCommandStart() {
 		return "areashop help";
 	}
-	
+
 	@Override
 	public String getHelp(CommandSender target) {
 		if(target.hasPermission("areashop.help")) {
@@ -24,6 +30,6 @@ public class HelpCommand extends CommandAreaShop {
 
 	@Override
 	public void execute(CommandSender sender, String[] args) {
-		plugin.getCommandManager().showHelp(sender);
+		commandManager.showHelp(sender);
 	}
 }

AreaShop/src/main/java/me/wiefferink/areashop/commands/ImportCommand.java

@@ -0,0 +1,89 @@
+package me.wiefferink.areashop.commands;
+
+import me.wiefferink.areashop.MessageBridge;
+import me.wiefferink.areashop.regions.ImportJob;
+import me.wiefferink.areashop.regions.ImportJobFactory;
+import me.wiefferink.interactivemessenger.processing.Message;
+import org.bukkit.command.CommandSender;
+
+import javax.inject.Inject;
+import javax.inject.Singleton;
+import java.util.ArrayList;
+import java.util.List;
+
+@Singleton
+public class ImportCommand extends CommandAreaShop {
+
+	/* RegionGroup priority usage:
+	   0: Settings from /config.yml
+	   1: Settings from /worlds/<world>/config.yml
+	   2: Settings from /worlds/<world>/parent-regions.yml (if their priority is set it is added to this value)
+	 */
+	@Inject
+	private MessageBridge messageBridge;
+	@Inject
+	private ImportJobFactory importJobFactory;
+
+	@Override
+	public String getCommandStart() {
+		return "areashop import";
+	}
+
+	@Override
+	public String getHelp(CommandSender target) {
+		if(target.hasPermission("areashop.import")) {
+			return "help-import";
+		}
+		return null;
+	}
+
+	// TODO:
+	//  - Landlord?
+	//  - Friends
+	//  - Region flags?
+	//  - Settings from the 'permissions' section in RegionForSale/config.yml?
+
+	@Override
+	public void execute(CommandSender sender, String[] args) {
+		if(!sender.hasPermission("areashop.import")) {
+			messageBridge.message(sender, "import-noPermission");
+			return;
+		}
+
+		if(args.length < 2) {
+			messageBridge.message(sender, "import-help");
+			return;
+		}
+
+		if(!"RegionForSale".equalsIgnoreCase(args[1])) {
+			messageBridge.message(sender, "import-wrongSource");
+			return;
+		}
+
+		if(!confirm(sender, args, Message.fromKey("import-confirm"))) {
+			return;
+		}
+
+		importJobFactory.createImportJob(sender).execute();
+	}
+
+	@Override
+	public List<String> getTabCompleteList(int toComplete, String[] start, CommandSender sender) {
+		List<String> result = new ArrayList<>();
+		if(toComplete == 2) {
+			result.add("RegionForSale");
+		}
+		return result;
+	}
+
+}
+
+
+
+
+
+
+
+
+
+

AreaShop/src/main/java/me/wiefferink/areashop/commands/InfoCommand.java

@@ -1,23 +1,34 @@
 package me.wiefferink.areashop.commands;
 
-import me.wiefferink.areashop.AreaShop;
-import me.wiefferink.areashop.Utils;
-import me.wiefferink.areashop.messages.Message;
+import io.github.bakedlibs.dough.blocks.BlockPosition;
+import me.wiefferink.areashop.MessageBridge;
+import me.wiefferink.areashop.managers.IFileManager;
 import me.wiefferink.areashop.regions.BuyRegion;
 import me.wiefferink.areashop.regions.GeneralRegion;
 import me.wiefferink.areashop.regions.RegionGroup;
 import me.wiefferink.areashop.regions.RentRegion;
-import org.bukkit.Location;
+import me.wiefferink.areashop.tools.Utils;
+import me.wiefferink.interactivemessenger.processing.Message;
 import org.bukkit.command.CommandSender;
 import org.bukkit.entity.Player;
 
-import java.util.*;
+import javax.inject.Inject;
+import javax.inject.Singleton;
+import java.util.ArrayList;
+import java.util.Arrays;
+import java.util.HashSet;
+import java.util.List;
+import java.util.Set;
 
+// TODO fix '/as info' help message hitting replacement limit (improve depth tracking?)
+// TODO add info about autoExtend
+@Singleton
 public class InfoCommand extends CommandAreaShop {
 
-	public InfoCommand(AreaShop plugin) {
-		super(plugin);
-	}
+	@Inject
+	private MessageBridge messageBridge;
+	@Inject
+	private IFileManager fileManager;
 	
 	@Override
 	public String getCommandStart() {
@@ -33,62 +44,56 @@ public class InfoCommand extends CommandAreaShop {
 	}
 
 	/**
-	 * Display a page of a list of regions
-	 * @param sender The CommandSender to send the messages to
-	 * @param regions The regions to display
+	 * Display a page of a list of regions.
+	 * @param sender      The CommandSender to send the messages to
+	 * @param regions     The regions to display
 	 * @param filterGroup The group to filter the regions by
-	 * @param keyHeader The header to print above the page
-	 * @param pageInput The page number, if any
-	 * @param baseCommand The command to execute for next/previous page
+	 * @param keyHeader   The header to print above the page
+	 * @param pageInput   The page number, if any
+	 * @param baseCommand The command to execute for next/previous page (/areashop will be added)
 	 */
 	private void showSortedPagedList(CommandSender sender, List<? extends GeneralRegion> regions, RegionGroup filterGroup, String keyHeader, String pageInput, String baseCommand) {
-		int ITEMS_PER_PAGE = 18;
+		int maximumItems = 20;
+		int itemsPerPage = maximumItems - 2;
 		int page = 1;
 		if(pageInput != null && Utils.isNumeric(pageInput)) {
 			try {
 				page = Integer.parseInt(pageInput);
 			} catch(NumberFormatException e) {
-				plugin.message(sender, "info-wrongPage", pageInput);
+				messageBridge.message(sender, "info-wrongPage", pageInput);
 				return;
 			}
 		}
 		if(filterGroup != null) {
-			for(Iterator<? extends GeneralRegion> it = regions.iterator(); it.hasNext(); ) {
-				if(!filterGroup.isMember(it.next())) {
-					it.remove();
-				}
-			}
+			regions.removeIf(generalRegion -> !filterGroup.isMember(generalRegion));
 		}
 		if(regions.isEmpty()) {
-			plugin.message(sender, "info-noRegions");
+			messageBridge.message(sender, "info-noRegions");
 		} else {
-			long start = Calendar.getInstance().getTimeInMillis();
 			// First sort by type, then by name
-			Collections.sort(regions, new Comparator<GeneralRegion>() {
-				@Override
-				public int compare(GeneralRegion one, GeneralRegion two) {
-					int typeCompare = getTypeOrder(two).compareTo(getTypeOrder(one));
-					if(typeCompare != 0) {
-						return typeCompare;
-					} else {
-						return one.getName().compareTo(two.getName());
-					}
+			regions.sort((one, two) -> {
+				int typeCompare = getTypeOrder(two).compareTo(getTypeOrder(one));
+				if(typeCompare != 0) {
+					return typeCompare;
+				} else {
+					return one.getName().compareTo(two.getName());
 				}
 			});
 			// Header
-			Message limitedToGroup = Message.none();
+			Message limitedToGroup = Message.empty();
 			if(filterGroup != null) {
 				limitedToGroup = Message.fromKey("info-limitedToGroup").replacements(filterGroup.getName());
 			}
-			plugin.message(sender, keyHeader, limitedToGroup);
+			messageBridge.message(sender, keyHeader, limitedToGroup);
 			// Page entries
-			int totalPages = (int)Math.ceil(regions.size()/(double)ITEMS_PER_PAGE); // Clip page to correct boundaries, not much need to tell the user
-			if(regions.size() == ITEMS_PER_PAGE+1) { // 19 total items is mapped to 1 page of 19
-				ITEMS_PER_PAGE++;
+			int totalPages = (int)Math.ceil(regions.size() / (double)itemsPerPage); // Clip page to correct boundaries, not much need to tell the user
+			if(regions.size() == itemsPerPage + 1) { // 19 total items is mapped to 1 page of 19
+				itemsPerPage++;
 				totalPages = 1;
 			}
 			page = Math.max(1, Math.min(totalPages, page));
-			for(int i = (page-1)*ITEMS_PER_PAGE; i < page*ITEMS_PER_PAGE && i < regions.size(); i++) {
+			int linesPrinted = 1; // header
+			for(int i = (page - 1) * itemsPerPage; i < page * itemsPerPage && i < regions.size(); i++) {
 				String state;
 				GeneralRegion region = regions.get(i);
 				if(region.getType() == GeneralRegion.RegionType.RENT) {
@@ -106,35 +111,39 @@ public class InfoCommand extends CommandAreaShop {
 						state = "Reselling";
 					}
 				}
-				plugin.messageNoPrefix(sender, "info-entry"+state, region);
+				messageBridge.messageNoPrefix(sender, "info-entry" + state, region);
+				linesPrinted++;
 			}
-			Message footer = Message.none();
+			Message footer = Message.empty();
 			// Previous button
 			if(page > 1) {
-				footer.append(Message.fromKey("info-pagePrevious").replacements(baseCommand+" "+(page-1)));
+				footer.append(Message.fromKey("info-pagePrevious").replacements(baseCommand + " " + (page - 1)));
 			} else {
 				footer.append(Message.fromKey("info-pageNoPrevious"));
 			}
 			// Page status
 			if(totalPages > 1) {
-				String pageString = ""+page;
-				for(int i = pageString.length(); i < (totalPages+"").length(); i++) {
-					pageString = "0"+pageString;
+				StringBuilder pageString = new StringBuilder("" + page);
+				for(int i = pageString.length(); i < (totalPages + "").length(); i++) {
+					pageString.insert(0, "0");
 				}
 				footer.append(Message.fromKey("info-pageStatus").replacements(page, totalPages));
 				if(page < totalPages) {
-					footer.append(Message.fromKey("info-pageNext").replacements(baseCommand+" "+(page+1)));
+					footer.append(Message.fromKey("info-pageNext").replacements(baseCommand + " " + (page + 1)));
 				} else {
 					footer.append(Message.fromKey("info-pageNoNext"));
 				}
+				// Fill up space if the page is not full (aligns header nicely)
+				for(int i = linesPrinted; i < maximumItems - 1; i++) {
+					sender.sendMessage(" ");
+				}
 				footer.send(sender);
-				long end = Calendar.getInstance().getTimeInMillis();
 			}
 		}
 	}
 
 	/**
-	 * Get an integer to order by type, usable for Comparators
+	 * Get an integer to order by type, usable for Comparators.
 	 * @param region The region to get the order for
 	 * @return An integer for sorting by type
 	 */
@@ -155,11 +164,11 @@ public class InfoCommand extends CommandAreaShop {
 			}
 		}
 	}
-	
+
 	@Override
 	public void execute(CommandSender sender, String[] args) {
 		if(!sender.hasPermission("areashop.info")) {
-			plugin.message(sender, "info-noPermission");
+			messageBridge.message(sender, "info-noPermission");
 			return;
 		}
 		if(args.length > 1 && args[1] != null) {
@@ -168,9 +177,9 @@ public class InfoCommand extends CommandAreaShop {
 			Set<String> groupFilters = new HashSet<>(Arrays.asList("all", "rented", "forrent", "sold", "forsale", "reselling"));
 			if(groupFilters.contains(args[1].toLowerCase()) && args.length > 2) {
 				if(!Utils.isNumeric(args[2])) {
-					filterGroup = plugin.getFileManager().getGroup(args[2]);
+					filterGroup = fileManager.getGroup(args[2]);
 					if(filterGroup == null) {
-						plugin.message(sender, "info-noFiltergroup", args[2]);
+						messageBridge.message(sender, "info-noFiltergroup", args[2]);
 						return;
 					}
 					// Pass page number to args[2] if available
@@ -179,73 +188,53 @@ public class InfoCommand extends CommandAreaShop {
 					}
 				}
 			}
-			
+
 			// All regions
 			if(args[1].equalsIgnoreCase("all")) {
-				showSortedPagedList(sender, plugin.getFileManager().getRegions(), filterGroup, "info-allHeader", (args.length > 2 ? args[2] : null), "/areashop info all");
+				showSortedPagedList(sender, new ArrayList<>(fileManager.getRegionsRef()), filterGroup, "info-allHeader", (args.length > 2 ? args[2] : null), "info all");
 			}
-			
+
 			// Rented regions
 			else if(args[1].equalsIgnoreCase("rented")) {
-				List<RentRegion> regions = plugin.getFileManager().getRents();
-				for(Iterator<RentRegion> it = regions.iterator(); it.hasNext(); ) {
-					if(!it.next().isRented()) {
-						it.remove();
-					}
-				}
-				showSortedPagedList(sender, regions, filterGroup, "info-rentedHeader", (args.length > 2 ? args[2] : null), "/areashop info rented");
+				List<RentRegion> regions = new ArrayList<>(fileManager.getRentsRef());
+				regions.removeIf(RentRegion::isAvailable);
+				showSortedPagedList(sender, regions, filterGroup, "info-rentedHeader", (args.length > 2 ? args[2] : null), "info rented");
 			}
 			// Forrent regions
 			else if(args[1].equalsIgnoreCase("forrent")) {
-				List<RentRegion> regions = plugin.getFileManager().getRents();
-				for(Iterator<RentRegion> it = regions.iterator(); it.hasNext(); ) {
-					if(it.next().isRented()) {
-						it.remove();
-					}
-				}
-				showSortedPagedList(sender, regions, filterGroup, "info-forrentHeader", (args.length > 2 ? args[2] : null), "/areashop info forrent");
+				List<RentRegion> regions = new ArrayList<>(fileManager.getRentsRef());
+				regions.removeIf(RentRegion::isRented);
+				showSortedPagedList(sender, regions, filterGroup, "info-forrentHeader", (args.length > 2 ? args[2] : null), "info forrent");
 			}
 			// Sold regions
 			else if(args[1].equalsIgnoreCase("sold")) {
-				List<BuyRegion> regions = plugin.getFileManager().getBuys();
-				for(Iterator<BuyRegion> it = regions.iterator(); it.hasNext(); ) {
-					if(!it.next().isSold()) {
-						it.remove();
-					}
-				}
-				showSortedPagedList(sender, regions, filterGroup, "info-soldHeader", (args.length > 2 ? args[2] : null), "/areashop info sold");
+				List<BuyRegion> regions = new ArrayList<>(fileManager.getBuysRef());
+				regions.removeIf(BuyRegion::isAvailable);
+				showSortedPagedList(sender, regions, filterGroup, "info-soldHeader", (args.length > 2 ? args[2] : null), "info sold");
 			}
 			// Forsale regions
 			else if(args[1].equalsIgnoreCase("forsale")) {
-				List<BuyRegion> regions = plugin.getFileManager().getBuys();
-				for(Iterator<BuyRegion> it = regions.iterator(); it.hasNext(); ) {
-					if(it.next().isSold()) {
-						it.remove();
-					}
-				}
-				showSortedPagedList(sender, regions, filterGroup, "info-forsaleHeader", (args.length > 2 ? args[2] : null), "/areashop info forsale");
+				List<BuyRegion> regions = new ArrayList<>(fileManager.getBuysRef());
+				regions.removeIf(BuyRegion::isSold);
+				showSortedPagedList(sender, regions, filterGroup, "info-forsaleHeader", (args.length > 2 ? args[2] : null), "info forsale");
 			}
 			// Reselling regions
 			else if(args[1].equalsIgnoreCase("reselling")) {
-				List<BuyRegion> regions = plugin.getFileManager().getBuys();
-				for(Iterator<BuyRegion> it = regions.iterator(); it.hasNext(); ) {
-					if(!it.next().isInResellingMode()) {
-						it.remove();
-					}
-				}
-				showSortedPagedList(sender, regions, filterGroup, "info-resellingHeader", (args.length > 2 ? args[2] : null), "/areashop info reselling");
+				List<BuyRegion> regions = new ArrayList<>(fileManager.getBuysRef());
+				regions.removeIf(region -> !region.isInResellingMode());
+				showSortedPagedList(sender, regions, filterGroup, "info-resellingHeader", (args.length > 2 ? args[2] : null), "info reselling");
 			}
 
 			// List of regions without a group
 			else if(args[1].equalsIgnoreCase("nogroup")) {
-				List<GeneralRegion> regions = plugin.getFileManager().getRegions();
-				for(RegionGroup group : plugin.getFileManager().getGroups()) {
+				List<GeneralRegion> regions = new ArrayList<>(fileManager.getRegionsRef());
+				for(RegionGroup group : fileManager.getGroups()) {
 					regions.removeAll(group.getMemberRegions());
 				}
 				if(regions.isEmpty()) {
-					plugin.message(sender, "info-nogroupNone");
+					messageBridge.message(sender, "info-nogroupNone");
 				} else {
-					showSortedPagedList(sender, regions, filterGroup, "info-nogroupHeader", (args.length > 2 ? args[2] : null), "/areashop info nogroup");
+					showSortedPagedList(sender, regions, filterGroup, "info-nogroupHeader", (args.length > 2 ? args[2] : null), "info nogroup");
 				}
 			}
 
@@ -255,46 +244,46 @@ public class InfoCommand extends CommandAreaShop {
 					RentRegion rent = null;
 					BuyRegion buy = null;
 					if(args.length > 2) {
-						rent = plugin.getFileManager().getRent(args[2]);
-						buy = plugin.getFileManager().getBuy(args[2]);
+						rent = fileManager.getRent(args[2]);
+						buy = fileManager.getBuy(args[2]);
 					} else {
-						if (sender instanceof Player) {
+						if(sender instanceof Player) {
 							// get the region by location
-							List<GeneralRegion> regions = Utils.getAllApplicableRegions(((Player) sender).getLocation());
-							if (regions.isEmpty()) {
-								plugin.message(sender, "cmd-noRegionsAtLocation");
+							List<GeneralRegion> regions = Utils.getImportantRegions(((Player)sender).getLocation());
+							if(regions.isEmpty()) {
+								messageBridge.message(sender, "cmd-noRegionsAtLocation");
 								return;
-							} else if (regions.size() > 1) {
-								plugin.message(sender, "cmd-moreRegionsAtLocation");
+							} else if(regions.size() > 1) {
+								messageBridge.message(sender, "cmd-moreRegionsAtLocation");
 								return;
 							} else {
-								if(regions.get(0).isRentRegion()) {
+								if(regions.get(0) instanceof RentRegion) {
 									rent = (RentRegion)regions.get(0);
-								} else if(regions.get(0).isBuyRegion()) {
+								} else if(regions.get(0) instanceof BuyRegion) {
 									buy = (BuyRegion)regions.get(0);
 								}
 							}
 						} else {
-							plugin.message(sender, "cmd-automaticRegionOnlyByPlayer");
+							messageBridge.message(sender, "cmd-automaticRegionOnlyByPlayer");
 							return;
 						}
 					}
-					
+
 					if(rent == null && buy == null) {
-						plugin.message(sender, "info-regionNotExisting", args[2]);
+						messageBridge.message(sender, "info-regionNotExisting", args[2]);
 						return;
-					}					
-					
+					}
+
 					if(rent != null) {
-						plugin.message(sender, "info-regionHeaderRent", rent);
+						messageBridge.message(sender, "info-regionHeaderRent", rent);
 						if(rent.isRented()) {
-							plugin.messageNoPrefix(sender, "info-regionRented", rent);
-							plugin.messageNoPrefix(sender, "info-regionExtending", rent);
+							messageBridge.messageNoPrefix(sender, "info-regionRented", rent);
+							messageBridge.messageNoPrefix(sender, "info-regionExtending", rent);
 							// Money back
-							if(UnrentCommand.canUse(sender, buy)) {
-								plugin.messageNoPrefix(sender, "info-regionMoneyBackRentClick", rent);
+							if(UnrentCommand.canUse(sender, rent)) {
+								messageBridge.messageNoPrefix(sender, "info-regionMoneyBackRentClick", rent);
 							} else {
-								plugin.messageNoPrefix(sender, "info-regionMoneyBackRent", rent);
+								messageBridge.messageNoPrefix(sender, "info-regionMoneyBackRent", rent);
 							}
 							// Friends
 							if(!rent.getFriendsFeature().getFriendNames().isEmpty()) {
@@ -302,29 +291,30 @@ public class InfoCommand extends CommandAreaShop {
 								if(DelfriendCommand.canUse(sender, rent)) {
 									messagePart = "info-friendRemove";
 								}
-								plugin.messageNoPrefix(sender, "info-regionFriends", rent, Utils.combinedMessage(rent.getFriendsFeature().getFriendNames(), messagePart));
+								messageBridge.messageNoPrefix(sender, "info-regionFriends", rent, Utils.combinedMessage(rent.getFriendsFeature().getFriendNames(), messagePart));
 							}
 						} else {
-							plugin.messageNoPrefix(sender, "info-regionCanBeRented", rent);
+							messageBridge.messageNoPrefix(sender, "info-regionCanBeRented", rent);
 						}
 						if(rent.getLandlordName() != null) {
-							plugin.messageNoPrefix(sender, "info-regionLandlord", rent);
+							messageBridge.messageNoPrefix(sender, "info-regionLandlord", rent);
 						}
 						// Maximum extends
 						if(rent.getMaxExtends() != -1) {
 							if(rent.getMaxExtends() == 0) {
-								plugin.messageNoPrefix(sender, "info-regionNoExtending", rent);
+								messageBridge.messageNoPrefix(sender, "info-regionNoExtending", rent);
 							} else if(rent.isRented()) {
-								plugin.messageNoPrefix(sender, "info-regionExtendsLeft", rent);
+								messageBridge.messageNoPrefix(sender, "info-regionExtendsLeft", rent);
 							} else {
-								plugin.messageNoPrefix(sender, "info-regionMaxExtends", rent);
+								messageBridge.messageNoPrefix(sender, "info-regionMaxExtends", rent);
 							}
 						}
-						if(rent.getMaxRentTime() != -1) {
-							plugin.messageNoPrefix(sender, "info-regionMaxRentTime", rent);
+						// If maxExtends is zero it does not make sense to show this message
+						if(rent.getMaxRentTime() != -1 && rent.getMaxExtends() != 0) {
+							messageBridge.messageNoPrefix(sender, "info-regionMaxRentTime", rent);
 						}
 						if(rent.getInactiveTimeUntilUnrent() != -1) {
-							plugin.messageNoPrefix(sender, "info-regionInactiveUnrent", rent);			
+							messageBridge.messageNoPrefix(sender, "info-regionInactiveUnrent", rent);
 						}
 						// Teleport
 						Message tp = Message.fromKey("info-prefix");
@@ -346,47 +336,45 @@ public class InfoCommand extends CommandAreaShop {
 						}
 						// Signs
 						List<String> signLocations = new ArrayList<>();
-						for(Location location : rent.getSignsFeature().getSignLocations()) {
-							signLocations.add(Message.fromKey("info-regionSignLocation").replacements(location.getWorld().getName(), location.getBlockX(), location.getBlockY(), location.getBlockZ()).getPlain());
+						for(BlockPosition location : rent.getSignsFeature().signManager().allSignLocations()) {
+							signLocations.add(Message.fromKey("info-regionSignLocation").replacements(location.getWorld().getName(), location.getX(), location.getY(), location.getZ()).getPlain());
 						}
 						if(!signLocations.isEmpty()) {
-							plugin.messageNoPrefix(sender, "info-regionSigns", signLocations.toArray());
+							messageBridge.messageNoPrefix(sender, "info-regionSigns", Utils.createCommaSeparatedList(signLocations));
 						}
 						// Groups
 						if(sender.hasPermission("areashop.groupinfo") && !rent.getGroupNames().isEmpty()) {
-							plugin.messageNoPrefix(sender, "info-regionGroups", Utils.createCommaSeparatedList(rent.getGroupNames()));
+							messageBridge.messageNoPrefix(sender, "info-regionGroups", Utils.createCommaSeparatedList(rent.getGroupNames()));
 						}
 						// Restoring
 						if(rent.isRestoreEnabled()) {
-							if(sender.hasPermission("areashop.setrestore")) {
-								plugin.messageNoPrefix(sender, "info-regionRestoringRent", rent, Message.fromKey("info-regionRestoringProfile").replacements(rent.getRestoreProfile()));
-							} else {
-								plugin.messageNoPrefix(sender, "info-regionRestoringRent", rent, "");
-							}
+							messageBridge.messageNoPrefix(sender, "info-regionRestoringRent", rent);
 						}
 						// Restrictions
 						if(!rent.isRented()) {
 							if(rent.restrictedToRegion()) {
-								plugin.messageNoPrefix(sender, "info-regionRestrictedRegionRent", rent);
+								messageBridge.messageNoPrefix(sender, "info-regionRestrictedRegionRent", rent);
 							} else if(rent.restrictedToWorld()) {
-								plugin.messageNoPrefix(sender, "info-regionRestrictedWorldRent", rent);
+								messageBridge.messageNoPrefix(sender, "info-regionRestrictedWorldRent", rent);
 							}
 						}
-						plugin.messageNoPrefix(sender, "info-regionFooterRent", rent);
+						messageBridge.messageNoPrefix(sender, "info-regionFooterRent", rent);
 					} else if(buy != null) {
-						plugin.message(sender, "info-regionHeaderBuy", buy);
+						messageBridge.message(sender, "info-regionHeaderBuy", buy);
 						if(buy.isSold()) {
 							if(buy.isInResellingMode()) {
-								plugin.messageNoPrefix(sender, "info-regionReselling", buy);
-								plugin.messageNoPrefix(sender, "info-regionReselPrice", buy);
+								messageBridge.messageNoPrefix(sender, "info-regionReselling", buy);
+								messageBridge.messageNoPrefix(sender, "info-regionReselPrice", buy);
 							} else {
-								plugin.messageNoPrefix(sender, "info-regionBought", buy);
+								messageBridge.messageNoPrefix(sender, "info-regionBought", buy);
 							}
 							// Money back
-							if(SellCommand.canUse(sender, buy)) {
-								plugin.messageNoPrefix(sender, "info-regionMoneyBackBuyClick", buy);
-							} else {
-								plugin.messageNoPrefix(sender, "info-regionMoneyBackBuy", buy);
+							if(!buy.getBooleanSetting("buy.sellDisabled")) {
+								if (SellCommand.canUse(sender, buy)) {
+									messageBridge.messageNoPrefix(sender, "info-regionMoneyBackBuyClick", buy);
+								} else {
+									messageBridge.messageNoPrefix(sender, "info-regionMoneyBackBuy", buy);
+								}
 							}
 							// Friends
 							if(!buy.getFriendsFeature().getFriendNames().isEmpty()) {
@@ -394,16 +382,16 @@ public class InfoCommand extends CommandAreaShop {
 								if(DelfriendCommand.canUse(sender, buy)) {
 									messagePart = "info-friendRemove";
 								}
-								plugin.messageNoPrefix(sender, "info-regionFriends", buy, Utils.combinedMessage(buy.getFriendsFeature().getFriendNames(), messagePart));
+								messageBridge.messageNoPrefix(sender, "info-regionFriends", buy, Utils.combinedMessage(buy.getFriendsFeature().getFriendNames(), messagePart));
 							}
 						} else {
-							plugin.messageNoPrefix(sender, "info-regionCanBeBought", buy);
+							messageBridge.messageNoPrefix(sender, "info-regionCanBeBought", buy);
 						}
 						if(buy.getLandlord() != null) {
-							plugin.messageNoPrefix(sender, "info-regionLandlord", buy);
+							messageBridge.messageNoPrefix(sender, "info-regionLandlord", buy);
 						}
 						if(buy.getInactiveTimeUntilSell() != -1) {
-							plugin.messageNoPrefix(sender, "info-regionInactiveSell", buy);			
+							messageBridge.messageNoPrefix(sender, "info-regionInactiveSell", buy);
 						}
 						// Teleport
 						Message tp = Message.fromKey("info-prefix");
@@ -425,65 +413,41 @@ public class InfoCommand extends CommandAreaShop {
 						}
 						// Signs
 						List<String> signLocations = new ArrayList<>();
-						for(Location location : buy.getSignsFeature().getSignLocations()) {
-							signLocations.add(Message.fromKey("info-regionSignLocation").replacements(location.getWorld().getName(), location.getBlockX(), location.getBlockY(), location.getBlockZ()).getPlain());
+						for(BlockPosition location : buy.getSignsFeature().signManager().allSignLocations()) {
+							signLocations.add(Message.fromKey("info-regionSignLocation").replacements(location.getWorld().getName(), location.getX(), location.getY(), location.getZ()).getPlain());
 						}
 						if(!signLocations.isEmpty()) {
-							plugin.messageNoPrefix(sender, "info-regionSigns", signLocations.toArray());
+							messageBridge.messageNoPrefix(sender, "info-regionSigns", Utils.createCommaSeparatedList(signLocations));
 						}
 						// Groups
 						if(sender.hasPermission("areashop.groupinfo") && !buy.getGroupNames().isEmpty()) {
-							plugin.messageNoPrefix(sender, "info-regionGroups", Utils.createCommaSeparatedList(buy.getGroupNames()));
+							messageBridge.messageNoPrefix(sender, "info-regionGroups", Utils.createCommaSeparatedList(buy.getGroupNames()));
 						}
 						// Restoring
 						if(buy.isRestoreEnabled()) {
-							if(sender.hasPermission("areashop.setrestore")) {
-								plugin.messageNoPrefix(sender, "info-regionRestoringBuy", buy, Message.fromKey("info-regionRestoringProfile").replacements(buy.getRestoreProfile()));
-							} else {
-								plugin.messageNoPrefix(sender, "info-regionRestoringBuy", buy, "");
-							}
+							messageBridge.messageNoPrefix(sender, "info-regionRestoringBuy", buy);
 						}
 						// Restrictions
 						if(!buy.isSold()) {
 							if(buy.restrictedToRegion()) {
-								plugin.messageNoPrefix(sender, "info-regionRestrictedRegionBuy", buy);
+								messageBridge.messageNoPrefix(sender, "info-regionRestrictedRegionBuy", buy);
 							} else if(buy.restrictedToWorld()) {
-								plugin.messageNoPrefix(sender, "info-regionRestrictedWorldBuy", buy);
+								messageBridge.messageNoPrefix(sender, "info-regionRestrictedWorldBuy", buy);
 							}
 						}
-						plugin.messageNoPrefix(sender, "info-regionFooterBuy", buy);
+						messageBridge.messageNoPrefix(sender, "info-regionFooterBuy", buy);
 					}
 				} else {
-					plugin.message(sender, "info-regionHelp");
+					messageBridge.message(sender, "info-regionHelp");
 				}
 			} else {
-				plugin.message(sender, "info-help");
+				messageBridge.message(sender, "info-help");
 			}
 		} else {
-			plugin.message(sender, "info-help");
-		}	
+			messageBridge.message(sender, "info-help");
+		}
 	}
-	
-	
-	/**
-	 * Create a comma-space separated list from a collection of strings
-	 * @param list The collection with strings
-	 * @return A comma-space separated list of the strings in the collection
-	 */
-	public String createCommaString(Collection<String> list) {
-		String result = "";
-		boolean first = true;
-		for(String part : list) {
-			if(first) {
-				result += part;
-				first = false;
-			} else {
-				result += ", " + part;
-			}
-		}		
-		return result;
-	}
-	
+
 	@Override
 	public List<String> getTabCompleteList(int toComplete, String[] start, CommandSender sender) {
 		List<String> result = new ArrayList<>();
@@ -495,8 +459,8 @@ public class InfoCommand extends CommandAreaShop {
 					result.add(player.getName());
 				}
 			} else if(start[2].equalsIgnoreCase("region")) {
-				result.addAll(plugin.getFileManager().getBuyNames());
-				result.addAll(plugin.getFileManager().getRentNames());
+				result.addAll(fileManager.getBuyNames());
+				result.addAll(fileManager.getRentNames());
 			}
 		}
 		return result;

AreaShop/src/main/java/me/wiefferink/areashop/commands/LinksignsCommand.java

@@ -1,25 +1,34 @@
 package me.wiefferink.areashop.commands;
 
+import com.google.inject.Inject;
+import com.google.inject.Singleton;
 import me.wiefferink.areashop.AreaShop;
-import me.wiefferink.areashop.messages.Message;
+import me.wiefferink.areashop.MessageBridge;
+import me.wiefferink.areashop.managers.SignLinkerManager;
+import me.wiefferink.interactivemessenger.processing.Message;
 import org.bukkit.command.CommandSender;
+import org.bukkit.configuration.ConfigurationSection;
 import org.bukkit.entity.Player;
 
 import java.util.ArrayList;
 import java.util.List;
 import java.util.Set;
 
+@Singleton
 public class LinksignsCommand extends CommandAreaShop {
 
-	public LinksignsCommand(AreaShop plugin) {
-		super(plugin);
-	}
-	
+	@Inject
+	private SignLinkerManager signLinkerManager;
+	@Inject
+	private AreaShop plugin;
+	@Inject
+	private MessageBridge messageBridge;
+
 	@Override
 	public String getCommandStart() {
 		return "areashop linksigns";
 	}
-	
+
 	@Override
 	public String getHelp(CommandSender target) {
 		if(target.hasPermission("areashop.linksigns")) {
@@ -31,39 +40,41 @@ public class LinksignsCommand extends CommandAreaShop {
 	@Override
 	public void execute(CommandSender sender, String[] args) {
 		if(!sender.hasPermission("areashop.linksigns")) {
-			plugin.message(sender, "linksigns-noPermission");
-			return;
-		}		
-		if (!(sender instanceof Player)) {
-			plugin.message(sender, "cmd-onlyByPlayer");
+			messageBridge.message(sender, "linksigns-noPermission");
 			return;
 		}
-		
-		Player player = (Player)sender;
-		if(plugin.getSignlinkerManager().isInSignLinkMode(player)) {
-			plugin.getSignlinkerManager().exitSignLinkMode(player);
+		if(!(sender instanceof Player player)) {
+			messageBridge.message(sender, "cmd-onlyByPlayer");
+			return;
+		}
+
+		if(signLinkerManager.isInSignLinkMode(player)) {
+			signLinkerManager.exitSignLinkMode(player);
 		} else {
 			// Get the profile
 			String profile = null;
 			if(args.length > 1) {
 				profile = args[1];
-				Set<String> profiles = plugin.getConfig().getConfigurationSection("signProfiles").getKeys(false);
-				if(!profiles.contains(profile)) {
-					ArrayList<String> message = new ArrayList<>();
-					for(String p : profiles) {
-						if(!message.isEmpty()) {
-							message.add(", ");
+				ConfigurationSection signProfilesSection = plugin.getConfig().getConfigurationSection("signProfiles");
+				if(signProfilesSection != null) {
+					Set<String> profiles = signProfilesSection.getKeys(false);
+					if(!profiles.contains(profile)) {
+						ArrayList<String> message = new ArrayList<>();
+						for(String p : profiles) {
+							if(!message.isEmpty()) {
+								message.add(", ");
+							}
+							message.addAll(Message.fromKey("addsign-profile").replacements(p).get());
 						}
-						message.addAll(Message.fromKey("addsign-profile").replacements(p).get());
+						messageBridge.message(sender, "addsign-wrongProfile", Message.fromList(message));
+						return;
 					}
-					plugin.message(sender, "addsign-wrongProfile", Message.fromList(message));
-					return;
 				}
 			}
-			plugin.getSignlinkerManager().enterSignLinkMode(player, profile);
+			signLinkerManager.enterSignLinkMode(player, profile);
 		}
 	}
-	
+
 	@Override
 	public List<String> getTabCompleteList(int toComplete, String[] start, CommandSender sender) {
 		List<String> result = new ArrayList<>();

AreaShop/src/main/java/me/wiefferink/areashop/commands/MeCommand.java

@@ -1,23 +1,39 @@
 package me.wiefferink.areashop.commands;
 
-import me.wiefferink.areashop.AreaShop;
+import me.wiefferink.areashop.MessageBridge;
+import me.wiefferink.areashop.adapters.platform.OfflinePlayerHelper;
+import me.wiefferink.areashop.managers.IFileManager;
 import me.wiefferink.areashop.regions.BuyRegion;
 import me.wiefferink.areashop.regions.GeneralRegion;
 import me.wiefferink.areashop.regions.RentRegion;
+import me.wiefferink.areashop.tools.BukkitSchedulerExecutor;
+import me.wiefferink.areashop.tools.Utils;
 import org.bukkit.Bukkit;
 import org.bukkit.OfflinePlayer;
 import org.bukkit.command.CommandSender;
 import org.bukkit.entity.Player;
 
+import javax.inject.Inject;
+import javax.inject.Singleton;
+import java.util.ArrayList;
 import java.util.HashSet;
+import java.util.List;
 import java.util.Set;
 
+@Singleton
 public class MeCommand extends CommandAreaShop {
 
-	public MeCommand(AreaShop plugin) {
-		super(plugin);
-	}
-	
+	@Inject
+	private MessageBridge messageBridge;
+	@Inject
+	private IFileManager fileManager;
+
+	@Inject
+	private OfflinePlayerHelper offlinePlayerHelper;
+
+	@Inject
+	private BukkitSchedulerExecutor executor;
+
 	@Override
 	public String getCommandStart() {
 		return "areashop me";
@@ -30,50 +46,52 @@ public class MeCommand extends CommandAreaShop {
 		}
 		return null;
 	}
-	
+
 	@Override
 	public void execute(CommandSender sender, String[] args) {
 		if(!sender.hasPermission("areashop.me")) {
-			plugin.message(sender, "me-noPermission");
+			messageBridge.message(sender, "me-noPermission");
 			return;
 		}
 		OfflinePlayer player = null;
 		if(!(sender instanceof Player)) {
 			if(args.length <= 1) {
-				plugin.message(sender, "me-notAPlayer");
+				messageBridge.message(sender, "me-notAPlayer");
 				return;
 			}
 		} else {
 			player = (OfflinePlayer)sender;
 		}
 		if(args.length > 1) {
-			player = Bukkit.getOfflinePlayer(args[1]);
-			if(player == null) {
-				plugin.message(sender, "me-noPlayer", args[1]);
-				return;
-			}
+			// Lookup offline players async
+			this.offlinePlayerHelper.lookupOfflinePlayerAsync(args[1]).thenAcceptAsync(offlinePlayer -> {
+				if (!offlinePlayer.hasPlayedBefore()) {
+					messageBridge.message(sender, "me-noPlayer", args[1]);
+				}
+			}, this.executor);
+			return;
 		}
-		if(player == null) {
+		if(!player.hasPlayedBefore()) {
 			return;
 		}
 
 		// Get the regions owned by the player
 		Set<RentRegion> rentRegions = new HashSet<>();
-		for(RentRegion region : plugin.getFileManager().getRents()) {
+		for(RentRegion region : fileManager.getRentsRef()) {
 			if(region.isOwner(player)) {
 				rentRegions.add(region);
 			}
 		}
 		Set<BuyRegion> buyRegions = new HashSet<>();
-		for(BuyRegion region : plugin.getFileManager().getBuys()) {
+		for(BuyRegion region : fileManager.getBuysRef()) {
 			if(region.isOwner(player)) {
 				buyRegions.add(region);
 			}
 		}
 		// Get the regions the player is added as friend
 		Set<GeneralRegion> friendRegions = new HashSet<>();
-		for(GeneralRegion region : plugin.getFileManager().getRegions()) {
-			if(region.getFriendsFeature().getFriends() != null && region.getFriendsFeature().getFriends().contains(player.getUniqueId())) {
+		for(GeneralRegion region : fileManager.getRegionsRef()) {
+			if(region.getFriendsFeature().getFriends().contains(player.getUniqueId())) {
 				friendRegions.add(region);
 			}
 		}
@@ -81,31 +99,40 @@ public class MeCommand extends CommandAreaShop {
 		// Send messages
 		boolean foundSome = !rentRegions.isEmpty() || !buyRegions.isEmpty() || !friendRegions.isEmpty();
 		if(foundSome) {
-			plugin.message(sender, "me-header", player.getName());
+			messageBridge.message(sender, "me-header", player.getName());
 		}
 		if(!rentRegions.isEmpty()) {
 			for(RentRegion region : rentRegions) {
-				plugin.messageNoPrefix(sender, "me-rentLine", region);
+				messageBridge.messageNoPrefix(sender, "me-rentLine", region);
 			}
 		}
 		if(!buyRegions.isEmpty()) {
 			for(BuyRegion region : buyRegions) {
-				plugin.messageNoPrefix(sender, "me-buyLine", region);
+				messageBridge.messageNoPrefix(sender, "me-buyLine", region);
 			}
 		}
 		if(!friendRegions.isEmpty()) {
 			for(GeneralRegion region : friendRegions) {
-				plugin.messageNoPrefix(sender, "me-friendLine", region);
+				messageBridge.messageNoPrefix(sender, "me-friendLine", region);
 			}
 		}
 
 		if(!foundSome) {
-			plugin.message(sender, "me-nothing", player.getName());
+			messageBridge.message(sender, "me-nothing", player.getName());
+		} else {
+			messageBridge.messageNoPrefix(sender, "me-clickHint");
 		}
 	}
 
-	public static void show() {
-
+	@Override
+	public List<String> getTabCompleteList(int toComplete, String[] start, CommandSender sender) {
+		ArrayList<String> result = new ArrayList<>();
+		if(toComplete == 2) {
+			for(Player player : Utils.getOnlinePlayers()) {
+				result.add(player.getName());
+			}
+		}
+		return result;
 	}
 }
 

AreaShop/src/main/java/me/wiefferink/areashop/commands/MessageCommand.java

@@ -1,22 +1,24 @@
 package me.wiefferink.areashop.commands;
 
-import me.wiefferink.areashop.AreaShop;
-import me.wiefferink.areashop.Utils;
-import me.wiefferink.areashop.messages.Message;
+import me.wiefferink.areashop.MessageBridge;
+import me.wiefferink.areashop.tools.Utils;
+import me.wiefferink.interactivemessenger.processing.Message;
 import org.apache.commons.lang.StringUtils;
 import org.bukkit.Bukkit;
 import org.bukkit.command.CommandSender;
 import org.bukkit.entity.Player;
 
+import javax.inject.Inject;
+import javax.inject.Singleton;
 import java.util.ArrayList;
 import java.util.List;
 
+@Singleton
 public class MessageCommand extends CommandAreaShop {
 
-	public MessageCommand(AreaShop plugin) {
-		super(plugin);
-	}
-
+	@Inject
+	private MessageBridge messageBridge;
+	
 	@Override
 	public String getCommandStart() {
 		return "areashop message";
@@ -24,33 +26,31 @@ public class MessageCommand extends CommandAreaShop {
 
 	@Override
 	public String getHelp(CommandSender target) {
-		if(target.hasPermission("areashop.message")) {
-			return "help-message";
-		}
+		// Internal command, no need to show in the help list
 		return null;
 	}
 
 	@Override
 	public void execute(final CommandSender sender, final String[] args) {
 		if(!sender.hasPermission("areashop.message")) {
-			plugin.message(sender, "message-noPermission");
+			messageBridge.message(sender, "message-noPermission");
 			return;
 		}
 
 		if(args.length < 3) {
-			plugin.message(sender, "message-help");
+			messageBridge.message(sender, "message-help");
 			return;
 		}
 
 		Player player = Bukkit.getPlayer(args[1]);
 		if(player == null) {
-			plugin.message(sender, "message-notOnline", args[1]);
+			messageBridge.message(sender, "message-notOnline", args[1]);
 			return;
 		}
 
-		String[] messageArgs = new String[args.length-2];
-		System.arraycopy(args, 2, messageArgs, 0, args.length-2);
-		String message = StringUtils.join(messageArgs);
+		String[] messageArgs = new String[args.length - 2];
+		System.arraycopy(args, 2, messageArgs, 0, args.length - 2);
+		String message = StringUtils.join(messageArgs, " ");
 
 		Message.fromString(message).send(player);
 	}

AreaShop/src/main/java/me/wiefferink/areashop/commands/README.md

@@ -0,0 +1,7 @@
+# Commands
+
+This module contains all AreaShop commands. 
+
+* `CommandAreaShop` is extended by all other classes, and implements some general functionality and defines which methods should be implemented.
+* Other classes implement specific sub-commands, supply their help messages and tab completion.
+* `CommandManager` class in the `managers` package handles incoming commands and dispatches them to the classes in this package.

AreaShop/src/main/java/me/wiefferink/areashop/commands/ReloadCommand.java

@@ -1,19 +1,25 @@
 package me.wiefferink.areashop.commands;
 
 import me.wiefferink.areashop.AreaShop;
+import me.wiefferink.areashop.MessageBridge;
 import org.bukkit.command.CommandSender;
 
+import javax.inject.Inject;
+import javax.inject.Singleton;
+
+@Singleton
 public class ReloadCommand extends CommandAreaShop {
 
-	public ReloadCommand(AreaShop plugin) {
-		super(plugin);
-	}
+	@Inject
+	private AreaShop plugin;
+	@Inject
+	private MessageBridge messageBridge;
 	
 	@Override
 	public String getCommandStart() {
 		return "areashop reload";
 	}
-	
+
 	@Override
 	public String getHelp(CommandSender target) {
 		if(target.hasPermission("areashop.reload")) {
@@ -28,7 +34,7 @@ public class ReloadCommand extends CommandAreaShop {
 			// Reload the configuration files and update all region flags/signs
 			plugin.reload(sender);
 		} else {
-			plugin.message(sender, "reload-noPermission");
+			messageBridge.message(sender, "reload-noPermission");
 		}
 	}
 }

AreaShop/src/main/java/me/wiefferink/areashop/commands/RentCommand.java

@@ -1,19 +1,24 @@
 package me.wiefferink.areashop.commands;
 
-import me.wiefferink.areashop.AreaShop;
-import me.wiefferink.areashop.Utils;
+import me.wiefferink.areashop.MessageBridge;
+import me.wiefferink.areashop.managers.IFileManager;
 import me.wiefferink.areashop.regions.RentRegion;
+import me.wiefferink.areashop.tools.Utils;
 import org.bukkit.command.CommandSender;
 import org.bukkit.entity.Player;
 
+import javax.inject.Inject;
+import javax.inject.Singleton;
 import java.util.ArrayList;
 import java.util.List;
 
+@Singleton
 public class RentCommand extends CommandAreaShop {
 
-	public RentCommand(AreaShop plugin) {
-		super(plugin);
-	}
+	@Inject
+	private MessageBridge messageBridge;
+	@Inject
+	private IFileManager fileManager;
 	
 	@Override
 	public String getCommandStart() {
@@ -27,43 +32,42 @@ public class RentCommand extends CommandAreaShop {
 		}
 		return null;
 	}
-	
+
 	@Override
 	public void execute(CommandSender sender, String[] args) {
 		if(!sender.hasPermission("areashop.rent")) {
-			plugin.message(sender, "rent-noPermission");
+			messageBridge.message(sender, "rent-noPermission");
 			return;
 		}
-		if (!(sender instanceof Player)) {
-			plugin.message(sender, "cmd-onlyByPlayer");
+		if(!(sender instanceof Player player)) {
+			messageBridge.message(sender, "cmd-onlyByPlayer");
 			return;
-		}					
-		Player player = (Player)sender;
+		}
 		if(args.length > 1 && args[1] != null) {
-			RentRegion rent = plugin.getFileManager().getRent(args[1]);
+			RentRegion rent = fileManager.getRent(args[1]);
 			if(rent == null) {
-				plugin.message(sender, "rent-notRentable");
+				messageBridge.message(sender, "rent-notRentable", args[1]);
 			} else {
 				rent.rent(player);
 			}
 		} else {
 			// get the region by location
-			List<RentRegion> regions = Utils.getApplicableRentRegions(((Player) sender).getLocation());
-			if (regions.isEmpty()) {
-				plugin.message(sender, "cmd-noRegionsAtLocation");
-			} else if (regions.size() > 1) {
-				plugin.message(sender, "cmd-moreRegionsAtLocation");
+			List<RentRegion> regions = Utils.getImportantRentRegions(((Player)sender).getLocation());
+			if(regions.isEmpty()) {
+				messageBridge.message(sender, "cmd-noRegionsAtLocation");
+			} else if(regions.size() > 1) {
+				messageBridge.message(sender, "cmd-moreRegionsAtLocation");
 			} else {
 				regions.get(0).rent(player);
-			}	
-		}	
+			}
+		}
 	}
-	
+
 	@Override
 	public List<String> getTabCompleteList(int toComplete, String[] start, CommandSender sender) {
 		ArrayList<String> result = new ArrayList<>();
 		if(toComplete == 2) {
-			for(RentRegion region : plugin.getFileManager().getRents()) {
+			for(RentRegion region : fileManager.getRentsRef()) {
 				if(!region.isRented()) {
 					result.add(region.getName());
 				}

AreaShop/src/main/java/me/wiefferink/areashop/commands/ResellCommand.java

@@ -1,19 +1,24 @@
 package me.wiefferink.areashop.commands;
 
-import me.wiefferink.areashop.AreaShop;
-import me.wiefferink.areashop.Utils;
+import me.wiefferink.areashop.MessageBridge;
+import me.wiefferink.areashop.managers.IFileManager;
 import me.wiefferink.areashop.regions.BuyRegion;
+import me.wiefferink.areashop.tools.Utils;
 import org.bukkit.command.CommandSender;
 import org.bukkit.entity.Player;
 
+import javax.inject.Inject;
+import javax.inject.Singleton;
 import java.util.ArrayList;
 import java.util.List;
 
+@Singleton
 public class ResellCommand extends CommandAreaShop {
 
-	public ResellCommand(AreaShop plugin) {
-		super(plugin);
-	}	
+	@Inject
+	private MessageBridge messageBridge;
+	@Inject
+	private IFileManager fileManager;
 	
 	@Override
 	public String getCommandStart() {
@@ -27,80 +32,92 @@ public class ResellCommand extends CommandAreaShop {
 		}
 		return null;
 	}
-	
+
 	@Override
 	public void execute(CommandSender sender, String[] args) {
 		if(!sender.hasPermission("areashop.resell") && !sender.hasPermission("areashop.resellall")) {
-			plugin.message(sender, "resell-noPermissionOther");
+			messageBridge.message(sender, "resell-noPermissionOther");
 			return;
 		}
-		
+
 		if(args.length <= 1) {
-			plugin.message(sender, "resell-help");
+			messageBridge.message(sender, "resell-help");
 			return;
 		}
 		double price;
 		try {
 			price = Double.parseDouble(args[1]);
 		} catch(NumberFormatException e) {
-			plugin.message(sender, "resell-wrongPrice", args[1]);
+			messageBridge.message(sender, "resell-wrongPrice", args[1]);
 			return;
 		}
+
+		if(price < 0) {
+			messageBridge.message(sender, "resell-wrongPrice", args[1]);
+			return;
+		}
+
 		BuyRegion buy;
 		if(args.length <= 2) {
-			if (sender instanceof Player) {
+			if(sender instanceof Player) {
 				// get the region by location
-				List<BuyRegion> regions = Utils.getApplicableBuyRegions(((Player) sender).getLocation());
-				if (regions.isEmpty()) {
-					plugin.message(sender, "cmd-noRegionsAtLocation");
+				List<BuyRegion> regions = Utils.getImportantBuyRegions(((Player)sender).getLocation());
+				if(regions.isEmpty()) {
+					messageBridge.message(sender, "cmd-noRegionsAtLocation");
 					return;
-				} else if (regions.size() > 1) {
-					plugin.message(sender, "cmd-moreRegionsAtLocation");
+				} else if(regions.size() > 1) {
+					messageBridge.message(sender, "cmd-moreRegionsAtLocation");
 					return;
 				} else {
 					buy = regions.get(0);
 				}
 			} else {
-				plugin.message(sender, "cmd-automaticRegionOnlyByPlayer");
+				messageBridge.message(sender, "cmd-automaticRegionOnlyByPlayer");
 				return;
-			}		
+			}
 		} else {
-			buy = plugin.getFileManager().getBuy(args[2]);
+			buy = fileManager.getBuy(args[2]);
 			if(buy == null) {
-				plugin.message(sender, "resell-notRegistered", args[2]);
+				messageBridge.message(sender, "resell-notRegistered", args[2]);
 				return;
 			}
 		}
 		if(buy == null) {
-			plugin.message(sender, "cmd-noRegionsAtLocation");
+			messageBridge.message(sender, "cmd-noRegionsAtLocation");
 			return;
 		}
 		if(!buy.isSold()) {
-			plugin.message(sender, "resell-notBought", buy);
+			messageBridge.message(sender, "resell-notBought", buy);
 			return;
 		}
 		if(sender.hasPermission("areashop.resellall")) {
 			buy.enableReselling(price);
 			buy.update();
-			plugin.message(sender, "resell-success", buy);
+			messageBridge.message(sender, "resell-success", buy);
 		} else if(sender.hasPermission("areashop.resell") && sender instanceof Player) {
-			if(buy.isOwner((Player)sender)) {
-				buy.enableReselling(price);
-				buy.update();
-				plugin.message(sender, "resell-success", buy);
-			} else {
-				plugin.message(sender, "resell-noPermissionOther", buy);
+			if(!buy.isOwner((Player)sender)) {
+				messageBridge.message(sender, "resell-noPermissionOther", buy);
+				return;
 			}
+
+			if(buy.getBooleanSetting("buy.resellDisabled")) {
+				messageBridge.message(sender, "resell-disabled", buy);
+				return;
+			}
+
+			buy.enableReselling(price);
+			buy.update();
+			messageBridge.message(sender, "resell-success", buy);
 		} else {
-			plugin.message(sender, "resell-noPermission", buy);
-		}	
+			messageBridge.message(sender, "resell-noPermission", buy);
+		}
 	}
-	
+
 	@Override
 	public List<String> getTabCompleteList(int toComplete, String[] start, CommandSender sender) {
 		ArrayList<String> result = new ArrayList<>();
 		if(toComplete == 3) {
-			for(BuyRegion region : plugin.getFileManager().getBuys()) {
+			for(BuyRegion region : fileManager.getBuysRef()) {
 				if(region.isSold() && !region.isInResellingMode()) {
 					result.add(region.getName());
 				}

AreaShop/src/main/java/me/wiefferink/areashop/commands/SchematiceventCommand.java

@@ -1,19 +1,26 @@
 package me.wiefferink.areashop.commands;
 
-import me.wiefferink.areashop.AreaShop;
-import me.wiefferink.areashop.Utils;
+import me.wiefferink.areashop.MessageBridge;
+import me.wiefferink.areashop.managers.IFileManager;
+import me.wiefferink.areashop.regions.BuyRegion;
 import me.wiefferink.areashop.regions.GeneralRegion;
+import me.wiefferink.areashop.regions.RentRegion;
+import me.wiefferink.areashop.tools.Utils;
 import org.bukkit.command.CommandSender;
 
+import javax.inject.Inject;
+import javax.inject.Singleton;
 import java.util.ArrayList;
 import java.util.Arrays;
 import java.util.List;
 
+@Singleton
 public class SchematiceventCommand extends CommandAreaShop {
 
-	public SchematiceventCommand(AreaShop plugin) {
-		super(plugin);
-	}	
+	@Inject
+	private MessageBridge messageBridge;
+	@Inject
+	private IFileManager fileManager;
 	
 	@Override
 	public String getCommandStart() {
@@ -27,25 +34,25 @@ public class SchematiceventCommand extends CommandAreaShop {
 		}
 		return null;
 	}
-	
+
 	@Override
 	public void execute(CommandSender sender, String[] args) {
 		if(!sender.hasPermission("areashop.schematicevents")) {
-			plugin.message(sender, "schemevent-noPermission");
+			messageBridge.message(sender, "schemevent-noPermission");
 			return;
 		}
-		
+
 		if(args.length < 3 || args[1] == null || args[2] == null) {
-			plugin.message(sender, "schemevent-help");
+			messageBridge.message(sender, "schemevent-help");
 			return;
-		}		
-		GeneralRegion region = plugin.getFileManager().getRegion(args[1]);
+		}
+		GeneralRegion region = fileManager.getRegion(args[1]);
 		if(region == null) {
-			plugin.message(sender, "cmd-notRegistered", args[1]);
+			messageBridge.message(sender, "cmd-notRegistered", args[1]);
 			return;
 		}
 		if(region.getRegion() == null) {
-			plugin.message(sender, "general-noRegion", region);
+			messageBridge.message(sender, "general-noRegion", region);
 			return;
 		}
 		GeneralRegion.RegionEvent event = null;
@@ -53,7 +60,7 @@ public class SchematiceventCommand extends CommandAreaShop {
 		try {
 			event = GeneralRegion.RegionEvent.valueOf(args[2].toUpperCase());
 		} catch(IllegalArgumentException e) {
-			exception = true;	
+			exception = true;
 		}
 		// Check for a totally wrong event or a non matching event
 		if(exception) {
@@ -61,25 +68,25 @@ public class SchematiceventCommand extends CommandAreaShop {
 			for(GeneralRegion.RegionEvent value : GeneralRegion.RegionEvent.values()) {
 				values.add(value.getValue().toLowerCase());
 			}
-			plugin.message(sender, "schemevent-wrongEvent", args[2], Utils.createCommaSeparatedList(values), region);
-			return;	
-		}		
+			messageBridge.message(sender, "schemevent-wrongEvent", args[2], Utils.createCommaSeparatedList(values), region);
+			return;
+		}
 		region.handleSchematicEvent(event);
 		region.update();
-		plugin.message(sender, "schemevent-success", args[2], region);
+		messageBridge.message(sender, "schemevent-success", args[2], region);
 	}
 
 	@Override
 	public List<String> getTabCompleteList(int toComplete, String[] start, CommandSender sender) {
 		ArrayList<String> result = new ArrayList<>();
 		if(toComplete == 2) {
-			result.addAll(plugin.getFileManager().getRegionNames());
+			result.addAll(fileManager.getRegionNames());
 		} else if(toComplete == 3) {
-			GeneralRegion region = plugin.getFileManager().getRegion(start[2]);
+			GeneralRegion region = fileManager.getRegion(start[2]);
 			if(region != null) {
-				if(region.isRentRegion()) {
+				if(region instanceof RentRegion) {
 					result.addAll(Arrays.asList("created", "deleted", "rented", "unrented"));
-				} else if(region.isBuyRegion()) {
+				} else if(region instanceof BuyRegion) {
 					result.addAll(Arrays.asList("created", "deleted", "bought", "sold"));
 				}
 			}

AreaShop/src/main/java/me/wiefferink/areashop/commands/SellCommand.java

@@ -1,20 +1,25 @@
 package me.wiefferink.areashop.commands;
 
-import me.wiefferink.areashop.AreaShop;
-import me.wiefferink.areashop.Utils;
+import me.wiefferink.areashop.MessageBridge;
+import me.wiefferink.areashop.managers.IFileManager;
 import me.wiefferink.areashop.regions.BuyRegion;
 import me.wiefferink.areashop.regions.GeneralRegion;
+import me.wiefferink.areashop.tools.Utils;
 import org.bukkit.command.CommandSender;
 import org.bukkit.entity.Player;
 
+import javax.inject.Inject;
+import javax.inject.Singleton;
 import java.util.ArrayList;
 import java.util.List;
 
+@Singleton
 public class SellCommand extends CommandAreaShop {
 
-	public SellCommand(AreaShop plugin) {
-		super(plugin);
-	}	
+	@Inject
+	private MessageBridge messageBridge;
+	@Inject
+	private IFileManager fileManager;
 	
 	@Override
 	public String getCommandStart() {
@@ -30,7 +35,7 @@ public class SellCommand extends CommandAreaShop {
 	}
 
 	/**
-	 * Check if a person can sell the region
+	 * Check if a person can sell the region.
 	 * @param person The person to check
 	 * @param region The region to check for
 	 * @return true if the person can sell it, otherwise false
@@ -39,56 +44,55 @@ public class SellCommand extends CommandAreaShop {
 		if(person.hasPermission("areashop.sell")) {
 			return true;
 		}
-		if(person instanceof Player) {
-			Player player = (Player)person;
+		if(person instanceof Player player) {
 			return region.isOwner(player) && person.hasPermission("areashop.sellown");
 		}
 		return false;
 	}
-	
+
 	@Override
 	public void execute(CommandSender sender, String[] args) {
 		if(!sender.hasPermission("areashop.sell") && !sender.hasPermission("areashop.sellown")) {
-			plugin.message(sender, "sell-noPermission");
+			messageBridge.message(sender, "sell-noPermission");
 			return;
 		}
 		BuyRegion buy;
 		if(args.length <= 1) {
-			if (sender instanceof Player) {
+			if(sender instanceof Player player) {
 				// get the region by location
-				List<BuyRegion> regions = Utils.getApplicableBuyRegions(((Player) sender).getLocation());
-				if (regions.isEmpty()) {
-					plugin.message(sender, "cmd-noRegionsAtLocation");
+				List<BuyRegion> regions = Utils.getImportantBuyRegions((player).getLocation());
+				if(regions.isEmpty()) {
+					messageBridge.message(sender, "cmd-noRegionsAtLocation");
 					return;
-				} else if (regions.size() > 1) {
-					plugin.message(sender, "cmd-moreRegionsAtLocation");
+				} else if(regions.size() > 1) {
+					messageBridge.message(sender, "cmd-moreRegionsAtLocation");
 					return;
 				} else {
 					buy = regions.get(0);
 				}
 			} else {
-				plugin.message(sender, "cmd-automaticRegionOnlyByPlayer");
+				messageBridge.message(sender, "cmd-automaticRegionOnlyByPlayer");
 				return;
-			}		
+			}
 		} else {
-			buy = plugin.getFileManager().getBuy(args[1]);
+			buy = fileManager.getBuy(args[1]);
 		}
 		if(buy == null) {
-			plugin.message(sender, "sell-notRegistered");
+			messageBridge.message(sender, "sell-notRegistered");
 			return;
 		}
 		if(!buy.isSold()) {
-			plugin.message(sender, "sell-notBought", buy);
+			messageBridge.message(sender, "sell-notBought", buy);
 			return;
 		}
 		buy.sell(true, sender);
 	}
-	
+
 	@Override
 	public List<String> getTabCompleteList(int toComplete, String[] start, CommandSender sender) {
 		ArrayList<String> result = new ArrayList<>();
 		if(toComplete == 2) {
-			for(BuyRegion region : plugin.getFileManager().getBuys()) {
+			for(BuyRegion region : fileManager.getBuysRef()) {
 				if(region.isSold()) {
 					result.add(region.getName());
 				}

AreaShop/src/main/java/me/wiefferink/areashop/commands/SetdurationCommand.java

@@ -1,25 +1,33 @@
 package me.wiefferink.areashop.commands;
 
-import me.wiefferink.areashop.AreaShop;
-import me.wiefferink.areashop.Utils;
+import me.wiefferink.areashop.MessageBridge;
+import me.wiefferink.areashop.managers.IFileManager;
 import me.wiefferink.areashop.regions.RentRegion;
+import me.wiefferink.areashop.tools.Utils;
 import org.bukkit.command.CommandSender;
 import org.bukkit.entity.Player;
+import org.bukkit.plugin.Plugin;
 
+import javax.inject.Inject;
+import javax.inject.Singleton;
 import java.util.ArrayList;
 import java.util.List;
 
+@Singleton
 public class SetdurationCommand extends CommandAreaShop {
 
-	public SetdurationCommand(AreaShop plugin) {
-		super(plugin);
-	}
+	@Inject
+	private MessageBridge messageBridge;
+	@Inject
+	private IFileManager fileManager;
+	@Inject
+	private Plugin plugin;
 	
 	@Override
 	public String getCommandStart() {
 		return "areashop setduration";
 	}
-	
+
 	@Override
 	public String getHelp(CommandSender target) {
 		if(target.hasPermission("areashop.setduration")) {
@@ -31,11 +39,11 @@ public class SetdurationCommand extends CommandAreaShop {
 	@Override
 	public void execute(CommandSender sender, String[] args) {
 		if(!sender.hasPermission("areashop.setduration") && (!sender.hasPermission("areashop.setduration.landlord") && sender instanceof Player)) {
-			plugin.message(sender, "setduration-noPermission");
+			messageBridge.message(sender, "setduration-noPermission");
 			return;
 		}
 		if(args.length < 3 || args[1] == null || args[2] == null) {
-			plugin.message(sender, "setduration-help");
+			messageBridge.message(sender, "setduration-help");
 			return;
 		}
 		int regionArgument = 3;
@@ -44,65 +52,65 @@ public class SetdurationCommand extends CommandAreaShop {
 		}
 		RentRegion rent;
 		if(args.length <= regionArgument) {
-			if (sender instanceof Player) {
+			if(sender instanceof Player) {
 				// get the region by location
-				List<RentRegion> regions = Utils.getApplicableRentRegions(((Player) sender).getLocation());
-				if (regions.isEmpty()) {
-					plugin.message(sender, "cmd-noRegionsAtLocation");
+				List<RentRegion> regions = Utils.getImportantRentRegions(((Player)sender).getLocation());
+				if(regions.isEmpty()) {
+					messageBridge.message(sender, "cmd-noRegionsAtLocation");
 					return;
-				} else if (regions.size() > 1) {
-					plugin.message(sender, "cmd-moreRegionsAtLocation");
+				} else if(regions.size() > 1) {
+					messageBridge.message(sender, "cmd-moreRegionsAtLocation");
 					return;
 				} else {
 					rent = regions.get(0);
 				}
 			} else {
-				plugin.message(sender, "cmd-automaticRegionOnlyByPlayer");
+				messageBridge.message(sender, "cmd-automaticRegionOnlyByPlayer");
 				return;
-			}		
+			}
 		} else {
-			rent = plugin.getFileManager().getRent(args[regionArgument]);
+			rent = fileManager.getRent(args[regionArgument]);
 		}
 		if(rent == null) {
-			plugin.message(sender, "setduration-notRegistered", args[regionArgument]);
+			messageBridge.message(sender, "setduration-notRegistered", args[regionArgument]);
 			return;
 		}
 		if(!sender.hasPermission("areashop.setduration") && !(sender instanceof Player && rent.isLandlord(((Player)sender).getUniqueId()))) {
-			plugin.message(sender, "setduration-noLandlord", rent);
+			messageBridge.message(sender, "setduration-noLandlord", rent);
 			return;
-		}	
+		}
 		if("default".equalsIgnoreCase(args[1]) || "reset".equalsIgnoreCase(args[1])) {
 			rent.setDuration(null);
 			rent.update();
-			plugin.message(sender, "setduration-successRemoved", rent);
+			messageBridge.message(sender, "setduration-successRemoved", rent);
 			return;
 		}
 		try {
 			Integer.parseInt(args[1]);
 		} catch(NumberFormatException e) {
-			plugin.message(sender, "setduration-wrongAmount", args[1], rent);
+			messageBridge.message(sender, "setduration-wrongAmount", args[1], rent);
 			return;
 		}
-		if(!Utils.checkTimeFormat(args[1]+" "+args[2])) {
-			plugin.message(sender, "setduration-wrongFormat", args[1]+" "+args[2], rent);
+		if(!Utils.checkTimeFormat(args[1] + " " + args[2])) {
+			messageBridge.message(sender, "setduration-wrongFormat", args[1] + " " + args[2], rent);
 			return;
-		}					
-		rent.setDuration(args[1]+" "+args[2]);
+		}
+		rent.setDuration(args[1] + " " + args[2]);
 		rent.update();
-		plugin.message(sender, "setduration-success", rent);
+		messageBridge.message(sender, "setduration-success", rent);
 	}
-	
+
 	@Override
 	public List<String> getTabCompleteList(int toComplete, String[] start, CommandSender sender) {
 		List<String> result = new ArrayList<>();
-		if(toComplete == 2) {
-			result = plugin.getFileManager().getRentNames();
-		} else if(toComplete == 4) {
+		if(toComplete == 3) {
 			result.addAll(plugin.getConfig().getStringList("minutes"));
 			result.addAll(plugin.getConfig().getStringList("hours"));
 			result.addAll(plugin.getConfig().getStringList("days"));
 			result.addAll(plugin.getConfig().getStringList("months"));
 			result.addAll(plugin.getConfig().getStringList("years"));
+		} else if(toComplete == 4) {
+			result = fileManager.getRentNames();
 		}
 		return result;
 	}

AreaShop/src/main/java/me/wiefferink/areashop/commands/SetlandlordCommand.java

@@ -1,92 +1,100 @@
 package me.wiefferink.areashop.commands;
 
-import me.wiefferink.areashop.AreaShop;
-import me.wiefferink.areashop.Utils;
+import me.wiefferink.areashop.MessageBridge;
+import me.wiefferink.areashop.adapters.platform.OfflinePlayerHelper;
+import me.wiefferink.areashop.managers.IFileManager;
 import me.wiefferink.areashop.regions.GeneralRegion;
-import org.bukkit.Bukkit;
-import org.bukkit.OfflinePlayer;
+import me.wiefferink.areashop.tools.BukkitSchedulerExecutor;
+import me.wiefferink.areashop.tools.Utils;
 import org.bukkit.command.CommandSender;
 import org.bukkit.entity.Player;
 
+import javax.inject.Inject;
+import javax.inject.Singleton;
 import java.util.ArrayList;
 import java.util.List;
 
+@Singleton
 public class SetlandlordCommand extends CommandAreaShop {
 
-	public SetlandlordCommand(AreaShop plugin) {
-		super(plugin);
-	}
-	
-	@Override
-	public String getCommandStart() {
-		return "areashop setlandlord";
-	}
-	
-	@Override
-	public String getHelp(CommandSender target) {
-		if(target.hasPermission("areashop.setlandlord")) {
-			return "help-setlandlord";
-		}
-		return null;
-	}
+    @Inject
+    private MessageBridge messageBridge;
+    @Inject
+    private IFileManager fileManager;
+    @Inject
+    private OfflinePlayerHelper offlinePlayerHelper;
+    @Inject
+    private BukkitSchedulerExecutor executor;
 
-	@Override
-	public void execute(CommandSender sender, String[] args) {
-		if(!sender.hasPermission("areashop.setlandlord")) {
-			plugin.message(sender, "setlandlord-noPermission");
-			return;
-		}		
-		if(args.length < 2) {
-			plugin.message(sender, "setlandlord-help");
-			return;
-		}
-		@SuppressWarnings("deprecation")
-		OfflinePlayer player = Bukkit.getOfflinePlayer(args[1]);
-		GeneralRegion region;
-		if(args.length < 3) {
-			if (sender instanceof Player) {
-				// get the region by location
-				List<GeneralRegion> regions = Utils.getAllApplicableRegions(((Player) sender).getLocation());
-				if (regions.isEmpty()) {
-					plugin.message(sender, "cmd-noRegionsAtLocation");
-					return;
-				} else if (regions.size() > 1) {
-					plugin.message(sender, "cmd-moreRegionsAtLocation");
-					return;
-				} else {
-					region = regions.get(0);
-				}
-			} else {
-				plugin.message(sender, "cmd-automaticRegionOnlyByPlayer");
-				return;
-			}		
-		} else {
-			region = plugin.getFileManager().getRegion(args[2]);
-		}	
-		if(region == null) {
-			plugin.message(sender, "cmd-notRegistered", args[2]);
-			return;
-		}		
-		String playerName = player.getName();
-		if(playerName == null || playerName.isEmpty()) {
-			playerName = args[1];
-		}
-		region.setLandlord(player.getUniqueId(), playerName);
-		region.update();
-		plugin.message(sender, "setlandlord-success", playerName, region);
-	}
-	
-	@Override
-	public List<String> getTabCompleteList(int toComplete, String[] start, CommandSender sender) {
-		ArrayList<String> result = new ArrayList<>();
-		if(toComplete == 2) {
-			for(Player player : Utils.getOnlinePlayers()) {
-				result.add(player.getName());
-			}
-		} else if(toComplete == 3) {
-			result.addAll(plugin.getFileManager().getRegionNames());
-		}
-		return result;
-	}
+    @Override
+    public String getCommandStart() {
+        return "areashop setlandlord";
+    }
+
+    @Override
+    public String getHelp(CommandSender target) {
+        if (target.hasPermission("areashop.setlandlord")) {
+            return "help-setlandlord";
+        }
+        return null;
+    }
+
+    @Override
+    public void execute(CommandSender sender, String[] args) {
+        if (!sender.hasPermission("areashop.setlandlord")) {
+            messageBridge.message(sender, "setlandlord-noPermission");
+            return;
+        }
+        if (args.length < 2) {
+            messageBridge.message(sender, "setlandlord-help");
+            return;
+        }
+        GeneralRegion region;
+        if (args.length < 3) {
+            if (!(sender instanceof Player player)) {
+                messageBridge.message(sender, "cmd-automaticRegionOnlyByPlayer");
+                return;
+            }
+            // get the region by location
+            List<GeneralRegion> regions = Utils.getImportantRegions(player.getLocation());
+            if (regions.isEmpty()) {
+                messageBridge.message(sender, "cmd-noRegionsAtLocation");
+                return;
+            } else if (regions.size() > 1) {
+                messageBridge.message(sender, "cmd-moreRegionsAtLocation");
+                return;
+            } else {
+                region = regions.get(0);
+            }
+        } else {
+            region = fileManager.getRegion(args[2]);
+        }
+        if (region == null) {
+            messageBridge.message(sender, "cmd-notRegistered", args[2]);
+            return;
+        }
+        this.offlinePlayerHelper.lookupOfflinePlayerAsync(args[1]).thenAcceptAsync(offlinePlayer -> {
+            String playerName = offlinePlayer.getName();
+            if (playerName == null || playerName.isEmpty()) {
+                playerName = args[1];
+            }
+            region.setLandlord(offlinePlayer.getUniqueId(), playerName);
+            region.update();
+            messageBridge.message(sender, "setlandlord-success", playerName, region);
+        }, this.executor);
+    }
+
+    @Override
+    public List<String> getTabCompleteList(int toComplete, String[] start, CommandSender sender) {
+        ArrayList<String> result = new ArrayList<>();
+        if (toComplete == 2) {
+            for (Player player : Utils.getOnlinePlayers()) {
+                result.add(player.getName());
+            }
+        } else if (toComplete == 3) {
+            result.addAll(fileManager.getRegionNames());
+        }
+        return result;
+    }
 
 }

AreaShop/src/main/java/me/wiefferink/areashop/commands/SetownerCommand.java

@@ -1,139 +1,138 @@
 package me.wiefferink.areashop.commands;
 
-import me.wiefferink.areashop.AreaShop;
-import me.wiefferink.areashop.Utils;
+import me.wiefferink.areashop.MessageBridge;
+import me.wiefferink.areashop.adapters.platform.OfflinePlayerHelper;
+import me.wiefferink.areashop.managers.IFileManager;
 import me.wiefferink.areashop.regions.BuyRegion;
 import me.wiefferink.areashop.regions.GeneralRegion;
 import me.wiefferink.areashop.regions.RentRegion;
+import me.wiefferink.areashop.tools.BukkitSchedulerExecutor;
+import me.wiefferink.areashop.tools.Utils;
 import org.bukkit.Bukkit;
 import org.bukkit.OfflinePlayer;
 import org.bukkit.command.CommandSender;
 import org.bukkit.entity.Player;
 
+import javax.inject.Inject;
+import javax.inject.Singleton;
 import java.util.ArrayList;
 import java.util.Calendar;
 import java.util.List;
 import java.util.UUID;
 
+@Singleton
 public class SetownerCommand extends CommandAreaShop {
 
-	public SetownerCommand(AreaShop plugin) {
-		super(plugin);
-	}
-	
-	@Override
-	public String getCommandStart() {
-		return "areashop setowner";
-	}
+    @Inject
+    private MessageBridge messageBridge;
+    @Inject
+    private IFileManager fileManager;
+    @Inject
+    private OfflinePlayerHelper offlinePlayerHelper;
+    @Inject
+    private BukkitSchedulerExecutor executor;
 
-	@Override
-	public String getHelp(CommandSender target) {
-		if(target.hasPermission("areashop.setownerrent") || target.hasPermission("areashop.setownerbuy")) {
-			return "help-setowner";
-		}
-		return null;
-	}
-	
-	@Override
-	public void execute(CommandSender sender, String[] args) {
-		if(!sender.hasPermission("areashop.setownerrent") && !sender.hasPermission("areashop.setownerbuy")) {
-			plugin.message(sender, "setowner-noPermission");
-			return;
-		}
-		GeneralRegion region;
-		if(args.length < 2) {
-			plugin.message(sender, "setowner-help");
-			return;
-		}		
-		if(args.length == 2) {
-			if (sender instanceof Player) {
-				// get the region by location
-				List<GeneralRegion> regions = Utils.getAllApplicableRegions(((Player) sender).getLocation());
-				if (regions.isEmpty()) {
-					plugin.message(sender, "cmd-noRegionsAtLocation");
-					return;
-				} else if (regions.size() > 1) {
-					plugin.message(sender, "cmd-moreRegionsAtLocation");
-					return;
-				} else {
-					region = regions.get(0);
-				}
-			} else {
-				plugin.message(sender, "cmd-automaticRegionOnlyByPlayer");
-				return;
-			}
-		} else {
-			region = plugin.getFileManager().getRegion(args[2]);
-		}
-		if(region == null) {
-			plugin.message(sender, "setowner-notRegistered");
-			return;
-		}
-		
-		if(region.isRentRegion() && !sender.hasPermission("areashop.setownerrent")) {
-			plugin.message(sender, "setowner-noPermissionRent", region);
-			return;
-		}
-		if(region.isBuyRegion() && !sender.hasPermission("areashop.setownerbuy")) {
-			plugin.message(sender, "setowner-noPermissionBuy", region);
-			return;
-		}
-		
-		UUID uuid = null;
-		@SuppressWarnings("deprecation")
-		OfflinePlayer player = Bukkit.getOfflinePlayer(args[1]);
-		if(player != null) {
-			uuid = player.getUniqueId();
-		}
-		if(uuid == null) {
-			plugin.message(sender, "setowner-noPlayer", args[1], region);
-			return;
-		}		
-		
-		if(region.isRentRegion()) {
-			RentRegion rent = (RentRegion)region;
-			if(rent.isRenter(uuid)) {
-				// extend
-				Calendar calendar = Calendar.getInstance();
-				calendar.setTimeInMillis(rent.getRentedUntil() + rent.getDuration());
-				rent.setRentedUntil(calendar.getTimeInMillis());
-				rent.setRenter(uuid);
-				rent.update();
-				plugin.message(sender, "setowner-succesRentExtend", region);
-			} else {
-				// change
-				Calendar calendar = Calendar.getInstance();
-				long current = calendar.getTimeInMillis();
-				if(rent.isRented()) {
-					current = rent.getRentedUntil();
-				}
-				calendar.setTimeInMillis(current + rent.getDuration());
-				rent.setRentedUntil(calendar.getTimeInMillis());
-				rent.setRenter(uuid);
-				rent.update();
-				plugin.message(sender, "setowner-succesRent", region);
-			}
-		}
-		if(region.isBuyRegion()) {
-			BuyRegion buy = (BuyRegion)region;
-			buy.setBuyer(uuid);
-			buy.update();
-			plugin.message(sender, "setowner-succesBuy", region);
-		}
-	}
-	
-	@Override
-	public List<String> getTabCompleteList(int toComplete, String[] start, CommandSender sender) {
-		ArrayList<String> result = new ArrayList<>();
-		if(toComplete == 2) {
-			for(Player player : Utils.getOnlinePlayers()) {
-				result.add(player.getName());
-			}
-		} else if(toComplete == 3) {
-			result.addAll(plugin.getFileManager().getRegionNames());
-		}
-		return result;
-	}
+    @Override
+    public String getCommandStart() {
+        return "areashop setowner";
+    }
+
+    @Override
+    public String getHelp(CommandSender target) {
+        if (target.hasPermission("areashop.setownerrent") || target.hasPermission("areashop.setownerbuy")) {
+            return "help-setowner";
+        }
+        return null;
+    }
+
+    @Override
+    public void execute(CommandSender sender, String[] args) {
+        if (!sender.hasPermission("areashop.setownerrent") && !sender.hasPermission("areashop.setownerbuy")) {
+            messageBridge.message(sender, "setowner-noPermission");
+            return;
+        }
+        GeneralRegion region;
+        if (args.length < 2) {
+            messageBridge.message(sender, "setowner-help");
+            return;
+        }
+        if (args.length == 2) {
+            if (!(sender instanceof Player player)) {
+                messageBridge.message(sender, "cmd-automaticRegionOnlyByPlayer");
+                return;
+            }
+            // get the region by location
+            List<GeneralRegion> regions = Utils.getImportantRegions(player.getLocation());
+            if (regions.isEmpty()) {
+                messageBridge.message(sender, "cmd-noRegionsAtLocation");
+                return;
+            } else if (regions.size() > 1) {
+                messageBridge.message(sender, "cmd-moreRegionsAtLocation");
+                return;
+            } else {
+                region = regions.get(0);
+            }
+
+        } else {
+            region = fileManager.getRegion(args[2]);
+        }
+        if (region == null) {
+            messageBridge.message(sender, "setowner-notRegistered");
+            return;
+        }
+
+        if (region instanceof RentRegion && !sender.hasPermission("areashop.setownerrent")) {
+            messageBridge.message(sender, "setowner-noPermissionRent", region);
+            return;
+        }
+        if (region instanceof BuyRegion && !sender.hasPermission("areashop.setownerbuy")) {
+            messageBridge.message(sender, "setowner-noPermissionBuy", region);
+            return;
+        }
+
+        this.offlinePlayerHelper.lookupUuidAsync(args[1]).thenAcceptAsync(optionalUuid -> {
+            if (optionalUuid.isEmpty()) {
+                messageBridge.message(sender, "setowner-noPlayer", args[1], region);
+                return;
+            }
+            final UUID uuid = optionalUuid.get();
+            if (region instanceof RentRegion rent) {
+                if (rent.isRenter(uuid)) {
+                    // extend
+                    rent.setRentedUntil(rent.getRentedUntil() + rent.getDuration());
+                    rent.setRenter(uuid);
+                    messageBridge.message(sender, "setowner-succesRentExtend", region);
+                } else {
+                    // change
+                    if (!rent.isRented()) {
+                        rent.setRentedUntil(Calendar.getInstance().getTimeInMillis() + rent.getDuration());
+                    }
+                    rent.setRenter(uuid);
+                    messageBridge.message(sender, "setowner-succesRent", region);
+                }
+            }
+            if (region instanceof BuyRegion buy) {
+                buy.setBuyer(uuid);
+                messageBridge.message(sender, "setowner-succesBuy", region);
+            }
+            region.getFriendsFeature().deleteFriend(region.getOwner(), null);
+            region.update();
+            region.saveRequired();
+        }, this.executor);
+    }
+
+    @Override
+    public List<String> getTabCompleteList(int toComplete, String[] start, CommandSender sender) {
+        ArrayList<String> result = new ArrayList<>();
+        if (toComplete == 2) {
+            for (Player player : Utils.getOnlinePlayers()) {
+                result.add(player.getName());
+            }
+        } else if (toComplete == 3) {
+            result.addAll(fileManager.getRegionNames());
+        }
+        return result;
+    }
 }
 
 

AreaShop/src/main/java/me/wiefferink/areashop/commands/SetpriceCommand.java

@@ -1,27 +1,32 @@
 package me.wiefferink.areashop.commands;
 
-import me.wiefferink.areashop.AreaShop;
-import me.wiefferink.areashop.Utils;
+import me.wiefferink.areashop.MessageBridge;
+import me.wiefferink.areashop.managers.IFileManager;
 import me.wiefferink.areashop.regions.BuyRegion;
 import me.wiefferink.areashop.regions.GeneralRegion;
 import me.wiefferink.areashop.regions.RentRegion;
+import me.wiefferink.areashop.tools.Utils;
 import org.bukkit.command.CommandSender;
 import org.bukkit.entity.Player;
 
+import javax.inject.Inject;
+import javax.inject.Singleton;
 import java.util.ArrayList;
 import java.util.List;
 
+@Singleton
 public class SetpriceCommand extends CommandAreaShop {
 
-	public SetpriceCommand(AreaShop plugin) {
-		super(plugin);
-	}
+	@Inject
+	private MessageBridge messageBridge;
+	@Inject
+	private IFileManager fileManager;
 	
 	@Override
 	public String getCommandStart() {
 		return "areashop setprice";
 	}
-	
+
 	@Override
 	public String getHelp(CommandSender target) {
 		if(target.hasPermission("areashop.setprice")) {
@@ -33,74 +38,74 @@ public class SetpriceCommand extends CommandAreaShop {
 	@Override
 	public void execute(CommandSender sender, String[] args) {
 		if(!sender.hasPermission("areashop.setprice") && (!sender.hasPermission("areashop.setprice.landlord") && sender instanceof Player)) {
-			plugin.message(sender, "setprice-noPermission");
+			messageBridge.message(sender, "setprice-noPermission");
 			return;
-		}		
+		}
 		if(args.length < 2 || args[1] == null) {
-			plugin.message(sender, "setprice-help");
+			messageBridge.message(sender, "setprice-help");
 			return;
 		}
 		GeneralRegion region;
 		if(args.length < 3) {
-			if (sender instanceof Player) {
+			if(sender instanceof Player) {
 				// get the region by location
-				List<GeneralRegion> regions = Utils.getAllApplicableRegions(((Player) sender).getLocation());
-				if (regions.isEmpty()) {
-					plugin.message(sender, "cmd-noRegionsAtLocation");
+				List<GeneralRegion> regions = Utils.getImportantRegions(((Player)sender).getLocation());
+				if(regions.isEmpty()) {
+					messageBridge.message(sender, "cmd-noRegionsAtLocation");
 					return;
-				} else if (regions.size() > 1) {
-					plugin.message(sender, "cmd-moreRegionsAtLocation");
+				} else if(regions.size() > 1) {
+					messageBridge.message(sender, "cmd-moreRegionsAtLocation");
 					return;
 				} else {
 					region = regions.get(0);
 				}
 			} else {
-				plugin.message(sender, "cmd-automaticRegionOnlyByPlayer");
+				messageBridge.message(sender, "cmd-automaticRegionOnlyByPlayer");
 				return;
-			}		
+			}
 		} else {
-			region = plugin.getFileManager().getRegion(args[2]);
-		}		
+			region = fileManager.getRegion(args[2]);
+		}
 		if(region == null) {
-			plugin.message(sender, "setprice-notRegistered", args[2]);
+			messageBridge.message(sender, "setprice-notRegistered", args[2]);
 			return;
 		}
 		if(!sender.hasPermission("areashop.setprice") && !(sender instanceof Player && region.isLandlord(((Player)sender).getUniqueId()))) {
-			plugin.message(sender, "setprice-noLandlord", region);
+			messageBridge.message(sender, "setprice-noLandlord", region);
 			return;
 		}
 		if("default".equalsIgnoreCase(args[1]) || "reset".equalsIgnoreCase(args[1])) {
-			if(region.isRentRegion()) {
-				((RentRegion)region).removePrice();
-			} else if(region.isBuyRegion()) {
-				((BuyRegion)region).removePrice();
+			if(region instanceof RentRegion) {
+				((RentRegion)region).setPrice(null);
+			} else if(region instanceof BuyRegion) {
+				((BuyRegion)region).setPrice(null);
 			}
 			region.update();
-			plugin.message(sender, "setprice-successRemoved", region);
+			messageBridge.message(sender, "setprice-successRemoved", region);
 			return;
 		}
 		double price;
 		try {
 			price = Double.parseDouble(args[1]);
 		} catch(NumberFormatException e) {
-			plugin.message(sender, "setprice-wrongPrice", args[1], region);
+			messageBridge.message(sender, "setprice-wrongPrice", args[1], region);
 			return;
 		}
-		if(region.isRentRegion()) {
+		if(region instanceof RentRegion) {
 			((RentRegion)region).setPrice(price);
-			plugin.message(sender, "setprice-successRent", region);
-		} else if(region.isBuyRegion()) {
+			messageBridge.message(sender, "setprice-successRent", region);
+		} else if(region instanceof BuyRegion) {
 			((BuyRegion)region).setPrice(price);
-			plugin.message(sender, "setprice-successBuy", region);
+			messageBridge.message(sender, "setprice-successBuy", region);
 		}
 		region.update();
 	}
-	
+
 	@Override
 	public List<String> getTabCompleteList(int toComplete, String[] start, CommandSender sender) {
 		List<String> result = new ArrayList<>();
 		if(toComplete == 3) {
-			result = plugin.getFileManager().getRegionNames();		
+			result = fileManager.getRegionNames();
 		}
 		return result;
 	}

AreaShop/src/main/java/me/wiefferink/areashop/commands/SetrestoreCommand.java

@@ -1,23 +1,33 @@
 package me.wiefferink.areashop.commands;
 
 import me.wiefferink.areashop.AreaShop;
+import me.wiefferink.areashop.MessageBridge;
+import me.wiefferink.areashop.managers.IFileManager;
 import me.wiefferink.areashop.regions.GeneralRegion;
 import org.bukkit.command.CommandSender;
+import org.bukkit.configuration.ConfigurationSection;
+import org.bukkit.plugin.Plugin;
 
+import javax.inject.Inject;
+import javax.inject.Singleton;
 import java.util.ArrayList;
 import java.util.List;
 
+@Singleton
 public class SetrestoreCommand extends CommandAreaShop {
 
-	public SetrestoreCommand(AreaShop plugin) {
-		super(plugin);
-	}
+	@Inject
+	private MessageBridge messageBridge;
+	@Inject
+	private IFileManager fileManager;
+	@Inject
+	private Plugin plugin;
 	
 	@Override
 	public String getCommandStart() {
 		return "areashop setrestore";
 	}
-	
+
 	@Override
 	public String getHelp(CommandSender target) {
 		if(target.hasPermission("areashop.setrestore")) {
@@ -29,16 +39,16 @@ public class SetrestoreCommand extends CommandAreaShop {
 	@Override
 	public void execute(CommandSender sender, String[] args) {
 		if(!sender.hasPermission("areashop.setrestore")) {
-			plugin.message(sender, "setrestore-noPermission");
+			messageBridge.message(sender, "setrestore-noPermission");
 			return;
 		}
 		if(args.length <= 2 || args[1] == null || args[2] == null) {
-			plugin.message(sender, "setrestore-help");
+			messageBridge.message(sender, "setrestore-help");
 			return;
 		}
-		GeneralRegion region = plugin.getFileManager().getRegion(args[1]);
+		GeneralRegion region = fileManager.getRegion(args[1]);
 		if(region == null) {
-			plugin.message(sender, "setrestore-notRegistered", args[1]);
+			messageBridge.message(sender, "setrestore-notRegistered", args[1]);
 			return;
 		}
 		Boolean value = null;
@@ -50,28 +60,31 @@ public class SetrestoreCommand extends CommandAreaShop {
 		region.setRestoreSetting(value);
 		String valueString = "general";
 		if(value != null) {
-			valueString = value+"";
+			valueString = value + "";
 		}
 		if(args.length > 3) {
 			region.setSchematicProfile(args[3]);
-			plugin.message(sender, "setrestore-successProfile", valueString, args[3], region);
+			messageBridge.message(sender, "setrestore-successProfile", valueString, args[3], region);
 		} else {
-			plugin.message(sender, "setrestore-success", valueString, region);
+			messageBridge.message(sender, "setrestore-success", valueString, region);
 		}
 		region.update();
 	}
-	
+
 	@Override
 	public List<String> getTabCompleteList(int toComplete, String[] start, CommandSender sender) {
 		List<String> result = new ArrayList<>();
 		if(toComplete == 2) {
-			result = plugin.getFileManager().getRegionNames();
+			result = fileManager.getRegionNames();
 		} else if(toComplete == 3) {
 			result.add("true");
 			result.add("false");
 			result.add("general");
 		} else if(toComplete == 4) {
-			result.addAll(plugin.getConfig().getConfigurationSection("schematicProfiles").getKeys(false));
+			ConfigurationSection schemProfiles = fileManager.getConfig().getConfigurationSection("schematicProfiles");
+			if (schemProfiles != null) {
+				result.addAll(schemProfiles.getKeys(false));
+			}
 		}
 		return result;
 	}

AreaShop/src/main/java/me/wiefferink/areashop/commands/SetteleportCommand.java

@@ -1,47 +1,51 @@
 package me.wiefferink.areashop.commands;
 
 import com.sk89q.worldguard.protection.regions.ProtectedRegion;
-import me.wiefferink.areashop.AreaShop;
-import me.wiefferink.areashop.Utils;
+import me.wiefferink.areashop.MessageBridge;
+import me.wiefferink.areashop.managers.IFileManager;
 import me.wiefferink.areashop.regions.BuyRegion;
 import me.wiefferink.areashop.regions.GeneralRegion;
 import me.wiefferink.areashop.regions.RentRegion;
+import me.wiefferink.areashop.tools.Utils;
 import org.bukkit.command.CommandSender;
 import org.bukkit.entity.Player;
 
+import javax.inject.Inject;
+import javax.inject.Singleton;
 import java.util.ArrayList;
 import java.util.List;
 
+@Singleton
 public class SetteleportCommand extends CommandAreaShop {
 
-	public SetteleportCommand(AreaShop plugin) {
-		super(plugin);
-	}
+	@Inject
+	private MessageBridge messageBridge;
+	@Inject
+	private IFileManager fileManager;
 	
 	@Override
 	public String getCommandStart() {
 		return "areashop settp";
 	}
-	
+
 	@Override
 	public String getHelp(CommandSender target) {
-		if(target.hasPermission("areashop.teleportall") || target.hasPermission("areashop.teleport")) {
+		if(target.hasPermission("areashop.setteleportall") || target.hasPermission("areashop.setteleport")) {
 			return "help-setteleport";
 		}
 		return null;
 	}
 
 	/**
-	 * Check if a person can set the teleport location of the region
+	 * Check if a person can set the teleport location of the region.
 	 * @param person The person to check
 	 * @param region The region to check for
 	 * @return true if the person can set the teleport location, otherwise false
 	 */
 	public static boolean canUse(CommandSender person, GeneralRegion region) {
-		if(!(person instanceof Player)) {
+		if(!(person instanceof Player player)) {
 			return false;
 		}
-		Player player = (Player)person;
 		return player.hasPermission("areashop.setteleportall")
 				|| region.isOwner(player) && player.hasPermission("areashop.setteleport");
 	}
@@ -49,71 +53,70 @@ public class SetteleportCommand extends CommandAreaShop {
 	@Override
 	public void execute(CommandSender sender, String[] args) {
 		if(!sender.hasPermission("areashop.setteleport") && !sender.hasPermission("areashop.setteleportall")) {
-			plugin.message(sender, "setteleport-noPermission");
+			messageBridge.message(sender, "setteleport-noPermission");
 			return;
 		}
-		if (!(sender instanceof Player)) {
-			plugin.message(sender, "onlyByPlayer");
+		if(!(sender instanceof Player player)) {
+			messageBridge.message(sender, "onlyByPlayer");
 			return;
 		}
-		Player player = (Player)sender;
 		GeneralRegion region;
 		if(args.length < 2) {
 			// get the region by location
-			List<GeneralRegion> regions = Utils.getAllApplicableRegions(((Player)sender).getLocation());
+			List<GeneralRegion> regions = Utils.getImportantRegions(((Player)sender).getLocation());
 			if(regions.isEmpty()) {
-				plugin.message(sender, "cmd-noRegionsAtLocation");
+				messageBridge.message(sender, "cmd-noRegionsAtLocation");
 				return;
 			} else if(regions.size() > 1) {
-				plugin.message(sender, "cmd-moreRegionsAtLocation");
+				messageBridge.message(sender, "cmd-moreRegionsAtLocation");
 				return;
 			} else {
 				region = regions.get(0);
 			}
 		} else {
-			region = plugin.getFileManager().getRegion(args[1]);
+			region = fileManager.getRegion(args[1]);
 		}
 
 		boolean owner;
-		
+
 		if(region == null) {
-			plugin.message(player, "setteleport-noRentOrBuy", args[1]);
+			messageBridge.message(player, "setteleport-noRentOrBuy", args[1]);
 			return;
 		}
-		if(region.isRentRegion()) {
+		if(region instanceof RentRegion) {
 			owner = player.getUniqueId().equals(((RentRegion)region).getRenter());
 		} else {
 			owner = player.getUniqueId().equals(((BuyRegion)region).getBuyer());
 		}
 		if(!player.hasPermission("areashop.setteleport")) {
-			plugin.message(player, "setteleport-noPermission", region);
+			messageBridge.message(player, "setteleport-noPermission", region);
 			return;
 		} else if(!owner && !player.hasPermission("areashop.setteleportall")) {
-			plugin.message(player, "setteleport-noPermissionOther", region);
+			messageBridge.message(player, "setteleport-noPermissionOther", region);
 			return;
 		}
 
 		ProtectedRegion wgRegion = region.getRegion();
 		if(args.length > 2 && args[2] != null && (args[2].equalsIgnoreCase("reset") || args[2].equalsIgnoreCase("yes") || args[2].equalsIgnoreCase("true"))) {
-			region.setTeleport(null);
+			region.getTeleportFeature().setTeleport(null);
 			region.update();
-			plugin.message(player, "setteleport-reset", region);
+			messageBridge.message(player, "setteleport-reset", region);
 			return;
 		}
 		if(!player.hasPermission("areashop.setteleportoutsideregion") && (wgRegion == null || !wgRegion.contains(player.getLocation().getBlockX(), player.getLocation().getBlockY(), player.getLocation().getBlockZ()))) {
-			plugin.message(player, "setteleport-notInside", region);
+			messageBridge.message(player, "setteleport-notInside", region);
 			return;
 		}
-		region.setTeleport(player.getLocation());
+		region.getTeleportFeature().setTeleport(player.getLocation());
 		region.update();
-		plugin.message(player, "setteleport-success", region);
+		messageBridge.message(player, "setteleport-success", region);
 	}
-	
+
 	@Override
 	public List<String> getTabCompleteList(int toComplete, String[] start, CommandSender sender) {
 		ArrayList<String> result = new ArrayList<>();
 		if(toComplete == 2) {
-			result.addAll(plugin.getFileManager().getRegionNames());
+			result.addAll(fileManager.getRegionNames());
 		} else if(toComplete == 3) {
 			result.add("reset");
 		}

AreaShop/src/main/java/me/wiefferink/areashop/commands/StackCommand.java

@@ -1,36 +1,53 @@
 package me.wiefferink.areashop.commands;
 
-import com.sk89q.worldedit.BlockVector;
-import com.sk89q.worldedit.bukkit.selections.Selection;
 import com.sk89q.worldguard.protection.managers.RegionManager;
 import com.sk89q.worldguard.protection.regions.ProtectedCuboidRegion;
 import me.wiefferink.areashop.AreaShop;
-import me.wiefferink.areashop.Utils;
-import me.wiefferink.areashop.messages.Message;
-import me.wiefferink.areashop.regions.BuyRegion;
+import me.wiefferink.areashop.MessageBridge;
+import me.wiefferink.areashop.events.ask.AddingRegionEvent;
+import me.wiefferink.areashop.interfaces.WorldEditInterface;
+import me.wiefferink.areashop.interfaces.WorldEditSelection;
+import me.wiefferink.areashop.interfaces.WorldGuardInterface;
+import me.wiefferink.areashop.managers.IFileManager;
 import me.wiefferink.areashop.regions.GeneralRegion;
+import me.wiefferink.areashop.regions.RegionFactory;
 import me.wiefferink.areashop.regions.RegionGroup;
-import me.wiefferink.areashop.regions.RentRegion;
+import me.wiefferink.areashop.tools.Utils;
+import me.wiefferink.interactivemessenger.processing.Message;
 import org.bukkit.Location;
 import org.bukkit.block.BlockFace;
 import org.bukkit.command.CommandSender;
 import org.bukkit.entity.Player;
+import org.bukkit.plugin.Plugin;
 import org.bukkit.scheduler.BukkitRunnable;
+import org.bukkit.util.Vector;
 
+import javax.inject.Inject;
+import javax.inject.Singleton;
 import java.util.ArrayList;
 import java.util.List;
 
+@Singleton
 public class StackCommand extends CommandAreaShop {
 
-	public StackCommand(AreaShop plugin) {
-		super(plugin);
-	}
+	@Inject
+	private MessageBridge messageBridge;
+	@Inject
+	private IFileManager fileManager;
+	@Inject
+	private WorldEditInterface worldEditInterface;
+	@Inject
+	private WorldGuardInterface worldGuardInterface;
+	@Inject
+	private RegionFactory regionFactory;
+	@Inject
+	private Plugin plugin;
 	
 	@Override
 	public String getCommandStart() {
 		return "areashop stack";
 	}
-	
+
 	@Override
 	public String getHelp(CommandSender target) {
 		if(target.hasPermission("areashop.stack")) {
@@ -43,18 +60,17 @@ public class StackCommand extends CommandAreaShop {
 	public void execute(CommandSender sender, String[] args) {
 		// Check permission
 		if(!sender.hasPermission("areashop.stack")) {
-			plugin.message(sender, "stack-noPermission");
+			messageBridge.message(sender, "stack-noPermission");
 			return;
 		}
 		// Only from ingame
-		if (!(sender instanceof Player)) {
-			plugin.message(sender, "cmd-onlyByPlayer");
+		if(!(sender instanceof final Player player)) {
+			messageBridge.message(sender, "cmd-onlyByPlayer");
 			return;
 		}
-		final Player player = (Player)sender;
 		// Specify enough arguments
 		if(args.length < 5) {
-			plugin.message(sender, "stack-help");
+			messageBridge.message(sender, "stack-help");
 			return;
 		}
 		// Check amount
@@ -65,7 +81,7 @@ public class StackCommand extends CommandAreaShop {
 			// Incorrect number
 		}
 		if(tempAmount <= 0) {
-			plugin.message(player, "stack-wrongAmount", args[1]);
+			messageBridge.message(player, "stack-wrongAmount", args[1]);
 			return;
 		}
 		// Check gap
@@ -73,137 +89,174 @@ public class StackCommand extends CommandAreaShop {
 		try {
 			gap = Integer.parseInt(args[2]);
 		} catch(NumberFormatException e) {
-			plugin.message(player, "stack-wrongGap", args[2]);
+			messageBridge.message(player, "stack-wrongGap", args[2]);
 			return;
 		}
 		// Check region type
 		if(!"rent".equalsIgnoreCase(args[4]) && !"buy".equalsIgnoreCase(args[4])) {
-			plugin.message(sender, "stack-help");
+			messageBridge.message(sender, "stack-help");
 			return;
 		}
 		// Get WorldEdit selection
-		final Selection selection = plugin.getWorldEdit().getSelection(player);
+		final WorldEditSelection selection = worldEditInterface.getPlayerSelection(player);
 		if(selection == null) {
-			plugin.message(player, "stack-noSelection");
+			messageBridge.message(player, "stack-noSelection");
 			return;
-		}		
+		}
 		// Get or create group
 		RegionGroup group = null;
 		if(args.length > 5) {
-			group = plugin.getFileManager().getGroup(args[5]);
+			group = fileManager.getGroup(args[5]);
 			if(group == null) {
-				group = new RegionGroup(plugin, args[5]);
-				plugin.getFileManager().addGroup(group);
+				group = regionFactory.createRegionGroup(args[5]);
+				fileManager.addGroup(group);
 			}
 		}
 		// Get facing of the player (must be clearly one of the four directions to make sure it is no mistake)
 		BlockFace facing = Utils.yawToFacing(player.getLocation().getYaw());
-		if(!(facing == BlockFace.NORTH || facing == BlockFace.EAST || facing == BlockFace.SOUTH || facing == BlockFace.WEST)) {
-			plugin.message(player, "stack-unclearDirection", facing.toString().toLowerCase().replace('_', '-'));
+		if(player.getLocation().getPitch() > 45) {
+			facing = BlockFace.DOWN;
+		} else if(player.getLocation().getPitch() < -45) {
+			facing = BlockFace.UP;
+		}
+		if(!(facing == BlockFace.NORTH || facing == BlockFace.EAST || facing == BlockFace.SOUTH || facing == BlockFace.WEST || facing == BlockFace.UP || facing == BlockFace.DOWN)) {
+			messageBridge.message(player, "stack-unclearDirection", facing.toString().toLowerCase().replace('_', '-'));
 			return;
 		}
-		final Location shift = new Location(selection.getWorld(), 0, 0, 0);
+		Vector shift = new Vector(0, 0, 0);
 		if(facing == BlockFace.SOUTH) {
-			shift.setZ(-selection.getLength() - gap);
+			shift = shift.setZ(-selection.getLength() - gap);
 		} else if(facing == BlockFace.WEST) {
-			shift.setX(selection.getWidth() + gap);
+			shift = shift.setX(selection.getWidth() + gap);
 		} else if(facing == BlockFace.NORTH) {
-			shift.setZ(selection.getLength() + gap);
+			shift = shift.setZ(selection.getLength() + gap);
 		} else if(facing == BlockFace.EAST) {
-			shift.setX(-selection.getWidth() - gap);
+			shift = shift.setX(-selection.getWidth() - gap);
+		} else if(facing == BlockFace.DOWN) {
+			shift = shift.setY(-selection.getHeight() - gap);
+		} else if(facing == BlockFace.UP) {
+			shift = shift.setY(selection.getHeight() + gap);
 		}
 		AreaShop.debug("  calculated shift vector: " + shift + ", with facing=" + facing);
 		// Create regions and add them to AreaShop
-		final String namePrefix = args[3];
+		final String nameTemplate = args[3];
+
+
 		final int regionsPerTick = plugin.getConfig().getInt("adding.regionsPerTick");
 		final boolean rentRegions = "rent".equalsIgnoreCase(args[4]);
 		final int amount = tempAmount;
 		final RegionGroup finalGroup = group;
+		final Vector finalShift = shift;
 		String type;
 		if(rentRegions) {
 			type = "rent";
 		} else {
 			type = "buy";
 		}
-		Message groupsMessage = Message.none();
+		Message groupsMessage = Message.empty();
 		if(group != null) {
 			groupsMessage = Message.fromKey("stack-addToGroup").replacements(group.getName());
-		}		
-		plugin.message(player, "stack-accepted", amount, type, gap, namePrefix, groupsMessage);
-		plugin.message(player, "stack-addStart", amount, regionsPerTick*20);
+		}
+		messageBridge.message(player, "stack-accepted", amount, type, gap, nameTemplate, groupsMessage);
+		messageBridge.message(player, "stack-addStart", amount, regionsPerTick * 20);
+
+		Location minimumLocation = selection.getMinimumLocation();
+		Vector minimumVector = new Vector(minimumLocation.getX(), minimumLocation.getY(), minimumLocation.getZ());
+		Location maximumLocation = selection.getMaximumLocation();
+		Vector maximumVector = new Vector(maximumLocation.getX(), maximumLocation.getY(), maximumLocation.getZ());
 		new BukkitRunnable() {
-			private int current = 0;
-			private RegionManager manager = AreaShop.getInstance().getWorldGuard().getRegionManager(selection.getWorld());
+			private int current = -1;
+			private final RegionManager manager = AreaShop.getInstance().getRegionManager(selection.getWorld());
 			private int counter = 1;
+			private int tooLow = 0;
+			private int tooHigh = 0;
+
 			@Override
 			public void run() {
-				for(int i=0; i<regionsPerTick; i++) {
+				for(int i = 0; i < regionsPerTick; i++) {
+					current++;
 					if(current < amount) {
 						// Create the region name
-						String counterName = counter+"";
-						int minimumLength = plugin.getConfig().getInt("stackRegionNumberLength");
-						while(counterName.length() < minimumLength) {
-							counterName = "0"+counterName;
-						}
-						String regionName = namePrefix + counterName;
+						String regionName = countToName(nameTemplate, counter);
 						while(manager.getRegion(regionName) != null || AreaShop.getInstance().getFileManager().getRegion(regionName) != null) {
 							counter++;
-							counterName = counter+"";
-							minimumLength = plugin.getConfig().getInt("stackRegionNumberLength");
-							while(counterName.length() < minimumLength) {
-								counterName = "0"+counterName;
-							}
-							regionName = namePrefix + counterName;
+							regionName = countToName(nameTemplate, counter);
 						}
+
 						// Add the region to WorldGuard (at startposition shifted by the number of this region times the blocks it should shift)
-						ProtectedCuboidRegion region = new ProtectedCuboidRegion(regionName, 
-								new BlockVector(
-										selection.getMinimumPoint().getBlockX() + shift.getBlockX()*current, 
-										selection.getMinimumPoint().getBlockY() + shift.getBlockY()*current, 
-										selection.getMinimumPoint().getBlockZ() + shift.getBlockZ()*current
-								), 
-								new BlockVector(
-										selection.getMaximumPoint().getBlockX() + shift.getBlockX()*current, 
-										selection.getMaximumPoint().getBlockY() + shift.getBlockY()*current, 
-										selection.getMaximumPoint().getBlockZ() + shift.getBlockZ()*current
-								)
-						);
-						manager.addRegion(region);
-						// Add the region to AreaShop
-						if(rentRegions) {
-							RentRegion rent = new RentRegion(plugin, region.getId(), selection.getWorld());
-							if(finalGroup != null) {
-								finalGroup.addMember(rent);
-							}
-							rent.runEventCommands(GeneralRegion.RegionEvent.CREATED, true);
-							plugin.getFileManager().addRent(rent);
-							rent.handleSchematicEvent(GeneralRegion.RegionEvent.CREATED);
-							rent.runEventCommands(GeneralRegion.RegionEvent.CREATED, false);
-							rent.update();
-						} else {
-							BuyRegion buy = new BuyRegion(plugin, region.getId(), selection.getWorld());
-							if(finalGroup != null) {
-								finalGroup.addMember(buy);
-							}
-							buy.runEventCommands(GeneralRegion.RegionEvent.CREATED, true);
-							plugin.getFileManager().addBuy(buy);
-							buy.handleSchematicEvent(GeneralRegion.RegionEvent.CREATED);
-							buy.runEventCommands(GeneralRegion.RegionEvent.CREATED, false);
-							buy.update();
+						Vector minimum = minimumVector.clone().add(finalShift.clone().multiply(current));
+						Vector maximum = maximumVector.clone().add(finalShift.clone().multiply(current));
+
+						// Check for out of bounds
+						if(minimum.getBlockY() < 0) {
+							tooLow++;
+							continue;
+						} else if(maximum.getBlockY() > 256) {
+							tooHigh++;
+							continue;
 						}
-						current++;
-					} 
+						ProtectedCuboidRegion region = worldGuardInterface.createCuboidRegion(regionName, minimum,maximum);
+						manager.addRegion(region);
+
+						// Add the region to AreaShop
+						GeneralRegion newRegion;
+						if(rentRegions) {
+							newRegion = regionFactory.createRentRegion(regionName, selection.getWorld());
+
+						} else {
+							newRegion = regionFactory.createBuyRegion(regionName, selection.getWorld());
+						}
+
+						if(finalGroup != null) {
+							finalGroup.addMember(newRegion);
+						}
+						AddingRegionEvent event = fileManager.addRegion(newRegion);
+						if (event.isCancelled()) {
+							messageBridge.message(player, "general-cancelled", event.getReason());
+							continue;
+						}
+						newRegion.handleSchematicEvent(GeneralRegion.RegionEvent.CREATED);
+						newRegion.update();
+					}
 				}
 				if(current >= amount) {
 					if(player.isOnline()) {
-						plugin.message(player, "stack-addComplete");
+						int added = amount - tooLow - tooHigh;
+						Message wrong = Message.empty();
+						if(tooHigh > 0) {
+							wrong.append(Message.fromKey("stack-tooHigh").replacements(tooHigh));
+						}
+						if(tooLow > 0) {
+							wrong.append(Message.fromKey("stack-tooLow").replacements(tooLow));
+						}
+						messageBridge.message(player, "stack-addComplete", added, wrong);
 					}
 					this.cancel();
 				}
 			}
 		}.runTaskTimer(plugin, 1, 1);
 	}
-	
+
+	/**
+	 * Build a name from a count, with the right length.
+	 * @param template Template to put the name in (# to put the count there, otherwise count is appended)
+	 * @param count Number to use
+	 * @return name with prepended 0's
+	 */
+	private String countToName(String template, int count) {
+		StringBuilder counterName =  new StringBuilder().append(count);
+		int minimumLength = plugin.getConfig().getInt("stackRegionNumberLength");
+		while(counterName.length() < minimumLength) {
+			counterName.insert(0, "0");
+		}
+
+		if(template.contains("#")) {
+			return template.replace("#", counterName);
+		} else {
+			return template + counterName;
+		}
+	}
+
 	@Override
 	public List<String> getTabCompleteList(int toComplete, String[] start, CommandSender sender) {
 		List<String> result = new ArrayList<>();
@@ -211,7 +264,7 @@ public class StackCommand extends CommandAreaShop {
 			result.add("rent");
 			result.add("buy");
 		} else if(toComplete == 6) {
-			result.addAll(plugin.getFileManager().getGroupNames());
+			result.addAll(fileManager.getGroupNames());
 		}
 		return result;
 	}

AreaShop/src/main/java/me/wiefferink/areashop/commands/StopresellCommand.java

@@ -1,19 +1,24 @@
 package me.wiefferink.areashop.commands;
 
-import me.wiefferink.areashop.AreaShop;
-import me.wiefferink.areashop.Utils;
+import me.wiefferink.areashop.MessageBridge;
+import me.wiefferink.areashop.managers.IFileManager;
 import me.wiefferink.areashop.regions.BuyRegion;
+import me.wiefferink.areashop.tools.Utils;
 import org.bukkit.command.CommandSender;
 import org.bukkit.entity.Player;
 
+import javax.inject.Inject;
+import javax.inject.Singleton;
 import java.util.ArrayList;
 import java.util.List;
 
+@Singleton
 public class StopresellCommand extends CommandAreaShop {
 
-	public StopresellCommand(AreaShop plugin) {
-		super(plugin);
-	}	
+	@Inject
+	private MessageBridge messageBridge;
+	@Inject
+	private IFileManager fileManager;
 	
 	@Override
 	public String getCommandStart() {
@@ -27,69 +32,69 @@ public class StopresellCommand extends CommandAreaShop {
 		}
 		return null;
 	}
-	
+
 	@Override
 	public void execute(CommandSender sender, String[] args) {
 		if(!sender.hasPermission("areashop.stopresell") && !sender.hasPermission("areashop.stopresellall")) {
-			plugin.message(sender, "stopresell-noPermissionOther");
+			messageBridge.message(sender, "stopresell-noPermissionOther");
 			return;
 		}
 
 		BuyRegion buy;
 		if(args.length <= 1) {
-			if (sender instanceof Player) {
+			if(sender instanceof Player) {
 				// get the region by location
-				List<BuyRegion> regions = Utils.getApplicableBuyRegions(((Player) sender).getLocation());
-				if (regions.isEmpty()) {
-					plugin.message(sender, "cmd-noRegionsAtLocation");
+				List<BuyRegion> regions = Utils.getImportantBuyRegions(((Player)sender).getLocation());
+				if(regions.isEmpty()) {
+					messageBridge.message(sender, "cmd-noRegionsAtLocation");
 					return;
-				} else if (regions.size() > 1) {
-					plugin.message(sender, "cmd-moreRegionsAtLocation");
+				} else if(regions.size() > 1) {
+					messageBridge.message(sender, "cmd-moreRegionsAtLocation");
 					return;
 				} else {
 					buy = regions.get(0);
 				}
 			} else {
-				plugin.message(sender, "cmd-automaticRegionOnlyByPlayer");
+				messageBridge.message(sender, "cmd-automaticRegionOnlyByPlayer");
 				return;
-			}		
+			}
 		} else {
-			buy = plugin.getFileManager().getBuy(args[1]);
+			buy = fileManager.getBuy(args[1]);
 			if(buy == null) {
-				plugin.message(sender, "stopresell-notRegistered", args[1]);
+				messageBridge.message(sender, "stopresell-notRegistered", args[1]);
 				return;
 			}
 		}
 		if(buy == null) {
-			plugin.message(sender, "cmd-noRegionsAtLocation");
+			messageBridge.message(sender, "cmd-noRegionsAtLocation");
 			return;
 		}
 		if(!buy.isInResellingMode()) {
-			plugin.message(sender, "stopresell-notResell", buy);
+			messageBridge.message(sender, "stopresell-notResell", buy);
 			return;
 		}
 		if(sender.hasPermission("areashop.stopresellall")) {
 			buy.disableReselling();
 			buy.update();
-			plugin.message(sender, "stopresell-success", buy);
+			messageBridge.message(sender, "stopresell-success", buy);
 		} else if(sender.hasPermission("areashop.stopresell") && sender instanceof Player) {
 			if(buy.isOwner((Player)sender)) {
 				buy.disableReselling();
 				buy.update();
-				plugin.message(sender, "stopresell-success", buy);
+				messageBridge.message(sender, "stopresell-success", buy);
 			} else {
-				plugin.message(sender, "stopresell-noPermissionOther", buy);
+				messageBridge.message(sender, "stopresell-noPermissionOther", buy);
 			}
 		} else {
-			plugin.message(sender, "stopresell-noPermission", buy);
-		}	
+			messageBridge.message(sender, "stopresell-noPermission", buy);
+		}
 	}
-	
+
 	@Override
 	public List<String> getTabCompleteList(int toComplete, String[] start, CommandSender sender) {
 		ArrayList<String> result = new ArrayList<>();
 		if(toComplete == 2) {
-			for(BuyRegion region : plugin.getFileManager().getBuys()) {
+			for(BuyRegion region : fileManager.getBuysRef()) {
 				if(region.isSold() && region.isInResellingMode()) {
 					result.add(region.getName());
 				}

AreaShop/src/main/java/me/wiefferink/areashop/commands/TeleportCommand.java

@@ -1,24 +1,29 @@
 package me.wiefferink.areashop.commands;
 
-import me.wiefferink.areashop.AreaShop;
+import me.wiefferink.areashop.MessageBridge;
+import me.wiefferink.areashop.managers.IFileManager;
 import me.wiefferink.areashop.regions.GeneralRegion;
 import org.bukkit.command.CommandSender;
 import org.bukkit.entity.Player;
 
+import javax.inject.Inject;
+import javax.inject.Singleton;
 import java.util.ArrayList;
 import java.util.List;
 
+@Singleton
 public class TeleportCommand extends CommandAreaShop {
 
-	public TeleportCommand(AreaShop plugin) {
-		super(plugin);
-	}
+	@Inject
+	private MessageBridge messageBridge;
+	@Inject
+	private IFileManager fileManager;
 	
 	@Override
 	public String getCommandStart() {
 		return "areashop tp";
 	}
-	
+
 	@Override
 	public String getHelp(CommandSender target) {
 		if(target.hasPermission("areashop.teleportall") || target.hasPermission("areashop.teleport")) {
@@ -28,54 +33,54 @@ public class TeleportCommand extends CommandAreaShop {
 	}
 
 	/**
-	 * Check if a person can teleport to the region (assuming he is not teleporting to a sign)
+	 * Check if a person can teleport to the region (assuming he is not teleporting to a sign).
 	 * @param person The person to check
 	 * @param region The region to check for
 	 * @return true if the person can teleport to it, otherwise false
 	 */
 	public static boolean canUse(CommandSender person, GeneralRegion region) {
-		if(!(person instanceof Player)) {
+		if(!(person instanceof Player player)) {
 			return false;
 		}
-		Player player = (Player)person;
 		return player.hasPermission("areashop.teleportall")
 				|| region.isOwner(player) && player.hasPermission("areashop.teleport")
+				|| region.isAvailable() && player.hasPermission("areashop.teleportavailable")
 				|| region.getFriendsFeature().getFriends().contains(player.getUniqueId()) && player.hasPermission("areashop.teleportfriend");
 	}
 
 	@Override
 	public void execute(CommandSender sender, String[] args) {
-		if(!sender.hasPermission("areashop.teleport") && !sender.hasPermission("areashop.teleportall") && !sender.hasPermission("areashop.teleportsign") && !sender.hasPermission("areashop.teleportsignall") && !sender.hasPermission("areashop.teleportfriend") && !sender.hasPermission("teleportfriendsign")) {
-			plugin.message(sender, "teleport-noPermission");
+		if(!sender.hasPermission("areashop.teleport") && !sender.hasPermission("areashop.teleportall") && !sender.hasPermission("areashop.teleportavailable") && !sender.hasPermission("areashop.teleportavailablesign") && !sender.hasPermission("areashop.teleportsign") && !sender.hasPermission("areashop.teleportsignall") && !sender.hasPermission("areashop.teleportfriend") && !sender.hasPermission("teleportfriendsign")) {
+			messageBridge.message(sender, "teleport-noPermission");
 			return;
 		}
-		if (!(sender instanceof Player)) {
-			plugin.message(sender, "cmd-onlyByPlayer");
+		if(!(sender instanceof Player player)) {
+			messageBridge.message(sender, "cmd-onlyByPlayer");
 			return;
-		}		
+		}
 		if(args.length <= 1 || args[1] == null) {
-			plugin.message(sender, "teleport-help");
+			messageBridge.message(sender, "teleport-help");
 			return;
 		}
-		Player player = (Player)sender;
-		GeneralRegion region = plugin.getFileManager().getRegion(args[1]);
+		GeneralRegion region = fileManager.getRegion(args[1]);
 		if(region == null) {
-			plugin.message(player, "teleport-noRentOrBuy", args[1]);
+			messageBridge.message(player, "teleport-noRentOrBuy", args[1]);
 			return;
 		}
-		if(args.length >= 3 && (args[2].equalsIgnoreCase("sign") || args[2].equalsIgnoreCase("yes") || args[2].equalsIgnoreCase("true"))) {
-			region.teleportPlayer(player, true);
-		} else {
-			region.teleportPlayer(player, false);
-		}
 
+		boolean toSign = args.length >= 3 && (
+				args[2].equalsIgnoreCase("sign")
+						|| args[2].equalsIgnoreCase("yes")
+						|| args[2].equalsIgnoreCase("true")
+		);
+		region.getTeleportFeature().teleportPlayer(player, toSign);
 	}
-	
+
 	@Override
 	public List<String> getTabCompleteList(int toComplete, String[] start, CommandSender sender) {
 		ArrayList<String> result = new ArrayList<>();
 		if(toComplete == 2) {
-			result.addAll(plugin.getFileManager().getRegionNames());
+			result.addAll(fileManager.getRegionNames());
 		} else if(toComplete == 3) {
 			result.add("sign");
 		}

AreaShop/src/main/java/me/wiefferink/areashop/commands/UnrentCommand.java

@@ -1,20 +1,25 @@
 package me.wiefferink.areashop.commands;
 
-import me.wiefferink.areashop.AreaShop;
-import me.wiefferink.areashop.Utils;
+import me.wiefferink.areashop.MessageBridge;
+import me.wiefferink.areashop.managers.IFileManager;
 import me.wiefferink.areashop.regions.GeneralRegion;
 import me.wiefferink.areashop.regions.RentRegion;
+import me.wiefferink.areashop.tools.Utils;
 import org.bukkit.command.CommandSender;
 import org.bukkit.entity.Player;
 
+import javax.inject.Inject;
+import javax.inject.Singleton;
 import java.util.ArrayList;
 import java.util.List;
 
+@Singleton
 public class UnrentCommand extends CommandAreaShop {
 
-	public UnrentCommand(AreaShop plugin) {
-		super(plugin);
-	}
+	@Inject
+	private MessageBridge messageBridge;
+	@Inject
+	private IFileManager fileManager;
 	
 	@Override
 	public String getCommandStart() {
@@ -30,7 +35,7 @@ public class UnrentCommand extends CommandAreaShop {
 	}
 
 	/**
-	 * Check if a person can unrent the region
+	 * Check if a person can unrent the region.
 	 * @param person The person to check
 	 * @param region The region to check for
 	 * @return true if the person can unrent it, otherwise false
@@ -39,8 +44,7 @@ public class UnrentCommand extends CommandAreaShop {
 		if(person.hasPermission("areashop.unrent")) {
 			return true;
 		}
-		if(person instanceof Player) {
-			Player player = (Player)person;
+		if(person instanceof Player player) {
 			return region.isOwner(player) && person.hasPermission("areashop.unrentown");
 		}
 		return false;
@@ -49,46 +53,46 @@ public class UnrentCommand extends CommandAreaShop {
 	@Override
 	public void execute(CommandSender sender, String[] args) {
 		if(!sender.hasPermission("areashop.unrent") && !sender.hasPermission("areashop.unrentown")) {
-			plugin.message(sender, "unrent-noPermission");
+			messageBridge.message(sender, "unrent-noPermission");
 			return;
 		}
 		RentRegion rent;
 		if(args.length <= 1) {
-			if (sender instanceof Player) {
+			if(sender instanceof Player) {
 				// get the region by location
-				List<RentRegion> regions = Utils.getApplicableRentRegions(((Player) sender).getLocation());
-				if (regions.isEmpty()) {
-					plugin.message(sender, "cmd-noRegionsAtLocation");
+				List<RentRegion> regions = Utils.getImportantRentRegions(((Player)sender).getLocation());
+				if(regions.isEmpty()) {
+					messageBridge.message(sender, "cmd-noRegionsAtLocation");
 					return;
-				} else if (regions.size() > 1) {
-					plugin.message(sender, "cmd-moreRegionsAtLocation");
+				} else if(regions.size() > 1) {
+					messageBridge.message(sender, "cmd-moreRegionsAtLocation");
 					return;
 				} else {
 					rent = regions.get(0);
 				}
 			} else {
-				plugin.message(sender, "cmd-automaticRegionOnlyByPlayer");
+				messageBridge.message(sender, "cmd-automaticRegionOnlyByPlayer");
 				return;
-			}			
+			}
 		} else {
-			rent = plugin.getFileManager().getRent(args[1]);
+			rent = fileManager.getRent(args[1]);
 		}
 		if(rent == null) {
-			plugin.message(sender, "unrent-notRegistered");
+			messageBridge.message(sender, "unrent-notRegistered");
 			return;
-		}		
+		}
 		if(!rent.isRented()) {
-			plugin.message(sender, "unrent-notRented", rent);
+			messageBridge.message(sender, "unrent-notRented", rent);
 			return;
 		}
 		rent.unRent(true, sender);
 	}
-	
+
 	@Override
 	public List<String> getTabCompleteList(int toComplete, String[] start, CommandSender sender) {
 		ArrayList<String> result = new ArrayList<>();
 		if(toComplete == 2) {
-			for(RentRegion region : plugin.getFileManager().getRents()) {
+			for(RentRegion region : fileManager.getRentsRef()) {
 				if(region.isRented()) {
 					result.add(region.getName());
 				}

AreaShop/src/main/java/me/wiefferink/areashop/events/CancellableRegionEvent.java

@@ -1,25 +1,16 @@
 package me.wiefferink.areashop.events;
 
-import org.bukkit.event.Event;
-import org.bukkit.event.HandlerList;
+public class CancellableRegionEvent<T> extends RegionEvent<T> {
 
-public class CancellableAreaShopEvent extends Event {
-
-	private static final HandlerList handlers = new HandlerList();
 	private boolean cancelled;
 	private String reason;
 
-	@Override
-	public HandlerList getHandlers() {
-		return handlers;
-	}
-
-	public static HandlerList getHandlerList() {
-		return handlers;
+	public CancellableRegionEvent(T region) {
+		super(region);
 	}
 
 	/**
-	 * Cancel the event from happening
+	 * Cancel the event from happening.
 	 * @param reason The reason of cancelling, used for display to the user, should end with a dot
 	 */
 	public void cancel(String reason) {
@@ -28,7 +19,7 @@ public class CancellableAreaShopEvent extends Event {
 	}
 
 	/**
-	 * Let the event continue, possible overwriting a cancel() call from another plugin
+	 * Let the event continue, possible overwriting a cancel() call from another plugin.
 	 */
 	public void allow() {
 		this.cancelled = false;
@@ -36,7 +27,7 @@ public class CancellableAreaShopEvent extends Event {
 	}
 
 	/**
-	 * Check if the event has been cancelled
+	 * Check if the event has been cancelled.
 	 * @return true if the event has been cancelled, otherwise false
 	 */
 	public boolean isCancelled() {
@@ -44,10 +35,11 @@ public class CancellableAreaShopEvent extends Event {
 	}
 
 	/**
-	 * Get the reason why this event is cancelled
+	 * Get the reason why this event is cancelled.
 	 * @return null if there is no reason or the event is not cancelled, otherwise a string
 	 */
 	public String getReason() {
 		return reason;
 	}
+
 }

AreaShop/src/main/java/me/wiefferink/areashop/events/NotifyRegionEvent.java

@@ -0,0 +1,7 @@
+package me.wiefferink.areashop.events;
+
+public class NotifyRegionEvent<T> extends RegionEvent<T> {
+	public NotifyRegionEvent(T region) {
+		super(region);
+	}
+}

AreaShop/src/main/java/me/wiefferink/areashop/events/README.md

@@ -0,0 +1,7 @@
+# Events
+
+This package contains event classes that allow other plugins to listen to events about AreaShop regions.
+
+* `RegionEvent` class represents a generic event.
+* `CancellableRegionEvent` represents an event that has a region and can be cancelled.
+* `NotifyRegionEvent` represents events that are to inform only, and cannot be cancelled anymore (an `CancellableRegionEvent` would be sent first).

AreaShop/src/main/java/me/wiefferink/areashop/events/RegionEvent.java

@@ -3,16 +3,29 @@ package me.wiefferink.areashop.events;
 import org.bukkit.event.Event;
 import org.bukkit.event.HandlerList;
 
-public class NotifyAreaShopEvent extends Event {
-
+public class RegionEvent<T> extends Event {
+	protected T region;
 	private static final HandlerList handlers = new HandlerList();
 
+	public RegionEvent(T region) {
+		this.region = region;
+	}
+
 	@Override
 	public HandlerList getHandlers() {
 		return handlers;
 	}
 
+	// Required by Bukkit/Spigot
 	public static HandlerList getHandlerList() {
 		return handlers;
 	}
+
+	/**
+	 * Get the region of this event.
+	 * @return The region the event is about
+	 */
+	public T getRegion() {
+		return region;
+	}
 }

AreaShop/src/main/java/me/wiefferink/areashop/events/ask/AddingRegionEvent.java

@@ -0,0 +1,19 @@
+package me.wiefferink.areashop.events.ask;
+
+import me.wiefferink.areashop.events.CancellableRegionEvent;
+import me.wiefferink.areashop.regions.GeneralRegion;
+
+/**
+ * Broadcasted when a region has been added to AreaShop.
+ */
+public class AddingRegionEvent extends CancellableRegionEvent<GeneralRegion> {
+
+	/**
+	 * Constructor.
+	 * @param region The region that has been added
+	 */
+	public AddingRegionEvent(GeneralRegion region) {
+		super(region);
+	}
+
+}

AreaShop/src/main/java/me/wiefferink/areashop/events/ask/BuyingRegionEvent.java

@@ -1,40 +1,31 @@
 package me.wiefferink.areashop.events.ask;
 
-import me.wiefferink.areashop.events.CancellableAreaShopEvent;
+import me.wiefferink.areashop.events.CancellableRegionEvent;
 import me.wiefferink.areashop.regions.BuyRegion;
-import org.bukkit.entity.Player;
+import org.bukkit.OfflinePlayer;
 
 /**
  * Broadcasted when a player tries to buy a region.
  */
-public class BuyingRegionEvent extends CancellableAreaShopEvent {
+public class BuyingRegionEvent extends CancellableRegionEvent<BuyRegion> {
 
-	private BuyRegion region;
-	private Player player;
+	private final OfflinePlayer player;
 
 	/**
-	 * Constructor
+	 * Constructor.
 	 * @param region The region that is about to get bought
 	 * @param player The player that tries to buy the region
 	 */
-	public BuyingRegionEvent(BuyRegion region, Player player) {
-		this.region = region;
+	public BuyingRegionEvent(BuyRegion region, OfflinePlayer player) {
+		super(region);
 		this.player = player;
 	}
 
 	/**
-	 * Get the region that is about to be bought
-	 * @return the region that is about to be bought
-	 */
-	public BuyRegion getRegion() {
-		return region;
-	}
-
-	/**
-	 * Get the player that is trying to buy the region
+	 * Get the player that is trying to buy the region.
 	 * @return The player that is trying to buy the region
 	 */
-	public Player getPlayer() {
+	public OfflinePlayer getPlayer() {
 		return player;
 	}
 }

AreaShop/src/main/java/me/wiefferink/areashop/events/ask/DeletingRegionEvent.java

@@ -0,0 +1,19 @@
+package me.wiefferink.areashop.events.ask;
+
+import me.wiefferink.areashop.events.CancellableRegionEvent;
+import me.wiefferink.areashop.regions.GeneralRegion;
+
+/**
+ * Broadcasted when a region has been added to AreaShop.
+ */
+public class DeletingRegionEvent extends CancellableRegionEvent<GeneralRegion> {
+
+	/**
+	 * Constructor.
+	 * @param region The region that has been added
+	 */
+	public DeletingRegionEvent(GeneralRegion region) {
+		super(region);
+	}
+
+}

AreaShop/src/main/java/me/wiefferink/areashop/events/ask/RentingRegionEvent.java

@@ -1,48 +1,39 @@
 package me.wiefferink.areashop.events.ask;
 
-import me.wiefferink.areashop.events.CancellableAreaShopEvent;
+import me.wiefferink.areashop.events.CancellableRegionEvent;
 import me.wiefferink.areashop.regions.RentRegion;
-import org.bukkit.entity.Player;
+import org.bukkit.OfflinePlayer;
 
 /**
- * Broadcasted when a player tries to rent a region
+ * Broadcasted when a player tries to rent a region.
  */
-public class RentingRegionEvent extends CancellableAreaShopEvent {
+public class RentingRegionEvent extends CancellableRegionEvent<RentRegion> {
 
-	private RentRegion region;
-	private Player player;
-	private boolean extending;
+	private final OfflinePlayer player;
+	private final boolean extending;
 
 	/**
-	 * Constructor
+	 * Constructor.
 	 * @param region    The region that is about to be rented
 	 * @param player    The player that tries to rent the region
 	 * @param extending true if the player is extending the rental of the region, otherwise false
 	 */
-	public RentingRegionEvent(RentRegion region, Player player, boolean extending) {
-		this.region = region;
+	public RentingRegionEvent(RentRegion region, OfflinePlayer player, boolean extending) {
+		super(region);
 		this.player = player;
 		this.extending = extending;
 	}
 
 	/**
-	 * Get the region that is about to be rented
-	 * @return the region that is about to be rented
-	 */
-	public RentRegion getRegion() {
-		return region;
-	}
-
-	/**
-	 * Get the player that is trying to rent the region
+	 * Get the player that is trying to rent the region.
 	 * @return The player that is trying to rent the region
 	 */
-	public Player getPlayer() {
+	public OfflinePlayer getPlayer() {
 		return player;
 	}
 
 	/**
-	 * Check if the player is extending the region or renting it for the first time
+	 * Check if the player is extending the region or renting it for the first time.
 	 * @return true if the player tries to extend the region, false if he tries to rent it the first time
 	 */
 	public boolean isExtending() {

AreaShop/src/main/java/me/wiefferink/areashop/events/ask/ResellingRegionEvent.java

@@ -1,40 +1,31 @@
 package me.wiefferink.areashop.events.ask;
 
-import me.wiefferink.areashop.events.CancellableAreaShopEvent;
+import me.wiefferink.areashop.events.CancellableRegionEvent;
 import me.wiefferink.areashop.regions.BuyRegion;
-import org.bukkit.entity.Player;
+import org.bukkit.OfflinePlayer;
 
 /**
- * Broadcasted when a player tries to resell a region
+ * Broadcasted when a player tries to resell a region.
  */
-public class ResellingRegionEvent extends CancellableAreaShopEvent {
+public class ResellingRegionEvent extends CancellableRegionEvent<BuyRegion> {
 
-	private BuyRegion region;
-	private Player player;
+	private final OfflinePlayer player;
 
 	/**
-	 * Contructor
+	 * Contructor.
 	 * @param region The region that the player is trying to resell
 	 * @param player The player that is trying to buy this region from the current owner
 	 */
-	public ResellingRegionEvent(BuyRegion region, Player player) {
-		this.region = region;
+	public ResellingRegionEvent(BuyRegion region, OfflinePlayer player) {
+		super(region);
 		this.player = player;
 	}
 
 	/**
-	 * Get the region that is about to be bought
-	 * @return the region that is about to be bought
-	 */
-	public BuyRegion getRegion() {
-		return region;
-	}
-
-	/**
-	 * Get the player that is trying to buy the region
+	 * Get the player that is trying to buy the region.
 	 * @return The player that is trying to buy the region
 	 */
-	public Player getBuyer() {
+	public OfflinePlayer getBuyer() {
 		return player;
 	}
 }

AreaShop/src/main/java/me/wiefferink/areashop/events/ask/SellingRegionEvent.java

@@ -1,28 +1,18 @@
 package me.wiefferink.areashop.events.ask;
 
-import me.wiefferink.areashop.events.CancellableAreaShopEvent;
+import me.wiefferink.areashop.events.CancellableRegionEvent;
 import me.wiefferink.areashop.regions.BuyRegion;
 
 /**
- * Broadcasted when a region is about to get sold
+ * Broadcasted when a region is about to get sold.
  */
-public class SellingRegionEvent extends CancellableAreaShopEvent {
-
-	private BuyRegion region;
+public class SellingRegionEvent extends CancellableRegionEvent<BuyRegion> {
 
 	/**
-	 * Constructor
+	 * Constructor.
 	 * @param region The region that is about to get sold
 	 */
 	public SellingRegionEvent(BuyRegion region) {
-		this.region = region;
-	}
-
-	/**
-	 * Get the region that is about to be sold
-	 * @return the region that is about to be sold
-	 */
-	public BuyRegion getRegion() {
-		return region;
+		super(region);
 	}
 }

AreaShop/src/main/java/me/wiefferink/areashop/events/ask/UnrentingRegionEvent.java

@@ -1,28 +1,18 @@
 package me.wiefferink.areashop.events.ask;
 
-import me.wiefferink.areashop.events.CancellableAreaShopEvent;
+import me.wiefferink.areashop.events.CancellableRegionEvent;
 import me.wiefferink.areashop.regions.RentRegion;
 
 /**
- * Broadcasted when a region is about to be unrented
+ * Broadcasted when a region is about to be unrented.
  */
-public class UnrentingRegionEvent extends CancellableAreaShopEvent {
-
-	private RentRegion region;
+public class UnrentingRegionEvent extends CancellableRegionEvent<RentRegion> {
 
 	/**
-	 * Constructor
+	 * Constructor.
 	 * @param region The region that is about to be unrented
 	 */
 	public UnrentingRegionEvent(RentRegion region) {
-		this.region = region;
-	}
-
-	/**
-	 * Get the region that is about to be rented
-	 * @return the region that is about to be rented
-	 */
-	public RentRegion getRegion() {
-		return region;
+		super(region);
 	}
 }

AreaShop/src/main/java/me/wiefferink/areashop/events/askandnotify/AddedFriendEvent.java

@@ -1,41 +1,32 @@
 package me.wiefferink.areashop.events.askandnotify;
 
-import me.wiefferink.areashop.events.CancellableAreaShopEvent;
+import me.wiefferink.areashop.events.CancellableRegionEvent;
 import me.wiefferink.areashop.regions.GeneralRegion;
 import org.bukkit.OfflinePlayer;
 import org.bukkit.command.CommandSender;
 
 /**
- * Broadcasted when a friend is being added to a region
+ * Broadcasted when a friend is being added to a region.
  */
-public class AddFriendEvent extends CancellableAreaShopEvent {
+public class AddedFriendEvent extends CancellableRegionEvent<GeneralRegion> {
 
-	private GeneralRegion region;
-	private OfflinePlayer friend;
-	private CommandSender by;
+	private final OfflinePlayer friend;
+	private final CommandSender by;
 
 	/**
-	 * Constructor
+	 * Constructor.
 	 * @param region The region the friend is getting added to
 	 * @param friend The friend that is about to be added
 	 * @param by     The CommandSender that is adding the friend, or null if none
 	 */
-	public AddFriendEvent(GeneralRegion region, OfflinePlayer friend, CommandSender by) {
-		this.region = region;
+	public AddedFriendEvent(GeneralRegion region, OfflinePlayer friend, CommandSender by) {
+		super(region);
 		this.friend = friend;
 		this.by = by;
 	}
 
 	/**
-	 * Get the region where the friend is getting added to
-	 * @return the region
-	 */
-	public GeneralRegion getRegion() {
-		return region;
-	}
-
-	/**
-	 * Get the OfflinePlayer that is getting added as friend
+	 * Get the OfflinePlayer that is getting added as friend.
 	 * @return The friend that is getting added
 	 */
 	public OfflinePlayer getFriend() {
@@ -43,7 +34,7 @@ public class AddFriendEvent extends CancellableAreaShopEvent {
 	}
 
 	/**
-	 * Get the CommandSender that is adding the friend
+	 * Get the CommandSender that is adding the friend.
 	 * @return null if none, a CommandSender if done by someone (likely Player or ConsoleCommandSender)
 	 */
 	public CommandSender getBy() {

AreaShop/src/main/java/me/wiefferink/areashop/events/askandnotify/DeletedFriendEvent.java

@@ -1,41 +1,32 @@
 package me.wiefferink.areashop.events.askandnotify;
 
-import me.wiefferink.areashop.events.CancellableAreaShopEvent;
+import me.wiefferink.areashop.events.CancellableRegionEvent;
 import me.wiefferink.areashop.regions.GeneralRegion;
 import org.bukkit.OfflinePlayer;
 import org.bukkit.command.CommandSender;
 
 /**
- * Broadcasted when a friend is being added to a region
+ * Broadcasted when a friend is being added to a region.
  */
-public class DeleteFriendEvent extends CancellableAreaShopEvent {
+public class DeletedFriendEvent extends CancellableRegionEvent<GeneralRegion> {
 
-	private GeneralRegion region;
-	private OfflinePlayer friend;
-	private CommandSender by;
+	private final OfflinePlayer friend;
+	private final CommandSender by;
 
 	/**
-	 * Constructor
+	 * Constructor.
 	 * @param region The region the friend is getting added to
 	 * @param friend The friend that is about to be added
 	 * @param by     The CommandSender that is adding the friend, or null if none
 	 */
-	public DeleteFriendEvent(GeneralRegion region, OfflinePlayer friend, CommandSender by) {
-		this.region = region;
+	public DeletedFriendEvent(GeneralRegion region, OfflinePlayer friend, CommandSender by) {
+		super(region);
 		this.friend = friend;
 		this.by = by;
 	}
 
 	/**
-	 * Get the region where the friend is getting added to
-	 * @return the region
-	 */
-	public GeneralRegion getRegion() {
-		return region;
-	}
-
-	/**
-	 * Get the OfflinePlayer that is getting added as friend
+	 * Get the OfflinePlayer that is getting added as friend.
 	 * @return The friend that is getting added
 	 */
 	public OfflinePlayer getFriend() {
@@ -43,7 +34,7 @@ public class DeleteFriendEvent extends CancellableAreaShopEvent {
 	}
 
 	/**
-	 * Get the CommandSender that is adding the friend
+	 * Get the CommandSender that is adding the friend.
 	 * @return null if none, a CommandSender if done by someone (likely Player or ConsoleCommandSender)
 	 */
 	public CommandSender getBy() {

AreaShop/src/main/java/me/wiefferink/areashop/events/notify/AddedRegionEvent.java

@@ -1,28 +1,19 @@
 package me.wiefferink.areashop.events.notify;
 
-import me.wiefferink.areashop.events.NotifyAreaShopEvent;
+import me.wiefferink.areashop.events.NotifyRegionEvent;
 import me.wiefferink.areashop.regions.GeneralRegion;
 
 /**
- * Broadcasted when a region has been added to AreaShop
+ * Broadcasted when a region has been added to AreaShop.
  */
-public class AddedRegionEvent extends NotifyAreaShopEvent {
-
-	private GeneralRegion region;
+public class AddedRegionEvent extends NotifyRegionEvent<GeneralRegion> {
 
 	/**
-	 * Constructor
+	 * Constructor.
 	 * @param region The region that has been added
 	 */
 	public AddedRegionEvent(GeneralRegion region) {
-		this.region = region;
+		super(region);
 	}
 
-	/**
-	 * Get the region that has been added
-	 * @return the region that has been added
-	 */
-	public GeneralRegion getRegion() {
-		return region;
-	}
 }

AreaShop/src/main/java/me/wiefferink/areashop/events/notify/BoughtRegionEvent.java

@@ -1,28 +1,19 @@
 package me.wiefferink.areashop.events.notify;
 
-import me.wiefferink.areashop.events.NotifyAreaShopEvent;
+import me.wiefferink.areashop.events.NotifyRegionEvent;
 import me.wiefferink.areashop.regions.BuyRegion;
 
 /**
- * Broadcasted when a region has been bought
+ * Broadcasted when a region has been bought.
  */
-public class BoughtRegionEvent extends NotifyAreaShopEvent {
-
-	private BuyRegion region;
+public class BoughtRegionEvent extends NotifyRegionEvent<BuyRegion> {
 
 	/**
-	 * Constructor
+	 * Constructor.
 	 * @param region The region that has been bought
 	 */
 	public BoughtRegionEvent(BuyRegion region) {
-		this.region = region;
+		super(region);
 	}
 
-	/**
-	 * Get the region that has been bought
-	 * @return the region that has been bought
-	 */
-	public BuyRegion getRegion() {
-		return region;
-	}
 }

AreaShop/src/main/java/me/wiefferink/areashop/events/notify/DeletedRegionEvent.java

@@ -0,0 +1,18 @@
+package me.wiefferink.areashop.events.notify;
+
+import me.wiefferink.areashop.events.NotifyRegionEvent;
+import me.wiefferink.areashop.regions.GeneralRegion;
+
+/**
+ * Broadcasted when a region has been removed from AreaShop.
+ */
+public class DeletedRegionEvent extends NotifyRegionEvent<GeneralRegion> {
+
+	/**
+	 * Constructor.
+	 * @param region The region that has been removed
+	 */
+	public DeletedRegionEvent(GeneralRegion region) {
+		super(region);
+	}
+}

AreaShop/src/main/java/me/wiefferink/areashop/events/notify/RegionUpdateEvent.java

@@ -1,29 +0,0 @@
-package me.wiefferink.areashop.events.notify;
-
-import me.wiefferink.areashop.events.NotifyAreaShopEvent;
-import me.wiefferink.areashop.regions.GeneralRegion;
-
-/**
- * Broadcasted when the data of a region changes.
- * Should be used for updating displays that use region data.
- */
-public class RegionUpdateEvent extends NotifyAreaShopEvent {
-
-	private GeneralRegion region;
-
-	/**
-	 * Contructor
-	 * @param region The region that has been updated
-	 */
-	public RegionUpdateEvent(GeneralRegion region) {
-		this.region = region;
-	}
-
-	/**
-	 * The region that has been updated
-	 * @return The GeneralRegion that has been updated
-	 */
-	public GeneralRegion getRegion() {
-		return region;
-	}
-}

AreaShop/src/main/java/me/wiefferink/areashop/events/notify/RemovedRegionEvent.java

@@ -1,28 +0,0 @@
-package me.wiefferink.areashop.events.notify;
-
-import me.wiefferink.areashop.events.NotifyAreaShopEvent;
-import me.wiefferink.areashop.regions.GeneralRegion;
-
-/**
- * Broadcasted when a region has been removed from AreaShop
- */
-public class RemovedRegionEvent extends NotifyAreaShopEvent {
-
-	private GeneralRegion region;
-
-	/**
-	 * Constructor
-	 * @param region The region that has been removed
-	 */
-	public RemovedRegionEvent(GeneralRegion region) {
-		this.region = region;
-	}
-
-	/**
-	 * Get the region that has been removed
-	 * @return the region that has been removed
-	 */
-	public GeneralRegion getRegion() {
-		return region;
-	}
-}

AreaShop/src/main/java/me/wiefferink/areashop/events/notify/RentedRegionEvent.java

@@ -1,36 +1,28 @@
 package me.wiefferink.areashop.events.notify;
 
-import me.wiefferink.areashop.events.NotifyAreaShopEvent;
+import me.wiefferink.areashop.events.NotifyRegionEvent;
 import me.wiefferink.areashop.regions.RentRegion;
 
 /**
- * Broadcasted when a region has been rented
+ * Broadcasted when a region has been rented.
  */
-public class RentedRegionEvent extends NotifyAreaShopEvent {
+public class RentedRegionEvent extends NotifyRegionEvent<RentRegion> {
 
-	private RentRegion region;
-	private boolean extended;
+	private final boolean extended;
 
 	/**
-	 * Constructor
+	 * Constructor.
 	 * @param region   The region that has been rented
 	 * @param extended true if the region has been extended, false if this is the first time buying the region
 	 */
 	public RentedRegionEvent(RentRegion region, boolean extended) {
+		super(region);
 		this.region = region;
 		this.extended = extended;
 	}
 
 	/**
-	 * Get the region that has been rented
-	 * @return the region that has been rented
-	 */
-	public RentRegion getRegion() {
-		return region;
-	}
-
-	/**
-	 * Check if the region was extended or rented for the first time
+	 * Check if the region was extended or rented for the first time.
 	 * @return true if the region was extended, false when rented for the first time
 	 */
 	public boolean hasExtended() {

AreaShop/src/main/java/me/wiefferink/areashop/events/notify/ResoldRegionEvent.java

@@ -1,38 +1,29 @@
 package me.wiefferink.areashop.events.notify;
 
-import me.wiefferink.areashop.events.NotifyAreaShopEvent;
+import me.wiefferink.areashop.events.NotifyRegionEvent;
 import me.wiefferink.areashop.regions.BuyRegion;
 
 import java.util.UUID;
 
 /**
- * Broadcasted when a region has been resold
+ * Broadcasted when a region has been resold.
  */
-public class ResoldRegionEvent extends NotifyAreaShopEvent {
+public class ResoldRegionEvent extends NotifyRegionEvent<BuyRegion> {
 
-	private BuyRegion region;
-	private UUID from;
+	private final UUID from;
 
 	/**
-	 * Constructor
+	 * Constructor.
 	 * @param region The region that has been resold
 	 * @param from   The player from who the region has been resold to the current owner
 	 */
 	public ResoldRegionEvent(BuyRegion region, UUID from) {
-		this.region = region;
+		super(region);
 		this.from = from;
 	}
 
 	/**
-	 * Get the region that has been bought
-	 * @return the region that has been bought
-	 */
-	public BuyRegion getRegion() {
-		return region;
-	}
-
-	/**
-	 * Get the player that the region has been bought from
+	 * Get the player that the region has been bought from.
 	 * @return The UUID of the player that the region has been bought from
 	 */
 	public UUID getFromPlayer() {

AreaShop/src/main/java/me/wiefferink/areashop/events/notify/SoldRegionEvent.java

@@ -1,41 +1,32 @@
 package me.wiefferink.areashop.events.notify;
 
-import me.wiefferink.areashop.events.NotifyAreaShopEvent;
+import me.wiefferink.areashop.events.NotifyRegionEvent;
 import me.wiefferink.areashop.regions.BuyRegion;
 
 import java.util.UUID;
 
 /**
- * Broadcasted when a region is sold
+ * Broadcasted when a region is sold.
  */
-public class SoldRegionEvent extends NotifyAreaShopEvent {
+public class SoldRegionEvent extends NotifyRegionEvent<BuyRegion> {
 
-	private BuyRegion region;
-	private UUID oldBuyer;
-	private double refundedMoney;
+	private final UUID oldBuyer;
+	private final double refundedMoney;
 
 	/**
-	 * Constructor
-	 * @param region   The region that has been sold
-	 * @param oldBuyer The player for which the region has been sold
+	 * Constructor.
+	 * @param region        The region that has been sold
+	 * @param oldBuyer      The player for which the region has been sold
 	 * @param refundedMoney The amount of money that has been refunded
 	 */
 	public SoldRegionEvent(BuyRegion region, UUID oldBuyer, double refundedMoney) {
-		this.region = region;
+		super(region);
 		this.oldBuyer = oldBuyer;
 		this.refundedMoney = refundedMoney;
 	}
 
 	/**
-	 * Get the region that has been sold
-	 * @return the region that has been sold
-	 */
-	public BuyRegion getRegion() {
-		return region;
-	}
-
-	/**
-	 * Get the player that the region is sold for
+	 * Get the player that the region is sold for.
 	 * @return The UUID of the player that the region is sold for
 	 */
 	public UUID getOldBuyer() {
@@ -43,7 +34,7 @@ public class SoldRegionEvent extends NotifyAreaShopEvent {
 	}
 
 	/**
-	 * Get the amount that is paid back to the player
+	 * Get the amount that is paid back to the player.
 	 * @return The amount of money paid back to the player
 	 */
 	public double getRefundedMoney() {

AreaShop/src/main/java/me/wiefferink/areashop/events/notify/UnrentedRegionEvent.java

@@ -1,41 +1,32 @@
 package me.wiefferink.areashop.events.notify;
 
-import me.wiefferink.areashop.events.NotifyAreaShopEvent;
+import me.wiefferink.areashop.events.NotifyRegionEvent;
 import me.wiefferink.areashop.regions.RentRegion;
 
 import java.util.UUID;
 
 /**
- * Broadcasted when a region has been unrented
+ * Broadcasted when a region has been unrented.
  */
-public class UnrentedRegionEvent extends NotifyAreaShopEvent {
+public class UnrentedRegionEvent extends NotifyRegionEvent<RentRegion> {
 
-	private RentRegion region;
-	private UUID oldRenter;
-	private double refundedMoney;
+	private final UUID oldRenter;
+	private final double refundedMoney;
 
 	/**
-	 * Constructor
-	 * @param region    The region that has been unrented
-	 * @param oldRenter The player that rented the region before it was unrented
+	 * Constructor.
+	 * @param region        The region that has been unrented
+	 * @param oldRenter     The player that rented the region before it was unrented
 	 * @param refundedMoney The amount of money that has been refunded
 	 */
 	public UnrentedRegionEvent(RentRegion region, UUID oldRenter, double refundedMoney) {
-		this.region = region;
+		super(region);
 		this.oldRenter = oldRenter;
 		this.refundedMoney = refundedMoney;
 	}
 
 	/**
-	 * Get the region that has been unrented
-	 * @return the region that has been unrented
-	 */
-	public RentRegion getRegion() {
-		return region;
-	}
-
-	/**
-	 * Get the player that the region was unrented for
+	 * Get the player that the region was unrented for.
 	 * @return The UUID of the player that the region was unrented for
 	 */
 	public UUID getOldRenter() {
@@ -43,7 +34,7 @@ public class UnrentedRegionEvent extends NotifyAreaShopEvent {
 	}
 
 	/**
-	 * Get the amount that is paid back to the player
+	 * Get the amount that is paid back to the player.
 	 * @return The amount of money paid back to the player
 	 */
 	public double getRefundedMoney() {

AreaShop/src/main/java/me/wiefferink/areashop/events/notify/UpdateRegionEvent.java

@@ -0,0 +1,19 @@
+package me.wiefferink.areashop.events.notify;
+
+import me.wiefferink.areashop.events.NotifyRegionEvent;
+import me.wiefferink.areashop.regions.GeneralRegion;
+
+/**
+ * Broadcasted when the data of a region changes.
+ * Should be used for updating displays that use region data.
+ */
+public class UpdateRegionEvent extends NotifyRegionEvent<GeneralRegion> {
+
+	/**
+	 * Contructor.
+	 * @param region The region that has been updated
+	 */
+	public UpdateRegionEvent(GeneralRegion region) {
+		super(region);
+	}
+}

AreaShop/src/main/java/me/wiefferink/areashop/features/CommandsFeature.java

@@ -0,0 +1,127 @@
+package me.wiefferink.areashop.features;
+
+import me.wiefferink.areashop.AreaShop;
+import me.wiefferink.areashop.events.ask.AddingRegionEvent;
+import me.wiefferink.areashop.events.ask.BuyingRegionEvent;
+import me.wiefferink.areashop.events.ask.DeletingRegionEvent;
+import me.wiefferink.areashop.events.ask.RentingRegionEvent;
+import me.wiefferink.areashop.events.ask.ResellingRegionEvent;
+import me.wiefferink.areashop.events.ask.SellingRegionEvent;
+import me.wiefferink.areashop.events.ask.UnrentingRegionEvent;
+import me.wiefferink.areashop.events.notify.AddedRegionEvent;
+import me.wiefferink.areashop.events.notify.BoughtRegionEvent;
+import me.wiefferink.areashop.events.notify.DeletedRegionEvent;
+import me.wiefferink.areashop.events.notify.RentedRegionEvent;
+import me.wiefferink.areashop.events.notify.ResoldRegionEvent;
+import me.wiefferink.areashop.events.notify.SoldRegionEvent;
+import me.wiefferink.areashop.events.notify.UnrentedRegionEvent;
+import me.wiefferink.areashop.regions.GeneralRegion;
+import org.bukkit.Bukkit;
+import org.bukkit.configuration.ConfigurationSection;
+import org.bukkit.event.EventHandler;
+import org.bukkit.event.EventPriority;
+
+import javax.inject.Inject;
+import javax.inject.Singleton;
+import java.util.List;
+
+@Singleton
+public class CommandsFeature extends RegionFeature {
+
+	@Inject
+	CommandsFeature(AreaShop plugin) {
+		super(plugin);
+	}
+
+	/**
+	 * Run command for a certain event.
+	 * @param region Region to execute the events for
+	 * @param event The event
+	 * @param before The 'before' or 'after' commands
+	 */
+	public void runEventCommands(GeneralRegion region, GeneralRegion.RegionEvent event, boolean before) {
+		ConfigurationSection eventCommandProfileSection = region.getConfigurationSectionSetting("general.eventCommandProfile", "eventCommandProfiles");
+		if(eventCommandProfileSection == null) {
+			return;
+		}
+		List<String> commands = eventCommandProfileSection.getStringList(event.getValue() + "." + (before ? "before" : "after"));
+		if(commands.isEmpty()) {
+			return;
+		}
+		region.runCommands(Bukkit.getConsoleSender(), commands);
+	}
+
+	@EventHandler(priority = EventPriority.MONITOR, ignoreCancelled = true)
+	public void addingRegion(AddingRegionEvent event) {
+		runEventCommands(event.getRegion(), GeneralRegion.RegionEvent.CREATED, true);
+	}
+
+	@EventHandler
+	public void addedRegion(AddedRegionEvent event) {
+		runEventCommands(event.getRegion(), GeneralRegion.RegionEvent.CREATED, false);
+	}
+
+	@EventHandler(priority = EventPriority.MONITOR, ignoreCancelled = true)
+	public void deletingRegion(DeletingRegionEvent event) {
+		runEventCommands(event.getRegion(), GeneralRegion.RegionEvent.DELETED, true);
+	}
+
+	@EventHandler
+	public void deletedRegion(DeletedRegionEvent event) {
+		runEventCommands(event.getRegion(), GeneralRegion.RegionEvent.DELETED, false);
+	}
+
+	@EventHandler(priority = EventPriority.MONITOR, ignoreCancelled = true)
+	public void rentingRegion(RentingRegionEvent event) {
+		// Technically the rent can still be cancelled if the payment fails...
+		runEventCommands(event.getRegion(), event.isExtending() ? GeneralRegion.RegionEvent.EXTENDED : GeneralRegion.RegionEvent.RENTED, true);
+	}
+
+	@EventHandler
+	public void rentedRegion(RentedRegionEvent event) {
+		runEventCommands(event.getRegion(), event.hasExtended() ? GeneralRegion.RegionEvent.EXTENDED : GeneralRegion.RegionEvent.RENTED, false);
+	}
+
+	@EventHandler(priority = EventPriority.MONITOR, ignoreCancelled = true)
+	public void buyingRegion(BuyingRegionEvent event) {
+		// Technically the buy can still be cancelled if the payment fails...
+		runEventCommands(event.getRegion(), GeneralRegion.RegionEvent.BOUGHT, true);
+	}
+
+	@EventHandler
+	public void boughtRegion(BoughtRegionEvent event) {
+		runEventCommands(event.getRegion(), GeneralRegion.RegionEvent.BOUGHT, false);
+	}
+
+	@EventHandler(priority = EventPriority.MONITOR, ignoreCancelled = true)
+	public void resellingRegion(ResellingRegionEvent event) {
+		// Technically the resell can still be cancelled if the payment fails...
+		runEventCommands(event.getRegion(), GeneralRegion.RegionEvent.RESELL, true);
+	}
+
+	@EventHandler
+	public void resoldRegion(ResoldRegionEvent event) {
+		runEventCommands(event.getRegion(), GeneralRegion.RegionEvent.RESELL, false);
+	}
+
+	@EventHandler(priority = EventPriority.MONITOR, ignoreCancelled = true)
+	public void sellingRegion(SellingRegionEvent event) {
+		runEventCommands(event.getRegion(), GeneralRegion.RegionEvent.SOLD, true);
+	}
+
+	@EventHandler
+	public void soldRegion(SoldRegionEvent event) {
+		runEventCommands(event.getRegion(), GeneralRegion.RegionEvent.SOLD, false);
+	}
+
+	@EventHandler(priority = EventPriority.MONITOR, ignoreCancelled = true)
+	public void unrentingRegion(UnrentingRegionEvent event) {
+		runEventCommands(event.getRegion(), GeneralRegion.RegionEvent.UNRENTED, true);
+	}
+
+	@EventHandler
+	public void unrentedRegion(UnrentedRegionEvent event) {
+		runEventCommands(event.getRegion(), GeneralRegion.RegionEvent.UNRENTED, false);
+	}
+
+}

AreaShop/src/main/java/me/wiefferink/areashop/features/DebugFeature.java

@@ -1,15 +1,35 @@
 package me.wiefferink.areashop.features;
 
 import me.wiefferink.areashop.AreaShop;
-import me.wiefferink.areashop.Utils;
-import me.wiefferink.areashop.events.ask.*;
-import me.wiefferink.areashop.events.askandnotify.AddFriendEvent;
-import me.wiefferink.areashop.events.askandnotify.DeleteFriendEvent;
-import me.wiefferink.areashop.events.notify.*;
+import me.wiefferink.areashop.events.ask.BuyingRegionEvent;
+import me.wiefferink.areashop.events.ask.RentingRegionEvent;
+import me.wiefferink.areashop.events.ask.ResellingRegionEvent;
+import me.wiefferink.areashop.events.ask.SellingRegionEvent;
+import me.wiefferink.areashop.events.ask.UnrentingRegionEvent;
+import me.wiefferink.areashop.events.askandnotify.AddedFriendEvent;
+import me.wiefferink.areashop.events.askandnotify.DeletedFriendEvent;
+import me.wiefferink.areashop.events.notify.AddedRegionEvent;
+import me.wiefferink.areashop.events.notify.BoughtRegionEvent;
+import me.wiefferink.areashop.events.notify.DeletedRegionEvent;
+import me.wiefferink.areashop.events.notify.RentedRegionEvent;
+import me.wiefferink.areashop.events.notify.ResoldRegionEvent;
+import me.wiefferink.areashop.events.notify.SoldRegionEvent;
+import me.wiefferink.areashop.events.notify.UnrentedRegionEvent;
+import me.wiefferink.areashop.events.notify.UpdateRegionEvent;
+import me.wiefferink.areashop.tools.Utils;
 import org.bukkit.event.EventHandler;
-import org.bukkit.event.Listener;
 
-public class DebugFeature extends Feature implements Listener {
+import javax.annotation.Nonnull;
+import javax.inject.Inject;
+import javax.inject.Singleton;
+
+@Singleton
+public class DebugFeature extends RegionFeature {
+
+	@Inject
+	DebugFeature(@Nonnull AreaShop plugin) {
+		super(plugin);
+	}
 
 	@EventHandler
 	public void buyingRegion(BuyingRegionEvent event) {
@@ -28,7 +48,7 @@ public class DebugFeature extends Feature implements Listener {
 
 	@EventHandler
 	public void soldRegion(SoldRegionEvent event) {
-		AreaShop.debug("SoldRegionEvent: "+Utils.toName(event.getOldBuyer())+" sold "+event.getRegion().getName());
+		AreaShop.debug("SoldRegionEvent: " + Utils.toName(event.getOldBuyer()) + " sold " + event.getRegion().getName());
 	}
 
 	@EventHandler
@@ -38,7 +58,7 @@ public class DebugFeature extends Feature implements Listener {
 
 	@EventHandler
 	public void resoldRegion(ResoldRegionEvent event) {
-		AreaShop.debug("ResoldRegionEvent: "+Utils.toName(event.getFromPlayer())+" resold "+event.getRegion().getName()+" to "+event.getRegion().getPlayerName());
+		AreaShop.debug("ResoldRegionEvent: " + Utils.toName(event.getFromPlayer()) + " resold " + event.getRegion().getName() + " to " + event.getRegion().getPlayerName());
 	}
 
 	@EventHandler
@@ -58,31 +78,31 @@ public class DebugFeature extends Feature implements Listener {
 
 	@EventHandler
 	public void unrentedRegion(UnrentedRegionEvent event) {
-		AreaShop.debug("UnrentedRegionEvent: "+Utils.toName(event.getOldRenter())+" unrented "+event.getRegion().getName());
+		AreaShop.debug("UnrentedRegionEvent: " + Utils.toName(event.getOldRenter()) + " unrented " + event.getRegion().getName());
 	}
 
 	@EventHandler
-	public void regionUpdate(RegionUpdateEvent event) {
-		//AreaShop.debug("RegionUpdateEvent: " + event.getRegion().getName() + " updated");
+	public void regionUpdate(UpdateRegionEvent event) {
+		//AreaShop.debug("UpdateRegionEvent: " + event.getRegion().getName() + " updated");
 	}
 
 	@EventHandler
 	public void addedRegion(AddedRegionEvent event) {
-		AreaShop.debug("AddedRegionEvent: "+event.getRegion().getName());
+		AreaShop.debug("AddedRegionEvent: " + event.getRegion().getName());
 	}
 
 	@EventHandler
-	public void removedRegion(RemovedRegionEvent event) {
-		AreaShop.debug("RemovedRegionEvent: "+event.getRegion().getName());
+	public void removedRegion(DeletedRegionEvent event) {
+		AreaShop.debug("DeletedRegionEvent: " + event.getRegion().getName());
 	}
 
 	@EventHandler
-	public void addedFriend(AddFriendEvent event) {
-		AreaShop.debug("AddFriendEvent: region "+event.getRegion().getName()+", "+event.getFriend().getName()+" by "+(event.getBy() == null ? "<nobody>" : event.getBy().getName()));
+	public void addedFriend(AddedFriendEvent event) {
+		AreaShop.debug("AddedFriendEvent: region " + event.getRegion().getName() + ", " + event.getFriend().getName() + " by " + (event.getBy() == null ? "<nobody>" : event.getBy().getName()));
 	}
 
 	@EventHandler
-	public void deleteFriend(DeleteFriendEvent event) {
-		AreaShop.debug("DeleteFriendEvent: region "+event.getRegion().getName()+", "+event.getFriend().getName()+" by "+(event.getBy() == null ? "<nobody>" : event.getBy().getName()));
+	public void deleteFriend(DeletedFriendEvent event) {
+		AreaShop.debug("DeletedFriendEvent: region " + event.getRegion().getName() + ", " + event.getFriend().getName() + " by " + (event.getBy() == null ? "<nobody>" : event.getBy().getName()));
 	}
 }

AreaShop/src/main/java/me/wiefferink/areashop/features/Feature.java

@@ -1,7 +0,0 @@
-package me.wiefferink.areashop.features;
-
-import me.wiefferink.areashop.AreaShop;
-
-public class Feature {
-	AreaShop plugin = AreaShop.getInstance();
-}

AreaShop/src/main/java/me/wiefferink/areashop/features/FeatureFactory.java

@@ -0,0 +1,19 @@
+package me.wiefferink.areashop.features;
+
+import me.wiefferink.areashop.features.signs.SignsFeature;
+import me.wiefferink.areashop.regions.GeneralRegion;
+
+import javax.annotation.Nonnull;
+
+public interface FeatureFactory {
+
+    @Nonnull
+    SignsFeature createSignsFeature(@Nonnull GeneralRegion generalRegion);
+
+    @Nonnull
+    TeleportFeature createTeleportFeature(@Nonnull GeneralRegion generalRegion);
+
+    @Nonnull
+    FriendsFeature createFriendsFeature(@Nonnull GeneralRegion generalRegion);
+
+}

AreaShop/src/main/java/me/wiefferink/areashop/features/FriendsFeature.java

@@ -1,77 +1,90 @@
 package me.wiefferink.areashop.features;
 
-import me.wiefferink.areashop.events.askandnotify.AddFriendEvent;
-import me.wiefferink.areashop.events.askandnotify.DeleteFriendEvent;
+import com.google.inject.Inject;
+import com.google.inject.assistedinject.Assisted;
+import com.google.inject.assistedinject.AssistedInject;
+import me.wiefferink.areashop.AreaShop;
+import me.wiefferink.areashop.MessageBridge;
+import me.wiefferink.areashop.events.askandnotify.AddedFriendEvent;
+import me.wiefferink.areashop.events.askandnotify.DeletedFriendEvent;
 import me.wiefferink.areashop.regions.GeneralRegion;
 import org.bukkit.Bukkit;
 import org.bukkit.OfflinePlayer;
 import org.bukkit.command.CommandSender;
 
-import java.util.*;
+import javax.annotation.Nonnull;
+import java.util.ArrayList;
+import java.util.HashSet;
+import java.util.List;
+import java.util.Set;
+import java.util.UUID;
 
-public class FriendsFeature extends Feature {
+public class FriendsFeature extends RegionFeature {
 
-	private GeneralRegion region;
-
-	public FriendsFeature(GeneralRegion region) {
-		this.region = region;
+	@Inject
+	private MessageBridge messageBridge;
+	
+	@AssistedInject
+	public FriendsFeature(@Nonnull AreaShop plugin, @Assisted @Nonnull GeneralRegion region) {
+		super(plugin);
+		setRegion(region);
 	}
 
 	/**
-	 * Add a friend to the region
+	 * Add a friend to the region.
 	 * @param player The UUID of the player to add
 	 * @param by     The CommandSender that is adding the friend, or null
 	 * @return true if the friend has been added, false if adding a friend was cancelled by another plugin
 	 */
 	public boolean addFriend(UUID player, CommandSender by) {
 		// Fire and check event
-		AddFriendEvent event = new AddFriendEvent(region, Bukkit.getOfflinePlayer(player), by);
+		AddedFriendEvent event = new AddedFriendEvent(getRegion(), Bukkit.getOfflinePlayer(player), by);
 		Bukkit.getPluginManager().callEvent(event);
 		if(event.isCancelled()) {
-			plugin.message(by, "general-cancelled", event.getReason(), this);
+			messageBridge.message(by, "general-cancelled", event.getReason(), this);
 			return false;
 		}
 
-		Set<String> friends = new HashSet<>(region.getConfig().getStringList("general.friends"));
+		Set<String> friends = new HashSet<>(getRegion().getConfig().getStringList("general.friends"));
 		friends.add(player.toString());
 		List<String> list = new ArrayList<>(friends);
-		region.setSetting("general.friends", list);
+		getRegion().setSetting("general.friends", list);
 		return true;
 	}
 
 	/**
-	 * Delete a friend from the region
+	 * Delete a friend from the region.
 	 * @param player The UUID of the player to delete
 	 * @param by     The CommandSender that is adding the friend, or null
 	 * @return true if the friend has been added, false if adding a friend was cancelled by another plugin
 	 */
 	public boolean deleteFriend(UUID player, CommandSender by) {
 		// Fire and check event
-		DeleteFriendEvent event = new DeleteFriendEvent(region, Bukkit.getOfflinePlayer(player), by);
+		DeletedFriendEvent event = new DeletedFriendEvent(getRegion(), Bukkit.getOfflinePlayer(player), by);
 		Bukkit.getPluginManager().callEvent(event);
 		if(event.isCancelled()) {
-			plugin.message(by, "general-cancelled", event.getReason(), this);
+			messageBridge.message(by, "general-cancelled", event.getReason(), this);
 			return false;
 		}
 
-		Set<String> friends = new HashSet<>(region.getConfig().getStringList("general.friends"));
+		Set<String> friends = new HashSet<>(getRegion().getConfig().getStringList("general.friends"));
 		friends.remove(player.toString());
 		List<String> list = new ArrayList<>(friends);
 		if(list.isEmpty()) {
-			region.setSetting("general.friends", null);
+			getRegion().setSetting("general.friends", null);
 		} else {
-			region.setSetting("general.friends", list);
+			getRegion().setSetting("general.friends", list);
 		}
 		return true;
 	}
 
 	/**
-	 * Get the list of friends added to this region
+	 * Get the list of friends added to this region.
 	 * @return Friends added to this region
 	 */
 	public Set<UUID> getFriends() {
 		HashSet<UUID> result = new HashSet<>();
-		for(String friend : region.getConfig().getStringList("general.friends")) {
+		for(String friend : getRegion().getConfig().getStringList("general.friends")) {
 			try {
 				UUID id = UUID.fromString(friend);
 				result.add(id);
@@ -83,14 +96,14 @@ public class FriendsFeature extends Feature {
 	}
 
 	/**
-	 * Get the list of friends added to this region
+	 * Get the list of friends added to this region.
 	 * @return Friends added to this region
 	 */
 	public Set<String> getFriendNames() {
 		HashSet<String> result = new HashSet<>();
 		for(UUID friend : getFriends()) {
 			OfflinePlayer player = Bukkit.getOfflinePlayer(friend);
-			if(player != null) {
+			if(player != null && player.getName() != null) {
 				result.add(player.getName());
 			}
 		}
@@ -98,10 +111,10 @@ public class FriendsFeature extends Feature {
 	}
 
 	/**
-	 * Remove all friends that are added to this region
+	 * Remove all friends that are added to this region.
 	 */
 	public void clearFriends() {
-		region.setSetting("general.friends", null);
+		getRegion().setSetting("general.friends", null);
 	}
 
 }

AreaShop/src/main/java/me/wiefferink/areashop/features/README.md

@@ -0,0 +1,6 @@
+# Features
+
+This package contains classes that represent a certain feature and implement it for all regions.
+
+* `RegionFeature` represents a single feature, for each implementing class one instance is created without an assigned region, to listen for events etc, and an instance per region is created on-demand to handle region specific things.
+* More features will be moved from `GeneralRegion` to these kind of classes, to keep all code for a feature together and cleanup `GeneralRegion`.

AreaShop/src/main/java/me/wiefferink/areashop/features/RegionFeature.java

@@ -0,0 +1,77 @@
+package me.wiefferink.areashop.features;
+
+import me.wiefferink.areashop.AreaShop;
+import me.wiefferink.areashop.regions.GeneralRegion;
+import org.bukkit.event.HandlerList;
+import org.bukkit.event.Listener;
+
+import javax.annotation.Nonnull;
+
+/*
+Possible future feature classes:
+- RestrictedToRegion feature
+	- rent/buy restricted to the region itself
+- RestrictedToWorld feature
+	- rent/buy restricted to the world of the region
+- CountLimitsFeature:
+	- Check region limits
+- TimeLimitsFeatures:
+	- maxExtends
+	- maxRentTime
+- SchematicFeature
+	- save/load schematics
+- CommandsFeature
+	- execute commands after extend/rent/etc
+- LandlordFeature
+	- manage landlords
+- ExpirationWarningsFeature
+	- sending rental expiration warnings
+ */
+
+public abstract class RegionFeature implements Listener {
+
+	protected final AreaShop plugin;
+	private GeneralRegion region;
+
+	protected RegionFeature(@Nonnull AreaShop plugin) {
+		this.plugin = plugin;
+	}
+
+	/**
+	 * Set the region for this feature.
+	 * @param region Feature region
+	 */
+	public void setRegion(GeneralRegion region) {
+		this.region = region;
+	}
+
+	/**
+	 * Get the region of this feature.
+	 * @return region of this feature, or null if generic
+	 */
+	public GeneralRegion getRegion() {
+		return region;
+	}
+
+	/**
+	 * Start listening to events.
+	 */
+	public void listen() {
+		plugin.getServer().getPluginManager().registerEvents(this, plugin);
+	}
+
+	/**
+	 * Destroy the feature and deregister everything.
+	 */
+	public void shutdownFeature() {
+		HandlerList.unregisterAll(this);
+		shutdown();
+	}
+
+	/**
+	 * Dummy method a RegionFeature implementation can override.
+	 */
+	public void shutdown() {
+	}
+
+}

AreaShop/src/main/java/me/wiefferink/areashop/features/SignsFeature.java

@@ -1,346 +0,0 @@
-package me.wiefferink.areashop.features;
-
-import me.wiefferink.areashop.AreaShop;
-import me.wiefferink.areashop.Utils;
-import me.wiefferink.areashop.events.notify.RegionUpdateEvent;
-import me.wiefferink.areashop.regions.GeneralRegion;
-import org.bukkit.Bukkit;
-import org.bukkit.Location;
-import org.bukkit.Material;
-import org.bukkit.block.Block;
-import org.bukkit.block.BlockFace;
-import org.bukkit.block.Sign;
-import org.bukkit.configuration.ConfigurationSection;
-import org.bukkit.configuration.file.YamlConfiguration;
-import org.bukkit.entity.Player;
-import org.bukkit.event.EventHandler;
-import org.bukkit.event.Listener;
-
-import java.util.*;
-
-public class SignsFeature extends Feature implements Listener {
-
-	private static Map<String, RegionSign> allSigns = new HashMap<>();
-
-	private GeneralRegion region;
-	private Map<String, RegionSign> signs;
-
-	public SignsFeature() {
-
-	}
-
-	public SignsFeature(GeneralRegion region) {
-		this.region = region;
-		signs = new HashMap<>();
-		// Setup current signs
-		ConfigurationSection signSection = region.getConfig().getConfigurationSection("general.signs");
-		if(signSection != null) {
-			for(String signKey : signSection.getKeys(false)) {
-				RegionSign sign = new RegionSign(region, this, signKey);
-				Location location = sign.getLocation();
-				if(location == null) {
-					plugin.getLogger().warning("Sign with key "+signKey+" of region "+region.getName()+" does not have a proper location");
-					continue;
-				}
-				signs.put(sign.getStringLocation(), sign);
-			}
-			allSigns.putAll(signs);
-		}
-	}
-
-	/**
-	 * Convert a location to a string to use as map key
-	 * @param location The location to get the key for
-	 * @return A string to use in a map for a location
-	 */
-	public static String locationToString(Location location) {
-		return location.getWorld().getName()+";"+location.getBlockX()+";"+location.getBlockY()+";"+location.getBlockZ();
-	}
-
-	/**
-	 * Get a sign by a location
-	 * @param location The location to get the sign for
-	 * @return The RegionSign that is at the location, or null if none
-	 */
-	public static RegionSign getSignByLocation(Location location) {
-		return allSigns.get(locationToString(location));
-	}
-
-	@EventHandler
-	public void regionUpdate(RegionUpdateEvent event) {
-		event.getRegion().getSignsFeature().update();
-	}
-
-	/**
-	 * Update all signs connected to this region
-	 * @return true if all signs are updated correctly, false if one or more updates failed
-	 */
-	public boolean update() {
-		boolean result = true;
-		for(RegionSign sign : signs.values()) {
-			result = result&sign.update();
-		}
-		return result;
-	}
-
-	/**
-	 * Check if any of the signs need periodic updating
-	 * @return true if one or more of the signs need periodic updating, otherwise false
-	 */
-	public boolean needsPeriodicUpdate() {
-		boolean result = false;
-		for(RegionSign sign : signs.values()) {
-			result = result|sign.needsPeriodicUpdate();
-		}
-		return result;
-	}
-
-	/**
-	 * Get a list with all sign locations
-	 * @return A List with all sign locations
-	 */
-	public List<Location> getSignLocations() {
-		List<Location> result = new ArrayList<>();
-		for(RegionSign sign : signs.values()) {
-			result.add(sign.getLocation());
-		}
-		return result;
-	}
-
-	/**
-	 * Add a sign to this region
-	 * @param location The location of the sign
-	 * @param signType The type of the sign (WALL_SIGN or SIGN_POST)
-	 * @param facing   The orientation of the sign
-	 * @param profile  The profile to use with this sign (null for default)
-	 */
-	public void addSign(Location location, Material signType, BlockFace facing, String profile) {
-		int i = 0;
-		while(region.getConfig().isSet("general.signs."+i)) {
-			i++;
-		}
-		String signPath = "general.signs."+i+".";
-		region.setSetting(signPath+"location", Utils.locationToConfig(location));
-		region.setSetting(signPath+"facing", facing.name());
-		region.setSetting(signPath+"signType", signType.name());
-		if(profile != null && profile.length() != 0) {
-			region.setSetting(signPath+"profile", profile);
-		}
-		// Add to the map
-		RegionSign sign = new RegionSign(region, this, i+"");
-		signs.put(sign.getStringLocation(), sign);
-		allSigns.put(sign.getStringLocation(), sign);
-	}
-
-	/**
-	 * Checks if there is a sign from this region at the specified location
-	 * @param location Location to check
-	 * @return true if this region has a sign at the location, otherwise false
-	 */
-	public boolean isSignOfRegion(Location location) {
-		Set<String> signs;
-		if(region.getConfig().getConfigurationSection("general.signs") == null) {
-			return false;
-		}
-		signs = region.getConfig().getConfigurationSection("general.signs").getKeys(false);
-		for(String sign : signs) {
-			Location signLocation = Utils.configToLocation(region.getConfig().getConfigurationSection("general.signs."+sign+".location"));
-			if(signLocation != null
-					&& signLocation.getWorld().equals(location.getWorld())
-					&& signLocation.getBlockX() == location.getBlockX()
-					&& signLocation.getBlockY() == location.getBlockY()
-					&& signLocation.getBlockZ() == location.getBlockZ()) {
-				return true;
-			}
-		}
-		return false;
-	}
-
-
-	/**
-	 * Sign that is connected to a region to display information and interact with the region
-	 */
-	public class RegionSign {
-
-		private GeneralRegion region;
-		private SignsFeature signsFeature;
-		private String key;
-
-		public RegionSign(GeneralRegion region, SignsFeature signsFeature, String key) {
-			this.region = region;
-			this.signsFeature = signsFeature;
-			this.key = key;
-		}
-
-		/**
-		 * Get the location of this sign
-		 * @return The location of this sign
-		 */
-		public Location getLocation() {
-			return Utils.configToLocation(region.getConfig().getConfigurationSection("general.signs."+key+".location"));
-		}
-
-		/**
-		 * Location string to be used as key in maps
-		 * @return Location string
-		 */
-		public String getStringLocation() {
-			return locationToString(getLocation());
-		}
-
-		/**
-		 * Get the region this sign is linked to
-		 * @return The region this sign is linked to
-		 */
-		public GeneralRegion getRegion() {
-			return region;
-		}
-
-		/**
-		 * Remove this sign from the region
-		 */
-		public void remove() {
-			getLocation().getBlock().setType(Material.AIR);
-			signs.remove(getStringLocation());
-			allSigns.remove(getStringLocation());
-			region.setSetting("general.signs."+key, null);
-		}
-
-		public String getProfile() {
-			String profile = region.getConfig().getString("general.signs."+key+".profile");
-			if(profile == null || profile.length() == 0) {
-				profile = region.getStringSetting("general.signProfile");
-			}
-			return profile;
-		}
-
-		/**
-		 * Update this sign
-		 * @return true if the update was successful, otherwise false
-		 */
-		public boolean update() {
-			if(region.isDeleted()) {
-				return false;
-			}
-			YamlConfiguration config = region.getConfig();
-			// Get the prefix
-			String prefix = "signProfiles."+getProfile()+"."+region.getState().getValue().toLowerCase()+".";
-			// Get the lines
-			String[] signLines = new String[4];
-			signLines[0] = plugin.getConfig().getString(prefix+"line1");
-			signLines[1] = plugin.getConfig().getString(prefix+"line2");
-			signLines[2] = plugin.getConfig().getString(prefix+"line3");
-			signLines[3] = plugin.getConfig().getString(prefix+"line4");
-			// Check if the sign should be present
-			Block block = getLocation().getBlock();
-			if(!plugin.getConfig().isSet(prefix)
-					|| ((signLines[0] == null || signLines[0].length() == 0)
-					&& (signLines[1] == null || signLines[1].length() == 0)
-					&& (signLines[2] == null || signLines[2].length() == 0)
-					&& (signLines[3] == null || signLines[3].length() == 0))) {
-				block.setType(Material.AIR);
-			} else {
-				Sign signState = null;
-				if(block.getType() != Material.WALL_SIGN && block.getType() != Material.SIGN_POST) {
-					Material signType;
-					try {
-						signType = Material.valueOf(config.getString("general.signs."+key+".signType"));
-					} catch(NullPointerException|IllegalArgumentException e) {
-						signType = null;
-					}
-					if(signType != Material.WALL_SIGN && signType != Material.SIGN_POST) {
-						AreaShop.debug("  setting sign failed");
-						return false;
-					}
-					block.setType(signType);
-					signState = (Sign)block.getState();
-					org.bukkit.material.Sign signData = (org.bukkit.material.Sign)signState.getData();
-					BlockFace signFace;
-					try {
-						signFace = BlockFace.valueOf(config.getString("general.signs."+key+".facing"));
-					} catch(NullPointerException|IllegalArgumentException e) {
-						signFace = null;
-					}
-					if(signFace != null) {
-						signData.setFacingDirection(signFace);
-						signState.setData(signData);
-					}
-				}
-				if(signState == null) {
-					signState = (Sign)block.getState();
-				}
-				org.bukkit.material.Sign signData = (org.bukkit.material.Sign)signState.getData();
-				if(!config.isString("general.signs."+key+".signType")) {
-					region.setSetting("general.signs."+key+".signType", signState.getType().toString());
-				}
-				if(!config.isString("general.signs."+key+".facing")) {
-					region.setSetting("general.signs."+key+".facing", signData.getFacing().toString());
-				}
-				// Apply replacements and color and then set it on the sign
-				for(int i = 0; i < signLines.length; i++) {
-					if(signLines[i] == null) {
-						signState.setLine(i, "");
-						continue;
-					}
-					signLines[i] = region.applyAllReplacements(signLines[i]);
-					signLines[i] = Utils.applyColors(signLines[i]);
-					signState.setLine(i, signLines[i]);
-				}
-				signState.update();
-			}
-			return true;
-		}
-
-		/**
-		 * Check if the sign needs to update periodically
-		 * @return true if it needs periodic updates, otherwise false
-		 */
-		public boolean needsPeriodicUpdate() {
-			// Get the prefix
-			String prefix = "signProfiles."+getProfile()+"."+region.getState().getValue().toLowerCase()+".line";
-			String line;
-			// Get the lines
-			for(int i = 1; i < 5; i++) {
-				line = plugin.getConfig().getString(prefix+i);
-				if(line != null && line.length() != 0 && line.contains(AreaShop.tagTimeLeft)) {
-					return true;
-				}
-			}
-			return false;
-		}
-
-		/**
-		 * Run commands when a player clicks a sign
-		 * @param clicker   The player that clicked the sign
-		 * @param clickType The type of clicking
-		 * @return true if the commands ran successfully, false if any of them failed
-		 */
-		public boolean runSignCommands(Player clicker, GeneralRegion.ClickType clickType) {
-			// Get the profile set in the config
-			String profile = region.getConfig().getString("general.signs."+key+".profile");
-			if(profile == null || profile.length() == 0) {
-				profile = region.getStringSetting("general.signProfile");
-			}
-
-			// Get paths (state may change after running them)
-			String playerPath = "signProfiles."+profile+"."+region.getState().getValue().toLowerCase()+"."+clickType.getValue()+"Player";
-			String consolePath = "signProfiles."+profile+"."+region.getState().getValue().toLowerCase()+"."+clickType.getValue()+"Console";
-
-			// Run player commands if specified
-			List<String> playerCommands = new ArrayList<>();
-			for(String command : plugin.getConfig().getStringList(playerPath)) {
-				playerCommands.add(command.replace(AreaShop.tagClicker, clicker.getName()));
-			}
-			region.runCommands(clicker, playerCommands);
-
-			// Run console commands if specified
-			List<String> consoleCommands = new ArrayList<>();
-			for(String command : plugin.getConfig().getStringList(consolePath)) {
-				consoleCommands.add(command.replace(AreaShop.tagClicker, clicker.getName()));
-			}
-			region.runCommands(Bukkit.getConsoleSender(), consoleCommands);
-
-			return !playerCommands.isEmpty() || !consoleCommands.isEmpty();
-		}
-	}
-}

AreaShop/src/main/java/me/wiefferink/areashop/features/TeleportFeature.java

@@ -0,0 +1,572 @@
+package me.wiefferink.areashop.features;
+
+import com.google.inject.assistedinject.Assisted;
+import com.google.inject.assistedinject.AssistedInject;
+import com.sk89q.worldguard.protection.regions.ProtectedRegion;
+import me.wiefferink.areashop.AreaShop;
+import me.wiefferink.areashop.features.signs.RegionSign;
+import me.wiefferink.areashop.features.signs.SignManager;
+import me.wiefferink.areashop.interfaces.WorldGuardInterface;
+import me.wiefferink.areashop.regions.GeneralRegion;
+import me.wiefferink.areashop.tools.Utils;
+import me.wiefferink.areashop.tools.Value;
+import org.bukkit.Location;
+import org.bukkit.Material;
+import org.bukkit.Tag;
+import org.bukkit.block.Block;
+import org.bukkit.block.BlockFace;
+import org.bukkit.entity.Player;
+import org.bukkit.util.Vector;
+
+import javax.annotation.Nonnull;
+import javax.inject.Inject;
+import java.util.Collection;
+import java.util.EnumSet;
+import java.util.Iterator;
+import java.util.Set;
+
+public class TeleportFeature extends RegionFeature {
+
+	@Inject
+	private WorldGuardInterface worldGuardInterface;
+
+	@AssistedInject
+	public TeleportFeature(@Nonnull AreaShop plugin, @Assisted @Nonnull GeneralRegion region) {
+		super(plugin);
+		setRegion(region);
+	}
+
+	/**
+	 * Get the teleportlocation set for this region.
+	 * @return The teleport location, or null if not set
+	 */
+	public Location getTeleportLocation() {
+		return Utils.configToLocation(getRegion().getConfigurationSectionSetting("general.teleportLocation"));
+	}
+
+	/**
+	 * Check if the region has a teleportLocation specified.
+	 * @return true if the region has a teleportlocation, false otherwise
+	 */
+	public boolean hasTeleportLocation() {
+		return getRegion().getConfigurationSectionSetting("general.teleportLocation") != null;
+	}
+
+	/**
+	 * Set the teleport location of this region.
+	 * @param location The location to set as teleport location
+	 */
+	public void setTeleport(Location location) {
+		if(location == null) {
+			getRegion().setSetting("general.teleportLocation", null);
+		} else {
+			getRegion().setSetting("general.teleportLocation", Utils.locationToConfig(location, true));
+		}
+	}
+
+	/**
+	 * Teleport a player to the region or sign.
+	 * @param player            Player that should be teleported
+	 * @param toSign            true to teleport to the first sign of the region, false for teleporting to the region itself
+	 * @param checkRestrictions Set to true if teleport permissions should be checked, false otherwise, also toggles cross-world check
+	 * @return true if the teleport succeeded, otherwise false
+	 */
+	public boolean teleportPlayer(Player player, boolean toSign, boolean checkRestrictions) {
+
+		// Check basics
+		if(getRegion().getWorld() == null) {
+			getRegion().message(player, "general-noWorld");
+			return false;
+		}
+		if(getRegion().getRegion() == null) {
+			getRegion().message(player, "general-noRegion");
+			return false;
+		}
+
+		if(checkRestrictions) {
+			// Check correct world
+			if(!getRegion().getBooleanSetting("general.teleportCrossWorld") && !player.getWorld().equals(getRegion().getWorld())) {
+				getRegion().message(player, "teleport-wrongWorld", player.getWorld().getName());
+				return false;
+			}
+
+			boolean owner = player.getUniqueId().equals(getRegion().getOwner());
+			boolean friend = getRegion().getFriendsFeature().getFriends().contains(player.getUniqueId());
+			boolean available = getRegion().isAvailable();
+			// Teleport to sign instead if they dont have permission for teleporting to region
+			if((!toSign && owner && !player.hasPermission("areashop.teleport") && player.hasPermission("areashop.teleportsign")
+					|| !toSign && !owner && !friend && !player.hasPermission("areashop.teleportall") && player.hasPermission("areashop.teleportsignall")
+					|| !toSign && !owner && friend && !player.hasPermission("areashop.teleportfriend") && player.hasPermission("areashop.teleportfriendsign")
+					|| !toSign && !owner && !friend && available && !player.hasPermission("areashop.teleportavailable") && player.hasPermission("areashop.teleportavailablesign"))) {
+				getRegion().message(player, "teleport-changedToSign");
+				toSign = true;
+			}
+			// Check permissions
+			if(owner && !available && !player.hasPermission("areashop.teleport") && !toSign) {
+				getRegion().message(player, "teleport-noPermission");
+				return false;
+			} else if(!owner && !available && !player.hasPermission("areashop.teleportall") && !toSign && !friend) {
+				getRegion().message(player, "teleport-noPermissionOther");
+				return false;
+			} else if(!owner && !available && !player.hasPermission("areashop.teleportfriend") && !toSign && friend) {
+				getRegion().message(player, "teleport-noPermissionFriend");
+				return false;
+			} else if(available && !player.hasPermission("areashop.teleportavailable") && !toSign) {
+				getRegion().message(player, "teleport-noPermissionAvailable");
+				return false;
+			} else if(owner && !available && !player.hasPermission("areashop.teleportsign") && toSign) {
+				getRegion().message(player, "teleport-noPermissionSign");
+				return false;
+			} else if(!owner && !available && !player.hasPermission("areashop.teleportsignall") && toSign && !friend) {
+				getRegion().message(player, "teleport-noPermissionOtherSign");
+				return false;
+			} else if(!owner && !available && !player.hasPermission("areashop.teleportfriendsign") && toSign && friend) {
+				getRegion().message(player, "teleport-noPermissionFriendSign");
+				return false;
+			} else if(available && !player.hasPermission("areashop.teleportavailablesign") && toSign) {
+				getRegion().message(player, "teleport-noPermissionAvailableSign");
+				return false;
+			}
+		}
+
+		// Get the starting location
+		Value<Boolean> toSignRef = new Value<>(toSign);
+		Location startLocation = getStartLocation(player, toSignRef);
+		toSign = toSignRef.get();
+
+		boolean insideRegion;
+		if(toSign) {
+			insideRegion = getRegion().getBooleanSetting("general.teleportToSignIntoRegion");
+		} else {
+			insideRegion = getRegion().getBooleanSetting("general.teleportIntoRegion");
+		}
+
+		// Check locations starting from startLocation and then a cube that increases
+		// radius around that (until no block in the region is found at all cube sides)
+		Location safeLocation = startLocation;
+		ProtectedRegion worldguardRegion = getRegion().getRegion();
+		boolean blocksInRegion = worldguardRegion.contains(startLocation.getBlockX(), startLocation.getBlockY(), startLocation.getBlockZ());
+		if(!blocksInRegion && insideRegion) {
+			getRegion().message(player, "teleport-blocked");
+			return false;
+		}
+
+		// Tries limit tracking
+		int radius = 1;
+		int checked = 1;
+		int maxTries = plugin.getConfig().getInt("maximumTries");
+
+		// Tracking of which sides to continue the search
+		boolean done = isSafe(safeLocation);
+		boolean northDone = false, eastDone = false, southDone = false, westDone = false, topDone = false, bottomDone = false;
+		boolean continueThisDirection;
+
+		while((blocksInRegion || !insideRegion) && !done) {
+			blocksInRegion = false;
+
+			// North side
+			continueThisDirection = false;
+			for(int x = -radius + 1; x <= radius && !done && !northDone; x++) {
+				for(int y = -radius + 1; y < radius && !done; y++) {
+					safeLocation = startLocation.clone().add(x, y, -radius);
+					if(safeLocation.getBlockY() > 256 || safeLocation.getBlockY() < 0) {
+						continue;
+					}
+					if(worldguardRegion.contains(safeLocation.getBlockX(), safeLocation.getBlockY(), safeLocation.getBlockZ()) || !insideRegion) {
+						checked++;
+						done = isSafe(safeLocation) || checked > maxTries;
+						blocksInRegion = true;
+						continueThisDirection = true;
+					}
+				}
+			}
+			northDone = northDone || !continueThisDirection;
+
+			// East side
+			continueThisDirection = false;
+			for(int z = -radius + 1; z <= radius && !done && !eastDone; z++) {
+				for(int y = -radius + 1; y < radius && !done; y++) {
+					safeLocation = startLocation.clone().add(radius, y, z);
+					if(safeLocation.getBlockY() > 256 || safeLocation.getBlockY() < 0) {
+						continue;
+					}
+					if(worldguardRegion.contains(safeLocation.getBlockX(), safeLocation.getBlockY(), safeLocation.getBlockZ()) || !insideRegion) {
+						checked++;
+						done = isSafe(safeLocation) || checked > maxTries;
+						blocksInRegion = true;
+						continueThisDirection = true;
+					}
+				}
+			}
+			eastDone = eastDone || !continueThisDirection;
+
+			// South side
+			continueThisDirection = false;
+			for(int x = radius - 1; x >= -radius && !done && !southDone; x--) {
+				for(int y = -radius + 1; y < radius && !done; y++) {
+					safeLocation = startLocation.clone().add(x, y, radius);
+					if(safeLocation.getBlockY() > 256 || safeLocation.getBlockY() < 0) {
+						continue;
+					}
+					if(worldguardRegion.contains(safeLocation.getBlockX(), safeLocation.getBlockY(), safeLocation.getBlockZ()) || !insideRegion) {
+						checked++;
+						done = isSafe(safeLocation) || checked > maxTries;
+						blocksInRegion = true;
+						continueThisDirection = true;
+					}
+				}
+			}
+			southDone = southDone || !continueThisDirection;
+
+			// West side
+			continueThisDirection = false;
+			for(int z = radius - 1; z >= -radius && !done && !westDone; z--) {
+				for(int y = -radius + 1; y < radius && !done; y++) {
+					safeLocation = startLocation.clone().add(-radius, y, z);
+					if(safeLocation.getBlockY() > 256 || safeLocation.getBlockY() < 0) {
+						continue;
+					}
+					if(worldguardRegion.contains(safeLocation.getBlockX(), safeLocation.getBlockY(), safeLocation.getBlockZ()) || !insideRegion) {
+						checked++;
+						done = isSafe(safeLocation) || checked > maxTries;
+						blocksInRegion = true;
+						continueThisDirection = true;
+					}
+				}
+			}
+			westDone = westDone || !continueThisDirection;
+
+			// Top side
+			continueThisDirection = false;
+			// Middle block of the top
+			if((startLocation.getBlockY() + radius) > 256) {
+				topDone = true;
+			}
+			if(!done && !topDone) {
+				safeLocation = startLocation.clone().add(0, radius, 0);
+				if(worldguardRegion.contains(safeLocation.getBlockX(), safeLocation.getBlockY(), safeLocation.getBlockZ()) || !insideRegion) {
+					checked++;
+					done = isSafe(safeLocation) || checked > maxTries;
+					blocksInRegion = true;
+					continueThisDirection = true;
+				}
+			}
+			for(int r = 1; r <= radius && !done && !topDone; r++) {
+				// North
+				for(int x = -r + 1; x <= r && !done; x++) {
+					safeLocation = startLocation.clone().add(x, radius, -r);
+					if(worldguardRegion.contains(safeLocation.getBlockX(), safeLocation.getBlockY(), safeLocation.getBlockZ()) || !insideRegion) {
+						checked++;
+						done = isSafe(safeLocation) || checked > maxTries;
+						blocksInRegion = true;
+						continueThisDirection = true;
+					}
+				}
+				// East
+				for(int z = -r + 1; z <= r && !done; z++) {
+					safeLocation = startLocation.clone().add(r, radius, z);
+					if(worldguardRegion.contains(safeLocation.getBlockX(), safeLocation.getBlockY(), safeLocation.getBlockZ()) || !insideRegion) {
+						checked++;
+						done = isSafe(safeLocation) || checked > maxTries;
+						blocksInRegion = true;
+						continueThisDirection = true;
+					}
+				}
+				// South side
+				for(int x = r - 1; x >= -r && !done; x--) {
+					safeLocation = startLocation.clone().add(x, radius, r);
+					if(worldguardRegion.contains(safeLocation.getBlockX(), safeLocation.getBlockY(), safeLocation.getBlockZ()) || !insideRegion) {
+						checked++;
+						done = isSafe(safeLocation) || checked > maxTries;
+						blocksInRegion = true;
+						continueThisDirection = true;
+					}
+				}
+				// West side
+				for(int z = r - 1; z >= -r && !done; z--) {
+					safeLocation = startLocation.clone().add(-r, radius, z);
+					if(worldguardRegion.contains(safeLocation.getBlockX(), safeLocation.getBlockY(), safeLocation.getBlockZ()) || !insideRegion) {
+						checked++;
+						done = isSafe(safeLocation) || checked > maxTries;
+						blocksInRegion = true;
+						continueThisDirection = true;
+					}
+				}
+			}
+			topDone = topDone || !continueThisDirection;
+
+			// Bottom side
+			continueThisDirection = false;
+			// Middle block of the bottom
+			if(startLocation.getBlockY() - radius < 0) {
+				bottomDone = true;
+			}
+			if(!done && !bottomDone) {
+				safeLocation = startLocation.clone().add(0, -radius, 0);
+				if(worldguardRegion.contains(safeLocation.getBlockX(), safeLocation.getBlockY(), safeLocation.getBlockZ()) || !insideRegion) {
+					checked++;
+					done = isSafe(safeLocation) || checked > maxTries;
+					blocksInRegion = true;
+					continueThisDirection = true;
+				}
+			}
+			for(int r = 1; r <= radius && !done && !bottomDone; r++) {
+				// North
+				for(int x = -r + 1; x <= r && !done; x++) {
+					safeLocation = startLocation.clone().add(x, -radius, -r);
+					if(worldguardRegion.contains(safeLocation.getBlockX(), safeLocation.getBlockY(), safeLocation.getBlockZ()) || !insideRegion) {
+						checked++;
+						done = isSafe(safeLocation) || checked > maxTries;
+						blocksInRegion = true;
+						continueThisDirection = true;
+					}
+				}
+				// East
+				for(int z = -r + 1; z <= r && !done; z++) {
+					safeLocation = startLocation.clone().add(r, -radius, z);
+					if(worldguardRegion.contains(safeLocation.getBlockX(), safeLocation.getBlockY(), safeLocation.getBlockZ()) || !insideRegion) {
+						checked++;
+						done = isSafe(safeLocation) || checked > maxTries;
+						blocksInRegion = true;
+						continueThisDirection = true;
+					}
+				}
+				// South side
+				for(int x = r - 1; x >= -r && !done; x--) {
+					safeLocation = startLocation.clone().add(x, -radius, r);
+					if(worldguardRegion.contains(safeLocation.getBlockX(), safeLocation.getBlockY(), safeLocation.getBlockZ()) || !insideRegion) {
+						checked++;
+						done = isSafe(safeLocation) || checked > maxTries;
+						blocksInRegion = true;
+						continueThisDirection = true;
+					}
+				}
+				// West side
+				for(int z = r - 1; z >= -r && !done; z--) {
+					safeLocation = startLocation.clone().add(-r, -radius, z);
+					if(worldguardRegion.contains(safeLocation.getBlockX(), safeLocation.getBlockY(), safeLocation.getBlockZ()) || !insideRegion) {
+						checked++;
+						done = isSafe(safeLocation) || checked > maxTries;
+						blocksInRegion = true;
+						continueThisDirection = true;
+					}
+				}
+			}
+			bottomDone = bottomDone || !continueThisDirection;
+
+			// Increase cube radius
+			radius++;
+		}
+		if(done && isSafe(safeLocation)) {
+			if(toSign) {
+				getRegion().message(player, "teleport-successSign");
+
+				// Let the player look at the sign
+				Vector playerVector = safeLocation.toVector();
+				playerVector.setY(playerVector.getY() + player.getEyeHeight(true));
+				SignManager signManager = getRegion().getSignsFeature().signManager();
+				Iterator<RegionSign> iterator = signManager.allSigns().iterator();
+				Vector signVector = iterator.next().getLocation().toVector().add(new Vector(0.5, 0.5, 0.5));
+				Vector direction = playerVector.clone().subtract(signVector).normalize();
+				safeLocation.setYaw(180 - (float)Math.toDegrees(Math.atan2(direction.getX(), direction.getZ())));
+				safeLocation.setPitch(90 - (float)Math.toDegrees(Math.acos(direction.getY())));
+			} else {
+				getRegion().message(player, "teleport-success");
+			}
+
+			player.teleport(safeLocation);
+			AreaShop.debug("Found location: " + safeLocation.toString() + " Tries: " + (checked - 1));
+			return true;
+		} else {
+			getRegion().message(player, "teleport-noSafe", checked - 1, maxTries);
+			AreaShop.debug("No location found, checked " + (checked - 1) + " spots of max " + maxTries);
+			return false;
+		}
+	}
+
+	/**
+	 * Teleport a player to the region or sign when he has permissions for it.
+	 * @param player Player that should be teleported
+	 * @param toSign true to teleport to the first sign of the region, false for teleporting to the region itself
+	 * @return true if the teleport succeeded, otherwise false
+	 */
+	public boolean teleportPlayer(Player player, boolean toSign) {
+		return teleportPlayer(player, toSign, true);
+	}
+
+	/**
+	 * Teleport a player to the region when he has permissions for it.
+	 * @param player Player that should be teleported
+	 * @return true if the teleport succeeded, otherwise false
+	 */
+	public boolean teleportPlayer(Player player) {
+		return teleportPlayer(player, false, true);
+	}
+
+	/**
+	 * Checks if a certain location is safe to teleport to.
+	 * @param location The location to check
+	 * @return true if it is safe, otherwise false
+	 */
+	private boolean isSafe(Location location) {
+		Block feet = location.getBlock();
+		Block head = feet.getRelative(BlockFace.UP);
+		Block below = feet.getRelative(BlockFace.DOWN);
+		Block above = head.getRelative(BlockFace.UP);
+
+		// Check the block at the feet and head of the player
+		if((feet.getType().isSolid() && !canSpawnIn(feet.getType())) || feet.isLiquid()) {
+			return false;
+		} else if((head.getType().isSolid() && !canSpawnIn(head.getType())) || head.isLiquid()) {
+			return false;
+		} else if(!below.getType().isSolid() || cannotSpawnOn(below.getType()) || below.isLiquid()) {
+			return false;
+		} else if(above.isLiquid() || cannotSpawnBeside(above.getType())) {
+			return false;
+		}
+
+		// Get all blocks around the player (below foot level, foot level, head level and above head level)
+		Set<Material> around = EnumSet.noneOf(Material.class);
+		for(int y = 0; y <= 3; y++) {
+			for(int x = -1; x <= 1; x++) {
+				for(int z = -1; z <= 1; z++) {
+					// Skip blocks in the column of the player
+					if(x == 0 && z == 0) {
+						continue;
+					}
+
+					around.add(below.getRelative(x, y, z).getType());
+				}
+			}
+		}
+
+		// Check the blocks around the player
+		for(Material material : around) {
+			if(cannotSpawnBeside(material)) {
+				return false;
+			}
+		}
+		return true;
+	}
+
+	/**
+	 * Check if a player can spawn in here.
+	 * @param material Material to check (assumed that this is at the feet or head level)
+	 * @return true when it is safe to spawn inside, otherwise false
+	 */
+	private static boolean canSpawnIn(Material material) {
+		return material == Material.DRAGON_EGG
+				|| Tag.DOORS.isTagged(material)
+				|| Tag.SIGNS.isTagged(material)
+				|| Tag.PRESSURE_PLATES.isTagged(material);
+	}
+
+	/**
+	 * Check if a player can spawn on here.
+	 * @param material Material to check (assumed that this is below the feet)
+	 * @return true when it is safe to spawn on top of, otherwise false
+	 */
+	private static boolean cannotSpawnOn(Material material) {
+		return material == Material.CACTUS
+				|| material == Material.PISTON
+				|| material == Material.PISTON_HEAD
+				|| material == Material.MOVING_PISTON
+				|| material == Material.DRAGON_EGG
+				|| material == Material.MAGMA_BLOCK
+				|| material == Material.REDSTONE_LAMP
+				|| Tag.SIGNS.isTagged(material)
+				|| Tag.DOORS.isTagged(material)
+				|| Tag.FENCE_GATES.isTagged(material)
+				|| Tag.FENCES.isTagged(material)
+				|| material.name().contains("GLASS_PANE");
+	}
+
+	/**
+	 * Check if a player can spawn next to it.
+	 * @param material Material to check (assumed that this is somewhere around the player)
+	 * @return true when it is safe to spawn next to, otherwise false
+	 */
+	private static boolean cannotSpawnBeside(Material material) {
+		return material == Material.LAVA
+				|| material == Material.FIRE
+				|| material == Material.MAGMA_BLOCK;
+	}
+
+	/**
+	 * Get the start location of a safe teleport search.
+	 * @param player The player to get it for
+	 * @param toSign true to try teleporting to the first sign, false for teleporting to the region
+	 * @return The start location
+	 */
+	private Location getStartLocation(Player player, Value<Boolean> toSign) {
+		Location startLocation = null;
+		ProtectedRegion worldguardRegion = getRegion().getRegion();
+
+		// Try to get sign location
+
+		Collection<RegionSign> signs = getRegion().getSignsFeature().signManager().allSigns();
+		if(toSign.get()) {
+			boolean signAvailable = !signs.isEmpty();
+			if(signAvailable) {
+				RegionSign firstSign = signs.iterator().next();
+				// Use the location 1 below the sign to prevent weird spawing above the sign
+				startLocation = firstSign.getLocation(); //.subtract(0.0, 1.0, 0.0);
+				startLocation.setPitch(player.getLocation().getPitch());
+				startLocation.setYaw(player.getLocation().getYaw());
+
+				// Move player x blocks away from the sign
+				double distance = getRegion().getDoubleSetting("general.teleportSignDistance");
+				if(distance > 0) {
+					BlockFace facing = firstSign.getFacing();
+					Vector facingVector = new Vector(facing.getModX(), facing.getModY(), facing.getModZ())
+							.normalize()
+							.multiply(distance);
+					startLocation.setX(startLocation.getBlockX() + 0.5);
+					startLocation.setZ(startLocation.getBlockZ() + 0.5);
+					startLocation.add(facingVector);
+				}
+			} else {
+				// No sign available
+				getRegion().message(player, "teleport-changedToNoSign");
+				toSign.set(false);
+			}
+		}
+
+		// Use teleportation location that is set for the region
+		if(startLocation == null && hasTeleportLocation()) {
+			startLocation = getTeleportLocation();
+		}
+
+		// Calculate a default location
+		if(startLocation == null) {
+			// Set to block in the middle, y configured in the config
+			Vector regionMin = worldGuardInterface.getMinimumPoint(worldguardRegion);
+			Vector regionMax = worldGuardInterface.getMaximumPoint(worldguardRegion);
+			Vector middle = regionMin.clone().midpoint(regionMax);
+			String configSetting = getRegion().getStringSetting("general.teleportLocationY");
+			if("bottom".equalsIgnoreCase(configSetting)) {
+				middle = middle.setY(regionMin.getBlockY());
+			} else if("top".equalsIgnoreCase(configSetting)) {
+				middle = middle.setY(regionMax.getBlockY());
+			} else if("middle".equalsIgnoreCase(configSetting)) {
+				middle = middle.setY(middle.getBlockY());
+			} else {
+				try {
+					int vertical = Integer.parseInt(configSetting);
+					middle = middle.setY(vertical);
+				} catch(NumberFormatException e) {
+					AreaShop.warn("Could not parse general.teleportLocationY: '" + configSetting + "'");
+				}
+			}
+			startLocation = new Location(getRegion().getWorld(), middle.getX(), middle.getY(), middle.getZ(), player.getLocation().getYaw(), player.getLocation().getPitch());
+		}
+
+		// Set location in the center of the block
+		startLocation.setX(startLocation.getBlockX() + 0.5);
+		startLocation.setZ(startLocation.getBlockZ() + 0.5);
+
+		return startLocation;
+	}
+
+
+}

AreaShop/src/main/java/me/wiefferink/areashop/features/WorldGuardRegionFlagsFeature.java

@@ -6,61 +6,87 @@ import com.sk89q.worldguard.protection.flags.InvalidFlagFormat;
 import com.sk89q.worldguard.protection.flags.RegionGroupFlag;
 import com.sk89q.worldguard.protection.regions.ProtectedRegion;
 import me.wiefferink.areashop.AreaShop;
-import me.wiefferink.areashop.events.notify.RegionUpdateEvent;
-import me.wiefferink.areashop.messages.Message;
+import me.wiefferink.areashop.events.notify.UpdateRegionEvent;
+import me.wiefferink.areashop.interfaces.RegionAccessSet;
+import me.wiefferink.areashop.interfaces.WorldGuardInterface;
 import me.wiefferink.areashop.regions.GeneralRegion;
+import me.wiefferink.interactivemessenger.processing.Message;
 import org.bukkit.configuration.ConfigurationSection;
 import org.bukkit.event.EventHandler;
-import org.bukkit.event.Listener;
 
+import javax.annotation.Nonnull;
+import javax.inject.Inject;
+import javax.inject.Singleton;
+import java.util.Objects;
 import java.util.Set;
+import java.util.UUID;
 
-public class WorldGuardRegionFlagsFeature extends Feature implements Listener {
+@Singleton
+public class WorldGuardRegionFlagsFeature extends RegionFeature {
 
+	@Inject
+	private WorldGuardInterface worldGuardInterface;
+	@Inject
+	private WorldGuardPlugin worldGuard;
+	
+	@Inject
+	WorldGuardRegionFlagsFeature(@Nonnull AreaShop plugin) {
+		super(plugin);
+	}
 
 	@EventHandler
-	public void regionUpdate(RegionUpdateEvent event) {
+	public void regionUpdate(UpdateRegionEvent event) {
 		updateRegionFlags(event.getRegion());
 	}
 
 	/**
-	 * Set the region flags/options to the values of a ConfigurationSection
+	 * Set the region flags/options to the values of a ConfigurationSection.
 	 * @param region The region to update the flags for
 	 * @return true if the flags have been set correctly, otherwise false
 	 */
-	protected boolean updateRegionFlags(GeneralRegion region) {
+	private boolean updateRegionFlags(GeneralRegion region) {
 		boolean result = true;
 
-		// General region flags
-		String allPath = "flagProfiles."+region.getStringSetting("general.flagProfile")+".ALL";
-		ConfigurationSection generalFlags = plugin.getConfig().getConfigurationSection(allPath);
-		if(plugin.getConfig().isSet(allPath) && generalFlags != null) { // Explicitely check if it is set, so don't apply if only in the default config
-			result = updateRegionFlags(region, generalFlags);
+		// Get section defining the region flag profile
+		ConfigurationSection flagProfileSection = region.getConfigurationSectionSetting("general.flagProfile", "flagProfiles");
+		if(flagProfileSection == null) {
+			return false;
 		}
 
-		// Specific region flags
-		String specificPath = "flagProfiles."+region.getStringSetting("general.flagProfile")+"."+region.getState().getValue();
-		if(plugin.getConfig().isSet(specificPath)) { // Do no apply default flags if they are removed from the active config
-			ConfigurationSection specificFlags = plugin.getConfig().getConfigurationSection(specificPath);
-			result = result && specificFlags != null && updateRegionFlags(region, specificFlags);
+		// Region flags for all states
+		ConfigurationSection allFlags = flagProfileSection.getConfigurationSection("ALL");
+		if(allFlags != null) {
+			result = updateRegionFlags(region, allFlags);
 		}
+
+		// Region flags for the current state
+		ConfigurationSection stateFlags = flagProfileSection.getConfigurationSection(region.getState().getValue());
+
+		// If in reselling mode, fallback to 'resale' section if 'resell' is not found (legacy configuration problem: https://github.com/NLthijs48/AreaShop/issues/303)
+		if(stateFlags == null && region.getState() == GeneralRegion.RegionState.RESELL) {
+			stateFlags = flagProfileSection.getConfigurationSection("resale");
+		}
+		if(stateFlags != null) {
+			result &= updateRegionFlags(region, stateFlags);
+		}
+
 		return result;
 	}
+
 	/**
-	 * Set the region flags/options to the values of a ConfigurationSection
+	 * Set the region flags/options to the values of a ConfigurationSection.
 	 * @param region The region to update the flags for
-	 * @param flags The flags to apply
+	 * @param flags  The flags to apply
 	 * @return true if the flags have been set correctly, otherwise false
 	 */
-	protected boolean updateRegionFlags(GeneralRegion region, ConfigurationSection flags) {
+	private boolean updateRegionFlags(GeneralRegion region, ConfigurationSection flags) {
 		boolean result = true;
 
 		Set<String> flagNames = flags.getKeys(false);
-		WorldGuardPlugin worldGuard = plugin.getWorldGuard();
 
 		// Get the region
-		ProtectedRegion wRegion = region.getRegion();
-		if(wRegion == null) {
+		ProtectedRegion worldguardRegion = region.getRegion();
+		if(worldguardRegion == null) {
 			AreaShop.debug("Region '" + region.getName() + "' does not exist, setting flags failed");
 			return false;
 		}
@@ -68,54 +94,60 @@ public class WorldGuardRegionFlagsFeature extends Feature implements Listener {
 		for(String flagName : flagNames) {
 			String value = Message.fromString(flags.getString(flagName)).replacements(region).getPlain();
 			// In the config normal Bukkit color codes are used, those only need to be translated on 5.X WorldGuard versions
-			if(plugin.getWorldGuard().getDescription().getVersion().startsWith("5.")) {
+			if(worldGuard.getDescription().getVersion().startsWith("5.")) {
 				value = translateBukkitToWorldGuardColors(value);
 			}
 			if(flagName.equalsIgnoreCase("members")) {
-				plugin.getWorldGuardHandler().setMembers(wRegion, value);
+				worldGuardInterface.setMembers(worldguardRegion, parseAccessSet(value));
 				//AreaShop.debug("  Flag " + flagName + " set: " + members.toUserFriendlyString());
 			} else if(flagName.equalsIgnoreCase("owners")) {
-				plugin.getWorldGuardHandler().setOwners(wRegion, value);
+				worldGuardInterface.setOwners(worldguardRegion, parseAccessSet(value));
 				//AreaShop.debug("  Flag " + flagName + " set: " + owners.toUserFriendlyString());
 			} else if(flagName.equalsIgnoreCase("priority")) {
 				try {
 					int priority = Integer.parseInt(value);
-					wRegion.setPriority(priority);
+					if(worldguardRegion.getPriority() != priority) {
+						worldguardRegion.setPriority(priority);
+					}
 					//AreaShop.debug("  Flag " + flagName + " set: " + value);
 				} catch(NumberFormatException e) {
-					plugin.getLogger().warning("The value of flag " + flagName + " is not a number");
+					AreaShop.warn("The value of flag " + flagName + " is not a number");
 					result = false;
 				}
 			} else if(flagName.equalsIgnoreCase("parent")) {
-				if(region.getWorld() == null || worldGuard.getRegionManager(region.getWorld()) == null) {
+				if(region.getWorld() == null || plugin.getRegionManager(region.getWorld()) == null) {
 					continue;
 				}
-				ProtectedRegion parentRegion = worldGuard.getRegionManager(region.getWorld()).getRegion(value);
+				ProtectedRegion parentRegion = plugin.getRegionManager(region.getWorld()).getRegion(value);
 				if(parentRegion != null) {
-					try {
-						wRegion.setParent(parentRegion);
-						//AreaShop.debug("  Flag " + flagName + " set: " + value);
-					} catch(ProtectedRegion.CircularInheritanceException e) {
-						plugin.getLogger().warning("The parent set in the config is not correct (circular inheritance)");
+					if(!parentRegion.equals(worldguardRegion.getParent())) {
+						try {
+							worldguardRegion.setParent(parentRegion);
+							//AreaShop.debug("  Flag " + flagName + " set: " + value);
+						} catch(ProtectedRegion.CircularInheritanceException e) {
+							AreaShop.warn("The parent set in the config is not correct (circular inheritance)");
+						}
 					}
 				} else {
-					plugin.getLogger().warning("The parent set in the config is not correct (region does not exist)");
+					AreaShop.warn("The parent set in the config is not correct (region does not exist)");
 				}
 			} else {
 				// Parse all other normal flags (groups are also handled)
 				String flagSetting = null;
 				com.sk89q.worldguard.protection.flags.RegionGroup groupValue = null;
 
-				Flag<?> foundFlag = plugin.getWorldGuardHandler().fuzzyMatchFlag(flagName);
+				Flag<?> foundFlag = worldGuardInterface.fuzzyMatchFlag(flagName);
 				if(foundFlag == null) {
-					plugin.getLogger().warning("Found wrong flag in flagProfiles section: " + flagName + ", check if that is the correct WorldGuard flag");
+					AreaShop.warn("Found wrong flag in flagProfiles section: " + flagName + ", check if that is the correct WorldGuard flag");
 					continue;
 				}
 				RegionGroupFlag groupFlag = foundFlag.getRegionGroupFlag();
 				if(value == null || value.isEmpty()) {
-					wRegion.setFlag(foundFlag, null);
-					if(groupFlag != null) {
-						wRegion.setFlag(groupFlag, null);
+					if(worldguardRegion.getFlag(foundFlag) != null) {
+						worldguardRegion.setFlag(foundFlag, null);
+					}
+					if(groupFlag != null && worldguardRegion.getFlag(groupFlag) != null) {
+						worldguardRegion.setFlag(groupFlag, null);
 					}
 					//AreaShop.debug("  Flag " + flagName + " reset (+ possible group of flag)");
 				} else {
@@ -126,9 +158,9 @@ public class WorldGuardRegionFlagsFeature extends Feature implements Listener {
 							if(part.startsWith("g:")) {
 								if(part.length() > 2) {
 									try {
-										groupValue = plugin.getWorldGuardHandler().parseFlagGroupInput(groupFlag, part.substring(2));
+										groupValue = worldGuardInterface.parseFlagGroupInput(groupFlag, part.substring(2));
 									} catch(InvalidFlagFormat e) {
-										plugin.getLogger().warning("Found wrong group value for flag " + flagName);
+										AreaShop.warn("Found wrong group value for flag " + flagName);
 									}
 								}
 							} else {
@@ -142,18 +174,18 @@ public class WorldGuardRegionFlagsFeature extends Feature implements Listener {
 					}
 					if(flagSetting != null) {
 						try {
-							setFlag(wRegion, foundFlag, flagSetting);
+							setFlag(worldguardRegion, foundFlag, flagSetting);
 							//AreaShop.debug("  Flag " + flagName + " set: " + flagSetting);
 						} catch(InvalidFlagFormat e) {
-							plugin.getLogger().warning("Found wrong value for flag " + flagName);
+							AreaShop.warn("Found wrong value for flag " + flagName);
 						}
 					}
 					if(groupValue != null) {
 						if(groupValue == groupFlag.getDefault()) {
-							wRegion.setFlag(groupFlag, null);
+							worldguardRegion.setFlag(groupFlag, null);
 							//AreaShop.debug("    Group of flag " + flagName + " set to default: " + groupValue);
 						} else {
-							wRegion.setFlag(groupFlag, groupValue);
+							worldguardRegion.setFlag(groupFlag, groupValue);
 							//AreaShop.debug("    Group of flag " + flagName + " set: " + groupValue);
 						}
 					}
@@ -161,28 +193,68 @@ public class WorldGuardRegionFlagsFeature extends Feature implements Listener {
 			}
 		}
 		// Indicate that the regions needs to be saved
-		plugin.getFileManager().saveIsRequiredForRegionWorld(region.getWorldName());
+		if(worldGuard.getDescription().getVersion().startsWith("5.")) {
+			plugin.getFileManager().saveIsRequiredForRegionWorld(region.getWorldName());
+		}
 		return result;
 	}
 
 	/**
-	 * Set a WorldGuard region flag
-	 * @param region The WorldGuard region to set
-	 * @param flag   The flag to set
-	 * @param value  The value to set the flag to
-	 * @param <V> They type of flag to set
-	 * @throws InvalidFlagFormat When the value of the flag is wrong
+	 * Build an RegionAccessSet from an input that specifies player names, player uuids and groups.
+	 * @param input Input string defining the access set
+	 * @return RegionAccessSet containing the entities parsed from the input
 	 */
-	private <V> void setFlag(ProtectedRegion region, Flag<V> flag, String value) throws InvalidFlagFormat {
-		region.setFlag(flag, plugin.getWorldGuardHandler().parseFlagInput(flag, value));
+	public RegionAccessSet parseAccessSet(String input) {
+		RegionAccessSet result = new RegionAccessSet();
+
+		String[] inputParts = input.split(", ");
+		for(String access : inputParts) {
+			if(access != null && !access.isEmpty()) {
+				// Check for groups
+				if(access.startsWith("g:")) {
+					if(access.length() > 2) {
+						result.getGroupNames().add(access.substring(2));
+					}
+				} else if(access.startsWith("n:")) {
+					if(access.length() > 2) {
+						result.getPlayerNames().add(access.substring(2));
+					}
+				} else {
+					try {
+						result.getPlayerUniqueIds().add(UUID.fromString(access));
+					} catch(IllegalArgumentException e) {
+						AreaShop.warn("Tried using '" + access + "' as uuid for a region member/owner, is your flagProfiles section correct?");
+					}
+				}
+			}
+		}
+
+		return result;
 	}
 
 	/**
-	 * Translate the color codes you put in greeting/farewell messages to the weird color codes of WorldGuard
+	 * Set a WorldGuard region flag.
+	 * @param region The WorldGuard region to set
+	 * @param flag   The flag to set
+	 * @param value  The value to set the flag to
+	 * @param <V>    They type of flag to set
+	 * @throws InvalidFlagFormat When the value of the flag is wrong
+	 */
+	private <V> void setFlag(ProtectedRegion region, Flag<V> flag, String value) throws InvalidFlagFormat {
+		V current = region.getFlag(flag);
+		V next = worldGuardInterface.parseFlagInput(flag, value);
+
+		if(!Objects.equals(current, next)) {
+			region.setFlag(flag, next);
+		}
+	}
+
+	/**
+	 * Translate the color codes you put in greeting/farewell messages to the weird color codes of WorldGuard.
 	 * @param message The message where the color codes should be translated (this message has bukkit color codes)
 	 * @return The string with the WorldGuard color codes
 	 */
-	public String translateBukkitToWorldGuardColors(String message) {
+	private String translateBukkitToWorldGuardColors(String message) {
 		String result = message;
 		result = result.replace("&c", "&r");
 		result = result.replace("&4", "&R");

AreaShop/src/main/java/me/wiefferink/areashop/features/signs/RegionSign.java

@@ -0,0 +1,295 @@
+package me.wiefferink.areashop.features.signs;
+
+import com.google.common.base.Objects;
+import com.google.inject.assistedinject.Assisted;
+import com.google.inject.assistedinject.AssistedInject;
+import io.github.bakedlibs.dough.blocks.BlockPosition;
+import io.papermc.lib.PaperLib;
+import me.wiefferink.areashop.AreaShop;
+import me.wiefferink.areashop.managers.SignErrorLogger;
+import me.wiefferink.areashop.nms.BlockBehaviourHelper;
+import me.wiefferink.areashop.regions.GeneralRegion;
+import me.wiefferink.areashop.tools.Materials;
+import me.wiefferink.areashop.tools.SignUtils;
+import me.wiefferink.areashop.tools.Utils;
+import me.wiefferink.interactivemessenger.processing.Message;
+import org.bukkit.Bukkit;
+import org.bukkit.Location;
+import org.bukkit.Material;
+import org.bukkit.block.Block;
+import org.bukkit.block.BlockFace;
+import org.bukkit.block.BlockState;
+import org.bukkit.block.Sign;
+import org.bukkit.block.data.BlockData;
+import org.bukkit.block.data.type.WallSign;
+import org.bukkit.configuration.ConfigurationSection;
+import org.bukkit.configuration.file.YamlConfiguration;
+import org.bukkit.entity.Player;
+
+import javax.annotation.Nonnull;
+import java.util.ArrayList;
+import java.util.List;
+
+/**
+ * Sign that is connected to a region to display information and interact with the region.
+ */
+public class RegionSign {
+
+	private final BlockBehaviourHelper blockHelper;
+	private final SignErrorLogger errorLogger;
+
+	private final SignsFeature signsFeature;
+	private final String key;
+
+
+	@AssistedInject
+	RegionSign(
+			@Nonnull BlockBehaviourHelper blockBehaviourHelper,
+			@Nonnull SignErrorLogger signErrorLogger,
+			@Assisted @Nonnull SignsFeature signsFeature,
+			@Assisted @Nonnull String key
+	) {
+		this.blockHelper = blockBehaviourHelper;
+		this.errorLogger = signErrorLogger;
+		this.signsFeature = signsFeature;
+		this.key = key;
+	}
+
+	public BlockPosition getPosition() {
+		return new BlockPosition(getLocation());
+	}
+
+	/**
+	 * Get the location of this sign.
+	 * @return The location of this sign
+	 */
+	public Location getLocation() {
+		return Utils.configToLocation(getRegion().getConfig().getConfigurationSection("general.signs." + key + ".location"));
+	}
+
+	/**
+	 * Location string to be used as key in maps.
+	 * @return Location string
+	 */
+	public String getStringLocation() {
+		return SignsFeature.locationToString(getLocation());
+	}
+
+	/**
+	 * Chunk string to be used as key in maps.
+	 * @return Chunk string
+	 */
+	public String getStringChunk() {
+		return SignsFeature.chunkToString(getLocation());
+	}
+
+	/**
+	 * Get the region this sign is linked to.
+	 * @return The region this sign is linked to
+	 */
+	public GeneralRegion getRegion() {
+		return signsFeature.getRegion();
+	}
+
+	/**
+	 * Remove this sign from the region.
+	 */
+	public void remove() {
+		Location location = getLocation();
+		if (location != null && location.getWorld() != null) {
+			location.getBlock().setType(Material.AIR);
+			this.signsFeature.signManager().removeSign(this);
+		}
+		getRegion().setSetting("general.signs." + key, null);
+		// Remove the sign from the region's sign manager
+	}
+
+	/**
+	 * Get the ConfigurationSection defining the sign layout.
+	 * @return The sign layout config
+	 */
+	public ConfigurationSection getProfile() {
+		return getRegion().getConfigurationSectionSetting("general.signProfile", "signProfiles", getRegion().getConfig().get("general.signs." + key + ".profile"));
+	}
+
+	/**
+	 * Get the facing of the sign as saved in the config.
+	 * @return BlockFace the sign faces, or null if unknown
+	 */
+	public BlockFace getFacing() {
+		try {
+			return BlockFace.valueOf(getRegion().getConfig().getString("general.signs." + key + ".facing"));
+		} catch(NullPointerException | IllegalArgumentException e) {
+			return null;
+		}
+	}
+
+	/**
+	 * Get the material of the sign as saved in the config.
+	 * @return Material of the sign,Material.AIR if none.
+	 */
+	public Material getMaterial() {
+		String name = getRegion().getConfig().getString("general.signs." + key + ".signType");
+		Material result = Materials.signNameToMaterial(name);
+		return result == null ? Material.AIR : result;
+	}
+
+	/**
+	 * Update this sign.
+	 * @return true if the update was successful, otherwise false
+	 */
+	public boolean update() {
+		// Ignore updates of signs in chunks that are not loaded
+		Location signLocation = getLocation();
+		if(signLocation == null
+				|| signLocation.getWorld() == null
+				|| !signLocation.getWorld().isChunkLoaded(signLocation.getBlockX() >> 4, signLocation.getBlockZ() >> 4)) {
+			return false;
+		}
+
+		if(getRegion().isDeleted()) {
+			return false;
+		}
+
+		YamlConfiguration regionConfig = getRegion().getConfig();
+		ConfigurationSection signConfig = getProfile();
+		Block block = signLocation.getBlock();
+		if(signConfig == null || !signConfig.isSet(getRegion().getState().getValue())) {
+			block.setType(Material.AIR);
+			return true;
+		}
+
+		ConfigurationSection stateConfig = signConfig.getConfigurationSection(getRegion().getState().getValue());
+
+		// Get the lines
+		String[] signLines = new String[4];
+		boolean signEmpty = true;
+		for(int i = 0; i < 4; i++) {
+			signLines[i] = stateConfig.getString("line" + (i + 1));
+			signEmpty &= (signLines[i] == null || signLines[i].isEmpty());
+		}
+		if(signEmpty) {
+			block.setType(Material.AIR);
+			return true;
+		}
+
+		// Place the sign back (with proper rotation and type) after it has been hidden or (indirectly) destroyed
+		if(!Materials.isSign(block.getType())) {
+			Material signType = getMaterial();
+			if (!blockHelper.canPlace(block.getLocation(), Bukkit.createBlockData(signType))) {
+				errorLogger.submitWarning("Setting sign" +  key +  "of region" + getRegion().getName() +  "failed, could not set sign block back");
+				this.remove();
+				return false;
+			}
+			// Don't do physics here, we first need to update the direction
+			block.setType(signType, false);
+
+			BlockState blockState = PaperLib.getBlockState(block, false).getState();
+			BlockData blockData = blockState.getBlockData();
+
+			if(blockData instanceof WallSign) {
+				((WallSign) blockData).setFacing(getFacing());
+			} else if(blockData instanceof org.bukkit.block.data.type.Sign) {
+				((org.bukkit.block.data.type.Sign) blockData).setRotation(getFacing());
+			} else {
+				errorLogger.submitWarning("Failed to update the facing direction of the sign at" + getStringLocation() + "to " + getFacing() + ", region:" + getRegion().getName());
+				return false;
+			}
+			block.setBlockData(blockData);
+
+			// Check if the sign has popped
+			if(!Materials.isSign(block.getType())) {
+				return false;
+			}
+		}
+
+		// Save current rotation and type
+		if(!regionConfig.isString("general.signs." + key + ".signType")) {
+			getRegion().setSetting("general.signs." + key + ".signType", block.getType().name());
+		}
+		if(!regionConfig.isString("general.signs." + key + ".facing")) {
+			BlockFace signFacing = SignUtils.getSignFacing(block);
+			getRegion().setSetting("general.signs." + key + ".facing", signFacing == null ? null : signFacing.toString());
+		}
+
+		// Apply replacements and color and then set it on the sign
+		Sign signState = (Sign) PaperLib.getBlockState(block, false).getState();
+		for(int i = 0; i < signLines.length; i++) {
+			if(signLines[i] == null) {
+				signState.setLine(i, "");
+				continue;
+			}
+			signLines[i] = Message.fromString(signLines[i]).replacements(getRegion()).getSingle();
+			signLines[i] = Utils.applyColors(signLines[i]);
+			signState.setLine(i, signLines[i]);
+		}
+		signState.update(false, false);
+		return true;
+	}
+
+	/**
+	 * Check if the sign needs to update periodically.
+	 * @return true if it needs periodic updates, otherwise false
+	 */
+	public boolean needsPeriodicUpdate() {
+		ConfigurationSection signConfig = getProfile();
+		if(signConfig == null || !signConfig.isSet(getRegion().getState().getValue().toLowerCase())) {
+			return false;
+		}
+
+		ConfigurationSection stateConfig = signConfig.getConfigurationSection(getRegion().getState().getValue().toLowerCase());
+		if(stateConfig == null) {
+			return false;
+		}
+
+		// Check the lines for the timeleft tag
+		for(int i = 1; i <= 4; i++) {
+			String line = stateConfig.getString("line" + i);
+			if(line != null && line.contains(Message.VARIABLE_START + AreaShop.tagTimeLeft + Message.VARIABLE_END)) {
+				return true;
+			}
+		}
+		return false;
+	}
+
+	/**
+	 * Run commands when a player clicks a sign.
+	 * @param clicker   The player that clicked the sign
+	 * @param clickType The type of clicking
+	 * @return true if the commands ran successfully, false if any of them failed
+	 */
+	public boolean runSignCommands(Player clicker, GeneralRegion.ClickType clickType) {
+		ConfigurationSection signConfig = getProfile();
+		if(signConfig == null) {
+			return false;
+		}
+		ConfigurationSection stateConfig = signConfig.getConfigurationSection(getRegion().getState().getValue().toLowerCase());
+
+		// Run player commands if specified
+		List<String> playerCommands = new ArrayList<>();
+		for(String command : stateConfig.getStringList(clickType.getValue() + "Player")) {
+			// TODO move variable checking code to InteractiveMessenger?
+			playerCommands.add(command.replace(Message.VARIABLE_START + AreaShop.tagClicker + Message.VARIABLE_END, clicker.getName()));
+		}
+		getRegion().runCommands(clicker, playerCommands);
+
+		// Run console commands if specified
+		List<String> consoleCommands = new ArrayList<>();
+		for(String command : stateConfig.getStringList(clickType.getValue() + "Console")) {
+			consoleCommands.add(command.replace(Message.VARIABLE_START + AreaShop.tagClicker + Message.VARIABLE_END, clicker.getName()));
+		}
+		getRegion().runCommands(Bukkit.getConsoleSender(), consoleCommands);
+
+		return !playerCommands.isEmpty() || !consoleCommands.isEmpty();
+	}
+
+	@Override
+	public boolean equals(Object object) {
+		return object instanceof RegionSign && ((RegionSign)object).getRegion().equals(this.getRegion()) && ((RegionSign)object).key.equals(this.key);
+	}
+
+	@Override
+	public int hashCode() {
+		return Objects.hashCode(key, getRegion().getName());
+	}
+}

AreaShop/src/main/java/me/wiefferink/areashop/features/signs/SignCache.java

@@ -0,0 +1,81 @@
+package me.wiefferink.areashop.features.signs;
+
+import io.github.bakedlibs.dough.blocks.BlockPosition;
+import io.github.bakedlibs.dough.blocks.ChunkPosition;
+import org.bukkit.Location;
+
+import java.util.ArrayList;
+import java.util.Collection;
+import java.util.Collections;
+import java.util.HashMap;
+import java.util.HashSet;
+import java.util.Map;
+import java.util.Optional;
+
+public class SignCache {
+
+    private final Map<Long, RegionSign> allSigns = new HashMap<>();
+    private final Map<Long, Collection<RegionSign>> signsByChunk = new HashMap<>();
+
+    public Optional<RegionSign> signAtLocation(long position) {
+        return Optional.ofNullable(this.allSigns.get(position));
+    }
+
+    public Collection<RegionSign> signsAtChunk(long position) {
+        return Collections.unmodifiableCollection(this.signsByChunk.getOrDefault(position, Collections.emptyList()));
+    }
+
+    public Collection<RegionSign> allSigns() {
+        return Collections.unmodifiableCollection(this.allSigns.values());
+    }
+
+    public Collection<BlockPosition> allSignLocations() {
+        Collection<BlockPosition> positions = new ArrayList<>(this.signsByChunk.size());
+        for (RegionSign sign : this.allSigns.values()) {
+            positions.add(sign.getPosition());
+        }
+        return positions;
+    }
+
+    public void addSign(RegionSign regionSign) {
+        BlockPosition blockPosition = regionSign.getPosition();
+        this.allSigns.put(blockPosition.getPosition(), regionSign);
+        ChunkPosition chunkPosition = new ChunkPosition(blockPosition.getChunk());
+        Collection<RegionSign> signs = this.signsByChunk.computeIfAbsent(chunkPosition.getPosition(), x -> new HashSet<>());
+        signs.add(regionSign);
+    }
+
+    public Optional<RegionSign> removeSign(Location location) {
+        return removeSign(new BlockPosition(location));
+    }
+
+    public Optional<RegionSign> removeSign(BlockPosition position) {
+        RegionSign removed = this.allSigns.remove(position.getPosition());
+        if (removed != null) {
+            Location location = position.toLocation();
+            this.signsByChunk.remove(new ChunkPosition(location).getPosition());
+            // Remove the sign from the region
+        }
+        return Optional.ofNullable(removed);
+    }
+
+    public void removeSign(RegionSign regionSign) {
+        BlockPosition blockPosition = regionSign.getPosition();
+        this.allSigns.remove(blockPosition.getPosition());
+        ChunkPosition chunkPosition = new ChunkPosition(blockPosition.getChunk());
+        long packedChunkPos = chunkPosition.getPosition();
+        Collection<RegionSign> signs = this.signsByChunk.get(packedChunkPos);
+        if (signs != null) {
+            signs.remove(regionSign);
+            if (signs.isEmpty()) {
+                this.signsByChunk.remove(packedChunkPos);
+            }
+        }
+    }
+
+    public void clear() {
+        this.allSigns.clear();
+        this.signsByChunk.clear();
+    }
+
+}

AreaShop/src/main/java/me/wiefferink/areashop/features/signs/SignFactory.java

@@ -0,0 +1,10 @@
+package me.wiefferink.areashop.features.signs;
+
+
+import javax.annotation.Nonnull;
+
+public interface SignFactory {
+
+    @Nonnull RegionSign createRegionSign(@Nonnull SignsFeature signsFeature, @Nonnull String key);
+
+}

AreaShop/src/main/java/me/wiefferink/areashop/features/signs/SignListener.java

@@ -0,0 +1,450 @@
+package me.wiefferink.areashop.features.signs;
+
+import com.sk89q.worldguard.protection.managers.RegionManager;
+import com.sk89q.worldguard.protection.regions.ProtectedRegion;
+import io.github.bakedlibs.dough.blocks.ChunkPosition;
+import me.wiefferink.areashop.AreaShop;
+import me.wiefferink.areashop.MessageBridge;
+import me.wiefferink.areashop.events.ask.AddingRegionEvent;
+import me.wiefferink.areashop.events.notify.UpdateRegionEvent;
+import me.wiefferink.areashop.interfaces.WorldGuardInterface;
+import me.wiefferink.areashop.managers.IFileManager;
+import me.wiefferink.areashop.managers.SignLinkerManager;
+import me.wiefferink.areashop.nms.BlockBehaviourHelper;
+import me.wiefferink.areashop.regions.BuyRegion;
+import me.wiefferink.areashop.regions.GeneralRegion;
+import me.wiefferink.areashop.regions.RegionFactory;
+import me.wiefferink.areashop.regions.RentRegion;
+import me.wiefferink.areashop.tools.Materials;
+import me.wiefferink.areashop.tools.SignUtils;
+import me.wiefferink.areashop.tools.Utils;
+import me.wiefferink.bukkitdo.Do;
+import org.bukkit.Chunk;
+import org.bukkit.Material;
+import org.bukkit.block.Block;
+import org.bukkit.entity.Player;
+import org.bukkit.event.EventHandler;
+import org.bukkit.event.EventPriority;
+import org.bukkit.event.Listener;
+import org.bukkit.event.block.Action;
+import org.bukkit.event.block.BlockBreakEvent;
+import org.bukkit.event.block.BlockPhysicsEvent;
+import org.bukkit.event.block.SignChangeEvent;
+import org.bukkit.event.player.PlayerInteractEvent;
+import org.bukkit.event.world.ChunkLoadEvent;
+
+import javax.annotation.Nonnull;
+import java.util.ArrayList;
+import java.util.Collection;
+import java.util.HashSet;
+import java.util.List;
+import java.util.Optional;
+import java.util.Set;
+
+public class SignListener implements Listener {
+
+    private final BlockBehaviourHelper behaviourHelper;
+    private final AreaShop plugin;
+    private final MessageBridge messageBridge;
+    private final SignManager signManager;
+    private final SignLinkerManager signLinkerManager;
+    private final WorldGuardInterface worldGuardInterface;
+    private final RegionFactory regionFactory;
+    private final IFileManager fileManager;
+
+    public SignListener(
+                        @Nonnull AreaShop plugin,
+                        @Nonnull BlockBehaviourHelper behaviourHelper,
+                        @Nonnull RegionFactory regionFactory,
+                        @Nonnull MessageBridge messageBridge,
+                        @Nonnull SignLinkerManager signLinkerManager,
+                        @Nonnull WorldGuardInterface worldGuardInterface,
+                        @Nonnull SignManager signManager,
+                        @Nonnull IFileManager fileManager) {
+        this.fileManager = fileManager;
+        this.signManager = signManager;
+        this.signLinkerManager = signLinkerManager;
+        this.regionFactory = regionFactory;
+        this.behaviourHelper = behaviourHelper;
+        this.plugin = plugin;
+        this.worldGuardInterface = worldGuardInterface;
+        this.messageBridge = messageBridge;
+    }
+
+    @EventHandler(ignoreCancelled = true, priority = EventPriority.MONITOR)
+    public void regionUpdate(UpdateRegionEvent event) {
+        Optional<SignsFeature> signsFeature = event.getRegion().getFeature(SignsFeature.class);
+        signsFeature.map(SignsFeature::signManager).ifPresent(SignManager::update);
+    }
+
+
+    @EventHandler(priority = EventPriority.MONITOR)
+    public void onChunkLoad(ChunkLoadEvent event) {
+        Chunk chunk = event.getChunk();
+        Optional<SignCache> optional = this.signManager.getCacheForWorld(chunk.getWorld());
+        if (optional.isEmpty()) {
+            return;
+        }
+        final SignCache signCache = optional.get();
+        Collection<RegionSign> chunkSigns = new ArrayList<>(signCache.signsAtChunk(ChunkPosition.getAsLong(chunk.getX(), chunk.getZ())));
+        if(chunkSigns.isEmpty()) {
+            return;
+        }
+        Do.forAll(chunkSigns, RegionSign::update);
+    }
+
+    @EventHandler(priority = EventPriority.HIGHEST, ignoreCancelled = true)
+    public void onIndirectSignBreak(BlockPhysicsEvent event) {
+        // Check if the block is a sign
+        if(!Materials.isSign(event.getBlock().getType()) || behaviourHelper.isBlockValid(event.getBlock())) {
+            return;
+        }
+
+        // Check if the sign is really the same as a saved rent
+        final Optional<RegionSign> optionalSign = this.signManager.signFromLocation(event.getBlock().getLocation());
+        if(optionalSign.isEmpty()) {
+            return;
+        }
+        RegionSign regionSign = optionalSign.get();
+
+        // Remove the sign so that it does not fall on the floor as an item (next region update will place it back when possible)
+        AreaShop.debug("onIndirectSignBreak: Removed block of sign for", regionSign.getRegion().getName(), "at", regionSign.getStringLocation());
+        event.getBlock().setType(Material.AIR);
+        event.setCancelled(true);
+    }
+
+
+
+    @EventHandler(priority = EventPriority.HIGH)
+    public void onSignBreak(BlockBreakEvent event) {
+        if(event.isCancelled()) {
+            return;
+        }
+        Block block = event.getBlock();
+        // Check if it is a sign
+        if(Materials.isSign(block.getType())) {
+            // Check if the rent sign is really the same as a saved rent
+            Optional<RegionSign> optional = signManager.signFromLocation(block.getLocation());
+            if(optional.isEmpty()) {
+                return;
+            }
+            RegionSign regionSign = optional.get();
+            // Remove the sign of the rental region if the player has permission
+            if(event.getPlayer().hasPermission("areashop.delsign")) {
+                signManager.removeSign(regionSign);
+                messageBridge.message(event.getPlayer(), "delsign-success", regionSign.getRegion());
+            } else { // Cancel the breaking of the sign
+                event.setCancelled(true);
+                messageBridge.message(event.getPlayer(), "delsign-noPermission", regionSign.getRegion());
+            }
+        }
+    }
+
+    @EventHandler(priority = EventPriority.HIGH, ignoreCancelled = true)
+    public void onSignClick(PlayerInteractEvent event) {
+        Block block = event.getClickedBlock();
+        if (block == null) {
+            return;
+        }
+
+        // Only listen to left and right clicks on blocks
+        if (!(event.getAction() == Action.RIGHT_CLICK_BLOCK || event.getAction() == Action.LEFT_CLICK_BLOCK)) {
+            return;
+        }
+
+        // Only care about clicking blocks
+        if(!Materials.isSign(block.getType())) {
+            return;
+        }
+
+        // Check if this sign belongs to a region
+        Optional<RegionSign> optional = signManager.signFromLocation(block.getLocation());
+        if(optional.isEmpty()) {
+            return;
+        }
+        RegionSign regionSign = optional.get();
+
+        // Ignore players that are in sign link mode (which will handle the event itself)
+        Player player = event.getPlayer();
+        if(signLinkerManager.isInSignLinkMode(player)) {
+            return;
+        }
+
+        // Get the clicktype
+        GeneralRegion.ClickType clickType = null;
+        if(player.isSneaking() && event.getAction() == Action.LEFT_CLICK_BLOCK) {
+            clickType = GeneralRegion.ClickType.SHIFTLEFTCLICK;
+        } else if(!player.isSneaking() && event.getAction() == Action.LEFT_CLICK_BLOCK) {
+            clickType = GeneralRegion.ClickType.LEFTCLICK;
+        } else if(player.isSneaking() && event.getAction() == Action.RIGHT_CLICK_BLOCK) {
+            clickType = GeneralRegion.ClickType.SHIFTRIGHTCLICK;
+        } else if(!player.isSneaking() && event.getAction() == Action.RIGHT_CLICK_BLOCK) {
+            clickType = GeneralRegion.ClickType.RIGHTCLICK;
+        }
+
+        boolean ran = regionSign.runSignCommands(player, clickType);
+
+        // Only cancel event if at least one command has been executed
+        event.setCancelled(ran);
+    }
+
+    @EventHandler(priority = EventPriority.MONITOR, ignoreCancelled = true)
+    public void onSignChange(SignChangeEvent event) {
+        Player player = event.getPlayer();
+        if(!plugin.isReady()) {
+            messageBridge.message(player, "general-notReady");
+            return;
+        }
+        // Check if the sign is meant for this plugin
+        if(event.getLine(0).contains(plugin.getConfig().getString("signTags.rent"))) {
+            if(!player.hasPermission("areashop.createrent") && !player.hasPermission("areashop.createrent.member") && !player.hasPermission("areashop.createrent.owner")) {
+                messageBridge.message(player, "setup-noPermissionRent");
+                return;
+            }
+            // Get the other lines
+            String secondLine = event.getLine(1);
+            String thirdLine = event.getLine(2);
+            String fourthLine = event.getLine(3);
+
+            // Get the regionManager for accessing regions
+            RegionManager regionManager = plugin.getRegionManager(event.getPlayer().getWorld());
+
+            // If the secondLine does not contain a name try to find the region by location
+            if(secondLine == null || secondLine.isEmpty()) {
+                Set<ProtectedRegion> regions = worldGuardInterface.getApplicableRegionsSet(event.getBlock().getLocation());
+                if(regions != null) {
+                    boolean first = true;
+                    ProtectedRegion candidate = null;
+                    for(ProtectedRegion pr : regions) {
+                        if(first) {
+                            candidate = pr;
+                            first = false;
+                        } else {
+                            if(pr.getPriority() > candidate.getPriority()) {
+                                candidate = pr;
+                            } else if(pr.getParent() != null && pr.getParent().equals(candidate)) {
+                                candidate = pr;
+                            } else {
+                                messageBridge.message(player, "setup-couldNotDetect", candidate.getId(), pr.getId());
+                                return;
+                            }
+                        }
+                    }
+                    if(candidate != null) {
+                        secondLine = candidate.getId();
+                    }
+                }
+            }
+
+            boolean priceSet = fourthLine != null && !fourthLine.isEmpty();
+            boolean durationSet = thirdLine != null && !thirdLine.isEmpty();
+            // check if all the lines are correct
+            if(secondLine == null || secondLine.isEmpty()) {
+                messageBridge.message(player, "setup-noRegion");
+                return;
+            }
+            ProtectedRegion region = regionManager.getRegion(secondLine);
+            if(region == null) {
+                messageBridge.message(player, "cmd-noRegion", secondLine);
+                return;
+            }
+
+            IFileManager.AddResult addResult = fileManager.checkRegionAdd(player, regionManager.getRegion(secondLine), event.getPlayer().getWorld(), GeneralRegion.RegionType.RENT);
+            if(addResult == IFileManager.AddResult.BLACKLISTED) {
+                messageBridge.message(player, "setup-blacklisted", secondLine);
+            } else if(addResult == IFileManager.AddResult.ALREADYADDED) {
+                messageBridge.message(player, "setup-alreadyRentSign");
+            } else if(addResult == IFileManager.AddResult.ALREADYADDEDOTHERWORLD) {
+                messageBridge.message(player, "setup-alreadyOtherWorld");
+            } else if(addResult == IFileManager.AddResult.NOPERMISSION) {
+                messageBridge.message(player, "setup-noPermission", secondLine);
+            } else if(thirdLine != null && !thirdLine.isEmpty() && !Utils.checkTimeFormat(thirdLine)) {
+                messageBridge.message(player, "setup-wrongDuration");
+            } else {
+                double price = 0.0;
+                if(priceSet) {
+                    // Check the fourth line
+                    try {
+                        price = Double.parseDouble(fourthLine);
+                    } catch(NumberFormatException e) {
+                        messageBridge.message(player, "setup-wrongPrice");
+                        return;
+                    }
+                }
+
+                // Add rent to the FileManager
+                final RentRegion rent = regionFactory.createRentRegion(secondLine, event.getPlayer().getWorld());
+                boolean isMember = worldGuardInterface.containsMember(rent.getRegion(), player.getUniqueId());
+                boolean isOwner = worldGuardInterface.containsOwner(rent.getRegion(), player.getUniqueId());
+                boolean landlord = (!player.hasPermission("areashop.createrent")
+                        && ((player.hasPermission("areashop.createrent.owner") && isOwner)
+                        || (player.hasPermission("areashop.createrent.member") && isMember)));
+
+                if(landlord) {
+                    rent.setLandlord(player.getUniqueId(), player.getName());
+                }
+                if(priceSet) {
+                    rent.setPrice(price);
+                }
+                if(durationSet) {
+                    rent.setDuration(thirdLine);
+                }
+                rent.getSignsFeature().addSign(event.getBlock().getLocation(), event.getBlock().getType(), SignUtils.getSignFacing(event.getBlock()), null);
+
+                AddingRegionEvent addingRegionEvent = plugin.getFileManager().addRegion(rent);
+                if (addingRegionEvent.isCancelled()) {
+                    messageBridge.message(player, "general-cancelled", addingRegionEvent.getReason());
+                    return;
+                }
+
+                rent.handleSchematicEvent(GeneralRegion.RegionEvent.CREATED);
+                messageBridge.message(player, "setup-rentSuccess", rent);
+                // Update the region after the event has written its lines
+                Do.sync(rent::update);
+            }
+        } else if(event.getLine(0).contains(plugin.getConfig().getString("signTags.buy"))) {
+            // Check for permission
+            if(!player.hasPermission("areashop.createbuy") && !player.hasPermission("areashop.createbuy.member") && !player.hasPermission("areashop.createbuy.owner")) {
+                messageBridge.message(player, "setup-noPermissionBuy");
+                return;
+            }
+
+            // Get the other lines
+            String secondLine = event.getLine(1);
+            String thirdLine = event.getLine(2);
+
+            // Get the regionManager for accessing regions
+            RegionManager regionManager = plugin.getRegionManager(event.getPlayer().getWorld());
+
+            // If the secondLine does not contain a name try to find the region by location
+            if(secondLine == null || secondLine.isEmpty()) {
+                Set<ProtectedRegion> regions = worldGuardInterface.getApplicableRegionsSet(event.getBlock().getLocation());
+                if(regions != null) {
+                    boolean first = true;
+                    ProtectedRegion candidate = null;
+                    for(ProtectedRegion pr : regions) {
+                        if(first) {
+                            candidate = pr;
+                            first = false;
+                        } else {
+                            if(pr.getPriority() > candidate.getPriority()) {
+                                candidate = pr;
+                            } else if(pr.getParent() != null && pr.getParent().equals(candidate)) {
+                                candidate = pr;
+                            } else {
+                                messageBridge.message(player, "setup-couldNotDetect", candidate.getId(), pr.getId());
+                                return;
+                            }
+                        }
+                    }
+                    if(candidate != null) {
+                        secondLine = candidate.getId();
+                    }
+                }
+            }
+
+            boolean priceSet = thirdLine != null && !thirdLine.isEmpty();
+            // Check if all the lines are correct
+            if(secondLine == null || secondLine.isEmpty()) {
+                messageBridge.message(player, "setup-noRegion");
+                return;
+            }
+            ProtectedRegion region = regionManager.getRegion(secondLine);
+            if(region == null) {
+                messageBridge.message(player, "cmd-noRegion", secondLine);
+                return;
+            }
+            IFileManager.AddResult addResult = plugin.getFileManager().checkRegionAdd(player, region, event.getPlayer().getWorld(), GeneralRegion.RegionType.BUY);
+            if(addResult == IFileManager.AddResult.BLACKLISTED) {
+                messageBridge.message(player, "setup-blacklisted", secondLine);
+            } else if(addResult == IFileManager.AddResult.ALREADYADDED) {
+                messageBridge.message(player, "setup-alreadyRentSign");
+            } else if(addResult == IFileManager.AddResult.ALREADYADDEDOTHERWORLD) {
+                messageBridge.message(player, "setup-alreadyOtherWorld");
+            } else if(addResult == IFileManager.AddResult.NOPERMISSION) {
+                messageBridge.message(player, "setup-noPermission", secondLine);
+            } else {
+                double price = 0.0;
+                if(priceSet) {
+                    // Check the fourth line
+                    try {
+                        price = Double.parseDouble(thirdLine);
+                    } catch(NumberFormatException e) {
+                        messageBridge.message(player, "setup-wrongPrice");
+                        return;
+                    }
+                }
+
+                // Add buy to the FileManager
+                final BuyRegion buy = regionFactory.createBuyRegion(secondLine, event.getPlayer().getWorld());
+                boolean isMember = worldGuardInterface.containsMember(buy.getRegion(), player.getUniqueId());
+                boolean isOwner = worldGuardInterface.containsOwner(buy.getRegion(), player.getUniqueId());
+                boolean landlord = (!player.hasPermission("areashop.createbuy")
+                        && ((player.hasPermission("areashop.createbuy.owner") && isOwner)
+                        || (player.hasPermission("areashop.createbuy.member") && isMember)));
+
+                if(landlord) {
+                    buy.setLandlord(player.getUniqueId(), player.getName());
+                }
+                if(priceSet) {
+                    buy.setPrice(price);
+                }
+                buy.getSignsFeature().addSign(event.getBlock().getLocation(), event.getBlock().getType(), SignUtils.getSignFacing(event.getBlock()), null);
+
+                AddingRegionEvent addingRegionEvent = plugin.getFileManager().addRegion(buy);
+                if (addingRegionEvent.isCancelled()) {
+                    messageBridge.message(player, "general-cancelled", addingRegionEvent.getReason());
+                    return;
+                }
+
+                buy.handleSchematicEvent(GeneralRegion.RegionEvent.CREATED);
+                messageBridge.message(player, "setup-buySuccess", buy);
+                // Update the region after the event has written its lines
+                Do.sync(buy::update);
+            }
+        } else if(event.getLine(0).contains(plugin.getConfig().getString("signTags.add"))) {
+            // Check for permission
+            if(!player.hasPermission("areashop.addsign")) {
+                messageBridge.message(player, "addsign-noPermission");
+                return;
+            }
+
+            // Get the other lines
+            String secondLine = event.getLine(1);
+            String thirdLine = event.getLine(2);
+
+            GeneralRegion region;
+            if(secondLine != null && !secondLine.isEmpty()) {
+                // Get region by secondLine of the sign
+                region = fileManager.getRegion(secondLine);
+                if(region == null) {
+                    messageBridge.message(player, "addSign-notRegistered", secondLine);
+                    return;
+                }
+            } else {
+                // Get region by sign position
+                List<GeneralRegion> regions = Utils.getImportantRegions(event.getBlock().getLocation());
+                if(regions.isEmpty()) {
+                    messageBridge.message(player, "addsign-noRegions");
+                    return;
+                } else if(regions.size() > 1) {
+                    messageBridge.message(player, "addsign-couldNotDetectSign", regions.get(0).getName(), regions.get(1).getName());
+                    return;
+                }
+                region = regions.get(0);
+            }
+
+            if(thirdLine == null || thirdLine.isEmpty()) {
+                region.getSignsFeature().addSign(event.getBlock().getLocation(), event.getBlock().getType(), SignUtils.getSignFacing(event.getBlock()), null);
+                messageBridge.message(player, "addsign-success", region);
+            } else {
+                region.getSignsFeature().addSign(event.getBlock().getLocation(), event.getBlock().getType(), SignUtils.getSignFacing(event.getBlock()), thirdLine);
+                messageBridge.message(player, "addsign-successProfile", thirdLine, region);
+            }
+
+            // Update the region later because this event will do it first
+            Do.sync(region::update);
+        }
+    }
+
+}

AreaShop/src/main/java/me/wiefferink/areashop/features/signs/SignManager.java

@@ -0,0 +1,109 @@
+package me.wiefferink.areashop.features.signs;
+
+import io.github.bakedlibs.dough.blocks.BlockPosition;
+import me.wiefferink.areashop.AreaShop;
+import me.wiefferink.areashop.managers.Manager;
+import org.bukkit.Location;
+import org.bukkit.World;
+
+import java.util.Collection;
+import java.util.HashMap;
+import java.util.HashSet;
+import java.util.Map;
+import java.util.Optional;
+import java.util.Set;
+
+public class SignManager extends Manager {
+
+    private final Map<World, SignCache> signCacheMap = new HashMap<>();
+
+    public Collection<BlockPosition> allSignLocations() {
+        final Set<BlockPosition> set = new HashSet<>(signCacheMap.size());
+        for (SignCache signCache : signCacheMap.values()) {
+            set.addAll(signCache.allSignLocations());
+        }
+        return set;
+    }
+
+    public Collection<RegionSign> allSigns() {
+        final Set<RegionSign> signs = new HashSet<>(signCacheMap.size());
+        for (SignCache signCache : signCacheMap.values()) {
+            signs.addAll(signCache.allSigns());
+        }
+        return signs;
+    }
+
+    public SignCache cacheForWorld(World world) {
+        return this.signCacheMap.computeIfAbsent(world, x -> new SignCache());
+    }
+
+    public Optional<SignCache> getCacheForWorld(World world) {
+        return Optional.ofNullable(this.signCacheMap.get(world));
+    }
+
+    public Optional<RegionSign> signFromLocation(Location location) {
+        final World world = location.getWorld();
+        return getCacheForWorld(world)
+                .flatMap(cache -> cache.signAtLocation(BlockPosition.getAsLong(location)));
+    }
+
+    public void addSign(RegionSign regionSign) {
+        Location location = regionSign.getLocation();
+        cacheForWorld(location.getWorld()).addSign(regionSign);
+    }
+
+    public void removeSign(RegionSign regionSign) {
+        Location location = regionSign.getLocation();
+        if (location.getWorld() == null) {
+            return;
+        }
+        cacheForWorld(location.getWorld()).removeSign(regionSign);
+    }
+
+    public Optional<RegionSign> removeSign(Location location) {
+        if (location == null || location.getWorld() == null) {
+            return Optional.empty();
+        }
+        return getCacheForWorld(location.getWorld()).flatMap(cache -> cache.removeSign(location));
+    }
+
+    /**
+     * Update all signs connected to this region.
+     * @return true if all signs are updated correctly, false if one or more updates failed
+     */
+    public boolean update() {
+        boolean result = true;
+        for (SignCache signCache : this.signCacheMap.values())
+        for(RegionSign sign : signCache.allSigns()) {
+            result &= sign.update();
+        }
+        return result;
+    }
+
+    /**
+     * Check if any of the signs need periodic updating.
+     * @return true if one or more of the signs need periodic updating, otherwise false
+     */
+    public boolean needsPeriodicUpdate() {
+        boolean result = false;
+        for (SignCache signCache : this.signCacheMap.values()) {
+            for (RegionSign sign : signCache.allSigns()) {
+                if (result) {
+                    break;
+                }
+                if (sign.needsPeriodicUpdate()) {
+                    result = true;
+                    break;
+                }
+            }
+        }
+        return result;
+    }
+
+
+    public void shutdown() {
+        this.signCacheMap.values().forEach(SignCache::clear);
+        this.signCacheMap.clear();
+    }
+
+}

AreaShop/src/main/java/me/wiefferink/areashop/features/signs/SignsFeature.java

@@ -0,0 +1,108 @@
+package me.wiefferink.areashop.features.signs;
+
+import com.google.inject.assistedinject.Assisted;
+import com.google.inject.assistedinject.AssistedInject;
+import io.github.bakedlibs.dough.blocks.BlockPosition;
+import io.github.bakedlibs.dough.blocks.ChunkPosition;
+import me.wiefferink.areashop.AreaShop;
+import me.wiefferink.areashop.features.RegionFeature;
+import me.wiefferink.areashop.regions.GeneralRegion;
+import me.wiefferink.areashop.tools.Utils;
+import org.bukkit.Location;
+import org.bukkit.Material;
+import org.bukkit.block.BlockFace;
+import org.bukkit.configuration.ConfigurationSection;
+
+import javax.annotation.Nonnull;
+import java.util.HashMap;
+import java.util.Map;
+
+public class SignsFeature extends RegionFeature {
+
+	private final SignManager internalSignManager = new SignManager();
+	private final SignManager globalSignManager;
+	private final SignFactory signFactory;
+	/**
+	 * Constructor.
+	 * @param region The region to bind to
+	 */
+	@AssistedInject
+	SignsFeature(@Nonnull AreaShop plugin,
+						@Nonnull SignManager signManager,
+						@Nonnull SignFactory signFactory,
+						@Assisted @Nonnull GeneralRegion region
+	) {
+		super(plugin);
+		this.globalSignManager = signManager;
+		this.signFactory = signFactory;
+		setRegion(region);
+		// Setup current signs
+		ConfigurationSection signSection = region.getConfig().getConfigurationSection("general.signs");
+		if (signSection == null) {
+			return;
+		}
+		for(String signKey : signSection.getKeys(false)) {
+			RegionSign sign = signFactory.createRegionSign(this, signKey);
+			Location location = sign.getLocation();
+			if(location == null) {
+				AreaShop.warn("Sign with key " + signKey + " of region " + region.getName() + " does not have a proper location");
+				continue;
+			}
+			this.globalSignManager.cacheForWorld(location.getWorld()).addSign(sign);
+			this.internalSignManager.addSign(sign);
+		}
+	}
+
+	/**
+	 * Convert a location to a string to use as map key.
+	 * @param location The location to get the key for
+	 * @return A string to use in a map for a location
+	 */
+	public static String locationToString(Location location) {
+		return location.getWorld().getName() + ";" + location.getBlockX() + ";" + location.getBlockY() + ";" + location.getBlockZ();
+	}
+
+	/**
+	 * Convert a chunk to a string to use as map key.
+	 * @param location The location to get the key for
+	 * @return A string to use in a map for a chunk
+	 */
+	public static String chunkToString(Location location) {
+		return location.getWorld().getName() + ";" + (location.getBlockX() >> 4) + ";" + (location.getBlockZ() >> 4);
+	}
+
+	@Override
+	public void shutdown() {
+
+	}
+
+	public SignManager signManager() {
+		return this.internalSignManager;
+	}
+
+	/**
+	 * Add a sign to this region.
+	 * @param location The location of the sign
+	 * @param signType The type of the sign (WALL_SIGN or SIGN_POST)
+	 * @param facing   The orientation of the sign
+	 * @param profile  The profile to use with this sign (null for default)
+	 */
+	public void addSign(Location location, Material signType, BlockFace facing, String profile) {
+		int i = 0;
+		while(getRegion().getConfig().isSet("general.signs." + i)) {
+			i++;
+		}
+		String signPath = "general.signs." + i + ".";
+		getRegion().setSetting(signPath + "location", Utils.locationToConfig(location));
+		getRegion().setSetting(signPath + "facing", facing != null ? facing.name() : null);
+		getRegion().setSetting(signPath + "signType", signType != null ? signType.name() : null);
+		if(profile != null && !profile.isEmpty()) {
+			getRegion().setSetting(signPath + "profile", profile);
+		}
+		// Add to the map
+		RegionSign regionSign = this.signFactory.createRegionSign(this, String.valueOf(i));
+		this.globalSignManager.addSign(regionSign);
+		this.internalSignManager.addSign(regionSign);
+	}
+
+}

AreaShop/src/main/java/me/wiefferink/areashop/features/signs/SignsModule.java

@@ -0,0 +1,50 @@
+package me.wiefferink.areashop.features.signs;
+
+import com.google.inject.AbstractModule;
+import com.google.inject.Provides;
+import com.google.inject.Singleton;
+import com.google.inject.assistedinject.FactoryModuleBuilder;
+import me.wiefferink.areashop.AreaShop;
+import me.wiefferink.areashop.MessageBridge;
+import me.wiefferink.areashop.interfaces.WorldGuardInterface;
+import me.wiefferink.areashop.managers.IFileManager;
+import me.wiefferink.areashop.managers.SignLinkerManager;
+import me.wiefferink.areashop.nms.BlockBehaviourHelper;
+import me.wiefferink.areashop.regions.RegionFactory;
+
+import javax.annotation.Nonnull;
+
+public class SignsModule extends AbstractModule {
+
+    @Override
+    protected void configure() {
+        bind(SignManager.class).asEagerSingleton();
+        install(new FactoryModuleBuilder().build(SignFactory.class));
+    }
+
+    @Provides
+    @Singleton
+    public SignListener provideSignListener(@Nonnull AreaShop plugin,
+                                            @Nonnull BlockBehaviourHelper behaviourHelper,
+                                            @Nonnull RegionFactory regionFactory,
+                                            @Nonnull MessageBridge messageBridge,
+                                            @Nonnull SignLinkerManager signLinkerManager,
+                                            @Nonnull WorldGuardInterface worldGuardInterface,
+                                            @Nonnull SignManager signManager,
+                                            @Nonnull IFileManager fileManager
+    ) {
+        final SignListener signListener = new SignListener(
+                plugin,
+                behaviourHelper,
+                regionFactory,
+                messageBridge,
+                signLinkerManager,
+                worldGuardInterface,
+                signManager,
+                fileManager
+        );
+        plugin.getServer().getPluginManager().registerEvents(signListener, plugin);
+        return signListener;
+    }
+
+}

AreaShop/src/main/java/me/wiefferink/areashop/lib/Metrics.java

@@ -1,743 +0,0 @@
-/*
- * Copyright 2011-2013 Tyler Blair. All rights reserved.
- *
- * Redistribution and use in source and binary forms, with or without modification, are
- * permitted provided that the following conditions are met:
- *
- *    1. Redistributions of source code must retain the above copyright notice, this list of
- *       conditions and the following disclaimer.
- *
- *    2. Redistributions in binary form must reproduce the above copyright notice, this list
- *       of conditions and the following disclaimer in the documentation and/or other materials
- *       provided with the distribution.
- *
- * THIS SOFTWARE IS PROVIDED BY THE AUTHOR ''AS IS'' AND ANY EXPRESS OR IMPLIED
- * WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND
- * FITNESS FOR A PARTICULAR PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL THE AUTHOR OR
- * CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR
- * CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR
- * SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON
- * ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT (INCLUDING
- * NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF
- * ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
- *
- * The views and conclusions contained in the software and documentation are those of the
- * authors and contributors and should not be interpreted as representing official policies,
- * either expressed or implied, of anybody else.
- */
-package me.wiefferink.areashop.lib;
-
-import org.bukkit.Bukkit;
-import org.bukkit.Server;
-import org.bukkit.configuration.InvalidConfigurationException;
-import org.bukkit.configuration.file.YamlConfiguration;
-import org.bukkit.entity.Player;
-import org.bukkit.plugin.Plugin;
-import org.bukkit.plugin.PluginDescriptionFile;
-import org.bukkit.scheduler.BukkitTask;
-
-import java.io.*;
-import java.lang.reflect.Method;
-import java.net.Proxy;
-import java.net.URL;
-import java.net.URLConnection;
-import java.net.URLEncoder;
-import java.util.*;
-import java.util.logging.Level;
-import java.util.zip.GZIPOutputStream;
-
-public class Metrics {
-
-    /**
-     * The current revision number
-     */
-    private final static int REVISION = 7;
-
-    /**
-     * The base url of the metrics domain
-     */
-    private static final String BASE_URL = "http://report.mcstats.org";
-
-    /**
-     * The url used to report a server's status
-     */
-    private static final String REPORT_URL = "/plugin/%s";
-
-    /**
-     * Interval of time to ping (in minutes)
-     */
-    private static final int PING_INTERVAL = 15;
-
-    /**
-     * The plugin this metrics submits for
-     */
-    private final Plugin plugin;
-
-    /**
-     * All of the custom graphs to submit to metrics
-     */
-    private final Set<Graph> graphs = Collections.synchronizedSet(new HashSet<Graph>());
-
-    /**
-     * The plugin configuration file
-     */
-    private final YamlConfiguration configuration;
-
-    /**
-     * The plugin configuration file
-     */
-    private final File configurationFile;
-
-    /**
-     * Unique server id
-     */
-    private final String guid;
-
-    /**
-     * Debug mode
-     */
-    private final boolean debug;
-
-    /**
-     * Lock for synchronization
-     */
-    private final Object optOutLock = new Object();
-
-    /**
-     * The scheduled task
-     */
-    private volatile BukkitTask task = null;
-
-    public Metrics(final Plugin plugin) throws IOException {
-        if(plugin == null) {
-            throw new IllegalArgumentException("Plugin cannot be null");
-        }
-
-        this.plugin = plugin;
-
-        // load the config
-        configurationFile = getConfigFile();
-        configuration = YamlConfiguration.loadConfiguration(configurationFile);
-
-        // add some defaults
-        configuration.addDefault("opt-out", false);
-        configuration.addDefault("guid", UUID.randomUUID().toString());
-        configuration.addDefault("debug", false);
-
-        // Do we need to create the file?
-        if(configuration.get("guid", null) == null) {
-            configuration.options().header("http://mcstats.org").copyDefaults(true);
-            configuration.save(configurationFile);
-        }
-
-        // Load the guid then
-        guid = configuration.getString("guid");
-        debug = configuration.getBoolean("debug", false);
-    }
-
-    /**
-     * Construct and create a Graph that can be used to separate specific plotters to their own graphs on the metrics
-     * website. Plotters can be added to the graph object returned.
-     * @param name The name of the graph
-     * @return Graph object created. Will never return NULL under normal circumstances unless bad parameters are given
-     */
-    public Graph createGraph(final String name) {
-        if(name == null) {
-            throw new IllegalArgumentException("Graph name cannot be null");
-        }
-
-        // Construct the graph object
-        final Graph graph = new Graph(name);
-
-        // Now we can add our graph
-        graphs.add(graph);
-
-        // and return back
-        return graph;
-    }
-
-    /**
-     * Add a Graph object to BukkitMetrics that represents data for the plugin that should be sent to the backend
-     * @param graph The name of the graph
-     */
-    public void addGraph(final Graph graph) {
-        if(graph == null) {
-            throw new IllegalArgumentException("Graph cannot be null");
-        }
-
-        graphs.add(graph);
-    }
-
-    /**
-     * Start measuring statistics. This will immediately create an async repeating task as the plugin and send the
-     * initial data to the metrics backend, and then after that it will post in increments of PING_INTERVAL * 1200
-     * ticks.
-     * @return True if statistics measuring is running, otherwise false.
-     */
-    public boolean start() {
-        synchronized(optOutLock) {
-            // Did we opt out?
-            if(isOptOut()) {
-                return false;
-            }
-
-            // Is metrics already running?
-            if(task != null) {
-                return true;
-            }
-
-            // Begin hitting the server with glorious data
-            task = plugin.getServer().getScheduler().runTaskTimerAsynchronously(plugin, new Runnable() {
-
-                private boolean firstPost = true;
-
-                public void run() {
-                    try {
-                        // This has to be synchronized or it can collide with the disable method.
-                        synchronized(optOutLock) {
-                            // Disable Task, if it is running and the server owner decided to opt-out
-                            if(isOptOut() && task != null) {
-                                task.cancel();
-                                task = null;
-                                // Tell all plotters to stop gathering information.
-                                for(Graph graph : graphs) {
-                                    graph.onOptOut();
-                                }
-                            }
-                        }
-
-                        // We use the inverse of firstPost because if it is the first time we are posting,
-                        // it is not a interval ping, so it evaluates to FALSE
-                        // Each time thereafter it will evaluate to TRUE, i.e PING!
-                        postPlugin(!firstPost);
-
-                        // After the first post we set firstPost to false
-                        // Each post thereafter will be a ping
-                        firstPost = false;
-                    } catch(IOException e) {
-                        if(debug) {
-                            Bukkit.getLogger().log(Level.INFO, "[Metrics] " + e.getMessage());
-                        }
-                    }
-                }
-            }, 0, PING_INTERVAL * 1200);
-
-            return true;
-        }
-    }
-
-    /**
-     * Has the server owner denied plugin metrics?
-     * @return true if metrics should be opted out of it
-     */
-    public boolean isOptOut() {
-        synchronized(optOutLock) {
-            try {
-                // Reload the metrics file
-                configuration.load(getConfigFile());
-            } catch(IOException ex) {
-                if(debug) {
-                    Bukkit.getLogger().log(Level.INFO, "[Metrics] " + ex.getMessage());
-                }
-                return true;
-            } catch(InvalidConfigurationException ex) {
-                if(debug) {
-                    Bukkit.getLogger().log(Level.INFO, "[Metrics] " + ex.getMessage());
-                }
-                return true;
-            }
-            return configuration.getBoolean("opt-out", false);
-        }
-    }
-
-    /**
-     * Enables metrics for the server by setting "opt-out" to false in the config file and starting the metrics task.
-     */
-    public void enable() throws IOException {
-        // This has to be synchronized or it can collide with the check in the task.
-        synchronized(optOutLock) {
-            // Check if the server owner has already set opt-out, if not, set it.
-            if(isOptOut()) {
-                configuration.set("opt-out", false);
-                configuration.save(configurationFile);
-            }
-
-            // Enable Task, if it is not running
-            if(task == null) {
-                start();
-            }
-        }
-    }
-
-    /**
-     * Disables metrics for the server by setting "opt-out" to true in the config file and canceling the metrics task.
-     */
-    public void disable() throws IOException {
-        // This has to be synchronized or it can collide with the check in the task.
-        synchronized(optOutLock) {
-            // Check if the server owner has already set opt-out, if not, set it.
-            if(!isOptOut()) {
-                configuration.set("opt-out", true);
-                configuration.save(configurationFile);
-            }
-
-            // Disable Task, if it is running
-            if(task != null) {
-                task.cancel();
-                task = null;
-            }
-        }
-    }
-
-    /**
-     * Gets the File object of the config file that should be used to store data such as the GUID and opt-out status
-     * @return the File object for the config file
-     */
-    public File getConfigFile() {
-        // I believe the easiest way to get the base folder (e.g craftbukkit set via -P) for plugins to use
-        // is to abuse the plugin object we already have
-        // plugin.getDataFolder() => base/plugins/PluginA/
-        // pluginsFolder => base/plugins/
-        // The base is not necessarily relative to the startup directory.
-        File pluginsFolder = plugin.getDataFolder().getParentFile();
-
-        // return => base/plugins/PluginMetrics/config.yml
-        return new File(new File(pluginsFolder, "PluginMetrics"), "config.yml");
-    }
-
-    /**
-     * Gets the online player (backwards compatibility)
-     * @return online player amount
-     */
-    private int getOnlinePlayers() {
-        try {
-            Method onlinePlayerMethod = Server.class.getMethod("getOnlinePlayers");
-            if(onlinePlayerMethod.getReturnType().equals(Collection.class)) {
-                return ((Collection<?>)onlinePlayerMethod.invoke(Bukkit.getServer())).size();
-            } else {
-                return ((Player[])onlinePlayerMethod.invoke(Bukkit.getServer())).length;
-            }
-        } catch(Exception ex) {
-            if(debug) {
-                Bukkit.getLogger().log(Level.INFO, "[Metrics] " + ex.getMessage());
-            }
-        }
-
-        return 0;
-    }
-
-    /**
-     * Generic method that posts a plugin to the metrics website
-     */
-    private void postPlugin(final boolean isPing) throws IOException {
-        // Server software specific section
-        PluginDescriptionFile description = plugin.getDescription();
-        String pluginName = description.getName();
-        boolean onlineMode = Bukkit.getServer().getOnlineMode(); // TRUE if online mode is enabled
-        String pluginVersion = description.getVersion();
-        String serverVersion = Bukkit.getVersion();
-        int playersOnline = this.getOnlinePlayers();
-
-        // END server software specific section -- all code below does not use any code outside of this class / Java
-
-        // Construct the post data
-        StringBuilder json = new StringBuilder(1024);
-        json.append('{');
-
-        // The plugin's description file containg all of the plugin data such as name, version, author, etc
-        appendJSONPair(json, "guid", guid);
-        appendJSONPair(json, "plugin_version", pluginVersion);
-        appendJSONPair(json, "server_version", serverVersion);
-        appendJSONPair(json, "players_online", Integer.toString(playersOnline));
-
-        // New data as of R6
-        String osname = System.getProperty("os.name");
-        String osarch = System.getProperty("os.arch");
-        String osversion = System.getProperty("os.version");
-        String java_version = System.getProperty("java.version");
-        int coreCount = Runtime.getRuntime().availableProcessors();
-
-        // normalize os arch .. amd64 -> x86_64
-        if(osarch.equals("amd64")) {
-            osarch = "x86_64";
-        }
-
-        appendJSONPair(json, "osname", osname);
-        appendJSONPair(json, "osarch", osarch);
-        appendJSONPair(json, "osversion", osversion);
-        appendJSONPair(json, "cores", Integer.toString(coreCount));
-        appendJSONPair(json, "auth_mode", onlineMode ? "1" : "0");
-        appendJSONPair(json, "java_version", java_version);
-
-        // If we're pinging, append it
-        if(isPing) {
-            appendJSONPair(json, "ping", "1");
-        }
-
-        if(graphs.size() > 0) {
-            synchronized(graphs) {
-                json.append(',');
-                json.append('"');
-                json.append("graphs");
-                json.append('"');
-                json.append(':');
-                json.append('{');
-
-                boolean firstGraph = true;
-
-                final Iterator<Graph> iter = graphs.iterator();
-
-                while(iter.hasNext()) {
-                    Graph graph = iter.next();
-
-                    StringBuilder graphJson = new StringBuilder();
-                    graphJson.append('{');
-
-                    for(Plotter plotter : graph.getPlotters()) {
-                        appendJSONPair(graphJson, plotter.getColumnName(), Integer.toString(plotter.getValue()));
-                    }
-
-                    graphJson.append('}');
-
-                    if(!firstGraph) {
-                        json.append(',');
-                    }
-
-                    json.append(escapeJSON(graph.getName()));
-                    json.append(':');
-                    json.append(graphJson);
-
-                    firstGraph = false;
-                }
-
-                json.append('}');
-            }
-        }
-
-        // close json
-        json.append('}');
-
-        // Create the url
-        URL url = new URL(BASE_URL + String.format(REPORT_URL, urlEncode(pluginName)));
-
-        // Connect to the website
-        URLConnection connection;
-
-        // Mineshafter creates a socks proxy, so we can safely bypass it
-        // It does not reroute POST requests so we need to go around it
-        if(isMineshafterPresent()) {
-            connection = url.openConnection(Proxy.NO_PROXY);
-        } else {
-            connection = url.openConnection();
-        }
-
-
-        byte[] uncompressed = json.toString().getBytes();
-        byte[] compressed = gzip(json.toString());
-
-        // Headers
-        connection.addRequestProperty("User-Agent", "MCStats/" + REVISION);
-        connection.addRequestProperty("Content-Type", "application/json");
-        connection.addRequestProperty("Content-Encoding", "gzip");
-        connection.addRequestProperty("Content-Length", Integer.toString(compressed.length));
-        connection.addRequestProperty("Accept", "application/json");
-        connection.addRequestProperty("Connection", "close");
-
-        connection.setDoOutput(true);
-
-        if(debug) {
-            System.out.println("[Metrics] Prepared request for " + pluginName + " uncompressed=" + uncompressed.length + " compressed=" + compressed.length);
-        }
-
-        // Write the data
-        OutputStream os = connection.getOutputStream();
-        os.write(compressed);
-        os.flush();
-
-        // Now read the response
-        final BufferedReader reader = new BufferedReader(new InputStreamReader(connection.getInputStream()));
-        String response = reader.readLine();
-
-        // close resources
-        os.close();
-        reader.close();
-
-        if(response == null || response.startsWith("ERR") || response.startsWith("7")) {
-            if(response == null) {
-                response = "null";
-            } else if(response.startsWith("7")) {
-                response = response.substring(response.startsWith("7,") ? 2 : 1);
-            }
-
-            throw new IOException(response);
-        } else {
-            // Is this the first update this hour?
-            if(response.equals("1") || response.contains("This is your first update this hour")) {
-                synchronized(graphs) {
-                    final Iterator<Graph> iter = graphs.iterator();
-
-                    while(iter.hasNext()) {
-                        final Graph graph = iter.next();
-
-                        for(Plotter plotter : graph.getPlotters()) {
-                            plotter.reset();
-                        }
-                    }
-                }
-            }
-        }
-    }
-
-    /**
-     * GZip compress a string of bytes
-     */
-    public static byte[] gzip(String input) {
-        ByteArrayOutputStream baos = new ByteArrayOutputStream();
-        GZIPOutputStream gzos = null;
-
-        try {
-            gzos = new GZIPOutputStream(baos);
-            gzos.write(input.getBytes("UTF-8"));
-        } catch(IOException e) {
-            e.printStackTrace();
-        } finally {
-            if(gzos != null) try {
-                gzos.close();
-            } catch(IOException ignore) {
-            }
-        }
-
-        return baos.toByteArray();
-    }
-
-    /**
-     * Check if mineshafter is present. If it is, we need to bypass it to send POST requests
-     * @return true if mineshafter is installed on the server
-     */
-    private boolean isMineshafterPresent() {
-        try {
-            Class.forName("mineshafter.MineServer");
-            return true;
-        } catch(Exception e) {
-            return false;
-        }
-    }
-
-    /**
-     * Appends a json encoded key/value pair to the given string builder.
-     */
-    private static void appendJSONPair(StringBuilder json, String key, String value) throws UnsupportedEncodingException {
-        boolean isValueNumeric = false;
-
-        try {
-            if(value.equals("0") || !value.endsWith("0")) {
-                Double.parseDouble(value);
-                isValueNumeric = true;
-            }
-        } catch(NumberFormatException e) {
-            isValueNumeric = false;
-        }
-
-        if(json.charAt(json.length() - 1) != '{') {
-            json.append(',');
-        }
-
-        json.append(escapeJSON(key));
-        json.append(':');
-
-        if(isValueNumeric) {
-            json.append(value);
-        } else {
-            json.append(escapeJSON(value));
-        }
-    }
-
-    /**
-     * Escape a string to create a valid JSON string
-     */
-    private static String escapeJSON(String text) {
-        StringBuilder builder = new StringBuilder();
-
-        builder.append('"');
-        for(int index = 0; index < text.length(); index++) {
-            char chr = text.charAt(index);
-
-            switch(chr) {
-                case '"':
-                case '\\':
-                    builder.append('\\');
-                    builder.append(chr);
-                    break;
-                case '\b':
-                    builder.append("\\b");
-                    break;
-                case '\t':
-                    builder.append("\\t");
-                    break;
-                case '\n':
-                    builder.append("\\n");
-                    break;
-                case '\r':
-                    builder.append("\\r");
-                    break;
-                default:
-                    if(chr < ' ') {
-                        String t = "000" + Integer.toHexString(chr);
-                        builder.append("\\u" + t.substring(t.length() - 4));
-                    } else {
-                        builder.append(chr);
-                    }
-                    break;
-            }
-        }
-        builder.append('"');
-
-        return builder.toString();
-    }
-
-    /**
-     * Encode text as UTF-8
-     * @param text the text to encode
-     * @return the encoded text, as UTF-8
-     */
-    private static String urlEncode(final String text) throws UnsupportedEncodingException {
-        return URLEncoder.encode(text, "UTF-8");
-    }
-
-    /**
-     * Represents a custom graph on the website
-     */
-    public static class Graph {
-
-        /**
-         * The graph's name, alphanumeric and spaces only :) If it does not comply to the above when submitted, it is
-         * rejected
-         */
-        private final String name;
-
-        /**
-         * The set of plotters that are contained within this graph
-         */
-        private final Set<Plotter> plotters = new LinkedHashSet<Plotter>();
-
-        private Graph(final String name) {
-            this.name = name;
-        }
-
-        /**
-         * Gets the graph's name
-         * @return the Graph's name
-         */
-        public String getName() {
-            return name;
-        }
-
-        /**
-         * Add a plotter to the graph, which will be used to plot entries
-         * @param plotter the plotter to add to the graph
-         */
-        public void addPlotter(final Plotter plotter) {
-            plotters.add(plotter);
-        }
-
-        /**
-         * Remove a plotter from the graph
-         * @param plotter the plotter to remove from the graph
-         */
-        public void removePlotter(final Plotter plotter) {
-            plotters.remove(plotter);
-        }
-
-        /**
-         * Gets an <b>unmodifiable</b> set of the plotter objects in the graph
-         * @return an unmodifiable {@link java.util.Set} of the plotter objects
-         */
-        public Set<Plotter> getPlotters() {
-            return Collections.unmodifiableSet(plotters);
-        }
-
-        @Override
-        public int hashCode() {
-            return name.hashCode();
-        }
-
-        @Override
-        public boolean equals(final Object object) {
-            if(!(object instanceof Graph)) {
-                return false;
-            }
-
-            final Graph graph = (Graph)object;
-            return graph.name.equals(name);
-        }
-
-        /**
-         * Called when the server owner decides to opt-out of BukkitMetrics while the server is running.
-         */
-        protected void onOptOut() {
-        }
-    }
-
-    /**
-     * Interface used to collect custom data for a plugin
-     */
-    public static abstract class Plotter {
-
-        /**
-         * The plot's name
-         */
-        private final String name;
-
-        /**
-         * Construct a plotter with the default plot name
-         */
-        public Plotter() {
-            this("Default");
-        }
-
-        /**
-         * Construct a plotter with a specific plot name
-         * @param name the name of the plotter to use, which will show up on the website
-         */
-        public Plotter(final String name) {
-            this.name = name;
-        }
-
-        /**
-         * Get the current value for the plotted point. Since this function defers to an external function it may or may
-         * not return immediately thus cannot be guaranteed to be thread friendly or safe. This function can be called
-         * from any thread so care should be taken when accessing resources that need to be synchronized.
-         * @return the current value for the point to be plotted.
-         */
-        public abstract int getValue();
-
-        /**
-         * Get the column name for the plotted point
-         * @return the plotted point's column name
-         */
-        public String getColumnName() {
-            return name;
-        }
-
-        /**
-         * Called after the website graphs have been updated
-         */
-        public void reset() {
-        }
-
-        @Override
-        public int hashCode() {
-            return getColumnName().hashCode();
-        }
-
-        @Override
-        public boolean equals(final Object object) {
-            if(!(object instanceof Plotter)) {
-                return false;
-            }
-
-            final Plotter plotter = (Plotter)object;
-            return plotter.name.equals(name) && plotter.getValue() == getValue();
-        }
-    }
-}

AreaShop/src/main/java/me/wiefferink/areashop/lib/Updater.java

@@ -1,750 +0,0 @@
-package me.wiefferink.areashop.lib;
-
-import me.wiefferink.areashop.AreaShop;
-import org.apache.commons.lang.exception.ExceptionUtils;
-import org.bukkit.configuration.file.YamlConfiguration;
-import org.bukkit.plugin.Plugin;
-import org.bukkit.scheduler.BukkitRunnable;
-import org.json.simple.JSONArray;
-import org.json.simple.JSONObject;
-import org.json.simple.JSONValue;
-
-import java.io.*;
-import java.net.MalformedURLException;
-import java.net.URL;
-import java.net.URLConnection;
-import java.util.Enumeration;
-import java.util.logging.Level;
-import java.util.zip.ZipEntry;
-import java.util.zip.ZipFile;
-
-/**
- * Check for updates on BukkitDev for a given plugin, and download the updates if needed.
- * <p/>
- * <b>VERY, VERY IMPORTANT</b>: Because there are no standards for adding auto-update toggles in your plugin's config, this system provides NO CHECK WITH YOUR CONFIG to make sure the user has allowed auto-updating.
- * <br>
- * It is a <b>BUKKIT POLICY</b> that you include a boolean value in your config that prevents the auto-updater from running <b>AT ALL</b>.
- * <br>
- * If you fail to include this option in your config, your plugin will be <b>REJECTED</b> when you attempt to submit it to dev.bukkit.org.
- * <p/>
- * An example of a good configuration option would be something similar to 'auto-update: true' - if this value is set to false you may NOT run the auto-updater.
- * <br>
- * If you are unsure about these rules, please read the plugin submission guidelines: http://goo.gl/8iU5l
- *
- * @author Gravity
- * @version 2.3
- */
-
-public class Updater {
-
-    /* Constants */
-
-    // Remote file's title
-    private static final String TITLE_VALUE = "name";
-    // Remote file's download link
-    private static final String LINK_VALUE = "downloadUrl";
-    // Remote file's release type
-    private static final String TYPE_VALUE = "releaseType";
-    // Remote file's build version
-    private static final String VERSION_VALUE = "gameVersion";
-    // Path to GET
-    private static final String QUERY = "/servermods/files?projectIds=";
-    // Slugs will be appended to this to get to the project's RSS feed
-    private static final String HOST = "https://api.curseforge.com";
-    // User-agent when querying Curse
-    private static final String USER_AGENT = "Updater (by Gravity)";
-    // Used for locating version numbers in file names
-    private static final String DELIMETER = "^V|[\\s_-]V";
-    // If the version number contains one of these, don't update.
-    private static final String[] NO_UPDATE_TAG = { "-DEV", "-PRE", "-SNAPSHOT" };
-    // Used for downloading files
-    private static final int BYTE_SIZE = 1024;
-    // Config key for api key
-    private static final String API_KEY_CONFIG_KEY = "api-key";
-    // Config key for disabling Updater
-    private static final String DISABLE_CONFIG_KEY = "disable";
-    // Default api key value in config
-    private static final String API_KEY_DEFAULT = "PUT_API_KEY_HERE";
-    // Default disable value in config
-    private static final boolean DISABLE_DEFAULT = false;
-
-    /* User-provided variables */
-
-    // Plugin running Updater
-    private final Plugin plugin;
-    // Type of update check to run
-    private final UpdateType type;
-    // Whether to announce file downloads
-    private final boolean announce;
-    // The plugin file (jar)
-    private final File file;
-    // The folder that downloads will be placed in
-    private final File updateFolder;
-    // The provided callback (if any)
-    private final UpdateCallback callback;
-    // Project's Curse ID
-    private int id = -1;
-    // BukkitDev ServerMods API key
-    private String apiKey = null;
-
-    /* Collected from Curse API */
-
-    private String versionName;
-    private String versionLink;
-    private String versionType;
-    private String versionGameVersion;
-
-    /* Update process variables */
-
-    // Connection to RSS
-    private URL url;
-    // Updater thread
-    private Thread thread;
-    // Used for determining the outcome of the update process
-    private Updater.UpdateResult result = Updater.UpdateResult.SUCCESS;
-
-    /**
-     * Gives the developer the result of the update process. Can be obtained by called {@link #getResult()}
-     */
-    public enum UpdateResult {
-        /**
-         * The updater found an update, and has readied it to be loaded the next time the server restarts/reloads.
-         */
-        SUCCESS,
-        /**
-         * The updater did not find an update, and nothing was downloaded.
-         */
-        NO_UPDATE,
-        /**
-         * The server administrator has disabled the updating system.
-         */
-        DISABLED,
-        /**
-         * The updater found an update, but was unable to download it.
-         */
-        FAIL_DOWNLOAD,
-        /**
-         * For some reason, the updater was unable to contact dev.bukkit.org to download the file.
-         */
-        FAIL_DBO,
-        /**
-         * When running the version check, the file on DBO did not contain a recognizable version.
-         */
-        FAIL_NOVERSION,
-        /**
-         * The id provided by the plugin running the updater was invalid and doesn't exist on DBO.
-         */
-        FAIL_BADID,
-        /**
-         * The server administrator has improperly configured their API key in the configuration.
-         */
-        FAIL_APIKEY,
-        /**
-         * The updater found an update, but because of the UpdateType being set to NO_DOWNLOAD, it wasn't downloaded.
-         */
-        UPDATE_AVAILABLE
-    }
-
-    /**
-     * Allows the developer to specify the type of update that will be run.
-     */
-    public enum UpdateType {
-        /**
-         * Run a version check, and then if the file is out of date, download the newest version.
-         */
-        DEFAULT,
-        /**
-         * Don't run a version check, just find the latest update and download it.
-         */
-        NO_VERSION_CHECK,
-        /**
-         * Get information about the version and the download size, but don't actually download anything.
-         */
-        NO_DOWNLOAD
-    }
-
-    /**
-     * Represents the various release types of a file on BukkitDev.
-     */
-    public enum ReleaseType {
-        /**
-         * An "alpha" file.
-         */
-        ALPHA,
-        /**
-         * A "beta" file.
-         */
-        BETA,
-        /**
-         * A "release" file.
-         */
-        RELEASE
-    }
-
-    /**
-     * Initialize the updater.
-     *
-     * @param plugin   The plugin that is checking for an update.
-     * @param id       The dev.bukkit.org id of the project.
-     * @param file     The file that the plugin is running from, get this by doing this.getFile() from within your main class.
-     * @param type     Specify the type of update this will be. See {@link UpdateType}
-     * @param announce True if the program should announce the progress of new updates in console.
-     */
-    public Updater(Plugin plugin, int id, File file, UpdateType type, boolean announce) {
-        this(plugin, id, file, type, null, announce);
-    }
-
-    /**
-     * Initialize the updater with the provided callback.
-     *
-     * @param plugin   The plugin that is checking for an update.
-     * @param id       The dev.bukkit.org id of the project.
-     * @param file     The file that the plugin is running from, get this by doing this.getFile() from within your main class.
-     * @param type     Specify the type of update this will be. See {@link UpdateType}
-     * @param callback The callback instance to notify when the Updater has finished
-     */
-    public Updater(Plugin plugin, int id, File file, UpdateType type, UpdateCallback callback) {
-        this(plugin, id, file, type, callback, false);
-    }
-
-    /**
-     * Initialize the updater with the provided callback.
-     *
-     * @param plugin   The plugin that is checking for an update.
-     * @param id       The dev.bukkit.org id of the project.
-     * @param file     The file that the plugin is running from, get this by doing this.getFile() from within your main class.
-     * @param type     Specify the type of update this will be. See {@link UpdateType}
-     * @param callback The callback instance to notify when the Updater has finished
-     * @param announce True if the program should announce the progress of new updates in console.
-     */
-    public Updater(Plugin plugin, int id, File file, UpdateType type, UpdateCallback callback, boolean announce) {
-        this.plugin = plugin;
-        this.type = type;
-        this.announce = announce;
-        this.file = file;
-        this.id = id;
-        this.updateFolder = this.plugin.getServer().getUpdateFolderFile();
-        this.callback = callback;
-
-        final File pluginFile = this.plugin.getDataFolder().getParentFile();
-        final File updaterFile = new File(pluginFile, "Updater");
-        final File updaterConfigFile = new File(updaterFile, "config.yml");
-
-        YamlConfiguration config = new YamlConfiguration();
-        config.options().header("This configuration file affects all plugins using the Updater system (version 2+ - http://forums.bukkit.org/threads/96681/ )" + '\n'
-                + "If you wish to use your API key, read http://wiki.bukkit.org/ServerMods_API and place it below." + '\n'
-                + "Some updating systems will not adhere to the disabled value, but these may be turned off in their plugin's configuration.");
-        config.addDefault(API_KEY_CONFIG_KEY, API_KEY_DEFAULT);
-        config.addDefault(DISABLE_CONFIG_KEY, DISABLE_DEFAULT);
-
-        if (!updaterFile.exists()) {
-            this.fileIOOrError(updaterFile, updaterFile.mkdir(), true);
-        }
-
-        boolean createFile = !updaterConfigFile.exists();
-        try {
-            if (createFile) {
-                this.fileIOOrError(updaterConfigFile, updaterConfigFile.createNewFile(), true);
-                config.options().copyDefaults(true);
-                config.save(updaterConfigFile);
-            } else {
-                config.load(updaterConfigFile);
-            }
-        } catch (final Exception e) {
-            final String message;
-            if (createFile) {
-                message = "The updater could not create configuration at " + updaterFile.getAbsolutePath();
-            } else {
-                message = "The updater could not load configuration at " + updaterFile.getAbsolutePath();
-            }
-            this.plugin.getLogger().log(Level.SEVERE, message, e);
-        }
-
-        if (config.getBoolean(DISABLE_CONFIG_KEY)) {
-            this.result = UpdateResult.DISABLED;
-            return;
-        }
-
-        String key = config.getString(API_KEY_CONFIG_KEY);
-        if (API_KEY_DEFAULT.equalsIgnoreCase(key) || "".equals(key)) {
-            key = null;
-        }
-
-        this.apiKey = key;
-
-        try {
-            this.url = new URL(Updater.HOST + Updater.QUERY + this.id);
-        } catch (final MalformedURLException e) {
-            this.plugin.getLogger().log(Level.SEVERE, "The project ID provided for updating, " + this.id + " is invalid.", e);
-            this.result = UpdateResult.FAIL_BADID;
-        }
-
-        if (this.result != UpdateResult.FAIL_BADID) {
-            this.thread = new Thread(new UpdateRunnable());
-            this.thread.start();
-        } else {
-            runUpdater();
-        }
-    }
-
-    /**
-     * Get the result of the update process.
-     *
-     * @return result of the update process.
-     * @see UpdateResult
-     */
-    public Updater.UpdateResult getResult() {
-        this.waitForThread();
-        return this.result;
-    }
-
-    /**
-     * Get the latest version's release type.
-     *
-     * @return latest version's release type.
-     * @see ReleaseType
-     */
-    public ReleaseType getLatestType() {
-        this.waitForThread();
-        if (this.versionType != null) {
-            for (ReleaseType type : ReleaseType.values()) {
-                if (this.versionType.equalsIgnoreCase(type.name())) {
-                    return type;
-                }
-            }
-        }
-        return null;
-    }
-
-    /**
-     * Get the latest version's game version (such as "CB 1.2.5-R1.0").
-     *
-     * @return latest version's game version.
-     */
-    public String getLatestGameVersion() {
-        this.waitForThread();
-        return this.versionGameVersion;
-    }
-
-    /**
-     * Get the latest version's name (such as "Project v1.0").
-     *
-     * @return latest version's name.
-     */
-    public String getLatestName() {
-        this.waitForThread();
-        return this.versionName;
-    }
-
-    /**
-     * Get the latest version's direct file link.
-     *
-     * @return latest version's file link.
-     */
-    public String getLatestFileLink() {
-        this.waitForThread();
-        return this.versionLink;
-    }
-
-    /**
-     * As the result of Updater output depends on the thread's completion, it is necessary to wait for the thread to finish
-     * before allowing anyone to check the result.
-     */
-    private void waitForThread() {
-        if ((this.thread != null) && this.thread.isAlive()) {
-            try {
-                this.thread.join();
-            } catch (final InterruptedException e) {
-                this.plugin.getLogger().log(Level.SEVERE, null, e);
-            }
-        }
-    }
-
-    /**
-     * Save an update from dev.bukkit.org into the server's update folder.
-     *
-     * @param file the name of the file to save it as.
-     */
-    private void saveFile(String file) {
-        final File folder = this.updateFolder;
-
-        deleteOldFiles();
-        if (!folder.exists()) {
-            this.fileIOOrError(folder, folder.mkdir(), true);
-        }
-        downloadFile();
-
-        // Check to see if it's a zip file, if it is, unzip it.
-        final File dFile = new File(folder.getAbsolutePath(), file);
-        if (dFile.getName().endsWith(".zip")) {
-            // Unzip
-            this.unzip(dFile.getAbsolutePath());
-        }
-        if (this.announce) {
-            this.plugin.getLogger().info("Finished updating.");
-        }
-    }
-
-    /**
-     * Download a file and save it to the specified folder.
-     */
-    private void downloadFile() {
-        BufferedInputStream in = null;
-        FileOutputStream fout = null;
-        try {
-            URL fileUrl = new URL(this.versionLink);
-            final int fileLength = fileUrl.openConnection().getContentLength();
-            in = new BufferedInputStream(fileUrl.openStream());
-            fout = new FileOutputStream(new File(this.updateFolder, file.getName()));
-
-            final byte[] data = new byte[Updater.BYTE_SIZE];
-            int count;
-            if (this.announce) {
-                this.plugin.getLogger().info("About to download a new update: " + this.versionName);
-            }
-            long downloaded = 0;
-            while ((count = in.read(data, 0, Updater.BYTE_SIZE)) != -1) {
-                downloaded += count;
-                fout.write(data, 0, count);
-                final int percent = (int) ((downloaded * 100) / fileLength);
-                if (this.announce && ((percent % 10) == 0)) {
-                    this.plugin.getLogger().info("Downloading update: " + percent + "% of " + fileLength + " bytes.");
-                }
-            }
-        } catch (Exception ex) {
-            this.plugin.getLogger().log(Level.WARNING, "The auto-updater tried to download a new update, but was unsuccessful.", ex);
-            this.result = Updater.UpdateResult.FAIL_DOWNLOAD;
-        } finally {
-            try {
-                if (in != null) {
-                    in.close();
-                }
-            } catch (final IOException ex) {
-                this.plugin.getLogger().log(Level.SEVERE, null, ex);
-            }
-            try {
-                if (fout != null) {
-                    fout.close();
-                }
-            } catch (final IOException ex) {
-                this.plugin.getLogger().log(Level.SEVERE, null, ex);
-            }
-        }
-    }
-
-    /**
-     * Remove possibly leftover files from the update folder.
-     */
-    private void deleteOldFiles() {
-        //Just a quick check to make sure we didn't leave any files from last time...
-        File[] list = listFilesOrError(this.updateFolder);
-        for (final File xFile : list) {
-            if (xFile.getName().endsWith(".zip")) {
-                this.fileIOOrError(xFile, xFile.mkdir(), true);
-            }
-        }
-    }
-
-    /**
-     * Part of Zip-File-Extractor, modified by Gravity for use with Updater.
-     *
-     * @param file the location of the file to extract.
-     */
-    private void unzip(String file) {
-        final File fSourceZip = new File(file);
-        try {
-            final String zipPath = file.substring(0, file.length() - 4);
-            ZipFile zipFile = new ZipFile(fSourceZip);
-            Enumeration<? extends ZipEntry> e = zipFile.entries();
-            while (e.hasMoreElements()) {
-                ZipEntry entry = e.nextElement();
-                File destinationFilePath = new File(zipPath, entry.getName());
-                this.fileIOOrError(destinationFilePath.getParentFile(), destinationFilePath.getParentFile().mkdirs(), true);
-                if (!entry.isDirectory()) {
-                    final BufferedInputStream bis = new BufferedInputStream(zipFile.getInputStream(entry));
-                    int b;
-                    final byte[] buffer = new byte[Updater.BYTE_SIZE];
-                    final FileOutputStream fos = new FileOutputStream(destinationFilePath);
-                    final BufferedOutputStream bos = new BufferedOutputStream(fos, Updater.BYTE_SIZE);
-                    while ((b = bis.read(buffer, 0, Updater.BYTE_SIZE)) != -1) {
-                        bos.write(buffer, 0, b);
-                    }
-                    bos.flush();
-                    bos.close();
-                    bis.close();
-                    final String name = destinationFilePath.getName();
-                    if (name.endsWith(".jar") && this.pluginExists(name)) {
-                        File output = new File(this.updateFolder, name);
-                        this.fileIOOrError(output, destinationFilePath.renameTo(output), true);
-                    }
-                }
-            }
-            zipFile.close();
-
-            // Move any plugin data folders that were included to the right place, Bukkit won't do this for us.
-            moveNewZipFiles(zipPath);
-
-        } catch (final IOException e) {
-            this.plugin.getLogger().log(Level.SEVERE, "The auto-updater tried to unzip a new update file, but was unsuccessful.", e);
-            this.result = Updater.UpdateResult.FAIL_DOWNLOAD;
-        } finally {
-            this.fileIOOrError(fSourceZip, fSourceZip.delete(), false);
-        }
-    }
-
-    /**
-     * Find any new files extracted from an update into the plugin's data directory.
-     * @param zipPath path of extracted files.
-     */
-    private void moveNewZipFiles(String zipPath) {
-        File[] list = listFilesOrError(new File(zipPath));
-        for (final File dFile : list) {
-            if (dFile.isDirectory() && this.pluginExists(dFile.getName())) {
-                // Current dir
-                final File oFile = new File(this.plugin.getDataFolder().getParent(), dFile.getName());
-                // List of existing files in the new dir
-                final File[] dList = listFilesOrError(dFile);
-                // List of existing files in the current dir
-                final File[] oList = listFilesOrError(oFile);
-                for (File cFile : dList) {
-                    // Loop through all the files in the new dir
-                    boolean found = false;
-                    for (final File xFile : oList) {
-                        // Loop through all the contents in the current dir to see if it exists
-                        if (xFile.getName().equals(cFile.getName())) {
-                            found = true;
-                            break;
-                        }
-                    }
-                    if (!found) {
-                        // Move the new file into the current dir
-                        File output = new File(oFile, cFile.getName());
-                        this.fileIOOrError(output, cFile.renameTo(output), true);
-                    } else {
-                        // This file already exists, so we don't need it anymore.
-                        this.fileIOOrError(cFile, cFile.delete(), false);
-                    }
-                }
-            }
-            this.fileIOOrError(dFile, dFile.delete(), false);
-        }
-        File zip = new File(zipPath);
-        this.fileIOOrError(zip, zip.delete(), false);
-    }
-
-    /**
-     * Check if the name of a jar is one of the plugins currently installed, used for extracting the correct files out of a zip.
-     *
-     * @param name a name to check for inside the plugins folder.
-     * @return true if a file inside the plugins folder is named this.
-     */
-    private boolean pluginExists(String name) {
-        File[] plugins = listFilesOrError(new File("plugins"));
-        for (final File file : plugins) {
-            if (file.getName().equals(name)) {
-                return true;
-            }
-        }
-        return false;
-    }
-
-    /**
-     * Check to see if the program should continue by evaluating whether the plugin is already updated, or shouldn't be updated.
-     *
-     * @return true if the version was located and is not the same as the remote's newest.
-     */
-    private boolean versionCheck() {
-        final String title = this.versionName;
-        if (this.type != UpdateType.NO_VERSION_CHECK) {
-			String localVersion = this.plugin.getDescription().getVersion();
-			if(localVersion.contains("#")) { // Strip build number
-				localVersion = localVersion.substring(0, localVersion.indexOf("#"));
-			}
-			if (title.split(DELIMETER).length == 2) {
-                // Get the newest file's version number
-                final String remoteVersion = title.split(DELIMETER)[1].split(" ")[0];
-
-                if (this.hasTag(localVersion) || !this.shouldUpdate(localVersion, remoteVersion)) {
-                    // We already have the latest version, or this build is tagged for no-update
-                    this.result = Updater.UpdateResult.NO_UPDATE;
-                    return false;
-                }
-            } else {
-                // The file's name did not contain the string 'vVersion'
-                final String authorInfo = this.plugin.getDescription().getAuthors().isEmpty() ? "" : " (" + this.plugin.getDescription().getAuthors().get(0) + ")";
-                this.plugin.getLogger().warning("The author of this plugin" + authorInfo + " has misconfigured their Auto Update system");
-                this.plugin.getLogger().warning("File versions should follow the format 'PluginName vVERSION'");
-                this.plugin.getLogger().warning("Please notify the author of this error.");
-                this.result = Updater.UpdateResult.FAIL_NOVERSION;
-                return false;
-            }
-        }
-        return true;
-    }
-
-    /**
-     * <b>If you wish to run mathematical versioning checks, edit this method.</b>
-     * <p>
-     * With default behavior, Updater will NOT verify that a remote version available on BukkitDev
-     * which is not this version is indeed an "update".
-     * If a version is present on BukkitDev that is not the version that is currently running,
-     * Updater will assume that it is a newer version.
-     * This is because there is no standard versioning scheme, and creating a calculation that can
-     * determine whether a new update is actually an update is sometimes extremely complicated.
-     * </p>
-     * <p>
-     * Updater will call this method from {@link #versionCheck()} before deciding whether
-     * the remote version is actually an update.
-     * If you have a specific versioning scheme with which a mathematical determination can
-     * be reliably made to decide whether one version is higher than another, you may
-     * revise this method, using the local and remote version parameters, to execute the
-     * appropriate check.
-     * </p>
-     * <p>
-     * Returning a value of <b>false</b> will tell the update process that this is NOT a new version.
-     * Without revision, this method will always consider a remote version at all different from
-     * that of the local version a new update.
-     * </p>
-     * @param localVersion the current version
-     * @param remoteVersion the remote version
-     * @return true if Updater should consider the remote version an update, false if not.
-     */
-    public boolean shouldUpdate(String localVersion, String remoteVersion) {
-        return !localVersion.equalsIgnoreCase(remoteVersion);
-    }
-
-    /**
-     * Evaluate whether the version number is marked showing that it should not be updated by this program.
-     *
-     * @param version a version number to check for tags in.
-     * @return true if updating should be disabled.
-     */
-    private boolean hasTag(String version) {
-        for (final String string : Updater.NO_UPDATE_TAG) {
-            if (version.contains(string)) {
-                return true;
-            }
-        }
-        return false;
-    }
-
-    /**
-     * Make a connection to the BukkitDev API and request the newest file's details.
-     *
-     * @return true if successful.
-     */
-    private boolean read() {
-        try {
-            final URLConnection conn = this.url.openConnection();
-            conn.setConnectTimeout(5000);
-
-            if (this.apiKey != null) {
-                conn.addRequestProperty("X-API-Key", this.apiKey);
-            }
-            conn.addRequestProperty("User-Agent", Updater.USER_AGENT);
-
-            conn.setDoOutput(true);
-
-            final BufferedReader reader = new BufferedReader(new InputStreamReader(conn.getInputStream()));
-            final String response = reader.readLine();
-
-            final JSONArray array = (JSONArray) JSONValue.parse(response);
-
-            if (array.isEmpty()) {
-                this.plugin.getLogger().warning("The updater could not find any files for the project id " + this.id);
-                this.result = UpdateResult.FAIL_BADID;
-                return false;
-            }
-
-            JSONObject latestUpdate = (JSONObject) array.get(array.size() - 1);
-            this.versionName = (String) latestUpdate.get(Updater.TITLE_VALUE);
-            this.versionLink = (String) latestUpdate.get(Updater.LINK_VALUE);
-            this.versionType = (String) latestUpdate.get(Updater.TYPE_VALUE);
-            this.versionGameVersion = (String) latestUpdate.get(Updater.VERSION_VALUE);
-
-            return true;
-        } catch (final IOException e) {
-            if (e.getMessage().contains("HTTP response code: 403")) {
-                this.plugin.getLogger().severe("dev.bukkit.org rejected the API key provided in plugins/Updater/config.yml");
-                this.plugin.getLogger().severe("Please double-check your configuration to ensure it is correct.");
-                this.result = UpdateResult.FAIL_APIKEY;
-            } else {
-                this.plugin.getLogger().severe("The updater could not contact dev.bukkit.org for updating.");
-                this.plugin.getLogger().severe("If you have not recently modified your configuration and this is the first time you are seeing this message, the site may be experiencing temporary downtime.");
-                this.result = UpdateResult.FAIL_DBO;
-            }
-            AreaShop.debug(ExceptionUtils.getStackTrace(e));
-            return false;
-        }
-    }
-
-    /**
-     * Perform a file operation and log any errors if it fails.
-     * @param file file operation is performed on.
-     * @param result result of file operation.
-     * @param create true if a file is being created, false if deleted.
-     */
-    private void fileIOOrError(File file, boolean result, boolean create) {
-        if (!result) {
-            this.plugin.getLogger().severe("The updater could not " + (create ? "create" : "delete") + " file at: " + file.getAbsolutePath());
-        }
-    }
-
-    private File[] listFilesOrError(File folder) {
-        File[] contents = folder.listFiles();
-        if (contents == null) {
-            this.plugin.getLogger().severe("The updater could not access files at: " + this.updateFolder.getAbsolutePath());
-            return new File[0];
-        } else {
-            return contents;
-        }
-    }
-
-    /**
-     * Called on main thread when the Updater has finished working, regardless
-     * of result.
-     */
-    public interface UpdateCallback {
-        /**
-         * Called when the updater has finished working.
-         * @param updater The updater instance
-         */
-        void onFinish(Updater updater);
-    }
-
-    private class UpdateRunnable implements Runnable {
-        @Override
-        public void run() {
-            runUpdater();
-        }
-    }
-
-    private void runUpdater() {
-        if (this.url != null && (this.read() && this.versionCheck())) {
-            // Obtain the results of the project's file feed
-            if ((this.versionLink != null) && (this.type != UpdateType.NO_DOWNLOAD)) {
-                String name = this.file.getName();
-                // If it's a zip file, it shouldn't be downloaded as the plugin's name
-                if (this.versionLink.endsWith(".zip")) {
-                    name = this.versionLink.substring(this.versionLink.lastIndexOf("/") + 1);
-                }
-                this.saveFile(name);
-            } else {
-                this.result = UpdateResult.UPDATE_AVAILABLE;
-            }
-        }
-
-        if (this.callback != null) {
-            new BukkitRunnable() {
-                @Override
-                public void run() {
-                    runCallback();
-                }
-            }.runTask(this.plugin);
-        }
-    }
-
-    private void runCallback() {
-        this.callback.onFinish(this);
-    }
-}

AreaShop/src/main/java/me/wiefferink/areashop/listeners/PlayerLoginLogoutListener.java

@@ -1,9 +1,12 @@
 package me.wiefferink.areashop.listeners;
 
 import me.wiefferink.areashop.AreaShop;
-import me.wiefferink.areashop.Utils;
+import me.wiefferink.areashop.MessageBridge;
+import me.wiefferink.areashop.regions.BuyRegion;
 import me.wiefferink.areashop.regions.GeneralRegion;
 import me.wiefferink.areashop.regions.RentRegion;
+import me.wiefferink.areashop.tools.Utils;
+import me.wiefferink.bukkitdo.Do;
 import org.bukkit.entity.Player;
 import org.bukkit.event.EventHandler;
 import org.bukkit.event.EventPriority;
@@ -12,28 +15,30 @@ import org.bukkit.event.player.PlayerKickEvent;
 import org.bukkit.event.player.PlayerLoginEvent;
 import org.bukkit.event.player.PlayerLoginEvent.Result;
 import org.bukkit.event.player.PlayerQuitEvent;
-import org.bukkit.scheduler.BukkitRunnable;
 
+import javax.annotation.Nonnull;
 import java.util.ArrayList;
 import java.util.List;
 
 /**
- * Checks for placement of signs for this plugin
- * @author NLThijs48
+ * Notify region expiry and track activity time.
  */
 public final class PlayerLoginLogoutListener implements Listener {
-	private AreaShop plugin;
-	
+
+	private final AreaShop plugin;
+	private final MessageBridge messageBridge;
+
 	/**
-	 * Constructor
+	 * Constructor.
 	 * @param plugin The AreaShop plugin
 	 */
-	public PlayerLoginLogoutListener(AreaShop plugin) {
+	public PlayerLoginLogoutListener(@Nonnull AreaShop plugin, @Nonnull MessageBridge messageBridge) {
 		this.plugin = plugin;
+		this.messageBridge = messageBridge;
 	}
-	
+
 	/**
-	 * Called when a sign is changed
+	 * Called when a sign is changed.
 	 * @param event The event
 	 */
 	@EventHandler(priority = EventPriority.MONITOR)
@@ -42,94 +47,87 @@ public final class PlayerLoginLogoutListener implements Listener {
 			return;
 		}
 		final Player player = event.getPlayer();
-		// Notify admins for plugin updates
-		if(plugin.updateAvailable() && player.hasPermission("areashop.notifyupdate")) {
-			AreaShop.getInstance().message(player, "update-playerNotify", AreaShop.getInstance().getDescription().getVersion(), AreaShop.getInstance().getUpdater().getLatestName());	
-		}
+
 		// Schedule task to check for notifications, prevents a lag spike at login
-        new BukkitRunnable() {
-			@Override
-			public void run() {
-				// Delay until all regions are loaded
-				if(!plugin.isReady()) {
-					return;
-				}	
-				if(!player.isOnline()) {
-					this.cancel();
-					return;
-				}
-				// Notify for rents that almost run out
-				for(RentRegion region : plugin.getFileManager().getRents()) {
-					if(region.isRenter(player)) {
-						String warningSetting = region.getStringSetting("rent.warningOnLoginTime");
-						if(warningSetting == null || warningSetting.isEmpty()) {
-							continue;
-						}
-						long warningTime = Utils.durationStringToLong(warningSetting);
-						if(region.getTimeLeft() < warningTime) {
-							// Send the warning message later to let it appear after general MOTD messages
-							AreaShop.getInstance().message(player, "rent-expireWarning", region);		        
-						}				
+		Do.syncTimerLater(25, 25, () -> {
+			// Delay until all regions are loaded
+			if(!plugin.isReady()) {
+				return true;
+			}
+			if(!player.isOnline()) {
+				return false;
+			}
+			// Notify for rents that almost run out
+			for(RentRegion region : plugin.getFileManager().getRentsRef()) {
+				if(region.isRenter(player)) {
+					String warningSetting = region.getStringSetting("rent.warningOnLoginTime");
+					if(warningSetting == null || warningSetting.isEmpty()) {
+						continue;
+					}
+					long warningTime = Utils.durationStringToLong(warningSetting);
+					if(region.getTimeLeft() < warningTime) {
+						// Send the warning message later to let it appear after general MOTD messages
+						 messageBridge.message(player, "rent-expireWarning", region);
 					}
 				}
-				this.cancel();
 			}
-        }.runTaskTimer(plugin, 25, 25);	
+
+			// Notify admins for plugin updates
+			this.plugin.notifyUpdate(player);
+			return false;
+		});
+
 		// Check if the player has regions that use an old name of him and update them
-		final List<GeneralRegion> regions = new ArrayList<>(plugin.getFileManager().getRegions());
-		new BukkitRunnable() {
-			private int current = 0;
-			
-			@Override
-			public void run() {
-				// Delay until all regions are loaded
-				if(!plugin.isReady()) {
-					return;
-				}
-				// Check all regions
-				for(int i=0; i<plugin.getConfig().getInt("nameupdate.regionsPerTick"); i++) {
-					if(current < regions.size()) {
-						GeneralRegion region = regions.get(current);
-						if(region.isOwner(player)) {
-							if(region.isBuyRegion()) {
-								if(!player.getName().equals(region.getStringSetting("buy.buyerName"))) {
-									region.setSetting("buy.buyerName", player.getName());
-									region.update();
-								}
-							} else if(region.isRentRegion()) {
-								if(!player.getName().equals(region.getStringSetting("rent.renterName"))) {
-									region.setSetting("rent.renterName", player.getName());
-									region.update();
-								}
-							}
-						}
-						current++;
-					}
-				}
-				if(current >= regions.size()) {
-					this.cancel();
+		Do.syncTimerLater(22, 10, () -> {
+			if(!plugin.isReady()) {
+				return true;
+			}
+
+			List<GeneralRegion> regions = new ArrayList<>();
+			for(GeneralRegion region : plugin.getFileManager().getRegionsRef()) {
+				if(region.isOwner(player)) {
+					regions.add(region);
 				}
 			}
-		}.runTaskTimer(plugin, 22, 1); // Wait a bit before starting to prevent a lot of stress on the server when a player joins (a lot of plugins already do stuff then)
+
+			Do.forAll(
+				plugin.getConfig().getInt("nameupdate.regionsPerTick"),
+				regions,
+				region -> {
+					if(region instanceof BuyRegion) {
+						if(!player.getName().equals(region.getStringSetting("buy.buyerName"))) {
+							region.setSetting("buy.buyerName", player.getName());
+							region.update();
+						}
+					} else if(region instanceof RentRegion) {
+						if(!player.getName().equals(region.getStringSetting("rent.renterName"))) {
+							region.setSetting("rent.renterName", player.getName());
+							region.update();
+						}
+					}
+				}
+			);
+			return false;
+		});
 	}
-	
+
 	// Active time updates
 	@EventHandler(priority = EventPriority.MONITOR)
 	public void onPlayerLogout(PlayerQuitEvent event) {
 		updateLastActive(event.getPlayer());
 	}
-	
+
 	@EventHandler(priority = EventPriority.MONITOR)
 	public void onPlayerKick(PlayerKickEvent event) {
 		updateLastActive(event.getPlayer());
 	}
-	
+
 	/**
-	 * Update the last active time for all regions the player is owner off
+	 * Update the last active time for all regions the player is owner off.
 	 * @param player The player to update the active times for
 	 */
 	private void updateLastActive(Player player) {
-		for(GeneralRegion region : plugin.getFileManager().getRegions()) {
+		for(GeneralRegion region : plugin.getFileManager().getRegionsRef()) {
 			if(region.isOwner(player)) {
 				region.updateLastActiveTime();
 			}

AreaShop/src/main/java/me/wiefferink/areashop/listeners/SignBreakListener.java

@@ -1,131 +0,0 @@
-package me.wiefferink.areashop.listeners;
-
-import me.wiefferink.areashop.AreaShop;
-import me.wiefferink.areashop.features.SignsFeature;
-import org.bukkit.Material;
-import org.bukkit.block.Block;
-import org.bukkit.block.Sign;
-import org.bukkit.event.EventHandler;
-import org.bukkit.event.EventPriority;
-import org.bukkit.event.Listener;
-import org.bukkit.event.block.BlockBreakEvent;
-import org.bukkit.event.block.BlockPhysicsEvent;
-
-/**
- * Checks for placement of signs for this plugin
- * @author NLThijs48
- */
-public final class SignBreakListener implements Listener {
-	private AreaShop plugin;
-	
-	/**
-	 * Constructor
-	 * @param plugin The AreaShop plugin
-	 */
-	public SignBreakListener(AreaShop plugin) {
-		this.plugin = plugin;
-	}
-	
-	
-	/**
-	 * Called when a block is broken
-	 * @param event The event
-	 */
-	@EventHandler(priority = EventPriority.HIGH)
-	public void onSignBreak(BlockBreakEvent event) {
-		if(event.isCancelled()) {
-			return;
-		}
-		Block block = event.getBlock();
-		// Check if it is a sign
-		if(block.getType() == Material.WALL_SIGN || block.getType() == Material.SIGN_POST) {
-			// Check if the rent sign is really the same as a saved rent
-			SignsFeature.RegionSign regionSign = SignsFeature.getSignByLocation(block.getLocation());
-			if(regionSign == null) {
-				return;
-			}
-			// Remove the sign of the rental region if the player has permission
-			if(event.getPlayer().hasPermission("areashop.delsign")) {
-				regionSign.remove();
-				plugin.message(event.getPlayer(), "delsign-success", regionSign.getRegion());
-			} else { // Cancel the breaking of the sign
-				event.setCancelled(true);
-				plugin.message(event.getPlayer(), "delsign-noPermission", regionSign.getRegion());
-			}
-		}
-	}
-	
-	/**
-	 * Called when the physics of a block change
-	 * @param event The event
-	 */
-	@EventHandler(priority = EventPriority.HIGHEST)
-    public void onIndirectSignBreak(BlockPhysicsEvent event){
-        Block block = event.getBlock();
-        if(event.isCancelled()) {
-        	return;
-        }
-        if(block.getType() == Material.SIGN_POST || block.getType() == Material.WALL_SIGN){
-            Sign sign = (Sign)block.getState();
-            Block attachedTo = block.getRelative(((org.bukkit.material.Sign)sign.getData()).getAttachedFace());
-            if(attachedTo.getType() == Material.AIR){
-				// Check if the rent sign is really the same as a saved rent
-				SignsFeature.RegionSign regionSign = SignsFeature.getSignByLocation(block.getLocation());
-				if(regionSign != null) {
-					event.setCancelled(true); // Cancel the sign breaking, will create a floating sign but at least it is not disconnected/gone
-				}
-            }
-        }
-    }
-}
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-

AreaShop/src/main/java/me/wiefferink/areashop/listeners/SignChangeListener.java

@@ -1,359 +0,0 @@
-package me.wiefferink.areashop.listeners;
-
-import com.sk89q.worldedit.bukkit.selections.CuboidSelection;
-import com.sk89q.worldguard.protection.managers.RegionManager;
-import com.sk89q.worldguard.protection.regions.ProtectedRegion;
-import me.wiefferink.areashop.AreaShop;
-import me.wiefferink.areashop.Utils;
-import me.wiefferink.areashop.managers.FileManager;
-import me.wiefferink.areashop.regions.BuyRegion;
-import me.wiefferink.areashop.regions.GeneralRegion;
-import me.wiefferink.areashop.regions.RentRegion;
-import org.bukkit.entity.Player;
-import org.bukkit.event.EventHandler;
-import org.bukkit.event.EventPriority;
-import org.bukkit.event.Listener;
-import org.bukkit.event.block.SignChangeEvent;
-import org.bukkit.material.Sign;
-import org.bukkit.scheduler.BukkitRunnable;
-
-import java.util.List;
-import java.util.Set;
-
-/**
- * Checks for placement of signs for this plugin
- * @author NLThijs48
- */
-public final class SignChangeListener implements Listener {
-	private AreaShop plugin;
-	
-	/**
-	 * Constructor
-	 * @param plugin The AreaShop plugin
-	 */
-	public SignChangeListener(AreaShop plugin) {
-		this.plugin = plugin;
-	}
-	
-	/**
-	 * Called when a sign is changed
-	 * @param event The event
-	 */
-	@EventHandler(priority = EventPriority.MONITOR)
-	public void onSignChange(SignChangeEvent event) {
-		if(event.isCancelled()) {
-			return;
-		}
-		Player player = event.getPlayer();
-		if(!plugin.isReady()) {
-			plugin.message(player, "general-notReady");
-			return;
-		}
-		
-		// Check if the sign is meant for this plugin
-		if(event.getLine(0).contains(plugin.getConfig().getString("signTags.rent"))) {
-			if(!player.hasPermission("areashop.createrent") && !player.hasPermission("areashop.createrent.member") && !player.hasPermission("areashop.createrent.owner")) {
-				plugin.message(player, "setup-noPermissionRent");				
-				return;
-			}
-			
-			// Get the other lines
-			String secondLine = event.getLine(1);
-			String thirdLine = event.getLine(2);
-			String fourthLine = event.getLine(3);
-			
-			// Get the regionManager for accessing regions
-			RegionManager regionManager = plugin.getWorldGuard().getRegionManager(event.getPlayer().getWorld());
-			
-			// If the secondLine does not contain a name try to find the region by location
-			if(secondLine == null || secondLine.length() == 0) {
-				Set<ProtectedRegion> regions = plugin.getWorldGuardHandler().getApplicableRegionsSet(event.getBlock().getLocation());
-				if(regions != null) {
-					boolean first = true;
-					ProtectedRegion candidate = null;
-					for(ProtectedRegion pr : regions) {
-						if(first) {
-							candidate = pr;
-							first = false;
-						} else {
-							if(pr.getPriority() > candidate.getPriority()) {
-								candidate = pr;
-							} else if(pr.getPriority() < candidate.getPriority()) {
-								// Already got the correct one
-							} else if(pr.getParent() != null && pr.getParent().equals(candidate)) {
-								candidate = pr;
-							} else if(candidate.getParent() != null && candidate.getParent().equals(pr)) {
-								// Already got the correct one
-							} else {
-								plugin.message(player, "setup-couldNotDetect", candidate.getId(), pr.getId());
-								return;
-							}
-						}
-					}
-					if(candidate != null) {
-						secondLine = candidate.getId();
-					}
-				}
-			}			
-		
-			boolean priceSet = fourthLine != null && fourthLine.length() != 0;
-			boolean durationSet = thirdLine != null && thirdLine.length() != 0;
-			// check if all the lines are correct			
-			if(secondLine == null || secondLine.length() == 0) {
-				plugin.message(player, "setup-noRegion");
-				return;
-			}
-			ProtectedRegion region = regionManager.getRegion(secondLine);
-			if(region == null) {
-				plugin.message(player, "cmd-notRegistered", secondLine);
-				return;
-			}
-
-			FileManager.AddResult addResult = plugin.getFileManager().checkRegionAdd(player, regionManager.getRegion(secondLine), GeneralRegion.RegionType.RENT);
-			if(addResult == FileManager.AddResult.BLACKLISTED) {
-				plugin.message(player, "setup-blacklisted", secondLine);
-			} else if(addResult == FileManager.AddResult.ALREADYADDED) {
-				plugin.message(player, "setup-alreadyRentSign");
-			} else if(addResult == FileManager.AddResult.NOPERMISSION) {
-				plugin.message(player, "setup-noPermission", secondLine);
-			} else if(thirdLine != null && thirdLine.length() != 0 && !Utils.checkTimeFormat(thirdLine)) {
-				plugin.message(player, "setup-wrongDuration");
-			} else {
-				double price = 0.0;
-				if(priceSet) {
-					// Check the fourth line
-					try {
-						price = Double.parseDouble(fourthLine);
-					} catch (NumberFormatException e) {
-						plugin.message(player, "setup-wrongPrice");
-						return;
-					}
-				}
-				
-				// Add rent to the FileManager
-				final RentRegion rent = new RentRegion(plugin, secondLine, event.getPlayer().getWorld());
-				boolean isMember = plugin.getWorldGuardHandler().containsMember(rent.getRegion(), player.getUniqueId());
-				boolean isOwner = plugin.getWorldGuardHandler().containsOwner(rent.getRegion(), player.getUniqueId());
-				boolean landlord = (!player.hasPermission("areashop.createrent")
-						&& ((player.hasPermission("areashop.createrent.owner") && isOwner)
-						|| (player.hasPermission("areashop.createrent.member") && isMember)));					
-
-				if(landlord) {
-					rent.setLandlord(player.getUniqueId(), player.getName());
-				}
-				if(priceSet) {
-					rent.setPrice(price);
-				}
-				if(durationSet) {
-					rent.setDuration(thirdLine);
-				}
-				Sign sign = (Sign)event.getBlock().getState().getData();
-				rent.getSignsFeature().addSign(event.getBlock().getLocation(), event.getBlock().getType(), sign.getFacing(), null);
-
-				// Run commands
-				rent.runEventCommands(GeneralRegion.RegionEvent.CREATED, true);
-				
-				plugin.getFileManager().addRent(rent);
-				rent.handleSchematicEvent(GeneralRegion.RegionEvent.CREATED);
-				plugin.message(player, "setup-rentSuccess", rent);
-				// Update the region after the event has written its lines
-				new BukkitRunnable() {
-					@Override
-					public void run() {
-						rent.update();
-					}
-				}.runTaskLater(plugin, 1);
-				// Run commands
-				rent.runEventCommands(GeneralRegion.RegionEvent.CREATED, false);
-			}
-		} else if (event.getLine(0).contains(plugin.getConfig().getString("signTags.buy"))) {
-			// Check for permission
-			if(!player.hasPermission("areashop.createbuy") && !player.hasPermission("areashop.createbuy.member") && !player.hasPermission("areashop.createbuy.owner")) {
-				plugin.message(player, "setup-noPermissionBuy");				
-				return;
-			}
-
-			// Get the other lines
-			String secondLine = event.getLine(1);
-			String thirdLine = event.getLine(2);
-
-			// Get the regionManager for accessing regions
-			RegionManager regionManager = plugin.getWorldGuard().getRegionManager(event.getPlayer().getWorld());
-
-			// If the secondLine does not contain a name try to find the region by location
-			if(secondLine == null || secondLine.length() == 0) {
-				Set<ProtectedRegion> regions = plugin.getWorldGuardHandler().getApplicableRegionsSet(event.getBlock().getLocation());
-				if(regions != null) {
-					boolean first = true;
-					ProtectedRegion candidate = null;
-					for(ProtectedRegion pr : regions) {
-						if(first) {
-							candidate = pr;
-							first = false;
-						} else {
-							if(pr.getPriority() > candidate.getPriority()) {
-								candidate = pr;
-							} else if(pr.getPriority() < candidate.getPriority()) {
-								// Already got the correct one
-							} else if(pr.getParent() != null && pr.getParent().equals(candidate)) {
-								candidate = pr;
-							} else if(candidate.getParent() != null && candidate.getParent().equals(pr)) {
-								// Already got the correct one
-							} else {
-								plugin.message(player, "setup-couldNotDetect", candidate.getId(), pr.getId());
-								return;
-							}
-						}
-					}
-					if(candidate != null) {
-						secondLine = candidate.getId();
-					}
-				}
-			}
-
-			boolean priceSet = thirdLine != null && thirdLine.length() != 0;
-			// Check if all the lines are correct			
-			if(secondLine == null || secondLine.length() == 0) {
-				plugin.message(player, "setup-noRegion");
-				return;
-			}
-			ProtectedRegion region = regionManager.getRegion(secondLine);
-			if(region == null) {
-				plugin.message(player, "add-noRegion", secondLine);
-				return;
-			}
-			FileManager.AddResult addResult = plugin.getFileManager().checkRegionAdd(player, region, GeneralRegion.RegionType.BUY);
-			if(addResult == FileManager.AddResult.BLACKLISTED) {
-				plugin.message(player, "setup-blacklisted", secondLine);
-			} else if(addResult == FileManager.AddResult.ALREADYADDED) {
-				plugin.message(player, "setup-alreadyRentSign");
-			} else if(addResult == FileManager.AddResult.NOPERMISSION) {
-				plugin.message(player, "setup-noPermission", secondLine);
-			} else {
-				double price = 0.0;
-				if(priceSet) {
-					// Check the fourth line
-					try {
-						price = Double.parseDouble(thirdLine);
-					} catch (NumberFormatException e) {
-						plugin.message(player, "setup-wrongPrice");
-						return;
-					}
-				}
-				
-				// Add buy to the FileManager
-				final BuyRegion buy = new BuyRegion(plugin, secondLine, event.getPlayer().getWorld());
-				boolean isMember = plugin.getWorldGuardHandler().containsMember(buy.getRegion(), player.getUniqueId());
-				boolean isOwner = plugin.getWorldGuardHandler().containsOwner(buy.getRegion(), player.getUniqueId());
-				boolean landlord = (!player.hasPermission("areashop.createbuy")
-						&& ((player.hasPermission("areashop.createbuy.owner") && isOwner)
-						|| (player.hasPermission("areashop.createbuy.member") && isMember)));					
-
-				if(landlord) {
-					buy.setLandlord(player.getUniqueId(), player.getName());
-				}
-				if(priceSet) {
-					buy.setPrice(price);
-				}
-				Sign sign = (Sign)event.getBlock().getState().getData();
-				buy.getSignsFeature().addSign(event.getBlock().getLocation(), event.getBlock().getType(), sign.getFacing(), null);
-				// Run commands
-				buy.runEventCommands(GeneralRegion.RegionEvent.CREATED, true);
-				
-				plugin.getFileManager().addBuy(buy);
-				buy.handleSchematicEvent(GeneralRegion.RegionEvent.CREATED);
-				plugin.message(player, "setup-buySuccess", buy);
-				// Update the region after the event has written its lines
-				new BukkitRunnable() {
-					@Override
-					public void run() {
-						buy.update();
-					}
-				}.runTaskLater(plugin, 1);
-
-				// Run commands
-				buy.runEventCommands(GeneralRegion.RegionEvent.CREATED, false);
-			}
-		} else if(event.getLine(0).contains(plugin.getConfig().getString("signTags.add"))) {
-			// Check for permission
-			if(!player.hasPermission("areashop.addsign")) {
-				plugin.message(player, "addsign-noPermission");				
-				return;
-			}
-			
-			// Get the other lines
-			String secondLine = event.getLine(1);
-			String thirdLine = event.getLine(2);
-
-			GeneralRegion region;
-			if(secondLine != null && secondLine.length() != 0) {
-				// Get region by secondLine of the sign
-				region = plugin.getFileManager().getRegion(secondLine);
-				if(region == null) {
-					plugin.message(player, "add-noRegion", secondLine);
-					return;
-				}			
-			} else {
-				// Get region by sign position
-				List<GeneralRegion> regions = Utils.getASRegionsInSelection(new CuboidSelection(event.getBlock().getWorld(), event.getBlock().getLocation(), event.getBlock().getLocation()));
-				if(regions.isEmpty()) {
-					plugin.message(player, "addsign-noRegions");
-					return;
-				} else if(regions.size() > 1) {
-					plugin.message(player, "addsign-couldNotDetectSign", regions.get(0).getName(), regions.get(1).getName());
-					return;
-				}
-				region = regions.get(0);
-			}
-			Sign sign = (Sign)event.getBlock().getState().getData();
-			if(thirdLine == null || thirdLine.length() == 0) {
-				region.getSignsFeature().addSign(event.getBlock().getLocation(), event.getBlock().getType(), sign.getFacing(), null);
-				plugin.message(player, "addsign-success", region);
-			} else {
-				region.getSignsFeature().addSign(event.getBlock().getLocation(), event.getBlock().getType(), sign.getFacing(), thirdLine);
-				plugin.message(player, "addsign-successProfile", thirdLine, region);
-			}
-
-			// Update the region later because this event will do it first
-			final GeneralRegion regionUpdate = region;
-			new BukkitRunnable() {
-				@Override
-				public void run() {
-					regionUpdate.update();
-				}
-			}.runTaskLater(plugin, 1);
-		}
-	}
-}
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-

AreaShop/src/main/java/me/wiefferink/areashop/listeners/SignClickListener.java

@@ -1,94 +0,0 @@
-package me.wiefferink.areashop.listeners;
-
-import me.wiefferink.areashop.AreaShop;
-import me.wiefferink.areashop.features.SignsFeature;
-import me.wiefferink.areashop.regions.GeneralRegion.ClickType;
-import org.bukkit.Material;
-import org.bukkit.block.Block;
-import org.bukkit.entity.Player;
-import org.bukkit.event.EventHandler;
-import org.bukkit.event.EventPriority;
-import org.bukkit.event.Listener;
-import org.bukkit.event.block.Action;
-import org.bukkit.event.player.PlayerInteractEvent;
-
-public class SignClickListener implements Listener {
-	private AreaShop plugin;
-	
-	/**
-	 * Constructor
-	 * @param plugin The AreaShop plugin
-	 */
-	public SignClickListener(AreaShop plugin) {
-		this.plugin = plugin;
-	}
-
-	/**
-	 * Called when a player interacts
-	 * @param event The event
-	 */
-	@EventHandler(priority = EventPriority.HIGH)
-	public void onSignClick(PlayerInteractEvent event) {
-		if(event.isCancelled()) {
-			return;
-		}
-		Block block = event.getClickedBlock();
-		// Check for clicking a sign and rightclicking
-		if((event.getAction() == Action.RIGHT_CLICK_BLOCK || event.getAction() == Action.LEFT_CLICK_BLOCK) 
-				&& (block.getType() == Material.SIGN_POST || block.getType() == Material.WALL_SIGN)) {
-			// Check if the rent sign is really the same as a saved rent
-			SignsFeature.RegionSign regionSign = SignsFeature.getSignByLocation(block.getLocation());
-			if(regionSign == null) {
-				return;
-			}
-			Player player = event.getPlayer();
-			if(plugin.getSignlinkerManager().isInSignLinkMode(player)) {
-				return;
-			}
-			// Get the clicktype
-			ClickType clickType = null;
-			if(player.isSneaking() && event.getAction() == Action.LEFT_CLICK_BLOCK) {
-				clickType = ClickType.SHIFTLEFTCLICK;
-			} else if(!player.isSneaking() && event.getAction() == Action.LEFT_CLICK_BLOCK) {
-				clickType = ClickType.LEFTCLICK;
-			} else if(player.isSneaking() && event.getAction() == Action.RIGHT_CLICK_BLOCK) {
-				clickType = ClickType.SHIFTRIGHTCLICK;
-			} else if(!player.isSneaking() && event.getAction() == Action.RIGHT_CLICK_BLOCK) {
-				clickType = ClickType.RIGHTCLICK;
-			}
-			// Run the commands
-			boolean ran = regionSign.runSignCommands(player, clickType);
-			// Only cancel event if at least one command has been executed
-			event.setCancelled(ran);
-		}
-	}
-}
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-

AreaShop/src/main/java/me/wiefferink/areashop/managers/CommandManager.java

@@ -1,128 +1,178 @@
 package me.wiefferink.areashop.managers;
 
+import com.google.inject.Injector;
 import me.wiefferink.areashop.AreaShop;
-import me.wiefferink.areashop.commands.*;
+import me.wiefferink.areashop.MessageBridge;
+import me.wiefferink.areashop.commands.AddCommand;
+import me.wiefferink.areashop.commands.AddfriendCommand;
+import me.wiefferink.areashop.commands.AddsignCommand;
+import me.wiefferink.areashop.commands.BuyCommand;
+import me.wiefferink.areashop.commands.CommandAreaShop;
+import me.wiefferink.areashop.commands.DelCommand;
+import me.wiefferink.areashop.commands.DelfriendCommand;
+import me.wiefferink.areashop.commands.DelsignCommand;
+import me.wiefferink.areashop.commands.FindCommand;
+import me.wiefferink.areashop.commands.GroupaddCommand;
+import me.wiefferink.areashop.commands.GroupdelCommand;
+import me.wiefferink.areashop.commands.GroupinfoCommand;
+import me.wiefferink.areashop.commands.GrouplistCommand;
+import me.wiefferink.areashop.commands.HelpCommand;
+import me.wiefferink.areashop.commands.ImportCommand;
+import me.wiefferink.areashop.commands.InfoCommand;
+import me.wiefferink.areashop.commands.LinksignsCommand;
+import me.wiefferink.areashop.commands.MeCommand;
+import me.wiefferink.areashop.commands.MessageCommand;
+import me.wiefferink.areashop.commands.ReloadCommand;
+import me.wiefferink.areashop.commands.RentCommand;
+import me.wiefferink.areashop.commands.ResellCommand;
+import me.wiefferink.areashop.commands.SchematiceventCommand;
+import me.wiefferink.areashop.commands.SellCommand;
+import me.wiefferink.areashop.commands.SetdurationCommand;
+import me.wiefferink.areashop.commands.SetlandlordCommand;
+import me.wiefferink.areashop.commands.SetownerCommand;
+import me.wiefferink.areashop.commands.SetpriceCommand;
+import me.wiefferink.areashop.commands.SetrestoreCommand;
+import me.wiefferink.areashop.commands.SetteleportCommand;
+import me.wiefferink.areashop.commands.StackCommand;
+import me.wiefferink.areashop.commands.StopresellCommand;
+import me.wiefferink.areashop.commands.TeleportCommand;
+import me.wiefferink.areashop.commands.UnrentCommand;
 import org.bukkit.command.Command;
 import org.bukkit.command.CommandExecutor;
 import org.bukkit.command.CommandSender;
 import org.bukkit.command.TabCompleter;
 
+import javax.annotation.Nonnull;
+import javax.inject.Inject;
+import javax.inject.Singleton;
 import java.util.ArrayList;
 import java.util.List;
 import java.util.SortedSet;
 import java.util.TreeSet;
 
-public class CommandManager implements CommandExecutor, TabCompleter {
-	private AreaShop plugin;
-	private ArrayList<CommandAreaShop> commands;
-	
+@Singleton
+public class CommandManager extends Manager implements CommandExecutor, TabCompleter {
+	private final List<CommandAreaShop> commands;
+	private final AreaShop plugin;
+	private final MessageBridge messageBridge;
+
 	/**
-	 * Constructor
-	 * @param plugin The AreaShop plugin
+	 * Constructor.
 	 */
-	public CommandManager(AreaShop plugin) {
+	@Inject
+	CommandManager(@Nonnull AreaShop plugin, @Nonnull MessageBridge messageBridge, @Nonnull
+				   Injector injector) {
 		this.plugin = plugin;
-		commands = new ArrayList<>();
-		commands.add(new HelpCommand(plugin));
-		commands.add(new RentCommand(plugin));
-		commands.add(new UnrentCommand(plugin));
-		commands.add(new BuyCommand(plugin));
-		commands.add(new SellCommand(plugin));
-		commands.add(new MeCommand(plugin));
-		commands.add(new InfoCommand(plugin));
-		commands.add(new TeleportCommand(plugin));
-		commands.add(new SetteleportCommand(plugin));
-		commands.add(new AddfriendCommand(plugin));
-		commands.add(new DelfriendCommand(plugin));
-		commands.add(new FindCommand(plugin));
-		commands.add(new ResellCommand(plugin));
-		commands.add(new StopresellCommand(plugin));
-		commands.add(new SetrestoreCommand(plugin));
-		commands.add(new SetpriceCommand(plugin));
-		commands.add(new SetownerCommand(plugin));
-		commands.add(new SetdurationCommand(plugin));
-		commands.add(new ReloadCommand(plugin));
-		commands.add(new GroupaddCommand(plugin));
-		commands.add(new GroupdelCommand(plugin));
-		commands.add(new GrouplistCommand(plugin));
-		commands.add(new GroupinfoCommand(plugin));
-		commands.add(new SchematiceventCommand(plugin));
-		commands.add(new AddCommand(plugin));
-		commands.add(new DelCommand(plugin));
-		commands.add(new AddsignCommand(plugin));
-		commands.add(new DelsignCommand(plugin));
-		commands.add(new LinksignsCommand(plugin));
-		commands.add(new StackCommand(plugin));
-		commands.add(new SetlandlordCommand(plugin));
-		commands.add(new MessageCommand(plugin));
+		this.messageBridge = messageBridge;
+		commands = new ArrayList<>(34);
+		commands.add(new HelpCommand(this));
+		commands.add(injector.getInstance(RentCommand.class));
+		commands.add(injector.getInstance(UnrentCommand.class));
+		commands.add(injector.getInstance(BuyCommand.class));
+		commands.add(injector.getInstance(SellCommand.class));
+		commands.add(injector.getInstance(MeCommand.class));
+		commands.add(injector.getInstance(InfoCommand.class));
+		commands.add(injector.getInstance(TeleportCommand.class));
+		commands.add(injector.getInstance(SetteleportCommand.class));
+		commands.add(injector.getInstance(AddfriendCommand.class));
+		commands.add(injector.getInstance(DelfriendCommand.class));
+		commands.add(injector.getInstance(FindCommand.class));
+		commands.add(injector.getInstance(ResellCommand.class));
+		commands.add(injector.getInstance(StopresellCommand.class));
+		commands.add(injector.getInstance(SetrestoreCommand.class));
+		commands.add(injector.getInstance(SetpriceCommand.class));
+		commands.add(injector.getInstance(SetownerCommand.class));
+		commands.add(injector.getInstance(SetdurationCommand.class));
+		commands.add(injector.getInstance(ReloadCommand.class));
+		commands.add(injector.getInstance(GroupaddCommand.class));
+		commands.add(injector.getInstance(GroupdelCommand.class));
+		commands.add(injector.getInstance(GrouplistCommand.class));
+		commands.add(injector.getInstance(GroupinfoCommand.class));
+		commands.add(injector.getInstance(SchematiceventCommand.class));
+		commands.add(injector.getInstance(AddCommand.class));
+		commands.add(injector.getInstance(DelCommand.class));
+		commands.add(injector.getInstance(AddsignCommand.class));
+		commands.add(injector.getInstance(DelsignCommand.class));
+		commands.add(injector.getInstance(LinksignsCommand.class));
+		commands.add(injector.getInstance(StackCommand.class));
+		commands.add(injector.getInstance(SetlandlordCommand.class));
+		commands.add(injector.getInstance(MessageCommand.class));
+		commands.add(injector.getInstance(ImportCommand.class));
 
 		// Register commands in bukkit
-		plugin.getCommand("AreaShop").setExecutor(this);	
+		plugin.getCommand("AreaShop").setExecutor(this);
 		plugin.getCommand("AreaShop").setTabCompleter(this);
-	}	
-	
+	}
+
 	/**
-	 * Get the list with AreaShop commands
+	 * Get the list with AreaShop commands.
 	 * @return The list with AreaShop commands
 	 */
-	public ArrayList<CommandAreaShop> getCommands() {
+	public List<CommandAreaShop> getCommands() {
 		return commands;
 	}
-	
+
 	/**
-	 * Shows the help page for the CommandSender
+	 * Shows the help page for the CommandSender.
 	 * @param target The CommandSender to show the help to
 	 */
 	public void showHelp(CommandSender target) {
 		if(!target.hasPermission("areashop.help")) {
-			plugin.message(target, "help-noPermission");
+			messageBridge.message(target, "help-noPermission");
 			return;
 		}
 		// Add all messages to a list
 		ArrayList<String> messages = new ArrayList<>();
-		plugin.message(target, "help-header");
-		plugin.message(target, "help-alias");
+		messageBridge.message(target, "help-header");
+		messageBridge.message(target, "help-alias");
 		for(CommandAreaShop command : commands) {
 			String help = command.getHelp(target);
-			if(help != null && help.length() != 0) {
+			if(help != null && !help.isEmpty()) {
 				messages.add(help);
 			}
 		}
 		// Send the messages to the target
 		for(String message : messages) {
-			plugin.messageNoPrefix(target, message);
+			messageBridge.messageNoPrefix(target, message);
 		}
 	}
-	
+
 	@Override
 	public boolean onCommand(CommandSender sender, Command command, String alias, String[] args) {
 		if(!plugin.isReady()) {
-			plugin.message(sender, "general-notReady");
+			messageBridge.message(sender, "general-notReady");
 			return true;
 		}
+
 		// Redirect `/as info player <player>` to `/as me <player>`
 		if(args.length == 3 && "info".equals(args[0]) && "player".equals(args[1])) {
 			args[0] = "me";
 			args[1] = args[2];
 		}
+
 		// Execute command
-		boolean executed = false;		
-		for(int i=0; i<commands.size() && !executed; i++) {
+		boolean executed = false;
+		for(int i = 0; i < commands.size() && !executed; i++) {
 			if(commands.get(i).canExecute(command, args)) {
 				commands.get(i).execute(sender, args);
 				executed = true;
 			}
 		}
-		if(!executed && args.length == 0) {
-			this.showHelp(sender);
-		} else if(!executed && args.length > 0) {
-			// Indicate that the '/as updaterents' and '/as updatebuys' commands are removed
-			if("updaterents".equalsIgnoreCase(args[0]) || "updatebuys".equalsIgnoreCase(args[0])) {
-				plugin.message(sender, "reload-updateCommandChanged");
+
+		// Show help
+		if (!executed) {
+			if (args.length == 0) {
+				this.showHelp(sender);
 			} else {
-				plugin.message(sender, "cmd-notValid");
+				// Indicate that the '/as updaterents' and '/as updatebuys' commands are removed
+				if("updaterents".equalsIgnoreCase(args[0]) || "updatebuys".equalsIgnoreCase(args[0])) {
+					messageBridge.message(sender, "reload-updateCommandChanged");
+				} else {
+					messageBridge.message(sender, "cmd-notValid");
+				}
 			}
 		}
+
 		return true;
 	}
 
@@ -133,19 +183,17 @@ public class CommandManager implements CommandExecutor, TabCompleter {
 			return result;
 		}
 		int toCompleteNumber = args.length;
-		String toCompletePrefix = args[args.length-1].toLowerCase();
+		String toCompletePrefix = args[args.length - 1].toLowerCase();
 		//AreaShop.debug("toCompleteNumber=" + toCompleteNumber + ", toCompletePrefix=" + toCompletePrefix + ", length=" + toCompletePrefix.length());
 		if(toCompleteNumber == 1) {
 			for(CommandAreaShop c : commands) {
 				String begin = c.getCommandStart();
-				result.add(begin.substring(begin.indexOf(' ') +1));
+				result.add(begin.substring(begin.indexOf(' ') + 1));
 			}
 		} else {
 			String[] start = new String[args.length];
 			start[0] = command.getName();
-			for(int i=1; i<args.length; i++) {
-				start[i] = args[i-1];
-			}
+			System.arraycopy(args, 0, start, 1, args.length - 1);
 			for(CommandAreaShop c : commands) {
 				if(c.canExecute(command, args)) {
 					result = c.getTabCompleteList(toCompleteNumber, start, sender);
@@ -153,13 +201,13 @@ public class CommandManager implements CommandExecutor, TabCompleter {
 			}
 		}
 		// Filter and sort the results
-		if(result.size() > 0) {
+		if(!result.isEmpty()) {
 			SortedSet<String> set = new TreeSet<>();
 			for(String suggestion : result) {
 				if(suggestion.toLowerCase().startsWith(toCompletePrefix)) {
 					set.add(suggestion);
 				}
-			}	
+			}
 			result.clear();
 			result.addAll(set);
 		}

AreaShop/src/main/java/me/wiefferink/areashop/managers/FeatureManager.java

@@ -0,0 +1,92 @@
+package me.wiefferink.areashop.managers;
+
+import com.google.inject.Injector;
+import com.google.inject.ProvisionException;
+import me.wiefferink.areashop.AreaShop;
+import me.wiefferink.areashop.features.CommandsFeature;
+import me.wiefferink.areashop.features.DebugFeature;
+import me.wiefferink.areashop.features.FeatureFactory;
+import me.wiefferink.areashop.features.FriendsFeature;
+import me.wiefferink.areashop.features.RegionFeature;
+import me.wiefferink.areashop.features.TeleportFeature;
+import me.wiefferink.areashop.features.WorldGuardRegionFlagsFeature;
+import me.wiefferink.areashop.features.signs.SignsFeature;
+import me.wiefferink.areashop.regions.GeneralRegion;
+
+import javax.annotation.Nonnull;
+import javax.inject.Inject;
+import javax.inject.Singleton;
+import java.util.Arrays;
+import java.util.Collection;
+import java.util.HashMap;
+import java.util.HashSet;
+import java.util.Map;
+import java.util.Set;
+import java.util.function.Function;
+
+@Singleton
+public class FeatureManager extends Manager {
+
+	private static final Collection<Class<? extends RegionFeature>> globalFeatureClasses = Arrays.asList(
+			CommandsFeature.class,
+			WorldGuardRegionFlagsFeature.class,
+			DebugFeature.class
+	);
+	// One instance of each feature, registered for event handling
+	private final Set<RegionFeature> globalFeatures = new HashSet<>();
+	private final Map<Class<? extends RegionFeature>, Function<GeneralRegion, ? extends RegionFeature>> regionFeatureConstructors = new HashMap<>();
+
+	/**
+	 * Constructor.
+	 */
+	@Inject
+	FeatureManager(@Nonnull FeatureFactory featureFactory) {
+		// Setup constructors for region specific features
+		regionFeatureConstructors.put(SignsFeature.class, wrapInstantiator(SignsFeature.class, featureFactory::createSignsFeature));
+		regionFeatureConstructors.put(TeleportFeature.class, wrapInstantiator(TeleportFeature.class, featureFactory::createTeleportFeature));
+		regionFeatureConstructors.put(FriendsFeature.class, wrapInstantiator(FriendsFeature.class, featureFactory::createFriendsFeature));
+	}
+
+	public void initializeFeatures(@Nonnull Injector injector) {
+		// Instantiate and register global features (one per type, for event handling)
+		for(Class<? extends RegionFeature> clazz : globalFeatureClasses) {
+			try {
+				RegionFeature feature = injector.getInstance(clazz);
+				feature.listen();
+				globalFeatures.add(feature);
+			} catch(ProvisionException e) {
+				AreaShop.error("Failed to instantiate global feature:", clazz, e);
+			}
+		}
+	}
+
+	private <T extends RegionFeature> Function<GeneralRegion, T> wrapInstantiator(Class<T> clazz, Function<GeneralRegion, T> function
+	) {
+		return region -> {
+			try {
+				return function.apply(region);
+			} catch (Throwable e) {
+				AreaShop.error("Failed to instantiate feature", clazz, "for region", region, e, e.getCause());
+				return null;
+			}
+		};
+	}
+
+	@Override
+	public void shutdown() {
+		for(RegionFeature feature : globalFeatures) {
+			feature.shutdown();
+		}
+	}
+
+	/**
+	 * Instanciate a feature for a certain region.
+	 * @param region       The region to create a feature for
+	 * @param featureClazz The class of the feature to create
+	 * @return The feature class
+	 */
+	public RegionFeature getRegionFeature(GeneralRegion region, Class<? extends RegionFeature> featureClazz) {
+		return regionFeatureConstructors.get(featureClazz).apply(region);
+	}
+
+}

AreaShop/src/main/java/me/wiefferink/areashop/managers/IFileManager.java

@@ -0,0 +1,395 @@
+package me.wiefferink.areashop.managers;
+
+import com.sk89q.worldguard.protection.regions.ProtectedRegion;
+import me.wiefferink.areashop.events.ask.AddingRegionEvent;
+import me.wiefferink.areashop.events.ask.DeletingRegionEvent;
+import me.wiefferink.areashop.regions.BuyRegion;
+import me.wiefferink.areashop.regions.GeneralRegion;
+import me.wiefferink.areashop.regions.RegionGroup;
+import me.wiefferink.areashop.regions.RentRegion;
+import org.bukkit.World;
+import org.bukkit.command.CommandSender;
+import org.bukkit.configuration.ConfigurationSection;
+import org.bukkit.configuration.file.YamlConfiguration;
+
+import javax.annotation.Nullable;
+import java.util.Collection;
+import java.util.List;
+
+public interface IFileManager {
+
+    /**
+     * Get the folder where schematics are stored.
+     *
+     * @return The folder where schematics are stored
+     */
+    String getSchematicFolder();
+
+    /**
+     * Get a group.
+     *
+     * @param name The name of the group to get (will be normalized)
+     * @return The group if found, otherwise null
+     */
+    RegionGroup getGroup(String name);
+
+    /**
+     * Get all groups.
+     *
+     * @return Collection with all groups (safe to modify)
+     */
+    Collection<RegionGroup> getGroups();
+
+    /**
+     * Get the default region settings as provided by the user (default.yml).
+     *
+     * @return YamlConfiguration with the settings (might miss settings, which should be filled in with {@link #getFallbackRegionSettings()})
+     */
+    YamlConfiguration getRegionSettings();
+
+    /**
+     * Get the default regions settings as provided by AreaShop (default.yml).
+     *
+     * @return YamlConfiguration with the default settings
+     */
+    YamlConfiguration getFallbackRegionSettings();
+
+    /**
+     * Get the config file (config.yml).
+     *
+     * @return YamlConfiguration with the settings of users, with fallback to the settings provided by AreaShop
+     */
+    YamlConfiguration getConfig();
+
+    /**
+     * Get a region.
+     *
+     * @param name The name of the region to get (will be normalized)
+     * @return The region if found, otherwise null
+     */
+    @Nullable
+    GeneralRegion getRegion(String name);
+
+    /**
+     * Get a rental region.
+     *
+     * @param name The name of the rental region (will be normalized)
+     * @return RentRegion if it could be found, otherwise null
+     */
+    @Nullable
+    RentRegion getRent(String name);
+
+    /**
+     * Get a buy region.
+     *
+     * @param name The name of the buy region (will be normalized)
+     * @return BuyRegion if it could be found, otherwise null
+     */
+    @Nullable
+    BuyRegion getBuy(String name);
+
+    /**
+     * Get all rental regions.
+     *
+     * @return List of all rental regions
+     */
+    Collection<RentRegion> getRents();
+
+    /**
+     * Get all rental regions.
+     *
+     * @return List of all rental regions
+     */
+    Collection<RentRegion> getRentsRef();
+
+    /**
+     * Get all buy regions.
+     *
+     * @return List of all buy regions
+     */
+    List<BuyRegion> getBuys();
+
+    Collection<BuyRegion> getBuysRef();
+
+    /**
+     * Get all regions.
+     *
+     * @return List of all regions (it is safe to modify the list)
+     */
+    List<GeneralRegion> getRegions();
+
+    /**
+     * Get all regions.
+     *
+     * @return List of all regions (it is safe to modify the list)
+     */
+    Collection<GeneralRegion> getRegionsRef();
+
+    /**
+     * Get a list of names of all buy regions.
+     *
+     * @return A String list with all the names
+     */
+    List<String> getBuyNames();
+
+    /**
+     * Get a list of names of all rent regions.
+     *
+     * @return A String list with all the names
+     */
+    List<String> getRentNames();
+
+    /**
+     * Get a list of names of all regions.
+     *
+     * @return A String list with all the names
+     */
+    List<String> getRegionNames();
+
+    /**
+     * Get a list of names of all groups.
+     *
+     * @return A String list with all the names
+     */
+    List<String> getGroupNames();
+
+    /**
+     * Add a region to the list and mark it as to-be-saved.
+     *
+     * @param region Then region to add
+     * @return true when successful, otherwise false (denied by an event listener)
+     */
+    AddingRegionEvent addRegion(GeneralRegion region);
+
+    /**
+     * Add a region to the list without saving it to disk (useful for loading at startup).
+     *
+     * @param region The region to add
+     * @return true when successful, otherwise false (denied by an event listener)
+     */
+    AddingRegionEvent addRegionNoSave(GeneralRegion region);
+
+    /**
+     * Mark all RegionGroups that they should regenerate regions.
+     */
+    void markGroupsAutoDirty();
+
+    /**
+     * Add a RegionGroup.
+     *
+     * @param group The RegionGroup to add
+     */
+    void addGroup(RegionGroup group);
+
+    /**
+     * Check if a player can add a certain region as rent or buy region.
+     *
+     * @param sender The player/console that wants to add a region
+     * @param region The WorldGuard region to add
+     * @param world  The world the ProtectedRegion is located in
+     * @param type   The type the region should have in AreaShop
+     * @return The result if a player would want to add this region
+     */
+    AddResult checkRegionAdd(CommandSender sender,
+                             ProtectedRegion region,
+                             World world,
+                             GeneralRegion.RegionType type);
+
+    /**
+     * Remove a region from the list.
+     *
+     * @param region        The region to remove
+     * @param giveMoneyBack use true to give money back to the player if someone is currently holding this region, otherwise false
+     * @return true if the region has been removed, false otherwise
+     */
+    DeletingRegionEvent deleteRegion(GeneralRegion region, boolean giveMoneyBack);
+
+    /**
+     * Remove a group.
+     *
+     * @param group Group to remove
+     */
+    void removeGroup(RegionGroup group);
+
+    /**
+     * Update all signs that need periodic updating.
+     */
+    void performPeriodicSignUpdate();
+
+    /**
+     * Send out rent expire warnings.
+     */
+    void sendRentExpireWarnings();
+
+    /**
+     * Update regions in a task to minimize lag.
+     *
+     * @param regions              Regions to update
+     * @param confirmationReceiver The CommandSender that should be notified at completion
+     */
+    void updateRegions(Collection<GeneralRegion> regions, CommandSender confirmationReceiver);
+
+    /**
+     * Update a list of regions.
+     *
+     * @param regions The list of regions to update.
+     */
+    void updateRegions(Collection<GeneralRegion> regions);
+
+    /**
+     * Update all regions, happens in a task to minimize lag.
+     */
+    void updateAllRegions();
+
+    /**
+     * Update all regions.
+     *
+     * @param confirmationReceiver Optional CommandSender that should receive progress messages
+     */
+    void updateAllRegions(CommandSender confirmationReceiver);
+
+    /**
+     * Save the group file to disk.
+     */
+    void saveGroupsIsRequired();
+
+    /**
+     * Check if saving the groups file is required.
+     *
+     * @return true if changes are made and saving is required, otherwise false
+     */
+    boolean isSaveGroupsRequired();
+
+    /**
+     * Save the groups file to disk synchronously.
+     */
+    void saveGroupsNow();
+
+    /**
+     * Save all region related files spread over time (low load).
+     */
+    void saveRequiredFiles();
+
+    /**
+     * Save all region related files directly (only for cases like onDisable()).
+     */
+    void saveRequiredFilesAtOnce();
+
+    /**
+     * Indicates that a/multiple WorldGuard regions need to be saved.
+     *
+     * @param worldName The world where the regions that should be saved is in
+     */
+    void saveIsRequiredForRegionWorld(String worldName);
+
+    /**
+     * Save all worldGuard regions that need saving.
+     */
+    void saveWorldGuardRegions();
+
+    /**
+     * Get the folder the region files are located in.
+     *
+     * @return The folder where the region.yml files are in
+     */
+    String getRegionFolder();
+
+    /**
+     * Check if a region is on the adding blacklist.
+     *
+     * @param region The region name to check
+     * @return true if the region may not be added, otherwise false
+     */
+    boolean isBlacklisted(String region);
+
+    /**
+     * Unrent regions that have no time left, regions to check per tick is in the config.
+     */
+    void checkRents();
+
+    /**
+     * Check all regions and unrent/sell them if the player is inactive for too long.
+     */
+    void checkForInactiveRegions();
+
+    /**
+     * Load the file with the versions, used to check if the other files need conversion.
+     */
+    @SuppressWarnings("unchecked")
+    void loadVersions();
+
+    /**
+     * Save the versions file to disk.
+     */
+    void saveVersions();
+
+    /**
+     * Load all files from disk.
+     *
+     * @param thisTick Load files in the current tick or a tick later
+     * @return true if the files are loaded correctly, otherwise false
+     */
+    boolean loadFiles(boolean thisTick);
+
+    /**
+     * Load the default.yml file
+     *
+     * @return true if it has been loaded successfully, otherwise false
+     */
+    boolean loadDefaultFile();
+
+    /**
+     * Load the default.yml file
+     *
+     * @return true if it has been loaded successfully, otherwise false
+     */
+    boolean loadConfigFile();
+
+    /**
+     * Load the groups.yml file from disk
+     *
+     * @return true if succeeded, otherwise false
+     */
+    boolean loadGroupsFile();
+
+    /**
+     * Load all region files.
+     */
+    void loadRegionFiles();
+
+    /**
+     * Get the settings of a group.
+     *
+     * @param groupName Name of the group to get the settings from
+     * @return The settings of the group
+     */
+    ConfigurationSection getGroupSettings(String groupName);
+
+    /**
+     * Set a setting for a group.
+     *
+     * @param group   The group to set it for
+     * @param path    The path to set
+     * @param setting The value to set
+     */
+    void setGroupSetting(RegionGroup group, String path, Object setting);
+
+    // Enum for region types
+    public enum AddResult {
+        BLACKLISTED("blacklisted"),
+        NOPERMISSION("nopermission"),
+        ALREADYADDED("alreadyadded"),
+        ALREADYADDEDOTHERWORLD("alreadyaddedotherworld"),
+        SUCCESS("success");
+
+        private final String value;
+
+        AddResult(String value) {
+            this.value = value;
+        }
+
+        public String getValue() {
+            return value;
+        }
+    }
+}

AreaShop/src/main/java/me/wiefferink/areashop/managers/Manager.java

@@ -0,0 +1,12 @@
+package me.wiefferink.areashop.managers;
+
+public abstract class Manager {
+
+	/**
+	 * Called at shutdown of the plugin.
+	 */
+	public void shutdown() {
+		// To override by extending classes
+	}
+
+}

AreaShop/src/main/java/me/wiefferink/areashop/managers/SignErrorLogger.java

@@ -0,0 +1,79 @@
+package me.wiefferink.areashop.managers;
+
+import me.wiefferink.areashop.AreaShop;
+
+import java.io.File;
+import java.io.FileOutputStream;
+import java.io.IOException;
+import java.io.OutputStream;
+import java.io.OutputStreamWriter;
+import java.nio.charset.StandardCharsets;
+import java.sql.Date;
+import java.text.DateFormat;
+import java.text.SimpleDateFormat;
+import java.time.Instant;
+import java.util.LinkedList;
+import java.util.List;
+import java.util.Objects;
+import java.util.StringJoiner;
+import java.util.concurrent.atomic.AtomicBoolean;
+
+public class SignErrorLogger {
+
+    public static final String PREFIX_WARN = "[Warning] [Sign Feature] ";
+    public static final DateFormat FORMAT = new SimpleDateFormat("MM/dd/yy HH:mm:ss");
+
+    private final List<String> cache = new LinkedList<>();
+    private final AtomicBoolean needsSaving = new AtomicBoolean(false);
+
+    private final File file;
+
+    public SignErrorLogger(File file) {
+        this.file = Objects.requireNonNull(file);
+    }
+
+    public void clearCache() {
+        synchronized (this.cache) {
+            this.cache.clear();
+        }
+    }
+
+    public SignErrorLogger submitWarning(String message) {
+        final String actual = FORMAT.format(Date.from(Instant.now())) + PREFIX_WARN + message;
+        synchronized (this.cache) {
+            this.cache.add(actual);
+        }
+        return this;
+    }
+
+    public void queueSave() {
+        this.needsSaving.set(true);
+    }
+
+    public void saveIfDirty() {
+        if (this.needsSaving.get()) {
+            save();
+        }
+    }
+
+    public synchronized void save() {
+        AreaShop.debugTask("[Sign Feature] Dumping sign errors to disk...");
+        final String[] copy;
+        synchronized (this.cache) {
+            copy = cache.toArray(new String[0]);
+        }
+        final StringJoiner joiner = new StringJoiner(System.lineSeparator());
+        for (String s : copy) {
+            joiner.add(s);
+        }
+        try (OutputStream os = new FileOutputStream(file);
+             OutputStreamWriter writer = new OutputStreamWriter(os, StandardCharsets.UTF_8)) {
+            writer.write(joiner.toString());
+        } catch (IOException ex) {
+            ex.printStackTrace();
+            AreaShop.error("Failed to update the sign error log!");
+        } finally {
+            AreaShop.debugTask("[Sign Feature] Error dump complete.");
+        }
+    }
+}

AreaShop/src/main/java/me/wiefferink/areashop/managers/SignLinkerManager.java

@@ -1,9 +1,14 @@
 package me.wiefferink.areashop.managers;
 
 import me.wiefferink.areashop.AreaShop;
-import me.wiefferink.areashop.Utils;
-import me.wiefferink.areashop.features.SignsFeature;
+import me.wiefferink.areashop.MessageBridge;
+import me.wiefferink.areashop.features.signs.RegionSign;
+import me.wiefferink.areashop.features.signs.SignManager;
 import me.wiefferink.areashop.regions.GeneralRegion;
+import me.wiefferink.areashop.tools.Materials;
+import me.wiefferink.areashop.tools.SignUtils;
+import me.wiefferink.areashop.tools.Utils;
+import org.bukkit.Bukkit;
 import org.bukkit.Location;
 import org.bukkit.Material;
 import org.bukkit.block.Block;
@@ -16,39 +21,59 @@ import org.bukkit.event.Listener;
 import org.bukkit.event.block.Action;
 import org.bukkit.event.player.PlayerInteractEvent;
 import org.bukkit.event.player.PlayerQuitEvent;
-import org.bukkit.material.Sign;
 import org.bukkit.util.BlockIterator;
 
-import java.util.*;
+import javax.inject.Inject;
+import javax.inject.Singleton;
+import java.util.HashMap;
+import java.util.HashSet;
+import java.util.List;
+import java.util.Map;
+import java.util.Optional;
+import java.util.Set;
+import java.util.UUID;
 
-public class SignLinkerManager implements Listener {
-	private AreaShop plugin = null;
-	private Map<UUID, SignLinker> signLinkers;
+@Singleton
+public class SignLinkerManager extends Manager implements Listener {
+	private final Map<UUID, SignLinker> signLinkers;
 	private boolean eventsRegistered;
-	
-	public SignLinkerManager(AreaShop plugin) {
-		this.plugin = plugin;
+
+	@Inject
+	private AreaShop plugin;
+	@Inject
+	private SignManager signManager;
+	@Inject
+	private MessageBridge messageBridge;
+
+	SignLinkerManager() {
 		signLinkers = new HashMap<>();
 		eventsRegistered = false;
 	}
-	
+
+	@Override
+	public void shutdown() {
+		for(UUID uuid : signLinkers.keySet()) {
+			exitSignLinkMode(Bukkit.getPlayer(uuid));
+		}
+	}
+
 	/**
-	 * Let a player enter sign linking mode
-	 * @param player The player that has to enter sign linking mode
+	 * Let a player enter sign linking mode.
+	 * @param player  The player that has to enter sign linking mode
 	 * @param profile The profile to use for the signs (null for default)
 	 */
 	public void enterSignLinkMode(Player player, String profile) {
 		signLinkers.put(player.getUniqueId(), new SignLinker(player, profile));
-		plugin.message(player, "linksigns-first");
-		plugin.message(player, "linksigns-next");
+		messageBridge.message(player, "linksigns-first");
+		messageBridge.message(player, "linksigns-next");
 		if(!eventsRegistered) {
 			eventsRegistered = true;
 			plugin.getServer().getPluginManager().registerEvents(this, plugin);
 		}
 	}
-	
+
 	/**
-	 * Let a player exit sign linking mode
+	 * Let a player exit sign linking mode.
 	 * @param player The player that has to exit sign linking mode
 	 */
 	public void exitSignLinkMode(Player player) {
@@ -57,11 +82,11 @@ public class SignLinkerManager implements Listener {
 			eventsRegistered = false;
 			HandlerList.unregisterAll(this);
 		}
-		plugin.message(player, "linksigns-stopped");
+		messageBridge.message(player, "linksigns-stopped");
 	}
-	
+
 	/**
-	 * Check if the player is in sign linking mode
+	 * Check if the player is in sign linking mode.
 	 * @param player The player to check
 	 * @return true if the player is in sign linking mode, otherwise false
 	 */
@@ -70,7 +95,7 @@ public class SignLinkerManager implements Listener {
 	}
 
 	/**
-	 * On player interactions
+	 * On player interactions.
 	 * @param event The PlayerInteractEvent
 	 */
 	@EventHandler(priority = EventPriority.HIGH)
@@ -84,7 +109,7 @@ public class SignLinkerManager implements Listener {
 				BlockIterator blockIterator = new BlockIterator(player, 100);
 				while(blockIterator.hasNext()) {
 					Block next = blockIterator.next();
-					List<GeneralRegion> regions = Utils.getASRegionsByLocation(next.getLocation());
+					List<GeneralRegion> regions = Utils.getRegions(next.getLocation());
 					if(regions.size() == 1) {
 						linker.setRegion(regions.get(0));
 						return;
@@ -93,13 +118,13 @@ public class SignLinkerManager implements Listener {
 						for(GeneralRegion region : regions) {
 							names.add(region.getName());
 						}
-						plugin.message(player, "linksigns-multipleRegions", Utils.createCommaSeparatedList(names));
-						plugin.message(player, "linksigns-multipleRegionsAdvice");
+						messageBridge.message(player, "linksigns-multipleRegions", Utils.createCommaSeparatedList(names));
+						messageBridge.message(player, "linksigns-multipleRegionsAdvice");
 						return;
-					}					
+					}
 				}
 				// No regions found within the maximum range
-				plugin.message(player, "linksigns-noRegions");
+				messageBridge.message(player, "linksigns-noRegions");
 			} else if(event.getAction() == Action.LEFT_CLICK_AIR || event.getAction() == Action.LEFT_CLICK_BLOCK) {
 				Block block = null;
 				BlockIterator blockIterator = new BlockIterator(player, 100);
@@ -109,68 +134,68 @@ public class SignLinkerManager implements Listener {
 						block = next;
 					}
 				}
-				if(block == null || !(block.getType() == Material.WALL_SIGN || block.getType() == Material.SIGN_POST)) {
-					plugin.message(player, "linksigns-noSign");
+				if(block == null || !Materials.isSign(block.getType())) {
+					messageBridge.message(player, "linksigns-noSign");
 					return;
 				}
 
-				SignsFeature.RegionSign regionSign = SignsFeature.getSignByLocation(block.getLocation());
-				if(regionSign != null) {
-					plugin.message(player, "linksigns-alreadyRegistered", regionSign.getRegion());
+				Optional<RegionSign> optional = signManager.signFromLocation(block.getLocation());
+				if(optional.isPresent()) {
+					RegionSign regionSign = optional.get();
+					messageBridge.message(player, "linksigns-alreadyRegistered", regionSign.getRegion());
 					return;
 				}
-				Sign sign = (Sign)block.getState().getData();
-				linker.setSign(block.getLocation(), block.getType(), sign.getFacing());
+				linker.setSign(block.getLocation(), block.getType(), SignUtils.getSignFacing(block));
 			}
 		}
 	}
-	
+
 	/**
-	 * Handle disconnection players
+	 * Handle disconnection players.
 	 * @param event The PlayerQuitEvent
 	 */
 	@EventHandler(priority = EventPriority.MONITOR)
 	public void onPlayerLeave(PlayerQuitEvent event) {
-		signLinkers.remove(event.getPlayer().getUniqueId());
+		exitSignLinkMode(event.getPlayer());
 	}
-	
+
 	/**
-	 * Class to keep track of the signlinking data
+	 * Class to keep track of the signlinking data.
 	 */
 	private class SignLinker {
 		private boolean hasSign = false;
 		private boolean hasRegion = false;
-		
-		public Player linker = null;
-		public String profile = null;
-		
+
+		public final Player linker;
+		public final String profile;
+
 		public GeneralRegion region = null;
-		
+
 		public Location location = null;
 		public Material type = null;
 		public BlockFace facing = null;
-				
+
 		public SignLinker(Player linker, String profile) {
 			this.linker = linker;
 			this.profile = profile;
 		}
-		
+
 		public void setRegion(GeneralRegion region) {
 			this.region = region;
 			hasRegion = true;
 			if(!isComplete()) {
-				plugin.message(linker, "linksigns-regionFound", region);
+				messageBridge.message(linker, "linksigns-regionFound", region);
 			}
 			finish();
 		}
-		
+
 		public void setSign(Location location, Material type, BlockFace facing) {
 			this.location = location;
 			this.type = type;
 			this.facing = facing;
 			hasSign = true;
 			if(!isComplete()) {
-				plugin.message(linker, "linksigns-signFound", location.getBlockX(), location.getBlockY(), location.getBlockZ());
+				messageBridge.message(linker, "linksigns-signFound", location.getBlockX(), location.getBlockY(), location.getBlockZ());
 			}
 			finish();
 		}
@@ -179,27 +204,27 @@ public class SignLinkerManager implements Listener {
 			if(isComplete()) {
 				region.getSignsFeature().addSign(location, type, facing, profile);
 				if(profile == null) {
-					plugin.message(linker, "addsign-success", region);
+					messageBridge.message(linker, "addsign-success", region);
 				} else {
-					plugin.message(linker, "addsign-successProfile", region, profile);
+					messageBridge.message(linker, "addsign-successProfile", region, profile);
 				}
 				region.update();
 				reset();
-				
-				plugin.message(linker, "linksigns-next");
+
+				messageBridge.message(linker, "linksigns-next");
 			}
 		}
-		
+
 		public void reset() {
 			hasSign = false;
 			hasRegion = false;
 		}
-		
+
 		public boolean isComplete() {
 			return hasSign && hasRegion;
 		}
 	}
-	
+
 
 }
 

AreaShop/src/main/java/me/wiefferink/areashop/messages/ArrayWrapper.java

@@ -1,108 +0,0 @@
-package me.wiefferink.areashop.messages;
-
-import org.apache.commons.lang.Validate;
-
-import java.lang.reflect.Array;
-import java.util.Arrays;
-import java.util.Collection;
-
-/**
- * Class made by glan3b (Github: https://github.com/glen3b) for the Fanciful project (Github: https://github.com/mkremins/fanciful)
- */
-
-/**
- * Represents a wrapper around an array class of an arbitrary reference type,
- * which properly implements "value" hash code and equality functions.
- * <p>
- * This class is intended for use as a key to a map.
- * </p>
- * @param <E> The type of elements in the array.
- * @author Glen Husman
- * @see Arrays
- */
-public final class ArrayWrapper<E> {
-
-	/**
-	 * Creates an array wrapper with some elements.
-	 * @param elements The elements of the array.
-	 */
-	public ArrayWrapper(E... elements) {
-		setArray(elements);
-	}
-
-	private E[] _array;
-
-	/**
-	 * Retrieves a reference to the wrapped array instance.
-	 * @return The array wrapped by this instance.
-	 */
-	public E[] getArray() {
-		return _array;
-	}
-
-	/**
-	 * Set this wrapper to wrap a new array instance.
-	 * @param array The new wrapped array.
-	 */
-	public void setArray(E[] array) {
-		Validate.notNull(array, "The array must not be null.");
-		_array = array;
-	}
-
-	/**
-	 * Determines if this object has a value equivalent to another object.
-	 * @see Arrays#equals(Object[], Object[])
-	 */
-	@SuppressWarnings("rawtypes")
-	@Override
-	public boolean equals(Object other) {
-		if(!(other instanceof ArrayWrapper)) {
-			return false;
-		}
-		return Arrays.equals(_array, ((ArrayWrapper)other)._array);
-	}
-
-	/**
-	 * Gets the hash code represented by this objects value.
-	 * @return This object's hash code.
-	 * @see Arrays#hashCode(Object[])
-	 */
-	@Override
-	public int hashCode() {
-		return Arrays.hashCode(_array);
-	}
-
-	/**
-	 * Converts an iterable element collection to an array of elements.
-	 * The iteration order of the specified object will be used as the array element order.
-	 * @param list The iterable of objects which will be converted to an array.
-	 * @param c    The type of the elements of the array.
-	 * @param <T> The type
-	 * @return An array of elements in the specified iterable.
-	 */
-	@SuppressWarnings("unchecked")
-	public static <T> T[] toArray(Iterable<? extends T> list, Class<T> c) {
-		int size = -1;
-		if(list instanceof Collection<?>) {
-			@SuppressWarnings("rawtypes")
-			Collection coll = (Collection)list;
-			size = coll.size();
-		}
-
-
-		if(size < 0) {
-			size = 0;
-			// Ugly hack: Count it ourselves
-			for(@SuppressWarnings("unused") T element : list) {
-				size++;
-			}
-		}
-
-		T[] result = (T[])Array.newInstance(c, size);
-		int i = 0;
-		for(T element : list) { // Assumes iteration order is consistent
-			result[i++] = element; // Assign array element at index THEN increment counter
-		}
-		return result;
-	}
-}