Release 2.7.11

Allow unrented event to use placeholders

.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,25 +1,194 @@
-# Maven stuff
-target
 
-.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
 
-# Locally stored "Eclipse launch configurations"
-*.launch
+### 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
+
+# User-specific stuff
+.idea/**/workspace.xml
+.idea/**/tasks.xml
+.idea/**/usage.statistics.xml
+.idea/**/dictionaries
+.idea/**/shelf
+
+# AWS User-specific
+.idea/**/aws.xml
+
+# 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
 
-desktop.ini
+# 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/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,326 +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.6.0</version> <!-- Main plugin version -->
-
-    <parent>
-        <groupId>me.wiefferink</groupId>
-        <artifactId>areashop-parent</artifactId>
-        <version>parent</version>
-    </parent>
-
-    <dependencies>
-        <!-- Bukkit, AreaShop aims to support 1.7.9+ -->
-        <dependency>
-            <groupId>org.bukkit</groupId>
-            <artifactId>craftbukkit</artifactId>
-            <version>1.13-R0.1-SNAPSHOT</version>
-            <type>jar</type>
-            <optional>true</optional>
-            <scope>provided</scope>
-        </dependency>
-
-        <!-- InteractiveMessenger library -->
-        <dependency>
-            <groupId>me.wiefferink</groupId>
-            <artifactId>interactivemessenger</artifactId>
-            <version>1.1-SNAPSHOT</version>
-        </dependency>
-
-        <!-- BukkitDo library -->
-        <dependency>
-            <groupId>me.wiefferink</groupId>
-            <artifactId>bukkitdo</artifactId>
-            <version>1.0.0-SNAPSHOT</version>
-        </dependency>
-
-        <!-- WorldEdit/WorldGuard -->
-        <dependency>
-            <groupId>com.sk89q</groupId>
-            <artifactId>worldedit</artifactId>
-            <scope>system</scope>
-            <version>any</version>
-            <systemPath>${project.basedir}/../dependencies/worldedit-bukkit-7.0.0-beta-04.jar</systemPath>
-        </dependency>
-        <dependency>
-            <groupId>com.sk89q</groupId>
-            <artifactId>worldguard</artifactId>
-            <scope>system</scope>
-            <version>any</version>
-            <systemPath>${project.basedir}/../dependencies/worldguard-legacy-7.0.0-beta-02.jar</systemPath>
-        </dependency>
-
-        <!-- Interfaces that specific WorldGuard and WorldEdit versions are built against -->
-        <dependency>
-            <groupId>me.wiefferink</groupId>
-            <artifactId>areashop-interface</artifactId>
-            <version>latest</version>
-            <type>jar</type>
-            <scope>compile</scope>
-        </dependency>
-
-        <!-- Bukkit api implementations -->
-        <dependency>
-            <groupId>me.wiefferink</groupId>
-            <artifactId>areashop-bukkit-1_12</artifactId>
-            <version>latest</version>
-            <type>jar</type>
-            <scope>compile</scope>
-        </dependency>
-        <dependency>
-            <groupId>me.wiefferink</groupId>
-            <artifactId>areashop-bukkit-1_13</artifactId>
-            <version>latest</version>
-            <type>jar</type>
-            <scope>compile</scope>
-        </dependency>
-
-        <!-- WorldGuard implementations -->
-        <dependency>
-            <groupId>me.wiefferink</groupId>
-            <artifactId>areashop-worldguard-5</artifactId>
-            <version>latest</version>
-            <type>jar</type>
-            <scope>compile</scope>
-        </dependency>
-        <dependency>
-            <groupId>me.wiefferink</groupId>
-            <artifactId>areashop-worldguard-6</artifactId>
-            <version>latest</version>
-            <type>jar</type>
-            <scope>compile</scope>
-        </dependency>
-        <dependency>
-            <groupId>me.wiefferink</groupId>
-            <artifactId>areashop-worldguard-6_1_3</artifactId>
-            <version>latest</version>
-            <type>jar</type>
-            <scope>compile</scope>
-        </dependency>
-        <dependency>
-            <groupId>me.wiefferink</groupId>
-            <artifactId>areashop-worldguard-7_beta_1</artifactId>
-            <version>latest</version>
-            <type>jar</type>
-            <scope>compile</scope>
-        </dependency>
-        <dependency>
-            <groupId>me.wiefferink</groupId>
-            <artifactId>areashop-worldguard-7_beta_2</artifactId>
-            <version>latest</version>
-            <type>jar</type>
-            <scope>compile</scope>
-        </dependency>
-
-        <!-- WorldEdit implementations -->
-        <dependency>
-            <groupId>me.wiefferink</groupId>
-            <artifactId>areashop-worldedit-5</artifactId>
-            <version>latest</version>
-            <type>jar</type>
-            <scope>compile</scope>
-        </dependency>
-        <dependency>
-            <groupId>me.wiefferink</groupId>
-            <artifactId>areashop-worldedit-6</artifactId>
-            <version>latest</version>
-            <type>jar</type>
-            <scope>compile</scope>
-        </dependency>
-        <dependency>
-            <groupId>me.wiefferink</groupId>
-            <artifactId>areashop-worldedit-7_beta_1</artifactId>
-            <version>latest</version>
-            <type>jar</type>
-            <scope>compile</scope>
-        </dependency>
-        <dependency>
-            <groupId>me.wiefferink</groupId>
-            <artifactId>areashop-worldedit-7_beta_4</artifactId>
-            <version>latest</version>
-        </dependency>
-        <dependency>
-            <groupId>me.wiefferink</groupId>
-            <artifactId>areashop-fastasyncworldedit</artifactId>
-            <version>latest</version>
-            <type>jar</type>
-            <scope>compile</scope>
-        </dependency>
-
-        <!-- Vault -->
-        <dependency>
-            <groupId>net.milkbowl.vault</groupId>
-            <artifactId>VaultAPI</artifactId>
-            <scope>system</scope>
-            <version>any</version>
-            <systemPath>${project.basedir}/../dependencies/VaultAPI-1.4.jar</systemPath>
-        </dependency>
-
-        <!-- bStats -->
-        <dependency>
-            <groupId>org.bstats</groupId>
-            <artifactId>bstats-bukkit</artifactId>
-            <version>1.1</version>
-        </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>3.1.0</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>
-                        <configuration>
-                            <relocations>
-                                <!-- Relocate messaging framework -->
-                                <relocation>
-                                    <pattern>me.wiefferink.interactivemessenger</pattern>
-                                    <shadedPattern>me.wiefferink.areashop.shaded.interactivemessenger</shadedPattern>
-                                </relocation>
-                                <!-- Relocate BukkitDo -->
-                                <relocation>
-                                    <pattern>me.wiefferink.bukkitdo</pattern>
-                                    <shadedPattern>me.wiefferink.areashop.shaded.bukkitdo</shadedPattern>
-                                </relocation>
-                                <!-- Relocate bstats -->
-                                <relocation>
-                                    <pattern>org.bstats</pattern>
-                                    <shadedPattern>me.wiefferink.areashop.shaded.bstats</shadedPattern>
-                                </relocation>
-                            </relocations>
-                        </configuration>
-                    </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/AreaShop.java

@@ -1,23 +1,36 @@
 package me.wiefferink.areashop;
 
+import com.google.inject.Guice;
+import com.google.inject.Injector;
+import com.google.inject.Stage;
 import com.sk89q.worldedit.bukkit.WorldEditPlugin;
 import com.sk89q.worldguard.bukkit.WorldGuardPlugin;
 import com.sk89q.worldguard.protection.managers.RegionManager;
+import io.papermc.lib.PaperLib;
+import me.wiefferink.areashop.adapters.platform.MinecraftPlatform;
+import me.wiefferink.areashop.adapters.platform.paper.PaperPlatform;
+import me.wiefferink.areashop.features.signs.SignManager;
 import me.wiefferink.areashop.interfaces.AreaShopInterface;
-import me.wiefferink.areashop.interfaces.BukkitInterface;
 import me.wiefferink.areashop.interfaces.WorldEditInterface;
 import me.wiefferink.areashop.interfaces.WorldGuardInterface;
 import me.wiefferink.areashop.listeners.PlayerLoginLogoutListener;
 import me.wiefferink.areashop.managers.CommandManager;
 import me.wiefferink.areashop.managers.FeatureManager;
+import me.wiefferink.areashop.managers.IFileManager;
 import me.wiefferink.areashop.managers.FileManager;
 import me.wiefferink.areashop.managers.Manager;
+import me.wiefferink.areashop.managers.SignErrorLogger;
 import me.wiefferink.areashop.managers.SignLinkerManager;
-import me.wiefferink.areashop.tools.Analytics;
+import me.wiefferink.areashop.modules.AreaShopModule;
+import me.wiefferink.areashop.modules.BukkitModule;
+import me.wiefferink.areashop.modules.DependencyModule;
+import me.wiefferink.areashop.modules.PlatformModule;
+import me.wiefferink.areashop.nms.NMS;
 import me.wiefferink.areashop.tools.GithubUpdateCheck;
+import me.wiefferink.areashop.tools.SimpleMessageBridge;
+import me.wiefferink.areashop.tools.SpigotPlatform;
 import me.wiefferink.areashop.tools.Utils;
 import me.wiefferink.bukkitdo.Do;
-import me.wiefferink.interactivemessenger.processing.Message;
 import me.wiefferink.interactivemessenger.source.LanguageManager;
 import net.milkbowl.vault.economy.Economy;
 import org.apache.commons.lang.StringUtils;
@@ -35,32 +48,37 @@ import org.bukkit.plugin.Plugin;
 import org.bukkit.plugin.RegisteredServiceProvider;
 import org.bukkit.plugin.java.JavaPlugin;
 
-import java.util.Arrays;
+import javax.annotation.Nonnull;
+import java.io.File;
 import java.util.HashSet;
 import java.util.List;
 import java.util.Set;
-import java.util.regex.Matcher;
-import java.util.regex.Pattern;
+import java.util.concurrent.TimeUnit;
+import java.util.function.Supplier;
 
 /**
  * Main class for the AreaShop plugin.
  * Contains methods to get parts of the plugins functionality and definitions for constants.
  */
-public final class AreaShop extends JavaPlugin implements AreaShopInterface {
+public final class AreaShop extends JavaPlugin implements AreaShopApi {
 	// Statically available instance
 	private static AreaShop instance = null;
 
 	// General variables
+	private Injector injector;
 	private WorldGuardPlugin worldGuard = null;
 	private WorldGuardInterface worldGuardInterface = null;
 	private WorldEditPlugin worldEdit = null;
 	private WorldEditInterface worldEditInterface = null;
-	private BukkitInterface bukkitInterface = null;
-	private FileManager fileManager = null;
+	private NMS nms;
+	private MessageBridge messageBridge;
+	private IFileManager fileManager = null;
 	private LanguageManager languageManager = null;
 	private CommandManager commandManager = null;
 	private SignLinkerManager signLinkerManager = null;
 	private FeatureManager featureManager = null;
+	private SignManager signManager;
+	private SignErrorLogger signErrorLogger;
 	private Set<Manager> managers = null;
 	private boolean debug = false;
 	private List<String> chatprefix = null;
@@ -75,6 +93,7 @@ public final class AreaShop extends JavaPlugin implements AreaShopInterface {
 	public static final String defaultFile = "default.yml";
 	public static final String configFile = "config.yml";
 	public static final String configFileHidden = "hiddenConfig.yml";
+	public static final String signLogFile = "sign-errors.log";
 	public static final String versionFile = "versions";
 
 	// Euro tag for in the config
@@ -149,267 +168,147 @@ public final class AreaShop extends JavaPlugin implements AreaShopInterface {
 		AreaShop.instance = this;
 		Do.init(this);
 		managers = new HashSet<>();
-		boolean error = false;
+		messageBridge = new SimpleMessageBridge();
+		signErrorLogger = new SignErrorLogger(new File(getDataFolder(), signLogFile));
+
+		// Setup NMS Impl
+		String rawServerVersion = Bukkit.getServer().getClass().getPackageName();
+		String[] split = rawServerVersion.split("\\.");
+		String serverVersion = split[3];
+		try {
+			Class<?> nmsImpl = Class.forName("me.wiefferink.areashop.adapters.platform." + serverVersion + ".NMSImpl");
+			this.nms = nmsImpl.asSubclass(NMS.class).getConstructor().newInstance();
+		} catch (ReflectiveOperationException ex) {
+			ex.printStackTrace();
+			error("Failed to initialize NMS implementation!");
+			shutdownOnError();
+			return;
+		}
+		final MinecraftPlatform platform;
+		if (PaperLib.isPaper()) {
+			platform = new PaperPlatform(this);
+			info("Detected Paper; using the PaperPlatform impl");
+		} else {
+			platform = new SpigotPlatform(this);
+			info("Detected Spigot; using the SpigotPlatform impl");
+		}
+		final PlatformModule platformModule = new PlatformModule(platform, this.nms);
+
+		// Check if Vault is present
+		if(getServer().getPluginManager().getPlugin("Vault") == null) {
+			error("Vault plugin is not present or has not loaded correctly");
+			shutdownOnError();
+			return;
+		}
 
 		// Find WorldEdit integration version to load
-		String weVersion = null;
-		String rawWeVersion = null;
-		String weBeta = null;
+		String weHandlerVersion;
 		Plugin plugin = getServer().getPluginManager().getPlugin("WorldEdit");
 		if(!(plugin instanceof WorldEditPlugin) || !plugin.isEnabled()) {
 			error("WorldEdit plugin is not present or has not loaded correctly");
-			error = true;
+			return;
 		} else {
-			worldEdit = (WorldEditPlugin)plugin;
-			rawWeVersion = worldEdit.getDescription().getVersion();
-
-			// Find beta version
-			Pattern pattern = Pattern.compile("beta-?\\d+");
-			Matcher matcher = pattern.matcher(rawWeVersion);
-			if (matcher.find()) {
-				weBeta = matcher.group();
-			}
-
-			// Get correct WorldEditInterface (handles things that changed version to version)
-			if(worldEdit.getDescription().getVersion().startsWith("5.")) {
-				weVersion = "5";
-			} else if(worldEdit.getDescription().getVersion().startsWith("6.")) {
-				weVersion = "6";
-			} else if ("beta-01".equalsIgnoreCase(weBeta)) {
-				weVersion = "7_beta_1";
+			this.worldEdit = (WorldEditPlugin) plugin;
+			Plugin fawePlugin = getServer().getPluginManager().getPlugin("FastAsyncWorldEdit");
+			if (fawePlugin != null && fawePlugin.isEnabled()) {
+				weHandlerVersion = "FastAsyncWorldEditHandler";
+				info("Detected FastAsyncWorldEdit, using the fawe handler");
 			} else {
-				// beta-02 and beta-03 also have the new vector system already
-				weVersion = "7_beta_4";
+				weHandlerVersion = "WorldEditHandler";
 			}
-
-			weVersion = "WorldEditHandler" + weVersion;
 		}
 
-		// Find WorldGuard integration version to load
-		String wgVersion = null;
-		String rawWgVersion = null;
-		int major = 0;
-		int minor = 0;
-		int fixes = 0;
-		Integer build = null;
 		plugin = getServer().getPluginManager().getPlugin("WorldGuard");
 		if(!(plugin instanceof WorldGuardPlugin) || !plugin.isEnabled()) {
 			error("WorldGuard plugin is not present or has not loaded correctly");
-			error = true;
+			shutdownOnError();
+			return;
 		} else {
-			worldGuard = (WorldGuardPlugin)plugin;
-			// Get correct WorldGuardInterface (handles things that changed version to version)
-			try {
-				rawWgVersion = worldGuard.getDescription().getVersion();
-				if(rawWgVersion.contains("-SNAPSHOT;")) {
-					String buildNumber = rawWgVersion.substring(rawWgVersion.indexOf("-SNAPSHOT;") + 10);
-					if(buildNumber.contains("-")) {
-						buildNumber = buildNumber.substring(0, buildNumber.indexOf('-'));
-						if (Utils.isNumeric(buildNumber)) {
-							build = Integer.parseInt(buildNumber);
-						} else {
-							warn("Could not correctly parse the build of WorldGuard, raw version: " + rawWgVersion + ", buildNumber: " + buildNumber);
-						}
-					}
-				}
-				// Clear stuff from the version string that is not a number
-				String[] versionParts = rawWgVersion.split("\\.");
-				for(int i = 0; i < versionParts.length; i++) {
-					Pattern pattern = Pattern.compile("^\\d+");
-					Matcher matcher = pattern.matcher(versionParts[i]);
-					if(matcher.find()) {
-						versionParts[i] = matcher.group();
-					}
-				}
-				// Find major, minor and fix numbers
-				try {
-					if(versionParts.length > 0) {
-						major = Integer.parseInt(versionParts[0]);
-					}
-					if(versionParts.length > 1) {
-						minor = Integer.parseInt(versionParts[1]);
-					}
-					if(versionParts.length > 2) {
-						fixes = Integer.parseInt(versionParts[2]);
-					}
-				} catch(NumberFormatException e) {
-					warn("Something went wrong while parsing WorldGuard version number: " + rawWgVersion);
-				}
-
-				// Determine correct implementation to use
-				if(rawWgVersion.startsWith("5.")) {
-					wgVersion = "5";
-				} else if(major == 6 && minor == 1 && fixes < 3) {
-					wgVersion = "6";
-				} else if(major == 6) {
-					if(build != null && build == 1672) {
-						error = true;
-						error("Build 1672 of WorldGuard is broken, update to a later build or a stable version!");
-					} else if(build != null && build < 1672) {
-						wgVersion = "6";
-					} else {
-						wgVersion = "6_1_3";
-					}
-				} else if ("beta-01".equalsIgnoreCase(weBeta)) {
-					// When using WorldEdit beta-01, we need to use the WorldGuard variant with the old vector system
-					wgVersion = "7_beta_1";
-				} else {
-					// Even though the WorldGuard file is called beta-02, the reported version is still beta-01!
-					wgVersion = "7_beta_2";
-				}
-			} catch(Exception e) { // If version detection fails, at least try to load the latest version
-				warn("Parsing the WorldGuard version failed, assuming version 7_beta_2:", rawWgVersion);
-				wgVersion = "7_beta_2";
-			}
-
-			wgVersion = "WorldGuardHandler" + wgVersion;
+			this.worldGuard = (WorldGuardPlugin) plugin;
 		}
 
-		// Check if FastAsyncWorldEdit is installed
-		boolean fawe;
-		try {
-			Class.forName("com.boydti.fawe.Fawe" );
-			fawe = true;
-		} catch (ClassNotFoundException ignore) {
-			fawe = false;
-		}
-
-		if (fawe) {
-			boolean useNewIntegration = true;
-			List<String> standardIntegrationVersions = Arrays.asList("1.7", "1.8", "1.9", "1.10", "1.11", "1.12");
-			for(String standardIntegrationVersion : standardIntegrationVersions) {
-				String version = Bukkit.getBukkitVersion();
-				// Detects '1.8', '1.8.3', '1.8-pre1' style versions
-				if(version.equals(standardIntegrationVersion)
-						|| version.startsWith(standardIntegrationVersion + ".")
-						|| version.startsWith(standardIntegrationVersion + "-")) {
-					useNewIntegration = false;
-					break;
-				}
-			}
-
-			if (useNewIntegration) {
-				weVersion = "FastAsyncWorldEditHandler";
-				wgVersion = "FastAsyncWorldEditWorldGuardHandler";
-			}
-		}
+		DependencyModule dependencyModule = new DependencyModule(this.worldEdit, this.worldGuard, getEconomy(), getPermissionProvider());
 
 		// Load WorldEdit
 		try {
-			Class<?> clazz = Class.forName("me.wiefferink.areashop.handlers." + weVersion);
-			// Check if we have a NMSHandler class at that location.
+			Class<?> clazz = Class.forName("me.wiefferink.areashop.adapters.plugins." + weHandlerVersion);
 			if(WorldEditInterface.class.isAssignableFrom(clazz)) { // Make sure it actually implements WorldEditInterface
 				worldEditInterface = (WorldEditInterface)clazz.getConstructor(AreaShopInterface.class).newInstance(this); // Set our handler
 			}
 		} catch(Exception e) {
-			error("Could not load the handler for WorldEdit (tried to load " + weVersion + "), report this problem to the author: " + ExceptionUtils.getStackTrace(e));
-			error = true;
-			weVersion = null;
+			error("Could not load the handler for WorldEdit (tried to load " + weHandlerVersion + "), report this problem to the author: " + ExceptionUtils.getStackTrace(e));
+			shutdownOnError();
+			return;
 		}
 
 		// Load WorldGuard
 		try {
-			Class<?> clazz = Class.forName("me.wiefferink.areashop.handlers." + wgVersion);
+			Class<?> clazz = Class.forName("me.wiefferink.areashop.adapters.plugins.WorldGuardHandler");
 			// Check if we have a NMSHandler class at that location.
 			if(WorldGuardInterface.class.isAssignableFrom(clazz)) { // Make sure it actually implements WorldGuardInterface
 				worldGuardInterface = (WorldGuardInterface)clazz.getConstructor(AreaShopInterface.class).newInstance(this); // Set our handler
 			}
 		} catch(Exception e) {
-			error("Could not load the handler for WorldGuard (tried to load " + wgVersion + "), report this problem to the author:" + ExceptionUtils.getStackTrace(e));
-			error = true;
-			wgVersion = null;
+			error("Could not load the handler for WorldGuard, report this problem to the author:" + ExceptionUtils.getStackTrace(e));
+			shutdownOnError();
+			return;
 		}
 
-		// Load Bukkit implementation
-		String bukkitHandler;
-		try {
-			Class.forName("org.bukkit.block.data.type.WallSign");
-			bukkitHandler = "1_13";
-		} catch (ClassNotFoundException e) {
-			bukkitHandler = "1_12";
-		}
-
-		try {
-			Class<?> clazz = Class.forName("me.wiefferink.areashop.handlers.BukkitHandler" + bukkitHandler);
-			bukkitInterface = (BukkitInterface)clazz.getConstructor(AreaShopInterface.class).newInstance(this);
-		} catch (Exception e) {
-			error("Could not load the Bukkit handler (used for sign updates), tried to load:", bukkitHandler + ", report this problem to the author:", ExceptionUtils.getStackTrace(e));
-			error = true;
-			bukkitHandler = null;
-		}
-
-		// Check if Vault is present
-		if(getServer().getPluginManager().getPlugin("Vault") == null) {
-			error("Vault plugin is not present or has not loaded correctly");
-			error = true;
-		}
+		AreaShopModule asModule = new AreaShopModule(this, messageBridge, nms, worldEditInterface, worldGuardInterface, signErrorLogger, platformModule, dependencyModule);
+		injector = Guice.createInjector(Stage.PRODUCTION, new BukkitModule(getServer()), asModule);
 
 		// Load all data from files and check versions
-		fileManager = new FileManager();
-		managers.add(fileManager);
+		fileManager = injector.getInstance(IFileManager.class);
+		managers.add((FileManager) fileManager);
 		boolean loadFilesResult = fileManager.loadFiles(false);
-		error = error || !loadFilesResult;
-
-		// Print loaded version of WG and WE in debug
-		if(wgVersion != null) {
-			AreaShop.debug("Loaded ", wgVersion, "(raw version:" + rawWgVersion + ", major:" + major + ", minor:" + minor + ", fixes:" + fixes + ", build:" + build + ", fawe:" + fawe + ")");
-		}
-		if(weVersion != null) {
-			AreaShop.debug("Loaded ", weVersion, "(raw version:" + rawWeVersion + ", beta:" + weBeta + ")");
-		}
-		if(bukkitHandler != null) {
-			AreaShop.debug("Loaded BukkitHandler", bukkitHandler);
+		if (!loadFilesResult) {
+			shutdownOnError();
+			return;
 		}
 
 		setupLanguageManager();
 
-		if(error) {
-			error("The plugin has not started, fix the errors listed above");
-		} else {
-			featureManager = new FeatureManager();
-			managers.add(featureManager);
+		featureManager = injector.getInstance(FeatureManager.class);
+		featureManager.initializeFeatures(injector);
+		managers.add(featureManager);
+		signManager = new SignManager();
+		managers.add(signManager);
 
-			// Register the event listeners
-			getServer().getPluginManager().registerEvents(new PlayerLoginLogoutListener(this), this);
+		// Register the event listeners
+		getServer().getPluginManager().registerEvents(new PlayerLoginLogoutListener(this, messageBridge), this);
 
-			setupTasks();
+		setupTasks();
 
-			// Startup the CommandManager (registers itself for the command)
-			commandManager = new CommandManager();
-			managers.add(commandManager);
+		// Startup the CommandManager (registers itself for the command)
+		commandManager = injector.getInstance(CommandManager.class);
+		managers.add(commandManager);
 
-			// Create a signLinkerManager
-			signLinkerManager = new SignLinkerManager();
-			managers.add(signLinkerManager);
+		// Create a signLinkerManager
+		signLinkerManager = injector.getInstance(SignLinkerManager.class);
+		managers.add(signLinkerManager);
 
-			// Enable Metrics if config allows it
-			if(getConfig().getBoolean("sendStats")) {
-				Analytics.start();
-			}
+		// Register dynamic permission (things declared in config)
+		registerDynamicPermissions();
 
-			// Register dynamic permission (things declared in config)
-			registerDynamicPermissions();
+		// Don't initialize the updatechecker if disabled in the config
+		if(getConfig().getBoolean("checkForUpdates")) {
+			githubUpdateCheck = new GithubUpdateCheck(
+					this,
+					"md5sha256",
+					"AreaShop"
+			).withVersionComparator((latestVersion, currentVersion) ->
+					!cleanVersion(latestVersion).equals(cleanVersion(currentVersion))
+			).checkUpdate(result -> {
+				AreaShop.debug("Update check result:", result);
+				if(!result.hasUpdate()) {
+					return;
+				}
 
-			// Don't initialize the updatechecker if disabled in the config
-			if(getConfig().getBoolean("checkForUpdates")) {
-				githubUpdateCheck = new GithubUpdateCheck(
-						AreaShop.getInstance(),
-						"NLThijs48",
-						"AreaShop"
-				).withVersionComparator((latestVersion, currentVersion) ->
-						!cleanVersion(latestVersion).equals(cleanVersion(currentVersion))
-				).checkUpdate(result -> {
-					AreaShop.debug("Update check result:", result);
-					if(!result.hasUpdate()) {
-						return;
-					}
-
-					AreaShop.info("Update from AreaShop V" + cleanVersion(result.getCurrentVersion()) + " to AreaShop V" + cleanVersion(result.getLatestVersion()) + " available, get the latest version at https://www.spigotmc.org/resources/areashop.2991/");
-					for(Player player : Utils.getOnlinePlayers()) {
-						notifyUpdate(player);
-					}
-				});
-			}
+				AreaShop.info("Update from AreaShop V" + cleanVersion(result.getCurrentVersion()) + " to AreaShop V" + cleanVersion(result.getLatestVersion()) + " available, get the latest version at https://github.com/md5sha256/releases");
+				for(Player player : Utils.getOnlinePlayers()) {
+					notifyUpdate(player);
+				}
+			});
 		}
 	}
 
@@ -419,10 +318,15 @@ public final class AreaShop extends JavaPlugin implements AreaShopInterface {
 	 */
 	public void notifyUpdate(CommandSender sender) {
 		if(githubUpdateCheck != null && githubUpdateCheck.hasUpdate() && sender.hasPermission("areashop.notifyupdate")) {
-			AreaShop.getInstance().message(sender, "update-playerNotify", cleanVersion(githubUpdateCheck.getCurrentVersion()), cleanVersion(githubUpdateCheck.getLatestVersion()));
+			messageBridge.message(sender, "update-playerNotify", cleanVersion(githubUpdateCheck.getCurrentVersion()), cleanVersion(githubUpdateCheck.getLatestVersion()));
 		}
 	}
 
+	private void shutdownOnError() {
+		error("The plugin has not started, fix the errors listed above");
+		getServer().getPluginManager().disablePlugin(this);
+	}
+
 	/**
 	 * Cleanup a version number.
 	 * @param version Version to clean
@@ -456,24 +360,7 @@ public final class AreaShop extends JavaPlugin implements AreaShopInterface {
 		for(Manager manager : managers) {
 			manager.shutdown();
 		}
-		managers = null;
-		fileManager = null;
-		languageManager = null;
-		commandManager = null;
-		signLinkerManager = null;
-		featureManager = null;
-
-		// Cleanup plugins
-		worldGuard = null;
-		worldGuardInterface = null;
-		worldEdit = null;
-		worldEditInterface = null;
-
-		// Cleanup other stuff
-		chatprefix = null;
-		debug = false;
-		ready = false;
-
+		signErrorLogger.saveIfDirty();
 		HandlerList.unregisterAll(this);
 	}
 
@@ -522,6 +409,14 @@ public final class AreaShop extends JavaPlugin implements AreaShopInterface {
 		this.chatprefix = chatprefix;
 	}
 
+	public NMS getNms() {
+		return nms;
+	}
+
+	public SignErrorLogger getSignErrorLogger() {
+		return signErrorLogger;
+	}
+
 	/**
 	 * Function to get the WorldGuard plugin.
 	 * @return WorldGuardPlugin
@@ -539,6 +434,12 @@ public final class AreaShop extends JavaPlugin implements AreaShopInterface {
 		return this.worldGuardInterface;
 	}
 
+
+	@Nonnull
+	public SignManager getSignManager() {
+		return signManager;
+	}
+
 	/**
 	 * Get the RegionManager.
 	 * @param world World to get the RegionManager for
@@ -557,6 +458,11 @@ public final class AreaShop extends JavaPlugin implements AreaShopInterface {
 		return worldEdit;
 	}
 
+	@Override
+	public Plugin pluginInstance() {
+		return this;
+	}
+
 	/**
 	 * Function to get WorldGuardInterface for version dependent things.
 	 * @return WorldGuardInterface
@@ -573,18 +479,12 @@ public final class AreaShop extends JavaPlugin implements AreaShopInterface {
 		return languageManager;
 	}
 
-	/**
-	 * Get the BukkitHandler, for sign interactions.
-	 * @return BukkitHandler
-	 */
-	public BukkitInterface getBukkitHandler() {
-		return this.bukkitInterface;
-	}
-
 	/**
 	 * Function to get the CommandManager.
 	 * @return the CommandManager
 	 */
+	@Nonnull
+	@Override
 	public CommandManager getCommandManager() {
 		return commandManager;
 	}
@@ -594,6 +494,8 @@ public final class AreaShop extends JavaPlugin implements AreaShopInterface {
 	 * Handles sign linking mode.
 	 * @return The SignLinkerManager
 	 */
+	@Nonnull
+	@Override
 	public SignLinkerManager getSignlinkerManager() {
 		return signLinkerManager;
 	}
@@ -603,6 +505,8 @@ public final class AreaShop extends JavaPlugin implements AreaShopInterface {
 	 * Manages region specific features.
 	 * @return The FeatureManager
 	 */
+	@Nonnull
+	@Override
 	public FeatureManager getFeatureManager() {
 		return featureManager;
 	}
@@ -611,9 +515,10 @@ public final class AreaShop extends JavaPlugin implements AreaShopInterface {
 	 * Function to get the Vault plugin.
 	 * @return Economy
 	 */
-	public Economy getEconomy() {
+	@Deprecated
+	private Economy getEconomy() {
 		RegisteredServiceProvider<Economy> economy = getServer().getServicesManager().getRegistration(net.milkbowl.vault.economy.Economy.class);
-		if(economy == null || economy.getProvider() == null) {
+		if(economy == null) {
 			error("There is no economy provider to support Vault, make sure you installed an economy plugin");
 			return null;
 		}
@@ -624,9 +529,10 @@ public final class AreaShop extends JavaPlugin implements AreaShopInterface {
 	 * Get the Vault permissions provider.
 	 * @return Vault permissions provider
 	 */
-	public net.milkbowl.vault.permission.Permission getPermissionProvider() {
+	@Deprecated
+	private net.milkbowl.vault.permission.Permission getPermissionProvider() {
 		RegisteredServiceProvider<net.milkbowl.vault.permission.Permission> permissionProvider = getServer().getServicesManager().getRegistration(net.milkbowl.vault.permission.Permission.class);
-		if (permissionProvider == null || permissionProvider.getProvider() == null) {
+		if (permissionProvider == null) {
 			return null;
 		}
 		return permissionProvider.getProvider();
@@ -659,7 +565,7 @@ public final class AreaShop extends JavaPlugin implements AreaShopInterface {
 	 * Method to get the FileManager (loads/save regions and can be used to get regions).
 	 * @return The fileManager
 	 */
-	public FileManager getFileManager() {
+	public IFileManager getFileManager() {
 		return fileManager;
 	}
 
@@ -689,6 +595,13 @@ public final class AreaShop extends JavaPlugin implements AreaShopInterface {
 	 * Register all required tasks.
 	 */
 	private void setupTasks() {
+
+		long signLogTicks = Utils.millisToTicks(TimeUnit.MINUTES.toMillis(5));
+		Bukkit.getScheduler().runTaskTimerAsynchronously(this,
+				() -> signErrorLogger.saveIfDirty(),
+				signLogTicks,
+				signLogTicks);
+
 		// Rent expiration timer
 		long expirationCheck = Utils.millisToTicks(Utils.getDurationFromSecondsOrString("expiration.delay"));
 		final AreaShop finalPlugin = this;
@@ -764,26 +677,6 @@ public final class AreaShop extends JavaPlugin implements AreaShopInterface {
 		}
 	}
 
-	/**
-	 * 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
-	 */
-	public void messageNoPrefix(Object target, String key, Object... replacements) {
-		Message.fromKey(key).replacements(replacements).send(target);
-	}
-
-	/**
-	 * 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
-	 */
-	public void message(Object target, String key, Object... replacements) {
-		Message.fromKey(key).prefix().replacements(replacements).send(target);
-	}
-
 
 	/**
 	 * Return the config.
@@ -812,12 +705,19 @@ public final class AreaShop extends JavaPlugin implements AreaShopInterface {
 		AreaShop.debug(StringUtils.join(message, " "));
 	}
 
+	@Override
+	public void debugI(Supplier<String> message) {
+		if (debug) {
+			info("Debug: " + message.get());
+		}
+	}
+
 	/**
 	 * Print an information message to the console.
 	 * @param message The message to print
 	 */
 	public static void info(Object... message) {
-		AreaShop.getInstance().getLogger().info(StringUtils.join(message, " "));
+		AreaShop.getInstance().getLogger().info(() -> StringUtils.join(message, " "));
 	}
 
 	/**
@@ -825,7 +725,7 @@ public final class AreaShop extends JavaPlugin implements AreaShopInterface {
 	 * @param message The message to print
 	 */
 	public static void warn(Object... message) {
-		AreaShop.getInstance().getLogger().warning(StringUtils.join(message, " "));
+		AreaShop.getInstance().getLogger().warning(() -> StringUtils.join(message, " "));
 	}
 
 	/**
@@ -833,7 +733,7 @@ public final class AreaShop extends JavaPlugin implements AreaShopInterface {
 	 * @param message The message to print
 	 */
 	public static void error(Object... message) {
-		AreaShop.getInstance().getLogger().severe(StringUtils.join(message, " "));
+		AreaShop.getInstance().getLogger().severe(() -> StringUtils.join(message, " "));
 	}
 
 	/**
@@ -855,7 +755,7 @@ public final class AreaShop extends JavaPlugin implements AreaShopInterface {
 		fileManager.saveRequiredFilesAtOnce();
 		fileManager.loadFiles(true);
 		setupLanguageManager();
-		message(confirmationReceiver, "reload-reloading");
+		messageBridge.message(confirmationReceiver, "reload-reloading");
 		fileManager.checkRents();
 		fileManager.updateAllRegions(confirmationReceiver);
 	}

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

@@ -2,15 +2,19 @@ package me.wiefferink.areashop.commands;
 
 import com.sk89q.worldguard.protection.regions.ProtectedRegion;
 import me.wiefferink.areashop.AreaShop;
+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.managers.FileManager;
+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;
@@ -20,6 +24,8 @@ import org.bukkit.World;
 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.HashMap;
@@ -29,8 +35,20 @@ import java.util.TreeSet;
 import java.util.UUID;
 import java.util.stream.Collectors;
 
+@Singleton
 public class AddCommand extends CommandAreaShop {
 
+	@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";
@@ -59,12 +77,12 @@ public class AddCommand extends CommandAreaShop {
 				&& !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".equalsIgnoreCase(args[1]) && !"buy".equalsIgnoreCase(args[1]))) {
-			plugin.message(sender, "add-help");
+			messageBridge.message(sender, "add-help");
 			return;
 		}
 		Map<String, ProtectedRegion> regions = new HashMap<>();
@@ -75,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;
 			}
-			WorldEditSelection selection = plugin.getWorldEditHandler().getPlayerSelection(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.getWorldEditRegionsInSelection(selection).stream().collect(Collectors.toMap(ProtectedRegion::getId, region -> region));
 			if(regions.isEmpty()) {
-				plugin.message(player, "cmd-noWERegionsFound");
+				messageBridge.message(player, "cmd-noWERegionsFound");
 				return;
 			}
 		} else {
@@ -94,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 {
@@ -102,19 +120,19 @@ 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.getRegionManager(world).getRegion(args[2]);
 			if(region == null) {
-				plugin.message(sender, "cmd-noRegion", args[2]);
+				messageBridge.message(sender, "cmd-noRegion", args[2]);
 				return;
 			}
 			regions.put(args[2], region);
@@ -138,22 +156,22 @@ public class AddCommand extends CommandAreaShop {
 				String regionName = regionEntry.getKey();
 				ProtectedRegion region = regionEntry.getValue();
 				// 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().containsOwner(region, finalPlayer.getUniqueId());
+				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";
 				}
-				FileManager.AddResult result = plugin.getFileManager().checkRegionAdd(sender, region, world, isRent ? GeneralRegion.RegionType.RENT : GeneralRegion.RegionType.BUY);
-				if(result == FileManager.AddResult.ALREADYADDED) {
+				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 == FileManager.AddResult.ALREADYADDEDOTHERWORLD) {
+				} else if(result == IFileManager.AddResult.ALREADYADDEDOTHERWORLD) {
 					regionsAlreadyOtherWorld.add(plugin.getFileManager().getRegion(regionName));
-				} else if(result == FileManager.AddResult.BLACKLISTED) {
+				} else if(result == IFileManager.AddResult.BLACKLISTED) {
 					namesBlacklisted.add(regionName);
-				} else if(result == FileManager.AddResult.NOPERMISSION) {
+				} else if(result == IFileManager.AddResult.NOPERMISSION) {
 					namesNoPermission.add(regionName);
 				} else {
 					// Check if the player should be landlord
@@ -161,8 +179,8 @@ public class AddCommand extends CommandAreaShop {
 							&& ((sender.hasPermission("areashop.create" + type + ".owner") && isOwner)
 							|| (sender.hasPermission("areashop.create" + type + ".member") && isMember)));
 					List<UUID> existing = new ArrayList<>();
-					existing.addAll(plugin.getWorldGuardHandler().getOwners(region).asUniqueIdList());
-					existing.addAll(plugin.getWorldGuardHandler().getMembers(region).asUniqueIdList());
+					existing.addAll(worldGuardInterface.getOwners(region).asUniqueIdList());
+					existing.addAll(worldGuardInterface.getMembers(region).asUniqueIdList());
 
 					AreaShop.debug("regionAddLandlordStatus:", regionName,
 							"landlord:", landlord,
@@ -174,7 +192,7 @@ public class AddCommand extends CommandAreaShop {
 							"memberPermission:", sender.hasPermission("areashop.create" + type + ".member"));
 
 					if(isRent) {
-						RentRegion rent = new RentRegion(regionName, world);
+						RentRegion rent = regionFactory.createRentRegion(regionName, world);
 						// Set landlord
 						if(landlord) {
 							rent.setLandlord(finalPlayer.getUniqueId(), finalPlayer.getName());
@@ -217,7 +235,7 @@ public class AddCommand extends CommandAreaShop {
 
 						regionsSuccess.add(rent);
 					} else {
-						BuyRegion buy = new BuyRegion(regionName, world);
+						BuyRegion buy = regionFactory.createBuyRegion(regionName, world);
 						// Set landlord
 						if(landlord) {
 							buy.setLandlord(finalPlayer.getUniqueId(), finalPlayer.getName());
@@ -264,29 +282,29 @@ public class AddCommand extends CommandAreaShop {
 			},
 			() -> {
 				if(!regionsSuccess.isEmpty()) {
-					plugin.message(sender, "add-success", args[1], Utils.combinedMessage(regionsSuccess, "region"));
+					messageBridge.message(sender, "add-success", args[1], Utils.combinedMessage(regionsSuccess, "region"));
 				}
 				if(!regionsAlready.isEmpty()) {
-					plugin.message(sender, "add-failed", Utils.combinedMessage(regionsAlready, "region"));
+					messageBridge.message(sender, "add-failed", Utils.combinedMessage(regionsAlready, "region"));
 				}
 				if(!regionsAlreadyOtherWorld.isEmpty()) {
-					plugin.message(sender, "add-failedOtherWorld", Utils.combinedMessage(regionsAlreadyOtherWorld, "region"));
+					messageBridge.message(sender, "add-failedOtherWorld", Utils.combinedMessage(regionsAlreadyOtherWorld, "region"));
 				}
 				if(!regionsRentCancelled.isEmpty()) {
-					plugin.message(sender, "add-rentCancelled", Utils.combinedMessage(regionsRentCancelled, "region"));
+					messageBridge.message(sender, "add-rentCancelled", Utils.combinedMessage(regionsRentCancelled, "region"));
 				}
 				if(!regionsBuyCancelled.isEmpty()) {
-					plugin.message(sender, "add-buyCancelled", Utils.combinedMessage(regionsBuyCancelled, "region"));
+					messageBridge.message(sender, "add-buyCancelled", Utils.combinedMessage(regionsBuyCancelled, "region"));
 				}
 				if(!namesBlacklisted.isEmpty()) {
-					plugin.message(sender, "add-blacklisted", Utils.createCommaSeparatedList(namesBlacklisted));
+					messageBridge.message(sender, "add-blacklisted", Utils.createCommaSeparatedList(namesBlacklisted));
 				}
 				if(!namesNoPermission.isEmpty()) {
-					plugin.message(sender, "add-noPermissionRegions", Utils.createCommaSeparatedList(namesNoPermission));
-					plugin.message(sender, "add-noPermissionOwnerMember");
+					messageBridge.message(sender, "add-noPermissionRegions", Utils.createCommaSeparatedList(namesNoPermission));
+					messageBridge.message(sender, "add-noPermissionOwnerMember");
 				}
 				if(!namesAddCancelled.isEmpty()) {
-					plugin.message(sender, "add-rentCancelled", Utils.createCommaSeparatedList(namesAddCancelled));
+					messageBridge.message(sender, "add-rentCancelled", Utils.createCommaSeparatedList(namesAddCancelled));
 				}
 			}
 		);
@@ -303,8 +321,7 @@ 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.getRegionManager(player.getWorld()).getRegions().values()) {
 						result.add(region.getId());

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

@@ -1,135 +1,142 @@
 package me.wiefferink.areashop.commands;
 
+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 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 {
 
-	@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;
-	}
+    @Inject
+    private OfflinePlayerHelper offlinePlayerHelper;
 
-	@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;
-		}
+    @Inject
+    private BukkitSchedulerExecutor executor;
 
-		if(args.length < 2) {
-			plugin.message(sender, "addfriend-help");
-			return;
-		}
+    @Override
+    public String getCommandStart() {
+        return "areashop addfriend";
+    }
 
-		GeneralRegion region;
-		if(args.length <= 2) {
-			if(sender instanceof Player) {
-				// get the region by location
-				List<GeneralRegion> regions = Utils.getImportantRegions(((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 instanceof RentRegion && !((RentRegion)region).isRented())
-					|| (region instanceof BuyRegion && !((BuyRegion)region).isSold())) {
-				plugin.message(sender, "addfriend-noOwner", region);
-				return;
-			}
-			OfflinePlayer friend = Bukkit.getOfflinePlayer(args[1]);
-			if(friend.getLastPlayed() == 0 && !friend.isOnline() && !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 && !friend.isOnline() && !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;
-					}
+    @Override
+    public String getHelp(CommandSender target) {
+        if (target.hasPermission("areashop.addfriendall") || target.hasPermission("areashop.addfriend")) {
+            return "help-addFriend";
+        }
+        return null;
+    }
 
-					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 void execute(CommandSender sender, String[] args) {
+        if (!sender.hasPermission("areashop.addfriend") && !sender.hasPermission("areashop.addfriendall")) {
+            messageBridge.message(sender, "addfriend-noPermission");
+            return;
+        }
 
-	@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;
-	}
+        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,22 +1,39 @@
 package me.wiefferink.areashop.commands;
 
+import me.wiefferink.areashop.MessageBridge;
 import me.wiefferink.areashop.features.signs.RegionSign;
-import me.wiefferink.areashop.features.signs.SignsFeature;
+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.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 {
 
+	@Inject
+	private MessageBridge messageBridge;
+	@Inject
+	private IFileManager fileManager;
+	@Inject
+	private SignManager signManager;
+	@Inject
+	private Plugin plugin;
+
 	@Override
 	public String getCommandStart() {
 		return "areashop addsign";
@@ -33,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;
@@ -52,26 +68,26 @@ public class AddsignCommand extends CommandAreaShop {
 			}
 		}
 		if(block == null || !Materials.isSign(block.getType())) {
-			plugin.message(sender, "addsign-noSign");
+			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.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);
@@ -81,21 +97,22 @@ public class AddsignCommand extends CommandAreaShop {
 			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;
 			}
 		}
-		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(), plugin.getBukkitHandler().getSignFacing(block), 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();
 	}
@@ -104,7 +121,7 @@ public class AddsignCommand extends CommandAreaShop {
 	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,15 +1,28 @@
 package me.wiefferink.areashop.commands;
 
+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 {
 
+	@Inject
+	private MessageBridge messageBridge;
+	@Inject
+	private Plugin plugin;
+	@Inject
+	private IFileManager fileManager;
+
 	@Override
 	public String getCommandStart() {
 		return "areashop buy";
@@ -26,18 +39,17 @@ public class BuyCommand extends CommandAreaShop {
 	@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", args[1]);
+				messageBridge.message(player, "buy-notBuyable", args[1]);
 			} else {
 				region.buy(player);
 			}
@@ -45,9 +57,9 @@ public class BuyCommand extends CommandAreaShop {
 			// get the region by location
 			List<BuyRegion> regions = Utils.getImportantBuyRegions(((Player)sender).getLocation());
 			if(regions.isEmpty()) {
-				plugin.message(sender, "cmd-noRegionsAtLocation");
+				messageBridge.message(sender, "cmd-noRegionsAtLocation");
 			} else if(regions.size() > 1) {
-				plugin.message(sender, "cmd-moreRegionsAtLocation");
+				messageBridge.message(sender, "cmd-moreRegionsAtLocation");
 			} else {
 				regions.get(0).buy(player);
 			}
@@ -58,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,6 +1,5 @@
 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;
@@ -16,11 +15,9 @@ import java.util.Map;
  */
 public abstract class CommandAreaShop {
 
-	final AreaShop plugin = AreaShop.getInstance();
-
 	private final Map<String, CommandTime> lastUsed;
 
-	public CommandAreaShop() {
+	protected CommandAreaShop() {
 		lastUsed = new HashMap<>();
 	}
 
@@ -89,7 +86,7 @@ public abstract class CommandAreaShop {
 		return false;
 	}
 
-	private class CommandTime {
+	private static class CommandTime {
 		public final String command;
 		public final long time;
 

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

@@ -1,7 +1,10 @@
 package me.wiefferink.areashop.commands;
 
+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;
@@ -9,12 +12,22 @@ 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 {
 
+	@Inject
+	private MessageBridge messageBridge;
+	@Inject
+	private WorldEditInterface worldEditInterface;
+	@Inject
+	private IFileManager fileManager;
+	
 	@Override
 	public String getCommandStart() {
 		return "areashop del";
@@ -35,24 +48,23 @@ public class DelCommand extends CommandAreaShop {
 
 				&& !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;
-			WorldEditSelection selection = plugin.getWorldEditHandler().getPlayerSelection(player);
+			WorldEditSelection selection = worldEditInterface.getPlayerSelection(player);
 			if(selection == null) {
-				plugin.message(player, "cmd-noSelection");
+				messageBridge.message(player, "cmd-noSelection");
 				return;
 			}
 			List<GeneralRegion> regions = Utils.getRegionsInSelection(selection);
 			if(regions == null || regions.isEmpty()) {
-				plugin.message(player, "cmd-noRegionsFound");
+				messageBridge.message(player, "cmd-noRegionsFound");
 				return;
 			}
 			// Start removing the regions that he has permission for
@@ -73,7 +85,7 @@ public class DelCommand extends CommandAreaShop {
 					}
 				}
 
-				DeletingRegionEvent event = plugin.getFileManager().deleteRegion(region, true);
+				DeletingRegionEvent event = fileManager.deleteRegion(region, true);
 				if (event.isCancelled()) {
 					regionsCancelled.add(region);
 				} else {
@@ -83,44 +95,44 @@ public class DelCommand extends CommandAreaShop {
 
 			// Send messages
 			if(!namesSuccess.isEmpty()) {
-				plugin.message(sender, "del-success", Utils.createCommaSeparatedList(namesSuccess));
+				messageBridge.message(sender, "del-success", Utils.createCommaSeparatedList(namesSuccess));
 			}
 			if(!regionsFailed.isEmpty()) {
-				plugin.message(sender, "del-failed", Utils.combinedMessage(regionsFailed, "region"));
+				messageBridge.message(sender, "del-failed", Utils.combinedMessage(regionsFailed, "region"));
 			}
 			if(!regionsCancelled.isEmpty()) {
-				plugin.message(sender, "del-cancelled", Utils.combinedMessage(regionsCancelled, "region"));
+				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 instanceof RentRegion) {
 				// Remove the rent if the player has permission
 				if(sender.hasPermission("areashop.destroyrent") || (isLandlord && sender.hasPermission("areashop.destroyrent.landlord"))) {
-					DeletingRegionEvent event = plugin.getFileManager().deleteRegion(region, true);
+					DeletingRegionEvent event = fileManager.deleteRegion(region, true);
 					if (event.isCancelled()) {
-						plugin.message(sender, "general-cancelled", event.getReason());
+						messageBridge.message(sender, "general-cancelled", event.getReason());
 					} else {
-						plugin.message(sender, "destroy-successRent", region);
+						messageBridge.message(sender, "destroy-successRent", region);
 					}
 				} else {
-					plugin.message(sender, "destroy-noPermissionRent", region);
+					messageBridge.message(sender, "destroy-noPermissionRent", region);
 				}
 			} else if(region instanceof BuyRegion) {
 				// Remove the buy if the player has permission
 				if(sender.hasPermission("areashop.destroybuy") || (isLandlord && sender.hasPermission("areashop.destroybuy.landlord"))) {
-					DeletingRegionEvent event = plugin.getFileManager().deleteRegion(region, true);
+					DeletingRegionEvent event = fileManager.deleteRegion(region, true);
 					if (event.isCancelled()) {
-						plugin.message(sender, "general-cancelled", event.getReason());
+						messageBridge.message(sender, "general-cancelled", event.getReason());
 					} else {
-						plugin.message(sender, "destroy-successBuy", region);
+						messageBridge.message(sender, "destroy-successBuy", region);
 					}
 				} else {
-					plugin.message(sender, "destroy-noPermissionBuy", region);
+					messageBridge.message(sender, "destroy-noPermissionBuy", region);
 				}
 			}
 		}
@@ -130,7 +142,7 @@ public class DelCommand extends CommandAreaShop {
 	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,120 +1,137 @@
 package me.wiefferink.areashop.commands;
 
+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 {
 
-	@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;
 
-	/**
-	 * 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;
-	}
+    @Inject
+    private BukkitSchedulerExecutor executor;
 
-	@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.getImportantRegions(((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 instanceof RentRegion && !((RentRegion)region).isRented())
-					|| (region instanceof BuyRegion && !((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 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);
+    }
 
 	@Override
 	public List<String> getTabCompleteList(int toComplete, String[] start, CommandSender sender) {
@@ -124,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,6 +1,8 @@
 package me.wiefferink.areashop.commands;
 
+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;
@@ -9,11 +11,20 @@ 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 {
 
+	@Inject
+	private MessageBridge messageBridge;
+	@Inject
+	private SignManager signManager;
+	
 	@Override
 	public String getCommandStart() {
 		return "areashop delsign";
@@ -30,35 +41,37 @@ 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 || !Materials.isSign(block.getType())) {
-			plugin.message(sender, "delsign-noSign");
+			messageBridge.message(sender, "delsign-noSign");
 			return;
 		}
-		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

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

@@ -1,19 +1,34 @@
 package me.wiefferink.areashop.commands;
 
+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 {
 
+	@Inject
+	private MessageBridge messageBridge;
+	@Inject
+	private Economy economy;
+	@Inject
+	private IFileManager fileManager;
+
 	@Override
 	public String getCommandStart() {
 		return "areashop find";
@@ -30,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");
+			messageBridge.message(sender, "find-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 || (!args[1].equalsIgnoreCase("buy") && !args[1].equalsIgnoreCase("rent"))) {
-			plugin.message(sender, "find-help");
+			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;
@@ -55,23 +69,23 @@ 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))
@@ -90,9 +104,9 @@ public class FindCommand extends CommandAreaShop {
 
 				// 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.getTeleportFeature().teleportPlayer(player, region.getBooleanSetting("general.findTeleportToSign"), false);
 			} else {
@@ -101,17 +115,17 @@ public class FindCommand extends CommandAreaShop {
 					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);
 				}
 			}
 		}
 
 		// Find rental regions
 		else {
-			List<RentRegion> regions = plugin.getFileManager().getRents();
-			List<RentRegion> results = new ArrayList<>();
+			Collection<RentRegion> regions = fileManager.getRentsRef();
+			List<RentRegion> results = new LinkedList<>();
 			for(RentRegion region : regions) {
 				if(!region.isRented()
 						&& ((region.getPrice() <= balance && !maxPriceSet) || (region.getPrice() <= maxPrice && maxPriceSet))
@@ -130,9 +144,9 @@ public class FindCommand extends CommandAreaShop {
 
 				// 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.getTeleportFeature().teleportPlayer(player, region.getBooleanSetting("general.findTeleportToSign"), false);
 			} else {
@@ -141,9 +155,9 @@ public class FindCommand extends CommandAreaShop {
 					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);
 				}
 			}
 		}

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

@@ -1,18 +1,35 @@
 package me.wiefferink.areashop.commands;
 
+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 {
 
+	@Inject
+	private MessageBridge messageBridge;
+	@Inject
+	private IFileManager fileManager;
+	@Inject
+	private RegionFactory regionFactory;
+	@Inject
+	private WorldEditInterface worldEditInterface;
+	
+	
 	@Override
 	public String getCommandStart() {
 		return "areashop groupadd";
@@ -29,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;
-			WorldEditSelection selection = plugin.getWorldEditHandler().getPlayerSelection(player);
+			WorldEditSelection selection = worldEditInterface.getPlayerSelection(player);
 			if(selection == null) {
-				plugin.message(player, "cmd-noSelection");
+				messageBridge.message(player, "cmd-noSelection");
 				return;
 			}
 			List<GeneralRegion> regions = Utils.getRegionsInSelection(selection);
 			if(regions.isEmpty()) {
-				plugin.message(player, "cmd-noRegionsFound");
+				messageBridge.message(player, "cmd-noRegionsFound");
 				return;
 			}
 			TreeSet<GeneralRegion> regionsSuccess = new TreeSet<>();
@@ -67,24 +83,24 @@ public class GroupaddCommand extends CommandAreaShop {
 				}
 			}
 			if(!regionsSuccess.isEmpty()) {
-				plugin.message(player, "groupadd-weSuccess", group.getName(), Utils.combinedMessage(regionsSuccess, "region"));
+				messageBridge.message(player, "groupadd-weSuccess", group.getName(), Utils.combinedMessage(regionsSuccess, "region"));
 			}
 			if(!regionsFailed.isEmpty()) {
-				plugin.message(player, "groupadd-weFailed", group.getName(), Utils.combinedMessage(regionsFailed, "region"));
+				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);
 			}
 		}
 	}
@@ -93,9 +109,9 @@ public class GroupaddCommand extends CommandAreaShop {
 	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,18 +1,34 @@
 package me.wiefferink.areashop.commands;
 
+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 {
 
+	@Inject
+	private MessageBridge messageBridge;
+	@Inject
+	private IFileManager fileManager;
+	@Inject
+	private RegionFactory regionFactory;
+	@Inject
+	private WorldEditInterface worldEditInterface;
+	
 	@Override
 	public String getCommandStart() {
 		return "areashop groupdel";
@@ -29,33 +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");
+			messageBridge.message(sender, "groupdel-help");
 			return;
 		}
-		RegionGroup group = plugin.getFileManager().getGroup(args[1]);
+		RegionGroup group = fileManager.getGroup(args[1]);
 		if(group == null) {
-			plugin.message(sender, "groupdel-wrongGroup", args[1]);
+			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;
-			WorldEditSelection selection = plugin.getWorldEditHandler().getPlayerSelection(player);
+			WorldEditSelection selection = worldEditInterface.getPlayerSelection(player);
 			if(selection == null) {
-				plugin.message(player, "cmd-noSelection");
+				messageBridge.message(player, "cmd-noSelection");
 				return;
 			}
 			List<GeneralRegion> regions = Utils.getRegionsInSelection(selection);
 			if(regions.isEmpty()) {
-				plugin.message(player, "cmd-noRegionsFound");
+				messageBridge.message(player, "cmd-noRegionsFound");
 				return;
 			}
 			TreeSet<GeneralRegion> regionsSuccess = new TreeSet<>();
@@ -68,25 +83,25 @@ public class GroupdelCommand extends CommandAreaShop {
 				}
 			}
 			if(!regionsSuccess.isEmpty()) {
-				plugin.message(player, "groupdel-weSuccess", group.getName(), Utils.combinedMessage(regionsSuccess, "region"));
+				messageBridge.message(player, "groupdel-weSuccess", group.getName(), Utils.combinedMessage(regionsSuccess, "region"));
 			}
 			if(!regionsFailed.isEmpty()) {
-				plugin.message(player, "groupdel-weFailed", group.getName(), Utils.combinedMessage(regionsFailed, "region"));
+				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);
 			}
 		}
 	}
@@ -95,9 +110,9 @@ public class GroupdelCommand extends CommandAreaShop {
 	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,15 +1,25 @@
 package me.wiefferink.areashop.commands;
 
+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 {
 
+	@Inject
+	private MessageBridge messageBridge;
+	@Inject
+	private IFileManager fileManager;
+	
 	@Override
 	public String getCommandStart() {
 		return "areashop groupinfo";
@@ -27,23 +37,23 @@ public class GroupinfoCommand extends CommandAreaShop {
 	@Override
 	public void execute(CommandSender sender, String[] args) {
 		if(!sender.hasPermission("areashop.groupinfo")) {
-			plugin.message(sender, "groupinfo-noPermission");
+			messageBridge.message(sender, "groupinfo-noPermission");
 			return;
 		}
 		if(args.length < 2 || args[1] == null) {
-			plugin.message(sender, "groupinfo-help");
+			messageBridge.message(sender, "groupinfo-help");
 			return;
 		}
-		RegionGroup group = plugin.getFileManager().getGroup(args[1]);
+		RegionGroup group = fileManager.getGroup(args[1]);
 		if(group == null) {
-			plugin.message(sender, "groupinfo-noGroup", args[1]);
+			messageBridge.message(sender, "groupinfo-noGroup", args[1]);
 			return;
 		}
 		Set<String> members = group.getMembers();
 		if(members.isEmpty()) {
-			plugin.message(sender, "groupinfo-noMembers", group.getName());
+			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));
 		}
 	}
 
@@ -51,7 +61,7 @@ public class GroupinfoCommand extends CommandAreaShop {
 	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,13 +1,23 @@
 package me.wiefferink.areashop.commands;
 
+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 {
 
+	@Inject
+	private MessageBridge messageBridge;
+	@Inject
+	private IFileManager fileManager;
+	
 	@Override
 	public String getCommandStart() {
 		return "areashop grouplist";
@@ -24,14 +34,14 @@ 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();
+		List<String> groups = fileManager.getGroupNames();
 		if(groups.isEmpty()) {
-			plugin.message(sender, "grouplist-noGroups");
+			messageBridge.message(sender, "grouplist-noGroups");
 		} else {
-			plugin.message(sender, "grouplist-success", Utils.createCommaSeparatedList(groups));
+			messageBridge.message(sender, "grouplist-success", Utils.createCommaSeparatedList(groups));
 		}
 	}
 

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

@@ -1,9 +1,20 @@
 package me.wiefferink.areashop.commands;
 
+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 {
 
+	private final CommandManager commandManager;
+
+	public HelpCommand(@Nonnull CommandManager commandManager) {
+		this.commandManager = commandManager;
+	}
+
 	@Override
 	public String getCommandStart() {
 		return "areashop help";
@@ -19,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

@@ -1,11 +1,17 @@
 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:
@@ -13,6 +19,10 @@ public class ImportCommand extends CommandAreaShop {
 	   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() {
@@ -36,17 +46,17 @@ public class ImportCommand extends CommandAreaShop {
 	@Override
 	public void execute(CommandSender sender, String[] args) {
 		if(!sender.hasPermission("areashop.import")) {
-			plugin.message(sender, "import-noPermission");
+			messageBridge.message(sender, "import-noPermission");
 			return;
 		}
 
 		if(args.length < 2) {
-			plugin.message(sender, "import-help");
+			messageBridge.message(sender, "import-help");
 			return;
 		}
 
 		if(!"RegionForSale".equalsIgnoreCase(args[1])) {
-			plugin.message(sender, "import-wrongSource");
+			messageBridge.message(sender, "import-wrongSource");
 			return;
 		}
 
@@ -54,7 +64,7 @@ public class ImportCommand extends CommandAreaShop {
 			return;
 		}
 
-		new ImportJob(sender);
+		importJobFactory.createImportJob(sender).execute();
 	}
 
 	@Override

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

@@ -1,15 +1,19 @@
 package me.wiefferink.areashop.commands;
 
+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 me.wiefferink.areashop.tools.Utils;
 import me.wiefferink.interactivemessenger.processing.Message;
-import org.bukkit.Location;
 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.Arrays;
 import java.util.HashSet;
@@ -18,8 +22,14 @@ 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 {
 
+	@Inject
+	private MessageBridge messageBridge;
+	@Inject
+	private IFileManager fileManager;
+	
 	@Override
 	public String getCommandStart() {
 		return "areashop info";
@@ -50,7 +60,7 @@ public class InfoCommand extends CommandAreaShop {
 			try {
 				page = Integer.parseInt(pageInput);
 			} catch(NumberFormatException e) {
-				plugin.message(sender, "info-wrongPage", pageInput);
+				messageBridge.message(sender, "info-wrongPage", pageInput);
 				return;
 			}
 		}
@@ -58,7 +68,7 @@ public class InfoCommand extends CommandAreaShop {
 			regions.removeIf(generalRegion -> !filterGroup.isMember(generalRegion));
 		}
 		if(regions.isEmpty()) {
-			plugin.message(sender, "info-noRegions");
+			messageBridge.message(sender, "info-noRegions");
 		} else {
 			// First sort by type, then by name
 			regions.sort((one, two) -> {
@@ -74,7 +84,7 @@ public class InfoCommand extends CommandAreaShop {
 			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)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
@@ -101,7 +111,7 @@ 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.empty();
@@ -158,7 +168,7 @@ 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) {
@@ -167,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
@@ -181,48 +191,48 @@ 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), "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();
+				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();
+				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();
+				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();
+				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();
+				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), "info nogroup");
 				}
@@ -234,17 +244,17 @@ 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) {
 							// get the region by location
 							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 {
 								if(regions.get(0) instanceof RentRegion) {
@@ -254,26 +264,26 @@ public class InfoCommand extends CommandAreaShop {
 								}
 							}
 						} 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, rent)) {
-								plugin.messageNoPrefix(sender, "info-regionMoneyBackRentClick", 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()) {
@@ -281,30 +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 maxExtends is zero it does not make sense to show this message
 						if(rent.getMaxRentTime() != -1 && rent.getMaxExtends() != 0) {
-							plugin.messageNoPrefix(sender, "info-regionMaxRentTime", rent);
+							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");
@@ -326,44 +336,44 @@ 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", Utils.createCommaSeparatedList(signLocations));
+							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()) {
-							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(!buy.getBooleanSetting("buy.sellDisabled")) {
 								if (SellCommand.canUse(sender, buy)) {
-									plugin.messageNoPrefix(sender, "info-regionMoneyBackBuyClick", buy);
+									messageBridge.messageNoPrefix(sender, "info-regionMoneyBackBuyClick", buy);
 								} else {
-									plugin.messageNoPrefix(sender, "info-regionMoneyBackBuy", buy);
+									messageBridge.messageNoPrefix(sender, "info-regionMoneyBackBuy", buy);
 								}
 							}
 							// Friends
@@ -372,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");
@@ -403,38 +413,38 @@ 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", Utils.createCommaSeparatedList(signLocations));
+							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()) {
-							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");
 		}
 	}
 
@@ -449,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,5 +1,10 @@
 package me.wiefferink.areashop.commands;
 
+import com.google.inject.Inject;
+import com.google.inject.Singleton;
+import me.wiefferink.areashop.AreaShop;
+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;
@@ -9,8 +14,16 @@ import java.util.ArrayList;
 import java.util.List;
 import java.util.Set;
 
+@Singleton
 public class LinksignsCommand extends CommandAreaShop {
 
+	@Inject
+	private SignLinkerManager signLinkerManager;
+	@Inject
+	private AreaShop plugin;
+	@Inject
+	private MessageBridge messageBridge;
+
 	@Override
 	public String getCommandStart() {
 		return "areashop linksigns";
@@ -27,17 +40,16 @@ public class LinksignsCommand extends CommandAreaShop {
 	@Override
 	public void execute(CommandSender sender, String[] args) {
 		if(!sender.hasPermission("areashop.linksigns")) {
-			plugin.message(sender, "linksigns-noPermission");
+			messageBridge.message(sender, "linksigns-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(plugin.getSignlinkerManager().isInSignLinkMode(player)) {
-			plugin.getSignlinkerManager().exitSignLinkMode(player);
+		if(signLinkerManager.isInSignLinkMode(player)) {
+			signLinkerManager.exitSignLinkMode(player);
 		} else {
 			// Get the profile
 			String profile = null;
@@ -54,12 +66,12 @@ public class LinksignsCommand extends CommandAreaShop {
 							}
 							message.addAll(Message.fromKey("addsign-profile").replacements(p).get());
 						}
-						plugin.message(sender, "addsign-wrongProfile", Message.fromList(message));
+						messageBridge.message(sender, "addsign-wrongProfile", Message.fromList(message));
 						return;
 					}
 				}
 			}
-			plugin.getSignlinkerManager().enterSignLinkMode(player, profile);
+			signLinkerManager.enterSignLinkMode(player, profile);
 		}
 	}
 

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

@@ -1,21 +1,39 @@
 package me.wiefferink.areashop.commands;
 
+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 {
 
+	@Inject
+	private MessageBridge messageBridge;
+	@Inject
+	private IFileManager fileManager;
+
+	@Inject
+	private OfflinePlayerHelper offlinePlayerHelper;
+
+	@Inject
+	private BukkitSchedulerExecutor executor;
+
 	@Override
 	public String getCommandStart() {
 		return "areashop me";
@@ -32,76 +50,77 @@ public class MeCommand extends CommandAreaShop {
 	@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;
-			}
-		}
-		if(player == null) {
+			// Lookup offline players async
+			this.offlinePlayerHelper.lookupOfflinePlayerAsync(args[1]).thenAcceptAsync(offlinePlayer -> {
+				if (!offlinePlayer.hasPlayedBefore()) {
+					messageBridge.message(sender, "me-noPlayer", args[1]);
+				} else {
+					sendMessageAboutRegions(sender, offlinePlayer);
+				}
+			}, this.executor);
 			return;
 		}
+		sendMessageAboutRegions(sender, player);
+	}
 
+	private void sendMessageAboutRegions(CommandSender sender, OfflinePlayer target) {
 		// Get the regions owned by the player
 		Set<RentRegion> rentRegions = new HashSet<>();
-		for(RentRegion region : plugin.getFileManager().getRents()) {
-			if(region.isOwner(player)) {
+		for(RentRegion region : fileManager.getRentsRef()) {
+			if(region.isOwner(target)) {
 				rentRegions.add(region);
 			}
 		}
 		Set<BuyRegion> buyRegions = new HashSet<>();
-		for(BuyRegion region : plugin.getFileManager().getBuys()) {
-			if(region.isOwner(player)) {
+		for(BuyRegion region : fileManager.getBuysRef()) {
+			if(region.isOwner(target)) {
 				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().contains(player.getUniqueId())) {
+		for(GeneralRegion region : fileManager.getRegionsRef()) {
+			if(region.getFriendsFeature().getFriends().contains(target.getUniqueId())) {
 				friendRegions.add(region);
 			}
 		}
 
 		// Send messages
 		boolean foundSome = !rentRegions.isEmpty() || !buyRegions.isEmpty() || !friendRegions.isEmpty();
-		if(foundSome) {
-			plugin.message(sender, "me-header", player.getName());
+		if(!foundSome) {
+			messageBridge.message(sender, "me-nothing", target.getName());
+			return;
 		}
+		messageBridge.message(sender, "me-header", target.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());
-		} else {
-			plugin.messageNoPrefix(sender, "me-clickHint");
-		}
+		messageBridge.messageNoPrefix(sender, "me-clickHint");
 	}
 
 	@Override

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

@@ -1,5 +1,6 @@
 package me.wiefferink.areashop.commands;
 
+import me.wiefferink.areashop.MessageBridge;
 import me.wiefferink.areashop.tools.Utils;
 import me.wiefferink.interactivemessenger.processing.Message;
 import org.apache.commons.lang.StringUtils;
@@ -7,11 +8,17 @@ 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 {
 
+	@Inject
+	private MessageBridge messageBridge;
+	
 	@Override
 	public String getCommandStart() {
 		return "areashop message";
@@ -26,18 +33,18 @@ public class MessageCommand extends CommandAreaShop {
 	@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;
 		}
 

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

@@ -1,9 +1,20 @@
 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 {
 
+	@Inject
+	private AreaShop plugin;
+	@Inject
+	private MessageBridge messageBridge;
+	
 	@Override
 	public String getCommandStart() {
 		return "areashop reload";
@@ -23,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,15 +1,25 @@
 package me.wiefferink.areashop.commands;
 
+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 {
 
+	@Inject
+	private MessageBridge messageBridge;
+	@Inject
+	private IFileManager fileManager;
+	
 	@Override
 	public String getCommandStart() {
 		return "areashop rent";
@@ -26,18 +36,17 @@ public class RentCommand extends CommandAreaShop {
 	@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", args[1]);
+				messageBridge.message(sender, "rent-notRentable", args[1]);
 			} else {
 				rent.rent(player);
 			}
@@ -45,9 +54,9 @@ public class RentCommand extends CommandAreaShop {
 			// get the region by location
 			List<RentRegion> regions = Utils.getImportantRentRegions(((Player)sender).getLocation());
 			if(regions.isEmpty()) {
-				plugin.message(sender, "cmd-noRegionsAtLocation");
+				messageBridge.message(sender, "cmd-noRegionsAtLocation");
 			} else if(regions.size() > 1) {
-				plugin.message(sender, "cmd-moreRegionsAtLocation");
+				messageBridge.message(sender, "cmd-moreRegionsAtLocation");
 			} else {
 				regions.get(0).rent(player);
 			}
@@ -58,7 +67,7 @@ public class RentCommand extends CommandAreaShop {
 	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,15 +1,25 @@
 package me.wiefferink.areashop.commands;
 
+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 {
 
+	@Inject
+	private MessageBridge messageBridge;
+	@Inject
+	private IFileManager fileManager;
+	
 	@Override
 	public String getCommandStart() {
 		return "areashop resell";
@@ -26,24 +36,24 @@ public class ResellCommand extends CommandAreaShop {
 	@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) {
-			plugin.message(sender, "resell-wrongPrice", args[1]);
+			messageBridge.message(sender, "resell-wrongPrice", args[1]);
 			return;
 		}
 
@@ -53,53 +63,53 @@ public class ResellCommand extends CommandAreaShop {
 				// get the region by location
 				List<BuyRegion> regions = Utils.getImportantBuyRegions(((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 {
 					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)) {
-				plugin.message(sender, "resell-noPermissionOther", buy);
+				messageBridge.message(sender, "resell-noPermissionOther", buy);
 				return;
 			}
 
 			if(buy.getBooleanSetting("buy.resellDisabled")) {
-				plugin.message(sender, "resell-disabled", buy);
+				messageBridge.message(sender, "resell-disabled", buy);
 				return;
 			}
 
 			buy.enableReselling(price);
 			buy.update();
-			plugin.message(sender, "resell-success", buy);
+			messageBridge.message(sender, "resell-success", buy);
 		} else {
-			plugin.message(sender, "resell-noPermission", buy);
+			messageBridge.message(sender, "resell-noPermission", buy);
 		}
 	}
 
@@ -107,7 +117,7 @@ public class ResellCommand extends CommandAreaShop {
 	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,17 +1,27 @@
 package me.wiefferink.areashop.commands;
 
+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 {
 
+	@Inject
+	private MessageBridge messageBridge;
+	@Inject
+	private IFileManager fileManager;
+	
 	@Override
 	public String getCommandStart() {
 		return "areashop schemevent";
@@ -28,21 +38,21 @@ public class SchematiceventCommand extends CommandAreaShop {
 	@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;
@@ -58,21 +68,21 @@ 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);
+			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 instanceof RentRegion) {
 					result.addAll(Arrays.asList("created", "deleted", "rented", "unrented"));

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

@@ -1,16 +1,26 @@
 package me.wiefferink.areashop.commands;
 
+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 {
 
+	@Inject
+	private MessageBridge messageBridge;
+	@Inject
+	private IFileManager fileManager;
+	
 	@Override
 	public String getCommandStart() {
 		return "areashop sell";
@@ -34,8 +44,7 @@ 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;
@@ -44,36 +53,36 @@ public class SellCommand extends CommandAreaShop {
 	@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.getImportantBuyRegions(((Player)sender).getLocation());
+				List<BuyRegion> regions = Utils.getImportantBuyRegions((player).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 {
 					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);
@@ -83,7 +92,7 @@ public class SellCommand 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/SetdurationCommand.java

@@ -1,15 +1,28 @@
 package me.wiefferink.areashop.commands;
 
+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 {
 
+	@Inject
+	private MessageBridge messageBridge;
+	@Inject
+	private IFileManager fileManager;
+	@Inject
+	private Plugin plugin;
+	
 	@Override
 	public String getCommandStart() {
 		return "areashop setduration";
@@ -26,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;
@@ -43,48 +56,48 @@ public class SetdurationCommand extends CommandAreaShop {
 				// get the region by location
 				List<RentRegion> regions = Utils.getImportantRentRegions(((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 {
 					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);
+			messageBridge.message(sender, "setduration-wrongFormat", args[1] + " " + args[2], rent);
 			return;
 		}
 		rent.setDuration(args[1] + " " + args[2]);
 		rent.update();
-		plugin.message(sender, "setduration-success", rent);
+		messageBridge.message(sender, "setduration-success", rent);
 	}
 
 	@Override
@@ -97,7 +110,7 @@ public class SetdurationCommand extends CommandAreaShop {
 			result.addAll(plugin.getConfig().getStringList("months"));
 			result.addAll(plugin.getConfig().getStringList("years"));
 		} else if(toComplete == 4) {
-			result = plugin.getFileManager().getRentNames();
+			result = fileManager.getRentNames();
 		}
 		return result;
 	}

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

@@ -1,87 +1,100 @@
 package me.wiefferink.areashop.commands;
 
+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 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;
 
+@Singleton
 public class SetlandlordCommand extends CommandAreaShop {
 
-	@Override
-	public String getCommandStart() {
-		return "areashop setlandlord";
-	}
+    @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.setlandlord")) {
-			return "help-setlandlord";
-		}
-		return null;
-	}
+    @Override
+    public String getCommandStart() {
+        return "areashop setlandlord";
+    }
 
-	@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.getImportantRegions(((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 String getHelp(CommandSender target) {
+        if (target.hasPermission("areashop.setlandlord")) {
+            return "help-setlandlord";
+        }
+        return null;
+    }
 
-	@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 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,128 +1,138 @@
 package me.wiefferink.areashop.commands;
 
+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 {
 
-	@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 String getCommandStart() {
+        return "areashop setowner";
+    }
 
-	@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.getImportantRegions(((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;
-		}
+    @Override
+    public String getHelp(CommandSender target) {
+        if (target.hasPermission("areashop.setownerrent") || target.hasPermission("areashop.setownerbuy")) {
+            return "help-setowner";
+        }
+        return null;
+    }
 
-		if(region instanceof RentRegion && !sender.hasPermission("areashop.setownerrent")) {
-			plugin.message(sender, "setowner-noPermissionRent", region);
-			return;
-		}
-		if(region instanceof BuyRegion && !sender.hasPermission("areashop.setownerbuy")) {
-			plugin.message(sender, "setowner-noPermissionBuy", region);
-			return;
-		}
+    @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);
+            }
 
-		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;
-		}
+        } else {
+            region = fileManager.getRegion(args[2]);
+        }
+        if (region == null) {
+            messageBridge.message(sender, "setowner-notRegistered");
+            return;
+        }
 
-		if(region instanceof RentRegion) {
-			RentRegion rent = (RentRegion)region;
-			if(rent.isRenter(uuid)) {
-				// extend
-				rent.setRentedUntil(rent.getRentedUntil() + rent.getDuration());
-				rent.setRenter(uuid);
-				plugin.message(sender, "setowner-succesRentExtend", region);
-			} else {
-				// change
-				if(!rent.isRented()) {
-					rent.setRentedUntil(Calendar.getInstance().getTimeInMillis() + rent.getDuration());
-				}
-				rent.setRenter(uuid);
-				plugin.message(sender, "setowner-succesRent", region);
-			}
-		}
-		if(region instanceof BuyRegion) {
-			BuyRegion buy = (BuyRegion)region;
-			buy.setBuyer(uuid);
-			plugin.message(sender, "setowner-succesBuy", region);
-		}
-		region.getFriendsFeature().deleteFriend(region.getOwner(), null);
-		region.update();
-		region.saveRequired();
-	}
+        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;
+        }
 
-	@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;
-	}
+        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,5 +1,7 @@
 package me.wiefferink.areashop.commands;
 
+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;
@@ -7,11 +9,19 @@ 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 {
 
+	@Inject
+	private MessageBridge messageBridge;
+	@Inject
+	private IFileManager fileManager;
+	
 	@Override
 	public String getCommandStart() {
 		return "areashop setprice";
@@ -28,11 +38,11 @@ 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;
@@ -41,27 +51,27 @@ public class SetpriceCommand extends CommandAreaShop {
 				// get the region by location
 				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 {
-				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])) {
@@ -71,22 +81,22 @@ public class SetpriceCommand extends CommandAreaShop {
 				((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 instanceof RentRegion) {
 			((RentRegion)region).setPrice(price);
-			plugin.message(sender, "setprice-successRent", region);
+			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();
 	}
@@ -95,7 +105,7 @@ public class SetpriceCommand extends CommandAreaShop {
 	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,13 +1,28 @@
 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 {
 
+	@Inject
+	private MessageBridge messageBridge;
+	@Inject
+	private IFileManager fileManager;
+	@Inject
+	private Plugin plugin;
+	
 	@Override
 	public String getCommandStart() {
 		return "areashop setrestore";
@@ -24,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;
@@ -49,9 +64,9 @@ public class SetrestoreCommand extends CommandAreaShop {
 		}
 		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();
 	}
@@ -60,13 +75,16 @@ public class SetrestoreCommand extends CommandAreaShop {
 	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,6 +1,8 @@
 package me.wiefferink.areashop.commands;
 
 import com.sk89q.worldguard.protection.regions.ProtectedRegion;
+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;
@@ -8,11 +10,19 @@ 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 {
 
+	@Inject
+	private MessageBridge messageBridge;
+	@Inject
+	private IFileManager fileManager;
+	
 	@Override
 	public String getCommandStart() {
 		return "areashop settp";
@@ -33,10 +43,9 @@ public class SetteleportCommand extends CommandAreaShop {
 	 * @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");
 	}
@@ -44,35 +53,34 @@ 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.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 instanceof RentRegion) {
@@ -81,10 +89,10 @@ public class SetteleportCommand extends CommandAreaShop {
 			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;
 		}
 
@@ -92,23 +100,23 @@ public class SetteleportCommand extends CommandAreaShop {
 		if(args.length > 2 && args[2] != null && (args[2].equalsIgnoreCase("reset") || args[2].equalsIgnoreCase("yes") || args[2].equalsIgnoreCase("true"))) {
 			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.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

@@ -3,26 +3,46 @@ package me.wiefferink.areashop.commands;
 import com.sk89q.worldguard.protection.managers.RegionManager;
 import com.sk89q.worldguard.protection.regions.ProtectedCuboidRegion;
 import me.wiefferink.areashop.AreaShop;
+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.regions.BuyRegion;
+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 {
 
+	@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";
@@ -40,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
@@ -62,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
@@ -70,27 +89,27 @@ 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 WorldEditSelection selection = plugin.getWorldEditHandler().getPlayerSelection(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)
@@ -101,7 +120,7 @@ public class StackCommand extends CommandAreaShop {
 			facing = BlockFace.UP;
 		}
 		if(!(facing == BlockFace.NORTH || facing == BlockFace.EAST || facing == BlockFace.SOUTH || facing == BlockFace.WEST || facing == BlockFace.UP || facing == BlockFace.DOWN)) {
-			plugin.message(player, "stack-unclearDirection", facing.toString().toLowerCase().replace('_', '-'));
+			messageBridge.message(player, "stack-unclearDirection", facing.toString().toLowerCase().replace('_', '-'));
 			return;
 		}
 		Vector shift = new Vector(0, 0, 0);
@@ -138,8 +157,8 @@ public class StackCommand extends CommandAreaShop {
 		if(group != null) {
 			groupsMessage = Message.fromKey("stack-addToGroup").replacements(group.getName());
 		}
-		plugin.message(player, "stack-accepted", amount, type, gap, nameTemplate, 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());
@@ -176,24 +195,24 @@ public class StackCommand extends CommandAreaShop {
 							tooHigh++;
 							continue;
 						}
-						ProtectedCuboidRegion region = plugin.getWorldGuardHandler().createCuboidRegion(regionName, minimum,maximum);
+						ProtectedCuboidRegion region = worldGuardInterface.createCuboidRegion(regionName, minimum,maximum);
 						manager.addRegion(region);
 
 						// Add the region to AreaShop
 						GeneralRegion newRegion;
 						if(rentRegions) {
-							newRegion = new RentRegion(regionName, selection.getWorld());
+							newRegion = regionFactory.createRentRegion(regionName, selection.getWorld());
 
 						} else {
-							newRegion = new BuyRegion(regionName, selection.getWorld());
+							newRegion = regionFactory.createBuyRegion(regionName, selection.getWorld());
 						}
 
 						if(finalGroup != null) {
 							finalGroup.addMember(newRegion);
 						}
-						AddingRegionEvent event = plugin.getFileManager().addRegion(newRegion);
+						AddingRegionEvent event = fileManager.addRegion(newRegion);
 						if (event.isCancelled()) {
-							plugin.message(player, "general-cancelled", event.getReason());
+							messageBridge.message(player, "general-cancelled", event.getReason());
 							continue;
 						}
 						newRegion.handleSchematicEvent(GeneralRegion.RegionEvent.CREATED);
@@ -210,7 +229,7 @@ public class StackCommand extends CommandAreaShop {
 						if(tooLow > 0) {
 							wrong.append(Message.fromKey("stack-tooLow").replacements(tooLow));
 						}
-						plugin.message(player, "stack-addComplete", added, wrong);
+						messageBridge.message(player, "stack-addComplete", added, wrong);
 					}
 					this.cancel();
 				}
@@ -245,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,15 +1,25 @@
 package me.wiefferink.areashop.commands;
 
+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 {
 
+	@Inject
+	private MessageBridge messageBridge;
+	@Inject
+	private IFileManager fileManager;
+	
 	@Override
 	public String getCommandStart() {
 		return "areashop stopresell";
@@ -26,7 +36,7 @@ public class StopresellCommand extends CommandAreaShop {
 	@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;
 		}
 
@@ -36,47 +46,47 @@ public class StopresellCommand extends CommandAreaShop {
 				// get the region by location
 				List<BuyRegion> regions = Utils.getImportantBuyRegions(((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 {
 					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);
 		}
 	}
 
@@ -84,7 +94,7 @@ public class StopresellCommand 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() && region.isInResellingMode()) {
 					result.add(region.getName());
 				}

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

@@ -1,14 +1,24 @@
 package me.wiefferink.areashop.commands;
 
+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 {
 
+	@Inject
+	private MessageBridge messageBridge;
+	@Inject
+	private IFileManager fileManager;
+	
 	@Override
 	public String getCommandStart() {
 		return "areashop tp";
@@ -29,10 +39,9 @@ public class TeleportCommand extends CommandAreaShop {
 	 * @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")
@@ -42,21 +51,20 @@ public class TeleportCommand extends CommandAreaShop {
 	@Override
 	public void execute(CommandSender sender, String[] args) {
 		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")) {
-			plugin.message(sender, "teleport-noPermission");
+			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;
 		}
 
@@ -72,7 +80,7 @@ public class TeleportCommand extends CommandAreaShop {
 	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,16 +1,26 @@
 package me.wiefferink.areashop.commands;
 
+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 {
 
+	@Inject
+	private MessageBridge messageBridge;
+	@Inject
+	private IFileManager fileManager;
+	
 	@Override
 	public String getCommandStart() {
 		return "areashop unrent";
@@ -34,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;
@@ -44,7 +53,7 @@ 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;
@@ -53,27 +62,27 @@ public class UnrentCommand extends CommandAreaShop {
 				// get the region by location
 				List<RentRegion> regions = Utils.getImportantRentRegions(((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 {
 					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);
@@ -83,7 +92,7 @@ public class UnrentCommand extends CommandAreaShop {
 	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/features/CommandsFeature.java

@@ -1,5 +1,6 @@
 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;
@@ -20,10 +21,18 @@ 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
@@ -36,7 +45,7 @@ public class CommandsFeature extends RegionFeature {
 			return;
 		}
 		List<String> commands = eventCommandProfileSection.getStringList(event.getValue() + "." + (before ? "before" : "after"));
-		if(commands == null || commands.isEmpty()) {
+		if(commands.isEmpty()) {
 			return;
 		}
 		region.runCommands(Bukkit.getConsoleSender(), commands);

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

@@ -19,8 +19,18 @@ import me.wiefferink.areashop.events.notify.UpdateRegionEvent;
 import me.wiefferink.areashop.tools.Utils;
 import org.bukkit.event.EventHandler;
 
+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) {
 		AreaShop.debug("BuyingRegionEvent: " + event.getPlayer().getName() + " is trying to buy " + event.getRegion().getName());

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,5 +1,10 @@
 package me.wiefferink.areashop.features;
 
+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;
@@ -7,6 +12,7 @@ import org.bukkit.Bukkit;
 import org.bukkit.OfflinePlayer;
 import org.bukkit.command.CommandSender;
 
+import javax.annotation.Nonnull;
 import java.util.ArrayList;
 import java.util.HashSet;
 import java.util.List;
@@ -15,7 +21,12 @@ import java.util.UUID;
 
 public class FriendsFeature extends RegionFeature {
 
-	public FriendsFeature(GeneralRegion region) {
+	@Inject
+	private MessageBridge messageBridge;
+	
+	@AssistedInject
+	public FriendsFeature(@Nonnull AreaShop plugin, @Assisted @Nonnull GeneralRegion region) {
+		super(plugin);
 		setRegion(region);
 	}
 
@@ -30,7 +41,7 @@ public class FriendsFeature extends RegionFeature {
 		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;
 		}
 
@@ -52,7 +63,7 @@ public class FriendsFeature extends RegionFeature {
 		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;
 		}
 

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

@@ -2,10 +2,11 @@ package me.wiefferink.areashop.features;
 
 import me.wiefferink.areashop.AreaShop;
 import me.wiefferink.areashop.regions.GeneralRegion;
-import org.bukkit.configuration.file.YamlConfiguration;
 import org.bukkit.event.HandlerList;
 import org.bukkit.event.Listener;
 
+import javax.annotation.Nonnull;
+
 /*
 Possible future feature classes:
 - RestrictedToRegion feature
@@ -28,11 +29,14 @@ Possible future feature classes:
  */
 
 public abstract class RegionFeature implements Listener {
-	public static final AreaShop plugin = AreaShop.getInstance();
 
-	public YamlConfiguration config = plugin.getConfig();
+	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

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

@@ -1,28 +1,38 @@
 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 java.util.HashSet;
-import java.util.List;
+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 {
 
-	public TeleportFeature() {
-	}
+	@Inject
+	private WorldGuardInterface worldGuardInterface;
 
-	public TeleportFeature(GeneralRegion region) {
+	@AssistedInject
+	public TeleportFeature(@Nonnull AreaShop plugin, @Assisted @Nonnull GeneralRegion region) {
+		super(plugin);
 		setRegion(region);
 	}
 
@@ -354,7 +364,9 @@ public class TeleportFeature extends RegionFeature {
 				// Let the player look at the sign
 				Vector playerVector = safeLocation.toVector();
 				playerVector.setY(playerVector.getY() + player.getEyeHeight(true));
-				Vector signVector = getRegion().getSignsFeature().getSigns().get(0).getLocation().toVector().add(new Vector(0.5, 0.5, 0.5));
+				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())));
@@ -414,7 +426,7 @@ public class TeleportFeature extends RegionFeature {
 		}
 
 		// Get all blocks around the player (below foot level, foot level, head level and above head level)
-		Set<Material> around = new HashSet<>();
+		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++) {
@@ -443,11 +455,10 @@ public class TeleportFeature extends RegionFeature {
 	 * @return true when it is safe to spawn inside, otherwise false
 	 */
 	private static boolean canSpawnIn(Material material) {
-		String name = material.name();
-		return name.contains("DOOR")
-				|| name.contains("SIGN")
-				|| name.contains("PLATE") // Redstone plates
-				|| name.equals("DRAGON_EGG");
+		return material == Material.DRAGON_EGG
+				|| Tag.DOORS.isTagged(material)
+				|| Tag.SIGNS.isTagged(material)
+				|| Tag.PRESSURE_PLATES.isTagged(material);
 	}
 
 	/**
@@ -456,17 +467,18 @@ public class TeleportFeature extends RegionFeature {
 	 * @return true when it is safe to spawn on top of, otherwise false
 	 */
 	private static boolean cannotSpawnOn(Material material) {
-		String name = material.name();
-		return name.equals("CACTUS")
-				|| name.contains("PISTON")
-				|| name.contains("SIGN")
-				|| name.contains("DOOR")
-				|| name.contains("PLATE")
-				|| name.contains("REDSTONE_LAMP")
-				|| name.contains("FENCE")
-				|| name.contains("GLASS_PANE") || name.contains("THIN_GLASS")
-				|| name.equals("DRAGON_EGG")
-				|| name.contains("MAGMA");
+		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");
 	}
 
 	/**
@@ -475,11 +487,9 @@ public class TeleportFeature extends RegionFeature {
 	 * @return true when it is safe to spawn next to, otherwise false
 	 */
 	private static boolean cannotSpawnBeside(Material material) {
-		String name = material.name();
-		return name.contains("LAVA")
-				|| name.contains("CACTUS")
-				|| name.equals("FIRE")
-				|| name.contains("MAGMA");
+		return material == Material.LAVA
+				|| material == Material.FIRE
+				|| material == Material.MAGMA_BLOCK;
 	}
 
 	/**
@@ -493,19 +503,21 @@ public class TeleportFeature extends RegionFeature {
 		ProtectedRegion worldguardRegion = getRegion().getRegion();
 
 		// Try to get sign location
-		List<RegionSign> signs = getRegion().getSignsFeature().getSigns();
-		boolean signAvailable = !signs.isEmpty();
+
+		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 = signs.get(0).getLocation(); //.subtract(0.0, 1.0, 0.0);
+				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 = getRegion().getSignsFeature().getSigns().get(0).getFacing();
+					BlockFace facing = firstSign.getFacing();
 					Vector facingVector = new Vector(facing.getModX(), facing.getModY(), facing.getModZ())
 							.normalize()
 							.multiply(distance);
@@ -528,8 +540,8 @@ public class TeleportFeature extends RegionFeature {
 		// Calculate a default location
 		if(startLocation == null) {
 			// Set to block in the middle, y configured in the config
-			Vector regionMin = AreaShop.getInstance().getWorldGuardHandler().getMinimumPoint(worldguardRegion);
-			Vector regionMax = AreaShop.getInstance().getWorldGuardHandler().getMaximumPoint(worldguardRegion);
+			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)) {

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

@@ -8,17 +8,31 @@ import com.sk89q.worldguard.protection.regions.ProtectedRegion;
 import me.wiefferink.areashop.AreaShop;
 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 javax.annotation.Nonnull;
+import javax.inject.Inject;
+import javax.inject.Singleton;
 import java.util.Objects;
 import java.util.Set;
 import java.util.UUID;
 
+@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(UpdateRegionEvent event) {
@@ -69,7 +83,6 @@ public class WorldGuardRegionFlagsFeature extends RegionFeature {
 		boolean result = true;
 
 		Set<String> flagNames = flags.getKeys(false);
-		WorldGuardPlugin worldGuard = plugin.getWorldGuard();
 
 		// Get the region
 		ProtectedRegion worldguardRegion = region.getRegion();
@@ -81,14 +94,14 @@ public class WorldGuardRegionFlagsFeature extends RegionFeature {
 		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(worldguardRegion, parseAccessSet(value));
+				worldGuardInterface.setMembers(worldguardRegion, parseAccessSet(value));
 				//AreaShop.debug("  Flag " + flagName + " set: " + members.toUserFriendlyString());
 			} else if(flagName.equalsIgnoreCase("owners")) {
-				plugin.getWorldGuardHandler().setOwners(worldguardRegion, parseAccessSet(value));
+				worldGuardInterface.setOwners(worldguardRegion, parseAccessSet(value));
 				//AreaShop.debug("  Flag " + flagName + " set: " + owners.toUserFriendlyString());
 			} else if(flagName.equalsIgnoreCase("priority")) {
 				try {
@@ -123,7 +136,7 @@ public class WorldGuardRegionFlagsFeature extends RegionFeature {
 				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) {
 					AreaShop.warn("Found wrong flag in flagProfiles section: " + flagName + ", check if that is the correct WorldGuard flag");
 					continue;
@@ -145,7 +158,7 @@ public class WorldGuardRegionFlagsFeature extends RegionFeature {
 							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) {
 										AreaShop.warn("Found wrong group value for flag " + flagName);
 									}
@@ -229,7 +242,7 @@ public class WorldGuardRegionFlagsFeature extends RegionFeature {
 	 */
 	private <V> void setFlag(ProtectedRegion region, Flag<V> flag, String value) throws InvalidFlagFormat {
 		V current = region.getFlag(flag);
-		V next = plugin.getWorldGuardHandler().parseFlagInput(flag, value);
+		V next = worldGuardInterface.parseFlagInput(flag, value);
 
 		if(!Objects.equals(current, next)) {
 			region.setFlag(flag, next);

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

@@ -1,9 +1,16 @@
 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;
@@ -11,11 +18,15 @@ 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;
 
@@ -24,14 +35,30 @@ import java.util.List;
  */
 public class RegionSign {
 
+	private final BlockBehaviourHelper blockHelper;
+	private final SignErrorLogger errorLogger;
+
 	private final SignsFeature signsFeature;
 	private final String key;
 
-	public RegionSign(SignsFeature signsFeature, 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
@@ -68,11 +95,13 @@ public class RegionSign {
 	 * Remove this sign from the region.
 	 */
 	public void remove() {
-		getLocation().getBlock().setType(Material.AIR);
-		signsFeature.getSignsRef().remove(getStringLocation());
-		SignsFeature.getAllSigns().remove(getStringLocation());
-		SignsFeature.getSignsByChunk().get(getStringChunk()).remove(this);
+		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
 	}
 
 	/**
@@ -97,7 +126,7 @@ public class RegionSign {
 
 	/**
 	 * Get the material of the sign as saved in the config.
-	 * @return Material of the sign, usually {@link Material#WALL_SIGN}, {@link Material#SIGN}, or one of the other wood types (different result for 1.13-), Material.AIR if none.
+	 * @return Material of the sign,Material.AIR if none.
 	 */
 	public Material getMaterial() {
 		String name = getRegion().getConfig().getString("general.signs." + key + ".signType");
@@ -147,17 +176,29 @@ public class RegionSign {
 		// 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);
 
-			// This triggers a physics update, which pops the sign if not attached properly
-			if (!AreaShop.getInstance().getBukkitHandler().setSignFacing(block, getFacing())) {
-				AreaShop.warn("Failed to update the facing direction of the sign at", getStringLocation(), "to ", getFacing(), ", region:", getRegion().getName());
+			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())) {
-				AreaShop.warn("Setting sign", key, "of region", getRegion().getName(), "failed, could not set sign block back");
 				return false;
 			}
 		}
@@ -167,12 +208,12 @@ public class RegionSign {
 			getRegion().setSetting("general.signs." + key + ".signType", block.getType().name());
 		}
 		if(!regionConfig.isString("general.signs." + key + ".facing")) {
-			BlockFace signFacing = AreaShop.getInstance().getBukkitHandler().getSignFacing(block);
+			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) block.getState();
+		Sign signState = (Sign) PaperLib.getBlockState(block, false).getState();
 		for(int i = 0; i < signLines.length; i++) {
 			if(signLines[i] == null) {
 				signState.setLine(i, "");
@@ -182,7 +223,7 @@ public class RegionSign {
 			signLines[i] = Utils.applyColors(signLines[i]);
 			signState.setLine(i, signLines[i]);
 		}
-		signState.update();
+		signState.update(false, false);
 		return true;
 	}
 
@@ -204,7 +245,7 @@ public class RegionSign {
 		// Check the lines for the timeleft tag
 		for(int i = 1; i <= 4; i++) {
 			String line = stateConfig.getString("line" + i);
-			if(line != null && !line.isEmpty() && line.contains(Message.VARIABLE_START + AreaShop.tagTimeLeft + Message.VARIABLE_END)) {
+			if(line != null && line.contains(Message.VARIABLE_START + AreaShop.tagTimeLeft + Message.VARIABLE_END)) {
 				return true;
 			}
 		}

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

@@ -1,454 +1,55 @@
 package me.wiefferink.areashop.features.signs;
 
-import com.sk89q.worldguard.protection.managers.RegionManager;
-import com.sk89q.worldguard.protection.regions.ProtectedRegion;
+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.events.ask.AddingRegionEvent;
-import me.wiefferink.areashop.events.notify.UpdateRegionEvent;
 import me.wiefferink.areashop.features.RegionFeature;
-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 me.wiefferink.areashop.tools.Materials;
 import me.wiefferink.areashop.tools.Utils;
-import me.wiefferink.bukkitdo.Do;
-import org.bukkit.Chunk;
 import org.bukkit.Location;
 import org.bukkit.Material;
-import org.bukkit.block.Block;
 import org.bukkit.block.BlockFace;
 import org.bukkit.configuration.ConfigurationSection;
-import org.bukkit.entity.Player;
-import org.bukkit.event.EventHandler;
-import org.bukkit.event.EventPriority;
-import org.bukkit.event.block.Action;
-import org.bukkit.event.block.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 java.util.ArrayList;
-import java.util.Collections;
+import javax.annotation.Nonnull;
 import java.util.HashMap;
-import java.util.List;
 import java.util.Map;
-import java.util.Set;
 
 public class SignsFeature extends RegionFeature {
 
-	private static final Map<String, RegionSign> allSigns = Collections.synchronizedMap(new HashMap<>());
-	private static final Map<String, List<RegionSign>> signsByChunk = Collections.synchronizedMap(new HashMap<>());
-
-	private Map<String, RegionSign> signs;
-
-	public SignsFeature() {
-
-	}
-
+	private final SignManager internalSignManager = new SignManager();
+	private final SignManager globalSignManager;
+	private final SignFactory signFactory;
 	/**
 	 * Constructor.
 	 * @param region The region to bind to
 	 */
-	public SignsFeature(GeneralRegion region) {
+	@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);
-		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(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;
-				}
-				signs.put(sign.getStringLocation(), sign);
-				signsByChunk.computeIfAbsent(sign.getStringChunk(), key -> new ArrayList<>())
-						.add(sign);
-			}
-			allSigns.putAll(signs);
-		}
-	}
-
-	@Override
-	public void shutdown() {
-		// Deregister signs from the registry
-		if(signs != null) {
-			for(Map.Entry<String, RegionSign> entry : signs.entrySet()) {
-				allSigns.remove(entry.getKey());
-				signsByChunk.get(entry.getValue().getStringChunk()).remove(entry.getValue());
-			}
-		}
-	}
-
-	@EventHandler(priority = EventPriority.HIGH)
-	public void onSignBreak(BlockBreakEvent event) {
-		if(event.isCancelled()) {
+		if (signSection == null) {
 			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
-			RegionSign regionSign = SignsFeature.getSignByLocation(block.getLocation());
-			if(regionSign == 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;
 			}
-			// 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());
-			}
-		}
-	}
-
-	@EventHandler(priority = EventPriority.HIGHEST, ignoreCancelled = true)
-	public void onIndirectSignBreak(BlockPhysicsEvent event) {
-		// Check if the block is a sign
-		if(!Materials.isSign(event.getBlock().getType())) {
-			return;
-		}
-
-		// Check if still attached to a block
-		Block attachedBlock = plugin.getBukkitHandler().getSignAttachedTo(event.getBlock());
-		// TODO: signs cannot be placed on all blocks, improve this check to isSolid()?
-		if (attachedBlock.getType() != Material.AIR) {
-			return;
-		}
-
-		// Check if the sign is really the same as a saved rent
-		RegionSign regionSign = SignsFeature.getSignByLocation(event.getBlock().getLocation());
-		if(regionSign == null) {
-			return;
-		}
-
-		// 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, 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
-		RegionSign regionSign = SignsFeature.getSignByLocation(block.getLocation());
-		if(regionSign == null) {
-			return;
-		}
-
-		// Ignore players that are in sign link mode (which will handle the event itself)
-		Player player = event.getPlayer();
-		if(plugin.getSignlinkerManager().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)
-	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.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 = 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.isEmpty();
-			boolean durationSet = thirdLine != null && !thirdLine.isEmpty();
-			// check if all the lines are correct
-			if(secondLine == null || secondLine.isEmpty()) {
-				plugin.message(player, "setup-noRegion");
-				return;
-			}
-			ProtectedRegion region = regionManager.getRegion(secondLine);
-			if(region == null) {
-				plugin.message(player, "cmd-noRegion", secondLine);
-				return;
-			}
-
-			FileManager.AddResult addResult = plugin.getFileManager().checkRegionAdd(player, regionManager.getRegion(secondLine), event.getPlayer().getWorld(), 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.ALREADYADDEDOTHERWORLD) {
-				plugin.message(player, "setup-alreadyOtherWorld");
-			} else if(addResult == FileManager.AddResult.NOPERMISSION) {
-				plugin.message(player, "setup-noPermission", secondLine);
-			} else if(thirdLine != null && !thirdLine.isEmpty() && !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(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);
-				}
-				rent.getSignsFeature().addSign(event.getBlock().getLocation(), event.getBlock().getType(), plugin.getBukkitHandler().getSignFacing(event.getBlock()), null);
-
-				AddingRegionEvent addingRegionEvent = plugin.getFileManager().addRegion(rent);
-				if (addingRegionEvent.isCancelled()) {
-					plugin.message(player, "general-cancelled", addingRegionEvent.getReason());
-					return;
-				}
-
-				rent.handleSchematicEvent(GeneralRegion.RegionEvent.CREATED);
-				plugin.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")) {
-				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.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 = 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.isEmpty();
-			// Check if all the lines are correct
-			if(secondLine == null || secondLine.isEmpty()) {
-				plugin.message(player, "setup-noRegion");
-				return;
-			}
-			ProtectedRegion region = regionManager.getRegion(secondLine);
-			if(region == null) {
-				plugin.message(player, "cmd-noRegion", secondLine);
-				return;
-			}
-			FileManager.AddResult addResult = plugin.getFileManager().checkRegionAdd(player, region, event.getPlayer().getWorld(), 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.ALREADYADDEDOTHERWORLD) {
-				plugin.message(player, "setup-alreadyOtherWorld");
-			} 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(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);
-				}
-				buy.getSignsFeature().addSign(event.getBlock().getLocation(), event.getBlock().getType(), plugin.getBukkitHandler().getSignFacing(event.getBlock()), null);
-
-				AddingRegionEvent addingRegionEvent = plugin.getFileManager().addRegion(buy);
-				if (addingRegionEvent.isCancelled()) {
-					plugin.message(player, "general-cancelled", addingRegionEvent.getReason());
-					return;
-				}
-
-				buy.handleSchematicEvent(GeneralRegion.RegionEvent.CREATED);
-				plugin.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")) {
-				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.isEmpty()) {
-				// Get region by secondLine of the sign
-				region = plugin.getFileManager().getRegion(secondLine);
-				if(region == null) {
-					plugin.message(player, "addSign-notRegistered", secondLine);
-					return;
-				}
-			} else {
-				// Get region by sign position
-				List<GeneralRegion> regions = Utils.getImportantRegions(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);
-			}
-
-			if(thirdLine == null || thirdLine.isEmpty()) {
-				region.getSignsFeature().addSign(event.getBlock().getLocation(), event.getBlock().getType(), plugin.getBukkitHandler().getSignFacing(event.getBlock()), null);
-				plugin.message(player, "addsign-success", region);
-			} else {
-				region.getSignsFeature().addSign(event.getBlock().getLocation(), event.getBlock().getType(), plugin.getBukkitHandler().getSignFacing(event.getBlock()), thirdLine);
-				plugin.message(player, "addsign-successProfile", thirdLine, region);
-			}
-
-			// Update the region later because this event will do it first
-			Do.sync(region::update);
+			this.globalSignManager.cacheForWorld(location.getWorld()).addSign(sign);
+			this.internalSignManager.addSign(sign);
 		}
 	}
 
@@ -470,106 +71,13 @@ public class SignsFeature extends RegionFeature {
 		return location.getWorld().getName() + ";" + (location.getBlockX() >> 4) + ";" + (location.getBlockZ() >> 4);
 	}
 
-	/**
-	 * Convert a chunk to a string to use as map key.
-	 * Use a Location argument to prevent chunk loading!
-	 * @param chunk The location to get the key for
-	 * @return A string to use in a map for a chunk
-	 */
-	public static String chunkToString(Chunk chunk) {
-		return chunk.getWorld().getName() + ";" + chunk.getX() + ";" + chunk.getZ();
+	@Override
+	public void shutdown() {
+
 	}
 
-	/**
-	 * 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));
-	}
-
-	/**
-	 * Get the map with all signs.
-	 * @return Map with all signs: locationString -&gt; RegionSign
-	 */
-	public static Map<String, RegionSign> getAllSigns() {
-		return allSigns;
-	}
-
-	/**
-	 * Get the map with signs by chunk.
-	 * @return Map with signs by chunk: chunkString -&gt; List&lt;RegionSign&gt;
-	 */
-	public static Map<String, List<RegionSign>> getSignsByChunk() {
-		return signsByChunk;
-	}
-
-	@EventHandler
-	public void regionUpdate(UpdateRegionEvent event) {
-		event.getRegion().getSignsFeature().update();
-	}
-
-	@EventHandler(priority = EventPriority.MONITOR)
-	public void onChunkLoad(ChunkLoadEvent event) {
-		List<RegionSign> chunkSigns = signsByChunk.get(chunkToString(event.getChunk()));
-		if(chunkSigns == null) {
-			return;
-		}
-
-		Do.forAll(chunkSigns, RegionSign::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 &= 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 |= sign.needsPeriodicUpdate();
-		}
-		return result;
-	}
-
-	/**
-	 * Get the signs of this region.
-	 * @return List of signs
-	 */
-	public List<RegionSign> getSigns() {
-		return Collections.unmodifiableList(new ArrayList<>(signs.values()));
-	}
-
-	/**
-	 * Get the signs of this region.
-	 * @return Map with signs: locationString -&gt; RegionSign
-	 */
-	Map<String, RegionSign> getSignsRef() {
-		return signs;
-	}
-
-	/**
-	 * 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;
+	public SignManager signManager() {
+		return this.internalSignManager;
 	}
 
 	/**
@@ -592,11 +100,9 @@ public class SignsFeature extends RegionFeature {
 			getRegion().setSetting(signPath + "profile", profile);
 		}
 		// Add to the map
-		RegionSign sign = new RegionSign(this, i + "");
-		signs.put(sign.getStringLocation(), sign);
-		allSigns.put(sign.getStringLocation(), sign);
-		signsByChunk.computeIfAbsent(sign.getStringChunk(), key -> new ArrayList<>())
-				.add(sign);
+		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/listeners/PlayerLoginLogoutListener.java

@@ -1,6 +1,7 @@
 package me.wiefferink.areashop.listeners;
 
 import me.wiefferink.areashop.AreaShop;
+import me.wiefferink.areashop.MessageBridge;
 import me.wiefferink.areashop.regions.BuyRegion;
 import me.wiefferink.areashop.regions.GeneralRegion;
 import me.wiefferink.areashop.regions.RentRegion;
@@ -15,6 +16,7 @@ import org.bukkit.event.player.PlayerLoginEvent;
 import org.bukkit.event.player.PlayerLoginEvent.Result;
 import org.bukkit.event.player.PlayerQuitEvent;
 
+import javax.annotation.Nonnull;
 import java.util.ArrayList;
 import java.util.List;
 
@@ -22,14 +24,17 @@ import java.util.List;
  * Notify region expiry and track activity time.
  */
 public final class PlayerLoginLogoutListener implements Listener {
+
 	private final AreaShop plugin;
+	private final MessageBridge messageBridge;
 
 	/**
 	 * Constructor.
 	 * @param plugin The AreaShop plugin
 	 */
-	public PlayerLoginLogoutListener(AreaShop plugin) {
+	public PlayerLoginLogoutListener(@Nonnull AreaShop plugin, @Nonnull MessageBridge messageBridge) {
 		this.plugin = plugin;
+		this.messageBridge = messageBridge;
 	}
 
 	/**
@@ -53,7 +58,7 @@ public final class PlayerLoginLogoutListener implements Listener {
 				return false;
 			}
 			// Notify for rents that almost run out
-			for(RentRegion region : plugin.getFileManager().getRents()) {
+			for(RentRegion region : plugin.getFileManager().getRentsRef()) {
 				if(region.isRenter(player)) {
 					String warningSetting = region.getStringSetting("rent.warningOnLoginTime");
 					if(warningSetting == null || warningSetting.isEmpty()) {
@@ -62,13 +67,13 @@ public final class PlayerLoginLogoutListener implements Listener {
 					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);
+						 messageBridge.message(player, "rent-expireWarning", region);
 					}
 				}
 			}
 
 			// Notify admins for plugin updates
-			AreaShop.getInstance().notifyUpdate(player);
+			this.plugin.notifyUpdate(player);
 			return false;
 		});
 
@@ -79,7 +84,7 @@ public final class PlayerLoginLogoutListener implements Listener {
 			}
 
 			List<GeneralRegion> regions = new ArrayList<>();
-			for(GeneralRegion region : plugin.getFileManager().getRegions()) {
+			for(GeneralRegion region : plugin.getFileManager().getRegionsRef()) {
 				if(region.isOwner(player)) {
 					regions.add(region);
 				}
@@ -122,7 +127,7 @@ public final class PlayerLoginLogoutListener implements Listener {
 	 * @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/managers/CommandManager.java

@@ -1,5 +1,8 @@
 package me.wiefferink.areashop.managers;
 
+import com.google.inject.Injector;
+import me.wiefferink.areashop.AreaShop;
+import me.wiefferink.areashop.MessageBridge;
 import me.wiefferink.areashop.commands.AddCommand;
 import me.wiefferink.areashop.commands.AddfriendCommand;
 import me.wiefferink.areashop.commands.AddsignCommand;
@@ -39,52 +42,62 @@ 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;
 
+@Singleton
 public class CommandManager extends Manager implements CommandExecutor, TabCompleter {
-	private final ArrayList<CommandAreaShop> commands;
+	private final List<CommandAreaShop> commands;
+	private final AreaShop plugin;
+	private final MessageBridge messageBridge;
 
 	/**
 	 * Constructor.
 	 */
-	public CommandManager() {
-		commands = new ArrayList<>();
-		commands.add(new HelpCommand());
-		commands.add(new RentCommand());
-		commands.add(new UnrentCommand());
-		commands.add(new BuyCommand());
-		commands.add(new SellCommand());
-		commands.add(new MeCommand());
-		commands.add(new InfoCommand());
-		commands.add(new TeleportCommand());
-		commands.add(new SetteleportCommand());
-		commands.add(new AddfriendCommand());
-		commands.add(new DelfriendCommand());
-		commands.add(new FindCommand());
-		commands.add(new ResellCommand());
-		commands.add(new StopresellCommand());
-		commands.add(new SetrestoreCommand());
-		commands.add(new SetpriceCommand());
-		commands.add(new SetownerCommand());
-		commands.add(new SetdurationCommand());
-		commands.add(new ReloadCommand());
-		commands.add(new GroupaddCommand());
-		commands.add(new GroupdelCommand());
-		commands.add(new GrouplistCommand());
-		commands.add(new GroupinfoCommand());
-		commands.add(new SchematiceventCommand());
-		commands.add(new AddCommand());
-		commands.add(new DelCommand());
-		commands.add(new AddsignCommand());
-		commands.add(new DelsignCommand());
-		commands.add(new LinksignsCommand());
-		commands.add(new StackCommand());
-		commands.add(new SetlandlordCommand());
-		commands.add(new MessageCommand());
-		commands.add(new ImportCommand());
+	@Inject
+	CommandManager(@Nonnull AreaShop plugin, @Nonnull MessageBridge messageBridge, @Nonnull
+				   Injector injector) {
+		this.plugin = 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);
@@ -105,13 +118,13 @@ public class CommandManager extends Manager implements CommandExecutor, TabCompl
 	 */
 	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.isEmpty()) {
@@ -120,14 +133,14 @@ public class CommandManager extends Manager implements CommandExecutor, TabCompl
 		}
 		// 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;
 		}
 
@@ -153,9 +166,9 @@ public class CommandManager extends Manager implements CommandExecutor, TabCompl
 			} else {
 				// 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");
+					messageBridge.message(sender, "reload-updateCommandChanged");
 				} else {
-					plugin.message(sender, "cmd-notValid");
+					messageBridge.message(sender, "cmd-notValid");
 				}
 			}
 		}

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

@@ -1,8 +1,11 @@
 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;
@@ -10,57 +13,63 @@ import me.wiefferink.areashop.features.WorldGuardRegionFlagsFeature;
 import me.wiefferink.areashop.features.signs.SignsFeature;
 import me.wiefferink.areashop.regions.GeneralRegion;
 
-import java.lang.reflect.Constructor;
-import java.lang.reflect.InvocationTargetException;
+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 {
 
-	// List of defined features
-	private static final Set<Class<? extends RegionFeature>> featureClasses = new HashSet<>(Arrays.asList(
-			DebugFeature.class,
-			SignsFeature.class,
-			FriendsFeature.class,
+	private static final Collection<Class<? extends RegionFeature>> globalFeatureClasses = Arrays.asList(
+			CommandsFeature.class,
 			WorldGuardRegionFlagsFeature.class,
-			TeleportFeature.class,
-			CommandsFeature.class
-	));
+			DebugFeature.class
+	);
 	// One instance of each feature, registered for event handling
-	private final Set<RegionFeature> globalFeatures;
-	private final Map<Class<? extends RegionFeature>, Constructor<? extends RegionFeature>> regionFeatureConstructors;
+	private final Set<RegionFeature> globalFeatures = new HashSet<>();
+	private final Map<Class<? extends RegionFeature>, Function<GeneralRegion, ? extends RegionFeature>> regionFeatureConstructors = new HashMap<>();
 
 	/**
 	 * Constructor.
 	 */
-	public FeatureManager() {
+	@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)
-		globalFeatures = new HashSet<>();
-		for(Class<? extends RegionFeature> clazz : featureClasses) {
+		for(Class<? extends RegionFeature> clazz : globalFeatureClasses) {
 			try {
-				Constructor<? extends RegionFeature> constructor = clazz.getConstructor();
-				RegionFeature feature = constructor.newInstance();
+				RegionFeature feature = injector.getInstance(clazz);
 				feature.listen();
 				globalFeatures.add(feature);
-			} catch(InstantiationException | IllegalAccessException | InvocationTargetException | IllegalArgumentException e) {
+			} catch(ProvisionException e) {
 				AreaShop.error("Failed to instantiate global feature:", clazz, e);
-			} catch(NoSuchMethodException e) {
-				// Feature does not have a global part
 			}
 		}
+	}
 
-		// Setup constructors for region specific features
-		regionFeatureConstructors = new HashMap<>();
-		for(Class<? extends RegionFeature> clazz : featureClasses) {
+	private <T extends RegionFeature> Function<GeneralRegion, T> wrapInstantiator(Class<T> clazz, Function<GeneralRegion, T> function
+	) {
+		return region -> {
 			try {
-				regionFeatureConstructors.put(clazz, clazz.getConstructor(GeneralRegion.class));
-			} catch(NoSuchMethodException | IllegalArgumentException e) {
-				// The feature does not have a region specific part
+				return function.apply(region);
+			} catch (Throwable e) {
+				AreaShop.error("Failed to instantiate feature", clazz, "for region", region, e, e.getCause());
+				return null;
 			}
-		}
+		};
 	}
 
 	@Override
@@ -77,12 +86,7 @@ public class FeatureManager extends Manager {
 	 * @return The feature class
 	 */
 	public RegionFeature getRegionFeature(GeneralRegion region, Class<? extends RegionFeature> featureClazz) {
-		try {
-			return regionFeatureConstructors.get(featureClazz).newInstance(region);
-		} catch(InstantiationException | InvocationTargetException | IllegalAccessException | IllegalArgumentException e) {
-			AreaShop.error("Failed to instantiate feature", featureClazz, "for region", region, e, e.getCause());
-		}
-		return null;
+		return regionFeatureConstructors.get(featureClazz).apply(region);
 	}
 
 }

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

@@ -4,21 +4,24 @@ import com.google.common.base.Charsets;
 import com.google.common.io.Files;
 import com.sk89q.worldguard.protection.managers.RegionManager;
 import com.sk89q.worldguard.protection.regions.ProtectedRegion;
+import io.github.bakedlibs.dough.blocks.BlockPosition;
 import me.wiefferink.areashop.AreaShop;
+import me.wiefferink.areashop.MessageBridge;
 import me.wiefferink.areashop.events.ask.AddingRegionEvent;
 import me.wiefferink.areashop.events.ask.DeletingRegionEvent;
 import me.wiefferink.areashop.events.notify.AddedRegionEvent;
 import me.wiefferink.areashop.events.notify.DeletedRegionEvent;
+import me.wiefferink.areashop.interfaces.WorldGuardInterface;
 import me.wiefferink.areashop.regions.BuyRegion;
 import me.wiefferink.areashop.regions.GeneralRegion;
 import me.wiefferink.areashop.regions.GeneralRegion.RegionEvent;
 import me.wiefferink.areashop.regions.GeneralRegion.RegionType;
+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.bukkitdo.Do;
 import org.bukkit.Bukkit;
-import org.bukkit.Location;
 import org.bukkit.Material;
 import org.bukkit.OfflinePlayer;
 import org.bukkit.World;
@@ -27,6 +30,10 @@ import org.bukkit.configuration.ConfigurationSection;
 import org.bukkit.configuration.file.YamlConfiguration;
 import org.bukkit.entity.Player;
 
+import javax.annotation.Nonnull;
+import javax.annotation.Nullable;
+import javax.inject.Inject;
+import javax.inject.Singleton;
 import java.io.File;
 import java.io.FileInputStream;
 import java.io.FileOutputStream;
@@ -36,58 +43,62 @@ import java.io.InputStreamReader;
 import java.io.ObjectInputStream;
 import java.io.ObjectOutputStream;
 import java.io.OutputStream;
+import java.nio.charset.StandardCharsets;
 import java.util.ArrayList;
 import java.util.Collection;
+import java.util.Collections;
 import java.util.HashMap;
 import java.util.HashSet;
 import java.util.List;
+import java.util.Locale;
+import java.util.Map;
 import java.util.Set;
 import java.util.regex.Matcher;
 import java.util.regex.Pattern;
 
-public class FileManager extends Manager {
+@Singleton
+public class FileManager extends Manager implements IFileManager {
 
-	private HashMap<String, GeneralRegion> regions = null;
-	private String regionsPath = null;
-	private HashMap<String, RegionGroup> groups = null;
-	private String configPath = null;
+	private final AreaShop plugin;
+	private final Map<String, GeneralRegion> regions;
+	private final Map<String, BuyRegion> buys;
+	private final Map<String, RentRegion> rents;
+	private final String regionsPath;
+	private final Map<String, RegionGroup> groups;
+	private final String configPath;
 	private YamlConfiguration config = null;
-	private String groupsPath = null;
+	private final String groupsPath;
 	private YamlConfiguration groupsConfig = null;
-	private String defaultPath = null;
+	private final String defaultPath;
 	private YamlConfiguration defaultConfig = null;
 	private YamlConfiguration defaultConfigFallback = null;
 	private boolean saveGroupsRequired = false;
 	private final Set<String> worldRegionsRequireSaving;
 
 	private HashMap<String, Integer> versions = null;
-	private String versionPath = null;
-	private String schemFolder = null;
-
-	// 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;
-		}
-	}
+	private final String versionPath;
+	private final String schemFolder;
+	private final WorldGuardInterface worldGuardInterface;
+	private final MessageBridge messageBridge;
+	private final RegionFactory regionFactory;
 
 	/**
 	 * Constructor, initialize variabeles.
 	 */
-	public FileManager() {
+	@Inject
+	FileManager(
+			@Nonnull AreaShop plugin,
+			@Nonnull WorldGuardInterface worldGuardInterface,
+			@Nonnull MessageBridge messageBridge,
+			@Nonnull RegionFactory regionFactory
+	) {
+		this.plugin = plugin;
+		this.worldGuardInterface = worldGuardInterface;
+		this.messageBridge = messageBridge;
+		this.regionFactory = regionFactory;
 		regions = new HashMap<>();
+		buys = new HashMap<>();
+		rents = new HashMap<>();
 		regionsPath = plugin.getDataFolder() + File.separator + AreaShop.regionsFolder;
 		configPath = plugin.getDataFolder() + File.separator + "config.yml";
 		groups = new HashMap<>();
@@ -106,7 +117,7 @@ public class FileManager extends Manager {
 	@Override
 	public void shutdown() {
 		// Update lastactive time for players that are online now
-		for(GeneralRegion region : getRegions()) {
+		for(GeneralRegion region : this.regions.values()) {
 			Player player = Bukkit.getPlayer(region.getOwner());
 			if(player != null) {
 				region.updateLastActiveTime();
@@ -125,6 +136,7 @@ public class FileManager extends Manager {
 	 * Get the folder where schematics are stored.
 	 * @return The folder where schematics are stored
 	 */
+	@Override
 	public String getSchematicFolder() {
 		return schemFolder;
 	}
@@ -134,6 +146,7 @@ public class FileManager extends Manager {
 	 * @param name The name of the group to get (will be normalized)
 	 * @return The group if found, otherwise null
 	 */
+	@Override
 	public RegionGroup getGroup(String name) {
 		return groups.get(name.toLowerCase());
 	}
@@ -142,6 +155,7 @@ public class FileManager extends Manager {
 	 * Get all groups.
 	 * @return Collection with all groups (safe to modify)
 	 */
+	@Override
 	public Collection<RegionGroup> getGroups() {
 		return groups.values();
 	}
@@ -150,6 +164,7 @@ public class FileManager extends Manager {
 	 * 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()})
 	 */
+	@Override
 	public YamlConfiguration getRegionSettings() {
 		return defaultConfig;
 	}
@@ -158,6 +173,7 @@ public class FileManager extends Manager {
 	 * Get the default regions settings as provided by AreaShop (default.yml).
 	 * @return YamlConfiguration with the default settings
 	 */
+	@Override
 	public YamlConfiguration getFallbackRegionSettings() {
 		return defaultConfigFallback;
 	}
@@ -166,6 +182,7 @@ public class FileManager extends Manager {
 	 * Get the config file (config.yml).
 	 * @return YamlConfiguration with the settings of users, with fallback to the settings provided by AreaShop
 	 */
+	@Override
 	public YamlConfiguration getConfig() {
 		return config;
 	}
@@ -175,7 +192,8 @@ public class FileManager extends Manager {
 	 * @param name The name of the region to get (will be normalized)
 	 * @return The region if found, otherwise null
 	 */
-	public GeneralRegion getRegion(String name) {
+	@Override
+	public @Nullable GeneralRegion getRegion(String name) {
 		return regions.get(name.toLowerCase());
 	}
 
@@ -184,12 +202,9 @@ public class FileManager extends Manager {
 	 * @param name The name of the rental region (will be normalized)
 	 * @return RentRegion if it could be found, otherwise null
 	 */
-	public RentRegion getRent(String name) {
-		GeneralRegion region = regions.get(name.toLowerCase());
-		if(region instanceof RentRegion) {
-			return (RentRegion)region;
-		}
-		return null;
+	@Override
+	public @Nullable RentRegion getRent(String name) {
+		return rents.get(name.toLowerCase(Locale.ENGLISH));
 	}
 
 	/**
@@ -197,57 +212,70 @@ public class FileManager extends Manager {
 	 * @param name The name of the buy region (will be normalized)
 	 * @return BuyRegion if it could be found, otherwise null
 	 */
-	public BuyRegion getBuy(String name) {
-		GeneralRegion region = regions.get(name.toLowerCase());
-		if(region instanceof BuyRegion) {
-			return (BuyRegion)region;
-		}
-		return null;
+	@Override
+	public @Nullable BuyRegion getBuy(String name) {
+		return buys.get(name.toLowerCase(Locale.ENGLISH));
 	}
 
 	/**
 	 * Get all rental regions.
 	 * @return List of all rental regions
 	 */
-	public List<RentRegion> getRents() {
-		List<RentRegion> result = new ArrayList<>();
-		for(GeneralRegion region : regions.values()) {
-			if(region instanceof RentRegion) {
-				result.add((RentRegion)region);
-			}
-		}
-		return result;
+	@Override
+	public Collection<RentRegion> getRents() {
+		return new ArrayList<>(rents.values());
+	}
+
+	/**
+	 * Get all rental regions.
+	 * @return List of all rental regions
+	 */
+	@Override
+	public Collection<RentRegion> getRentsRef() {
+		return Collections.unmodifiableCollection(rents.values());
 	}
 
 	/**
 	 * Get all buy regions.
 	 * @return List of all buy regions
 	 */
+	@Override
 	public List<BuyRegion> getBuys() {
-		List<BuyRegion> result = new ArrayList<>();
-		for(GeneralRegion region : regions.values()) {
-			if(region instanceof BuyRegion) {
-				result.add((BuyRegion)region);
-			}
-		}
-		return result;
+		return new ArrayList<>(buys.values());
+	}
+
+	@Override
+	public Collection<BuyRegion> getBuysRef() {
+		return Collections.unmodifiableCollection(buys.values());
+	}
+
+
+	/**
+	 * Get all regions.
+	 * @return List of all regions (it is safe to modify the list)
+	 */
+	@Override
+	public List<GeneralRegion> getRegions() {
+		return new ArrayList<>(regions.values());
 	}
 
 	/**
 	 * Get all regions.
 	 * @return List of all regions (it is safe to modify the list)
 	 */
-	public List<GeneralRegion> getRegions() {
-		return new ArrayList<>(regions.values());
+	@Override
+	public Collection<GeneralRegion> getRegionsRef() {
+		return Collections.unmodifiableCollection(regions.values());
 	}
 
 	/**
 	 * Get a list of names of all buy regions.
 	 * @return A String list with all the names
 	 */
+	@Override
 	public List<String> getBuyNames() {
-		ArrayList<String> result = new ArrayList<>();
-		for(BuyRegion region : getBuys()) {
+		ArrayList<String> result = new ArrayList<>(buys.size());
+		for(BuyRegion region : buys.values()) {
 			result.add(region.getName());
 		}
 		return result;
@@ -257,9 +285,10 @@ public class FileManager extends Manager {
 	 * Get a list of names of all rent regions.
 	 * @return A String list with all the names
 	 */
+	@Override
 	public List<String> getRentNames() {
-		ArrayList<String> result = new ArrayList<>();
-		for(RentRegion region : getRents()) {
+		ArrayList<String> result = new ArrayList<>(rents.size());
+		for(RentRegion region : rents.values()) {
 			result.add(region.getName());
 		}
 		return result;
@@ -269,9 +298,10 @@ public class FileManager extends Manager {
 	 * Get a list of names of all regions.
 	 * @return A String list with all the names
 	 */
+	@Override
 	public List<String> getRegionNames() {
-		ArrayList<String> result = new ArrayList<>();
-		for(GeneralRegion region : getRegions()) {
+		ArrayList<String> result = new ArrayList<>(regions.size());
+		for(GeneralRegion region : regions.values()) {
 			result.add(region.getName());
 		}
 		return result;
@@ -281,9 +311,10 @@ public class FileManager extends Manager {
 	 * Get a list of names of all groups.
 	 * @return A String list with all the names
 	 */
+	@Override
 	public List<String> getGroupNames() {
 		ArrayList<String> result = new ArrayList<>();
-		for(RegionGroup group : getGroups()) {
+		for(RegionGroup group : groups.values()) {
 			result.add(group.getName());
 		}
 		return result;
@@ -294,6 +325,7 @@ public class FileManager extends Manager {
 	 * @param region Then region to add
 	 * @return true when successful, otherwise false (denied by an event listener)
 	 */
+	@Override
 	public AddingRegionEvent addRegion(GeneralRegion region) {
 		AddingRegionEvent event = addRegionNoSave(region);
 		if (event.isCancelled()) {
@@ -309,6 +341,7 @@ public class FileManager extends Manager {
 	 * @param region The region to add
 	 * @return true when successful, otherwise false (denied by an event listener)
 	 */
+	@Override
 	public AddingRegionEvent addRegionNoSave(GeneralRegion region) {
 		AddingRegionEvent event = new AddingRegionEvent(region);
 		if(region == null) {
@@ -320,7 +353,13 @@ public class FileManager extends Manager {
 		if (event.isCancelled()) {
 			return event;
 		}
-		regions.put(region.getName().toLowerCase(), region);
+		final String key = region.getName().toLowerCase(Locale.ENGLISH);
+		regions.put(key, region);
+		if (region instanceof BuyRegion buyRegion) {
+			buys.put(key, buyRegion);
+		} else if (region instanceof RentRegion rentRegion) {
+			rents.put(key, rentRegion);
+		}
 		Bukkit.getPluginManager().callEvent(new AddedRegionEvent(region));
 		return event;
 	}
@@ -328,6 +367,7 @@ public class FileManager extends Manager {
 	/**
 	 * Mark all RegionGroups that they should regenerate regions.
 	 */
+	@Override
 	public void markGroupsAutoDirty() {
 		for(RegionGroup group : getGroups()) {
 			group.autoDirty();
@@ -338,6 +378,7 @@ public class FileManager extends Manager {
 	 * Add a RegionGroup.
 	 * @param group The RegionGroup to add
 	 */
+	@Override
 	public void addGroup(RegionGroup group) {
 		groups.put(group.getName().toLowerCase(), group);
 		String lowGroup = group.getName().toLowerCase();
@@ -354,14 +395,18 @@ public class FileManager extends Manager {
 	 * @param type   The type the region should have in AreaShop
 	 * @return The result if a player would want to add this region
 	 */
-	public AddResult checkRegionAdd(CommandSender sender, ProtectedRegion region, World world, RegionType type) {
+	@Override
+	public AddResult checkRegionAdd(CommandSender sender,
+									ProtectedRegion region,
+									World world,
+									RegionType type) {
 		Player player = null;
 		if(sender instanceof Player) {
 			player = (Player)sender;
 		}
 		// Determine if the player is an owner or member of the region
-		boolean isMember = player != null && plugin.getWorldGuardHandler().containsMember(region, player.getUniqueId());
-		boolean isOwner = player != null && plugin.getWorldGuardHandler().containsOwner(region, player.getUniqueId());
+		boolean isMember = player != null && worldGuardInterface.containsMember(region, player.getUniqueId());
+		boolean isOwner = player != null && worldGuardInterface.containsOwner(region, player.getUniqueId());
 		AreaShop.debug("checkRegionAdd: isOwner=" + isOwner + ", isMember=" + isMember);
 		String typeString;
 		if(type == RegionType.RENT) {
@@ -396,6 +441,7 @@ public class FileManager extends Manager {
 	 * @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
 	 */
+	@Override
 	public DeletingRegionEvent deleteRegion(GeneralRegion region, boolean giveMoneyBack) {
 		DeletingRegionEvent event = new DeletingRegionEvent(region);
 		if(region == null) {
@@ -420,7 +466,7 @@ public class FileManager extends Manager {
 
 		// Delete the signs
 		if(region.getWorld() != null) {
-			for(Location sign : region.getSignsFeature().getSignLocations()) {
+			for(BlockPosition sign : region.getSignsFeature().signManager().allSignLocations()) {
 				sign.getBlock().setType(Material.AIR);
 			}
 		}
@@ -432,7 +478,10 @@ public class FileManager extends Manager {
 		}
 
 		region.resetRegionFlags();
-		regions.remove(region.getLowerCaseName());
+		String name = region.getLowerCaseName();
+		regions.remove(name);
+		buys.remove(name);
+		rents.remove(name);
 
 		// Remove file
 		File file = new File(plugin.getDataFolder() + File.separator + AreaShop.regionsFolder + File.separator + region.getLowerCaseName() + ".yml");
@@ -444,7 +493,7 @@ public class FileManager extends Manager {
 				deleted = false;
 			}
 			if(!deleted) {
-				AreaShop.warn("File could not be deleted: " + file.toString());
+				AreaShop.warn("File could not be deleted: " + file);
 			}
 		}
 
@@ -457,6 +506,7 @@ public class FileManager extends Manager {
 	 * Remove a group.
 	 * @param group Group to remove
 	 */
+	@Override
 	public void removeGroup(RegionGroup group) {
 		groups.remove(group.getLowerCaseName());
 		groupsConfig.set(group.getLowerCaseName(), null);
@@ -466,10 +516,11 @@ public class FileManager extends Manager {
 	/**
 	 * Update all signs that need periodic updating.
 	 */
+	@Override
 	public void performPeriodicSignUpdate() {
 		Do.forAll(
 			plugin.getConfig().getInt("signs.regionsPerTick"),
-			getRents(),
+			getRentsRef(),
 			region -> {
 				if(region.needsPeriodicUpdate()) {
 					region.update();
@@ -481,10 +532,11 @@ public class FileManager extends Manager {
 	/**
 	 * Send out rent expire warnings.
 	 */
+	@Override
 	public void sendRentExpireWarnings() {
 		Do.forAll(
 			plugin.getConfig().getInt("expireWarning.regionsPerTick"),
-			getRents(),
+			getRentsRef(),
 			RentRegion::sendExpirationWarnings
 		);
 	}
@@ -494,10 +546,12 @@ public class FileManager extends Manager {
 	 * @param regions              Regions to update
 	 * @param confirmationReceiver The CommandSender that should be notified at completion
 	 */
-	public void updateRegions(final List<GeneralRegion> regions, final CommandSender confirmationReceiver) {
+	@Override
+	public void updateRegions(final Collection<GeneralRegion> regions,
+							  final CommandSender confirmationReceiver) {
 		final int regionsPerTick = plugin.getConfig().getInt("update.regionsPerTick");
 		if(confirmationReceiver != null) {
-			plugin.message(confirmationReceiver, "reload-updateStart", regions.size(), regionsPerTick * 20);
+			messageBridge.message(confirmationReceiver, "reload-updateStart", regions.size(), regionsPerTick * 20);
 		}
 		Do.forAll(
 			regionsPerTick,
@@ -505,7 +559,7 @@ public class FileManager extends Manager {
 			GeneralRegion::update,
 			() -> {
 				if(confirmationReceiver != null) {
-					plugin.message(confirmationReceiver, "reload-updateComplete");
+					messageBridge.message(confirmationReceiver, "reload-updateComplete");
 				}
 			}
 		);
@@ -515,29 +569,33 @@ public class FileManager extends Manager {
 	 * Update a list of regions.
 	 * @param regions The list of regions to update.
 	 */
-	public void updateRegions(List<GeneralRegion> regions) {
+	@Override
+	public void updateRegions(Collection<GeneralRegion> regions) {
 		updateRegions(regions, null);
 	}
 
 	/**
 	 * Update all regions, happens in a task to minimize lag.
 	 */
+	@Override
 	public void updateAllRegions() {
-		updateRegions(getRegions(), null);
+		updateRegions(getRegionsRef(), null);
 	}
 
 	/**
 	 * Update all regions.
 	 * @param confirmationReceiver Optional CommandSender that should receive progress messages
 	 */
+	@Override
 	public void updateAllRegions(CommandSender confirmationReceiver) {
-		updateRegions(getRegions(), confirmationReceiver);
+		updateRegions(getRegionsRef(), confirmationReceiver);
 	}
 
 
 	/**
 	 * Save the group file to disk.
 	 */
+	@Override
 	public void saveGroupsIsRequired() {
 		saveGroupsRequired = true;
 	}
@@ -546,6 +604,7 @@ public class FileManager extends Manager {
 	 * Check if saving the groups file is required.
 	 * @return true if changes are made and saving is required, otherwise false
 	 */
+	@Override
 	public boolean isSaveGroupsRequired() {
 		return saveGroupsRequired;
 	}
@@ -553,6 +612,7 @@ public class FileManager extends Manager {
 	/**
 	 * Save the groups file to disk synchronously.
 	 */
+	@Override
 	public void saveGroupsNow() {
 		AreaShop.debug("saveGroupsNow() done");
 		saveGroupsRequired = false;
@@ -567,6 +627,7 @@ public class FileManager extends Manager {
 	/**
 	 * Save all region related files spread over time (low load).
 	 */
+	@Override
 	public void saveRequiredFiles() {
 		if(isSaveGroupsRequired()) {
 			saveGroupsNow();
@@ -575,7 +636,7 @@ public class FileManager extends Manager {
 
 		Do.forAll(
 			plugin.getConfig().getInt("saving.regionsPerTick"),
-			getRegions(),
+			getRegionsRef(),
 			region -> {
 				if(region.isSaveRequired()) {
 					region.saveNow();
@@ -587,11 +648,12 @@ public class FileManager extends Manager {
 	/**
 	 * Save all region related files directly (only for cases like onDisable()).
 	 */
+	@Override
 	public void saveRequiredFilesAtOnce() {
 		if(isSaveGroupsRequired()) {
 			saveGroupsNow();
 		}
-		for(GeneralRegion region : getRegions()) {
+		for(GeneralRegion region : getRegionsRef()) {
 			if(region.isSaveRequired()) {
 				region.saveNow();
 			}
@@ -603,6 +665,7 @@ public class FileManager extends Manager {
 	 * Indicates that a/multiple WorldGuard regions need to be saved.
 	 * @param worldName The world where the regions that should be saved is in
 	 */
+	@Override
 	public void saveIsRequiredForRegionWorld(String worldName) {
 		worldRegionsRequireSaving.add(worldName);
 	}
@@ -610,6 +673,7 @@ public class FileManager extends Manager {
 	/**
 	 * Save all worldGuard regions that need saving.
 	 */
+	@Override
 	public void saveWorldGuardRegions() {
 		for(String world : worldRegionsRequireSaving) {
 			World bukkitWorld = Bukkit.getWorld(world);
@@ -617,11 +681,7 @@ public class FileManager extends Manager {
 				RegionManager manager = plugin.getRegionManager(bukkitWorld);
 				if(manager != null) {
 					try {
-						if(plugin.getWorldGuard().getDescription().getVersion().startsWith("5.")) {
-							manager.save();
-						} else {
-							manager.saveChanges();
-						}
+						manager.saveChanges();
 					} catch(Exception e) {
 						AreaShop.warn("WorldGuard regions in world " + world + " could not be saved");
 					}
@@ -634,6 +694,7 @@ public class FileManager extends Manager {
 	 * Get the folder the region files are located in.
 	 * @return The folder where the region.yml files are in
 	 */
+	@Override
 	public String getRegionFolder() {
 		return regionsPath;
 	}
@@ -643,6 +704,7 @@ public class FileManager extends Manager {
 	 * @param region The region name to check
 	 * @return true if the region may not be added, otherwise false
 	 */
+	@Override
 	public boolean isBlacklisted(String region) {
 		for(String line : plugin.getConfig().getStringList("blacklist")) {
 			Pattern pattern = Pattern.compile(line, Pattern.CASE_INSENSITIVE);
@@ -657,10 +719,11 @@ public class FileManager extends Manager {
 	/**
 	 * Unrent regions that have no time left, regions to check per tick is in the config.
 	 */
+	@Override
 	public void checkRents() {
 		Do.forAll(
 			plugin.getConfig().getInt("expiration.regionsPerTick"),
-			getRents(),
+			getRentsRef(),
 			RentRegion::checkExpiration
 		);
 	}
@@ -668,10 +731,11 @@ public class FileManager extends Manager {
 	/**
 	 * Check all regions and unrent/sell them if the player is inactive for too long.
 	 */
+	@Override
 	public void checkForInactiveRegions() {
 		Do.forAll(
 			plugin.getConfig().getInt("inactive.regionsPerTick"),
-			getRegions(),
+			getRegionsRef(),
 			GeneralRegion::checkInactive
 		);
 	}
@@ -680,6 +744,7 @@ public class FileManager extends Manager {
 	/**
 	 * Load the file with the versions, used to check if the other files need conversion.
 	 */
+	@Override
 	@SuppressWarnings("unchecked")
 	public void loadVersions() {
 		File file = new File(versionPath);
@@ -702,6 +767,7 @@ public class FileManager extends Manager {
 	/**
 	 * Save the versions file to disk.
 	 */
+	@Override
 	public void saveVersions() {
 		if(!(new File(versionPath).exists())) {
 			AreaShop.debug("versions file created, this should happen only after installing or upgrading the plugin");
@@ -718,6 +784,7 @@ public class FileManager extends Manager {
 	 * @param thisTick Load files in the current tick or a tick later
 	 * @return true if the files are loaded correctly, otherwise false
 	 */
+	@Override
 	public boolean loadFiles(boolean thisTick) {
 		// Load config.yml + add defaults from .jar
 		boolean result = loadConfigFile();
@@ -749,14 +816,15 @@ public class FileManager extends Manager {
 	 * Load the default.yml file
 	 * @return true if it has been loaded successfully, otherwise false
 	 */
+	@Override
 	public boolean loadDefaultFile() {
 		boolean result = true;
 		File defaultFile = new File(defaultPath);
 		// Safe the file from the jar to disk if it does not exist
 		if(!defaultFile.exists()) {
 			try(
-					InputStream input = plugin.getResource(AreaShop.defaultFile);
-					OutputStream output = new FileOutputStream(defaultFile)
+                    InputStream input = plugin.getResource(AreaShop.defaultFile);
+                    OutputStream output = new FileOutputStream(defaultFile)
 			) {
 				int read;
 				byte[] bytes = new byte[1024];
@@ -770,8 +838,8 @@ public class FileManager extends Manager {
 		}
 		// Load default.yml from the plugin folder, and as backup the default one
 		try(
-				InputStreamReader custom = new InputStreamReader(new FileInputStream(defaultFile), Charsets.UTF_8);
-				InputStreamReader normal = new InputStreamReader(plugin.getResource(AreaShop.defaultFile), Charsets.UTF_8)
+				InputStreamReader custom = new InputStreamReader(new FileInputStream(defaultFile), StandardCharsets.UTF_8);
+				InputStreamReader normal = new InputStreamReader(plugin.getResource(AreaShop.defaultFile), StandardCharsets.UTF_8)
 		) {
 			defaultConfig = YamlConfiguration.loadConfiguration(custom);
 			if(defaultConfig.getKeys(false).isEmpty()) {
@@ -789,14 +857,15 @@ public class FileManager extends Manager {
 	 * Load the default.yml file
 	 * @return true if it has been loaded successfully, otherwise false
 	 */
+	@Override
 	public boolean loadConfigFile() {
 		boolean result = true;
 		File configFile = new File(configPath);
 		// Safe the file from the jar to disk if it does not exist
 		if(!configFile.exists()) {
 			try(
-					InputStream input = plugin.getResource(AreaShop.configFile);
-					OutputStream output = new FileOutputStream(configFile)
+                    InputStream input = plugin.getResource(AreaShop.configFile);
+                    OutputStream output = new FileOutputStream(configFile)
 			) {
 				int read;
 				byte[] bytes = new byte[1024];
@@ -810,9 +879,9 @@ public class FileManager extends Manager {
 		}
 		// Load config.yml from the plugin folder
 		try(
-				InputStreamReader custom = new InputStreamReader(new FileInputStream(configFile), Charsets.UTF_8);
-				InputStreamReader normal = new InputStreamReader(plugin.getResource(AreaShop.configFile), Charsets.UTF_8);
-				InputStreamReader hidden = new InputStreamReader(plugin.getResource(AreaShop.configFileHidden), Charsets.UTF_8)
+                InputStreamReader custom = new InputStreamReader(new FileInputStream(configFile), StandardCharsets.UTF_8);
+                InputStreamReader normal = new InputStreamReader(plugin.getResource(AreaShop.configFile), StandardCharsets.UTF_8);
+                InputStreamReader hidden = new InputStreamReader(plugin.getResource(AreaShop.configFileHidden), StandardCharsets.UTF_8)
 		) {
 			config = YamlConfiguration.loadConfiguration(custom);
 			if(config.getKeys(false).isEmpty()) {
@@ -843,12 +912,13 @@ public class FileManager extends Manager {
 	 * Load the groups.yml file from disk
 	 * @return true if succeeded, otherwise false
 	 */
+	@Override
 	public boolean loadGroupsFile() {
 		boolean result = true;
 		File groupFile = new File(groupsPath);
 		if(groupFile.exists() && groupFile.isFile()) {
 			try(
-					InputStreamReader reader = new InputStreamReader(new FileInputStream(groupFile), Charsets.UTF_8)
+					InputStreamReader reader = new InputStreamReader(new FileInputStream(groupFile), StandardCharsets.UTF_8)
 			) {
 				groupsConfig = YamlConfiguration.loadConfiguration(reader);
 			} catch(IOException e) {
@@ -859,7 +929,7 @@ public class FileManager extends Manager {
 			groupsConfig = new YamlConfiguration();
 		}
 		for(String groupName : groupsConfig.getKeys(false)) {
-			RegionGroup group = new RegionGroup(plugin, groupName);
+			RegionGroup group = regionFactory.createRegionGroup(groupName);
 			groups.put(groupName, group);
 		}
 		return result;
@@ -868,6 +938,7 @@ public class FileManager extends Manager {
 	/**
 	 * Load all region files.
 	 */
+	@Override
 	public void loadRegionFiles() {
 		regions.clear();
 		final File file = new File(regionsPath);
@@ -893,7 +964,7 @@ public class FileManager extends Manager {
 		List<String> noRegionType = new ArrayList<>();
 		List<String> noNamePaths = new ArrayList<>();
 		List<GeneralRegion> noWorld = new ArrayList<>();
-		List<GeneralRegion> noRegion = new ArrayList<>();
+		Map<GeneralRegion, File> noRegion = new HashMap<>();
 		List<GeneralRegion> incorrectDuration = new ArrayList<>();
 		for(File regionFile : regionFiles) {
 			if(regionFile.exists() && regionFile.isFile() && !regionFile.isHidden()) {
@@ -901,11 +972,13 @@ public class FileManager extends Manager {
 				// Load the region file from disk in UTF8 mode
 				YamlConfiguration regionConfig;
 				try(
-						InputStreamReader reader = new InputStreamReader(new FileInputStream(regionFile), Charsets.UTF_8)
+						InputStreamReader reader = new InputStreamReader(new FileInputStream(regionFile), StandardCharsets.UTF_8)
 				) {
 					regionConfig = YamlConfiguration.loadConfiguration(reader);
 					if(regionConfig.getKeys(false).isEmpty()) {
 						AreaShop.warn("Region file '" + regionFile.getName() + "' is empty, check for errors in the log.");
+						regionFile.delete();
+						continue;
 					}
 				} catch(IOException e) {
 					AreaShop.warn("Something went wrong reading region file: " + regionFile.getAbsolutePath());
@@ -916,9 +989,9 @@ public class FileManager extends Manager {
 				String type = regionConfig.getString("general.type");
 				GeneralRegion region;
 				if(RegionType.RENT.getValue().equals(type)) {
-					region = new RentRegion(regionConfig);
+					region = regionFactory.createRentRegion(regionConfig);
 				} else if(RegionType.BUY.getValue().equals(type)) {
-					region = new BuyRegion(regionConfig);
+					region = regionFactory.createBuyRegion(regionConfig);
 				} else {
 					noRegionType.add(regionFile.getPath());
 					continue;
@@ -931,7 +1004,7 @@ public class FileManager extends Manager {
 				} else if(region.getWorld() == null) {
 					noWorld.add(region);
 				} else if(region.getRegion() == null) {
-					noRegion.add(region);
+					noRegion.put(region, regionFile);
 				} else if(region instanceof RentRegion && !Utils.checkTimeFormat(((RentRegion)region).getDurationString())) {
 					incorrectDuration.add(region);
 				} else {
@@ -955,11 +1028,11 @@ public class FileManager extends Manager {
 
 		if(!noRegion.isEmpty()) {
 			List<String> noRegionNames = new ArrayList<>();
-			for(GeneralRegion region : noRegion) {
-				noRegionNames.add(region.getName());
+			for(Map.Entry<GeneralRegion, File> regionMap : noRegion.entrySet()) {
+				noRegionNames.add(regionMap.getKey().getName());
+				regionMap.getValue().delete();
 			}
-			AreaShop.warn("AreaShop regions that are missing their WorldGuard region: " + Utils.createCommaSeparatedList(noRegionNames));
-			AreaShop.warn("Remove these regions from AreaShop with '/as del' or recreate their regions in WorldGuard.");
+			AreaShop.warn("AreaShop regions that are missing their WorldGuard region are now being deleted: " + Utils.createCommaSeparatedList(noRegionNames));
 		}
 
 		boolean noWorldRegions = !noWorld.isEmpty();
@@ -1293,13 +1366,13 @@ public class FileManager extends Manager {
 
 		// Add 'general.lastActive' to rented/bought regions (initialize at current time)
 		if(fileStatus == null || fileStatus < 3) {
-			for(GeneralRegion region : getRegions()) {
+			for(GeneralRegion region : getRegionsRef()) {
 				region.updateLastActiveTime();
 			}
 			// Update versions file to 3
 			versions.put(AreaShop.versionFiles, 3);
 			saveVersions();
-			if(!getRegions().isEmpty()) {
+			if(!getRegionsRef().isEmpty()) {
 				AreaShop.info("  Added last active time to regions (v2 to v3)");
 			}
 		}
@@ -1310,6 +1383,7 @@ public class FileManager extends Manager {
 	 * @param groupName Name of the group to get the settings from
 	 * @return The settings of the group
 	 */
+	@Override
 	public ConfigurationSection getGroupSettings(String groupName) {
 		return groupsConfig.getConfigurationSection(groupName.toLowerCase());
 	}
@@ -1320,6 +1394,7 @@ public class FileManager extends Manager {
 	 * @param path    The path to set
 	 * @param setting The value to set
 	 */
+	@Override
 	public void setGroupSetting(RegionGroup group, String path, Object setting) {
 		groupsConfig.set(group.getName().toLowerCase() + "." + path, setting);
 	}

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

@@ -0,0 +1,399 @@
+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 (readonly)
+     *
+     * @return Unmodifiable collection of all rental regions
+     */
+    Collection<RentRegion> getRentsRef();
+
+    /**
+     * Get all buy regions.
+     *
+     * @return List of all buy regions
+     */
+    List<BuyRegion> getBuys();
+
+    /**
+     * Get all buy regions (readonly)
+     * @return Unmodifiable collection of all buy regions
+     */
+    Collection<BuyRegion> getBuysRef();
+
+    /**
+     * Get all regions.
+     *
+     * @return List of all regions (it is safe to modify the list)
+     */
+    List<GeneralRegion> getRegions();
+
+    /**
+     * Get all regions (readonly)
+     *
+     * @return Unmodifiable collection of all regions
+     */
+    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

@@ -1,11 +1,7 @@
 package me.wiefferink.areashop.managers;
 
-import me.wiefferink.areashop.AreaShop;
-
 public abstract class Manager {
 
-	final AreaShop plugin = AreaShop.getInstance();
-
 	/**
 	 * Called at shutdown of the plugin.
 	 */

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,12 @@
 package me.wiefferink.areashop.managers;
 
+import me.wiefferink.areashop.AreaShop;
+import me.wiefferink.areashop.MessageBridge;
 import me.wiefferink.areashop.features.signs.RegionSign;
-import me.wiefferink.areashop.features.signs.SignsFeature;
+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;
@@ -20,18 +23,29 @@ import org.bukkit.event.player.PlayerInteractEvent;
 import org.bukkit.event.player.PlayerQuitEvent;
 import org.bukkit.util.BlockIterator;
 
+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;
 
+@Singleton
 public class SignLinkerManager extends Manager implements Listener {
 	private final Map<UUID, SignLinker> signLinkers;
 	private boolean eventsRegistered;
 
-	public SignLinkerManager() {
+	@Inject
+	private AreaShop plugin;
+	@Inject
+	private SignManager signManager;
+	@Inject
+	private MessageBridge messageBridge;
+
+	SignLinkerManager() {
 		signLinkers = new HashMap<>();
 		eventsRegistered = false;
 	}
@@ -50,8 +64,8 @@ public class SignLinkerManager extends Manager implements Listener {
 	 */
 	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);
@@ -68,7 +82,7 @@ public class SignLinkerManager extends Manager implements Listener {
 			eventsRegistered = false;
 			HandlerList.unregisterAll(this);
 		}
-		plugin.message(player, "linksigns-stopped");
+		messageBridge.message(player, "linksigns-stopped");
 	}
 
 	/**
@@ -104,13 +118,13 @@ public class SignLinkerManager extends Manager 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);
@@ -121,16 +135,17 @@ public class SignLinkerManager extends Manager implements Listener {
 					}
 				}
 				if(block == null || !Materials.isSign(block.getType())) {
-					plugin.message(player, "linksigns-noSign");
+					messageBridge.message(player, "linksigns-noSign");
 					return;
 				}
 
-				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;
 				}
-				linker.setSign(block.getLocation(), block.getType(), plugin.getBukkitHandler().getSignFacing(block));
+				linker.setSign(block.getLocation(), block.getType(), SignUtils.getSignFacing(block));
 			}
 		}
 	}
@@ -169,7 +184,7 @@ public class SignLinkerManager extends Manager implements Listener {
 			this.region = region;
 			hasRegion = true;
 			if(!isComplete()) {
-				plugin.message(linker, "linksigns-regionFound", region);
+				messageBridge.message(linker, "linksigns-regionFound", region);
 			}
 			finish();
 		}
@@ -180,7 +195,7 @@ public class SignLinkerManager extends Manager implements Listener {
 			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();
 		}
@@ -189,14 +204,14 @@ public class SignLinkerManager extends Manager 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");
 			}
 		}
 

AreaShop/src/main/java/me/wiefferink/areashop/modules/AreaShopModule.java

@@ -0,0 +1,74 @@
+package me.wiefferink.areashop.modules;
+
+import com.google.inject.AbstractModule;
+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.features.FeatureFactory;
+import me.wiefferink.areashop.features.signs.SignsModule;
+import me.wiefferink.areashop.interfaces.WorldEditInterface;
+import me.wiefferink.areashop.interfaces.WorldGuardInterface;
+import me.wiefferink.areashop.managers.CommandManager;
+import me.wiefferink.areashop.managers.FeatureManager;
+import me.wiefferink.areashop.managers.FileManager;
+import me.wiefferink.areashop.managers.IFileManager;
+import me.wiefferink.areashop.managers.SignErrorLogger;
+import me.wiefferink.areashop.managers.SignLinkerManager;
+import me.wiefferink.areashop.nms.NMS;
+import me.wiefferink.areashop.regions.ImportJobFactory;
+import me.wiefferink.areashop.regions.RegionModule;
+import me.wiefferink.areashop.tools.Utils;
+import org.bukkit.plugin.Plugin;
+
+import javax.annotation.Nonnull;
+import java.util.Arrays;
+
+public class AreaShopModule extends AbstractModule {
+
+    private final AreaShop instance;
+    private final WorldGuardInterface worldGuardInterface;
+    private final WorldEditInterface worldEditInterface;
+    private final NMS nms;
+    private final MessageBridge messageBridge;
+    private final SignErrorLogger signErrorLogger;
+    private final AbstractModule[] extras;
+
+    public AreaShopModule(@Nonnull AreaShop instance,
+                          @Nonnull MessageBridge messageBridge,
+                          @Nonnull NMS nms,
+                          @Nonnull WorldEditInterface worldEditInterface,
+                          @Nonnull WorldGuardInterface worldGuardInterface,
+                          @Nonnull SignErrorLogger signErrorLogger,
+                          @Nonnull AbstractModule... extras
+    ) {
+        this.instance = instance;
+        this.messageBridge = messageBridge;
+        this.nms = nms;
+        this.signErrorLogger = signErrorLogger;
+        this.worldEditInterface = worldEditInterface;
+        this.worldGuardInterface = worldGuardInterface;
+        this.extras = extras;
+    }
+
+    @Override
+    protected void configure() {
+        Arrays.stream(this.extras).forEach(this::install);
+        bind(Plugin.class).toInstance(this.instance);
+        bind(AreaShop.class).toInstance(this.instance);
+        bind(MessageBridge.class).toInstance(this.messageBridge);
+        bind(WorldGuardInterface.class).toInstance(this.worldGuardInterface);
+        bind(WorldEditInterface.class).toInstance(this.worldEditInterface);
+        bind(SignErrorLogger.class).toInstance(this.signErrorLogger);
+        // Setup managers
+        bind(IFileManager.class).to(FileManager.class).asEagerSingleton();
+        bind(FeatureManager.class).in(Singleton.class);
+        bind(CommandManager.class).in(Singleton.class);
+        bind(SignLinkerManager.class).in(Singleton.class);
+        install(new SignsModule());
+        install(new RegionModule());
+        install(new FactoryModuleBuilder().build(FeatureFactory.class));
+        install(new FactoryModuleBuilder().build(ImportJobFactory.class));
+        requestStaticInjection(Utils.class);
+    }
+}

AreaShop/src/main/java/me/wiefferink/areashop/modules/BukkitModule.java

@@ -0,0 +1,34 @@
+package me.wiefferink.areashop.modules;
+
+import com.google.inject.AbstractModule;
+import org.bukkit.Server;
+import org.bukkit.command.ConsoleCommandSender;
+import org.bukkit.inventory.ItemFactory;
+import org.bukkit.plugin.PluginManager;
+import org.bukkit.plugin.ServicesManager;
+import org.bukkit.scheduler.BukkitScheduler;
+import org.bukkit.scoreboard.ScoreboardManager;
+
+import javax.annotation.Nonnull;
+
+public class BukkitModule extends AbstractModule {
+
+    private final Server server;
+
+    public BukkitModule(@Nonnull Server server) {
+        this.server = server;
+    }
+
+    @Override
+    protected void configure() {
+        bind(Server.class).toInstance(this.server);
+        bind(PluginManager.class).toInstance(this.server.getPluginManager());
+        bind(BukkitScheduler.class).toInstance(this.server.getScheduler());
+        bind(PluginManager.class).toInstance(this.server.getPluginManager());
+        bind(ServicesManager.class).toInstance(this.server.getServicesManager());
+        bind(ItemFactory.class).toInstance(this.server.getItemFactory());
+        bind(ConsoleCommandSender.class).toInstance(this.server.getConsoleSender());
+        bind(ScoreboardManager.class).toInstance(this.server.getScoreboardManager());
+    }
+
+}

AreaShop/src/main/java/me/wiefferink/areashop/modules/DependencyModule.java

@@ -0,0 +1,37 @@
+package me.wiefferink.areashop.modules;
+
+import com.google.inject.AbstractModule;
+import com.sk89q.worldedit.bukkit.WorldEditPlugin;
+import com.sk89q.worldguard.bukkit.WorldGuardPlugin;
+import net.milkbowl.vault.economy.Economy;
+import net.milkbowl.vault.permission.Permission;
+
+import javax.annotation.Nonnull;
+import javax.annotation.Nullable;
+
+public class DependencyModule extends AbstractModule {
+
+    private final WorldEditPlugin worldEditPlugin;
+    private final WorldGuardPlugin worldGuardPlugin;
+    private final Economy economy;
+    private final Permission permission;
+
+   public DependencyModule(@Nonnull WorldEditPlugin worldEditPlugin,
+                           @Nonnull WorldGuardPlugin worldGuardPlugin,
+                           @Nullable Economy economy,
+                           @Nullable Permission permission
+   ) {
+       this.worldEditPlugin = worldEditPlugin;
+       this.worldGuardPlugin = worldGuardPlugin;
+       this.economy = economy;
+       this.permission = permission;
+   }
+
+    @Override
+    protected void configure() {
+        bind(WorldEditPlugin.class).toInstance(this.worldEditPlugin);
+        bind(WorldGuardPlugin.class).toInstance(this.worldGuardPlugin);
+        bind(Economy.class).toInstance(this.economy);
+        bind(Permission.class).toInstance(this.permission);
+    }
+}

AreaShop/src/main/java/me/wiefferink/areashop/modules/PlatformModule.java

@@ -0,0 +1,29 @@
+package me.wiefferink.areashop.modules;
+
+import com.google.inject.AbstractModule;
+import me.wiefferink.areashop.adapters.platform.MinecraftPlatform;
+import me.wiefferink.areashop.adapters.platform.OfflinePlayerHelper;
+import me.wiefferink.areashop.nms.BlockBehaviourHelper;
+import me.wiefferink.areashop.nms.NMS;
+import me.wiefferink.areashop.tools.BukkitSchedulerExecutor;
+import org.jetbrains.annotations.NotNull;
+
+public class PlatformModule extends AbstractModule {
+
+    private final MinecraftPlatform minecraftPlatform;
+    private final NMS nms;
+
+    public PlatformModule(@NotNull MinecraftPlatform platform,
+                          @NotNull NMS nms) {
+        this.minecraftPlatform = platform;
+        this.nms = nms;
+    }
+    @Override
+    protected void configure() {
+        bind(MinecraftPlatform.class).toInstance(this.minecraftPlatform);
+        bind(OfflinePlayerHelper.class).toInstance(this.minecraftPlatform.offlinePlayerHelper());
+        bind(NMS.class).toInstance(this.nms);
+        bind(BlockBehaviourHelper.class).toInstance(this.nms.blockBehaviourHelper());
+        bind(BukkitSchedulerExecutor.class).asEagerSingleton();
+    }
+}

AreaShop/src/main/java/me/wiefferink/areashop/regions/BuyRegion.java

@@ -1,5 +1,7 @@
 package me.wiefferink.areashop.regions;
 
+import com.google.inject.assistedinject.Assisted;
+import com.google.inject.assistedinject.AssistedInject;
 import me.wiefferink.areashop.AreaShop;
 import me.wiefferink.areashop.events.ask.BuyingRegionEvent;
 import me.wiefferink.areashop.events.ask.ResellingRegionEvent;
@@ -7,7 +9,11 @@ import me.wiefferink.areashop.events.ask.SellingRegionEvent;
 import me.wiefferink.areashop.events.notify.BoughtRegionEvent;
 import me.wiefferink.areashop.events.notify.ResoldRegionEvent;
 import me.wiefferink.areashop.events.notify.SoldRegionEvent;
+import me.wiefferink.areashop.interfaces.WorldEditInterface;
+import me.wiefferink.areashop.interfaces.WorldGuardInterface;
+import me.wiefferink.areashop.managers.FeatureManager;
 import me.wiefferink.areashop.tools.Utils;
+import net.milkbowl.vault.economy.Economy;
 import net.milkbowl.vault.economy.EconomyResponse;
 import org.bukkit.Bukkit;
 import org.bukkit.OfflinePlayer;
@@ -16,17 +22,55 @@ import org.bukkit.command.CommandSender;
 import org.bukkit.configuration.file.YamlConfiguration;
 import org.bukkit.entity.Player;
 
+import javax.annotation.Nonnull;
+import javax.annotation.Nullable;
 import java.util.Calendar;
 import java.util.UUID;
 
 public class BuyRegion extends GeneralRegion {
 
-	public BuyRegion(YamlConfiguration config) {
-		super(config);
+	private final Economy economy;
+	
+	@AssistedInject
+	BuyRegion(
+			@Nonnull AreaShop plugin,
+			@Nonnull FeatureManager featureManager,
+			@Nonnull WorldEditInterface worldEditInterface,
+			@Nonnull WorldGuardInterface worldGuardInterface,
+			@Nullable Economy economy,
+			@Assisted @Nonnull YamlConfiguration config
+	) {
+		super(plugin, featureManager, worldEditInterface, worldGuardInterface, config);
+		this.economy = economy;
 	}
 
-	public BuyRegion(String name, World world) {
-		super(name, world);
+	@AssistedInject
+	BuyRegion(
+			@Nonnull AreaShop plugin,
+			@Nonnull FeatureManager featureManager,
+			@Nonnull WorldEditInterface worldEditInterface,
+			@Nonnull WorldGuardInterface worldGuardInterface,
+			@Nullable Economy economy,
+			@Assisted @Nonnull String name,
+			@Assisted @Nonnull World world
+	) {
+		super(plugin, featureManager, worldEditInterface, worldGuardInterface, name, world);
+		this.economy = economy;
+	}
+
+	@Override
+	public boolean isOwner(UUID player) {
+		return isBuyer(player);
+	}
+
+	@Override
+	public UUID getOwner() {
+		return getBuyer();
+	}
+
+	@Override
+	public void setOwner(UUID player) {
+		setBuyer(player);
 	}
 
 	@Override
@@ -208,31 +252,20 @@ public class BuyRegion extends GeneralRegion {
 
 	@Override
 	public Object provideReplacement(String variable) {
-		switch(variable) {
-			case AreaShop.tagPrice:
-				return getFormattedPrice();
-			case AreaShop.tagRawPrice:
-				return getPrice();
-			case AreaShop.tagPlayerName:
-				return getPlayerName();
-			case AreaShop.tagPlayerUUID:
-				return getBuyer();
-			case AreaShop.tagResellPrice:
-				return getFormattedResellPrice();
-			case AreaShop.tagRawResellPrice:
-				return getResellPrice();
-			case AreaShop.tagMoneyBackAmount:
-				return getFormattedMoneyBackAmount();
-			case AreaShop.tagRawMoneyBackAmount:
-				return getMoneyBackAmount();
-			case AreaShop.tagMoneyBackPercentage:
-				return getMoneyBackPercentage() % 1.0 == 0.0 ? (int)getMoneyBackPercentage() : getMoneyBackPercentage();
-			case AreaShop.tagMaxInactiveTime:
-				return this.getFormattedInactiveTimeUntilSell();
-
-			default:
-				return super.provideReplacement(variable);
-		}
+        return switch (variable) {
+            case AreaShop.tagPrice -> getFormattedPrice();
+            case AreaShop.tagRawPrice -> getPrice();
+            case AreaShop.tagPlayerName -> getPlayerName();
+            case AreaShop.tagPlayerUUID -> getBuyer();
+            case AreaShop.tagResellPrice -> getFormattedResellPrice();
+            case AreaShop.tagRawResellPrice -> getResellPrice();
+            case AreaShop.tagMoneyBackAmount -> getFormattedMoneyBackAmount();
+            case AreaShop.tagRawMoneyBackAmount -> getMoneyBackAmount();
+            case AreaShop.tagMoneyBackPercentage ->
+                    getMoneyBackPercentage() % 1.0 == 0.0 ? (int) getMoneyBackPercentage() : getMoneyBackPercentage();
+            case AreaShop.tagMaxInactiveTime -> this.getFormattedInactiveTimeUntilSell();
+            default -> super.provideReplacement(variable);
+        };
 	}
 
 	/**
@@ -264,7 +297,7 @@ public class BuyRegion extends GeneralRegion {
 			return false;
 		}
 
-		if(plugin.getEconomy() == null) {
+		if(economy == null) {
 			message(offlinePlayer, "general-noEconomy");
 			return false;
 		}
@@ -335,12 +368,12 @@ public class BuyRegion extends GeneralRegion {
 		}
 
 		// Check if the player has enough money
-		if (isResell && !plugin.getEconomy().has(offlinePlayer, getWorldName(), getResellPrice())) {
-			message(offlinePlayer, "buy-lowMoneyResell", Utils.formatCurrency(plugin.getEconomy().getBalance(offlinePlayer, getWorldName())));
+		if (isResell && !economy.has(offlinePlayer, getWorldName(), getResellPrice())) {
+			message(offlinePlayer, "buy-lowMoneyResell", Utils.formatCurrency(economy.getBalance(offlinePlayer, getWorldName())));
 			return false;
 		}
-		if (!isResell && !plugin.getEconomy().has(offlinePlayer, getWorldName(), getPrice())) {
-			message(offlinePlayer, "buy-lowMoney", Utils.formatCurrency(plugin.getEconomy().getBalance(offlinePlayer, getWorldName())));
+		if (!isResell && !economy.has(offlinePlayer, getWorldName(), getPrice())) {
+			message(offlinePlayer, "buy-lowMoney", Utils.formatCurrency(economy.getBalance(offlinePlayer, getWorldName())));
 			return false;
 		}
 
@@ -357,7 +390,7 @@ public class BuyRegion extends GeneralRegion {
 			getFriendsFeature().clearFriends();
 			double resellPrice = getResellPrice();
 			// Transfer the money to the previous owner
-			EconomyResponse r = plugin.getEconomy().withdrawPlayer(offlinePlayer, getWorldName(), getResellPrice());
+			EconomyResponse r = economy.withdrawPlayer(offlinePlayer, getWorldName(), getResellPrice());
 			if(!r.transactionSuccess()) {
 				message(offlinePlayer, "buy-payError");
 				AreaShop.debug("Something went wrong with getting money from " + offlinePlayer.getName() + " while buying " + getName() + ": " + r.errorMessage);
@@ -367,10 +400,10 @@ public class BuyRegion extends GeneralRegion {
 			OfflinePlayer oldOwnerPlayer = Bukkit.getOfflinePlayer(oldOwner);
 			String oldOwnerName = getPlayerName();
 			if(oldOwnerPlayer != null && oldOwnerPlayer.getName() != null) {
-				r = plugin.getEconomy().depositPlayer(oldOwnerPlayer, getWorldName(), getResellPrice());
+				r = economy.depositPlayer(oldOwnerPlayer, getWorldName(), getResellPrice());
 				oldOwnerName = oldOwnerPlayer.getName();
 			} else if(oldOwnerName != null) {
-				r = plugin.getEconomy().depositPlayer(oldOwnerName, getWorldName(), getResellPrice());
+				r = economy.depositPlayer(oldOwnerName, getWorldName(), getResellPrice());
 			}
 			if(r == null || !r.transactionSuccess()) {
 				AreaShop.warn("Something went wrong with paying '" + oldOwnerName + "' " + getFormattedPrice() + " for his resell of region " + getName() + " to " + offlinePlayer.getName());
@@ -404,7 +437,7 @@ public class BuyRegion extends GeneralRegion {
 			}
 
 			// Substract the money from the players balance
-			EconomyResponse r = plugin.getEconomy().withdrawPlayer(offlinePlayer, getWorldName(), getPrice());
+			EconomyResponse r = economy.withdrawPlayer(offlinePlayer, getWorldName(), getPrice());
 			if(!r.transactionSuccess()) {
 				message(offlinePlayer, "buy-payError");
 				return false;
@@ -417,9 +450,9 @@ public class BuyRegion extends GeneralRegion {
 			String landlordName = getLandlordName();
 			if(landlordName != null) {
 				if(landlordPlayer != null && landlordPlayer.getName() != null) {
-					r = plugin.getEconomy().depositPlayer(landlordPlayer, getWorldName(), getPrice());
+					r = economy.depositPlayer(landlordPlayer, getWorldName(), getPrice());
 				} else {
-					r = plugin.getEconomy().depositPlayer(landlordName, getWorldName(), getPrice());
+					r = economy.depositPlayer(landlordName, getWorldName(), getPrice());
 				}
 				if(r != null && !r.transactionSuccess()) {
 					AreaShop.warn("Something went wrong with paying '" + landlordName + "' " + getFormattedPrice() + " for his sell of region " + getName() + " to " + offlinePlayer.getName());
@@ -450,7 +483,7 @@ public class BuyRegion extends GeneralRegion {
 	 */
 	@SuppressWarnings("deprecation")
 	public boolean sell(boolean giveMoneyBack, CommandSender executor) {
-		boolean own = executor instanceof Player && this.isBuyer((Player)executor);
+		boolean own = executor instanceof Player player && this.isBuyer(player);
 		if(executor != null) {
 			if(!executor.hasPermission("areashop.sell") && !own) {
 				message(executor, "sell-noPermissionOther");
@@ -469,7 +502,7 @@ public class BuyRegion extends GeneralRegion {
 			}
 		}
 
-		if(plugin.getEconomy() == null) {
+		if(economy == null) {
 			return false;
 		}
 
@@ -494,9 +527,9 @@ public class BuyRegion extends GeneralRegion {
 			EconomyResponse r;
 			if(landlordName != null) {
 				if(landlordPlayer != null && landlordPlayer.getName() != null) {
-					r = plugin.getEconomy().withdrawPlayer(landlordPlayer, getWorldName(), moneyBack);
+					r = economy.withdrawPlayer(landlordPlayer, getWorldName(), moneyBack);
 				} else {
-					r = plugin.getEconomy().withdrawPlayer(landlordName, getWorldName(), moneyBack);
+					r = economy.withdrawPlayer(landlordName, getWorldName(), moneyBack);
 				}
 				if(r == null || !r.transactionSuccess()) {
 					noPayBack = true;
@@ -505,14 +538,14 @@ public class BuyRegion extends GeneralRegion {
 
 			// Give back the money
 			OfflinePlayer player = Bukkit.getOfflinePlayer(getBuyer());
-			if(player != null && !noPayBack) {
+			if(player.hasPlayedBefore() && !noPayBack) {
 				EconomyResponse response = null;
 				boolean error = false;
 				try {
 					if(player.getName() != null) {
-						response = plugin.getEconomy().depositPlayer(player, getWorldName(), moneyBack);
+						response = economy.depositPlayer(player, getWorldName(), moneyBack);
 					} else if(getPlayerName() != null) {
-						response = plugin.getEconomy().depositPlayer(getPlayerName(), getWorldName(), moneyBack);
+						response = economy.depositPlayer(getPlayerName(), getWorldName(), moneyBack);
 					}
 				} catch(Exception e) {
 					error = true;

AreaShop/src/main/java/me/wiefferink/areashop/regions/GeneralRegion.java

@@ -10,7 +10,10 @@ import me.wiefferink.areashop.features.RegionFeature;
 import me.wiefferink.areashop.features.TeleportFeature;
 import me.wiefferink.areashop.features.signs.SignsFeature;
 import me.wiefferink.areashop.interfaces.GeneralRegionInterface;
-import me.wiefferink.areashop.managers.FileManager;
+import me.wiefferink.areashop.interfaces.WorldEditInterface;
+import me.wiefferink.areashop.interfaces.WorldGuardInterface;
+import me.wiefferink.areashop.managers.FeatureManager;
+import me.wiefferink.areashop.managers.IFileManager;
 import me.wiefferink.areashop.tools.Utils;
 import me.wiefferink.bukkitdo.Do;
 import me.wiefferink.interactivemessenger.processing.Message;
@@ -27,22 +30,32 @@ import org.bukkit.configuration.file.YamlConfiguration;
 import org.bukkit.entity.Player;
 import org.bukkit.util.Vector;
 
+import javax.annotation.Nonnull;
+import java.awt.geom.Area;
 import java.io.File;
 import java.io.IOException;
 import java.text.SimpleDateFormat;
 import java.util.ArrayList;
 import java.util.Calendar;
+import java.util.Collection;
 import java.util.HashMap;
 import java.util.HashSet;
 import java.util.List;
+import java.util.Locale;
 import java.util.Map;
+import java.util.Optional;
 import java.util.Set;
 import java.util.UUID;
+import java.util.concurrent.CompletableFuture;
 
 public abstract class GeneralRegion implements GeneralRegionInterface, Comparable<GeneralRegion>, ReplacementProvider {
-	static final AreaShop plugin = AreaShop.getInstance();
 
-	final YamlConfiguration config;
+	protected final AreaShop plugin;
+	protected final FeatureManager featureManager;
+	protected final WorldEditInterface worldEditInterface;
+	protected final WorldGuardInterface worldGuardInterface;
+
+	protected final YamlConfiguration config;
 	private boolean saveRequired = false;
 	private boolean deleted = false;
 	private long volume = -1;
@@ -146,7 +159,17 @@ public abstract class GeneralRegion implements GeneralRegionInterface, Comparabl
 	 * Constructor, used to restore regions from disk at startup.
 	 * @param config The configuration of the region
 	 */
-	public GeneralRegion(YamlConfiguration config) {
+	protected GeneralRegion(
+			@Nonnull AreaShop plugin,
+			@Nonnull FeatureManager featureManager,
+			@Nonnull WorldEditInterface worldEditInterface,
+			@Nonnull WorldGuardInterface worldGuardInterface,
+			@Nonnull YamlConfiguration config
+	) {
+		this.plugin = plugin;
+		this.featureManager = featureManager;
+		this.worldEditInterface = worldEditInterface;
+		this.worldGuardInterface = worldGuardInterface;
 		this.config = config;
 		setup();
 	}
@@ -156,8 +179,17 @@ public abstract class GeneralRegion implements GeneralRegionInterface, Comparabl
 	 * @param name  Name of the WorldGuard region that this region is attached to
 	 * @param world The world of the WorldGuard region
 	 */
-	public GeneralRegion(String name, World world) {
-		config = new YamlConfiguration();
+	protected GeneralRegion(@Nonnull AreaShop plugin,
+							@Nonnull FeatureManager featureManager,
+							@Nonnull WorldEditInterface worldEditInterface,
+							@Nonnull WorldGuardInterface worldGuardInterface,
+							@Nonnull String name,
+							@Nonnull World world) {
+		this.config = new YamlConfiguration();
+		this.plugin = plugin;
+		this.featureManager = featureManager;
+		this.worldGuardInterface = worldGuardInterface;
+		this.worldEditInterface = worldEditInterface;
 		setSetting("general.name", name);
 		setSetting("general.world", world.getName());
 		setSetting("general.type", getType().getValue().toLowerCase());
@@ -186,21 +218,21 @@ public abstract class GeneralRegion implements GeneralRegionInterface, Comparabl
 	 * @param <T> The feature to get
 	 * @return The feature (either just instantiated or cached)
 	 */
-	public <T extends RegionFeature> T getFeature(Class<T> clazz) {
-		RegionFeature result = features.get(clazz);
-		if(result == null) {
-			result = plugin.getFeatureManager().getRegionFeature(this, clazz);
-			features.put(clazz, result);
-		}
+	public <T extends RegionFeature> T getOrCreateFeature(Class<T> clazz) {
+		RegionFeature result = features.computeIfAbsent(clazz, x -> featureManager.getRegionFeature(this, clazz));
 		return clazz.cast(result);
 	}
 
+	public <T extends RegionFeature> Optional<T> getFeature(Class<T> clazz) {
+		return Optional.ofNullable(clazz.cast(features.get(clazz)));
+	}
+
 	/**
 	 * Get the friends feature to query and manipulate friends of this region.
 	 * @return The FriendsFeature of this region
 	 */
 	public FriendsFeature getFriendsFeature() {
-		return getFeature(FriendsFeature.class);
+		return getOrCreateFeature(FriendsFeature.class);
 	}
 
 	/**
@@ -208,7 +240,7 @@ public abstract class GeneralRegion implements GeneralRegionInterface, Comparabl
 	 * @return The SignsFeature of this region
 	 */
 	public SignsFeature getSignsFeature() {
-		return getFeature(SignsFeature.class);
+		return getOrCreateFeature(SignsFeature.class);
 	}
 
 	/**
@@ -216,7 +248,7 @@ public abstract class GeneralRegion implements GeneralRegionInterface, Comparabl
 	 * @return The TeleportFeature
 	 */
 	public TeleportFeature getTeleportFeature() {
-		return getFeature(TeleportFeature.class);
+		return getOrCreateFeature(TeleportFeature.class);
 	}
 
 	// ABSTRACT
@@ -322,7 +354,7 @@ public abstract class GeneralRegion implements GeneralRegionInterface, Comparabl
 	 * @return The region name in lowercase
 	 */
 	public String getLowerCaseName() {
-		return getName().toLowerCase();
+		return getName().toLowerCase(Locale.ENGLISH);
 	}
 
 	/**
@@ -385,7 +417,7 @@ public abstract class GeneralRegion implements GeneralRegionInterface, Comparabl
 	 * Get the FileManager from the plugin.
 	 * @return The FileManager (responsible for saving/loading regions and getting them)
 	 */
-	public FileManager getFileManager() {
+	public IFileManager getFileManager() {
 		return plugin.getFileManager();
 	}
 
@@ -403,33 +435,18 @@ public abstract class GeneralRegion implements GeneralRegionInterface, Comparabl
 	 * @param player Player to check ownership for
 	 * @return true if the player currently rents or buys this region
 	 */
-	public boolean isOwner(UUID player) {
-		return (this instanceof RentRegion && ((RentRegion)this).isRenter(player)) || (this instanceof BuyRegion && ((BuyRegion)this).isBuyer(player));
-	}
+	public abstract boolean isOwner(UUID player);
 
 	/**
 	 * Get the player that is currently the owner of this region (either bought or rented it).
 	 * @return The UUID of the owner of this region
 	 */
-	public UUID getOwner() {
-		if(this instanceof RentRegion) {
-			return ((RentRegion)this).getRenter();
-		} else {
-			return ((BuyRegion)this).getBuyer();
-		}
-	}
-
+	public abstract UUID getOwner();
 	/**
 	 * Change the owner of the region.
 	 * @param player The player that should be the owner
 	 */
-	public void setOwner(UUID player) {
-		if(this instanceof RentRegion) {
-			((RentRegion)this).setRenter(player);
-		} else {
-			((BuyRegion)this).setBuyer(player);
-		}
-	}
+	public abstract void setOwner(UUID player);
 
 	/**
 	 * Get the landlord of this region (the player that receives any revenue from this region).
@@ -448,7 +465,7 @@ public abstract class GeneralRegion implements GeneralRegionInterface, Comparabl
 		if(landlordName != null && !landlordName.isEmpty()) {
 			@SuppressWarnings("deprecation")
 			OfflinePlayer offlinePlayer = Bukkit.getOfflinePlayer(landlordName);
-			if(offlinePlayer != null) {
+			if(offlinePlayer.hasPlayedBefore()) {
 				return offlinePlayer.getUniqueId();
 			}
 		}
@@ -461,7 +478,7 @@ public abstract class GeneralRegion implements GeneralRegionInterface, Comparabl
 	 */
 	public String getLandlordName() {
 		String result = Utils.toName(getLandlord());
-		if(result == null || result.isEmpty()) {
+		if(result.isEmpty()) {
 			result = config.getString("general.landlordName");
 			if(result == null || result.isEmpty()) {
 				result = null;
@@ -480,7 +497,7 @@ public abstract class GeneralRegion implements GeneralRegionInterface, Comparabl
 			setSetting("general.landlord", landlord.toString());
 		}
 		String properName = Utils.toName(landlord);
-		if(properName == null) {
+		if(properName.isBlank()) {
 			properName = name;
 		}
 		setSetting("general.landlordName", properName);
@@ -523,7 +540,7 @@ public abstract class GeneralRegion implements GeneralRegionInterface, Comparabl
 	 * @return Vector
 	 */
 	public Vector getMinimumPoint() {
-		return plugin.getWorldGuardHandler().getMinimumPoint(getRegion());
+		return worldGuardInterface.getMinimumPoint(getRegion());
 	}
 
 	/**
@@ -531,7 +548,7 @@ public abstract class GeneralRegion implements GeneralRegionInterface, Comparabl
 	 * @return Vector
 	 */
 	public Vector getMaximumPoint() {
-		return plugin.getWorldGuardHandler().getMaximumPoint(getRegion());
+		return worldGuardInterface.getMaximumPoint(getRegion());
 	}
 
 	/**
@@ -598,86 +615,96 @@ public abstract class GeneralRegion implements GeneralRegionInterface, Comparabl
 
 	@Override
 	public Object provideReplacement(String variable) {
-		switch(variable) {
+		switch (variable) {
 
 			// Basics
-			case AreaShop.tagRegionName:
+			case AreaShop.tagRegionName -> {
 				return getName();
-			case AreaShop.tagRegionType:
+			}
+			case AreaShop.tagRegionType -> {
 				return getType().getValue().toLowerCase();
-			case AreaShop.tagWorldName:
+			}
+			case AreaShop.tagWorldName -> {
 				return getWorldName();
-			case AreaShop.tagWidth:
+			}
+			case AreaShop.tagWidth -> {
 				return getWidth();
-			case AreaShop.tagDepth:
+			}
+			case AreaShop.tagDepth -> {
 				return getDepth();
-			case AreaShop.tagHeight:
+			}
+			case AreaShop.tagHeight -> {
 				return getHeight();
-			case AreaShop.tagFriends:
+			}
+			case AreaShop.tagFriends -> {
 				return Utils.createCommaSeparatedList(getFriendsFeature().getFriendNames());
-			case AreaShop.tagFriendsUUID:
+			}
+			case AreaShop.tagFriendsUUID -> {
 				return Utils.createCommaSeparatedList(getFriendsFeature().getFriends());
-			case AreaShop.tagLandlord:
+			}
+			case AreaShop.tagLandlord -> {
 				return getLandlordName();
-			case AreaShop.tagLandlordUUID:
+			}
+			case AreaShop.tagLandlordUUID -> {
 				return getLandlord();
-			case AreaShop.tagVolume:
+			}
+			case AreaShop.tagVolume -> {
 				return getVolume();
+			}
 
 			// Date/time
-			case AreaShop.tagEpoch:
+			case AreaShop.tagEpoch -> {
 				return Calendar.getInstance().getTimeInMillis();
-			case AreaShop.tagMillisecond:
+			}
+			case AreaShop.tagMillisecond -> {
 				return Calendar.getInstance().get(Calendar.MILLISECOND);
-			case AreaShop.tagSecond:
+			}
+			case AreaShop.tagSecond -> {
 				return Calendar.getInstance().get(Calendar.SECOND);
-			case AreaShop.tagMinute:
+			}
+			case AreaShop.tagMinute -> {
 				return Calendar.getInstance().get(Calendar.MINUTE);
-			case AreaShop.tagHour:
+			}
+			case AreaShop.tagHour -> {
 				return Calendar.getInstance().get(Calendar.HOUR_OF_DAY);
-			case AreaShop.tagDay:
+			}
+			case AreaShop.tagDay -> {
 				return Calendar.getInstance().get(Calendar.DAY_OF_MONTH);
-			case AreaShop.tagMonth:
+			}
+			case AreaShop.tagMonth -> {
 				return Calendar.getInstance().get(Calendar.MONTH) + 1;
-			case AreaShop.tagYear:
+			}
+			case AreaShop.tagYear -> {
 				return Calendar.getInstance().get(Calendar.YEAR);
-			case AreaShop.tagDateTime:
+			}
+			case AreaShop.tagDateTime -> {
 				return new SimpleDateFormat(plugin.getConfig().getString("timeFormatChat")).format(Calendar.getInstance().getTime());
-			case AreaShop.tagDateTimeShort:
+			}
+			case AreaShop.tagDateTimeShort -> {
 				return new SimpleDateFormat(plugin.getConfig().getString("timeFormatSign")).format(Calendar.getInstance().getTime());
+			}
 
 			// Teleport locations
-			default:
+			default -> {
 				Location tp = getTeleportFeature().getTeleportLocation();
-				if(tp == null) {
+				if (tp == null) {
 					return null;
 				}
-				switch(variable) {
-					case AreaShop.tagTeleportBlockX:
-						return tp.getBlockX();
-					case AreaShop.tagTeleportBlockY:
-						return tp.getBlockY();
-					case AreaShop.tagTeleportBlockZ:
-						return tp.getBlockZ();
-					case AreaShop.tagTeleportX:
-						return tp.getX();
-					case AreaShop.tagTeleportY:
-						return tp.getY();
-					case AreaShop.tagTeleportZ:
-						return tp.getZ();
-					case AreaShop.tagTeleportPitch:
-						return tp.getPitch();
-					case AreaShop.tagTeleportYaw:
-						return tp.getYaw();
-					case AreaShop.tagTeleportPitchRound:
-						return Math.round(tp.getPitch());
-					case AreaShop.tagTeleportYawRound:
-						return Math.round(tp.getYaw());
-					case AreaShop.tagTeleportWorld:
-						return tp.getWorld().getName();
-					default:
-						return null;
-				}
+				return switch (variable) {
+					case AreaShop.tagTeleportBlockX -> tp.getBlockX();
+					case AreaShop.tagTeleportBlockY -> tp.getBlockY();
+					case AreaShop.tagTeleportBlockZ -> tp.getBlockZ();
+					case AreaShop.tagTeleportX -> tp.getX();
+					case AreaShop.tagTeleportY -> tp.getY();
+					case AreaShop.tagTeleportZ -> tp.getZ();
+					case AreaShop.tagTeleportPitch -> tp.getPitch();
+					case AreaShop.tagTeleportYaw -> tp.getYaw();
+					case AreaShop.tagTeleportPitchRound -> Math.round(tp.getPitch());
+					case AreaShop.tagTeleportYawRound -> Math.round(tp.getYaw());
+					case AreaShop.tagTeleportWorld -> tp.getWorld().getName();
+					default -> null;
+				};
+			}
 		}
 	}
 
@@ -731,7 +758,7 @@ public abstract class GeneralRegion implements GeneralRegionInterface, Comparabl
 	 * @return true if the signs of this region need periodic updating, otherwise false
 	 */
 	public boolean needsPeriodicUpdate() {
-		return !(isDeleted() || !(this instanceof RentRegion)) && getSignsFeature().needsPeriodicUpdate();
+		return !(isDeleted() || !(this instanceof RentRegion)) && getSignsFeature().signManager().needsPeriodicUpdate();
 	}
 
 	/**
@@ -766,19 +793,49 @@ public abstract class GeneralRegion implements GeneralRegionInterface, Comparabl
 		File saveFile = new File(plugin.getFileManager().getSchematicFolder() + File.separator + fileName);
 		// Create parent directories
 		File parent = saveFile.getParentFile();
-		if(parent != null && !parent.exists()) {
-			if(!parent.mkdirs()) {
-				AreaShop.warn("Did not save region " + getName() + ", schematic directory could not be created: " + saveFile.getAbsolutePath());
-				return false;
-			}
+		if(parent != null && !parent.exists() && !parent.mkdirs()) {
+			AreaShop.warn("Did not save region " + getName() + ", schematic directory could not be created: " + saveFile.getAbsolutePath());
+			return false;
 		}
-		boolean result = plugin.getWorldEditHandler().saveRegionBlocks(saveFile, this);
+		boolean result = worldEditInterface.saveRegionBlocks(saveFile, this);
 		if(result) {
 			AreaShop.debug("Saved schematic for region " + getName());
 		}
 		return true;
 	}
 
+	/**
+	 * Save all blocks in a region for restoring later.
+	 * @param fileName The name of the file to save to (extension and folder will be added)
+	 * @return true if the region has been saved properly, otherwise false
+	 */
+	public CompletableFuture<Boolean> saveRegionBlocksAsync(String fileName) {
+		if (!worldEditInterface.supportsAsyncOperations()) {
+			return CompletableFuture.completedFuture(saveRegionBlocks(fileName));
+		}
+		// Check if the region is correct
+		ProtectedRegion region = getRegion();
+		if(region == null) {
+			AreaShop.debug("Region '" + getName() + "' does not exist in WorldGuard, save failed");
+			return CompletableFuture.completedFuture(false);
+		}
+		// The path to save the schematic
+		File saveFile = new File(plugin.getFileManager().getSchematicFolder() + File.separator + fileName);
+		// Create parent directories
+		File parent = saveFile.getParentFile();
+		if(parent != null && !parent.exists() && !parent.mkdirs()) {
+			AreaShop.warn("Did not save region " + getName() + ", schematic directory could not be created: " + saveFile.getAbsolutePath());
+			return CompletableFuture.completedFuture(false);
+		}
+		return worldEditInterface.saveRegionBlocksAsync(saveFile, this)
+				.thenApply(result -> {
+					if(Boolean.TRUE.equals(result)) {
+						AreaShop.debug("Saved schematic async for region " + getName());
+					}
+					return result;
+				});
+	}
+
 	/**
 	 * Restore all blocks in a region for restoring later.
 	 * @param fileName The name of the file to save to (extension and folder will be added)
@@ -791,24 +848,53 @@ public abstract class GeneralRegion implements GeneralRegionInterface, Comparabl
 		}
 		// The path to save the schematic
 		File restoreFile = new File(plugin.getFileManager().getSchematicFolder() + File.separator + fileName);
-		boolean result = plugin.getWorldEditHandler().restoreRegionBlocks(restoreFile, this);
+		boolean result = worldEditInterface.restoreRegionBlocks(restoreFile, this);
 		if(result) {
 			AreaShop.debug("Restored schematic for region " + getName());
 
 			// Workaround for signs inside the region in combination with async restore of plugins like AsyncWorldEdit and FastAsyncWorldEdit
-			Do.syncLater(10, getSignsFeature()::update);
+			Do.syncLater(10, getSignsFeature().signManager()::update);
 		}
 		return result;
 	}
 
+	/**
+	 * Restore all blocks in a region for restoring later.
+	 * @param fileName The name of the file to save to (extension and folder will be added)
+	 * @return true if the region has been restored properly, otherwise false
+	 */
+	public CompletableFuture<Boolean> restoreRegionBlocksAsync(String fileName) {
+		if (!worldEditInterface.supportsAsyncOperations()) {
+			return CompletableFuture.completedFuture(restoreRegionBlocks(fileName));
+		}
+		if(getRegion() == null) {
+			AreaShop.debug("Region '" + getName() + "' does not exist in WorldGuard, restore failed");
+			return CompletableFuture.completedFuture(false);
+		}
+		// The path to save the schematic
+		File restoreFile = new File(plugin.getFileManager().getSchematicFolder() + File.separator + fileName);
+		return worldEditInterface.restoreRegionBlocksAsync(restoreFile, this)
+				.thenApply(result -> {
+					if(Boolean.TRUE.equals(result)) {
+						AreaShop.debug("Restored schematic async for region " + getName());
+						// Sync back to main
+						Do.syncLater(10, getSignsFeature().signManager()::update);
+					}
+					return result;
+				}
+		);
+	}
+
+
+
 	/**
 	 * Reset all flags of the region.
 	 */
 	public void resetRegionFlags() {
 		ProtectedRegion region = getRegion();
 		if(region != null) {
-			region.setFlag(plugin.getWorldGuardHandler().fuzzyMatchFlag("greeting"), null);
-			region.setFlag(plugin.getWorldGuardHandler().fuzzyMatchFlag("farewell"), null);
+			region.setFlag(worldGuardInterface.fuzzyMatchFlag("greeting"), null);
+			region.setFlag(worldGuardInterface.fuzzyMatchFlag("farewell"), null);
 		}
 	}
 
@@ -880,7 +966,6 @@ public abstract class GeneralRegion implements GeneralRegionInterface, Comparabl
 		if(found) {
 			return result;
 		}
-
 		if(this.getFileManager().getRegionSettings().isString(path)) {
 			return this.getFileManager().getRegionSettings().getString(path).equalsIgnoreCase("true");
 		}
@@ -1207,12 +1292,12 @@ public abstract class GeneralRegion implements GeneralRegionInterface, Comparabl
 				int totalLimit = plugin.getConfig().getInt("limitGroups." + group + ".total");
 				int typeLimit = plugin.getConfig().getInt("limitGroups." + group + "." + typePath);
 				//AreaShop.debug("typeLimitOther="+typeLimit+", typePath="+typePath);
-				int totalCurrent = hasRegionsInLimitGroup(offlinePlayer, group, plugin.getFileManager().getRegions(), exclude);
+				int totalCurrent = hasRegionsInLimitGroup(offlinePlayer, group, plugin.getFileManager().getRegionsRef(), exclude);
 				int typeCurrent;
 				if(type == RegionType.RENT) {
-					typeCurrent = hasRegionsInLimitGroup(offlinePlayer, group, plugin.getFileManager().getRents(), exclude);
+					typeCurrent = hasRegionsInLimitGroup(offlinePlayer, group, plugin.getFileManager().getRentsRef(), exclude);
 				} else {
-					typeCurrent = hasRegionsInLimitGroup(offlinePlayer, group, plugin.getFileManager().getBuys(), exclude);
+					typeCurrent = hasRegionsInLimitGroup(offlinePlayer, group, plugin.getFileManager().getBuysRef(), exclude);
 				}
 				if(totalLimit == -1) {
 					totalLimit = Integer.MAX_VALUE;
@@ -1368,7 +1453,7 @@ public abstract class GeneralRegion implements GeneralRegionInterface, Comparabl
 	 * @param exclude    Exclude this region from the count
 	 * @return The number of regions that the player has bought or rented matching the limit group (worlds and groups filters)
 	 */
-	public int hasRegionsInLimitGroup(OfflinePlayer player, String limitGroup, List<? extends GeneralRegion> regions, GeneralRegion exclude) {
+	public int hasRegionsInLimitGroup(OfflinePlayer player, String limitGroup, Collection<? extends GeneralRegion> regions, GeneralRegion exclude) {
 		int result = 0;
 		for(GeneralRegion region : regions) {
 			if(region.getBooleanSetting("general.countForLimits")
@@ -1389,8 +1474,8 @@ public abstract class GeneralRegion implements GeneralRegionInterface, Comparabl
 	public boolean matchesLimitGroup(String group) {
 		List<String> worlds = plugin.getConfig().getStringList("limitGroups." + group + ".worlds");
 		List<String> groups = plugin.getConfig().getStringList("limitGroups." + group + ".groups");
-		if((worlds == null || worlds.isEmpty() || worlds.contains(getWorldName()))) {
-			if(groups == null || groups.isEmpty()) {
+		if(worlds.isEmpty() || worlds.contains(getWorldName())) {
+			if(groups.isEmpty()) {
 				return true;
 			} else {
 				boolean inGroups = false;
@@ -1422,14 +1507,23 @@ public abstract class GeneralRegion implements GeneralRegionInterface, Comparabl
 		String save = profileSection.getString(type.getValue() + ".save");
 		String restore = profileSection.getString(type.getValue() + ".restore");
 		// Save the region if needed
-		if(save != null && !save.isEmpty()) {
+		boolean async = worldEditInterface.supportsAsyncOperations();
+		if(save != null && !save.isBlank()) {
 			save = Message.fromString(save).replacements(this).getSingle();
-			saveRegionBlocks(save);
+			if (async) {
+				saveRegionBlocksAsync(save);
+			} else {
+				saveRegionBlocks(save);
+			}
 		}
 		// Restore the region if needed
-		if(restore != null && !restore.isEmpty()) {
+		if(restore != null && !restore.isBlank()) {
 			restore = Message.fromString(restore).replacements(this).getSingle();
-			restoreRegionBlocks(restore);
+			if (async) {
+				restoreRegionBlocksAsync(restore);
+			} else {
+				restoreRegionBlocks(restore);
+			}
 		}
 	}
 
@@ -1518,7 +1612,7 @@ public abstract class GeneralRegion implements GeneralRegionInterface, Comparabl
 			}
 			// Estimate, but quick algorithm
 			else {
-				List<Vector> points = plugin.getWorldGuardHandler().getRegionPoints(region);
+				List<Vector> points = worldGuardInterface.getRegionPoints(region);
 				int numPoints = points.size();
 				if(numPoints < 3) {
 					return 0;

AreaShop/src/main/java/me/wiefferink/areashop/regions/ImportJob.java

@@ -1,16 +1,17 @@
-package me.wiefferink.areashop.commands;
+package me.wiefferink.areashop.regions;
 
 import com.google.common.base.Charsets;
+import com.google.inject.assistedinject.Assisted;
+import com.google.inject.assistedinject.AssistedInject;
 import com.sk89q.worldguard.protection.managers.RegionManager;
 import com.sk89q.worldguard.protection.regions.ProtectedRegion;
 import me.wiefferink.areashop.AreaShop;
+import me.wiefferink.areashop.MessageBridge;
 import me.wiefferink.areashop.events.ask.AddingRegionEvent;
 import me.wiefferink.areashop.features.signs.RegionSign;
-import me.wiefferink.areashop.features.signs.SignsFeature;
-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 me.wiefferink.areashop.features.signs.SignManager;
+import me.wiefferink.areashop.interfaces.WorldGuardInterface;
+import me.wiefferink.areashop.managers.IFileManager;
 import org.bukkit.Bukkit;
 import org.bukkit.Location;
 import org.bukkit.OfflinePlayer;
@@ -20,33 +21,52 @@ import org.bukkit.command.ConsoleCommandSender;
 import org.bukkit.configuration.ConfigurationSection;
 import org.bukkit.configuration.file.YamlConfiguration;
 
+import javax.annotation.Nonnull;
 import java.io.File;
 import java.io.FileInputStream;
 import java.io.IOException;
 import java.io.InputStreamReader;
 import java.util.ArrayList;
 import java.util.List;
+import java.util.Optional;
 import java.util.UUID;
 
 public class ImportJob {
 
 	private final AreaShop plugin;
+	private final IFileManager fileManager;
+	private final SignManager signManager;
+	private final WorldGuardInterface worldGuardInterface;
 	private final CommandSender sender;
+	private final MessageBridge messageBridge;
+	private final RegionFactory regionFactory;
 
 	/**
 	 * Create and execute the import.
 	 * @param sender CommandSender that should receive progress updates
 	 */
-	public ImportJob(CommandSender sender) {
+	@AssistedInject
+	ImportJob(
+			@Nonnull AreaShop plugin,
+			@Nonnull IFileManager fileManager,
+			@Nonnull SignManager signManager,
+			@Nonnull WorldGuardInterface worldGuardInterface,
+			@Nonnull MessageBridge messageBridge,
+			@Nonnull RegionFactory regionFactory,
+			@Assisted @Nonnull CommandSender sender) {
+		this.regionFactory = regionFactory;
 		this.sender = sender;
-		this.plugin = AreaShop.getInstance();
-		execute();
+		this.plugin = plugin;
+		this.signManager = signManager;
+		this.fileManager = fileManager;
+		this.worldGuardInterface = worldGuardInterface;
+		this.messageBridge = messageBridge;
 	}
 
 	/**
 	 * Execute the job.
 	 */
-	private void execute() {
+	public void execute() {
 		// Check for RegionForSale data
 		File regionForSaleFolder = new File(plugin.getDataFolder().getParentFile().getAbsolutePath(), "RegionForSale");
 		if(!regionForSaleFolder.exists()) {
@@ -70,8 +90,8 @@ public class ImportJob {
 		message("import-start");
 
 		// Group with settings for all imported regions
-		RegionGroup regionForSaleGroup = new RegionGroup(plugin, "RegionForSale");
-		plugin.getFileManager().addGroup(regionForSaleGroup);
+		RegionGroup regionForSaleGroup = regionFactory.createRegionGroup("RegionForSale");
+		fileManager.addGroup(regionForSaleGroup);
 
 		// Import /RegionForSale/config.yml settings
 		File regionForSaleConfigFile = new File(regionForSaleFolder.getAbsolutePath(), "config.yml");
@@ -149,11 +169,11 @@ public class ImportJob {
 				worldConfig = new YamlConfiguration();
 			} else {
 				// RegionGroup with all world settings
-				RegionGroup worldGroup = new RegionGroup(plugin, "RegionForSale-" + worldFolder.getName());
+				RegionGroup worldGroup = regionFactory.createRegionGroup("RegionForSale-" + worldFolder.getName());
 				importRegionSettings(worldConfig, worldGroup.getSettings(), null, false);
 				worldGroup.setSetting("priority", 1);
 				worldGroup.addWorld(worldFolder.getName());
-				plugin.getFileManager().addGroup(regionForSaleGroup);
+				fileManager.addGroup(regionForSaleGroup);
 				worldGroup.saveRequired();
 			}
 
@@ -185,7 +205,7 @@ public class ImportJob {
 					}
 
 					// Import parent region settings into a RegionGroup
-					RegionGroup parentRegionGroup = new RegionGroup(plugin, "RegionForSale-" + worldFolder.getName() + "-" + parentRegionName);
+					RegionGroup parentRegionGroup = regionFactory.createRegionGroup( "RegionForSale-" + worldFolder.getName() + "-" + parentRegionName);
 					importRegionSettings(parentRegionSection, parentRegionGroup.getSettings(), null, false);
 					parentRegionGroup.setSetting("priority", 2 + parentRegionSection.getLong("info.priority", 0));
 					parentRegionGroup.saveRequired();
@@ -197,7 +217,7 @@ public class ImportJob {
 
 			// Read and import regions
 			for(String regionKey : regions.getKeys(false)) {
-				GeneralRegion existingRegion = plugin.getFileManager().getRegion(regionKey);
+				GeneralRegion existingRegion = fileManager.getRegion(regionKey);
 				if(existingRegion != null) {
 					if(world.getName().equalsIgnoreCase(existingRegion.getWorldName())) {
 						messageNoPrefix("import-alreadyAdded", regionKey);
@@ -240,9 +260,9 @@ public class ImportJob {
 				// Create region
 				GeneralRegion region;
 				if(rentable || (owner != null && !isBought)) {
-					region = new RentRegion(regionKey, world);
+					region = regionFactory.createRentRegion(regionKey, world);
 				} else {
-					region = new BuyRegion(regionKey, world);
+					region = regionFactory.createBuyRegion(regionKey, world);
 				}
 				AddingRegionEvent event = plugin.getFileManager().addRegion(region);
 				if (event.isCancelled()) {
@@ -259,16 +279,16 @@ public class ImportJob {
 				if(owner != null) {
 					@SuppressWarnings("deprecation")
 					OfflinePlayer offlinePlayer = Bukkit.getOfflinePlayer(owner);
-					if(offlinePlayer != null) {
+					if(offlinePlayer.hasPlayedBefore()) {
 						existing.add(offlinePlayer.getUniqueId());
 					}
 				}
-				for(UUID uuid : plugin.getWorldGuardHandler().getOwners(worldGuardRegion).asUniqueIdList()) {
+				for(UUID uuid : worldGuardInterface.getOwners(worldGuardRegion).asUniqueIdList()) {
 					if(!existing.contains(uuid)) {
 						existing.add(uuid);
 					}
 				}
-				for(UUID uuid : plugin.getWorldGuardHandler().getMembers(worldGuardRegion).asUniqueIdList()) {
+				for(UUID uuid : worldGuardInterface.getMembers(worldGuardRegion).asUniqueIdList()) {
 					if(!existing.contains(uuid)) {
 						existing.add(uuid);
 					}
@@ -290,9 +310,9 @@ public class ImportJob {
 		}
 
 		// Update all regions
-		plugin.getFileManager().updateAllRegions(sender);
+		fileManager.updateAllRegions(sender);
 		// Write all imported regions and settings to disk
-		plugin.getFileManager().saveRequiredFiles();
+		fileManager.saveRequiredFiles();
 	}
 
 	/**
@@ -373,8 +393,7 @@ public class ImportJob {
 
 		// Set rented until
 		if(from.isLong("info.last-withdrawal")
-				&& region instanceof RentRegion) {
-			RentRegion rentRegion = (RentRegion)region;
+				&& region instanceof RentRegion rentRegion) {
 			long lastWithdrawal = from.getLong("info.last-withdrawal");
 			// Because the rental duration is already imported into the region and its parents this should be correct
 			rentRegion.setRentedUntil(lastWithdrawal + rentRegion.getDuration());
@@ -399,8 +418,9 @@ public class ImportJob {
 				}
 
 				// Check if this location is already added to a region
-				RegionSign regionSign = SignsFeature.getSignByLocation(location);
-				if(regionSign != null) {
+				Optional<RegionSign> optionalRegionSign = signManager.signFromLocation(location);
+				if(optionalRegionSign.isPresent()) {
+					RegionSign regionSign = optionalRegionSign.get();
 					if(!regionSign.getRegion().equals(region)) {
 						message("import-signAlreadyAdded", region.getName(), signLocation, regionSign.getRegion().getName());
 					}
@@ -424,7 +444,7 @@ public class ImportJob {
 		}
 	}
 
-	private static final List<TimeUnit> timeUnitLookup = new ArrayList<TimeUnit>() {
+	private static final List<TimeUnit> timeUnitLookup = new ArrayList<>() {
 		{
 			add(new TimeUnit(60 * 24 * 30 * 12, "year"));
 			add(new TimeUnit(60 * 24 * 30, "month"));
@@ -459,10 +479,10 @@ public class ImportJob {
 	 * @param replacements The replacements to insert in the message
 	 */
 	public void messageNoPrefix(String key, Object... replacements) {
-		plugin.messageNoPrefix(sender, key, replacements);
+		messageBridge.messageNoPrefix(sender, key, replacements);
 
 		if(!(sender instanceof ConsoleCommandSender)) {
-			plugin.messageNoPrefix(Bukkit.getConsoleSender(), key, replacements);
+			messageBridge.messageNoPrefix(Bukkit.getConsoleSender(), key, replacements);
 		}
 	}
 
@@ -472,10 +492,10 @@ public class ImportJob {
 	 * @param replacements The replacements to insert in the message
 	 */
 	public void message(String key, Object... replacements) {
-		plugin.message(sender, key, replacements);
+		messageBridge.message(sender, key, replacements);
 
 		if(!(sender instanceof ConsoleCommandSender)) {
-			plugin.message(Bukkit.getConsoleSender(), key, replacements);
+			messageBridge.message(Bukkit.getConsoleSender(), key, replacements);
 		}
 	}
 }

AreaShop/src/main/java/me/wiefferink/areashop/regions/ImportJobFactory.java

@@ -0,0 +1,11 @@
+package me.wiefferink.areashop.regions;
+
+import org.bukkit.command.CommandSender;
+
+import javax.annotation.Nonnull;
+
+public interface ImportJobFactory {
+
+    @Nonnull ImportJob createImportJob(@Nonnull CommandSender commandSender);
+
+}

AreaShop/src/main/java/me/wiefferink/areashop/regions/RegionFactory.java

@@ -0,0 +1,20 @@
+package me.wiefferink.areashop.regions;
+
+import org.bukkit.World;
+import org.bukkit.configuration.file.YamlConfiguration;
+
+import javax.annotation.Nonnull;
+
+public interface RegionFactory {
+
+    @Nonnull BuyRegion createBuyRegion(@Nonnull YamlConfiguration yamlConfiguration);
+
+    @Nonnull BuyRegion createBuyRegion(@Nonnull String name, @Nonnull World world);
+
+    @Nonnull RentRegion createRentRegion(@Nonnull YamlConfiguration yamlConfiguration);
+
+    @Nonnull RentRegion createRentRegion(@Nonnull String name, @Nonnull World world);
+
+    @Nonnull RegionGroup createRegionGroup(@Nonnull String name);
+
+}

AreaShop/src/main/java/me/wiefferink/areashop/regions/RegionGroup.java

@@ -1,9 +1,13 @@
 package me.wiefferink.areashop.regions;
 
-import me.wiefferink.areashop.AreaShop;
+import com.google.inject.assistedinject.Assisted;
+import com.google.inject.assistedinject.AssistedInject;
+import me.wiefferink.areashop.managers.IFileManager;
 import org.bukkit.configuration.ConfigurationSection;
 import org.bukkit.configuration.file.YamlConfiguration;
+import org.bukkit.plugin.Plugin;
 
+import javax.annotation.Nonnull;
 import java.util.ArrayList;
 import java.util.HashSet;
 import java.util.Set;
@@ -11,7 +15,8 @@ import java.util.Set;
 // TODO consider switching to saving lowercase regions
 public class RegionGroup {
 
-	private final AreaShop plugin;
+	private final Plugin plugin;
+	private final IFileManager fileManager;
 	private final String name;
 	private final Set<String> regions;
 	private Set<String> autoRegions;
@@ -23,8 +28,10 @@ public class RegionGroup {
 	 * @param plugin The AreaShop plugin
 	 * @param name   Name of the group, has to be unique
 	 */
-	public RegionGroup(AreaShop plugin, String name) {
+	@AssistedInject
+	RegionGroup(@Nonnull Plugin plugin, @Nonnull IFileManager fileManager, @Assisted String name) {
 		this.plugin = plugin;
+		this.fileManager = fileManager;
 		this.name = name;
 		this.autoDirty = true;
 		setSetting("name", name);
@@ -41,7 +48,7 @@ public class RegionGroup {
 	public Set<String> getAutoRegions() {
 		if(autoDirty) {
 			autoRegions = new HashSet<>();
-			for(GeneralRegion region : plugin.getFileManager().getRegions()) {
+			for(GeneralRegion region : fileManager.getRegionsRef()) {
 				if(worlds.contains(region.getWorldName())) {
 					autoRegions.add(region.getName());
 				}
@@ -149,7 +156,7 @@ public class RegionGroup {
 	public Set<GeneralRegion> getMemberRegions() {
 		Set<GeneralRegion> result = new HashSet<>();
 		for(String playerName : getMembers()) {
-			result.add(plugin.getFileManager().getRegion(playerName));
+			result.add(fileManager.getRegion(playerName));
 		}
 		return result;
 	}
@@ -192,7 +199,7 @@ public class RegionGroup {
 	 * @return The ConfigurationSection with the settings of the group
 	 */
 	public ConfigurationSection getSettings() {
-		ConfigurationSection result =  plugin.getFileManager().getGroupSettings(name);
+		ConfigurationSection result =  fileManager.getGroupSettings(name);
 		if(result != null) {
 			return result;
 		} else {
@@ -206,20 +213,20 @@ public class RegionGroup {
 	 * @param setting The value to set
 	 */
 	public void setSetting(String path, Object setting) {
-		plugin.getFileManager().setGroupSetting(this, path, setting);
+		fileManager.setGroupSetting(this, path, setting);
 	}
 
 	/**
 	 * Indicates this file needs to be saved, will actually get saved later by a task.
 	 */
 	public void saveRequired() {
-		plugin.getFileManager().saveGroupsIsRequired();
+		fileManager.saveGroupsIsRequired();
 	}
 
 	/**
 	 * Save the groups to disk now, normally saveRequired() is preferred because of performance.
 	 */
 	public void saveNow() {
-		plugin.getFileManager().saveGroupsNow();
+		fileManager.saveGroupsNow();
 	}
 }

AreaShop/src/main/java/me/wiefferink/areashop/regions/RegionModule.java

@@ -0,0 +1,12 @@
+package me.wiefferink.areashop.regions;
+
+import com.google.inject.AbstractModule;
+import com.google.inject.assistedinject.FactoryModuleBuilder;
+
+public class RegionModule extends AbstractModule {
+
+    @Override
+    protected void configure() {
+        install(new FactoryModuleBuilder().build(RegionFactory.class));
+    }
+}

AreaShop/src/main/java/me/wiefferink/areashop/regions/RentRegion.java

@@ -1,11 +1,17 @@
 package me.wiefferink.areashop.regions;
 
+import com.google.inject.assistedinject.Assisted;
+import com.google.inject.assistedinject.AssistedInject;
 import me.wiefferink.areashop.AreaShop;
 import me.wiefferink.areashop.events.ask.RentingRegionEvent;
 import me.wiefferink.areashop.events.ask.UnrentingRegionEvent;
 import me.wiefferink.areashop.events.notify.RentedRegionEvent;
 import me.wiefferink.areashop.events.notify.UnrentedRegionEvent;
+import me.wiefferink.areashop.interfaces.WorldEditInterface;
+import me.wiefferink.areashop.interfaces.WorldGuardInterface;
+import me.wiefferink.areashop.managers.FeatureManager;
 import me.wiefferink.areashop.tools.Utils;
+import net.milkbowl.vault.economy.Economy;
 import net.milkbowl.vault.economy.EconomyResponse;
 import org.bukkit.Bukkit;
 import org.bukkit.OfflinePlayer;
@@ -15,6 +21,8 @@ import org.bukkit.configuration.ConfigurationSection;
 import org.bukkit.configuration.file.YamlConfiguration;
 import org.bukkit.entity.Player;
 
+import javax.annotation.Nonnull;
+import javax.annotation.Nullable;
 import java.text.SimpleDateFormat;
 import java.util.Calendar;
 import java.util.Date;
@@ -24,14 +32,25 @@ import java.util.UUID;
 import static me.wiefferink.areashop.tools.Utils.millisToHumanFormat;
 
 public class RentRegion extends GeneralRegion {
-	private long warningsDoneUntil = Calendar.getInstance().getTimeInMillis();
+
+	private long warningsDoneUntil = System.currentTimeMillis();
+	private final Economy economy;
 
 	/**
 	 * Constructor.
 	 * @param config All settings of this region
 	 */
-	public RentRegion(YamlConfiguration config) {
-		super(config);
+	@AssistedInject
+	RentRegion(
+			@Nonnull AreaShop plugin,
+			@Nonnull FeatureManager featureManager,
+			@Nonnull WorldEditInterface worldEditInterface,
+			@Nonnull WorldGuardInterface worldGuardInterface,
+			@Nullable Economy economy,
+			@Assisted @Nonnull YamlConfiguration config
+	) {
+		super(plugin, featureManager, worldEditInterface, worldGuardInterface, config);
+		this.economy = economy;
 	}
 
 	/**
@@ -39,8 +58,34 @@ public class RentRegion extends GeneralRegion {
 	 * @param name  The name of the region (correct casing)
 	 * @param world The world of the WorldGuard region
 	 */
-	public RentRegion(String name, World world) {
-		super(name, world);
+	@AssistedInject
+	RentRegion(
+			@Nonnull AreaShop plugin,
+			@Nonnull FeatureManager featureManager,
+			@Nonnull WorldEditInterface worldEditInterface,
+			@Nonnull WorldGuardInterface worldGuardInterface,
+			@Nullable Economy economy,
+			@Assisted @Nonnull String name,
+			@Assisted @Nonnull World world
+	) {
+		super(plugin, featureManager, worldEditInterface, worldGuardInterface, name, world);
+		this.economy = economy;
+	}
+
+
+	@Override
+	public boolean isOwner(UUID player) {
+		return isRenter(player);
+	}
+
+	@Override
+	public UUID getOwner() {
+		return getRenter();
+	}
+
+	@Override
+	public void setOwner(UUID player) {
+		setRenter(player);
 	}
 
 	@Override
@@ -136,43 +181,28 @@ public class RentRegion extends GeneralRegion {
 
 	@Override
 	public Object provideReplacement(String variable) {
-		switch(variable) {
-			case AreaShop.tagPrice:
-				return getFormattedPrice();
-			case AreaShop.tagRawPrice:
-				return getPrice();
-			case AreaShop.tagDuration:
-				return getDurationString();
-			case AreaShop.tagPlayerName:
-				return getPlayerName();
-			case AreaShop.tagPlayerUUID:
-				return getRenter();
-			case AreaShop.tagRentedUntil:
-				return new SimpleDateFormat(plugin.getConfig().getString("timeFormatChat")).format(new Date(getRentedUntil()));
-			case AreaShop.tagRentedUntilShort:
-				return new SimpleDateFormat(plugin.getConfig().getString("timeFormatSign")).format(new Date(getRentedUntil()));
-			case AreaShop.tagTimeLeft:
-				return getTimeLeftString();
-			case AreaShop.tagMoneyBackAmount:
-				return getFormattedMoneyBackAmount();
-			case AreaShop.tagRawMoneyBackAmount:
-				return getMoneyBackAmount();
-			case AreaShop.tagMoneyBackPercentage:
-				return (getMoneyBackPercentage() % 1.0) == 0.0 ? (int)getMoneyBackPercentage() : getMoneyBackPercentage();
-			case AreaShop.tagTimesExtended:
-				return this.getTimesExtended();
-			case AreaShop.tagMaxExtends:
-				return this.getMaxExtends();
-			case AreaShop.tagExtendsLeft:
-				return getMaxExtends() - getTimesExtended();
-			case AreaShop.tagMaxRentTime:
-				return millisToHumanFormat(getMaxRentTime());
-			case AreaShop.tagMaxInactiveTime:
-				return this.getFormattedInactiveTimeUntilUnrent();
-
-			default:
-				return super.provideReplacement(variable);
-		}
+		return switch (variable) {
+			case AreaShop.tagPrice -> getFormattedPrice();
+			case AreaShop.tagRawPrice -> getPrice();
+			case AreaShop.tagDuration -> getDurationString();
+			case AreaShop.tagPlayerName -> getPlayerName();
+			case AreaShop.tagPlayerUUID -> getRenter();
+			case AreaShop.tagRentedUntil ->
+					new SimpleDateFormat(plugin.getConfig().getString("timeFormatChat")).format(new Date(getRentedUntil()));
+			case AreaShop.tagRentedUntilShort ->
+					new SimpleDateFormat(plugin.getConfig().getString("timeFormatSign")).format(new Date(getRentedUntil()));
+			case AreaShop.tagTimeLeft -> getTimeLeftString();
+			case AreaShop.tagMoneyBackAmount -> getFormattedMoneyBackAmount();
+			case AreaShop.tagRawMoneyBackAmount -> getMoneyBackAmount();
+			case AreaShop.tagMoneyBackPercentage ->
+					(getMoneyBackPercentage() % 1.0) == 0.0 ? (int) getMoneyBackPercentage() : getMoneyBackPercentage();
+			case AreaShop.tagTimesExtended -> this.getTimesExtended();
+			case AreaShop.tagMaxExtends -> this.getMaxExtends();
+			case AreaShop.tagExtendsLeft -> getMaxExtends() - getTimesExtended();
+			case AreaShop.tagMaxRentTime -> millisToHumanFormat(getMaxRentTime());
+			case AreaShop.tagMaxInactiveTime -> this.getFormattedInactiveTimeUntilUnrent();
+			default -> super.provideReplacement(variable);
+		};
 	}
 
 	/**
@@ -428,7 +458,7 @@ public class RentRegion extends GeneralRegion {
 	 * @return true if it succeeded and false if not
 	 */
 	public boolean rent(OfflinePlayer offlinePlayer) {
-		if(plugin.getEconomy() == null) {
+		if(economy == null) {
 			message(offlinePlayer, "general-noEconomy");
 			return false;
 		}
@@ -540,11 +570,11 @@ public class RentRegion extends GeneralRegion {
 		}
 
 		// Check if the player has enough money
-		if(!plugin.getEconomy().has(offlinePlayer, getWorldName(), price)) {
+		if(!economy.has(offlinePlayer, getWorldName(), price)) {
 			if(extend) {
-				message(offlinePlayer, "rent-lowMoneyExtend", Utils.formatCurrency(plugin.getEconomy().getBalance(offlinePlayer, getWorldName())));
+				message(offlinePlayer, "rent-lowMoneyExtend", Utils.formatCurrency(economy.getBalance(offlinePlayer, getWorldName())));
 			} else {
-				message(offlinePlayer, "rent-lowMoneyRent", Utils.formatCurrency(plugin.getEconomy().getBalance(offlinePlayer, getWorldName())));
+				message(offlinePlayer, "rent-lowMoneyRent", Utils.formatCurrency(economy.getBalance(offlinePlayer, getWorldName())));
 			}
 			return false;
 		}
@@ -558,7 +588,7 @@ public class RentRegion extends GeneralRegion {
 		}
 
 		// Substract the money from the players balance
-		EconomyResponse r = plugin.getEconomy().withdrawPlayer(offlinePlayer, getWorldName(), price);
+		EconomyResponse r = economy.withdrawPlayer(offlinePlayer, getWorldName(), price);
 		if(!r.transactionSuccess()) {
 			message(offlinePlayer, "rent-payError");
 			AreaShop.debug("Something went wrong with getting money from " + offlinePlayer.getName() + " while renting " + getName() + ": " + r.errorMessage);
@@ -572,9 +602,9 @@ public class RentRegion extends GeneralRegion {
 		String landlordName = getLandlordName();
 		if(landlordName != null) {
 			if(landlordPlayer != null && landlordPlayer.getName() != null) {
-				r = plugin.getEconomy().depositPlayer(landlordPlayer, getWorldName(), price);
+				r = economy.depositPlayer(landlordPlayer, getWorldName(), price);
 			} else {
-				r = plugin.getEconomy().depositPlayer(landlordName, getWorldName(), price);
+				r = economy.depositPlayer(landlordName, getWorldName(), price);
 			}
 			if(r == null || !r.transactionSuccess()) {
 				AreaShop.warn("Something went wrong with paying '" + landlordName + "' " + Utils.formatCurrency(price) + " for his rent of region " + getName() + " to " + offlinePlayer.getName());
@@ -638,15 +668,15 @@ public class RentRegion extends GeneralRegion {
 			}
 		}
 
-		if(plugin.getEconomy() == null) {
+		if(economy == null) {
 			return false;
 		}
 
 		// Broadcast and check event
-		UnrentingRegionEvent event = new UnrentingRegionEvent(this);
-		Bukkit.getPluginManager().callEvent(event);
-		if(event.isCancelled()) {
-			message(executor, "general-cancelled", event.getReason());
+		UnrentingRegionEvent unrentingRegionEvent = new UnrentingRegionEvent(this);
+		Bukkit.getPluginManager().callEvent(unrentingRegionEvent);
+		if(unrentingRegionEvent.isCancelled()) {
+			message(executor, "general-cancelled", unrentingRegionEvent.getReason());
 			return false;
 		}
 
@@ -662,9 +692,9 @@ public class RentRegion extends GeneralRegion {
 			EconomyResponse r;
 			if(landlordName != null) {
 				if(landlordPlayer != null && landlordPlayer.getName() != null) {
-					r = plugin.getEconomy().withdrawPlayer(landlordPlayer, getWorldName(), moneyBack);
+					r = economy.withdrawPlayer(landlordPlayer, getWorldName(), moneyBack);
 				} else {
-					r = plugin.getEconomy().withdrawPlayer(landlordName, getWorldName(), moneyBack);
+					r = economy.withdrawPlayer(landlordName, getWorldName(), moneyBack);
 				}
 				if(r == null || !r.transactionSuccess()) {
 					noPayBack = true;
@@ -678,9 +708,9 @@ public class RentRegion extends GeneralRegion {
 				boolean error = false;
 				try {
 					if(player.getName() != null) {
-						r = plugin.getEconomy().depositPlayer(player, getWorldName(), moneyBack);
+						r = economy.depositPlayer(player, getWorldName(), moneyBack);
 					} else if(getPlayerName() != null) {
-						r = plugin.getEconomy().depositPlayer(getPlayerName(), getWorldName(), moneyBack);
+						r = economy.depositPlayer(getPlayerName(), getWorldName(), moneyBack);
 					}
 				} catch(Exception e) {
 					error = true;
@@ -700,13 +730,17 @@ public class RentRegion extends GeneralRegion {
 		// Remove friends, the owner and renteduntil values
 		getFriendsFeature().clearFriends();
 		UUID oldRenter = getRenter();
-		setRenter(null);
 		setRentedUntil(null);
 		setTimesExtended(-1);
 		removeLastActiveTime();
 
 		// Notify about updates
-		this.notifyAndUpdate(new UnrentedRegionEvent(this, oldRenter, Math.max(0, moneyBack)));
+		Bukkit.getPluginManager().callEvent(new UnrentedRegionEvent(this, oldRenter, Math.max(0, moneyBack)));
+		// Placed here so when event is passed, the player renting can still be accessed
+		setRenter(null);
+		// Update world (has to be after setting renter to null)
+		this.update();
+
 		return true;
 	}
 

AreaShop/src/main/java/me/wiefferink/areashop/tools/Analytics.java

@@ -1,143 +0,0 @@
-package me.wiefferink.areashop.tools;
-
-import me.wiefferink.areashop.AreaShop;
-import me.wiefferink.areashop.regions.BuyRegion;
-import me.wiefferink.areashop.regions.GeneralRegion;
-import me.wiefferink.areashop.regions.RentRegion;
-import org.bstats.Metrics;
-
-import java.util.HashMap;
-
-public class Analytics {
-
-	private Analytics() {
-
-	}
-
-	/**
-	 * Start analytics tracking.
-	 */
-	public static void start() {
-		// bStats statistics
-		try {
-			Metrics metrics = new Metrics(AreaShop.getInstance());
-
-			// Number of regions
-			metrics.addCustomChart(new Metrics.SingleLineChart("region_count") {
-				@Override
-				public int getValue() {
-					return AreaShop.getInstance().getFileManager().getRegions().size();
-				}
-			});
-
-			// Number of rental regions
-			metrics.addCustomChart(new Metrics.SingleLineChart("rental_region_count") {
-				@Override
-				public int getValue() {
-					return AreaShop.getInstance().getFileManager().getRents().size();
-				}
-			});
-
-			// Number of buy regions
-			metrics.addCustomChart(new Metrics.SingleLineChart("buy_region_count") {
-				@Override
-				public int getValue() {
-					return AreaShop.getInstance().getFileManager().getBuys().size();
-				}
-			});
-
-			// Language
-			metrics.addCustomChart(new Metrics.SimplePie("language") {
-				@Override
-				public String getValue() {
-					return AreaShop.getInstance().getConfig().getString("language");
-				}
-			});
-
-			// Pie with region states
-			metrics.addCustomChart(new Metrics.AdvancedPie("region_state") {
-				@Override
-				public HashMap<String, Integer> getValues(HashMap<String, Integer> result) {
-					RegionStateStats stats = getStateStats();
-					result.put("For Rent", stats.forrent);
-					result.put("Rented", stats.rented);
-					result.put("For Sale", stats.forsale);
-					result.put("Sold", stats.sold);
-					result.put("Reselling", stats.reselling);
-					return result;
-				}
-			});
-
-			// Time series of each region state
-			metrics.addCustomChart(new Metrics.SingleLineChart("forrent_region_count") {
-				@Override
-				public int getValue() {
-					return getStateStats().forrent;
-				}
-			});
-			metrics.addCustomChart(new Metrics.SingleLineChart("rented_region_count") {
-				@Override
-				public int getValue() {
-					return getStateStats().rented;
-				}
-			});
-			metrics.addCustomChart(new Metrics.SingleLineChart("forsale_region_count") {
-				@Override
-				public int getValue() {
-					return getStateStats().forsale;
-				}
-			});
-			metrics.addCustomChart(new Metrics.SingleLineChart("sold_region_count") {
-				@Override
-				public int getValue() {
-					return getStateStats().sold;
-				}
-			});
-			metrics.addCustomChart(new Metrics.SingleLineChart("reselling_region_count") {
-				@Override
-				public int getValue() {
-					return getStateStats().reselling;
-				}
-			});
-
-			// TODO track rent/buy/unrent/sell/resell actions (so that it can be reported per collection interval)
-
-			AreaShop.debug("Started bstats.org statistics service");
-		} catch(Exception e) {
-			AreaShop.debug("Could not start bstats.org statistics service");
-		}
-	}
-
-	private static class RegionStateStats {
-		int forrent = 0;
-		int forsale = 0;
-		int rented = 0;
-		int sold = 0;
-		int reselling = 0;
-	}
-
-	private static RegionStateStats getStateStats() {
-		RegionStateStats result = new RegionStateStats();
-		for(GeneralRegion region : AreaShop.getInstance().getFileManager().getRegions()) {
-			if(region instanceof RentRegion) {
-				RentRegion rent = (RentRegion)region;
-				if(rent.isAvailable()) {
-					result.forrent++;
-				} else {
-					result.rented++;
-				}
-			} else if(region instanceof BuyRegion) {
-				BuyRegion buy = (BuyRegion)region;
-				if(buy.isAvailable()) {
-					result.forsale++;
-				} else if(buy.isInResellingMode()) {
-					result.reselling++;
-				} else {
-					result.sold++;
-				}
-			}
-		}
-		return result;
-	}
-
-}

AreaShop/src/main/java/me/wiefferink/areashop/tools/BukkitSchedulerExecutor.java

@@ -0,0 +1,26 @@
+package me.wiefferink.areashop.tools;
+
+
+import org.bukkit.plugin.Plugin;
+import org.bukkit.scheduler.BukkitScheduler;
+import org.jetbrains.annotations.NotNull;
+
+import javax.inject.Inject;
+import java.util.concurrent.Executor;
+
+public class BukkitSchedulerExecutor implements Executor {
+
+    private final Plugin plugin;
+    private final BukkitScheduler scheduler;
+
+    @Inject
+    public BukkitSchedulerExecutor(@NotNull Plugin plugin, @NotNull BukkitScheduler scheduler) {
+        this.plugin = plugin;
+        this.scheduler = scheduler;
+    }
+
+    @Override
+    public void execute(@NotNull Runnable command) {
+        this.scheduler.runTask(this.plugin, command);
+    }
+}

AreaShop/src/main/java/me/wiefferink/areashop/tools/Materials.java

@@ -1,62 +1,11 @@
 package me.wiefferink.areashop.tools;
 
-import me.wiefferink.areashop.AreaShop;
-import org.bukkit.Bukkit;
 import org.bukkit.Material;
-
-import java.util.Arrays;
-import java.util.HashSet;
-import java.util.List;
+import org.bukkit.Tag;
 
 public class Materials {
 
 	private Materials() {
-
-	}
-
-	private static final HashSet<String> WALL_SIGN_TYPES = new HashSet<>(Arrays.asList(
-		// 1.14+ types
-		"ACACIA_WALL_SIGN",
-		"BIRCH_WALL_SIGN",
-		"DARK_OAK_WALL_SIGN",
-		"JUNGLE_WALL_SIGN",
-		"OAK_WALL_SIGN",
-		"SPRUCE_WALL_SIGN",
-
-		// Legacy types
-		"LEGACY_WALL_SIGN",
-		"WALL_SIGN"
-	));
-	private static final HashSet<String> FLOOR_SIGN_TYPES = new HashSet<>(Arrays.asList(
-		// 1.14+ types
-		"ACACIA_SIGN",
-		"BIRCH_SIGN",
-		"DARK_OAK_SIGN",
-		"JUNGLE_SIGN",
-		"OAK_SIGN",
-		"SPRUCE_SIGN",
-
-		// Legacy types
-		"LEGACY_SIGN",
-		"LEGACY_SIGN_POST",
-		"SIGN",
-		"SIGN_POST"
-	));
-
-	private static boolean legacyMaterials = false;
-
-	static {
-		List<String> legacyMaterialVersions = Arrays.asList("1.7", "1.8", "1.9", "1.10", "1.11", "1.12");
-		for(String legacyMaterialVersion : legacyMaterialVersions) {
-			String version = Bukkit.getBukkitVersion();
-			// Detects '1.8', '1.8.3', '1.8-pre1' style versions
-			if(version.equals(legacyMaterialVersion)
-					|| version.startsWith(legacyMaterialVersion + ".")
-					|| version.startsWith(legacyMaterialVersion + "-")) {
-				legacyMaterials = true;
-				break;
-			}
-		}
 	}
 
 	/**
@@ -69,46 +18,12 @@ public class Materials {
 		if (!isSign(name)) {
 			return null;
 		}
-
-		Material result = null;
-		if (legacyMaterials) {
-			// 1.12 and lower just know SIGN_POST, WALL_SIGN and SIGN
-			if (FLOOR_SIGN_TYPES.contains(name)) {
-				result = Material.getMaterial("SIGN_POST");
-			} else if (WALL_SIGN_TYPES.contains(name)) {
-				result = Material.getMaterial("WALL_SIGN");
-				if (result == null) {
-					result = Material.getMaterial("SIGN");
-				}
-			}
-		} else {
-			// Try saved name (works for wood types on 1.14, regular types for below)
-			result = Material.getMaterial(name);
-			if (result == null) {
-				// Cases for 1.13, which don't know wood types, but need new materials
-				if (FLOOR_SIGN_TYPES.contains(name)) {
-					// SIGN -> OAK_SIGN for 1.14
-					result = Material.getMaterial("OAK_SIGN");
-					// Fallback for 1.13
-					if (result == null) {
-						result = Material.getMaterial("SIGN");
-					}
-				} else if (WALL_SIGN_TYPES.contains(name)) {
-					// WALL_SIGN -> OAK_WALL_SIGN for 1.14
-					result = Material.getMaterial("OAK_WALL_SIGN");
-					// Fallback for 1.13
-					if (result == null) {
-						result = Material.getMaterial("WALL_SIGN");
-					}
-				}
-			}
+		try {
+			return Material.getMaterial(name);
+		} catch (IllegalArgumentException ex) {
+			ex.printStackTrace();
 		}
-
-		if (result == null) {
-			AreaShop.debug("Materials.get() null result:", name, "legacyMaterials:", legacyMaterials);
-		}
-
-		return result;
+		return null;
 	}
 
 	/**
@@ -117,7 +32,7 @@ public class Materials {
 	 * @return true if the given material is a sign
 	 */
 	public static boolean isSign(Material material) {
-		return isSign(material.name());
+		return Tag.SIGNS.isTagged(material);
 	}
 
 	/**
@@ -126,7 +41,11 @@ public class Materials {
 	 * @return true if the given material is a sign
 	 */
 	public static boolean isSign(String name) {
-		return name != null && (FLOOR_SIGN_TYPES.contains(name) || WALL_SIGN_TYPES.contains(name));
+		try {
+			return isSign(Material.getMaterial(name));
+		} catch (IllegalArgumentException ex) {
+			return false;
+		}
 	}
 
 }

AreaShop/src/main/java/me/wiefferink/areashop/tools/OperandParser.java

@@ -0,0 +1,152 @@
+package me.wiefferink.areashop.tools;
+
+/**
+ * Parse math from a string
+ * Adapted from:
+ * https://stackoverflow.com/questions/3422673/how-to-evaluate-a-math-expression-given-in-string-form
+ */
+public final class OperandParser {
+
+    private final String str;
+
+    private OperandParser(final String str) {
+        this.str = str;
+    }
+
+    public static double parse(final String str) throws ParseException {
+        return new OperandParser(str).parse();
+    }
+
+
+    private int pos = -1, ch;
+
+    private void nextChar() {
+        ch = (++pos < str.length()) ? str.charAt(pos) : -1;
+    }
+
+    private boolean eat(int charToEat) {
+        while (ch == ' ') nextChar();
+        if (ch == charToEat) {
+            nextChar();
+            return true;
+        }
+        return false;
+    }
+
+    private double parse() throws ParseException {
+        nextChar();
+        double x = parseExpression();
+        if (pos < str.length())
+        {
+            throw new ParseException("Unexpected: " + (char) ch);
+        }
+        return x;
+    }
+
+    // Grammar:
+    // expression = term | expression `+` term | expression `-` term
+    // term = factor | term `*` factor | term `/` factor
+    // factor = `+` factor | `-` factor | `(` expression `)`
+    //        | number | functionName factor | factor `^` factor
+
+    private double parseExpression() throws ParseException {
+        double x = parseTerm();
+        for (; ; ) {
+            if (eat('+')) {
+                // addition
+                x += parseTerm();
+            }
+            else if (eat('-')) {
+                // subtraction
+                x -= parseTerm();
+            }
+            else return x;
+        }
+    }
+
+    private double parseTerm() throws ParseException {
+        double x = parseFactor();
+        for (; ; ) {
+            if (eat('*')) {
+                // multiplication
+                x *= parseFactor();
+            }
+            else if (eat('/')) {
+                // division
+                x /= parseFactor();
+            }
+            else return x;
+        }
+    }
+
+    private double parseFactor() throws ParseException {
+        if (eat('+')) {
+            // unary plus
+            return parseFactor();
+        }
+        if (eat('-')) {
+            // unary minus
+            return -parseFactor();
+        }
+
+        double x;
+        int startPos = this.pos;
+        if (eat('(')) {
+            // parentheses
+            x = parseExpression();
+            eat(')');
+        } else if ((ch >= '0' && ch <= '9') || ch == '.') {
+            // numbers
+            while ((ch >= '0' && ch <= '9') || ch == '.') {
+                nextChar();
+            }
+            x = Double.parseDouble(str.substring(startPos, this.pos));
+        } else if (ch >= 'a' && ch <= 'z') {
+            // functions
+            while (ch >= 'a' && ch <= 'z') {
+                nextChar();
+            }
+            String func = str.substring(startPos, this.pos);
+            x = parseFactor();
+            x = switch (func) {
+                case "sqrt" -> Math.sqrt(x);
+                case "sin" -> Math.sin(Math.toRadians(x));
+                case "cos" -> Math.cos(Math.toRadians(x));
+                case "tan" -> Math.tan(Math.toRadians(x));
+                default -> throw new ParseException("Unknown function: " + func);
+            };
+        } else {
+            throw new ParseException("Unexpected: " + (char) ch);
+        }
+
+        if (eat('^')) {
+            // exponentiation
+            x = Math.pow(x, parseFactor());
+        }
+
+        return x;
+    }
+
+    public static class ParseException extends Exception {
+
+        public ParseException() {
+        }
+
+        public ParseException(String message) {
+            super(message);
+        }
+
+        public ParseException(String message, Throwable cause) {
+            super(message, cause);
+        }
+
+        public ParseException(Throwable cause) {
+            super(cause);
+        }
+
+        public ParseException(String message, Throwable cause, boolean enableSuppression, boolean writableStackTrace) {
+            super(message, cause, enableSuppression, writableStackTrace);
+        }
+    }
+
+}

AreaShop/src/main/java/me/wiefferink/areashop/tools/SignUtils.java

@@ -0,0 +1,97 @@
+package me.wiefferink.areashop.tools;
+
+import org.bukkit.block.Block;
+import org.bukkit.block.BlockFace;
+import org.bukkit.block.BlockState;
+import org.bukkit.block.data.BlockData;
+import org.bukkit.block.data.type.Sign;
+import org.bukkit.block.data.type.WallSign;
+
+/**
+ * Sign Utilities class
+ */
+public final class SignUtils {
+
+    private SignUtils() {
+
+    }
+
+    /**
+     * Get the {@link BlockFace} of a sign block
+     * If the passed {@link Block} is not an instance of either
+     * a {@link Sign} or {@link WallSign}, this method will return <code>null</code>
+     *
+     * @param block The sign
+     * @return Returns the {@link BlockFace} of the sign or <code>null</code>
+     */
+    public static BlockFace getSignFacing(Block block) {
+        if (block == null) {
+            return null;
+        }
+
+        BlockState blockState = block.getState();
+        BlockData blockData = blockState.getBlockData();
+
+        if (blockData instanceof WallSign wallSign) {
+            return wallSign.getFacing();
+        } else if (blockData instanceof org.bukkit.block.data.type.Sign sign) {
+            return sign.getRotation();
+        }
+        return null;
+    }
+
+    /**
+     * Set the {@link BlockFace} in which the sign will face
+     * If the passed {@link Block} is not an instance of either
+     * a {@link Sign} or {@link WallSign}, this method will return <code>null</code>.
+     *
+     * @param block  The sign block
+     * @param facing The new {@link BlockFace} the sign should face
+     * @return Returns <code>true</code> if the sign was successfully placed, <code>false</code> otherwise
+     */
+    public static boolean setSignFacing(Block block, BlockFace facing) {
+        if (block == null || facing == null) {
+            return false;
+        }
+
+        BlockState blockState = block.getState();
+        BlockData blockData = blockState.getBlockData();
+
+        if (blockData instanceof WallSign wallSign) {
+            wallSign.setFacing(facing);
+        } else if (blockData instanceof org.bukkit.block.data.type.Sign sign) {
+            sign.setRotation(facing);
+        } else {
+            return false;
+        }
+        block.setBlockData(blockData);
+        return true;
+    }
+
+    /**
+     * Get the {@link Block} which a given sign is attached to.
+     * This method will return <code>null</code> if the passed {@link Block}
+     * is not an instance of either a {@link Sign} or {@link WallSign}.
+     *
+     * @param block The sign {@link Block}
+     * @return Returns the block which the sign is attached to or null
+     */
+    public static Block getSignAttachedTo(Block block) {
+        if (block == null) {
+            return null;
+        }
+
+        BlockState blockState = block.getState();
+
+        BlockData blockData = blockState.getBlockData();
+
+        if (blockData instanceof WallSign wallSign) {
+            return block.getRelative(wallSign.getFacing().getOppositeFace());
+        } else if (blockData instanceof Sign) {
+            return block.getRelative(BlockFace.DOWN);
+        }
+
+        return null;
+    }
+
+}

AreaShop/src/main/java/me/wiefferink/areashop/tools/SimpleMessageBridge.java

@@ -0,0 +1,32 @@
+package me.wiefferink.areashop.tools;
+
+import com.google.inject.Singleton;
+import me.wiefferink.areashop.MessageBridge;
+import me.wiefferink.interactivemessenger.processing.Message;
+
+@Singleton
+public class SimpleMessageBridge implements 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
+     */
+    @Override
+    public void messageNoPrefix(Object target, String key, Object... replacements) {
+        Message.fromKey(key).replacements(replacements).send(target);
+    }
+
+    /**
+     * 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
+     */
+    @Override
+    public void message(Object target, String key, Object... replacements) {
+        Message.fromKey(key).prefix().replacements(replacements).send(target);
+    }
+
+}

AreaShop/src/main/java/me/wiefferink/areashop/tools/SpigotOfflinePlayerHelper.java

@@ -0,0 +1,42 @@
+package me.wiefferink.areashop.tools;
+
+import me.wiefferink.areashop.adapters.platform.OfflinePlayerHelper;
+import org.bukkit.OfflinePlayer;
+import org.bukkit.Server;
+import org.bukkit.plugin.Plugin;
+import org.jetbrains.annotations.NotNull;
+
+import java.util.Optional;
+import java.util.UUID;
+import java.util.concurrent.CompletableFuture;
+
+public class SpigotOfflinePlayerHelper implements OfflinePlayerHelper {
+
+    private final Plugin plugin;
+
+    public SpigotOfflinePlayerHelper(@NotNull Plugin plugin) {
+        this.plugin = plugin;
+    }
+
+    @Override
+    public CompletableFuture<Optional<UUID>> lookupUuidAsync(String username) {
+        return lookupOfflinePlayerAsync(username).thenApply(player -> {
+            if (player.hasPlayedBefore()) {
+                return Optional.of(player.getUniqueId());
+            }
+            return Optional.empty();
+        });
+    }
+
+    @Override
+    public CompletableFuture<OfflinePlayer> lookupOfflinePlayerAsync(String username) {
+        final CompletableFuture<OfflinePlayer> future = new CompletableFuture<>();
+        final Server server = this.plugin.getServer();
+        server.getScheduler().runTaskAsynchronously(this.plugin, () -> {
+            @SuppressWarnings("deprecation")
+            OfflinePlayer player = server.getOfflinePlayer(username);
+            future.complete(player);
+        });
+        return future;
+    }
+}

AreaShop/src/main/java/me/wiefferink/areashop/tools/SpigotPlatform.java

@@ -0,0 +1,20 @@
+package me.wiefferink.areashop.tools;
+
+import me.wiefferink.areashop.adapters.platform.MinecraftPlatform;
+import me.wiefferink.areashop.adapters.platform.OfflinePlayerHelper;
+import org.bukkit.plugin.Plugin;
+import org.jetbrains.annotations.NotNull;
+
+public class SpigotPlatform implements MinecraftPlatform {
+
+    private final OfflinePlayerHelper offlinePlayerHelper;
+
+    public SpigotPlatform(@NotNull Plugin plugin) {
+        this.offlinePlayerHelper = new SpigotOfflinePlayerHelper(plugin);
+    }
+
+    @Override
+    public OfflinePlayerHelper offlinePlayerHelper() {
+        return this.offlinePlayerHelper;
+    }
+}

AreaShop/src/main/java/me/wiefferink/areashop/tools/Utils.java

@@ -4,6 +4,7 @@ import com.sk89q.worldguard.protection.managers.RegionManager;
 import com.sk89q.worldguard.protection.regions.ProtectedRegion;
 import me.wiefferink.areashop.AreaShop;
 import me.wiefferink.areashop.interfaces.WorldEditSelection;
+import me.wiefferink.areashop.interfaces.WorldGuardInterface;
 import me.wiefferink.areashop.regions.BuyRegion;
 import me.wiefferink.areashop.regions.GeneralRegion;
 import me.wiefferink.areashop.regions.RentRegion;
@@ -22,9 +23,7 @@ import org.bukkit.configuration.file.YamlConfiguration;
 import org.bukkit.entity.Player;
 import org.bukkit.util.Vector;
 
-import javax.script.ScriptEngine;
-import javax.script.ScriptEngineManager;
-import javax.script.ScriptException;
+import javax.inject.Inject;
 import java.lang.reflect.Method;
 import java.math.BigDecimal;
 import java.math.RoundingMode;
@@ -45,6 +44,11 @@ public class Utils {
 	private Utils() {
 	}
 
+	@Inject
+	private static AreaShop plugin;
+	@Inject
+	private static WorldGuardInterface worldGuardInterface;
+
 	private static YamlConfiguration config;
 	private static Set<String> identifiers;
 	private static Set<String> seconds;
@@ -54,7 +58,6 @@ public class Utils {
 	private static Set<String> weeks;
 	private static Set<String> months;
 	private static Set<String> years;
-	private static ScriptEngine scriptEngine;
 	private static Map<Double, String> suffixes;
 
 	/**
@@ -321,7 +324,7 @@ public class Utils {
 	public static List<GeneralRegion> getRegionsInSelection(WorldEditSelection selection) {
 		ArrayList<GeneralRegion> result = new ArrayList<>();
 		for(ProtectedRegion region : getWorldEditRegionsInSelection(selection)) {
-			GeneralRegion asRegion = AreaShop.getInstance().getFileManager().getRegion(region.getId());
+			GeneralRegion asRegion = plugin.getFileManager().getRegion(region.getId());
 			if(asRegion != null) {
 				result.add(asRegion);
 			}
@@ -346,13 +349,13 @@ public class Utils {
 	public static List<ProtectedRegion> getWorldEditRegionsInSelection(WorldEditSelection selection) {
 		// Get all regions inside or intersecting with the WorldEdit selection of the player
 		World world = selection.getWorld();
-		RegionManager regionManager = AreaShop.getInstance().getRegionManager(world);
+		RegionManager regionManager = plugin.getRegionManager(world);
 		ArrayList<ProtectedRegion> result = new ArrayList<>();
 		Location selectionMin = selection.getMinimumLocation();
 		Location selectionMax = selection.getMaximumLocation();
 		for(ProtectedRegion region : regionManager.getRegions().values()) {
-			Vector regionMin = AreaShop.getInstance().getWorldGuardHandler().getMinimumPoint(region);
-			Vector regionMax = AreaShop.getInstance().getWorldGuardHandler().getMaximumPoint(region);
+			Vector regionMin = worldGuardInterface.getMinimumPoint(region);
+			Vector regionMax = worldGuardInterface.getMaximumPoint(region);
 			if(
 					(      // x part, resolves to true if the selection and region overlap anywhere on the x-axis
 							(regionMin.getBlockX() <= selectionMax.getBlockX() && regionMin.getBlockX() >= selectionMin.getBlockX())
@@ -385,7 +388,7 @@ public class Utils {
 	 */
 	public static List<ProtectedRegion> getImportantWorldEditRegions(Location location) {
 		List<ProtectedRegion> result = new ArrayList<>();
-		Set<ProtectedRegion> regions = AreaShop.getInstance().getWorldGuardHandler().getApplicableRegionsSet(location);
+		Set<ProtectedRegion> regions = worldGuardInterface.getApplicableRegionsSet(location);
 		if(regions != null) {
 			boolean first = true;
 			for(ProtectedRegion pr : regions) {
@@ -455,11 +458,11 @@ public class Utils {
 	 */
 	public static List<GeneralRegion> getImportantRegions(Location location, GeneralRegion.RegionType type) {
 		List<GeneralRegion> result = new ArrayList<>();
-		Set<ProtectedRegion> regions = AreaShop.getInstance().getWorldGuardHandler().getApplicableRegionsSet(location);
+		Set<ProtectedRegion> regions = worldGuardInterface.getApplicableRegionsSet(location);
 		if(regions != null) {
 			List<GeneralRegion> candidates = new ArrayList<>();
 			for(ProtectedRegion pr : regions) {
-				GeneralRegion region = AreaShop.getInstance().getFileManager().getRegion(pr.getId());
+				GeneralRegion region = plugin.getFileManager().getRegion(pr.getId());
 				if(region != null && (
 						(type == GeneralRegion.RegionType.RENT && region instanceof RentRegion)
 								|| (type == GeneralRegion.RegionType.BUY && region instanceof BuyRegion)
@@ -755,16 +758,11 @@ public class Utils {
 			return Double.parseDouble(input);
 		}
 
-		// Lazy init scriptEngine
-		if(scriptEngine == null) {
-			scriptEngine = new ScriptEngineManager().getEngineByName("JavaScript");
-		}
-
 		// Evaluate expression
 		Object result;
 		try {
-			result = scriptEngine.eval(input);
-		} catch(ScriptException e) {
+			result = OperandParser.parse(input);
+		} catch(OperandParser.ParseException e) {
 			AreaShop.warn("Price of region", region.getName(), "is set with an invalid expression: '" + input + "', exception:", ExceptionUtils.getStackTrace(e));
 			return 99999999999.0; // High fallback for safety
 		}

AreaShop/src/main/resources/config.yml

@@ -121,6 +121,10 @@ debug: false
 version: ${project.version}
 # Maximum number of blocks to save to or restore from a .schemetic file.
 maximumBlocks: 1000000
+# Whether to forcefully clear "hanging" entities (painting, itemframes, etc.) on region restore
+# Only enable this option if hanging entities at the destination aren't removed on restore normally
+# If set to true, there may be a performance impact when performing region restores.
+forceClearEntities: false
 # Maximum number of locations the teleport function should check to find a safe spot.
 maximumTries: 50000
 

AreaShop/src/main/resources/lang/EN.yml

@@ -619,7 +619,7 @@ greeting-resale: "%region% can be bought for %resellprice% from %player%."
 
 update-playerNotify:
   - "[darkgreen]Update from AreaShop V%0% to AreaShop V%1% available, get the latest version at "
-  - "[bold]Spigot[/bold]"
-  - "    hover: %lang:action|Go to the Spigot AreaShop page|%"
-  - "    link: https://www.spigotmc.org/resources/areashop.2991/"
+  - "[bold]Github[/bold]"
+  - "    hover: %lang:action|Go to the AreaShop Github Releases|%"
+  - "    link: https://github.com/md5sha256/releases"
   - " (and leave a review)."

AreaShop/src/main/resources/plugin.yml

@@ -1,11 +1,11 @@
 name: AreaShop
 main: me.wiefferink.areashop.AreaShop
-version: "${project.version}${build.number}"
+version: "${version}"
 description: "Selling and renting WorldGuard regions to your players, highly configurable."
 depend: [Vault, WorldGuard, WorldEdit]
 softdepend: [Multiverse-Core, FastAsyncWorldEdit]
 author: NLThijs48
-website: https://github.com/NLthijs48/AreaShop
+website: https://github.com/md5sha256/AreaShop
 commands:
   AreaShop:
     description: 'For all commands use /as help.'
@@ -13,7 +13,7 @@ commands:
     aliases: [as]
 awareness:
   - !@UTF8
-api-version: 1.13
+api-version: 1.17
 permissions:
   areashop.*:
     description: Give access to all commands of AreaShop

README.md

@@ -1,6 +1,6 @@
 ![AreaShop logo](https://cloud.githubusercontent.com/assets/6951068/9471294/f016d8ee-4b4f-11e5-9bda-d61b1c423ebb.png)<br/>
 **Usage and configuration:**
-[►Download (releases)](https://github.com/NLthijs48/AreaShop/releases)&nbsp;&nbsp;
+[►Download (releases)](https://github.com/md5sha256/AreasShop/releases)&nbsp;&nbsp;
 [►Commands and Permissions](https://github.com/NLthijs48/AreaShop/wiki/Commands-and-Permissions)
 <br/>&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;
 [►Basic regions setup](https://github.com/NLthijs48/AreaShop/wiki/Basic-regions-setup)&nbsp;&nbsp;
@@ -14,11 +14,10 @@
 [►Frequently Asked Questions](https://github.com/NLthijs48/AreaShop/wiki/Frequently-Asked-Questions)&nbsp;&nbsp;
 [►Common errors](https://github.com/NLthijs48/AreaShop/wiki/Common-errors)<br/>
 **Support:**
-[►Request a feature, report a bug or ask support](https://github.com/NLthijs48/AreaShop/issues/new/choose)&nbsp;&nbsp;
-[►Open issues](https://github.com/NLthijs48/AreaShop/issues)<br/>
+[►Request a feature, report a bug or ask support](https://github.com/md5sha256/AreasShop/issues/new/choose)&nbsp;&nbsp;
+[►Open issues](https://github.com/md5sha256/AreasShop/issues)<br/>
 **Development:**
-[►Changelog](https://github.com/NLthijs48/AreaShop/blob/master/changelog.md)&nbsp;&nbsp;
-[►Compiling](https://github.com/NLthijs48/AreaShop/wiki/Compiling-AreaShop)&nbsp;&nbsp;
+[►Compiling](https://github.com/md5sha256/AreaShop/tree/dev/bleeding/documentation/compiling.md)&nbsp;&nbsp;
 [►Modules/classes overview](https://github.com/NLthijs48/AreaShop/wiki/Modules,-packages-and-classes-overview)
 [►Javadocs](https://wiefferink.me/AreaShop/javadocs/)
 [►Development builds](http://jenkins.wiefferink.me/job/AreaShop)<br/>
@@ -26,7 +25,19 @@
 [►AreaShop in Spigot Resources](http://www.spigotmc.org/resources/areashop.2991/)&nbsp;&nbsp;
 [►AreaShop on BukkitDev](http://dev.bukkit.org/bukkit-plugins/regionbuyandrent/)
 
-***
+### Required dependencies
+* Java 17 or higher (latest recommended)
+* Bukkit/Spigot 1.17.2 or newer (hybrids such as Mohist are not supported)
+* [WorldGuard](http://dev.bukkit.org/bukkit-plugins/worldguard/): 7.0.7 or newer
+* [WorldEdit](http://dev.bukkit.org/bukkit-plugins/worldedit/): 7.2.12 or newer
+* [Vault](http://dev.bukkit.org/bukkit-plugins/vault/): 1.7.3 or higher
+* An economy plugin supported by Vault (check the [Vault page](http://dev.bukkit.org/bukkit-plugins/vault/) for a list of these)
+
+### Optional Dependencies
+* [FastAsyncWorldEdit](https://www.spigotmc.org/resources/fastasyncworldedit.13932/) 2.4.5 or newer (Note: Use either FAWE or WE, not both together) 
+  * AreaShop has a separate adapter for FAWE which leverages its support for asynchronous edit operations. This adapter is used for region saving and restoring. 
+  * Note that schematics created by the FAWE adapter are not compatible with normal WorldEdit; however, schematics created by the normal WorldEdit adapter are compatible with FAWE
+  * Due to a bug with FAWE, entities are not saved by the FAWE adapter but are saved in the normal WE adapter
 
 AreaShop allows you selling and renting regions to players. It could be used to let them rent a jail in your prison server, a shop in the market of the survival server or a plot on a creative server. The player interacts with signs, making it easy to use. It also has a lot of commands to check the status of all regions, manage the renting and buying of a region and also features for admins. A lot of messages send to the player can be clicked, for immediately performing actions (buying the region, selling the region, etc.) or getting more information (for example clicking region name for region information). To setup the renting and selling of the regions exactly as you want AreaShop has a lot of options to custimize it to your liking.
 
@@ -36,7 +47,7 @@ AreaShop allows you selling and renting regions to players. It could be used to
 * ![rented-sign](https://cloud.githubusercontent.com/assets/6951068/21939029/3844896a-d9be-11e6-8492-7a23ec71fce2.png)
 * Messages that can be clicked for more information and actions ([language](https://github.com/NLthijs48/AreaShop/wiki/Language-support) can be changed, as well as click/hover actions).
 * ![region-information-message](https://cloud.githubusercontent.com/assets/6951068/21939161/bff2fe3c-d9be-11e6-802f-4a0bce073c64.png)
-* Change the  of the plugin or use of of the already provided language files (check [here](https://github.com/NLthijs48/AreaShop/tree/master/AreaShop/src/main/resources/lang))
+* Change the  of the plugin or use of the already provided language files (check [here](https://github.com/md5sha256/AreasShop/tree/dev/bleeding/AreaShop/src/main/resources/lang))
 * Automatically restore the region to its original state when sold: [restore](https://github.com/NLthijs48/AreaShop/wiki/Region-blocks-save-restore) the region with schematics.
 * Change which [commands](https://github.com/NLthijs48/AreaShop/wiki/Commands-and-Permissions) players can use with [permissions](https://github.com/NLthijs48/AreaShop/wiki/Commands-and-Permissions).
 * Customize the plugin by changing the [config files](https://github.com/NLthijs48/AreaShop/wiki/The-config-system).
@@ -61,28 +72,4 @@ For a preview join 'mc.go-craft.com' and go to the Survival server, the shops ar
 **Made by [PerkulatorTime](https://www.youtube.com/user/PerkulatorTime)**<br/>
 [![Tutorial Video](https://cloud.githubusercontent.com/assets/6951068/9532788/147526cc-4d0e-11e5-9672-1274faae280a.png)](https://www.youtube.com/watch?v=OQOsOG-EdNc)
 
-Old video for AreaShop v1.0: [Tutorial by VariationVault](https://www.youtube.com/watch?v=k2HMCxCCOYo)
-
-### Required dependencies
-* Java 7 or higher (latest recommended)
-* Bukkit/Spigot 1.7.9 or higher (modded servers often include Bukkit/Spigot support, so it should also work on that, but it is not specifically tested for it)
-* [WorldGuard](http://dev.bukkit.org/bukkit-plugins/worldguard/): 5.9 or higher (6.0+ recommended)
-* [WorldEdit](http://dev.bukkit.org/bukkit-plugins/worldedit/): 5.6.3 or higher (6.0+ recommended)
-* [Vault](http://dev.bukkit.org/bukkit-plugins/vault/): 1.4.1 or higher
-* An economy plugin supported by Vault (check the [Vault page](http://dev.bukkit.org/bukkit-plugins/vault/) for a list of these)
-
-### Metrics
-This plugin utilizes Hidendra's plugin metrics system, which means that the following information is collected and sent to mcstats.org:
-
-*A unique identifier, the server's version of Java, whether the server is in offline or online mode, the plugin's version, the server's version, the OS version/name and architecture, the core count for the CPU, the number of players online, the Metrics version.*
-
-This information will give me an indication how much the plugin is used and encourages me to continue development. Opting out of this service can be done by setting `sendStats` in the config of this plugin to `false`, if you want to disable Metrics for any plugin go to `plugins/Plugin Metrics/config.yml` and change `opt-out` to `true`. Check graphs of the statistics at this page: [mcstats.org/plugin/AreaShop](http://mcstats.org/plugin/AreaShop)
-
-### Do you want to translate AreaShop?
-Help translating the plugin into different languages and to keep the translations up to date. Go to [this page](https://github.com/NLthijs48/AreaShop/wiki/Language-support#translating-on-transifex) for more information. Translating goes through the [Transifex](https://www.transifex.com/projects/p/areashop/) website and is very easy, sending files back and forth is not needed, you can translate lines online and whenever you want. Every line you translate will be saved, no need to do it all at once (this also allows for easy collaboration).
-
-![Transifex-translation-progress](https://transifex.com/projects/p/areashop/resource/enyml/chart/image_png)
-
-[![Discord-support-chat](https://discordapp.com/api/v6/guilds/342592311122853893/widget.png?style=banner3)](https://discord.gg/84kGMCQ)
-
-[![Donate through PayPal to support development](https://www.paypal.com/en_US/i/btn/btn_donate_LG.gif)](https://www.paypal.com/cgi-bin/webscr?cmd=_s-xclick&hosted_button_id=VEECV88NG3L5C)
+Old video for AreaShop v1.0: [Tutorial by VariationVault](https://www.youtube.com/watch?v=k2HMCxCCOYo)

adapters/platform/bukkit-1-17/build.gradle.kts

@@ -0,0 +1,22 @@
+plugins.apply("io.papermc.paperweight.userdev")
+
+dependencies {
+    paperDevBundle("1.17.1-R0.1-SNAPSHOT")
+    compileOnly(projects.areashopInterface)
+    compileOnly(projects.areashopNms)
+}
+
+
+description = "AreaShop NMS Helper 1-17"
+
+tasks {
+
+    assemble {
+        dependsOn("reobfJar")
+    }
+
+    named("reobfJar", io.papermc.paperweight.tasks.RemapJar::class) {
+        outputJar.set(file("build/libs/${project.name}-${project.version}.jar"))
+    }
+
+}

adapters/platform/bukkit-1-17/src/main/java/me/wiefferink/areashop/adapters/platform/v1_17_R1/BlockBehaviourImpl.java

@@ -0,0 +1,46 @@
+package me.wiefferink.areashop.adapters.platform.v1_17_R1;
+
+import me.wiefferink.areashop.nms.BlockBehaviourHelper;
+import net.minecraft.core.BlockPos;
+import net.minecraft.server.level.ServerLevel;
+import net.minecraft.world.level.block.state.BlockState;
+import org.bukkit.Location;
+import org.bukkit.block.Block;
+import org.bukkit.block.data.BlockData;
+import org.bukkit.craftbukkit.v1_17_R1.CraftWorld;
+import org.bukkit.craftbukkit.v1_17_R1.block.CraftBlock;
+import org.bukkit.craftbukkit.v1_17_R1.block.CraftBlockState;
+import org.bukkit.craftbukkit.v1_17_R1.block.data.CraftBlockData;
+
+import java.util.Objects;
+
+public class BlockBehaviourImpl implements BlockBehaviourHelper {
+
+    @Override
+    public boolean canPlace(Location location, BlockData blockData) {
+        Objects.requireNonNull(location.getWorld(), "Null World!");
+        final BlockPos blockPos = new BlockPos(location.getX(), location.getY(), location.getZ());
+        final CraftWorld craftWorld = (CraftWorld) location.getWorld();
+        final ServerLevel world = craftWorld.getHandle();
+        final CraftBlockData craftBlockData = (CraftBlockData) blockData;
+        final BlockState ibd = craftBlockData.getState();
+        return ibd.canSurvive(world, blockPos);
+    }
+
+    @Override
+    public boolean isBlockValid(Block block) {
+        final CraftBlock craftBlock = (CraftBlock) block;
+        final CraftWorld craftWorld = (CraftWorld) craftBlock.getWorld();
+        final ServerLevel world = craftWorld.getHandle();
+        final BlockState ibd = craftBlock.getNMS();
+        return ibd.canSurvive(world, craftBlock.getPosition());
+    }
+
+    @Override
+    public boolean isBlockStateValid(org.bukkit.block.BlockState blockState) {
+        final CraftBlockState craftBlockState = (CraftBlockState) blockState;
+        final BlockState ibd = craftBlockState.getHandle();
+        return ibd.canSurvive(craftBlockState.getBlock().getCraftWorld().getHandle(), craftBlockState.getPosition());
+    }
+
+}

adapters/platform/bukkit-1-17/src/main/java/me/wiefferink/areashop/adapters/platform/v1_17_R1/NMSImpl.java

@@ -0,0 +1,15 @@
+package me.wiefferink.areashop.adapters.platform.v1_17_R1;
+
+import me.wiefferink.areashop.nms.BlockBehaviourHelper;
+import me.wiefferink.areashop.nms.NMS;
+
+public class NMSImpl implements NMS {
+
+    private final BlockBehaviourImpl blockBehaviourHelper = new BlockBehaviourImpl();
+
+    @Override
+    public BlockBehaviourHelper blockBehaviourHelper() {
+        return this.blockBehaviourHelper;
+    }
+
+}

adapters/platform/bukkit-1-18/build.gradle.kts

@@ -0,0 +1,21 @@
+plugins.apply("io.papermc.paperweight.userdev")
+
+dependencies {
+    paperDevBundle("1.18.2-R0.1-SNAPSHOT")
+    compileOnly(projects.areashopInterface)
+    compileOnly(projects.areashopNms)
+}
+
+description = "AreaShop NMS Helper 1-18"
+
+tasks {
+
+    assemble {
+        dependsOn("reobfJar")
+    }
+
+    named("reobfJar", io.papermc.paperweight.tasks.RemapJar::class) {
+        outputJar.set(file("build/libs/${project.name}-${project.version}.jar"))
+    }
+
+}

adapters/platform/bukkit-1-18/src/main/java/me/wiefferink/areashop/adapters/platform/v1_18_R2/BlockBehaviourImpl.java

@@ -0,0 +1,46 @@
+package me.wiefferink.areashop.adapters.platform.v1_18_R2;
+
+import me.wiefferink.areashop.nms.BlockBehaviourHelper;
+import net.minecraft.core.BlockPos;
+import net.minecraft.server.level.ServerLevel;
+import net.minecraft.world.level.block.state.BlockState;
+import org.bukkit.Location;
+import org.bukkit.block.Block;
+import org.bukkit.block.data.BlockData;
+import org.bukkit.craftbukkit.v1_18_R2.CraftWorld;
+import org.bukkit.craftbukkit.v1_18_R2.block.CraftBlock;
+import org.bukkit.craftbukkit.v1_18_R2.block.CraftBlockState;
+import org.bukkit.craftbukkit.v1_18_R2.block.data.CraftBlockData;
+
+import java.util.Objects;
+
+public class BlockBehaviourImpl implements BlockBehaviourHelper {
+
+    @Override
+    public boolean canPlace(Location location, BlockData blockData) {
+        Objects.requireNonNull(location.getWorld(), "Null World!");
+        final BlockPos blockPosition = new BlockPos(location.getX(), location.getY(), location.getZ());
+        final CraftWorld craftWorld = (CraftWorld) location.getWorld();
+        final ServerLevel world = craftWorld.getHandle();
+        final CraftBlockData craftBlockData = (CraftBlockData) blockData;
+        final BlockState ibd = craftBlockData.getState();
+        return ibd.canSurvive(world, blockPosition);
+    }
+
+    @Override
+    public boolean isBlockValid(Block block) {
+        final CraftBlock craftBlock = (CraftBlock) block;
+        final CraftWorld craftWorld = (CraftWorld) craftBlock.getWorld();
+        final ServerLevel world = craftWorld.getHandle();
+        final BlockState ibd = craftBlock.getNMS();
+        return ibd.canSurvive(world, craftBlock.getPosition());
+    }
+
+    @Override
+    public boolean isBlockStateValid(org.bukkit.block.BlockState blockState) {
+        final CraftBlockState craftBlockState = (CraftBlockState) blockState;
+        final BlockState ibd = craftBlockState.getHandle();
+        return ibd.canSurvive(craftBlockState.getBlock().getCraftWorld().getHandle(), craftBlockState.getPosition());
+    }
+
+}

adapters/platform/bukkit-1-18/src/main/java/me/wiefferink/areashop/adapters/platform/v1_18_R2/NMSImpl.java

@@ -0,0 +1,15 @@
+package me.wiefferink.areashop.adapters.platform.v1_18_R2;
+
+import me.wiefferink.areashop.nms.BlockBehaviourHelper;
+import me.wiefferink.areashop.nms.NMS;
+
+public class NMSImpl implements NMS {
+
+    private final BlockBehaviourImpl blockBehaviourHelper = new BlockBehaviourImpl();
+
+    @Override
+    public BlockBehaviourHelper blockBehaviourHelper() {
+        return this.blockBehaviourHelper;
+    }
+
+}

adapters/platform/bukkit-1-19/build.gradle.kts

@@ -0,0 +1,21 @@
+plugins.apply("io.papermc.paperweight.userdev")
+
+dependencies {
+    paperDevBundle("1.19.4-R0.1-SNAPSHOT")
+    compileOnly(projects.areashopInterface)
+    compileOnly(projects.areashopNms)
+}
+
+description = "AreaShop NMS Helper 1-19"
+
+tasks {
+
+    assemble {
+        dependsOn("reobfJar")
+    }
+
+    named("reobfJar", io.papermc.paperweight.tasks.RemapJar::class) {
+        outputJar.set(file("build/libs/${project.name}-${project.version}.jar"))
+    }
+
+}

adapters/platform/bukkit-1-19/src/main/java/me/wiefferink/areashop/adapters/platform/v1_19_R3/BlockBehaviourImpl.java

@@ -0,0 +1,46 @@
+package me.wiefferink.areashop.adapters.platform.v1_19_R3;
+
+import me.wiefferink.areashop.nms.BlockBehaviourHelper;
+import net.minecraft.core.BlockPos;
+import net.minecraft.server.level.ServerLevel;
+import net.minecraft.world.level.block.state.BlockState;
+import org.bukkit.Location;
+import org.bukkit.block.Block;
+import org.bukkit.block.data.BlockData;
+import org.bukkit.craftbukkit.v1_19_R3.CraftWorld;
+import org.bukkit.craftbukkit.v1_19_R3.block.CraftBlock;
+import org.bukkit.craftbukkit.v1_19_R3.block.CraftBlockState;
+import org.bukkit.craftbukkit.v1_19_R3.block.data.CraftBlockData;
+
+import java.util.Objects;
+
+public class BlockBehaviourImpl implements BlockBehaviourHelper {
+
+    @Override
+    public boolean canPlace(Location location, BlockData blockData) {
+        Objects.requireNonNull(location.getWorld(), "Null World!");
+        final BlockPos blockPosition = new BlockPos(location.getBlockX(), location.getBlockY(), location.getBlockZ());
+        final CraftWorld craftWorld = (CraftWorld) location.getWorld();
+        final ServerLevel world = craftWorld.getHandle();
+        final CraftBlockData craftBlockData = (CraftBlockData) blockData;
+        final BlockState ibd = craftBlockData.getState();
+        return ibd.canSurvive(world, blockPosition);
+    }
+
+    @Override
+    public boolean isBlockValid(Block block) {
+        final CraftBlock craftBlock = (CraftBlock) block;
+        final CraftWorld craftWorld = (CraftWorld) craftBlock.getWorld();
+        final ServerLevel world = craftWorld.getHandle();
+        final BlockState ibd = craftBlock.getNMS();
+        return ibd.canSurvive(world, craftBlock.getPosition());
+    }
+
+    @Override
+    public boolean isBlockStateValid(org.bukkit.block.BlockState blockState) {
+        final CraftBlockState craftBlockState = (CraftBlockState) blockState;
+        final BlockState ibd = craftBlockState.getHandle();
+        return ibd.canSurvive(craftBlockState.getBlock().getCraftWorld().getHandle(), craftBlockState.getPosition());
+    }
+
+}

adapters/platform/bukkit-1-19/src/main/java/me/wiefferink/areashop/adapters/platform/v1_19_R3/NMSImpl.java

@@ -0,0 +1,15 @@
+package me.wiefferink.areashop.adapters.platform.v1_19_R3;
+
+import me.wiefferink.areashop.nms.BlockBehaviourHelper;
+import me.wiefferink.areashop.nms.NMS;
+
+public class NMSImpl implements NMS {
+
+    private final BlockBehaviourImpl blockBehaviourHelper = new BlockBehaviourImpl();
+
+    @Override
+    public BlockBehaviourHelper blockBehaviourHelper() {
+        return this.blockBehaviourHelper;
+    }
+
+}

adapters/platform/paper/build.gradle.kts

@@ -0,0 +1,6 @@
+description = "AreaShop Paper Helper"
+
+dependencies {
+    compileOnlyApi(libs.paper)
+    compileOnlyApi(projects.adapters.platform.platformInterface)
+}

adapters/platform/paper/src/main/java/me/wiefferink/areashop/adapters/platform/paper/PaperOfflinePlayerHelper.java

@@ -0,0 +1,44 @@
+package me.wiefferink.areashop.adapters.platform.paper;
+
+import com.destroystokyo.paper.profile.PlayerProfile;
+import me.wiefferink.areashop.adapters.platform.OfflinePlayerHelper;
+import org.bukkit.OfflinePlayer;
+import org.bukkit.Server;
+import org.bukkit.plugin.Plugin;
+
+import java.util.Optional;
+import java.util.UUID;
+import java.util.concurrent.CompletableFuture;
+
+public class PaperOfflinePlayerHelper implements OfflinePlayerHelper {
+
+    private final Plugin plugin;
+    private final Server server;
+
+    public PaperOfflinePlayerHelper(Plugin plugin) {
+        this.plugin = plugin;
+        this.server = plugin.getServer();
+    }
+
+    @Override
+    public CompletableFuture<Optional<UUID>> lookupUuidAsync(String username) {
+        final PlayerProfile profile = this.server.createProfile(username);
+        final CompletableFuture<Optional<UUID>> future = new CompletableFuture<>();
+        this.server.getScheduler().runTaskAsynchronously(this.plugin, () -> {
+            profile.complete(false);
+            future.complete(Optional.ofNullable(profile.getId()));
+        });
+        return future;
+    }
+
+    @Override
+    public CompletableFuture<OfflinePlayer> lookupOfflinePlayerAsync(String username) {
+        final CompletableFuture<OfflinePlayer> future = new CompletableFuture<>();
+        this.server.getScheduler().runTaskAsynchronously(this.plugin, () -> {
+            @SuppressWarnings("deprecation")
+            OfflinePlayer offlinePlayer = plugin.getServer().getOfflinePlayer(username);
+            future.complete(offlinePlayer);
+        });
+        return future;
+    }
+}

adapters/platform/paper/src/main/java/me/wiefferink/areashop/adapters/platform/paper/PaperPlatform.java

@@ -0,0 +1,20 @@
+package me.wiefferink.areashop.adapters.platform.paper;
+
+import me.wiefferink.areashop.adapters.platform.OfflinePlayerHelper;
+import me.wiefferink.areashop.adapters.platform.MinecraftPlatform;
+import org.bukkit.plugin.Plugin;
+import org.jetbrains.annotations.NotNull;
+
+public class PaperPlatform implements MinecraftPlatform {
+
+    private final OfflinePlayerHelper offlinePlayerHelper;
+
+    public PaperPlatform(@NotNull Plugin plugin) {
+        this.offlinePlayerHelper = new PaperOfflinePlayerHelper(plugin);
+    }
+
+    @Override
+    public OfflinePlayerHelper offlinePlayerHelper() {
+        return this.offlinePlayerHelper;
+    }
+}