Bump version

Fix compile errors in the fawe 1.17 module
Fix startup errors, bump fawe version
2026-11-07 01:42:34 -05:00 · 2021-08-16 13:30:46 +02:00 · 2021-08-16 13:26:50 +02:00 · 2021-08-16 13:23:26 +02:00 · 2021-06-29 22:38:59 +02:00 · 2021-06-24 17:25:14 +02:00
127 changed files with 8306 additions and 9985 deletions
@@ -0,0 +1,38 @@
+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"
@@ -1,189 +1,28 @@
-
-# Created by https://www.toptal.com/developers/gitignore/api/macos,windows,intellij,maven,gradle
-# Edit at https://www.toptal.com/developers/gitignore?templates=macos,windows,intellij,maven,gradle
-
-### Intellij ###
-# 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
-
-.idea/**
-
-# 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
-
-# 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 Patch ###
-# Comment Reason: https://github.com/joeblau/gitignore.io/issues/186#issuecomment-215987721
-
-# *.iml
-# modules.xml
-# .idea/misc.xml
-# *.ipr
-
-# Sonarlint plugin
-# https://plugins.jetbrains.com/plugin/7973-sonarlint
-.idea/**/sonarlint/
-
-# SonarQube Plugin
-# https://plugins.jetbrains.com/plugin/7238-sonarqube-community-plugin
-.idea/**/sonarIssues.xml
-
-# Markdown Navigator plugin
-# https://plugins.jetbrains.com/plugin/7896-markdown-navigator-enhanced
-.idea/**/markdown-navigator.xml
-.idea/**/markdown-navigator-enh.xml
-.idea/**/markdown-navigator/
-
-# Cache file creation bug
-# See https://youtrack.jetbrains.com/issue/JBR-2257
-.idea/$CACHE_FILE$
-
-# CodeStream plugin
-# https://plugins.jetbrains.com/plugin/12206-codestream
-.idea/codestream.xml
-
-### 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
+target

-### Maven Patch ###
-# Eclipse m2e generated files
-# Eclipse Core
 .project
-# JDT-specific (Eclipse Java Development Tools)
+.metadata
+bin/
+tmp/
+*.tmp
+*.bak
+*.swp
+*~.nib
+local.properties
 .classpath
+.settings/
+.loadpath

-### Windows ###
-# Windows thumbnail cache files
-Thumbs.db
-Thumbs.db:encryptable
-ehthumbs.db
-ehthumbs_vista.db
+### Locally stored "Eclipse launch configurations" ###
+*.launch

-# Dump file
-*.stackdump
+### IntelliJ IDEA ###
+*.iml
+.idea
+dependency-reduced-pom.xml

-# 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
+desktop.ini

 ### Gradle ###
 .gradle
@@ -203,9 +42,3 @@ gradle-app.setting

 ### Gradle Patch ###
 **/build/
-
-# Eclipse Gradle plugin generated files
-# Eclipse Core
-# JDT-specific (Eclipse Java Development Tools)
-
-# End of https://www.toptal.com/developers/gitignore/api/macos,windows,intellij,maven,gradle
@@ -1,12 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<module version="4">
-  <component name="FacetManager">
-    <facet type="minecraft" name="Minecraft">
-      <configuration>
-        <autoDetectTypes>
-          <platformType>BUKKIT</platformType>
-        </autoDetectTypes>
-      </configuration>
-    </facet>
-  </component>
-</module>
@@ -1,40 +1,35 @@
 import org.apache.tools.ant.filters.ReplaceTokens

 plugins {
-    id 'com.github.johnrengelman.shadow' version '7.1.0'
-    id 'maven-publish'
    id 'java-library'
+    id 'com.github.johnrengelman.shadow' version '7.0.0'
 }

-version = "2.7.2"
+description = 'AreaShop'
+version = '2.6.4'

 dependencies {
+    // Spigot api
+    compileOnly 'org.spigotmc:spigot-api:1.16.5-R0.1-SNAPSHOT'
+
+    // Libs
    implementation 'com.github.NLthijs48:InteractiveMessenger:e7749258ca'
-    implementation 'com.github.NLthijs48:BukkitDo:819d51ec2b'
+    implementation 'co.aikar:taskchain-bukkit:3.7.2'
    implementation 'io.papermc:paperlib:1.0.6'
-    implementation 'io.github.baked-libs:dough-data:1.0.3'
-    implementation ('com.google.inject:guice:5.0.1') {
-        exclude group: 'com.google.guava'
-    }
-    implementation ('com.google.inject.extensions:guice-assistedinject:5.0.1') {
-        exclude group: 'com.google.guava'
-    }
+
+    // Hooks
    implementation project(':areashop-interface')
-    implementation project(':areashop-bukkit-1_13')
-    implementation project(':areashop-nms')
-    runtimeOnly project(path: ':areashop-nms-1-17', configuration: 'reobf')
-    runtimeOnly project(path: ':areashop-nms-1-18', configuration: 'reobf')
-    implementation project(':areashop-worldedit-7')
    implementation project(':areashop-worldguard-7')
-    implementation project(':areashop-fastasyncworldedit')
-    compileOnly 'org.spigotmc:spigot-api:1.18.1-R0.1-SNAPSHOT'
-    compileOnly ('com.sk89q.worldedit:worldedit-bukkit:7.2.8') {
-        exclude group: 'com.google.guava'
-    }
-    compileOnly ('com.sk89q.worldguard:worldguard-bukkit:7.0.6') {
-        exclude group: 'com.google.guava'
-    }
-    compileOnly ('com.github.MilkBowl:VaultAPI:1.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 {
@@ -47,62 +42,19 @@ processResources {

 assemble {
    dependsOn(shadowJar)
-    dependsOn(publishToMavenLocal)
 }

 jar {
-    archiveClassifier.set('original')
-}
-
-java {
-    withSourcesJar()
+    archiveBaseName.set('AreaShop')
+    classifier('original')
 }

 shadowJar {
-    archiveClassifier.set('')
-    setArchivesBaseName('AreaShop')
-    String 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.inject", "${base}.javax.inject")
-    include {
-        include("com.google.inject")
-        minimize()
-    }
+    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")
 }
-
-sourcesJar {
-    classifier('sources')
-    from sourceSets.main.allSource
-}
-
-publishing {
-    publications {
-        // ... artifact publications
-        areaShop(MavenPublication) {
-            from components.java
-            pom {
-                group = "me.wiefferink"
-                artifactId = "$project.name"
-                version = "$project.version"
-                scm {
-                    connection = 'scm:git:git://github.com/md5sha256/AreaShop.git'
-                    developerConnection = 'scm:git:ssh://github.com/md5sha256/AreaShop.git'
-                    url = "https://github.com/md5sha256/AreaShop/tree/dev/bleeding"
-                }
-                licenses {
-                    license {
-                        name = 'GNU General Public License v3.0'
-                        url = "https://github.com/md5sha256/AreaShop/blob/dev/bleeding/LICENSE"
-                    }
-                }
-            }
-        }
-    }
-}
-
-description = 'AreaShop'
@@ -1,39 +0,0 @@
-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();
-
-}
@@ -1,21 +0,0 @@
-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);
-}
@@ -2,53 +2,28 @@ 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.interfaces.WorldGuardInterface;
-import me.wiefferink.areashop.managers.IFileManager;
+import me.wiefferink.areashop.managers.FileManager;
 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 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.*;
 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";
@@ -77,12 +52,12 @@ public class AddCommand extends CommandAreaShop {
 				&& !sender.hasPermission("areashop.createbuy")
 				&& !sender.hasPermission("areashop.createbuy.member")
 				&& !sender.hasPermission("areashop.createbuy.owner")) {
-			messageBridge.message(sender, "add-noPermission");
+			plugin.message(sender, "add-noPermission");
 			return;
 		}

 		if(args.length < 2 || args[1] == null || (!"rent".equalsIgnoreCase(args[1]) && !"buy".equalsIgnoreCase(args[1]))) {
-			messageBridge.message(sender, "add-help");
+			plugin.message(sender, "add-help");
 			return;
 		}
 		Map<String, ProtectedRegion> regions = new HashMap<>();
@@ -93,18 +68,18 @@ public class AddCommand extends CommandAreaShop {
 		}
 		if(args.length == 2) {
 			if(player == null) {
-				messageBridge.message(sender, "cmd-weOnlyByPlayer");
+				plugin.message(sender, "cmd-weOnlyByPlayer");
 				return;
 			}
-			WorldEditSelection selection = worldEditInterface.getPlayerSelection(player);
+			WorldEditSelection selection = plugin.getWorldEditHandler().getPlayerSelection(player);
 			if(selection == null) {
-				messageBridge.message(player, "cmd-noSelection");
+				plugin.message(player, "cmd-noSelection");
 				return;
 			}
 			world = selection.getWorld();
 			regions = Utils.getWorldEditRegionsInSelection(selection).stream().collect(Collectors.toMap(ProtectedRegion::getId, region -> region));
 			if(regions.isEmpty()) {
-				messageBridge.message(player, "cmd-noWERegionsFound");
+				plugin.message(player, "cmd-noWERegionsFound");
 				return;
 			}
 		} else {
@@ -112,7 +87,7 @@ public class AddCommand extends CommandAreaShop {
 				if(args.length == 4) {
 					world = Bukkit.getWorld(args[3]);
 					if(world == null) {
-						messageBridge.message(sender, "add-incorrectWorld", args[3]);
+						plugin.message(sender, "add-incorrectWorld", args[3]);
 						return;
 					}
 				} else {
@@ -120,19 +95,19 @@ public class AddCommand extends CommandAreaShop {
 				}
 			} else {
 				if(args.length < 4) {
-					messageBridge.message(sender, "add-specifyWorld");
+					plugin.message(sender, "add-specifyWorld");
 					return;
 				} else {
 					world = Bukkit.getWorld(args[3]);
 					if(world == null) {
-						messageBridge.message(sender, "add-incorrectWorld", args[3]);
+						plugin.message(sender, "add-incorrectWorld", args[3]);
 						return;
 					}
 				}
 			}
 			ProtectedRegion region = plugin.getRegionManager(world).getRegion(args[2]);
 			if(region == null) {
-				messageBridge.message(sender, "cmd-noRegion", args[2]);
+				plugin.message(sender, "cmd-noRegion", args[2]);
 				return;
 			}
 			regions.put(args[2], region);
@@ -149,29 +124,28 @@ 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
-		Do.forAll(
-			plugin.getConfig().getInt("adding.regionsPerTick"),
-			regions.entrySet(),
-			regionEntry -> {
+		Utils.runAsBatches(regions.entrySet(),
+			Math.min(plugin.getConfig().getInt("adding.regionsPerTick"), 1),
+				(regionEntry) -> {
 				String regionName = regionEntry.getKey();
 				ProtectedRegion region = regionEntry.getValue();
 				// Determine if the player is an owner or member of the region
-				boolean isMember = finalPlayer != null && worldGuardInterface.containsMember(region, finalPlayer.getUniqueId());
-				boolean isOwner = finalPlayer != null && worldGuardInterface.containsOwner(region, finalPlayer.getUniqueId());
+				boolean isMember = finalPlayer != null && plugin.getWorldGuardHandler().containsMember(region, finalPlayer.getUniqueId());
+				boolean isOwner = finalPlayer != null && plugin.getWorldGuardHandler().containsOwner(region, finalPlayer.getUniqueId());
 				String type;
 				if(isRent) {
 					type = "rent";
 				} else {
 					type = "buy";
 				}
-				IFileManager.AddResult result = plugin.getFileManager().checkRegionAdd(sender, region, world, isRent ? GeneralRegion.RegionType.RENT : GeneralRegion.RegionType.BUY);
-				if(result == IFileManager.AddResult.ALREADYADDED) {
+				FileManager.AddResult result = plugin.getFileManager().checkRegionAdd(sender, region, world, isRent ? GeneralRegion.RegionType.RENT : GeneralRegion.RegionType.BUY);
+				if(result == FileManager.AddResult.ALREADYADDED) {
 					regionsAlready.add(plugin.getFileManager().getRegion(regionName));
-				} else if(result == IFileManager.AddResult.ALREADYADDEDOTHERWORLD) {
+				} else if(result == FileManager.AddResult.ALREADYADDEDOTHERWORLD) {
 					regionsAlreadyOtherWorld.add(plugin.getFileManager().getRegion(regionName));
-				} else if(result == IFileManager.AddResult.BLACKLISTED) {
+				} else if(result == FileManager.AddResult.BLACKLISTED) {
 					namesBlacklisted.add(regionName);
-				} else if(result == IFileManager.AddResult.NOPERMISSION) {
+				} else if(result == FileManager.AddResult.NOPERMISSION) {
 					namesNoPermission.add(regionName);
 				} else {
 					// Check if the player should be landlord
@@ -179,8 +153,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(worldGuardInterface.getOwners(region).asUniqueIdList());
-					existing.addAll(worldGuardInterface.getMembers(region).asUniqueIdList());
+					existing.addAll(plugin.getWorldGuardHandler().getOwners(region).asUniqueIdList());
+					existing.addAll(plugin.getWorldGuardHandler().getMembers(region).asUniqueIdList());

 					AreaShop.debug("regionAddLandlordStatus:", regionName,
 							"landlord:", landlord,
@@ -192,7 +166,7 @@ public class AddCommand extends CommandAreaShop {
 							"memberPermission:", sender.hasPermission("areashop.create" + type + ".member"));

 					if(isRent) {
-						RentRegion rent = regionFactory.createRentRegion(regionName, world);
+						RentRegion rent = new RentRegion(regionName, world);
 						// Set landlord
 						if(landlord) {
 							rent.setLandlord(finalPlayer.getUniqueId(), finalPlayer.getName());
@@ -235,7 +209,7 @@ public class AddCommand extends CommandAreaShop {

 						regionsSuccess.add(rent);
 					} else {
-						BuyRegion buy = regionFactory.createBuyRegion(regionName, world);
+						BuyRegion buy = new BuyRegion(regionName, world);
 						// Set landlord
 						if(landlord) {
 							buy.setLandlord(finalPlayer.getUniqueId(), finalPlayer.getName());
@@ -279,40 +253,39 @@ public class AddCommand extends CommandAreaShop {
 						regionsSuccess.add(buy);
 					}
 				}
-			},
-			() -> {
+			}, false).thenAccept(
+			(success) -> {
 				if(!regionsSuccess.isEmpty()) {
-					messageBridge.message(sender, "add-success", args[1], Utils.combinedMessage(regionsSuccess, "region"));
+					plugin.message(sender, "add-success", args[1], Utils.combinedMessage(regionsSuccess, "region"));
 				}
 				if(!regionsAlready.isEmpty()) {
-					messageBridge.message(sender, "add-failed", Utils.combinedMessage(regionsAlready, "region"));
+					plugin.message(sender, "add-failed", Utils.combinedMessage(regionsAlready, "region"));
 				}
 				if(!regionsAlreadyOtherWorld.isEmpty()) {
-					messageBridge.message(sender, "add-failedOtherWorld", Utils.combinedMessage(regionsAlreadyOtherWorld, "region"));
+					plugin.message(sender, "add-failedOtherWorld", Utils.combinedMessage(regionsAlreadyOtherWorld, "region"));
 				}
 				if(!regionsRentCancelled.isEmpty()) {
-					messageBridge.message(sender, "add-rentCancelled", Utils.combinedMessage(regionsRentCancelled, "region"));
+					plugin.message(sender, "add-rentCancelled", Utils.combinedMessage(regionsRentCancelled, "region"));
 				}
 				if(!regionsBuyCancelled.isEmpty()) {
-					messageBridge.message(sender, "add-buyCancelled", Utils.combinedMessage(regionsBuyCancelled, "region"));
+					plugin.message(sender, "add-buyCancelled", Utils.combinedMessage(regionsBuyCancelled, "region"));
 				}
 				if(!namesBlacklisted.isEmpty()) {
-					messageBridge.message(sender, "add-blacklisted", Utils.createCommaSeparatedList(namesBlacklisted));
+					plugin.message(sender, "add-blacklisted", Utils.createCommaSeparatedList(namesBlacklisted));
 				}
 				if(!namesNoPermission.isEmpty()) {
-					messageBridge.message(sender, "add-noPermissionRegions", Utils.createCommaSeparatedList(namesNoPermission));
-					messageBridge.message(sender, "add-noPermissionOwnerMember");
+					plugin.message(sender, "add-noPermissionRegions", Utils.createCommaSeparatedList(namesNoPermission));
+					plugin.message(sender, "add-noPermissionOwnerMember");
 				}
 				if(!namesAddCancelled.isEmpty()) {
-					messageBridge.message(sender, "add-rentCancelled", Utils.createCommaSeparatedList(namesAddCancelled));
+					plugin.message(sender, "add-rentCancelled", Utils.createCommaSeparatedList(namesAddCancelled));
 				}
-			}
-		);
+			});
 	}

 	@Override
 	public List<String> getTabCompleteList(int toComplete, String[] start, CommandSender sender) {
-		List<String> result = new ArrayList<>();
+		List<String> result = new LinkedList<>();
 		if(toComplete == 2) {
 			if(sender.hasPermission("areashop.createrent")) {
 				result.add("rent");
@@ -1,7 +1,5 @@
 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;
@@ -10,23 +8,12 @@ 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";
@@ -44,12 +31,12 @@ public class AddfriendCommand extends CommandAreaShop {
 	@Override
 	public void execute(CommandSender sender, String[] args) {
 		if(!sender.hasPermission("areashop.addfriend") && !sender.hasPermission("areashop.addfriendall")) {
-			messageBridge.message(sender, "addfriend-noPermission");
+			plugin.message(sender, "addfriend-noPermission");
 			return;
 		}

 		if(args.length < 2) {
-			messageBridge.message(sender, "addfriend-help");
+			plugin.message(sender, "addfriend-help");
 			return;
 		}

@@ -59,74 +46,74 @@ public class AddfriendCommand extends CommandAreaShop {
 				// get the region by location
 				List<GeneralRegion> regions = Utils.getImportantRegions(((Player)sender).getLocation());
 				if(regions.isEmpty()) {
-					messageBridge.message(sender, "cmd-noRegionsAtLocation");
+					plugin.message(sender, "cmd-noRegionsAtLocation");
 					return;
 				} else if(regions.size() > 1) {
-					messageBridge.message(sender, "cmd-moreRegionsAtLocation");
+					plugin.message(sender, "cmd-moreRegionsAtLocation");
 					return;
 				} else {
 					region = regions.get(0);
 				}
 			} else {
-				messageBridge.message(sender, "cmd-automaticRegionOnlyByPlayer");
+				plugin.message(sender, "cmd-automaticRegionOnlyByPlayer");
 				return;
 			}
 		} else {
-			region = fileManager.getRegion(args[2]);
+			region = plugin.getFileManager().getRegion(args[2]);
 			if(region == null) {
-				messageBridge.message(sender, "cmd-notRegistered", args[2]);
+				plugin.message(sender, "cmd-notRegistered", args[2]);
 				return;
 			}
 		}
 		if(sender.hasPermission("areashop.addfriendall")) {
 			if((region instanceof RentRegion && !((RentRegion)region).isRented())
 					|| (region instanceof BuyRegion && !((BuyRegion)region).isSold())) {
-				messageBridge.message(sender, "addfriend-noOwner", region);
+				plugin.message(sender, "addfriend-noOwner", region);
 				return;
 			}
 			OfflinePlayer friend = Bukkit.getOfflinePlayer(args[1]);
 			if(friend.getLastPlayed() == 0 && !friend.isOnline() && !plugin.getConfig().getBoolean("addFriendNotExistingPlayers")) {
-				messageBridge.message(sender, "addfriend-notVisited", args[1], region);
+				plugin.message(sender, "addfriend-notVisited", args[1], region);
 				return;
 			}
 			if(region.getFriendsFeature().getFriends().contains(friend.getUniqueId())) {
-				messageBridge.message(sender, "addfriend-alreadyAdded", friend.getName(), region);
+				plugin.message(sender, "addfriend-alreadyAdded", friend.getName(), region);
 				return;
 			}
 			if(region.isOwner(friend.getUniqueId())) {
-				messageBridge.message(sender, "addfriend-self", friend.getName(), region);
+				plugin.message(sender, "addfriend-self", friend.getName(), region);
 				return;
 			}
 			if(region.getFriendsFeature().addFriend(friend.getUniqueId(), sender)) {
 				region.update();
-				messageBridge.message(sender, "addfriend-successOther", friend.getName(), region);
+				plugin.message(sender, "addfriend-successOther", friend.getName(), region);
 			}
 		} else {
 			if(sender.hasPermission("areashop.addfriend") && sender instanceof Player) {
 				if(region.isOwner((Player)sender)) {
 					OfflinePlayer friend = Bukkit.getOfflinePlayer(args[1]);
 					if(friend.getLastPlayed() == 0 && !friend.isOnline() && !plugin.getConfig().getBoolean("addFriendNotExistingPlayers")) {
-						messageBridge.message(sender, "addfriend-notVisited", args[1], region);
+						plugin.message(sender, "addfriend-notVisited", args[1], region);
 						return;
 					}
 					if(region.getFriendsFeature().getFriends().contains(friend.getUniqueId())) {
-						messageBridge.message(sender, "addfriend-alreadyAdded", friend.getName(), region);
+						plugin.message(sender, "addfriend-alreadyAdded", friend.getName(), region);
 						return;
 					}
 					if(region.isOwner(friend.getUniqueId())) {
-						messageBridge.message(sender, "addfriend-self", friend.getName(), region);
+						plugin.message(sender, "addfriend-self", friend.getName(), region);
 						return;
 					}

 					if(region.getFriendsFeature().addFriend(friend.getUniqueId(), sender)) {
 						region.update();
-						messageBridge.message(sender, "addfriend-success", friend.getName(), region);
+						plugin.message(sender, "addfriend-success", friend.getName(), region);
 					}
 				} else {
-					messageBridge.message(sender, "addfriend-noPermissionOther", region);
+					plugin.message(sender, "addfriend-noPermissionOther", region);
 				}
 			} else {
-				messageBridge.message(sender, "addfriend-noPermission", region);
+				plugin.message(sender, "addfriend-noPermission", region);
 			}
 		}
 	}
@@ -139,7 +126,7 @@ public class AddfriendCommand extends CommandAreaShop {
 				result.add(player.getName());
 			}
 		} else if(toComplete == 3) {
-			result.addAll(fileManager.getRegionNames());
+			result.addAll(plugin.getFileManager().getRegionNames());
 		}
 		return result;
 	}
@@ -1,135 +1,128 @@
 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.interfaces.BukkitInterface;
-import me.wiefferink.areashop.managers.IFileManager;
+import me.wiefferink.areashop.features.signs.SignsFeature;
 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 {

-	@Inject
-	private MessageBridge messageBridge;
-	@Inject
-	private IFileManager fileManager;
-	@Inject
-	private SignManager signManager;
-	@Inject
-	private Plugin plugin;
-	@Inject
-	private BukkitInterface bukkitInterface;
+    @Override
+    public String getCommandStart() {
+        return "areashop addsign";
+    }

-	@Override
-	public String getCommandStart() {
-		return "areashop addsign";
-	}
+    @Override
+    public String getHelp(CommandSender target) {
+        if (target.hasPermission("areashop.addsign")) {
+            return "help-addsign";
+        }
+        return null;
+    }

-	@Override
-	public String getHelp(CommandSender target) {
-		if(target.hasPermission("areashop.addsign")) {
-			return "help-addsign";
-		}
-		return null;
-	}
+    @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 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;
+        // 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;
+        }

-		// 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;
-		}
+        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;
+        }

-		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;
-		}
+        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();
+    }

-		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;
-	}
+    @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;
+    }

 }

@@ -1,28 +1,15 @@
 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";
@@ -39,18 +26,18 @@ public class BuyCommand extends CommandAreaShop {
 	@Override
 	public void execute(CommandSender sender, String[] args) {
 		if(!sender.hasPermission("areashop.buy")) {
-			messageBridge.message(sender, "buy-noPermission");
+			plugin.message(sender, "buy-noPermission");
 			return;
 		}
 		if(!(sender instanceof Player)) {
-			messageBridge.message(sender, "cmd-onlyByPlayer");
+			plugin.message(sender, "cmd-onlyByPlayer");
 			return;
 		}
 		Player player = (Player)sender;
 		if(args.length > 1 && args[1] != null) {
-			BuyRegion region = fileManager.getBuy(args[1]);
+			BuyRegion region = plugin.getFileManager().getBuy(args[1]);
 			if(region == null) {
-				messageBridge.message(player, "buy-notBuyable", args[1]);
+				plugin.message(player, "buy-notBuyable", args[1]);
 			} else {
 				region.buy(player);
 			}
@@ -58,9 +45,9 @@ public class BuyCommand extends CommandAreaShop {
 			// get the region by location
 			List<BuyRegion> regions = Utils.getImportantBuyRegions(((Player)sender).getLocation());
 			if(regions.isEmpty()) {
-				messageBridge.message(sender, "cmd-noRegionsAtLocation");
+				plugin.message(sender, "cmd-noRegionsAtLocation");
 			} else if(regions.size() > 1) {
-				messageBridge.message(sender, "cmd-moreRegionsAtLocation");
+				plugin.message(sender, "cmd-moreRegionsAtLocation");
 			} else {
 				regions.get(0).buy(player);
 			}
@@ -71,7 +58,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 : fileManager.getBuysRef()) {
+			for(BuyRegion region : plugin.getFileManager().getBuys()) {
 				if(!region.isSold()) {
 					result.add(region.getName());
 				}
@@ -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.ArrayList;
-import java.util.HashMap;
-import java.util.List;
-import java.util.Map;
+import java.util.*;

 /**
 * Abstract class for generalising command classes.
 */
 public abstract class CommandAreaShop {

+	final AreaShop plugin = AreaShop.getInstance();
+
 	private final Map<String, CommandTime> lastUsed;

-	protected CommandAreaShop() {
+	public 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 new ArrayList<>();
+		return Collections.emptyList();
 	}

 	/**
@@ -1,10 +1,7 @@
 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;
@@ -12,22 +9,13 @@ 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";
@@ -48,24 +36,24 @@ public class DelCommand extends CommandAreaShop {

 				&& !sender.hasPermission("areashop.destroyrent")
 				&& !sender.hasPermission("areashop.destroyrent.landlord")) {
-			messageBridge.message(sender, "del-noPermission");
+			plugin.message(sender, "del-noPermission");
 			return;
 		}
 		if(args.length < 2) {
 			// Only players can have a selection
 			if(!(sender instanceof Player)) {
-				messageBridge.message(sender, "cmd-weOnlyByPlayer");
+				plugin.message(sender, "cmd-weOnlyByPlayer");
 				return;
 			}
 			Player player = (Player)sender;
-			WorldEditSelection selection = worldEditInterface.getPlayerSelection(player);
+			WorldEditSelection selection = plugin.getWorldEditHandler().getPlayerSelection(player);
 			if(selection == null) {
-				messageBridge.message(player, "cmd-noSelection");
+				plugin.message(player, "cmd-noSelection");
 				return;
 			}
 			List<GeneralRegion> regions = Utils.getRegionsInSelection(selection);
-			if(regions == null || regions.isEmpty()) {
-				messageBridge.message(player, "cmd-noRegionsFound");
+			if(regions.isEmpty()) {
+				plugin.message(player, "cmd-noRegionsFound");
 				return;
 			}
 			// Start removing the regions that he has permission for
@@ -86,7 +74,7 @@ public class DelCommand extends CommandAreaShop {
 					}
 				}

-				DeletingRegionEvent event = fileManager.deleteRegion(region, true);
+				DeletingRegionEvent event = plugin.getFileManager().deleteRegion(region, true);
 				if (event.isCancelled()) {
 					regionsCancelled.add(region);
 				} else {
@@ -96,46 +84,50 @@ public class DelCommand extends CommandAreaShop {

 			// Send messages
 			if(!namesSuccess.isEmpty()) {
-				messageBridge.message(sender, "del-success", Utils.createCommaSeparatedList(namesSuccess));
+				plugin.message(sender, "del-success", Utils.createCommaSeparatedList(namesSuccess));
 			}
 			if(!regionsFailed.isEmpty()) {
-				messageBridge.message(sender, "del-failed", Utils.combinedMessage(regionsFailed, "region"));
+				plugin.message(sender, "del-failed", Utils.combinedMessage(regionsFailed, "region"));
 			}
 			if(!regionsCancelled.isEmpty()) {
-				messageBridge.message(sender, "del-cancelled", Utils.combinedMessage(regionsCancelled, "region"));
+				plugin.message(sender, "del-cancelled", Utils.combinedMessage(regionsCancelled, "region"));
 			}
 		} else {
-			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);
-				}
-			}
+			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();
 		}
 	}

@@ -143,7 +135,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 = fileManager.getRegionNames();
+			result = plugin.getFileManager().getRegionNames();
 		}
 		return result;
 	}
@@ -1,7 +1,5 @@
 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;
@@ -11,19 +9,11 @@ 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";
@@ -58,11 +48,11 @@ public class DelfriendCommand extends CommandAreaShop {
 	@Override
 	public void execute(CommandSender sender, String[] args) {
 		if(!sender.hasPermission("areashop.delfriend") && !sender.hasPermission("areashop.delfriendall")) {
-			messageBridge.message(sender, "delfriend-noPermission");
+			plugin.message(sender, "delfriend-noPermission");
 			return;
 		}
 		if(args.length < 2) {
-			messageBridge.message(sender, "delfriend-help");
+			plugin.message(sender, "delfriend-help");
 			return;
 		}
 		GeneralRegion region;
@@ -71,57 +61,57 @@ public class DelfriendCommand extends CommandAreaShop {
 				// get the region by location
 				List<GeneralRegion> regions = Utils.getImportantRegions(((Player)sender).getLocation());
 				if(regions.isEmpty()) {
-					messageBridge.message(sender, "cmd-noRegionsAtLocation");
+					plugin.message(sender, "cmd-noRegionsAtLocation");
 					return;
 				} else if(regions.size() > 1) {
-					messageBridge.message(sender, "cmd-moreRegionsAtLocation");
+					plugin.message(sender, "cmd-moreRegionsAtLocation");
 					return;
 				} else {
 					region = regions.get(0);
 				}
 			} else {
-				messageBridge.message(sender, "cmd-automaticRegionOnlyByPlayer");
+				plugin.message(sender, "cmd-automaticRegionOnlyByPlayer");
 				return;
 			}
 		} else {
-			region = fileManager.getRegion(args[2]);
+			region = plugin.getFileManager().getRegion(args[2]);
 			if(region == null) {
-				messageBridge.message(sender, "cmd-notRegistered", args[2]);
+				plugin.message(sender, "cmd-notRegistered", args[2]);
 				return;
 			}
 		}
 		if(sender.hasPermission("areashop.delfriendall")) {
 			if((region instanceof RentRegion && !((RentRegion)region).isRented())
 					|| (region instanceof BuyRegion && !((BuyRegion)region).isSold())) {
-				messageBridge.message(sender, "delfriend-noOwner", region);
+				plugin.message(sender, "delfriend-noOwner", region);
 				return;
 			}
 			OfflinePlayer friend = Bukkit.getOfflinePlayer(args[1]);
 			if(!region.getFriendsFeature().getFriends().contains(friend.getUniqueId())) {
-				messageBridge.message(sender, "delfriend-notAdded", friend.getName(), region);
+				plugin.message(sender, "delfriend-notAdded", friend.getName(), region);
 				return;
 			}
 			if(region.getFriendsFeature().deleteFriend(friend.getUniqueId(), sender)) {
 				region.update();
-				messageBridge.message(sender, "delfriend-successOther", friend.getName(), region);
+				plugin.message(sender, "delfriend-successOther", friend.getName(), region);
 			}
 		} else {
 			if(sender.hasPermission("areashop.delfriend") && sender instanceof Player) {
 				if(region.isOwner((Player)sender)) {
 					OfflinePlayer friend = Bukkit.getOfflinePlayer(args[1]);
 					if(!region.getFriendsFeature().getFriends().contains(friend.getUniqueId())) {
-						messageBridge.message(sender, "delfriend-notAdded", friend.getName(), region);
+						plugin.message(sender, "delfriend-notAdded", friend.getName(), region);
 						return;
 					}
 					if(region.getFriendsFeature().deleteFriend(friend.getUniqueId(), sender)) {
 						region.update();
-						messageBridge.message(sender, "delfriend-success", friend.getName(), region);
+						plugin.message(sender, "delfriend-success", friend.getName(), region);
 					}
 				} else {
-					messageBridge.message(sender, "delfriend-noPermissionOther", region);
+					plugin.message(sender, "delfriend-noPermissionOther", region);
 				}
 			} else {
-				messageBridge.message(sender, "delfriend-noPermission", region);
+				plugin.message(sender, "delfriend-noPermission", region);
 			}
 		}
 	}
@@ -134,7 +124,7 @@ public class DelfriendCommand extends CommandAreaShop {
 				result.add(player.getName());
 			}
 		} else if(toComplete == 3) {
-			result.addAll(fileManager.getRegionNames());
+			result.addAll(plugin.getFileManager().getRegionNames());
 		}
 		return result;
 	}
@@ -1,8 +1,6 @@
 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;
@@ -11,20 +9,11 @@ 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";
@@ -41,11 +30,11 @@ public class DelsignCommand extends CommandAreaShop {
 	@Override
 	public void execute(CommandSender sender, String[] args) {
 		if(!sender.hasPermission("areashop.delsign")) {
-			messageBridge.message(sender, "delsign-noPermission");
+			plugin.message(sender, "delsign-noPermission");
 			return;
 		}
 		if(!(sender instanceof Player)) {
-			messageBridge.message(sender, "cmd-onlyByPlayer");
+			plugin.message(sender, "cmd-onlyByPlayer");
 			return;
 		}
 		Player player = (Player)sender;
@@ -60,17 +49,15 @@ public class DelsignCommand extends CommandAreaShop {
 			}
 		}
 		if(block == null || !Materials.isSign(block.getType())) {
-			messageBridge.message(sender, "delsign-noSign");
+			plugin.message(sender, "delsign-noSign");
 			return;
 		}
-		Optional<RegionSign> optionalSign = signManager.removeSign(block.getLocation());
-		if(optionalSign.isEmpty()) {
-			messageBridge.message(sender, "delsign-noRegion");
+		RegionSign regionSign = SignsFeature.getSignByLocation(block.getLocation());
+		if(regionSign == null) {
+			plugin.message(sender, "delsign-noRegion");
 			return;
 		}
-		RegionSign regionSign = optionalSign.get();
-		messageBridge.message(sender, "delsign-success", regionSign.getRegion());
-		signManager.removeSign(regionSign);
+		plugin.message(sender, "delsign-success", regionSign.getRegion());
 		regionSign.remove();
 	}

@@ -1,34 +1,20 @@
 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";
@@ -45,21 +31,21 @@ public class FindCommand extends CommandAreaShop {
 	@Override
 	public void execute(CommandSender sender, String[] args) {
 		if(!sender.hasPermission("areashop.find")) {
-			messageBridge.message(sender, "find-noPermission");
+			plugin.message(sender, "find-noPermission");
 			return;
 		}
 		if(!(sender instanceof Player)) {
-			messageBridge.message(sender, "cmd-onlyByPlayer");
+			plugin.message(sender, "cmd-onlyByPlayer");
 			return;
 		}
 		if(args.length <= 1 || args[1] == null || (!args[1].equalsIgnoreCase("buy") && !args[1].equalsIgnoreCase("rent"))) {
-			messageBridge.message(sender, "find-help");
+			plugin.message(sender, "find-help");
 			return;
 		}
 		Player player = (Player)sender;
 		double balance = 0.0;
-		if(economy != null) {
-			balance = economy.getBalance(player);
+		if(plugin.getEconomy() != null) {
+			balance = plugin.getEconomy().getBalance(player);
 		}
 		double maxPrice = 0;
 		boolean maxPriceSet = false;
@@ -70,23 +56,23 @@ public class FindCommand extends CommandAreaShop {
 				maxPrice = Double.parseDouble(args[2]);
 				maxPriceSet = true;
 			} catch(NumberFormatException e) {
-				messageBridge.message(sender, "find-wrongMaxPrice", args[2]);
+				plugin.message(sender, "find-wrongMaxPrice", args[2]);
 				return;
 			}
 		}
 		// Parse optional group argument
 		if(args.length >= 4) {
-			group = fileManager.getGroup(args[3]);
+			group = plugin.getFileManager().getGroup(args[3]);
 			if(group == null) {
-				messageBridge.message(sender, "find-wrongGroup", args[3]);
+				plugin.message(sender, "find-wrongGroup", args[3]);
 				return;
 			}
 		}

 		// Find buy regions
 		if(args[1].equalsIgnoreCase("buy")) {
-			Collection<BuyRegion> regions = fileManager.getBuysRef();
-			List<BuyRegion> results = new LinkedList<>();
+			List<BuyRegion> regions = plugin.getFileManager().getBuys();
+			List<BuyRegion> results = new ArrayList<>();
 			for(BuyRegion region : regions) {
 				if(!region.isSold()
 						&& ((region.getPrice() <= balance && !maxPriceSet) || (region.getPrice() <= maxPrice && maxPriceSet))
@@ -97,7 +83,7 @@ public class FindCommand extends CommandAreaShop {
 			}
 			if(!results.isEmpty()) {
 				// Draw a random one
-				BuyRegion region = results.get(new Random().nextInt(results.size()));
+				BuyRegion region = results.get(ThreadLocalRandom.current().nextInt(results.size()));
 				Message onlyInGroup = Message.empty();
 				if(group != null) {
 					onlyInGroup = Message.fromKey("find-onlyInGroup").replacements(args[3]);
@@ -105,9 +91,9 @@ public class FindCommand extends CommandAreaShop {

 				// Teleport
 				if(maxPriceSet) {
-					messageBridge.message(player, "find-successMax", "buy", Utils.formatCurrency(maxPrice), onlyInGroup, region);
+					plugin.message(player, "find-successMax", "buy", Utils.formatCurrency(maxPrice), onlyInGroup, region);
 				} else {
-					messageBridge.message(player, "find-success", "buy", Utils.formatCurrency(balance), onlyInGroup, region);
+					plugin.message(player, "find-success", "buy", Utils.formatCurrency(balance), onlyInGroup, region);
 				}
 				region.getTeleportFeature().teleportPlayer(player, region.getBooleanSetting("general.findTeleportToSign"), false);
 			} else {
@@ -116,17 +102,17 @@ public class FindCommand extends CommandAreaShop {
 					onlyInGroup = Message.fromKey("find-onlyInGroup").replacements(args[3]);
 				}
 				if(maxPriceSet) {
-					messageBridge.message(player, "find-noneFoundMax", "buy", Utils.formatCurrency(maxPrice), onlyInGroup);
+					plugin.message(player, "find-noneFoundMax", "buy", Utils.formatCurrency(maxPrice), onlyInGroup);
 				} else {
-					messageBridge.message(player, "find-noneFound", "buy", Utils.formatCurrency(balance), onlyInGroup);
+					plugin.message(player, "find-noneFound", "buy", Utils.formatCurrency(balance), onlyInGroup);
 				}
 			}
 		}

 		// Find rental regions
 		else {
-			Collection<RentRegion> regions = fileManager.getRentsRef();
-			List<RentRegion> results = new LinkedList<>();
+			List<RentRegion> regions = plugin.getFileManager().getRents();
+			List<RentRegion> results = new ArrayList<>();
 			for(RentRegion region : regions) {
 				if(!region.isRented()
 						&& ((region.getPrice() <= balance && !maxPriceSet) || (region.getPrice() <= maxPrice && maxPriceSet))
@@ -137,7 +123,7 @@ public class FindCommand extends CommandAreaShop {
 			}
 			if(!results.isEmpty()) {
 				// Draw a random one
-				RentRegion region = results.get(new Random().nextInt(results.size()));
+				RentRegion region = results.get(ThreadLocalRandom.current().nextInt(results.size()));
 				Message onlyInGroup = Message.empty();
 				if(group != null) {
 					onlyInGroup = Message.fromKey("find-onlyInGroup").replacements(args[3]);
@@ -145,9 +131,9 @@ public class FindCommand extends CommandAreaShop {

 				// Teleport
 				if(maxPriceSet) {
-					messageBridge.message(player, "find-successMax", "rent", Utils.formatCurrency(maxPrice), onlyInGroup, region);
+					plugin.message(player, "find-successMax", "rent", Utils.formatCurrency(maxPrice), onlyInGroup, region);
 				} else {
-					messageBridge.message(player, "find-success", "rent", Utils.formatCurrency(balance), onlyInGroup, region);
+					plugin.message(player, "find-success", "rent", Utils.formatCurrency(balance), onlyInGroup, region);
 				}
 				region.getTeleportFeature().teleportPlayer(player, region.getBooleanSetting("general.findTeleportToSign"), false);
 			} else {
@@ -156,9 +142,9 @@ public class FindCommand extends CommandAreaShop {
 					onlyInGroup = Message.fromKey("find-onlyInGroup").replacements(args[3]);
 				}
 				if(maxPriceSet) {
-					messageBridge.message(player, "find-noneFoundMax", "rent", Utils.formatCurrency(maxPrice), onlyInGroup);
+					plugin.message(player, "find-noneFoundMax", "rent", Utils.formatCurrency(maxPrice), onlyInGroup);
 				} else {
-					messageBridge.message(player, "find-noneFound", "rent", Utils.formatCurrency(balance), onlyInGroup);
+					plugin.message(player, "find-noneFound", "rent", Utils.formatCurrency(balance), onlyInGroup);
 				}
 			}
 		}
@@ -1,35 +1,18 @@
 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";
@@ -46,32 +29,32 @@ public class GroupaddCommand extends CommandAreaShop {
 	@Override
 	public void execute(CommandSender sender, String[] args) {
 		if(!sender.hasPermission("areashop.groupadd")) {
-			messageBridge.message(sender, "groupadd-noPermission");
+			plugin.message(sender, "groupadd-noPermission");
 			return;
 		}
 		if(args.length < 2 || args[1] == null) {
-			messageBridge.message(sender, "groupadd-help");
+			plugin.message(sender, "groupadd-help");
 			return;
 		}
-		RegionGroup group = fileManager.getGroup(args[1]);
+		RegionGroup group = plugin.getFileManager().getGroup(args[1]);
 		if(group == null) {
-			group = regionFactory.createRegionGroup(args[1]);
-			fileManager.addGroup(group);
+			group = new RegionGroup(plugin, args[1]);
+			plugin.getFileManager().addGroup(group);
 		}
 		if(args.length == 2) {
 			if(!(sender instanceof Player)) {
-				messageBridge.message(sender, "cmd-weOnlyByPlayer");
+				plugin.message(sender, "cmd-weOnlyByPlayer");
 				return;
 			}
 			Player player = (Player)sender;
-			WorldEditSelection selection = worldEditInterface.getPlayerSelection(player);
+			WorldEditSelection selection = plugin.getWorldEditHandler().getPlayerSelection(player);
 			if(selection == null) {
-				messageBridge.message(player, "cmd-noSelection");
+				plugin.message(player, "cmd-noSelection");
 				return;
 			}
 			List<GeneralRegion> regions = Utils.getRegionsInSelection(selection);
 			if(regions.isEmpty()) {
-				messageBridge.message(player, "cmd-noRegionsFound");
+				plugin.message(player, "cmd-noRegionsFound");
 				return;
 			}
 			TreeSet<GeneralRegion> regionsSuccess = new TreeSet<>();
@@ -84,24 +67,24 @@ public class GroupaddCommand extends CommandAreaShop {
 				}
 			}
 			if(!regionsSuccess.isEmpty()) {
-				messageBridge.message(player, "groupadd-weSuccess", group.getName(), Utils.combinedMessage(regionsSuccess, "region"));
+				plugin.message(player, "groupadd-weSuccess", group.getName(), Utils.combinedMessage(regionsSuccess, "region"));
 			}
 			if(!regionsFailed.isEmpty()) {
-				messageBridge.message(player, "groupadd-weFailed", group.getName(), Utils.combinedMessage(regionsFailed, "region"));
+				plugin.message(player, "groupadd-weFailed", group.getName(), Utils.combinedMessage(regionsFailed, "region"));
 			}
 			// Update all regions, this does it in a task, updating them without lag
-			fileManager.updateRegions(new ArrayList<>(regionsSuccess), player);
+			plugin.getFileManager().updateRegions(new ArrayList<>(regionsSuccess), player);
 		} else {
-			GeneralRegion region = fileManager.getRegion(args[2]);
+			GeneralRegion region = plugin.getFileManager().getRegion(args[2]);
 			if(region == null) {
-				messageBridge.message(sender, "cmd-notRegistered", args[2]);
+				plugin.message(sender, "cmd-notRegistered", args[2]);
 				return;
 			}
 			if(group.addMember(region)) {
 				region.update();
-				messageBridge.message(sender, "groupadd-success", group.getName(), group.getMembers().size(), region);
+				plugin.message(sender, "groupadd-success", group.getName(), group.getMembers().size(), region);
 			} else {
-				messageBridge.message(sender, "groupadd-failed", group.getName(), region);
+				plugin.message(sender, "groupadd-failed", group.getName(), region);
 			}
 		}
 	}
@@ -110,9 +93,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 = fileManager.getGroupNames();
+			result = plugin.getFileManager().getGroupNames();
 		} else if(toComplete == 3) {
-			result = fileManager.getRegionNames();
+			result = plugin.getFileManager().getRegionNames();
 		}
 		return result;
 	}
@@ -1,34 +1,18 @@
 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";
@@ -45,33 +29,33 @@ public class GroupdelCommand extends CommandAreaShop {
 	@Override
 	public void execute(CommandSender sender, String[] args) {
 		if(!sender.hasPermission("areashop.groupdel")) {
-			messageBridge.message(sender, "groupdel-noPermission");
+			plugin.message(sender, "groupdel-noPermission");
 			return;
 		}
 		if(args.length < 2 || args[1] == null) {
-			messageBridge.message(sender, "groupdel-help");
+			plugin.message(sender, "groupdel-help");
 			return;
 		}
-		RegionGroup group = fileManager.getGroup(args[1]);
+		RegionGroup group = plugin.getFileManager().getGroup(args[1]);
 		if(group == null) {
-			messageBridge.message(sender, "groupdel-wrongGroup", args[1]);
+			plugin.message(sender, "groupdel-wrongGroup", args[1]);
 			return;
 		}

 		if(args.length == 2) {
 			if(!(sender instanceof Player)) {
-				messageBridge.message(sender, "cmd-weOnlyByPlayer");
+				plugin.message(sender, "cmd-weOnlyByPlayer");
 				return;
 			}
 			Player player = (Player)sender;
-			WorldEditSelection selection = worldEditInterface.getPlayerSelection(player);
+			WorldEditSelection selection = plugin.getWorldEditHandler().getPlayerSelection(player);
 			if(selection == null) {
-				messageBridge.message(player, "cmd-noSelection");
+				plugin.message(player, "cmd-noSelection");
 				return;
 			}
 			List<GeneralRegion> regions = Utils.getRegionsInSelection(selection);
 			if(regions.isEmpty()) {
-				messageBridge.message(player, "cmd-noRegionsFound");
+				plugin.message(player, "cmd-noRegionsFound");
 				return;
 			}
 			TreeSet<GeneralRegion> regionsSuccess = new TreeSet<>();
@@ -84,25 +68,25 @@ public class GroupdelCommand extends CommandAreaShop {
 				}
 			}
 			if(!regionsSuccess.isEmpty()) {
-				messageBridge.message(player, "groupdel-weSuccess", group.getName(), Utils.combinedMessage(regionsSuccess, "region"));
+				plugin.message(player, "groupdel-weSuccess", group.getName(), Utils.combinedMessage(regionsSuccess, "region"));
 			}
 			if(!regionsFailed.isEmpty()) {
-				messageBridge.message(player, "groupdel-weFailed", group.getName(), Utils.combinedMessage(regionsFailed, "region"));
+				plugin.message(player, "groupdel-weFailed", group.getName(), Utils.combinedMessage(regionsFailed, "region"));
 			}
 			// Update all regions, this does it in a task, updating them without lag
-			fileManager.updateRegions(regionsSuccess, player);
+			plugin.getFileManager().updateRegions(new ArrayList<>(regionsSuccess), player);
 			group.saveRequired();
 		} else {
-			GeneralRegion region = fileManager.getRegion(args[2]);
+			GeneralRegion region = plugin.getFileManager().getRegion(args[2]);
 			if(region == null) {
-				messageBridge.message(sender, "cmd-notRegistered", args[2]);
+				plugin.message(sender, "cmd-notRegistered", args[2]);
 				return;
 			}
 			if(group.removeMember(region)) {
 				region.update();
-				messageBridge.message(sender, "groupdel-success", group.getName(), group.getMembers().size(), region);
+				plugin.message(sender, "groupdel-success", group.getName(), group.getMembers().size(), region);
 			} else {
-				messageBridge.message(sender, "groupdel-failed", group.getName(), region);
+				plugin.message(sender, "groupdel-failed", group.getName(), region);
 			}
 		}
 	}
@@ -111,9 +95,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 = fileManager.getGroupNames();
+			result = plugin.getFileManager().getGroupNames();
 		} else if(toComplete == 3) {
-			result = fileManager.getRegionNames();
+			result = plugin.getFileManager().getRegionNames();
 		}
 		return result;
 	}
@@ -1,25 +1,15 @@
 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";
@@ -37,23 +27,23 @@ public class GroupinfoCommand extends CommandAreaShop {
 	@Override
 	public void execute(CommandSender sender, String[] args) {
 		if(!sender.hasPermission("areashop.groupinfo")) {
-			messageBridge.message(sender, "groupinfo-noPermission");
+			plugin.message(sender, "groupinfo-noPermission");
 			return;
 		}
 		if(args.length < 2 || args[1] == null) {
-			messageBridge.message(sender, "groupinfo-help");
+			plugin.message(sender, "groupinfo-help");
 			return;
 		}
-		RegionGroup group = fileManager.getGroup(args[1]);
+		RegionGroup group = plugin.getFileManager().getGroup(args[1]);
 		if(group == null) {
-			messageBridge.message(sender, "groupinfo-noGroup", args[1]);
+			plugin.message(sender, "groupinfo-noGroup", args[1]);
 			return;
 		}
 		Set<String> members = group.getMembers();
 		if(members.isEmpty()) {
-			messageBridge.message(sender, "groupinfo-noMembers", group.getName());
+			plugin.message(sender, "groupinfo-noMembers", group.getName());
 		} else {
-			messageBridge.message(sender, "groupinfo-members", group.getName(), Utils.createCommaSeparatedList(members));
+			plugin.message(sender, "groupinfo-members", group.getName(), Utils.createCommaSeparatedList(members));
 		}
 	}

@@ -61,7 +51,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 = fileManager.getGroupNames();
+			result = plugin.getFileManager().getGroupNames();
 		}
 		return result;
 	}
@@ -1,23 +1,13 @@
 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";
@@ -34,14 +24,14 @@ public class GrouplistCommand extends CommandAreaShop {
 	@Override
 	public void execute(CommandSender sender, String[] args) {
 		if(!sender.hasPermission("areashop.grouplist")) {
-			messageBridge.message(sender, "grouplist-noPermission");
+			plugin.message(sender, "grouplist-noPermission");
 			return;
 		}
-		List<String> groups = fileManager.getGroupNames();
+		List<String> groups = plugin.getFileManager().getGroupNames();
 		if(groups.isEmpty()) {
-			messageBridge.message(sender, "grouplist-noGroups");
+			plugin.message(sender, "grouplist-noGroups");
 		} else {
-			messageBridge.message(sender, "grouplist-success", Utils.createCommaSeparatedList(groups));
+			plugin.message(sender, "grouplist-success", Utils.createCommaSeparatedList(groups));
 		}
 	}

@@ -1,20 +1,9 @@
 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";
@@ -30,6 +19,6 @@ public class HelpCommand extends CommandAreaShop {

 	@Override
 	public void execute(CommandSender sender, String[] args) {
-		commandManager.showHelp(sender);
+		plugin.getCommandManager().showHelp(sender);
 	}
 }
@@ -1,17 +1,11 @@
 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:
@@ -19,10 +13,6 @@ 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() {
@@ -46,17 +36,17 @@ public class ImportCommand extends CommandAreaShop {
 	@Override
 	public void execute(CommandSender sender, String[] args) {
 		if(!sender.hasPermission("areashop.import")) {
-			messageBridge.message(sender, "import-noPermission");
+			plugin.message(sender, "import-noPermission");
 			return;
 		}

 		if(args.length < 2) {
-			messageBridge.message(sender, "import-help");
+			plugin.message(sender, "import-help");
 			return;
 		}

 		if(!"RegionForSale".equalsIgnoreCase(args[1])) {
-			messageBridge.message(sender, "import-wrongSource");
+			plugin.message(sender, "import-wrongSource");
 			return;
 		}

@@ -64,7 +54,7 @@ public class ImportCommand extends CommandAreaShop {
 			return;
 		}

-		importJobFactory.createImportJob(sender).execute();
+		new ImportJob(sender);
 	}

 	@Override
@@ -1,17 +1,16 @@
-package me.wiefferink.areashop.regions;
+package me.wiefferink.areashop.commands;

 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.SignManager;
-import me.wiefferink.areashop.interfaces.WorldGuardInterface;
-import me.wiefferink.areashop.managers.IFileManager;
+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 org.bukkit.Bukkit;
 import org.bukkit.Location;
 import org.bukkit.OfflinePlayer;
@@ -21,52 +20,33 @@ 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
 	 */
-	@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;
+	public ImportJob(CommandSender sender) {
 		this.sender = sender;
-		this.plugin = plugin;
-		this.signManager = signManager;
-		this.fileManager = fileManager;
-		this.worldGuardInterface = worldGuardInterface;
-		this.messageBridge = messageBridge;
+		this.plugin = AreaShop.getInstance();
+		execute();
 	}

 	/**
 	 * Execute the job.
 	 */
-	public void execute() {
+	private void execute() {
 		// Check for RegionForSale data
 		File regionForSaleFolder = new File(plugin.getDataFolder().getParentFile().getAbsolutePath(), "RegionForSale");
 		if(!regionForSaleFolder.exists()) {
@@ -90,8 +70,8 @@ public class ImportJob {
 		message("import-start");

 		// Group with settings for all imported regions
-		RegionGroup regionForSaleGroup = regionFactory.createRegionGroup("RegionForSale");
-		fileManager.addGroup(regionForSaleGroup);
+		RegionGroup regionForSaleGroup = new RegionGroup(plugin, "RegionForSale");
+		plugin.getFileManager().addGroup(regionForSaleGroup);

 		// Import /RegionForSale/config.yml settings
 		File regionForSaleConfigFile = new File(regionForSaleFolder.getAbsolutePath(), "config.yml");
@@ -169,11 +149,11 @@ public class ImportJob {
 				worldConfig = new YamlConfiguration();
 			} else {
 				// RegionGroup with all world settings
-				RegionGroup worldGroup = regionFactory.createRegionGroup("RegionForSale-" + worldFolder.getName());
+				RegionGroup worldGroup = new RegionGroup(plugin, "RegionForSale-" + worldFolder.getName());
 				importRegionSettings(worldConfig, worldGroup.getSettings(), null, false);
 				worldGroup.setSetting("priority", 1);
 				worldGroup.addWorld(worldFolder.getName());
-				fileManager.addGroup(regionForSaleGroup);
+				plugin.getFileManager().addGroup(regionForSaleGroup);
 				worldGroup.saveRequired();
 			}

@@ -205,7 +185,7 @@ public class ImportJob {
 					}

 					// Import parent region settings into a RegionGroup
-					RegionGroup parentRegionGroup = regionFactory.createRegionGroup( "RegionForSale-" + worldFolder.getName() + "-" + parentRegionName);
+					RegionGroup parentRegionGroup = new RegionGroup(plugin, "RegionForSale-" + worldFolder.getName() + "-" + parentRegionName);
 					importRegionSettings(parentRegionSection, parentRegionGroup.getSettings(), null, false);
 					parentRegionGroup.setSetting("priority", 2 + parentRegionSection.getLong("info.priority", 0));
 					parentRegionGroup.saveRequired();
@@ -217,7 +197,7 @@ public class ImportJob {

 			// Read and import regions
 			for(String regionKey : regions.getKeys(false)) {
-				GeneralRegion existingRegion = fileManager.getRegion(regionKey);
+				GeneralRegion existingRegion = plugin.getFileManager().getRegion(regionKey);
 				if(existingRegion != null) {
 					if(world.getName().equalsIgnoreCase(existingRegion.getWorldName())) {
 						messageNoPrefix("import-alreadyAdded", regionKey);
@@ -260,9 +240,9 @@ public class ImportJob {
 				// Create region
 				GeneralRegion region;
 				if(rentable || (owner != null && !isBought)) {
-					region = regionFactory.createRentRegion(regionKey, world);
+					region = new RentRegion(regionKey, world);
 				} else {
-					region = regionFactory.createBuyRegion(regionKey, world);
+					region = new BuyRegion(regionKey, world);
 				}
 				AddingRegionEvent event = plugin.getFileManager().addRegion(region);
 				if (event.isCancelled()) {
@@ -279,16 +259,16 @@ public class ImportJob {
 				if(owner != null) {
 					@SuppressWarnings("deprecation")
 					OfflinePlayer offlinePlayer = Bukkit.getOfflinePlayer(owner);
-					if(offlinePlayer.hasPlayedBefore()) {
+					if(offlinePlayer != null) {
 						existing.add(offlinePlayer.getUniqueId());
 					}
 				}
-				for(UUID uuid : worldGuardInterface.getOwners(worldGuardRegion).asUniqueIdList()) {
+				for(UUID uuid : plugin.getWorldGuardHandler().getOwners(worldGuardRegion).asUniqueIdList()) {
 					if(!existing.contains(uuid)) {
 						existing.add(uuid);
 					}
 				}
-				for(UUID uuid : worldGuardInterface.getMembers(worldGuardRegion).asUniqueIdList()) {
+				for(UUID uuid : plugin.getWorldGuardHandler().getMembers(worldGuardRegion).asUniqueIdList()) {
 					if(!existing.contains(uuid)) {
 						existing.add(uuid);
 					}
@@ -310,9 +290,9 @@ public class ImportJob {
 		}

 		// Update all regions
-		fileManager.updateAllRegions(sender);
+		plugin.getFileManager().updateAllRegions(sender);
 		// Write all imported regions and settings to disk
-		fileManager.saveRequiredFiles();
+		plugin.getFileManager().saveRequiredFiles();
 	}

 	/**
@@ -419,9 +399,8 @@ public class ImportJob {
 				}

 				// Check if this location is already added to a region
-				Optional<RegionSign> optionalRegionSign = signManager.signFromLocation(location);
-				if(optionalRegionSign.isPresent()) {
-					RegionSign regionSign = optionalRegionSign.get();
+				RegionSign regionSign = SignsFeature.getSignByLocation(location);
+				if(regionSign != null) {
 					if(!regionSign.getRegion().equals(region)) {
 						message("import-signAlreadyAdded", region.getName(), signLocation, regionSign.getRegion().getName());
 					}
@@ -480,10 +459,10 @@ public class ImportJob {
 	 * @param replacements The replacements to insert in the message
 	 */
 	public void messageNoPrefix(String key, Object... replacements) {
-		messageBridge.messageNoPrefix(sender, key, replacements);
+		plugin.messageNoPrefix(sender, key, replacements);

 		if(!(sender instanceof ConsoleCommandSender)) {
-			messageBridge.messageNoPrefix(Bukkit.getConsoleSender(), key, replacements);
+			plugin.messageNoPrefix(Bukkit.getConsoleSender(), key, replacements);
 		}
 	}

@@ -493,10 +472,10 @@ public class ImportJob {
 	 * @param replacements The replacements to insert in the message
 	 */
 	public void message(String key, Object... replacements) {
-		messageBridge.message(sender, key, replacements);
+		plugin.message(sender, key, replacements);

 		if(!(sender instanceof ConsoleCommandSender)) {
-			messageBridge.message(Bukkit.getConsoleSender(), key, replacements);
+			plugin.message(Bukkit.getConsoleSender(), key, replacements);
 		}
 	}
 }
@@ -1,19 +1,15 @@
 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;
@@ -22,14 +18,8 @@ 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";
@@ -60,7 +50,7 @@ public class InfoCommand extends CommandAreaShop {
 			try {
 				page = Integer.parseInt(pageInput);
 			} catch(NumberFormatException e) {
-				messageBridge.message(sender, "info-wrongPage", pageInput);
+				plugin.message(sender, "info-wrongPage", pageInput);
 				return;
 			}
 		}
@@ -68,7 +58,7 @@ public class InfoCommand extends CommandAreaShop {
 			regions.removeIf(generalRegion -> !filterGroup.isMember(generalRegion));
 		}
 		if(regions.isEmpty()) {
-			messageBridge.message(sender, "info-noRegions");
+			plugin.message(sender, "info-noRegions");
 		} else {
 			// First sort by type, then by name
 			regions.sort((one, two) -> {
@@ -84,7 +74,7 @@ public class InfoCommand extends CommandAreaShop {
 			if(filterGroup != null) {
 				limitedToGroup = Message.fromKey("info-limitedToGroup").replacements(filterGroup.getName());
 			}
-			messageBridge.message(sender, keyHeader, limitedToGroup);
+			plugin.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
@@ -111,7 +101,7 @@ public class InfoCommand extends CommandAreaShop {
 						state = "Reselling";
 					}
 				}
-				messageBridge.messageNoPrefix(sender, "info-entry" + state, region);
+				plugin.messageNoPrefix(sender, "info-entry" + state, region);
 				linesPrinted++;
 			}
 			Message footer = Message.empty();
@@ -168,7 +158,7 @@ public class InfoCommand extends CommandAreaShop {
 	@Override
 	public void execute(CommandSender sender, String[] args) {
 		if(!sender.hasPermission("areashop.info")) {
-			messageBridge.message(sender, "info-noPermission");
+			plugin.message(sender, "info-noPermission");
 			return;
 		}
 		if(args.length > 1 && args[1] != null) {
@@ -177,9 +167,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 = fileManager.getGroup(args[2]);
+					filterGroup = plugin.getFileManager().getGroup(args[2]);
 					if(filterGroup == null) {
-						messageBridge.message(sender, "info-noFiltergroup", args[2]);
+						plugin.message(sender, "info-noFiltergroup", args[2]);
 						return;
 					}
 					// Pass page number to args[2] if available
@@ -191,48 +181,48 @@ public class InfoCommand extends CommandAreaShop {

 			// All regions
 			if(args[1].equalsIgnoreCase("all")) {
-				showSortedPagedList(sender, new ArrayList<>(fileManager.getRegionsRef()), filterGroup, "info-allHeader", (args.length > 2 ? args[2] : null), "info all");
+				showSortedPagedList(sender, plugin.getFileManager().getRegions(), filterGroup, "info-allHeader", (args.length > 2 ? args[2] : null), "info all");
 			}

 			// Rented regions
 			else if(args[1].equalsIgnoreCase("rented")) {
-				List<RentRegion> regions = new ArrayList<>(fileManager.getRentsRef());
+				List<RentRegion> regions = plugin.getFileManager().getRents();
 				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 = new ArrayList<>(fileManager.getRentsRef());
+				List<RentRegion> regions = plugin.getFileManager().getRents();
 				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 = new ArrayList<>(fileManager.getBuysRef());
+				List<BuyRegion> regions = plugin.getFileManager().getBuys();
 				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 = new ArrayList<>(fileManager.getBuysRef());
+				List<BuyRegion> regions = plugin.getFileManager().getBuys();
 				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 = new ArrayList<>(fileManager.getBuysRef());
+				List<BuyRegion> regions = plugin.getFileManager().getBuys();
 				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 = new ArrayList<>(fileManager.getRegionsRef());
-				for(RegionGroup group : fileManager.getGroups()) {
+				List<GeneralRegion> regions = plugin.getFileManager().getRegions();
+				for(RegionGroup group : plugin.getFileManager().getGroups()) {
 					regions.removeAll(group.getMemberRegions());
 				}
 				if(regions.isEmpty()) {
-					messageBridge.message(sender, "info-nogroupNone");
+					plugin.message(sender, "info-nogroupNone");
 				} else {
 					showSortedPagedList(sender, regions, filterGroup, "info-nogroupHeader", (args.length > 2 ? args[2] : null), "info nogroup");
 				}
@@ -244,17 +234,17 @@ public class InfoCommand extends CommandAreaShop {
 					RentRegion rent = null;
 					BuyRegion buy = null;
 					if(args.length > 2) {
-						rent = fileManager.getRent(args[2]);
-						buy = fileManager.getBuy(args[2]);
+						rent = plugin.getFileManager().getRent(args[2]);
+						buy = plugin.getFileManager().getBuy(args[2]);
 					} else {
 						if(sender instanceof Player) {
 							// get the region by location
 							List<GeneralRegion> regions = Utils.getImportantRegions(((Player)sender).getLocation());
 							if(regions.isEmpty()) {
-								messageBridge.message(sender, "cmd-noRegionsAtLocation");
+								plugin.message(sender, "cmd-noRegionsAtLocation");
 								return;
 							} else if(regions.size() > 1) {
-								messageBridge.message(sender, "cmd-moreRegionsAtLocation");
+								plugin.message(sender, "cmd-moreRegionsAtLocation");
 								return;
 							} else {
 								if(regions.get(0) instanceof RentRegion) {
@@ -264,26 +254,26 @@ public class InfoCommand extends CommandAreaShop {
 								}
 							}
 						} else {
-							messageBridge.message(sender, "cmd-automaticRegionOnlyByPlayer");
+							plugin.message(sender, "cmd-automaticRegionOnlyByPlayer");
 							return;
 						}
 					}

 					if(rent == null && buy == null) {
-						messageBridge.message(sender, "info-regionNotExisting", args[2]);
+						plugin.message(sender, "info-regionNotExisting", args[2]);
 						return;
 					}

 					if(rent != null) {
-						messageBridge.message(sender, "info-regionHeaderRent", rent);
+						plugin.message(sender, "info-regionHeaderRent", rent);
 						if(rent.isRented()) {
-							messageBridge.messageNoPrefix(sender, "info-regionRented", rent);
-							messageBridge.messageNoPrefix(sender, "info-regionExtending", rent);
+							plugin.messageNoPrefix(sender, "info-regionRented", rent);
+							plugin.messageNoPrefix(sender, "info-regionExtending", rent);
 							// Money back
 							if(UnrentCommand.canUse(sender, rent)) {
-								messageBridge.messageNoPrefix(sender, "info-regionMoneyBackRentClick", rent);
+								plugin.messageNoPrefix(sender, "info-regionMoneyBackRentClick", rent);
 							} else {
-								messageBridge.messageNoPrefix(sender, "info-regionMoneyBackRent", rent);
+								plugin.messageNoPrefix(sender, "info-regionMoneyBackRent", rent);
 							}
 							// Friends
 							if(!rent.getFriendsFeature().getFriendNames().isEmpty()) {
@@ -291,30 +281,30 @@ public class InfoCommand extends CommandAreaShop {
 								if(DelfriendCommand.canUse(sender, rent)) {
 									messagePart = "info-friendRemove";
 								}
-								messageBridge.messageNoPrefix(sender, "info-regionFriends", rent, Utils.combinedMessage(rent.getFriendsFeature().getFriendNames(), messagePart));
+								plugin.messageNoPrefix(sender, "info-regionFriends", rent, Utils.combinedMessage(rent.getFriendsFeature().getFriendNames(), messagePart));
 							}
 						} else {
-							messageBridge.messageNoPrefix(sender, "info-regionCanBeRented", rent);
+							plugin.messageNoPrefix(sender, "info-regionCanBeRented", rent);
 						}
 						if(rent.getLandlordName() != null) {
-							messageBridge.messageNoPrefix(sender, "info-regionLandlord", rent);
+							plugin.messageNoPrefix(sender, "info-regionLandlord", rent);
 						}
 						// Maximum extends
 						if(rent.getMaxExtends() != -1) {
 							if(rent.getMaxExtends() == 0) {
-								messageBridge.messageNoPrefix(sender, "info-regionNoExtending", rent);
+								plugin.messageNoPrefix(sender, "info-regionNoExtending", rent);
 							} else if(rent.isRented()) {
-								messageBridge.messageNoPrefix(sender, "info-regionExtendsLeft", rent);
+								plugin.messageNoPrefix(sender, "info-regionExtendsLeft", rent);
 							} else {
-								messageBridge.messageNoPrefix(sender, "info-regionMaxExtends", rent);
+								plugin.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) {
-							messageBridge.messageNoPrefix(sender, "info-regionMaxRentTime", rent);
+							plugin.messageNoPrefix(sender, "info-regionMaxRentTime", rent);
 						}
 						if(rent.getInactiveTimeUntilUnrent() != -1) {
-							messageBridge.messageNoPrefix(sender, "info-regionInactiveUnrent", rent);
+							plugin.messageNoPrefix(sender, "info-regionInactiveUnrent", rent);
 						}
 						// Teleport
 						Message tp = Message.fromKey("info-prefix");
@@ -336,44 +326,44 @@ public class InfoCommand extends CommandAreaShop {
 						}
 						// Signs
 						List<String> signLocations = new ArrayList<>();
-						for(BlockPosition location : rent.getSignsFeature().signManager().allSignLocations()) {
-							signLocations.add(Message.fromKey("info-regionSignLocation").replacements(location.getWorld().getName(), location.getX(), location.getY(), location.getZ()).getPlain());
+						for(Location location : rent.getSignsFeature().getSignLocations()) {
+							signLocations.add(Message.fromKey("info-regionSignLocation").replacements(location.getWorld().getName(), location.getBlockX(), location.getBlockY(), location.getBlockZ()).getPlain());
 						}
 						if(!signLocations.isEmpty()) {
-							messageBridge.messageNoPrefix(sender, "info-regionSigns", Utils.createCommaSeparatedList(signLocations));
+							plugin.messageNoPrefix(sender, "info-regionSigns", Utils.createCommaSeparatedList(signLocations));
 						}
 						// Groups
 						if(sender.hasPermission("areashop.groupinfo") && !rent.getGroupNames().isEmpty()) {
-							messageBridge.messageNoPrefix(sender, "info-regionGroups", Utils.createCommaSeparatedList(rent.getGroupNames()));
+							plugin.messageNoPrefix(sender, "info-regionGroups", Utils.createCommaSeparatedList(rent.getGroupNames()));
 						}
 						// Restoring
 						if(rent.isRestoreEnabled()) {
-							messageBridge.messageNoPrefix(sender, "info-regionRestoringRent", rent);
+							plugin.messageNoPrefix(sender, "info-regionRestoringRent", rent);
 						}
 						// Restrictions
 						if(!rent.isRented()) {
 							if(rent.restrictedToRegion()) {
-								messageBridge.messageNoPrefix(sender, "info-regionRestrictedRegionRent", rent);
+								plugin.messageNoPrefix(sender, "info-regionRestrictedRegionRent", rent);
 							} else if(rent.restrictedToWorld()) {
-								messageBridge.messageNoPrefix(sender, "info-regionRestrictedWorldRent", rent);
+								plugin.messageNoPrefix(sender, "info-regionRestrictedWorldRent", rent);
 							}
 						}
-						messageBridge.messageNoPrefix(sender, "info-regionFooterRent", rent);
+						plugin.messageNoPrefix(sender, "info-regionFooterRent", rent);
 					} else if(buy != null) {
-						messageBridge.message(sender, "info-regionHeaderBuy", buy);
+						plugin.message(sender, "info-regionHeaderBuy", buy);
 						if(buy.isSold()) {
 							if(buy.isInResellingMode()) {
-								messageBridge.messageNoPrefix(sender, "info-regionReselling", buy);
-								messageBridge.messageNoPrefix(sender, "info-regionReselPrice", buy);
+								plugin.messageNoPrefix(sender, "info-regionReselling", buy);
+								plugin.messageNoPrefix(sender, "info-regionReselPrice", buy);
 							} else {
-								messageBridge.messageNoPrefix(sender, "info-regionBought", buy);
+								plugin.messageNoPrefix(sender, "info-regionBought", buy);
 							}
 							// Money back
 							if(!buy.getBooleanSetting("buy.sellDisabled")) {
 								if (SellCommand.canUse(sender, buy)) {
-									messageBridge.messageNoPrefix(sender, "info-regionMoneyBackBuyClick", buy);
+									plugin.messageNoPrefix(sender, "info-regionMoneyBackBuyClick", buy);
 								} else {
-									messageBridge.messageNoPrefix(sender, "info-regionMoneyBackBuy", buy);
+									plugin.messageNoPrefix(sender, "info-regionMoneyBackBuy", buy);
 								}
 							}
 							// Friends
@@ -382,16 +372,16 @@ public class InfoCommand extends CommandAreaShop {
 								if(DelfriendCommand.canUse(sender, buy)) {
 									messagePart = "info-friendRemove";
 								}
-								messageBridge.messageNoPrefix(sender, "info-regionFriends", buy, Utils.combinedMessage(buy.getFriendsFeature().getFriendNames(), messagePart));
+								plugin.messageNoPrefix(sender, "info-regionFriends", buy, Utils.combinedMessage(buy.getFriendsFeature().getFriendNames(), messagePart));
 							}
 						} else {
-							messageBridge.messageNoPrefix(sender, "info-regionCanBeBought", buy);
+							plugin.messageNoPrefix(sender, "info-regionCanBeBought", buy);
 						}
 						if(buy.getLandlord() != null) {
-							messageBridge.messageNoPrefix(sender, "info-regionLandlord", buy);
+							plugin.messageNoPrefix(sender, "info-regionLandlord", buy);
 						}
 						if(buy.getInactiveTimeUntilSell() != -1) {
-							messageBridge.messageNoPrefix(sender, "info-regionInactiveSell", buy);
+							plugin.messageNoPrefix(sender, "info-regionInactiveSell", buy);
 						}
 						// Teleport
 						Message tp = Message.fromKey("info-prefix");
@@ -413,38 +403,38 @@ public class InfoCommand extends CommandAreaShop {
 						}
 						// Signs
 						List<String> signLocations = new ArrayList<>();
-						for(BlockPosition location : buy.getSignsFeature().signManager().allSignLocations()) {
-							signLocations.add(Message.fromKey("info-regionSignLocation").replacements(location.getWorld().getName(), location.getX(), location.getY(), location.getZ()).getPlain());
+						for(Location location : buy.getSignsFeature().getSignLocations()) {
+							signLocations.add(Message.fromKey("info-regionSignLocation").replacements(location.getWorld().getName(), location.getBlockX(), location.getBlockY(), location.getBlockZ()).getPlain());
 						}
 						if(!signLocations.isEmpty()) {
-							messageBridge.messageNoPrefix(sender, "info-regionSigns", Utils.createCommaSeparatedList(signLocations));
+							plugin.messageNoPrefix(sender, "info-regionSigns", Utils.createCommaSeparatedList(signLocations));
 						}
 						// Groups
 						if(sender.hasPermission("areashop.groupinfo") && !buy.getGroupNames().isEmpty()) {
-							messageBridge.messageNoPrefix(sender, "info-regionGroups", Utils.createCommaSeparatedList(buy.getGroupNames()));
+							plugin.messageNoPrefix(sender, "info-regionGroups", Utils.createCommaSeparatedList(buy.getGroupNames()));
 						}
 						// Restoring
 						if(buy.isRestoreEnabled()) {
-							messageBridge.messageNoPrefix(sender, "info-regionRestoringBuy", buy);
+							plugin.messageNoPrefix(sender, "info-regionRestoringBuy", buy);
 						}
 						// Restrictions
 						if(!buy.isSold()) {
 							if(buy.restrictedToRegion()) {
-								messageBridge.messageNoPrefix(sender, "info-regionRestrictedRegionBuy", buy);
+								plugin.messageNoPrefix(sender, "info-regionRestrictedRegionBuy", buy);
 							} else if(buy.restrictedToWorld()) {
-								messageBridge.messageNoPrefix(sender, "info-regionRestrictedWorldBuy", buy);
+								plugin.messageNoPrefix(sender, "info-regionRestrictedWorldBuy", buy);
 							}
 						}
-						messageBridge.messageNoPrefix(sender, "info-regionFooterBuy", buy);
+						plugin.messageNoPrefix(sender, "info-regionFooterBuy", buy);
 					}
 				} else {
-					messageBridge.message(sender, "info-regionHelp");
+					plugin.message(sender, "info-regionHelp");
 				}
 			} else {
-				messageBridge.message(sender, "info-help");
+				plugin.message(sender, "info-help");
 			}
 		} else {
-			messageBridge.message(sender, "info-help");
+			plugin.message(sender, "info-help");
 		}
 	}

@@ -459,8 +449,8 @@ public class InfoCommand extends CommandAreaShop {
 					result.add(player.getName());
 				}
 			} else if(start[2].equalsIgnoreCase("region")) {
-				result.addAll(fileManager.getBuyNames());
-				result.addAll(fileManager.getRentNames());
+				result.addAll(plugin.getFileManager().getBuyNames());
+				result.addAll(plugin.getFileManager().getRentNames());
 			}
 		}
 		return result;
@@ -1,10 +1,5 @@
 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;
@@ -14,16 +9,8 @@ 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";
@@ -40,17 +27,17 @@ public class LinksignsCommand extends CommandAreaShop {
 	@Override
 	public void execute(CommandSender sender, String[] args) {
 		if(!sender.hasPermission("areashop.linksigns")) {
-			messageBridge.message(sender, "linksigns-noPermission");
+			plugin.message(sender, "linksigns-noPermission");
 			return;
 		}
 		if(!(sender instanceof Player)) {
-			messageBridge.message(sender, "cmd-onlyByPlayer");
+			plugin.message(sender, "cmd-onlyByPlayer");
 			return;
 		}

 		Player player = (Player)sender;
-		if(signLinkerManager.isInSignLinkMode(player)) {
-			signLinkerManager.exitSignLinkMode(player);
+		if(plugin.getSignlinkerManager().isInSignLinkMode(player)) {
+			plugin.getSignlinkerManager().exitSignLinkMode(player);
 		} else {
 			// Get the profile
 			String profile = null;
@@ -67,12 +54,12 @@ public class LinksignsCommand extends CommandAreaShop {
 							}
 							message.addAll(Message.fromKey("addsign-profile").replacements(p).get());
 						}
-						messageBridge.message(sender, "addsign-wrongProfile", Message.fromList(message));
+						plugin.message(sender, "addsign-wrongProfile", Message.fromList(message));
 						return;
 					}
 				}
 			}
-			signLinkerManager.enterSignLinkMode(player, profile);
+			plugin.getSignlinkerManager().enterSignLinkMode(player, profile);
 		}
 	}

@@ -1,7 +1,5 @@
 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;
@@ -11,21 +9,13 @@ 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";
@@ -42,13 +32,13 @@ public class MeCommand extends CommandAreaShop {
 	@Override
 	public void execute(CommandSender sender, String[] args) {
 		if(!sender.hasPermission("areashop.me")) {
-			messageBridge.message(sender, "me-noPermission");
+			plugin.message(sender, "me-noPermission");
 			return;
 		}
 		OfflinePlayer player = null;
 		if(!(sender instanceof Player)) {
 			if(args.length <= 1) {
-				messageBridge.message(sender, "me-notAPlayer");
+				plugin.message(sender, "me-notAPlayer");
 				return;
 			}
 		} else {
@@ -56,31 +46,31 @@ public class MeCommand extends CommandAreaShop {
 		}
 		if(args.length > 1) {
 			player = Bukkit.getOfflinePlayer(args[1]);
-			if(!player.hasPlayedBefore()) {
-				messageBridge.message(sender, "me-noPlayer", args[1]);
+			if(player == null) {
+				plugin.message(sender, "me-noPlayer", args[1]);
 				return;
 			}
 		}
-		if(!player.hasPlayedBefore()) {
+		if(player == null) {
 			return;
 		}

 		// Get the regions owned by the player
 		Set<RentRegion> rentRegions = new HashSet<>();
-		for(RentRegion region : fileManager.getRentsRef()) {
+		for(RentRegion region : plugin.getFileManager().getRents()) {
 			if(region.isOwner(player)) {
 				rentRegions.add(region);
 			}
 		}
 		Set<BuyRegion> buyRegions = new HashSet<>();
-		for(BuyRegion region : fileManager.getBuysRef()) {
+		for(BuyRegion region : plugin.getFileManager().getBuys()) {
 			if(region.isOwner(player)) {
 				buyRegions.add(region);
 			}
 		}
 		// Get the regions the player is added as friend
 		Set<GeneralRegion> friendRegions = new HashSet<>();
-		for(GeneralRegion region : fileManager.getRegionsRef()) {
+		for(GeneralRegion region : plugin.getFileManager().getRegions()) {
 			if(region.getFriendsFeature().getFriends().contains(player.getUniqueId())) {
 				friendRegions.add(region);
 			}
@@ -89,28 +79,28 @@ public class MeCommand extends CommandAreaShop {
 		// Send messages
 		boolean foundSome = !rentRegions.isEmpty() || !buyRegions.isEmpty() || !friendRegions.isEmpty();
 		if(foundSome) {
-			messageBridge.message(sender, "me-header", player.getName());
+			plugin.message(sender, "me-header", player.getName());
 		}
 		if(!rentRegions.isEmpty()) {
 			for(RentRegion region : rentRegions) {
-				messageBridge.messageNoPrefix(sender, "me-rentLine", region);
+				plugin.messageNoPrefix(sender, "me-rentLine", region);
 			}
 		}
 		if(!buyRegions.isEmpty()) {
 			for(BuyRegion region : buyRegions) {
-				messageBridge.messageNoPrefix(sender, "me-buyLine", region);
+				plugin.messageNoPrefix(sender, "me-buyLine", region);
 			}
 		}
 		if(!friendRegions.isEmpty()) {
 			for(GeneralRegion region : friendRegions) {
-				messageBridge.messageNoPrefix(sender, "me-friendLine", region);
+				plugin.messageNoPrefix(sender, "me-friendLine", region);
 			}
 		}

 		if(!foundSome) {
-			messageBridge.message(sender, "me-nothing", player.getName());
+			plugin.message(sender, "me-nothing", player.getName());
 		} else {
-			messageBridge.messageNoPrefix(sender, "me-clickHint");
+			plugin.messageNoPrefix(sender, "me-clickHint");
 		}
 	}

@@ -1,6 +1,5 @@
 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;
@@ -8,17 +7,11 @@ 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";
@@ -33,18 +26,18 @@ public class MessageCommand extends CommandAreaShop {
 	@Override
 	public void execute(final CommandSender sender, final String[] args) {
 		if(!sender.hasPermission("areashop.message")) {
-			messageBridge.message(sender, "message-noPermission");
+			plugin.message(sender, "message-noPermission");
 			return;
 		}

 		if(args.length < 3) {
-			messageBridge.message(sender, "message-help");
+			plugin.message(sender, "message-help");
 			return;
 		}

 		Player player = Bukkit.getPlayer(args[1]);
 		if(player == null) {
-			messageBridge.message(sender, "message-notOnline", args[1]);
+			plugin.message(sender, "message-notOnline", args[1]);
 			return;
 		}

@@ -1,20 +1,9 @@
 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";
@@ -34,7 +23,7 @@ public class ReloadCommand extends CommandAreaShop {
 			// Reload the configuration files and update all region flags/signs
 			plugin.reload(sender);
 		} else {
-			messageBridge.message(sender, "reload-noPermission");
+			plugin.message(sender, "reload-noPermission");
 		}
 	}
 }
@@ -1,25 +1,15 @@
 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";
@@ -36,18 +26,18 @@ public class RentCommand extends CommandAreaShop {
 	@Override
 	public void execute(CommandSender sender, String[] args) {
 		if(!sender.hasPermission("areashop.rent")) {
-			messageBridge.message(sender, "rent-noPermission");
+			plugin.message(sender, "rent-noPermission");
 			return;
 		}
 		if(!(sender instanceof Player)) {
-			messageBridge.message(sender, "cmd-onlyByPlayer");
+			plugin.message(sender, "cmd-onlyByPlayer");
 			return;
 		}
 		Player player = (Player)sender;
 		if(args.length > 1 && args[1] != null) {
-			RentRegion rent = fileManager.getRent(args[1]);
+			RentRegion rent = plugin.getFileManager().getRent(args[1]);
 			if(rent == null) {
-				messageBridge.message(sender, "rent-notRentable", args[1]);
+				plugin.message(sender, "rent-notRentable", args[1]);
 			} else {
 				rent.rent(player);
 			}
@@ -55,9 +45,9 @@ public class RentCommand extends CommandAreaShop {
 			// get the region by location
 			List<RentRegion> regions = Utils.getImportantRentRegions(((Player)sender).getLocation());
 			if(regions.isEmpty()) {
-				messageBridge.message(sender, "cmd-noRegionsAtLocation");
+				plugin.message(sender, "cmd-noRegionsAtLocation");
 			} else if(regions.size() > 1) {
-				messageBridge.message(sender, "cmd-moreRegionsAtLocation");
+				plugin.message(sender, "cmd-moreRegionsAtLocation");
 			} else {
 				regions.get(0).rent(player);
 			}
@@ -68,7 +58,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 : fileManager.getRentsRef()) {
+			for(RentRegion region : plugin.getFileManager().getRents()) {
 				if(!region.isRented()) {
 					result.add(region.getName());
 				}
@@ -1,25 +1,15 @@
 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";
@@ -36,24 +26,24 @@ public class ResellCommand extends CommandAreaShop {
 	@Override
 	public void execute(CommandSender sender, String[] args) {
 		if(!sender.hasPermission("areashop.resell") && !sender.hasPermission("areashop.resellall")) {
-			messageBridge.message(sender, "resell-noPermissionOther");
+			plugin.message(sender, "resell-noPermissionOther");
 			return;
 		}

 		if(args.length <= 1) {
-			messageBridge.message(sender, "resell-help");
+			plugin.message(sender, "resell-help");
 			return;
 		}
 		double price;
 		try {
 			price = Double.parseDouble(args[1]);
 		} catch(NumberFormatException e) {
-			messageBridge.message(sender, "resell-wrongPrice", args[1]);
+			plugin.message(sender, "resell-wrongPrice", args[1]);
 			return;
 		}

 		if(price < 0) {
-			messageBridge.message(sender, "resell-wrongPrice", args[1]);
+			plugin.message(sender, "resell-wrongPrice", args[1]);
 			return;
 		}

@@ -63,53 +53,53 @@ public class ResellCommand extends CommandAreaShop {
 				// get the region by location
 				List<BuyRegion> regions = Utils.getImportantBuyRegions(((Player)sender).getLocation());
 				if(regions.isEmpty()) {
-					messageBridge.message(sender, "cmd-noRegionsAtLocation");
+					plugin.message(sender, "cmd-noRegionsAtLocation");
 					return;
 				} else if(regions.size() > 1) {
-					messageBridge.message(sender, "cmd-moreRegionsAtLocation");
+					plugin.message(sender, "cmd-moreRegionsAtLocation");
 					return;
 				} else {
 					buy = regions.get(0);
 				}
 			} else {
-				messageBridge.message(sender, "cmd-automaticRegionOnlyByPlayer");
+				plugin.message(sender, "cmd-automaticRegionOnlyByPlayer");
 				return;
 			}
 		} else {
-			buy = fileManager.getBuy(args[2]);
+			buy = plugin.getFileManager().getBuy(args[2]);
 			if(buy == null) {
-				messageBridge.message(sender, "resell-notRegistered", args[2]);
+				plugin.message(sender, "resell-notRegistered", args[2]);
 				return;
 			}
 		}
 		if(buy == null) {
-			messageBridge.message(sender, "cmd-noRegionsAtLocation");
+			plugin.message(sender, "cmd-noRegionsAtLocation");
 			return;
 		}
 		if(!buy.isSold()) {
-			messageBridge.message(sender, "resell-notBought", buy);
+			plugin.message(sender, "resell-notBought", buy);
 			return;
 		}
 		if(sender.hasPermission("areashop.resellall")) {
 			buy.enableReselling(price);
 			buy.update();
-			messageBridge.message(sender, "resell-success", buy);
+			plugin.message(sender, "resell-success", buy);
 		} else if(sender.hasPermission("areashop.resell") && sender instanceof Player) {
 			if(!buy.isOwner((Player)sender)) {
-				messageBridge.message(sender, "resell-noPermissionOther", buy);
+				plugin.message(sender, "resell-noPermissionOther", buy);
 				return;
 			}

 			if(buy.getBooleanSetting("buy.resellDisabled")) {
-				messageBridge.message(sender, "resell-disabled", buy);
+				plugin.message(sender, "resell-disabled", buy);
 				return;
 			}

 			buy.enableReselling(price);
 			buy.update();
-			messageBridge.message(sender, "resell-success", buy);
+			plugin.message(sender, "resell-success", buy);
 		} else {
-			messageBridge.message(sender, "resell-noPermission", buy);
+			plugin.message(sender, "resell-noPermission", buy);
 		}
 	}

@@ -117,7 +107,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 : fileManager.getBuysRef()) {
+			for(BuyRegion region : plugin.getFileManager().getBuys()) {
 				if(region.isSold() && !region.isInResellingMode()) {
 					result.add(region.getName());
 				}
@@ -1,27 +1,17 @@
 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";
@@ -38,21 +28,21 @@ public class SchematiceventCommand extends CommandAreaShop {
 	@Override
 	public void execute(CommandSender sender, String[] args) {
 		if(!sender.hasPermission("areashop.schematicevents")) {
-			messageBridge.message(sender, "schemevent-noPermission");
+			plugin.message(sender, "schemevent-noPermission");
 			return;
 		}

 		if(args.length < 3 || args[1] == null || args[2] == null) {
-			messageBridge.message(sender, "schemevent-help");
+			plugin.message(sender, "schemevent-help");
 			return;
 		}
-		GeneralRegion region = fileManager.getRegion(args[1]);
+		GeneralRegion region = plugin.getFileManager().getRegion(args[1]);
 		if(region == null) {
-			messageBridge.message(sender, "cmd-notRegistered", args[1]);
+			plugin.message(sender, "cmd-notRegistered", args[1]);
 			return;
 		}
 		if(region.getRegion() == null) {
-			messageBridge.message(sender, "general-noRegion", region);
+			plugin.message(sender, "general-noRegion", region);
 			return;
 		}
 		GeneralRegion.RegionEvent event = null;
@@ -68,21 +58,21 @@ public class SchematiceventCommand extends CommandAreaShop {
 			for(GeneralRegion.RegionEvent value : GeneralRegion.RegionEvent.values()) {
 				values.add(value.getValue().toLowerCase());
 			}
-			messageBridge.message(sender, "schemevent-wrongEvent", args[2], Utils.createCommaSeparatedList(values), region);
+			plugin.message(sender, "schemevent-wrongEvent", args[2], Utils.createCommaSeparatedList(values), region);
 			return;
 		}
 		region.handleSchematicEvent(event);
 		region.update();
-		messageBridge.message(sender, "schemevent-success", args[2], region);
+		plugin.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(fileManager.getRegionNames());
+			result.addAll(plugin.getFileManager().getRegionNames());
 		} else if(toComplete == 3) {
-			GeneralRegion region = fileManager.getRegion(start[2]);
+			GeneralRegion region = plugin.getFileManager().getRegion(start[2]);
 			if(region != null) {
 				if(region instanceof RentRegion) {
 					result.addAll(Arrays.asList("created", "deleted", "rented", "unrented"));
@@ -1,26 +1,16 @@
 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";
@@ -54,7 +44,7 @@ public class SellCommand extends CommandAreaShop {
 	@Override
 	public void execute(CommandSender sender, String[] args) {
 		if(!sender.hasPermission("areashop.sell") && !sender.hasPermission("areashop.sellown")) {
-			messageBridge.message(sender, "sell-noPermission");
+			plugin.message(sender, "sell-noPermission");
 			return;
 		}
 		BuyRegion buy;
@@ -63,27 +53,27 @@ public class SellCommand extends CommandAreaShop {
 				// get the region by location
 				List<BuyRegion> regions = Utils.getImportantBuyRegions(((Player)sender).getLocation());
 				if(regions.isEmpty()) {
-					messageBridge.message(sender, "cmd-noRegionsAtLocation");
+					plugin.message(sender, "cmd-noRegionsAtLocation");
 					return;
 				} else if(regions.size() > 1) {
-					messageBridge.message(sender, "cmd-moreRegionsAtLocation");
+					plugin.message(sender, "cmd-moreRegionsAtLocation");
 					return;
 				} else {
 					buy = regions.get(0);
 				}
 			} else {
-				messageBridge.message(sender, "cmd-automaticRegionOnlyByPlayer");
+				plugin.message(sender, "cmd-automaticRegionOnlyByPlayer");
 				return;
 			}
 		} else {
-			buy = fileManager.getBuy(args[1]);
+			buy = plugin.getFileManager().getBuy(args[1]);
 		}
 		if(buy == null) {
-			messageBridge.message(sender, "sell-notRegistered");
+			plugin.message(sender, "sell-notRegistered");
 			return;
 		}
 		if(!buy.isSold()) {
-			messageBridge.message(sender, "sell-notBought", buy);
+			plugin.message(sender, "sell-notBought", buy);
 			return;
 		}
 		buy.sell(true, sender);
@@ -93,7 +83,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 : fileManager.getBuysRef()) {
+			for(BuyRegion region : plugin.getFileManager().getBuys()) {
 				if(region.isSold()) {
 					result.add(region.getName());
 				}
@@ -1,28 +1,15 @@
 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";
@@ -39,11 +26,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)) {
-			messageBridge.message(sender, "setduration-noPermission");
+			plugin.message(sender, "setduration-noPermission");
 			return;
 		}
 		if(args.length < 3 || args[1] == null || args[2] == null) {
-			messageBridge.message(sender, "setduration-help");
+			plugin.message(sender, "setduration-help");
 			return;
 		}
 		int regionArgument = 3;
@@ -56,48 +43,48 @@ public class SetdurationCommand extends CommandAreaShop {
 				// get the region by location
 				List<RentRegion> regions = Utils.getImportantRentRegions(((Player)sender).getLocation());
 				if(regions.isEmpty()) {
-					messageBridge.message(sender, "cmd-noRegionsAtLocation");
+					plugin.message(sender, "cmd-noRegionsAtLocation");
 					return;
 				} else if(regions.size() > 1) {
-					messageBridge.message(sender, "cmd-moreRegionsAtLocation");
+					plugin.message(sender, "cmd-moreRegionsAtLocation");
 					return;
 				} else {
 					rent = regions.get(0);
 				}
 			} else {
-				messageBridge.message(sender, "cmd-automaticRegionOnlyByPlayer");
+				plugin.message(sender, "cmd-automaticRegionOnlyByPlayer");
 				return;
 			}
 		} else {
-			rent = fileManager.getRent(args[regionArgument]);
+			rent = plugin.getFileManager().getRent(args[regionArgument]);
 		}
 		if(rent == null) {
-			messageBridge.message(sender, "setduration-notRegistered", args[regionArgument]);
+			plugin.message(sender, "setduration-notRegistered", args[regionArgument]);
 			return;
 		}
 		if(!sender.hasPermission("areashop.setduration") && !(sender instanceof Player && rent.isLandlord(((Player)sender).getUniqueId()))) {
-			messageBridge.message(sender, "setduration-noLandlord", rent);
+			plugin.message(sender, "setduration-noLandlord", rent);
 			return;
 		}
 		if("default".equalsIgnoreCase(args[1]) || "reset".equalsIgnoreCase(args[1])) {
 			rent.setDuration(null);
 			rent.update();
-			messageBridge.message(sender, "setduration-successRemoved", rent);
+			plugin.message(sender, "setduration-successRemoved", rent);
 			return;
 		}
 		try {
 			Integer.parseInt(args[1]);
 		} catch(NumberFormatException e) {
-			messageBridge.message(sender, "setduration-wrongAmount", args[1], rent);
+			plugin.message(sender, "setduration-wrongAmount", args[1], rent);
 			return;
 		}
 		if(!Utils.checkTimeFormat(args[1] + " " + args[2])) {
-			messageBridge.message(sender, "setduration-wrongFormat", args[1] + " " + args[2], rent);
+			plugin.message(sender, "setduration-wrongFormat", args[1] + " " + args[2], rent);
 			return;
 		}
 		rent.setDuration(args[1] + " " + args[2]);
 		rent.update();
-		messageBridge.message(sender, "setduration-success", rent);
+		plugin.message(sender, "setduration-success", rent);
 	}

 	@Override
@@ -110,7 +97,7 @@ public class SetdurationCommand extends CommandAreaShop {
 			result.addAll(plugin.getConfig().getStringList("months"));
 			result.addAll(plugin.getConfig().getStringList("years"));
 		} else if(toComplete == 4) {
-			result = fileManager.getRentNames();
+			result = plugin.getFileManager().getRentNames();
 		}
 		return result;
 	}
@@ -1,7 +1,5 @@
 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;
@@ -9,19 +7,11 @@ 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";
@@ -38,11 +28,11 @@ public class SetlandlordCommand extends CommandAreaShop {
 	@Override
 	public void execute(CommandSender sender, String[] args) {
 		if(!sender.hasPermission("areashop.setlandlord")) {
-			messageBridge.message(sender, "setlandlord-noPermission");
+			plugin.message(sender, "setlandlord-noPermission");
 			return;
 		}
 		if(args.length < 2) {
-			messageBridge.message(sender, "setlandlord-help");
+			plugin.message(sender, "setlandlord-help");
 			return;
 		}
 		@SuppressWarnings("deprecation")
@@ -53,23 +43,23 @@ public class SetlandlordCommand extends CommandAreaShop {
 				// get the region by location
 				List<GeneralRegion> regions = Utils.getImportantRegions(((Player)sender).getLocation());
 				if(regions.isEmpty()) {
-					messageBridge.message(sender, "cmd-noRegionsAtLocation");
+					plugin.message(sender, "cmd-noRegionsAtLocation");
 					return;
 				} else if(regions.size() > 1) {
-					messageBridge.message(sender, "cmd-moreRegionsAtLocation");
+					plugin.message(sender, "cmd-moreRegionsAtLocation");
 					return;
 				} else {
 					region = regions.get(0);
 				}
 			} else {
-				messageBridge.message(sender, "cmd-automaticRegionOnlyByPlayer");
+				plugin.message(sender, "cmd-automaticRegionOnlyByPlayer");
 				return;
 			}
 		} else {
-			region = fileManager.getRegion(args[2]);
+			region = plugin.getFileManager().getRegion(args[2]);
 		}
 		if(region == null) {
-			messageBridge.message(sender, "cmd-notRegistered", args[2]);
+			plugin.message(sender, "cmd-notRegistered", args[2]);
 			return;
 		}
 		String playerName = player.getName();
@@ -78,7 +68,7 @@ public class SetlandlordCommand extends CommandAreaShop {
 		}
 		region.setLandlord(player.getUniqueId(), playerName);
 		region.update();
-		messageBridge.message(sender, "setlandlord-success", playerName, region);
+		plugin.message(sender, "setlandlord-success", playerName, region);
 	}

 	@Override
@@ -89,7 +79,7 @@ public class SetlandlordCommand extends CommandAreaShop {
 				result.add(player.getName());
 			}
 		} else if(toComplete == 3) {
-			result.addAll(fileManager.getRegionNames());
+			result.addAll(plugin.getFileManager().getRegionNames());
 		}
 		return result;
 	}
@@ -1,7 +1,5 @@
 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;
@@ -11,21 +9,13 @@ 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";
@@ -42,12 +32,12 @@ public class SetownerCommand extends CommandAreaShop {
 	@Override
 	public void execute(CommandSender sender, String[] args) {
 		if(!sender.hasPermission("areashop.setownerrent") && !sender.hasPermission("areashop.setownerbuy")) {
-			messageBridge.message(sender, "setowner-noPermission");
+			plugin.message(sender, "setowner-noPermission");
 			return;
 		}
 		GeneralRegion region;
 		if(args.length < 2) {
-			messageBridge.message(sender, "setowner-help");
+			plugin.message(sender, "setowner-help");
 			return;
 		}
 		if(args.length == 2) {
@@ -55,32 +45,32 @@ public class SetownerCommand extends CommandAreaShop {
 				// get the region by location
 				List<GeneralRegion> regions = Utils.getImportantRegions(((Player)sender).getLocation());
 				if(regions.isEmpty()) {
-					messageBridge.message(sender, "cmd-noRegionsAtLocation");
+					plugin.message(sender, "cmd-noRegionsAtLocation");
 					return;
 				} else if(regions.size() > 1) {
-					messageBridge.message(sender, "cmd-moreRegionsAtLocation");
+					plugin.message(sender, "cmd-moreRegionsAtLocation");
 					return;
 				} else {
 					region = regions.get(0);
 				}
 			} else {
-				messageBridge.message(sender, "cmd-automaticRegionOnlyByPlayer");
+				plugin.message(sender, "cmd-automaticRegionOnlyByPlayer");
 				return;
 			}
 		} else {
-			region = fileManager.getRegion(args[2]);
+			region = plugin.getFileManager().getRegion(args[2]);
 		}
 		if(region == null) {
-			messageBridge.message(sender, "setowner-notRegistered");
+			plugin.message(sender, "setowner-notRegistered");
 			return;
 		}

 		if(region instanceof RentRegion && !sender.hasPermission("areashop.setownerrent")) {
-			messageBridge.message(sender, "setowner-noPermissionRent", region);
+			plugin.message(sender, "setowner-noPermissionRent", region);
 			return;
 		}
 		if(region instanceof BuyRegion && !sender.hasPermission("areashop.setownerbuy")) {
-			messageBridge.message(sender, "setowner-noPermissionBuy", region);
+			plugin.message(sender, "setowner-noPermissionBuy", region);
 			return;
 		}

@@ -91,7 +81,7 @@ public class SetownerCommand extends CommandAreaShop {
 			uuid = player.getUniqueId();
 		}
 		if(uuid == null) {
-			messageBridge.message(sender, "setowner-noPlayer", args[1], region);
+			plugin.message(sender, "setowner-noPlayer", args[1], region);
 			return;
 		}

@@ -101,20 +91,20 @@ public class SetownerCommand extends CommandAreaShop {
 				// extend
 				rent.setRentedUntil(rent.getRentedUntil() + rent.getDuration());
 				rent.setRenter(uuid);
-				messageBridge.message(sender, "setowner-succesRentExtend", region);
+				plugin.message(sender, "setowner-succesRentExtend", region);
 			} else {
 				// change
 				if(!rent.isRented()) {
 					rent.setRentedUntil(Calendar.getInstance().getTimeInMillis() + rent.getDuration());
 				}
 				rent.setRenter(uuid);
-				messageBridge.message(sender, "setowner-succesRent", region);
+				plugin.message(sender, "setowner-succesRent", region);
 			}
 		}
 		if(region instanceof BuyRegion) {
 			BuyRegion buy = (BuyRegion)region;
 			buy.setBuyer(uuid);
-			messageBridge.message(sender, "setowner-succesBuy", region);
+			plugin.message(sender, "setowner-succesBuy", region);
 		}
 		region.getFriendsFeature().deleteFriend(region.getOwner(), null);
 		region.update();
@@ -129,7 +119,7 @@ public class SetownerCommand extends CommandAreaShop {
 				result.add(player.getName());
 			}
 		} else if(toComplete == 3) {
-			result.addAll(fileManager.getRegionNames());
+			result.addAll(plugin.getFileManager().getRegionNames());
 		}
 		return result;
 	}
@@ -1,7 +1,5 @@
 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,19 +7,11 @@ 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";
@@ -38,11 +28,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)) {
-			messageBridge.message(sender, "setprice-noPermission");
+			plugin.message(sender, "setprice-noPermission");
 			return;
 		}
 		if(args.length < 2 || args[1] == null) {
-			messageBridge.message(sender, "setprice-help");
+			plugin.message(sender, "setprice-help");
 			return;
 		}
 		GeneralRegion region;
@@ -51,27 +41,27 @@ public class SetpriceCommand extends CommandAreaShop {
 				// get the region by location
 				List<GeneralRegion> regions = Utils.getImportantRegions(((Player)sender).getLocation());
 				if(regions.isEmpty()) {
-					messageBridge.message(sender, "cmd-noRegionsAtLocation");
+					plugin.message(sender, "cmd-noRegionsAtLocation");
 					return;
 				} else if(regions.size() > 1) {
-					messageBridge.message(sender, "cmd-moreRegionsAtLocation");
+					plugin.message(sender, "cmd-moreRegionsAtLocation");
 					return;
 				} else {
 					region = regions.get(0);
 				}
 			} else {
-				messageBridge.message(sender, "cmd-automaticRegionOnlyByPlayer");
+				plugin.message(sender, "cmd-automaticRegionOnlyByPlayer");
 				return;
 			}
 		} else {
-			region = fileManager.getRegion(args[2]);
+			region = plugin.getFileManager().getRegion(args[2]);
 		}
 		if(region == null) {
-			messageBridge.message(sender, "setprice-notRegistered", args[2]);
+			plugin.message(sender, "setprice-notRegistered", args[2]);
 			return;
 		}
 		if(!sender.hasPermission("areashop.setprice") && !(sender instanceof Player && region.isLandlord(((Player)sender).getUniqueId()))) {
-			messageBridge.message(sender, "setprice-noLandlord", region);
+			plugin.message(sender, "setprice-noLandlord", region);
 			return;
 		}
 		if("default".equalsIgnoreCase(args[1]) || "reset".equalsIgnoreCase(args[1])) {
@@ -81,22 +71,22 @@ public class SetpriceCommand extends CommandAreaShop {
 				((BuyRegion)region).setPrice(null);
 			}
 			region.update();
-			messageBridge.message(sender, "setprice-successRemoved", region);
+			plugin.message(sender, "setprice-successRemoved", region);
 			return;
 		}
 		double price;
 		try {
 			price = Double.parseDouble(args[1]);
 		} catch(NumberFormatException e) {
-			messageBridge.message(sender, "setprice-wrongPrice", args[1], region);
+			plugin.message(sender, "setprice-wrongPrice", args[1], region);
 			return;
 		}
 		if(region instanceof RentRegion) {
 			((RentRegion)region).setPrice(price);
-			messageBridge.message(sender, "setprice-successRent", region);
+			plugin.message(sender, "setprice-successRent", region);
 		} else if(region instanceof BuyRegion) {
 			((BuyRegion)region).setPrice(price);
-			messageBridge.message(sender, "setprice-successBuy", region);
+			plugin.message(sender, "setprice-successBuy", region);
 		}
 		region.update();
 	}
@@ -105,7 +95,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 = fileManager.getRegionNames();
+			result = plugin.getFileManager().getRegionNames();
 		}
 		return result;
 	}
@@ -1,26 +1,13 @@
 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";
@@ -37,16 +24,16 @@ public class SetrestoreCommand extends CommandAreaShop {
 	@Override
 	public void execute(CommandSender sender, String[] args) {
 		if(!sender.hasPermission("areashop.setrestore")) {
-			messageBridge.message(sender, "setrestore-noPermission");
+			plugin.message(sender, "setrestore-noPermission");
 			return;
 		}
 		if(args.length <= 2 || args[1] == null || args[2] == null) {
-			messageBridge.message(sender, "setrestore-help");
+			plugin.message(sender, "setrestore-help");
 			return;
 		}
-		GeneralRegion region = fileManager.getRegion(args[1]);
+		GeneralRegion region = plugin.getFileManager().getRegion(args[1]);
 		if(region == null) {
-			messageBridge.message(sender, "setrestore-notRegistered", args[1]);
+			plugin.message(sender, "setrestore-notRegistered", args[1]);
 			return;
 		}
 		Boolean value = null;
@@ -62,9 +49,9 @@ public class SetrestoreCommand extends CommandAreaShop {
 		}
 		if(args.length > 3) {
 			region.setSchematicProfile(args[3]);
-			messageBridge.message(sender, "setrestore-successProfile", valueString, args[3], region);
+			plugin.message(sender, "setrestore-successProfile", valueString, args[3], region);
 		} else {
-			messageBridge.message(sender, "setrestore-success", valueString, region);
+			plugin.message(sender, "setrestore-success", valueString, region);
 		}
 		region.update();
 	}
@@ -73,7 +60,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 = fileManager.getRegionNames();
+			result = plugin.getFileManager().getRegionNames();
 		} else if(toComplete == 3) {
 			result.add("true");
 			result.add("false");
@@ -1,8 +1,6 @@
 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;
@@ -10,19 +8,11 @@ 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";
@@ -54,11 +44,11 @@ public class SetteleportCommand extends CommandAreaShop {
 	@Override
 	public void execute(CommandSender sender, String[] args) {
 		if(!sender.hasPermission("areashop.setteleport") && !sender.hasPermission("areashop.setteleportall")) {
-			messageBridge.message(sender, "setteleport-noPermission");
+			plugin.message(sender, "setteleport-noPermission");
 			return;
 		}
 		if(!(sender instanceof Player)) {
-			messageBridge.message(sender, "onlyByPlayer");
+			plugin.message(sender, "onlyByPlayer");
 			return;
 		}
 		Player player = (Player)sender;
@@ -67,22 +57,22 @@ public class SetteleportCommand extends CommandAreaShop {
 			// get the region by location
 			List<GeneralRegion> regions = Utils.getImportantRegions(((Player)sender).getLocation());
 			if(regions.isEmpty()) {
-				messageBridge.message(sender, "cmd-noRegionsAtLocation");
+				plugin.message(sender, "cmd-noRegionsAtLocation");
 				return;
 			} else if(regions.size() > 1) {
-				messageBridge.message(sender, "cmd-moreRegionsAtLocation");
+				plugin.message(sender, "cmd-moreRegionsAtLocation");
 				return;
 			} else {
 				region = regions.get(0);
 			}
 		} else {
-			region = fileManager.getRegion(args[1]);
+			region = plugin.getFileManager().getRegion(args[1]);
 		}

 		boolean owner;

 		if(region == null) {
-			messageBridge.message(player, "setteleport-noRentOrBuy", args[1]);
+			plugin.message(player, "setteleport-noRentOrBuy", args[1]);
 			return;
 		}
 		if(region instanceof RentRegion) {
@@ -91,10 +81,10 @@ public class SetteleportCommand extends CommandAreaShop {
 			owner = player.getUniqueId().equals(((BuyRegion)region).getBuyer());
 		}
 		if(!player.hasPermission("areashop.setteleport")) {
-			messageBridge.message(player, "setteleport-noPermission", region);
+			plugin.message(player, "setteleport-noPermission", region);
 			return;
 		} else if(!owner && !player.hasPermission("areashop.setteleportall")) {
-			messageBridge.message(player, "setteleport-noPermissionOther", region);
+			plugin.message(player, "setteleport-noPermissionOther", region);
 			return;
 		}

@@ -102,23 +92,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();
-			messageBridge.message(player, "setteleport-reset", region);
+			plugin.message(player, "setteleport-reset", region);
 			return;
 		}
 		if(!player.hasPermission("areashop.setteleportoutsideregion") && (wgRegion == null || !wgRegion.contains(player.getLocation().getBlockX(), player.getLocation().getBlockY(), player.getLocation().getBlockZ()))) {
-			messageBridge.message(player, "setteleport-notInside", region);
+			plugin.message(player, "setteleport-notInside", region);
 			return;
 		}
 		region.getTeleportFeature().setTeleport(player.getLocation());
 		region.update();
-		messageBridge.message(player, "setteleport-success", region);
+		plugin.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(fileManager.getRegionNames());
+			result.addAll(plugin.getFileManager().getRegionNames());
 		} else if(toComplete == 3) {
 			result.add("reset");
 		}
@@ -3,46 +3,26 @@ 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.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.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";
@@ -60,18 +40,18 @@ public class StackCommand extends CommandAreaShop {
 	public void execute(CommandSender sender, String[] args) {
 		// Check permission
 		if(!sender.hasPermission("areashop.stack")) {
-			messageBridge.message(sender, "stack-noPermission");
+			plugin.message(sender, "stack-noPermission");
 			return;
 		}
 		// Only from ingame
 		if(!(sender instanceof Player)) {
-			messageBridge.message(sender, "cmd-onlyByPlayer");
+			plugin.message(sender, "cmd-onlyByPlayer");
 			return;
 		}
 		final Player player = (Player)sender;
 		// Specify enough arguments
 		if(args.length < 5) {
-			messageBridge.message(sender, "stack-help");
+			plugin.message(sender, "stack-help");
 			return;
 		}
 		// Check amount
@@ -82,7 +62,7 @@ public class StackCommand extends CommandAreaShop {
 			// Incorrect number
 		}
 		if(tempAmount <= 0) {
-			messageBridge.message(player, "stack-wrongAmount", args[1]);
+			plugin.message(player, "stack-wrongAmount", args[1]);
 			return;
 		}
 		// Check gap
@@ -90,27 +70,27 @@ public class StackCommand extends CommandAreaShop {
 		try {
 			gap = Integer.parseInt(args[2]);
 		} catch(NumberFormatException e) {
-			messageBridge.message(player, "stack-wrongGap", args[2]);
+			plugin.message(player, "stack-wrongGap", args[2]);
 			return;
 		}
 		// Check region type
 		if(!"rent".equalsIgnoreCase(args[4]) && !"buy".equalsIgnoreCase(args[4])) {
-			messageBridge.message(sender, "stack-help");
+			plugin.message(sender, "stack-help");
 			return;
 		}
 		// Get WorldEdit selection
-		final WorldEditSelection selection = worldEditInterface.getPlayerSelection(player);
+		final WorldEditSelection selection = plugin.getWorldEditHandler().getPlayerSelection(player);
 		if(selection == null) {
-			messageBridge.message(player, "stack-noSelection");
+			plugin.message(player, "stack-noSelection");
 			return;
 		}
 		// Get or create group
 		RegionGroup group = null;
 		if(args.length > 5) {
-			group = fileManager.getGroup(args[5]);
+			group = plugin.getFileManager().getGroup(args[5]);
 			if(group == null) {
-				group = regionFactory.createRegionGroup(args[5]);
-				fileManager.addGroup(group);
+				group = new RegionGroup(plugin, args[5]);
+				plugin.getFileManager().addGroup(group);
 			}
 		}
 		// Get facing of the player (must be clearly one of the four directions to make sure it is no mistake)
@@ -121,7 +101,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)) {
-			messageBridge.message(player, "stack-unclearDirection", facing.toString().toLowerCase().replace('_', '-'));
+			plugin.message(player, "stack-unclearDirection", facing.toString().toLowerCase().replace('_', '-'));
 			return;
 		}
 		Vector shift = new Vector(0, 0, 0);
@@ -158,8 +138,8 @@ public class StackCommand extends CommandAreaShop {
 		if(group != null) {
 			groupsMessage = Message.fromKey("stack-addToGroup").replacements(group.getName());
 		}
-		messageBridge.message(player, "stack-accepted", amount, type, gap, nameTemplate, groupsMessage);
-		messageBridge.message(player, "stack-addStart", amount, regionsPerTick * 20);
+		plugin.message(player, "stack-accepted", amount, type, gap, nameTemplate, groupsMessage);
+		plugin.message(player, "stack-addStart", amount, regionsPerTick * 20);

 		Location minimumLocation = selection.getMinimumLocation();
 		Vector minimumVector = new Vector(minimumLocation.getX(), minimumLocation.getY(), minimumLocation.getZ());
@@ -196,24 +176,24 @@ public class StackCommand extends CommandAreaShop {
 							tooHigh++;
 							continue;
 						}
-						ProtectedCuboidRegion region = worldGuardInterface.createCuboidRegion(regionName, minimum,maximum);
+						ProtectedCuboidRegion region = plugin.getWorldGuardHandler().createCuboidRegion(regionName, minimum,maximum);
 						manager.addRegion(region);

 						// Add the region to AreaShop
 						GeneralRegion newRegion;
 						if(rentRegions) {
-							newRegion = regionFactory.createRentRegion(regionName, selection.getWorld());
+							newRegion = new RentRegion(regionName, selection.getWorld());

 						} else {
-							newRegion = regionFactory.createBuyRegion(regionName, selection.getWorld());
+							newRegion = new BuyRegion(regionName, selection.getWorld());
 						}

 						if(finalGroup != null) {
 							finalGroup.addMember(newRegion);
 						}
-						AddingRegionEvent event = fileManager.addRegion(newRegion);
+						AddingRegionEvent event = plugin.getFileManager().addRegion(newRegion);
 						if (event.isCancelled()) {
-							messageBridge.message(player, "general-cancelled", event.getReason());
+							plugin.message(player, "general-cancelled", event.getReason());
 							continue;
 						}
 						newRegion.handleSchematicEvent(GeneralRegion.RegionEvent.CREATED);
@@ -230,7 +210,7 @@ public class StackCommand extends CommandAreaShop {
 						if(tooLow > 0) {
 							wrong.append(Message.fromKey("stack-tooLow").replacements(tooLow));
 						}
-						messageBridge.message(player, "stack-addComplete", added, wrong);
+						plugin.message(player, "stack-addComplete", added, wrong);
 					}
 					this.cancel();
 				}
@@ -265,7 +245,7 @@ public class StackCommand extends CommandAreaShop {
 			result.add("rent");
 			result.add("buy");
 		} else if(toComplete == 6) {
-			result.addAll(fileManager.getGroupNames());
+			result.addAll(plugin.getFileManager().getGroupNames());
 		}
 		return result;
 	}
@@ -1,25 +1,15 @@
 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";
@@ -36,7 +26,7 @@ public class StopresellCommand extends CommandAreaShop {
 	@Override
 	public void execute(CommandSender sender, String[] args) {
 		if(!sender.hasPermission("areashop.stopresell") && !sender.hasPermission("areashop.stopresellall")) {
-			messageBridge.message(sender, "stopresell-noPermissionOther");
+			plugin.message(sender, "stopresell-noPermissionOther");
 			return;
 		}

@@ -46,47 +36,47 @@ public class StopresellCommand extends CommandAreaShop {
 				// get the region by location
 				List<BuyRegion> regions = Utils.getImportantBuyRegions(((Player)sender).getLocation());
 				if(regions.isEmpty()) {
-					messageBridge.message(sender, "cmd-noRegionsAtLocation");
+					plugin.message(sender, "cmd-noRegionsAtLocation");
 					return;
 				} else if(regions.size() > 1) {
-					messageBridge.message(sender, "cmd-moreRegionsAtLocation");
+					plugin.message(sender, "cmd-moreRegionsAtLocation");
 					return;
 				} else {
 					buy = regions.get(0);
 				}
 			} else {
-				messageBridge.message(sender, "cmd-automaticRegionOnlyByPlayer");
+				plugin.message(sender, "cmd-automaticRegionOnlyByPlayer");
 				return;
 			}
 		} else {
-			buy = fileManager.getBuy(args[1]);
+			buy = plugin.getFileManager().getBuy(args[1]);
 			if(buy == null) {
-				messageBridge.message(sender, "stopresell-notRegistered", args[1]);
+				plugin.message(sender, "stopresell-notRegistered", args[1]);
 				return;
 			}
 		}
 		if(buy == null) {
-			messageBridge.message(sender, "cmd-noRegionsAtLocation");
+			plugin.message(sender, "cmd-noRegionsAtLocation");
 			return;
 		}
 		if(!buy.isInResellingMode()) {
-			messageBridge.message(sender, "stopresell-notResell", buy);
+			plugin.message(sender, "stopresell-notResell", buy);
 			return;
 		}
 		if(sender.hasPermission("areashop.stopresellall")) {
 			buy.disableReselling();
 			buy.update();
-			messageBridge.message(sender, "stopresell-success", buy);
+			plugin.message(sender, "stopresell-success", buy);
 		} else if(sender.hasPermission("areashop.stopresell") && sender instanceof Player) {
 			if(buy.isOwner((Player)sender)) {
 				buy.disableReselling();
 				buy.update();
-				messageBridge.message(sender, "stopresell-success", buy);
+				plugin.message(sender, "stopresell-success", buy);
 			} else {
-				messageBridge.message(sender, "stopresell-noPermissionOther", buy);
+				plugin.message(sender, "stopresell-noPermissionOther", buy);
 			}
 		} else {
-			messageBridge.message(sender, "stopresell-noPermission", buy);
+			plugin.message(sender, "stopresell-noPermission", buy);
 		}
 	}

@@ -94,7 +84,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 : fileManager.getBuysRef()) {
+			for(BuyRegion region : plugin.getFileManager().getBuys()) {
 				if(region.isSold() && region.isInResellingMode()) {
 					result.add(region.getName());
 				}
@@ -1,24 +1,14 @@
 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";
@@ -52,21 +42,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")) {
-			messageBridge.message(sender, "teleport-noPermission");
+			plugin.message(sender, "teleport-noPermission");
 			return;
 		}
 		if(!(sender instanceof Player)) {
-			messageBridge.message(sender, "cmd-onlyByPlayer");
+			plugin.message(sender, "cmd-onlyByPlayer");
 			return;
 		}
 		if(args.length <= 1 || args[1] == null) {
-			messageBridge.message(sender, "teleport-help");
+			plugin.message(sender, "teleport-help");
 			return;
 		}
 		Player player = (Player)sender;
-		GeneralRegion region = fileManager.getRegion(args[1]);
+		GeneralRegion region = plugin.getFileManager().getRegion(args[1]);
 		if(region == null) {
-			messageBridge.message(player, "teleport-noRentOrBuy", args[1]);
+			plugin.message(player, "teleport-noRentOrBuy", args[1]);
 			return;
 		}

@@ -75,14 +65,14 @@ public class TeleportCommand extends CommandAreaShop {
 						|| args[2].equalsIgnoreCase("yes")
 						|| args[2].equalsIgnoreCase("true")
 		);
-		region.getTeleportFeature().teleportPlayer(player, toSign);
+		region.getTeleportFeature().teleportPlayer(player, toSign, true);
 	}

 	@Override
 	public List<String> getTabCompleteList(int toComplete, String[] start, CommandSender sender) {
 		ArrayList<String> result = new ArrayList<>();
 		if(toComplete == 2) {
-			result.addAll(fileManager.getRegionNames());
+			result.addAll(plugin.getFileManager().getRegionNames());
 		} else if(toComplete == 3) {
 			result.add("sign");
 		}
@@ -1,26 +1,16 @@
 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";
@@ -54,7 +44,7 @@ public class UnrentCommand extends CommandAreaShop {
 	@Override
 	public void execute(CommandSender sender, String[] args) {
 		if(!sender.hasPermission("areashop.unrent") && !sender.hasPermission("areashop.unrentown")) {
-			messageBridge.message(sender, "unrent-noPermission");
+			plugin.message(sender, "unrent-noPermission");
 			return;
 		}
 		RentRegion rent;
@@ -63,27 +53,27 @@ public class UnrentCommand extends CommandAreaShop {
 				// get the region by location
 				List<RentRegion> regions = Utils.getImportantRentRegions(((Player)sender).getLocation());
 				if(regions.isEmpty()) {
-					messageBridge.message(sender, "cmd-noRegionsAtLocation");
+					plugin.message(sender, "cmd-noRegionsAtLocation");
 					return;
 				} else if(regions.size() > 1) {
-					messageBridge.message(sender, "cmd-moreRegionsAtLocation");
+					plugin.message(sender, "cmd-moreRegionsAtLocation");
 					return;
 				} else {
 					rent = regions.get(0);
 				}
 			} else {
-				messageBridge.message(sender, "cmd-automaticRegionOnlyByPlayer");
+				plugin.message(sender, "cmd-automaticRegionOnlyByPlayer");
 				return;
 			}
 		} else {
-			rent = fileManager.getRent(args[1]);
+			rent = plugin.getFileManager().getRent(args[1]);
 		}
 		if(rent == null) {
-			messageBridge.message(sender, "unrent-notRegistered");
+			plugin.message(sender, "unrent-notRegistered");
 			return;
 		}
 		if(!rent.isRented()) {
-			messageBridge.message(sender, "unrent-notRented", rent);
+			plugin.message(sender, "unrent-notRented", rent);
 			return;
 		}
 		rent.unRent(true, sender);
@@ -93,7 +83,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 : fileManager.getRentsRef()) {
+			for(RentRegion region : plugin.getFileManager().getRents()) {
 				if(region.isRented()) {
 					result.add(region.getName());
 				}
@@ -1,6 +1,5 @@
 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;
@@ -21,18 +20,10 @@ 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
@@ -45,7 +36,7 @@ public class CommandsFeature extends RegionFeature {
 			return;
 		}
 		List<String> commands = eventCommandProfileSection.getStringList(event.getValue() + "." + (before ? "before" : "after"));
-		if(commands.isEmpty()) {
+		if(commands == null || commands.isEmpty()) {
 			return;
 		}
 		region.runCommands(Bukkit.getConsoleSender(), commands);
@@ -19,18 +19,8 @@ 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());
@@ -1,19 +0,0 @@
-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);
-
-}
@@ -1,10 +1,5 @@
 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;
@@ -12,7 +7,6 @@ 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;
@@ -21,12 +15,7 @@ import java.util.UUID;

 public class FriendsFeature extends RegionFeature {

-	@Inject
-	private MessageBridge messageBridge;
-	
-	@AssistedInject
-	public FriendsFeature(@Nonnull AreaShop plugin, @Assisted @Nonnull GeneralRegion region) {
-		super(plugin);
+	public FriendsFeature(GeneralRegion region) {
 		setRegion(region);
 	}

@@ -41,7 +30,7 @@ public class FriendsFeature extends RegionFeature {
 		AddedFriendEvent event = new AddedFriendEvent(getRegion(), Bukkit.getOfflinePlayer(player), by);
 		Bukkit.getPluginManager().callEvent(event);
 		if(event.isCancelled()) {
-			messageBridge.message(by, "general-cancelled", event.getReason(), this);
+			plugin.message(by, "general-cancelled", event.getReason(), this);
 			return false;
 		}

@@ -63,7 +52,7 @@ public class FriendsFeature extends RegionFeature {
 		DeletedFriendEvent event = new DeletedFriendEvent(getRegion(), Bukkit.getOfflinePlayer(player), by);
 		Bukkit.getPluginManager().callEvent(event);
 		if(event.isCancelled()) {
-			messageBridge.message(by, "general-cancelled", event.getReason(), this);
+			plugin.message(by, "general-cancelled", event.getReason(), this);
 			return false;
 		}

@@ -103,7 +92,7 @@ public class FriendsFeature extends RegionFeature {
 		HashSet<String> result = new HashSet<>();
 		for(UUID friend : getFriends()) {
 			OfflinePlayer player = Bukkit.getOfflinePlayer(friend);
-			if(player != null && player.getName() != null) {
+			if(player.hasPlayedBefore() && player.getName() != null) {
 				result.add(player.getName());
 			}
 		}
@@ -2,11 +2,10 @@ 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
@@ -29,14 +28,11 @@ Possible future feature classes:
 */

 public abstract class RegionFeature implements Listener {
+	public static final AreaShop plugin = AreaShop.getInstance();

-	protected final AreaShop plugin;
+	protected YamlConfiguration config = plugin.getConfig();
 	private GeneralRegion region;

-	protected RegionFeature(@Nonnull AreaShop plugin) {
-		this.plugin = plugin;
-	}
-
 	/**
 	 * Set the region for this feature.
 	 * @param region Feature region
@@ -8,31 +8,17 @@ 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) {
@@ -83,6 +69,7 @@ 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();
@@ -94,14 +81,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(worldGuard.getDescription().getVersion().startsWith("5.")) {
+			if(plugin.getWorldGuard().getDescription().getVersion().startsWith("5.")) {
 				value = translateBukkitToWorldGuardColors(value);
 			}
 			if(flagName.equalsIgnoreCase("members")) {
-				worldGuardInterface.setMembers(worldguardRegion, parseAccessSet(value));
+				plugin.getWorldGuardHandler().setMembers(worldguardRegion, parseAccessSet(value));
 				//AreaShop.debug("  Flag " + flagName + " set: " + members.toUserFriendlyString());
 			} else if(flagName.equalsIgnoreCase("owners")) {
-				worldGuardInterface.setOwners(worldguardRegion, parseAccessSet(value));
+				plugin.getWorldGuardHandler().setOwners(worldguardRegion, parseAccessSet(value));
 				//AreaShop.debug("  Flag " + flagName + " set: " + owners.toUserFriendlyString());
 			} else if(flagName.equalsIgnoreCase("priority")) {
 				try {
@@ -136,7 +123,7 @@ public class WorldGuardRegionFlagsFeature extends RegionFeature {
 				String flagSetting = null;
 				com.sk89q.worldguard.protection.flags.RegionGroup groupValue = null;

-				Flag<?> foundFlag = worldGuardInterface.fuzzyMatchFlag(flagName);
+				Flag<?> foundFlag = plugin.getWorldGuardHandler().fuzzyMatchFlag(flagName);
 				if(foundFlag == null) {
 					AreaShop.warn("Found wrong flag in flagProfiles section: " + flagName + ", check if that is the correct WorldGuard flag");
 					continue;
@@ -158,7 +145,7 @@ public class WorldGuardRegionFlagsFeature extends RegionFeature {
 							if(part.startsWith("g:")) {
 								if(part.length() > 2) {
 									try {
-										groupValue = worldGuardInterface.parseFlagGroupInput(groupFlag, part.substring(2));
+										groupValue = plugin.getWorldGuardHandler().parseFlagGroupInput(groupFlag, part.substring(2));
 									} catch(InvalidFlagFormat e) {
 										AreaShop.warn("Found wrong group value for flag " + flagName);
 									}
@@ -242,7 +229,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 = worldGuardInterface.parseFlagInput(flag, value);
+		V next = plugin.getWorldGuardHandler().parseFlagInput(flag, value);

 		if(!Objects.equals(current, next)) {
 			region.setFlag(flag, next);
@@ -268,7 +255,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");
@@ -1,14 +1,11 @@
 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.nms.BlockBehaviourHelper;
+import me.wiefferink.areashop.interfaces.BlockBehaviourHelper;
 import me.wiefferink.areashop.regions.GeneralRegion;
 import me.wiefferink.areashop.tools.Materials;
 import me.wiefferink.areashop.tools.Utils;
@@ -16,6 +13,7 @@ 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;
@@ -26,270 +24,308 @@ 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;

-	private final SignsFeature signsFeature;
-	private final String key;
+    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;
+        }
+    }


-	@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 boolean canLogSignError() {
+        return AreaShop.getInstance().getLogger().isLoggable(invalidSignLogLevel);
+    }

-	public BlockPosition getPosition() {
-		return new BlockPosition(getLocation());
-	}
+    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);
+        }
+    }

-	/**
-	 * 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"));
-	}
+    private final SignsFeature signsFeature;
+    private final String key;

-	/**
-	 * Location string to be used as key in maps.
-	 * @return Location string
-	 */
-	public String getStringLocation() {
-		return SignsFeature.locationToString(getLocation());
-	}
+    public RegionSign(SignsFeature signsFeature, String key) {
+        this.signsFeature = signsFeature;
+        this.key = key;
+    }

-	/**
-	 * Chunk string to be used as key in maps.
-	 * @return Chunk string
-	 */
-	public String getStringChunk() {
-		return SignsFeature.chunkToString(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"));
+    }

-	/**
-	 * Get the region this sign is linked to.
-	 * @return The region this sign is linked to
-	 */
-	public GeneralRegion getRegion() {
-		return signsFeature.getRegion();
-	}
+    /**
+     * Location string to be used as key in maps.
+     *
+     * @return Location string
+     */
+    public String getStringLocation() {
+        return SignsFeature.locationToString(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
-	}
+    /**
+     * Chunk string to be used as key in maps.
+     *
+     * @return Chunk string
+     */
+    public String getStringChunk() {
+        return SignsFeature.chunkToString(getLocation());
+    }

-	/**
-	 * 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 region this sign is linked to.
+     *
+     * @return The region this sign is linked to
+     */
+    public GeneralRegion getRegion() {
+        return signsFeature.getRegion();
+    }

-	/**
-	 * 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;
-		}
-	}
+    /**
+     * 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 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 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"));
+    }

-	/**
-	 * 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 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;
+        }
+    }

-		if(getRegion().isDeleted()) {
-			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;
+    }

-		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;
-		}
+    /**
+     * 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;
+        }

-		ConfigurationSection stateConfig = signConfig.getConfigurationSection(getRegion().getState().getValue());
+        if (getRegion().isDeleted()) {
+            return false;
+        }

-		// 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;
-		}
+        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;
+        }

-		// 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);
+        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()));
+        }

-			BlockState blockState = PaperLib.getBlockState(block, false).getState();
-			BlockData blockData = blockState.getBlockData();
+        // 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());
+        }

-			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);
+        // 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);
+    }

-			// Check if the sign has popped
-			if(!Materials.isSign(block.getType())) {
-				return false;
-			}
-		}
+    /**
+     * 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;
+        }

-		// 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());
-		}
+        ConfigurationSection stateConfig = signConfig.getConfigurationSection(getRegion().getState().getValue().toLowerCase());
+        if (stateConfig == null) {
+            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;
-	}
+        // 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;
+    }

-	/**
-	 * 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 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());

-		ConfigurationSection stateConfig = signConfig.getConfigurationSection(getRegion().getState().getValue().toLowerCase());
-		if(stateConfig == null) {
-			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);

-		// Check the lines for the timeleft tag
-		for(int i = 1; i <= 4; i++) {
-			String line = stateConfig.getString("line" + i);
-			if(line != null && line.contains(Message.VARIABLE_START + AreaShop.tagTimeLeft + Message.VARIABLE_END)) {
-				return true;
-			}
-		}
-		return false;
-	}
+        // Run 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);

-	/**
-	 * 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());
+        return !playerCommands.isEmpty() || !consoleCommands.isEmpty();
+    }

-		// 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 boolean equals(Object object) {
+        return object instanceof RegionSign && ((RegionSign) object).getRegion().equals(this.getRegion()) && ((RegionSign) object).key.equals(this.key);
+    }

-		// 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());
-	}
+    @Override
+    public int hashCode() {
+        return Objects.hashCode(key, getRegion().getName());
+    }
 }
@@ -1,80 +1,121 @@
-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();
-    }
-
-}
+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);
+    }
+
+}
@@ -1,10 +0,0 @@
-package me.wiefferink.areashop.features.signs;
-
-
-import javax.annotation.Nonnull;
-
-public interface SignFactory {
-
-    @Nonnull RegionSign createRegionSign(@Nonnull SignsFeature signsFeature, @Nonnull String key);
-
-}
@@ -1,453 +0,0 @@
-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);
-        }
-    }
-
-}
@@ -1,101 +0,0 @@
-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();
-    }
-
-}
@@ -1,103 +1,634 @@
 package me.wiefferink.areashop.features.signs;

-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.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 javax.annotation.Nonnull;
+import java.util.*;

 public class SignsFeature extends RegionFeature {

-	private final SignManager internalSignManager = new SignManager();
-	private final SignManager globalSignManager;
-	private final SignFactory signFactory;
-	/**
-	 * Constructor.
-	 * @param region The region to bind to
-	 */
-	@AssistedInject
-	SignsFeature(@Nonnull AreaShop plugin,
-						@Nonnull SignManager signManager,
-						@Nonnull SignFactory signFactory,
-						@Assisted @Nonnull GeneralRegion region
-	) {
-		super(plugin);
-		this.globalSignManager = signManager;
-		this.signFactory = signFactory;
-		setRegion(region);
-		// Setup current signs
-		ConfigurationSection signSection = region.getConfig().getConfigurationSection("general.signs");
-		if(signSection != null) {
-			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);
-			}
-		}
-	}
+    public static final SignCache signCache = new SignCache();

-	/**
-	 * 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();
-	}
+    private static final BlockBehaviourHelper behaviourHelper = AreaShop.getInstance().getNMSHelper().behaviourHelper();

-	/**
-	 * 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);
-	}
+    static {
+        signCache.registerListeners();
+    }

-	@Override
-	public void shutdown() {
+    public static void shutdownGlobalState() {
+        signCache.shutdown();
+    }

-	}
+    private Map<String, RegionSign> signs;

-	public SignManager signManager() {
-		return this.internalSignManager;
-	}
+    public SignsFeature() {

-	/**
-	 * 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);
-	}
+    }
+
+    /**
+     * 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);
+    }

 }
@@ -1,53 +0,0 @@
-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;
-    }
-
-}
@@ -1,12 +1,10 @@
 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;
@@ -16,7 +14,6 @@ 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;

@@ -24,115 +21,109 @@ import java.util.List;
 * Notify region expiry and track activity time.
 */
 public final class PlayerLoginLogoutListener implements Listener {
+    private final AreaShop plugin;

-	private final AreaShop plugin;
-	private final MessageBridge messageBridge;
+    /**
+     * Constructor.
+     *
+     * @param plugin The AreaShop plugin
+     */
+    public PlayerLoginLogoutListener(AreaShop plugin) {
+        this.plugin = plugin;
+    }

-	/**
-	 * Constructor.
-	 * @param plugin The AreaShop plugin
-	 */
-	public PlayerLoginLogoutListener(@Nonnull AreaShop plugin, @Nonnull MessageBridge messageBridge) {
-		this.plugin = plugin;
-		this.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();

-	/**
-	 * 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();
+        // 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);
+                    }
+                }
+            }

-		// 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);
-					}
-				}
-			}
+            // Notify admins for plugin updates
+            AreaShop.getInstance().notifyUpdate(player);
+            return false;
+        }, 25, 25, false);

-			// Notify admins for plugin updates
-			this.plugin.notifyUpdate(player);
-			return false;
-		});
+        // Check if the player has regions that use an old name of him and update them
+        Utils.runCancellingTaskTimer(() -> {
+            if (!plugin.isReady()) {
+                return true;
+            }

-		// 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;
-			}
+            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);
+    }

-			List<GeneralRegion> regions = new ArrayList<>();
-			for(GeneralRegion region : plugin.getFileManager().getRegionsRef()) {
-				if(region.isOwner(player)) {
-					regions.add(region);
-				}
-			}
+    // Active time updates
+    @EventHandler(priority = EventPriority.MONITOR)
+    public void onPlayerLogout(PlayerQuitEvent 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;
-		});
-	}
+    @EventHandler(priority = EventPriority.MONITOR)
+    public void onPlayerKick(PlayerKickEvent event) {
+        updateLastActive(event.getPlayer());
+    }

-	// 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();
-			}
-		}
-	}
+    /**
+     * 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();
+            }
+        }
+    }
 }


@@ -1,8 +1,5 @@
 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;
@@ -37,71 +34,54 @@ import me.wiefferink.areashop.commands.StackCommand;
 import me.wiefferink.areashop.commands.StopresellCommand;
 import me.wiefferink.areashop.commands.TeleportCommand;
 import me.wiefferink.areashop.commands.UnrentCommand;
-import org.bukkit.command.Command;
-import org.bukkit.command.CommandExecutor;
-import org.bukkit.command.CommandSender;
-import org.bukkit.command.TabCompleter;
+import org.bukkit.command.*;

-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;
+import java.util.*;

-@Singleton
-public class CommandManager extends Manager implements CommandExecutor, TabCompleter {
-	private final List<CommandAreaShop> commands;
-	private final AreaShop plugin;
-	private final MessageBridge messageBridge;
+public class CommandManager extends Manager implements TabExecutor {
+	private final ArrayList<CommandAreaShop> commands;

 	/**
 	 * Constructor.
 	 */
-	@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));
+	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());

 		// Register commands in bukkit
 		plugin.getCommand("AreaShop").setExecutor(this);
-		plugin.getCommand("AreaShop").setTabCompleter(this);
 	}

 	/**
@@ -118,13 +98,13 @@ public class CommandManager extends Manager implements CommandExecutor, TabCompl
 	 */
 	public void showHelp(CommandSender target) {
 		if(!target.hasPermission("areashop.help")) {
-			messageBridge.message(target, "help-noPermission");
+			plugin.message(target, "help-noPermission");
 			return;
 		}
 		// Add all messages to a list
 		ArrayList<String> messages = new ArrayList<>();
-		messageBridge.message(target, "help-header");
-		messageBridge.message(target, "help-alias");
+		plugin.message(target, "help-header");
+		plugin.message(target, "help-alias");
 		for(CommandAreaShop command : commands) {
 			String help = command.getHelp(target);
 			if(help != null && !help.isEmpty()) {
@@ -133,14 +113,14 @@ public class CommandManager extends Manager implements CommandExecutor, TabCompl
 		}
 		// Send the messages to the target
 		for(String message : messages) {
-			messageBridge.messageNoPrefix(target, message);
+			plugin.messageNoPrefix(target, message);
 		}
 	}

 	@Override
 	public boolean onCommand(CommandSender sender, Command command, String alias, String[] args) {
 		if(!plugin.isReady()) {
-			messageBridge.message(sender, "general-notReady");
+			plugin.message(sender, "general-notReady");
 			return true;
 		}

@@ -166,9 +146,9 @@ public class CommandManager extends Manager implements CommandExecutor, TabCompl
 			} else {
 				// Indicate that the '/as updaterents' and '/as updatebuys' commands are removed
 				if("updaterents".equalsIgnoreCase(args[0]) || "updatebuys".equalsIgnoreCase(args[0])) {
-					messageBridge.message(sender, "reload-updateCommandChanged");
+					plugin.message(sender, "reload-updateCommandChanged");
 				} else {
-					messageBridge.message(sender, "cmd-notValid");
+					plugin.message(sender, "cmd-notValid");
 				}
 			}
 		}
@@ -178,10 +158,10 @@ public class CommandManager extends Manager implements CommandExecutor, TabCompl

 	@Override
 	public List<String> onTabComplete(CommandSender sender, Command command, String alias, String[] args) {
-		List<String> result = new ArrayList<>();
 		if(!sender.hasPermission("areashop.tabcomplete")) {
-			return result;
+			return Collections.emptyList();
 		}
+		List<String> result = new ArrayList<>();
 		int toCompleteNumber = args.length;
 		String toCompletePrefix = args[args.length - 1].toLowerCase();
 		//AreaShop.debug("toCompleteNumber=" + toCompleteNumber + ", toCompletePrefix=" + toCompletePrefix + ", length=" + toCompletePrefix.length());
@@ -1,11 +1,8 @@
 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;
@@ -13,63 +10,57 @@ import me.wiefferink.areashop.features.WorldGuardRegionFlagsFeature;
 import me.wiefferink.areashop.features.signs.SignsFeature;
 import me.wiefferink.areashop.regions.GeneralRegion;

-import javax.annotation.Nonnull;
-import javax.inject.Inject;
-import javax.inject.Singleton;
+import java.lang.reflect.Constructor;
+import java.lang.reflect.InvocationTargetException;
 import java.util.Arrays;
-import java.util.Collection;
 import java.util.HashMap;
 import java.util.HashSet;
 import java.util.Map;
 import java.util.Set;
-import java.util.function.Function;

-@Singleton
 public class FeatureManager extends Manager {

-	private static final Collection<Class<? extends RegionFeature>> globalFeatureClasses = Arrays.asList(
-			CommandsFeature.class,
+	// List of defined features
+	private static final Set<Class<? extends RegionFeature>> featureClasses = new HashSet<>(Arrays.asList(
+			DebugFeature.class,
+			SignsFeature.class,
+			FriendsFeature.class,
 			WorldGuardRegionFlagsFeature.class,
-			DebugFeature.class
-	);
+			TeleportFeature.class,
+			CommandsFeature.class
+	));
 	// One instance of each feature, registered for event handling
-	private final Set<RegionFeature> globalFeatures = new HashSet<>();
-	private final Map<Class<? extends RegionFeature>, Function<GeneralRegion, ? extends RegionFeature>> regionFeatureConstructors = new HashMap<>();
+	private final Set<RegionFeature> globalFeatures;
+	private final Map<Class<? extends RegionFeature>, Constructor<? extends RegionFeature>> regionFeatureConstructors;

 	/**
 	 * Constructor.
 	 */
-	@Inject
-	FeatureManager(@Nonnull FeatureFactory featureFactory) {
-		// Setup constructors for region specific features
-		regionFeatureConstructors.put(SignsFeature.class, wrapInstantiator(SignsFeature.class, featureFactory::createSignsFeature));
-		regionFeatureConstructors.put(TeleportFeature.class, wrapInstantiator(TeleportFeature.class, featureFactory::createTeleportFeature));
-		regionFeatureConstructors.put(FriendsFeature.class, wrapInstantiator(FriendsFeature.class, featureFactory::createFriendsFeature));
-	}
-
-	public void initializeFeatures(@Nonnull Injector injector) {
+	public FeatureManager() {
 		// Instantiate and register global features (one per type, for event handling)
-		for(Class<? extends RegionFeature> clazz : globalFeatureClasses) {
+		globalFeatures = new HashSet<>();
+		for(Class<? extends RegionFeature> clazz : featureClasses) {
 			try {
-				RegionFeature feature = injector.getInstance(clazz);
+				Constructor<? extends RegionFeature> constructor = clazz.getConstructor();
+				RegionFeature feature = constructor.newInstance();
 				feature.listen();
 				globalFeatures.add(feature);
-			} catch(ProvisionException e) {
+			} catch(InstantiationException | IllegalAccessException | InvocationTargetException | IllegalArgumentException e) {
 				AreaShop.error("Failed to instantiate global feature:", clazz, e);
+			} catch(NoSuchMethodException e) {
+				// Feature does not have a global part
 			}
 		}
-	}

-	private <T extends RegionFeature> Function<GeneralRegion, T> wrapInstantiator(Class<T> clazz, Function<GeneralRegion, T> function
-	) {
-		return region -> {
+		// Setup constructors for region specific features
+		regionFeatureConstructors = new HashMap<>();
+		for(Class<? extends RegionFeature> clazz : featureClasses) {
 			try {
-				return function.apply(region);
-			} catch (Throwable e) {
-				AreaShop.error("Failed to instantiate feature", clazz, "for region", region, e, e.getCause());
-				return null;
+				regionFeatureConstructors.put(clazz, clazz.getConstructor(GeneralRegion.class));
+			} catch(NoSuchMethodException | IllegalArgumentException e) {
+				// The feature does not have a region specific part
 			}
-		};
+		}
 	}

 	@Override
@@ -77,6 +68,8 @@ public class FeatureManager extends Manager {
 		for(RegionFeature feature : globalFeatures) {
 			feature.shutdown();
 		}
+		// FIXME make this system less hacky!
+		SignsFeature.shutdownGlobalState();
 	}

 	/**
@@ -86,7 +79,12 @@ public class FeatureManager extends Manager {
 	 * @return The feature class
 	 */
 	public RegionFeature getRegionFeature(GeneralRegion region, Class<? extends RegionFeature> featureClazz) {
-		return regionFeatureConstructors.get(featureClazz).apply(region);
+		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;
 	}

 }
@@ -1,395 +0,0 @@
-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;
-        }
-    }
-}
@@ -1,7 +1,11 @@
 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.
 	 */
@@ -1,10 +1,7 @@
 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.SignManager;
-import me.wiefferink.areashop.interfaces.BukkitInterface;
+import me.wiefferink.areashop.features.signs.SignsFeature;
 import me.wiefferink.areashop.regions.GeneralRegion;
 import me.wiefferink.areashop.tools.Materials;
 import me.wiefferink.areashop.tools.Utils;
@@ -13,6 +10,9 @@ 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,31 +23,18 @@ 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;

-	@Inject
-	private AreaShop plugin;
-	@Inject
-	private BukkitInterface bukkitInterface;
-	@Inject
-	private SignManager signManager;
-	@Inject
-	private MessageBridge messageBridge;
-
-	SignLinkerManager() {
+	public SignLinkerManager() {
 		signLinkers = new HashMap<>();
 		eventsRegistered = false;
 	}
@@ -66,8 +53,8 @@ public class SignLinkerManager extends Manager implements Listener {
 	 */
 	public void enterSignLinkMode(Player player, String profile) {
 		signLinkers.put(player.getUniqueId(), new SignLinker(player, profile));
-		messageBridge.message(player, "linksigns-first");
-		messageBridge.message(player, "linksigns-next");
+		plugin.message(player, "linksigns-first");
+		plugin.message(player, "linksigns-next");
 		if(!eventsRegistered) {
 			eventsRegistered = true;
 			plugin.getServer().getPluginManager().registerEvents(this, plugin);
@@ -84,7 +71,7 @@ public class SignLinkerManager extends Manager implements Listener {
 			eventsRegistered = false;
 			HandlerList.unregisterAll(this);
 		}
-		messageBridge.message(player, "linksigns-stopped");
+		plugin.message(player, "linksigns-stopped");
 	}

 	/**
@@ -120,13 +107,13 @@ public class SignLinkerManager extends Manager implements Listener {
 						for(GeneralRegion region : regions) {
 							names.add(region.getName());
 						}
-						messageBridge.message(player, "linksigns-multipleRegions", Utils.createCommaSeparatedList(names));
-						messageBridge.message(player, "linksigns-multipleRegionsAdvice");
+						plugin.message(player, "linksigns-multipleRegions", Utils.createCommaSeparatedList(names));
+						plugin.message(player, "linksigns-multipleRegionsAdvice");
 						return;
 					}
 				}
 				// No regions found within the maximum range
-				messageBridge.message(player, "linksigns-noRegions");
+				plugin.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);
@@ -137,17 +124,25 @@ public class SignLinkerManager extends Manager implements Listener {
 					}
 				}
 				if(block == null || !Materials.isSign(block.getType())) {
-					messageBridge.message(player, "linksigns-noSign");
+					plugin.message(player, "linksigns-noSign");
 					return;
 				}

-				Optional<RegionSign> optional = signManager.signFromLocation(block.getLocation());
-				if(optional.isPresent()) {
-					RegionSign regionSign = optional.get();
-					messageBridge.message(player, "linksigns-alreadyRegistered", regionSign.getRegion());
+				RegionSign regionSign = SignsFeature.getSignByLocation(block.getLocation());
+				if(regionSign != null) {
+					plugin.message(player, "linksigns-alreadyRegistered", regionSign.getRegion());
 					return;
 				}
-				linker.setSign(block.getLocation(), block.getType(), bukkitInterface.getSignFacing(block));
+				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);
 			}
 		}
 	}
@@ -186,7 +181,7 @@ public class SignLinkerManager extends Manager implements Listener {
 			this.region = region;
 			hasRegion = true;
 			if(!isComplete()) {
-				messageBridge.message(linker, "linksigns-regionFound", region);
+				plugin.message(linker, "linksigns-regionFound", region);
 			}
 			finish();
 		}
@@ -197,7 +192,7 @@ public class SignLinkerManager extends Manager implements Listener {
 			this.facing = facing;
 			hasSign = true;
 			if(!isComplete()) {
-				messageBridge.message(linker, "linksigns-signFound", location.getBlockX(), location.getBlockY(), location.getBlockZ());
+				plugin.message(linker, "linksigns-signFound", location.getBlockX(), location.getBlockY(), location.getBlockZ());
 			}
 			finish();
 		}
@@ -206,14 +201,14 @@ public class SignLinkerManager extends Manager implements Listener {
 			if(isComplete()) {
 				region.getSignsFeature().addSign(location, type, facing, profile);
 				if(profile == null) {
-					messageBridge.message(linker, "addsign-success", region);
+					plugin.message(linker, "addsign-success", region);
 				} else {
-					messageBridge.message(linker, "addsign-successProfile", region, profile);
+					plugin.message(linker, "addsign-successProfile", region, profile);
 				}
 				region.update();
 				reset();

-				messageBridge.message(linker, "linksigns-next");
+				plugin.message(linker, "linksigns-next");
 			}
 		}

@@ -1,81 +0,0 @@
-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);
-    }
-}
@@ -1,34 +0,0 @@
-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());
-    }
-
-}
@@ -1,37 +0,0 @@
-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);
-    }
-}
@@ -1,7 +1,5 @@
 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;
@@ -9,11 +7,7 @@ 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;
@@ -22,40 +16,17 @@ 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 {

-	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(YamlConfiguration config) {
+		super(config);
 	}

-	@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;
+	public BuyRegion(String name, World world) {
+		super(name, world);
 	}

 	@Override
@@ -293,7 +264,7 @@ public class BuyRegion extends GeneralRegion {
 			return false;
 		}

-		if(economy == null) {
+		if(plugin.getEconomy() == null) {
 			message(offlinePlayer, "general-noEconomy");
 			return false;
 		}
@@ -364,12 +335,12 @@ public class BuyRegion extends GeneralRegion {
 		}

 		// Check if the player has enough money
-		if (isResell && !economy.has(offlinePlayer, getWorldName(), getResellPrice())) {
-			message(offlinePlayer, "buy-lowMoneyResell", Utils.formatCurrency(economy.getBalance(offlinePlayer, getWorldName())));
+		if (isResell && !plugin.getEconomy().has(offlinePlayer, getWorldName(), getResellPrice())) {
+			message(offlinePlayer, "buy-lowMoneyResell", Utils.formatCurrency(plugin.getEconomy().getBalance(offlinePlayer, getWorldName())));
 			return false;
 		}
-		if (!isResell && !economy.has(offlinePlayer, getWorldName(), getPrice())) {
-			message(offlinePlayer, "buy-lowMoney", Utils.formatCurrency(economy.getBalance(offlinePlayer, getWorldName())));
+		if (!isResell && !plugin.getEconomy().has(offlinePlayer, getWorldName(), getPrice())) {
+			message(offlinePlayer, "buy-lowMoney", Utils.formatCurrency(plugin.getEconomy().getBalance(offlinePlayer, getWorldName())));
 			return false;
 		}

@@ -386,7 +357,7 @@ public class BuyRegion extends GeneralRegion {
 			getFriendsFeature().clearFriends();
 			double resellPrice = getResellPrice();
 			// Transfer the money to the previous owner
-			EconomyResponse r = economy.withdrawPlayer(offlinePlayer, getWorldName(), getResellPrice());
+			EconomyResponse r = plugin.getEconomy().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);
@@ -395,11 +366,11 @@ public class BuyRegion extends GeneralRegion {
 			r = null;
 			OfflinePlayer oldOwnerPlayer = Bukkit.getOfflinePlayer(oldOwner);
 			String oldOwnerName = getPlayerName();
-			if(oldOwnerPlayer != null && oldOwnerPlayer.getName() != null) {
-				r = economy.depositPlayer(oldOwnerPlayer, getWorldName(), getResellPrice());
+			if(oldOwnerPlayer.hasPlayedBefore() && oldOwnerPlayer.getName() != null) {
+				r = plugin.getEconomy().depositPlayer(oldOwnerPlayer, getWorldName(), getResellPrice());
 				oldOwnerName = oldOwnerPlayer.getName();
 			} else if(oldOwnerName != null) {
-				r = economy.depositPlayer(oldOwnerName, getWorldName(), getResellPrice());
+				r = plugin.getEconomy().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());
@@ -433,7 +404,7 @@ public class BuyRegion extends GeneralRegion {
 			}

 			// Substract the money from the players balance
-			EconomyResponse r = economy.withdrawPlayer(offlinePlayer, getWorldName(), getPrice());
+			EconomyResponse r = plugin.getEconomy().withdrawPlayer(offlinePlayer, getWorldName(), getPrice());
 			if(!r.transactionSuccess()) {
 				message(offlinePlayer, "buy-payError");
 				return false;
@@ -446,9 +417,9 @@ public class BuyRegion extends GeneralRegion {
 			String landlordName = getLandlordName();
 			if(landlordName != null) {
 				if(landlordPlayer != null && landlordPlayer.getName() != null) {
-					r = economy.depositPlayer(landlordPlayer, getWorldName(), getPrice());
+					r = plugin.getEconomy().depositPlayer(landlordPlayer, getWorldName(), getPrice());
 				} else {
-					r = economy.depositPlayer(landlordName, getWorldName(), getPrice());
+					r = plugin.getEconomy().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());
@@ -498,7 +469,7 @@ public class BuyRegion extends GeneralRegion {
 			}
 		}

-		if(economy == null) {
+		if(plugin.getEconomy() == null) {
 			return false;
 		}

@@ -523,9 +494,9 @@ public class BuyRegion extends GeneralRegion {
 			EconomyResponse r;
 			if(landlordName != null) {
 				if(landlordPlayer != null && landlordPlayer.getName() != null) {
-					r = economy.withdrawPlayer(landlordPlayer, getWorldName(), moneyBack);
+					r = plugin.getEconomy().withdrawPlayer(landlordPlayer, getWorldName(), moneyBack);
 				} else {
-					r = economy.withdrawPlayer(landlordName, getWorldName(), moneyBack);
+					r = plugin.getEconomy().withdrawPlayer(landlordName, getWorldName(), moneyBack);
 				}
 				if(r == null || !r.transactionSuccess()) {
 					noPayBack = true;
@@ -539,9 +510,9 @@ public class BuyRegion extends GeneralRegion {
 				boolean error = false;
 				try {
 					if(player.getName() != null) {
-						response = economy.depositPlayer(player, getWorldName(), moneyBack);
+						response = plugin.getEconomy().depositPlayer(player, getWorldName(), moneyBack);
 					} else if(getPlayerName() != null) {
-						response = economy.depositPlayer(getPlayerName(), getWorldName(), moneyBack);
+						response = plugin.getEconomy().depositPlayer(getPlayerName(), getWorldName(), moneyBack);
 					}
 				} catch(Exception e) {
 					error = true;
@@ -1,11 +0,0 @@
-package me.wiefferink.areashop.regions;
-
-import org.bukkit.command.CommandSender;
-
-import javax.annotation.Nonnull;
-
-public interface ImportJobFactory {
-
-    @Nonnull ImportJob createImportJob(@Nonnull CommandSender commandSender);
-
-}
@@ -1,20 +0,0 @@
-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);
-
-}
@@ -1,13 +1,9 @@
 package me.wiefferink.areashop.regions;

-import com.google.inject.assistedinject.Assisted;
-import com.google.inject.assistedinject.AssistedInject;
-import me.wiefferink.areashop.managers.IFileManager;
+import me.wiefferink.areashop.AreaShop;
 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;
@@ -15,8 +11,7 @@ import java.util.Set;
 // TODO consider switching to saving lowercase regions
 public class RegionGroup {

-	private final Plugin plugin;
-	private final IFileManager fileManager;
+	private final AreaShop plugin;
 	private final String name;
 	private final Set<String> regions;
 	private Set<String> autoRegions;
@@ -28,10 +23,8 @@ public class RegionGroup {
 	 * @param plugin The AreaShop plugin
 	 * @param name   Name of the group, has to be unique
 	 */
-	@AssistedInject
-	RegionGroup(@Nonnull Plugin plugin, @Nonnull IFileManager fileManager, @Assisted String name) {
+	public RegionGroup(AreaShop plugin, String name) {
 		this.plugin = plugin;
-		this.fileManager = fileManager;
 		this.name = name;
 		this.autoDirty = true;
 		setSetting("name", name);
@@ -48,7 +41,7 @@ public class RegionGroup {
 	public Set<String> getAutoRegions() {
 		if(autoDirty) {
 			autoRegions = new HashSet<>();
-			for(GeneralRegion region : fileManager.getRegionsRef()) {
+			for(GeneralRegion region : plugin.getFileManager().getRegions()) {
 				if(worlds.contains(region.getWorldName())) {
 					autoRegions.add(region.getName());
 				}
@@ -156,7 +149,7 @@ public class RegionGroup {
 	public Set<GeneralRegion> getMemberRegions() {
 		Set<GeneralRegion> result = new HashSet<>();
 		for(String playerName : getMembers()) {
-			result.add(fileManager.getRegion(playerName));
+			result.add(plugin.getFileManager().getRegion(playerName));
 		}
 		return result;
 	}
@@ -199,7 +192,7 @@ public class RegionGroup {
 	 * @return The ConfigurationSection with the settings of the group
 	 */
 	public ConfigurationSection getSettings() {
-		ConfigurationSection result =  fileManager.getGroupSettings(name);
+		ConfigurationSection result =  plugin.getFileManager().getGroupSettings(name);
 		if(result != null) {
 			return result;
 		} else {
@@ -213,20 +206,20 @@ public class RegionGroup {
 	 * @param setting The value to set
 	 */
 	public void setSetting(String path, Object setting) {
-		fileManager.setGroupSetting(this, path, setting);
+		plugin.getFileManager().setGroupSetting(this, path, setting);
 	}

 	/**
 	 * Indicates this file needs to be saved, will actually get saved later by a task.
 	 */
 	public void saveRequired() {
-		fileManager.saveGroupsIsRequired();
+		plugin.getFileManager().saveGroupsIsRequired();
 	}

 	/**
 	 * Save the groups to disk now, normally saveRequired() is preferred because of performance.
 	 */
 	public void saveNow() {
-		fileManager.saveGroupsNow();
+		plugin.getFileManager().saveGroupsNow();
 	}
 }
@@ -1,12 +0,0 @@
-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));
-    }
-}
@@ -1,17 +1,11 @@
 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;
@@ -21,8 +15,6 @@ 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;
@@ -32,25 +24,14 @@ import java.util.UUID;
 import static me.wiefferink.areashop.tools.Utils.millisToHumanFormat;

 public class RentRegion extends GeneralRegion {
-
-	private long warningsDoneUntil = System.currentTimeMillis();
-	private final Economy economy;
+	private long warningsDoneUntil = Calendar.getInstance().getTimeInMillis();

 	/**
 	 * Constructor.
 	 * @param config All settings of this region
 	 */
-	@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;
+	public RentRegion(YamlConfiguration config) {
+		super(config);
 	}

 	/**
@@ -58,18 +39,8 @@ public class RentRegion extends GeneralRegion {
 	 * @param name  The name of the region (correct casing)
 	 * @param world The world of the WorldGuard region
 	 */
-	@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;
+	public RentRegion(String name, World world) {
+		super(name, world);
 	}

 	@Override
@@ -457,7 +428,7 @@ public class RentRegion extends GeneralRegion {
 	 * @return true if it succeeded and false if not
 	 */
 	public boolean rent(OfflinePlayer offlinePlayer) {
-		if(economy == null) {
+		if(plugin.getEconomy() == null) {
 			message(offlinePlayer, "general-noEconomy");
 			return false;
 		}
@@ -569,11 +540,11 @@ public class RentRegion extends GeneralRegion {
 		}

 		// Check if the player has enough money
-		if(!economy.has(offlinePlayer, getWorldName(), price)) {
+		if(!plugin.getEconomy().has(offlinePlayer, getWorldName(), price)) {
 			if(extend) {
-				message(offlinePlayer, "rent-lowMoneyExtend", Utils.formatCurrency(economy.getBalance(offlinePlayer, getWorldName())));
+				message(offlinePlayer, "rent-lowMoneyExtend", Utils.formatCurrency(plugin.getEconomy().getBalance(offlinePlayer, getWorldName())));
 			} else {
-				message(offlinePlayer, "rent-lowMoneyRent", Utils.formatCurrency(economy.getBalance(offlinePlayer, getWorldName())));
+				message(offlinePlayer, "rent-lowMoneyRent", Utils.formatCurrency(plugin.getEconomy().getBalance(offlinePlayer, getWorldName())));
 			}
 			return false;
 		}
@@ -587,7 +558,7 @@ public class RentRegion extends GeneralRegion {
 		}

 		// Substract the money from the players balance
-		EconomyResponse r = economy.withdrawPlayer(offlinePlayer, getWorldName(), price);
+		EconomyResponse r = plugin.getEconomy().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);
@@ -601,9 +572,9 @@ public class RentRegion extends GeneralRegion {
 		String landlordName = getLandlordName();
 		if(landlordName != null) {
 			if(landlordPlayer != null && landlordPlayer.getName() != null) {
-				r = economy.depositPlayer(landlordPlayer, getWorldName(), price);
+				r = plugin.getEconomy().depositPlayer(landlordPlayer, getWorldName(), price);
 			} else {
-				r = economy.depositPlayer(landlordName, getWorldName(), price);
+				r = plugin.getEconomy().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());
@@ -667,7 +638,7 @@ public class RentRegion extends GeneralRegion {
 			}
 		}

-		if(economy == null) {
+		if(plugin.getEconomy() == null) {
 			return false;
 		}

@@ -691,9 +662,9 @@ public class RentRegion extends GeneralRegion {
 			EconomyResponse r;
 			if(landlordName != null) {
 				if(landlordPlayer != null && landlordPlayer.getName() != null) {
-					r = economy.withdrawPlayer(landlordPlayer, getWorldName(), moneyBack);
+					r = plugin.getEconomy().withdrawPlayer(landlordPlayer, getWorldName(), moneyBack);
 				} else {
-					r = economy.withdrawPlayer(landlordName, getWorldName(), moneyBack);
+					r = plugin.getEconomy().withdrawPlayer(landlordName, getWorldName(), moneyBack);
 				}
 				if(r == null || !r.transactionSuccess()) {
 					noPayBack = true;
@@ -707,9 +678,9 @@ public class RentRegion extends GeneralRegion {
 				boolean error = false;
 				try {
 					if(player.getName() != null) {
-						r = economy.depositPlayer(player, getWorldName(), moneyBack);
+						r = plugin.getEconomy().depositPlayer(player, getWorldName(), moneyBack);
 					} else if(getPlayerName() != null) {
-						r = economy.depositPlayer(getPlayerName(), getWorldName(), moneyBack);
+						r = plugin.getEconomy().depositPlayer(getPlayerName(), getWorldName(), moneyBack);
 					}
 				} catch(Exception e) {
 					error = true;
@@ -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,234 +18,242 @@ 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;
+    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();

-	private final String author;
-	private final String repository;
-	private final Plugin plugin;
-	private final Logger logger;
-	private URL url;
-	private VersionComparator versionComparator;
+    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;

-	// Status
-	private boolean checking;
-	private boolean error;
-	private boolean hasUpdate;
-	private String latestVersion;
-	private final String currentVersion;
+    /**
+     * 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);

-	/**
-	 * 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);
+        this.checking = false;
+        this.error = false;
+        this.hasUpdate = false;
+    }

-		this.checking = false;
-		this.error = false;
-		this.hasUpdate = false;
-	}
+    /**
+     * 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;
+    }

-	/**
-	 * 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.
+     */
+    public void checkUpdate() {
+        checkUpdate(null);
+    }

-	/**
-	 * Check if an update is available.
-	 */
-	public void checkUpdate() {
-		checkUpdate(null);
-	}
+    /**
+     * 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.
-	 * @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;
-					}
+                            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);

-					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);
+                                    JsonObject latestRelease = GSON.fromJson(response, JsonObject.class);

-							JSONObject latestRelease = (JSONObject)JSONValue.parse(response);
+                                    if (latestRelease.isJsonNull()) {
+                                        logger.warning("Failed to get api response from " + url);
+                                        error = true;
+                                        return;
+                                    }
+                                    debug("json: " + latestRelease.toString());

-							if(latestRelease.isEmpty()) {
-								logger.warning("Failed to get api response from " + url);
-								error = true;
-								return;
-							}
-							debug("json: " + latestRelease.toJSONString());
+                                    // Latest version
+                                    latestVersion = latestRelease.get("tag_name").getAsString();
+                                    debug("Tag name:", latestVersion);

-							// Latest version
-							latestVersion = (String)latestRelease.get("tag_name");
-							debug("Tag name:", latestVersion);
+                                    // Current version
+                                    debug("Plugin version:", currentVersion);

-							// Current version
-							debug("Plugin version:", currentVersion);
+                                    // 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;
+    }

-							// 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 an update check is running.
+     *
+     * @return true if an update check is running
+     */
+    public boolean isChecking() {
+        return checking;
+    }

-	/**
-	 * Check if an update check is running.
-	 * @return true if an update check is running
-	 */
-	public boolean isChecking() {
-		return checking;
-	}
+    /**
+     * 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 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 has been found.
+     *
+     * @return true if an update has been found
+     */
+    public boolean hasUpdate() {
+        return hasUpdate;
+    }

-	/**
-	 * Check if an update has been found.
-	 * @return true if an update has been found
-	 */
-	public boolean hasUpdate() {
-		return hasUpdate;
-	}
+    /**
+     * Get the repository that this update checker is checking.
+     *
+     * @return Used repository
+     */
+    public String getRepository() {
+        return repository;
+    }

-	/**
-	 * Get the repository that this update checker is checking.
-	 * @return Used repository
-	 */
-	public String getRepository() {
-		return repository;
-	}
+    /**
+     * Get the author that this update checker is checking.
+     *
+     * @return Used author
+     */
+    public String getAuthor() {
+        return author;
+    }

-	/**
-	 * Get the author that this update checker is checking.
-	 * @return Used author
-	 */
-	public String getAuthor() {
-		return author;
-	}
+    /**
+     * Get the current version.
+     *
+     * @return Current version of the plugin
+     */
+    public String getCurrentVersion() {
+        return currentVersion;
+    }

-	/**
-	 * Get the current version.
-	 * @return Current version of the plugin
-	 */
-	public String getCurrentVersion() {
-		return currentVersion;
-	}
+    /**
+     * Get the latest version.
+     *
+     * @return Latest version of the plugin (if checking is complete)
+     */
+    public String getLatestVersion() {
+        return latestVersion;
+    }

-	/**
-	 * Get the latest version.
-	 * @return Latest version of the plugin (if checking is complete)
-	 */
-	public String getLatestVersion() {
-		return latestVersion;
-	}
+    /**
+     * 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, " "));
+        }
+    }

-	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);
-	}
+    @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 UpdateCallback {
-		void run(GithubUpdateCheck result);
-	}
+    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);
+    }

-	/**
-	 * 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
-		), ", ") + ")";
-	}
+    public interface UpdateCallback {
+        void run(GithubUpdateCheck result);
+    }
 }
@@ -1,8 +1,14 @@
 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() {
@@ -19,11 +25,11 @@ public class Materials {
 			return null;
 		}
 		try {
-			return Material.getMaterial(name);
-		} catch (IllegalArgumentException ex) {
-			ex.printStackTrace();
+			return Material.matchMaterial(name);
+		} catch (IllegalArgumentException ignored) {
+			AreaShop.debug("Materials.get() null result:", name);
+			return null;
 		}
-		return null;
 	}

 	/**
@@ -32,7 +38,7 @@ public class Materials {
 	 * @return true if the given material is a sign
 	 */
 	public static boolean isSign(Material material) {
-		return Tag.SIGNS.isTagged(material);
+		return Tag.SIGNS.isTagged(material) || Tag.WALL_SIGNS.isTagged(material);
 	}

 	/**
@@ -42,8 +48,9 @@ public class Materials {
 	 */
 	public static boolean isSign(String name) {
 		try {
-			return isSign(Material.getMaterial(name));
+			return isSign(Material.matchMaterial(name));
 		} catch (IllegalArgumentException ex) {
+			AreaShop.debug("Invalid Material: " + name + " passed when performing sign check.");
 			return false;
 		}
 	}
@@ -1,152 +0,0 @@
-package me.wiefferink.areashop.tools;
-
-/**
- * Parse math from a string
- * Adapted from:
- * https://stackoverflow.com/questions/3422673/how-to-evaluate-a-math-expression-given-in-string-form
- */
-public final class OperandParser {
-
-    private final String str;
-
-    private OperandParser(final String str) {
-        this.str = str;
-    }
-
-    public static double parse(final String str) throws ParseException {
-        return new OperandParser(str).parse();
-    }
-
-
-    private int pos = -1, ch;
-
-    private void nextChar() {
-        ch = (++pos < str.length()) ? str.charAt(pos) : -1;
-    }
-
-    private boolean eat(int charToEat) {
-        while (ch == ' ') nextChar();
-        if (ch == charToEat) {
-            nextChar();
-            return true;
-        }
-        return false;
-    }
-
-    private double parse() throws ParseException {
-        nextChar();
-        double x = parseExpression();
-        if (pos < str.length())
-        {
-            throw new ParseException("Unexpected: " + (char) ch);
-        }
-        return x;
-    }
-
-    // Grammar:
-    // expression = term | expression `+` term | expression `-` term
-    // term = factor | term `*` factor | term `/` factor
-    // factor = `+` factor | `-` factor | `(` expression `)`
-    //        | number | functionName factor | factor `^` factor
-
-    private double parseExpression() throws ParseException {
-        double x = parseTerm();
-        for (; ; ) {
-            if (eat('+')) {
-                // addition
-                x += parseTerm();
-            }
-            else if (eat('-')) {
-                // subtraction
-                x -= parseTerm();
-            }
-            else return x;
-        }
-    }
-
-    private double parseTerm() throws ParseException {
-        double x = parseFactor();
-        for (; ; ) {
-            if (eat('*')) {
-                // multiplication
-                x *= parseFactor();
-            }
-            else if (eat('/')) {
-                // division
-                x /= parseFactor();
-            }
-            else return x;
-        }
-    }
-
-    private double parseFactor() throws ParseException {
-        if (eat('+')) {
-            // unary plus
-            return parseFactor();
-        }
-        if (eat('-')) {
-            // unary minus
-            return -parseFactor();
-        }
-
-        double x;
-        int startPos = this.pos;
-        if (eat('(')) {
-            // parentheses
-            x = parseExpression();
-            eat(')');
-        } else if ((ch >= '0' && ch <= '9') || ch == '.') {
-            // numbers
-            while ((ch >= '0' && ch <= '9') || ch == '.') {
-                nextChar();
-            }
-            x = Double.parseDouble(str.substring(startPos, this.pos));
-        } else if (ch >= 'a' && ch <= 'z') {
-            // functions
-            while (ch >= 'a' && ch <= 'z') {
-                nextChar();
-            }
-            String func = str.substring(startPos, this.pos);
-            x = parseFactor();
-            x = switch (func) {
-                case "sqrt" -> Math.sqrt(x);
-                case "sin" -> Math.sin(Math.toRadians(x));
-                case "cos" -> Math.cos(Math.toRadians(x));
-                case "tan" -> Math.tan(Math.toRadians(x));
-                default -> throw new ParseException("Unknown function: " + func);
-            };
-        } else {
-            throw new ParseException("Unexpected: " + (char) ch);
-        }
-
-        if (eat('^')) {
-            // exponentiation
-            x = Math.pow(x, parseFactor());
-        }
-
-        return x;
-    }
-
-    public static class ParseException extends Exception {
-
-        public ParseException() {
-        }
-
-        public ParseException(String message) {
-            super(message);
-        }
-
-        public ParseException(String message, Throwable cause) {
-            super(message, cause);
-        }
-
-        public ParseException(Throwable cause) {
-            super(cause);
-        }
-
-        public ParseException(String message, Throwable cause, boolean enableSuppression, boolean writableStackTrace) {
-            super(message, cause, enableSuppression, writableStackTrace);
-        }
-    }
-
-}
@@ -1,32 +0,0 @@
-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);
-    }
-
-}
@@ -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 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
+* 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
 * An economy plugin supported by Vault (check the [Vault page](http://dev.bukkit.org/bukkit-plugins/vault/) for a list of these)

 ### Metrics
@@ -1,12 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<module version="4">
-  <component name="FacetManager">
-    <facet type="minecraft" name="Minecraft">
-      <configuration>
-        <autoDetectTypes>
-          <platformType>BUKKIT</platformType>
-        </autoDetectTypes>
-      </configuration>
-    </facet>
-  </component>
-</module>
@@ -1,31 +0,0 @@
-dependencies {
-    compileOnly 'org.spigotmc:spigot-api:1.17.1-R0.1-SNAPSHOT'
-    compileOnly project(':areashop-interface')
-}
-
-description = 'AreaShop Bukkit 1.13 and higher'
-
-publishing {
-    publications {
-        // ... artifact publications
-        areaShop(MavenPublication) {
-            from components.java
-            pom {
-                group = "me.wiefferink"
-                artifactId = "$project.name"
-                version = "$project.version"
-                scm {
-                    connection = 'scm:git:git://github.com/md5sha256/AreaShop.git'
-                    developerConnection = 'scm:git:ssh://github.com/md5sha256/AreaShop.git'
-                    url = "https://github.com/md5sha256/AreaShop/tree/dev/bleeding"
-                }
-                licenses {
-                    license {
-                        name = 'GNU General Public License v3.0'
-                        url = "https://github.com/md5sha256/AreaShop/blob/dev/bleeding/LICENSE"
-                    }
-                }
-            }
-        }
-    }
-}
@@ -1,77 +0,0 @@
-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;
-
-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;
-	}
-
-}
@@ -1,12 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<module version="4">
-  <component name="FacetManager">
-    <facet type="minecraft" name="Minecraft">
-      <configuration>
-        <autoDetectTypes>
-          <platformType>BUKKIT</platformType>
-        </autoDetectTypes>
-      </configuration>
-    </facet>
-  </component>
-</module>
@@ -1,32 +0,0 @@
-dependencies {
-    compileOnly 'org.spigotmc:spigot-api:1.18.1-R0.1-SNAPSHOT'
-    compileOnly 'com.sk89q.worldedit:worldedit-bukkit:7.2.8'
-    compileOnly 'com.sk89q.worldguard:worldguard-bukkit:7.0.6'
-}
-
-description = 'AreaShop Interface'
-
-publishing {
-    publications {
-        // ... artifact publications
-        areaShop(MavenPublication) {
-            from components.java
-            pom {
-                group = "me.wiefferink"
-                artifactId = "$project.name"
-                version = "$project.version"
-                scm {
-                    connection = 'scm:git:git://github.com/md5sha256/AreaShop.git'
-                    developerConnection = 'scm:git:ssh://github.com/md5sha256/AreaShop.git'
-                    url = "https://github.com/md5sha256/AreaShop/tree/dev/bleeding"
-                }
-                licenses {
-                    license {
-                        name = 'GNU General Public License v3.0'
-                        url = "https://github.com/md5sha256/AreaShop/blob/dev/bleeding/LICENSE"
-                    }
-                }
-            }
-        }
-    }
-}
@@ -1,35 +0,0 @@
-package me.wiefferink.areashop.interfaces;
-
-import org.bukkit.block.Block;
-import org.bukkit.block.BlockFace;
-
-public abstract class BukkitInterface {
-	protected final AreaShopInterface pluginInterface;
-
-	public BukkitInterface(AreaShopInterface pluginInterface) {
-		this.pluginInterface = pluginInterface;
-	}
-
-	/**
-	 * Get the direciton a sign is facing.
-	 * @param block Sign block to get the facing from
-	 * @return direction the sign is facing
-	 */
-	public abstract BlockFace getSignFacing(Block block);
-
-	/**
-	 * Set the direction a sign is facing.
-	 * @param block Sign block to update
-	 * @param facing direction to let the sign face
-	 * @return true when successful, otherwise false
-	 */
-	public abstract boolean setSignFacing(Block block, BlockFace facing);
-
-	/**
-	 * Get the block a sign is attached to.
-	 * @param block Sign block
-	 * @return Block the sign is attached to, or null when not a sign or not attached
-	 */
-	public abstract Block getSignAttachedTo(Block block);
-
-}
@@ -1,25 +1,16 @@
 plugins {
-    id 'java-library'
-    id 'maven-publish'
-    id 'io.papermc.paperweight.userdev' version '1.3.3' apply false
+    id 'java'
 }

-group = 'me.wiefferink'
-version = '2.7.2'
+group = "me.wiefferink.areashop"
+version = '2.6.4'

 subprojects {

-    plugins.apply('java-library')
-    plugins.apply('maven-publish')
-
-    version = '2.7.1'
+    plugins.apply('java')

    repositories {
        mavenCentral()
-        maven {
-            name = 'oss-sonatype'
-           url = uri("https://oss.sonatype.org/content/groups/public/")
-        }
        maven {
            name = 'paper-repo'
            url = uri('https://papermc.io/repo/repository/maven-public/')
@@ -46,10 +37,14 @@ subprojects {
    }

    tasks.withType(JavaCompile) {
-        java.toolchain.languageVersion.set(JavaLanguageVersion.of(17))
-        options.release.set(17)
-        options.encoding = 'UTF-8'
-        options.fork = true
-        options.deprecation = true
+        tasks.withType(JavaCompile) {
+            javaToolchains.compilerFor {
+                JavaLanguageVersion.of(16)
+            }
+            options.release.set(16)
+            options.encoding = 'UTF-8'
+            options.fork = true
+            options.deprecation = true
+        }
    }
 }
@@ -1 +1,2 @@
-org.gradle.parallel=true
+org.gradle.parallel=true
+org.gradle.java.installations.auto-download=false
@@ -1,5 +1,5 @@
 distributionBase=GRADLE_USER_HOME
 distributionPath=wrapper/dists
-distributionUrl=https\://services.gradle.org/distributions/gradle-7.3-bin.zip
+distributionUrl=https\://services.gradle.org/distributions/gradle-7.1-bin.zip
 zipStoreBase=GRADLE_USER_HOME
 zipStorePath=wrapper/dists
@@ -1,7 +1,7 @@
-#!/bin/sh
+#!/usr/bin/env sh

 #
-# Copyright © 2015-2021 the original authors.
+# Copyright 2015 the original author or authors.
 #
 # Licensed under the Apache License, Version 2.0 (the "License");
 # you may not use this file except in compliance with the License.
@@ -17,101 +17,67 @@
 #

 ##############################################################################
-#
-#   Gradle start up script for POSIX generated by Gradle.
-#
-#   Important for running:
-#
-#   (1) You need a POSIX-compliant shell to run this script. If your /bin/sh is
-#       noncompliant, but you have some other compliant shell such as ksh or
-#       bash, then to run this script, type that shell name before the whole
-#       command line, like:
-#
-#           ksh Gradle
-#
-#       Busybox and similar reduced shells will NOT work, because this script
-#       requires all of these POSIX shell features:
-#         * functions;
-#         * expansions «$var», «${var}», «${var:-default}», «${var+SET}»,
-#           «${var#prefix}», «${var%suffix}», and «$( cmd )»;
-#         * compound commands having a testable exit status, especially «case»;
-#         * various built-in commands including «command», «set», and «ulimit».
-#
-#   Important for patching:
-#
-#   (2) This script targets any POSIX shell, so it avoids extensions provided
-#       by Bash, Ksh, etc; in particular arrays are avoided.
-#
-#       The "traditional" practice of packing multiple parameters into a
-#       space-separated string is a well documented source of bugs and security
-#       problems, so this is (mostly) avoided, by progressively accumulating
-#       options in "$@", and eventually passing that to Java.
-#
-#       Where the inherited environment variables (DEFAULT_JVM_OPTS, JAVA_OPTS,
-#       and GRADLE_OPTS) rely on word-splitting, this is performed explicitly;
-#       see the in-line comments for details.
-#
-#       There are tweaks for specific operating systems such as AIX, CygWin,
-#       Darwin, MinGW, and NonStop.
-#
-#   (3) This script is generated from the Groovy template
-#       https://github.com/gradle/gradle/blob/master/subprojects/plugins/src/main/resources/org/gradle/api/internal/plugins/unixStartScript.txt
-#       within the Gradle project.
-#
-#       You can find Gradle at https://github.com/gradle/gradle/.
-#
+##
+##  Gradle start up script for UN*X
+##
 ##############################################################################

 # Attempt to set APP_HOME
-
 # Resolve links: $0 may be a link
-app_path=$0
-
-# Need this for daisy-chained symlinks.
-while
-    APP_HOME=${app_path%"${app_path##*/}"}  # leaves a trailing /; empty if no leading path
-    [ -h "$app_path" ]
-do
-    ls=$( ls -ld "$app_path" )
-    link=${ls#*' -> '}
-    case $link in             #(
-      /*)   app_path=$link ;; #(
-      *)    app_path=$APP_HOME$link ;;
-    esac
+PRG="$0"
+# Need this for relative symlinks.
+while [ -h "$PRG" ] ; do
+    ls=`ls -ld "$PRG"`
+    link=`expr "$ls" : '.*-> \(.*\)$'`
+    if expr "$link" : '/.*' > /dev/null; then
+        PRG="$link"
+    else
+        PRG=`dirname "$PRG"`"/$link"
+    fi
 done
-
-APP_HOME=$( cd "${APP_HOME:-./}" && pwd -P ) || exit
+SAVED="`pwd`"
+cd "`dirname \"$PRG\"`/" >/dev/null
+APP_HOME="`pwd -P`"
+cd "$SAVED" >/dev/null

 APP_NAME="Gradle"
-APP_BASE_NAME=${0##*/}
+APP_BASE_NAME=`basename "$0"`

 # Add default JVM options here. You can also use JAVA_OPTS and GRADLE_OPTS to pass JVM options to this script.
 DEFAULT_JVM_OPTS='"-Xmx64m" "-Xms64m"'

 # Use the maximum available, or set MAX_FD != -1 to use that value.
-MAX_FD=maximum
+MAX_FD="maximum"

 warn () {
    echo "$*"
-} >&2
+}

 die () {
    echo
    echo "$*"
    echo
    exit 1
-} >&2
+}

 # OS specific support (must be 'true' or 'false').
 cygwin=false
 msys=false
 darwin=false
 nonstop=false
-case "$( uname )" in                #(
-  CYGWIN* )         cygwin=true  ;; #(
-  Darwin* )         darwin=true  ;; #(
-  MSYS* | MINGW* )  msys=true    ;; #(
-  NONSTOP* )        nonstop=true ;;
+case "`uname`" in
+  CYGWIN* )
+    cygwin=true
+    ;;
+  Darwin* )
+    darwin=true
+    ;;
+  MINGW* )
+    msys=true
+    ;;
+  NONSTOP* )
+    nonstop=true
+    ;;
 esac

 CLASSPATH=$APP_HOME/gradle/wrapper/gradle-wrapper.jar
@@ -121,9 +87,9 @@ CLASSPATH=$APP_HOME/gradle/wrapper/gradle-wrapper.jar
 if [ -n "$JAVA_HOME" ] ; then
    if [ -x "$JAVA_HOME/jre/sh/java" ] ; then
        # IBM's JDK on AIX uses strange locations for the executables
-        JAVACMD=$JAVA_HOME/jre/sh/java
+        JAVACMD="$JAVA_HOME/jre/sh/java"
    else
-        JAVACMD=$JAVA_HOME/bin/java
+        JAVACMD="$JAVA_HOME/bin/java"
    fi
    if [ ! -x "$JAVACMD" ] ; then
        die "ERROR: JAVA_HOME is set to an invalid directory: $JAVA_HOME
@@ -132,7 +98,7 @@ Please set the JAVA_HOME variable in your environment to match the
 location of your Java installation."
    fi
 else
-    JAVACMD=java
+    JAVACMD="java"
    which java >/dev/null 2>&1 || die "ERROR: JAVA_HOME is not set and no 'java' command could be found in your PATH.

 Please set the JAVA_HOME variable in your environment to match the
@@ -140,95 +106,80 @@ location of your Java installation."
 fi

 # Increase the maximum file descriptors if we can.
-if ! "$cygwin" && ! "$darwin" && ! "$nonstop" ; then
-    case $MAX_FD in #(
-      max*)
-        MAX_FD=$( ulimit -H -n ) ||
-            warn "Could not query maximum file descriptor limit"
-    esac
-    case $MAX_FD in  #(
-      '' | soft) :;; #(
-      *)
-        ulimit -n "$MAX_FD" ||
-            warn "Could not set maximum file descriptor limit to $MAX_FD"
-    esac
+if [ "$cygwin" = "false" -a "$darwin" = "false" -a "$nonstop" = "false" ] ; then
+    MAX_FD_LIMIT=`ulimit -H -n`
+    if [ $? -eq 0 ] ; then
+        if [ "$MAX_FD" = "maximum" -o "$MAX_FD" = "max" ] ; then
+            MAX_FD="$MAX_FD_LIMIT"
+        fi
+        ulimit -n $MAX_FD
+        if [ $? -ne 0 ] ; then
+            warn "Could not set maximum file descriptor limit: $MAX_FD"
+        fi
+    else
+        warn "Could not query maximum file descriptor limit: $MAX_FD_LIMIT"
+    fi
 fi

-# Collect all arguments for the java command, stacking in reverse order:
-#   * args from the command line
-#   * the main class name
-#   * -classpath
-#   * -D...appname settings
-#   * --module-path (only if needed)
-#   * DEFAULT_JVM_OPTS, JAVA_OPTS, and GRADLE_OPTS environment variables.
+# For Darwin, add options to specify how the application appears in the dock
+if $darwin; then
+    GRADLE_OPTS="$GRADLE_OPTS \"-Xdock:name=$APP_NAME\" \"-Xdock:icon=$APP_HOME/media/gradle.icns\""
+fi

 # For Cygwin or MSYS, switch paths to Windows format before running java
-if "$cygwin" || "$msys" ; then
-    APP_HOME=$( cygpath --path --mixed "$APP_HOME" )
-    CLASSPATH=$( cygpath --path --mixed "$CLASSPATH" )
+if [ "$cygwin" = "true" -o "$msys" = "true" ] ; then
+    APP_HOME=`cygpath --path --mixed "$APP_HOME"`
+    CLASSPATH=`cygpath --path --mixed "$CLASSPATH"`

-    JAVACMD=$( cygpath --unix "$JAVACMD" )
+    JAVACMD=`cygpath --unix "$JAVACMD"`

-    # Now convert the arguments - kludge to limit ourselves to /bin/sh
-    for arg do
-        if
-            case $arg in                                #(
-              -*)   false ;;                            # don't mess with options #(
-              /?*)  t=${arg#/} t=/${t%%/*}              # looks like a POSIX filepath
-                    [ -e "$t" ] ;;                      #(
-              *)    false ;;
-            esac
-        then
-            arg=$( cygpath --path --ignore --mixed "$arg" )
-        fi
-        # Roll the args list around exactly as many times as the number of
-        # args, so each arg winds up back in the position where it started, but
-        # possibly modified.
-        #
-        # NB: a `for` loop captures its iteration list before it begins, so
-        # changing the positional parameters here affects neither the number of
-        # iterations, nor the values presented in `arg`.
-        shift                   # remove old arg
-        set -- "$@" "$arg"      # push replacement arg
+    # We build the pattern for arguments to be converted via cygpath
+    ROOTDIRSRAW=`find -L / -maxdepth 1 -mindepth 1 -type d 2>/dev/null`
+    SEP=""
+    for dir in $ROOTDIRSRAW ; do
+        ROOTDIRS="$ROOTDIRS$SEP$dir"
+        SEP="|"
    done
+    OURCYGPATTERN="(^($ROOTDIRS))"
+    # Add a user-defined pattern to the cygpath arguments
+    if [ "$GRADLE_CYGPATTERN" != "" ] ; then
+        OURCYGPATTERN="$OURCYGPATTERN|($GRADLE_CYGPATTERN)"
+    fi
+    # Now convert the arguments - kludge to limit ourselves to /bin/sh
+    i=0
+    for arg in "$@" ; do
+        CHECK=`echo "$arg"|egrep -c "$OURCYGPATTERN" -`
+        CHECK2=`echo "$arg"|egrep -c "^-"`                                 ### Determine if an option
+
+        if [ $CHECK -ne 0 ] && [ $CHECK2 -eq 0 ] ; then                    ### Added a condition
+            eval `echo args$i`=`cygpath --path --ignore --mixed "$arg"`
+        else
+            eval `echo args$i`="\"$arg\""
+        fi
+        i=`expr $i + 1`
+    done
+    case $i in
+        0) set -- ;;
+        1) set -- "$args0" ;;
+        2) set -- "$args0" "$args1" ;;
+        3) set -- "$args0" "$args1" "$args2" ;;
+        4) set -- "$args0" "$args1" "$args2" "$args3" ;;
+        5) set -- "$args0" "$args1" "$args2" "$args3" "$args4" ;;
+        6) set -- "$args0" "$args1" "$args2" "$args3" "$args4" "$args5" ;;
+        7) set -- "$args0" "$args1" "$args2" "$args3" "$args4" "$args5" "$args6" ;;
+        8) set -- "$args0" "$args1" "$args2" "$args3" "$args4" "$args5" "$args6" "$args7" ;;
+        9) set -- "$args0" "$args1" "$args2" "$args3" "$args4" "$args5" "$args6" "$args7" "$args8" ;;
+    esac
 fi

-# Collect all arguments for the java command;
-#   * $DEFAULT_JVM_OPTS, $JAVA_OPTS, and $GRADLE_OPTS can contain fragments of
-#     shell script including quotes and variable substitutions, so put them in
-#     double quotes to make sure that they get re-expanded; and
-#   * put everything else in single quotes, so that it's not re-expanded.
+# Escape application args
+save () {
+    for i do printf %s\\n "$i" | sed "s/'/'\\\\''/g;1s/^/'/;\$s/\$/' \\\\/" ; done
+    echo " "
+}
+APP_ARGS=`save "$@"`

-set -- \
-        "-Dorg.gradle.appname=$APP_BASE_NAME" \
-        -classpath "$CLASSPATH" \
-        org.gradle.wrapper.GradleWrapperMain \
-        "$@"
-
-# Use "xargs" to parse quoted args.
-#
-# With -n1 it outputs one arg per line, with the quotes and backslashes removed.
-#
-# In Bash we could simply go:
-#
-#   readarray ARGS < <( xargs -n1 <<<"$var" ) &&
-#   set -- "${ARGS[@]}" "$@"
-#
-# but POSIX shell has neither arrays nor command substitution, so instead we
-# post-process each arg (as a line of input to sed) to backslash-escape any
-# character that might be a shell metacharacter, then use eval to reverse
-# that process (while maintaining the separation between arguments), and wrap
-# the whole thing up as a single "set" statement.
-#
-# This will of course break if any of these variables contains a newline or
-# an unmatched quote.
-#
-
-eval "set -- $(
-        printf '%s\n' "$DEFAULT_JVM_OPTS $JAVA_OPTS $GRADLE_OPTS" |
-        xargs -n1 |
-        sed ' s~[^-[:alnum:]+,./:=@_]~\\&~g; ' |
-        tr '\n' ' '
-    )" '"$@"'
+# Collect all arguments for the java command, following the shell quoting and substitution rules
+eval set -- $DEFAULT_JVM_OPTS $JAVA_OPTS $GRADLE_OPTS "\"-Dorg.gradle.appname=$APP_BASE_NAME\"" -classpath "\"$CLASSPATH\"" org.gradle.wrapper.GradleWrapperMain "$APP_ARGS"

 exec "$JAVACMD" "$@"
@@ -1,89 +1,89 @@
-@rem
-@rem Copyright 2015 the original author or authors.
-@rem
-@rem Licensed under the Apache License, Version 2.0 (the "License");
-@rem you may not use this file except in compliance with the License.
-@rem You may obtain a copy of the License at
-@rem
-@rem      https://www.apache.org/licenses/LICENSE-2.0
-@rem
-@rem Unless required by applicable law or agreed to in writing, software
-@rem distributed under the License is distributed on an "AS IS" BASIS,
-@rem WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-@rem See the License for the specific language governing permissions and
-@rem limitations under the License.
-@rem
-
-@if "%DEBUG%" == "" @echo off
-@rem ##########################################################################
-@rem
-@rem  Gradle startup script for Windows
-@rem
-@rem ##########################################################################
-
-@rem Set local scope for the variables with windows NT shell
-if "%OS%"=="Windows_NT" setlocal
-
-set DIRNAME=%~dp0
-if "%DIRNAME%" == "" set DIRNAME=.
-set APP_BASE_NAME=%~n0
-set APP_HOME=%DIRNAME%
-
-@rem Resolve any "." and ".." in APP_HOME to make it shorter.
-for %%i in ("%APP_HOME%") do set APP_HOME=%%~fi
-
-@rem Add default JVM options here. You can also use JAVA_OPTS and GRADLE_OPTS to pass JVM options to this script.
-set DEFAULT_JVM_OPTS="-Xmx64m" "-Xms64m"
-
-@rem Find java.exe
-if defined JAVA_HOME goto findJavaFromJavaHome
-
-set JAVA_EXE=java.exe
-%JAVA_EXE% -version >NUL 2>&1
-if "%ERRORLEVEL%" == "0" goto execute
-
-echo.
-echo ERROR: JAVA_HOME is not set and no 'java' command could be found in your PATH.
-echo.
-echo Please set the JAVA_HOME variable in your environment to match the
-echo location of your Java installation.
-
-goto fail
-
-:findJavaFromJavaHome
-set JAVA_HOME=%JAVA_HOME:"=%
-set JAVA_EXE=%JAVA_HOME%/bin/java.exe
-
-if exist "%JAVA_EXE%" goto execute
-
-echo.
-echo ERROR: JAVA_HOME is set to an invalid directory: %JAVA_HOME%
-echo.
-echo Please set the JAVA_HOME variable in your environment to match the
-echo location of your Java installation.
-
-goto fail
-
-:execute
-@rem Setup the command line
-
-set CLASSPATH=%APP_HOME%\gradle\wrapper\gradle-wrapper.jar
-
-
-@rem Execute Gradle
-"%JAVA_EXE%" %DEFAULT_JVM_OPTS% %JAVA_OPTS% %GRADLE_OPTS% "-Dorg.gradle.appname=%APP_BASE_NAME%" -classpath "%CLASSPATH%" org.gradle.wrapper.GradleWrapperMain %*
-
-:end
-@rem End local scope for the variables with windows NT shell
-if "%ERRORLEVEL%"=="0" goto mainEnd
-
-:fail
-rem Set variable GRADLE_EXIT_CONSOLE if you need the _script_ return code instead of
-rem the _cmd.exe /c_ return code!
-if  not "" == "%GRADLE_EXIT_CONSOLE%" exit 1
-exit /b 1
-
-:mainEnd
-if "%OS%"=="Windows_NT" endlocal
-
-:omega
+@rem
+@rem Copyright 2015 the original author or authors.
+@rem
+@rem Licensed under the Apache License, Version 2.0 (the "License");
+@rem you may not use this file except in compliance with the License.
+@rem You may obtain a copy of the License at
+@rem
+@rem      https://www.apache.org/licenses/LICENSE-2.0
+@rem
+@rem Unless required by applicable law or agreed to in writing, software
+@rem distributed under the License is distributed on an "AS IS" BASIS,
+@rem WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+@rem See the License for the specific language governing permissions and
+@rem limitations under the License.
+@rem
+
+@if "%DEBUG%" == "" @echo off
+@rem ##########################################################################
+@rem
+@rem  Gradle startup script for Windows
+@rem
+@rem ##########################################################################
+
+@rem Set local scope for the variables with windows NT shell
+if "%OS%"=="Windows_NT" setlocal
+
+set DIRNAME=%~dp0
+if "%DIRNAME%" == "" set DIRNAME=.
+set APP_BASE_NAME=%~n0
+set APP_HOME=%DIRNAME%
+
+@rem Resolve any "." and ".." in APP_HOME to make it shorter.
+for %%i in ("%APP_HOME%") do set APP_HOME=%%~fi
+
+@rem Add default JVM options here. You can also use JAVA_OPTS and GRADLE_OPTS to pass JVM options to this script.
+set DEFAULT_JVM_OPTS="-Xmx64m" "-Xms64m"
+
+@rem Find java.exe
+if defined JAVA_HOME goto findJavaFromJavaHome
+
+set JAVA_EXE=java.exe
+%JAVA_EXE% -version >NUL 2>&1
+if "%ERRORLEVEL%" == "0" goto execute
+
+echo.
+echo ERROR: JAVA_HOME is not set and no 'java' command could be found in your PATH.
+echo.
+echo Please set the JAVA_HOME variable in your environment to match the
+echo location of your Java installation.
+
+goto fail
+
+:findJavaFromJavaHome
+set JAVA_HOME=%JAVA_HOME:"=%
+set JAVA_EXE=%JAVA_HOME%/bin/java.exe
+
+if exist "%JAVA_EXE%" goto execute
+
+echo.
+echo ERROR: JAVA_HOME is set to an invalid directory: %JAVA_HOME%
+echo.
+echo Please set the JAVA_HOME variable in your environment to match the
+echo location of your Java installation.
+
+goto fail
+
+:execute
+@rem Setup the command line
+
+set CLASSPATH=%APP_HOME%\gradle\wrapper\gradle-wrapper.jar
+
+
+@rem Execute Gradle
+"%JAVA_EXE%" %DEFAULT_JVM_OPTS% %JAVA_OPTS% %GRADLE_OPTS% "-Dorg.gradle.appname=%APP_BASE_NAME%" -classpath "%CLASSPATH%" org.gradle.wrapper.GradleWrapperMain %*
+
+:end
+@rem End local scope for the variables with windows NT shell
+if "%ERRORLEVEL%"=="0" goto mainEnd
+
+:fail
+rem Set variable GRADLE_EXIT_CONSOLE if you need the _script_ return code instead of
+rem the _cmd.exe /c_ return code!
+if  not "" == "%GRADLE_EXIT_CONSOLE%" exit 1
+exit /b 1
+
+:mainEnd
+if "%OS%"=="Windows_NT" endlocal
+
+:omega
@@ -1,12 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<module version="4">
-  <component name="FacetManager">
-    <facet type="minecraft" name="Minecraft">
-      <configuration>
-        <autoDetectTypes>
-          <platformType>BUKKIT</platformType>
-        </autoDetectTypes>
-      </configuration>
-    </facet>
-  </component>
-</module>
@@ -1,43 +0,0 @@
-repositories {
-    maven {
-        name = "S01 Sonatype Snapshots"
-        url = uri("https://s01.oss.sonatype.org/content/repositories/snapshots/")
-    }
-}
-
-dependencies {
-    compileOnly 'org.spigotmc:spigot-api:1.18.1-R0.1-SNAPSHOT'
-    compileOnly("com.fastasyncworldedit:FastAsyncWorldEdit-Core:2.0.0-SNAPSHOT")
-    compileOnly("com.fastasyncworldedit:FastAsyncWorldEdit-Bukkit:2.0.0-SNAPSHOT") {
-
-    }
-    compileOnly 'com.sk89q.worldguard:worldguard-bukkit:7.0.6'
-    compileOnly project(':areashop-interface')
-}
-
-description = 'AreaShop FastAsyncWorldEdit'
-
-publishing {
-    publications {
-        // ... artifact publications
-        areaShop(MavenPublication) {
-            from components.java
-            pom {
-                group = "me.wiefferink"
-                artifactId = "$project.name"
-                version = "$project.version"
-                scm {
-                    connection = 'scm:git:git://github.com/md5sha256/AreaShop.git'
-                    developerConnection = 'scm:git:ssh://github.com/md5sha256/AreaShop.git'
-                    url = "https://github.com/md5sha256/AreaShop/tree/dev/bleeding"
-                }
-                licenses {
-                    license {
-                        name = 'GNU General Public License v3.0'
-                        url = "https://github.com/md5sha256/AreaShop/blob/dev/bleeding/LICENSE"
-                    }
-                }
-            }
-        }
-    }
-}
@@ -1,298 +0,0 @@
-package me.wiefferink.areashop.handlers;
-
-import com.fastasyncworldedit.core.FaweAPI;
-import com.fastasyncworldedit.core.extent.clipboard.MemoryOptimizedClipboard;
-import com.fastasyncworldedit.core.extent.clipboard.io.FastSchematicReader;
-import com.fastasyncworldedit.core.extent.processor.lighting.RelightMode;
-import com.fastasyncworldedit.core.limit.FaweLimit;
-import com.google.common.annotations.Beta;
-import com.sk89q.jnbt.NBTInputStream;
-import com.sk89q.worldedit.EditSession;
-import com.sk89q.worldedit.IncompleteRegionException;
-import com.sk89q.worldedit.LocalSession;
-import com.sk89q.worldedit.MaxChangedBlocksException;
-import com.sk89q.worldedit.WorldEdit;
-import com.sk89q.worldedit.bukkit.BukkitAdapter;
-import com.sk89q.worldedit.extent.clipboard.Clipboard;
-import com.sk89q.worldedit.extent.clipboard.io.*;
-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 net.kyori.adventure.nbt.TagStringIO;
-import org.apache.commons.lang.exception.ExceptionUtils;
-import org.bukkit.entity.Player;
-import org.bukkit.util.BoundingBox;
-
-import java.io.BufferedInputStream;
-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;
-import java.util.zip.GZIPInputStream;
-
-// 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(), 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);
-		}
-	}
-
-	@Beta
-	public CompletableFuture<Boolean> restoreRegionBlocksAsync(File rawFile, GeneralRegionInterface regionInterface) {
-		File file = null;
-		ClipboardFormat format = null;
-		for (ClipboardFormat formatOption : BuiltInClipboardFormat.values()) {
-			if (new File(rawFile.getAbsolutePath() + "." + formatOption.getPrimaryFileExtension())
-					.exists()) {
-				file = new File(
-						rawFile.getAbsolutePath() + "." + formatOption.getPrimaryFileExtension());
-				format = formatOption;
-				break;
-			}
-		}
-		if (file == null) {
-			pluginInterface.getLogger().info("Did not restore region " + regionInterface.getName()
-					+ ", schematic file does not exist: " + rawFile.getAbsolutePath());
-			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 CompletableFuture<Boolean> completableFuture = new CompletableFuture<>();
-		final FaweLimit limit = new FaweLimit();
-		limit.MAX_CHANGES = pluginInterface.getConfig().getInt("maximumBlocks");
-		EditSession editSession = WorldEdit.getInstance().newEditSessionBuilder()
-				.world(world)
-				.limit(limit)
-				.relightMode(RelightMode.OPTIMAL)
-				.build();
-		editSession.setReorderMode(EditSession.ReorderMode.MULTI_STAGE);
-		ProtectedRegion region = regionInterface.getRegion();
-		final RegionType regionType = region.getType();
-		// Get the origin and size of the region
-		final BlockVector3 origin = BlockVector3
-				.at(region.getMinimumPoint().getBlockX(), region.getMinimumPoint().getBlockY(),
-						region.getMinimumPoint().getBlockZ());
-		final RegionBoundMask mask = new RegionBoundMask(region);
-		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());
-		FaweAPI.getTaskManager().async(() -> {
-			// Read the schematic and paste it into the world
-			try (Closer closer = Closer.create()) {
-				FileInputStream fis = closer.register(new FileInputStream(finalFile));
-				BufferedInputStream bis = closer.register(new BufferedInputStream(fis));
-				NBTInputStream nbtStream = new NBTInputStream(new GZIPInputStream(bis));
-				ClipboardReader reader = new FastSchematicReader(nbtStream);
-
-				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"));
-				CompletableFuture.completedFuture(false);
-			} catch (IOException e) {
-				pluginInterface.getLogger().warning(
-						"An error occured while restoring schematic of " + regionInterface.getName()
-								+ ", enable debug to see the complete stacktrace");
-				pluginInterface.debugI(ExceptionUtils.getStackTrace(e));
-				CompletableFuture.completedFuture(false);
-			} catch (Exception e) {
-				pluginInterface.getLogger()
-						.warning("crashed during restore of " + regionInterface.getName());
-				pluginInterface.debugI(ExceptionUtils.getStackTrace(e));
-				CompletableFuture.completedFuture(false);
-			}
-			editSession.flushQueue();
-			CompletableFuture.completedFuture(true);
-		});
-		return completableFuture;
-	}
-
-	@Override
-	public boolean restoreRegionBlocks(File rawFile, GeneralRegionInterface regionInterface) {
-		return restoreRegionBlocksAsync(rawFile, regionInterface).join();
-	}
-
-
-	@Beta
-	public CompletableFuture<Boolean> saveRegionBlocksAsync(File file, GeneralRegionInterface regionInterface) {
-		// TODO implement using the FastAsyncWorldEdit api to save async
-		ClipboardFormat format = BuiltInClipboardFormat.MINECRAFT_STRUCTURE;
-		// 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 = WorldEdit.getInstance().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);
-			}
-
-			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 occured 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);
-			}
-			completableFuture.complete(true);
-		});
-		return completableFuture;
-	}
-
-	@Override
-	public boolean saveRegionBlocks(File file, GeneralRegionInterface regionInterface) {
-		return saveRegionBlocksAsync(file, regionInterface).join();
-	}
-
-	@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;
-		}
-	}
-}
@@ -1,160 +0,0 @@
-package me.wiefferink.areashop.handlers;
-
-import com.sk89q.worldedit.bukkit.BukkitAdapter;
-import com.sk89q.worldedit.math.BlockVector2;
-import com.sk89q.worldedit.math.BlockVector3;
-import com.sk89q.worldguard.WorldGuard;
-import com.sk89q.worldguard.domains.DefaultDomain;
-import com.sk89q.worldguard.protection.flags.Flag;
-import com.sk89q.worldguard.protection.flags.FlagContext;
-import com.sk89q.worldguard.protection.flags.Flags;
-import com.sk89q.worldguard.protection.flags.InvalidFlagFormat;
-import com.sk89q.worldguard.protection.flags.RegionGroup;
-import com.sk89q.worldguard.protection.flags.RegionGroupFlag;
-import com.sk89q.worldguard.protection.managers.RegionManager;
-import com.sk89q.worldguard.protection.regions.ProtectedCuboidRegion;
-import com.sk89q.worldguard.protection.regions.ProtectedRegion;
-import me.wiefferink.areashop.interfaces.AreaShopInterface;
-import me.wiefferink.areashop.interfaces.RegionAccessSet;
-import me.wiefferink.areashop.interfaces.WorldGuardInterface;
-import org.bukkit.Location;
-import org.bukkit.World;
-import org.bukkit.util.Vector;
-
-import java.util.ArrayList;
-import java.util.HashSet;
-import java.util.List;
-import java.util.Set;
-import java.util.UUID;
-
-public class FastAsyncWorldEditWorldGuardHandler extends WorldGuardInterface {
-
-	public FastAsyncWorldEditWorldGuardHandler(AreaShopInterface pluginInterface) {
-		super(pluginInterface);
-	}
-
-	@Override
-	public RegionManager getRegionManager(World world) {
-		return WorldGuard.getInstance().getPlatform().getRegionContainer().get(BukkitAdapter.adapt(world));
-	}
-
-	@Override
-	public Set<ProtectedRegion> getApplicableRegionsSet(Location location) {
-		Set<ProtectedRegion> result = new HashSet<>();
-		BlockVector3 vector = BlockVector3.at(location.getX(), location.getY(), location.getZ());
-		for(ProtectedRegion region : getRegionManager(location.getWorld()).getRegions().values()) {
-			if(region.contains(vector)) {
-				result.add(region);
-			}
-		}
-		return result;
-	}
-
-	/**
-	 * Build a DefaultDomain from a RegionAccessSet.
-	 * @param regionAccessSet RegionAccessSet to read
-	 * @return DefaultDomain containing the entities from the RegionAccessSet
-	 */
-	private DefaultDomain buildDomain(RegionAccessSet regionAccessSet) {
-		DefaultDomain owners = new DefaultDomain();
-
-		for(String playerName : regionAccessSet.getPlayerNames()) {
-			owners.addPlayer(playerName);
-		}
-
-		for(UUID uuid : regionAccessSet.getPlayerUniqueIds()) {
-			owners.addPlayer(uuid);
-		}
-
-		for(String group : regionAccessSet.getGroupNames()) {
-			owners.addGroup(group);
-		}
-
-		return owners;
-	}
-
-	@Override
-	public void setOwners(ProtectedRegion region, RegionAccessSet regionAccessSet) {
-		DefaultDomain defaultDomain = buildDomain(regionAccessSet);
-		if(!region.getOwners().toUserFriendlyString().equals(defaultDomain.toUserFriendlyString())) {
-			region.setOwners(defaultDomain);
-		}
-	}
-
-	@Override
-	public void setMembers(ProtectedRegion region, RegionAccessSet regionAccessSet) {
-		DefaultDomain defaultDomain = buildDomain(regionAccessSet);
-		if(!region.getMembers().toUserFriendlyString().equals(defaultDomain.toUserFriendlyString())) {
-			region.setMembers(defaultDomain);
-		}
-	}
-
-	@Override
-	public boolean containsMember(ProtectedRegion region, UUID player) {
-		return region.getMembers().contains(player);
-	}
-
-	@Override
-	public boolean containsOwner(ProtectedRegion region, UUID player) {
-		return region.getOwners().contains(player);
-	}
-
-	@Override
-	public RegionAccessSet getMembers(ProtectedRegion region) {
-		RegionAccessSet result = new RegionAccessSet();
-		result.getGroupNames().addAll(region.getMembers().getGroups());
-		result.getPlayerNames().addAll(region.getMembers().getPlayers());
-		result.getPlayerUniqueIds().addAll(region.getMembers().getUniqueIds());
-		return result;
-	}
-
-	@Override
-	public RegionAccessSet getOwners(ProtectedRegion region) {
-		RegionAccessSet result = new RegionAccessSet();
-		result.getGroupNames().addAll(region.getOwners().getGroups());
-		result.getPlayerNames().addAll(region.getOwners().getPlayers());
-		result.getPlayerUniqueIds().addAll(region.getOwners().getUniqueIds());
-		return result;
-	}
-
-	@Override
-	public Flag<?> fuzzyMatchFlag(String flagName) {
-		return Flags.fuzzyMatchFlag(WorldGuard.getInstance().getFlagRegistry(), flagName);
-	}
-
-	@Override
-	public <V> V parseFlagInput(Flag<V> flag, String input) throws InvalidFlagFormat {
-		return flag.parseInput(FlagContext.create().setInput(input).build());
-	}
-
-	@Override
-	public RegionGroup parseFlagGroupInput(RegionGroupFlag flag, String input) throws InvalidFlagFormat {
-		return flag.parseInput(FlagContext.create().setInput(input).build());
-	}
-
-	@Override
-	public Vector getMinimumPoint(ProtectedRegion region) {
-		BlockVector3 min = region.getMinimumPoint();
-		return new Vector(min.getX(), min.getY(), min.getZ());
-	}
-
-	@Override
-	public Vector getMaximumPoint(ProtectedRegion region) {
-		BlockVector3 min = region.getMaximumPoint();
-		return new Vector(min.getX(), min.getY(), min.getZ());
-	}
-
-	@Override
-	public List<Vector> getRegionPoints(ProtectedRegion region) {
-		List<Vector> result = new ArrayList<>();
-		for (BlockVector2 point : region.getPoints()) {
-			result.add(new Vector(point.getX(), 0,point.getZ()));
-		}
-		return result;
-	}
-
-	@Override
-	public ProtectedCuboidRegion createCuboidRegion(String name, Vector corner1, Vector corner2) {
-		return new ProtectedCuboidRegion(name, BlockVector3.at(corner1.getBlockX(), corner1.getBlockY(), corner1.getBlockZ()), BlockVector3.at(corner2.getBlockX(), corner2.getBlockY(), corner2.getBlockZ()));
-	}
-}
@@ -0,0 +1,16 @@
+repositories {
+    maven {
+        name = 'IS-Repo'
+        url = uri('https://mvn.intellectualsites.com/content/repositories/releases/')
+    }
+}
+
+dependencies {
+    compileOnly project(':areashop-interface')
+    compileOnly 'org.spigotmc:spigot-api:1.16.5-R0.1-SNAPSHOT'
+    compileOnly ('com.intellectualsites.fawe:FAWE-Core:1.16-725')
+    compileOnly ('com.intellectualsites.fawe:FAWE-Bukkit:1.16-725')
+    compileOnly 'com.sk89q.worldguard:worldguard-bukkit:7.0.5'
+}
+
+description = 'AreaShop FastAsyncWorldEdit 1.16'
@@ -0,0 +1,289 @@
+package me.wiefferink.areashop.handlers.fawe.v1_16;
+
+import com.boydti.fawe.FaweAPI;
+import com.boydti.fawe.object.FaweLimit;
+import com.boydti.fawe.object.RelightMode;
+import com.boydti.fawe.object.clipboard.MemoryOptimizedClipboard;
+import com.boydti.fawe.util.EditSessionBuilder;
+import com.google.common.annotations.Beta;
+import com.sk89q.jnbt.NBTInputStream;
+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.Clipboard;
+import com.sk89q.worldedit.extent.clipboard.io.*;
+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.BufferedInputStream;
+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;
+import java.util.zip.GZIPInputStream;
+
+// 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(), 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
+    @Beta
+    public CompletableFuture<Boolean> restoreRegionBlocksAsync(File rawFile, GeneralRegionInterface regionInterface) {
+        File file = null;
+        ClipboardFormat format = null;
+        for (ClipboardFormat formatOption : BuiltInClipboardFormat.values()) {
+            if (new File(rawFile.getAbsolutePath() + "." + formatOption.getPrimaryFileExtension())
+                    .exists()) {
+                file = new File(
+                        rawFile.getAbsolutePath() + "." + formatOption.getPrimaryFileExtension());
+                format = formatOption;
+                break;
+            }
+        }
+        if (file == null) {
+            pluginInterface.getLogger().info("Did not restore region " + regionInterface.getName()
+                                                     + ", schematic file does not exist: " + rawFile.getAbsolutePath());
+            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 CompletableFuture<Boolean> completableFuture = new CompletableFuture<>();
+        final FaweLimit limit = new FaweLimit();
+        limit.MAX_CHANGES = pluginInterface.getConfig().getInt("maximumBlocks");
+        EditSession editSession = new EditSessionBuilder(world).limit(limit).relightMode(RelightMode.OPTIMAL).build();
+        editSession.setReorderMode(EditSession.ReorderMode.MULTI_STAGE);
+        ProtectedRegion region = regionInterface.getRegion();
+        final RegionType regionType = region.getType();
+        // Get the origin and size of the region
+        final BlockVector3 origin = BlockVector3
+                .at(region.getMinimumPoint().getBlockX(), region.getMinimumPoint().getBlockY(),
+                    region.getMinimumPoint().getBlockZ());
+        final RegionBoundMask mask = new RegionBoundMask(region);
+        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());
+        FaweAPI.getTaskManager().async(() -> {
+            // Read the schematic and paste it into the world
+            try (Closer closer = Closer.create()) {
+                FileInputStream fis = closer.register(new FileInputStream(finalFile));
+                BufferedInputStream bis = closer.register(new BufferedInputStream(fis));
+                NBTInputStream nbtStream = new NBTInputStream(new GZIPInputStream(bis));
+                ClipboardReader reader = new FastSchematicReader(nbtStream);
+
+                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(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"));
+                CompletableFuture.completedFuture(false);
+            } catch (IOException e) {
+                pluginInterface.getLogger().warning(
+                        "An error occured while restoring schematic of " + regionInterface.getName()
+                                + ", enable debug to see the complete stacktrace");
+                pluginInterface.debugI(ExceptionUtils.getStackTrace(e));
+                CompletableFuture.completedFuture(false);
+            } catch (Exception e) {
+                pluginInterface.getLogger()
+                               .warning("crashed during restore of " + regionInterface.getName());
+                pluginInterface.debugI(ExceptionUtils.getStackTrace(e));
+                CompletableFuture.completedFuture(false);
+            }
+            editSession.flushQueue();
+            CompletableFuture.completedFuture(true);
+        });
+        return completableFuture;
+    }
+
+    @Override
+    public boolean restoreRegionBlocks(File rawFile, GeneralRegionInterface regionInterface) {
+        return restoreRegionBlocksAsync(rawFile, regionInterface).join();
+    }
+
+    @Override
+    @Beta
+    public CompletableFuture<Boolean> saveRegionBlocksAsync(File file, GeneralRegionInterface regionInterface) {
+        // TODO implement using the FastAsyncWorldEdit api to save async
+        ClipboardFormat format = BuiltInClipboardFormat.MINECRAFT_STRUCTURE;
+        // 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 = new EditSessionBuilder(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);
+            }
+
+            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 occured 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);
+            }
+            completableFuture.complete(true);
+        });
+        return completableFuture;
+    }
+
+    @Override
+    public boolean saveRegionBlocks(File file, GeneralRegionInterface regionInterface) {
+        return saveRegionBlocksAsync(file, regionInterface).join();
+    }
+
+    @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;
+        }
+    }
+}
@@ -0,0 +1,16 @@
+repositories {
+    maven {
+        name = 'IS-Repo'
+        url = uri('https://mvn.intellectualsites.com/content/repositories/releases/')
+    }
+}
+
+dependencies {
+    compileOnly project(':areashop-interface')
+    compileOnly('org.spigotmc:spigot-api:1.17.1-R0.1-SNAPSHOT')
+    compileOnly("com.fastasyncworldedit:FAWE-Core:1.17-138")
+    compileOnly("com.fastasyncworldedit:FAWE-Bukkit:1.17-138")
+    compileOnly('com.sk89q.worldguard:worldguard-bukkit:7.0.5')
+}
+
+description = 'AreaShop FastAsyncWorldEdit 1.17'
@@ -0,0 +1,290 @@
+package me.wiefferink.areashop.handlers.fawe.v1_17;
+
+import com.fastasyncworldedit.core.FaweAPI;
+import com.fastasyncworldedit.core.extent.clipboard.MemoryOptimizedClipboard;
+import com.fastasyncworldedit.core.extent.clipboard.io.FastSchematicReader;
+import com.fastasyncworldedit.core.extent.processor.lighting.RelightMode;
+import com.fastasyncworldedit.core.object.FaweLimit;
+import com.fastasyncworldedit.core.util.EditSessionBuilder;
+import com.google.common.annotations.Beta;
+import com.sk89q.jnbt.NBTInputStream;
+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.Clipboard;
+import com.sk89q.worldedit.extent.clipboard.io.*;
+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.BufferedInputStream;
+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;
+import java.util.zip.GZIPInputStream;
+
+// 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(), 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
+    @Beta
+    public CompletableFuture<Boolean> restoreRegionBlocksAsync(File rawFile, GeneralRegionInterface regionInterface) {
+        File file = null;
+        ClipboardFormat format = null;
+        for (ClipboardFormat formatOption : BuiltInClipboardFormat.values()) {
+            if (new File(rawFile.getAbsolutePath() + "." + formatOption.getPrimaryFileExtension())
+                    .exists()) {
+                file = new File(
+                        rawFile.getAbsolutePath() + "." + formatOption.getPrimaryFileExtension());
+                format = formatOption;
+                break;
+            }
+        }
+        if (file == null) {
+            pluginInterface.getLogger().info("Did not restore region " + regionInterface.getName()
+                                                     + ", schematic file does not exist: " + rawFile.getAbsolutePath());
+            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 CompletableFuture<Boolean> completableFuture = new CompletableFuture<>();
+        final FaweLimit limit = new FaweLimit();
+        limit.MAX_CHANGES = pluginInterface.getConfig().getInt("maximumBlocks");
+        EditSession editSession = new EditSessionBuilder(world).limit(limit).relightMode(RelightMode.OPTIMAL).build();
+        editSession.setReorderMode(EditSession.ReorderMode.MULTI_STAGE);
+        ProtectedRegion region = regionInterface.getRegion();
+        final RegionType regionType = region.getType();
+        // Get the origin and size of the region
+        final BlockVector3 origin = BlockVector3
+                .at(region.getMinimumPoint().getBlockX(), region.getMinimumPoint().getBlockY(),
+                    region.getMinimumPoint().getBlockZ());
+        final RegionBoundMask mask = new RegionBoundMask(region);
+        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());
+        FaweAPI.getTaskManager().async(() -> {
+            // Read the schematic and paste it into the world
+            try (Closer closer = Closer.create()) {
+                FileInputStream fis = closer.register(new FileInputStream(finalFile));
+                BufferedInputStream bis = closer.register(new BufferedInputStream(fis));
+                NBTInputStream nbtStream = new NBTInputStream(new GZIPInputStream(bis));
+                ClipboardReader reader = new FastSchematicReader(nbtStream);
+
+                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(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"));
+                CompletableFuture.completedFuture(false);
+            } catch (IOException e) {
+                pluginInterface.getLogger().warning(
+                        "An error occured while restoring schematic of " + regionInterface.getName()
+                                + ", enable debug to see the complete stacktrace");
+                pluginInterface.debugI(ExceptionUtils.getStackTrace(e));
+                CompletableFuture.completedFuture(false);
+            } catch (Exception e) {
+                pluginInterface.getLogger()
+                               .warning("crashed during restore of " + regionInterface.getName());
+                pluginInterface.debugI(ExceptionUtils.getStackTrace(e));
+                CompletableFuture.completedFuture(false);
+            }
+            editSession.flushQueue();
+            CompletableFuture.completedFuture(true);
+        });
+        return completableFuture;
+    }
+
+    @Override
+    public boolean restoreRegionBlocks(File rawFile, GeneralRegionInterface regionInterface) {
+        return restoreRegionBlocksAsync(rawFile, regionInterface).join();
+    }
+
+    @Override
+    @Beta
+    public CompletableFuture<Boolean> saveRegionBlocksAsync(File file, GeneralRegionInterface regionInterface) {
+        // TODO implement using the FastAsyncWorldEdit api to save async
+        ClipboardFormat format = BuiltInClipboardFormat.MINECRAFT_STRUCTURE;
+        // 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 = new EditSessionBuilder(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);
+            }
+
+            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 occured 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);
+            }
+            completableFuture.complete(true);
+        });
+        return completableFuture;
+    }
+
+    @Override
+    public boolean saveRegionBlocks(File file, GeneralRegionInterface regionInterface) {
+        return saveRegionBlocksAsync(file, regionInterface).join();
+    }
+
+    @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;
+        }
+    }
+}
@@ -0,0 +1,7 @@
+dependencies {
+    compileOnly 'org.spigotmc:spigot-api:1.16.5-R0.1-SNAPSHOT'
+    compileOnly 'com.sk89q.worldedit:worldedit-bukkit:7.2.5-SNAPSHOT'
+    compileOnly 'com.sk89q.worldguard:worldguard-bukkit:7.0.5'
+}
+
+description = 'AreaShop Interface'
Author	SHA1	Message	Date
Andrew Wong	b50d57739f	Bump version	2021-08-16 13:30:46 +02:00
Andrew Wong	ce9438eaeb	Fix compile errors in the fawe 1.17 module	2021-08-16 13:26:50 +02:00
Andrew Wong	47cc259c40	Fix startup errors, bump fawe version	2021-08-16 13:23:26 +02:00
Andrew Wong	e6ae122b86	Fix missing version	2021-06-29 22:38:59 +02:00
Andrew Wong	2562075b90	Add fawe module for 1.17	2021-06-24 17:25:14 +02:00
Andrew Wong	9fc5d8a314	Add support for 1.17	2021-06-23 14:24:15 +02:00
Andrew Wong	e96b179c48	Performance improvements and bug fixes to sign	2021-06-23 14:20:05 +02:00
Andrew Wong	49bed6f655	Use the updated method of making an edit session	2021-06-23 13:45:15 +02:00
Andrew Wong	ffc5b03a75	Fix merge conflicts	2021-06-23 13:43:23 +02:00
Andrew Wong	69fea8ab7e	Fix merge conflicts	2021-06-23 12:38:45 +02:00
Andrew Wong	29fc2c4205	Move maven things to gradle	2021-06-23 12:23:06 +02:00
Andrew Wong	2dd6d4ec4a	Don't use deprecated methods in WorldGuard and WorldEdit handlers	2021-06-23 11:45:00 +02:00
Andrew Wong	789073f6d6	Bump worldedit and worldguard versions	2021-06-23 11:41:04 +02:00
Andrew Wong	d211bf2f43	Move compat to 1.16	2021-06-23 11:16:02 +02:00
Andrew Wong	a6659cb14d	Remove bstats	2021-06-23 10:58:20 +02:00
Andrew Wong	880218cca0	Bump gradle to 7.1 and java version to 16	2021-06-23 10:47:05 +02:00
Andrew Wong	3426381273	Gradleise	2021-06-04 14:45:00 +02:00
Andrew Wong	80a73fecea	Load invalid region files when trying to delete them	2021-06-04 13:24:33 +02:00
Andrew Wong	590d5a4988	Fix names and pom	2021-06-03 12:24:35 +02:00
Andrew Wong	dda4a090fb	Fix merge conflicts	2021-06-03 12:24:17 +02:00
Andrew Wong	3a415513dd	Fix tab completions	2021-01-18 19:02:34 +01:00
Andrew Wong	8ec6a43dc8	Update the fawe hook	2020-11-04 17:38:24 +01:00
Andrew Wong	2d81614f5f	Update the fawe hook	2020-11-04 17:34:43 +01:00
Andrew Wong	8fb035015d	Cache rent and buy regions in a seperate map in FileManager	2020-11-04 17:19:14 +01:00
Andrew Wong	77088a3a72	Performance improvements	2020-11-04 16:38:13 +01:00
Andrew Wong	2c2f40b0ea	Fix merge conflict	2020-09-25 16:55:13 +02:00
Andrew Wong	07406c3987	Improve the performance of TeleportFeature#teleportPlayer Split chunk loading accross multiple ticks, delay 3 ticks before executing teleport logic	2020-09-25 13:01:09 +02:00
Andrew Wong	82a90b350d	Minor bug fixes	2020-08-22 01:37:33 +02:00
Andrew Wong	151fbe8000	Move away from using BukkitDo; Add TaskChain as a dependency	2020-08-17 21:47:44 +02:00
Andrew Wong	f2a4dd71e3	Update README.md	2020-08-16 23:44:06 +02:00
Andrew Wong	d4cc70f954	Rename version	2020-08-16 23:41:56 +02:00
Andrew Wong	8001047480	Add in the spigot repo	2020-08-16 23:31:29 +02:00
Andrew Wong	af1486a6fa	Create maven.yml	2020-08-16 23:27:40 +02:00
Andrew Wong	36a2d054d6	Bump maven plugin versions	2020-08-16 23:24:37 +02:00
Andrew Wong	7429b0a206	Remove system dependencies. Utilise PaperLib when teleporting. Remove support for pre-1.13. Added support for 1.16.1	2020-08-16 23:17:08 +02:00