Add a sign error logger

Split chunk loading accross multiple ticks, delay 3 ticks before executing teleport logic

.github/workflows/maven.yml

@@ -0,0 +1,32 @@
+# This workflow will build a Java project with Maven
+# For more information see: https://help.github.com/actions/language-and-framework-guides/building-and-testing-java-with-maven
+
+name: Java CI with Maven
+
+on:
+  push:
+    branches: [ master ]
+  pull_request:
+    branches: [ master ]
+
+jobs:
+  build:
+
+    runs-on: ubuntu-latest
+
+    steps:
+    - uses: actions/checkout@v2
+    - name: Set up JDK 1.8
+      uses: actions/setup-java@v1
+      with:
+        java-version: 1.8
+    - name: Cache local Maven repository
+      uses: actions/cache@v2
+      with:
+        path: ~/.m2/repository
+        key: ${{ runner.os }}-maven-${{ hashFiles('**/pom.xml') }}
+        restore-keys: |
+          ${{ runner.os }}-maven-
+    - name: Build with Maven
+      run: mvn -B package --file pom.xml
+      

.gitignore

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

AreaShop/build.gradle.kts

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

AreaShop/pom.xml

@@ -0,0 +1,285 @@
+<project xmlns="http://maven.apache.org/POM/4.0.0" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
+         xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/xsd/maven-4.0.0.xsd">
+    <modelVersion>4.0.0</modelVersion>
+
+    <parent>
+        <groupId>me.wiefferink</groupId>
+        <artifactId>areashop-parent</artifactId>
+        <version>1.0</version>
+    </parent>
+
+    <artifactId>areashop</artifactId>
+    <packaging>jar</packaging>
+    <name>AreaShop</name>
+    <version>2.7</version> <!-- Main plugin version -->
+
+    <repositories>
+        <repository>
+            <id>papermc</id>
+            <url>https://papermc.io/repo/repository/maven-public/</url>
+        </repository>
+        <repository>
+            <id>aikar</id>
+            <url>https://repo.aikar.co/content/groups/aikar/</url>
+        </repository>
+    </repositories>
+
+    <dependencies>
+        <!-- Bukkit, AreaShop aims to support 1.16.5+ -->
+        <dependency>
+            <groupId>org.spigotmc</groupId>
+            <artifactId>spigot-api</artifactId>
+            <version>1.16.5-R0.1-SNAPSHOT</version>
+            <scope>provided</scope>
+        </dependency>
+
+        <!-- InteractiveMessenger library -->
+        <dependency>
+            <groupId>me.wiefferink</groupId>
+            <artifactId>interactivemessenger</artifactId>
+            <version>1.1-SNAPSHOT</version>
+        </dependency>
+
+        <!-- TaskChain library -->
+        <dependency>
+            <groupId>co.aikar</groupId>
+            <artifactId>taskchain-bukkit</artifactId>
+            <version>3.7.2</version>
+        </dependency>
+
+        <dependency>
+            <groupId>io.papermc</groupId>
+            <artifactId>paperlib</artifactId>
+            <version>1.0.4</version>
+        </dependency>
+
+        <!-- WorldEdit/WorldGuard -->
+        <dependency>
+            <groupId>com.sk89q.worldedit</groupId>
+            <artifactId>worldedit-bukkit</artifactId>
+            <version>7.1.0-SNAPSHOT</version>
+            <scope>provided</scope>
+        </dependency>
+        <dependency>
+            <groupId>com.sk89q.worldguard</groupId>
+            <artifactId>worldguard-bukkit</artifactId>
+            <version>7.0.3</version>
+            <scope>provided</scope>
+        </dependency>
+
+        <!-- Interfaces that specific WorldGuard and WorldEdit versions are built against -->
+        <dependency>
+            <groupId>me.wiefferink</groupId>
+            <artifactId>areashop-interface</artifactId>
+            <version>latest</version>
+            <scope>compile</scope>
+        </dependency>
+
+        <!-- WorldGuard implementations -->
+        <dependency>
+            <groupId>me.wiefferink</groupId>
+            <artifactId>areashop-worldguard-7</artifactId>
+            <version>latest</version>
+            <scope>compile</scope>
+        </dependency>
+
+        <!-- WorldEdit implementations -->
+        <dependency>
+            <groupId>me.wiefferink</groupId>
+            <artifactId>areashop-worldedit-7</artifactId>
+            <version>latest</version>
+            <scope>compile</scope>
+        </dependency>
+
+        <!-- FAWE compat -->
+        <dependency>
+            <groupId>me.wiefferink</groupId>
+            <artifactId>areashop-fawe-1-15</artifactId>
+            <version>latest</version>
+            <type>jar</type>
+            <scope>compile</scope>
+        </dependency>
+
+        <!-- Vault -->
+        <dependency>
+            <groupId>net.milkbowl.vault</groupId>
+            <artifactId>VaultAPI</artifactId>
+            <version>1.7</version>
+            <scope>provided</scope>
+        </dependency>
+
+        <!-- bStats -->
+        <dependency>
+            <groupId>org.bstats</groupId>
+            <artifactId>bstats-bukkit</artifactId>
+            <version>1.1</version>
+            <scope>compile</scope>
+        </dependency>
+
+    </dependencies>
+
+    <profiles>
+        <!-- Copy the jar file to a test server, activate by using -DcopyResult="/path/to/test/server" -->
+        <profile>
+            <id>test-locally</id>
+            <activation>
+                <property>
+                    <name>copyResult</name>
+                </property>
+            </activation>
+            <build>
+                <plugins>
+                    <plugin>
+                        <artifactId>maven-antrun-plugin</artifactId>
+                        <version>1.8</version>
+                        <configuration>
+                            <target>
+                                <copy file="./target/${project.build.finalName}.jar"
+                                      tofile="${copyResult}\${project.build.finalName}.jar"/>
+                            </target>
+                        </configuration>
+                        <executions>
+                            <execution>
+                                <phase>package</phase>
+                                <goals>
+                                    <goal>run</goal>
+                                </goals>
+                            </execution>
+                        </executions>
+                    </plugin>
+                </plugins>
+            </build>
+        </profile>
+
+        <!-- Package the source files in a jar, activate by using -Dsources -->
+        <profile>
+            <id>package-sources</id>
+            <activation>
+                <property>
+                    <name>sources</name>
+                </property>
+            </activation>
+            <build>
+                <plugins>
+                    <plugin>
+                        <groupId>org.apache.maven.plugins</groupId>
+                        <artifactId>maven-source-plugin</artifactId>
+                        <version>3.2.1</version>
+                        <executions>
+                            <execution>
+                                <phase>package</phase>
+                                <id>attach-sources</id>
+                                <goals>
+                                    <goal>jar</goal>
+                                </goals>
+                            </execution>
+                        </executions>
+                    </plugin>
+                </plugins>
+            </build>
+        </profile>
+
+        <!-- Produce javadoc files, activate by using -Djavadoc -->
+        <profile>
+            <id>generate-javadoc</id>
+            <activation>
+                <property>
+                    <name>javadoc</name>
+                </property>
+            </activation>
+            <build>
+                <plugins>
+                    <plugin>
+                        <groupId>org.apache.maven.plugins</groupId>
+                        <artifactId>maven-javadoc-plugin</artifactId>
+                        <version>3.2.0</version>
+                        <executions>
+                            <execution>
+                                <phase>package</phase>
+                                <id>attach-javadocs</id>
+                                <goals>
+                                    <goal>jar</goal>
+                                </goals>
+                            </execution>
+                        </executions>
+                        <configuration>
+                            <excludePackageNames>me.wiefferink.areashop.lib</excludePackageNames>
+                            <destDir>${javadoc}</destDir>
+                            <links>
+                                <link>https://hub.spigotmc.org/javadocs/bukkit/</link>
+                                <link>http://docs.sk89q.com/worldedit/apidocs/</link>
+                                <link>http://docs.sk89q.com/worldguard/apidocs/</link>
+                            </links>
+                        </configuration>
+                    </plugin>
+                </plugins>
+            </build>
+        </profile>
+    </profiles>
+
+    <build>
+        <directory>target</directory>
+        <finalName>AreaShop</finalName>
+        <resources>
+            <resource>
+                <targetPath>.</targetPath>
+                <filtering>true</filtering>
+                <directory>src/main/resources</directory>
+                <includes>
+                    <include>plugin.yml</include>
+                    <include>config.yml</include>
+                    <include>hiddenConfig.yml</include>
+                    <include>default.yml</include>
+                    <include>README.md</include>
+                    <include>lang/*.yml</include>
+                </includes>
+            </resource>
+        </resources>
+        <plugins>
+            <plugin>
+                <groupId>org.apache.maven.plugins</groupId>
+                <artifactId>maven-shade-plugin</artifactId>
+                <version>3.2.3</version>
+                <executions>
+                    <execution>
+                        <phase>package</phase>
+                        <goals>
+                            <goal>shade</goal>
+                        </goals>
+                        <configuration>
+                            <relocations>
+                                <!-- Relocate TaskChain -->
+                                <relocation>
+                                    <pattern>co.aikar.taskchain</pattern>
+                                    <shadedPattern>me.wiefferink.areashop.shaded.taskchain</shadedPattern>
+                                </relocation>
+                                <!-- Relocate messaging framework -->
+                                <relocation>
+                                    <pattern>me.wiefferink.interactivemessenger</pattern>
+                                    <shadedPattern>me.wiefferink.areashop.shaded.interactivemessenger</shadedPattern>
+                                </relocation>
+                                <!-- Relocate bstats -->
+                                <relocation>
+                                    <pattern>org.bstats</pattern>
+                                    <shadedPattern>me.wiefferink.areashop.shaded.bstats</shadedPattern>
+                                </relocation>
+                                <relocation>
+                                    <pattern>io.papermc</pattern>
+                                    <shadedPattern>me.wiefferink.areashop.shaded.paperlib</shadedPattern>
+                                </relocation>
+                            </relocations>
+                        </configuration>
+                    </execution>
+                </executions>
+            </plugin>
+            <plugin>
+                <artifactId>maven-compiler-plugin</artifactId>
+                <version>3.8.1</version>
+                <configuration>
+                    <source>1.8</source>
+                    <target>1.8</target>
+                </configuration>
+            </plugin>
+        </plugins>
+    </build>
+</project>

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

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

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

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

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

@@ -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(
+		Utils.runAsBatches(regions.entrySet(),
 			plugin.getConfig().getInt("adding.regionsPerTick"),
-			regions.entrySet(),
-			regionEntry -> {
+				(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");

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

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

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

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

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

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

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

@@ -1,23 +1,23 @@
 package me.wiefferink.areashop.commands;
 
+import me.wiefferink.areashop.AreaShop;
 import me.wiefferink.interactivemessenger.processing.Message;
 import org.apache.commons.lang.StringUtils;
 import org.bukkit.command.Command;
 import org.bukkit.command.CommandSender;
 
-import java.util.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<>();
 	}
 
@@ -28,11 +28,12 @@ public abstract class CommandAreaShop {
 	 * @return true if it can execute the command, false otherwise
 	 */
 	public boolean canExecute(Command command, String[] args) {
-		String commandString = command.getName() + " " + StringUtils.join(args, " ");
-		if(commandString.length() > getCommandStart().length()) {
-			return commandString.toLowerCase().startsWith(getCommandStart().toLowerCase() + " ");
+		String commandString = command.getName() + " " + StringUtils.join(args, " ").toLowerCase();
+		final String start = getCommandStart().toLowerCase();
+		if(commandString.length() > start.length()) {
+			return commandString.startsWith(start + " ");
 		}
-		return commandString.toLowerCase().startsWith(getCommandStart().toLowerCase());
+		return commandString.startsWith(start);
 	}
 
 	/**
@@ -43,7 +44,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();
 	}
 
 	/**

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

@@ -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,12 @@ import me.wiefferink.areashop.tools.Utils;
 import org.bukkit.command.CommandSender;
 import org.bukkit.entity.Player;
 
-import javax.inject.Inject;
-import javax.inject.Singleton;
 import java.util.ArrayList;
 import java.util.List;
 import java.util.TreeSet;
 
-@Singleton
 public class DelCommand extends CommandAreaShop {
 
-	@Inject
-	private MessageBridge messageBridge;
-	@Inject
-	private WorldEditInterface worldEditInterface;
-	@Inject
-	private IFileManager fileManager;
-	
 	@Override
 	public String getCommandStart() {
 		return "areashop del";
@@ -48,24 +35,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");
+				plugin.message(player, "cmd-noRegionsFound");
 				return;
 			}
 			// Start removing the regions that he has permission for
@@ -86,7 +73,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,44 +83,44 @@ 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]);
+			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;
 			}
 			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);
+					DeletingRegionEvent event = plugin.getFileManager().deleteRegion(region, true);
 					if (event.isCancelled()) {
-						messageBridge.message(sender, "general-cancelled", event.getReason());
+						plugin.message(sender, "general-cancelled", event.getReason());
 					} else {
-						messageBridge.message(sender, "destroy-successRent", region);
+						plugin.message(sender, "destroy-successRent", region);
 					}
 				} else {
-					messageBridge.message(sender, "destroy-noPermissionRent", region);
+					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 = fileManager.deleteRegion(region, true);
+					DeletingRegionEvent event = plugin.getFileManager().deleteRegion(region, true);
 					if (event.isCancelled()) {
-						messageBridge.message(sender, "general-cancelled", event.getReason());
+						plugin.message(sender, "general-cancelled", event.getReason());
 					} else {
-						messageBridge.message(sender, "destroy-successBuy", region);
+						plugin.message(sender, "destroy-successBuy", region);
 					}
 				} else {
-					messageBridge.message(sender, "destroy-noPermissionBuy", region);
+					plugin.message(sender, "destroy-noPermissionBuy", region);
 				}
 			}
 		}
@@ -143,7 +130,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;
 	}

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

@@ -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

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

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

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

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

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

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

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

@@ -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");
 		}
 	}
 

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

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

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

@@ -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");
 		}
 	}
 }

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

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

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

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

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

@@ -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"));

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

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

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

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

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

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

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

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

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

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

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

@@ -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");

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

@@ -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");
 		}

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

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

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

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

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

@@ -1,92 +1,83 @@
 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.Collections;
 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";
-	}
+    /**
+     * Check if a person can teleport to the region (assuming he is not teleporting to a sign).
+     *
+     * @param person The person to check
+     * @param region The region to check for
+     * @return true if the person can teleport to it, otherwise false
+     */
+    public static boolean canUse(CommandSender person, GeneralRegion region) {
+        if (!(person instanceof Player)) {
+            return false;
+        }
+        Player player = (Player) person;
+        return player.hasPermission("areashop.teleportall")
+                || region.isOwner(player) && player.hasPermission("areashop.teleport")
+                || region.isAvailable() && player.hasPermission("areashop.teleportavailable")
+                || region.getFriendsFeature().getFriends().contains(player.getUniqueId()) && player.hasPermission("areashop.teleportfriend");
+    }
 
-	@Override
-	public String getHelp(CommandSender target) {
-		if(target.hasPermission("areashop.teleportall") || target.hasPermission("areashop.teleport")) {
-			return "help-teleport";
-		}
-		return null;
-	}
+    @Override
+    public String getCommandStart() {
+        return "areashop tp";
+    }
 
-	/**
-	 * Check if a person can teleport to the region (assuming he is not teleporting to a sign).
-	 * @param person The person to check
-	 * @param region The region to check for
-	 * @return true if the person can teleport to it, otherwise false
-	 */
-	public static boolean canUse(CommandSender person, GeneralRegion region) {
-		if(!(person instanceof Player)) {
-			return false;
-		}
-		Player player = (Player)person;
-		return player.hasPermission("areashop.teleportall")
-				|| region.isOwner(player) && player.hasPermission("areashop.teleport")
-				|| region.isAvailable() && player.hasPermission("areashop.teleportavailable")
-				|| region.getFriendsFeature().getFriends().contains(player.getUniqueId()) && player.hasPermission("areashop.teleportfriend");
-	}
+    @Override
+    public String getHelp(CommandSender target) {
+        if (target.hasPermission("areashop.teleportall") || target.hasPermission("areashop.teleport")) {
+            return "help-teleport";
+        }
+        return null;
+    }
 
-	@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");
-			return;
-		}
-		if(!(sender instanceof Player)) {
-			messageBridge.message(sender, "cmd-onlyByPlayer");
-			return;
-		}
-		if(args.length <= 1 || args[1] == null) {
-			messageBridge.message(sender, "teleport-help");
-			return;
-		}
-		Player player = (Player)sender;
-		GeneralRegion region = fileManager.getRegion(args[1]);
-		if(region == null) {
-			messageBridge.message(player, "teleport-noRentOrBuy", args[1]);
-			return;
-		}
+    @Override
+    public void execute(CommandSender sender, String[] args) {
+        if (!sender.hasPermission("areashop.teleport") && !sender.hasPermission("areashop.teleportall") && !sender.hasPermission("areashop.teleportavailable") && !sender.hasPermission("areashop.teleportavailablesign") && !sender.hasPermission("areashop.teleportsign") && !sender.hasPermission("areashop.teleportsignall") && !sender.hasPermission("areashop.teleportfriend") && !sender.hasPermission("teleportfriendsign")) {
+            plugin.message(sender, "teleport-noPermission");
+            return;
+        }
+        if (!(sender instanceof Player)) {
+            plugin.message(sender, "cmd-onlyByPlayer");
+            return;
+        }
+        if (args.length <= 1 || args[1] == null) {
+            plugin.message(sender, "teleport-help");
+            return;
+        }
+        Player player = (Player) sender;
+        GeneralRegion region = plugin.getFileManager().getRegion(args[1]);
+        if (region == null) {
+            plugin.message(player, "teleport-noRentOrBuy", args[1]);
+            return;
+        }
 
-		boolean toSign = args.length >= 3 && (
-				args[2].equalsIgnoreCase("sign")
-						|| args[2].equalsIgnoreCase("yes")
-						|| args[2].equalsIgnoreCase("true")
-		);
-		region.getTeleportFeature().teleportPlayer(player, toSign);
-	}
+        boolean toSign = args.length >= 3 && (
+                args[2].equalsIgnoreCase("sign")
+                        || args[2].equalsIgnoreCase("yes")
+                        || args[2].equalsIgnoreCase("true")
+        );
+        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());
-		} else if(toComplete == 3) {
-			result.add("sign");
-		}
-		return result;
-	}
+    @Override
+    public List<String> getTabCompleteList(int toComplete, String[] start, CommandSender sender) {
+        if (toComplete == 2) {
+            return plugin.getFileManager().getRegionNames();
+        } else if (toComplete == 3) {
+            return Collections.singletonList("sign");
+        }
+        return Collections.emptyList();
+    }
 
 }

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

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

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

@@ -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);

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

@@ -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());

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

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

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

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

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

@@ -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

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

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

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

@@ -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);

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

@@ -1,14 +1,10 @@
 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.regions.GeneralRegion;
 import me.wiefferink.areashop.tools.Materials;
 import me.wiefferink.areashop.tools.Utils;
@@ -16,6 +12,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,7 +23,6 @@ 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;
 
@@ -35,261 +31,267 @@ import java.util.List;
  */
 public class RegionSign {
 
-	private final BlockBehaviourHelper blockHelper;
-	private final SignErrorLogger errorLogger;
-	private final BukkitInterface bukkitInterface;
+    private final SignsFeature signsFeature;
+    private final String key;
 
-	private final SignsFeature signsFeature;
-	private final String key;
+    public RegionSign(SignsFeature signsFeature, String key) {
+        this.signsFeature = signsFeature;
+        this.key = key;
+    }
 
+    /**
+     * Get the location of this sign.
+     *
+     * @return The location of this sign
+     */
+    public Location getLocation() {
+        return Utils.configToLocation(getRegion().getConfig().getConfigurationSection("general.signs." + key + ".location"));
+    }
 
-	@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;
-	}
+    /**
+     * Location string to be used as key in maps.
+     *
+     * @return Location string
+     */
+    public String getStringLocation() {
+        return SignsFeature.locationToString(getLocation());
+    }
 
-	public BlockPosition getPosition() {
-		return new BlockPosition(getLocation());
-	}
+    /**
+     * 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);
+        signsFeature.getSignsRef().remove(getStringLocation());
+        SignsFeature.getAllSigns().remove(getStringLocation());
+        SignsFeature.getSignsByChunk().get(getStringChunk()).remove(this);
+        getRegion().setSetting("general.signs." + key, null);
+    }
 
-	/**
-	 * 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);
-		this.signsFeature.signManager().removeSign(this);
-		getRegion().setSetting("general.signs." + key, null);
-		// Remove the sign from the region's sign manager
-	}
+    /**
+     * Get the material of the sign as saved in the config.
+     *
+     * @return Material of the sign, usually or one of the other wood types (different result for 1.13-), 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() {
 
-	/**
-	 * 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;
-		}
-	}
+        // Ignore updates of signs in chunks that are not loaded
+        Location signLocation = getLocation();
+        if (signLocation == null
+                || signLocation.getWorld() == null
+                || !signLocation.getWorld().isChunkLoaded(signLocation.getBlockX() >> 4, signLocation.getBlockZ() >> 4)) {
+            return false;
+        }
 
-	/**
-	 * Get the material of the sign as saved in the config.
-	 * @return Material of the sign,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;
-	}
+        final GeneralRegion region = getRegion();
 
-	/**
-	 * Update this sign.
-	 * @return true if the update was successful, otherwise false
-	 */
-	public boolean update() {
-		// Ignore updates of signs in chunks that are not loaded
-		Location signLocation = getLocation();
-		if(signLocation == null
-				|| signLocation.getWorld() == null
-				|| !signLocation.getWorld().isChunkLoaded(signLocation.getBlockX() >> 4, signLocation.getBlockZ() >> 4)) {
-			return false;
-		}
+        if (region.isDeleted()) {
+            return false;
+        }
 
-		if(getRegion().isDeleted()) {
-			return false;
-		}
+        YamlConfiguration regionConfig = region.getConfig();
+        ConfigurationSection signConfig = getProfile();
+        Block block = signLocation.getBlock();
+        final String value = region.getState().getValue();
+        if (signConfig == null || !signConfig.isSet(value)) {
+            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;
-		}
+        ConfigurationSection stateConfig = signConfig.getConfigurationSection(value);
 
-		ConfigurationSection stateConfig = signConfig.getConfigurationSection(getRegion().getState().getValue());
+        // Get the lines
+        String[] signLines = new String[4];
+        boolean signEmpty = true;
+        for (int i = 0; i < 4; i++) {
+            signLines[i] = stateConfig.getString("line" + (i + 1));
+            signEmpty &= (signLines[i] == null || signLines[i].isEmpty());
+        }
+        if (signEmpty) {
+            block.setType(Material.AIR);
+            return true;
+        }
 
-		// 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 (!Tag.SIGNS.isTagged(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, region.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, region.getName(), signType.name()));
+        }
 
-		// Place the sign back (with proper rotation and type) after it has been hidden or (indirectly) destroyed
-		if(!Materials.isSign(block.getType())) {
-			Material signType = getMaterial();
-			if (!blockHelper.canPlace(block.getLocation(), Bukkit.createBlockData(signType))) {
-				errorLogger.submitWarning("Setting sign" +  key +  "of region" + getRegion().getName() +  "failed, could not set sign block back");
-				this.remove();
-				return false;
-			}
-			// Don't do physics here, we first need to update the direction
-			block.setType(signType, false);
+        // Save current rotation and type
+        if (!regionConfig.isString("general.signs." + key + ".signType")) {
+            region.setSetting("general.signs." + key + ".signType", blockState.getType().name());
+        }
+        if (!regionConfig.isString("general.signs." + key + ".facing")) {
+            final BlockFace rotation;
+            if (Materials.isSign(block.getType())) {
+                if (blockData instanceof org.bukkit.block.data.type.Sign) {
+                    rotation = ((org.bukkit.block.data.type.Sign) blockData).getRotation();
+                } else if (blockData instanceof WallSign) {
+                    rotation = ((WallSign) blockData).getFacing();
+                } else {
+                    rotation = null;
+                }
+            } else {
+                rotation = null;
+            }
+            region.setSetting("general.signs." + key + ".facing", rotation == null ? null : rotation.toString());
+        }
 
-			BlockState blockState = PaperLib.getBlockState(block, false).getState();
-			BlockData blockData = blockState.getBlockData();
+        // Apply replacements and color and then set it on the sign
+        Sign signState = (Sign) blockState;
+        for (int i = 0; i < signLines.length; i++) {
+            if (signLines[i] == null) {
+                signState.setLine(i, "");
+                continue;
+            }
+            signLines[i] = Message.fromString(signLines[i]).replacements(getRegion()).getSingle();
+            signLines[i] = Utils.applyColors(signLines[i]);
+            signState.setLine(i, signLines[i]);
+        }
+        // BlockState#update *should* return true here.
+        blockState.update(false, false);
+        return true;
+    }
 
-			if(blockData instanceof WallSign) {
-				((WallSign) blockData).setFacing(getFacing());
-			} else if(blockData instanceof org.bukkit.block.data.type.Sign) {
-				((org.bukkit.block.data.type.Sign) blockData).setRotation(getFacing());
-			} else {
-				errorLogger.submitWarning("Failed to update the facing direction of the sign at" + getStringLocation() + "to " + getFacing() + ", region:" + getRegion().getName());
-				return false;
-			}
-			block.setBlockData(blockData);
+    /**
+     * Check if the sign needs to update periodically.
+     *
+     * @return true if it needs periodic updates, otherwise false
+     */
+    public boolean needsPeriodicUpdate() {
+        ConfigurationSection signConfig = getProfile();
+        if (signConfig == null || !signConfig.isSet(getRegion().getState().getValue().toLowerCase())) {
+            return false;
+        }
 
-			// Check if the sign has popped
-			if(!Materials.isSign(block.getType())) {
-				return false;
-			}
-		}
+        ConfigurationSection stateConfig = signConfig.getConfigurationSection(getRegion().getState().getValue().toLowerCase());
+        if (stateConfig == null) {
+            return false;
+        }
 
-		// Save current rotation and type
-		if(!regionConfig.isString("general.signs." + key + ".signType")) {
-			getRegion().setSetting("general.signs." + key + ".signType", block.getType().name());
-		}
-		if(!regionConfig.isString("general.signs." + key + ".facing")) {
-			BlockFace signFacing = bukkitInterface.getSignFacing(block);
-			getRegion().setSetting("general.signs." + key + ".facing", signFacing == null ? null : signFacing.toString());
-		}
+        // Check the lines for the timeleft tag
+        for (int i = 1; i <= 4; i++) {
+            String line = stateConfig.getString("line" + i);
+            if (line != null && !line.isEmpty() && line.contains(Message.VARIABLE_START + AreaShop.tagTimeLeft + Message.VARIABLE_END)) {
+                return true;
+            }
+        }
+        return false;
+    }
 
-		// Apply replacements and color and then set it on the sign
-		Sign signState = (Sign) PaperLib.getBlockState(block, false).getState();
-		for(int i = 0; i < signLines.length; i++) {
-			if(signLines[i] == null) {
-				signState.setLine(i, "");
-				continue;
-			}
-			signLines[i] = Message.fromString(signLines[i]).replacements(getRegion()).getSingle();
-			signLines[i] = Utils.applyColors(signLines[i]);
-			signState.setLine(i, signLines[i]);
-		}
-		signState.update(false, false);
-		return true;
-	}
+    /**
+     * Run commands when a player clicks a sign.
+     *
+     * @param clicker   The player that clicked the sign
+     * @param clickType The type of clicking
+     * @return true if the commands ran successfully, false if any of them failed
+     */
+    public boolean runSignCommands(Player clicker, GeneralRegion.ClickType clickType) {
+        ConfigurationSection signConfig = getProfile();
+        if (signConfig == null) {
+            return false;
+        }
+        final GeneralRegion region = getRegion();
+        ConfigurationSection stateConfig = signConfig.getConfigurationSection(region.getState().getValue().toLowerCase());
 
-	/**
-	 * Check if the sign needs to update periodically.
-	 * @return true if it needs periodic updates, otherwise false
-	 */
-	public boolean needsPeriodicUpdate() {
-		ConfigurationSection signConfig = getProfile();
-		if(signConfig == null || !signConfig.isSet(getRegion().getState().getValue().toLowerCase())) {
-			return false;
-		}
+        // Run player commands if specified
+        List<String> playerCommands = new ArrayList<>();
+        for (String command : stateConfig.getStringList(clickType.getValue() + "Player")) {
+            // TODO move variable checking code to InteractiveMessenger?
+            playerCommands.add(command.replace(Message.VARIABLE_START + AreaShop.tagClicker + Message.VARIABLE_END, clicker.getName()));
+        }
+        region.runCommands(clicker, playerCommands);
 
-		ConfigurationSection stateConfig = signConfig.getConfigurationSection(getRegion().getState().getValue().toLowerCase());
-		if(stateConfig == null) {
-			return false;
-		}
+        // Run console commands if specified
+        List<String> consoleCommands = new ArrayList<>();
+        for (String command : stateConfig.getStringList(clickType.getValue() + "Console")) {
+            consoleCommands.add(command.replace(Message.VARIABLE_START + AreaShop.tagClicker + Message.VARIABLE_END, clicker.getName()));
+        }
+        region.runCommands(Bukkit.getConsoleSender(), consoleCommands);
 
-		// Check the lines for the timeleft tag
-		for(int i = 1; i <= 4; i++) {
-			String line = stateConfig.getString("line" + i);
-			if(line != null && line.contains(Message.VARIABLE_START + AreaShop.tagTimeLeft + Message.VARIABLE_END)) {
-				return true;
-			}
-		}
-		return false;
-	}
+        return !playerCommands.isEmpty() || !consoleCommands.isEmpty();
+    }
 
-	/**
-	 * Run commands when a player clicks a sign.
-	 * @param clicker   The player that clicked the sign
-	 * @param clickType The type of clicking
-	 * @return true if the commands ran successfully, false if any of them failed
-	 */
-	public boolean runSignCommands(Player clicker, GeneralRegion.ClickType clickType) {
-		ConfigurationSection signConfig = getProfile();
-		if(signConfig == null) {
-			return false;
-		}
-		ConfigurationSection stateConfig = signConfig.getConfigurationSection(getRegion().getState().getValue().toLowerCase());
+    @Override
+    public boolean equals(Object object) {
+        return object instanceof RegionSign && ((RegionSign) object).getRegion().equals(this.getRegion()) && ((RegionSign) object).key.equals(this.key);
+    }
 
-		// Run player commands if specified
-		List<String> playerCommands = new ArrayList<>();
-		for(String command : stateConfig.getStringList(clickType.getValue() + "Player")) {
-			// TODO move variable checking code to InteractiveMessenger?
-			playerCommands.add(command.replace(Message.VARIABLE_START + AreaShop.tagClicker + Message.VARIABLE_END, clicker.getName()));
-		}
-		getRegion().runCommands(clicker, playerCommands);
-
-		// 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());
+    }
 }

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

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

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

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

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

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

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

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

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

@@ -1,103 +1,639 @@
 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.events.notify.UpdateRegionEvent;
 import me.wiefferink.areashop.features.RegionFeature;
+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.entity.Player;
+import org.bukkit.event.EventHandler;
+import org.bukkit.event.EventPriority;
+import org.bukkit.event.block.Action;
+import org.bukkit.event.block.BlockBreakEvent;
+import org.bukkit.event.block.BlockPhysicsEvent;
+import org.bukkit.event.block.SignChangeEvent;
+import org.bukkit.event.player.PlayerInteractEvent;
+import org.bukkit.event.world.ChunkLoadEvent;
 
-import 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);
-			}
-		}
-	}
+    private static final Map<String, RegionSign> allSigns = Collections.synchronizedMap(new HashMap<>());
+    private static final Map<String, List<RegionSign>> signsByChunk = Collections.synchronizedMap(new HashMap<>());
 
-	/**
-	 * 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 Map<String, RegionSign> signs;
 
-	/**
-	 * Convert a chunk to a string to use as map key.
-	 * @param location The location to get the key for
-	 * @return A string to use in a map for a chunk
-	 */
-	public static String chunkToString(Location location) {
-		return location.getWorld().getName() + ";" + (location.getBlockX() >> 4) + ";" + (location.getBlockZ() >> 4);
-	}
+    public SignsFeature() {
 
-	@Override
-	public void shutdown() {
+    }
 
-	}
+    /**
+     * 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);
+                signsByChunk.computeIfAbsent(sign.getStringChunk(), key -> new ArrayList<>())
+                        .add(sign);
+            }
+            allSigns.putAll(signs);
+        }
+    }
 
-	public SignManager signManager() {
-		return this.internalSignManager;
-	}
+    /**
+     * 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();
+    }
 
-	/**
-	 * 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);
-	}
+    /**
+     * 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 allSigns.get(locationToString(location));
+    }
+
+    /**
+     * Get the map with all signs.
+     *
+     * @return Map with all signs: locationString -&gt; RegionSign
+     */
+    public static Map<String, RegionSign> getAllSigns() {
+        return allSigns;
+    }
+
+    /**
+     * Get the map with signs by chunk.
+     *
+     * @return Map with signs by chunk: chunkString -&gt; List&lt;RegionSign&gt;
+     */
+    public static Map<String, List<RegionSign>> getSignsByChunk() {
+        return signsByChunk;
+    }
+
+    @Override
+    public void shutdown() {
+        // Deregister signs from the registry
+        if (signs != null) {
+            for (Map.Entry<String, RegionSign> entry : signs.entrySet()) {
+                allSigns.remove(entry.getKey());
+                signsByChunk.get(entry.getValue().getStringChunk()).remove(entry.getValue());
+            }
+        }
+    }
+
+    @EventHandler(priority = EventPriority.HIGH)
+    public void onSignBreak(BlockBreakEvent event) {
+        if (event.isCancelled()) {
+            return;
+        }
+        Block block = event.getBlock();
+        // Check if it is a sign
+        if (Materials.isSign(block.getType())) {
+            // Check if the rent sign is really the same as a saved rent
+            RegionSign regionSign = SignsFeature.getSignByLocation(block.getLocation());
+            if (regionSign == null) {
+                return;
+            }
+            // Remove the sign of the rental region if the player has permission
+            if (event.getPlayer().hasPermission("areashop.delsign")) {
+                regionSign.remove();
+                plugin.message(event.getPlayer(), "delsign-success", regionSign.getRegion());
+            } else { // Cancel the breaking of the sign
+                event.setCancelled(true);
+                plugin.message(event.getPlayer(), "delsign-noPermission", regionSign.getRegion());
+            }
+        }
+    }
+
+    @EventHandler(priority = EventPriority.HIGHEST, ignoreCancelled = true)
+    public void onIndirectSignBreak(BlockPhysicsEvent event) {
+        // Check if the block is a sign
+        if (!Materials.isSign(event.getBlock().getType())) {
+            return;
+        }
+        final Block block = event.getBlock();
+        final BlockData blockData = block.getBlockData();
+        final Block attachedBlock;
+        if (blockData instanceof WallSign) {
+            attachedBlock = block.getRelative(((WallSign) blockData).getFacing().getOppositeFace());
+        } else if (blockData instanceof Sign) {
+            attachedBlock = block.getRelative(BlockFace.DOWN);
+        } else {
+            attachedBlock = null;
+        }
+
+        // Check if still attached to a block
+        // TODO: signs cannot be placed on all blocks, improve this check to isSolid()?
+        if (attachedBlock == null || attachedBlock.getType() != Material.AIR) {
+            return;
+        }
+
+        // Check if the sign is really the same as a saved rent
+        RegionSign regionSign = SignsFeature.getSignByLocation(event.getBlock().getLocation());
+        if (regionSign == null) {
+            return;
+        }
+
+        // Remove the sign so that it does not fall on the floor as an item (next region update will place it back when possible)
+        AreaShop.debug("onIndirectSignBreak: Removed block of sign for", regionSign.getRegion().getName(), "at", regionSign.getStringLocation());
+        event.getBlock().setType(Material.AIR);
+        event.setCancelled(true);
+    }
+
+    @EventHandler(priority = EventPriority.HIGH, ignoreCancelled = true)
+    public void onSignClick(PlayerInteractEvent event) {
+        Block block = event.getClickedBlock();
+        if (block == null) {
+            return;
+        }
+
+        // Only listen to left and right clicks on blocks
+        if (!(event.getAction() == Action.RIGHT_CLICK_BLOCK || event.getAction() == Action.LEFT_CLICK_BLOCK)) {
+            return;
+        }
+
+        // Only care about clicking blocks
+        if (!Materials.isSign(block.getType())) {
+            return;
+        }
+
+        // Check if this sign belongs to a region
+        RegionSign regionSign = SignsFeature.getSignByLocation(block.getLocation());
+        if (regionSign == null) {
+            return;
+        }
+
+        // Ignore players that are in sign link mode (which will handle the event itself)
+        Player player = event.getPlayer();
+        if (plugin.getSignlinkerManager().isInSignLinkMode(player)) {
+            return;
+        }
+
+        // Get the clicktype
+        GeneralRegion.ClickType clickType = null;
+        if (player.isSneaking() && event.getAction() == Action.LEFT_CLICK_BLOCK) {
+            clickType = GeneralRegion.ClickType.SHIFTLEFTCLICK;
+        } else if (!player.isSneaking() && event.getAction() == Action.LEFT_CLICK_BLOCK) {
+            clickType = GeneralRegion.ClickType.LEFTCLICK;
+        } else if (player.isSneaking() && event.getAction() == Action.RIGHT_CLICK_BLOCK) {
+            clickType = GeneralRegion.ClickType.SHIFTRIGHTCLICK;
+        } else if (!player.isSneaking() && event.getAction() == Action.RIGHT_CLICK_BLOCK) {
+            clickType = GeneralRegion.ClickType.RIGHTCLICK;
+        }
+
+        boolean ran = regionSign.runSignCommands(player, clickType);
+
+        // Only cancel event if at least one command has been executed
+        event.setCancelled(ran);
+    }
+
+    @EventHandler(priority = EventPriority.MONITOR)
+    public void onSignChange(SignChangeEvent event) {
+        if (event.isCancelled()) {
+            return;
+        }
+        Player player = event.getPlayer();
+        if (!plugin.isReady()) {
+            plugin.message(player, "general-notReady");
+            return;
+        }
+
+        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);
+        }
+    }
+
+    @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);
+    }
+
+    /**
+     * 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<>();
+        for (RegionSign sign : signs.values()) {
+            result.add(sign.getLocation());
+        }
+        return result;
+    }
+
+    /**
+     * Add a sign to this region.
+     *
+     * @param location The location of the sign
+     * @param signType The type of the sign (WALL_SIGN or SIGN_POST)
+     * @param facing   The orientation of the sign
+     * @param profile  The profile to use with this sign (null for default)
+     */
+    public void addSign(Location location, Material signType, BlockFace facing, String profile) {
+        int i = 0;
+        while (getRegion().getConfig().isSet("general.signs." + i)) {
+            i++;
+        }
+        String signPath = "general.signs." + i + ".";
+        final GeneralRegion region = getRegion();
+        region.setSetting(signPath + "location", Utils.locationToConfig(location));
+        region.setSetting(signPath + "facing", facing != null ? facing.name() : null);
+        region.setSetting(signPath + "signType", signType != null ? signType.name() : null);
+        if (profile != null && !profile.isEmpty()) {
+            region.setSetting(signPath + "profile", profile);
+        }
+        // Add to the map
+        RegionSign sign = new RegionSign(this, String.valueOf(i));
+        signs.put(sign.getStringLocation(), sign);
+        allSigns.put(sign.getStringLocation(), sign);
+        signsByChunk.computeIfAbsent(sign.getStringChunk(), key -> new ArrayList<>())
+                .add(sign);
+    }
 
 }

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

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

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

@@ -0,0 +1,269 @@
+package me.wiefferink.areashop.features.teleport;
+
+import co.aikar.taskchain.TaskChain;
+import com.sk89q.worldedit.math.BlockVector3;
+import com.sk89q.worldguard.protection.regions.ProtectedRegion;
+import io.papermc.lib.PaperLib;
+import me.wiefferink.areashop.AreaShop;
+import me.wiefferink.areashop.features.RegionFeature;
+import me.wiefferink.areashop.features.signs.RegionSign;
+import me.wiefferink.areashop.regions.GeneralRegion;
+import me.wiefferink.areashop.tools.Utils;
+import me.wiefferink.areashop.tools.Value;
+import org.bukkit.*;
+import org.bukkit.block.Block;
+import org.bukkit.block.BlockFace;
+import org.bukkit.entity.Player;
+import org.bukkit.util.Vector;
+
+import java.util.Collection;
+import java.util.HashSet;
+import java.util.List;
+import java.util.Set;
+import java.util.concurrent.CompletableFuture;
+
+public class TeleportFeature extends RegionFeature {
+
+    public TeleportFeature() {
+    }
+
+    public TeleportFeature(GeneralRegion region) {
+        setRegion(region);
+    }
+
+    /**
+     * Checks if a certain location is safe to teleport to.
+     *
+     * @param location The location to check
+     * @return true if it is safe, otherwise false
+     */
+    static boolean isSafe(Location location) {
+        Block feet = location.getBlock();
+        Block head = feet.getRelative(BlockFace.UP);
+        Block below = feet.getRelative(BlockFace.DOWN);
+        Block above = head.getRelative(BlockFace.UP);
+
+        // Check the block at the feet and head of the player
+        if ((feet.getType().isSolid() && !canSpawnIn(feet.getType())) || feet.isLiquid()) {
+            return false;
+        } else if ((head.getType().isSolid() && !canSpawnIn(head.getType())) || head.isLiquid()) {
+            return false;
+        } else if (!below.getType().isSolid() || cannotSpawnOn(below.getType()) || below.isLiquid()) {
+            return false;
+        } else if (above.isLiquid() || cannotSpawnBeside(above.getType())) {
+            return false;
+        }
+
+        // Get all blocks around the player (below foot level, foot level, head level and above head level)
+        Set<Material> around = new HashSet<>();
+        for (int y = 0; y <= 3; y++) {
+            for (int x = -1; x <= 1; x++) {
+                for (int z = -1; z <= 1; z++) {
+                    // Skip blocks in the column of the player
+                    if (x == 0 && z == 0) {
+                        continue;
+                    }
+
+                    around.add(below.getRelative(x, y, z).getType());
+                }
+            }
+        }
+
+        // Check the blocks around the player
+        for (Material material : around) {
+            if (cannotSpawnBeside(material)) {
+                return false;
+            }
+        }
+        return true;
+    }
+
+    /**
+     * Check if a player can spawn in here.
+     *
+     * @param material Material to check (assumed that this is at the feet or head level)
+     * @return true when it is safe to spawn inside, otherwise false
+     */
+    private static boolean canSpawnIn(Material material) {
+        String name = material.name();
+        return name.contains("DOOR")
+                || name.contains("SIGN")
+                || name.contains("PLATE") // Redstone plates
+                || name.equals("DRAGON_EGG");
+    }
+
+    /**
+     * Check if a player can spawn on here.
+     *
+     * @param material Material to check (assumed that this is below the feet)
+     * @return true when it is safe to spawn on top of, otherwise false
+     */
+    private static boolean cannotSpawnOn(Material material) {
+        String name = material.name();
+        return name.equals("CACTUS")
+                || name.contains("PISTON")
+                || name.contains("SIGN")
+                || name.contains("DOOR")
+                || name.contains("PLATE")
+                || name.contains("REDSTONE_LAMP")
+                || name.contains("FENCE")
+                || name.contains("GLASS_PANE") || name.contains("THIN_GLASS")
+                || name.equals("DRAGON_EGG")
+                || name.contains("MAGMA");
+    }
+
+    /**
+     * Check if a player can spawn next to it.
+     *
+     * @param material Material to check (assumed that this is somewhere around the player)
+     * @return true when it is safe to spawn next to, otherwise false
+     */
+    private static boolean cannotSpawnBeside(Material material) {
+        String name = material.name();
+        return name.contains("LAVA")
+                || name.contains("CACTUS")
+                || name.equals("FIRE")
+                || name.contains("MAGMA");
+    }
+
+    /**
+     * Get the teleportlocation set for this region.
+     *
+     * @return The teleport location, or null if not set
+     */
+    public Location getTeleportLocation() {
+        return Utils.configToLocation(getRegion().getConfigurationSectionSetting("general.teleportLocation"));
+    }
+
+    /**
+     * Check if the region has a teleportLocation specified.
+     *
+     * @return true if the region has a teleportlocation, false otherwise
+     */
+    public boolean hasTeleportLocation() {
+        return getRegion().getConfigurationSectionSetting("general.teleportLocation") != null;
+    }
+
+    /**
+     * Set the teleport location of this region.
+     *
+     * @param location The location to set as teleport location
+     */
+    public void setTeleport(Location location) {
+        if (location == null) {
+            getRegion().setSetting("general.teleportLocation", null);
+        } else {
+            getRegion().setSetting("general.teleportLocation", Utils.locationToConfig(location, true));
+        }
+    }
+
+    /**
+     * Teleport a player to the region or sign.
+     *
+     * @param player            Player that should be teleported
+     * @param toSign            true to teleport to the first sign of the region, false for teleporting to the region itself
+     * @param checkRestrictions Set to true if teleport permissions should be checked, false otherwise, also toggles cross-world check
+     * @return true if the teleport succeeded, otherwise false
+     */
+    public CompletableFuture<Boolean> teleportPlayer(Player player, boolean toSign, boolean checkRestrictions) {
+        return new TeleportJob(this, plugin).executeTeleport(player, toSign, checkRestrictions);
+    }
+
+    /**
+     * Teleport a player to the region or sign when he has permissions for it.
+     *
+     * @param player Player that should be teleported
+     * @param toSign true to teleport to the first sign of the region, false for teleporting to the region itself
+     * @return true if the teleport succeeded, otherwise false
+     */
+    public CompletableFuture<Boolean> teleportPlayer(Player player, boolean toSign) {
+        return teleportPlayer(player, toSign, true);
+    }
+
+    /**
+     * Teleport a player to the region when he has permissions for it.
+     *
+     * @param player Player that should be teleported
+     * @return true if the teleport succeeded, otherwise false
+     */
+    public CompletableFuture<Boolean> teleportPlayer(Player player) {
+        return teleportPlayer(player, false, true);
+    }
+
+    /**
+     * Get the start location of a safe teleport search.
+     *
+     * @param player The player to get it for
+     * @param toSign true to try teleporting to the first sign, false for teleporting to the region
+     * @return The start location
+     */
+    Location getStartLocation(Player player, Value<Boolean> toSign) {
+        Location startLocation = null;
+        ProtectedRegion worldguardRegion = getRegion().getRegion();
+
+        // Try to get sign location
+        List<RegionSign> signs = getRegion().getSignsFeature().getSigns();
+        boolean signAvailable = !signs.isEmpty();
+        if (toSign.get()) {
+            if (signAvailable) {
+                // Use the location 1 below the sign to prevent weird spawing above the sign
+                startLocation = signs.get(0).getLocation(); //.subtract(0.0, 1.0, 0.0);
+                startLocation.setPitch(player.getLocation().getPitch());
+                startLocation.setYaw(player.getLocation().getYaw());
+
+                // Move player x blocks away from the sign
+                double distance = getRegion().getDoubleSetting("general.teleportSignDistance");
+                if (distance > 0) {
+                    BlockFace facing = getRegion().getSignsFeature().getSigns().get(0).getFacing();
+                    Vector facingVector = new Vector(facing.getModX(), facing.getModY(), facing.getModZ())
+                            .normalize()
+                            .multiply(distance);
+                    startLocation.setX(startLocation.getBlockX() + 0.5);
+                    startLocation.setZ(startLocation.getBlockZ() + 0.5);
+                    startLocation.add(facingVector);
+                }
+            } else {
+                // No sign available
+                getRegion().message(player, "teleport-changedToNoSign");
+                toSign.set(false);
+            }
+        }
+
+        // Use teleportation location that is set for the region
+        if (startLocation == null && hasTeleportLocation()) {
+            startLocation = getTeleportLocation();
+        }
+
+        // Calculate a default location
+        if (startLocation == null) {
+            // Set to block in the middle, y configured in the config
+            Vector regionMin = AreaShop.getInstance().getWorldGuardHandler().getMinimumPoint(worldguardRegion);
+            Vector regionMax = AreaShop.getInstance().getWorldGuardHandler().getMaximumPoint(worldguardRegion);
+            Vector middle = regionMin.clone().midpoint(regionMax);
+            String configSetting = getRegion().getStringSetting("general.teleportLocationY");
+            if ("bottom".equalsIgnoreCase(configSetting)) {
+                middle = middle.setY(regionMin.getBlockY());
+            } else if ("top".equalsIgnoreCase(configSetting)) {
+                middle = middle.setY(regionMax.getBlockY());
+            } else if ("middle".equalsIgnoreCase(configSetting)) {
+                middle = middle.setY(middle.getBlockY());
+            } else {
+                try {
+                    int vertical = Integer.parseInt(configSetting);
+                    middle = middle.setY(vertical);
+                } catch (NumberFormatException e) {
+                    AreaShop.warn("Could not parse general.teleportLocationY: '" + configSetting + "'");
+                }
+            }
+            startLocation = new Location(getRegion().getWorld(), middle.getX(), middle.getY(), middle.getZ(), player.getLocation().getYaw(), player.getLocation().getPitch());
+        }
+
+        // Set location in the center of the block
+        startLocation.setX(startLocation.getBlockX() + 0.5);
+        startLocation.setZ(startLocation.getBlockZ() + 0.5);
+
+        return startLocation;
+    }
+
+
+}

AreaShop/src/main/java/me/wiefferink/areashop/features/teleport/TeleportJob.java

@@ -0,0 +1,639 @@
+package me.wiefferink.areashop.features.teleport;
+
+import co.aikar.taskchain.TaskChain;
+import com.sk89q.worldedit.math.BlockVector2;
+import com.sk89q.worldedit.math.BlockVector3;
+import com.sk89q.worldguard.protection.regions.GlobalProtectedRegion;
+import com.sk89q.worldguard.protection.regions.ProtectedCuboidRegion;
+import com.sk89q.worldguard.protection.regions.ProtectedPolygonalRegion;
+import com.sk89q.worldguard.protection.regions.ProtectedRegion;
+import io.papermc.lib.PaperLib;
+import me.wiefferink.areashop.AreaShop;
+import me.wiefferink.areashop.regions.GeneralRegion;
+import me.wiefferink.areashop.tools.Utils;
+import me.wiefferink.areashop.tools.Value;
+import org.bukkit.Bukkit;
+import org.bukkit.Chunk;
+import org.bukkit.Location;
+import org.bukkit.World;
+import org.bukkit.entity.Player;
+import org.bukkit.scheduler.BukkitRunnable;
+import org.bukkit.scheduler.BukkitTask;
+import org.bukkit.util.Vector;
+
+import java.util.*;
+import java.util.concurrent.*;
+import java.util.function.Function;
+
+class TeleportJob {
+
+    private final AreaShop plugin;
+    private final GeneralRegion region;
+    private final TeleportFeature feature;
+    private BukkitTask notifierTask;
+
+    private boolean running;
+    private int checked;
+    private boolean done;
+    private boolean blocksInRegionCopy;
+    private boolean northDone = false, eastDone = false, southDone = false, westDone = false, topDone = false, bottomDone = false;
+    private boolean continueThisDirection;
+    private int radius = 1;
+
+    public TeleportJob(final TeleportFeature region, final AreaShop plugin) {
+        this.feature = region;
+        this.region = region.getRegion();
+        this.plugin = plugin;
+    }
+
+    private static Function<double[], Boolean> generateContainsFunction(final ProtectedRegion worldguardRegion) {
+        final BlockVector3 min = worldguardRegion.getMinimumPoint(), max = worldguardRegion.getMaximumPoint();
+        if (worldguardRegion instanceof GlobalProtectedRegion) {
+            return (unused) -> true;
+        } else if (worldguardRegion instanceof ProtectedCuboidRegion) {
+            return coords -> {
+                final double x = coords[0];
+                final double y = coords[1];
+                final double z = coords[2];
+                return x >= min.getBlockX() && x < max.getBlockX() + 1
+                        && y >= min.getBlockY() && y < max.getBlockY() + 1
+                        && z >= min.getBlockZ() && z < max.getBlockZ() + 1;
+            };
+        } else if (worldguardRegion instanceof ProtectedPolygonalRegion) {
+            final int minY = min.getY(), maxY = max.getY();
+            final List<BlockVector2> points = worldguardRegion.getPoints();
+            return coords -> {
+
+                int targetX = (int) Math.round(coords[0]); // Width
+                int targetY = (int) Math.round(coords[1]); // Height
+                int targetZ = (int) Math.round(coords[2]); // Depth
+
+                if (targetY < minY || targetY > maxY) {
+                    return false;
+                }
+                //Quick and dirty check.
+                if (targetX < min.getBlockX() || targetX > max.getBlockX() || targetZ < min.getBlockZ() || targetZ > max.getBlockZ()) {
+                    return false;
+                }
+                boolean inside = false;
+                int npoints = points.size();
+                int xNew, zNew;
+                int xOld, zOld;
+                int x1, z1;
+                int x2, z2;
+                long crossproduct;
+                int i;
+
+                xOld = points.get(npoints - 1).getBlockX();
+                zOld = points.get(npoints - 1).getBlockZ();
+
+                for (i = 0; i < npoints; i++) {
+                    xNew = points.get(i).getBlockX();
+                    zNew = points.get(i).getBlockZ();
+                    //Check for corner
+                    if (xNew == targetX && zNew == targetZ) {
+                        return true;
+                    }
+                    if (xNew > xOld) {
+                        x1 = xOld;
+                        x2 = xNew;
+                        z1 = zOld;
+                        z2 = zNew;
+                    } else {
+                        x1 = xNew;
+                        x2 = xOld;
+                        z1 = zNew;
+                        z2 = zOld;
+                    }
+                    if (x1 <= targetX && targetX <= x2) {
+                        crossproduct = ((long) targetZ - (long) z1) * (long) (x2 - x1)
+                                - ((long) z2 - (long) z1) * (long) (targetX - x1);
+                        if (crossproduct == 0) {
+                            if ((z1 <= targetZ) == (targetZ <= z2)) return true; // on edge
+                        } else if (crossproduct < 0 && (x1 != targetX)) {
+                            inside = !inside;
+                        }
+                    }
+                    xOld = xNew;
+                    zOld = zNew;
+                }
+
+                return inside;
+            };
+        } else {
+            throw new UnsupportedOperationException("Unknown region type: " + worldguardRegion.getClass().getCanonicalName());
+        }
+    }
+
+    public boolean isRunning() {
+        return running;
+    }
+
+    public CompletableFuture<Boolean> executeTeleport(final Player player, boolean toSign, boolean checkRestrictions) {
+
+        if (running) {
+            throw new IllegalStateException("Task is already running!");
+        }
+        running = true;
+        // Check basics
+        if (feature == null) {
+            region.message(player, "general-noRegion");
+            return CompletableFuture.completedFuture(false);
+        }
+
+        if (region.getWorld() == null) {
+            region.message(player, "general-noWorld");
+            return CompletableFuture.completedFuture(false);
+        }
+
+        if (checkRestrictions) {
+            // Check correct world
+            if (!region.getBooleanSetting("general.teleportCrossWorld") && !player.getWorld().equals(region.getWorld())) {
+                region.message(player, "teleport-wrongWorld", player.getWorld().getName());
+                return CompletableFuture.completedFuture(false);
+            }
+
+            boolean owner = player.getUniqueId().equals(region.getOwner());
+            boolean friend = region.getFriendsFeature().getFriends().contains(player.getUniqueId());
+            boolean available = region.isAvailable();
+            // Teleport to sign instead if they dont have permission for teleporting to region
+            if ((!toSign && owner && !player.hasPermission("areashop.teleport") && player.hasPermission("areashop.teleportsign")
+                    || !toSign && !owner && !friend && !player.hasPermission("areashop.teleportall") && player.hasPermission("areashop.teleportsignall")
+                    || !toSign && !owner && friend && !player.hasPermission("areashop.teleportfriend") && player.hasPermission("areashop.teleportfriendsign")
+                    || !toSign && !owner && !friend && available && !player.hasPermission("areashop.teleportavailable") && player.hasPermission("areashop.teleportavailablesign"))) {
+                region.message(player, "teleport-changedToSign");
+                toSign = true;
+            }
+            // Check permissions
+            if (owner && !available && !player.hasPermission("areashop.teleport") && !toSign) {
+                region.message(player, "teleport-noPermission");
+                return CompletableFuture.completedFuture(false);
+            } else if (!owner && !available && !player.hasPermission("areashop.teleportall") && !toSign && !friend) {
+                region.message(player, "teleport-noPermissionOther");
+                return CompletableFuture.completedFuture(false);
+            } else if (!owner && !available && !player.hasPermission("areashop.teleportfriend") && !toSign && friend) {
+                region.message(player, "teleport-noPermissionFriend");
+                return CompletableFuture.completedFuture(false);
+            } else if (available && !player.hasPermission("areashop.teleportavailable") && !toSign) {
+                region.message(player, "teleport-noPermissionAvailable");
+                return CompletableFuture.completedFuture(false);
+            } else if (owner && !available && !player.hasPermission("areashop.teleportsign") && toSign) {
+                region.message(player, "teleport-noPermissionSign");
+                return CompletableFuture.completedFuture(false);
+            } else if (!owner && !available && !player.hasPermission("areashop.teleportsignall") && toSign && !friend) {
+                region.message(player, "teleport-noPermissionOtherSign");
+                return CompletableFuture.completedFuture(false);
+            } else if (!owner && !available && !player.hasPermission("areashop.teleportfriendsign") && toSign && friend) {
+                region.message(player, "teleport-noPermissionFriendSign");
+                return CompletableFuture.completedFuture(false);
+            } else if (available && !player.hasPermission("areashop.teleportavailablesign") && toSign) {
+                region.message(player, "teleport-noPermissionAvailableSign");
+                return CompletableFuture.completedFuture(false);
+            }
+        }
+
+        // Get the starting location
+        Value<Boolean> toSignRef = new Value<>(toSign);
+        Location startLocation = feature.getStartLocation(player, toSignRef);
+        toSign = toSignRef.get();
+
+        boolean insideRegion;
+        if (toSign) {
+            insideRegion = region.getBooleanSetting("general.teleportToSignIntoRegion");
+        } else {
+            insideRegion = region.getBooleanSetting("general.teleportIntoRegion");
+        }
+
+        // Check locations starting from startLocation and then a cube that increases
+        // radius around that (until no block in the region is found at all cube sides)
+
+        ProtectedRegion worldguardRegion = region.getRegion();
+        final Function<double[], Boolean> regionContains = generateContainsFunction(worldguardRegion);
+
+        boolean blocksInRegion = worldguardRegion.contains(startLocation.getBlockX(), startLocation.getBlockY(), startLocation.getBlockZ());
+        if (!blocksInRegion && insideRegion) {
+            region.message(player, "teleport-blocked");
+            return CompletableFuture.completedFuture(false);
+        }
+
+        // Tracking of which sides to continue the search
+        final World world = region.getWorld();
+        BlockVector3 min = worldguardRegion.getMinimumPoint();
+        BlockVector3 max = worldguardRegion.getMaximumPoint();
+
+        final Collection<Chunk> collection = ConcurrentHashMap.newKeySet();
+        final List<CompletableFuture<Object>> futures = new ArrayList<>();
+        final Collection<int[]> coords = new HashSet<>();
+        for (int x = min.getX(); x < max.getX(); x += 16) {
+            for (int z = min.getZ(); z < max.getZ(); z += 16) {
+                coords.add(new int[]{x, z});
+            }
+        }
+        final CompletableFuture<?> schedulingFuture;
+        if (coords.size() < 128) {
+            schedulingFuture = Utils.runAsBatches(coords, 32,
+                    coord -> futures.add(PaperLib.getChunkAtAsync(world, coord[0], coord[1]).thenApply(chunk -> {
+                        chunk.setForceLoaded(true);
+                        collection.add(chunk);
+                        return chunk;
+                    })), false);
+        } else {
+            schedulingFuture = null;
+        }
+        final CompletableFuture<Boolean> future = new CompletableFuture<>();
+        final boolean finalToSign = toSign;
+
+        final Runnable task = () -> {
+            blocksInRegionCopy = blocksInRegion;
+            int safeY = startLocation.getBlockY();
+            int safeX = startLocation.getBlockX();
+            int safeZ = startLocation.getBlockZ();
+            final Location temp = new Location(world, 0, 0, 0);
+            // Tries limit tracking
+
+            int maxTries = plugin.getConfig().getInt("maximumTries");
+
+            // Tracking of which sides to continue the search
+            try {
+                this.done = Bukkit.getScheduler().callSyncMethod(plugin, () -> TeleportFeature.isSafe(startLocation)).get(5, TimeUnit.SECONDS);
+            } catch (ExecutionException | InterruptedException | TimeoutException ex) {
+                ex.printStackTrace();
+                this.done = false;
+            }
+            Utils.newChain().async(() -> {
+                while ((blocksInRegionCopy || !insideRegion) && !done) {
+                    blocksInRegionCopy = false;
+
+                    // North side
+                    continueThisDirection = false;
+                    temp.setX(-radius + 1);
+                    temp.setY(-radius + 1);
+                    temp.setZ(-radius);
+                    for (int x = -radius + 1; x <= radius && !done && !northDone; x++) {
+                        for (int y = -radius + 1; y < radius && !done; y++) {
+                            if (y + safeY > 256 || y + safeY < 0) {
+                                continue;
+                            }
+                            if (!insideRegion || regionContains.apply(new double[]{x + safeX, y + safeY, safeZ - radius})) {
+                                checked++;
+                                try {
+                                    this.done = checked > maxTries || Bukkit.getScheduler().callSyncMethod(plugin, () -> TeleportFeature.isSafe(temp)).get(5, TimeUnit.SECONDS);
+                                } catch (ExecutionException | InterruptedException | TimeoutException ex) {
+                                    ex.printStackTrace();
+                                    this.done = false;
+                                }
+                                blocksInRegionCopy = true;
+                                continueThisDirection = true;
+                            }
+                            temp.add(0, 1, 0);
+                        }
+                        temp.add(1, 0, 0);
+                    }
+                    northDone = northDone || !continueThisDirection;
+                }
+            }).abortIf((var0) -> done).async(() -> {
+                // South side
+                continueThisDirection = false;
+                temp.setX(radius - 1);
+                temp.setY(-radius + 1);
+                temp.setZ(-radius);
+                for (int x = radius - 1; x >= -radius && !done && !southDone; x--) {
+                    for (int y = -radius + 1; y < radius && !done; y++) {
+                        if (y + safeY > 256 || y + safeY < 0) {
+                            continue;
+                        }
+                        if (!insideRegion || regionContains.apply(new double[]{safeX + x, safeY + y, safeZ - radius})) {
+                            checked++;
+                            try {
+                                this.done = checked > maxTries || Bukkit.getScheduler().callSyncMethod(plugin, () -> TeleportFeature.isSafe(temp)).get(5, TimeUnit.SECONDS);
+                            } catch (ExecutionException | InterruptedException | TimeoutException ex) {
+                                ex.printStackTrace();
+                                this.done = false;
+                            }
+                            blocksInRegionCopy = true;
+                            continueThisDirection = true;
+                        }
+                        temp.add(0, 1, 0);
+                    }
+                    temp.add(-1, 0, 0);
+                }
+                southDone = southDone || !continueThisDirection;
+            }).abortIf((var0) -> done).async(() -> {
+                // East side
+                continueThisDirection = false;
+                temp.setX(-radius + 1);
+                temp.setY(-radius + 1);
+                temp.setZ(0);
+                for (int z = -radius + 1; z <= radius && !done && !eastDone; z++) {
+                    for (int y = -radius + 1; y < radius && !done; y++) {
+                        if (y + safeY > 256 || y + safeY < 0) {
+                            continue;
+                        }
+                        if (!insideRegion || regionContains.apply(new double[]{safeX + radius, y + safeY, z + safeZ})) {
+                            checked++;
+                            try {
+                                this.done = checked > maxTries || Bukkit.getScheduler().callSyncMethod(plugin, () -> TeleportFeature.isSafe(temp)).get(5, TimeUnit.SECONDS);
+                            } catch (ExecutionException | InterruptedException | TimeoutException ex) {
+                                ex.printStackTrace();
+                                this.done = false;
+                            }
+                            blocksInRegionCopy = true;
+                            continueThisDirection = true;
+                        }
+                        temp.add(0, 1, 0);
+                    }
+                    temp.add(0, 0, 1);
+                }
+                eastDone = eastDone || !continueThisDirection;
+            }).abortIf((var0) -> done).async(() -> {
+                // West side
+                continueThisDirection = false;
+                temp.setX(-radius);
+                temp.setY(-radius);
+                temp.setZ(radius - 1);
+                for (int z = radius - 1; z >= -radius && !done && !westDone; z--) {
+                    for (int y = -radius + 1; y < radius && !done; y++) {
+                        if (y + safeY > 256 || y + safeY < 0) {
+                            continue;
+                        }
+                        if (!insideRegion || regionContains.apply(new double[]{safeX - radius, safeY + y, safeZ + z})) {
+                            checked++;
+                            try {
+                                this.done = checked > maxTries || Bukkit.getScheduler().callSyncMethod(plugin, () -> TeleportFeature.isSafe(temp)).get(5, TimeUnit.SECONDS);
+                            } catch (ExecutionException | InterruptedException | TimeoutException ex) {
+                                ex.printStackTrace();
+                                this.done = false;
+                            }
+                            blocksInRegionCopy = true;
+                            continueThisDirection = true;
+                        }
+                        temp.add(0, 1, 0);
+                    }
+                    temp.add(0, 0, -1);
+                }
+                westDone = westDone || !continueThisDirection;
+            }).abortIf((var0) -> done).async(() -> {
+                // Top side
+                continueThisDirection = false;
+                // Middle block of the top
+                if ((safeY + radius) > 256) {
+                    topDone = true;
+                }
+                if (!done && !topDone) {
+                    temp.setX(0);
+                    temp.setY(radius);
+                    temp.setZ(0);
+                    if (!insideRegion || regionContains.apply(new double[]{safeX, safeY + radius, safeZ})) {
+                        checked++;
+                        try {
+                            this.done = checked > maxTries || Bukkit.getScheduler().callSyncMethod(plugin, () -> TeleportFeature.isSafe(temp)).get(5, TimeUnit.SECONDS);
+                        } catch (ExecutionException | InterruptedException | TimeoutException ex) {
+                            ex.printStackTrace();
+                            this.done = false;
+                        }
+                        blocksInRegionCopy = true;
+                        continueThisDirection = true;
+                    }
+                }
+
+                temp.setY(radius);
+                for (int r = 1; r <= radius && !done && !topDone; r++) {
+                    temp.setX(-r + 1);
+                    temp.setZ(-r);
+                    for (int x = -r + 1; x <= r && !done; x++) {
+                        if (!insideRegion || regionContains.apply(new double[]{safeX + x, safeY + radius, safeZ - r})) {
+                            checked++;
+                            try {
+                                this.done = checked > maxTries || Bukkit.getScheduler().callSyncMethod(plugin, () -> TeleportFeature.isSafe(temp)).get(5, TimeUnit.SECONDS);
+                            } catch (ExecutionException | InterruptedException | TimeoutException ex) {
+                                ex.printStackTrace();
+                                this.done = false;
+                            }
+                            blocksInRegionCopy = true;
+                            continueThisDirection = true;
+                        }
+                        temp.add(1, 0, 0);
+                    }
+                    // East
+                    temp.setX(r);
+                    temp.setZ(-r + 1);
+                    for (int z = -r + 1; z <= r && !done; z++) {
+                        if (!insideRegion || regionContains.apply(new double[]{safeX + r, safeY + radius, safeZ + z})) {
+                            checked++;
+                            try {
+                                this.done = checked > maxTries || Bukkit.getScheduler().callSyncMethod(plugin, () -> TeleportFeature.isSafe(temp)).get(5, TimeUnit.SECONDS);
+                            } catch (ExecutionException | InterruptedException | TimeoutException ex) {
+                                ex.printStackTrace();
+                                this.done = false;
+                            }
+                            blocksInRegionCopy = true;
+                            continueThisDirection = true;
+                        }
+                        temp.add(0, 0, z);
+                    }
+                    // South side
+                    temp.setX(r - 1);
+                    temp.setZ(r);
+                    for (int x = r - 1; x >= -r && !done; x--) {
+                        if (!insideRegion || regionContains.apply(new double[]{safeX + x, safeY + radius, safeZ + r})) {
+                            checked++;
+                            try {
+                                this.done = checked > maxTries || Bukkit.getScheduler().callSyncMethod(plugin, () -> TeleportFeature.isSafe(temp)).get(5, TimeUnit.SECONDS);
+                            } catch (ExecutionException | InterruptedException | TimeoutException ex) {
+                                ex.printStackTrace();
+                                this.done = false;
+                            }
+                            blocksInRegionCopy = true;
+                            continueThisDirection = true;
+                        }
+                        temp.add(-1, 0, 0);
+                    }
+                    // West side
+                    temp.setX(-r);
+                    temp.setZ(r - 1);
+                    for (int z = r - 1; z >= -r && !done; z--) {
+                        if (!insideRegion || regionContains.apply(new double[]{safeX - r, safeY + radius, safeZ + z})) {
+                            checked++;
+                            try {
+                                this.done = checked > maxTries || Bukkit.getScheduler().callSyncMethod(plugin, () -> TeleportFeature.isSafe(temp)).get(5, TimeUnit.SECONDS);
+                            } catch (ExecutionException | InterruptedException | TimeoutException ex) {
+                                ex.printStackTrace();
+                                this.done = false;
+                            }
+                            blocksInRegionCopy = true;
+                            continueThisDirection = true;
+                        }
+                        temp.add(0, 0, -1);
+                    }
+                }
+                topDone = topDone || !continueThisDirection;
+            }).abortIf(var0 -> done).async(() -> {
+                // Bottom side
+                continueThisDirection = false;
+                // Middle block of the bottom
+                if (safeY - radius < 0) {
+                    bottomDone = true;
+                }
+                if (!done && !bottomDone) {
+                    temp.setX(0);
+                    temp.setY(-radius);
+                    temp.setZ(0);
+                    if (!insideRegion || regionContains.apply(new double[]{safeX, safeY - radius, safeZ})) {
+                        checked++;
+                        try {
+                            this.done = checked > maxTries || Bukkit.getScheduler().callSyncMethod(plugin, () -> TeleportFeature.isSafe(temp)).get(5, TimeUnit.SECONDS);
+                        } catch (ExecutionException | InterruptedException | TimeoutException ex) {
+                            ex.printStackTrace();
+                            this.done = false;
+                        }
+                        blocksInRegionCopy = true;
+                        continueThisDirection = true;
+                    }
+                }
+                temp.setY(-radius);
+                for (int r = 1; r <= radius && !done && !bottomDone; r++) {
+                    // North
+                    temp.setX(-r + 1);
+                    temp.setZ(-r);
+                    for (int x = -r + 1; x <= r && !done; x++) {
+                        if (!insideRegion || regionContains.apply(new double[]{safeX + x, safeY - radius, safeZ - r})) {
+                            checked++;
+                            try {
+                                this.done = checked > maxTries || Bukkit.getScheduler().callSyncMethod(plugin, () -> TeleportFeature.isSafe(temp)).get(5, TimeUnit.SECONDS);
+                            } catch (ExecutionException | InterruptedException | TimeoutException ex) {
+                                ex.printStackTrace();
+                                this.done = false;
+                            }
+                            blocksInRegionCopy = true;
+                            continueThisDirection = true;
+                        }
+                        temp.add(1, 0, 0);
+                    }
+                    // East
+                    temp.setX(0);
+                    temp.setZ(-r + 1);
+                    for (int z = -r + 1; z <= r && !done; z++) {
+                        if (!insideRegion || regionContains.apply(new double[]{safeX + r, safeY - radius, safeZ + z})) {
+                            checked++;
+                            try {
+                                this.done = checked > maxTries || Bukkit.getScheduler().callSyncMethod(plugin, () -> TeleportFeature.isSafe(temp)).get(5, TimeUnit.SECONDS);
+                            } catch (ExecutionException | InterruptedException | TimeoutException ex) {
+                                ex.printStackTrace();
+                                this.done = false;
+                            }
+                            blocksInRegionCopy = true;
+                            continueThisDirection = true;
+                        }
+                        temp.add(0, 0, 1);
+                    }
+                    // South side
+                    temp.setX(r - 1);
+                    temp.setZ(r);
+                    for (int x = r - 1; x >= -r && !done; x--) {
+                        if (!insideRegion || regionContains.apply(new double[]{safeX + x, safeY - radius, safeZ + r})) {
+                            checked++;
+                            try {
+                                this.done = checked > maxTries || Bukkit.getScheduler().callSyncMethod(plugin, () -> TeleportFeature.isSafe(temp)).get(5, TimeUnit.SECONDS);
+                            } catch (ExecutionException | InterruptedException | TimeoutException ex) {
+                                ex.printStackTrace();
+                                this.done = false;
+                            }
+                            blocksInRegionCopy = true;
+                            continueThisDirection = true;
+                        }
+                        temp.add(-1, 0, 0);
+                    }
+                    // West side
+                    temp.setX(-r);
+                    temp.setZ(r - 1);
+                    for (int z = r - 1; z >= -r && !done; z--) {
+                        if (!insideRegion || regionContains.apply(new double[]{safeX - r, safeY - radius, safeZ + z})) {
+                            checked++;
+                            try {
+                                this.done = checked > maxTries || Bukkit.getScheduler().callSyncMethod(plugin, () -> TeleportFeature.isSafe(temp)).get(5, TimeUnit.SECONDS);
+                            } catch (ExecutionException | InterruptedException | TimeoutException ex) {
+                                ex.printStackTrace();
+                                this.done = false;
+                            }
+                            blocksInRegionCopy = true;
+                            continueThisDirection = true;
+                        }
+                        temp.add(0, 0, -1);
+                    }
+                }
+                bottomDone = bottomDone || !continueThisDirection;
+
+                // Increase cube radius
+                radius++;
+                startLocation.add(temp);
+            }).execute(() -> Bukkit.getScheduler().runTask(plugin, () -> {
+                if (done && TeleportFeature.isSafe(startLocation)) {
+                    if (finalToSign) {
+                        region.message(player, "teleport-successSign");
+
+                        // Let the player look at the sign
+                        Vector playerVector = startLocation.toVector();
+                        playerVector.setY(playerVector.getY() + player.getEyeHeight(true));
+                        Vector signVector = region.getSignsFeature().getSigns().get(0).getLocation().toVector().add(new Vector(0.5, 0.5, 0.5));
+                        Vector direction = playerVector.clone().subtract(signVector).normalize();
+                        startLocation.setYaw(180 - (float) Math.toDegrees(Math.atan2(direction.getX(), direction.getZ())));
+                        startLocation.setPitch(90 - (float) Math.toDegrees(Math.acos(direction.getY())));
+                    } else {
+                        region.message(player, "teleport-success");
+                    }
+
+                    AreaShop.debug("Found location: " + startLocation.toString() + " Tries: " + checked);
+                    PaperLib.teleportAsync(player, startLocation).thenAccept(future::complete);
+                } else {
+                    region.message(player, "teleport-noSafe", checked, maxTries);
+                    AreaShop.debug("No location found, checked " + checked + " spots of max " + maxTries);
+                    future.complete(false);
+                }
+            }));
+        };
+        // Start notifying the player, the one issue is that checked/max is 0 is if chunk loading takes up >= ~3s
+        doNotifications(player.getUniqueId());
+        TaskChain<?> chain = Utils.newChain();
+        if (schedulingFuture != null) {
+            // If there aren't too many chunks, pre-load them. Max will take 10 ticks ~ 500-600ms
+            chain = chain.asyncFirstFuture(() -> schedulingFuture).asyncFutures((unused) -> futures);
+        }
+        // Run the calculation task async
+        chain.async(task::run).execute();
+        // Don't keep chunks force-loaded once the teleportation has been completed.
+        return future.thenApply((unused0) -> {
+            for (Chunk chunk : collection) {
+                chunk.setForceLoaded(false); // Should be fine to call async(?)
+            }
+            running = false;
+            return unused0;
+        });
+    }
+
+    /**
+     * Get the task which notifies player of teleport progress.
+     *
+     * @return Returns the task, may be null.
+     */
+    public BukkitTask getNotifierTask() {
+        return notifierTask;
+    }
+
+    private void doNotifications(final UUID player0) {
+        final int maxTries = plugin.getConfig().getInt("maximumTries");
+        this.notifierTask = new BukkitRunnable() {
+
+            @Override
+            public void run() {
+                final Player player = Bukkit.getPlayer(player0);
+                if (TeleportJob.this.done || player == null) {
+                    this.cancel();
+                    TeleportJob.this.notifierTask = null;
+                    return;
+                }
+                region.message(player, "teleport-calculation-progress", "%done%", String.valueOf(checked), "%max%", String.valueOf(maxTries));
+            }
+
+        }.runTaskTimer(plugin, Utils.millisToTicks(3000), Utils.millisToTicks(3000));
+    }
+}

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

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

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

@@ -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;
@@ -42,62 +39,48 @@ import org.bukkit.command.CommandExecutor;
 import org.bukkit.command.CommandSender;
 import org.bukkit.command.TabCompleter;
 
-import javax.annotation.Nonnull;
-import javax.inject.Inject;
-import javax.inject.Singleton;
-import java.util.ArrayList;
-import java.util.List;
-import java.util.SortedSet;
-import java.util.TreeSet;
+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;
+	private final List<CommandAreaShop> commands = new ArrayList<>();
 
 	/**
 	 * 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.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);
@@ -109,7 +92,8 @@ public class CommandManager extends Manager implements CommandExecutor, TabCompl
 	 * @return The list with AreaShop commands
 	 */
 	public List<CommandAreaShop> getCommands() {
-		return commands;
+		// Return a cloned array
+		return new ArrayList<>(commands);
 	}
 
 	/**
@@ -118,13 +102,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");
+		List<String> messages = new ArrayList<>(commands.size());
+		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,30 +117,33 @@ 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;
 		}
 
 		// Redirect `/as info player <player>` to `/as me <player>`
-		if(args.length == 3 && "info".equals(args[0]) && "player".equals(args[1])) {
+		if(args.length == 3 && "info".equalsIgnoreCase(args[0]) && "player".equalsIgnoreCase(args[1])) {
 			args[0] = "me";
 			args[1] = args[2];
 		}
 
 		// Execute command
 		boolean executed = false;
-		for(int i = 0; i < commands.size() && !executed; i++) {
-			if(commands.get(i).canExecute(command, args)) {
-				commands.get(i).execute(sender, args);
+		for (final CommandAreaShop cmd : commands) {
+			if (cmd.canExecute(command, args)) {
+				cmd.execute(sender, args);
 				executed = true;
+				// Can't have two commands with same label
+				break;
 			}
+
 		}
 
 		// Show help
@@ -166,9 +153,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 +165,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());
@@ -197,6 +184,7 @@ public class CommandManager extends Manager implements CommandExecutor, TabCompl
 			for(CommandAreaShop c : commands) {
 				if(c.canExecute(command, args)) {
 					result = c.getTabCompleteList(toCompleteNumber, start, sender);
+					break;
 				}
 			}
 		}
@@ -208,8 +196,7 @@ public class CommandManager extends Manager implements CommandExecutor, TabCompl
 					set.add(suggestion);
 				}
 			}
-			result.clear();
-			result.addAll(set);
+			return new ArrayList<>(set);
 		}
 		//AreaShop.debug("Tabcomplete #" + toCompleteNumber + ", prefix="+ toCompletePrefix + ", result=" + result.toString());
 		return result;

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

@@ -1,75 +1,66 @@
 package me.wiefferink.areashop.managers;
 
-import com.google.inject.Injector;
-import com.google.inject.ProvisionException;
 import me.wiefferink.areashop.AreaShop;
 import me.wiefferink.areashop.features.CommandsFeature;
 import me.wiefferink.areashop.features.DebugFeature;
-import me.wiefferink.areashop.features.FeatureFactory;
 import me.wiefferink.areashop.features.FriendsFeature;
 import me.wiefferink.areashop.features.RegionFeature;
-import me.wiefferink.areashop.features.TeleportFeature;
+import me.wiefferink.areashop.features.teleport.TeleportFeature;
 import me.wiefferink.areashop.features.WorldGuardRegionFlagsFeature;
 import me.wiefferink.areashop.features.signs.SignsFeature;
 import me.wiefferink.areashop.regions.GeneralRegion;
 
-import javax.annotation.Nonnull;
-import javax.inject.Inject;
-import javax.inject.Singleton;
+import java.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 ignored) {
+				// The feature does not have a region specific part
 			}
-		};
+		}
 	}
 
 	@Override
@@ -80,13 +71,18 @@ public class FeatureManager extends Manager {
 	}
 
 	/**
-	 * Instanciate a feature for a certain region.
+	 * Instantiate a feature for a certain region.
 	 * @param region       The region to create a feature for
 	 * @param featureClazz The class of the feature to create
 	 * @return The feature class
 	 */
 	public RegionFeature getRegionFeature(GeneralRegion region, Class<? extends RegionFeature> featureClazz) {
-		return regionFeatureConstructors.get(featureClazz).apply(region);
+		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;
 	}
 
 }

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

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

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

@@ -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.
 	 */

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

@@ -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;
 	}
@@ -55,7 +42,7 @@ public class SignLinkerManager extends Manager implements Listener {
 	@Override
 	public void shutdown() {
 		for(UUID uuid : signLinkers.keySet()) {
-			exitSignLinkMode(Bukkit.getPlayer(uuid));
+			exitSignLinkMode(uuid);
 		}
 	}
 
@@ -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,19 @@ public class SignLinkerManager extends Manager implements Listener {
 			eventsRegistered = false;
 			HandlerList.unregisterAll(this);
 		}
-		messageBridge.message(player, "linksigns-stopped");
+		plugin.message(player, "linksigns-stopped");
+	}
+
+	private void exitSignLinkMode(UUID player) {
+		signLinkers.remove(player);
+		if(eventsRegistered && signLinkers.isEmpty()) {
+			eventsRegistered = false;
+			HandlerList.unregisterAll(this);
+		}
+		final Player online = Bukkit.getPlayer(player);
+		if (online != null) {
+			plugin.message(player, "linksigns-stopped");
+		}
 	}
 
 	/**
@@ -120,13 +119,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 +136,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 +193,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 +204,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 +213,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");
 			}
 		}
 

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

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

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

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

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

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

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

@@ -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);
@@ -396,10 +367,10 @@ public class BuyRegion extends GeneralRegion {
 			OfflinePlayer oldOwnerPlayer = Bukkit.getOfflinePlayer(oldOwner);
 			String oldOwnerName = getPlayerName();
 			if(oldOwnerPlayer != null && oldOwnerPlayer.getName() != null) {
-				r = economy.depositPlayer(oldOwnerPlayer, getWorldName(), getResellPrice());
+				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;
@@ -580,10 +551,11 @@ public class BuyRegion extends GeneralRegion {
 			return false;
 		}
 		long lastPlayed = getLastActiveTime();
+		long now = System.currentTimeMillis();
 		//AreaShop.debug("currentTime=" + Calendar.getInstance().getTimeInMillis() + ", getLastPlayed()=" + lastPlayed + ", timeInactive=" + (Calendar.getInstance().getTimeInMillis()-player.getLastPlayed()) + ", inactiveSetting=" + inactiveSetting);
-		if(Calendar.getInstance().getTimeInMillis() > (lastPlayed + inactiveSetting)) {
+		if(now > (lastPlayed + inactiveSetting)) {
 			AreaShop.info("Region " + getName() + " unrented because of inactivity for player " + getPlayerName());
-			AreaShop.debug("currentTime=" + Calendar.getInstance().getTimeInMillis() + ", getLastPlayed()=" + lastPlayed + ", timeInactive=" + (Calendar.getInstance().getTimeInMillis() - player.getLastPlayed()) + ", inactiveSetting=" + inactiveSetting);
+			AreaShop.debug("currentTime=" + now + ", getLastPlayed()=" + lastPlayed + ", timeInactive=" + (now - player.getLastPlayed()) + ", inactiveSetting=" + inactiveSetting);
 			return this.sell(true, null);
 		}
 		return false;

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

@@ -1,5 +1,6 @@
 package me.wiefferink.areashop.regions;
 
+import co.aikar.taskchain.TaskChain;
 import com.sk89q.worldguard.protection.regions.ProtectedPolygonalRegion;
 import com.sk89q.worldguard.protection.regions.ProtectedRegion;
 import me.wiefferink.areashop.AreaShop;
@@ -7,15 +8,11 @@ import me.wiefferink.areashop.events.NotifyRegionEvent;
 import me.wiefferink.areashop.events.notify.UpdateRegionEvent;
 import me.wiefferink.areashop.features.FriendsFeature;
 import me.wiefferink.areashop.features.RegionFeature;
-import me.wiefferink.areashop.features.TeleportFeature;
+import me.wiefferink.areashop.features.teleport.TeleportFeature;
 import me.wiefferink.areashop.features.signs.SignsFeature;
 import me.wiefferink.areashop.interfaces.GeneralRegionInterface;
-import me.wiefferink.areashop.interfaces.WorldEditInterface;
-import me.wiefferink.areashop.interfaces.WorldGuardInterface;
-import me.wiefferink.areashop.managers.FeatureManager;
-import me.wiefferink.areashop.managers.IFileManager;
+import me.wiefferink.areashop.managers.FileManager;
 import me.wiefferink.areashop.tools.Utils;
-import me.wiefferink.bukkitdo.Do;
 import me.wiefferink.interactivemessenger.processing.Message;
 import me.wiefferink.interactivemessenger.processing.ReplacementProvider;
 import org.apache.commons.lang.exception.ExceptionUtils;
@@ -26,34 +23,28 @@ import org.bukkit.World;
 import org.bukkit.command.CommandException;
 import org.bukkit.command.CommandSender;
 import org.bukkit.configuration.ConfigurationSection;
+import org.bukkit.configuration.InvalidConfigurationException;
 import org.bukkit.configuration.file.YamlConfiguration;
 import org.bukkit.entity.Player;
 import org.bukkit.util.Vector;
 
-import javax.annotation.Nonnull;
 import java.io.File;
 import java.io.IOException;
 import java.text.SimpleDateFormat;
 import java.util.ArrayList;
 import java.util.Calendar;
-import java.util.Collection;
 import java.util.HashMap;
 import java.util.HashSet;
 import java.util.List;
-import java.util.Locale;
 import java.util.Map;
-import java.util.Optional;
 import java.util.Set;
 import java.util.UUID;
+import java.util.concurrent.CompletableFuture;
 
 public abstract class GeneralRegion implements GeneralRegionInterface, Comparable<GeneralRegion>, ReplacementProvider {
+	static final AreaShop plugin = AreaShop.getInstance();
 
-	protected final AreaShop plugin;
-	protected final FeatureManager featureManager;
-	protected final WorldEditInterface worldEditInterface;
-	protected final WorldGuardInterface worldGuardInterface;
-
-	protected final YamlConfiguration config;
+	final YamlConfiguration config;
 	private boolean saveRequired = false;
 	private boolean deleted = false;
 	private long volume = -1;
@@ -157,17 +148,7 @@ public abstract class GeneralRegion implements GeneralRegionInterface, Comparabl
 	 * Constructor, used to restore regions from disk at startup.
 	 * @param config The configuration of the region
 	 */
-	protected GeneralRegion(
-			@Nonnull AreaShop plugin,
-			@Nonnull FeatureManager featureManager,
-			@Nonnull WorldEditInterface worldEditInterface,
-			@Nonnull WorldGuardInterface worldGuardInterface,
-			@Nonnull YamlConfiguration config
-	) {
-		this.plugin = plugin;
-		this.featureManager = featureManager;
-		this.worldEditInterface = worldEditInterface;
-		this.worldGuardInterface = worldGuardInterface;
+	public GeneralRegion(YamlConfiguration config) {
 		this.config = config;
 		setup();
 	}
@@ -177,17 +158,8 @@ public abstract class GeneralRegion implements GeneralRegionInterface, Comparabl
 	 * @param name  Name of the WorldGuard region that this region is attached to
 	 * @param world The world of the WorldGuard region
 	 */
-	protected GeneralRegion(@Nonnull AreaShop plugin,
-							@Nonnull FeatureManager featureManager,
-							@Nonnull WorldEditInterface worldEditInterface,
-							@Nonnull WorldGuardInterface worldGuardInterface,
-							@Nonnull String name,
-							@Nonnull World world) {
-		this.config = new YamlConfiguration();
-		this.plugin = plugin;
-		this.featureManager = featureManager;
-		this.worldGuardInterface = worldGuardInterface;
-		this.worldEditInterface = worldEditInterface;
+	public GeneralRegion(String name, World world) {
+		config = new YamlConfiguration();
 		setSetting("general.name", name);
 		setSetting("general.world", world.getName());
 		setSetting("general.type", getType().getValue().toLowerCase());
@@ -216,13 +188,8 @@ public abstract class GeneralRegion implements GeneralRegionInterface, Comparabl
 	 * @param <T> The feature to get
 	 * @return The feature (either just instantiated or cached)
 	 */
-	public <T extends RegionFeature> T getOrCreateFeature(Class<T> clazz) {
-		RegionFeature result = features.computeIfAbsent(clazz, x -> featureManager.getRegionFeature(this, clazz));
-		return clazz.cast(result);
-	}
-
-	public <T extends RegionFeature> Optional<T> getFeature(Class<T> clazz) {
-		return Optional.ofNullable(clazz.cast(features.get(clazz)));
+	public <T extends RegionFeature> T getFeature(Class<T> clazz) {
+		return clazz.cast(features.computeIfAbsent(clazz, (unused) -> plugin.getFeatureManager().getRegionFeature(this, clazz)));
 	}
 
 	/**
@@ -230,7 +197,7 @@ public abstract class GeneralRegion implements GeneralRegionInterface, Comparabl
 	 * @return The FriendsFeature of this region
 	 */
 	public FriendsFeature getFriendsFeature() {
-		return getOrCreateFeature(FriendsFeature.class);
+		return getFeature(FriendsFeature.class);
 	}
 
 	/**
@@ -238,7 +205,7 @@ public abstract class GeneralRegion implements GeneralRegionInterface, Comparabl
 	 * @return The SignsFeature of this region
 	 */
 	public SignsFeature getSignsFeature() {
-		return getOrCreateFeature(SignsFeature.class);
+		return getFeature(SignsFeature.class);
 	}
 
 	/**
@@ -246,7 +213,7 @@ public abstract class GeneralRegion implements GeneralRegionInterface, Comparabl
 	 * @return The TeleportFeature
 	 */
 	public TeleportFeature getTeleportFeature() {
-		return getOrCreateFeature(TeleportFeature.class);
+		return getFeature(TeleportFeature.class);
 	}
 
 	// ABSTRACT
@@ -352,7 +319,7 @@ public abstract class GeneralRegion implements GeneralRegionInterface, Comparabl
 	 * @return The region name in lowercase
 	 */
 	public String getLowerCaseName() {
-		return getName().toLowerCase(Locale.ENGLISH);
+		return getName().toLowerCase();
 	}
 
 	/**
@@ -415,7 +382,7 @@ public abstract class GeneralRegion implements GeneralRegionInterface, Comparabl
 	 * Get the FileManager from the plugin.
 	 * @return The FileManager (responsible for saving/loading regions and getting them)
 	 */
-	public IFileManager getFileManager() {
+	public FileManager getFileManager() {
 		return plugin.getFileManager();
 	}
 
@@ -478,7 +445,7 @@ public abstract class GeneralRegion implements GeneralRegionInterface, Comparabl
 		if(landlordName != null && !landlordName.isEmpty()) {
 			@SuppressWarnings("deprecation")
 			OfflinePlayer offlinePlayer = Bukkit.getOfflinePlayer(landlordName);
-			if(offlinePlayer != null) {
+			if(offlinePlayer.hasPlayedBefore()) {
 				return offlinePlayer.getUniqueId();
 			}
 		}
@@ -491,7 +458,7 @@ public abstract class GeneralRegion implements GeneralRegionInterface, Comparabl
 	 */
 	public String getLandlordName() {
 		String result = Utils.toName(getLandlord());
-		if(result == null || result.isEmpty()) {
+		if(result.isEmpty()) {
 			result = config.getString("general.landlordName");
 			if(result == null || result.isEmpty()) {
 				result = null;
@@ -510,7 +477,7 @@ public abstract class GeneralRegion implements GeneralRegionInterface, Comparabl
 			setSetting("general.landlord", landlord.toString());
 		}
 		String properName = Utils.toName(landlord);
-		if(properName == null) {
+		if(properName.isEmpty()) {
 			properName = name;
 		}
 		setSetting("general.landlordName", properName);
@@ -553,7 +520,7 @@ public abstract class GeneralRegion implements GeneralRegionInterface, Comparabl
 	 * @return Vector
 	 */
 	public Vector getMinimumPoint() {
-		return worldGuardInterface.getMinimumPoint(getRegion());
+		return plugin.getWorldGuardHandler().getMinimumPoint(getRegion());
 	}
 
 	/**
@@ -561,7 +528,7 @@ public abstract class GeneralRegion implements GeneralRegionInterface, Comparabl
 	 * @return Vector
 	 */
 	public Vector getMaximumPoint() {
-		return worldGuardInterface.getMaximumPoint(getRegion());
+		return plugin.getWorldGuardHandler().getMaximumPoint(getRegion());
 	}
 
 	/**
@@ -620,8 +587,11 @@ public abstract class GeneralRegion implements GeneralRegionInterface, Comparabl
 	 */
 	public List<String> getGroupNames() {
 		List<String> result = new ArrayList<>();
-		for(RegionGroup group : getGroups()) {
-			result.add(group.getName());
+		// Inline #getGroups
+		for(RegionGroup group : plugin.getFileManager().getGroups()) {
+			if(group.isMember(this)) {
+				result.add(group.getName());
+			}
 		}
 		return result;
 	}
@@ -761,7 +731,7 @@ public abstract class GeneralRegion implements GeneralRegionInterface, Comparabl
 	 * @return true if the signs of this region need periodic updating, otherwise false
 	 */
 	public boolean needsPeriodicUpdate() {
-		return !(isDeleted() || !(this instanceof RentRegion)) && getSignsFeature().signManager().needsPeriodicUpdate();
+		return !(isDeleted() || !(this instanceof RentRegion)) && getSignsFeature().needsPeriodicUpdate();
 	}
 
 	/**
@@ -802,13 +772,43 @@ public abstract class GeneralRegion implements GeneralRegionInterface, Comparabl
 				return false;
 			}
 		}
-		boolean result = worldEditInterface.saveRegionBlocks(saveFile, this);
+		boolean result = plugin.getWorldEditHandler().saveRegionBlocks(saveFile, this);
 		if(result) {
 			AreaShop.debug("Saved schematic for region " + getName());
 		}
 		return true;
 	}
 
+	/**
+	 * Save all blocks in a region for restoring later.
+	 * @param fileName The name of the file to save to (extension and folder will be added)
+	 * @return true if the region has been saved properly, otherwise false
+	 */
+	public CompletableFuture<Boolean> saveRegionBlocksAsync(String fileName) {
+		// Check if the region is correct
+		ProtectedRegion region = getRegion();
+		if(region == null) {
+			AreaShop.debug("Region '" + getName() + "' does not exist in WorldGuard, save failed");
+			return CompletableFuture.completedFuture(false);
+		}
+		// The path to save the schematic
+		File saveFile = new File(plugin.getFileManager().getSchematicFolder() + File.separator + fileName);
+		// Create parent directories
+		File parent = saveFile.getParentFile();
+		if(parent != null && !parent.exists()) {
+			if(!parent.mkdirs()) {
+				AreaShop.warn("Did not save region " + getName() + ", schematic directory could not be created: " + saveFile.getAbsolutePath());
+				return CompletableFuture.completedFuture(false);
+			}
+		}
+		return plugin.getWorldEditHandler().saveRegionBlocksAsync(saveFile, this).thenApply(result -> {
+			if(result) {
+				AreaShop.debug("Saved schematic for region " + getName());
+			}
+			return result;
+		});
+	}
+
 	/**
 	 * Restore all blocks in a region for restoring later.
 	 * @param fileName The name of the file to save to (extension and folder will be added)
@@ -821,24 +821,47 @@ public abstract class GeneralRegion implements GeneralRegionInterface, Comparabl
 		}
 		// The path to save the schematic
 		File restoreFile = new File(plugin.getFileManager().getSchematicFolder() + File.separator + fileName);
-		boolean result = worldEditInterface.restoreRegionBlocks(restoreFile, this);
+		boolean result = plugin.getWorldEditHandler().restoreRegionBlocks(restoreFile, this);
 		if(result) {
 			AreaShop.debug("Restored schematic for region " + getName());
 
 			// Workaround for signs inside the region in combination with async restore of plugins like AsyncWorldEdit and FastAsyncWorldEdit
-			Do.syncLater(10, getSignsFeature().signManager()::update);
+			Bukkit.getScheduler().runTaskLater(plugin, getSignsFeature()::update, 10);
 		}
 		return result;
 	}
 
+	/**
+	 * Restore all blocks in a region for restoring later.
+	 * @param fileName The name of the file to save to (extension and folder will be added)
+	 * @return true if the region has been restored properly, otherwise false
+	 */
+	public CompletableFuture<Boolean> restoreRegionBlocksAsync(String fileName) {
+		if(getRegion() == null) {
+			AreaShop.debug("Region '" + getName() + "' does not exist in WorldGuard, restore failed");
+			return CompletableFuture.completedFuture(false);
+		}
+		// The path to save the schematic
+		File restoreFile = new File(plugin.getFileManager().getSchematicFolder() + File.separator + fileName);
+		return plugin.getWorldEditHandler().restoreRegionBlocksAsync(restoreFile, this).thenApply(result -> {
+			if(result) {
+				AreaShop.debug("Restored schematic for region " + getName());
+
+				// Workaround for signs inside the region in combination with async restore of plugins like AsyncWorldEdit and FastAsyncWorldEdit
+				Bukkit.getScheduler().runTaskLater(plugin, getSignsFeature()::update, 10);
+			}
+			return result;
+		});
+	}
+
 	/**
 	 * Reset all flags of the region.
 	 */
 	public void resetRegionFlags() {
 		ProtectedRegion region = getRegion();
 		if(region != null) {
-			region.setFlag(worldGuardInterface.fuzzyMatchFlag("greeting"), null);
-			region.setFlag(worldGuardInterface.fuzzyMatchFlag("farewell"), null);
+			region.setFlag(plugin.getWorldGuardHandler().fuzzyMatchFlag("greeting"), null);
+			region.setFlag(plugin.getWorldGuardHandler().fuzzyMatchFlag("farewell"), null);
 		}
 	}
 
@@ -875,6 +898,48 @@ public abstract class GeneralRegion implements GeneralRegionInterface, Comparabl
 		}
 	}
 
+	public CompletableFuture<Boolean> saveNowAsync() {
+		final YamlConfiguration clone = new YamlConfiguration();
+		final String fileName = plugin.getFileManager().getRegionFolder() + File.separator + getName().toLowerCase() + ".yml";
+		try {
+			clone.loadFromString(config.saveToString());
+		} catch (InvalidConfigurationException ex) {
+			ex.printStackTrace();
+			return CompletableFuture.completedFuture(false);
+		}
+		final CompletableFuture<Boolean> future = new CompletableFuture<>();
+		Bukkit.getScheduler().runTaskAsynchronously(plugin, () -> {
+			try {
+				clone.save(new File(fileName));
+				future.complete(true);
+			} catch (IOException ex) {
+				ex.printStackTrace();
+				future.complete(false);
+			}
+		});
+		return future;
+	}
+
+	public TaskChain<Boolean> saveNowAsync(final TaskChain<?> chain) {
+		final YamlConfiguration clone = new YamlConfiguration();
+		final String fileName = plugin.getFileManager().getRegionFolder() + File.separator + getName().toLowerCase() + ".yml";
+		try {
+			clone.loadFromString(config.saveToString());
+		} catch (InvalidConfigurationException ex) {
+			ex.printStackTrace();
+			return chain.sync((unused) -> false);
+		}
+		return chain.async((unused) -> {
+			try {
+				clone.save(new File(fileName));
+				return true;
+			} catch (IOException ex) {
+				ex.printStackTrace();
+				return false;
+			}
+		});
+	}
+
 
 	// CONFIG
 
@@ -1237,12 +1302,12 @@ public abstract class GeneralRegion implements GeneralRegionInterface, Comparabl
 				int totalLimit = plugin.getConfig().getInt("limitGroups." + group + ".total");
 				int typeLimit = plugin.getConfig().getInt("limitGroups." + group + "." + typePath);
 				//AreaShop.debug("typeLimitOther="+typeLimit+", typePath="+typePath);
-				int totalCurrent = hasRegionsInLimitGroup(offlinePlayer, group, plugin.getFileManager().getRegionsRef(), exclude);
+				int totalCurrent = hasRegionsInLimitGroup(offlinePlayer, group, plugin.getFileManager().getRegions(), exclude);
 				int typeCurrent;
 				if(type == RegionType.RENT) {
-					typeCurrent = hasRegionsInLimitGroup(offlinePlayer, group, plugin.getFileManager().getRentsRef(), exclude);
+					typeCurrent = hasRegionsInLimitGroup(offlinePlayer, group, plugin.getFileManager().getRents(), exclude);
 				} else {
-					typeCurrent = hasRegionsInLimitGroup(offlinePlayer, group, plugin.getFileManager().getBuysRef(), exclude);
+					typeCurrent = hasRegionsInLimitGroup(offlinePlayer, group, plugin.getFileManager().getBuys(), exclude);
 				}
 				if(totalLimit == -1) {
 					totalLimit = Integer.MAX_VALUE;
@@ -1304,7 +1369,7 @@ public abstract class GeneralRegion implements GeneralRegionInterface, Comparabl
 	/**
 	 * Class to store the result of a limits check.
 	 */
-	public class LimitResult {
+	public static class LimitResult {
 		private final boolean actionAllowed;
 		private final LimitType limitingFactor;
 		private final int maximum;
@@ -1398,7 +1463,7 @@ public abstract class GeneralRegion implements GeneralRegionInterface, Comparabl
 	 * @param exclude    Exclude this region from the count
 	 * @return The number of regions that the player has bought or rented matching the limit group (worlds and groups filters)
 	 */
-	public int hasRegionsInLimitGroup(OfflinePlayer player, String limitGroup, Collection<? extends GeneralRegion> regions, GeneralRegion exclude) {
+	public int hasRegionsInLimitGroup(OfflinePlayer player, String limitGroup, List<? extends GeneralRegion> regions, GeneralRegion exclude) {
 		int result = 0;
 		for(GeneralRegion region : regions) {
 			if(region.getBooleanSetting("general.countForLimits")
@@ -1419,8 +1484,8 @@ public abstract class GeneralRegion implements GeneralRegionInterface, Comparabl
 	public boolean matchesLimitGroup(String group) {
 		List<String> worlds = plugin.getConfig().getStringList("limitGroups." + group + ".worlds");
 		List<String> groups = plugin.getConfig().getStringList("limitGroups." + group + ".groups");
-		if((worlds == null || worlds.isEmpty() || worlds.contains(getWorldName()))) {
-			if(groups == null || groups.isEmpty()) {
+		if(worlds.isEmpty() || worlds.contains(getWorldName())) {
+			if(groups.isEmpty()) {
 				return true;
 			} else {
 				boolean inGroups = false;
@@ -1454,12 +1519,12 @@ public abstract class GeneralRegion implements GeneralRegionInterface, Comparabl
 		// Save the region if needed
 		if(save != null && !save.isEmpty()) {
 			save = Message.fromString(save).replacements(this).getSingle();
-			saveRegionBlocks(save);
+			saveRegionBlocksAsync(save);
 		}
 		// Restore the region if needed
 		if(restore != null && !restore.isEmpty()) {
 			restore = Message.fromString(restore).replacements(this).getSingle();
-			restoreRegionBlocks(restore);
+			restoreRegionBlocksAsync(restore);
 		}
 	}
 
@@ -1548,7 +1613,7 @@ public abstract class GeneralRegion implements GeneralRegionInterface, Comparabl
 			}
 			// Estimate, but quick algorithm
 			else {
-				List<Vector> points = worldGuardInterface.getRegionPoints(region);
+				List<Vector> points = plugin.getWorldGuardHandler().getRegionPoints(region);
 				int numPoints = points.size();
 				if(numPoints < 3) {
 					return 0;

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

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

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

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

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

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

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

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

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

@@ -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;
@@ -750,10 +721,11 @@ public class RentRegion extends GeneralRegion {
 			return false;
 		}
 		long lastPlayed = getLastActiveTime();
+		final long now = System.currentTimeMillis();
 		//AreaShop.debug("currentTime=" + Calendar.getInstance().getTimeInMillis() + ", getLastPlayed()=" + lastPlayed + ", timeInactive=" + (Calendar.getInstance().getTimeInMillis()-player.getLastPlayed()) + ", inactiveSetting=" + inactiveSetting);
-		if(Calendar.getInstance().getTimeInMillis() > (lastPlayed + inactiveSetting)) {
+		if(now > (lastPlayed + inactiveSetting)) {
 			AreaShop.info("Region " + getName() + " unrented because of inactivity for player " + getPlayerName());
-			AreaShop.debug("currentTime=" + Calendar.getInstance().getTimeInMillis() + ", getLastPlayed()=" + lastPlayed + ", timeInactive=" + (Calendar.getInstance().getTimeInMillis() - player.getLastPlayed()) + ", inactiveSetting=" + inactiveSetting);
+			AreaShop.debug("currentTime=" + now + ", getLastPlayed()=" + lastPlayed + ", timeInactive=" + (now - player.getLastPlayed()) + ", inactiveSetting=" + inactiveSetting);
 			return this.unRent(true, null);
 		}
 		return false;

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

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

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

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

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

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

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

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

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

@@ -343,6 +343,7 @@ destroy-successRent: "%lang:region% successfully deregistered as rental region."
 destroy-successBuy: "%lang:region% successfully deregistered as buy region."
 
 teleport-help: "/as tp <region> [sign]."
+teleport-calculation-progress: "Teleport in progress, finding safe location %done%/%max% scans complete."
 teleport-noRentOrBuy: "The specified region is not registered: %0%."
 teleport-noPermission: "You don't have permission to teleport to your region."
 teleport-noPermissionOther: "You don't have permission to teleport to regions you do not own."

AreaShop/src/main/resources/plugin.yml

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

README.md

@@ -64,11 +64,11 @@ For a preview join 'mc.go-craft.com' and go to the Survival server, the shops ar
 Old video for AreaShop v1.0: [Tutorial by VariationVault](https://www.youtube.com/watch?v=k2HMCxCCOYo)
 
 ### Required dependencies
-* Java 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

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

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

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

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

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

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

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

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

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

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

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

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

adapters/plugins/fastasyncworldedit/build.gradle.kts

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

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

@@ -1,297 +0,0 @@
-package me.wiefferink.areashop.adapters.plugins;
-
-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 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;
-		}
-	}
-}

adapters/plugins/worldedit/build.gradle.kts

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

adapters/plugins/worldguard/build.gradle.kts

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

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

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

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

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

areashop-interface/build.gradle.kts

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

areashop-interface/src/main/java/me/wiefferink/areashop/interfaces/BukkitInterface.java

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

areashop-nms/build.gradle.kts

@@ -1,5 +0,0 @@
-dependencies {
-    compileOnly(libs.spigot)
-}
-
-description = "AreaShop NMS Interface"

areashop-nms/src/main/java/me/wiefferink/areashop/nms/BlockBehaviourHelper.java

@@ -1,16 +0,0 @@
-package me.wiefferink.areashop.nms;
-
-import org.bukkit.Location;
-import org.bukkit.block.Block;
-import org.bukkit.block.BlockState;
-import org.bukkit.block.data.BlockData;
-
-public interface BlockBehaviourHelper {
-
-    boolean canPlace(Location location, BlockData blockData);
-
-    boolean isBlockValid(Block block);
-
-    boolean isBlockStateValid(BlockState blockState);
-
-}

areashop-nms/src/main/java/me/wiefferink/areashop/nms/NMS.java

@@ -1,7 +0,0 @@
-package me.wiefferink.areashop.nms;
-
-public interface NMS {
-
-    BlockBehaviourHelper blockBehaviourHelper();
-
-}