bump to 2.7.6

.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

.github/workflows/maven.yml

@@ -1,38 +0,0 @@
-name : "build"
-
-on : [ "pull_request", "push" ]
-
-jobs :
-  build :
-    strategy :
-      matrix :
-        java : [ 16 ]
-        # java: ["1.8", "11"]
-        os : [ "ubuntu-18.04" ]
-    runs-on : "${{ matrix.os }}"
-    steps :
-      - name : "Checkout Repository"
-        uses : "actions/checkout@v2.3.4"
-
-      - name : "Checkout submodules"
-        uses : "srt32/git-actions@v0.0.3"
-        with :
-          args : "git submodule update --init --recursive"
-
-      - name : "Restore Gradle cache"
-        uses : "actions/cache@v2"
-        with :
-          path : "~/.gradle/caches"
-          key : "${{ runner.os }}-gradle-${{ hashFiles('**/*.gradle*') }}"
-          restore-keys : |
-            ${{ runner.os }}-gradle-
-      - name : "Setup JDK ${{ matrix.java }}"
-        uses : "actions/setup-java@v1.4.3"
-        with :
-          java-version : "${{ matrix.java }}"
-
-      - name : "Grant execute permission for gradlew"
-        run : "chmod +x gradlew"
-
-      - name : "Build with Gradle"
-        run : "./gradlew clean build"

.gitignore

@@ -1,32 +1,180 @@
-### Maven ###
-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
@@ -42,3 +190,5 @@ gradle-app.setting
 
 ### Gradle Patch ###
 **/build/
+
+# End of https://www.toptal.com/developers/gitignore/api/macos,windows,intellij+all,gradle,maven

AreaShop/build.gradle

@@ -1,60 +0,0 @@
-import org.apache.tools.ant.filters.ReplaceTokens
-
-plugins {
-    id 'java-library'
-    id 'com.github.johnrengelman.shadow' version '7.0.0'
-}
-
-description = 'AreaShop'
-version = '2.6.5'
-
-dependencies {
-    // Spigot api
-    compileOnly 'org.spigotmc:spigot-api:1.16.5-R0.1-SNAPSHOT'
-
-    // Libs
-    implementation 'com.github.NLthijs48:InteractiveMessenger:e7749258ca'
-    implementation 'co.aikar:taskchain-bukkit:3.7.2'
-    implementation 'io.papermc:paperlib:1.0.6'
-
-    // Hooks
-    implementation project(':areashop-interface')
-    implementation project(':areashop-worldguard-7')
-    implementation project(':areashop-worldedit-7')
-    implementation project(':areashop-fawe-1-16')
-    implementation project(':areashop-fawe-1-17')
-    implementation project(':areashop-nms-1-16-5')
-    implementation project(':areashop-nms-1-17')
-
-    // Runtime plugins
-    compileOnly 'com.sk89q.worldedit:worldedit-bukkit:7.2.5'
-    compileOnly 'com.sk89q.worldguard:worldguard-bukkit:7.0.5'
-    compileOnly 'com.github.MilkBowl:VaultAPI:1.7'
-}
-
-processResources {
-
-    from (sourceSets.main.resources) {
-        filter ReplaceTokens, tokens: [version: project.version]
-        duplicatesStrategy(DuplicatesStrategy.INCLUDE)
-    }
-}
-
-assemble {
-    dependsOn(shadowJar)
-}
-
-jar {
-    archiveBaseName.set('AreaShop')
-    classifier('original')
-}
-
-shadowJar {
-    archiveBaseName.set('AreaShop')
-    String relocationBase = 'me.wiefferink.areashop.shaded'
-    classifier('')
-    relocate('co.aikar.taskchain', "${relocationBase}.taskchain")
-    relocate('me.wiefferink.interactivemessenger', "${relocationBase}.interactivemessenger")
-    relocate('org.bstats', "${relocationBase}.bstats")
-    relocate('io.papermc', "${relocationBase}.papermc")
-}

AreaShop/build.gradle.kts

@@ -0,0 +1,95 @@
+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.areashopBukkit113)
+    implementation(projects.areashopNms)
+    // 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-18-1", "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/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,28 +2,53 @@ 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;
 import org.bukkit.Bukkit;
 import org.bukkit.OfflinePlayer;
 import org.bukkit.World;
 import org.bukkit.command.CommandSender;
 import org.bukkit.entity.Player;
 
-import java.util.*;
+import javax.inject.Inject;
+import javax.inject.Singleton;
+import java.util.ArrayList;
+import java.util.Calendar;
+import java.util.HashMap;
+import java.util.List;
+import java.util.Map;
+import java.util.TreeSet;
+import java.util.UUID;
 import java.util.stream.Collectors;
 
+@Singleton
 public class AddCommand extends CommandAreaShop {
 
+	@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";
@@ -52,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<>();
@@ -68,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 {
@@ -87,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 {
@@ -95,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);
@@ -124,28 +149,29 @@ public class AddCommand extends CommandAreaShop {
 		TreeSet<String> namesBlacklisted = new TreeSet<>();
 		TreeSet<String> namesNoPermission = new TreeSet<>();
 		TreeSet<String> namesAddCancelled = new TreeSet<>(); // Denied by an event listener
-		Utils.runAsBatches(regions.entrySet(),
-			Math.min(plugin.getConfig().getInt("adding.regionsPerTick"), 1),
-				(regionEntry) -> {
+		Do.forAll(
+			plugin.getConfig().getInt("adding.regionsPerTick"),
+			regions.entrySet(),
+			regionEntry -> {
 				String regionName = regionEntry.getKey();
 				ProtectedRegion region = regionEntry.getValue();
 				// Determine if the player is an owner or member of the region
-				boolean isMember = finalPlayer != null && 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
@@ -153,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,
@@ -166,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());
@@ -209,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());
@@ -253,39 +279,40 @@ public class AddCommand extends CommandAreaShop {
 						regionsSuccess.add(buy);
 					}
 				}
-			}, false).thenAccept(
-			(success) -> {
+			},
+			() -> {
 				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));
 				}
-			});
+			}
+		);
 	}
 
 	@Override
 	public List<String> getTabCompleteList(int toComplete, String[] start, CommandSender sender) {
-		List<String> result = new LinkedList<>();
+		List<String> result = new ArrayList<>();
 		if(toComplete == 2) {
 			if(sender.hasPermission("areashop.createrent")) {
 				result.add("rent");

AreaShop/src/main/java/me/wiefferink/areashop/commands/AddfriendCommand.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;
@@ -8,12 +10,23 @@ 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 {
 
+	@Inject
+	private MessageBridge messageBridge;
+	@Inject
+	private IFileManager fileManager;
+	@Inject
+	private Plugin plugin;
+
 	@Override
 	public String getCommandStart() {
 		return "areashop addfriend";
@@ -31,12 +44,12 @@ public class AddfriendCommand extends CommandAreaShop {
 	@Override
 	public void execute(CommandSender sender, String[] args) {
 		if(!sender.hasPermission("areashop.addfriend") && !sender.hasPermission("areashop.addfriendall")) {
-			plugin.message(sender, "addfriend-noPermission");
+			messageBridge.message(sender, "addfriend-noPermission");
 			return;
 		}
 
 		if(args.length < 2) {
-			plugin.message(sender, "addfriend-help");
+			messageBridge.message(sender, "addfriend-help");
 			return;
 		}
 
@@ -46,74 +59,74 @@ public class AddfriendCommand 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, "cmd-notRegistered", args[2]);
+				messageBridge.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);
+				messageBridge.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);
+				messageBridge.message(sender, "addfriend-notVisited", args[1], region);
 				return;
 			}
 			if(region.getFriendsFeature().getFriends().contains(friend.getUniqueId())) {
-				plugin.message(sender, "addfriend-alreadyAdded", friend.getName(), region);
+				messageBridge.message(sender, "addfriend-alreadyAdded", friend.getName(), region);
 				return;
 			}
 			if(region.isOwner(friend.getUniqueId())) {
-				plugin.message(sender, "addfriend-self", friend.getName(), region);
+				messageBridge.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);
+				messageBridge.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);
+						messageBridge.message(sender, "addfriend-notVisited", args[1], region);
 						return;
 					}
 					if(region.getFriendsFeature().getFriends().contains(friend.getUniqueId())) {
-						plugin.message(sender, "addfriend-alreadyAdded", friend.getName(), region);
+						messageBridge.message(sender, "addfriend-alreadyAdded", friend.getName(), region);
 						return;
 					}
 					if(region.isOwner(friend.getUniqueId())) {
-						plugin.message(sender, "addfriend-self", friend.getName(), region);
+						messageBridge.message(sender, "addfriend-self", friend.getName(), region);
 						return;
 					}
 
 					if(region.getFriendsFeature().addFriend(friend.getUniqueId(), sender)) {
 						region.update();
-						plugin.message(sender, "addfriend-success", friend.getName(), region);
+						messageBridge.message(sender, "addfriend-success", friend.getName(), region);
 					}
 				} else {
-					plugin.message(sender, "addfriend-noPermissionOther", region);
+					messageBridge.message(sender, "addfriend-noPermissionOther", region);
 				}
 			} else {
-				plugin.message(sender, "addfriend-noPermission", region);
+				messageBridge.message(sender, "addfriend-noPermission", region);
 			}
 		}
 	}
@@ -126,7 +139,7 @@ public class AddfriendCommand 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/AddsignCommand.java

@@ -1,128 +1,135 @@
 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.interfaces.BukkitInterface;
+import me.wiefferink.areashop.managers.IFileManager;
 import me.wiefferink.areashop.regions.GeneralRegion;
 import me.wiefferink.areashop.tools.Materials;
 import me.wiefferink.areashop.tools.Utils;
 import org.bukkit.Material;
 import org.bukkit.block.Block;
-import org.bukkit.block.BlockFace;
-import org.bukkit.block.data.BlockData;
-import org.bukkit.block.data.type.Sign;
-import org.bukkit.block.data.type.WallSign;
 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 {
 
-    @Override
-    public String getCommandStart() {
-        return "areashop addsign";
-    }
+	@Inject
+	private MessageBridge messageBridge;
+	@Inject
+	private IFileManager fileManager;
+	@Inject
+	private SignManager signManager;
+	@Inject
+	private Plugin plugin;
+	@Inject
+	private BukkitInterface bukkitInterface;
 
-    @Override
-    public String getHelp(CommandSender target) {
-        if (target.hasPermission("areashop.addsign")) {
-            return "help-addsign";
-        }
-        return null;
-    }
+	@Override
+	public String getCommandStart() {
+		return "areashop addsign";
+	}
 
-    @Override
-    public void execute(CommandSender sender, String[] args) {
-        if (!sender.hasPermission("areashop.addsign")) {
-            plugin.message(sender, "addsign-noPermission");
-            return;
-        }
-        if (!(sender instanceof Player)) {
-            plugin.message(sender, "cmd-onlyByPlayer");
-            return;
-        }
-        Player player = (Player) sender;
+	@Override
+	public String getHelp(CommandSender target) {
+		if(target.hasPermission("areashop.addsign")) {
+			return "help-addsign";
+		}
+		return null;
+	}
 
-        // 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) {
-                block = next;
-            }
-        }
-        if (block == null || !Materials.isSign(block.getType())) {
-            plugin.message(sender, "addsign-noSign");
-            return;
-        }
+	@Override
+	public void execute(CommandSender sender, String[] args) {
+		if(!sender.hasPermission("areashop.addsign")) {
+			messageBridge.message(sender, "addsign-noPermission");
+			return;
+		}
+		if(!(sender instanceof Player)) {
+			messageBridge.message(sender, "cmd-onlyByPlayer");
+			return;
+		}
+		Player player = (Player)sender;
 
-        GeneralRegion region;
-        if (args.length > 1) {
-            // Get region by argument
-            region = plugin.getFileManager().getRegion(args[1]);
-            if (region == null) {
-                plugin.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");
-                return;
-            } else if (regions.size() > 1) {
-                plugin.message(sender, "addsign-couldNotDetect", regions.get(0).getName(), regions.get(1).getName());
-                return;
-            }
-            region = regions.get(0);
-        }
-        String profile = null;
-        if (args.length > 2) {
-            profile = args[2];
-            Set<String> profiles = plugin.getConfig().getConfigurationSection("signProfiles").getKeys(false);
-            if (!profiles.contains(profile)) {
-                plugin.message(sender, "addsign-wrongProfile", Utils.createCommaSeparatedList(profiles), region);
-                return;
-            }
-        }
-        RegionSign regionSign = SignsFeature.getSignByLocation(block.getLocation());
-        if (regionSign != null) {
-            plugin.message(sender, "addsign-alreadyRegistered", regionSign.getRegion());
-            return;
-        }
+		// 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) {
+				block = next;
+			}
+		}
+		if(block == null || !Materials.isSign(block.getType())) {
+			messageBridge.message(sender, "addsign-noSign");
+			return;
+		}
 
-        final BlockData data = block.getBlockData();
-        final BlockFace rotation;
-        if (data instanceof Sign) {
-            rotation = ((Sign) data).getRotation();
-        } else if (data instanceof WallSign) {
-            rotation = ((WallSign) data).getFacing();
-        } else {
-            rotation = null;
-        }
-        region.getSignsFeature().addSign(block.getLocation(), block.getType(), rotation, profile);
-        if (profile == null) {
-            plugin.message(sender, "addsign-success", region);
-        } else {
-            plugin.message(sender, "addsign-successProfile", profile, region);
-        }
-        region.update();
-    }
+		GeneralRegion region;
+		if(args.length > 1) {
+			// Get region by argument
+			region = fileManager.getRegion(args[1]);
+			if(region == null) {
+				messageBridge.message(sender, "cmd-notRegistered", args[1]);
+				return;
+			}
+		} else {
+			// Get region by sign position
+			List<GeneralRegion> regions = Utils.getImportantRegions(block.getLocation());
+			if(regions.isEmpty()) {
+				messageBridge.message(sender, "addsign-noRegions");
+				return;
+			} else if(regions.size() > 1) {
+				messageBridge.message(sender, "addsign-couldNotDetect", regions.get(0).getName(), regions.get(1).getName());
+				return;
+			}
+			region = regions.get(0);
+		}
+		String profile = null;
+		if(args.length > 2) {
+			profile = args[2];
+			Set<String> profiles = plugin.getConfig().getConfigurationSection("signProfiles").getKeys(false);
+			if(!profiles.contains(profile)) {
+				messageBridge.message(sender, "addsign-wrongProfile", Utils.createCommaSeparatedList(profiles), region);
+				return;
+			}
+		}
+		Optional<RegionSign> optionalRegionSign = signManager.signFromLocation(block.getLocation());
+		if(optionalRegionSign.isPresent()) {
+			RegionSign regionSign = optionalRegionSign.get();
+			messageBridge.message(sender, "addsign-alreadyRegistered", regionSign.getRegion());
+			return;
+		}
 
-    @Override
-    public List<String> getTabCompleteList(int toComplete, String[] start, CommandSender sender) {
-        List<String> result = new ArrayList<>();
-        if (toComplete == 2) {
-            result.addAll(plugin.getFileManager().getRegionNames());
-        } else if (toComplete == 3) {
-            result.addAll(plugin.getConfig().getStringList("signProfiles"));
-        }
-        return result;
-    }
+		region.getSignsFeature().addSign(block.getLocation(), block.getType(), bukkitInterface.getSignFacing(block), profile);
+		if(profile == null) {
+			messageBridge.message(sender, "addsign-success", region);
+		} else {
+			messageBridge.message(sender, "addsign-successProfile", profile, region);
+		}
+		region.update();
+	}
+
+	@Override
+	public List<String> getTabCompleteList(int toComplete, String[] start, CommandSender sender) {
+		List<String> result = new ArrayList<>();
+		if(toComplete == 2) {
+			result.addAll(fileManager.getRegionNames());
+		} else if(toComplete == 3) {
+			result.addAll(plugin.getConfig().getStringList("signProfiles"));
+		}
+		return result;
+	}
 
 }
 

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,18 @@ 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");
+			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 +58,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 +71,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,23 +1,23 @@
 package me.wiefferink.areashop.commands;
 
-import me.wiefferink.areashop.AreaShop;
 import me.wiefferink.interactivemessenger.processing.Message;
 import org.apache.commons.lang.StringUtils;
 import org.bukkit.command.Command;
 import org.bukkit.command.CommandSender;
 
-import java.util.*;
+import java.util.ArrayList;
+import java.util.HashMap;
+import java.util.List;
+import java.util.Map;
 
 /**
  * Abstract class for generalising command classes.
  */
 public abstract class CommandAreaShop {
 
-	final AreaShop plugin = AreaShop.getInstance();
-
 	private final Map<String, CommandTime> lastUsed;
 
-	public CommandAreaShop() {
+	protected CommandAreaShop() {
 		lastUsed = new HashMap<>();
 	}
 
@@ -43,7 +43,7 @@ public abstract class CommandAreaShop {
 	 * @return A collection with all the possibilities for argument to complete
 	 */
 	public List<String> getTabCompleteList(int toComplete, String[] start, CommandSender sender) {
-		return Collections.emptyList();
+		return new ArrayList<>();
 	}
 
 	/**

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,13 +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;
-import java.util.concurrent.CompletableFuture;
 
+@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";
@@ -36,24 +48,24 @@ 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");
+				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");
+			if(regions == null || regions.isEmpty()) {
+				messageBridge.message(player, "cmd-noRegionsFound");
 				return;
 			}
 			// Start removing the regions that he has permission for
@@ -74,7 +86,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 {
@@ -84,50 +96,46 @@ 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 {
-			CompletableFuture<GeneralRegion> future = plugin.getFileManager().getRegionUnsafe(args[1]);
-			Utils.newChain()
-				 .future(future)
-				 .syncLast(region -> {
-					 if(region == null) {
-						 plugin.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);
-							 if (event.isCancelled()) {
-								 plugin.message(sender, "general-cancelled", event.getReason());
-							 } else {
-								 plugin.message(sender, "destroy-successRent", region);
-							 }
-						 } else {
-							 plugin.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);
-							 if (event.isCancelled()) {
-								 plugin.message(sender, "general-cancelled", event.getReason());
-							 } else {
-								 plugin.message(sender, "destroy-successBuy", region);
-							 }
-						 } else {
-							 plugin.message(sender, "destroy-noPermissionBuy", region);
-						 }
-					 }
-			}).execute();
+			GeneralRegion region = fileManager.getRegion(args[1]);
+			if(region == null) {
+				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 = fileManager.deleteRegion(region, true);
+					if (event.isCancelled()) {
+						messageBridge.message(sender, "general-cancelled", event.getReason());
+					} else {
+						messageBridge.message(sender, "destroy-successRent", region);
+					}
+				} else {
+					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 = fileManager.deleteRegion(region, true);
+					if (event.isCancelled()) {
+						messageBridge.message(sender, "general-cancelled", event.getReason());
+					} else {
+						messageBridge.message(sender, "destroy-successBuy", region);
+					}
+				} else {
+					messageBridge.message(sender, "destroy-noPermissionBuy", region);
+				}
+			}
 		}
 	}
 
@@ -135,7 +143,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,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;
@@ -9,11 +11,19 @@ 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 DelfriendCommand extends CommandAreaShop {
 
+	@Inject
+	private MessageBridge messageBridge;
+	@Inject
+	private IFileManager fileManager;
+	
 	@Override
 	public String getCommandStart() {
 		return "areashop delfriend";
@@ -48,11 +58,11 @@ public class DelfriendCommand extends CommandAreaShop {
 	@Override
 	public void execute(CommandSender sender, String[] args) {
 		if(!sender.hasPermission("areashop.delfriend") && !sender.hasPermission("areashop.delfriendall")) {
-			plugin.message(sender, "delfriend-noPermission");
+			messageBridge.message(sender, "delfriend-noPermission");
 			return;
 		}
 		if(args.length < 2) {
-			plugin.message(sender, "delfriend-help");
+			messageBridge.message(sender, "delfriend-help");
 			return;
 		}
 		GeneralRegion region;
@@ -61,57 +71,57 @@ public class DelfriendCommand 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, "cmd-notRegistered", args[2]);
+				messageBridge.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);
+				messageBridge.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);
+				messageBridge.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);
+				messageBridge.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);
+						messageBridge.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);
+						messageBridge.message(sender, "delfriend-success", friend.getName(), region);
 					}
 				} else {
-					plugin.message(sender, "delfriend-noPermissionOther", region);
+					messageBridge.message(sender, "delfriend-noPermissionOther", region);
 				}
 			} else {
-				plugin.message(sender, "delfriend-noPermission", region);
+				messageBridge.message(sender, "delfriend-noPermission", region);
 			}
 		}
 	}
@@ -124,7 +134,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,11 +41,11 @@ 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");
+			messageBridge.message(sender, "cmd-onlyByPlayer");
 			return;
 		}
 		Player player = (Player)sender;
@@ -49,15 +60,17 @@ public class DelsignCommand extends CommandAreaShop {
 			}
 		}
 		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());
+		signManager.removeSign(regionSign);
 		regionSign.remove();
 	}
 

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

@@ -1,20 +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;
-import java.util.concurrent.ThreadLocalRandom;
 
+@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";
@@ -31,21 +45,21 @@ 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");
+			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;
@@ -56,23 +70,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))
@@ -83,7 +97,7 @@ public class FindCommand extends CommandAreaShop {
 			}
 			if(!results.isEmpty()) {
 				// Draw a random one
-				BuyRegion region = results.get(ThreadLocalRandom.current().nextInt(results.size()));
+				BuyRegion region = results.get(new Random().nextInt(results.size()));
 				Message onlyInGroup = Message.empty();
 				if(group != null) {
 					onlyInGroup = Message.fromKey("find-onlyInGroup").replacements(args[3]);
@@ -91,9 +105,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 {
@@ -102,17 +116,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))
@@ -123,7 +137,7 @@ public class FindCommand extends CommandAreaShop {
 			}
 			if(!results.isEmpty()) {
 				// Draw a random one
-				RentRegion region = results.get(ThreadLocalRandom.current().nextInt(results.size()));
+				RentRegion region = results.get(new Random().nextInt(results.size()));
 				Message onlyInGroup = Message.empty();
 				if(group != null) {
 					onlyInGroup = Message.fromKey("find-onlyInGroup").replacements(args[3]);
@@ -131,9 +145,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 {
@@ -142,9 +156,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,32 @@ 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");
+				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 +84,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 +110,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,33 @@ 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");
+				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 +84,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 +111,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,17 @@ 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");
+			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 +67,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,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;
@@ -9,13 +11,21 @@ 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;
+
 	@Override
 	public String getCommandStart() {
 		return "areashop me";
@@ -32,13 +42,13 @@ 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 {
@@ -46,31 +56,31 @@ public class MeCommand extends CommandAreaShop {
 		}
 		if(args.length > 1) {
 			player = Bukkit.getOfflinePlayer(args[1]);
-			if(player == null) {
-				plugin.message(sender, "me-noPlayer", args[1]);
+			if(!player.hasPlayedBefore()) {
+				messageBridge.message(sender, "me-noPlayer", args[1]);
 				return;
 			}
 		}
-		if(player == null) {
+		if(!player.hasPlayedBefore()) {
 			return;
 		}
 
 		// Get the regions owned by the player
 		Set<RentRegion> rentRegions = new HashSet<>();
-		for(RentRegion region : plugin.getFileManager().getRents()) {
+		for(RentRegion region : fileManager.getRentsRef()) {
 			if(region.isOwner(player)) {
 				rentRegions.add(region);
 			}
 		}
 		Set<BuyRegion> buyRegions = new HashSet<>();
-		for(BuyRegion region : plugin.getFileManager().getBuys()) {
+		for(BuyRegion region : fileManager.getBuysRef()) {
 			if(region.isOwner(player)) {
 				buyRegions.add(region);
 			}
 		}
 		// Get the regions the player is added as friend
 		Set<GeneralRegion> friendRegions = new HashSet<>();
-		for(GeneralRegion region : plugin.getFileManager().getRegions()) {
+		for(GeneralRegion region : fileManager.getRegionsRef()) {
 			if(region.getFriendsFeature().getFriends().contains(player.getUniqueId())) {
 				friendRegions.add(region);
 			}
@@ -79,28 +89,28 @@ public class MeCommand extends CommandAreaShop {
 		// Send messages
 		boolean foundSome = !rentRegions.isEmpty() || !buyRegions.isEmpty() || !friendRegions.isEmpty();
 		if(foundSome) {
-			plugin.message(sender, "me-header", player.getName());
+			messageBridge.message(sender, "me-header", player.getName());
 		}
 		if(!rentRegions.isEmpty()) {
 			for(RentRegion region : rentRegions) {
-				plugin.messageNoPrefix(sender, "me-rentLine", region);
+				messageBridge.messageNoPrefix(sender, "me-rentLine", region);
 			}
 		}
 		if(!buyRegions.isEmpty()) {
 			for(BuyRegion region : buyRegions) {
-				plugin.messageNoPrefix(sender, "me-buyLine", region);
+				messageBridge.messageNoPrefix(sender, "me-buyLine", region);
 			}
 		}
 		if(!friendRegions.isEmpty()) {
 			for(GeneralRegion region : friendRegions) {
-				plugin.messageNoPrefix(sender, "me-friendLine", region);
+				messageBridge.messageNoPrefix(sender, "me-friendLine", region);
 			}
 		}
 
 		if(!foundSome) {
-			plugin.message(sender, "me-nothing", player.getName());
+			messageBridge.message(sender, "me-nothing", player.getName());
 		} else {
-			plugin.messageNoPrefix(sender, "me-clickHint");
+			messageBridge.messageNoPrefix(sender, "me-clickHint");
 		}
 	}
 

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,18 @@ 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");
+			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 +55,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 +68,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";
@@ -44,7 +54,7 @@ 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;
@@ -53,27 +63,27 @@ public class SellCommand 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, "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 +93,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,5 +1,7 @@
 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.tools.Utils;
 import org.bukkit.Bukkit;
@@ -7,11 +9,19 @@ 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 {
 
+	@Inject
+	private MessageBridge messageBridge;
+	@Inject
+	private IFileManager fileManager;
+	
 	@Override
 	public String getCommandStart() {
 		return "areashop setlandlord";
@@ -28,11 +38,11 @@ public class SetlandlordCommand extends CommandAreaShop {
 	@Override
 	public void execute(CommandSender sender, String[] args) {
 		if(!sender.hasPermission("areashop.setlandlord")) {
-			plugin.message(sender, "setlandlord-noPermission");
+			messageBridge.message(sender, "setlandlord-noPermission");
 			return;
 		}
 		if(args.length < 2) {
-			plugin.message(sender, "setlandlord-help");
+			messageBridge.message(sender, "setlandlord-help");
 			return;
 		}
 		@SuppressWarnings("deprecation")
@@ -43,23 +53,23 @@ public class SetlandlordCommand 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, "cmd-notRegistered", args[2]);
+			messageBridge.message(sender, "cmd-notRegistered", args[2]);
 			return;
 		}
 		String playerName = player.getName();
@@ -68,7 +78,7 @@ public class SetlandlordCommand extends CommandAreaShop {
 		}
 		region.setLandlord(player.getUniqueId(), playerName);
 		region.update();
-		plugin.message(sender, "setlandlord-success", playerName, region);
+		messageBridge.message(sender, "setlandlord-success", playerName, region);
 	}
 
 	@Override
@@ -79,7 +89,7 @@ public class SetlandlordCommand 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/SetownerCommand.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;
@@ -9,13 +11,21 @@ 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 {
 
+	@Inject
+	private MessageBridge messageBridge;
+	@Inject
+	private IFileManager fileManager;
+	
 	@Override
 	public String getCommandStart() {
 		return "areashop setowner";
@@ -32,12 +42,12 @@ public class SetownerCommand extends CommandAreaShop {
 	@Override
 	public void execute(CommandSender sender, String[] args) {
 		if(!sender.hasPermission("areashop.setownerrent") && !sender.hasPermission("areashop.setownerbuy")) {
-			plugin.message(sender, "setowner-noPermission");
+			messageBridge.message(sender, "setowner-noPermission");
 			return;
 		}
 		GeneralRegion region;
 		if(args.length < 2) {
-			plugin.message(sender, "setowner-help");
+			messageBridge.message(sender, "setowner-help");
 			return;
 		}
 		if(args.length == 2) {
@@ -45,32 +55,32 @@ public class SetownerCommand 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, "setowner-notRegistered");
+			messageBridge.message(sender, "setowner-notRegistered");
 			return;
 		}
 
 		if(region instanceof RentRegion && !sender.hasPermission("areashop.setownerrent")) {
-			plugin.message(sender, "setowner-noPermissionRent", region);
+			messageBridge.message(sender, "setowner-noPermissionRent", region);
 			return;
 		}
 		if(region instanceof BuyRegion && !sender.hasPermission("areashop.setownerbuy")) {
-			plugin.message(sender, "setowner-noPermissionBuy", region);
+			messageBridge.message(sender, "setowner-noPermissionBuy", region);
 			return;
 		}
 
@@ -81,7 +91,7 @@ public class SetownerCommand extends CommandAreaShop {
 			uuid = player.getUniqueId();
 		}
 		if(uuid == null) {
-			plugin.message(sender, "setowner-noPlayer", args[1], region);
+			messageBridge.message(sender, "setowner-noPlayer", args[1], region);
 			return;
 		}
 
@@ -91,20 +101,20 @@ public class SetownerCommand extends CommandAreaShop {
 				// extend
 				rent.setRentedUntil(rent.getRentedUntil() + rent.getDuration());
 				rent.setRenter(uuid);
-				plugin.message(sender, "setowner-succesRentExtend", region);
+				messageBridge.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);
+				messageBridge.message(sender, "setowner-succesRent", region);
 			}
 		}
 		if(region instanceof BuyRegion) {
 			BuyRegion buy = (BuyRegion)region;
 			buy.setBuyer(uuid);
-			plugin.message(sender, "setowner-succesBuy", region);
+			messageBridge.message(sender, "setowner-succesBuy", region);
 		}
 		region.getFriendsFeature().deleteFriend(region.getOwner(), null);
 		region.update();
@@ -119,7 +129,7 @@ public class SetownerCommand 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/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,26 @@
 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.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 +37,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 +62,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,7 +73,7 @@ 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");

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";
@@ -44,11 +54,11 @@ 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");
+			messageBridge.message(sender, "onlyByPlayer");
 			return;
 		}
 		Player player = (Player)sender;
@@ -57,22 +67,22 @@ public class SetteleportCommand 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 {
-			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 +91,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 +102,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,18 @@ 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");
+			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 +82,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 +90,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 +121,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 +158,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 +196,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 +230,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 +265,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";
@@ -42,21 +52,21 @@ 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");
+			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;
 		}
 
@@ -65,14 +75,14 @@ public class TeleportCommand extends CommandAreaShop {
 						|| args[2].equalsIgnoreCase("yes")
 						|| args[2].equalsIgnoreCase("true")
 		);
-		region.getTeleportFeature().teleportPlayer(player, toSign, true);
+		region.getTeleportFeature().teleportPlayer(player, toSign);
 	}
 
 	@Override
 	public List<String> getTabCompleteList(int toComplete, String[] start, CommandSender sender) {
 		ArrayList<String> result = new ArrayList<>();
 		if(toComplete == 2) {
-			result.addAll(plugin.getFileManager().getRegionNames());
+			result.addAll(fileManager.getRegionNames());
 		} else if(toComplete == 3) {
 			result.add("sign");
 		}

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

@@ -1,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";
@@ -44,7 +54,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 +63,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 +93,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;
 		}
 
@@ -92,7 +103,7 @@ public class FriendsFeature extends RegionFeature {
 		HashSet<String> result = new HashSet<>();
 		for(UUID friend : getFriends()) {
 			OfflinePlayer player = Bukkit.getOfflinePlayer(friend);
-			if(player.hasPlayedBefore() && player.getName() != null) {
+			if(player != null && player.getName() != null) {
 				result.add(player.getName());
 			}
 		}

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();
 
-	protected 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/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);
@@ -255,7 +268,7 @@ public class WorldGuardRegionFlagsFeature extends RegionFeature {
 		result = result.replace("&1", "&B");
 		result = result.replace("&d", "&p");
 		result = result.replace("&5", "&P");
-		//result = result.replace("&0", "&0");
+		result = result.replace("&0", "&0");
 		result = result.replace("&8", "&1");
 		result = result.replace("&7", "&2");
 		result = result.replace("&f", "&w");

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

@@ -1,11 +1,14 @@
 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 io.papermc.lib.features.blockstatesnapshot.BlockStateSnapshotResult;
 import me.wiefferink.areashop.AreaShop;
+import me.wiefferink.areashop.interfaces.BukkitInterface;
 import me.wiefferink.areashop.managers.SignErrorLogger;
-import me.wiefferink.areashop.interfaces.BlockBehaviourHelper;
+import me.wiefferink.areashop.nms.BlockBehaviourHelper;
 import me.wiefferink.areashop.regions.GeneralRegion;
 import me.wiefferink.areashop.tools.Materials;
 import me.wiefferink.areashop.tools.Utils;
@@ -13,7 +16,6 @@ import me.wiefferink.interactivemessenger.processing.Message;
 import org.bukkit.Bukkit;
 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.block.BlockState;
@@ -24,308 +26,270 @@ 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;
-import java.util.logging.Level;
 
 /**
  * Sign that is connected to a region to display information and interact with the region.
  */
 public class RegionSign {
 
+	private final BlockBehaviourHelper blockHelper;
+	private final SignErrorLogger errorLogger;
+	private final BukkitInterface bukkitInterface;
 
-    public static final BlockBehaviourHelper behaviourHelper = AreaShop.getInstance().getNMSHelper().behaviourHelper();
-    public static Level invalidSignLogLevel;
-    public static boolean removeInvalidSigns;
-
-    static {
-        YamlConfiguration configuration = AreaShop.getInstance().getConfig();
-        removeInvalidSigns = configuration.getBoolean("signs.removeInvalid");
-        final String rawLogLevel = configuration.getString("signs.invalidSignLogLevel", "WARNING");
-        try {
-            assert rawLogLevel != null;
-            invalidSignLogLevel = Level.parse(rawLogLevel);
-        } catch (IllegalArgumentException ex) {
-            AreaShop.warn("Invalid Logging Level: " + rawLogLevel);
-            invalidSignLogLevel = Level.WARNING;
-        }
-    }
+	private final SignsFeature signsFeature;
+	private final String key;
 
 
-    private static boolean canLogSignError() {
-        return AreaShop.getInstance().getLogger().isLoggable(invalidSignLogLevel);
-    }
+	@AssistedInject
+	RegionSign(
+			@Nonnull BlockBehaviourHelper blockBehaviourHelper,
+			@Nonnull SignErrorLogger signErrorLogger,
+			@Nonnull BukkitInterface bukkitInterface,
+			@Assisted @Nonnull SignsFeature signsFeature,
+			@Assisted @Nonnull String key
+	) {
+		this.blockHelper = blockBehaviourHelper;
+		this.errorLogger = signErrorLogger;
+		this.bukkitInterface = bukkitInterface;
+		this.signsFeature = signsFeature;
+		this.key = key;
+	}
 
-    private static void logSignError(String... messages) {
-        if (invalidSignLogLevel == Level.OFF) {
-            return;
-        }
-        if (invalidSignLogLevel == Level.SEVERE) {
-            AreaShop.error((Object) messages);
-        } else if (invalidSignLogLevel == Level.WARNING) {
-            AreaShop.warn((Object) messages);
-        } else if (invalidSignLogLevel.intValue() >= Level.FINE.intValue()) {
-            AreaShop.debug((Object) messages);
-        } else {
-            AreaShop.info((Object) messages);
-        }
-    }
+	public BlockPosition getPosition() {
+		return new BlockPosition(getLocation());
+	}
 
-    private final SignsFeature signsFeature;
-    private final String key;
+	/**
+	 * Get the location of this sign.
+	 * @return The location of this sign
+	 */
+	public Location getLocation() {
+		return Utils.configToLocation(getRegion().getConfig().getConfigurationSection("general.signs." + key + ".location"));
+	}
 
-    public RegionSign(SignsFeature signsFeature, String key) {
-        this.signsFeature = signsFeature;
-        this.key = key;
-    }
+	/**
+	 * Location string to be used as key in maps.
+	 * @return Location string
+	 */
+	public String getStringLocation() {
+		return SignsFeature.locationToString(getLocation());
+	}
 
-    /**
-     * Get the location of this sign.
-     *
-     * @return The location of this sign
-     */
-    public Location getLocation() {
-        return Utils.configToLocation(getRegion().getConfig().getConfigurationSection("general.signs." + key + ".location"));
-    }
+	/**
+	 * Chunk string to be used as key in maps.
+	 * @return Chunk string
+	 */
+	public String getStringChunk() {
+		return SignsFeature.chunkToString(getLocation());
+	}
 
-    /**
-     * Location string to be used as key in maps.
-     *
-     * @return Location string
-     */
-    public String getStringLocation() {
-        return SignsFeature.locationToString(getLocation());
-    }
+	/**
+	 * Get the region this sign is linked to.
+	 * @return The region this sign is linked to
+	 */
+	public GeneralRegion getRegion() {
+		return signsFeature.getRegion();
+	}
 
-    /**
-     * Chunk string to be used as key in maps.
-     *
-     * @return Chunk string
-     */
-    public String getStringChunk() {
-        return SignsFeature.chunkToString(getLocation());
-    }
+	/**
+	 * Remove this sign from the region.
+	 */
+	public void remove() {
+		getLocation().getBlock().setType(Material.AIR);
+		this.signsFeature.signManager().removeSign(this);
+		getRegion().setSetting("general.signs." + key, null);
+		// Remove the sign from the region's sign manager
+	}
 
-    /**
-     * Get the region this sign is linked to.
-     *
-     * @return The region this sign is linked to
-     */
-    public GeneralRegion getRegion() {
-        return signsFeature.getRegion();
-    }
+	/**
+	 * Get the ConfigurationSection defining the sign layout.
+	 * @return The sign layout config
+	 */
+	public ConfigurationSection getProfile() {
+		return getRegion().getConfigurationSectionSetting("general.signProfile", "signProfiles", getRegion().getConfig().get("general.signs." + key + ".profile"));
+	}
 
-    /**
-     * 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);
-        getRegion().setSetting("general.signs." + key, null);
-    }
+	/**
+	 * Get the facing of the sign as saved in the config.
+	 * @return BlockFace the sign faces, or null if unknown
+	 */
+	public BlockFace getFacing() {
+		try {
+			return BlockFace.valueOf(getRegion().getConfig().getString("general.signs." + key + ".facing"));
+		} catch(NullPointerException | IllegalArgumentException e) {
+			return null;
+		}
+	}
 
-    /**
-     * Get the ConfigurationSection defining the sign layout.
-     *
-     * @return The sign layout config
-     */
-    public ConfigurationSection getProfile() {
-        return getRegion().getConfigurationSectionSetting("general.signProfile", "signProfiles", getRegion().getConfig().get("general.signs." + key + ".profile"));
-    }
+	/**
+	 * Get the material of the sign as saved in the config.
+	 * @return Material of the sign,Material.AIR if none.
+	 */
+	public Material getMaterial() {
+		String name = getRegion().getConfig().getString("general.signs." + key + ".signType");
+		Material result = Materials.signNameToMaterial(name);
+		return result == null ? Material.AIR : result;
+	}
 
-    /**
-     * Get the facing of the sign as saved in the config.
-     *
-     * @return BlockFace the sign faces, or null if unknown
-     */
-    public BlockFace getFacing() {
-        try {
-            return BlockFace.valueOf(getRegion().getConfig().getString("general.signs." + key + ".facing"));
-        } catch (NullPointerException | IllegalArgumentException e) {
-            return null;
-        }
-    }
+	/**
+	 * Update this sign.
+	 * @return true if the update was successful, otherwise false
+	 */
+	public boolean update() {
+		// Ignore updates of signs in chunks that are not loaded
+		Location signLocation = getLocation();
+		if(signLocation == null
+				|| signLocation.getWorld() == null
+				|| !signLocation.getWorld().isChunkLoaded(signLocation.getBlockX() >> 4, signLocation.getBlockZ() >> 4)) {
+			return false;
+		}
 
-    /**
-     * Get the material of the sign as saved in the config.
-     *
-     * @return Material of the sign, usually, a sign or {@link Material#AIR} if none.
-     */
-    public Material getMaterial() {
-        String name = getRegion().getConfig().getString("general.signs." + key + ".signType");
-        Material result = Materials.signNameToMaterial(name);
-        return result == null ? Material.AIR : result;
-    }
+		if(getRegion().isDeleted()) {
+			return false;
+		}
 
-    /**
-     * Update this sign.
-     *
-     * @return true if the update was successful, otherwise false
-     */
-    public boolean update() {
-        // Ignore updates of signs in chunks that are not loaded
-        Location signLocation = getLocation();
-        if (signLocation == null
-                || signLocation.getWorld() == null
-                || !signLocation.getWorld().isChunkLoaded(signLocation.getBlockX() >> 4, signLocation.getBlockZ() >> 4)) {
-            return false;
-        }
+		YamlConfiguration regionConfig = getRegion().getConfig();
+		ConfigurationSection signConfig = getProfile();
+		Block block = signLocation.getBlock();
+		if(signConfig == null || !signConfig.isSet(getRegion().getState().getValue())) {
+			block.setType(Material.AIR);
+			return true;
+		}
 
-        if (getRegion().isDeleted()) {
-            return false;
-        }
+		ConfigurationSection stateConfig = signConfig.getConfigurationSection(getRegion().getState().getValue());
 
-        YamlConfiguration regionConfig = getRegion().getConfig();
-        ConfigurationSection signConfig = getProfile();
-        Block block = signLocation.getBlock();
-        if (signConfig == null || !signConfig.isSet(getRegion().getState().getValue())) {
-            block.setType(Material.AIR);
-            return true;
-        }
+		// Get the lines
+		String[] signLines = new String[4];
+		boolean signEmpty = true;
+		for(int i = 0; i < 4; i++) {
+			signLines[i] = stateConfig.getString("line" + (i + 1));
+			signEmpty &= (signLines[i] == null || signLines[i].isEmpty());
+		}
+		if(signEmpty) {
+			block.setType(Material.AIR);
+			return true;
+		}
 
-        ConfigurationSection stateConfig = signConfig.getConfigurationSection(getRegion().getState().getValue());
-        assert stateConfig != null;
-        // Get the lines
-        String[] signLines = new String[4];
-        boolean signEmpty = true;
-        for (int i = 0; i < 4; i++) {
-            signLines[i] = stateConfig.getString("line" + (i + 1));
-            signEmpty &= (signLines[i] == null || signLines[i].isEmpty());
-        }
-        if (signEmpty) {
-            block.setType(Material.AIR);
-            return true;
-        }
-        final BlockStateSnapshotResult snapshot = PaperLib.getBlockState(block, false);
-        final BlockState blockState = snapshot.getState();
-        final BlockData blockData = blockState.getBlockData();
-        final SignErrorLogger errorLogger = AreaShop.getInstance().getSignErrorLogger();
-        Material signType = getMaterial();
-        // Place the sign back (with proper rotation and type) after it has been hidden or (indirectly) destroyed
-        if (!Materials.isSign(blockState.getType())) {
-            // Don't do physics here, we first need to update the direction
-            blockState.setType(signType);
-            if (blockData instanceof WallSign) {
-                ((WallSign) blockData).setFacing(getFacing());
-            } else if (blockData instanceof Sign) {
-                ((org.bukkit.block.data.type.Sign) blockData).setRotation(getFacing());
-            }
-            blockState.setBlockData(blockData);
-            blockState.update(false, true);
-            // Check if the sign has popped
-            if (!Materials.isSign(block.getType())) {
-                final String message = String.format("Setting sign of $1%s of region $2%s failed, could not set sign block back", key, getRegion().getName());
-                errorLogger.submitWarning(message);
-                return false;
-            }
-        } else {
-            final String message = "Setting sign $1%s of region $2%s failed, RegionSign material was: $3%s";
-            errorLogger.submitWarning(String.format(message, key, getRegion().getName(), signType.name()));
-        }
+		// 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);
 
-        // Save current rotation and type
-        if (!regionConfig.isString("general.signs." + key + ".signType")) {
-            getRegion().setSetting("general.signs." + key + ".signType", block.getType().name());
-        }
-        if (!regionConfig.isString("general.signs." + key + ".facing")) {
-            final BlockFace rotation;
-            if (Materials.isSign(block.getType())) {
-                BlockData data = blockState.getBlockData();
-                if (data instanceof org.bukkit.block.data.type.Sign) {
-                    rotation = ((org.bukkit.block.data.type.Sign) block.getBlockData()).getRotation();
-                } else if (data instanceof WallSign) {
-                    rotation = ((WallSign) data).getFacing();
-                } else {
-                    rotation = null;
-                }
-            } else {
-                rotation = null;
-            }
-            getRegion().setSetting("general.signs." + key + ".facing", rotation == null ? null : rotation.toString());
-        }
+			BlockState blockState = PaperLib.getBlockState(block, false).getState();
+			BlockData blockData = blockState.getBlockData();
 
-        // Apply replacements and color and then set it on the sign
-        Sign signState = (Sign) blockState;
-        for (int i = 0; i < signLines.length; i++) {
-            if (signLines[i] == null) {
-                signState.setLine(i, "");
-                continue;
-            }
-            signLines[i] = Message.fromString(signLines[i]).replacements(getRegion()).getSingle();
-            signLines[i] = Utils.applyColors(signLines[i]);
-            signState.setLine(i, signLines[i]);
-        }
-        // BlockState#update *should* return true here.
-        return blockState.update(true, false);
-    }
+			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 needs to update periodically.
-     *
-     * @return true if it needs periodic updates, otherwise false
-     */
-    public boolean needsPeriodicUpdate() {
-        ConfigurationSection signConfig = getProfile();
-        if (signConfig == null || !signConfig.isSet(getRegion().getState().getValue().toLowerCase())) {
-            return false;
-        }
+			// Check if the sign has popped
+			if(!Materials.isSign(block.getType())) {
+				return false;
+			}
+		}
 
-        ConfigurationSection stateConfig = signConfig.getConfigurationSection(getRegion().getState().getValue().toLowerCase());
-        if (stateConfig == null) {
-            return false;
-        }
+		// Save current rotation and type
+		if(!regionConfig.isString("general.signs." + key + ".signType")) {
+			getRegion().setSetting("general.signs." + key + ".signType", block.getType().name());
+		}
+		if(!regionConfig.isString("general.signs." + key + ".facing")) {
+			BlockFace signFacing = bukkitInterface.getSignFacing(block);
+			getRegion().setSetting("general.signs." + key + ".facing", signFacing == null ? null : signFacing.toString());
+		}
 
-        // 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)) {
-                return true;
-            }
-        }
-        return false;
-    }
+		// Apply replacements and color and then set it on the sign
+		Sign signState = (Sign) PaperLib.getBlockState(block, false).getState();
+		for(int i = 0; i < signLines.length; i++) {
+			if(signLines[i] == null) {
+				signState.setLine(i, "");
+				continue;
+			}
+			signLines[i] = Message.fromString(signLines[i]).replacements(getRegion()).getSingle();
+			signLines[i] = Utils.applyColors(signLines[i]);
+			signState.setLine(i, signLines[i]);
+		}
+		signState.update(false, false);
+		return true;
+	}
 
-    /**
-     * Run commands when a player clicks a sign.
-     *
-     * @param clicker   The player that clicked the sign
-     * @param clickType The type of clicking
-     * @return true if the commands ran successfully, false if any of them failed
-     */
-    public boolean runSignCommands(Player clicker, GeneralRegion.ClickType clickType) {
-        ConfigurationSection signConfig = getProfile();
-        if (signConfig == null) {
-            return false;
-        }
-        ConfigurationSection stateConfig = signConfig.getConfigurationSection(getRegion().getState().getValue().toLowerCase());
+	/**
+	 * Check if the sign needs to update periodically.
+	 * @return true if it needs periodic updates, otherwise false
+	 */
+	public boolean needsPeriodicUpdate() {
+		ConfigurationSection signConfig = getProfile();
+		if(signConfig == null || !signConfig.isSet(getRegion().getState().getValue().toLowerCase())) {
+			return false;
+		}
 
-        // Run player commands if specified
-        List<String> playerCommands = new ArrayList<>();
-        for (String command : stateConfig.getStringList(clickType.getValue() + "Player")) {
-            // TODO move variable checking code to InteractiveMessenger?
-            playerCommands.add(command.replace(Message.VARIABLE_START + AreaShop.tagClicker + Message.VARIABLE_END, clicker.getName()));
-        }
-        getRegion().runCommands(clicker, playerCommands);
+		ConfigurationSection stateConfig = signConfig.getConfigurationSection(getRegion().getState().getValue().toLowerCase());
+		if(stateConfig == null) {
+			return false;
+		}
 
-        // Run console commands if specified
-        List<String> consoleCommands = new ArrayList<>();
-        for (String command : stateConfig.getStringList(clickType.getValue() + "Console")) {
-            consoleCommands.add(command.replace(Message.VARIABLE_START + AreaShop.tagClicker + Message.VARIABLE_END, clicker.getName()));
-        }
-        getRegion().runCommands(Bukkit.getConsoleSender(), consoleCommands);
+		// Check the lines for the timeleft tag
+		for(int i = 1; i <= 4; i++) {
+			String line = stateConfig.getString("line" + i);
+			if(line != null && line.contains(Message.VARIABLE_START + AreaShop.tagTimeLeft + Message.VARIABLE_END)) {
+				return true;
+			}
+		}
+		return false;
+	}
 
-        return !playerCommands.isEmpty() || !consoleCommands.isEmpty();
-    }
+	/**
+	 * Run commands when a player clicks a sign.
+	 * @param clicker   The player that clicked the sign
+	 * @param clickType The type of clicking
+	 * @return true if the commands ran successfully, false if any of them failed
+	 */
+	public boolean runSignCommands(Player clicker, GeneralRegion.ClickType clickType) {
+		ConfigurationSection signConfig = getProfile();
+		if(signConfig == null) {
+			return false;
+		}
+		ConfigurationSection stateConfig = signConfig.getConfigurationSection(getRegion().getState().getValue().toLowerCase());
 
-    @Override
-    public boolean equals(Object object) {
-        return object instanceof RegionSign && ((RegionSign) object).getRegion().equals(this.getRegion()) && ((RegionSign) object).key.equals(this.key);
-    }
+		// Run player commands if specified
+		List<String> playerCommands = new ArrayList<>();
+		for(String command : stateConfig.getStringList(clickType.getValue() + "Player")) {
+			// TODO move variable checking code to InteractiveMessenger?
+			playerCommands.add(command.replace(Message.VARIABLE_START + AreaShop.tagClicker + Message.VARIABLE_END, clicker.getName()));
+		}
+		getRegion().runCommands(clicker, playerCommands);
 
-    @Override
-    public int hashCode() {
-        return Objects.hashCode(key, getRegion().getName());
-    }
+		// Run console commands if specified
+		List<String> consoleCommands = new ArrayList<>();
+		for(String command : stateConfig.getStringList(clickType.getValue() + "Console")) {
+			consoleCommands.add(command.replace(Message.VARIABLE_START + AreaShop.tagClicker + Message.VARIABLE_END, clicker.getName()));
+		}
+		getRegion().runCommands(Bukkit.getConsoleSender(), consoleCommands);
+
+		return !playerCommands.isEmpty() || !consoleCommands.isEmpty();
+	}
+
+	@Override
+	public boolean equals(Object object) {
+		return object instanceof RegionSign && ((RegionSign)object).getRegion().equals(this.getRegion()) && ((RegionSign)object).key.equals(this.key);
+	}
+
+	@Override
+	public int hashCode() {
+		return Objects.hashCode(key, getRegion().getName());
+	}
 }

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

@@ -1,121 +1,80 @@
-package me.wiefferink.areashop.features.signs;
-
-import me.wiefferink.areashop.AreaShop;
-import me.wiefferink.areashop.events.notify.UpdateRegionEvent;
-import me.wiefferink.areashop.tools.Utils;
-import org.bukkit.Bukkit;
-import org.bukkit.Chunk;
-import org.bukkit.Location;
-import org.bukkit.event.EventHandler;
-import org.bukkit.event.EventPriority;
-import org.bukkit.event.HandlerList;
-import org.bukkit.event.Listener;
-import org.bukkit.event.world.ChunkLoadEvent;
-
-import java.util.ArrayList;
-import java.util.HashMap;
-import java.util.List;
-import java.util.Map;
-
-public class SignCache implements Listener {
-
-    private final Map<String, RegionSign> allSigns = new HashMap<>();
-    private final Map<String, List<RegionSign>> signsByChunk = new HashMap<>();
-
-    public void registerListeners() {
-        Bukkit.getPluginManager().registerEvents(this, AreaShop.getInstance());
-    }
-
-    /**
-     * Convert a location to a string to use as map key.
-     *
-     * @param location The location to get the key for
-     * @return A string to use in a map for a location
-     */
-    public static String locationToString(Location location) {
-        return location.getWorld().getName() + ";" + location.getBlockX() + ";" + location.getBlockY() + ";" + location.getBlockZ();
-    }
-
-    /**
-     * Convert a chunk to a string to use as map key.
-     *
-     * @param location The location to get the key for
-     * @return A string to use in a map for a chunk
-     */
-    public static String chunkToString(Location location) {
-        return location.getWorld().getName() + ";" + (location.getBlockX() >> 4) + ";" + (location.getBlockZ() >> 4);
-    }
-
-    /**
-     * 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();
-    }
-
-    /**
-     * 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 RegionSign getSignByLocation(Location location) {
-        return allSigns.get(locationToString(location));
-    }
-
-    /**
-     * Get the map with all signs.
-     *
-     * @return Map with all signs: locationString -&gt; RegionSign
-     */
-    public 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 Map<String, List<RegionSign>> getSignsByChunk() {
-        return signsByChunk;
-    }
-
-    public void addSign(RegionSign regionSign) {
-        signsByChunk.computeIfAbsent(regionSign.getStringChunk(), (unused) -> new ArrayList<>()).add(regionSign);
-    }
-
-    public void removeSign(RegionSign regionSign) {
-        final List<RegionSign> signs = signsByChunk.get(regionSign.getStringChunk());
-        if (signs != null) {
-            signs.remove(regionSign);
-        }
-        allSigns.remove(regionSign.getStringLocation());
-    }
-
-    public void shutdown() {
-        HandlerList.unregisterAll(this);
-        signsByChunk.clear();
-        allSigns.clear();
-    }
-
-    @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;
-        }
-        int batchSize = Math.max(chunkSigns.size() / 10, 10);
-        Utils.runAsBatches(chunkSigns, batchSize, RegionSign::update, false);
-    }
-
-}
+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.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 ArrayList<>());
+        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,453 @@
+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.BukkitInterface;
+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.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.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 BukkitInterface bukkitInterface;
+    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 BukkitInterface bukkitInterface,
+                        @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.bukkitInterface = bukkitInterface;
+        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;
+        }
+        chunkSigns.remove(null);
+        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(), bukkitInterface.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(), bukkitInterface.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(), bukkitInterface.getSignFacing(event.getBlock()), null);
+                messageBridge.message(player, "addsign-success", region);
+            } else {
+                region.getSignsFeature().addSign(event.getBlock().getLocation(), event.getBlock().getType(), bukkitInterface.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,101 @@
+package me.wiefferink.areashop.features.signs;
+
+import io.github.bakedlibs.dough.blocks.BlockPosition;
+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) {
+        removeSign(regionSign.getLocation());
+    }
+
+    public Optional<RegionSign> removeSign(Location location) {
+        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,634 +1,103 @@
 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 me.wiefferink.areashop.AreaShop;
-import me.wiefferink.areashop.events.ask.AddingRegionEvent;
 import me.wiefferink.areashop.features.RegionFeature;
-import me.wiefferink.areashop.interfaces.BlockBehaviourHelper;
-import me.wiefferink.areashop.managers.FileManager;
-import me.wiefferink.areashop.managers.SignErrorLogger;
-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 org.bukkit.Bukkit;
-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.block.data.BlockData;
-import org.bukkit.block.data.type.Sign;
-import org.bukkit.block.data.type.WallSign;
 import org.bukkit.configuration.ConfigurationSection;
-import org.bukkit.configuration.file.YamlConfiguration;
-import org.bukkit.entity.Player;
-import org.bukkit.event.EventHandler;
-import org.bukkit.event.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 java.util.*;
+import javax.annotation.Nonnull;
 
 public class SignsFeature extends RegionFeature {
 
-    public static final SignCache signCache = new SignCache();
+	private final SignManager internalSignManager = new SignManager();
+	private final SignManager globalSignManager;
+	private final SignFactory signFactory;
+	/**
+	 * Constructor.
+	 * @param region The region to bind to
+	 */
+	@AssistedInject
+	SignsFeature(@Nonnull AreaShop plugin,
+						@Nonnull SignManager signManager,
+						@Nonnull SignFactory signFactory,
+						@Assisted @Nonnull GeneralRegion region
+	) {
+		super(plugin);
+		this.globalSignManager = signManager;
+		this.signFactory = signFactory;
+		setRegion(region);
+		// Setup current signs
+		ConfigurationSection signSection = region.getConfig().getConfigurationSection("general.signs");
+		if(signSection != null) {
+			for(String signKey : signSection.getKeys(false)) {
+				RegionSign sign = signFactory.createRegionSign(this, signKey);
+				Location location = sign.getLocation();
+				if(location == null) {
+					AreaShop.warn("Sign with key " + signKey + " of region " + region.getName() + " does not have a proper location");
+					continue;
+				}
+				this.globalSignManager.cacheForWorld(location.getWorld()).addSign(sign);
+				this.internalSignManager.addSign(sign);
+			}
+		}
+	}
 
-    private static final BlockBehaviourHelper behaviourHelper = AreaShop.getInstance().getNMSHelper().behaviourHelper();
+	/**
+	 * Convert a location to a string to use as map key.
+	 * @param location The location to get the key for
+	 * @return A string to use in a map for a location
+	 */
+	public static String locationToString(Location location) {
+		return location.getWorld().getName() + ";" + location.getBlockX() + ";" + location.getBlockY() + ";" + location.getBlockZ();
+	}
 
-    static {
-        signCache.registerListeners();
-    }
+	/**
+	 * Convert a chunk to a string to use as map key.
+	 * @param location The location to get the key for
+	 * @return A string to use in a map for a chunk
+	 */
+	public static String chunkToString(Location location) {
+		return location.getWorld().getName() + ";" + (location.getBlockX() >> 4) + ";" + (location.getBlockZ() >> 4);
+	}
 
-    public static void shutdownGlobalState() {
-        signCache.shutdown();
-    }
+	@Override
+	public void shutdown() {
 
-    private Map<String, RegionSign> signs;
+	}
 
-    public SignsFeature() {
+	public SignManager signManager() {
+		return this.internalSignManager;
+	}
 
-    }
-
-    /**
-     * Constructor.
-     *
-     * @param region The region to bind to
-     */
-    public SignsFeature(GeneralRegion region) {
-        setRegion(region);
-        signs = new HashMap<>();
-        // Setup current signs
-        ConfigurationSection signSection = region.getConfig().getConfigurationSection("general.signs");
-        SignErrorLogger errorLogger = AreaShop.getInstance().getSignErrorLogger();
-        if (signSection != null) {
-            for (String signKey : signSection.getKeys(false)) {
-                RegionSign sign = new RegionSign(this, signKey);
-                Location location = sign.getLocation();
-                if (location == null) {
-                    final String message = "Sign with key $1%s of region $2%s does not have a proper location";
-                    errorLogger.submitWarning(String.format(message, signKey,  region.getName()));
-                    continue;
-                }
-                signs.put(sign.getStringLocation(), sign);
-                signCache.addSign(sign);
-            }
-        }
-    }
-
-    /**
-     * Convert a location to a string to use as map key.
-     *
-     * @param location The location to get the key for
-     * @return A string to use in a map for a location
-     */
-    public static String locationToString(Location location) {
-        return location.getWorld().getName() + ";" + location.getBlockX() + ";" + location.getBlockY() + ";" + location.getBlockZ();
-    }
-
-    /**
-     * Convert a chunk to a string to use as map key.
-     *
-     * @param location The location to get the key for
-     * @return A string to use in a map for a chunk
-     */
-    public static String chunkToString(Location location) {
-        return location.getWorld().getName() + ";" + (location.getBlockX() >> 4) + ";" + (location.getBlockZ() >> 4);
-    }
-
-    /**
-     * 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();
-    }
-
-    /**
-     * 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 signCache.getSignByLocation(location);
-    }
-
-    /**
-     * Get the map with all signs.
-     *
-     * @return Map with all signs: locationString -&gt; RegionSign
-     */
-    public static Map<String, RegionSign> getAllSigns() {
-        return signCache.getAllSigns();
-    }
-
-    /**
-     * 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 signCache.getSignsByChunk();
-    }
-
-    @Override
-    public void shutdown() {
-        // Deregister signs from the registry
-        if (signs != null) {
-            for (Map.Entry<String, RegionSign> entry : signs.entrySet()) {
-                signCache.removeSign(entry.getValue());
-            }
-        }
-    }
-
-    @EventHandler(priority = EventPriority.HIGH, ignoreCancelled = true)
-    public void onSignBreak(BlockBreakEvent event) {
-        Block block = event.getBlock();
-        RegionSign regionSign = SignsFeature.getSignByLocation(block.getLocation());
-        if (regionSign == null) {
-            return;
-        }
-        if (regionSign.getRegion().invalidated()) {
-            AreaShop.warn("SignsFeature: Sign feature for an invalidated region is still active!");
-        }
-        // Check if it is a sign
-        if (Materials.isSign(block.getType())) {
-            // Check if the rent sign is really the same as a saved rent
-            if (regionSign.getRegion().invalidated()) {
-                AreaShop.warn("SignsFeature: Sign feature for an invalidated region object is still active!");
-            }
-            // 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) {
-        final Block block = event.getBlock();
-
-        // Check if the sign is really the same as a saved rent
-        RegionSign regionSign = SignsFeature.getSignByLocation(event.getBlock().getLocation());
-        if (regionSign == null) {
-            return;
-        }
-
-        if (regionSign.getRegion().invalidated()) {
-            AreaShop.warn("SignsFeature: Sign feature for an invalidated region is still active!");
-        }
-        // Check if the block is a sign
-        if (!Materials.isSign(event.getBlock().getType())) {
-            return;
-        }
-        // If the block is in an invalid position then we remove the sign
-        if (!behaviourHelper.isBlockValid(block)) {
-            regionSign.remove();
-        }
-
-        // 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;
-        }
-        // Check if this sign belongs to a region
-        RegionSign regionSign = SignsFeature.getSignByLocation(block.getLocation());
-        if (regionSign == null) {
-            return;
-        }
-
-        if (regionSign.getRegion().invalidated()) {
-            AreaShop.warn("SignsFeature: Sign feature for an invalidated region is still active!");
-        }
-
-        // 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;
-        }
-
-
-        // 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, ignoreCancelled = true)
-    public void onSignChange(SignChangeEvent event) {
-
-        RegionSign regionSign = SignsFeature.getSignByLocation(event.getBlock().getLocation());
-        if (regionSign == null) {
-            return;
-        }
-
-        if (regionSign.getRegion().invalidated()) {
-            AreaShop.warn("SignsFeature: Sign feature for an invalidated region is still active!");
-        }
-        Player player = event.getPlayer();
-        if (!plugin.isReady()) {
-            plugin.message(player, "general-notReady");
-            return;
-        }
-
-        final BlockFace rotation;
-        final BlockData data = event.getBlock().getBlockData();
-        if (data instanceof Sign) {
-            rotation = ((Sign) data).getRotation();
-        } else if (data instanceof WallSign) {
-            rotation = ((WallSign) data).getFacing();
-        } else {
-            rotation = null;
-        }
-
-        final String line0 = event.getLine(0) == null ? "" : event.getLine(0);
-
-        // Check if the sign is meant for this plugin
-        if (line0.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.getParent() != null && pr.getParent().equals(candidate)) {
-                                candidate = pr;
-                            } 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);
-
-            switch (addResult) {
-                case BLACKLISTED:
-                    plugin.message(player, "setup-blacklisted", secondLine);
-                    break;
-                case ALREADYADDED:
-                    plugin.message(player, "setup-alreadyRentSign");
-                    break;
-                case ALREADYADDEDOTHERWORLD:
-                    plugin.message(player, "setup-alreadyOtherWorld");
-                    break;
-                case NOPERMISSION:
-                    plugin.message(player, "setup-noPermission", secondLine);
-                    break;
-                default:
-                    if (thirdLine != null && !thirdLine.isEmpty() && !Utils.checkTimeFormat(thirdLine)) {
-                        plugin.message(player, "setup-wrongDuration");
-                        break;
-                    }
-                    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(), rotation, 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
-                    Bukkit.getScheduler().runTask(plugin, rent::update);
-
-            }
-        } else if (line0.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.getParent() != null && pr.getParent().equals(candidate)) {
-                                candidate = pr;
-                            } 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(), rotation, 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
-                Bukkit.getScheduler().runTask(plugin, 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);
-            }
-            String profile = thirdLine == null || thirdLine.isEmpty() ? null : thirdLine;
-            region.getSignsFeature().addSign(event.getBlock().getLocation(), event.getBlock().getType(), rotation, profile);
-            if (profile == null) {
-                plugin.message(player, "addsign-success", region);
-            } else {
-                plugin.message(player, "addsign-successProfile", thirdLine, region);
-            }
-
-            // Update the region later because this event will do it first
-            Bukkit.getScheduler().runTask(plugin, region::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() {
-        for (RegionSign sign : signs.values()) {
-            if (sign.needsPeriodicUpdate()) {
-                return true;
-            }
-        }
-        return false;
-    }
-
-    /**
-     * Get the signs of this region.
-     *
-     * @return List of signs
-     */
-    public List<RegionSign> getSigns() {
-        return 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<>(signs.size());
-        for (RegionSign sign : signs.values()) {
-            result.add(sign.getLocation());
-        }
-        return result;
-    }
-
-    /**
-     * Add a sign to this region.
-     *
-     * @param location The location of the sign
-     * @param signType The type of the sign (WALL_SIGN or SIGN_POST)
-     * @param facing   The orientation of the sign
-     * @param profile  The profile to use with this sign (null for default)
-     */
-    public void addSign(Location location, Material signType, BlockFace facing, String profile) {
-        int i = 0;
-        final YamlConfiguration configuration = getRegion().getConfig();
-        while (configuration.isSet("general.signs." + i)) {
-            i++;
-        }
-        String signPath = "general.signs." + i + ".";
-        getRegion().setSetting(signPath + "location", Utils.locationToConfig(location));
-        getRegion().setSetting(signPath + "facing", facing != null ? facing.name() : null);
-        getRegion().setSetting(signPath + "signType", signType != null ? signType.name() : null);
-        if (profile != null && !profile.isEmpty()) {
-            getRegion().setSetting(signPath + "profile", profile);
-        }
-        // Add to the map
-        RegionSign sign = new RegionSign(this, i + "");
-        signs.put(sign.getStringLocation(), sign);
-        signCache.addSign(sign);
-    }
+	/**
+	 * Add a sign to this region.
+	 * @param location The location of the sign
+	 * @param signType The type of the sign (WALL_SIGN or SIGN_POST)
+	 * @param facing   The orientation of the sign
+	 * @param profile  The profile to use with this sign (null for default)
+	 */
+	public void addSign(Location location, Material signType, BlockFace facing, String profile) {
+		int i = 0;
+		while(getRegion().getConfig().isSet("general.signs." + i)) {
+			i++;
+		}
+		String signPath = "general.signs." + i + ".";
+		getRegion().setSetting(signPath + "location", Utils.locationToConfig(location));
+		getRegion().setSetting(signPath + "facing", facing != null ? facing.name() : null);
+		getRegion().setSetting(signPath + "signType", signType != null ? signType.name() : null);
+		if(profile != null && !profile.isEmpty()) {
+			getRegion().setSetting(signPath + "profile", profile);
+		}
+		// Add to the map
+		RegionSign regionSign = this.signFactory.createRegionSign(this, String.valueOf(i));
+		this.globalSignManager.addSign(regionSign);
+		this.internalSignManager.addSign(regionSign);
+	}
 
 }

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

@@ -0,0 +1,53 @@
+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.BukkitInterface;
+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 BukkitInterface bukkitInterface,
+                                            @Nonnull WorldGuardInterface worldGuardInterface,
+                                            @Nonnull SignManager signManager,
+                                            @Nonnull IFileManager fileManager
+    ) {
+        final SignListener signListener = new SignListener(
+                plugin,
+                behaviourHelper,
+                regionFactory,
+                messageBridge,
+                signLinkerManager,
+                bukkitInterface,
+                worldGuardInterface,
+                signManager,
+                fileManager
+        );
+        plugin.getServer().getPluginManager().registerEvents(signListener, plugin);
+        return signListener;
+    }
+
+}

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

@@ -1,10 +1,12 @@
 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;
 import me.wiefferink.areashop.tools.Utils;
+import me.wiefferink.bukkitdo.Do;
 import org.bukkit.entity.Player;
 import org.bukkit.event.EventHandler;
 import org.bukkit.event.EventPriority;
@@ -14,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;
 
@@ -21,109 +24,115 @@ import java.util.List;
  * Notify region expiry and track activity time.
  */
 public final class PlayerLoginLogoutListener implements Listener {
-    private final AreaShop plugin;
 
-    /**
-     * Constructor.
-     *
-     * @param plugin The AreaShop plugin
-     */
-    public PlayerLoginLogoutListener(AreaShop plugin) {
-        this.plugin = plugin;
-    }
+	private final AreaShop plugin;
+	private final MessageBridge messageBridge;
 
-    /**
-     * Called when a sign is changed.
-     *
-     * @param event The event
-     */
-    @EventHandler(priority = EventPriority.MONITOR)
-    public void onPlayerLogin(PlayerLoginEvent event) {
-        if (event.getResult() != Result.ALLOWED) {
-            return;
-        }
-        final Player player = event.getPlayer();
+	/**
+	 * Constructor.
+	 * @param plugin The AreaShop plugin
+	 */
+	public PlayerLoginLogoutListener(@Nonnull AreaShop plugin, @Nonnull MessageBridge messageBridge) {
+		this.plugin = plugin;
+		this.messageBridge = messageBridge;
+	}
 
-        // Schedule task to check for notifications, prevents a lag spike at login
-        Utils.runCancellingTaskTimer(() -> {
-            // Delay until all regions are loaded
-            if (!plugin.isReady()) {
-                return true;
-            }
-            if (!player.isOnline()) {
-                return false;
-            }
-            // Notify for rents that almost run out
-            for (RentRegion region : plugin.getFileManager().getRents()) {
-                if (region.isRenter(player)) {
-                    String warningSetting = region.getStringSetting("rent.warningOnLoginTime");
-                    if (warningSetting == null || warningSetting.isEmpty()) {
-                        continue;
-                    }
-                    long warningTime = Utils.durationStringToLong(warningSetting);
-                    if (region.getTimeLeft() < warningTime) {
-                        // Send the warning message later to let it appear after general MOTD messages
-                        AreaShop.getInstance().message(player, "rent-expireWarning", region);
-                    }
-                }
-            }
+	/**
+	 * Called when a sign is changed.
+	 * @param event The event
+	 */
+	@EventHandler(priority = EventPriority.MONITOR)
+	public void onPlayerLogin(PlayerLoginEvent event) {
+		if(event.getResult() != Result.ALLOWED) {
+			return;
+		}
+		final Player player = event.getPlayer();
 
-            // Notify admins for plugin updates
-            AreaShop.getInstance().notifyUpdate(player);
-            return false;
-        }, 25, 25, false);
+		// Schedule task to check for notifications, prevents a lag spike at login
+		Do.syncTimerLater(25, 25, () -> {
+			// Delay until all regions are loaded
+			if(!plugin.isReady()) {
+				return true;
+			}
+			if(!player.isOnline()) {
+				return false;
+			}
+			// Notify for rents that almost run out
+			for(RentRegion region : plugin.getFileManager().getRentsRef()) {
+				if(region.isRenter(player)) {
+					String warningSetting = region.getStringSetting("rent.warningOnLoginTime");
+					if(warningSetting == null || warningSetting.isEmpty()) {
+						continue;
+					}
+					long warningTime = Utils.durationStringToLong(warningSetting);
+					if(region.getTimeLeft() < warningTime) {
+						// Send the warning message later to let it appear after general MOTD messages
+						 messageBridge.message(player, "rent-expireWarning", region);
+					}
+				}
+			}
 
-        // Check if the player has regions that use an old name of him and update them
-        Utils.runCancellingTaskTimer(() -> {
-            if (!plugin.isReady()) {
-                return true;
-            }
+			// Notify admins for plugin updates
+			this.plugin.notifyUpdate(player);
+			return false;
+		});
 
-            List<GeneralRegion> regions = new ArrayList<>();
-            for (GeneralRegion region : plugin.getFileManager().getRegions()) {
-                if (region.isOwner(player)) {
-                    regions.add(region);
-                }
-            }
-            final String name = player.getName();
-            Utils.runAsBatches(regions,
-                    plugin.getConfig().getInt("nameupdate.regionsPerTick"),
-                    (region) -> {
-                        if (region instanceof BuyRegion || region instanceof RentRegion) {
-                            String key = region instanceof BuyRegion ? "buy.buyerName" : "rent.renterName";
-                            if (!name.equals(region.getStringSetting("buy.buyerName"))) {
-                                region.setSetting(key, player.getName());
-                                region.update();
-                            }
-                        }
-                    }, false);
-            return false;
-        }, 22, 10, false);
-    }
+		// Check if the player has regions that use an old name of him and update them
+		Do.syncTimerLater(22, 10, () -> {
+			if(!plugin.isReady()) {
+				return true;
+			}
 
-    // Active time updates
-    @EventHandler(priority = EventPriority.MONITOR)
-    public void onPlayerLogout(PlayerQuitEvent event) {
-        updateLastActive(event.getPlayer());
-    }
+			List<GeneralRegion> regions = new ArrayList<>();
+			for(GeneralRegion region : plugin.getFileManager().getRegionsRef()) {
+				if(region.isOwner(player)) {
+					regions.add(region);
+				}
+			}
 
-    @EventHandler(priority = EventPriority.MONITOR)
-    public void onPlayerKick(PlayerKickEvent event) {
-        updateLastActive(event.getPlayer());
-    }
+			Do.forAll(
+				plugin.getConfig().getInt("nameupdate.regionsPerTick"),
+				regions,
+				region -> {
+					if(region instanceof BuyRegion) {
+						if(!player.getName().equals(region.getStringSetting("buy.buyerName"))) {
+							region.setSetting("buy.buyerName", player.getName());
+							region.update();
+						}
+					} else if(region instanceof RentRegion) {
+						if(!player.getName().equals(region.getStringSetting("rent.renterName"))) {
+							region.setSetting("rent.renterName", player.getName());
+							region.update();
+						}
+					}
+				}
+			);
+			return false;
+		});
+	}
 
-    /**
-     * Update the last active time for all regions the player is owner off.
-     *
-     * @param player The player to update the active times for
-     */
-    private void updateLastActive(Player player) {
-        for (GeneralRegion region : plugin.getFileManager().getRegions()) {
-            if (region.isOwner(player)) {
-                region.updateLastActiveTime();
-            }
-        }
-    }
+	// Active time updates
+	@EventHandler(priority = EventPriority.MONITOR)
+	public void onPlayerLogout(PlayerQuitEvent event) {
+		updateLastActive(event.getPlayer());
+	}
+
+	@EventHandler(priority = EventPriority.MONITOR)
+	public void onPlayerKick(PlayerKickEvent event) {
+		updateLastActive(event.getPlayer());
+	}
+
+	/**
+	 * Update the last active time for all regions the player is owner off.
+	 * @param player The player to update the active times for
+	 */
+	private void updateLastActive(Player player) {
+		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;
@@ -34,54 +37,71 @@ import me.wiefferink.areashop.commands.StackCommand;
 import me.wiefferink.areashop.commands.StopresellCommand;
 import me.wiefferink.areashop.commands.TeleportCommand;
 import me.wiefferink.areashop.commands.UnrentCommand;
-import org.bukkit.command.*;
+import org.bukkit.command.Command;
+import org.bukkit.command.CommandExecutor;
+import org.bukkit.command.CommandSender;
+import org.bukkit.command.TabCompleter;
 
-import java.util.*;
+import javax.annotation.Nonnull;
+import javax.inject.Inject;
+import javax.inject.Singleton;
+import java.util.ArrayList;
+import java.util.List;
+import java.util.SortedSet;
+import java.util.TreeSet;
 
-public class CommandManager extends Manager implements TabExecutor {
-	private final ArrayList<CommandAreaShop> commands;
+@Singleton
+public class CommandManager extends Manager implements CommandExecutor, TabCompleter {
+	private final List<CommandAreaShop> commands;
+	private final AreaShop plugin;
+	private final MessageBridge messageBridge;
 
 	/**
 	 * Constructor.
 	 */
-	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);
+		plugin.getCommand("AreaShop").setTabCompleter(this);
 	}
 
 	/**
@@ -98,13 +118,13 @@ public class CommandManager extends Manager implements TabExecutor {
 	 */
 	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()) {
@@ -113,14 +133,14 @@ public class CommandManager extends Manager implements TabExecutor {
 		}
 		// 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;
 		}
 
@@ -146,9 +166,9 @@ public class CommandManager extends Manager implements TabExecutor {
 			} 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");
 				}
 			}
 		}
@@ -158,10 +178,10 @@ public class CommandManager extends Manager implements TabExecutor {
 
 	@Override
 	public List<String> onTabComplete(CommandSender sender, Command command, String alias, String[] args) {
-		if(!sender.hasPermission("areashop.tabcomplete")) {
-			return Collections.emptyList();
-		}
 		List<String> result = new ArrayList<>();
+		if(!sender.hasPermission("areashop.tabcomplete")) {
+			return result;
+		}
 		int toCompleteNumber = args.length;
 		String toCompletePrefix = args[args.length - 1].toLowerCase();
 		//AreaShop.debug("toCompleteNumber=" + toCompleteNumber + ", toCompletePrefix=" + toCompletePrefix + ", length=" + toCompletePrefix.length());

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
@@ -68,8 +77,6 @@ public class FeatureManager extends Manager {
 		for(RegionFeature feature : globalFeatures) {
 			feature.shutdown();
 		}
-		// FIXME make this system less hacky!
-		SignsFeature.shutdownGlobalState();
 	}
 
 	/**
@@ -79,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/IFileManager.java

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

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

@@ -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/SignLinkerManager.java

@@ -1,7 +1,10 @@
 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.interfaces.BukkitInterface;
 import me.wiefferink.areashop.regions.GeneralRegion;
 import me.wiefferink.areashop.tools.Materials;
 import me.wiefferink.areashop.tools.Utils;
@@ -10,9 +13,6 @@ import org.bukkit.Location;
 import org.bukkit.Material;
 import org.bukkit.block.Block;
 import org.bukkit.block.BlockFace;
-import org.bukkit.block.data.BlockData;
-import org.bukkit.block.data.type.Sign;
-import org.bukkit.block.data.type.WallSign;
 import org.bukkit.entity.Player;
 import org.bukkit.event.EventHandler;
 import org.bukkit.event.EventPriority;
@@ -23,18 +23,31 @@ 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 BukkitInterface bukkitInterface;
+	@Inject
+	private SignManager signManager;
+	@Inject
+	private MessageBridge messageBridge;
+
+	SignLinkerManager() {
 		signLinkers = new HashMap<>();
 		eventsRegistered = false;
 	}
@@ -53,8 +66,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);
@@ -71,7 +84,7 @@ public class SignLinkerManager extends Manager implements Listener {
 			eventsRegistered = false;
 			HandlerList.unregisterAll(this);
 		}
-		plugin.message(player, "linksigns-stopped");
+		messageBridge.message(player, "linksigns-stopped");
 	}
 
 	/**
@@ -107,13 +120,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);
@@ -124,25 +137,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;
 				}
-				final BlockData blockData = block.getBlockData();
-				final BlockFace rotation;
-				if (blockData instanceof Sign) {
-					rotation = ((Sign) blockData).getRotation();
-				} else if (blockData instanceof WallSign) {
-					rotation = ((WallSign) blockData).getFacing();
-				} else {
-					rotation = null;
-				}
-				linker.setSign(block.getLocation(), block.getType(), rotation);
+				linker.setSign(block.getLocation(), block.getType(), bukkitInterface.getSignFacing(block));
 			}
 		}
 	}
@@ -181,7 +186,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();
 		}
@@ -192,7 +197,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();
 		}
@@ -201,14 +206,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,81 @@
+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.BukkitInterface;
+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.IFileManager;
+import me.wiefferink.areashop.managers.FileManager;
+import me.wiefferink.areashop.managers.SignErrorLogger;
+import me.wiefferink.areashop.managers.SignLinkerManager;
+import me.wiefferink.areashop.nms.BlockBehaviourHelper;
+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;
+
+public class AreaShopModule extends AbstractModule {
+
+    private final AreaShop instance;
+    private final BukkitInterface bukkitInterface;
+    private final WorldGuardInterface worldGuardInterface;
+    private final WorldEditInterface worldEditInterface;
+    private final NMS nms;
+    private final MessageBridge messageBridge;
+    private final SignErrorLogger signErrorLogger;
+    private final DependencyModule dependencyModule;
+
+    public AreaShopModule(@Nonnull AreaShop instance,
+                          @Nonnull MessageBridge messageBridge,
+                          @Nonnull NMS nms,
+                          @Nonnull BukkitInterface bukkitInterface,
+                          @Nonnull WorldEditInterface worldEditInterface,
+                          @Nonnull WorldGuardInterface worldGuardInterface,
+                          @Nonnull SignErrorLogger signErrorLogger,
+                          @Nonnull DependencyModule dependencyModule
+    ) {
+        this.instance = instance;
+        this.messageBridge = messageBridge;
+        this.nms = nms;
+        this.signErrorLogger = signErrorLogger;
+        this.bukkitInterface = bukkitInterface;
+        this.worldEditInterface = worldEditInterface;
+        this.worldGuardInterface = worldGuardInterface;
+        this.dependencyModule = dependencyModule;
+    }
+
+    @Override
+    protected void configure() {
+        install(this.dependencyModule);
+        bind(Plugin.class).toInstance(this.instance);
+        bind(AreaShop.class).toInstance(this.instance);
+        bind(MessageBridge.class).toInstance(this.messageBridge);
+        bind(NMS.class).toInstance(this.nms);
+        bind(BlockBehaviourHelper.class).toInstance(this.nms.blockBehaviourHelper());
+        bind(BukkitInterface.class).toInstance(this.bukkitInterface);
+        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/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,40 @@ 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
@@ -264,7 +293,7 @@ public class BuyRegion extends GeneralRegion {
 			return false;
 		}
 
-		if(plugin.getEconomy() == null) {
+		if(economy == null) {
 			message(offlinePlayer, "general-noEconomy");
 			return false;
 		}
@@ -335,12 +364,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 +386,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);
@@ -366,11 +395,11 @@ public class BuyRegion extends GeneralRegion {
 			r = null;
 			OfflinePlayer oldOwnerPlayer = Bukkit.getOfflinePlayer(oldOwner);
 			String oldOwnerName = getPlayerName();
-			if(oldOwnerPlayer.hasPlayedBefore() && oldOwnerPlayer.getName() != null) {
-				r = plugin.getEconomy().depositPlayer(oldOwnerPlayer, getWorldName(), getResellPrice());
+			if(oldOwnerPlayer != null && oldOwnerPlayer.getName() != null) {
+				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 +433,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 +446,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());
@@ -469,7 +498,7 @@ public class BuyRegion extends GeneralRegion {
 			}
 		}
 
-		if(plugin.getEconomy() == null) {
+		if(economy == null) {
 			return false;
 		}
 
@@ -494,9 +523,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;
@@ -510,9 +539,9 @@ public class BuyRegion extends GeneralRegion {
 				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/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();
 	}
 
 	/**
@@ -399,8 +419,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());
 					}
@@ -459,10 +480,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 +493,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,18 @@ 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
@@ -428,7 +457,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 +569,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 +587,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 +601,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,7 +667,7 @@ public class RentRegion extends GeneralRegion {
 			}
 		}
 
-		if(plugin.getEconomy() == null) {
+		if(economy == null) {
 			return false;
 		}
 
@@ -662,9 +691,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 +707,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;

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

@@ -1,11 +1,11 @@
 package me.wiefferink.areashop.tools;
 
-import com.google.gson.Gson;
-import com.google.gson.GsonBuilder;
-import com.google.gson.JsonObject;
 import org.apache.commons.lang.StringUtils;
 import org.apache.commons.lang.exception.ExceptionUtils;
 import org.bukkit.plugin.Plugin;
+import org.bukkit.scheduler.BukkitRunnable;
+import org.json.simple.JSONObject;
+import org.json.simple.JSONValue;
 
 import java.io.BufferedReader;
 import java.io.IOException;
@@ -18,242 +18,234 @@ import java.util.logging.Logger;
 
 public class GithubUpdateCheck {
 
-    public static final String API_HOST = "https://api.github.com/repos";
-    public static final String API_LATEST_RELEASE = "releases/latest";
-    public static final String USER_AGENT = "GithubUpdateCheck by NLThijs48";
-    public static final boolean DEBUG = false;
-    private static final Gson GSON = new GsonBuilder().create();
+	public static final String API_HOST = "https://api.github.com/repos";
+	public static final String API_LATEST_RELEASE = "releases/latest";
+	public static final String USER_AGENT = "GithubUpdateCheck by NLThijs48";
+	public static final boolean DEBUG = false;
 
-    private final String author;
-    private final String repository;
-    private final Plugin plugin;
-    private final Logger logger;
-    private final String currentVersion;
-    private URL url;
-    private VersionComparator versionComparator;
-    // Status
-    private boolean checking;
-    private boolean error;
-    private boolean hasUpdate;
-    private String latestVersion;
+	private final String author;
+	private final String repository;
+	private final Plugin plugin;
+	private final Logger logger;
+	private URL url;
+	private VersionComparator versionComparator;
 
-    /**
-     * Create a new GithubUpdateCheck with the required information.
-     *
-     * @param plugin     The plugin to create it for (used for logging and checking version)
-     * @param author     The author of the plugin as used on Github
-     * @param repository The repository name of the plugin on Github
-     */
-    public GithubUpdateCheck(Plugin plugin, String author, String repository) {
-        this.plugin = plugin;
-        this.logger = plugin.getLogger();
-        this.author = author;
-        this.repository = repository;
-        this.currentVersion = plugin.getDescription().getVersion();
-        this.versionComparator = (latest, current) ->
-                !latest.equalsIgnoreCase(current);
+	// Status
+	private boolean checking;
+	private boolean error;
+	private boolean hasUpdate;
+	private String latestVersion;
+	private final String currentVersion;
 
-        this.checking = false;
-        this.error = false;
-        this.hasUpdate = false;
-    }
+	/**
+	 * Create a new GithubUpdateCheck with the required information.
+	 * @param plugin            The plugin to create it for (used for logging and checking version)
+	 * @param author            The author of the plugin as used on Github
+	 * @param repository        The repository name of the plugin on Github
+	 */
+	public GithubUpdateCheck(Plugin plugin, String author, String repository) {
+		this.plugin = plugin;
+		this.logger = plugin.getLogger();
+		this.author = author;
+		this.repository = repository;
+		this.currentVersion = plugin.getDescription().getVersion();
+		this.versionComparator = (latest, current) ->
+				!latest.equalsIgnoreCase(current);
 
-    /**
-     * Change the version comparator.
-     *
-     * @param versionComparator VersionComparator to use for checking if one version is newer than the other
-     * @return this
-     */
-    public GithubUpdateCheck withVersionComparator(VersionComparator versionComparator) {
-        this.versionComparator = versionComparator;
-        return this;
-    }
+		this.checking = false;
+		this.error = false;
+		this.hasUpdate = false;
+	}
 
-    /**
-     * Check if an update is available.
-     */
-    public void checkUpdate() {
-        checkUpdate(null);
-    }
+	/**
+	 * Change the version comparator.
+	 * @param versionComparator VersionComparator to use for checking if one version is newer than the other
+	 * @return this
+	 */
+	public GithubUpdateCheck withVersionComparator(VersionComparator versionComparator) {
+		this.versionComparator = versionComparator;
+		return this;
+	}
 
-    /**
-     * Check if an update is available.
-     *
-     * @param callback Callback to execute when the update check is done
-     * @return GithubUpdateCheck containing the status of the check
-     */
-    public GithubUpdateCheck checkUpdate(UpdateCallback callback) {
-        checking = true;
-        final GithubUpdateCheck self = this;
-        // Check for update on async thread
-        Utils.newChain()
-             .async(() -> {
-                        try {
-                            try {
-                                String rawUrl = API_HOST + "/" + author + "/" + repository + "/" + API_LATEST_RELEASE;
-                                url = new URL(rawUrl);
-                            } catch (MalformedURLException e) {
-                                logger.severe("Invalid url: '" + url + "', are the author '" + author + "' and repository '" + repository + "' correct?");
-                                error = true;
-                                return;
-                            }
+	/**
+	 * Check if an update is available.
+	 */
+	public void checkUpdate() {
+		checkUpdate(null);
+	}
 
-                            try {
-                                URLConnection conn = url.openConnection();
-                                // Give up after 15 seconds
-                                conn.setConnectTimeout(15000);
-                                // Identify ourselves
-                                conn.addRequestProperty("User-Agent", USER_AGENT);
-                                // Make sure we access the correct api version
-                                conn.addRequestProperty("Accept", "application/vnd.github.v3+json");
-                                // We want to read the result
-                                conn.setDoOutput(true);
-                                // Open connection
-                                try (BufferedReader reader = new BufferedReader(new InputStreamReader(conn.getInputStream()))) {
-                                    String response = reader.readLine();
-                                    debug("Response:", response);
+	/**
+	 * Check if an update is available.
+	 * @param callback Callback to execute when the update check is done
+	 * @return GithubUpdateCheck containing the status of the check
+	 */
+	public GithubUpdateCheck checkUpdate(UpdateCallback callback) {
+		checking = true;
+		final GithubUpdateCheck self = this;
+		// Check for update on asyn thread
+		new BukkitRunnable() {
+			@Override
+			public void run() {
+				try {
+					try {
+						String rawUrl = API_HOST + "/" + author + "/" + repository + "/" + API_LATEST_RELEASE;
+						url = new URL(rawUrl);
+					} catch(MalformedURLException e) {
+						logger.severe("Invalid url: '" + url + "', are the author '" + author + "' and repository '" + repository + "' correct?");
+						error = true;
+						return;
+					}
 
-                                    JsonObject latestRelease = GSON.fromJson(response, JsonObject.class);
+					try {
+						URLConnection conn = url.openConnection();
+						// Give up after 15 seconds
+						conn.setConnectTimeout(15000);
+						// Identify ourselves
+						conn.addRequestProperty("User-Agent", USER_AGENT);
+						// Make sure we access the correct api version
+						conn.addRequestProperty("Accept", "application/vnd.github.v3+json");
+						// We want to read the result
+						conn.setDoOutput(true);
+						// Open connection
+						try(BufferedReader reader = new BufferedReader(new InputStreamReader(conn.getInputStream()))) {
+							String response = reader.readLine();
+							debug("Response:", response);
 
-                                    if (latestRelease.isJsonNull()) {
-                                        logger.warning("Failed to get api response from " + url);
-                                        error = true;
-                                        return;
-                                    }
-                                    debug("json: " + latestRelease.toString());
+							JSONObject latestRelease = (JSONObject)JSONValue.parse(response);
 
-                                    // Latest version
-                                    latestVersion = latestRelease.get("tag_name").getAsString();
-                                    debug("Tag name:", latestVersion);
+							if(latestRelease.isEmpty()) {
+								logger.warning("Failed to get api response from " + url);
+								error = true;
+								return;
+							}
+							debug("json: " + latestRelease.toJSONString());
 
-                                    // Current version
-                                    debug("Plugin version:", currentVersion);
+							// Latest version
+							latestVersion = (String)latestRelease.get("tag_name");
+							debug("Tag name:", latestVersion);
 
-                                    // Compare version
-                                    hasUpdate = versionComparator.isNewer(latestVersion, currentVersion);
-                                }
-                            } catch (IOException e) {
-                                logger.severe("Failed to get latest release:" + ExceptionUtils
-                                        .getStackTrace(e));
-                                error = true;
-                            } catch (ClassCastException e) {
-                                logger.info("Unexpected structure of the result, failed to parse it");
-                                error = true;
-                            }
-                        } finally {
-                            checking = false;
-                            debug("result:", self);
-                        }
-                    }
-             ).syncLast(x -> {
-            if (callback != null) {
-                callback.run(this);
-            }
-        }).execute();
-        return this;
-    }
+							// Current version
+							debug("Plugin version:", currentVersion);
 
-    /**
-     * Check if an update check is running.
-     *
-     * @return true if an update check is running
-     */
-    public boolean isChecking() {
-        return checking;
-    }
+							// Compare version
+							hasUpdate = versionComparator.isNewer(latestVersion, currentVersion);
+						}
+					} catch(IOException e) {
+						logger.severe("Failed to get latest release:" + ExceptionUtils.getStackTrace(e));
+						error = true;
+					} catch(ClassCastException e) {
+						logger.info("Unexpected structure of the result, failed to parse it");
+						error = true;
+					}
+				} finally {
+					checking = false;
+					debug("result:", self);
+					if(callback != null) {
+						// Switch back to main thread and call the callback
+						new BukkitRunnable() {
+							@Override
+							public void run() {
+								callback.run(self);
+							}
+						}.runTask(plugin);
+					}
+				}
+			}
+		}.runTaskAsynchronously(plugin);
+		return this;
+	}
 
-    /**
-     * Check if the update check failed.
-     *
-     * @return true if the update check failed (an error message has been logged)
-     */
-    public boolean hasFailed() {
-        return error;
-    }
+	/**
+	 * Check if an update check is running.
+	 * @return true if an update check is running
+	 */
+	public boolean isChecking() {
+		return checking;
+	}
 
-    /**
-     * Check if an update has been found.
-     *
-     * @return true if an update has been found
-     */
-    public boolean hasUpdate() {
-        return hasUpdate;
-    }
+	/**
+	 * Check if the update check failed.
+	 * @return true if the update check failed (an error message has been logged)
+	 */
+	public boolean hasFailed() {
+		return error;
+	}
 
-    /**
-     * Get the repository that this update checker is checking.
-     *
-     * @return Used repository
-     */
-    public String getRepository() {
-        return repository;
-    }
+	/**
+	 * Check if an update has been found.
+	 * @return true if an update has been found
+	 */
+	public boolean hasUpdate() {
+		return hasUpdate;
+	}
 
-    /**
-     * Get the author that this update checker is checking.
-     *
-     * @return Used author
-     */
-    public String getAuthor() {
-        return author;
-    }
+	/**
+	 * Get the repository that this update checker is checking.
+	 * @return Used repository
+	 */
+	public String getRepository() {
+		return repository;
+	}
 
-    /**
-     * Get the current version.
-     *
-     * @return Current version of the plugin
-     */
-    public String getCurrentVersion() {
-        return currentVersion;
-    }
+	/**
+	 * Get the author that this update checker is checking.
+	 * @return Used author
+	 */
+	public String getAuthor() {
+		return author;
+	}
 
-    /**
-     * Get the latest version.
-     *
-     * @return Latest version of the plugin (if checking is complete)
-     */
-    public String getLatestVersion() {
-        return latestVersion;
-    }
+	/**
+	 * Get the current version.
+	 * @return Current version of the plugin
+	 */
+	public String getCurrentVersion() {
+		return currentVersion;
+	}
 
-    /**
-     * Print a debug message if DEBUG is enabled.
-     *
-     * @param message Message to print
-     */
-    private void debug(Object... message) {
-        if (DEBUG) {
-            logger.info("[" + this.getClass().getSimpleName() + "] [DEBUG] " + StringUtils
-                    .join(message, " "));
-        }
-    }
+	/**
+	 * Get the latest version.
+	 * @return Latest version of the plugin (if checking is complete)
+	 */
+	public String getLatestVersion() {
+		return latestVersion;
+	}
 
-    @Override
-    public String toString() {
-        return "GithubUpdateCheck(" + StringUtils.join(Arrays.asList(
-                "author=" + author,
-                "repository=" + repository,
-                "plugin=" + plugin.getName(),
-                "checking=" + checking,
-                "hasUpdate=" + hasUpdate,
-                "error=" + error,
-                "currentVersion=" + currentVersion,
-                "latestVersion=" + latestVersion
-        ), ", ") + ")";
-    }
+	public interface VersionComparator {
+		/**
+		 * Check if a version should be considered 'newer' than another.
+		 * @param latestVersion  Version that is available on Github
+		 * @param currentVersion Version of the current plugin
+		 * @return true if the latestVersion is newer than the localVersion, otherwise false
+		 */
+		boolean isNewer(String latestVersion, String currentVersion);
+	}
 
-    public interface VersionComparator {
-        /**
-         * Check if a version should be considered 'newer' than another.
-         *
-         * @param latestVersion  Version that is available on Github
-         * @param currentVersion Version of the current plugin
-         * @return true if the latestVersion is newer than the localVersion, otherwise false
-         */
-        boolean isNewer(String latestVersion, String currentVersion);
-    }
+	public interface UpdateCallback {
+		void run(GithubUpdateCheck result);
+	}
 
-    public interface UpdateCallback {
-        void run(GithubUpdateCheck result);
-    }
+	/**
+	 * Print a debug message if DEBUG is enabled.
+	 * @param message Message to print
+	 */
+	private void debug(Object... message) {
+		if(DEBUG) {
+			logger.info("[" + this.getClass().getSimpleName() + "] [DEBUG] " + StringUtils.join(message, " "));
+		}
+	}
+
+	@Override
+	public String toString() {
+		return "GithubUpdateCheck(" + StringUtils.join(Arrays.asList(
+				"author=" + author,
+				"repository=" + repository,
+				"plugin=" + plugin.getName(),
+				"checking=" + checking,
+				"hasUpdate=" + hasUpdate,
+				"error=" + error,
+				"currentVersion=" + currentVersion,
+				"latestVersion=" + latestVersion
+		), ", ") + ")";
+	}
 }

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

@@ -1,14 +1,8 @@
 package me.wiefferink.areashop.tools;
 
-import me.wiefferink.areashop.AreaShop;
-import org.bukkit.Bukkit;
 import org.bukkit.Material;
 import org.bukkit.Tag;
 
-import java.util.Arrays;
-import java.util.HashSet;
-import java.util.List;
-
 public class Materials {
 
 	private Materials() {
@@ -25,11 +19,11 @@ public class Materials {
 			return null;
 		}
 		try {
-			return Material.matchMaterial(name);
-		} catch (IllegalArgumentException ignored) {
-			AreaShop.debug("Materials.get() null result:", name);
-			return null;
+			return Material.getMaterial(name);
+		} catch (IllegalArgumentException ex) {
+			ex.printStackTrace();
 		}
+		return null;
 	}
 
 	/**
@@ -38,7 +32,7 @@ public class Materials {
 	 * @return true if the given material is a sign
 	 */
 	public static boolean isSign(Material material) {
-		return Tag.SIGNS.isTagged(material) || Tag.WALL_SIGNS.isTagged(material);
+		return Tag.SIGNS.isTagged(material);
 	}
 
 	/**
@@ -48,9 +42,8 @@ public class Materials {
 	 */
 	public static boolean isSign(String name) {
 		try {
-			return isSign(Material.matchMaterial(name));
+			return isSign(Material.getMaterial(name));
 		} catch (IllegalArgumentException ex) {
-			AreaShop.debug("Invalid Material: " + name + " passed when performing sign check.");
 			return false;
 		}
 	}

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

@@ -126,7 +126,7 @@ public final class OperandParser {
 
         return x;
     }
-    
+
     public static class ParseException extends Exception {
 
         public ParseException() {

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/resources/config.yml

@@ -121,6 +121,8 @@ debug: false
 version: ${project.version}
 # Maximum number of blocks to save to or restore from a .schemetic file.
 maximumBlocks: 1000000
+# Maximum number of entities to save to or restore from a .schematic file (FAWE only)
+maximumEntities: 1000
 # Maximum number of locations the teleport function should check to find a safe spot.
 maximumTries: 50000
 

AreaShop/src/main/resources/plugin.yml

@@ -1,11 +1,11 @@
 name: AreaShop
 main: me.wiefferink.areashop.AreaShop
-version: "@version@"
+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

@@ -64,11 +64,11 @@ For a preview join 'mc.go-craft.com' and go to the Survival server, the shops ar
 Old video for AreaShop v1.0: [Tutorial by VariationVault](https://www.youtube.com/watch?v=k2HMCxCCOYo)
 
 ### Required dependencies
-* Java 8 or higher (latest recommended)
-* Bukkit/Spigot 1.13.2 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/): 7.0.3 or higher
-* [WorldEdit](http://dev.bukkit.org/bukkit-plugins/worldedit/): 7.0.1 or higher 
-* [Vault](http://dev.bukkit.org/bukkit-plugins/vault/): 1.7 or higher
+* 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

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-1/build.gradle.kts

@@ -0,0 +1,21 @@
+plugins.apply("io.papermc.paperweight.userdev")
+
+dependencies {
+    paperDevBundle("1.18.1-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-1/src/main/java/me/wiefferink/areashop/adapters/platform/v1_18_R1/BlockBehaviourImpl.java

@@ -0,0 +1,46 @@
+package me.wiefferink.areashop.adapters.platform.v1_18_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_18_R1.CraftWorld;
+import org.bukkit.craftbukkit.v1_18_R1.block.CraftBlock;
+import org.bukkit.craftbukkit.v1_18_R1.block.CraftBlockState;
+import org.bukkit.craftbukkit.v1_18_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 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-1/src/main/java/me/wiefferink/areashop/adapters/platform/v1_18_R1/NMSImpl.java

@@ -0,0 +1,15 @@
+package me.wiefferink.areashop.adapters.platform.v1_18_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/plugins/fastasyncworldedit/build.gradle.kts

@@ -0,0 +1,9 @@
+dependencies {
+    compileOnly(libs.spigot)
+    compileOnly(projects.areashopInterface)
+    compileOnly(libs.fastasyncworldeditCore)
+    compileOnly(libs.fastasyncworldeditBukkit)
+    compileOnly(libs.worldguardCore)
+}
+
+description = "AreaShop FastAsyncWorldEdit"

adapters/plugins/fastasyncworldedit/src/main/java/me/wiefferink/areashop/adapters/plugins/FastAsyncWorldEditHandler.java

@@ -0,0 +1,482 @@
+package me.wiefferink.areashop.adapters.plugins;
+
+import com.fastasyncworldedit.core.FaweAPI;
+import com.fastasyncworldedit.core.extent.clipboard.MemoryOptimizedClipboard;
+import com.fastasyncworldedit.core.extent.processor.lighting.RelightMode;
+import com.fastasyncworldedit.core.internal.exception.FaweException;
+import com.fastasyncworldedit.core.limit.FaweLimit;
+import com.google.common.annotations.Beta;
+import com.sk89q.worldedit.EditSession;
+import com.sk89q.worldedit.IncompleteRegionException;
+import com.sk89q.worldedit.LocalSession;
+import com.sk89q.worldedit.MaxChangedBlocksException;
+import com.sk89q.worldedit.bukkit.BukkitAdapter;
+import com.sk89q.worldedit.extent.clipboard.BlockArrayClipboard;
+import com.sk89q.worldedit.extent.clipboard.Clipboard;
+import com.sk89q.worldedit.extent.clipboard.io.BuiltInClipboardFormat;
+import com.sk89q.worldedit.extent.clipboard.io.ClipboardFormat;
+import com.sk89q.worldedit.extent.clipboard.io.ClipboardFormats;
+import com.sk89q.worldedit.extent.clipboard.io.ClipboardReader;
+import com.sk89q.worldedit.extent.clipboard.io.ClipboardWriter;
+import com.sk89q.worldedit.extent.transform.BlockTransformExtent;
+import com.sk89q.worldedit.function.mask.Mask;
+import com.sk89q.worldedit.function.mask.Mask2D;
+import com.sk89q.worldedit.function.operation.ForwardExtentCopy;
+import com.sk89q.worldedit.function.operation.Operations;
+import com.sk89q.worldedit.math.BlockVector3;
+import com.sk89q.worldedit.regions.CuboidRegion;
+import com.sk89q.worldedit.regions.Region;
+import com.sk89q.worldedit.session.ClipboardHolder;
+import com.sk89q.worldedit.util.io.Closer;
+import com.sk89q.worldedit.world.World;
+import com.sk89q.worldguard.protection.regions.ProtectedRegion;
+import com.sk89q.worldguard.protection.regions.RegionType;
+import me.wiefferink.areashop.interfaces.AreaShopInterface;
+import me.wiefferink.areashop.interfaces.GeneralRegionInterface;
+import me.wiefferink.areashop.interfaces.WorldEditInterface;
+import me.wiefferink.areashop.interfaces.WorldEditSelection;
+import org.apache.commons.lang.exception.ExceptionUtils;
+import org.bukkit.entity.Player;
+import org.bukkit.util.BoundingBox;
+
+import java.io.BufferedOutputStream;
+import java.io.File;
+import java.io.FileInputStream;
+import java.io.FileOutputStream;
+import java.io.IOException;
+import java.util.concurrent.CompletableFuture;
+
+// Future: this class could use the schematic save/paste api of FAWE: https://github.com/boy0001/FastAsyncWorldedit/wiki/Pasting-a-schematic
+// This would not allow for shaping the schematic to a polygon region though
+public class FastAsyncWorldEditHandler extends WorldEditInterface {
+
+	public FastAsyncWorldEditHandler(AreaShopInterface pluginInterface) {
+		super(pluginInterface);
+	}
+
+	private static class RegionBoundMask implements Mask {
+
+		private final BoundingBox boundingBox;
+
+		public RegionBoundMask(final ProtectedRegion region) {
+			final BlockVector3 min = region.getMinimumPoint();
+			final BlockVector3 max = region.getMaximumPoint();
+			this.boundingBox = new BoundingBox(min.getX(), min.getY(), min.getZ(), max.getX(), max.getY(), max.getZ());
+		}
+
+		public RegionBoundMask(final BoundingBox boundingBox) {
+			this.boundingBox = boundingBox.clone();
+		}
+
+		@Override
+		public boolean test(BlockVector3 vector) {
+			return boundingBox.contains(vector.getX(), vector.getY(), vector.getZ());
+		}
+
+		@Override
+		public Mask2D toMask2D() {
+			return null;
+		}
+
+		@Override
+		public Mask copy() {
+			return new RegionBoundMask(boundingBox);
+		}
+	}
+
+	@Override
+	public boolean supportsAsyncOperations() {
+		return true;
+	}
+
+	@Beta
+	public CompletableFuture<Boolean> restoreRegionBlocksAsync(File rawFile, GeneralRegionInterface regionInterface) {
+		File file = null;
+		for (ClipboardFormat formatOption : BuiltInClipboardFormat.values()) {
+			if (new File(rawFile.getAbsolutePath() + "." + formatOption.getPrimaryFileExtension())
+					.exists()) {
+				file = new File(
+						rawFile.getAbsolutePath() + "." + formatOption.getPrimaryFileExtension());
+				break;
+			}
+		}
+		if (file == null) {
+			pluginInterface.getLogger().info("Did not restore region " + regionInterface.getName()
+					+ ", schematic file does not exist: " + rawFile.getAbsolutePath());
+			return CompletableFuture.completedFuture(false);
+		}
+		ClipboardFormat format = ClipboardFormats.findByFile(file);
+		if (format == null) {
+			pluginInterface.debugI("Did not restore region " + regionInterface.getName() + ", could not find a valid clipboard format");
+			return CompletableFuture.completedFuture(false);
+		}
+		pluginInterface.debugI("Trying to restore region", regionInterface.getName(), " from file",
+				file.getAbsolutePath(), "with format", format.getName());
+
+		com.sk89q.worldedit.world.World world = null;
+		if (regionInterface.getName() != null) {
+			world = BukkitAdapter.adapt(regionInterface.getWorld());
+		}
+		if (world == null) {
+			pluginInterface.getLogger().info(
+					"Did not restore region " + regionInterface.getName() + ", world not found: "
+							+ regionInterface.getWorldName());
+			return CompletableFuture.completedFuture(false);
+		}
+		final FaweLimit limit = FaweLimit.MAX.copy();
+		limit.MAX_CHANGES = pluginInterface.getConfig().getInt("maximumBlocks");
+		limit.MAX_ENTITIES = pluginInterface.getConfig().getInt("maximumEntities", (int) (limit.MAX_CHANGES / 1000));
+		EditSession editSession = pluginInterface.getWorldEdit().getWorldEdit()
+				.newEditSessionBuilder()
+				.world(world)
+				.limit(limit)
+				.build();
+		editSession.setReorderMode(EditSession.ReorderMode.MULTI_STAGE);
+		ProtectedRegion region = regionInterface.getRegion();
+		// Get the origin and size of the region
+		BlockVector3 origin = BlockVector3
+				.at(region.getMinimumPoint().getBlockX(),
+						region.getMinimumPoint().getBlockY(),
+						region.getMinimumPoint().getBlockZ());
+		final File finalFile = file;
+		final String regionName = regionInterface.getName();
+		final double regionWidth = regionInterface.getWidth(), regionHeight = regionInterface.getHeight(), regionDepth = regionInterface.getDepth();
+		final LocalSession session =
+				new LocalSession(pluginInterface.getWorldEdit().getLocalConfiguration());
+		final CompletableFuture<Boolean> completableFuture = new CompletableFuture<>();
+		final RegionType regionType = region.getType();
+		final Mask mask = new RegionBoundMask(region);
+		FaweAPI.getTaskManager().async(() -> {
+			boolean result = true;
+			// Read the schematic and paste it into the world
+			try (Closer closer = Closer.create()) {
+				final FileInputStream fis = closer.register(new FileInputStream(finalFile));
+				final ClipboardReader reader = format.getReader(fis);
+				final Clipboard clipboard = reader.read();
+
+				if (clipboard.getDimensions().getY() != regionHeight
+						|| clipboard.getDimensions().getX() != regionWidth
+						|| clipboard.getDimensions().getZ() != regionDepth) {
+					pluginInterface.getLogger().warning(
+							"Size of the region " + regionName
+									+ " is not the same as the schematic to restore!");
+					pluginInterface.debugI(
+							"schematic|region, x:" + clipboard.getDimensions().getX() + "|"
+									+ regionWidth + ", y:" + clipboard.getDimensions().getY()
+									+ "|" + regionHeight + ", z:" + clipboard.getDimensions()
+									.getZ() + "|" + regionDepth);
+				}
+				clipboard.setOrigin(clipboard.getMinimumPoint());
+				ClipboardHolder clipboardHolder = new ClipboardHolder(clipboard);
+				session.setBlockChangeLimit((int) limit.MAX_CHANGES);
+				session.setClipboard(clipboardHolder);
+
+				// Build operation
+
+				BlockTransformExtent extent = new BlockTransformExtent(clipboard);
+				ForwardExtentCopy copy =
+						new ForwardExtentCopy(extent, clipboard.getRegion(), clipboard.getOrigin(),
+								editSession, origin);
+				copy.setTransform(clipboardHolder.getTransform());
+				// Mask to region (for polygon and other weird shaped regions)
+				// TODO make this more efficient (especially for polygon regions)
+				if (regionType != RegionType.CUBOID) {
+					copy.setSourceMask(mask);
+				}
+				Operations.completeLegacy(copy);
+			} catch (MaxChangedBlocksException e) {
+				pluginInterface.getLogger().warning(
+						"exceeded the block limit while restoring schematic of " + regionInterface.getName()
+								+ ", limit in exception: " + e.getBlockLimit() + ", limit passed by AreaShop: "
+								+ pluginInterface.getConfig().getInt("maximumBlocks"));
+				result = false;
+			} catch (IOException e) {
+				pluginInterface.getLogger().warning(
+						"An error occurred while restoring schematic of " + regionInterface.getName()
+								+ ", enable debug to see the complete stacktrace");
+				pluginInterface.debugI(ExceptionUtils.getStackTrace(e));
+				result = false;
+			} catch (Exception e) {
+				pluginInterface.getLogger()
+						.warning("crashed during restore of " + regionInterface.getName());
+				pluginInterface.debugI(ExceptionUtils.getStackTrace(e));
+				result = false;
+			}
+			editSession.flushQueue();
+			completableFuture.complete(result);
+		});
+		return completableFuture;
+	}
+
+	@Beta
+	public CompletableFuture<Boolean> saveRegionBlocksAsync(File file, GeneralRegionInterface regionInterface) {
+		// TODO implement using the FastAsyncWorldEdit api to save async
+		ClipboardFormat format = BuiltInClipboardFormat.FAST;
+		// TODO allow selecting FAWE format in the config? (when enabled you cannot go back to vanilla WorldEdit easily)
+
+		file = new File(file.getAbsolutePath() + "." + format.getPrimaryFileExtension());
+		pluginInterface.debugI("Trying to save region", regionInterface.getName(), " to file",
+				file.getAbsolutePath(), "with format", format.getName());
+		com.sk89q.worldedit.world.World world = null;
+		if (regionInterface.getWorld() != null) {
+			world = BukkitAdapter.adapt(regionInterface.getWorld());
+		}
+		if (world == null) {
+			pluginInterface.getLogger().warning(
+					"Did not save region " + regionInterface.getName() + ", world not found: "
+							+ regionInterface.getWorldName());
+			return CompletableFuture.completedFuture(false);
+		}
+		final FaweLimit limit = new FaweLimit();
+		limit.MAX_CHANGES = pluginInterface.getConfig().getInt("maximumBlocks");
+		EditSession editSession = pluginInterface.getWorldEdit().getWorldEdit().newEditSessionBuilder()
+				.world(world)
+				.relightMode(RelightMode.OPTIMAL)
+				.limit(limit)
+				.build();
+
+		final ProtectedRegion region = regionInterface.getRegion();
+		final BlockVector3 min = region.getMinimumPoint(), max = region.getMaximumPoint();
+		final String regionName = regionInterface.getName();
+		final World finalWorld = world;
+		final CompletableFuture<Boolean> completableFuture = new CompletableFuture<>();
+		final File finalFile = file;
+		FaweAPI.getTaskManager().async(() -> {
+			// Create a clipboard
+			CuboidRegion selection =
+					new CuboidRegion(finalWorld, min, max);
+			Clipboard clipboard = new MemoryOptimizedClipboard(selection);
+			clipboard.setOrigin(min);
+			ForwardExtentCopy copy = new ForwardExtentCopy(editSession,
+					selection.clone(), clipboard,
+					min);
+			try {
+				Operations.completeLegacy(copy);
+			} catch (MaxChangedBlocksException e) {
+				pluginInterface.getLogger().warning(
+						"Exceeded the block limit while saving schematic of " + regionName
+								+ ", limit in exception: " + e.getBlockLimit() + ", limit passed by AreaShop: "
+								+ pluginInterface.getConfig().getInt("maximumBlocks"));
+				completableFuture.complete(false);
+				return;
+			}
+
+			try (Closer closer = Closer.create()) {
+				FileOutputStream fos = closer.register(new FileOutputStream(finalFile));
+				BufferedOutputStream bos = closer.register(new BufferedOutputStream(fos));
+				ClipboardWriter writer = closer.register(format.getWriter(bos));
+				writer.write(clipboard);
+			} catch (IOException e) {
+				pluginInterface.getLogger().warning(
+						"An error occurred while saving schematic of " + regionName
+								+ ", enable debug to see the complete stacktrace");
+				pluginInterface.debugI(ExceptionUtils.getStackTrace(e));
+				completableFuture.complete(false);
+			} catch (Exception e) {
+				pluginInterface.getLogger()
+						.warning("Crashed during save of " + regionName);
+				pluginInterface.debugI(ExceptionUtils.getStackTrace(e));
+				completableFuture.complete(false);
+				return;
+			}
+			completableFuture.complete(true);
+		});
+		return completableFuture;
+	}
+
+	@Override
+	public boolean restoreRegionBlocks(File rawFile, GeneralRegionInterface regionInterface) {
+		// TODO implement using the FastAsyncWorldEdit api to paste async
+		File file = null;
+		for (ClipboardFormat formatOption : BuiltInClipboardFormat.values()) {
+			if (new File(rawFile.getAbsolutePath() + "." + formatOption.getPrimaryFileExtension())
+					.exists()) {
+				file = new File(
+						rawFile.getAbsolutePath() + "." + formatOption.getPrimaryFileExtension());
+				break;
+			}
+		}
+		if (file == null) {
+			pluginInterface.getLogger().info("Did not restore region " + regionInterface.getName()
+					+ ", schematic file does not exist: " + rawFile.getAbsolutePath());
+			return false;
+		}
+		ClipboardFormat format = ClipboardFormats.findByFile(file);
+		if (format == null) {
+			pluginInterface.debugI("Did not restore region " + regionInterface.getName() + ", could not find a valid clipboard format");
+			return false;
+		}
+		pluginInterface.debugI("Trying to restore region", regionInterface.getName(), " from file",
+				file.getAbsolutePath(), "with format", format.getName());
+
+		com.sk89q.worldedit.world.World world = null;
+		if (regionInterface.getName() != null) {
+			world = BukkitAdapter.adapt(regionInterface.getWorld());
+		}
+		if (world == null) {
+			pluginInterface.getLogger().info(
+					"Did not restore region " + regionInterface.getName() + ", world not found: "
+							+ regionInterface.getWorldName());
+			return false;
+		}
+		final FaweLimit limit = FaweLimit.MAX.copy();
+		limit.MAX_CHANGES = pluginInterface.getConfig().getInt("maximumBlocks");
+		limit.MAX_ENTITIES = pluginInterface.getConfig().getInt("maximumEntities", (int) (limit.MAX_CHANGES / 1000));
+		EditSession editSession = pluginInterface.getWorldEdit().getWorldEdit()
+				.newEditSessionBuilder()
+				.world(world)
+				.limit(limit)
+				.build();
+		editSession.setReorderMode(EditSession.ReorderMode.MULTI_STAGE);
+		ProtectedRegion region = regionInterface.getRegion();
+		// Get the origin and size of the region
+		BlockVector3 origin = BlockVector3
+				.at(region.getMinimumPoint().getBlockX(), region.getMinimumPoint().getBlockY(),
+						region.getMinimumPoint().getBlockZ());
+
+
+		// Read the schematic and paste it into the world
+		try(Closer closer = Closer.create()) {
+			final FileInputStream fis = closer.register(new FileInputStream(file));
+			final ClipboardReader reader = format.getReader(fis);
+			final Clipboard clipboard = reader.read();
+			if (clipboard.getDimensions().getY() != regionInterface.getHeight()
+					|| clipboard.getDimensions().getX() != regionInterface.getWidth()
+					|| clipboard.getDimensions().getZ() != regionInterface.getDepth()) {
+				pluginInterface.getLogger().warning(
+						"Size of the region " + regionInterface.getName()
+								+ " is not the same as the schematic to restore!");
+				pluginInterface.debugI(
+						"schematic|region, x:" + clipboard.getDimensions().getX() + "|"
+								+ regionInterface.getWidth() + ", y:" + clipboard.getDimensions().getY()
+								+ "|" + regionInterface.getHeight() + ", z:" + clipboard.getDimensions()
+								.getZ() + "|" + regionInterface.getDepth());
+			}
+			clipboard.setOrigin(clipboard.getMinimumPoint());
+			ClipboardHolder clipboardHolder = new ClipboardHolder(clipboard);
+			LocalSession session =
+					new LocalSession(pluginInterface.getWorldEdit().getLocalConfiguration());
+			session.setBlockChangeLimit(pluginInterface.getConfig().getInt("maximumBlocks"));
+			session.setClipboard(clipboardHolder);
+
+			// Build operation
+
+			BlockTransformExtent extent = new BlockTransformExtent(clipboard);
+			ForwardExtentCopy copy =
+					new ForwardExtentCopy(extent, clipboard.getRegion(), clipboard.getOrigin(),
+							editSession, origin);
+			copy.setTransform(clipboardHolder.getTransform());
+			// Mask to region (for polygon and other weird shaped regions)
+			// TODO make this more efficient (especially for polygon regions)
+			if (region.getType() != RegionType.CUBOID) {
+				copy.setSourceMask(new RegionBoundMask(region));
+			}
+			Operations.completeLegacy(copy);
+		} catch (MaxChangedBlocksException e) {
+			pluginInterface.getLogger().warning(
+					"exceeded the block limit while restoring schematic of " + regionInterface.getName()
+							+ ", limit in exception: " + e.getBlockLimit() + ", limit passed by AreaShop: "
+							+ pluginInterface.getConfig().getInt("maximumBlocks"));
+			return false;
+		} catch (FaweException ex) {
+			pluginInterface.getLogger().warning(
+					"exceeded the block entity limit while restoring schematic of " + regionInterface.getName()
+							+ ", limit passed by AreaShop: "
+							+ pluginInterface.getConfig().getInt("maximumEntities"));
+			return false;
+		}
+		catch (IOException e) {
+			pluginInterface.getLogger().warning(
+					"An error occurred while restoring schematic of " + regionInterface.getName()
+							+ ", enable debug to see the complete stacktrace");
+			pluginInterface.debugI(ExceptionUtils.getStackTrace(e));
+			return false;
+		} catch (Exception e) {
+			pluginInterface.getLogger()
+					.warning("crashed during restore of " + regionInterface.getName());
+			pluginInterface.debugI(ExceptionUtils.getStackTrace(e));
+			return false;
+		}
+		editSession.flushQueue();
+		return true;
+	}
+
+	@Override
+	public boolean saveRegionBlocks(File file, GeneralRegionInterface regionInterface) {
+		// TODO implement using the FastAsyncWorldEdit api to save async
+		ClipboardFormat format = BuiltInClipboardFormat.FAST;
+		// TODO allow selecting FAWE format in the config? (when enabled you cannot go back to vanilla WorldEdit easily)
+
+		file = new File(file.getAbsolutePath() + "." + format.getPrimaryFileExtension());
+		pluginInterface.debugI("Trying to save region", regionInterface.getName(), " to file",
+				file.getAbsolutePath(), "with format", format.getName());
+		com.sk89q.worldedit.world.World world = null;
+		if (regionInterface.getWorld() != null) {
+			world = BukkitAdapter.adapt(regionInterface.getWorld());
+		}
+		if (world == null) {
+			pluginInterface.getLogger().warning(
+					"Did not save region " + regionInterface.getName() + ", world not found: "
+							+ regionInterface.getWorldName());
+			return false;
+		}
+		EditSession editSession =
+				pluginInterface.getWorldEdit().getWorldEdit()
+						.newEditSessionBuilder()
+						.world(world)
+						.maxBlocks(pluginInterface.getConfig().getInt("maximumBlocks"))
+						.build();
+
+		// Create a clipboard
+		CuboidRegion selection =
+				new CuboidRegion(world, regionInterface.getRegion().getMinimumPoint(),
+						regionInterface.getRegion().getMaximumPoint());
+		BlockArrayClipboard clipboard = new BlockArrayClipboard(selection);
+		clipboard.setOrigin(regionInterface.getRegion().getMinimumPoint());
+		ForwardExtentCopy copy = new ForwardExtentCopy(editSession,
+				new CuboidRegion(world, regionInterface.getRegion().getMinimumPoint(),
+						regionInterface.getRegion().getMaximumPoint()), clipboard,
+				regionInterface.getRegion().getMinimumPoint());
+		try {
+			Operations.completeLegacy(copy);
+		} catch (MaxChangedBlocksException e) {
+			pluginInterface.getLogger().warning(
+					"Exceeded the block limit while saving schematic of " + regionInterface.getName()
+							+ ", limit in exception: " + e.getBlockLimit() + ", limit passed by AreaShop: "
+							+ pluginInterface.getConfig().getInt("maximumBlocks"));
+			return false;
+		}
+
+		try (Closer closer = Closer.create()) {
+			FileOutputStream fos = closer.register(new FileOutputStream(file));
+			BufferedOutputStream bos = closer.register(new BufferedOutputStream(fos));
+			ClipboardWriter writer = closer.register(format.getWriter(bos));
+			writer.write(clipboard);
+		} catch (IOException e) {
+			pluginInterface.getLogger().warning(
+					"An error occurred while saving schematic of " + regionInterface.getName()
+							+ ", enable debug to see the complete stacktrace");
+			pluginInterface.debugI(ExceptionUtils.getStackTrace(e));
+			return false;
+		} catch (Exception e) {
+			pluginInterface.getLogger()
+					.warning("Crashed during save of " + regionInterface.getName());
+			pluginInterface.debugI(ExceptionUtils.getStackTrace(e));
+			return false;
+		}
+		return true;
+	}
+
+	@Override
+	public WorldEditSelection getPlayerSelection(Player player) {
+		try {
+			Region region = pluginInterface.getWorldEdit().getSession(player)
+					.getSelection(BukkitAdapter.adapt(player.getWorld()));
+			return new WorldEditSelection(player.getWorld(),
+					BukkitAdapter.adapt(player.getWorld(), region.getMinimumPoint()),
+					BukkitAdapter.adapt(player.getWorld(), region.getMaximumPoint()));
+		} catch (IncompleteRegionException e) {
+			return null;
+		}
+	}
+}

adapters/plugins/worldedit/build.gradle.kts

@@ -0,0 +1,9 @@
+dependencies {
+    compileOnly(libs.spigot)
+    compileOnly(projects.areashopInterface)
+    compileOnly(libs.worldeditCore)
+    compileOnly(libs.worldeditBukkit)
+    compileOnly(libs.worldguardCore)
+}
+
+description = "AreaShop WorldEdit 7"

adapters/plugins/worldedit/src/main/java/me/wiefferink/areashop/adapters/plugins/WorldEditHandler.java

@@ -1,4 +1,4 @@
-package me.wiefferink.areashop.handlers.worldedit.v7;
+package me.wiefferink.areashop.adapters.plugins;
 
 import com.sk89q.worldedit.EditSession;
 import com.sk89q.worldedit.IncompleteRegionException;
@@ -46,14 +46,7 @@ public class WorldEditHandler extends WorldEditInterface {
 	@Override
 	public WorldEditSelection getPlayerSelection(Player player) {
 		try {
-			final LocalSession session = pluginInterface.getWorldEdit().getSession(player);
-			if (session == null) {
-				return null;
-			}
-			Region region = session.getSelection(BukkitAdapter.adapt(player.getWorld()));
-			if (region == null) {
-				return null;
-			}
+			Region region = pluginInterface.getWorldEdit().getSession(player).getSelection(BukkitAdapter.adapt(player.getWorld()));
 			return new WorldEditSelection(
 					player.getWorld(),
 					BukkitAdapter.adapt(player.getWorld(), region.getMinimumPoint()),
@@ -91,21 +84,16 @@ public class WorldEditHandler extends WorldEditInterface {
 			pluginInterface.getLogger().info("Did not restore region " + regionInterface.getName() + ", world not found: " + regionInterface.getWorldName());
 			return false;
 		}
-		EditSession editSession = pluginInterface.getWorldEdit()
-												 .getWorldEdit()
-												 .newEditSessionBuilder()
-												 .world(world)
-												 .maxBlocks(pluginInterface.getConfig().getInt("maximumBlocks"))
-												 .build();
+		EditSession editSession = pluginInterface.getWorldEdit().getWorldEdit().getEditSessionFactory().getEditSession(world, pluginInterface.getConfig().getInt("maximumBlocks"));
 		ProtectedRegion region = regionInterface.getRegion();
 		// Get the origin and size of the region
 		BlockVector3 origin = BlockVector3.at(region.getMinimumPoint().getBlockX(), region.getMinimumPoint().getBlockY(), region.getMinimumPoint().getBlockZ());
 
 		// Read the schematic and paste it into the world
-		try(Closer closer = Closer.create();
+		try(Closer closer = Closer.create()) {
 			FileInputStream fis = closer.register(new FileInputStream(file));
 			BufferedInputStream bis = closer.register(new BufferedInputStream(fis));
-			ClipboardReader reader = format.getReader(bis)) {
+			ClipboardReader reader = format.getReader(bis);
 
 			//WorldData worldData = world.getWorldData();
 			LocalSession session = new LocalSession(pluginInterface.getWorldEdit().getLocalConfiguration());
@@ -154,7 +142,7 @@ public class WorldEditHandler extends WorldEditInterface {
 			pluginInterface.debugI(ExceptionUtils.getStackTrace(e));
 			return false;
 		}
-		editSession.close();
+		editSession.flushSession();
 		return true;
 	}
 
@@ -182,12 +170,7 @@ public class WorldEditHandler extends WorldEditInterface {
 			pluginInterface.getLogger().warning("Did not save region " + regionInterface.getName() + ", world not found: " + regionInterface.getWorldName());
 			return false;
 		}
-		EditSession editSession = pluginInterface.getWorldEdit()
-												 .getWorldEdit()
-												 .newEditSessionBuilder()
-												 .world(world)
-												 .maxBlocks(pluginInterface.getConfig().getInt("maximumBlocks"))
-												 .build();
+		EditSession editSession = pluginInterface.getWorldEdit().getWorldEdit().getEditSessionFactory().getEditSession(world, pluginInterface.getConfig().getInt("maximumBlocks"));
 
 		// Create a clipboard
 		CuboidRegion selection = new CuboidRegion(world, regionInterface.getRegion().getMinimumPoint(), regionInterface.getRegion().getMaximumPoint());
@@ -201,9 +184,10 @@ public class WorldEditHandler extends WorldEditInterface {
 			return false;
 		}
 
-		try(Closer closer = Closer.create(); FileOutputStream fos = closer.register(new FileOutputStream(file));
+		try(Closer closer = Closer.create()) {
+			FileOutputStream fos = closer.register(new FileOutputStream(file));
 			BufferedOutputStream bos = closer.register(new BufferedOutputStream(fos));
-			ClipboardWriter writer = closer.register(format.getWriter(bos));) {
+			ClipboardWriter writer = closer.register(format.getWriter(bos));
 			writer.write(clipboard);
 		} catch(IOException e) {
 			pluginInterface.getLogger().warning("An error occured while saving schematic of " + regionInterface.getName() + ", enable debug to see the complete stacktrace");

adapters/plugins/worldguard/build.gradle.kts

@@ -0,0 +1,9 @@
+dependencies {
+    compileOnly(libs.spigot)
+    compileOnly(projects.areashopInterface)
+    compileOnly(libs.worldeditCore)
+    compileOnly(libs.worldeditBukkit)
+    compileOnly(libs.worldguardCore)
+}
+
+description = "AreaShop WorldGuard 7"

adapters/plugins/worldguard/src/main/java/me/wiefferink/areashop/adapters/plugins/WorldGuardHandler.java

@@ -1,4 +1,4 @@
-package me.wiefferink.areashop.handlers.worldguard.v7;
+package me.wiefferink.areashop.adapters.plugins;
 
 import com.sk89q.worldedit.bukkit.BukkitAdapter;
 import com.sk89q.worldedit.math.BlockVector2;

areashop-bukkit-1_13/build.gradle.kts

@@ -0,0 +1,6 @@
+dependencies {
+    compileOnly(libs.spigot)
+    compileOnly(projects.areashopInterface)
+}
+
+description = "AreaShop Bukkit 1.13 and higher"

areashop-bukkit-1_13/src/main/java/me/wiefferink/areashop/handlers/BukkitHandler1_13.java

@@ -0,0 +1,82 @@
+package me.wiefferink.areashop.handlers;
+
+import me.wiefferink.areashop.interfaces.AreaShopInterface;
+import me.wiefferink.areashop.interfaces.BukkitInterface;
+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 handler for 1.13+
+ * @deprecated Obsolete as we don't support pre-1.13 versions anyway
+ */
+@Deprecated(forRemoval = true)
+public class BukkitHandler1_13 extends BukkitInterface {
+
+	public BukkitHandler1_13(AreaShopInterface pluginInterface) {
+		super(pluginInterface);
+	}
+
+	// Uses BlockData, which does not yet exist in 1.12-
+	@Override
+	public BlockFace getSignFacing(Block block) {
+		if (block == null) {
+			return null;
+		}
+
+		BlockState blockState = block.getState();
+		BlockData blockData = blockState.getBlockData();
+
+		if(blockData instanceof WallSign) {
+			return ((WallSign) blockData).getFacing();
+		} else if(blockData instanceof Sign) {
+			return ((Sign) blockData).getRotation();
+		}
+
+		return null;
+	}
+
+	// Uses BlockData, WallSign and Sign which don't exist in 1.12-
+	@Override
+	public 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) blockData).setFacing(facing);
+		} else if(blockData instanceof Sign) {
+			((Sign) blockData).setRotation(facing);
+		} else {
+			return false;
+		}
+		block.setBlockData(blockData);
+		return true;
+	}
+
+	@Override
+	public Block getSignAttachedTo(Block block) {
+		if (block == null) {
+			return null;
+		}
+
+		BlockState blockState = block.getState();
+
+		BlockData blockData = blockState.getBlockData();
+
+		if(blockData instanceof WallSign) {
+			return block.getRelative(((WallSign) blockData).getFacing().getOppositeFace());
+		} else if(blockData instanceof Sign) {
+			return block.getRelative(BlockFace.DOWN);
+		}
+
+		return null;
+	}
+
+}

areashop-interface/build.gradle.kts

@@ -0,0 +1,9 @@
+dependencies {
+    compileOnly(libs.spigot)
+    compileOnly(libs.worldeditCore)
+    compileOnly(libs.worldeditBukkit)
+    compileOnly(libs.worldguardCore)
+    compileOnly(libs.worldguardBukkit)
+}
+
+description = "AreaShop Interface"