Initial work on rewriting regions

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

.github/ISSUE_TEMPLATE/bug_report.md

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

.github/ISSUE_TEMPLATE/feature_request.md

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

.github/ISSUE_TEMPLATE/support-question.md

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

.github/workflows/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,7 +1,6 @@
 # Maven stuff
-/target
+target
 
-*.pydevproject
 .project
 .metadata
 bin/
@@ -15,17 +14,12 @@ local.properties
 .settings/
 .loadpath
 
-# External tool builders
-.externalToolBuilders/
-
 # Locally stored "Eclipse launch configurations"
 *.launch
 
-# CDT-specific
-.cproject
-
-# PDT-specific
-.buildpath
-
 # IntelliJ IDEA
-*.iml
+*.iml
+.idea
+dependency-reduced-pom.xml
+
+desktop.ini

AreaShop/.gitignore

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

AreaShop/pom.xml

@@ -1,156 +1,342 @@
 <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>
-  <groupId>nl.evolutioncoding</groupId>
-  <artifactId>areashop</artifactId>
-  <packaging>jar</packaging>
-  <name>AreaShop</name>
-  <version>2.2.2</version> <!-- Main plugin version -->
+         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>
 
-  <properties>
-    <project.build.sourceEncoding>UTF-8</project.build.sourceEncoding>
-  </properties>
+    <parent>
+        <groupId>me.wiefferink</groupId>
+        <artifactId>areashop-parent</artifactId>
+        <version>1.0</version>
+    </parent>
 
-  <repositories>
-    <repository>
-      <id>bukkit-repo</id>
-      <url>http://repo.bukkit.org/content/groups/public</url>
-    </repository>
-    <repository>
-      <id>sk89q-repo-wg</id>
-      <url>http://maven.sk89q.com/artifactory/repo/</url>
-    </repository>
-  </repositories>
+    <artifactId>areashop</artifactId>
+    <packaging>jar</packaging>
+    <name>AreaShop</name>
+    <version>2.7</version> <!-- Main plugin version -->
 
-  <dependencies>
-    <dependency>
-      <groupId>org.bukkit</groupId>
-      <artifactId>bukkit</artifactId>
-      <version>1.7.9-R0.2</version>
-      <type>jar</type>
-      <scope>provided</scope>
-      <optional>true</optional>
-    </dependency>
-    <dependency>
-      <groupId>nl.evolutioncoding</groupId>
-      <artifactId>areashop-worldguard-5</artifactId>
-      <version>WorldGuard-5</version>
-      <type>jar</type>
-      <scope>compile</scope>
-      <optional>true</optional>
-    </dependency>
-    <dependency>
-      <groupId>nl.evolutioncoding</groupId>
-      <artifactId>areashop-worldguard-6</artifactId>
-      <version>WorldGuard-6</version>
-      <type>jar</type>
-      <scope>compile</scope>
-      <optional>true</optional>
-    </dependency>
-    <dependency>
-      <groupId>nl.evolutioncoding</groupId>
-      <artifactId>areashop-interface</artifactId>
-      <version>AreaShopInterface</version>
-      <type>jar</type>
-      <scope>compile</scope>
-      <optional>true</optional>
-    </dependency>
-    <dependency>
-      <groupId>nl.evolutioncoding</groupId>
-      <artifactId>areashop-worldedit-5</artifactId>
-      <version>WorldEdit-5</version>
-      <type>jar</type>
-      <scope>compile</scope>
-      <optional>true</optional>
-    </dependency>
-    <dependency>
-      <groupId>nl.evolutioncoding</groupId>
-      <artifactId>areashop-worldedit-6</artifactId>
-      <version>WorldEdit-6</version>
-      <type>jar</type>
-      <scope>compile</scope>
-      <optional>true</optional>
-    </dependency>
-    <dependency>
-      <groupId>com.sk89q</groupId>
-      <artifactId>worldedit</artifactId>
-      <version>6.0.0-SNAPSHOT</version>
-      <scope>provided</scope>
-      <type>jar</type>
-    </dependency>
-    <dependency>
-      <groupId>com.sk89q</groupId>
-      <artifactId>worldguard</artifactId>
-      <version>6.0.0-SNAPSHOT</version>
-      <scope>provided</scope>
-      <type>jar</type>
-    </dependency>
-    <dependency>
-      <groupId>net.milkbowl</groupId>
-      <artifactId>vault</artifactId>
-      <version>1.4.1</version>
-      <scope>system</scope>
-      <systemPath>${basedir}/../dependencies/Vault.jar</systemPath>
-    </dependency>
-  </dependencies>
+    <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>
 
-  <build>
-    <directory>target</directory>
-    <finalName>AreaShop</finalName>
-    <!-- Include all required resources -->
-    <resources>
-      <resource>
-        <targetPath>.</targetPath>
-        <filtering>true</filtering>
-        <directory>src/main/resources</directory>
-        <includes>
-          <include>plugin.yml</include>
-          <include>config.yml</include>
-          <include>default.yml</include>
-          <include>README.md</include>
-          <include>lang/*.yml</include>
-        </includes>
-      </resource>
-    </resources>
-    <plugins>
-      <plugin>
-        <groupId>org.apache.maven.plugins</groupId>
-        <artifactId>maven-shade-plugin</artifactId>
-        <version>2.4.3</version>
-        <executions>
-          <execution>
-            <phase>package</phase>
-            <goals>
-              <goal>shade</goal>
-            </goals>
-          </execution>
-        </executions>
-      </plugin>
-      <plugin>
-        <artifactId>maven-compiler-plugin</artifactId>
-        <version>3.5.1</version>
-        <configuration>
-          <source>1.7</source>
-          <target>1.7</target>
-        </configuration>
-      </plugin>
-      <!-- Copy resulting file to local server, change to your own path -->
-      <plugin>
-	    <artifactId>maven-antrun-plugin</artifactId>
-	    <configuration>
-	      <tasks>
-	        <copy file="./target/${project.build.finalName}.jar" tofile="C:\Games\Minecraft\Spigot\plugins\${project.build.finalName}.jar"/>
-	      </tasks>
-	    </configuration>
-	    <executions>
-	      <execution>
-	        <phase>package</phase>
-	        <goals>
-	          <goal>run</goal>
-	        </goals>
-	      </execution>
-	    </executions>
-      </plugin>
-    </plugins>
-  </build>
+    <dependencies>
+        <dependency>
+            <groupId>org.jetbrains</groupId>
+            <artifactId>annotations</artifactId>
+            <version>20.1.0</version>
+        </dependency>
+
+        <!-- Bukkit, AreaShop aims to support 1.15.2+ -->
+        <dependency>
+            <groupId>org.spigotmc</groupId>
+            <artifactId>spigot-api</artifactId>
+            <version>1.15.2-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>com.google.inject</groupId>
+            <artifactId>guice</artifactId>
+            <version>5.0.1</version>
+            <exclusions>
+                <exclusion>
+                    <groupId>com.google.guava</groupId>
+                    <artifactId>guava</artifactId>
+                </exclusion>
+            </exclusions>
+        </dependency>
+
+        <dependency>
+            <groupId>com.google.inject.extensions</groupId>
+            <artifactId>guice-assistedinject</artifactId>
+            <version>5.0.1</version>
+            <exclusions>
+                <exclusion>
+                    <groupId>com.google.guava</groupId>
+                    <artifactId>guava</artifactId>
+                </exclusion>
+            </exclusions>
+        </dependency>
+
+        <!-- PaperLib -->
+        <dependency>
+            <groupId>io.papermc</groupId>
+            <artifactId>paperlib</artifactId>
+            <version>1.0.6</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>
+
+        <!-- NMS Implementations -->
+        <dependency>
+            <groupId>me.wiefferink</groupId>
+            <artifactId>areashop-nms-1-15</artifactId>
+            <version>1.0-SNAPSHOT</version>
+            <scope>compile</scope>
+        </dependency>
+
+        <dependency>
+            <groupId>me.wiefferink</groupId>
+            <artifactId>areashop-nms-1-16</artifactId>
+            <version>1.0-SNAPSHOT</version>
+            <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>
+                                <!-- Relocate PaperLib -->
+                                <relocation>
+                                    <pattern>io.papermc</pattern>
+                                    <shadedPattern>me.wiefferink.areashop.shaded.paperlib</shadedPattern>
+                                </relocation>
+                                <!-- Relocate Guice -->
+                                <relocation>
+                                    <pattern>com.google.inject</pattern>
+                                    <shadedPattern>me.wiefferink.areashop.shaded.google.inject</shadedPattern>
+                                </relocation>
+                                <relocation>
+                                    <pattern>javax.inject</pattern>
+                                    <shadedPattern>me.wiefferink.areashop.shaded.javax.inject</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/AreaShop.java

@@ -0,0 +1,826 @@
+package me.wiefferink.areashop;
+
+import co.aikar.taskchain.BukkitTaskChainFactory;
+import com.sk89q.worldedit.bukkit.WorldEditPlugin;
+import com.sk89q.worldguard.bukkit.WorldGuardPlugin;
+import com.sk89q.worldguard.protection.managers.RegionManager;
+import me.wiefferink.areashop.interfaces.AreaShopInterface;
+import me.wiefferink.areashop.interfaces.NMS;
+import me.wiefferink.areashop.interfaces.WorldEditInterface;
+import me.wiefferink.areashop.interfaces.WorldGuardInterface;
+import me.wiefferink.areashop.listeners.PlayerLoginLogoutListener;
+import me.wiefferink.areashop.managers.*;
+import me.wiefferink.areashop.tools.Analytics;
+import me.wiefferink.areashop.tools.GithubUpdateCheck;
+import me.wiefferink.areashop.tools.Utils;
+import me.wiefferink.interactivemessenger.processing.Message;
+import me.wiefferink.interactivemessenger.source.LanguageManager;
+import net.milkbowl.vault.economy.Economy;
+import org.apache.commons.lang.StringUtils;
+import org.bukkit.Bukkit;
+import org.bukkit.OfflinePlayer;
+import org.bukkit.World;
+import org.bukkit.command.CommandSender;
+import org.bukkit.configuration.ConfigurationSection;
+import org.bukkit.configuration.file.YamlConfiguration;
+import org.bukkit.entity.Player;
+import org.bukkit.event.HandlerList;
+import org.bukkit.permissions.Permission;
+import org.bukkit.plugin.Plugin;
+import org.bukkit.plugin.RegisteredServiceProvider;
+import org.bukkit.plugin.java.JavaPlugin;
+
+import java.util.HashSet;
+import java.util.List;
+import java.util.Set;
+import java.util.logging.Level;
+import java.util.regex.Matcher;
+import java.util.regex.Pattern;
+
+/**
+ * Main class for the AreaShop plugin.
+ * Contains methods to get parts of the plugins functionality and definitions for constants.
+ */
+public final class AreaShop extends JavaPlugin implements AreaShopInterface {
+
+    // Folders and file names
+    public static final String languageFolder = "lang";
+    public static final String schematicFolder = "schem";
+    public static final String regionsFolder = "regions";
+    public static final String groupsFile = "groups.yml";
+    public static final String defaultFile = "default.yml";
+    public static final String configFile = "config.yml";
+    public static final String configFileHidden = "hiddenConfig.yml";
+    public static final String versionFile = "versions";
+    // Euro tag for in the config
+    public static final String currencyEuro = "%euro%";
+    // Constants for handling file versions
+    public static final String versionFiles = "files";
+    public static final int versionFilesCurrent = 3;
+    // Keys for replacing parts of flags, commands, strings
+    public static final String tagPlayerName = "player";
+    public static final String tagPlayerUUID = "uuid";
+    public static final String tagWorldName = "world";
+    public static final String tagRegionName = "region";
+    public static final String tagRegionType = "type";
+    public static final String tagPrice = "price";
+    public static final String tagRawPrice = "rawprice";
+    public static final String tagDuration = "duration";
+    public static final String tagRentedUntil = "until";
+    public static final String tagRentedUntilShort = "untilshort";
+    public static final String tagWidth = "width"; // x-axis
+    public static final String tagHeight = "height"; // y-axis
+    public static final String tagDepth = "depth"; // z-axis
+    public static final String tagVolume = "volume";
+    // Number of blocks in the region (accounting for polygon regions)
+    public static final String tagTimeLeft = "timeleft";
+    public static final String tagClicker = "clicker";
+    public static final String tagResellPrice = "resellprice";
+    public static final String tagRawResellPrice = "rawresellprice";
+    public static final String tagFriends = "friends";
+    public static final String tagFriendsUUID = "friendsuuid";
+    public static final String tagMoneyBackPercentage = "moneybackpercent";
+    public static final String tagMoneyBackAmount = "moneyback";
+    public static final String tagRawMoneyBackAmount = "rawmoneyback";
+    public static final String tagTimesExtended = "timesExtended";
+    public static final String tagMaxExtends = "maxextends";
+    public static final String tagExtendsLeft = "extendsleft";
+    public static final String tagMaxRentTime = "maxrenttime";
+    public static final String tagMaxInactiveTime = "inactivetime";
+    public static final String tagLandlord = "landlord";
+    public static final String tagLandlordUUID = "landlorduuid";
+    public static final String tagDateTime = "datetime";
+    public static final String tagDateTimeShort = "datetimeshort";
+    public static final String tagYear = "year";
+    public static final String tagMonth = "month";
+    public static final String tagDay = "day";
+    public static final String tagHour = "hour";
+    public static final String tagMinute = "minute";
+    public static final String tagSecond = "second";
+    public static final String tagMillisecond = "millisecond";
+    public static final String tagEpoch = "epoch";
+    public static final String tagTeleportX = "tpx";
+    public static final String tagTeleportY = "tpy";
+    public static final String tagTeleportZ = "tpz";
+    public static final String tagTeleportBlockX = "tpblockx";
+    public static final String tagTeleportBlockY = "tpblocky";
+    public static final String tagTeleportBlockZ = "tpblockz";
+    public static final String tagTeleportPitch = "tppitch";
+    public static final String tagTeleportYaw = "tpyaw";
+    public static final String tagTeleportPitchRound = "tppitchround";
+    public static final String tagTeleportYawRound = "tpyawround";
+    public static final String tagTeleportWorld = "tpworld";
+    // REGEX Matcher for Versions which follow a x.x.x format.
+    private static final Pattern VERSION_MATCHER_3 = Pattern.compile("([0-9]+)\\.([0-9]+)\\.([0-9]+)");
+    private static final Pattern VERSION_MATCHER_2 = Pattern.compile("([0-9]+)\\.([0-9]+)");
+    // Statically available instance
+    private static AreaShop instance = null;
+    // General variables
+    private WorldGuardPlugin worldGuard = null;
+    private WorldGuardInterface worldGuardInterface = null;
+    private WorldEditPlugin worldEdit = null;
+    private WorldEditInterface worldEditInterface = null;
+    private FileManager fileManager = null;
+    private LanguageManager languageManager = null;
+    private CommandManager commandManager = null;
+    private SignLinkerManager signLinkerManager = null;
+    private FeatureManager featureManager = null;
+    private Set<Manager> managers = null;
+    private boolean debug = false;
+    private List<String> chatprefix = null;
+    private boolean ready = false;
+    private GithubUpdateCheck githubUpdateCheck = null;
+    private NMS nms;
+
+    public static AreaShop getInstance() {
+        return AreaShop.instance;
+    }
+
+    /**
+     * Sends an debug message to the console.
+     *
+     * @param message The message that should be printed to the console
+     */
+    public static void debug(Object... message) {
+        if (AreaShop.getInstance().debug) {
+            info("Debug: " + StringUtils.join(message, " "));
+        }
+    }
+
+    /**
+     * Print an information message to the console.
+     *
+     * @param message The message to print
+     */
+    public static void info(Object... message) {
+        AreaShop.getInstance().getLogger().info(StringUtils.join(message, " "));
+    }
+
+    /**
+     * Print a warning to the console.
+     *
+     * @param message The message to print
+     */
+    public static void warn(Object... message) {
+        AreaShop.getInstance().getLogger().warning(StringUtils.join(message, " "));
+    }
+
+    /**
+     * Print an error to the console.
+     *
+     * @param message The message to print
+     */
+    public static void error(Object... message) {
+        AreaShop.getInstance().getLogger().severe(StringUtils.join(message, " "));
+    }
+
+    /**
+     * Print debug message for periodic task.
+     *
+     * @param message The message to print
+     */
+    public static void debugTask(Object... message) {
+        if (AreaShop.getInstance().getConfig().getBoolean("debugTask")) {
+            AreaShop.debug(StringUtils.join(message, " "));
+        }
+    }
+
+    /**
+     * Notify a player about an update if he wants notifications about it and an update is available.
+     *
+     * @param sender CommandSender to notify
+     */
+    public void notifyUpdate(CommandSender sender) {
+        if (githubUpdateCheck != null && githubUpdateCheck.hasUpdate() && sender
+                .hasPermission("areashop.notifyupdate")) {
+            AreaShop.getInstance().message(sender, "update-playerNotify",
+                    cleanVersion(githubUpdateCheck.getCurrentVersion()),
+                    cleanVersion(githubUpdateCheck.getLatestVersion()));
+        }
+    }
+
+    /**
+     * Cleanup a version number.
+     *
+     * @param version Version to clean
+     * @return Cleaned up version (removed prefixes and suffixes)
+     */
+    private String cleanVersion(String version) {
+        version = version.toLowerCase();
+
+        // Strip 'v' as used on Github tags
+        if (version.startsWith("v")) {
+            version = version.substring(1);
+        }
+
+        // Strip build number as used by Jenkins
+        if (version.contains("#")) {
+            version = version.substring(0, version.indexOf("#"));
+        }
+
+        return version;
+    }
+
+    /**
+     * Indicates if the plugin is ready to be used.
+     *
+     * @return true if the plugin is ready, false otherwise
+     */
+    public boolean isReady() {
+        return ready;
+    }
+
+    /**
+     * Set if the plugin is ready to be used or not (not to be used from another plugin!).
+     *
+     * @param ready Indicate if the plugin is ready to be used
+     */
+    public void setReady(boolean ready) {
+        this.ready = ready;
+    }
+
+    /**
+     * Set if the plugin should output debug messages (loaded from config normally).
+     *
+     * @param debug Indicates if the plugin should output debug messages or not
+     */
+    public void setDebug(boolean debug) {
+        this.debug = debug;
+    }
+
+    /**
+     * Setup a new LanguageManager.
+     */
+    private void setupLanguageManager() {
+        languageManager =
+                new LanguageManager(this, languageFolder, getConfig().getString("language"), "EN",
+                        chatprefix);
+    }
+
+    /**
+     * Set the chatprefix to use in the chat (loaded from config normally).
+     *
+     * @param chatprefix The string to use in front of chat messages (supports formatting codes)
+     */
+    public void setChatprefix(List<String> chatprefix) {
+        this.chatprefix = chatprefix;
+    }
+
+    public NMS getNMSHelper() {
+        return this.nms;
+    }
+
+    /**
+     * Function to get WorldGuardInterface for version dependent things.
+     *
+     * @return WorldGuardInterface
+     */
+    public WorldGuardInterface getWorldGuardHandler() {
+        return this.worldGuardInterface;
+    }
+
+    /**
+     * Get the RegionManager.
+     *
+     * @param world World to get the RegionManager for
+     * @return RegionManager for the given world, if there is one, otherwise null
+     */
+    public RegionManager getRegionManager(World world) {
+        return this.worldGuardInterface.getRegionManager(world);
+    }
+
+    /**
+     * Function to get WorldGuardInterface for version dependent things.
+     *
+     * @return WorldGuardInterface
+     */
+    public WorldEditInterface getWorldEditHandler() {
+        return this.worldEditInterface;
+    }
+
+    /**
+     * Function to get the LanguageManager.
+     *
+     * @return the LanguageManager
+     */
+    public LanguageManager getLanguageManager() {
+        return languageManager;
+    }
+
+    /**
+     * Function to get the CommandManager.
+     *
+     * @return the CommandManager
+     */
+    public CommandManager getCommandManager() {
+        return commandManager;
+    }
+
+    /**
+     * Get the SignLinkerManager.
+     * Handles sign linking mode.
+     *
+     * @return The SignLinkerManager
+     */
+    public SignLinkerManager getSignlinkerManager() {
+        return signLinkerManager;
+    }
+
+    /**
+     * Get the FeatureManager.
+     * Manages region specific features.
+     *
+     * @return The FeatureManager
+     */
+    public FeatureManager getFeatureManager() {
+        return featureManager;
+    }
+
+    /**
+     * Function to get the Vault plugin.
+     *
+     * @return Economy
+     */
+    public Economy getEconomy() {
+        RegisteredServiceProvider<Economy> economy = getServer().getServicesManager()
+                .getRegistration(net.milkbowl.vault.economy.Economy.class);
+        if (economy == null || economy.getProvider() == null) {
+            error(
+                    "There is no economy provider to support Vault, make sure you installed an economy plugin");
+            return null;
+        }
+        return economy.getProvider();
+    }
+
+    /**
+     * Get the Vault permissions provider.
+     *
+     * @return Vault permissions provider
+     */
+    public net.milkbowl.vault.permission.Permission getPermissionProvider() {
+        RegisteredServiceProvider<net.milkbowl.vault.permission.Permission> permissionProvider =
+                getServer().getServicesManager()
+                        .getRegistration(net.milkbowl.vault.permission.Permission.class);
+        return permissionProvider == null ? null : permissionProvider.getProvider();
+    }
+
+    /**
+     * Check for a permission of a (possibly offline) player.
+     *
+     * @param offlinePlayer OfflinePlayer to check
+     * @param permission    Permission to check
+     * @return true if the player has the permission, false if the player does not have permission or, is offline and there is not Vault-compatible permission plugin
+     */
+    public boolean hasPermission(OfflinePlayer offlinePlayer, String permission) {
+        // Online, return through Bukkit
+        if (offlinePlayer.getPlayer() != null) {
+            return offlinePlayer.getPlayer().hasPermission(permission);
+        }
+
+        // Resolve while offline if possible
+        net.milkbowl.vault.permission.Permission permissionProvider = getPermissionProvider();
+        if (permissionProvider != null) {
+            // TODO: Should we provide a world here?
+            return permissionProvider.playerHas(null, offlinePlayer, permission);
+        }
+
+        // Player offline and no offline permission provider available, safely say that there is no permission
+        return false;
+    }
+
+    /**
+     * Method to get the FileManager (loads/save regions and can be used to get regions).
+     *
+     * @return The fileManager
+     */
+    public FileManager getFileManager() {
+        return fileManager;
+    }
+
+    /**
+     * Register dynamic permissions controlled by config settings.
+     */
+    private void registerDynamicPermissions() {
+        // Register limit groups of amount of regions a player can have
+        ConfigurationSection section = getConfig().getConfigurationSection("limitGroups");
+        if (section == null) {
+            return;
+        }
+        for (String group : section.getKeys(false)) {
+            if (!"default".equals(group)) {
+                Permission perm = new Permission("areashop.limits." + group);
+                try {
+                    Bukkit.getPluginManager().addPermission(perm);
+                } catch (IllegalArgumentException e) {
+                    warn("Could not add the following permission to be used as limit: " + perm
+                            .getName());
+                }
+            }
+        }
+        Bukkit.getPluginManager().recalculatePermissionDefaults(
+                Bukkit.getPluginManager().getPermission("playerwarps.limits"));
+    }
+
+    /**
+     * Register all required tasks.
+     */
+    private void setupTasks() {
+        // Rent expiration timer
+        long expirationCheck =
+                Utils.millisToTicks(Utils.getDurationFromSecondsOrString("expiration.delay"));
+        final AreaShop finalPlugin = this;
+        if (expirationCheck > 0) {
+            Bukkit.getScheduler().runTaskTimer(this, () -> {
+                if (isReady()) {
+                    finalPlugin.getFileManager().checkRents();
+                    AreaShop.debugTask("Checking rent expirations...");
+                } else {
+                    AreaShop.debugTask("Skipped checking rent expirations, plugin not ready");
+                }
+            }, 1, expirationCheck);
+        }
+
+        // Inactive unrenting/selling timer
+        long inactiveCheck =
+                Utils.millisToTicks(Utils.getDurationFromMinutesOrString("inactive.delay"));
+        if (inactiveCheck > 0) {
+            Bukkit.getScheduler().runTaskTimer(this,  () -> {
+                if (isReady()) {
+                    finalPlugin.getFileManager().checkForInactiveRegions();
+                    AreaShop.debugTask(
+                            "Checking for regions with players that are inactive too long...");
+                } else {
+                    AreaShop.debugTask(
+                            "Skipped checking for regions of inactive players, plugin not ready");
+                }
+            }, 1, inactiveCheck);
+        }
+
+        // Periodic updating of signs for timeleft tags
+        long periodicUpdate =
+                Utils.millisToTicks(Utils.getDurationFromSecondsOrString("signs.delay"));
+        if (periodicUpdate > 0) {
+            Bukkit.getScheduler().runTaskTimer(this, () -> {
+                if (isReady()) {
+                    finalPlugin.getFileManager().performPeriodicSignUpdate();
+                    AreaShop.debugTask("Performing periodic sign update...");
+                } else {
+                    AreaShop.debugTask("Skipped performing periodic sign update, plugin not ready");
+                }
+            },1, periodicUpdate);
+        }
+
+        // Saving regions and group settings
+        long saveFiles = Utils.millisToTicks(Utils.getDurationFromMinutesOrString("saving.delay"));
+        if (saveFiles > 0) {
+            Bukkit.getScheduler().runTaskTimer(this, () -> {
+                if (isReady()) {
+                    finalPlugin.getFileManager().saveRequiredFiles();
+                    AreaShop.debugTask("Saving required files...");
+                } else {
+                    AreaShop.debugTask("Skipped saving required files, plugin not ready");
+                }
+            }, saveFiles, saveFiles);
+        }
+
+        // Sending warnings about rent regions to online players
+        long expireWarning =
+                Utils.millisToTicks(Utils.getDurationFromMinutesOrString("expireWarning.delay"));
+        if (expireWarning > 0) {
+            Bukkit.getScheduler().runTaskLater(finalPlugin, () -> {
+                if (isReady()) {
+                    finalPlugin.getFileManager().sendRentExpireWarnings();
+                    AreaShop.debugTask("Sending rent expire warnings...");
+                } else {
+                    AreaShop.debugTask("Skipped sending rent expire warnings, plugin not ready");
+                }
+            }, expireWarning);
+        }
+
+        // Update all regions on startup
+        if (getConfig().getBoolean("updateRegionsOnStartup")) {
+            Bukkit.getScheduler().runTaskLater(this, () -> {
+                finalPlugin.getFileManager().updateAllRegions();
+                AreaShop.debugTask("Updating all regions at startup...");
+            }, 20);
+        }
+    }
+
+    /**
+     * Send a message to a target without a prefix.
+     *
+     * @param target       The target to send the message to
+     * @param key          The key of the language string
+     * @param replacements The replacements to insert in the message
+     */
+    public void messageNoPrefix(Object target, String key, Object... replacements) {
+        Message.fromKey(key).replacements(replacements).send(target);
+    }
+
+    /**
+     * Send a message to a target, prefixed by the default chat prefix.
+     *
+     * @param target       The target to send the message to
+     * @param key          The key of the language string
+     * @param replacements The replacements to insert in the message
+     */
+    public void message(Object target, String key, Object... replacements) {
+        Message.fromKey(key).prefix().replacements(replacements).send(target);
+    }
+
+    /**
+     * Return the config.
+     */
+    @Override
+    public YamlConfiguration getConfig() {
+        return fileManager.getConfig();
+    }
+
+    /**
+     * Called on shutdown or reload of the server.
+     */
+    @Override
+    public void onDisable() {
+
+        Bukkit.getServer().getScheduler().cancelTasks(this);
+
+        // Cleanup managers
+        for (Manager manager : managers) {
+            manager.shutdown();
+        }
+        managers = null;
+        fileManager = null;
+        languageManager = null;
+        commandManager = null;
+        signLinkerManager = null;
+        featureManager = null;
+
+        // Cleanup plugins
+        worldGuard = null;
+        worldGuardInterface = null;
+        worldEdit = null;
+        worldEditInterface = null;
+
+        // Cleanup other stuff
+        chatprefix = null;
+        debug = false;
+        ready = false;
+
+        HandlerList.unregisterAll(this);
+    }
+
+    private void setupNMS() throws IllegalStateException {
+        final String packageName = Bukkit.getServer().getClass().getPackage().getName();
+        final String[] split = packageName.split("\\.");
+        final String nmsRevision = split[3];
+        try {
+            Class<?> rawClazz = Class.forName("me.wiefferink.areashop.nms." + nmsRevision + ".NMSImpl");
+            if (!NMS.class.isAssignableFrom(rawClazz)) {
+                throw new IllegalStateException("Invalid NMS Impl: " + rawClazz.getCanonicalName() + " does not implement the NMS!");
+            }
+            Class<? extends NMS> casted = rawClazz.asSubclass(NMS.class);
+            this.nms = casted.getConstructor().newInstance();
+        } catch (ReflectiveOperationException ex) {
+            throw new IllegalStateException("Failed to instantiate the NMS Helper!", ex);
+        }
+    }
+
+    /**
+     * Called on start or reload of the server.
+     */
+    @Override
+    public void onEnable() {
+        AreaShop.instance = this;
+        Utils.factory = BukkitTaskChainFactory.create(this);
+        managers = new HashSet<>();
+        boolean error = !loadHooks();
+
+        // Check if Vault is present
+        if (getServer().getPluginManager().getPlugin("Vault") == null) {
+            error("Vault plugin is not present or has not loaded correctly");
+            error = true;
+        }
+
+        // Setup the NMS helper
+        setupNMS();
+
+        // Load all data from files and check versions
+        fileManager = new FileManager();
+        managers.add(fileManager);
+        boolean loadFilesResult = fileManager.loadFiles(false);
+        error = error || !loadFilesResult;
+
+        setupLanguageManager();
+
+        if (error) {
+            error("The plugin has not started, fix the errors listed above");
+        } else {
+            featureManager = new FeatureManager();
+            managers.add(featureManager);
+
+            // Register the event listeners
+            getServer().getPluginManager()
+                    .registerEvents(new PlayerLoginLogoutListener(this), this);
+
+            setupTasks();
+
+            // Startup the CommandManager (registers itself for the command)
+            commandManager = new CommandManager();
+            managers.add(commandManager);
+
+            // Create a signLinkerManager
+            signLinkerManager = new SignLinkerManager();
+            managers.add(signLinkerManager);
+
+            // Enable Metrics if config allows it
+            if (getConfig().getBoolean("sendStats")) {
+                Analytics.start();
+            }
+
+            // Register dynamic permission (things declared in config)
+            registerDynamicPermissions();
+
+            // Don't initialize the updatechecker if disabled in the config
+            if (getConfig().getBoolean("checkForUpdates")) {
+
+                final GithubUpdateCheck.VersionComparator comparator = (latestVersion, currentVersion) -> {
+                    Matcher matcher0 = VERSION_MATCHER_3.matcher(latestVersion);
+                    boolean dual0 = false;
+                    if (!matcher0.find()) {
+                        matcher0 = VERSION_MATCHER_2.matcher(latestVersion);
+                        if (!matcher0.find()) {
+                            throw new IllegalArgumentException("Invalid Versions Detected!");
+                        }
+                        dual0 = true;
+                    }
+                    Matcher matcher1 = VERSION_MATCHER_3.matcher(currentVersion);
+                    boolean dual1 = false;
+                    if (!matcher1.find()) {
+                        matcher1 = VERSION_MATCHER_2.matcher(currentVersion);
+                        if (!matcher1.find()) {
+                            throw new IllegalArgumentException("Invalid Versions Detected!");
+                        }
+                        dual1 = true;
+                    }
+
+                    int major0 = Integer.parseInt(matcher0.group(1));
+                    int centre0 = Integer.parseInt(matcher0.group(2));
+                    int minor0 = dual0 ? 0 : Integer.parseInt(matcher0.group(3));
+
+                    int major1 = Integer.parseInt(matcher1.group(1));
+                    int centre1 = Integer.parseInt(matcher1.group(2));
+                    int minor1 = dual1 ? 0 : Integer.parseInt(matcher1.group(3));
+
+                    return major0 > major1 && centre0 > centre1 && minor0 > minor1;
+                };
+
+                githubUpdateCheck =
+                        new GithubUpdateCheck(AreaShop.getInstance(), "NLThijs48", "AreaShop")
+                                .withVersionComparator(comparator).checkUpdate(result -> {
+                            AreaShop.debug("Update check result:", result);
+                            if (!result.hasUpdate()) {
+                                return;
+                            }
+
+                            AreaShop.info(
+                                    "Update from AreaShop V" + cleanVersion(result.getCurrentVersion())
+                                            + " to AreaShop V" + cleanVersion(result.getLatestVersion())
+                                            + " available, get the latest version at https://www.spigotmc.org/resources/areashop.2991/");
+                            for (Player player : Utils.getOnlinePlayers()) {
+                                notifyUpdate(player);
+                            }
+                        });
+            }
+        }
+    }
+
+    public boolean loadHooks() {
+        final Plugin worldEdit = getServer().getPluginManager().getPlugin("WorldEdit");
+        if (!(worldEdit instanceof WorldEditPlugin) || !worldEdit.isEnabled()) {
+            error("WorldEdit plugin is not present or has not loaded correctly");
+            return true;
+        }
+        final Plugin worldGuard = getServer().getPluginManager().getPlugin("WorldGuard");
+        if (!(worldGuard instanceof WorldGuardPlugin) || !worldEdit.isEnabled()) {
+            error("WorldGuard plugin is not present or has not loaded correctly");
+            return true;
+        }
+        final String packageName = "me.wiefferink.areashop.handlers.";
+        final Plugin fawe = getServer().getPluginManager().getPlugin("FastAsyncWorldEdit");
+        if (fawe != null && fawe.isEnabled()) {
+            final String version = fawe.getDescription().getVersion();
+            if (version.startsWith("1.15") || version.startsWith("1.16")) {
+                try {
+                    this.worldEditInterface = (WorldEditInterface) Class.forName(packageName + "fawe.v1_15.FastAsyncWorldEditHandler")
+                            .getDeclaredConstructor(AreaShopInterface.class).newInstance(this);
+                } catch (ReflectiveOperationException ex) {
+                    getLogger().log(Level.SEVERE, "Failed to hook into FAWE!");
+                    ex.printStackTrace();
+                }
+            }
+            if (this.worldEditInterface == null) {
+                info("FAWE Version: " + version + " detected, no compatible handler found. Using the WorldEdit handler instead.");
+            }
+        }
+        if (this.worldEditInterface == null) {
+            final String version = worldEdit.getDescription().getVersion();
+            Matcher matcher = VERSION_MATCHER_3.matcher(version);
+            if (!matcher.find()) {
+                error("Failed to parse the WE version!");
+                return false;
+            }
+            String major = matcher.group(1);
+            if (Integer.parseInt(major) < 7) {
+                error("Unsupported WorldEdit Version: " + version + "! Only WorldEdit version(s) 7.x.x or newer are supported!");
+                return false;
+            }
+            try {
+                this.worldEditInterface = (WorldEditInterface) Class.forName(packageName + "worldedit.v" + major + ".WorldEditHandler")
+                        .getDeclaredConstructor(AreaShopInterface.class).newInstance(this);
+            } catch (final ReflectiveOperationException ex) {
+                ex.printStackTrace();
+                error("Failed to hook into WorldEdit!");
+                return false;
+            }
+        }
+        final String wgVersion = worldGuard.getDescription().getVersion();
+        Matcher matcher = VERSION_MATCHER_3.matcher(wgVersion);
+        if (!matcher.find()) {
+            error("Failed to parse the WG version!");
+            return false;
+        }
+        String major = matcher.group(1);
+
+        if (Integer.parseInt(major) < 7) {
+            error("Unsupported WorldGuard Version: " + wgVersion + "! Only WorldGuard version(s) 7.x.x or newer are supported!");
+            return false;
+        }
+        try {
+            this.worldGuard = (WorldGuardPlugin) worldGuard;
+            this.worldGuardInterface = (WorldGuardInterface) Class.forName(packageName + "worldguard.v" + major + ".WorldGuardHandler")
+                    .getDeclaredConstructor(AreaShopInterface.class).newInstance(this);
+        } catch (ReflectiveOperationException ex) {
+            ex.printStackTrace();
+            error("Failed to hook into WorldGuard!");
+            return false;
+        }
+        return true;
+    }
+
+    /**
+     * Non-static debug to use as implementation of the interface.
+     *
+     * @param message Object parts of the message that should be logged, toString() will be used
+     */
+    @Override
+    public void debugI(Object... message) {
+        AreaShop.debug(StringUtils.join(message, " "));
+    }
+
+    /**
+     * Function to get the WorldGuard plugin.
+     *
+     * @return WorldGuardPlugin
+     */
+    @Override
+    public WorldGuardPlugin getWorldGuard() {
+        return worldGuard;
+    }
+
+    /**
+     * Function to get the WorldEdit plugin.
+     *
+     * @return WorldEditPlugin
+     */
+    @Override
+    public WorldEditPlugin getWorldEdit() {
+        return worldEdit;
+    }
+
+    /**
+     * Reload all files of the plugin and update all regions.
+     *
+     * @param confirmationReceiver The CommandSender which should be notified when complete, null for nobody
+     */
+    public void reload(final CommandSender confirmationReceiver) {
+        setReady(false);
+        fileManager.saveRequiredFilesAtOnce();
+        fileManager.loadFiles(true);
+        setupLanguageManager();
+        message(confirmationReceiver, "reload-reloading");
+        fileManager.checkRents();
+        fileManager.updateAllRegions(confirmationReceiver);
+    }
+
+    /**
+     * Reload all files of the plugin and update all regions.
+     */
+    public void reload() {
+        reload(null);
+    }
+
+}
+
+
+
+

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

@@ -0,0 +1,321 @@
+package me.wiefferink.areashop.commands;
+
+import com.sk89q.worldguard.protection.regions.ProtectedRegion;
+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.RentingRegionEvent;
+import me.wiefferink.areashop.events.notify.BoughtRegionEvent;
+import me.wiefferink.areashop.events.notify.RentedRegionEvent;
+import me.wiefferink.areashop.interfaces.WorldEditSelection;
+import me.wiefferink.areashop.managers.FileManager;
+import me.wiefferink.areashop.regions.BuyRegion;
+import me.wiefferink.areashop.regions.LegacyGeneralRegion;
+import me.wiefferink.areashop.regions.RentRegion;
+import me.wiefferink.areashop.regions.util.RegionEvent;
+import me.wiefferink.areashop.regions.util.RegionType;
+import me.wiefferink.areashop.tools.Utils;
+import org.bukkit.Bukkit;
+import org.bukkit.OfflinePlayer;
+import org.bukkit.World;
+import org.bukkit.command.CommandSender;
+import org.bukkit.entity.Player;
+
+import java.util.*;
+import java.util.stream.Collectors;
+
+public class AddCommand extends CommandAreaShop {
+
+	@Override
+	public String getCommandStart() {
+		return "areashop add";
+	}
+
+	@Override
+	public String getHelp(CommandSender target) {
+		if(target.hasPermission("areashop.createrent")
+				|| target.hasPermission("areashop.createrent.member")
+				|| target.hasPermission("areashop.createrent.owner")
+
+				|| target.hasPermission("areashop.createbuy")
+				|| target.hasPermission("areashop.createbuy.member")
+				|| target.hasPermission("areashop.createbuy.owner")) {
+			return "help-add";
+		}
+		return null;
+	}
+
+	@Override
+	public void execute(final CommandSender sender, final String[] args) {
+		if(!sender.hasPermission("areashop.createrent")
+				&& !sender.hasPermission("areashop.createrent.member")
+				&& !sender.hasPermission("areashop.createrent.owner")
+
+				&& !sender.hasPermission("areashop.createbuy")
+				&& !sender.hasPermission("areashop.createbuy.member")
+				&& !sender.hasPermission("areashop.createbuy.owner")) {
+			plugin.message(sender, "add-noPermission");
+			return;
+		}
+
+		if(args.length < 2 || args[1] == null || (!"rent".equalsIgnoreCase(args[1]) && !"buy".equalsIgnoreCase(args[1]))) {
+			plugin.message(sender, "add-help");
+			return;
+		}
+		Map<String, ProtectedRegion> regions = new HashMap<>();
+		World world;
+		Player player = null;
+		if(sender instanceof Player) {
+			player = (Player)sender;
+		}
+		if(args.length == 2) {
+			if(player == null) {
+				plugin.message(sender, "cmd-weOnlyByPlayer");
+				return;
+			}
+			WorldEditSelection selection = plugin.getWorldEditHandler().getPlayerSelection(player);
+			if(selection == null) {
+				plugin.message(player, "cmd-noSelection");
+				return;
+			}
+			world = selection.getWorld();
+			regions = Utils.getWorldEditRegionsInSelection(selection).stream().collect(Collectors.toMap(ProtectedRegion::getId, region -> region));
+			if(regions.isEmpty()) {
+				plugin.message(player, "cmd-noWERegionsFound");
+				return;
+			}
+		} else {
+			if(player != null) {
+				if(args.length == 4) {
+					world = Bukkit.getWorld(args[3]);
+					if(world == null) {
+						plugin.message(sender, "add-incorrectWorld", args[3]);
+						return;
+					}
+				} else {
+					world = ((Player)sender).getWorld();
+				}
+			} else {
+				if(args.length < 4) {
+					plugin.message(sender, "add-specifyWorld");
+					return;
+				} else {
+					world = Bukkit.getWorld(args[3]);
+					if(world == null) {
+						plugin.message(sender, "add-incorrectWorld", args[3]);
+						return;
+					}
+				}
+			}
+			ProtectedRegion region = plugin.getRegionManager(world).getRegion(args[2]);
+			if(region == null) {
+				plugin.message(sender, "cmd-noRegion", args[2]);
+				return;
+			}
+			regions.put(args[2], region);
+		}
+		final boolean isRent = "rent".equalsIgnoreCase(args[1]);
+		final Player finalPlayer = player;
+		AreaShop.debug("Starting add task with " + regions.size() + " regions");
+
+		TreeSet<LegacyGeneralRegion> regionsSuccess = new TreeSet<>();
+		TreeSet<LegacyGeneralRegion> regionsAlready = new TreeSet<>();
+		TreeSet<LegacyGeneralRegion> regionsAlreadyOtherWorld = new TreeSet<>();
+		TreeSet<LegacyGeneralRegion> regionsRentCancelled = new TreeSet<>(); // Denied by an event listener
+		TreeSet<LegacyGeneralRegion> regionsBuyCancelled = new TreeSet<>(); // Denied by an event listener
+		TreeSet<String> namesBlacklisted = new TreeSet<>();
+		TreeSet<String> namesNoPermission = new TreeSet<>();
+		TreeSet<String> namesAddCancelled = new TreeSet<>(); // Denied by an event listener
+		Utils.runAsBatches(regions.entrySet(),
+			plugin.getConfig().getInt("adding.regionsPerTick"),
+				(regionEntry) -> {
+				String regionName = regionEntry.getKey();
+				ProtectedRegion region = regionEntry.getValue();
+				// Determine if the player is an owner or member of the region
+				boolean isMember = finalPlayer != null && plugin.getWorldGuardHandler().containsMember(region, finalPlayer.getUniqueId());
+				boolean isOwner = finalPlayer != null && plugin.getWorldGuardHandler().containsOwner(region, finalPlayer.getUniqueId());
+				String type;
+				if(isRent) {
+					type = "rent";
+				} else {
+					type = "buy";
+				}
+				FileManager.AddResult result = plugin.getFileManager().checkRegionAdd(sender, region, world, isRent ? RegionType.RENT : RegionType.BUY);
+				if(result == FileManager.AddResult.ALREADYADDED) {
+					regionsAlready.add(plugin.getFileManager().getRegion(regionName));
+				} else if(result == FileManager.AddResult.ALREADYADDEDOTHERWORLD) {
+					regionsAlreadyOtherWorld.add(plugin.getFileManager().getRegion(regionName));
+				} else if(result == FileManager.AddResult.BLACKLISTED) {
+					namesBlacklisted.add(regionName);
+				} else if(result == FileManager.AddResult.NOPERMISSION) {
+					namesNoPermission.add(regionName);
+				} else {
+					// Check if the player should be landlord
+					boolean landlord = (!sender.hasPermission("areashop.create" + type)
+							&& ((sender.hasPermission("areashop.create" + type + ".owner") && isOwner)
+							|| (sender.hasPermission("areashop.create" + type + ".member") && isMember)));
+					List<UUID> existing = new ArrayList<>();
+					existing.addAll(plugin.getWorldGuardHandler().getOwners(region).asUniqueIdList());
+					existing.addAll(plugin.getWorldGuardHandler().getMembers(region).asUniqueIdList());
+
+					AreaShop.debug("regionAddLandlordStatus:", regionName,
+							"landlord:", landlord,
+							"existing:", existing,
+							"isMember:", isMember,
+							"isOwner:", isOwner,
+							"createPermission:", sender.hasPermission("areashop.create" + type),
+							"ownerPermission:", sender.hasPermission("areashop.create" + type + ".owner"),
+							"memberPermission:", sender.hasPermission("areashop.create" + type + ".member"));
+
+					if(isRent) {
+						RentRegion rent = new RentRegion(regionName, world);
+						// Set landlord
+						if(landlord) {
+							rent.setLandlord(finalPlayer.getUniqueId(), finalPlayer.getName());
+						}
+
+						AddingRegionEvent event = plugin.getFileManager().addRegion(rent);
+						if (event.isCancelled()) {
+							namesAddCancelled.add(rent.getRegionId());
+							return;
+						}
+						rent.handleSchematicEvent(RegionEvent.CREATED);
+						rent.update();
+
+						// Add existing owners/members if any
+						if(!landlord && !existing.isEmpty()) {
+							UUID rentBy = existing.remove(0);
+							OfflinePlayer rentByPlayer = Bukkit.getOfflinePlayer(rentBy);
+
+							RentingRegionEvent rentingRegionEvent = new RentingRegionEvent(rent, rentByPlayer, false);
+							Bukkit.getPluginManager().callEvent(rentingRegionEvent);
+							if(rentingRegionEvent.isCancelled()) {
+								regionsRentCancelled.add(rent);
+							} else {
+								// Add values to the rent and send it to FileManager
+								rent.setRentedUntil(Calendar.getInstance().getTimeInMillis() + rent.getDuration());
+								rent.setRenter(rentBy);
+								rent.updateLastActiveTime();
+
+								// Fire schematic event and updated times extended
+								rent.handleSchematicEvent(RegionEvent.RENTED);
+
+								// Add others as friends
+								for(UUID friend : existing) {
+									rent.getFriendsFeature().addFriend(friend, null);
+								}
+
+								rent.notifyAndUpdate(new RentedRegionEvent(rent, false));
+							}
+						}
+
+						regionsSuccess.add(rent);
+					} else {
+						BuyRegion buy = new BuyRegion(regionName, world);
+						// Set landlord
+						if(landlord) {
+							buy.setLandlord(finalPlayer.getUniqueId(), finalPlayer.getName());
+						}
+
+						AddingRegionEvent event = plugin.getFileManager().addRegion(buy);
+						if (event.isCancelled()) {
+							namesAddCancelled.add(buy.getRegionId());
+							return;
+						}
+
+						buy.handleSchematicEvent(RegionEvent.CREATED);
+						buy.update();
+
+						// Add existing owners/members if any
+						if(!landlord && !existing.isEmpty()) {
+							UUID buyBy = existing.remove(0);
+							OfflinePlayer buyByPlayer = Bukkit.getOfflinePlayer(buyBy);
+
+							BuyingRegionEvent buyingRegionEvent = new BuyingRegionEvent(buy, buyByPlayer);
+							Bukkit.getPluginManager().callEvent(buyingRegionEvent);
+							if(buyingRegionEvent.isCancelled()) {
+								regionsBuyCancelled.add(buy);
+							} else {
+								// Set the owner
+								buy.setBuyer(buyBy);
+								buy.updateLastActiveTime();
+
+								// Update everything
+								buy.handleSchematicEvent(RegionEvent.BOUGHT);
+
+								// Add others as friends
+								for (UUID friend : existing) {
+									buy.getFriendsFeature().addFriend(friend, null);
+								}
+
+								buy.notifyAndUpdate(new BoughtRegionEvent(buy));
+							}
+						}
+
+						regionsSuccess.add(buy);
+					}
+				}
+			}, false).thenAccept(
+			(success) -> {
+				if(!regionsSuccess.isEmpty()) {
+					plugin.message(sender, "add-success", args[1], Utils.combinedMessage(regionsSuccess, "region"));
+				}
+				if(!regionsAlready.isEmpty()) {
+					plugin.message(sender, "add-failed", Utils.combinedMessage(regionsAlready, "region"));
+				}
+				if(!regionsAlreadyOtherWorld.isEmpty()) {
+					plugin.message(sender, "add-failedOtherWorld", Utils.combinedMessage(regionsAlreadyOtherWorld, "region"));
+				}
+				if(!regionsRentCancelled.isEmpty()) {
+					plugin.message(sender, "add-rentCancelled", Utils.combinedMessage(regionsRentCancelled, "region"));
+				}
+				if(!regionsBuyCancelled.isEmpty()) {
+					plugin.message(sender, "add-buyCancelled", Utils.combinedMessage(regionsBuyCancelled, "region"));
+				}
+				if(!namesBlacklisted.isEmpty()) {
+					plugin.message(sender, "add-blacklisted", Utils.createCommaSeparatedList(namesBlacklisted));
+				}
+				if(!namesNoPermission.isEmpty()) {
+					plugin.message(sender, "add-noPermissionRegions", Utils.createCommaSeparatedList(namesNoPermission));
+					plugin.message(sender, "add-noPermissionOwnerMember");
+				}
+				if(!namesAddCancelled.isEmpty()) {
+					plugin.message(sender, "add-rentCancelled", Utils.createCommaSeparatedList(namesAddCancelled));
+				}
+			});
+	}
+
+	@Override
+	public List<String> getTabCompleteList(int toComplete, String[] start, CommandSender sender) {
+		List<String> result = new LinkedList<>();
+		if(toComplete == 2) {
+			if(sender.hasPermission("areashop.createrent")) {
+				result.add("rent");
+			}
+			if(sender.hasPermission("areashop.createbuy")) {
+				result.add("buy");
+			}
+		} else if(toComplete == 3) {
+			if(sender instanceof Player) {
+				Player player = (Player)sender;
+				if(sender.hasPermission("areashop.createrent") || sender.hasPermission("areashop.createbuy")) {
+					for(ProtectedRegion region : plugin.getRegionManager(player.getWorld()).getRegions().values()) {
+						result.add(region.getId());
+					}
+				}
+			}
+		}
+		return result;
+	}
+
+}
+
+
+
+
+
+
+
+
+
+

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

@@ -1,10 +1,9 @@
-package nl.evolutioncoding.areashop.commands;
+package me.wiefferink.areashop.commands;
 
-import nl.evolutioncoding.areashop.AreaShop;
-import nl.evolutioncoding.areashop.Utils;
-import nl.evolutioncoding.areashop.regions.BuyRegion;
-import nl.evolutioncoding.areashop.regions.GeneralRegion;
-import nl.evolutioncoding.areashop.regions.RentRegion;
+import me.wiefferink.areashop.regions.BuyRegion;
+import me.wiefferink.areashop.regions.LegacyGeneralRegion;
+import me.wiefferink.areashop.regions.RentRegion;
+import me.wiefferink.areashop.tools.Utils;
 import org.bukkit.Bukkit;
 import org.bukkit.OfflinePlayer;
 import org.bukkit.command.CommandSender;
@@ -15,10 +14,6 @@ import java.util.List;
 
 public class AddfriendCommand extends CommandAreaShop {
 
-	public AddfriendCommand(AreaShop plugin) {
-		super(plugin);
-	}
-	
 	@Override
 	public String getCommandStart() {
 		return "areashop addfriend";
@@ -26,14 +21,12 @@ public class AddfriendCommand extends CommandAreaShop {
 
 	@Override
 	public String getHelp(CommandSender target) {
-		if(target.hasPermission("areashop.addfriendall")) {
-			return plugin.getLanguageManager().getLang("help-addFriendAll");
-		} else if(target.hasPermission("areashop.addfriend")) {
-			return plugin.getLanguageManager().getLang("help-addFriend");
+		if(target.hasPermission("areashop.addfriendall") || target.hasPermission("areashop.addfriend")) {
+			return "help-addFriend";
 		}
 		return null;
 	}
-	
+
 	@SuppressWarnings("deprecation")
 	@Override
 	public void execute(CommandSender sender, String[] args) {
@@ -41,21 +34,21 @@ public class AddfriendCommand extends CommandAreaShop {
 			plugin.message(sender, "addfriend-noPermission");
 			return;
 		}
-		
+
 		if(args.length < 2) {
 			plugin.message(sender, "addfriend-help");
 			return;
 		}
 
-		GeneralRegion region;
+		LegacyGeneralRegion region;
 		if(args.length <= 2) {
-			if (sender instanceof Player) {
+			if(sender instanceof Player) {
 				// get the region by location
-				List<GeneralRegion> regions = Utils.getAllApplicableRegions(((Player) sender).getLocation());
-				if (regions.isEmpty()) {
+				List<LegacyGeneralRegion> regions = Utils.getImportantRegions(((Player)sender).getLocation());
+				if(regions.isEmpty()) {
 					plugin.message(sender, "cmd-noRegionsAtLocation");
 					return;
-				} else if (regions.size() > 1) {
+				} else if(regions.size() > 1) {
 					plugin.message(sender, "cmd-moreRegionsAtLocation");
 					return;
 				} else {
@@ -64,7 +57,7 @@ public class AddfriendCommand extends CommandAreaShop {
 			} else {
 				plugin.message(sender, "cmd-automaticRegionOnlyByPlayer");
 				return;
-			}	
+			}
 		} else {
 			region = plugin.getFileManager().getRegion(args[2]);
 			if(region == null) {
@@ -73,17 +66,17 @@ public class AddfriendCommand extends CommandAreaShop {
 			}
 		}
 		if(sender.hasPermission("areashop.addfriendall")) {
-			if((region.isRentRegion() && !((RentRegion)region).isRented())
-					|| (region.isBuyRegion() && !((BuyRegion)region).isSold())) {
+			if((region instanceof RentRegion && !((RentRegion)region).isRented())
+					|| (region instanceof BuyRegion && !((BuyRegion)region).isSold())) {
 				plugin.message(sender, "addfriend-noOwner", region);
 				return;
-			}	
+			}
 			OfflinePlayer friend = Bukkit.getOfflinePlayer(args[1]);
-			if(friend.getLastPlayed() == 0 && !plugin.getConfig().getBoolean("addFriendNotExistingPlayers")) {
+			if(friend.getLastPlayed() == 0 && !friend.isOnline() && !plugin.getConfig().getBoolean("addFriendNotExistingPlayers")) {
 				plugin.message(sender, "addfriend-notVisited", args[1], region);
 				return;
 			}
-			if(region.getFriends().contains(friend.getUniqueId())) {
+			if(region.getFriendsFeature().getFriends().contains(friend.getUniqueId())) {
 				plugin.message(sender, "addfriend-alreadyAdded", friend.getName(), region);
 				return;
 			}
@@ -91,18 +84,19 @@ public class AddfriendCommand extends CommandAreaShop {
 				plugin.message(sender, "addfriend-self", friend.getName(), region);
 				return;
 			}
-			region.addFriend(friend.getUniqueId());
-			region.update();
-			plugin.message(sender, "addfriend-successOther", friend.getName(), region);
+			if(region.getFriendsFeature().addFriend(friend.getUniqueId(), sender)) {
+				region.update();
+				plugin.message(sender, "addfriend-successOther", friend.getName(), region);
+			}
 		} else {
 			if(sender.hasPermission("areashop.addfriend") && sender instanceof Player) {
 				if(region.isOwner((Player)sender)) {
 					OfflinePlayer friend = Bukkit.getOfflinePlayer(args[1]);
-					if(friend.getLastPlayed() == 0 && !plugin.getConfig().getBoolean("addFriendNotExistingPlayers")) {
+					if(friend.getLastPlayed() == 0 && !friend.isOnline() && !plugin.getConfig().getBoolean("addFriendNotExistingPlayers")) {
 						plugin.message(sender, "addfriend-notVisited", args[1], region);
 						return;
 					}
-					if(region.getFriends().contains(friend.getUniqueId())) {
+					if(region.getFriendsFeature().getFriends().contains(friend.getUniqueId())) {
 						plugin.message(sender, "addfriend-alreadyAdded", friend.getName(), region);
 						return;
 					}
@@ -110,9 +104,11 @@ public class AddfriendCommand extends CommandAreaShop {
 						plugin.message(sender, "addfriend-self", friend.getName(), region);
 						return;
 					}
-					region.addFriend(friend.getUniqueId());
-					region.update();
-					plugin.message(sender, "addfriend-success", friend.getName(), region);
+
+					if(region.getFriendsFeature().addFriend(friend.getUniqueId(), sender)) {
+						region.update();
+						plugin.message(sender, "addfriend-success", friend.getName(), region);
+					}
 				} else {
 					plugin.message(sender, "addfriend-noPermissionOther", region);
 				}
@@ -121,7 +117,7 @@ public class AddfriendCommand extends CommandAreaShop {
 			}
 		}
 	}
-	
+
 	@Override
 	public List<String> getTabCompleteList(int toComplete, String[] start, CommandSender sender) {
 		ArrayList<String> result = new ArrayList<>();

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

@@ -0,0 +1,137 @@
+package me.wiefferink.areashop.commands;
+
+import me.wiefferink.areashop.features.signs.RegionSign;
+import me.wiefferink.areashop.features.signs.SignsFeature;
+import me.wiefferink.areashop.regions.LegacyGeneralRegion;
+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.util.BlockIterator;
+
+import java.util.ArrayList;
+import java.util.List;
+import java.util.Set;
+
+public class AddsignCommand extends CommandAreaShop {
+
+    @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 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;
+
+        // 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;
+        }
+
+        LegacyGeneralRegion 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<LegacyGeneralRegion> 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).getRegionId(), regions.get(1).getRegionId());
+                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;
+        }
+
+        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();
+    }
+
+    @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,8 +1,7 @@
-package nl.evolutioncoding.areashop.commands;
+package me.wiefferink.areashop.commands;
 
-import nl.evolutioncoding.areashop.AreaShop;
-import nl.evolutioncoding.areashop.Utils;
-import nl.evolutioncoding.areashop.regions.BuyRegion;
+import me.wiefferink.areashop.regions.BuyRegion;
+import me.wiefferink.areashop.tools.Utils;
 import org.bukkit.command.CommandSender;
 import org.bukkit.entity.Player;
 
@@ -11,10 +10,6 @@ import java.util.List;
 
 public class BuyCommand extends CommandAreaShop {
 
-	public BuyCommand(AreaShop plugin) {
-		super(plugin);
-	}	
-	
 	@Override
 	public String getCommandStart() {
 		return "areashop buy";
@@ -23,18 +18,18 @@ public class BuyCommand extends CommandAreaShop {
 	@Override
 	public String getHelp(CommandSender target) {
 		if(target.hasPermission("areashop.buy")) {
-			return plugin.getLanguageManager().getLang("help-buy");
+			return "help-buy";
 		}
 		return null;
 	}
-	
+
 	@Override
 	public void execute(CommandSender sender, String[] args) {
 		if(!sender.hasPermission("areashop.buy")) {
 			plugin.message(sender, "buy-noPermission");
 			return;
 		}
-		if (!(sender instanceof Player)) {
+		if(!(sender instanceof Player)) {
 			plugin.message(sender, "cmd-onlyByPlayer");
 			return;
 		}
@@ -42,16 +37,16 @@ public class BuyCommand extends CommandAreaShop {
 		if(args.length > 1 && args[1] != null) {
 			BuyRegion region = plugin.getFileManager().getBuy(args[1]);
 			if(region == null) {
-				plugin.message(player, "buy-notBuyable");
+				plugin.message(player, "buy-notBuyable", args[1]);
 			} else {
 				region.buy(player);
 			}
 		} else {
 			// get the region by location
-			List<BuyRegion> regions = Utils.getApplicableBuyRegions(((Player) sender).getLocation());
-			if (regions.isEmpty()) {
+			List<BuyRegion> regions = Utils.getImportantBuyRegions(((Player)sender).getLocation());
+			if(regions.isEmpty()) {
 				plugin.message(sender, "cmd-noRegionsAtLocation");
-			} else if (regions.size() > 1) {
+			} else if(regions.size() > 1) {
 				plugin.message(sender, "cmd-moreRegionsAtLocation");
 			} else {
 				regions.get(0).buy(player);
@@ -65,7 +60,7 @@ public class BuyCommand extends CommandAreaShop {
 		if(toComplete == 2) {
 			for(BuyRegion region : plugin.getFileManager().getBuys()) {
 				if(!region.isSold()) {
-					result.add(region.getName());
+					result.add(region.getRegionId());
 				}
 			}
 		}

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

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

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

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

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

@@ -1,10 +1,9 @@
-package nl.evolutioncoding.areashop.commands;
+package me.wiefferink.areashop.commands;
 
-import nl.evolutioncoding.areashop.AreaShop;
-import nl.evolutioncoding.areashop.Utils;
-import nl.evolutioncoding.areashop.regions.BuyRegion;
-import nl.evolutioncoding.areashop.regions.GeneralRegion;
-import nl.evolutioncoding.areashop.regions.RentRegion;
+import me.wiefferink.areashop.regions.BuyRegion;
+import me.wiefferink.areashop.regions.LegacyGeneralRegion;
+import me.wiefferink.areashop.regions.RentRegion;
+import me.wiefferink.areashop.tools.Utils;
 import org.bukkit.Bukkit;
 import org.bukkit.OfflinePlayer;
 import org.bukkit.command.CommandSender;
@@ -15,10 +14,6 @@ import java.util.List;
 
 public class DelfriendCommand extends CommandAreaShop {
 
-	public DelfriendCommand(AreaShop plugin) {
-		super(plugin);
-	}
-	
 	@Override
 	public String getCommandStart() {
 		return "areashop delfriend";
@@ -26,34 +21,49 @@ public class DelfriendCommand extends CommandAreaShop {
 
 	@Override
 	public String getHelp(CommandSender target) {
-		if(target.hasPermission("areashop.delfriendall")) {
-			return plugin.getLanguageManager().getLang("help-delFriendAll");
-		} else if(target.hasPermission("areashop.delfriend")) {
-			return plugin.getLanguageManager().getLang("help-delFriend");
+		if(target.hasPermission("areashop.delfriendall") || target.hasPermission("areashop.delfriend")) {
+			return "help-delFriend";
 		}
 		return null;
 	}
-	
+
+	/**
+	 * Check if a person can remove friends.
+	 * @param person The person to check
+	 * @param region The region to check for
+	 * @return true if the person can remove friends, otherwise false
+	 */
+	public static boolean canUse(CommandSender person, LegacyGeneralRegion region) {
+		if(person.hasPermission("areashop.delfriendall")) {
+			return true;
+		}
+		if(person instanceof Player) {
+			Player player = (Player)person;
+			return region.isOwner(player) && player.hasPermission("areashop.delfriend");
+		}
+		return false;
+	}
+
 	@SuppressWarnings("deprecation")
 	@Override
 	public void execute(CommandSender sender, String[] args) {
 		if(!sender.hasPermission("areashop.delfriend") && !sender.hasPermission("areashop.delfriendall")) {
 			plugin.message(sender, "delfriend-noPermission");
 			return;
-		}		
+		}
 		if(args.length < 2) {
 			plugin.message(sender, "delfriend-help");
 			return;
 		}
-		GeneralRegion region;
+		LegacyGeneralRegion region;
 		if(args.length <= 2) {
-			if (sender instanceof Player) {
+			if(sender instanceof Player) {
 				// get the region by location
-				List<GeneralRegion> regions = Utils.getAllApplicableRegions(((Player) sender).getLocation());
-				if (regions.isEmpty()) {
+				List<LegacyGeneralRegion> regions = Utils.getImportantRegions(((Player)sender).getLocation());
+				if(regions.isEmpty()) {
 					plugin.message(sender, "cmd-noRegionsAtLocation");
 					return;
-				} else if (regions.size() > 1) {
+				} else if(regions.size() > 1) {
 					plugin.message(sender, "cmd-moreRegionsAtLocation");
 					return;
 				} else {
@@ -62,7 +72,7 @@ public class DelfriendCommand extends CommandAreaShop {
 			} else {
 				plugin.message(sender, "cmd-automaticRegionOnlyByPlayer");
 				return;
-			}	
+			}
 		} else {
 			region = plugin.getFileManager().getRegion(args[2]);
 			if(region == null) {
@@ -71,30 +81,32 @@ public class DelfriendCommand extends CommandAreaShop {
 			}
 		}
 		if(sender.hasPermission("areashop.delfriendall")) {
-			if((region.isRentRegion() && !((RentRegion)region).isRented())
-					|| (region.isBuyRegion() && !((BuyRegion)region).isSold())) {
+			if((region instanceof RentRegion && !((RentRegion)region).isRented())
+					|| (region instanceof BuyRegion && !((BuyRegion)region).isSold())) {
 				plugin.message(sender, "delfriend-noOwner", region);
 				return;
-			}		
+			}
 			OfflinePlayer friend = Bukkit.getOfflinePlayer(args[1]);
-			if(!region.getFriends().contains(friend.getUniqueId())) {
+			if(!region.getFriendsFeature().getFriends().contains(friend.getUniqueId())) {
 				plugin.message(sender, "delfriend-notAdded", friend.getName(), region);
 				return;
 			}
-			region.deleteFriend(friend.getUniqueId());
-			region.update();
-			plugin.message(sender, "delfriend-successOther", friend.getName(), region);
+			if(region.getFriendsFeature().deleteFriend(friend.getUniqueId(), sender)) {
+				region.update();
+				plugin.message(sender, "delfriend-successOther", friend.getName(), region);
+			}
 		} else {
 			if(sender.hasPermission("areashop.delfriend") && sender instanceof Player) {
 				if(region.isOwner((Player)sender)) {
 					OfflinePlayer friend = Bukkit.getOfflinePlayer(args[1]);
-					if(!region.getFriends().contains(friend.getUniqueId())) {
+					if(!region.getFriendsFeature().getFriends().contains(friend.getUniqueId())) {
 						plugin.message(sender, "delfriend-notAdded", friend.getName(), region);
 						return;
 					}
-					region.deleteFriend(friend.getUniqueId());
-					region.update();
-					plugin.message(sender, "delfriend-success", friend.getName(), region);
+					if(region.getFriendsFeature().deleteFriend(friend.getUniqueId(), sender)) {
+						region.update();
+						plugin.message(sender, "delfriend-success", friend.getName(), region);
+					}
 				} else {
 					plugin.message(sender, "delfriend-noPermissionOther", region);
 				}
@@ -103,7 +115,7 @@ public class DelfriendCommand extends CommandAreaShop {
 			}
 		}
 	}
-	
+
 	@Override
 	public List<String> getTabCompleteList(int toComplete, String[] start, CommandSender sender) {
 		ArrayList<String> result = new ArrayList<>();

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

@@ -1,83 +1,79 @@
-package nl.evolutioncoding.areashop.commands;
-
-import nl.evolutioncoding.areashop.AreaShop;
-import nl.evolutioncoding.areashop.regions.GeneralRegion;
-import org.bukkit.Material;
-import org.bukkit.block.Block;
-import org.bukkit.command.CommandSender;
-import org.bukkit.entity.Player;
-import org.bukkit.util.BlockIterator;
-
-import java.util.ArrayList;
-import java.util.List;
-
-public class DelsignCommand extends CommandAreaShop {
-
-	public DelsignCommand(AreaShop plugin) {
-		super(plugin);
-	}
-	
-	@Override
-	public String getCommandStart() {
-		return "areashop delsign";
-	}
-	
-	@Override
-	public String getHelp(CommandSender target) {
-		if(target.hasPermission("areashop.delsign")) {
-			return plugin.getLanguageManager().getLang("help-delsign");
-		}
-		return null;
-	}
-
-	@Override
-	public void execute(CommandSender sender, String[] args) {
-		if(!sender.hasPermission("areashop.delsign")) {
-			plugin.message(sender, "delsign-noPermission");
-			return;
-		}
-		if (!(sender instanceof Player)) {
-			plugin.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 || !(block.getType() == Material.WALL_SIGN || block.getType() == Material.SIGN_POST)) {
-			plugin.message(sender, "delsign-noSign");
-			return;
-		}
-		GeneralRegion region = plugin.getFileManager().getRegionBySignLocation(block.getLocation());
-		if(region == null) {
-			plugin.message(sender, "delsign-noRegion");
-			return;
-		}
-		plugin.message(sender, "delsign-success", region);
-		region.removeSign(block.getLocation());
-		region.update();
-	}
-	
-	@Override
-	public List<String> getTabCompleteList(int toComplete, String[] start, CommandSender sender) {
-		return new ArrayList<>();
-	}
-
-}
-
-
-
-
-
-
-
-
-
-
+package me.wiefferink.areashop.commands;
+
+import me.wiefferink.areashop.features.signs.RegionSign;
+import me.wiefferink.areashop.features.signs.SignsFeature;
+import me.wiefferink.areashop.tools.Materials;
+import org.bukkit.Material;
+import org.bukkit.block.Block;
+import org.bukkit.command.CommandSender;
+import org.bukkit.entity.Player;
+import org.bukkit.util.BlockIterator;
+
+import java.util.ArrayList;
+import java.util.List;
+
+public class DelsignCommand extends CommandAreaShop {
+
+	@Override
+	public String getCommandStart() {
+		return "areashop delsign";
+	}
+
+	@Override
+	public String getHelp(CommandSender target) {
+		if(target.hasPermission("areashop.delsign")) {
+			return "help-delsign";
+		}
+		return null;
+	}
+
+	@Override
+	public void execute(CommandSender sender, String[] args) {
+		if(!sender.hasPermission("areashop.delsign")) {
+			plugin.message(sender, "delsign-noPermission");
+			return;
+		}
+		if(!(sender instanceof Player)) {
+			plugin.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, "delsign-noSign");
+			return;
+		}
+		RegionSign regionSign = SignsFeature.getSignByLocation(block.getLocation());
+		if(regionSign == null) {
+			plugin.message(sender, "delsign-noRegion");
+			return;
+		}
+		plugin.message(sender, "delsign-success", regionSign.getRegion());
+		regionSign.remove();
+	}
+
+	@Override
+	public List<String> getTabCompleteList(int toComplete, String[] start, CommandSender sender) {
+		return new ArrayList<>();
+	}
+
+}
+
+
+
+
+
+
+
+
+
+

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

@@ -1,183 +1,191 @@
-package nl.evolutioncoding.areashop.commands;
-
-import nl.evolutioncoding.areashop.AreaShop;
-import nl.evolutioncoding.areashop.Utils;
-import nl.evolutioncoding.areashop.regions.BuyRegion;
-import nl.evolutioncoding.areashop.regions.RegionGroup;
-import nl.evolutioncoding.areashop.regions.RentRegion;
-import org.bukkit.command.CommandSender;
-import org.bukkit.entity.Player;
-
-import java.util.ArrayList;
-import java.util.List;
-import java.util.Random;
-
-public class FindCommand extends CommandAreaShop {
-
-	public FindCommand(AreaShop plugin) {
-		super(plugin);
-	}
-	
-	@Override
-	public String getCommandStart() {
-		return "areashop find";
-	}
-	
-	@Override
-	public String getHelp(CommandSender target) {
-		if(target.hasPermission("areashop.find")) {
-			return plugin.getLanguageManager().getLang("help-find");
-		}
-		return null;
-	}
-
-	@Override
-	public void execute(CommandSender sender, String[] args) {
-		if(!sender.hasPermission("areashop.find")) {
-			plugin.message(sender, "find-noPermission");
-			return;
-		}	
-		if (!(sender instanceof Player)) {
-			plugin.message(sender, "cmd-onlyByPlayer");
-			return;
-		}		
-		if(args.length <= 1 || args[1] == null || (!args[1].equalsIgnoreCase("buy") && !args[1].equalsIgnoreCase("rent"))) {
-			plugin.message(sender, "find-help");
-			return;
-		}
-		Player player = (Player)sender;
-		double balance = 0.0;
-		if(plugin.getEconomy() != null) {
-			balance = plugin.getEconomy().getBalance(player);
-		}
-		double maxPrice = 0;
-		boolean maxPriceSet = false;
-		RegionGroup group = null;
-		// Parse optional price argument
-		if(args.length >= 3) {
-			try {
-				maxPrice = Double.parseDouble(args[2]);
-				maxPriceSet = true;
-			} catch(NumberFormatException e) {
-				plugin.message(sender, "find-wrongMaxPrice", args[2]);
-				return;
-			}
-		}
-		// Parse optional group argument
-		if(args.length >= 4) {
-			group = plugin.getFileManager().getGroup(args[3]);
-			if(group == null) {
-				plugin.message(sender, "find-wrongGroup", args[3]);
-				return;
-			}
-		}
-		if(args[1].equalsIgnoreCase("buy")) {
-			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)) 
-						&& (group == null || group.isMember(region))) {
-					results.add(region);
-				}
-			}
-			if(!results.isEmpty()) {
-				// Draw a random one
-				BuyRegion region = results.get(new Random().nextInt(results.size()));
-			    String onlyInGroup = "";
-				if(group != null) {
-					onlyInGroup = plugin.getLanguageManager().getLang("find-onlyInGroup", args[3]);
-				}
-				if(maxPriceSet) {
-					plugin.message(player, "find-successMax", "buy", Utils.formatCurrency(maxPrice), onlyInGroup, region);
-				} else {
-					plugin.message(player, "find-success", "buy", Utils.formatCurrency(balance), onlyInGroup, region);
-				}
-				region.teleportPlayer(player, region.getBooleanSetting("general.findTeleportToSign"), false);		
-			} else {
-			    String onlyInGroup = "";
-				if(group != null) {
-					onlyInGroup = plugin.getLanguageManager().getLang("find-onlyInGroup", args[3]);
-				}
-				if(maxPriceSet) {
-					plugin.message(player, "find-noneFoundMax", "buy", Utils.formatCurrency(maxPrice), onlyInGroup);
-				} else {
-					plugin.message(player, "find-noneFound", "buy", Utils.formatCurrency(balance), onlyInGroup);
-				}
-			}
-		} else {
-			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))
-						&& (group == null || group.isMember(region))) {
-					results.add(region);
-				}
-			}
-			if(!results.isEmpty()) {
-				// Draw a random one
-				RentRegion region = results.get(new Random().nextInt(results.size()));
-			    String onlyInGroup = "";
-				if(group != null) {
-					onlyInGroup = plugin.getLanguageManager().getLang("find-onlyInGroup", args[3]);
-				}
-				if(maxPriceSet) {
-					plugin.message(player, "find-successMax", "rent", Utils.formatCurrency(maxPrice), onlyInGroup, region);
-				} else {
-					plugin.message(player, "find-success", "rent", Utils.formatCurrency(balance), onlyInGroup, region);
-				}
-				region.teleportPlayer(player, region.getBooleanSetting("general.findTeleportToSign"), false);		
-			} else {
-			    String onlyInGroup = "";
-				if(group != null) {
-					onlyInGroup = plugin.getLanguageManager().getLang("find-onlyInGroup", args[3]);
-				}
-				if(maxPriceSet) {
-					plugin.message(player, "find-noneFoundMax", "rent", Utils.formatCurrency(maxPrice), onlyInGroup);
-				} else {
-					plugin.message(player, "find-noneFound", "rent", Utils.formatCurrency(balance), onlyInGroup);
-				}
-			}
-		}
-
-	}
-	
-	@Override
-	public List<String> getTabCompleteList(int toComplete, String[] start, CommandSender sender) {
-		ArrayList<String> result = new ArrayList<>();
-		if(toComplete == 2) {
-			result.add("buy");
-			result.add("rent");
-		}
-		return result;
-	}
-
-}
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
+package me.wiefferink.areashop.commands;
+
+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 org.bukkit.command.CommandSender;
+import org.bukkit.entity.Player;
+
+import java.util.ArrayList;
+import java.util.List;
+import java.util.Random;
+import java.util.concurrent.ThreadLocalRandom;
+
+public class FindCommand extends CommandAreaShop {
+
+	@Override
+	public String getCommandStart() {
+		return "areashop find";
+	}
+
+	@Override
+	public String getHelp(CommandSender target) {
+		if(target.hasPermission("areashop.find")) {
+			return "help-find";
+		}
+		return null;
+	}
+
+	@Override
+	public void execute(CommandSender sender, String[] args) {
+		if(!sender.hasPermission("areashop.find")) {
+			plugin.message(sender, "find-noPermission");
+			return;
+		}
+		if(!(sender instanceof Player)) {
+			plugin.message(sender, "cmd-onlyByPlayer");
+			return;
+		}
+		if(args.length <= 1 || args[1] == null || (!args[1].equalsIgnoreCase("buy") && !args[1].equalsIgnoreCase("rent"))) {
+			plugin.message(sender, "find-help");
+			return;
+		}
+		Player player = (Player)sender;
+		double balance = 0.0;
+		if(plugin.getEconomy() != null) {
+			balance = plugin.getEconomy().getBalance(player);
+		}
+		double maxPrice = 0;
+		boolean maxPriceSet = false;
+		RegionGroup group = null;
+		// Parse optional price argument
+		if(args.length >= 3) {
+			try {
+				maxPrice = Double.parseDouble(args[2]);
+				maxPriceSet = true;
+			} catch(NumberFormatException e) {
+				plugin.message(sender, "find-wrongMaxPrice", args[2]);
+				return;
+			}
+		}
+		// Parse optional group argument
+		if(args.length >= 4) {
+			group = plugin.getFileManager().getGroup(args[3]);
+			if(group == null) {
+				plugin.message(sender, "find-wrongGroup", args[3]);
+				return;
+			}
+		}
+
+		// Find buy regions
+		if(args[1].equalsIgnoreCase("buy")) {
+			List<BuyRegion> regions = plugin.getFileManager().getBuys();
+			List<BuyRegion> results = new ArrayList<>();
+			for(BuyRegion region : regions) {
+				if(!region.isSold()
+						&& ((region.getPrice() <= balance && !maxPriceSet) || (region.getPrice() <= maxPrice && maxPriceSet))
+						&& (group == null || group.isMember(region))
+						&& (region.getBooleanSetting("general.findCrossWorld") || player.getWorld().equals(region.getWorld()))) {
+					results.add(region);
+				}
+			}
+			if(!results.isEmpty()) {
+				// Draw a random one
+				BuyRegion region = results.get(ThreadLocalRandom.current().nextInt(results.size()));
+				Message onlyInGroup = Message.empty();
+				if(group != null) {
+					onlyInGroup = Message.fromKey("find-onlyInGroup").replacements(args[3]);
+				}
+
+				// Teleport
+				if(maxPriceSet) {
+					plugin.message(player, "find-successMax", "buy", Utils.formatCurrency(maxPrice), onlyInGroup, region);
+				} else {
+					plugin.message(player, "find-success", "buy", Utils.formatCurrency(balance), onlyInGroup, region);
+				}
+				region.getTeleportFeature().teleportPlayer(player, region.getBooleanSetting("general.findTeleportToSign"), false);
+			} else {
+				Message onlyInGroup = Message.empty();
+				if(group != null) {
+					onlyInGroup = Message.fromKey("find-onlyInGroup").replacements(args[3]);
+				}
+				if(maxPriceSet) {
+					plugin.message(player, "find-noneFoundMax", "buy", Utils.formatCurrency(maxPrice), onlyInGroup);
+				} else {
+					plugin.message(player, "find-noneFound", "buy", Utils.formatCurrency(balance), onlyInGroup);
+				}
+			}
+		}
+
+		// Find rental regions
+		else {
+			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))
+						&& (group == null || group.isMember(region))
+						&& (region.getBooleanSetting("general.findCrossWorld") || player.getWorld().equals(region.getWorld()))) {
+					results.add(region);
+				}
+			}
+			if(!results.isEmpty()) {
+				// Draw a random one
+				RentRegion region = results.get(ThreadLocalRandom.current().nextInt(results.size()));
+				Message onlyInGroup = Message.empty();
+				if(group != null) {
+					onlyInGroup = Message.fromKey("find-onlyInGroup").replacements(args[3]);
+				}
+
+				// Teleport
+				if(maxPriceSet) {
+					plugin.message(player, "find-successMax", "rent", Utils.formatCurrency(maxPrice), onlyInGroup, region);
+				} else {
+					plugin.message(player, "find-success", "rent", Utils.formatCurrency(balance), onlyInGroup, region);
+				}
+				region.getTeleportFeature().teleportPlayer(player, region.getBooleanSetting("general.findTeleportToSign"), false);
+			} else {
+				Message onlyInGroup = Message.empty();
+				if(group != null) {
+					onlyInGroup = Message.fromKey("find-onlyInGroup").replacements(args[3]);
+				}
+				if(maxPriceSet) {
+					plugin.message(player, "find-noneFoundMax", "rent", Utils.formatCurrency(maxPrice), onlyInGroup);
+				} else {
+					plugin.message(player, "find-noneFound", "rent", Utils.formatCurrency(balance), onlyInGroup);
+				}
+			}
+		}
+
+	}
+
+	@Override
+	public List<String> getTabCompleteList(int toComplete, String[] start, CommandSender sender) {
+		ArrayList<String> result = new ArrayList<>();
+		if(toComplete == 2) {
+			result.add("buy");
+			result.add("rent");
+		}
+		return result;
+	}
+
+}
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+

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

@@ -1,31 +1,27 @@
-package nl.evolutioncoding.areashop.commands;
+package me.wiefferink.areashop.commands;
 
-import com.sk89q.worldedit.bukkit.selections.Selection;
-import nl.evolutioncoding.areashop.AreaShop;
-import nl.evolutioncoding.areashop.Utils;
-import nl.evolutioncoding.areashop.regions.GeneralRegion;
-import nl.evolutioncoding.areashop.regions.RegionGroup;
+import me.wiefferink.areashop.interfaces.WorldEditSelection;
+import me.wiefferink.areashop.regions.LegacyGeneralRegion;
+import me.wiefferink.areashop.regions.RegionGroup;
+import me.wiefferink.areashop.tools.Utils;
 import org.bukkit.command.CommandSender;
 import org.bukkit.entity.Player;
 
 import java.util.ArrayList;
 import java.util.List;
+import java.util.TreeSet;
 
 public class GroupaddCommand extends CommandAreaShop {
 
-	public GroupaddCommand(AreaShop plugin) {
-		super(plugin);
-	}
-	
 	@Override
 	public String getCommandStart() {
 		return "areashop groupadd";
 	}
-	
+
 	@Override
 	public String getHelp(CommandSender target) {
 		if(target.hasPermission("areashop.groupadd")) {
-			return plugin.getLanguageManager().getLang("help-groupadd");
+			return "help-groupadd";
 		}
 		return null;
 	}
@@ -35,11 +31,11 @@ public class GroupaddCommand extends CommandAreaShop {
 		if(!sender.hasPermission("areashop.groupadd")) {
 			plugin.message(sender, "groupadd-noPermission");
 			return;
-		}		
+		}
 		if(args.length < 2 || args[1] == null) {
 			plugin.message(sender, "groupadd-help");
 			return;
-		}		
+		}
 		RegionGroup group = plugin.getFileManager().getGroup(args[1]);
 		if(group == null) {
 			group = new RegionGroup(plugin, args[1]);
@@ -51,39 +47,37 @@ public class GroupaddCommand extends CommandAreaShop {
 				return;
 			}
 			Player player = (Player)sender;
-			Selection selection = plugin.getWorldEdit().getSelection(player);
+			WorldEditSelection selection = plugin.getWorldEditHandler().getPlayerSelection(player);
 			if(selection == null) {
 				plugin.message(player, "cmd-noSelection");
 				return;
 			}
-			List<GeneralRegion> regions = Utils.getASRegionsInSelection(selection);
-			if(regions.size() == 0) {
+			List<LegacyGeneralRegion> regions = Utils.getRegionsInSelection(selection);
+			if(regions.isEmpty()) {
 				plugin.message(player, "cmd-noRegionsFound");
 				return;
 			}
-			ArrayList<String> namesSuccess = new ArrayList<>();
-			ArrayList<String> namesFailed = new ArrayList<>();
-			ArrayList<GeneralRegion> toUpdate = new ArrayList<>();
-			for(GeneralRegion region : regions) {
+			TreeSet<LegacyGeneralRegion> regionsSuccess = new TreeSet<>();
+			TreeSet<LegacyGeneralRegion> regionsFailed = new TreeSet<>();
+			for(LegacyGeneralRegion region : regions) {
 				if(group.addMember(region)) {
-					namesSuccess.add(region.getName());
-					toUpdate.add(region);
+					regionsSuccess.add(region);
 				} else {
-					namesFailed.add(region.getName());
+					regionsFailed.add(region);
 				}
 			}
-			if(namesSuccess.size() != 0) {
-				plugin.message(player, "groupadd-weSuccess", group.getName(), Utils.createCommaSeparatedList(namesSuccess));
+			if(!regionsSuccess.isEmpty()) {
+				plugin.message(player, "groupadd-weSuccess", group.getName(), Utils.combinedMessage(regionsSuccess, "region"));
 			}
-			if(namesFailed.size() != 0) {
-				plugin.message(player, "groupadd-weFailed", group.getName(), Utils.createCommaSeparatedList(namesFailed));
+			if(!regionsFailed.isEmpty()) {
+				plugin.message(player, "groupadd-weFailed", group.getName(), Utils.combinedMessage(regionsFailed, "region"));
 			}
 			// Update all regions, this does it in a task, updating them without lag
-			plugin.getFileManager().updateRegions(toUpdate, player);
+			plugin.getFileManager().updateRegions(new ArrayList<>(regionsSuccess), player);
 		} else {
-			GeneralRegion region = plugin.getFileManager().getRegion(args[2]);
+			LegacyGeneralRegion region = plugin.getFileManager().getRegion(args[2]);
 			if(region == null) {
-				plugin.message(sender, "groupadd-noRegion", args[2]);
+				plugin.message(sender, "cmd-notRegistered", args[2]);
 				return;
 			}
 			if(group.addMember(region)) {
@@ -94,14 +88,14 @@ public class GroupaddCommand extends CommandAreaShop {
 			}
 		}
 	}
-	
+
 	@Override
 	public List<String> getTabCompleteList(int toComplete, String[] start, CommandSender sender) {
 		List<String> result = new ArrayList<>();
 		if(toComplete == 2) {
 			result = plugin.getFileManager().getGroupNames();
 		} else if(toComplete == 3) {
-			result = plugin.getFileManager().getRegionNames();	
+			result = plugin.getFileManager().getRegionNames();
 		}
 		return result;
 	}

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

@@ -1,31 +1,27 @@
-package nl.evolutioncoding.areashop.commands;
+package me.wiefferink.areashop.commands;
 
-import com.sk89q.worldedit.bukkit.selections.Selection;
-import nl.evolutioncoding.areashop.AreaShop;
-import nl.evolutioncoding.areashop.Utils;
-import nl.evolutioncoding.areashop.regions.GeneralRegion;
-import nl.evolutioncoding.areashop.regions.RegionGroup;
+import me.wiefferink.areashop.interfaces.WorldEditSelection;
+import me.wiefferink.areashop.regions.LegacyGeneralRegion;
+import me.wiefferink.areashop.regions.RegionGroup;
+import me.wiefferink.areashop.tools.Utils;
 import org.bukkit.command.CommandSender;
 import org.bukkit.entity.Player;
 
 import java.util.ArrayList;
 import java.util.List;
+import java.util.TreeSet;
 
 public class GroupdelCommand extends CommandAreaShop {
 
-	public GroupdelCommand(AreaShop plugin) {
-		super(plugin);
-	}
-	
 	@Override
 	public String getCommandStart() {
 		return "areashop groupdel";
 	}
-	
+
 	@Override
 	public String getHelp(CommandSender target) {
 		if(target.hasPermission("areashop.groupdel")) {
-			return plugin.getLanguageManager().getLang("help-groupdel");
+			return "help-groupdel";
 		}
 		return null;
 	}
@@ -35,58 +31,57 @@ public class GroupdelCommand extends CommandAreaShop {
 		if(!sender.hasPermission("areashop.groupdel")) {
 			plugin.message(sender, "groupdel-noPermission");
 			return;
-		}		
+		}
 		if(args.length < 2 || args[1] == null) {
 			plugin.message(sender, "groupdel-help");
 			return;
-		}	
+		}
 		RegionGroup group = plugin.getFileManager().getGroup(args[1]);
 		if(group == null) {
-			group = new RegionGroup(plugin, args[1]);
-			plugin.getFileManager().addGroup(group);
+			plugin.message(sender, "groupdel-wrongGroup", args[1]);
+			return;
 		}
+
 		if(args.length == 2) {
 			if(!(sender instanceof Player)) {
 				plugin.message(sender, "cmd-weOnlyByPlayer");
 				return;
 			}
 			Player player = (Player)sender;
-			Selection selection = plugin.getWorldEdit().getSelection(player);
+			WorldEditSelection selection = plugin.getWorldEditHandler().getPlayerSelection(player);
 			if(selection == null) {
 				plugin.message(player, "cmd-noSelection");
 				return;
 			}
-			List<GeneralRegion> regions = Utils.getASRegionsInSelection(selection);
-			if(regions.size() == 0) {
+			List<LegacyGeneralRegion> regions = Utils.getRegionsInSelection(selection);
+			if(regions.isEmpty()) {
 				plugin.message(player, "cmd-noRegionsFound");
 				return;
 			}
-			ArrayList<String> namesSuccess = new ArrayList<>();
-			ArrayList<String> namesFailed = new ArrayList<>();
-			ArrayList<GeneralRegion> toUpdate = new ArrayList<>();
-			for(GeneralRegion region : regions) {
+			TreeSet<LegacyGeneralRegion> regionsSuccess = new TreeSet<>();
+			TreeSet<LegacyGeneralRegion> regionsFailed = new TreeSet<>();
+			for(LegacyGeneralRegion region : regions) {
 				if(group.removeMember(region)) {
-					namesSuccess.add(region.getName());
-					toUpdate.add(region);
+					regionsSuccess.add(region);
 				} else {
-					namesFailed.add(region.getName());
+					regionsFailed.add(region);
 				}
 			}
-			if(namesSuccess.size() != 0) {
-				plugin.message(player, "groupdel-weSuccess", group.getName(), Utils.createCommaSeparatedList(namesSuccess));
+			if(!regionsSuccess.isEmpty()) {
+				plugin.message(player, "groupdel-weSuccess", group.getName(), Utils.combinedMessage(regionsSuccess, "region"));
 			}
-			if(namesFailed.size() != 0) {
-				plugin.message(player, "groupdel-weFailed", group.getName(), Utils.createCommaSeparatedList(namesFailed));
+			if(!regionsFailed.isEmpty()) {
+				plugin.message(player, "groupdel-weFailed", group.getName(), Utils.combinedMessage(regionsFailed, "region"));
 			}
 			// Update all regions, this does it in a task, updating them without lag
-			plugin.getFileManager().updateRegions(toUpdate, player);
+			plugin.getFileManager().updateRegions(new ArrayList<>(regionsSuccess), player);
 			group.saveRequired();
 		} else {
-			GeneralRegion region = plugin.getFileManager().getRegion(args[2]);
+			LegacyGeneralRegion region = plugin.getFileManager().getRegion(args[2]);
 			if(region == null) {
-				plugin.message(sender, "groupdel-noRegion", args[2]);
+				plugin.message(sender, "cmd-notRegistered", args[2]);
 				return;
-			}	
+			}
 			if(group.removeMember(region)) {
 				region.update();
 				plugin.message(sender, "groupdel-success", group.getName(), group.getMembers().size(), region);
@@ -95,12 +90,12 @@ public class GroupdelCommand extends CommandAreaShop {
 			}
 		}
 	}
-	
+
 	@Override
 	public List<String> getTabCompleteList(int toComplete, String[] start, CommandSender sender) {
 		List<String> result = new ArrayList<>();
 		if(toComplete == 2) {
-			result = plugin.getFileManager().getGroupNames();		
+			result = plugin.getFileManager().getGroupNames();
 		} else if(toComplete == 3) {
 			result = plugin.getFileManager().getRegionNames();
 		}

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

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

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

@@ -1,58 +1,53 @@
-package nl.evolutioncoding.areashop.commands;
-
-import nl.evolutioncoding.areashop.AreaShop;
-import nl.evolutioncoding.areashop.Utils;
-import org.bukkit.command.CommandSender;
-
-import java.util.ArrayList;
-import java.util.List;
-
-public class GrouplistCommand extends CommandAreaShop {
-
-	public GrouplistCommand(AreaShop plugin) {
-		super(plugin);
-	}
-	
-	@Override
-	public String getCommandStart() {
-		return "areashop grouplist";
-	}
-	
-	@Override
-	public String getHelp(CommandSender target) {
-		if(target.hasPermission("areashop.grouplist")) {
-			return plugin.getLanguageManager().getLang("help-grouplist");
-		}
-		return null;
-	}
-
-	@Override
-	public void execute(CommandSender sender, String[] args) {
-		if(!sender.hasPermission("areashop.grouplist")) {
-			plugin.message(sender, "grouplist-noPermission");
-			return;
-		}
-		List<String> groups = plugin.getFileManager().getGroupNames();
-		if(groups.size() == 0) {
-			plugin.message(sender, "grouplist-noGroups");
-		} else {
-			plugin.message(sender, "grouplist-success", Utils.createCommaSeparatedList(groups));
-		}
-	}
-	
-	@Override
-	public List<String> getTabCompleteList(int toComplete, String[] start, CommandSender sender) {
-		return new ArrayList<>();
-	}
-
-}
-
-
-
-
-
-
-
-
-
-
+package me.wiefferink.areashop.commands;
+
+import me.wiefferink.areashop.tools.Utils;
+import org.bukkit.command.CommandSender;
+
+import java.util.ArrayList;
+import java.util.List;
+
+public class GrouplistCommand extends CommandAreaShop {
+
+	@Override
+	public String getCommandStart() {
+		return "areashop grouplist";
+	}
+
+	@Override
+	public String getHelp(CommandSender target) {
+		if(target.hasPermission("areashop.grouplist")) {
+			return "help-grouplist";
+		}
+		return null;
+	}
+
+	@Override
+	public void execute(CommandSender sender, String[] args) {
+		if(!sender.hasPermission("areashop.grouplist")) {
+			plugin.message(sender, "grouplist-noPermission");
+			return;
+		}
+		List<String> groups = plugin.getFileManager().getGroupNames();
+		if(groups.isEmpty()) {
+			plugin.message(sender, "grouplist-noGroups");
+		} else {
+			plugin.message(sender, "grouplist-success", Utils.createCommaSeparatedList(groups));
+		}
+	}
+
+	@Override
+	public List<String> getTabCompleteList(int toComplete, String[] start, CommandSender sender) {
+		return new ArrayList<>();
+	}
+
+}
+
+
+
+
+
+
+
+
+
+

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

@@ -1,29 +1,24 @@
-package nl.evolutioncoding.areashop.commands;
-
-import nl.evolutioncoding.areashop.AreaShop;
-import org.bukkit.command.CommandSender;
-
-public class HelpCommand extends CommandAreaShop {
-
-	public HelpCommand(AreaShop plugin) {
-		super(plugin);
-	}
-	
-	@Override
-	public String getCommandStart() {
-		return "areashop help";
-	}
-	
-	@Override
-	public String getHelp(CommandSender target) {
-		if(target.hasPermission("areashop.help")) {
-			return plugin.getLanguageManager().getLang("help-help");
-		}
-		return null;
-	}
-
-	@Override
-	public void execute(CommandSender sender, String[] args) {
-		plugin.getCommandManager().showHelp(sender);
-	}
-}
+package me.wiefferink.areashop.commands;
+
+import org.bukkit.command.CommandSender;
+
+public class HelpCommand extends CommandAreaShop {
+
+	@Override
+	public String getCommandStart() {
+		return "areashop help";
+	}
+
+	@Override
+	public String getHelp(CommandSender target) {
+		if(target.hasPermission("areashop.help")) {
+			return "help-help";
+		}
+		return null;
+	}
+
+	@Override
+	public void execute(CommandSender sender, String[] args) {
+		plugin.getCommandManager().showHelp(sender);
+	}
+}

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

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

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

@@ -0,0 +1,481 @@
+package me.wiefferink.areashop.commands;
+
+import com.google.common.base.Charsets;
+import com.sk89q.worldguard.protection.managers.RegionManager;
+import com.sk89q.worldguard.protection.regions.ProtectedRegion;
+import me.wiefferink.areashop.AreaShop;
+import me.wiefferink.areashop.events.ask.AddingRegionEvent;
+import me.wiefferink.areashop.features.signs.RegionSign;
+import me.wiefferink.areashop.features.signs.SignsFeature;
+import me.wiefferink.areashop.regions.BuyRegion;
+import me.wiefferink.areashop.regions.LegacyGeneralRegion;
+import me.wiefferink.areashop.regions.RegionGroup;
+import me.wiefferink.areashop.regions.RentRegion;
+import org.bukkit.Bukkit;
+import org.bukkit.Location;
+import org.bukkit.OfflinePlayer;
+import org.bukkit.World;
+import org.bukkit.command.CommandSender;
+import org.bukkit.command.ConsoleCommandSender;
+import org.bukkit.configuration.ConfigurationSection;
+import org.bukkit.configuration.file.YamlConfiguration;
+
+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.UUID;
+
+public class ImportJob {
+
+	private final AreaShop plugin;
+	private final CommandSender sender;
+
+	/**
+	 * Create and execute the import.
+	 * @param sender CommandSender that should receive progress updates
+	 */
+	public ImportJob(CommandSender sender) {
+		this.sender = sender;
+		this.plugin = AreaShop.getInstance();
+		execute();
+	}
+
+	/**
+	 * Execute the job.
+	 */
+	private void execute() {
+		// Check for RegionForSale data
+		File regionForSaleFolder = new File(plugin.getDataFolder().getParentFile().getAbsolutePath(), "RegionForSale");
+		if(!regionForSaleFolder.exists()) {
+			message("import-noPluginFolder", regionForSaleFolder.getName());
+			return;
+		}
+
+		File worldsFolder = new File(regionForSaleFolder.getAbsolutePath(), "worlds");
+		if(!worldsFolder.exists()) {
+			message("import-noWorldsFolder");
+			return;
+		}
+
+		File[] worldFolders = worldsFolder.listFiles();
+		if(worldFolders == null) {
+			message("import-noWorldsFolder");
+			return;
+		}
+
+		// Import data for each world
+		message("import-start");
+
+		// Group with settings for all imported regions
+		RegionGroup regionForSaleGroup = new RegionGroup(plugin, "RegionForSale");
+		plugin.getFileManager().addGroup(regionForSaleGroup);
+
+		// Import /RegionForSale/config.yml settings
+		File regionForSaleConfigFile = new File(regionForSaleFolder.getAbsolutePath(), "config.yml");
+		YamlConfiguration regionForSaleConfig = loadConfiguration(regionForSaleConfigFile);
+		if(regionForSaleConfig == null) {
+			messageNoPrefix("import-loadConfigFailed", regionForSaleConfigFile.getAbsolutePath());
+			regionForSaleConfig = new YamlConfiguration();
+		} else {
+			importRegionSettings(regionForSaleConfig, regionForSaleGroup.getSettings(), null, false);
+			regionForSaleGroup.setSetting("priority", 0);
+		}
+
+		// Import /RegionForSale/general.yml settings
+		File regionForSaleGeneralFile = new File(regionForSaleFolder.getAbsolutePath(), "config.yml");
+		YamlConfiguration regionForSaleGeneral = loadConfiguration(regionForSaleConfigFile);
+		if(regionForSaleGeneral == null) {
+			messageNoPrefix("import-loadConfigFailed", regionForSaleGeneralFile.getAbsolutePath());
+		} else {
+			// Collection interval of RegionForSale maps to rent duration
+			String duration = "1 day";
+			if(regionForSaleGeneral.isLong("interval.collect_money")) {
+				duration = minutesToString(regionForSaleGeneral.getLong("interval.collect_money"));
+			}
+			regionForSaleGroup.setSetting("rent.duration", duration);
+
+			// Global economy account has an effect close to landlord in AreaShop
+			if(regionForSaleGeneral.isString("global_econ_account")) {
+				regionForSaleGroup.setSetting("general.landlordName", regionForSaleGeneral.getString("global_econ_account"));
+			}
+		}
+		regionForSaleGroup.saveRequired();
+
+		////////// Handle defaults of RegionForSale
+
+		// Set autoExtend, to keep the same behavior as RegionForSale had
+		regionForSaleGroup.setSetting("rent.autoExtend", true);
+
+		// Import regions from each world
+		for(File worldFolder : worldFolders) {
+			// Skip files
+			if(!worldFolder.isDirectory() || worldFolder.isHidden()) {
+				continue;
+			}
+
+			messageNoPrefix("import-doWorld", worldFolder.getName());
+
+			// Get the Bukkit world
+			World world = Bukkit.getWorld(worldFolder.getName());
+			if(world == null) {
+				messageNoPrefix("import-noBukkitWorld");
+				continue;
+			}
+
+			// Get the WorldGuard RegionManager
+			RegionManager regionManager = plugin.getRegionManager(world);
+			if(regionManager == null) {
+				messageNoPrefix("import-noRegionManger");
+				continue;
+			}
+
+			// Load the /worlds/<world>/regions.yml file
+			File regionsFile = new File(worldFolder.getAbsolutePath(), "regions.yml");
+			YamlConfiguration regions = loadConfiguration(regionsFile);
+			if(regions == null) {
+				messageNoPrefix("import-loadRegionsFailed", regionsFile.getAbsolutePath());
+				continue;
+			}
+
+			// Load /worlds/<world>/config.yml file
+			File worldConfigFile = new File(worldFolder.getAbsolutePath(), "config.yml");
+			YamlConfiguration worldConfig = loadConfiguration(worldConfigFile);
+			if(worldConfig == null) {
+				messageNoPrefix("import-loadWorldConfigFailed", worldConfigFile.getAbsolutePath());
+				// Simply skip importing the settings, since this is not really fatal
+				worldConfig = new YamlConfiguration();
+			} else {
+				// RegionGroup with all world settings
+				RegionGroup worldGroup = new RegionGroup(plugin, "RegionForSale-" + worldFolder.getName());
+				importRegionSettings(worldConfig, worldGroup.getSettings(), null, false);
+				worldGroup.setSetting("priority", 1);
+				worldGroup.addWorld(worldFolder.getName());
+				plugin.getFileManager().addGroup(regionForSaleGroup);
+				worldGroup.saveRequired();
+			}
+
+			// Create groups to hold settings of /worlds/<world>/parent-regions.yml
+			File parentRegionsFile = new File(worldFolder.getAbsolutePath(), "parent-regions.yml");
+			YamlConfiguration parentRegions = loadConfiguration(parentRegionsFile);
+			if(parentRegions == null) {
+				messageNoPrefix("import-loadParentRegionsFailed", parentRegionsFile.getAbsolutePath());
+				// Non-fatal, so just continue
+			} else {
+				for(String parentRegionName : parentRegions.getKeys(false)) {
+					// Get WorldGuard region
+					ProtectedRegion worldGuardRegion = regionManager.getRegion(parentRegionName);
+					if(worldGuardRegion == null) {
+						messageNoPrefix("import-noWorldGuardRegionParent", parentRegionName);
+						continue;
+					}
+
+					// Get settings section
+					ConfigurationSection parentRegionSection = parentRegions.getConfigurationSection(parentRegionName);
+					if(parentRegionSection == null) {
+						messageNoPrefix("import-improperParentRegion", parentRegionName);
+						continue;
+					}
+
+					// Skip if it does not have any settings
+					if(parentRegionSection.getKeys(false).isEmpty()) {
+						continue;
+					}
+
+					// Import parent region settings into a RegionGroup
+					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();
+
+					// TODO add all regions that are contained in this parent region
+					// Utils.getWorldEditRegionsInSelection()
+				}
+			}
+
+			// Read and import regions
+			for(String regionKey : regions.getKeys(false)) {
+				LegacyGeneralRegion existingRegion = plugin.getFileManager().getRegion(regionKey);
+				if(existingRegion != null) {
+					if(world.getName().equalsIgnoreCase(existingRegion.getWorldName())) {
+						messageNoPrefix("import-alreadyAdded", regionKey);
+					} else {
+						messageNoPrefix("import-alreadyAddedOtherWorld", regionKey, existingRegion.getWorldName(), world.getName());
+					}
+					continue;
+				}
+
+				ConfigurationSection regionSection = regions.getConfigurationSection(regionKey);
+				if(regionSection == null) {
+					messageNoPrefix("import-invalidRegionSection", regionKey);
+					continue;
+				}
+
+				// Get WorldGuard region
+				ProtectedRegion worldGuardRegion = regionManager.getRegion(regionKey);
+				if(worldGuardRegion == null) {
+					messageNoPrefix("import-noWorldGuardRegion", regionKey);
+					continue;
+				}
+
+				String owner = regionSection.getString("info.owner", null);
+				boolean isBought = regionSection.getBoolean("info.is-bought");
+				// TODO: should also take into config settings of parent regions
+				boolean rentable = regionSection.getBoolean("economic-settings.rentable", worldConfig.getBoolean("economic-settings.rentable", regionForSaleConfig.getBoolean("economic-settings.rentable")));
+				boolean buyable = regionSection.getBoolean("economic-settings.buyable", worldConfig.getBoolean("economic-settings.buyable", regionForSaleConfig.getBoolean("economic-settings.buyable")));
+
+				// Can be bought and rented, import as buy
+				if(buyable && rentable) {
+					messageNoPrefix("import-buyAndRent", regionKey);
+				}
+
+				// Cannot be bought or rented, skip
+				if(!buyable && !rentable && owner == null) {
+					messageNoPrefix("import-noBuyAndNoRent", regionKey);
+					continue;
+				}
+
+				// Create region
+				LegacyGeneralRegion region;
+				if(rentable || (owner != null && !isBought)) {
+					region = new RentRegion(regionKey, world);
+				} else {
+					region = new BuyRegion(regionKey, world);
+				}
+				AddingRegionEvent event = plugin.getFileManager().addRegion(region);
+				if (event.isCancelled()) {
+					messageNoPrefix("general-cancelled", event.getReason());
+					continue;
+				}
+
+				// Import settings
+				importRegionSettings(regionSection, region.getConfig(), region, !buyable && !rentable);
+				region.getConfig().set("general.importedFrom", "RegionForSale");
+
+				// Get existing owners and members
+				List<UUID> existing = new ArrayList<>();
+				if(owner != null) {
+					@SuppressWarnings("deprecation")
+					OfflinePlayer offlinePlayer = Bukkit.getOfflinePlayer(owner);
+					if(offlinePlayer != null) {
+						existing.add(offlinePlayer.getUniqueId());
+					}
+				}
+				for(UUID uuid : plugin.getWorldGuardHandler().getOwners(worldGuardRegion).asUniqueIdList()) {
+					if(!existing.contains(uuid)) {
+						existing.add(uuid);
+					}
+				}
+				for(UUID uuid : plugin.getWorldGuardHandler().getMembers(worldGuardRegion).asUniqueIdList()) {
+					if(!existing.contains(uuid)) {
+						existing.add(uuid);
+					}
+				}
+
+				// First owner (or if none, the first member) will be the renter/buyer
+				if(!existing.isEmpty()) {
+					region.setOwner(existing.remove(0));
+				}
+				// Add others as friends
+				for(UUID friend : existing) {
+					region.getFriendsFeature().addFriend(friend, null);
+				}
+
+				region.saveRequired();
+
+				messageNoPrefix("import-imported", regionKey);
+			}
+		}
+
+		// Update all regions
+		plugin.getFileManager().updateAllRegions(sender);
+		// Write all imported regions and settings to disk
+		plugin.getFileManager().saveRequiredFiles();
+	}
+
+	/**
+	 * Load a YamlConfiguration from disk using UTF-8 encoding.
+	 * @param from File to read the configuration from
+	 * @return YamlConfiguration if the file exists and got read wihout problems, otherwise null
+	 */
+	private YamlConfiguration loadConfiguration(File from) {
+		try(
+				InputStreamReader reader = new InputStreamReader(new FileInputStream(from), Charsets.UTF_8)
+		) {
+			return YamlConfiguration.loadConfiguration(reader);
+		} catch(IOException e) {
+			return null;
+		}
+	}
+
+	/**
+	 * Import region specific settings from a RegionForSale source to an AreaShop target ConfigurationSection.
+	 * @param from RegionForSale config section that specifies region settings
+	 * @param to AreaShop config section that specifies region settings
+	 * @param region GeneralRegion to copy settings to, or null if doing generic settings
+	 * @param permanent Region cannot be rented or bought, disables some features
+	 */
+	private void importRegionSettings(ConfigurationSection from, ConfigurationSection to, LegacyGeneralRegion region, boolean permanent) {
+		// Maximum rental time, TODO check if this is actually the same
+		if(from.isLong("permissions.max-rent-time")) {
+			to.set("rent.maxRentTime", minutesToString(from.getLong("permissions.max-rent-time")));
+		}
+
+		// Region rebuild
+		if(from.getBoolean("region-rebuilding.auto-rebuild")) {
+			to.set("general.enableRestore", true);
+		}
+
+		// Get price settings
+		String unit = from.getString("economic-settings.unit-type");
+		String rentPrice = from.getString("economic-settings.cost-per-unit.rent");
+		String buyPrice = from.getString("economic-settings.cost-per-unit.buy");
+		String sellPrice = from.getString("economic-settings.cost-per-unit.selling-price");
+		// TODO: There is no easy way to import this, setup eventCommandsProfile?
+		// String taxes = from.getString("economic-settings.cost-per-unit.taxes");
+
+		// Determine unit and add that to the price
+		String unitSuffix = "";
+		if("region".equalsIgnoreCase(unit)) {
+			// add nothing
+		} else if("m3".equalsIgnoreCase(unit)) {
+			unitSuffix = "*%volume%";
+		} else { // m2 or nothing (in case not set, we should actually look in parent files to correctly set this...)
+			unitSuffix = "*(%volume%/%height%)"; // This is better than width*depth because of polygon regions
+		}
+
+		// Apply settings
+		if(rentPrice != null) {
+			to.set("rent.price", rentPrice + unitSuffix);
+		}
+		if(buyPrice != null) {
+			to.set("buy.price", buyPrice + unitSuffix);
+			if(sellPrice != null) {
+				try {
+					double buyPriceAmount = Double.parseDouble(buyPrice);
+					double sellPriceAmount = Double.parseDouble(sellPrice);
+					to.set("buy.moneyBack", sellPriceAmount / buyPriceAmount * 100);
+				} catch(NumberFormatException e) {
+					// There is not always a region here for the message, should probably indicate something though
+					message("import-moneyBackFailed", buyPrice, sellPrice);
+				}
+			}
+		}
+
+		// Apply permanent region settings
+		if(permanent) {
+			to.set("buy.resellDisabled", true);
+			to.set("buy.sellDisabled", true);
+			to.set("general.countForLimits", false);
+		}
+
+		// Set rented until
+		if(from.isLong("info.last-withdrawal")
+				&& region instanceof RentRegion) {
+			RentRegion rentRegion = (RentRegion)region;
+			long lastWithdrawal = from.getLong("info.last-withdrawal");
+			// Because the rental duration is already imported into the region and its parents this should be correct
+			rentRegion.setRentedUntil(lastWithdrawal + rentRegion.getDuration());
+		}
+
+		// Import signs (list of strings like "297, 71, -22")
+		if(from.isList("info.signs") && region != null) {
+			for(String signLocation : from.getStringList("info.signs")) {
+				String[] locationParts = signLocation.split(", ");
+				if(locationParts.length != 3) {
+					message("import-invalidSignLocation", region.getRegionId(), signLocation);
+					continue;
+				}
+
+				// Parse the location
+				Location location;
+				try {
+					location = new Location(region.getWorld(), Double.parseDouble(locationParts[0]), Double.parseDouble(locationParts[1]), Double.parseDouble(locationParts[2]));
+				} catch(NumberFormatException e) {
+					message("import-invalidSignLocation", region.getRegionId(), signLocation);
+					continue;
+				}
+
+				// Check if this location is already added to a region
+				RegionSign regionSign = SignsFeature.getSignByLocation(location);
+				if(regionSign != null) {
+					if(!regionSign.getRegion().equals(region)) {
+						message("import-signAlreadyAdded", region.getRegionId(), signLocation, regionSign.getRegion().getRegionId());
+					}
+					continue;
+				}
+
+				// SignType and Facing will be written when the sign is updated later
+				region.getSignsFeature().addSign(location, null, null, null);
+			}
+		}
+
+	}
+
+	private static class TimeUnit {
+		public final long minutes;
+		public final String identifier;
+
+		TimeUnit(long minutes, String identifier) {
+			this.minutes = minutes;
+			this.identifier = identifier;
+		}
+	}
+
+	private static final List<TimeUnit> timeUnitLookup = new ArrayList<TimeUnit>() {
+		{
+			add(new TimeUnit(60 * 24 * 30 * 12, "year"));
+			add(new TimeUnit(60 * 24 * 30, "month"));
+			add(new TimeUnit(60 * 24, "day"));
+			add(new TimeUnit(60, "hour"));
+		}
+	};
+
+	/**
+	 * Convert minutes to a human-readable string.
+	 * @param minutes Value to convert
+	 * @return String that represents the same length of time in a readable format, like "1 day", "5 minutes", "3 months"
+	 */
+	private String minutesToString(long minutes) {
+		// If the specified number of minutes can map nicely to a higher unit, use that one
+		String resultUnit = "minute";
+		long resultValue = minutes;
+		for(TimeUnit unit : timeUnitLookup) {
+			long result = minutes / unit.minutes;
+			if(resultValue * unit.minutes == minutes) {
+				resultUnit = unit.identifier;
+				resultValue = result;
+				break;
+			}
+		}
+		return resultValue + " " + resultUnit + (resultValue == 1 ? "" : "s");
+	}
+
+	/**
+	 * Send a message to a target without a prefix.
+	 * @param key          The key of the language string
+	 * @param replacements The replacements to insert in the message
+	 */
+	public void messageNoPrefix(String key, Object... replacements) {
+		plugin.messageNoPrefix(sender, key, replacements);
+
+		if(!(sender instanceof ConsoleCommandSender)) {
+			plugin.messageNoPrefix(Bukkit.getConsoleSender(), key, replacements);
+		}
+	}
+
+	/**
+	 * Send a message to a target, prefixed by the default chat prefix.
+	 * @param key          The key of the language string
+	 * @param replacements The replacements to insert in the message
+	 */
+	public void message(String key, Object... replacements) {
+		plugin.message(sender, key, replacements);
+
+		if(!(sender instanceof ConsoleCommandSender)) {
+			plugin.message(Bukkit.getConsoleSender(), key, replacements);
+		}
+	}
+}

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

@@ -0,0 +1,484 @@
+package me.wiefferink.areashop.commands;
+
+import me.wiefferink.areashop.regions.BuyRegion;
+import me.wiefferink.areashop.regions.LegacyGeneralRegion;
+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 java.util.ArrayList;
+import java.util.Arrays;
+import java.util.HashSet;
+import java.util.List;
+import java.util.Set;
+
+// TODO fix '/as info' help message hitting replacement limit (improve depth tracking?)
+// TODO add info about autoExtend
+public class InfoCommand extends CommandAreaShop {
+
+	@Override
+	public String getCommandStart() {
+		return "areashop info";
+	}
+
+	@Override
+	public String getHelp(CommandSender target) {
+		if(target.hasPermission("areashop.info")) {
+			return "help-info";
+		}
+		return null;
+	}
+
+	/**
+	 * Display a page of a list of regions.
+	 * @param sender      The CommandSender to send the messages to
+	 * @param regions     The regions to display
+	 * @param filterGroup The group to filter the regions by
+	 * @param keyHeader   The header to print above the page
+	 * @param pageInput   The page number, if any
+	 * @param baseCommand The command to execute for next/previous page (/areashop will be added)
+	 */
+	private void showSortedPagedList(CommandSender sender, List<? extends LegacyGeneralRegion> regions, RegionGroup filterGroup, String keyHeader, String pageInput, String baseCommand) {
+		int maximumItems = 20;
+		int itemsPerPage = maximumItems - 2;
+		int page = 1;
+		if(pageInput != null && Utils.isNumeric(pageInput)) {
+			try {
+				page = Integer.parseInt(pageInput);
+			} catch(NumberFormatException e) {
+				plugin.message(sender, "info-wrongPage", pageInput);
+				return;
+			}
+		}
+		if(filterGroup != null) {
+			regions.removeIf(generalRegion -> !filterGroup.isMember(generalRegion));
+		}
+		if(regions.isEmpty()) {
+			plugin.message(sender, "info-noRegions");
+		} else {
+			// First sort by type, then by name
+			regions.sort((one, two) -> {
+				int typeCompare = getTypeOrder(two).compareTo(getTypeOrder(one));
+				if(typeCompare != 0) {
+					return typeCompare;
+				} else {
+					return one.getRegionId().compareTo(two.getRegionId());
+				}
+			});
+			// Header
+			Message limitedToGroup = Message.empty();
+			if(filterGroup != null) {
+				limitedToGroup = Message.fromKey("info-limitedToGroup").replacements(filterGroup.getName());
+			}
+			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
+				itemsPerPage++;
+				totalPages = 1;
+			}
+			page = Math.max(1, Math.min(totalPages, page));
+			int linesPrinted = 1; // header
+			for(int i = (page - 1) * itemsPerPage; i < page * itemsPerPage && i < regions.size(); i++) {
+				String state;
+				LegacyGeneralRegion region = regions.get(i);
+				if(region.getType() == LegacyGeneralRegion.RegionType.RENT) {
+					if(region.getOwner() == null) {
+						state = "Forrent";
+					} else {
+						state = "Rented";
+					}
+				} else {
+					if(region.getOwner() == null) {
+						state = "Forsale";
+					} else if(!((BuyRegion)region).isInResellingMode()) {
+						state = "Sold";
+					} else {
+						state = "Reselling";
+					}
+				}
+				plugin.messageNoPrefix(sender, "info-entry" + state, region);
+				linesPrinted++;
+			}
+			Message footer = Message.empty();
+			// Previous button
+			if(page > 1) {
+				footer.append(Message.fromKey("info-pagePrevious").replacements(baseCommand + " " + (page - 1)));
+			} else {
+				footer.append(Message.fromKey("info-pageNoPrevious"));
+			}
+			// Page status
+			if(totalPages > 1) {
+				StringBuilder pageString = new StringBuilder("" + page);
+				for(int i = pageString.length(); i < (totalPages + "").length(); i++) {
+					pageString.insert(0, "0");
+				}
+				footer.append(Message.fromKey("info-pageStatus").replacements(page, totalPages));
+				if(page < totalPages) {
+					footer.append(Message.fromKey("info-pageNext").replacements(baseCommand + " " + (page + 1)));
+				} else {
+					footer.append(Message.fromKey("info-pageNoNext"));
+				}
+				// Fill up space if the page is not full (aligns header nicely)
+				for(int i = linesPrinted; i < maximumItems - 1; i++) {
+					sender.sendMessage(" ");
+				}
+				footer.send(sender);
+			}
+		}
+	}
+
+	/**
+	 * Get an integer to order by type, usable for Comparators.
+	 * @param region The region to get the order for
+	 * @return An integer for sorting by type
+	 */
+	private Integer getTypeOrder(LegacyGeneralRegion region) {
+		if(region.getType() == LegacyGeneralRegion.RegionType.RENT) {
+			if(region.getOwner() == null) {
+				return 1;
+			} else {
+				return 2;
+			}
+		} else {
+			if(region.getOwner() == null) {
+				return 3;
+			} else if(!((BuyRegion)region).isInResellingMode()) {
+				return 4;
+			} else {
+				return 5;
+			}
+		}
+	}
+
+	@Override
+	public void execute(CommandSender sender, String[] args) {
+		if(!sender.hasPermission("areashop.info")) {
+			plugin.message(sender, "info-noPermission");
+			return;
+		}
+		if(args.length > 1 && args[1] != null) {
+			// Get filter group (only used by some commands)
+			RegionGroup filterGroup = null;
+			Set<String> groupFilters = new HashSet<>(Arrays.asList("all", "rented", "forrent", "sold", "forsale", "reselling"));
+			if(groupFilters.contains(args[1].toLowerCase()) && args.length > 2) {
+				if(!Utils.isNumeric(args[2])) {
+					filterGroup = plugin.getFileManager().getGroup(args[2]);
+					if(filterGroup == null) {
+						plugin.message(sender, "info-noFiltergroup", args[2]);
+						return;
+					}
+					// Pass page number to args[2] if available
+					if(args.length > 3) {
+						args[2] = args[3];
+					}
+				}
+			}
+
+			// All regions
+			if(args[1].equalsIgnoreCase("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 = 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 = 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 = 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 = 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 = 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<LegacyGeneralRegion> regions = plugin.getFileManager().getRegions();
+				for(RegionGroup group : plugin.getFileManager().getGroups()) {
+					regions.removeAll(group.getMemberRegions());
+				}
+				if(regions.isEmpty()) {
+					plugin.message(sender, "info-nogroupNone");
+				} else {
+					showSortedPagedList(sender, regions, filterGroup, "info-nogroupHeader", (args.length > 2 ? args[2] : null), "info nogroup");
+				}
+			}
+
+			// Region info
+			else if(args[1].equalsIgnoreCase("region")) {
+				if(args.length > 1) {
+					RentRegion rent = null;
+					BuyRegion buy = null;
+					if(args.length > 2) {
+						rent = plugin.getFileManager().getRent(args[2]);
+						buy = plugin.getFileManager().getBuy(args[2]);
+					} else {
+						if(sender instanceof Player) {
+							// get the region by location
+							List<LegacyGeneralRegion> regions = Utils.getImportantRegions(((Player)sender).getLocation());
+							if(regions.isEmpty()) {
+								plugin.message(sender, "cmd-noRegionsAtLocation");
+								return;
+							} else if(regions.size() > 1) {
+								plugin.message(sender, "cmd-moreRegionsAtLocation");
+								return;
+							} else {
+								if(regions.get(0) instanceof RentRegion) {
+									rent = (RentRegion)regions.get(0);
+								} else if(regions.get(0) instanceof BuyRegion) {
+									buy = (BuyRegion)regions.get(0);
+								}
+							}
+						} else {
+							plugin.message(sender, "cmd-automaticRegionOnlyByPlayer");
+							return;
+						}
+					}
+
+					if(rent == null && buy == null) {
+						plugin.message(sender, "info-regionNotExisting", args[2]);
+						return;
+					}
+
+					if(rent != null) {
+						plugin.message(sender, "info-regionHeaderRent", rent);
+						if(rent.isRented()) {
+							plugin.messageNoPrefix(sender, "info-regionRented", rent);
+							plugin.messageNoPrefix(sender, "info-regionExtending", rent);
+							// Money back
+							if(UnrentCommand.canUse(sender, rent)) {
+								plugin.messageNoPrefix(sender, "info-regionMoneyBackRentClick", rent);
+							} else {
+								plugin.messageNoPrefix(sender, "info-regionMoneyBackRent", rent);
+							}
+							// Friends
+							if(!rent.getFriendsFeature().getFriendNames().isEmpty()) {
+								String messagePart = "info-friend";
+								if(DelfriendCommand.canUse(sender, rent)) {
+									messagePart = "info-friendRemove";
+								}
+								plugin.messageNoPrefix(sender, "info-regionFriends", rent, Utils.combinedMessage(rent.getFriendsFeature().getFriendNames(), messagePart));
+							}
+						} else {
+							plugin.messageNoPrefix(sender, "info-regionCanBeRented", rent);
+						}
+						if(rent.getLandlordName() != null) {
+							plugin.messageNoPrefix(sender, "info-regionLandlord", rent);
+						}
+						// Maximum extends
+						if(rent.getMaxExtends() != -1) {
+							if(rent.getMaxExtends() == 0) {
+								plugin.messageNoPrefix(sender, "info-regionNoExtending", rent);
+							} else if(rent.isRented()) {
+								plugin.messageNoPrefix(sender, "info-regionExtendsLeft", rent);
+							} else {
+								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) {
+							plugin.messageNoPrefix(sender, "info-regionMaxRentTime", rent);
+						}
+						if(rent.getInactiveTimeUntilUnrent() != -1) {
+							plugin.messageNoPrefix(sender, "info-regionInactiveUnrent", rent);
+						}
+						// Teleport
+						Message tp = Message.fromKey("info-prefix");
+						boolean foundSomething = false;
+						if(TeleportCommand.canUse(sender, rent)) {
+							foundSomething = true;
+							tp.append(Message.fromKey("info-regionTeleport").replacements(rent));
+						}
+						if(SetteleportCommand.canUse(sender, rent)) {
+							if(foundSomething) {
+								tp.append(", ");
+							}
+							foundSomething = true;
+							tp.append(Message.fromKey("info-setRegionTeleport").replacements(rent));
+						}
+						if(foundSomething) {
+							tp.append(".");
+							tp.send(sender);
+						}
+						// Signs
+						List<String> signLocations = new ArrayList<>();
+						for(Location location : rent.getSignsFeature().getSignLocations()) {
+							signLocations.add(Message.fromKey("info-regionSignLocation").replacements(location.getWorld().getName(), location.getBlockX(), location.getBlockY(), location.getBlockZ()).getPlain());
+						}
+						if(!signLocations.isEmpty()) {
+							plugin.messageNoPrefix(sender, "info-regionSigns", Utils.createCommaSeparatedList(signLocations));
+						}
+						// Groups
+						if(sender.hasPermission("areashop.groupinfo") && !rent.getGroupNames().isEmpty()) {
+							plugin.messageNoPrefix(sender, "info-regionGroups", Utils.createCommaSeparatedList(rent.getGroupNames()));
+						}
+						// Restoring
+						if(rent.isRestoreEnabled()) {
+							plugin.messageNoPrefix(sender, "info-regionRestoringRent", rent);
+						}
+						// Restrictions
+						if(!rent.isRented()) {
+							if(rent.restrictedToRegion()) {
+								plugin.messageNoPrefix(sender, "info-regionRestrictedRegionRent", rent);
+							} else if(rent.restrictedToWorld()) {
+								plugin.messageNoPrefix(sender, "info-regionRestrictedWorldRent", rent);
+							}
+						}
+						plugin.messageNoPrefix(sender, "info-regionFooterRent", rent);
+					} else if(buy != null) {
+						plugin.message(sender, "info-regionHeaderBuy", buy);
+						if(buy.isSold()) {
+							if(buy.isInResellingMode()) {
+								plugin.messageNoPrefix(sender, "info-regionReselling", buy);
+								plugin.messageNoPrefix(sender, "info-regionReselPrice", buy);
+							} else {
+								plugin.messageNoPrefix(sender, "info-regionBought", buy);
+							}
+							// Money back
+							if(!buy.getBooleanSetting("buy.sellDisabled")) {
+								if (SellCommand.canUse(sender, buy)) {
+									plugin.messageNoPrefix(sender, "info-regionMoneyBackBuyClick", buy);
+								} else {
+									plugin.messageNoPrefix(sender, "info-regionMoneyBackBuy", buy);
+								}
+							}
+							// Friends
+							if(!buy.getFriendsFeature().getFriendNames().isEmpty()) {
+								String messagePart = "info-friend";
+								if(DelfriendCommand.canUse(sender, buy)) {
+									messagePart = "info-friendRemove";
+								}
+								plugin.messageNoPrefix(sender, "info-regionFriends", buy, Utils.combinedMessage(buy.getFriendsFeature().getFriendNames(), messagePart));
+							}
+						} else {
+							plugin.messageNoPrefix(sender, "info-regionCanBeBought", buy);
+						}
+						if(buy.getLandlord() != null) {
+							plugin.messageNoPrefix(sender, "info-regionLandlord", buy);
+						}
+						if(buy.getInactiveTimeUntilSell() != -1) {
+							plugin.messageNoPrefix(sender, "info-regionInactiveSell", buy);
+						}
+						// Teleport
+						Message tp = Message.fromKey("info-prefix");
+						boolean foundSomething = false;
+						if(TeleportCommand.canUse(sender, buy)) {
+							foundSomething = true;
+							tp.append(Message.fromKey("info-regionTeleport").replacements(buy));
+						}
+						if(SetteleportCommand.canUse(sender, buy)) {
+							if(foundSomething) {
+								tp.append(", ");
+							}
+							foundSomething = true;
+							tp.append(Message.fromKey("info-setRegionTeleport").replacements(buy));
+						}
+						if(foundSomething) {
+							tp.append(".");
+							tp.send(sender);
+						}
+						// Signs
+						List<String> signLocations = new ArrayList<>();
+						for(Location location : buy.getSignsFeature().getSignLocations()) {
+							signLocations.add(Message.fromKey("info-regionSignLocation").replacements(location.getWorld().getName(), location.getBlockX(), location.getBlockY(), location.getBlockZ()).getPlain());
+						}
+						if(!signLocations.isEmpty()) {
+							plugin.messageNoPrefix(sender, "info-regionSigns", Utils.createCommaSeparatedList(signLocations));
+						}
+						// Groups
+						if(sender.hasPermission("areashop.groupinfo") && !buy.getGroupNames().isEmpty()) {
+							plugin.messageNoPrefix(sender, "info-regionGroups", Utils.createCommaSeparatedList(buy.getGroupNames()));
+						}
+						// Restoring
+						if(buy.isRestoreEnabled()) {
+							plugin.messageNoPrefix(sender, "info-regionRestoringBuy", buy);
+						}
+						// Restrictions
+						if(!buy.isSold()) {
+							if(buy.restrictedToRegion()) {
+								plugin.messageNoPrefix(sender, "info-regionRestrictedRegionBuy", buy);
+							} else if(buy.restrictedToWorld()) {
+								plugin.messageNoPrefix(sender, "info-regionRestrictedWorldBuy", buy);
+							}
+						}
+						plugin.messageNoPrefix(sender, "info-regionFooterBuy", buy);
+					}
+				} else {
+					plugin.message(sender, "info-regionHelp");
+				}
+			} else {
+				plugin.message(sender, "info-help");
+			}
+		} else {
+			plugin.message(sender, "info-help");
+		}
+	}
+
+	@Override
+	public List<String> getTabCompleteList(int toComplete, String[] start, CommandSender sender) {
+		List<String> result = new ArrayList<>();
+		if(toComplete == 2) {
+			result.addAll(Arrays.asList("all", "rented", "forrent", "sold", "forsale", "player", "region", "nogroup", "reselling"));
+		} else if(toComplete == 3) {
+			if(start[2].equalsIgnoreCase("player")) {
+				for(Player player : Utils.getOnlinePlayers()) {
+					result.add(player.getName());
+				}
+			} else if(start[2].equalsIgnoreCase("region")) {
+				result.addAll(plugin.getFileManager().getBuyNames());
+				result.addAll(plugin.getFileManager().getRentNames());
+			}
+		}
+		return result;
+	}
+}
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+

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

@@ -1,81 +1,87 @@
-package nl.evolutioncoding.areashop.commands;
-
-import nl.evolutioncoding.areashop.AreaShop;
-import nl.evolutioncoding.areashop.Utils;
-import org.bukkit.command.CommandSender;
-import org.bukkit.entity.Player;
-
-import java.util.ArrayList;
-import java.util.List;
-import java.util.Set;
-
-public class LinksignsCommand extends CommandAreaShop {
-
-	public LinksignsCommand(AreaShop plugin) {
-		super(plugin);
-	}
-	
-	@Override
-	public String getCommandStart() {
-		return "areashop linksigns";
-	}
-	
-	@Override
-	public String getHelp(CommandSender target) {
-		if(target.hasPermission("areashop.linksigns")) {
-			return plugin.getLanguageManager().getLang("help-linksigns");
-		}
-		return null;
-	}
-
-	@Override
-	public void execute(CommandSender sender, String[] args) {
-		if(!sender.hasPermission("areashop.linksigns")) {
-			plugin.message(sender, "linksigns-noPermission");
-			return;
-		}		
-		if (!(sender instanceof Player)) {
-			plugin.message(sender, "cmd-onlyByPlayer");
-			return;
-		}
-		
-		Player player = (Player)sender;
-		if(plugin.getSignlinkerManager().isInSignLinkMode(player)) {
-			plugin.getSignlinkerManager().exitSignLinkMode(player);
-		} else {
-			// Get the profile
-			String profile = null;
-			if(args.length > 1) {
-				profile = args[1];
-				Set<String> profiles = plugin.getConfig().getConfigurationSection("signProfiles").getKeys(false);
-				if(!profiles.contains(profile)) {
-					plugin.message(sender, "addsign-wrongProfile", Utils.createCommaSeparatedList(profiles));
-					return;
-				}
-			}
-			plugin.getSignlinkerManager().enterSignLinkMode(player, profile);
-		}
-	}
-	
-	@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;
-	}
-
-}
-
-
-
-
-
-
-
-
-
-
+package me.wiefferink.areashop.commands;
+
+import me.wiefferink.interactivemessenger.processing.Message;
+import org.bukkit.command.CommandSender;
+import org.bukkit.configuration.ConfigurationSection;
+import org.bukkit.entity.Player;
+
+import java.util.ArrayList;
+import java.util.List;
+import java.util.Set;
+
+public class LinksignsCommand extends CommandAreaShop {
+
+	@Override
+	public String getCommandStart() {
+		return "areashop linksigns";
+	}
+
+	@Override
+	public String getHelp(CommandSender target) {
+		if(target.hasPermission("areashop.linksigns")) {
+			return "help-linksigns";
+		}
+		return null;
+	}
+
+	@Override
+	public void execute(CommandSender sender, String[] args) {
+		if(!sender.hasPermission("areashop.linksigns")) {
+			plugin.message(sender, "linksigns-noPermission");
+			return;
+		}
+		if(!(sender instanceof Player)) {
+			plugin.message(sender, "cmd-onlyByPlayer");
+			return;
+		}
+
+		Player player = (Player)sender;
+		if(plugin.getSignlinkerManager().isInSignLinkMode(player)) {
+			plugin.getSignlinkerManager().exitSignLinkMode(player);
+		} else {
+			// Get the profile
+			String profile = null;
+			if(args.length > 1) {
+				profile = args[1];
+				ConfigurationSection signProfilesSection = plugin.getConfig().getConfigurationSection("signProfiles");
+				if(signProfilesSection != null) {
+					Set<String> profiles = signProfilesSection.getKeys(false);
+					if(!profiles.contains(profile)) {
+						ArrayList<String> message = new ArrayList<>();
+						for(String p : profiles) {
+							if(!message.isEmpty()) {
+								message.add(", ");
+							}
+							message.addAll(Message.fromKey("addsign-profile").replacements(p).get());
+						}
+						plugin.message(sender, "addsign-wrongProfile", Message.fromList(message));
+						return;
+					}
+				}
+			}
+			plugin.getSignlinkerManager().enterSignLinkMode(player, profile);
+		}
+	}
+
+	@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/MeCommand.java

@@ -0,0 +1,143 @@
+package me.wiefferink.areashop.commands;
+
+import me.wiefferink.areashop.regions.BuyRegion;
+import me.wiefferink.areashop.regions.LegacyGeneralRegion;
+import me.wiefferink.areashop.regions.RentRegion;
+import me.wiefferink.areashop.tools.Utils;
+import org.bukkit.Bukkit;
+import org.bukkit.OfflinePlayer;
+import org.bukkit.command.CommandSender;
+import org.bukkit.entity.Player;
+
+import java.util.ArrayList;
+import java.util.HashSet;
+import java.util.List;
+import java.util.Set;
+
+public class MeCommand extends CommandAreaShop {
+
+	@Override
+	public String getCommandStart() {
+		return "areashop me";
+	}
+
+	@Override
+	public String getHelp(CommandSender target) {
+		if(target.hasPermission("areashop.me")) {
+			return "help-me";
+		}
+		return null;
+	}
+
+	@Override
+	public void execute(CommandSender sender, String[] args) {
+		if(!sender.hasPermission("areashop.me")) {
+			plugin.message(sender, "me-noPermission");
+			return;
+		}
+		OfflinePlayer player = null;
+		if(!(sender instanceof Player)) {
+			if(args.length <= 1) {
+				plugin.message(sender, "me-notAPlayer");
+				return;
+			}
+		} else {
+			player = (OfflinePlayer)sender;
+		}
+		if(args.length > 1) {
+			player = Bukkit.getOfflinePlayer(args[1]);
+			if(player == null) {
+				plugin.message(sender, "me-noPlayer", args[1]);
+				return;
+			}
+		}
+		if(player == null) {
+			return;
+		}
+
+		// Get the regions owned by the player
+		Set<RentRegion> rentRegions = new HashSet<>();
+		for(RentRegion region : plugin.getFileManager().getRents()) {
+			if(region.isOwner(player)) {
+				rentRegions.add(region);
+			}
+		}
+		Set<BuyRegion> buyRegions = new HashSet<>();
+		for(BuyRegion region : plugin.getFileManager().getBuys()) {
+			if(region.isOwner(player)) {
+				buyRegions.add(region);
+			}
+		}
+		// Get the regions the player is added as friend
+		Set<LegacyGeneralRegion> friendRegions = new HashSet<>();
+		for(LegacyGeneralRegion region : plugin.getFileManager().getRegions()) {
+			if(region.getFriendsFeature().getFriends().contains(player.getUniqueId())) {
+				friendRegions.add(region);
+			}
+		}
+
+		// Send messages
+		boolean foundSome = !rentRegions.isEmpty() || !buyRegions.isEmpty() || !friendRegions.isEmpty();
+		if(foundSome) {
+			plugin.message(sender, "me-header", player.getName());
+		}
+		if(!rentRegions.isEmpty()) {
+			for(RentRegion region : rentRegions) {
+				plugin.messageNoPrefix(sender, "me-rentLine", region);
+			}
+		}
+		if(!buyRegions.isEmpty()) {
+			for(BuyRegion region : buyRegions) {
+				plugin.messageNoPrefix(sender, "me-buyLine", region);
+			}
+		}
+		if(!friendRegions.isEmpty()) {
+			for(LegacyGeneralRegion region : friendRegions) {
+				plugin.messageNoPrefix(sender, "me-friendLine", region);
+			}
+		}
+
+		if(!foundSome) {
+			plugin.message(sender, "me-nothing", player.getName());
+		} else {
+			plugin.messageNoPrefix(sender, "me-clickHint");
+		}
+	}
+
+	@Override
+	public List<String> getTabCompleteList(int toComplete, String[] start, CommandSender sender) {
+		ArrayList<String> result = new ArrayList<>();
+		if(toComplete == 2) {
+			for(Player player : Utils.getOnlinePlayers()) {
+				result.add(player.getName());
+			}
+		}
+		return result;
+	}
+}
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+

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

@@ -0,0 +1,72 @@
+package me.wiefferink.areashop.commands;
+
+import me.wiefferink.areashop.tools.Utils;
+import me.wiefferink.interactivemessenger.processing.Message;
+import org.apache.commons.lang.StringUtils;
+import org.bukkit.Bukkit;
+import org.bukkit.command.CommandSender;
+import org.bukkit.entity.Player;
+
+import java.util.ArrayList;
+import java.util.List;
+
+public class MessageCommand extends CommandAreaShop {
+
+	@Override
+	public String getCommandStart() {
+		return "areashop message";
+	}
+
+	@Override
+	public String getHelp(CommandSender target) {
+		// Internal command, no need to show in the help list
+		return null;
+	}
+
+	@Override
+	public void execute(final CommandSender sender, final String[] args) {
+		if(!sender.hasPermission("areashop.message")) {
+			plugin.message(sender, "message-noPermission");
+			return;
+		}
+
+		if(args.length < 3) {
+			plugin.message(sender, "message-help");
+			return;
+		}
+
+		Player player = Bukkit.getPlayer(args[1]);
+		if(player == null) {
+			plugin.message(sender, "message-notOnline", args[1]);
+			return;
+		}
+
+		String[] messageArgs = new String[args.length - 2];
+		System.arraycopy(args, 2, messageArgs, 0, args.length - 2);
+		String message = StringUtils.join(messageArgs, " ");
+
+		Message.fromString(message).send(player);
+	}
+
+	@Override
+	public List<String> getTabCompleteList(int toComplete, String[] start, CommandSender sender) {
+		List<String> result = new ArrayList<>();
+		if(toComplete == 2) {
+			for(Player player : Utils.getOnlinePlayers()) {
+				result.add(player.getName());
+			}
+		}
+		return result;
+	}
+
+}
+
+
+
+
+
+
+
+
+
+

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

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

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

@@ -1,34 +1,29 @@
-package nl.evolutioncoding.areashop.commands;
-
-import nl.evolutioncoding.areashop.AreaShop;
-import org.bukkit.command.CommandSender;
-
-public class ReloadCommand extends CommandAreaShop {
-
-	public ReloadCommand(AreaShop plugin) {
-		super(plugin);
-	}
-	
-	@Override
-	public String getCommandStart() {
-		return "areashop reload";
-	}
-	
-	@Override
-	public String getHelp(CommandSender target) {
-		if(target.hasPermission("areashop.reload")) {
-			return plugin.getLanguageManager().getLang("help-reload");
-		}
-		return null;
-	}
-
-	@Override
-	public void execute(CommandSender sender, String[] args) {
-		if(sender.hasPermission("areashop.reload")) {
-			// Reload the configuration files and update all region flags/signs
-			plugin.reload(sender);
-		} else {
-			plugin.message(sender, "reload-noPermission");
-		}
-	}
-}
+package me.wiefferink.areashop.commands;
+
+import org.bukkit.command.CommandSender;
+
+public class ReloadCommand extends CommandAreaShop {
+
+	@Override
+	public String getCommandStart() {
+		return "areashop reload";
+	}
+
+	@Override
+	public String getHelp(CommandSender target) {
+		if(target.hasPermission("areashop.reload")) {
+			return "help-reload";
+		}
+		return null;
+	}
+
+	@Override
+	public void execute(CommandSender sender, String[] args) {
+		if(sender.hasPermission("areashop.reload")) {
+			// Reload the configuration files and update all region flags/signs
+			plugin.reload(sender);
+		} else {
+			plugin.message(sender, "reload-noPermission");
+		}
+	}
+}

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

@@ -1,8 +1,7 @@
-package nl.evolutioncoding.areashop.commands;
+package me.wiefferink.areashop.commands;
 
-import nl.evolutioncoding.areashop.AreaShop;
-import nl.evolutioncoding.areashop.Utils;
-import nl.evolutioncoding.areashop.regions.RentRegion;
+import me.wiefferink.areashop.regions.RentRegion;
+import me.wiefferink.areashop.tools.Utils;
 import org.bukkit.command.CommandSender;
 import org.bukkit.entity.Player;
 
@@ -11,10 +10,6 @@ import java.util.List;
 
 public class RentCommand extends CommandAreaShop {
 
-	public RentCommand(AreaShop plugin) {
-		super(plugin);
-	}
-	
 	@Override
 	public String getCommandStart() {
 		return "areashop rent";
@@ -23,49 +18,49 @@ public class RentCommand extends CommandAreaShop {
 	@Override
 	public String getHelp(CommandSender target) {
 		if(target.hasPermission("areashop.rent")) {
-			return plugin.getLanguageManager().getLang("help-rent");
+			return "help-rent";
 		}
 		return null;
 	}
-	
+
 	@Override
 	public void execute(CommandSender sender, String[] args) {
 		if(!sender.hasPermission("areashop.rent")) {
 			plugin.message(sender, "rent-noPermission");
 			return;
 		}
-		if (!(sender instanceof Player)) {
+		if(!(sender instanceof Player)) {
 			plugin.message(sender, "cmd-onlyByPlayer");
 			return;
-		}					
+		}
 		Player player = (Player)sender;
 		if(args.length > 1 && args[1] != null) {
 			RentRegion rent = plugin.getFileManager().getRent(args[1]);
 			if(rent == null) {
-				plugin.message(sender, "rent-notRentable");
+				plugin.message(sender, "rent-notRentable", args[1]);
 			} else {
 				rent.rent(player);
 			}
 		} else {
 			// get the region by location
-			List<RentRegion> regions = Utils.getApplicableRentRegions(((Player) sender).getLocation());
-			if (regions.isEmpty()) {
+			List<RentRegion> regions = Utils.getImportantRentRegions(((Player)sender).getLocation());
+			if(regions.isEmpty()) {
 				plugin.message(sender, "cmd-noRegionsAtLocation");
-			} else if (regions.size() > 1) {
+			} else if(regions.size() > 1) {
 				plugin.message(sender, "cmd-moreRegionsAtLocation");
 			} else {
 				regions.get(0).rent(player);
-			}	
-		}	
+			}
+		}
 	}
-	
+
 	@Override
 	public List<String> getTabCompleteList(int toComplete, String[] start, CommandSender sender) {
 		ArrayList<String> result = new ArrayList<>();
 		if(toComplete == 2) {
 			for(RentRegion region : plugin.getFileManager().getRents()) {
 				if(!region.isRented()) {
-					result.add(region.getName());
+					result.add(region.getRegionId());
 				}
 			}
 		}

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

@@ -1,8 +1,7 @@
-package nl.evolutioncoding.areashop.commands;
+package me.wiefferink.areashop.commands;
 
-import nl.evolutioncoding.areashop.AreaShop;
-import nl.evolutioncoding.areashop.Utils;
-import nl.evolutioncoding.areashop.regions.BuyRegion;
+import me.wiefferink.areashop.regions.BuyRegion;
+import me.wiefferink.areashop.tools.Utils;
 import org.bukkit.command.CommandSender;
 import org.bukkit.entity.Player;
 
@@ -11,10 +10,6 @@ import java.util.List;
 
 public class ResellCommand extends CommandAreaShop {
 
-	public ResellCommand(AreaShop plugin) {
-		super(plugin);
-	}	
-	
 	@Override
 	public String getCommandStart() {
 		return "areashop resell";
@@ -22,21 +17,19 @@ public class ResellCommand extends CommandAreaShop {
 
 	@Override
 	public String getHelp(CommandSender target) {
-		if(target.hasPermission("areashop.resellall")) {
-			return plugin.getLanguageManager().getLang("help-resellAll");
-		} else if(target.hasPermission("areashop.resell")) {
-			return plugin.getLanguageManager().getLang("help-resell");
+		if(target.hasPermission("areashop.resellall") || target.hasPermission("areashop.resell")) {
+			return "help-resell";
 		}
 		return null;
 	}
-	
+
 	@Override
 	public void execute(CommandSender sender, String[] args) {
 		if(!sender.hasPermission("areashop.resell") && !sender.hasPermission("areashop.resellall")) {
 			plugin.message(sender, "resell-noPermissionOther");
 			return;
 		}
-		
+
 		if(args.length <= 1) {
 			plugin.message(sender, "resell-help");
 			return;
@@ -48,15 +41,21 @@ public class ResellCommand extends CommandAreaShop {
 			plugin.message(sender, "resell-wrongPrice", args[1]);
 			return;
 		}
+
+		if(price < 0) {
+			plugin.message(sender, "resell-wrongPrice", args[1]);
+			return;
+		}
+
 		BuyRegion buy;
 		if(args.length <= 2) {
-			if (sender instanceof Player) {
+			if(sender instanceof Player) {
 				// get the region by location
-				List<BuyRegion> regions = Utils.getApplicableBuyRegions(((Player) sender).getLocation());
-				if (regions.isEmpty()) {
+				List<BuyRegion> regions = Utils.getImportantBuyRegions(((Player)sender).getLocation());
+				if(regions.isEmpty()) {
 					plugin.message(sender, "cmd-noRegionsAtLocation");
 					return;
-				} else if (regions.size() > 1) {
+				} else if(regions.size() > 1) {
 					plugin.message(sender, "cmd-moreRegionsAtLocation");
 					return;
 				} else {
@@ -65,7 +64,7 @@ public class ResellCommand extends CommandAreaShop {
 			} else {
 				plugin.message(sender, "cmd-automaticRegionOnlyByPlayer");
 				return;
-			}		
+			}
 		} else {
 			buy = plugin.getFileManager().getBuy(args[2]);
 			if(buy == null) {
@@ -74,7 +73,7 @@ public class ResellCommand extends CommandAreaShop {
 			}
 		}
 		if(buy == null) {
-			plugin.message(sender, "resell-noRegionFound");
+			plugin.message(sender, "cmd-noRegionsAtLocation");
 			return;
 		}
 		if(!buy.isSold()) {
@@ -86,25 +85,31 @@ public class ResellCommand extends CommandAreaShop {
 			buy.update();
 			plugin.message(sender, "resell-success", buy);
 		} else if(sender.hasPermission("areashop.resell") && sender instanceof Player) {
-			if(buy.isOwner((Player)sender)) {
-				buy.enableReselling(price);
-				buy.update();
-				plugin.message(sender, "resell-success", buy);
-			} else {
+			if(!buy.isOwner((Player)sender)) {
 				plugin.message(sender, "resell-noPermissionOther", buy);
+				return;
 			}
+
+			if(buy.getBooleanSetting("buy.resellDisabled")) {
+				plugin.message(sender, "resell-disabled", buy);
+				return;
+			}
+
+			buy.enableReselling(price);
+			buy.update();
+			plugin.message(sender, "resell-success", buy);
 		} else {
 			plugin.message(sender, "resell-noPermission", buy);
-		}	
+		}
 	}
-	
+
 	@Override
 	public List<String> getTabCompleteList(int toComplete, String[] start, CommandSender sender) {
 		ArrayList<String> result = new ArrayList<>();
 		if(toComplete == 3) {
 			for(BuyRegion region : plugin.getFileManager().getBuys()) {
 				if(region.isSold() && !region.isInResellingMode()) {
-					result.add(region.getName());
+					result.add(region.getRegionId());
 				}
 			}
 		}

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

@@ -1,9 +1,10 @@
-package nl.evolutioncoding.areashop.commands;
+package me.wiefferink.areashop.commands;
 
-import nl.evolutioncoding.areashop.AreaShop;
-import nl.evolutioncoding.areashop.Utils;
-import nl.evolutioncoding.areashop.regions.GeneralRegion;
-import nl.evolutioncoding.areashop.regions.GeneralRegion.RegionEvent;
+import me.wiefferink.areashop.regions.BuyRegion;
+import me.wiefferink.areashop.regions.LegacyGeneralRegion;
+import me.wiefferink.areashop.regions.RentRegion;
+import me.wiefferink.areashop.regions.util.RegionEvent;
+import me.wiefferink.areashop.tools.Utils;
 import org.bukkit.command.CommandSender;
 
 import java.util.ArrayList;
@@ -12,10 +13,6 @@ import java.util.List;
 
 public class SchematiceventCommand extends CommandAreaShop {
 
-	public SchematiceventCommand(AreaShop plugin) {
-		super(plugin);
-	}	
-	
 	@Override
 	public String getCommandStart() {
 		return "areashop schemevent";
@@ -24,37 +21,37 @@ public class SchematiceventCommand extends CommandAreaShop {
 	@Override
 	public String getHelp(CommandSender target) {
 		if(target.hasPermission("areashop.schematicevents")) {
-			return plugin.getLanguageManager().getLang("help-schemevent");
+			return "help-schemevent";
 		}
 		return null;
 	}
-	
+
 	@Override
 	public void execute(CommandSender sender, String[] args) {
 		if(!sender.hasPermission("areashop.schematicevents")) {
 			plugin.message(sender, "schemevent-noPermission");
 			return;
 		}
-		
+
 		if(args.length < 3 || args[1] == null || args[2] == null) {
 			plugin.message(sender, "schemevent-help");
 			return;
-		}		
-		GeneralRegion region = plugin.getFileManager().getRegion(args[1]);
+		}
+		LegacyGeneralRegion region = plugin.getFileManager().getRegion(args[1]);
 		if(region == null) {
-			plugin.message(sender, "schemevent-noRegion", args[1]);
+			plugin.message(sender, "cmd-notRegistered", args[1]);
 			return;
 		}
 		if(region.getRegion() == null) {
 			plugin.message(sender, "general-noRegion", region);
 			return;
-		}		
+		}
 		RegionEvent event = null;
 		boolean exception = false;
 		try {
 			event = RegionEvent.valueOf(args[2].toUpperCase());
 		} catch(IllegalArgumentException e) {
-			exception = true;	
+			exception = true;
 		}
 		// Check for a totally wrong event or a non matching event
 		if(exception) {
@@ -63,8 +60,8 @@ public class SchematiceventCommand extends CommandAreaShop {
 				values.add(value.getValue().toLowerCase());
 			}
 			plugin.message(sender, "schemevent-wrongEvent", args[2], Utils.createCommaSeparatedList(values), region);
-			return;	
-		}		
+			return;
+		}
 		region.handleSchematicEvent(event);
 		region.update();
 		plugin.message(sender, "schemevent-success", args[2], region);
@@ -76,11 +73,11 @@ public class SchematiceventCommand extends CommandAreaShop {
 		if(toComplete == 2) {
 			result.addAll(plugin.getFileManager().getRegionNames());
 		} else if(toComplete == 3) {
-			GeneralRegion region = plugin.getFileManager().getRegion(start[2]);
+			LegacyGeneralRegion region = plugin.getFileManager().getRegion(start[2]);
 			if(region != null) {
-				if(region.isRentRegion()) {
+				if(region instanceof RentRegion) {
 					result.addAll(Arrays.asList("created", "deleted", "rented", "unrented"));
-				} else if(region.isBuyRegion()) {
+				} else if(region instanceof BuyRegion) {
 					result.addAll(Arrays.asList("created", "deleted", "bought", "sold"));
 				}
 			}

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

@@ -1,8 +1,8 @@
-package nl.evolutioncoding.areashop.commands;
+package me.wiefferink.areashop.commands;
 
-import nl.evolutioncoding.areashop.AreaShop;
-import nl.evolutioncoding.areashop.Utils;
-import nl.evolutioncoding.areashop.regions.BuyRegion;
+import me.wiefferink.areashop.regions.BuyRegion;
+import me.wiefferink.areashop.regions.LegacyGeneralRegion;
+import me.wiefferink.areashop.tools.Utils;
 import org.bukkit.command.CommandSender;
 import org.bukkit.entity.Player;
 
@@ -11,10 +11,6 @@ import java.util.List;
 
 public class SellCommand extends CommandAreaShop {
 
-	public SellCommand(AreaShop plugin) {
-		super(plugin);
-	}	
-	
 	@Override
 	public String getCommandStart() {
 		return "areashop sell";
@@ -22,14 +18,29 @@ public class SellCommand extends CommandAreaShop {
 
 	@Override
 	public String getHelp(CommandSender target) {
-		if(target.hasPermission("areashop.sell")) {
-			return plugin.getLanguageManager().getLang("help-sell");
-		} else if(target.hasPermission("areashop.sellown")) {
-			return plugin.getLanguageManager().getLang("help-sellOwn");
+		if(target.hasPermission("areashop.sell") || target.hasPermission("areashop.sellown")) {
+			return "help-sell";
 		}
 		return null;
 	}
-	
+
+	/**
+	 * Check if a person can sell the region.
+	 * @param person The person to check
+	 * @param region The region to check for
+	 * @return true if the person can sell it, otherwise false
+	 */
+	public static boolean canUse(CommandSender person, LegacyGeneralRegion region) {
+		if(person.hasPermission("areashop.sell")) {
+			return true;
+		}
+		if(person instanceof Player) {
+			Player player = (Player)person;
+			return region.isOwner(player) && person.hasPermission("areashop.sellown");
+		}
+		return false;
+	}
+
 	@Override
 	public void execute(CommandSender sender, String[] args) {
 		if(!sender.hasPermission("areashop.sell") && !sender.hasPermission("areashop.sellown")) {
@@ -38,13 +49,13 @@ public class SellCommand extends CommandAreaShop {
 		}
 		BuyRegion buy;
 		if(args.length <= 1) {
-			if (sender instanceof Player) {
+			if(sender instanceof Player) {
 				// get the region by location
-				List<BuyRegion> regions = Utils.getApplicableBuyRegions(((Player) sender).getLocation());
-				if (regions.isEmpty()) {
+				List<BuyRegion> regions = Utils.getImportantBuyRegions(((Player)sender).getLocation());
+				if(regions.isEmpty()) {
 					plugin.message(sender, "cmd-noRegionsAtLocation");
 					return;
-				} else if (regions.size() > 1) {
+				} else if(regions.size() > 1) {
 					plugin.message(sender, "cmd-moreRegionsAtLocation");
 					return;
 				} else {
@@ -53,7 +64,7 @@ public class SellCommand extends CommandAreaShop {
 			} else {
 				plugin.message(sender, "cmd-automaticRegionOnlyByPlayer");
 				return;
-			}		
+			}
 		} else {
 			buy = plugin.getFileManager().getBuy(args[1]);
 		}
@@ -67,14 +78,14 @@ public class SellCommand extends CommandAreaShop {
 		}
 		buy.sell(true, sender);
 	}
-	
+
 	@Override
 	public List<String> getTabCompleteList(int toComplete, String[] start, CommandSender sender) {
 		ArrayList<String> result = new ArrayList<>();
 		if(toComplete == 2) {
 			for(BuyRegion region : plugin.getFileManager().getBuys()) {
 				if(region.isSold()) {
-					result.add(region.getName());
+					result.add(region.getRegionId());
 				}
 			}
 		}

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

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

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

@@ -1,8 +1,7 @@
-package nl.evolutioncoding.areashop.commands;
+package me.wiefferink.areashop.commands;
 
-import nl.evolutioncoding.areashop.AreaShop;
-import nl.evolutioncoding.areashop.Utils;
-import nl.evolutioncoding.areashop.regions.GeneralRegion;
+import me.wiefferink.areashop.regions.LegacyGeneralRegion;
+import me.wiefferink.areashop.tools.Utils;
 import org.bukkit.Bukkit;
 import org.bukkit.OfflinePlayer;
 import org.bukkit.command.CommandSender;
@@ -13,19 +12,15 @@ import java.util.List;
 
 public class SetlandlordCommand extends CommandAreaShop {
 
-	public SetlandlordCommand(AreaShop plugin) {
-		super(plugin);
-	}
-	
 	@Override
 	public String getCommandStart() {
 		return "areashop setlandlord";
 	}
-	
+
 	@Override
 	public String getHelp(CommandSender target) {
 		if(target.hasPermission("areashop.setlandlord")) {
-			return plugin.getLanguageManager().getLang("help-setlandlord");
+			return "help-setlandlord";
 		}
 		return null;
 	}
@@ -35,22 +30,22 @@ public class SetlandlordCommand extends CommandAreaShop {
 		if(!sender.hasPermission("areashop.setlandlord")) {
 			plugin.message(sender, "setlandlord-noPermission");
 			return;
-		}		
+		}
 		if(args.length < 2) {
 			plugin.message(sender, "setlandlord-help");
 			return;
 		}
 		@SuppressWarnings("deprecation")
 		OfflinePlayer player = Bukkit.getOfflinePlayer(args[1]);
-		GeneralRegion region;
+		LegacyGeneralRegion region;
 		if(args.length < 3) {
-			if (sender instanceof Player) {
+			if(sender instanceof Player) {
 				// get the region by location
-				List<GeneralRegion> regions = Utils.getAllApplicableRegions(((Player) sender).getLocation());
-				if (regions.isEmpty()) {
+				List<LegacyGeneralRegion> regions = Utils.getImportantRegions(((Player)sender).getLocation());
+				if(regions.isEmpty()) {
 					plugin.message(sender, "cmd-noRegionsAtLocation");
 					return;
-				} else if (regions.size() > 1) {
+				} else if(regions.size() > 1) {
 					plugin.message(sender, "cmd-moreRegionsAtLocation");
 					return;
 				} else {
@@ -59,14 +54,14 @@ public class SetlandlordCommand extends CommandAreaShop {
 			} else {
 				plugin.message(sender, "cmd-automaticRegionOnlyByPlayer");
 				return;
-			}		
+			}
 		} else {
 			region = plugin.getFileManager().getRegion(args[2]);
-		}	
+		}
 		if(region == null) {
-			plugin.message(sender, "setlandlord-noRegion", args[2]);
+			plugin.message(sender, "cmd-notRegistered", args[2]);
 			return;
-		}		
+		}
 		String playerName = player.getName();
 		if(playerName == null || playerName.isEmpty()) {
 			playerName = args[1];
@@ -75,7 +70,7 @@ public class SetlandlordCommand extends CommandAreaShop {
 		region.update();
 		plugin.message(sender, "setlandlord-success", playerName, region);
 	}
-	
+
 	@Override
 	public List<String> getTabCompleteList(int toComplete, String[] start, CommandSender sender) {
 		ArrayList<String> result = new ArrayList<>();

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

@@ -1,10 +1,9 @@
-package nl.evolutioncoding.areashop.commands;
+package me.wiefferink.areashop.commands;
 
-import nl.evolutioncoding.areashop.AreaShop;
-import nl.evolutioncoding.areashop.Utils;
-import nl.evolutioncoding.areashop.regions.BuyRegion;
-import nl.evolutioncoding.areashop.regions.GeneralRegion;
-import nl.evolutioncoding.areashop.regions.RentRegion;
+import me.wiefferink.areashop.regions.BuyRegion;
+import me.wiefferink.areashop.regions.LegacyGeneralRegion;
+import me.wiefferink.areashop.regions.RentRegion;
+import me.wiefferink.areashop.tools.Utils;
 import org.bukkit.Bukkit;
 import org.bukkit.OfflinePlayer;
 import org.bukkit.command.CommandSender;
@@ -17,10 +16,6 @@ import java.util.UUID;
 
 public class SetownerCommand extends CommandAreaShop {
 
-	public SetownerCommand(AreaShop plugin) {
-		super(plugin);
-	}
-	
 	@Override
 	public String getCommandStart() {
 		return "areashop setowner";
@@ -29,30 +24,30 @@ public class SetownerCommand extends CommandAreaShop {
 	@Override
 	public String getHelp(CommandSender target) {
 		if(target.hasPermission("areashop.setownerrent") || target.hasPermission("areashop.setownerbuy")) {
-			return plugin.getLanguageManager().getLang("help-setowner");
+			return "help-setowner";
 		}
 		return null;
 	}
-	
+
 	@Override
 	public void execute(CommandSender sender, String[] args) {
 		if(!sender.hasPermission("areashop.setownerrent") && !sender.hasPermission("areashop.setownerbuy")) {
 			plugin.message(sender, "setowner-noPermission");
 			return;
 		}
-		GeneralRegion region;
+		LegacyGeneralRegion region;
 		if(args.length < 2) {
 			plugin.message(sender, "setowner-help");
 			return;
-		}		
+		}
 		if(args.length == 2) {
-			if (sender instanceof Player) {
+			if(sender instanceof Player) {
 				// get the region by location
-				List<GeneralRegion> regions = Utils.getAllApplicableRegions(((Player) sender).getLocation());
-				if (regions.isEmpty()) {
+				List<LegacyGeneralRegion> regions = Utils.getImportantRegions(((Player)sender).getLocation());
+				if(regions.isEmpty()) {
 					plugin.message(sender, "cmd-noRegionsAtLocation");
 					return;
-				} else if (regions.size() > 1) {
+				} else if(regions.size() > 1) {
 					plugin.message(sender, "cmd-moreRegionsAtLocation");
 					return;
 				} else {
@@ -69,16 +64,16 @@ public class SetownerCommand extends CommandAreaShop {
 			plugin.message(sender, "setowner-notRegistered");
 			return;
 		}
-		
-		if(region.isRentRegion() && !sender.hasPermission("areashop.setownerrent")) {
+
+		if(region instanceof RentRegion && !sender.hasPermission("areashop.setownerrent")) {
 			plugin.message(sender, "setowner-noPermissionRent", region);
 			return;
 		}
-		if(region.isBuyRegion() && !sender.hasPermission("areashop.setownerbuy")) {
+		if(region instanceof BuyRegion && !sender.hasPermission("areashop.setownerbuy")) {
 			plugin.message(sender, "setowner-noPermissionBuy", region);
 			return;
 		}
-		
+
 		UUID uuid = null;
 		@SuppressWarnings("deprecation")
 		OfflinePlayer player = Bukkit.getOfflinePlayer(args[1]);
@@ -88,40 +83,34 @@ public class SetownerCommand extends CommandAreaShop {
 		if(uuid == null) {
 			plugin.message(sender, "setowner-noPlayer", args[1], region);
 			return;
-		}		
-		
-		if(region.isRentRegion()) {
+		}
+
+		if(region instanceof RentRegion) {
 			RentRegion rent = (RentRegion)region;
 			if(rent.isRenter(uuid)) {
 				// extend
-				Calendar calendar = Calendar.getInstance();
-				calendar.setTimeInMillis(rent.getRentedUntil() + rent.getDuration());
-				rent.setRentedUntil(calendar.getTimeInMillis());
+				rent.setRentedUntil(rent.getRentedUntil() + rent.getDuration());
 				rent.setRenter(uuid);
-				rent.update();
 				plugin.message(sender, "setowner-succesRentExtend", region);
 			} else {
 				// change
-				Calendar calendar = Calendar.getInstance();
-				long current = calendar.getTimeInMillis();
-				if(rent.isRented()) {
-					current = rent.getRentedUntil();
+				if(!rent.isRented()) {
+					rent.setRentedUntil(Calendar.getInstance().getTimeInMillis() + rent.getDuration());
 				}
-				calendar.setTimeInMillis(current + rent.getDuration());
-				rent.setRentedUntil(calendar.getTimeInMillis());
 				rent.setRenter(uuid);
-				rent.update();
 				plugin.message(sender, "setowner-succesRent", region);
 			}
 		}
-		if(region.isBuyRegion()) {
+		if(region instanceof BuyRegion) {
 			BuyRegion buy = (BuyRegion)region;
 			buy.setBuyer(uuid);
-			buy.update();
 			plugin.message(sender, "setowner-succesBuy", region);
 		}
+		region.getFriendsFeature().deleteFriend(region.getOwner(), null);
+		region.update();
+		region.saveRequired();
 	}
-	
+
 	@Override
 	public List<String> getTabCompleteList(int toComplete, String[] start, CommandSender sender) {
 		ArrayList<String> result = new ArrayList<>();

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

@@ -1,10 +1,9 @@
-package nl.evolutioncoding.areashop.commands;
+package me.wiefferink.areashop.commands;
 
-import nl.evolutioncoding.areashop.AreaShop;
-import nl.evolutioncoding.areashop.Utils;
-import nl.evolutioncoding.areashop.regions.BuyRegion;
-import nl.evolutioncoding.areashop.regions.GeneralRegion;
-import nl.evolutioncoding.areashop.regions.RentRegion;
+import me.wiefferink.areashop.regions.BuyRegion;
+import me.wiefferink.areashop.regions.LegacyGeneralRegion;
+import me.wiefferink.areashop.regions.RentRegion;
+import me.wiefferink.areashop.tools.Utils;
 import org.bukkit.command.CommandSender;
 import org.bukkit.entity.Player;
 
@@ -13,19 +12,15 @@ import java.util.List;
 
 public class SetpriceCommand extends CommandAreaShop {
 
-	public SetpriceCommand(AreaShop plugin) {
-		super(plugin);
-	}
-	
 	@Override
 	public String getCommandStart() {
 		return "areashop setprice";
 	}
-	
+
 	@Override
 	public String getHelp(CommandSender target) {
 		if(target.hasPermission("areashop.setprice")) {
-			return plugin.getLanguageManager().getLang("help-setprice");
+			return "help-setprice";
 		}
 		return null;
 	}
@@ -35,20 +30,20 @@ public class SetpriceCommand extends CommandAreaShop {
 		if(!sender.hasPermission("areashop.setprice") && (!sender.hasPermission("areashop.setprice.landlord") && sender instanceof Player)) {
 			plugin.message(sender, "setprice-noPermission");
 			return;
-		}		
+		}
 		if(args.length < 2 || args[1] == null) {
 			plugin.message(sender, "setprice-help");
 			return;
 		}
-		GeneralRegion region;
+		LegacyGeneralRegion region;
 		if(args.length < 3) {
-			if (sender instanceof Player) {
+			if(sender instanceof Player) {
 				// get the region by location
-				List<GeneralRegion> regions = Utils.getAllApplicableRegions(((Player) sender).getLocation());
-				if (regions.isEmpty()) {
+				List<LegacyGeneralRegion> regions = Utils.getImportantRegions(((Player)sender).getLocation());
+				if(regions.isEmpty()) {
 					plugin.message(sender, "cmd-noRegionsAtLocation");
 					return;
-				} else if (regions.size() > 1) {
+				} else if(regions.size() > 1) {
 					plugin.message(sender, "cmd-moreRegionsAtLocation");
 					return;
 				} else {
@@ -57,10 +52,10 @@ public class SetpriceCommand extends CommandAreaShop {
 			} else {
 				plugin.message(sender, "cmd-automaticRegionOnlyByPlayer");
 				return;
-			}		
+			}
 		} else {
 			region = plugin.getFileManager().getRegion(args[2]);
-		}		
+		}
 		if(region == null) {
 			plugin.message(sender, "setprice-notRegistered", args[2]);
 			return;
@@ -70,10 +65,10 @@ public class SetpriceCommand extends CommandAreaShop {
 			return;
 		}
 		if("default".equalsIgnoreCase(args[1]) || "reset".equalsIgnoreCase(args[1])) {
-			if(region.isRentRegion()) {
-				((RentRegion)region).removePrice();
-			} else if(region.isBuyRegion()) {
-				((BuyRegion)region).removePrice();
+			if(region instanceof RentRegion) {
+				((RentRegion)region).setPrice(null);
+			} else if(region instanceof BuyRegion) {
+				((BuyRegion)region).setPrice(null);
 			}
 			region.update();
 			plugin.message(sender, "setprice-successRemoved", region);
@@ -86,21 +81,21 @@ public class SetpriceCommand extends CommandAreaShop {
 			plugin.message(sender, "setprice-wrongPrice", args[1], region);
 			return;
 		}
-		if(region.isRentRegion()) {
+		if(region instanceof RentRegion) {
 			((RentRegion)region).setPrice(price);
 			plugin.message(sender, "setprice-successRent", region);
-		} else if(region.isBuyRegion()) {
+		} else if(region instanceof BuyRegion) {
 			((BuyRegion)region).setPrice(price);
 			plugin.message(sender, "setprice-successBuy", region);
 		}
 		region.update();
 	}
-	
+
 	@Override
 	public List<String> getTabCompleteList(int toComplete, String[] start, CommandSender sender) {
 		List<String> result = new ArrayList<>();
 		if(toComplete == 3) {
-			result = plugin.getFileManager().getRegionNames();		
+			result = plugin.getFileManager().getRegionNames();
 		}
 		return result;
 	}

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

@@ -1,7 +1,6 @@
-package nl.evolutioncoding.areashop.commands;
+package me.wiefferink.areashop.commands;
 
-import nl.evolutioncoding.areashop.AreaShop;
-import nl.evolutioncoding.areashop.regions.GeneralRegion;
+import me.wiefferink.areashop.regions.LegacyGeneralRegion;
 import org.bukkit.command.CommandSender;
 
 import java.util.ArrayList;
@@ -9,19 +8,15 @@ import java.util.List;
 
 public class SetrestoreCommand extends CommandAreaShop {
 
-	public SetrestoreCommand(AreaShop plugin) {
-		super(plugin);
-	}
-	
 	@Override
 	public String getCommandStart() {
 		return "areashop setrestore";
 	}
-	
+
 	@Override
 	public String getHelp(CommandSender target) {
 		if(target.hasPermission("areashop.setrestore")) {
-			return plugin.getLanguageManager().getLang("help-setrestore");
+			return "help-setrestore";
 		}
 		return null;
 	}
@@ -36,7 +31,7 @@ public class SetrestoreCommand extends CommandAreaShop {
 			plugin.message(sender, "setrestore-help");
 			return;
 		}
-		GeneralRegion region = plugin.getFileManager().getRegion(args[1]);
+		LegacyGeneralRegion region = plugin.getFileManager().getRegion(args[1]);
 		if(region == null) {
 			plugin.message(sender, "setrestore-notRegistered", args[1]);
 			return;
@@ -50,7 +45,7 @@ public class SetrestoreCommand extends CommandAreaShop {
 		region.setRestoreSetting(value);
 		String valueString = "general";
 		if(value != null) {
-			valueString = value+"";
+			valueString = value + "";
 		}
 		if(args.length > 3) {
 			region.setSchematicProfile(args[3]);
@@ -60,7 +55,7 @@ public class SetrestoreCommand extends CommandAreaShop {
 		}
 		region.update();
 	}
-	
+
 	@Override
 	public List<String> getTabCompleteList(int toComplete, String[] start, CommandSender sender) {
 		List<String> result = new ArrayList<>();

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

@@ -1,11 +1,10 @@
-package nl.evolutioncoding.areashop.commands;
+package me.wiefferink.areashop.commands;
 
 import com.sk89q.worldguard.protection.regions.ProtectedRegion;
-import nl.evolutioncoding.areashop.AreaShop;
-import nl.evolutioncoding.areashop.Utils;
-import nl.evolutioncoding.areashop.regions.BuyRegion;
-import nl.evolutioncoding.areashop.regions.GeneralRegion;
-import nl.evolutioncoding.areashop.regions.RentRegion;
+import me.wiefferink.areashop.regions.BuyRegion;
+import me.wiefferink.areashop.regions.LegacyGeneralRegion;
+import me.wiefferink.areashop.regions.RentRegion;
+import me.wiefferink.areashop.tools.Utils;
 import org.bukkit.command.CommandSender;
 import org.bukkit.entity.Player;
 
@@ -14,40 +13,49 @@ import java.util.List;
 
 public class SetteleportCommand extends CommandAreaShop {
 
-	public SetteleportCommand(AreaShop plugin) {
-		super(plugin);
-	}
-	
 	@Override
 	public String getCommandStart() {
 		return "areashop settp";
 	}
-	
+
 	@Override
 	public String getHelp(CommandSender target) {
-		if(target.hasPermission("areashop.teleportall")) {
-			return plugin.getLanguageManager().getLang("help-setteleportAll");
-		} else if(target.hasPermission("areashop.teleport")) {
-			return plugin.getLanguageManager().getLang("help-setteleport");
+		if(target.hasPermission("areashop.setteleportall") || target.hasPermission("areashop.setteleport")) {
+			return "help-setteleport";
 		}
 		return null;
 	}
 
+	/**
+	 * Check if a person can set the teleport location of the region.
+	 * @param person The person to check
+	 * @param region The region to check for
+	 * @return true if the person can set the teleport location, otherwise false
+	 */
+	public static boolean canUse(CommandSender person, LegacyGeneralRegion region) {
+		if(!(person instanceof Player)) {
+			return false;
+		}
+		Player player = (Player)person;
+		return player.hasPermission("areashop.setteleportall")
+				|| region.isOwner(player) && player.hasPermission("areashop.setteleport");
+	}
+
 	@Override
 	public void execute(CommandSender sender, String[] args) {
 		if(!sender.hasPermission("areashop.setteleport") && !sender.hasPermission("areashop.setteleportall")) {
 			plugin.message(sender, "setteleport-noPermission");
 			return;
 		}
-		if (!(sender instanceof Player)) {
+		if(!(sender instanceof Player)) {
 			plugin.message(sender, "onlyByPlayer");
 			return;
 		}
 		Player player = (Player)sender;
-		GeneralRegion region;
+		LegacyGeneralRegion region;
 		if(args.length < 2) {
 			// get the region by location
-			List<GeneralRegion> regions = Utils.getAllApplicableRegions(((Player)sender).getLocation());
+			List<LegacyGeneralRegion> regions = Utils.getImportantRegions(((Player)sender).getLocation());
 			if(regions.isEmpty()) {
 				plugin.message(sender, "cmd-noRegionsAtLocation");
 				return;
@@ -62,12 +70,12 @@ public class SetteleportCommand extends CommandAreaShop {
 		}
 
 		boolean owner;
-		
+
 		if(region == null) {
 			plugin.message(player, "setteleport-noRentOrBuy", args[1]);
 			return;
 		}
-		if(region.isRentRegion()) {
+		if(region instanceof RentRegion) {
 			owner = player.getUniqueId().equals(((RentRegion)region).getRenter());
 		} else {
 			owner = player.getUniqueId().equals(((BuyRegion)region).getBuyer());
@@ -82,7 +90,7 @@ public class SetteleportCommand extends CommandAreaShop {
 
 		ProtectedRegion wgRegion = region.getRegion();
 		if(args.length > 2 && args[2] != null && (args[2].equalsIgnoreCase("reset") || args[2].equalsIgnoreCase("yes") || args[2].equalsIgnoreCase("true"))) {
-			region.setTeleport(null);
+			region.getTeleportFeature().setTeleport(null);
 			region.update();
 			plugin.message(player, "setteleport-reset", region);
 			return;
@@ -91,11 +99,11 @@ public class SetteleportCommand extends CommandAreaShop {
 			plugin.message(player, "setteleport-notInside", region);
 			return;
 		}
-		region.setTeleport(player.getLocation());
+		region.getTeleportFeature().setTeleport(player.getLocation());
 		region.update();
 		plugin.message(player, "setteleport-success", region);
 	}
-	
+
 	@Override
 	public List<String> getTabCompleteList(int toComplete, String[] start, CommandSender sender) {
 		ArrayList<String> result = new ArrayList<>();

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

@@ -0,0 +1,264 @@
+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.events.ask.AddingRegionEvent;
+import me.wiefferink.areashop.interfaces.WorldEditSelection;
+import me.wiefferink.areashop.regions.BuyRegion;
+import me.wiefferink.areashop.regions.LegacyGeneralRegion;
+import me.wiefferink.areashop.regions.RegionGroup;
+import me.wiefferink.areashop.regions.RentRegion;
+import me.wiefferink.areashop.regions.util.RegionEvent;
+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.scheduler.BukkitRunnable;
+import org.bukkit.util.Vector;
+
+import java.util.ArrayList;
+import java.util.List;
+
+public class StackCommand extends CommandAreaShop {
+
+	@Override
+	public String getCommandStart() {
+		return "areashop stack";
+	}
+
+	@Override
+	public String getHelp(CommandSender target) {
+		if(target.hasPermission("areashop.stack")) {
+			return "help-stack";
+		}
+		return null;
+	}
+
+	@Override
+	public void execute(CommandSender sender, String[] args) {
+		// Check permission
+		if(!sender.hasPermission("areashop.stack")) {
+			plugin.message(sender, "stack-noPermission");
+			return;
+		}
+		// Only from ingame
+		if(!(sender instanceof Player)) {
+			plugin.message(sender, "cmd-onlyByPlayer");
+			return;
+		}
+		final Player player = (Player)sender;
+		// Specify enough arguments
+		if(args.length < 5) {
+			plugin.message(sender, "stack-help");
+			return;
+		}
+		// Check amount
+		int tempAmount = -1;
+		try {
+			tempAmount = Integer.parseInt(args[1]);
+		} catch(NumberFormatException e) {
+			// Incorrect number
+		}
+		if(tempAmount <= 0) {
+			plugin.message(player, "stack-wrongAmount", args[1]);
+			return;
+		}
+		// Check gap
+		int gap;
+		try {
+			gap = Integer.parseInt(args[2]);
+		} catch(NumberFormatException e) {
+			plugin.message(player, "stack-wrongGap", args[2]);
+			return;
+		}
+		// Check region type
+		if(!"rent".equalsIgnoreCase(args[4]) && !"buy".equalsIgnoreCase(args[4])) {
+			plugin.message(sender, "stack-help");
+			return;
+		}
+		// Get WorldEdit selection
+		final WorldEditSelection selection = plugin.getWorldEditHandler().getPlayerSelection(player);
+		if(selection == null) {
+			plugin.message(player, "stack-noSelection");
+			return;
+		}
+		// Get or create group
+		RegionGroup group = null;
+		if(args.length > 5) {
+			group = plugin.getFileManager().getGroup(args[5]);
+			if(group == null) {
+				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)
+		BlockFace facing = Utils.yawToFacing(player.getLocation().getYaw());
+		if(player.getLocation().getPitch() > 45) {
+			facing = BlockFace.DOWN;
+		} else if(player.getLocation().getPitch() < -45) {
+			facing = BlockFace.UP;
+		}
+		if(!(facing == BlockFace.NORTH || facing == BlockFace.EAST || facing == BlockFace.SOUTH || facing == BlockFace.WEST || facing == BlockFace.UP || facing == BlockFace.DOWN)) {
+			plugin.message(player, "stack-unclearDirection", facing.toString().toLowerCase().replace('_', '-'));
+			return;
+		}
+		Vector shift = new Vector(0, 0, 0);
+		if(facing == BlockFace.SOUTH) {
+			shift = shift.setZ(-selection.getLength() - gap);
+		} else if(facing == BlockFace.WEST) {
+			shift = shift.setX(selection.getWidth() + gap);
+		} else if(facing == BlockFace.NORTH) {
+			shift = shift.setZ(selection.getLength() + gap);
+		} else if(facing == BlockFace.EAST) {
+			shift = shift.setX(-selection.getWidth() - gap);
+		} else if(facing == BlockFace.DOWN) {
+			shift = shift.setY(-selection.getHeight() - gap);
+		} else if(facing == BlockFace.UP) {
+			shift = shift.setY(selection.getHeight() + gap);
+		}
+		AreaShop.debug("  calculated shift vector: " + shift + ", with facing=" + facing);
+		// Create regions and add them to AreaShop
+		final String nameTemplate = args[3];
+
+
+		final int regionsPerTick = plugin.getConfig().getInt("adding.regionsPerTick");
+		final boolean rentRegions = "rent".equalsIgnoreCase(args[4]);
+		final int amount = tempAmount;
+		final RegionGroup finalGroup = group;
+		final Vector finalShift = shift;
+		String type;
+		if(rentRegions) {
+			type = "rent";
+		} else {
+			type = "buy";
+		}
+		Message groupsMessage = Message.empty();
+		if(group != null) {
+			groupsMessage = Message.fromKey("stack-addToGroup").replacements(group.getName());
+		}
+		plugin.message(player, "stack-accepted", amount, type, gap, nameTemplate, groupsMessage);
+		plugin.message(player, "stack-addStart", amount, regionsPerTick * 20);
+
+		Location minimumLocation = selection.getMinimumLocation();
+		Vector minimumVector = new Vector(minimumLocation.getX(), minimumLocation.getY(), minimumLocation.getZ());
+		Location maximumLocation = selection.getMaximumLocation();
+		Vector maximumVector = new Vector(maximumLocation.getX(), maximumLocation.getY(), maximumLocation.getZ());
+		new BukkitRunnable() {
+			private int current = -1;
+			private final RegionManager manager = AreaShop.getInstance().getRegionManager(selection.getWorld());
+			private int counter = 1;
+			private int tooLow = 0;
+			private int tooHigh = 0;
+
+			@Override
+			public void run() {
+				for(int i = 0; i < regionsPerTick; i++) {
+					current++;
+					if(current < amount) {
+						// Create the region name
+						String regionName = countToName(nameTemplate, counter);
+						while(manager.getRegion(regionName) != null || AreaShop.getInstance().getFileManager().getRegion(regionName) != null) {
+							counter++;
+							regionName = countToName(nameTemplate, counter);
+						}
+
+						// Add the region to WorldGuard (at startposition shifted by the number of this region times the blocks it should shift)
+						Vector minimum = minimumVector.clone().add(finalShift.clone().multiply(current));
+						Vector maximum = maximumVector.clone().add(finalShift.clone().multiply(current));
+
+						// Check for out of bounds
+						if(minimum.getBlockY() < 0) {
+							tooLow++;
+							continue;
+						} else if(maximum.getBlockY() > 256) {
+							tooHigh++;
+							continue;
+						}
+						ProtectedCuboidRegion region = plugin.getWorldGuardHandler().createCuboidRegion(regionName, minimum,maximum);
+						manager.addRegion(region);
+
+						// Add the region to AreaShop
+						LegacyGeneralRegion newRegion;
+						if(rentRegions) {
+							newRegion = new RentRegion(regionName, selection.getWorld());
+
+						} else {
+							newRegion = new BuyRegion(regionName, selection.getWorld());
+						}
+
+						if(finalGroup != null) {
+							finalGroup.addMember(newRegion);
+						}
+						AddingRegionEvent event = plugin.getFileManager().addRegion(newRegion);
+						if (event.isCancelled()) {
+							plugin.message(player, "general-cancelled", event.getReason());
+							continue;
+						}
+						newRegion.handleSchematicEvent(RegionEvent.CREATED);
+						newRegion.update();
+					}
+				}
+				if(current >= amount) {
+					if(player.isOnline()) {
+						int added = amount - tooLow - tooHigh;
+						Message wrong = Message.empty();
+						if(tooHigh > 0) {
+							wrong.append(Message.fromKey("stack-tooHigh").replacements(tooHigh));
+						}
+						if(tooLow > 0) {
+							wrong.append(Message.fromKey("stack-tooLow").replacements(tooLow));
+						}
+						plugin.message(player, "stack-addComplete", added, wrong);
+					}
+					this.cancel();
+				}
+			}
+		}.runTaskTimer(plugin, 1, 1);
+	}
+
+	/**
+	 * Build a name from a count, with the right length.
+	 * @param template Template to put the name in (# to put the count there, otherwise count is appended)
+	 * @param count Number to use
+	 * @return name with prepended 0's
+	 */
+	private String countToName(String template, int count) {
+		StringBuilder counterName =  new StringBuilder().append(count);
+		int minimumLength = plugin.getConfig().getInt("stackRegionNumberLength");
+		while(counterName.length() < minimumLength) {
+			counterName.insert(0, "0");
+		}
+
+		if(template.contains("#")) {
+			return template.replace("#", counterName);
+		} else {
+			return template + counterName;
+		}
+	}
+
+	@Override
+	public List<String> getTabCompleteList(int toComplete, String[] start, CommandSender sender) {
+		List<String> result = new ArrayList<>();
+		if(toComplete == 5) {
+			result.add("rent");
+			result.add("buy");
+		} else if(toComplete == 6) {
+			result.addAll(plugin.getFileManager().getGroupNames());
+		}
+		return result;
+	}
+
+}
+
+
+
+
+
+
+
+
+
+

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

@@ -1,8 +1,7 @@
-package nl.evolutioncoding.areashop.commands;
+package me.wiefferink.areashop.commands;
 
-import nl.evolutioncoding.areashop.AreaShop;
-import nl.evolutioncoding.areashop.Utils;
-import nl.evolutioncoding.areashop.regions.BuyRegion;
+import me.wiefferink.areashop.regions.BuyRegion;
+import me.wiefferink.areashop.tools.Utils;
 import org.bukkit.command.CommandSender;
 import org.bukkit.entity.Player;
 
@@ -11,10 +10,6 @@ import java.util.List;
 
 public class StopresellCommand extends CommandAreaShop {
 
-	public StopresellCommand(AreaShop plugin) {
-		super(plugin);
-	}	
-	
 	@Override
 	public String getCommandStart() {
 		return "areashop stopresell";
@@ -22,14 +17,12 @@ public class StopresellCommand extends CommandAreaShop {
 
 	@Override
 	public String getHelp(CommandSender target) {
-		if(target.hasPermission("areashop.stopresellall")) {
-			return plugin.getLanguageManager().getLang("help-stopResellAll");
-		} else if(target.hasPermission("areashop.stopresell")) {
-			return plugin.getLanguageManager().getLang("help-stopResell");
+		if(target.hasPermission("areashop.stopresellall") || target.hasPermission("areashop.stopresell")) {
+			return "help-stopResell";
 		}
 		return null;
 	}
-	
+
 	@Override
 	public void execute(CommandSender sender, String[] args) {
 		if(!sender.hasPermission("areashop.stopresell") && !sender.hasPermission("areashop.stopresellall")) {
@@ -39,13 +32,13 @@ public class StopresellCommand extends CommandAreaShop {
 
 		BuyRegion buy;
 		if(args.length <= 1) {
-			if (sender instanceof Player) {
+			if(sender instanceof Player) {
 				// get the region by location
-				List<BuyRegion> regions = Utils.getApplicableBuyRegions(((Player) sender).getLocation());
-				if (regions.isEmpty()) {
+				List<BuyRegion> regions = Utils.getImportantBuyRegions(((Player)sender).getLocation());
+				if(regions.isEmpty()) {
 					plugin.message(sender, "cmd-noRegionsAtLocation");
 					return;
-				} else if (regions.size() > 1) {
+				} else if(regions.size() > 1) {
 					plugin.message(sender, "cmd-moreRegionsAtLocation");
 					return;
 				} else {
@@ -54,7 +47,7 @@ public class StopresellCommand extends CommandAreaShop {
 			} else {
 				plugin.message(sender, "cmd-automaticRegionOnlyByPlayer");
 				return;
-			}		
+			}
 		} else {
 			buy = plugin.getFileManager().getBuy(args[1]);
 			if(buy == null) {
@@ -63,7 +56,7 @@ public class StopresellCommand extends CommandAreaShop {
 			}
 		}
 		if(buy == null) {
-			plugin.message(sender, "stopresell-noRegionFound");
+			plugin.message(sender, "cmd-noRegionsAtLocation");
 			return;
 		}
 		if(!buy.isInResellingMode()) {
@@ -84,16 +77,16 @@ public class StopresellCommand extends CommandAreaShop {
 			}
 		} else {
 			plugin.message(sender, "stopresell-noPermission", buy);
-		}	
+		}
 	}
-	
+
 	@Override
 	public List<String> getTabCompleteList(int toComplete, String[] start, CommandSender sender) {
 		ArrayList<String> result = new ArrayList<>();
 		if(toComplete == 2) {
 			for(BuyRegion region : plugin.getFileManager().getBuys()) {
 				if(region.isSold() && region.isInResellingMode()) {
-					result.add(region.getName());
+					result.add(region.getRegionId());
 				}
 			}
 		}

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

@@ -0,0 +1,82 @@
+package me.wiefferink.areashop.commands;
+
+import me.wiefferink.areashop.regions.LegacyGeneralRegion;
+import org.bukkit.command.CommandSender;
+import org.bukkit.entity.Player;
+
+import java.util.Collections;
+import java.util.List;
+
+public class TeleportCommand extends CommandAreaShop {
+
+    /**
+     * 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, LegacyGeneralRegion 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 getCommandStart() {
+        return "areashop tp";
+    }
+
+    @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")) {
+            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;
+        LegacyGeneralRegion 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, true);
+    }
+
+    @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,8 +1,8 @@
-package nl.evolutioncoding.areashop.commands;
+package me.wiefferink.areashop.commands;
 
-import nl.evolutioncoding.areashop.AreaShop;
-import nl.evolutioncoding.areashop.Utils;
-import nl.evolutioncoding.areashop.regions.RentRegion;
+import me.wiefferink.areashop.regions.LegacyGeneralRegion;
+import me.wiefferink.areashop.regions.RentRegion;
+import me.wiefferink.areashop.tools.Utils;
 import org.bukkit.command.CommandSender;
 import org.bukkit.entity.Player;
 
@@ -11,10 +11,6 @@ import java.util.List;
 
 public class UnrentCommand extends CommandAreaShop {
 
-	public UnrentCommand(AreaShop plugin) {
-		super(plugin);
-	}
-	
 	@Override
 	public String getCommandStart() {
 		return "areashop unrent";
@@ -22,14 +18,29 @@ public class UnrentCommand extends CommandAreaShop {
 
 	@Override
 	public String getHelp(CommandSender target) {
-		if(target.hasPermission("areashop.unrent")) {
-			return plugin.getLanguageManager().getLang("help-unrent");
-		} else if(target.hasPermission("areashop.unrentown")) {
-			return plugin.getLanguageManager().getLang("help-unrentOwn");
+		if(target.hasPermission("areashop.unrent") || target.hasPermission("areashop.unrentown")) {
+			return "help-unrent";
 		}
 		return null;
 	}
-	
+
+	/**
+	 * Check if a person can unrent the region.
+	 * @param person The person to check
+	 * @param region The region to check for
+	 * @return true if the person can unrent it, otherwise false
+	 */
+	public static boolean canUse(CommandSender person, LegacyGeneralRegion region) {
+		if(person.hasPermission("areashop.unrent")) {
+			return true;
+		}
+		if(person instanceof Player) {
+			Player player = (Player)person;
+			return region.isOwner(player) && person.hasPermission("areashop.unrentown");
+		}
+		return false;
+	}
+
 	@Override
 	public void execute(CommandSender sender, String[] args) {
 		if(!sender.hasPermission("areashop.unrent") && !sender.hasPermission("areashop.unrentown")) {
@@ -38,13 +49,13 @@ public class UnrentCommand extends CommandAreaShop {
 		}
 		RentRegion rent;
 		if(args.length <= 1) {
-			if (sender instanceof Player) {
+			if(sender instanceof Player) {
 				// get the region by location
-				List<RentRegion> regions = Utils.getApplicableRentRegions(((Player) sender).getLocation());
-				if (regions.isEmpty()) {
+				List<RentRegion> regions = Utils.getImportantRentRegions(((Player)sender).getLocation());
+				if(regions.isEmpty()) {
 					plugin.message(sender, "cmd-noRegionsAtLocation");
 					return;
-				} else if (regions.size() > 1) {
+				} else if(regions.size() > 1) {
 					plugin.message(sender, "cmd-moreRegionsAtLocation");
 					return;
 				} else {
@@ -53,28 +64,28 @@ public class UnrentCommand extends CommandAreaShop {
 			} else {
 				plugin.message(sender, "cmd-automaticRegionOnlyByPlayer");
 				return;
-			}			
+			}
 		} else {
 			rent = plugin.getFileManager().getRent(args[1]);
 		}
 		if(rent == null) {
 			plugin.message(sender, "unrent-notRegistered");
 			return;
-		}		
+		}
 		if(!rent.isRented()) {
 			plugin.message(sender, "unrent-notRented", rent);
 			return;
 		}
 		rent.unRent(true, sender);
 	}
-	
+
 	@Override
 	public List<String> getTabCompleteList(int toComplete, String[] start, CommandSender sender) {
 		ArrayList<String> result = new ArrayList<>();
 		if(toComplete == 2) {
 			for(RentRegion region : plugin.getFileManager().getRents()) {
 				if(region.isRented()) {
-					result.add(region.getName());
+					result.add(region.getRegionId());
 				}
 			}
 		}

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

@@ -0,0 +1,98 @@
+package me.wiefferink.areashop.features;
+
+import me.wiefferink.areashop.AreaShop;
+import me.wiefferink.areashop.events.ask.BuyingRegionEvent;
+import me.wiefferink.areashop.events.ask.RentingRegionEvent;
+import me.wiefferink.areashop.events.ask.ResellingRegionEvent;
+import me.wiefferink.areashop.events.ask.SellingRegionEvent;
+import me.wiefferink.areashop.events.ask.UnrentingRegionEvent;
+import me.wiefferink.areashop.events.askandnotify.AddedFriendEvent;
+import me.wiefferink.areashop.events.askandnotify.DeletedFriendEvent;
+import me.wiefferink.areashop.events.notify.AddedRegionEvent;
+import me.wiefferink.areashop.events.notify.BoughtRegionEvent;
+import me.wiefferink.areashop.events.notify.DeletedRegionEvent;
+import me.wiefferink.areashop.events.notify.RentedRegionEvent;
+import me.wiefferink.areashop.events.notify.ResoldRegionEvent;
+import me.wiefferink.areashop.events.notify.SoldRegionEvent;
+import me.wiefferink.areashop.events.notify.UnrentedRegionEvent;
+import me.wiefferink.areashop.events.notify.UpdateRegionEvent;
+import me.wiefferink.areashop.tools.Utils;
+import org.bukkit.event.EventHandler;
+
+public class DebugFeature extends RegionFeature {
+
+	@EventHandler
+	public void buyingRegion(BuyingRegionEvent event) {
+		AreaShop.debug("BuyingRegionEvent: " + event.getPlayer().getName() + " is trying to buy " + event.getRegion().getRegionId());
+	}
+
+	@EventHandler
+	public void boughtRegion(BoughtRegionEvent event) {
+		AreaShop.debug("BoughtRegionEvent: " + event.getRegion().getPlayerName() + " bought " + event.getRegion().getRegionId());
+	}
+
+	@EventHandler
+	public void sellingRegion(SellingRegionEvent event) {
+		AreaShop.debug("SellingRegionEvent: " + event.getRegion().getRegionId() + " is trying to sell " + event.getRegion().getRegionId());
+	}
+
+	@EventHandler
+	public void soldRegion(SoldRegionEvent event) {
+		AreaShop.debug("SoldRegionEvent: " + Utils.toName(event.getOldBuyer()) + " sold " + event.getRegion().getRegionId());
+	}
+
+	@EventHandler
+	public void resellingRegion(ResellingRegionEvent event) {
+		AreaShop.debug("ResellingRegionEvent: " + event.getRegion().getRegionId() + " is trying to resell " + event.getRegion().getRegionId());
+	}
+
+	@EventHandler
+	public void resoldRegion(ResoldRegionEvent event) {
+		AreaShop.debug("ResoldRegionEvent: " + Utils.toName(event.getFromPlayer()) + " resold " + event.getRegion().getRegionId() + " to " + event.getRegion().getPlayerName());
+	}
+
+	@EventHandler
+	public void rentingRegion(RentingRegionEvent event) {
+		AreaShop.debug("RentingRegionEvent: " + event.getPlayer().getName() + " is trying to rent " + event.getRegion().getRegionId() + ", extending=" + event.isExtending());
+	}
+
+	@EventHandler
+	public void rentedRegion(RentedRegionEvent event) {
+		AreaShop.debug("RentedRegionEvent: " + event.getRegion().getPlayerName() + " rented " + event.getRegion().getRegionId() + ", extending=" + event.hasExtended());
+	}
+
+	@EventHandler
+	public void unrentingRegion(UnrentingRegionEvent event) {
+		AreaShop.debug("UnrentingRegionEvent: " + event.getRegion().getPlayerName() + " is trying to unrent " + event.getRegion().getRegionId());
+	}
+
+	@EventHandler
+	public void unrentedRegion(UnrentedRegionEvent event) {
+		AreaShop.debug("UnrentedRegionEvent: " + Utils.toName(event.getOldRenter()) + " unrented " + event.getRegion().getRegionId());
+	}
+
+	@EventHandler
+	public void regionUpdate(UpdateRegionEvent event) {
+		//AreaShop.debug("UpdateRegionEvent: " + event.getRegion().getName() + " updated");
+	}
+
+	@EventHandler
+	public void addedRegion(AddedRegionEvent event) {
+		AreaShop.debug("AddedRegionEvent: " + event.getRegion().getRegionId());
+	}
+
+	@EventHandler
+	public void removedRegion(DeletedRegionEvent event) {
+		AreaShop.debug("DeletedRegionEvent: " + event.getRegion().getRegionId());
+	}
+
+	@EventHandler
+	public void addedFriend(AddedFriendEvent event) {
+		AreaShop.debug("AddedFriendEvent: region " + event.getRegion().getRegionId() + ", " + event.getFriend().getName() + " by " + (event.getBy() == null ? "<nobody>" : event.getBy().getName()));
+	}
+
+	@EventHandler
+	public void deleteFriend(DeletedFriendEvent event) {
+		AreaShop.debug("DeletedFriendEvent: region " + event.getRegion().getRegionId() + ", " + event.getFriend().getName() + " by " + (event.getBy() == null ? "<nobody>" : event.getBy().getName()));
+	}
+}

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

@@ -0,0 +1,109 @@
+package me.wiefferink.areashop.features;
+
+import me.wiefferink.areashop.events.askandnotify.AddedFriendEvent;
+import me.wiefferink.areashop.events.askandnotify.DeletedFriendEvent;
+import me.wiefferink.areashop.regions.LegacyGeneralRegion;
+import org.bukkit.Bukkit;
+import org.bukkit.OfflinePlayer;
+import org.bukkit.command.CommandSender;
+
+import java.util.ArrayList;
+import java.util.HashSet;
+import java.util.List;
+import java.util.Set;
+import java.util.UUID;
+
+public class FriendsFeature extends RegionFeature {
+
+	public FriendsFeature(LegacyGeneralRegion region) {
+		setRegion(region);
+	}
+
+	/**
+	 * Add a friend to the region.
+	 * @param player The UUID of the player to add
+	 * @param by     The CommandSender that is adding the friend, or null
+	 * @return true if the friend has been added, false if adding a friend was cancelled by another plugin
+	 */
+	public boolean addFriend(UUID player, CommandSender by) {
+		// Fire and check event
+		AddedFriendEvent event = new AddedFriendEvent(getRegion(), Bukkit.getOfflinePlayer(player), by);
+		Bukkit.getPluginManager().callEvent(event);
+		if(event.isCancelled()) {
+			plugin.message(by, "general-cancelled", event.getReason(), this);
+			return false;
+		}
+
+		Set<String> friends = new HashSet<>(getRegion().getConfig().getStringList("general.friends"));
+		friends.add(player.toString());
+		List<String> list = new ArrayList<>(friends);
+		getRegion().setSetting("general.friends", list);
+		return true;
+	}
+
+	/**
+	 * Delete a friend from the region.
+	 * @param player The UUID of the player to delete
+	 * @param by     The CommandSender that is adding the friend, or null
+	 * @return true if the friend has been added, false if adding a friend was cancelled by another plugin
+	 */
+	public boolean deleteFriend(UUID player, CommandSender by) {
+		// Fire and check event
+		DeletedFriendEvent event = new DeletedFriendEvent(getRegion(), Bukkit.getOfflinePlayer(player), by);
+		Bukkit.getPluginManager().callEvent(event);
+		if(event.isCancelled()) {
+			plugin.message(by, "general-cancelled", event.getReason(), this);
+			return false;
+		}
+
+		Set<String> friends = new HashSet<>(getRegion().getConfig().getStringList("general.friends"));
+		friends.remove(player.toString());
+		List<String> list = new ArrayList<>(friends);
+		if(list.isEmpty()) {
+			getRegion().setSetting("general.friends", null);
+		} else {
+			getRegion().setSetting("general.friends", list);
+		}
+		return true;
+	}
+
+	/**
+	 * Get the list of friends added to this region.
+	 * @return Friends added to this region
+	 */
+	public Set<UUID> getFriends() {
+		HashSet<UUID> result = new HashSet<>();
+		for(String friend : getRegion().getConfig().getStringList("general.friends")) {
+			try {
+				UUID id = UUID.fromString(friend);
+				result.add(id);
+			} catch(IllegalArgumentException e) {
+				// Don't add it
+			}
+		}
+		return result;
+	}
+
+	/**
+	 * Get the list of friends added to this region.
+	 * @return Friends added to this region
+	 */
+	public Set<String> getFriendNames() {
+		HashSet<String> result = new HashSet<>();
+		for(UUID friend : getFriends()) {
+			OfflinePlayer player = Bukkit.getOfflinePlayer(friend);
+			if(player != null && player.getName() != null) {
+				result.add(player.getName());
+			}
+		}
+		return result;
+	}
+
+	/**
+	 * Remove all friends that are added to this region.
+	 */
+	public void clearFriends() {
+		getRegion().setSetting("general.friends", null);
+	}
+
+}

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

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

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

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

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

@@ -0,0 +1,266 @@
+package me.wiefferink.areashop.features;
+
+import com.sk89q.worldguard.bukkit.WorldGuardPlugin;
+import com.sk89q.worldguard.protection.flags.Flag;
+import com.sk89q.worldguard.protection.flags.InvalidFlagFormat;
+import com.sk89q.worldguard.protection.flags.RegionGroupFlag;
+import com.sk89q.worldguard.protection.regions.ProtectedRegion;
+import me.wiefferink.areashop.AreaShop;
+import me.wiefferink.areashop.events.notify.UpdateRegionEvent;
+import me.wiefferink.areashop.interfaces.RegionAccessSet;
+import me.wiefferink.areashop.regions.LegacyGeneralRegion;
+import me.wiefferink.areashop.regions.util.RegionStatus;
+import me.wiefferink.interactivemessenger.processing.Message;
+import org.bukkit.configuration.ConfigurationSection;
+import org.bukkit.event.EventHandler;
+
+import java.util.Objects;
+import java.util.Set;
+import java.util.UUID;
+
+public class WorldGuardRegionFlagsFeature extends RegionFeature {
+
+
+	@EventHandler
+	public void regionUpdate(UpdateRegionEvent event) {
+		updateRegionFlags(event.getRegion());
+	}
+
+	/**
+	 * Set the region flags/options to the values of a ConfigurationSection.
+	 * @param region The region to update the flags for
+	 * @return true if the flags have been set correctly, otherwise false
+	 */
+	private boolean updateRegionFlags(LegacyGeneralRegion region) {
+		boolean result = true;
+
+		// Get section defining the region flag profile
+		ConfigurationSection flagProfileSection = region.getConfigurationSectionSetting("general.flagProfile", "flagProfiles");
+		if(flagProfileSection == null) {
+			return false;
+		}
+
+		// Region flags for all states
+		ConfigurationSection allFlags = flagProfileSection.getConfigurationSection("ALL");
+		if(allFlags != null) {
+			result = updateRegionFlags(region, allFlags);
+		}
+
+		// Region flags for the current state
+		ConfigurationSection stateFlags = flagProfileSection.getConfigurationSection(region.getState().getValue());
+
+		// If in reselling mode, fallback to 'resale' section if 'resell' is not found (legacy configuration problem: https://github.com/NLthijs48/AreaShop/issues/303)
+		if(stateFlags == null && region.getState() == RegionStatus.RESELL) {
+			stateFlags = flagProfileSection.getConfigurationSection("resale");
+		}
+		if(stateFlags != null) {
+			result &= updateRegionFlags(region, stateFlags);
+		}
+
+		return result;
+	}
+
+	/**
+	 * Set the region flags/options to the values of a ConfigurationSection.
+	 * @param region The region to update the flags for
+	 * @param flags  The flags to apply
+	 * @return true if the flags have been set correctly, otherwise false
+	 */
+	private boolean updateRegionFlags(LegacyGeneralRegion region, ConfigurationSection flags) {
+		boolean result = true;
+
+		Set<String> flagNames = flags.getKeys(false);
+		WorldGuardPlugin worldGuard = plugin.getWorldGuard();
+
+		// Get the region
+		ProtectedRegion worldguardRegion = region.getRegion();
+		if(worldguardRegion == null) {
+			AreaShop.debug("Region '" + region.getRegionId() + "' does not exist, setting flags failed");
+			return false;
+		}
+		// Loop through all flags that are set in the config
+		for(String flagName : flagNames) {
+			String value = Message.fromString(flags.getString(flagName)).replacements(region).getPlain();
+			// In the config normal Bukkit color codes are used, those only need to be translated on 5.X WorldGuard versions
+			if(plugin.getWorldGuard().getDescription().getVersion().startsWith("5.")) {
+				value = translateBukkitToWorldGuardColors(value);
+			}
+			if(flagName.equalsIgnoreCase("members")) {
+				plugin.getWorldGuardHandler().setMembers(worldguardRegion, parseAccessSet(value));
+				//AreaShop.debug("  Flag " + flagName + " set: " + members.toUserFriendlyString());
+			} else if(flagName.equalsIgnoreCase("owners")) {
+				plugin.getWorldGuardHandler().setOwners(worldguardRegion, parseAccessSet(value));
+				//AreaShop.debug("  Flag " + flagName + " set: " + owners.toUserFriendlyString());
+			} else if(flagName.equalsIgnoreCase("priority")) {
+				try {
+					int priority = Integer.parseInt(value);
+					if(worldguardRegion.getPriority() != priority) {
+						worldguardRegion.setPriority(priority);
+					}
+					//AreaShop.debug("  Flag " + flagName + " set: " + value);
+				} catch(NumberFormatException e) {
+					AreaShop.warn("The value of flag " + flagName + " is not a number");
+					result = false;
+				}
+			} else if(flagName.equalsIgnoreCase("parent")) {
+				if(region.getWorld() == null || plugin.getRegionManager(region.getWorld()) == null) {
+					continue;
+				}
+				ProtectedRegion parentRegion = plugin.getRegionManager(region.getWorld()).getRegion(value);
+				if(parentRegion != null) {
+					if(!parentRegion.equals(worldguardRegion.getParent())) {
+						try {
+							worldguardRegion.setParent(parentRegion);
+							//AreaShop.debug("  Flag " + flagName + " set: " + value);
+						} catch(ProtectedRegion.CircularInheritanceException e) {
+							AreaShop.warn("The parent set in the config is not correct (circular inheritance)");
+						}
+					}
+				} else {
+					AreaShop.warn("The parent set in the config is not correct (region does not exist)");
+				}
+			} else {
+				// Parse all other normal flags (groups are also handled)
+				String flagSetting = null;
+				com.sk89q.worldguard.protection.flags.RegionGroup groupValue = null;
+
+				Flag<?> foundFlag = plugin.getWorldGuardHandler().fuzzyMatchFlag(flagName);
+				if(foundFlag == null) {
+					AreaShop.warn("Found wrong flag in flagProfiles section: " + flagName + ", check if that is the correct WorldGuard flag");
+					continue;
+				}
+				RegionGroupFlag groupFlag = foundFlag.getRegionGroupFlag();
+				if(value == null || value.isEmpty()) {
+					if(worldguardRegion.getFlag(foundFlag) != null) {
+						worldguardRegion.setFlag(foundFlag, null);
+					}
+					if(groupFlag != null && worldguardRegion.getFlag(groupFlag) != null) {
+						worldguardRegion.setFlag(groupFlag, null);
+					}
+					//AreaShop.debug("  Flag " + flagName + " reset (+ possible group of flag)");
+				} else {
+					if(groupFlag == null) {
+						flagSetting = value;
+					} else {
+						for(String part : value.split(" ")) {
+							if(part.startsWith("g:")) {
+								if(part.length() > 2) {
+									try {
+										groupValue = plugin.getWorldGuardHandler().parseFlagGroupInput(groupFlag, part.substring(2));
+									} catch(InvalidFlagFormat e) {
+										AreaShop.warn("Found wrong group value for flag " + flagName);
+									}
+								}
+							} else {
+								if(flagSetting == null) {
+									flagSetting = part;
+								} else {
+									flagSetting += " " + part;
+								}
+							}
+						}
+					}
+					if(flagSetting != null) {
+						try {
+							setFlag(worldguardRegion, foundFlag, flagSetting);
+							//AreaShop.debug("  Flag " + flagName + " set: " + flagSetting);
+						} catch(InvalidFlagFormat e) {
+							AreaShop.warn("Found wrong value for flag " + flagName);
+						}
+					}
+					if(groupValue != null) {
+						if(groupValue == groupFlag.getDefault()) {
+							worldguardRegion.setFlag(groupFlag, null);
+							//AreaShop.debug("    Group of flag " + flagName + " set to default: " + groupValue);
+						} else {
+							worldguardRegion.setFlag(groupFlag, groupValue);
+							//AreaShop.debug("    Group of flag " + flagName + " set: " + groupValue);
+						}
+					}
+				}
+			}
+		}
+		// Indicate that the regions needs to be saved
+		if(worldGuard.getDescription().getVersion().startsWith("5.")) {
+			plugin.getFileManager().saveIsRequiredForRegionWorld(region.getWorldName());
+		}
+		return result;
+	}
+
+	/**
+	 * Build an RegionAccessSet from an input that specifies player names, player uuids and groups.
+	 * @param input Input string defining the access set
+	 * @return RegionAccessSet containing the entities parsed from the input
+	 */
+	public RegionAccessSet parseAccessSet(String input) {
+		RegionAccessSet result = new RegionAccessSet();
+
+		String[] inputParts = input.split(", ");
+		for(String access : inputParts) {
+			if(access != null && !access.isEmpty()) {
+				// Check for groups
+				if(access.startsWith("g:")) {
+					if(access.length() > 2) {
+						result.getGroupNames().add(access.substring(2));
+					}
+				} else if(access.startsWith("n:")) {
+					if(access.length() > 2) {
+						result.getPlayerNames().add(access.substring(2));
+					}
+				} else {
+					try {
+						result.getPlayerUniqueIds().add(UUID.fromString(access));
+					} catch(IllegalArgumentException e) {
+						AreaShop.warn("Tried using '" + access + "' as uuid for a region member/owner, is your flagProfiles section correct?");
+					}
+				}
+			}
+		}
+
+		return result;
+	}
+
+	/**
+	 * Set a WorldGuard region flag.
+	 * @param region The WorldGuard region to set
+	 * @param flag   The flag to set
+	 * @param value  The value to set the flag to
+	 * @param <V>    They type of flag to set
+	 * @throws InvalidFlagFormat When the value of the flag is wrong
+	 */
+	private <V> void setFlag(ProtectedRegion region, Flag<V> flag, String value) throws InvalidFlagFormat {
+		V current = region.getFlag(flag);
+		V next = plugin.getWorldGuardHandler().parseFlagInput(flag, value);
+
+		if(!Objects.equals(current, next)) {
+			region.setFlag(flag, next);
+		}
+	}
+
+	/**
+	 * Translate the color codes you put in greeting/farewell messages to the weird color codes of WorldGuard.
+	 * @param message The message where the color codes should be translated (this message has bukkit color codes)
+	 * @return The string with the WorldGuard color codes
+	 */
+	private String translateBukkitToWorldGuardColors(String message) {
+		String result = message;
+		result = result.replace("&c", "&r");
+		result = result.replace("&4", "&R");
+		result = result.replace("&e", "&y");
+		result = result.replace("&6", "&Y");
+		result = result.replace("&a", "&g");
+		result = result.replace("&2", "&G");
+		result = result.replace("&b", "&c");
+		result = result.replace("&3", "&C");
+		result = result.replace("&9", "&b");
+		result = result.replace("&1", "&B");
+		result = result.replace("&d", "&p");
+		result = result.replace("&5", "&P");
+		result = result.replace("&0", "&0");
+		result = result.replace("&8", "&1");
+		result = result.replace("&7", "&2");
+		result = result.replace("&f", "&w");
+		result = result.replace("&r", "&x");
+		return result;
+	}
+}

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

@@ -0,0 +1,350 @@
+package me.wiefferink.areashop.features.signs;
+
+import com.google.common.base.Objects;
+import io.papermc.lib.PaperLib;
+import io.papermc.lib.features.blockstatesnapshot.BlockStateSnapshotResult;
+import me.wiefferink.areashop.AreaShop;
+import me.wiefferink.areashop.interfaces.BlockBehaviourHelper;
+import me.wiefferink.areashop.regions.LegacyGeneralRegion;
+import me.wiefferink.areashop.regions.util.ClickType;
+import me.wiefferink.areashop.tools.Materials;
+import me.wiefferink.areashop.tools.Utils;
+import me.wiefferink.interactivemessenger.processing.Message;
+import org.bukkit.Bukkit;
+import org.bukkit.Location;
+import org.bukkit.Material;
+import org.bukkit.block.Block;
+import org.bukkit.block.BlockFace;
+import org.bukkit.block.BlockState;
+import org.bukkit.block.Sign;
+import org.bukkit.block.data.BlockData;
+import org.bukkit.block.data.type.WallSign;
+import org.bukkit.configuration.ConfigurationSection;
+import org.bukkit.configuration.file.YamlConfiguration;
+import org.bukkit.entity.Player;
+
+import java.util.ArrayList;
+import java.util.List;
+import java.util.logging.Level;
+
+/**
+ * Sign that is connected to a region to display information and interact with the region.
+ */
+public class RegionSign {
+
+    public static final BlockBehaviourHelper behaviourHelper = AreaShop.getInstance().getNMSHelper().behaviourHelper();
+    public static Level invalidSignLogLevel;
+    public static boolean removeInvalidSigns;
+
+    static {
+        YamlConfiguration configuration = AreaShop.getInstance().getConfig();
+        removeInvalidSigns = configuration.getBoolean("signs.removeInvalid");
+        final String rawLogLevel = configuration.getString("signs.invalidSignLogLevel", "WARNING");
+        try {
+            assert rawLogLevel != null;
+            invalidSignLogLevel = Level.parse(rawLogLevel);
+        } catch (IllegalArgumentException ex) {
+            AreaShop.warn("Invalid Logging Level: " + rawLogLevel);
+            invalidSignLogLevel = Level.WARNING;
+        }
+    }
+
+
+    private static boolean canLogSignError() {
+        return AreaShop.getInstance().getLogger().isLoggable(invalidSignLogLevel);
+    }
+
+    private static void logSignError(String... messages) {
+        if (invalidSignLogLevel == Level.OFF) {
+            return;
+        }
+        if (invalidSignLogLevel == Level.SEVERE) {
+            AreaShop.error((Object) messages);
+        } else if (invalidSignLogLevel == Level.WARNING) {
+            AreaShop.warn((Object) messages);
+        } else if (invalidSignLogLevel.intValue() >= Level.FINE.intValue()) {
+            AreaShop.debug((Object) messages);
+        } else {
+            AreaShop.info((Object) messages);
+        }
+    }
+
+    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"));
+    }
+
+    /**
+     * Location string to be used as key in maps.
+     *
+     * @return Location string
+     */
+    public String getStringLocation() {
+        return SignsFeature.locationToString(getLocation());
+    }
+
+    /**
+     * Chunk string to be used as key in maps.
+     *
+     * @return Chunk string
+     */
+    public String getStringChunk() {
+        return SignsFeature.chunkToString(getLocation());
+    }
+
+    /**
+     * Get the region this sign is linked to.
+     *
+     * @return The region this sign is linked to
+     */
+    public LegacyGeneralRegion getRegion() {
+        return signsFeature.getRegion();
+    }
+
+    /**
+     * Remove this sign from the region.
+     */
+    public void remove() {
+        final Block block = getLocation().getBlock();
+        if (block.getType() == getMaterial()) {
+            // If removing a valid sign, replace with air, otherwise ignore.
+            block.setType(Material.AIR);
+        }
+        signsFeature.getSignsRef().remove(getStringLocation());
+        SignsFeature.getAllSigns().remove(getStringLocation());
+        SignsFeature.getSignsByChunk().get(getStringChunk()).remove(this);
+        getRegion().setSetting("general.signs." + key, null);
+    }
+
+    /**
+     * Get the ConfigurationSection defining the sign layout.
+     *
+     * @return The sign layout config
+     */
+    public ConfigurationSection getProfile() {
+        return getRegion().getConfigurationSectionSetting("general.signProfile", "signProfiles", getRegion().getConfig().get("general.signs." + key + ".profile"));
+    }
+
+    /**
+     * Get the facing of the sign as saved in the config.
+     *
+     * @return BlockFace the sign faces, or null if unknown
+     */
+    public BlockFace getFacing() {
+        try {
+            return BlockFace.valueOf(getRegion().getConfig().getString("general.signs." + key + ".facing"));
+        } catch (NullPointerException | IllegalArgumentException e) {
+            return null;
+        }
+    }
+
+    /**
+     * Get the material of the sign as saved in the config.
+     *
+     * @return Material of the sign, usually, a sign or {@link Material#AIR} if none.
+     */
+    public Material getMaterial() {
+        String name = getRegion().getConfig().getString("general.signs." + key + ".signType");
+        Material result = Materials.signNameToMaterial(name);
+        return result == null ? Material.AIR : result;
+    }
+
+    /**
+     * 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;
+        }
+
+        final LegacyGeneralRegion region = getRegion();
+
+        if (region.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;
+        }
+
+        ConfigurationSection stateConfig = signConfig.getConfigurationSection(value);
+
+        // 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, true);
+        final BlockState blockState = snapshot.getState();
+        final BlockData blockData = blockState.getBlockData();
+
+        // 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 (Materials.isSign(signType)) {
+                // 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());
+                }
+                if (behaviourHelper.canPlace(block.getLocation(), blockData)) {
+                    blockState.setBlockData(blockData);
+                    // Update the block if its valid but don't apply physics
+                    blockState.update(true, false);
+                } else {
+                    if (canLogSignError()) {
+                        logSignError("Setting sign", key, "of region", region.getRegionId(), "failed, could not set sign block back");
+                    }
+                    if (removeInvalidSigns) {
+                        remove();
+                    }
+                    return false;
+                }
+            } else {
+                if (canLogSignError()) {
+                    logSignError("Setting sign", key, "of region", region.getRegionId(), "failed, RegionSign material was: " + signType.name());
+                }
+                if (removeInvalidSigns) {
+                    remove();
+                    return 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());
+        }
+
+        // Apply replacements and color and then set it on the sign
+        Sign signState = (Sign) blockState;
+        for (int i = 0; i < signLines.length; i++) {
+            if (signLines[i] == null) {
+                signState.setLine(i, "");
+                continue;
+            }
+            signLines[i] = Message.fromString(signLines[i]).replacements(getRegion()).getSingle();
+            signLines[i] = Utils.applyColors(signLines[i]);
+            signState.setLine(i, signLines[i]);
+        }
+        // BlockState#update *should* return true here.
+        return blockState.update(true, false);
+    }
+
+    /**
+     * Check if the sign needs to update periodically.
+     *
+     * @return true if it needs periodic updates, otherwise false
+     */
+    public boolean needsPeriodicUpdate() {
+        ConfigurationSection signConfig = getProfile();
+        if (signConfig == null || !signConfig.isSet(getRegion().getState().getValue().toLowerCase())) {
+            return false;
+        }
+
+        ConfigurationSection stateConfig = signConfig.getConfigurationSection(getRegion().getState().getValue().toLowerCase());
+        if (stateConfig == null) {
+            return false;
+        }
+
+        // Check the lines for the timeleft tag
+        for (int i = 1; i <= 4; i++) {
+            String line = stateConfig.getString("line" + i);
+            if (line != null && !line.isEmpty() && line.contains(Message.VARIABLE_START + AreaShop.tagTimeLeft + Message.VARIABLE_END)) {
+                return true;
+            }
+        }
+        return false;
+    }
+
+    /**
+     * Run commands when a player clicks a sign.
+     *
+     * @param clicker   The player that clicked the sign
+     * @param clickType The type of clicking
+     * @return true if the commands ran successfully, false if any of them failed
+     */
+    public boolean runSignCommands(Player clicker, ClickType clickType) {
+        ConfigurationSection signConfig = getProfile();
+        if (signConfig == null) {
+            return false;
+        }
+        final LegacyGeneralRegion region = getRegion();
+        ConfigurationSection stateConfig = signConfig.getConfigurationSection(region.getState().getValue().toLowerCase());
+
+        // Run player commands if specified
+        List<String> playerCommands = new ArrayList<>();
+        for (String command : stateConfig.getStringList(clickType.getValue() + "Player")) {
+            // TODO move variable checking code to InteractiveMessenger?
+            playerCommands.add(command.replace(Message.VARIABLE_START + AreaShop.tagClicker + Message.VARIABLE_END, clicker.getName()));
+        }
+        region.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()));
+        }
+        region.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().getRegionId());
+    }
+}

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

@@ -0,0 +1,523 @@
+package me.wiefferink.areashop.features.signs;
+
+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.interfaces.BlockBehaviourHelper;
+import me.wiefferink.areashop.managers.FileManager;
+import me.wiefferink.areashop.regions.BuyRegion;
+import me.wiefferink.areashop.regions.LegacyGeneralRegion;
+import me.wiefferink.areashop.regions.RentRegion;
+import me.wiefferink.areashop.regions.util.ClickType;
+import me.wiefferink.areashop.regions.util.RegionEvent;
+import me.wiefferink.areashop.regions.util.RegionType;
+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.entity.Player;
+import org.bukkit.event.EventHandler;
+import org.bukkit.event.EventPriority;
+import org.bukkit.event.HandlerList;
+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 java.util.*;
+
+public class SignCache implements Listener {
+
+    private final Map<String, RegionSign> allSigns = new HashMap<>();
+    private final Map<String, List<RegionSign>> signsByChunk = new HashMap<>();
+    private final BlockBehaviourHelper behaviourHelper = AreaShop.getInstance().getNMSHelper().behaviourHelper();
+    private final AreaShop plugin = AreaShop.getInstance();
+
+    public void registerListeners() {
+        Bukkit.getPluginManager().registerEvents(this, AreaShop.getInstance());
+    }
+
+    /**
+     * Convert a location to a string to use as map key.
+     *
+     * @param location The location to get the key for
+     * @return A string to use in a map for a location
+     */
+    public static String locationToString(Location location) {
+        return location.getWorld().getName() + ";" + location.getBlockX() + ";" + location.getBlockY() + ";" + location.getBlockZ();
+    }
+
+    /**
+     * Convert a chunk to a string to use as map key.
+     *
+     * @param location The location to get the key for
+     * @return A string to use in a map for a chunk
+     */
+    public static String chunkToString(Location location) {
+        return location.getWorld().getName() + ";" + (location.getBlockX() >> 4) + ";" + (location.getBlockZ() >> 4);
+    }
+
+    /**
+     * Convert a chunk to a string to use as map key.
+     * Use a Location argument to prevent chunk loading!
+     *
+     * @param chunk The location to get the key for
+     * @return A string to use in a map for a chunk
+     */
+    public static String chunkToString(Chunk chunk) {
+        return chunk.getWorld().getName() + ";" + chunk.getX() + ";" + chunk.getZ();
+    }
+
+    /**
+     * Get a sign by a location.
+     *
+     * @param location The location to get the sign for
+     * @return The RegionSign that is at the location, or null if none
+     */
+    public RegionSign getSignByLocation(Location location) {
+        return allSigns.get(locationToString(location));
+    }
+
+    /**
+     * Get the map with all signs.
+     *
+     * @return Map with all signs: locationString -&gt; RegionSign
+     */
+    public Map<String, RegionSign> getAllSigns() {
+        return allSigns;
+    }
+
+    /**
+     * Get the map with signs by chunk.
+     *
+     * @return Map with signs by chunk: chunkString -&gt; List&lt;RegionSign&gt;
+     */
+    public Map<String, List<RegionSign>> getSignsByChunk() {
+        return signsByChunk;
+    }
+
+    public void addSign(RegionSign regionSign) {
+        signsByChunk.computeIfAbsent(regionSign.getStringChunk(), (unused) -> new ArrayList<>()).add(regionSign);
+    }
+
+    public void removeSign(RegionSign regionSign) {
+        final List<RegionSign> signs = signsByChunk.get(regionSign.getStringChunk());
+        if (signs != null) {
+            signs.remove(regionSign);
+        }
+        allSigns.remove(regionSign.getStringLocation());
+    }
+
+    public void shutdown() {
+        HandlerList.unregisterAll(this);
+        signsByChunk.clear();
+        allSigns.clear();
+    }
+
+    @EventHandler
+    public void regionUpdate(UpdateRegionEvent event) {
+        event.getRegion().getSignsFeature().update();
+    }
+
+    @EventHandler(priority = EventPriority.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();
+
+        // Check if the sign is really the same as a saved rent
+        RegionSign regionSign = SignsFeature.getSignByLocation(event.getBlock().getLocation());
+        if (regionSign == null) {
+            return;
+        }
+        // If the block is in an invalid position then we remove the sign
+        if (!behaviourHelper.isBlockValid(block)) {
+            regionSign.remove();
+        }
+
+        // Remove the sign so that it does not fall on the floor as an item (next region update will place it back when possible)
+        AreaShop.debug("onIndirectSignBreak: Removed block of sign for", regionSign.getRegion().getRegionId(), "at", regionSign.getStringLocation());
+        event.getBlock().setType(Material.AIR);
+        event.setCancelled(true);
+    }
+
+
+    @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);
+    }
+
+    @EventHandler(priority = EventPriority.HIGH, ignoreCancelled = true)
+    public void onSignBreak(BlockBreakEvent event) {
+        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;
+            }
+            if (regionSign.getRegion().invalidated()) {
+                AreaShop.warn("SignsFeature: Sign feature for an invalidated region object is still active!");
+            }
+            // Remove the sign of the rental region if the player has permission
+            if (event.getPlayer().hasPermission("areashop.delsign")) {
+                regionSign.remove();
+                plugin.message(event.getPlayer(), "delsign-success", regionSign.getRegion());
+            } else { // Cancel the breaking of the sign
+                event.setCancelled(true);
+                plugin.message(event.getPlayer(), "delsign-noPermission", regionSign.getRegion());
+            }
+        }
+    }
+
+    @EventHandler(priority = EventPriority.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
+        ClickType clickType = null;
+        if (player.isSneaking() && event.getAction() == Action.LEFT_CLICK_BLOCK) {
+            clickType = ClickType.SHIFTLEFTCLICK;
+        } else if (!player.isSneaking() && event.getAction() == Action.LEFT_CLICK_BLOCK) {
+            clickType = ClickType.LEFTCLICK;
+        } else if (player.isSneaking() && event.getAction() == Action.RIGHT_CLICK_BLOCK) {
+            clickType = ClickType.SHIFTRIGHTCLICK;
+        } else if (!player.isSneaking() && event.getAction() == Action.RIGHT_CLICK_BLOCK) {
+            clickType = ClickType.RIGHTCLICK;
+        }
+
+        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()) {
+            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(), 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(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(), 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(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);
+
+            LegacyGeneralRegion 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<LegacyGeneralRegion> 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).getRegionId(), regions.get(1).getRegionId());
+                    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);
+        }
+    }
+
+}

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

@@ -0,0 +1,214 @@
+package me.wiefferink.areashop.features.signs;
+
+import me.wiefferink.areashop.AreaShop;
+import me.wiefferink.areashop.features.RegionFeature;
+import me.wiefferink.areashop.regions.LegacyGeneralRegion;
+import me.wiefferink.areashop.tools.Utils;
+import org.bukkit.Chunk;
+import org.bukkit.Location;
+import org.bukkit.Material;
+import org.bukkit.block.BlockFace;
+import org.bukkit.configuration.ConfigurationSection;
+
+import java.util.ArrayList;
+import java.util.HashMap;
+import java.util.List;
+import java.util.Map;
+
+public class SignsFeature extends RegionFeature {
+
+    public static final SignCache signCache = new SignCache();
+
+    static {
+        signCache.registerListeners();
+    }
+
+    private Map<String, RegionSign> signs;
+
+    public SignsFeature() {
+
+    }
+
+    /**
+     * Constructor.
+     *
+     * @param region The region to bind to
+     */
+    public SignsFeature(LegacyGeneralRegion region) {
+        setRegion(region);
+        signs = new HashMap<>();
+        // Setup current signs
+        ConfigurationSection signSection = region.getConfig().getConfigurationSection("general.signs");
+        if (signSection != null) {
+            for (String signKey : signSection.getKeys(false)) {
+                RegionSign sign = new RegionSign(this, signKey);
+                Location location = sign.getLocation();
+                if (location == null) {
+                    AreaShop.warn("Sign with key " + signKey + " of region " + region.getRegionId() + " does not have a proper location");
+                    continue;
+                }
+                signs.put(sign.getStringLocation(), sign);
+                signCache.addSign(sign);
+            }
+        }
+    }
+
+    public static void shutdownGlobalState() {
+        signCache.shutdown();
+    }
+
+    /**
+     * Convert a location to a string to use as map key.
+     *
+     * @param location The location to get the key for
+     * @return A string to use in a map for a location
+     */
+    public static String locationToString(Location location) {
+        return location.getWorld().getName() + ";" + location.getBlockX() + ";" + location.getBlockY() + ";" + location.getBlockZ();
+    }
+
+    /**
+     * Convert a chunk to a string to use as map key.
+     *
+     * @param location The location to get the key for
+     * @return A string to use in a map for a chunk
+     */
+    public static String chunkToString(Location location) {
+        return location.getWorld().getName() + ";" + (location.getBlockX() >> 4) + ";" + (location.getBlockZ() >> 4);
+    }
+
+    /**
+     * Convert a chunk to a string to use as map key.
+     * Use a Location argument to prevent chunk loading!
+     *
+     * @param chunk The location to get the key for
+     * @return A string to use in a map for a chunk
+     */
+    public static String chunkToString(Chunk chunk) {
+        return chunk.getWorld().getName() + ";" + chunk.getX() + ";" + chunk.getZ();
+    }
+
+    /**
+     * Get a sign by a location.
+     *
+     * @param location The location to get the sign for
+     * @return The RegionSign that is at the location, or null if none
+     */
+    public static RegionSign getSignByLocation(Location location) {
+        return signCache.getSignByLocation(location);
+    }
+
+    /**
+     * Get the map with all signs.
+     *
+     * @return Map with all signs: locationString -&gt; RegionSign
+     */
+    public static Map<String, RegionSign> getAllSigns() {
+        return signCache.getAllSigns();
+    }
+
+    /**
+     * Get the map with signs by chunk.
+     *
+     * @return Map with signs by chunk: chunkString -&gt; List&lt;RegionSign&gt;
+     */
+    public static Map<String, List<RegionSign>> getSignsByChunk() {
+        return signCache.getSignsByChunk();
+    }
+
+    @Override
+    public void shutdown() {
+        // Deregister signs from the registry
+        if (signs != null) {
+            for (Map.Entry<String, RegionSign> entry : signs.entrySet()) {
+                signCache.removeSign(entry.getValue());
+            }
+        }
+    }
+
+    /**
+     * 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 LegacyGeneralRegion 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);
+        signCache.addSign(sign);
+    }
+
+}

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

@@ -0,0 +1,265 @@
+package me.wiefferink.areashop.features.teleport;
+
+import com.sk89q.worldguard.protection.regions.ProtectedRegion;
+import me.wiefferink.areashop.AreaShop;
+import me.wiefferink.areashop.features.RegionFeature;
+import me.wiefferink.areashop.features.signs.RegionSign;
+import me.wiefferink.areashop.regions.LegacyGeneralRegion;
+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.HashSet;
+import java.util.List;
+import java.util.Set;
+import java.util.concurrent.CompletableFuture;
+
+public class TeleportFeature extends RegionFeature {
+
+    public TeleportFeature() {
+    }
+
+    public TeleportFeature(LegacyGeneralRegion 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.LegacyGeneralRegion;
+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 LegacyGeneralRegion 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

@@ -0,0 +1,159 @@
+package me.wiefferink.areashop.listeners;
+
+import me.wiefferink.areashop.AreaShop;
+import me.wiefferink.areashop.regions.BuyRegion;
+import me.wiefferink.areashop.regions.LegacyGeneralRegion;
+import me.wiefferink.areashop.regions.RentRegion;
+import me.wiefferink.areashop.tools.Utils;
+import org.bukkit.entity.Player;
+import org.bukkit.event.EventHandler;
+import org.bukkit.event.EventPriority;
+import org.bukkit.event.Listener;
+import org.bukkit.event.player.PlayerKickEvent;
+import org.bukkit.event.player.PlayerLoginEvent;
+import org.bukkit.event.player.PlayerLoginEvent.Result;
+import org.bukkit.event.player.PlayerQuitEvent;
+
+import java.util.ArrayList;
+import java.util.List;
+
+/**
+ * Notify region expiry and track activity time.
+ */
+public final class PlayerLoginLogoutListener implements Listener {
+    private final AreaShop plugin;
+
+    /**
+     * Constructor.
+     *
+     * @param plugin The AreaShop plugin
+     */
+    public PlayerLoginLogoutListener(AreaShop plugin) {
+        this.plugin = plugin;
+    }
+
+    /**
+     * 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);
+                    }
+                }
+            }
+
+            // Notify admins for plugin updates
+            AreaShop.getInstance().notifyUpdate(player);
+            return false;
+        }, 25, 25, false);
+
+        // Check if the player has regions that use an old name of him and update them
+        Utils.runCancellingTaskTimer(() -> {
+            if (!plugin.isReady()) {
+                return true;
+            }
+
+            List<LegacyGeneralRegion> regions = new ArrayList<>();
+            for (LegacyGeneralRegion 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);
+    }
+
+    // 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 (LegacyGeneralRegion region : plugin.getFileManager().getRegions()) {
+            if (region.isOwner(player)) {
+                region.updateLastActiveTime();
+            }
+        }
+    }
+}
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+

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

@@ -0,0 +1,221 @@
+package me.wiefferink.areashop.managers;
+
+import me.wiefferink.areashop.commands.AddCommand;
+import me.wiefferink.areashop.commands.AddfriendCommand;
+import me.wiefferink.areashop.commands.AddsignCommand;
+import me.wiefferink.areashop.commands.BuyCommand;
+import me.wiefferink.areashop.commands.CommandAreaShop;
+import me.wiefferink.areashop.commands.DelCommand;
+import me.wiefferink.areashop.commands.DelfriendCommand;
+import me.wiefferink.areashop.commands.DelsignCommand;
+import me.wiefferink.areashop.commands.FindCommand;
+import me.wiefferink.areashop.commands.GroupaddCommand;
+import me.wiefferink.areashop.commands.GroupdelCommand;
+import me.wiefferink.areashop.commands.GroupinfoCommand;
+import me.wiefferink.areashop.commands.GrouplistCommand;
+import me.wiefferink.areashop.commands.HelpCommand;
+import me.wiefferink.areashop.commands.ImportCommand;
+import me.wiefferink.areashop.commands.InfoCommand;
+import me.wiefferink.areashop.commands.LinksignsCommand;
+import me.wiefferink.areashop.commands.MeCommand;
+import me.wiefferink.areashop.commands.MessageCommand;
+import me.wiefferink.areashop.commands.ReloadCommand;
+import me.wiefferink.areashop.commands.RentCommand;
+import me.wiefferink.areashop.commands.ResellCommand;
+import me.wiefferink.areashop.commands.SchematiceventCommand;
+import me.wiefferink.areashop.commands.SellCommand;
+import me.wiefferink.areashop.commands.SetdurationCommand;
+import me.wiefferink.areashop.commands.SetlandlordCommand;
+import me.wiefferink.areashop.commands.SetownerCommand;
+import me.wiefferink.areashop.commands.SetpriceCommand;
+import me.wiefferink.areashop.commands.SetrestoreCommand;
+import me.wiefferink.areashop.commands.SetteleportCommand;
+import me.wiefferink.areashop.commands.StackCommand;
+import me.wiefferink.areashop.commands.StopresellCommand;
+import me.wiefferink.areashop.commands.TeleportCommand;
+import me.wiefferink.areashop.commands.UnrentCommand;
+import org.bukkit.command.Command;
+import org.bukkit.command.CommandExecutor;
+import org.bukkit.command.CommandSender;
+import org.bukkit.command.TabCompleter;
+
+import java.util.*;
+
+public class CommandManager extends Manager implements CommandExecutor, TabCompleter {
+	private final List<CommandAreaShop> commands = new ArrayList<>();
+
+	/**
+	 * Constructor.
+	 */
+	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);
+		plugin.getCommand("AreaShop").setTabCompleter(this);
+	}
+
+	/**
+	 * Get the list with AreaShop commands.
+	 * @return The list with AreaShop commands
+	 */
+	public List<CommandAreaShop> getCommands() {
+		// Return a cloned array
+		return new ArrayList<>(commands);
+	}
+
+	/**
+	 * Shows the help page for the CommandSender.
+	 * @param target The CommandSender to show the help to
+	 */
+	public void showHelp(CommandSender target) {
+		if(!target.hasPermission("areashop.help")) {
+			plugin.message(target, "help-noPermission");
+			return;
+		}
+		// Add all messages to a list
+		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()) {
+				messages.add(help);
+			}
+		}
+		// Send the messages to the target
+		for(String message : messages) {
+			plugin.messageNoPrefix(target, message);
+		}
+	}
+
+	@Override
+	public boolean onCommand(CommandSender sender, Command command, String alias, String[] args) {
+		if(!plugin.isReady()) {
+			plugin.message(sender, "general-notReady");
+			return true;
+		}
+
+		// Redirect `/as info player <player>` to `/as me <player>`
+		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 (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
+		if (!executed) {
+			if (args.length == 0) {
+				this.showHelp(sender);
+			} else {
+				// Indicate that the '/as updaterents' and '/as updatebuys' commands are removed
+				if("updaterents".equalsIgnoreCase(args[0]) || "updatebuys".equalsIgnoreCase(args[0])) {
+					plugin.message(sender, "reload-updateCommandChanged");
+				} else {
+					plugin.message(sender, "cmd-notValid");
+				}
+			}
+		}
+
+		return true;
+	}
+
+	@Override
+	public List<String> onTabComplete(CommandSender sender, Command command, String alias, String[] args) {
+		if(!sender.hasPermission("areashop.tabcomplete")) {
+			return Collections.emptyList();
+		}
+		List<String> result = new ArrayList<>();
+		int toCompleteNumber = args.length;
+		String toCompletePrefix = args[args.length - 1].toLowerCase();
+		//AreaShop.debug("toCompleteNumber=" + toCompleteNumber + ", toCompletePrefix=" + toCompletePrefix + ", length=" + toCompletePrefix.length());
+		if(toCompleteNumber == 1) {
+			for(CommandAreaShop c : commands) {
+				String begin = c.getCommandStart();
+				result.add(begin.substring(begin.indexOf(' ') + 1));
+			}
+		} else {
+			String[] start = new String[args.length];
+			start[0] = command.getName();
+			System.arraycopy(args, 0, start, 1, args.length - 1);
+			for(CommandAreaShop c : commands) {
+				if(c.canExecute(command, args)) {
+					result = c.getTabCompleteList(toCompleteNumber, start, sender);
+					break;
+				}
+			}
+		}
+		// Filter and sort the results
+		if(!result.isEmpty()) {
+			SortedSet<String> set = new TreeSet<>();
+			for(String suggestion : result) {
+				if(suggestion.toLowerCase().startsWith(toCompletePrefix)) {
+					set.add(suggestion);
+				}
+			}
+			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

@@ -0,0 +1,92 @@
+package me.wiefferink.areashop.managers;
+
+import me.wiefferink.areashop.AreaShop;
+import me.wiefferink.areashop.features.CommandsFeature;
+import me.wiefferink.areashop.features.DebugFeature;
+import me.wiefferink.areashop.features.FriendsFeature;
+import me.wiefferink.areashop.features.RegionFeature;
+import me.wiefferink.areashop.features.teleport.TeleportFeature;
+import me.wiefferink.areashop.features.WorldGuardRegionFlagsFeature;
+import me.wiefferink.areashop.features.signs.SignsFeature;
+import me.wiefferink.areashop.interfaces.IRegion;
+import me.wiefferink.areashop.regions.LegacyGeneralRegion;
+import org.jetbrains.annotations.NotNull;
+
+import java.lang.reflect.Constructor;
+import java.lang.reflect.InvocationTargetException;
+import java.util.Arrays;
+import java.util.HashMap;
+import java.util.HashSet;
+import java.util.Map;
+import java.util.Set;
+
+public class FeatureManager extends Manager {
+
+	// List of defined features
+	private static final Set<Class<? extends RegionFeature>> featureClasses = new HashSet<>(Arrays.asList(
+			DebugFeature.class,
+			SignsFeature.class,
+			FriendsFeature.class,
+			WorldGuardRegionFlagsFeature.class,
+			TeleportFeature.class,
+			CommandsFeature.class
+	));
+	// One instance of each feature, registered for event handling
+	private final Set<RegionFeature> globalFeatures;
+	private final Map<Class<? extends RegionFeature>, Constructor<? extends RegionFeature>> regionFeatureConstructors;
+
+	/**
+	 * Constructor.
+	 */
+	public FeatureManager() {
+		// Instantiate and register global features (one per type, for event handling)
+		globalFeatures = new HashSet<>();
+		for(Class<? extends RegionFeature> clazz : featureClasses) {
+			try {
+				Constructor<? extends RegionFeature> constructor = clazz.getConstructor();
+				RegionFeature feature = constructor.newInstance();
+				feature.listen();
+				globalFeatures.add(feature);
+			} 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
+			}
+		}
+
+		// Setup constructors for region specific features
+		regionFeatureConstructors = new HashMap<>();
+		for(Class<? extends RegionFeature> clazz : featureClasses) {
+			try {
+				regionFeatureConstructors.put(clazz, clazz.getConstructor(IRegion.class));
+			} catch(NoSuchMethodException | IllegalArgumentException ignored) {
+				// The feature does not have a region specific part
+			}
+		}
+	}
+
+	@Override
+	public void shutdown() {
+		for(RegionFeature feature : globalFeatures) {
+			feature.shutdown();
+		}
+		// FIXME make this system less hacky!
+		SignsFeature.shutdownGlobalState();
+	}
+
+	/**
+	 * 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 <T extends RegionFeature> T getRegionFeature(@NotNull IRegion region, @NotNull Class<T> featureClazz) {
+		try {
+			return featureClazz.cast(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/Manager.java

@@ -0,0 +1,16 @@
+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.
+	 */
+	public void shutdown() {
+		// To override by extending classes
+	}
+
+}

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

@@ -1,216 +1,254 @@
-package nl.evolutioncoding.areashop.managers;
-
-import nl.evolutioncoding.areashop.AreaShop;
-import nl.evolutioncoding.areashop.Utils;
-import nl.evolutioncoding.areashop.regions.GeneralRegion;
-import org.bukkit.Location;
-import org.bukkit.Material;
-import org.bukkit.block.Block;
-import org.bukkit.block.BlockFace;
-import org.bukkit.entity.Player;
-import org.bukkit.event.EventHandler;
-import org.bukkit.event.EventPriority;
-import org.bukkit.event.HandlerList;
-import org.bukkit.event.Listener;
-import org.bukkit.event.block.Action;
-import org.bukkit.event.player.PlayerInteractEvent;
-import org.bukkit.event.player.PlayerQuitEvent;
-import org.bukkit.material.Sign;
-import org.bukkit.util.BlockIterator;
-
-import java.util.*;
-
-public class SignLinkerManager implements Listener {
-	private AreaShop plugin = null;
-	private Map<UUID, SignLinker> signLinkers;
-	private boolean eventsRegistered;
-	
-	public SignLinkerManager(AreaShop plugin) {
-		this.plugin = plugin;
-		signLinkers = new HashMap<>();
-		eventsRegistered = false;
-	}
-	
-	/**
-	 * Let a player enter sign linking mode
-	 * @param player The player that has to enter sign linking mode
-	 * @param profile The profile to use for the signs (null for default)
-	 */
-	public void enterSignLinkMode(Player player, String profile) {
-		signLinkers.put(player.getUniqueId(), new SignLinker(player, profile));
-		plugin.message(player, "linksigns-first");
-		plugin.message(player, "linksigns-next");
-		if(!eventsRegistered) {
-			eventsRegistered = true;
-			plugin.getServer().getPluginManager().registerEvents(this, plugin);
-		}
-	}
-	
-	/**
-	 * Let a player exit sign linking mode
-	 * @param player The player that has to exit sign linking mode
-	 */
-	public void exitSignLinkMode(Player player) {
-		signLinkers.remove(player.getUniqueId());
-		if(eventsRegistered && signLinkers.isEmpty()) {
-			eventsRegistered = false;
-			HandlerList.unregisterAll(this);
-		}
-		plugin.message(player, "linksigns-stopped");
-	}
-	
-	/**
-	 * Check if the player is in sign linking mode
-	 * @param player The player to check
-	 * @return true if the player is in sign linking mode, otherwise false
-	 */
-	public boolean isInSignLinkMode(Player player) {
-		return signLinkers.containsKey(player.getUniqueId());
-	}
-	
-	@EventHandler(priority = EventPriority.HIGH)
-	public void onPlayerInteract(PlayerInteractEvent event) {
-		AreaShop.debug("PlayerInteractEvent of " + event.getPlayer().getName() + ", " + signLinkers.size() + " signlinkers");
-		if(isInSignLinkMode(event.getPlayer())) {
-			event.setCancelled(true);
-			Player player = event.getPlayer();
-			SignLinker linker = signLinkers.get(event.getPlayer().getUniqueId());
-			if(event.getAction() == Action.RIGHT_CLICK_AIR || event.getAction() == Action.RIGHT_CLICK_BLOCK) {
-				// Get the region
-				BlockIterator blockIterator = new BlockIterator(player, 100);
-				while(blockIterator.hasNext()) {
-					Block next = blockIterator.next();
-					List<GeneralRegion> regions = Utils.getASRegionsByLocation(next.getLocation());
-					if(regions.size() == 1) {
-						linker.setRegion(regions.get(0));
-						return;
-					} else if(regions.size() > 1) {
-						Set<String> names = new HashSet<>();
-						for(GeneralRegion region : regions) {
-							names.add(region.getName());
-						}
-						plugin.message(player, "linksigns-multipleRegions", Utils.createCommaSeparatedList(names));
-						plugin.message(player, "linksigns-multipleRegionsAdvice");
-						return;
-					}					
-				}
-				// No regions found within the maximum range
-				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);
-				while(blockIterator.hasNext() && block == null) {
-					Block next = blockIterator.next();
-					if(next.getType() != Material.AIR) {
-						block = next;
-					}
-				}
-				if(block == null || !(block.getType() == Material.WALL_SIGN || block.getType() == Material.SIGN_POST)) {
-					plugin.message(player, "linksigns-noSign");
-					return;
-				}
-
-				GeneralRegion signRegion = plugin.getFileManager().getRegionBySignLocation(block.getLocation());
-				if(signRegion != null) {
-					plugin.message(player, "linksigns-alreadyRegistered", signRegion);
-					return;
-				}
-				Sign sign = (Sign)block.getState().getData();
-				linker.setSign(block.getLocation(), block.getType(), sign.getFacing());
-			}
-		}
-	}
-	
-	/**
-	 * Handle disconnection players
-	 */
-	@EventHandler(priority = EventPriority.MONITOR)
-	public void onPlayerLeave(PlayerQuitEvent event) {
-		AreaShop.debug("PlayerQuitEvent of " + event.getPlayer().getName() + ", " + signLinkers.size() + " signlinkers");
-		signLinkers.remove(event.getPlayer().getUniqueId());
-	}
-	
-	/**
-	 * Class to keep track of the signlinking data
-	 */
-	private class SignLinker {
-		private boolean hasSign = false;
-		private boolean hasRegion = false;
-		
-		public Player linker = null;
-		public String profile = null;
-		
-		public GeneralRegion region = null;
-		
-		public Location location = null;
-		public Material type = null;
-		public BlockFace facing = null;
-				
-		public SignLinker(Player linker, String profile) {
-			this.linker = linker;
-			this.profile = profile;
-		}
-		
-		public void setRegion(GeneralRegion region) {
-			this.region = region;
-			hasRegion = true;
-			if(!isComplete()) {
-				plugin.message(linker, "linksigns-regionFound", region);
-			}
-			finish();
-		}
-		
-		public void setSign(Location location, Material type, BlockFace facing) {
-			this.location = location;
-			this.type = type;
-			this.facing = facing;
-			hasSign = true;
-			if(!isComplete()) {
-				plugin.message(linker, "linksigns-signFound", location.getBlockX(), location.getBlockY(), location.getBlockZ());
-			}
-			finish();
-		}
-
-		public void finish() {
-			if(isComplete()) {
-				region.addSign(location, type, facing, profile);
-				if(profile == null) {
-					plugin.message(linker, "addsign-success", region);
-				} else {
-					plugin.message(linker, "addsign-successProfile", region, profile);
-				}
-				region.update();
-				reset();
-				
-				plugin.message(linker, "linksigns-next");
-			}
-		}
-		
-		public void reset() {
-			hasSign = false;
-			hasRegion = false;
-		}
-		
-		public boolean isComplete() {
-			return hasSign && hasRegion;
-		}
-	}
-	
-
-}
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
+package me.wiefferink.areashop.managers;
+
+import me.wiefferink.areashop.features.signs.RegionSign;
+import me.wiefferink.areashop.features.signs.SignsFeature;
+import me.wiefferink.areashop.regions.LegacyGeneralRegion;
+import me.wiefferink.areashop.tools.Materials;
+import me.wiefferink.areashop.tools.Utils;
+import org.bukkit.Bukkit;
+import org.bukkit.Location;
+import org.bukkit.Material;
+import org.bukkit.block.Block;
+import org.bukkit.block.BlockFace;
+import org.bukkit.block.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;
+import org.bukkit.event.HandlerList;
+import org.bukkit.event.Listener;
+import org.bukkit.event.block.Action;
+import org.bukkit.event.player.PlayerInteractEvent;
+import org.bukkit.event.player.PlayerQuitEvent;
+import org.bukkit.util.BlockIterator;
+
+import java.util.HashMap;
+import java.util.HashSet;
+import java.util.List;
+import java.util.Map;
+import java.util.Set;
+import java.util.UUID;
+
+public class SignLinkerManager extends Manager implements Listener {
+	private final Map<UUID, SignLinker> signLinkers;
+	private boolean eventsRegistered;
+
+	public SignLinkerManager() {
+		signLinkers = new HashMap<>();
+		eventsRegistered = false;
+	}
+
+	@Override
+	public void shutdown() {
+		for(UUID uuid : signLinkers.keySet()) {
+			exitSignLinkMode(uuid);
+		}
+	}
+
+	/**
+	 * Let a player enter sign linking mode.
+	 * @param player  The player that has to enter sign linking mode
+	 * @param profile The profile to use for the signs (null for default)
+	 */
+	public void enterSignLinkMode(Player player, String profile) {
+		signLinkers.put(player.getUniqueId(), new SignLinker(player, profile));
+		plugin.message(player, "linksigns-first");
+		plugin.message(player, "linksigns-next");
+		if(!eventsRegistered) {
+			eventsRegistered = true;
+			plugin.getServer().getPluginManager().registerEvents(this, plugin);
+		}
+	}
+
+	/**
+	 * Let a player exit sign linking mode.
+	 * @param player The player that has to exit sign linking mode
+	 */
+	public void exitSignLinkMode(Player player) {
+		signLinkers.remove(player.getUniqueId());
+		if(eventsRegistered && signLinkers.isEmpty()) {
+			eventsRegistered = false;
+			HandlerList.unregisterAll(this);
+		}
+		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");
+		}
+	}
+
+	/**
+	 * Check if the player is in sign linking mode.
+	 * @param player The player to check
+	 * @return true if the player is in sign linking mode, otherwise false
+	 */
+	public boolean isInSignLinkMode(Player player) {
+		return signLinkers.containsKey(player.getUniqueId());
+	}
+
+	/**
+	 * On player interactions.
+	 * @param event The PlayerInteractEvent
+	 */
+	@EventHandler(priority = EventPriority.HIGH)
+	public void onPlayerInteract(PlayerInteractEvent event) {
+		if(isInSignLinkMode(event.getPlayer())) {
+			event.setCancelled(true);
+			Player player = event.getPlayer();
+			SignLinker linker = signLinkers.get(event.getPlayer().getUniqueId());
+			if(event.getAction() == Action.RIGHT_CLICK_AIR || event.getAction() == Action.RIGHT_CLICK_BLOCK) {
+				// Get the region
+				BlockIterator blockIterator = new BlockIterator(player, 100);
+				while(blockIterator.hasNext()) {
+					Block next = blockIterator.next();
+					List<LegacyGeneralRegion> regions = Utils.getRegions(next.getLocation());
+					if(regions.size() == 1) {
+						linker.setRegion(regions.get(0));
+						return;
+					} else if(regions.size() > 1) {
+						Set<String> names = new HashSet<>();
+						for(LegacyGeneralRegion region : regions) {
+							names.add(region.getRegionId());
+						}
+						plugin.message(player, "linksigns-multipleRegions", Utils.createCommaSeparatedList(names));
+						plugin.message(player, "linksigns-multipleRegionsAdvice");
+						return;
+					}
+				}
+				// No regions found within the maximum range
+				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);
+				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(player, "linksigns-noSign");
+					return;
+				}
+
+				RegionSign regionSign = SignsFeature.getSignByLocation(block.getLocation());
+				if(regionSign != null) {
+					plugin.message(player, "linksigns-alreadyRegistered", regionSign.getRegion());
+					return;
+				}
+				final BlockData blockData = block.getBlockData();
+				final BlockFace rotation;
+				if (blockData instanceof Sign) {
+					rotation = ((Sign) blockData).getRotation();
+				} else if (blockData instanceof WallSign) {
+					rotation = ((WallSign) blockData).getFacing();
+				} else {
+					rotation = null;
+				}
+				linker.setSign(block.getLocation(), block.getType(), rotation);
+			}
+		}
+	}
+
+	/**
+	 * Handle disconnection players.
+	 * @param event The PlayerQuitEvent
+	 */
+	@EventHandler(priority = EventPriority.MONITOR)
+	public void onPlayerLeave(PlayerQuitEvent event) {
+		exitSignLinkMode(event.getPlayer());
+	}
+
+	/**
+	 * Class to keep track of the signlinking data.
+	 */
+	private class SignLinker {
+		private boolean hasSign = false;
+		private boolean hasRegion = false;
+
+		public final Player linker;
+		public final String profile;
+
+		public LegacyGeneralRegion region = null;
+
+		public Location location = null;
+		public Material type = null;
+		public BlockFace facing = null;
+
+		public SignLinker(Player linker, String profile) {
+			this.linker = linker;
+			this.profile = profile;
+		}
+
+		public void setRegion(LegacyGeneralRegion region) {
+			this.region = region;
+			hasRegion = true;
+			if(!isComplete()) {
+				plugin.message(linker, "linksigns-regionFound", region);
+			}
+			finish();
+		}
+
+		public void setSign(Location location, Material type, BlockFace facing) {
+			this.location = location;
+			this.type = type;
+			this.facing = facing;
+			hasSign = true;
+			if(!isComplete()) {
+				plugin.message(linker, "linksigns-signFound", location.getBlockX(), location.getBlockY(), location.getBlockZ());
+			}
+			finish();
+		}
+
+		public void finish() {
+			if(isComplete()) {
+				region.getSignsFeature().addSign(location, type, facing, profile);
+				if(profile == null) {
+					plugin.message(linker, "addsign-success", region);
+				} else {
+					plugin.message(linker, "addsign-successProfile", region, profile);
+				}
+				region.update();
+				reset();
+
+				plugin.message(linker, "linksigns-next");
+			}
+		}
+
+		public void reset() {
+			hasSign = false;
+			hasRegion = false;
+		}
+
+		public boolean isComplete() {
+			return hasSign && hasRegion;
+		}
+	}
+
+
+}
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+

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

@@ -0,0 +1,15 @@
+package me.wiefferink.areashop.module;
+
+import me.wiefferink.areashop.interfaces.IRegion;
+import me.wiefferink.areashop.regions.util.RegionFeatureHelper;
+import org.jetbrains.annotations.NotNull;
+
+import java.util.concurrent.locks.ReadWriteLock;
+
+public interface RegionFactory {
+
+    @NotNull RegionFeatureHelper createFeatureHelper(@NotNull IRegion region, @NotNull ReadWriteLock readWriteLock);
+
+    @NotNull RegionFeatureHelper createFeatureHelper(@NotNull IRegion region);
+
+}

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

@@ -0,0 +1,352 @@
+package me.wiefferink.areashop.regions;
+
+import me.wiefferink.areashop.regions.util.RegionStatus;
+import me.wiefferink.areashop.regions.util.RegionType;
+import org.bukkit.World;
+import org.bukkit.configuration.ConfigurationSection;
+import org.jetbrains.annotations.NotNull;
+import org.jetbrains.annotations.Nullable;
+
+import java.util.Objects;
+import java.util.Optional;
+import java.util.UUID;
+import java.util.concurrent.locks.ReadWriteLock;
+import java.util.concurrent.locks.ReentrantReadWriteLock;
+
+public class AbstractRegionMeta implements RegionMeta {
+
+    private static final String KEY_REGION_ID = "name";
+    private static final String KEY_RESTORE = "enableRestore";
+    private static final String KEY_SCHEMATIC_PROFILE = "schematicProfile";
+    //private static final String KEY_LAST_ACTIVE = "lastActive";
+    private static final String KEY_WORLD_NAME = "world";
+    private static final String KEY_LANDLORD = "landlord";
+    private static final String KEY_LANDLORD_NAME = "landlordName";
+
+    private static final String KEY_COUNT_FOR_LIMITS = "countForLimits";
+
+    protected transient final ReadWriteLock readWriteLock = new ReentrantReadWriteLock();
+
+    private @NotNull String regionId;
+    private @NotNull String world;
+    private @Nullable String schematicProfile;
+    private @NotNull RegionStatus regionStatus;
+
+    private @Nullable UUID landlord;
+    private @Nullable String lastKnownLandlordName;
+
+    private boolean restoreEnabled;
+    private boolean restrictedToRegion;
+    private boolean restrictedToWorld;
+    private boolean countForLimits;
+
+    protected AbstractRegionMeta(@NotNull ConfigurationSection configurationSection) {
+        load0(configurationSection);
+    }
+
+    protected AbstractRegionMeta(@NotNull String regionId,
+                                 @NotNull String world,
+                                 @Nullable String schematicProfile,
+                                 @NotNull RegionType regionType,
+                                 @NotNull RegionStatus regionStatus,
+                                 boolean restoreEnabled,
+                                 boolean restrictedToRegion,
+                                 boolean restrictedToWorld) {
+
+        this.regionId = Objects.requireNonNull(regionId);
+        this.world = Objects.requireNonNull(world);
+        this.schematicProfile = Objects.requireNonNull(schematicProfile);
+        this.regionStatus = Objects.requireNonNull(regionStatus);
+        this.restoreEnabled = restoreEnabled;
+        this.restrictedToRegion = restrictedToRegion;
+        this.restrictedToWorld = restrictedToWorld;
+
+    }
+
+    private void load0(@NotNull ConfigurationSection section) {
+        this.regionId = Objects.requireNonNull(section.getString(KEY_REGION_ID));
+        this.world = Objects.requireNonNull(section.getString(KEY_WORLD_NAME));
+        this.schematicProfile = section.getString(KEY_SCHEMATIC_PROFILE);
+
+    }
+
+    @Override
+    public void load(@NotNull ConfigurationSection section) {
+        lockWrite();
+        try {
+            load0(section);
+        } finally {
+            unlockWrite();
+        }
+    }
+
+    @Override
+    public void removeLandlord() {
+        lockWrite();
+        try {
+            this.landlord = null;
+            this.lastKnownLandlordName = null;
+        } finally {
+            unlockWrite();
+        }
+    }
+
+    @Override
+    public void landlord(@NotNull UUID landlord, @NotNull String lastKnownName) {
+        lockWrite();
+        try {
+            this.landlord = Objects.requireNonNull(landlord);
+            this.lastKnownLandlordName = Objects.requireNonNull(lastKnownName);
+        } finally {
+            unlockWrite();
+        }
+    }
+
+
+    @Override
+    public @NotNull Optional<@NotNull UUID> landlord() {
+        return Optional.ofNullable(this.landlord);
+    }
+
+    @Override
+    public @NotNull Optional<@NotNull String> landlordLastKnownName() {
+        lockWrite();
+        try {
+            return Optional.ofNullable(this.lastKnownLandlordName);
+        } finally {
+            unlockWrite();
+        }
+    }
+
+    @Override
+    public @NotNull String regionId() {
+        lockRead();
+        try {
+            return this.regionId;
+        } finally {
+            unlockRead();
+        }
+    }
+
+    @Override
+    public @NotNull String worldName() {
+        lockRead();
+        try {
+            return this.world;
+        } finally {
+            unlockRead();
+        }
+    }
+
+    @Override
+    public @NotNull Optional<@NotNull String> schematicProfile() {
+        lockRead();
+        try {
+            return Optional.ofNullable(this.schematicProfile);
+        } finally {
+            unlockRead();
+        }
+    }
+
+    @Override
+    public @NotNull RegionStatus status() {
+        lockRead();
+        try {
+            return this.regionStatus;
+        } finally {
+            unlockRead();
+        }
+    }
+
+    @Override
+    public boolean restoreEnabled() {
+        lockRead();
+        try {
+            return this.restoreEnabled;
+        } finally {
+            unlockRead();
+        }
+    }
+
+    @Override
+    public boolean restrictedToRegion() {
+        lockRead();
+        try {
+            return this.restrictedToRegion;
+        } finally {
+            unlockRead();
+        }
+    }
+
+    @Override
+    public boolean restrictedToWorld() {
+        lockRead();
+        try {
+            return this.restrictedToWorld || restrictedToRegion();
+        } finally {
+            unlockRead();
+        }
+    }
+
+    @Override
+    public void regionId(@NotNull String regionId) {
+        lockWrite();
+        try {
+            this.regionId = Objects.requireNonNull(regionId);
+        } finally {
+            unlockWrite();
+        }
+    }
+
+    @Override
+    public void world(@NotNull World world) {
+        lockWrite();
+        try {
+            this.world = world.getName();
+        } finally {
+            unlockWrite();
+        }
+    }
+
+    @Override
+    public void world(@NotNull String world) {
+        lockWrite();
+        try {
+            this.world = Objects.requireNonNull(world);
+        } finally {
+            unlockWrite();
+        }
+    }
+
+    @Override
+    public void schematicProfile(@Nullable String schematicProfile) {
+        lockWrite();
+        try {
+            this.schematicProfile = schematicProfile;
+        } finally {
+            unlockWrite();
+        }
+    }
+
+    @Override
+    public void status(@NotNull RegionStatus regionStatus) {
+        lockWrite();
+        try {
+            this.regionStatus = regionStatus;
+        } finally {
+            unlockWrite();
+        }
+    }
+
+    @Override
+    public void restoreEnabled(boolean restoreEnabled) {
+        lockWrite();
+        try {
+            this.restoreEnabled = restoreEnabled;
+        } finally {
+            unlockWrite();
+        }
+    }
+
+    @Override
+    public void restrictedToRegion(boolean restrictedToRegion) {
+        lockWrite();
+        try {
+            this.restrictedToRegion = restrictedToRegion;
+        } finally {
+            unlockWrite();
+        }
+    }
+
+    @Override
+    public void restrictedToWorld(boolean restrictedToWorld) {
+        lockWrite();
+        try {
+            this.restrictedToWorld = restrictedToWorld;
+        } finally {
+            unlockWrite();
+        }
+    }
+
+    @Override
+    public boolean countForLimits() {
+        lockRead();
+        try {
+            return this.countForLimits;
+        } finally {
+            unlockRead();
+        }
+    }
+
+    @Override
+    public void countForLimits(boolean countForLimits) {
+        lockWrite();
+        try {
+            this.countForLimits = countForLimits;
+        } finally {
+            unlockWrite();
+        }
+    }
+
+    @Override
+    public void saveTo(@NotNull ConfigurationSection section) {
+        section.set(KEY_REGION_ID, this.regionId);
+        section.set(KEY_RESTORE, this.restoreEnabled);
+        section.set(KEY_SCHEMATIC_PROFILE, this.schematicProfile);
+        section.set(KEY_WORLD_NAME, this.world);
+        section.set(KEY_LANDLORD, this.landlord);
+        section.set(KEY_LANDLORD_NAME, this.lastKnownLandlordName);
+        section.set(KEY_COUNT_FOR_LIMITS, this.countForLimits);
+    }
+
+    protected final void lockRead() {
+        this.readWriteLock.readLock().lock();
+    }
+
+    protected final void unlockRead() {
+        this.readWriteLock.readLock().unlock();
+    }
+
+    protected final void lockWrite() {
+        this.readWriteLock.writeLock().lock();
+    }
+
+    protected final void unlockWrite() {
+        this.readWriteLock.writeLock().unlock();
+    }
+
+    @Override
+    public boolean equals(Object o) {
+        if (this == o) return true;
+        if (o == null || getClass() != o.getClass()) return false;
+
+        AbstractRegionMeta that = (AbstractRegionMeta) o;
+
+        if (restoreEnabled != that.restoreEnabled) return false;
+        if (restrictedToRegion != that.restrictedToRegion) return false;
+        if (restrictedToWorld != that.restrictedToWorld) return false;
+        if (countForLimits != that.countForLimits) return false;
+        if (!regionId.equals(that.regionId)) return false;
+        if (!world.equals(that.world)) return false;
+        if (!Objects.equals(schematicProfile, that.schematicProfile))
+            return false;
+        if (regionStatus != that.regionStatus) return false;
+        if (!Objects.equals(landlord, that.landlord)) return false;
+        return Objects.equals(lastKnownLandlordName, that.lastKnownLandlordName);
+    }
+
+    @Override
+    public int hashCode() {
+        int result = regionId.hashCode();
+        result = 31 * result + world.hashCode();
+        result = 31 * result + (schematicProfile != null ? schematicProfile.hashCode() : 0);
+        result = 31 * result + regionStatus.hashCode();
+        result = 31 * result + (landlord != null ? landlord.hashCode() : 0);
+        result = 31 * result + (lastKnownLandlordName != null ? lastKnownLandlordName.hashCode() : 0);
+        result = 31 * result + (restoreEnabled ? 1 : 0);
+        result = 31 * result + (restrictedToRegion ? 1 : 0);
+        result = 31 * result + (restrictedToWorld ? 1 : 0);
+        result = 31 * result + (countForLimits ? 1 : 0);
+        return result;
+    }
+}

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

@@ -0,0 +1,7 @@
+package me.wiefferink.areashop.regions;
+
+public interface BuyMeta extends RegionMeta {
+
+
+
+}

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

@@ -0,0 +1,613 @@
+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;
+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.handlers.worldedit.v7.WorldEditHandler;
+import me.wiefferink.areashop.handlers.worldguard.v7.WorldGuardHandler;
+import me.wiefferink.areashop.managers.FileManager;
+import me.wiefferink.areashop.module.RegionFactory;
+import me.wiefferink.areashop.regions.util.*;
+import me.wiefferink.areashop.tools.Utils;
+import net.milkbowl.vault.economy.EconomyResponse;
+import org.bukkit.Bukkit;
+import org.bukkit.OfflinePlayer;
+import org.bukkit.World;
+import org.bukkit.command.CommandSender;
+import org.bukkit.configuration.file.YamlConfiguration;
+import org.bukkit.entity.Player;
+import org.jetbrains.annotations.NotNull;
+
+import java.util.UUID;
+
+public class BuyRegion extends AbstractRegion {
+
+	public static String KEY_SECTION = "buy";
+
+	public static String KEY_BUYER = "buyer";
+	public static String KEY_BUYER_NAME = "buyerName";
+	public static String KEY_PRICE = "price";
+	public static String KEY_RESELL_MODE = "resellMode";
+	public static String KEY_RESELL_PRICE = "resellPrice";
+	public static String KEY_MONEY_BACK_PERCENTAGE = "moneyBack";
+	public static String KEY_INACTIVE_TIME_THRESHOLD = "inactiveTimeUntilSell";
+
+	@AssistedInject
+	public BuyRegion(@NotNull @Assisted YamlConfiguration config,
+					 @NotNull RegionFactory regionFactory,
+					 @NotNull AreaShop plugin,
+					 @NotNull FileManager fileManager,
+					 @NotNull WorldEditHandler worldEditHandler,
+					 @NotNull WorldGuardHandler worldGuardHandler) {
+		super(config, regionFactory, plugin, fileManager, worldEditHandler, worldGuardHandler);
+	}
+
+	@Override
+	public RegionType getType() {
+		return RegionType.BUY;
+	}
+
+	@Override
+	public @NotNull BuyMeta regionMeta() {
+		return (BuyMeta) super.regionMeta();
+	}
+
+	@Override
+	public RegionStatus status() {
+		if(isSold() && isInResellingMode()) {
+			return RegionStatus.RESELL;
+		} else if(isSold() && !isInResellingMode()) {
+			return RegionStatus.SOLD;
+		} else {
+			return RegionStatus.FORSALE;
+		}
+	}
+
+	@Override
+	public boolean isAvailable() {
+		return !isSold();
+	}
+
+	/**
+	 * Get the UUID of the owner of this region.
+	 * @return The UUID of the owner of this region
+	 */
+	public UUID getBuyer() {
+		String buyer = config.getString("buy.buyer");
+		if(buyer != null) {
+			try {
+				return UUID.fromString(buyer);
+			} catch(IllegalArgumentException e) {
+				// Incorrect UUID
+			}
+		}
+		return null;
+	}
+
+	/**
+	 * Check if a player is the buyer of this region.
+	 * @param player Player to check
+	 * @return true if this player owns this region, otherwise false
+	 */
+	public boolean isBuyer(OfflinePlayer player) {
+		return player != null && isBuyer(player.getUniqueId());
+	}
+
+	public boolean isBuyer(UUID player) {
+		UUID buyer = getBuyer();
+		return !(buyer == null || player == null) && buyer.equals(player);
+	}
+
+	/**
+	 * Set the buyer of this region.
+	 * @param buyer The UUID of the player that should be set as buyer
+	 */
+	public void setBuyer(UUID buyer) {
+		if(buyer == null) {
+			setSetting("buy.buyer", null);
+			setSetting("buy.buyerName", null);
+		} else {
+			setSetting("buy.buyer", buyer.toString());
+			setSetting("buy.buyerName", Utils.toName(buyer));
+		}
+	}
+
+	/**
+	 * Get the name of the player that owns this region.
+	 * @return The name of the player that owns this region, if unavailable by UUID it will return the old cached name, if that is unavailable it will return <UNKNOWN>
+	 */
+	public String getPlayerName() {
+		String result = Utils.toName(getBuyer());
+		if(result == null || result.isEmpty()) {
+			result = getStringSetting("buy.buyerName");
+			if(result == null || result.isEmpty()) {
+				result = "<UNKNOWN>";
+			}
+		}
+		return result;
+	}
+
+	/**
+	 * Check if the region is sold.
+	 * @return true if the region is sold, otherwise false
+	 */
+	public boolean isSold() {
+		return getBuyer() != null;
+	}
+
+	/**
+	 * Check if the region is being resold.
+	 * @return true if the region is available for reselling, otherwise false
+	 */
+	public boolean isInResellingMode() {
+		return config.getBoolean("buy.resellMode");
+	}
+
+	/**
+	 * Get the price of the region.
+	 * @return The price of the region
+	 */
+	public double getPrice() {
+		return Math.max(0, Utils.evaluateToDouble(getStringSetting("buy.price"), this));
+	}
+
+	/**
+	 * Get the resell price of this region.
+	 * @return The resell price if isInResellingMode(), otherwise 0.0
+	 */
+	public double getResellPrice() {
+		return Math.max(0, config.getDouble("buy.resellPrice"));
+	}
+
+	/**
+	 * Get the formatted string of the price (includes prefix and suffix).
+	 * @return The formatted string of the price
+	 */
+	public String getFormattedPrice() {
+		return Utils.formatCurrency(getPrice());
+	}
+
+	/**
+	 * Get the formatted string of the resellprice (includes prefix and suffix).
+	 * @return The formatted string of the resellprice
+	 */
+	public String getFormattedResellPrice() {
+		return Utils.formatCurrency(getResellPrice());
+	}
+
+	/**
+	 * Change the price of the region.
+	 * @param price The price to set this region to
+	 */
+	public void setPrice(Double price) {
+		setSetting("buy.price", price);
+	}
+
+	/**
+	 * Set the region into resell mode with the given price.
+	 * @param price The price this region should be put up for sale
+	 */
+	public void enableReselling(double price) {
+		setSetting("buy.resellMode", true);
+		setSetting("buy.resellPrice", price);
+	}
+
+	/**
+	 * Stop this region from being in resell mode.
+	 */
+	public void disableReselling() {
+		setSetting("buy.resellMode", null);
+		setSetting("buy.resellPrice", null);
+	}
+
+	/**
+	 * Get the moneyBack percentage.
+	 * @return The % of money the player will get back when selling
+	 */
+	public double getMoneyBackPercentage() {
+		return Utils.evaluateToDouble(getStringSetting("buy.moneyBack"), this);
+	}
+
+	/**
+	 * Get the amount of money that should be paid to the player when selling the region.
+	 * @return The amount of money the player should get back
+	 */
+	public double getMoneyBackAmount() {
+		return getPrice() * (getMoneyBackPercentage() / 100.0);
+	}
+
+	/**
+	 * Get the formatted string of the amount of the moneyBack amount.
+	 * @return String with currency symbols and proper fractional part
+	 */
+	public String getFormattedMoneyBackAmount() {
+		return Utils.formatCurrency(getMoneyBackAmount());
+	}
+
+	@Override
+	public Object provideReplacement(String variable) {
+		switch(variable) {
+			case AreaShop.tagPrice:
+				return getFormattedPrice();
+			case AreaShop.tagRawPrice:
+				return getPrice();
+			case AreaShop.tagPlayerName:
+				return getPlayerName();
+			case AreaShop.tagPlayerUUID:
+				return getBuyer();
+			case AreaShop.tagResellPrice:
+				return getFormattedResellPrice();
+			case AreaShop.tagRawResellPrice:
+				return getResellPrice();
+			case AreaShop.tagMoneyBackAmount:
+				return getFormattedMoneyBackAmount();
+			case AreaShop.tagRawMoneyBackAmount:
+				return getMoneyBackAmount();
+			case AreaShop.tagMoneyBackPercentage:
+				return getMoneyBackPercentage() % 1.0 == 0.0 ? (int)getMoneyBackPercentage() : getMoneyBackPercentage();
+			case AreaShop.tagMaxInactiveTime:
+				return this.getFormattedInactiveTimeUntilSell();
+
+			default:
+				return super.provideReplacement(variable);
+		}
+	}
+
+	/**
+	 * Minutes until automatic unrent when player is offline.
+	 * @return The number of milliseconds until the region is unrented while player is offline
+	 */
+	public long getInactiveTimeUntilSell() {
+		return Utils.getDurationFromMinutesOrStringInput(getStringSetting("buy.inactiveTimeUntilSell"));
+	}
+
+	/**
+	 * Get a human readable string indicating how long the player can be offline until automatic unrent.
+	 * @return String indicating the inactive time until unrent
+	 */
+	public String getFormattedInactiveTimeUntilSell() {
+		return Utils.millisToHumanFormat(getInactiveTimeUntilSell());
+	}
+
+	/**
+	 * Buy a region.
+	 * @param offlinePlayer The player that wants to buy the region
+	 * @return true if it succeeded and false if not
+	 */
+	@SuppressWarnings("deprecation")
+	public boolean buy(OfflinePlayer offlinePlayer) {
+		// Check if the player has permission
+		if(!plugin.hasPermission(offlinePlayer, "areashop.buy")) {
+			message(offlinePlayer, "buy-noPermission");
+			return false;
+		}
+
+		if(plugin.getEconomy() == null) {
+			message(offlinePlayer, "general-noEconomy");
+			return false;
+		}
+
+		if(isInResellingMode()) {
+			if(!plugin.hasPermission(offlinePlayer, "areashop.buyresell")) {
+				message(offlinePlayer, "buy-noPermissionResell");
+				return false;
+			}
+		} else {
+			if(!plugin.hasPermission(offlinePlayer, "areashop.buynormal")) {
+				message(offlinePlayer, "buy-noPermissionNoResell");
+				return false;
+			}
+		}
+
+		if(getWorld() == null) {
+			message(offlinePlayer, "general-noWorld");
+			return false;
+		}
+
+		if(getRegion() == null) {
+			message(offlinePlayer, "general-noRegion");
+			return false;
+		}
+
+		if (isSold() && !(isInResellingMode() && !isBuyer(offlinePlayer))) {
+			if(isBuyer(offlinePlayer)) {
+				message(offlinePlayer, "buy-yours");
+			} else {
+				message(offlinePlayer, "buy-someoneElse");
+			}
+			return false;
+		}
+
+		boolean isResell = isInResellingMode();
+
+		// Only relevant if the player is online
+		Player player = offlinePlayer.getPlayer();
+		if(player != null) {
+			// Check if the players needs to be in the region for buying
+			if(restrictedToRegion() && (!player.getWorld().getName().equals(getWorldName())
+					|| !getRegion().contains(player.getLocation().getBlockX(), player.getLocation().getBlockY(), player.getLocation().getBlockZ()))) {
+				message(offlinePlayer, "buy-restrictedToRegion");
+				return false;
+			}
+			// Check if the players needs to be in the world for buying
+			if(restrictedToWorld() && !player.getWorld().getName().equals(getWorldName())) {
+				message(offlinePlayer, "buy-restrictedToWorld", player.getWorld().getName());
+				return false;
+			}
+		}
+
+		// Check region limits
+		LimitResult limitResult = this.limitsAllow(RegionType.BUY, offlinePlayer);
+		AreaShop.debug("LimitResult: " + limitResult.toString());
+		if(!limitResult.actionAllowed()) {
+			if(limitResult.getLimitingFactor() == LimitType.TOTAL) {
+				message(offlinePlayer, "total-maximum", limitResult.getMaximum(), limitResult.getCurrent(), limitResult.getLimitingGroup());
+				return false;
+			}
+			if(limitResult.getLimitingFactor() == LimitType.BUYS) {
+				message(offlinePlayer, "buy-maximum", limitResult.getMaximum(), limitResult.getCurrent(), limitResult.getLimitingGroup());
+				return false;
+			}
+			// Should not be reached, but is safe like this
+			return false;
+		}
+
+		// Check if the player has enough money
+		if (isResell && !plugin.getEconomy().has(offlinePlayer, getWorldName(), getResellPrice())) {
+			message(offlinePlayer, "buy-lowMoneyResell", Utils.formatCurrency(plugin.getEconomy().getBalance(offlinePlayer, getWorldName())));
+			return false;
+		}
+		if (!isResell && !plugin.getEconomy().has(offlinePlayer, getWorldName(), getPrice())) {
+			message(offlinePlayer, "buy-lowMoney", Utils.formatCurrency(plugin.getEconomy().getBalance(offlinePlayer, getWorldName())));
+			return false;
+		}
+
+		UUID oldOwner = getBuyer();
+		if(isResell && oldOwner != null) {
+			// Broadcast and check event
+			ResellingRegionEvent event = new ResellingRegionEvent(this, offlinePlayer);
+			Bukkit.getPluginManager().callEvent(event);
+			if(event.isCancelled()) {
+				message(offlinePlayer, "general-cancelled", event.getReason());
+				return false;
+			}
+
+			getFriendsFeature().clearFriends();
+			double resellPrice = getResellPrice();
+			// Transfer the money to the previous owner
+			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 " + getRegionId() + ": " + r.errorMessage);
+				return false;
+			}
+			r = null;
+			OfflinePlayer oldOwnerPlayer = Bukkit.getOfflinePlayer(oldOwner);
+			String oldOwnerName = getPlayerName();
+			if(oldOwnerPlayer != null && oldOwnerPlayer.getName() != null) {
+				r = plugin.getEconomy().depositPlayer(oldOwnerPlayer, getWorldName(), getResellPrice());
+				oldOwnerName = oldOwnerPlayer.getName();
+			} else if(oldOwnerName != null) {
+				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 " + getRegionId() + " to " + offlinePlayer.getName());
+			}
+			// Resell is done, disable that now
+			disableReselling();
+
+			// Set the owner
+			setBuyer(offlinePlayer.getUniqueId());
+			updateLastActiveTime();
+
+			// Update everything
+			handleSchematicEvent(RegionEvent.RESELL);
+
+			// Notify about updates
+			this.notifyAndUpdate(new ResoldRegionEvent(this, oldOwner));
+
+			// Send message to the player
+			message(offlinePlayer, "buy-successResale", oldOwnerName);
+			Player seller = Bukkit.getPlayer(oldOwner);
+			if(seller != null) {
+				message(seller, "buy-successSeller", resellPrice);
+			}
+		} else {
+			// Broadcast and check event
+			BuyingRegionEvent event = new BuyingRegionEvent(this, offlinePlayer);
+			Bukkit.getPluginManager().callEvent(event);
+			if(event.isCancelled()) {
+				message(offlinePlayer, "general-cancelled", event.getReason());
+				return false;
+			}
+
+			// Substract the money from the players balance
+			EconomyResponse r = plugin.getEconomy().withdrawPlayer(offlinePlayer, getWorldName(), getPrice());
+			if(!r.transactionSuccess()) {
+				message(offlinePlayer, "buy-payError");
+				return false;
+			}
+			// Optionally give money to the landlord
+			OfflinePlayer landlordPlayer = null;
+			if(getLandlord() != null) {
+				landlordPlayer = Bukkit.getOfflinePlayer(getLandlord());
+			}
+			String landlordName = getLandlordName();
+			if(landlordName != null) {
+				if(landlordPlayer != null && landlordPlayer.getName() != null) {
+					r = plugin.getEconomy().depositPlayer(landlordPlayer, getWorldName(), getPrice());
+				} else {
+					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 " + getRegionId() + " to " + offlinePlayer.getName());
+				}
+			}
+
+			// Set the owner
+			setBuyer(offlinePlayer.getUniqueId());
+			updateLastActiveTime();
+
+			// Send message to the player
+			message(offlinePlayer, "buy-succes");
+
+			// Update everything
+			handleSchematicEvent(RegionEvent.BOUGHT);
+
+			// Notify about updates
+			this.notifyAndUpdate(new BoughtRegionEvent(this));
+		}
+		return true;
+	}
+
+	/**
+	 * Sell a buyed region, get part of the money back.
+	 * @param giveMoneyBack true if the player should be given money back, otherwise false
+	 * @param executor      CommandSender to receive a message when the sell fails, or null
+	 * @return true if the region has been sold, otherwise false
+	 */
+	@SuppressWarnings("deprecation")
+	public boolean sell(boolean giveMoneyBack, CommandSender executor) {
+		boolean own = executor instanceof Player && this.isBuyer((Player)executor);
+		if(executor != null) {
+			if(!executor.hasPermission("areashop.sell") && !own) {
+				message(executor, "sell-noPermissionOther");
+				return false;
+			}
+			if(!executor.hasPermission("areashop.sell") && !executor.hasPermission("areashop.sellown") && own) {
+				message(executor, "sell-noPermission");
+				return false;
+			}
+			if(!executor.hasPermission("areashop.sell")
+					&& executor.hasPermission("areashop.sellown")
+					&& own
+					&& getBooleanSetting("buy.sellDisabled")) {
+				message(executor, "sell-disabled");
+				return false;
+			}
+		}
+
+		if(plugin.getEconomy() == null) {
+			return false;
+		}
+
+		// Broadcast and check event
+		SellingRegionEvent event = new SellingRegionEvent(this);
+		Bukkit.getPluginManager().callEvent(event);
+		if(event.isCancelled()) {
+			message(executor, "general-cancelled", event.getReason());
+			return false;
+		}
+
+		disableReselling();
+		// Give part of the buying price back
+		double moneyBack = getMoneyBackAmount();
+		if(moneyBack > 0 && giveMoneyBack) {
+			boolean noPayBack = false;
+			OfflinePlayer landlordPlayer = null;
+			if(getLandlord() != null) {
+				landlordPlayer = Bukkit.getOfflinePlayer(getLandlord());
+			}
+			String landlordName = getLandlordName();
+			EconomyResponse r;
+			if(landlordName != null) {
+				if(landlordPlayer != null && landlordPlayer.getName() != null) {
+					r = plugin.getEconomy().withdrawPlayer(landlordPlayer, getWorldName(), moneyBack);
+				} else {
+					r = plugin.getEconomy().withdrawPlayer(landlordName, getWorldName(), moneyBack);
+				}
+				if(r == null || !r.transactionSuccess()) {
+					noPayBack = true;
+				}
+			}
+
+			// Give back the money
+			OfflinePlayer player = Bukkit.getOfflinePlayer(getBuyer());
+			if(player != null && !noPayBack) {
+				EconomyResponse response = null;
+				boolean error = false;
+				try {
+					if(player.getName() != null) {
+						response = plugin.getEconomy().depositPlayer(player, getWorldName(), moneyBack);
+					} else if(getPlayerName() != null) {
+						response = plugin.getEconomy().depositPlayer(getPlayerName(), getWorldName(), moneyBack);
+					}
+				} catch(Exception e) {
+					error = true;
+				}
+				if(error || response == null || !response.transactionSuccess()) {
+					AreaShop.warn("Something went wrong with paying back money to " + getPlayerName() + " while selling region " + getRegionId());
+				}
+			}
+		}
+
+		// Handle schematic save/restore (while %uuid% is still available)
+		handleSchematicEvent(RegionEvent.SOLD);
+
+		// Send message: before actual removal of the buyer so that it is still available for variables
+		message(executor, "sell-sold");
+
+		// Remove friends and the owner
+		getFriendsFeature().clearFriends();
+		UUID oldBuyer = getBuyer();
+		setBuyer(null);
+		removeLastActiveTime();
+
+		// Notify about updates
+		this.notifyAndUpdate(new SoldRegionEvent(this, oldBuyer, Math.max(moneyBack, 0)));
+		return true;
+	}
+
+	@Override
+	public boolean checkInactive() {
+		if(isDeleted() || !isSold()) {
+			return false;
+		}
+		long inactiveSetting = getInactiveTimeUntilSell();
+		OfflinePlayer player = Bukkit.getOfflinePlayer(getBuyer());
+		if(inactiveSetting <= 0 || player.isOp()) {
+			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(now > (lastPlayed + inactiveSetting)) {
+			AreaShop.info("Region " + getRegionId() + " unrented because of inactivity for player " + getPlayerName());
+			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/BuyRegionMetaImpl.java

@@ -0,0 +1,6 @@
+package me.wiefferink.areashop.regions;
+
+public class BuyRegionMetaImpl extends AbstractRegionMeta {
+
+
+}

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

@@ -0,0 +1,228 @@
+package me.wiefferink.areashop.regions;
+
+import me.wiefferink.areashop.events.NotifyRegionEvent;
+import me.wiefferink.areashop.interfaces.IRegion;
+import me.wiefferink.areashop.regions.util.*;
+import me.wiefferink.interactivemessenger.processing.ReplacementProvider;
+import org.bukkit.OfflinePlayer;
+import org.bukkit.command.CommandSender;
+import org.bukkit.util.Vector;
+import org.jetbrains.annotations.NotNull;
+
+import java.util.List;
+import java.util.Set;
+import java.util.concurrent.CompletableFuture;
+
+public interface MarketableRegion extends IRegion, Comparable<MarketableRegion>, ReplacementProvider {
+    /**
+     * Get the amount of regions a player has matching a certain limits group (config.yml -- limitGroups)
+     *
+     * @param player     The player to check the amount for
+     * @param limitGroup The group to check
+     * @param regions    All the regions a player has bought or rented
+     * @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)
+     */
+    static int hasRegionsInLimitGroup(OfflinePlayer player, String limitGroup, List<? extends MarketableRegion> regions, MarketableRegion exclude) {
+        int result = 0;
+        for (MarketableRegion region : regions) {
+            final RegionMeta meta = region.regionMeta();
+            if (meta.countForLimits()
+                    // && region.isOwner(player)
+                    && region.matchesLimitGroup(limitGroup)
+                    && (exclude == null || !exclude.getRegionId().equals(region.getRegionId()))) {
+                result++;
+            }
+        }
+        return result;
+    }
+
+    @NotNull RegionMeta regionMeta();
+
+    @NotNull RegionFeatureHelper featureHelper();
+
+    /**
+     * Shared setup of all constructors.
+     */
+    void setup();
+
+    /**
+     * Deregister everything.
+     */
+    void destroy();
+
+    /**
+     * Broadcast an event to indicate that region settings have been changed.
+     * This will update region flags, signs, etc.
+     */
+    void update();
+
+    /**
+     * Broadcast the given event and update the region status.
+     *
+     * @param event The update event that should be broadcasted
+     */
+    void notifyAndUpdate(NotifyRegionEvent<?> event);
+
+    /**
+     * Check if the region has been deleted.
+     *
+     * @return true if the region has been deleted, otherwise false
+     */
+    boolean isDeleted();
+
+    /**
+     * Indicate that this region has been deleted.
+     */
+    void delete();
+
+    /**
+     * Get the minimum corner of the region.
+     *
+     * @return Vector
+     */
+    Vector getMinimumPoint();
+
+    /**
+     * Get the maximum corner of the region.
+     *
+     * @return Vector
+     */
+    Vector getMaximumPoint();
+
+    /**
+     * Get the groups that this region is added to.
+     *
+     * @return A Set with all groups of this region
+     */
+    Set<RegionGroup> getGroups();
+
+    /**
+     * Get a list of names from groups this region is in.
+     *
+     * @return A list of groups this region is part of
+     */
+    List<String> getGroupNames();
+
+    /**
+     * Method to send a message to a CommandSender, using chatprefix if it is a player.
+     * Automatically includes the region in the message, enabling the use of all variables.
+     *
+     * @param target The CommandSender you wan't to send the message to (e.g. a player)
+     * @param key    The key to get the translation
+     * @param prefix Specify if the message should have a prefix
+     * @param params The parameters to inject into the message string
+     */
+    void configurableMessage(Object target, String key, boolean prefix, Object... params);
+
+    void messageNoPrefix(Object target, String key, Object... params);
+
+    void message(Object target, String key, Object... params);
+
+    /**
+     * 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
+     */
+    boolean saveRegionBlocks(String fileName);
+
+    /**
+     * 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
+     */
+    CompletableFuture<Boolean> saveRegionBlocksAsync(String fileName);
+
+    /**
+     * 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
+     */
+    boolean restoreRegionBlocks(String fileName);
+
+    /**
+     * 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
+     */
+    CompletableFuture<Boolean> restoreRegionBlocksAsync(String fileName);
+
+    /**
+     * Reset all flags of the region.
+     */
+    void resetRegionFlags();
+
+    /**
+     * Indicate this region needs to be saved, saving will happen by a repeating task.
+     */
+    void saveRequired();
+
+    /**
+     * Check if a save is required.
+     *
+     * @return true if a save is required because some data changed, otherwise false
+     */
+    boolean isSaveRequired();
+
+    /**
+     * Save this region to disk now, using this method could slow down the plugin, normally saveRequired() should be used.
+     *
+     * @return true if the region is saved successfully, otherwise false
+     */
+    boolean saveNow();
+
+    CompletableFuture<Boolean> saveNowAsync();
+
+    /**
+     * Check if the player can buy/rent this region, detailed info in the result object.
+     *
+     * @param type   The type of region to check
+     * @param player The player to check it for
+     * @return LimitResult containing if it is allowed, why and limiting factor
+     */
+    LimitResult limitsAllow(RegionType type, OfflinePlayer player);
+
+    /**
+     * Check if the player can buy/rent this region, detailed info in the result object.
+     *
+     * @param type          The type of region to check
+     * @param offlinePlayer The player to check it for
+     * @param extend        Check for extending of rental regions
+     * @return LimitResult containing if it is allowed, why and limiting factor
+     */
+    LimitResult limitsAllow(RegionType type, OfflinePlayer offlinePlayer, boolean extend);
+
+    /**
+     * Check if this region matches the filters of a limit group.
+     *
+     * @param group The group to check
+     * @return true if the region applies to the limit group, otherwise false
+     */
+    boolean matchesLimitGroup(String group);
+
+    /**
+     * Checks an event and handles saving to and restoring from schematic for it.
+     *
+     * @param type The type of event
+     */
+    void handleSchematicEvent(RegionEvent type);
+
+    /**
+     * Run commands as the CommandsSender, replacing all tags with the relevant values.
+     *
+     * @param sender   The sender that should perform the command
+     * @param commands A list of the commands to run (without slash and with tags)
+     */
+    void runCommands(CommandSender sender, List<String> commands);
+
+    /**
+     * Get the volume of the region (number of blocks inside it).
+     *
+     * @return Number of blocks in the region
+     */
+    long volume();
+}

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

@@ -0,0 +1,7 @@
+# Regions
+
+This package contains the `GeneralRegion` class which represents a region in AreaShop. Such a region is linked to a WorldGuard region and has its own configuration file at `/plugins/AreaShop/regions/<name>.yml`.
+
+The `BuyRegion` and `RentRegion` classes represent buy and rental regions (mutually exclusive) and inherit from `GeneralRegion`.
+
+To group regions there is `RegionGroup`, which allows configuring settings for a lot of regions at once.

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

@@ -0,0 +1,225 @@
+package me.wiefferink.areashop.regions;
+
+import me.wiefferink.areashop.AreaShop;
+import org.bukkit.configuration.ConfigurationSection;
+import org.bukkit.configuration.file.YamlConfiguration;
+
+import java.util.ArrayList;
+import java.util.HashSet;
+import java.util.Set;
+
+// TODO consider switching to saving lowercase regions
+public class RegionGroup {
+
+	private final AreaShop plugin;
+	private final String name;
+	private final Set<String> regions;
+	private Set<String> autoRegions;
+	private boolean autoDirty;
+	private final Set<String> worlds;
+
+	/**
+	 * Constructor, used when creating new groups or restoring them from groups.yml at server boot.
+	 * @param plugin The AreaShop plugin
+	 * @param name   Name of the group, has to be unique
+	 */
+	public RegionGroup(AreaShop plugin, String name) {
+		this.plugin = plugin;
+		this.name = name;
+		this.autoDirty = true;
+		setSetting("name", name);
+
+		// Load regions and worlds
+		regions = new HashSet<>(getSettings().getStringList("regions"));
+		worlds = new HashSet<>(getSettings().getStringList("worlds"));
+	}
+
+	/**
+	 * Get automatically added regions.
+	 * @return Set of regions automatically added by the configuration
+	 */
+	public Set<String> getAutoRegions() {
+		if(autoDirty) {
+			autoRegions = new HashSet<>();
+			for(LegacyGeneralRegion region : plugin.getFileManager().getRegions()) {
+				if(worlds.contains(region.getWorldName())) {
+					autoRegions.add(region.getRegionId());
+				}
+			}
+			autoDirty = false;
+		}
+		return autoRegions;
+	}
+
+	/**
+	 * Mark that automatically added regions should be regenerated.
+	 */
+	public void autoDirty() {
+		autoDirty = true;
+	}
+
+	/**
+	 * Adds a world from which all regions should be added to the group.
+	 * @param world World from which all regions should be added
+	 * @return true if the region was not already added, otherwise false
+	 */
+	public boolean addWorld(String world) {
+		if(worlds.add(world)) {
+			setSetting("regionsFromWorlds", new ArrayList<>(worlds));
+			saveRequired();
+			autoDirty();
+			return true;
+		}
+		return false;
+	}
+
+	/**
+	 * Remove a member from the group.
+	 * @param world World to remove
+	 * @return true if the region was in the group before, otherwise false
+	 */
+	public boolean removeWorld(String world) {
+		if(worlds.remove(world)) {
+			setSetting("regionsFromWorlds", new ArrayList<>(worlds));
+			saveRequired();
+			autoDirty();
+			return true;
+		}
+		return false;
+	}
+
+	/**
+	 * Get all worlds from which regions are added automatically.
+	 * @return A list with the names of all worlds (immutable)
+	 */
+	public Set<String> getWorlds() {
+		return new HashSet<>(worlds);
+	}
+
+	/**
+	 * Adds a member to a group.
+	 * @param region The region to add to the group (GeneralRegion or a subclass of it)
+	 * @return true if the region was not already added, otherwise false
+	 */
+	public boolean addMember(MarketableRegion region) {
+		if(regions.add(region.getRegionId())) {
+			setSetting("regions", new ArrayList<>(regions));
+			saveRequired();
+			return true;
+		}
+		return false;
+	}
+
+	/**
+	 * Remove a member from the group.
+	 * @param region The region to remove
+	 * @return true if the region was in the group before, otherwise false
+	 */
+	public boolean removeMember(MarketableRegion region) {
+		if(regions.remove(region.getRegionId())) {
+			setSetting("regions", new ArrayList<>(regions));
+			saveRequired();
+			return true;
+		}
+		return false;
+	}
+
+	/**
+	 * Get all members of the group.
+	 * @return A list with the names of all members of the group (immutable)
+	 */
+	public Set<String> getMembers() {
+		HashSet<String> result = new HashSet<>(regions);
+		result.addAll(getAutoRegions());
+		return result;
+	}
+
+	/**
+	 * Get all manually added members of the group.
+	 * @return A list with the names of all members of the group (immutable)
+	 */
+	public Set<String> getManualMembers() {
+		return new HashSet<>(regions);
+	}
+
+	/**
+	 * Get all members of the group as GeneralRegions.
+	 * @return A Set with all group members
+	 */
+	public Set<LegacyGeneralRegion> getMemberRegions() {
+		Set<LegacyGeneralRegion> result = new HashSet<>();
+		for(String playerName : getMembers()) {
+			result.add(plugin.getFileManager().getRegion(playerName));
+		}
+		return result;
+	}
+
+	/**
+	 * Get the name of the group.
+	 * @return The name of the group
+	 */
+	public String getName() {
+		return name;
+	}
+
+	/**
+	 * Get the lowercase name of the group (used for getting the config etc).
+	 * @return The name of the group in lowercase
+	 */
+	public String getLowerCaseName() {
+		return getName().toLowerCase();
+	}
+
+	/**
+	 * Check if a region is member of the group.
+	 * @param region Region to check
+	 * @return true if the region is in the group, otherwise false
+	 */
+	public boolean isMember(LegacyGeneralRegion region) {
+		return getMembers().contains(region.getRegionId());
+	}
+
+	/**
+	 * Get the priority of the group (higher overwrites).
+	 * @return The priority of the group
+	 */
+	public int getPriority() {
+		return getSettings().getInt("priority");
+	}
+
+	/**
+	 * Get the configurationsection with the settings of this group.
+	 * @return The ConfigurationSection with the settings of the group
+	 */
+	public ConfigurationSection getSettings() {
+		ConfigurationSection result =  plugin.getFileManager().getGroupSettings(name);
+		if(result != null) {
+			return result;
+		} else {
+			return new YamlConfiguration();
+		}
+	}
+
+	/**
+	 * Set a setting of this group.
+	 * @param path    The path to set
+	 * @param setting The value to set
+	 */
+	public void setSetting(String path, Object 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() {
+		plugin.getFileManager().saveGroupsIsRequired();
+	}
+
+	/**
+	 * Save the groups to disk now, normally saveRequired() is preferred because of performance.
+	 */
+	public void saveNow() {
+		plugin.getFileManager().saveGroupsNow();
+	}
+}

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

@@ -0,0 +1,65 @@
+package me.wiefferink.areashop.regions;
+
+import me.wiefferink.areashop.regions.util.RegionStatus;
+import me.wiefferink.areashop.regions.util.RegionType;
+import org.bukkit.World;
+import org.bukkit.configuration.ConfigurationSection;
+import org.bukkit.entity.Player;
+import org.jetbrains.annotations.NotNull;
+import org.jetbrains.annotations.Nullable;
+
+import java.util.Optional;
+import java.util.UUID;
+
+public interface RegionMeta {
+
+    void load(@NotNull ConfigurationSection section);
+
+    @NotNull String regionId();
+
+    void regionId(@NotNull String regionId);
+
+    @NotNull String worldName();
+
+    @NotNull Optional<@NotNull UUID> landlord();
+
+    @NotNull Optional<@NotNull String> landlordLastKnownName();
+
+    void removeLandlord();
+
+    void landlord(@NotNull UUID landlord, @NotNull String lastKnownName);
+
+    default void landlord(@NotNull Player player) {
+        landlord(player.getUniqueId(), player.getName());
+    }
+
+    void world(@NotNull World world);
+
+    void world(@NotNull String worldName);
+
+    @NotNull Optional<@NotNull String> schematicProfile();
+
+    void schematicProfile(@Nullable String schematicProfile);
+
+    @NotNull RegionStatus status();
+
+    void status(@NotNull RegionStatus status);
+
+    boolean restoreEnabled();
+
+    void restoreEnabled(boolean enabled);
+
+    boolean restrictedToRegion();
+
+    void restrictedToRegion(boolean restricted);
+
+    boolean restrictedToWorld();
+
+    void restrictedToWorld(boolean restricted);
+
+    boolean countForLimits();
+
+    void countForLimits(boolean counts);
+
+    void saveTo(@NotNull ConfigurationSection configurationSection);
+}

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

@@ -0,0 +1,748 @@
+package me.wiefferink.areashop.regions;
+
+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.regions.util.*;
+import me.wiefferink.areashop.tools.Utils;
+import net.milkbowl.vault.economy.EconomyResponse;
+import org.bukkit.Bukkit;
+import org.bukkit.OfflinePlayer;
+import org.bukkit.World;
+import org.bukkit.command.CommandSender;
+import org.bukkit.configuration.ConfigurationSection;
+import org.bukkit.configuration.file.YamlConfiguration;
+import org.bukkit.entity.Player;
+
+import java.text.SimpleDateFormat;
+import java.util.Calendar;
+import java.util.Date;
+import java.util.List;
+import java.util.UUID;
+
+import static me.wiefferink.areashop.tools.Utils.millisToHumanFormat;
+
+public class RentRegion extends LegacyGeneralRegion {
+	private long warningsDoneUntil = Calendar.getInstance().getTimeInMillis();
+
+	/**
+	 * Constructor.
+	 * @param config All settings of this region
+	 */
+	public RentRegion(YamlConfiguration config) {
+		super(config);
+	}
+
+	/**
+	 * Create a new RentRegion.
+	 * @param name  The name of the region (correct casing)
+	 * @param world The world of the WorldGuard region
+	 */
+	public RentRegion(String name, World world) {
+		super(name, world);
+	}
+
+	@Override
+	public RegionType getType() {
+		return RegionType.RENT;
+	}
+
+	@Override
+	public RegionStatus getState() {
+		if(isRented()) {
+			return RegionStatus.RENTED;
+		} else {
+			return RegionStatus.FORRENT;
+		}
+	}
+
+	@Override
+	public boolean isAvailable() {
+		return !isRented();
+	}
+
+	/**
+	 * Get the UUID of the player renting the region.
+	 * @return The UUID of the renter
+	 */
+	public UUID getRenter() {
+		String renter = config.getString("rent.renter");
+		if(renter != null) {
+			try {
+				return UUID.fromString(renter);
+			} catch(IllegalArgumentException e) {
+				// Incorrect UUID
+			}
+		}
+		return null;
+	}
+
+	/**
+	 * Check if a player is the renter of this region.
+	 * @param player Player to check
+	 * @return true if this player rents this region, otherwise false
+	 */
+	public boolean isRenter(Player player) {
+		return player != null && isRenter(player.getUniqueId());
+	}
+
+	public boolean isRenter(UUID player) {
+		UUID renter = getRenter();
+		return !(player == null || renter == null) && renter.equals(player);
+	}
+
+	/**
+	 * Set the renter of this region.
+	 * @param renter The UUID of the player that should be set as the renter
+	 */
+	public void setRenter(UUID renter) {
+		if(renter == null) {
+			setSetting("rent.renter", null);
+			setSetting("rent.renterName", null);
+		} else {
+			setSetting("rent.renter", renter.toString());
+			setSetting("rent.renterName", Utils.toName(renter));
+		}
+	}
+
+	/**
+	 * Get the max number of extends of this region.
+	 * @return -1 if infinite otherwise the maximum number
+	 */
+	public int getMaxExtends() {
+		return getIntegerSetting("rent.maxExtends");
+	}
+
+	/**
+	 * Get how many times the rent has already been extended.
+	 * @return The number of times extended
+	 */
+	public int getTimesExtended() {
+		return config.getInt("rent.timesExtended");
+	}
+
+	/**
+	 * Set the number of times the region has been extended.
+	 * @param times The number of times the region has been extended
+	 */
+	public void setTimesExtended(int times) {
+		if(times < 0) {
+			setSetting("rent.timesExtended", null);
+		} else {
+			setSetting("rent.timesExtended", times);
+		}
+	}
+
+	@Override
+	public Object provideReplacement(String variable) {
+		switch(variable) {
+			case AreaShop.tagPrice:
+				return getFormattedPrice();
+			case AreaShop.tagRawPrice:
+				return getPrice();
+			case AreaShop.tagDuration:
+				return getDurationString();
+			case AreaShop.tagPlayerName:
+				return getPlayerName();
+			case AreaShop.tagPlayerUUID:
+				return getRenter();
+			case AreaShop.tagRentedUntil:
+				return new SimpleDateFormat(plugin.getConfig().getString("timeFormatChat")).format(new Date(getRentedUntil()));
+			case AreaShop.tagRentedUntilShort:
+				return new SimpleDateFormat(plugin.getConfig().getString("timeFormatSign")).format(new Date(getRentedUntil()));
+			case AreaShop.tagTimeLeft:
+				return getTimeLeftString();
+			case AreaShop.tagMoneyBackAmount:
+				return getFormattedMoneyBackAmount();
+			case AreaShop.tagRawMoneyBackAmount:
+				return getMoneyBackAmount();
+			case AreaShop.tagMoneyBackPercentage:
+				return (getMoneyBackPercentage() % 1.0) == 0.0 ? (int)getMoneyBackPercentage() : getMoneyBackPercentage();
+			case AreaShop.tagTimesExtended:
+				return this.getTimesExtended();
+			case AreaShop.tagMaxExtends:
+				return this.getMaxExtends();
+			case AreaShop.tagExtendsLeft:
+				return getMaxExtends() - getTimesExtended();
+			case AreaShop.tagMaxRentTime:
+				return millisToHumanFormat(getMaxRentTime());
+			case AreaShop.tagMaxInactiveTime:
+				return this.getFormattedInactiveTimeUntilUnrent();
+
+			default:
+				return super.provideReplacement(variable);
+		}
+	}
+
+	/**
+	 * Check if the region is rented.
+	 * @return true if the region is rented, otherwise false
+	 */
+	public boolean isRented() {
+		return getRenter() != null;
+	}
+
+	/**
+	 * Get the name of the player renting this region.
+	 * @return Name of the player renting this region, if unavailable by UUID it will return the old cached name, if that is unavailable it will return &lt;UNKNOWN&gt;
+	 */
+	public String getPlayerName() {
+		String result = Utils.toName(getRenter());
+		if(result == null || result.isEmpty()) {
+			result = config.getString("rent.renterName");
+			if(result == null || result.isEmpty()) {
+				result = "<UNKNOWN>";
+			}
+		}
+		return result;
+	}
+
+	/**
+	 * Get the time until this region is rented (time from 1970 epoch).
+	 * @return The epoch time until which this region is rented
+	 */
+	public long getRentedUntil() {
+		return getLongSetting("rent.rentedUntil");
+	}
+
+	/**
+	 * Set the time until the region is rented (milliseconds from 1970, system time).
+	 * @param rentedUntil The time until the region is rented
+	 */
+	public void setRentedUntil(Long rentedUntil) {
+		if(rentedUntil == null) {
+			setSetting("rent.rentedUntil", null);
+		} else {
+			setSetting("rent.rentedUntil", rentedUntil);
+		}
+	}
+
+	/**
+	 * Get the price of the region.
+	 * @return The price of the region
+	 */
+	public double getPrice() {
+		return Math.max(0, Utils.evaluateToDouble(getStringSetting("rent.price"), this));
+	}
+
+	/**
+	 * Get the formatted string of the price (includes prefix and suffix).
+	 * @return The formatted string of the price
+	 */
+	public String getFormattedPrice() {
+		return Utils.formatCurrency(getPrice());
+	}
+
+	/**
+	 * Get the duration of 1 rent period.
+	 * @return The duration in milliseconds of 1 rent period
+	 */
+	public long getDuration() {
+		return Utils.durationStringToLong(getDurationString());
+	}
+
+	/**
+	 * Get the duration string, includes 'number indentifier'.
+	 * @return The duration string
+	 */
+	public String getDurationString() {
+		return getStringSetting("rent.duration");
+	}
+
+	/**
+	 * Get the time that is left on the region.
+	 * @return The time left on the region
+	 */
+	public long getTimeLeft() {
+		if(isRented()) {
+			return this.getRentedUntil() - Calendar.getInstance().getTimeInMillis();
+		} else {
+			return 0;
+		}
+	}
+
+	/**
+	 * Get a formatted string indicating the rent time that is left.
+	 * @return Time left on the rent, for example '29 days', '3 months', '1 second'
+	 */
+	public String getTimeLeftString() {
+		return Utils.millisToHumanFormat(getTimeLeft());
+	}
+
+	/**
+	 * Minutes until automatic unrent when player is offline.
+	 * @return The number of milliseconds until the region is unrented while player is offline
+	 */
+	public long getInactiveTimeUntilUnrent() {
+		return Utils.getDurationFromMinutesOrStringInput(getStringSetting("rent.inactiveTimeUntilUnrent"));
+	}
+
+	/**
+	 * Get a human readable string indicating how long the player can be offline until automatic unrent.
+	 * @return String indicating the inactive time until unrent
+	 */
+	public String getFormattedInactiveTimeUntilUnrent() {
+		return Utils.millisToHumanFormat(getInactiveTimeUntilUnrent());
+	}
+
+	/**
+	 * Change the price of the region.
+	 * @param price The price of the region
+	 */
+	public void setPrice(Double price) {
+		setSetting("rent.price", price);
+	}
+
+	/**
+	 * Set the duration of the rent.
+	 * @param duration The duration of the rent (as specified on the documentation pages)
+	 */
+	public void setDuration(String duration) {
+		setSetting("rent.duration", duration);
+	}
+
+	/**
+	 * Get the moneyBack percentage.
+	 * @return The % of money the player will get back when unrenting
+	 */
+	public double getMoneyBackPercentage() {
+		return Utils.evaluateToDouble(getStringSetting("rent.moneyBack"), this);
+	}
+
+	/**
+	 * Get the amount of money that should be paid to the player when unrenting the region.
+	 * @return The amount of money the player should get back
+	 */
+	public double getMoneyBackAmount() {
+		Long currentTime = Calendar.getInstance().getTimeInMillis();
+		Double timeLeft = (double)(getRentedUntil() - currentTime);
+		double percentage = (getMoneyBackPercentage()) / 100.0;
+		Double timePeriod = (double)(getDuration());
+		double periods = timeLeft / timePeriod;
+		return Math.max(0, periods * getPrice() * percentage);
+	}
+
+	/**
+	 * Get the formatted string of the amount of the moneyBack amount.
+	 * @return String with currency symbols and proper fractional part
+	 */
+	public String getFormattedMoneyBackAmount() {
+		return Utils.formatCurrency(getMoneyBackAmount());
+	}
+
+	/**
+	 * Get the maximum time the player can rent the region in advance (milliseconds).
+	 * @return The maximum rent time in milliseconds
+	 */
+	public long getMaxRentTime() {
+		return Utils.getDurationFromMinutesOrStringInput(getStringSetting("rent.maxRentTime"));
+	}
+
+	/**
+	 * Check if the rent should expire.
+	 * @return true if the rent has expired and has been unrented, false otherwise
+	 */
+	public boolean checkExpiration() {
+		long now = Calendar.getInstance().getTimeInMillis();
+		if(!isDeleted() && isRented() && now > getRentedUntil()) {
+			// Extend rent if configured for that
+			if(getBooleanSetting("rent.autoExtend") && extend()) {
+				return false;
+			}
+
+			// Send message to the player if online
+			Player player = Bukkit.getPlayer(getRenter());
+			if(unRent(false, null)) {
+				if(player != null) {
+					message(player, "unrent-expired");
+				}
+				return true;
+			}
+		}
+		return false;
+	}
+
+	/**
+	 * Send the expiration warnings from the selected profile which is specified in the config.
+	 * Sends all warnings since previous call until (now + normal delay), delay can be found in the config as well.
+	 */
+	public void sendExpirationWarnings() {
+		// Send from warningsDoneUntil to current+delay
+		if(isDeleted() || !isRented()) {
+			return;
+		}
+		ConfigurationSection profileSection = getConfigurationSectionSetting("rent.expirationWarningProfile", "expirationWarningProfiles");
+		if(profileSection == null) {
+			return;
+		}
+
+		// Check if a warning needs to be send for each defined point in time
+		Player player = Bukkit.getPlayer(getRenter());
+		long sendUntil = Calendar.getInstance().getTimeInMillis() + (plugin.getConfig().getInt("expireWarning.delay") * 60 * 1000);
+		for(String timeBefore : profileSection.getKeys(false)) {
+			long timeBeforeParsed = Utils.durationStringToLong(timeBefore);
+			if(timeBeforeParsed <= 0) {
+				return;
+			}
+			long checkTime = getRentedUntil() - timeBeforeParsed;
+
+			if(checkTime > warningsDoneUntil && checkTime <= sendUntil) {
+				List<String> commands;
+				if(profileSection.isConfigurationSection(timeBefore)) {
+					/* Legacy config layout:
+					 *   "1 minute":
+					 *     warnPlayer: true
+					 *     commands: ["say hi"]
+					 */
+					commands = profileSection.getStringList(timeBefore + ".commands");
+					// Warn player
+					if(profileSection.getBoolean(timeBefore + ".warnPlayer") && player != null) {
+						message(player, "rent-expireWarning");
+					}
+				} else {
+					commands = profileSection.getStringList(timeBefore);
+				}
+				this.runCommands(Bukkit.getConsoleSender(), commands);
+			}
+		}
+		warningsDoneUntil = sendUntil;
+	}
+
+	/**
+	 * Try to extend the rent for the current owner, respecting all restrictions.
+	 * @return true if successful, otherwise false
+	 */
+	public boolean extend() {
+		if(!isRented()) {
+			return false;
+		}
+
+		OfflinePlayer offlinePlayer = Bukkit.getOfflinePlayer(getRenter());
+		return offlinePlayer != null && rent(offlinePlayer);
+	}
+
+	/**
+	 * Rent a region.
+	 * @param offlinePlayer The player that wants to rent the region
+	 * @return true if it succeeded and false if not
+	 */
+	public boolean rent(OfflinePlayer offlinePlayer) {
+		if(plugin.getEconomy() == null) {
+			message(offlinePlayer, "general-noEconomy");
+			return false;
+		}
+
+		// Check if the player has permission
+		if(!plugin.hasPermission(offlinePlayer, "areashop.rent")) {
+			message(offlinePlayer, "rent-noPermission");
+			return false;
+		}
+
+		// Check location restrictions
+		if(getWorld() == null) {
+			message(offlinePlayer, "general-noWorld");
+			return false;
+		}
+		if(getRegion() == null) {
+			message(offlinePlayer, "general-noRegion");
+			return false;
+		}
+		boolean extend = false;
+		if(getRenter() != null && offlinePlayer.getUniqueId().equals(getRenter())) {
+			extend = true;
+		}
+
+		// Check if available or extending
+		if (isRented() && !extend) {
+			message(offlinePlayer, "rent-someoneElse");
+			return false;
+		}
+
+		// These checks are only relevant for online players doing the renting/buying themselves
+		Player player = offlinePlayer.getPlayer();
+		if(player != null) {
+			// Check if the players needs to be in the region for renting
+			if(restrictedToRegion() && (!player.getWorld().getName().equals(getWorldName())
+					|| !getRegion().contains(player.getLocation().getBlockX(), player.getLocation().getBlockY(), player.getLocation().getBlockZ()))) {
+				message(offlinePlayer, "rent-restrictedToRegion");
+				return false;
+			}
+
+			// Check if the players needs to be in the world for renting
+			if(restrictedToWorld() && !player.getWorld().getName().equals(getWorldName())) {
+				message(offlinePlayer, "rent-restrictedToWorld", player.getWorld().getName());
+				return false;
+			}
+		}
+
+		// Check region limits if this is not extending
+		if(!(extend && config.getBoolean("allowRegionExtendsWhenAboveLimits"))) {
+
+			LimitResult limitResult;
+			if(extend) {
+				limitResult = this.limitsAllow(RegionType.RENT, offlinePlayer, true);
+			} else {
+				limitResult = this.limitsAllow(RegionType.RENT, offlinePlayer);
+			}
+			AreaShop.debug("LimitResult: " + limitResult.toString());
+			if(!limitResult.actionAllowed()) {
+				if(limitResult.getLimitingFactor() == LimitType.TOTAL) {
+					message(offlinePlayer, "total-maximum", limitResult.getMaximum(), limitResult.getCurrent(), limitResult.getLimitingGroup());
+					return false;
+				}
+				if(limitResult.getLimitingFactor() == LimitType.RENTS) {
+					message(offlinePlayer, "rent-maximum", limitResult.getMaximum(), limitResult.getCurrent(), limitResult.getLimitingGroup());
+					return false;
+				}
+				if(limitResult.getLimitingFactor() == LimitType.EXTEND) {
+					message(offlinePlayer, "rent-maximumExtend", limitResult.getMaximum(), limitResult.getCurrent() + 1, limitResult.getLimitingGroup());
+					return false;
+				}
+				return false;
+			}
+		}
+
+		// Check if the player can still extend this rent
+		if(extend && !plugin.hasPermission(offlinePlayer, "areashop.rentextendbypass")) {
+			if(getMaxExtends() >= 0 && getTimesExtended() >= getMaxExtends()) {
+				message(offlinePlayer, "rent-maxExtends");
+				return false;
+			}
+		}
+
+		// Check if there is enough time left before hitting maxRentTime
+		boolean extendToMax = false;
+		double price = getPrice();
+		long timeNow = Calendar.getInstance().getTimeInMillis();
+		long timeRented = 0;
+		long maxRentTime = getMaxRentTime();
+		if(isRented()) {
+			timeRented = getRentedUntil() - timeNow;
+		}
+		if((timeRented + getDuration()) > (maxRentTime)
+				&& !plugin.hasPermission(offlinePlayer, "areashop.renttimebypass")
+				&& maxRentTime != -1) {
+			// Extend to the maximum instead of adding a full period
+			if(getBooleanSetting("rent.extendToFullWhenAboveMaxRentTime")) {
+				if(timeRented >= maxRentTime) {
+					message(offlinePlayer, "rent-alreadyAtFull");
+					return false;
+				} else {
+					long toRentPart = maxRentTime - timeRented;
+					extendToMax = true;
+					price = ((double)toRentPart) / getDuration() * price;
+				}
+			} else {
+				message(offlinePlayer, "rent-maxRentTime");
+				return false;
+			}
+		}
+
+		// Check if the player has enough money
+		if(!plugin.getEconomy().has(offlinePlayer, getWorldName(), price)) {
+			if(extend) {
+				message(offlinePlayer, "rent-lowMoneyExtend", Utils.formatCurrency(plugin.getEconomy().getBalance(offlinePlayer, getWorldName())));
+			} else {
+				message(offlinePlayer, "rent-lowMoneyRent", Utils.formatCurrency(plugin.getEconomy().getBalance(offlinePlayer, getWorldName())));
+			}
+			return false;
+		}
+
+		// Broadcast and check event
+		RentingRegionEvent event = new RentingRegionEvent(this, offlinePlayer, extend);
+		Bukkit.getPluginManager().callEvent(event);
+		if(event.isCancelled()) {
+			message(offlinePlayer, "general-cancelled", event.getReason());
+			return false;
+		}
+
+		// Substract the money from the players balance
+		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 " + getRegionId() + ": " + r.errorMessage);
+			return false;
+		}
+		// Optionally give money to the landlord
+		OfflinePlayer landlordPlayer = null;
+		if(getLandlord() != null) {
+			landlordPlayer = Bukkit.getOfflinePlayer(getLandlord());
+		}
+		String landlordName = getLandlordName();
+		if(landlordName != null) {
+			if(landlordPlayer != null && landlordPlayer.getName() != null) {
+				r = plugin.getEconomy().depositPlayer(landlordPlayer, getWorldName(), price);
+			} else {
+				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 " + getRegionId() + " to " + offlinePlayer.getName());
+			}
+		}
+
+		// Get the time until the region will be rented
+		Calendar calendar = Calendar.getInstance();
+		if(extendToMax) {
+			calendar.setTimeInMillis(calendar.getTimeInMillis() + getMaxRentTime());
+		} else if(extend) {
+			calendar.setTimeInMillis(getRentedUntil() + getDuration());
+		} else {
+			calendar.setTimeInMillis(calendar.getTimeInMillis() + getDuration());
+		}
+
+		// Add values to the rent and send it to FileManager
+		setRentedUntil(calendar.getTimeInMillis());
+		setRenter(offlinePlayer.getUniqueId());
+		updateLastActiveTime();
+
+		// Fire schematic event and updated times extended
+		if(!extend) {
+			this.handleSchematicEvent(RegionEvent.RENTED);
+			setTimesExtended(0);
+		} else {
+			setTimesExtended(getTimesExtended() + 1);
+		}
+
+		// Send message to the player
+		if(extendToMax) {
+			message(offlinePlayer, "rent-extendedToMax");
+		} else if(extend) {
+			message(offlinePlayer, "rent-extended");
+		} else {
+			message(offlinePlayer, "rent-rented");
+		}
+
+		// Notify about updates
+		this.notifyAndUpdate(new RentedRegionEvent(this, extend));
+		return true;
+	}
+
+	/**
+	 * Unrent a region, reset to unrented.
+	 * @param giveMoneyBack true if money should be given back to the player, false otherwise
+	 * @param executor      The CommandSender that should get the cancelled message if there is any, or null
+	 * @return true if unrenting succeeded, othwerwise false
+	 */
+	@SuppressWarnings("deprecation")
+	public boolean unRent(boolean giveMoneyBack, CommandSender executor) {
+		boolean own = executor instanceof Player && this.isRenter((Player) executor);
+		if(executor != null) {
+			if(!executor.hasPermission("areashop.unrent") && !own) {
+				message(executor, "unrent-noPermissionOther");
+				return false;
+			}
+			if(!executor.hasPermission("areashop.unrent") && !executor.hasPermission("areashop.unrentown") && own) {
+				message(executor, "unrent-noPermission");
+				return false;
+			}
+		}
+
+		if(plugin.getEconomy() == null) {
+			return false;
+		}
+
+		// Broadcast and check event
+		UnrentingRegionEvent event = new UnrentingRegionEvent(this);
+		Bukkit.getPluginManager().callEvent(event);
+		if(event.isCancelled()) {
+			message(executor, "general-cancelled", event.getReason());
+			return false;
+		}
+
+		// Do a payback
+		double moneyBack = getMoneyBackAmount();
+		if(moneyBack > 0 && giveMoneyBack) {
+			boolean noPayBack = false;
+			OfflinePlayer landlordPlayer = null;
+			if(getLandlord() != null) {
+				landlordPlayer = Bukkit.getOfflinePlayer(getLandlord());
+			}
+			String landlordName = getLandlordName();
+			EconomyResponse r;
+			if(landlordName != null) {
+				if(landlordPlayer != null && landlordPlayer.getName() != null) {
+					r = plugin.getEconomy().withdrawPlayer(landlordPlayer, getWorldName(), moneyBack);
+				} else {
+					r = plugin.getEconomy().withdrawPlayer(landlordName, getWorldName(), moneyBack);
+				}
+				if(r == null || !r.transactionSuccess()) {
+					noPayBack = true;
+				}
+			}
+
+			// Give back the money
+			OfflinePlayer player = Bukkit.getOfflinePlayer(getRenter());
+			if(player != null && !noPayBack) {
+				r = null;
+				boolean error = false;
+				try {
+					if(player.getName() != null) {
+						r = plugin.getEconomy().depositPlayer(player, getWorldName(), moneyBack);
+					} else if(getPlayerName() != null) {
+						r = plugin.getEconomy().depositPlayer(getPlayerName(), getWorldName(), moneyBack);
+					}
+				} catch(Exception e) {
+					error = true;
+				}
+				if(error || r == null || !r.transactionSuccess()) {
+					AreaShop.warn("Something went wrong with paying back to " + getPlayerName() + " money while unrenting region " + getRegionId());
+				}
+			}
+		}
+
+		// Handle schematic save/restore (while %uuid% is still available)
+		handleSchematicEvent(RegionEvent.UNRENTED);
+
+		// Send message: before actual removal of the renter so that it is still available for variables
+		message(executor, "unrent-unrented");
+
+		// Remove friends, the owner and renteduntil values
+		getFriendsFeature().clearFriends();
+		UUID oldRenter = getRenter();
+		setRenter(null);
+		setRentedUntil(null);
+		setTimesExtended(-1);
+		removeLastActiveTime();
+
+		// Notify about updates
+		this.notifyAndUpdate(new UnrentedRegionEvent(this, oldRenter, Math.max(0, moneyBack)));
+		return true;
+	}
+
+	@Override
+	public boolean checkInactive() {
+		if(isDeleted() || !isRented()) {
+			return false;
+		}
+		long inactiveSetting = getInactiveTimeUntilUnrent();
+		OfflinePlayer player = Bukkit.getOfflinePlayer(getRenter());
+		if(inactiveSetting <= 0 || player.isOp()) {
+			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(now > (lastPlayed + inactiveSetting)) {
+			AreaShop.info("Region " + getRegionId() + " unrented because of inactivity for player " + getPlayerName());
+			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/regions/util/ClickType.java

@@ -0,0 +1,19 @@
+package me.wiefferink.areashop.regions.util;
+
+// Enum for click types
+    public enum ClickType {
+        RIGHTCLICK("rightClick"),
+        LEFTCLICK("leftClick"),
+        SHIFTRIGHTCLICK("shiftRightClick"),
+        SHIFTLEFTCLICK("shiftLeftClick");
+
+        private final String value;
+
+        ClickType(String value) {
+            this.value = value;
+        }
+
+        public String getValue() {
+            return value;
+        }
+    }

AreaShop/src/main/java/me/wiefferink/areashop/regions/util/LimitResult.java

@@ -0,0 +1,79 @@
+package me.wiefferink.areashop.regions.util;
+
+/**
+ * Class to store the result of a limits check.
+ */
+public class LimitResult {
+    private final boolean actionAllowed;
+    private final LimitType limitingFactor;
+    private final int maximum;
+    private final int current;
+    private final String limitingGroup;
+
+    /**
+     * Constructor.
+     *
+     * @param actionAllowed  has the action been allowed?
+     * @param limitingFactor The LimitType that has prevented the action (if actionAllowed is false)
+     * @param maximum        The maximum number of regions allowed (if actionAllowed is false)
+     * @param current        The current number of regions the player has (if actionAllowed is false)
+     * @param limitingGroup  The group that is enforcing this limit (if actionAllowed is false)
+     */
+    public LimitResult(boolean actionAllowed, LimitType limitingFactor, int maximum, int current, String limitingGroup) {
+        this.actionAllowed = actionAllowed;
+        this.limitingFactor = limitingFactor;
+        this.maximum = maximum;
+        this.current = current;
+        this.limitingGroup = limitingGroup;
+    }
+
+    /**
+     * Check if the action is allowed.
+     *
+     * @return true if the actions is allowed, otherwise false
+     */
+    public boolean actionAllowed() {
+        return actionAllowed;
+    }
+
+    /**
+     * Get the type of the factor that is limiting the action, assuming actionAllowed() is false.
+     *
+     * @return The type of the limiting factor
+     */
+    public LimitType getLimitingFactor() {
+        return limitingFactor;
+    }
+
+    /**
+     * Get the maximum number of the group that is the limiting factor, assuming actionAllowed() is false.
+     *
+     * @return The maximum
+     */
+    public int getMaximum() {
+        return maximum;
+    }
+
+    /**
+     * Get the current number of regions in the group that is the limiting factor, assuming actionAllowed() is false.
+     *
+     * @return The current number of regions the player has
+     */
+    public int getCurrent() {
+        return current;
+    }
+
+    /**
+     * Get the name of the group that is limiting the action, assuming actionAllowed() is false.
+     *
+     * @return The name of the group
+     */
+    public String getLimitingGroup() {
+        return limitingGroup;
+    }
+
+    @Override
+    public String toString() {
+        return "actionAllowed=" + actionAllowed + ", limitingFactor=" + limitingFactor + ", maximum=" + maximum + ", current=" + current + ", limitingGroup=" + limitingGroup;
+    }
+}

AreaShop/src/main/java/me/wiefferink/areashop/regions/util/LimitType.java

@@ -0,0 +1,19 @@
+package me.wiefferink.areashop.regions.util;
+
+// Enum for limit types
+    public enum LimitType {
+        RENTS("rents"),
+        BUYS("buys"),
+        TOTAL("total"),
+        EXTEND("extend");
+
+        private final String value;
+
+        LimitType(String value) {
+            this.value = value;
+        }
+
+        public String getValue() {
+            return value;
+        }
+    }

AreaShop/src/main/java/me/wiefferink/areashop/regions/util/RegionEvent.java

@@ -0,0 +1,23 @@
+package me.wiefferink.areashop.regions.util;
+
+// Enum for schematic event types
+    public enum RegionEvent {
+        CREATED("created"),
+        DELETED("deleted"),
+        RENTED("rented"),
+        EXTENDED("extended"),
+        UNRENTED("unrented"),
+        BOUGHT("bought"),
+        SOLD("sold"),
+        RESELL("resell");
+
+        private final String value;
+
+        RegionEvent(String value) {
+            this.value = value;
+        }
+
+        public String getValue() {
+            return value;
+        }
+    }

AreaShop/src/main/java/me/wiefferink/areashop/regions/util/RegionFeatureHelper.java

@@ -0,0 +1,72 @@
+package me.wiefferink.areashop.regions.util;
+
+import com.google.common.collect.ClassToInstanceMap;
+import com.google.common.collect.MutableClassToInstanceMap;
+import com.google.inject.Inject;
+import com.google.inject.assistedinject.Assisted;
+import com.google.inject.assistedinject.AssistedInject;
+import me.wiefferink.areashop.features.RegionFeature;
+import me.wiefferink.areashop.interfaces.IRegion;
+import me.wiefferink.areashop.managers.FeatureManager;
+import org.jetbrains.annotations.NotNull;
+
+import java.util.Collection;
+import java.util.Collections;
+import java.util.HashSet;
+import java.util.concurrent.locks.ReadWriteLock;
+import java.util.concurrent.locks.ReentrantReadWriteLock;
+
+public class RegionFeatureHelper {
+
+    @Inject
+    private FeatureManager featureManager;
+
+    private final ReadWriteLock readWriteLock;
+    private final IRegion region;
+
+    private final ClassToInstanceMap<RegionFeature> features = MutableClassToInstanceMap.create();
+
+    @AssistedInject
+    public RegionFeatureHelper(@NotNull @Assisted IRegion region, @NotNull @Assisted ReadWriteLock readWriteLock) {
+        this.region = region;
+        this.readWriteLock = readWriteLock;
+    }
+
+    @AssistedInject
+    public RegionFeatureHelper(@NotNull @Assisted IRegion region) {
+        this(region, new ReentrantReadWriteLock());
+    }
+
+    public <T extends RegionFeature> @NotNull T feature(@NotNull Class<T> clazz) {
+        this.readWriteLock.writeLock().lock();
+        try {
+            if (this.features.containsKey(clazz)) {
+                return this.features.getInstance(clazz);
+            }
+            final T feature = featureManager.getRegionFeature(this.region, clazz);
+            this.features.put(clazz, feature);
+            return feature;
+        } finally {
+            this.readWriteLock.writeLock().unlock();
+        }
+    }
+
+    public @NotNull Collection<? extends RegionFeature> valuesCopy() {
+        this.readWriteLock.readLock().lock();
+        try {
+            return new HashSet<>(this.features.values());
+        } finally {
+            this.readWriteLock.readLock().unlock();
+        }
+    }
+
+    public @NotNull Collection<? extends RegionFeature> values() {
+        this.readWriteLock.readLock().lock();
+        try {
+            return Collections.unmodifiableCollection(this.features.values());
+        } finally {
+            this.readWriteLock.readLock().unlock();
+        }
+    }
+
+}

AreaShop/src/main/java/me/wiefferink/areashop/regions/util/RegionStatus.java

@@ -0,0 +1,21 @@
+package me.wiefferink.areashop.regions.util;
+
+// Enum for Region states
+public enum RegionStatus {
+
+    FORRENT("forrent"),
+    RENTED("rented"),
+    FORSALE("forsale"),
+    SOLD("sold"),
+    RESELL("resell");
+
+    private final String value;
+
+    RegionStatus(String value) {
+        this.value = value;
+    }
+
+    public String getValue() {
+        return value;
+    }
+}