Set version to 2.6.0

documentation/release.md: add instructions for releasing a new version
langHeader.yml: add the template used to generate the language file headers to the repository
2026-11-06 17:32:43 -05:00 · 2019-01-13 17:34:50 +01:00 · 2019-01-13 17:34:37 +01:00 · 2019-01-13 17:33:54 +01:00 · 2019-01-13 17:33:09 +01:00 · 2019-01-08 21:18:19 +01:00
123 changed files with 11081 additions and 9557 deletions
@@ -2,7 +2,7 @@
 name: Bug report
 about: Report a problem in the plugin
 title: ''
-labels: 'NEW, Type: Bug'
+labels: 'Type: Bug'
 assignees: ''

 ---
@@ -2,7 +2,7 @@
 name: Feature request
 about: Suggest an idea
 title: ''
-labels: 'NEW, Type: Feature'
+labels: 'Type: Feature'
 assignees: ''

 ---
@@ -2,7 +2,7 @@
 name: Support question
 about: Ask help with the setup or usage of the plugin
 title: ''
-labels: 'NEW, Type: Support'
+labels: 'Type: Support'
 assignees: ''

 ---
@@ -1,32 +0,0 @@
-# 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
-      
@@ -1,5 +1,5 @@
 # Maven stuff
-target
+/target

 .project
 .metadata
@@ -0,0 +1 @@
+/target
@@ -1,36 +1,27 @@
 <project xmlns="http://maven.apache.org/POM/4.0.0" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
         xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/xsd/maven-4.0.0.xsd">
    <modelVersion>4.0.0</modelVersion>
+    <artifactId>areashop</artifactId>
+    <packaging>jar</packaging>
+    <name>AreaShop</name>
+    <version>2.6.0</version> <!-- Main plugin version -->

    <parent>
        <groupId>me.wiefferink</groupId>
        <artifactId>areashop-parent</artifactId>
-        <version>1.0</version>
+        <version>parent</version>
    </parent>

-    <artifactId>areashop</artifactId>
-    <packaging>jar</packaging>
-    <name>AreaShop</name>
-    <version>2.7.1-SNAPSHOT</version> <!-- Main plugin version -->
-
-    <repositories>
-        <repository>
-            <id>papermc</id>
-            <url>https://papermc.io/repo/repository/maven-public/</url>
-        </repository>
-        <repository>
-            <id>aikar</id>
-            <url>https://repo.aikar.co/content/groups/aikar/</url>
-        </repository>
-    </repositories>
-
    <dependencies>
-        <!-- Bukkit, AreaShop aims to support 1.13.2+ -->
+        <!-- Bukkit, AreaShop aims to support 1.7.9+ -->
        <dependency>
-            <groupId>org.spigotmc</groupId>
-            <artifactId>spigot-api</artifactId>
-            <version>1.13.2-R0.1-SNAPSHOT</version>
-            <scope>provided</scope>
+            <groupId>org.bukkit</groupId>
+            <artifactId>craftbukkit</artifactId>
+            <scope>system</scope>
+            <version>any</version>
+            <systemPath>${project.basedir}/../dependencies/craftbukkit-1.7.9-R0.2-SNAPSHOT.jar</systemPath>
+            <type>jar</type>
+            <optional>true</optional>
        </dependency>

        <!-- InteractiveMessenger library -->
@@ -40,40 +31,27 @@
            <version>1.1-SNAPSHOT</version>
        </dependency>

-        <!-- TaskChain library -->
+        <!-- BukkitDo library -->
        <dependency>
-            <groupId>co.aikar</groupId>
-            <artifactId>taskchain-bukkit</artifactId>
-            <version>3.7.2</version>
-        </dependency>
-
-        <!-- JetBrains Annotations -->
-        <dependency>
-            <groupId>org.jetbrains</groupId>
-            <artifactId>annotations</artifactId>
-            <version>19.0.0</version>
-            <scope>provided</scope>
-        </dependency>
-
-        <!-- Paper Lib -->
-        <dependency>
-            <groupId>io.papermc</groupId>
-            <artifactId>paperlib</artifactId>
-            <version>1.0.5</version>
+            <groupId>me.wiefferink</groupId>
+            <artifactId>bukkitdo</artifactId>
+            <version>1.0.0-SNAPSHOT</version>
        </dependency>

        <!-- WorldEdit/WorldGuard -->
        <dependency>
-            <groupId>com.sk89q.worldedit</groupId>
-            <artifactId>worldedit-bukkit</artifactId>
-            <version>7.1.0-SNAPSHOT</version>
-            <scope>provided</scope>
+            <groupId>com.sk89q</groupId>
+            <artifactId>worldedit</artifactId>
+            <scope>system</scope>
+            <version>any</version>
+            <systemPath>${project.basedir}/../dependencies/worldedit-bukkit-7.0.0-beta-04.jar</systemPath>
        </dependency>
        <dependency>
-            <groupId>com.sk89q.worldguard</groupId>
-            <artifactId>worldguard-bukkit</artifactId>
-            <version>7.0.3</version>
-            <scope>provided</scope>
+            <groupId>com.sk89q</groupId>
+            <artifactId>worldguard</artifactId>
+            <scope>system</scope>
+            <version>any</version>
+            <systemPath>${project.basedir}/../dependencies/worldguard-legacy-7.0.0-beta-02.jar</systemPath>
        </dependency>

        <!-- Interfaces that specific WorldGuard and WorldEdit versions are built against -->
@@ -81,29 +59,77 @@
            <groupId>me.wiefferink</groupId>
            <artifactId>areashop-interface</artifactId>
            <version>latest</version>
+            <type>jar</type>
            <scope>compile</scope>
        </dependency>

        <!-- WorldGuard implementations -->
        <dependency>
            <groupId>me.wiefferink</groupId>
-            <artifactId>areashop-worldguard-7</artifactId>
+            <artifactId>areashop-worldguard-5</artifactId>
            <version>latest</version>
+            <type>jar</type>
+            <scope>compile</scope>
+        </dependency>
+        <dependency>
+            <groupId>me.wiefferink</groupId>
+            <artifactId>areashop-worldguard-6</artifactId>
+            <version>latest</version>
+            <type>jar</type>
+            <scope>compile</scope>
+        </dependency>
+        <dependency>
+            <groupId>me.wiefferink</groupId>
+            <artifactId>areashop-worldguard-6_1_3</artifactId>
+            <version>latest</version>
+            <type>jar</type>
+            <scope>compile</scope>
+        </dependency>
+        <dependency>
+            <groupId>me.wiefferink</groupId>
+            <artifactId>areashop-worldguard-7_beta_1</artifactId>
+            <version>latest</version>
+            <type>jar</type>
+            <scope>compile</scope>
+        </dependency>
+        <dependency>
+            <groupId>me.wiefferink</groupId>
+            <artifactId>areashop-worldguard-7_beta_2</artifactId>
+            <version>latest</version>
+            <type>jar</type>
            <scope>compile</scope>
        </dependency>

        <!-- WorldEdit implementations -->
        <dependency>
            <groupId>me.wiefferink</groupId>
-            <artifactId>areashop-worldedit-7</artifactId>
+            <artifactId>areashop-worldedit-5</artifactId>
            <version>latest</version>
+            <type>jar</type>
            <scope>compile</scope>
        </dependency>
-
-        <!-- FAWE compat -->
        <dependency>
            <groupId>me.wiefferink</groupId>
-            <artifactId>areashop-fawe-1-15</artifactId>
+            <artifactId>areashop-worldedit-6</artifactId>
+            <version>latest</version>
+            <type>jar</type>
+            <scope>compile</scope>
+        </dependency>
+        <dependency>
+            <groupId>me.wiefferink</groupId>
+            <artifactId>areashop-worldedit-7_beta_1</artifactId>
+            <version>latest</version>
+            <type>jar</type>
+            <scope>compile</scope>
+        </dependency>
+        <dependency>
+            <groupId>me.wiefferink</groupId>
+            <artifactId>areashop-worldedit-7_beta_4</artifactId>
+            <version>latest</version>
+        </dependency>
+        <dependency>
+            <groupId>me.wiefferink</groupId>
+            <artifactId>areashop-fastasyncworldedit</artifactId>
            <version>latest</version>
            <type>jar</type>
            <scope>compile</scope>
@@ -113,18 +139,17 @@
        <dependency>
            <groupId>net.milkbowl.vault</groupId>
            <artifactId>VaultAPI</artifactId>
-            <version>1.7</version>
-            <scope>provided</scope>
+            <scope>system</scope>
+            <version>any</version>
+            <systemPath>${project.basedir}/../dependencies/VaultAPI-1.4.jar</systemPath>
        </dependency>

        <!-- bStats -->
        <dependency>
            <groupId>org.bstats</groupId>
            <artifactId>bstats-bukkit</artifactId>
-            <version>1.6</version>
-            <scope>compile</scope>
+            <version>1.1</version>
        </dependency>
-
    </dependencies>

    <profiles>
@@ -173,7 +198,7 @@
                    <plugin>
                        <groupId>org.apache.maven.plugins</groupId>
                        <artifactId>maven-source-plugin</artifactId>
-                        <version>3.2.1</version>
+                        <version>3.0.0</version>
                        <executions>
                            <execution>
                                <phase>package</phase>
@@ -201,7 +226,7 @@
                    <plugin>
                        <groupId>org.apache.maven.plugins</groupId>
                        <artifactId>maven-javadoc-plugin</artifactId>
-                        <version>3.2.0</version>
+                        <version>2.10.4</version>
                        <executions>
                            <execution>
                                <phase>package</phase>
@@ -248,7 +273,7 @@
            <plugin>
                <groupId>org.apache.maven.plugins</groupId>
                <artifactId>maven-shade-plugin</artifactId>
-                <version>3.2.3</version>
+                <version>2.4.3</version>
                <executions>
                    <execution>
                        <phase>package</phase>
@@ -257,31 +282,21 @@
                        </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 BukkitDo -->
+                                <relocation>
+                                    <pattern>me.wiefferink.bukkitdo</pattern>
+                                    <shadedPattern>me.wiefferink.areashop.shaded.bukkitdo</shadedPattern>
+                                </relocation>
                                <!-- Relocate bstats -->
                                <relocation>
                                    <pattern>org.bstats</pattern>
                                    <shadedPattern>me.wiefferink.areashop.shaded.bstats</shadedPattern>
                                </relocation>
-                                <!-- Relocate PaperLib -->
-                                <relocation>
-                                    <pattern>io.papermc</pattern>
-                                    <shadedPattern>me.wiefferink.areashop.shaded.paperlib</shadedPattern>
-                                </relocation>
-                                <!-- Relocate Google Guice & Guice-Assisted-Inject -->
-                                <relocation>
-                                    <pattern>com.google.inject</pattern>
-                                    <shadedPattern>me.wiefferink.areashop.shaded.inject</shadedPattern>
-                                </relocation>
                            </relocations>
                        </configuration>
                    </execution>
@@ -289,11 +304,7 @@
            </plugin>
            <plugin>
                <artifactId>maven-compiler-plugin</artifactId>
-                <version>3.8.1</version>
-                <configuration>
-                    <source>1.8</source>
-                    <target>1.8</target>
-                </configuration>
+                <version>3.5.1</version>
            </plugin>
        </plugins>
    </build>
@@ -2,24 +2,25 @@ 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.GeneralRegion;
 import me.wiefferink.areashop.regions.RentRegion;
 import me.wiefferink.areashop.tools.Utils;
+import me.wiefferink.bukkitdo.Do;
 import org.bukkit.Bukkit;
-import org.bukkit.OfflinePlayer;
 import org.bukkit.World;
 import org.bukkit.command.CommandSender;
 import org.bukkit.entity.Player;

-import java.util.*;
+import java.util.ArrayList;
+import java.util.Calendar;
+import java.util.HashMap;
+import java.util.List;
+import java.util.Map;
+import java.util.TreeSet;
+import java.util.UUID;
 import java.util.stream.Collectors;

 public class AddCommand extends CommandAreaShop {
@@ -56,7 +57,7 @@ public class AddCommand extends CommandAreaShop {
 			return;
 		}

-		if(args.length < 2 || args[1] == null || (!"rent".equalsIgnoreCase(args[1]) && !"buy".equalsIgnoreCase(args[1]))) {
+		if(args.length < 2 || args[1] == null || (!"rent".equals(args[1].toLowerCase()) && !"buy".equals(args[1].toLowerCase()))) {
 			plugin.message(sender, "add-help");
 			return;
 		}
@@ -78,7 +79,7 @@ public class AddCommand extends CommandAreaShop {
 			}
 			world = selection.getWorld();
 			regions = Utils.getWorldEditRegionsInSelection(selection).stream().collect(Collectors.toMap(ProtectedRegion::getId, region -> region));
-			if(regions.isEmpty()) {
+			if(regions.size() == 0) {
 				plugin.message(player, "cmd-noWERegionsFound");
 				return;
 			}
@@ -112,21 +113,19 @@ public class AddCommand extends CommandAreaShop {
 			}
 			regions.put(args[2], region);
 		}
-		final boolean isRent = "rent".equalsIgnoreCase(args[1]);
+		final boolean isRent = "rent".equals(args[1].toLowerCase());
 		final Player finalPlayer = player;
 		AreaShop.debug("Starting add task with " + regions.size() + " regions");

 		TreeSet<GeneralRegion> regionsSuccess = new TreeSet<>();
 		TreeSet<GeneralRegion> regionsAlready = new TreeSet<>();
 		TreeSet<GeneralRegion> regionsAlreadyOtherWorld = new TreeSet<>();
-		TreeSet<GeneralRegion> regionsRentCancelled = new TreeSet<>(); // Denied by an event listener
-		TreeSet<GeneralRegion> 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(),
+		Do.forAll(
 			plugin.getConfig().getInt("adding.regionsPerTick"),
-				(regionEntry) -> {
+			regions.entrySet(),
+			regionEntry -> {
 				String regionName = regionEntry.getKey();
 				ProtectedRegion region = regionEntry.getValue();
 				// Determine if the player is an owner or member of the region
@@ -171,40 +170,40 @@ public class AddCommand extends CommandAreaShop {
 						if(landlord) {
 							rent.setLandlord(finalPlayer.getUniqueId(), finalPlayer.getName());
 						}
-
-						AddingRegionEvent event = plugin.getFileManager().addRegion(rent);
-						if (event.isCancelled()) {
-							namesAddCancelled.add(rent.getName());
-							return;
-						}
+						// Run commands
+						rent.runEventCommands(GeneralRegion.RegionEvent.CREATED, true);
+						plugin.getFileManager().addRent(rent);
 						rent.handleSchematicEvent(GeneralRegion.RegionEvent.CREATED);
+
 						rent.update();

+						// Run commands
+						rent.runEventCommands(GeneralRegion.RegionEvent.CREATED, false);
+
 						// Add existing owners/members if any
 						if(!landlord && !existing.isEmpty()) {
-							UUID rentBy = existing.remove(0);
-							OfflinePlayer rentByPlayer = Bukkit.getOfflinePlayer(rentBy);
+							// TODO also execute rent events to notify other plugins?

-							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();
+							// Run commands
+							rent.runEventCommands(GeneralRegion.RegionEvent.RENTED, true);

-								// Fire schematic event and updated times extended
-								rent.handleSchematicEvent(GeneralRegion.RegionEvent.RENTED);
+							// Add values to the rent and send it to FileManager
+							rent.setRentedUntil(Calendar.getInstance().getTimeInMillis() + rent.getDuration());
+							rent.setRenter(existing.remove(0));
+							rent.updateLastActiveTime();

-								// Add others as friends
-								for(UUID friend : existing) {
-									rent.getFriendsFeature().addFriend(friend, null);
-								}
-
-								rent.notifyAndUpdate(new RentedRegionEvent(rent, false));
+							// Add others as friends
+							for(UUID friend : existing) {
+								rent.getFriendsFeature().addFriend(friend, null);
 							}
+
+							// Fire schematic event and updated times extended
+							rent.handleSchematicEvent(GeneralRegion.RegionEvent.RENTED);
+
+							// Notify about updates
+							rent.update();
+
+							rent.runEventCommands(GeneralRegion.RegionEvent.RENTED, false);
 						}

 						regionsSuccess.add(rent);
@@ -214,47 +213,47 @@ public class AddCommand extends CommandAreaShop {
 						if(landlord) {
 							buy.setLandlord(finalPlayer.getUniqueId(), finalPlayer.getName());
 						}
+						// Run commands
+						buy.runEventCommands(GeneralRegion.RegionEvent.CREATED, true);

-						AddingRegionEvent event = plugin.getFileManager().addRegion(buy);
-						if (event.isCancelled()) {
-							namesAddCancelled.add(buy.getName());
-							return;
-						}
-
+						plugin.getFileManager().addBuy(buy);
 						buy.handleSchematicEvent(GeneralRegion.RegionEvent.CREATED);
+
 						buy.update();

+						// Run commands
+						buy.runEventCommands(GeneralRegion.RegionEvent.CREATED, false);
+
 						// Add existing owners/members if any
 						if(!landlord && !existing.isEmpty()) {
-							UUID buyBy = existing.remove(0);
-							OfflinePlayer buyByPlayer = Bukkit.getOfflinePlayer(buyBy);
+							// TODO also execute buy events to notify for other plugins?

-							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();
+							// Run commands
+							buy.runEventCommands(GeneralRegion.RegionEvent.BOUGHT, true);

-								// Update everything
-								buy.handleSchematicEvent(GeneralRegion.RegionEvent.BOUGHT);
-
-								// Add others as friends
-								for (UUID friend : existing) {
-									buy.getFriendsFeature().addFriend(friend, null);
-								}
-
-								buy.notifyAndUpdate(new BoughtRegionEvent(buy));
+							// Set the owner
+							buy.setBuyer(existing.remove(0));
+							buy.updateLastActiveTime();
+							// Add others as friends
+							for(UUID friend : existing) {
+								buy.getFriendsFeature().addFriend(friend, null);
 							}
+
+							// Notify about updates
+							buy.update();
+
+							// Update everything
+							buy.handleSchematicEvent(GeneralRegion.RegionEvent.BOUGHT);
+
+							// Run commands
+							buy.runEventCommands(GeneralRegion.RegionEvent.BOUGHT, false);
 						}

 						regionsSuccess.add(buy);
 					}
 				}
-			}, false).thenAccept(
-			(success) -> {
+			},
+			() -> {
 				if(!regionsSuccess.isEmpty()) {
 					plugin.message(sender, "add-success", args[1], Utils.combinedMessage(regionsSuccess, "region"));
 				}
@@ -264,12 +263,6 @@ public class AddCommand extends CommandAreaShop {
 				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));
 				}
@@ -277,15 +270,13 @@ public class AddCommand extends CommandAreaShop {
 					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<>();
+		List<String> result = new ArrayList<>();
 		if(toComplete == 2) {
 			if(sender.hasPermission("areashop.createrent")) {
 				result.add("rent");
@@ -7,12 +7,9 @@ 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.material.Sign;
 import org.bukkit.util.BlockIterator;

 import java.util.ArrayList;
@@ -21,108 +18,100 @@ import java.util.Set;

 public class AddsignCommand extends CommandAreaShop {

-    @Override
-    public String getCommandStart() {
-        return "areashop addsign";
-    }
+	@Override
+	public String getCommandStart() {
+		return "areashop addsign";
+	}

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

-    @Override
-    public void execute(CommandSender sender, String[] args) {
-        if (!sender.hasPermission("areashop.addsign")) {
-            plugin.message(sender, "addsign-noPermission");
-            return;
-        }
-        if (!(sender instanceof Player)) {
-            plugin.message(sender, "cmd-onlyByPlayer");
-            return;
-        }
-        Player player = (Player) sender;
+	@Override
+	public void execute(CommandSender sender, String[] args) {
+		if(!sender.hasPermission("areashop.addsign")) {
+			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;
-        }
+		// 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;
+		}

-        GeneralRegion region;
-        if (args.length > 1) {
-            // Get region by argument
-            region = plugin.getFileManager().getRegion(args[1]);
-            if (region == null) {
-                plugin.message(sender, "cmd-notRegistered", args[1]);
-                return;
-            }
-        } else {
-            // Get region by sign position
-            List<GeneralRegion> regions = Utils.getImportantRegions(block.getLocation());
-            if (regions.isEmpty()) {
-                plugin.message(sender, "addsign-noRegions");
-                return;
-            } else if (regions.size() > 1) {
-                plugin.message(sender, "addsign-couldNotDetect", regions.get(0).getName(), regions.get(1).getName());
-                return;
-            }
-            region = regions.get(0);
-        }
-        String profile = null;
-        if (args.length > 2) {
-            profile = args[2];
-            Set<String> profiles = plugin.getConfig().getConfigurationSection("signProfiles").getKeys(false);
-            if (!profiles.contains(profile)) {
-                plugin.message(sender, "addsign-wrongProfile", Utils.createCommaSeparatedList(profiles), region);
-                return;
-            }
-        }
-        RegionSign regionSign = SignsFeature.getSignByLocation(block.getLocation());
-        if (regionSign != null) {
-            plugin.message(sender, "addsign-alreadyRegistered", regionSign.getRegion());
-            return;
-        }
+		GeneralRegion region;
+		if(args.length > 1) {
+			// Get region by argument
+			region = plugin.getFileManager().getRegion(args[1]);
+			if(region == null) {
+				plugin.message(sender, "cmd-notRegistered", args[1]);
+				return;
+			}
+		} else {
+			// Get region by sign position
+			List<GeneralRegion> regions = Utils.getImportantRegions(block.getLocation());
+			if(regions.isEmpty()) {
+				plugin.message(sender, "addsign-noRegions");
+				return;
+			} else if(regions.size() > 1) {
+				plugin.message(sender, "addsign-couldNotDetect", regions.get(0).getName(), regions.get(1).getName());
+				return;
+			}
+			region = regions.get(0);
+		}
+		Sign sign = (Sign)block.getState().getData();
+		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();
-    }
+		region.getSignsFeature().addSign(block.getLocation(), block.getType(), sign.getFacing(), 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;
-    }
+	@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;
+	}

 }

@@ -89,9 +89,9 @@ public abstract class CommandAreaShop {
 		return false;
 	}

-	private static class CommandTime {
-		public final String command;
-		public final long time;
+	private class CommandTime {
+		public String command;
+		public long time;

 		CommandTime(String command, long time) {
 			this.command = command;
@@ -1,6 +1,5 @@
 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.GeneralRegion;
@@ -51,45 +50,37 @@ public class DelCommand extends CommandAreaShop {
 				return;
 			}
 			List<GeneralRegion> regions = Utils.getRegionsInSelection(selection);
-			if(regions == null || regions.isEmpty()) {
+			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<>();
-			TreeSet<GeneralRegion> regionsFailed = new TreeSet<>();
-			TreeSet<GeneralRegion> regionsCancelled = new TreeSet<>();
+			TreeSet<GeneralRegion> namesFailed = new TreeSet<>();
 			for(GeneralRegion 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;
+						namesFailed.add(region);
+					} else {
+						plugin.getFileManager().removeRent((RentRegion)region, true);
+						namesSuccess.add(region.getName());
 					}
 				} else if(region instanceof BuyRegion) {
 					if(!sender.hasPermission("areashop.destroybuy") && !(isLandlord && sender.hasPermission("areashop.destroybuy.landlord"))) {
-						regionsFailed.add(region);
-						continue;
+						namesFailed.add(region);
+					} else {
+						plugin.getFileManager().removeBuy((BuyRegion)region, true);
+						namesSuccess.add(region.getName());
 					}
 				}
-
-				DeletingRegionEvent event = plugin.getFileManager().deleteRegion(region, true);
-				if (event.isCancelled()) {
-					regionsCancelled.add(region);
-				} else {
-					namesSuccess.add(region.getName());
-				}
 			}
-
-			// Send messages
-			if(!namesSuccess.isEmpty()) {
+			// send messages
+			if(namesSuccess.size() != 0) {
 				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"));
+			if(namesFailed.size() != 0) {
+				plugin.message(sender, "del-failed", Utils.combinedMessage(namesFailed, "region"));
 			}
 		} else {
 			GeneralRegion region = plugin.getFileManager().getRegion(args[1]);
@@ -101,24 +92,16 @@ public class DelCommand extends CommandAreaShop {
 			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);
-					}
+					plugin.getFileManager().removeRent((RentRegion)region, true);
+					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);
-					}
+					plugin.getFileManager().removeBuy((BuyRegion)region, true);
+					plugin.message(sender, "destroy-successBuy", region);
 				} else {
 					plugin.message(sender, "destroy-noPermissionBuy", region);
 				}
@@ -11,7 +11,6 @@ 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 {

@@ -83,7 +82,7 @@ public class FindCommand extends CommandAreaShop {
 			}
 			if(!results.isEmpty()) {
 				// Draw a random one
-				BuyRegion region = results.get(ThreadLocalRandom.current().nextInt(results.size()));
+				BuyRegion region = results.get(new Random().nextInt(results.size()));
 				Message onlyInGroup = Message.empty();
 				if(group != null) {
 					onlyInGroup = Message.fromKey("find-onlyInGroup").replacements(args[3]);
@@ -112,7 +111,7 @@ public class FindCommand extends CommandAreaShop {
 		// Find rental regions
 		else {
 			List<RentRegion> regions = plugin.getFileManager().getRents();
-			List<RentRegion> results = new ArrayList<>(regions.size());
+			List<RentRegion> results = new ArrayList<>();
 			for(RentRegion region : regions) {
 				if(!region.isRented()
 						&& ((region.getPrice() <= balance && !maxPriceSet) || (region.getPrice() <= maxPrice && maxPriceSet))
@@ -123,7 +122,7 @@ public class FindCommand extends CommandAreaShop {
 			}
 			if(!results.isEmpty()) {
 				// Draw a random one
-				RentRegion region = results.get(ThreadLocalRandom.current().nextInt(results.size()));
+				RentRegion region = results.get(new Random().nextInt(results.size()));
 				Message onlyInGroup = Message.empty();
 				if(group != null) {
 					onlyInGroup = Message.fromKey("find-onlyInGroup").replacements(args[3]);
@@ -53,7 +53,7 @@ public class GroupaddCommand extends CommandAreaShop {
 				return;
 			}
 			List<GeneralRegion> regions = Utils.getRegionsInSelection(selection);
-			if(regions.isEmpty()) {
+			if(regions.size() == 0) {
 				plugin.message(player, "cmd-noRegionsFound");
 				return;
 			}
@@ -66,10 +66,10 @@ public class GroupaddCommand extends CommandAreaShop {
 					regionsFailed.add(region);
 				}
 			}
-			if(!regionsSuccess.isEmpty()) {
+			if(regionsSuccess.size() != 0) {
 				plugin.message(player, "groupadd-weSuccess", group.getName(), Utils.combinedMessage(regionsSuccess, "region"));
 			}
-			if(!regionsFailed.isEmpty()) {
+			if(regionsFailed.size() != 0) {
 				plugin.message(player, "groupadd-weFailed", group.getName(), Utils.combinedMessage(regionsFailed, "region"));
 			}
 			// Update all regions, this does it in a task, updating them without lag
@@ -54,7 +54,7 @@ public class GroupdelCommand extends CommandAreaShop {
 				return;
 			}
 			List<GeneralRegion> regions = Utils.getRegionsInSelection(selection);
-			if(regions.isEmpty()) {
+			if(regions.size() == 0) {
 				plugin.message(player, "cmd-noRegionsFound");
 				return;
 			}
@@ -67,10 +67,10 @@ public class GroupdelCommand extends CommandAreaShop {
 					regionsFailed.add(region);
 				}
 			}
-			if(!regionsSuccess.isEmpty()) {
+			if(regionsSuccess.size() != 0) {
 				plugin.message(player, "groupdel-weSuccess", group.getName(), Utils.combinedMessage(regionsSuccess, "region"));
 			}
-			if(!regionsFailed.isEmpty()) {
+			if(regionsFailed.size() != 0) {
 				plugin.message(player, "groupdel-weFailed", group.getName(), Utils.combinedMessage(regionsFailed, "region"));
 			}
 			// Update all regions, this does it in a task, updating them without lag
@@ -40,7 +40,7 @@ public class GroupinfoCommand extends CommandAreaShop {
 			return;
 		}
 		Set<String> members = group.getMembers();
-		if(members.isEmpty()) {
+		if(members.size() == 0) {
 			plugin.message(sender, "groupinfo-noMembers", group.getName());
 		} else {
 			plugin.message(sender, "groupinfo-members", group.getName(), Utils.createCommaSeparatedList(members));
@@ -28,7 +28,7 @@ public class GrouplistCommand extends CommandAreaShop {
 			return;
 		}
 		List<String> groups = plugin.getFileManager().getGroupNames();
-		if(groups.isEmpty()) {
+		if(groups.size() == 0) {
 			plugin.message(sender, "grouplist-noGroups");
 		} else {
 			plugin.message(sender, "grouplist-success", Utils.createCommaSeparatedList(groups));
@@ -27,11 +27,11 @@ public class ImportCommand extends CommandAreaShop {
 		return null;
 	}

-	// TODO:
-	//  - Landlord?
-	//  - Friends
-	//  - Region flags?
-	//  - Settings from the 'permissions' section in RegionForSale/config.yml?
+	// TODO
+	// - Landlord?
+	// - Friends
+	// - Region flags?
+	// - Settings from the 'permissions' section in RegionForSale/config.yml?

 	@Override
 	public void execute(CommandSender sender, String[] args) {
@@ -54,7 +54,7 @@ public class ImportCommand extends CommandAreaShop {
 			return;
 		}

-		new ImportJob(sender);
+		ImportJob importJob = new ImportJob(sender);
 	}

 	@Override
@@ -4,7 +4,6 @@ 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;
@@ -241,13 +240,10 @@ public class ImportJob {
 				GeneralRegion region;
 				if(rentable || (owner != null && !isBought)) {
 					region = new RentRegion(regionKey, world);
+					plugin.getFileManager().addRent((RentRegion)region);
 				} else {
 					region = new BuyRegion(regionKey, world);
-				}
-				AddingRegionEvent event = plugin.getFileManager().addRegion(region);
-				if (event.isCancelled()) {
-					messageNoPrefix("general-cancelled", event.getReason());
-					continue;
+					plugin.getFileManager().addBuy((BuyRegion)region);
 				}

 				// Import settings
@@ -259,7 +255,7 @@ public class ImportJob {
 				if(owner != null) {
 					@SuppressWarnings("deprecation")
 					OfflinePlayer offlinePlayer = Bukkit.getOfflinePlayer(owner);
-					if(offlinePlayer.hasPlayedBefore()) {
+					if(offlinePlayer != null) {
 						existing.add(offlinePlayer.getUniqueId());
 					}
 				}
@@ -334,11 +330,13 @@ public class ImportJob {
 		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");
+		String taxes = from.getString("economic-settings.cost-per-unit.taxes");

 		// Determine unit and add that to the price
 		String unitSuffix = "";
-		if("m3".equalsIgnoreCase(unit)) {
+		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
@@ -413,8 +411,8 @@ public class ImportJob {
 	}

 	private static class TimeUnit {
-		public final long minutes;
-		public final String identifier;
+		public long minutes;
+		public String identifier;

 		TimeUnit(long minutes, String identifier) {
 			this.minutes = minutes;
@@ -10,7 +10,11 @@ import org.bukkit.Location;
 import org.bukkit.command.CommandSender;
 import org.bukkit.entity.Player;

-import java.util.*;
+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
@@ -58,7 +62,7 @@ public class InfoCommand extends CommandAreaShop {
 		} else {
 			// First sort by type, then by name
 			regions.sort((one, two) -> {
-				int typeCompare = Integer.compare(getTypeOrder(two), getTypeOrder(one));
+				int typeCompare = getTypeOrder(two).compareTo(getTypeOrder(one));
 				if(typeCompare != 0) {
 					return typeCompare;
 				} else {
@@ -82,22 +86,20 @@ public class InfoCommand extends CommandAreaShop {
 			for(int i = (page - 1) * itemsPerPage; i < page * itemsPerPage && i < regions.size(); i++) {
 				String state;
 				GeneralRegion region = regions.get(i);
-				if(region instanceof RentRegion) {
-					if(region.isAvailable()) {
+				if(region.getType() == GeneralRegion.RegionType.RENT) {
+					if(region.getOwner() == null) {
 						state = "Forrent";
 					} else {
 						state = "Rented";
 					}
-				} else if (region instanceof BuyRegion){
-					if(region.isAvailable()) {
+				} else {
+					if(region.getOwner() == null) {
 						state = "Forsale";
 					} else if(!((BuyRegion)region).isInResellingMode()) {
 						state = "Sold";
 					} else {
 						state = "Reselling";
 					}
-				} else {
-					state = region.getState().getValue();
 				}
 				plugin.messageNoPrefix(sender, "info-entry" + state, region);
 				linesPrinted++;
@@ -111,9 +113,9 @@ public class InfoCommand extends CommandAreaShop {
 			}
 			// Page status
 			if(totalPages > 1) {
-				StringBuilder pageString = new StringBuilder("" + page);
+				String pageString = "" + page;
 				for(int i = pageString.length(); i < (totalPages + "").length(); i++) {
-					pageString.insert(0, "0");
+					pageString = "0" + pageString;
 				}
 				footer.append(Message.fromKey("info-pageStatus").replacements(page, totalPages));
 				if(page < totalPages) {
@@ -135,15 +137,15 @@ public class InfoCommand extends CommandAreaShop {
 	 * @param region The region to get the order for
 	 * @return An integer for sorting by type
 	 */
-	private int getTypeOrder(GeneralRegion region) {
+	private Integer getTypeOrder(GeneralRegion region) {
 		if(region.getType() == GeneralRegion.RegionType.RENT) {
-			if(region.isAvailable()) {
+			if(region.getOwner() == null) {
 				return 1;
 			} else {
 				return 2;
 			}
 		} else {
-			if(region.isAvailable()) {
+			if(region.getOwner() == null) {
 				return 3;
 			} else if(!((BuyRegion)region).isInResellingMode()) {
 				return 4;
@@ -228,201 +230,205 @@ public class InfoCommand extends CommandAreaShop {

 			// Region info
 			else if(args[1].equalsIgnoreCase("region")) {
-				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<GeneralRegion> regions = Utils.getImportantRegions(((Player)sender).getLocation());
-						if(regions.isEmpty()) {
-							plugin.message(sender, "cmd-noRegionsAtLocation");
-							return;
-						} else if(regions.size() > 1) {
-							plugin.message(sender, "cmd-moreRegionsAtLocation");
-							return;
-						} else {
-							if(regions.get(0) instanceof RentRegion) {
-								rent = (RentRegion)regions.get(0);
-							} else if(regions.get(0) instanceof BuyRegion) {
-								buy = (BuyRegion)regions.get(0);
-							}
-						}
+				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 {
-						plugin.message(sender, "cmd-automaticRegionOnlyByPlayer");
+						if(sender instanceof Player) {
+							// get the region by location
+							List<GeneralRegion> regions = Utils.getImportantRegions(((Player)sender).getLocation());
+							if(regions.isEmpty()) {
+								plugin.message(sender, "cmd-noRegionsAtLocation");
+								return;
+							} else if(regions.size() > 1) {
+								plugin.message(sender, "cmd-moreRegionsAtLocation");
+								return;
+							} else {
+								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 && 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.getInactivityThresholdMillis() != -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);
+					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-regionMoneyBackBuy", buy);
+								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);
 							}
 						}
-						// 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));
+						// 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));
 						}
-					} else {
-						plugin.messageNoPrefix(sender, "info-regionCanBeBought", buy);
-					}
-					if(buy.getLandlord() != null) {
-						plugin.messageNoPrefix(sender, "info-regionLandlord", buy);
-					}
-					if(buy.getInactivityThresholdMillis() != -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(", ");
+							tp.append(".");
+							tp.send(sender);
 						}
-						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);
+						// 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);
 					}
-					plugin.messageNoPrefix(sender, "info-regionFooterBuy", buy);
+				} else {
+					plugin.message(sender, "info-regionHelp");
 				}
 			} else {
 				plugin.message(sender, "info-help");
@@ -8,7 +8,6 @@ import org.bukkit.entity.Player;
 import java.util.ArrayList;
 import java.util.List;
 import java.util.Set;
-import java.util.StringJoiner;

 public class LinksignsCommand extends CommandAreaShop {

@@ -48,11 +47,14 @@ public class LinksignsCommand extends CommandAreaShop {
 				if(signProfilesSection != null) {
 					Set<String> profiles = signProfilesSection.getKeys(false);
 					if(!profiles.contains(profile)) {
-						StringJoiner joiner = new StringJoiner(", ");
+						ArrayList<String> message = new ArrayList<>();
 						for(String p : profiles) {
-							Message.fromKey("addsign-profile").replacements(p).get().forEach(joiner::add);
+							if(!message.isEmpty()) {
+								message.add(", ");
+							}
+							message.addAll(Message.fromKey("addsign-profile").replacements(p).get());
 						}
-						plugin.message(sender, "addsign-wrongProfile", joiner.toString());
+						plugin.message(sender, "addsign-wrongProfile", Message.fromList(message));
 						return;
 					}
 				}
@@ -19,7 +19,9 @@ public class MessageCommand extends CommandAreaShop {

 	@Override
 	public String getHelp(CommandSender target) {
-		// Internal command, no need to show in the help list
+		if(target.hasPermission("areashop.message")) {
+			return null; // Internal command, no need to show in the help list
+		}
 		return null;
 	}

@@ -85,7 +85,7 @@ public class ResellCommand extends CommandAreaShop {
 			buy.update();
 			plugin.message(sender, "resell-success", buy);
 		} else if(sender.hasPermission("areashop.resell") && sender instanceof Player) {
-			if(!buy.isTransactionHolder((Player)sender)) {
+			if(!buy.isOwner((Player)sender)) {
 				plugin.message(sender, "resell-noPermissionOther", buy);
 				return;
 			}
@@ -2,7 +2,6 @@ package me.wiefferink.areashop.commands;

 import me.wiefferink.areashop.regions.BuyRegion;
 import me.wiefferink.areashop.regions.GeneralRegion;
-import me.wiefferink.areashop.regions.TransactionalRegion;
 import me.wiefferink.areashop.tools.Utils;
 import org.bukkit.command.CommandSender;
 import org.bukkit.entity.Player;
@@ -12,87 +11,86 @@ import java.util.List;

 public class SellCommand extends CommandAreaShop {

-    /**
-     * 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, GeneralRegion region) {
-        if (person.hasPermission("areashop.sell")) {
-            return true;
-        }
-        if (person instanceof Player && region instanceof TransactionalRegion) {
-            Player player = (Player) person;
-            return ((TransactionalRegion) region).isTransactionHolder(player) && person.hasPermission("areashop.sellown");
-        }
-        return false;
-    }
+	@Override
+	public String getCommandStart() {
+		return "areashop sell";
+	}

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

-    @Override
-    public String getHelp(CommandSender target) {
-        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, GeneralRegion 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")) {
-            plugin.message(sender, "sell-noPermission");
-            return;
-        }
-        BuyRegion buy;
-        if (args.length <= 1) {
-            if (sender instanceof Player) {
-                // get the region by location
-                List<BuyRegion> regions = Utils.getImportantBuyRegions(((Player) sender).getLocation());
-                if (regions.isEmpty()) {
-                    plugin.message(sender, "cmd-noRegionsAtLocation");
-                    return;
-                } else if (regions.size() > 1) {
-                    plugin.message(sender, "cmd-moreRegionsAtLocation");
-                    return;
-                } else {
-                    buy = regions.get(0);
-                }
-            } else {
-                plugin.message(sender, "cmd-automaticRegionOnlyByPlayer");
-                return;
-            }
-        } else {
-            buy = plugin.getFileManager().getBuy(args[1]);
-        }
-        if (buy == null) {
-            plugin.message(sender, "sell-notRegistered");
-            return;
-        }
-        if (!buy.isSold()) {
-            plugin.message(sender, "sell-notBought", buy);
-            return;
-        }
-        buy.sell(true, sender);
-    }
+	@Override
+	public void execute(CommandSender sender, String[] args) {
+		if(!sender.hasPermission("areashop.sell") && !sender.hasPermission("areashop.sellown")) {
+			plugin.message(sender, "sell-noPermission");
+			return;
+		}
+		BuyRegion buy;
+		if(args.length <= 1) {
+			if(sender instanceof Player) {
+				// get the region by location
+				List<BuyRegion> regions = Utils.getImportantBuyRegions(((Player)sender).getLocation());
+				if(regions.isEmpty()) {
+					plugin.message(sender, "cmd-noRegionsAtLocation");
+					return;
+				} else if(regions.size() > 1) {
+					plugin.message(sender, "cmd-moreRegionsAtLocation");
+					return;
+				} else {
+					buy = regions.get(0);
+				}
+			} else {
+				plugin.message(sender, "cmd-automaticRegionOnlyByPlayer");
+				return;
+			}
+		} else {
+			buy = plugin.getFileManager().getBuy(args[1]);
+		}
+		if(buy == null) {
+			plugin.message(sender, "sell-notRegistered");
+			return;
+		}
+		if(!buy.isSold()) {
+			plugin.message(sender, "sell-notBought", buy);
+			return;
+		}
+		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());
-                }
-            }
-        }
-        return result;
-    }
+	@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());
+				}
+			}
+		}
+		return result;
+	}
 }


@@ -3,7 +3,6 @@ package me.wiefferink.areashop.commands;
 import me.wiefferink.areashop.regions.BuyRegion;
 import me.wiefferink.areashop.regions.GeneralRegion;
 import me.wiefferink.areashop.regions.RentRegion;
-import me.wiefferink.areashop.regions.TransactionalRegion;
 import me.wiefferink.areashop.tools.Utils;
 import org.bukkit.Bukkit;
 import org.bukkit.OfflinePlayer;
@@ -78,7 +77,7 @@ public class SetownerCommand extends CommandAreaShop {
 		UUID uuid = null;
 		@SuppressWarnings("deprecation")
 		OfflinePlayer player = Bukkit.getOfflinePlayer(args[1]);
-		if(player.hasPlayedBefore()) {
+		if(player != null) {
 			uuid = player.getUniqueId();
 		}
 		if(uuid == null) {
@@ -88,27 +87,26 @@ public class SetownerCommand extends CommandAreaShop {

 		if(region instanceof RentRegion) {
 			RentRegion rent = (RentRegion)region;
-			if(rent.isTransactionHolder(uuid)) {
+			if(rent.isRenter(uuid)) {
 				// extend
 				rent.setRentedUntil(rent.getRentedUntil() + rent.getDuration());
+				rent.setRenter(uuid);
 				plugin.message(sender, "setowner-succesRentExtend", region);
 			} else {
 				// change
 				if(!rent.isRented()) {
-					rent.setRentedUntil(System.currentTimeMillis()  + rent.getDuration());
+					rent.setRentedUntil(Calendar.getInstance().getTimeInMillis() + rent.getDuration());
 				}
+				rent.setRenter(uuid);
 				plugin.message(sender, "setowner-succesRent", region);
 			}
-			rent.setTransactionHolder(uuid);
 		}
 		if(region instanceof BuyRegion) {
 			BuyRegion buy = (BuyRegion)region;
-			buy.setTransactionHolder(uuid);
+			buy.setBuyer(uuid);
 			plugin.message(sender, "setowner-succesBuy", region);
 		}
-		if (region instanceof TransactionalRegion) {
-			region.getFriendsFeature().deleteFriend(((TransactionalRegion) region).getTransactionHolder(), null);
-		}
+		region.getFriendsFeature().deleteFriend(region.getOwner(), null);
 		region.update();
 		region.saveRequired();
 	}
@@ -66,9 +66,9 @@ public class SetpriceCommand extends CommandAreaShop {
 		}
 		if("default".equalsIgnoreCase(args[1]) || "reset".equalsIgnoreCase(args[1])) {
 			if(region instanceof RentRegion) {
-				((RentRegion)region).setPrice(0);
+				((RentRegion)region).setPrice(null);
 			} else if(region instanceof BuyRegion) {
-				((BuyRegion)region).setPrice(0);
+				((BuyRegion)region).setPrice(null);
 			}
 			region.update();
 			plugin.message(sender, "setprice-successRemoved", region);
@@ -20,7 +20,7 @@ public class SetteleportCommand extends CommandAreaShop {

 	@Override
 	public String getHelp(CommandSender target) {
-		if(target.hasPermission("areashop.setteleportall") || target.hasPermission("areashop.setteleport")) {
+		if(target.hasPermission("areashop.teleportall") || target.hasPermission("areashop.teleport")) {
 			return "help-setteleport";
 		}
 		return null;
@@ -3,7 +3,6 @@ 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.GeneralRegion;
@@ -158,16 +157,33 @@ public class StackCommand extends CommandAreaShop {
 					current++;
 					if(current < amount) {
 						// Create the region name
-						String regionName = countToName(nameTemplate, counter);
+						String counterName = counter + "";
+						int minimumLength = plugin.getConfig().getInt("stackRegionNumberLength");
+						while(counterName.length() < minimumLength) {
+							counterName = "0" + counterName;
+						}
+						String regionName;
+						if(nameTemplate.contains("#")) {
+							regionName = nameTemplate.replace("#", counterName);
+						} else {
+							regionName = nameTemplate + counterName;
+						}
 						while(manager.getRegion(regionName) != null || AreaShop.getInstance().getFileManager().getRegion(regionName) != null) {
 							counter++;
-							regionName = countToName(nameTemplate, counter);
+							counterName = counter + "";
+							minimumLength = plugin.getConfig().getInt("stackRegionNumberLength");
+							while(counterName.length() < minimumLength) {
+								counterName = "0" + counterName;
+							}
+							if(nameTemplate.contains("#")) {
+								regionName = nameTemplate.replace("#", counterName);
+							} else {
+								regionName = nameTemplate + counterName;
+							}
 						}
-
 						// 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++;
@@ -178,26 +194,28 @@ public class StackCommand extends CommandAreaShop {
 						}
 						ProtectedCuboidRegion region = plugin.getWorldGuardHandler().createCuboidRegion(regionName, minimum,maximum);
 						manager.addRegion(region);
-
 						// Add the region to AreaShop
-						GeneralRegion newRegion;
 						if(rentRegions) {
-							newRegion = new RentRegion(regionName, selection.getWorld());
-
+							RentRegion rent = new RentRegion(regionName, selection.getWorld());
+							if(finalGroup != null) {
+								finalGroup.addMember(rent);
+							}
+							rent.runEventCommands(GeneralRegion.RegionEvent.CREATED, true);
+							plugin.getFileManager().addRent(rent);
+							rent.handleSchematicEvent(GeneralRegion.RegionEvent.CREATED);
+							rent.runEventCommands(GeneralRegion.RegionEvent.CREATED, false);
+							rent.update();
 						} else {
-							newRegion = new BuyRegion(regionName, selection.getWorld());
+							BuyRegion buy = new BuyRegion(regionName, selection.getWorld());
+							if(finalGroup != null) {
+								finalGroup.addMember(buy);
+							}
+							buy.runEventCommands(GeneralRegion.RegionEvent.CREATED, true);
+							plugin.getFileManager().addBuy(buy);
+							buy.handleSchematicEvent(GeneralRegion.RegionEvent.CREATED);
+							buy.runEventCommands(GeneralRegion.RegionEvent.CREATED, false);
+							buy.update();
 						}
-
-						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(GeneralRegion.RegionEvent.CREATED);
-						newRegion.update();
 					}
 				}
 				if(current >= amount) {
@@ -218,26 +236,6 @@ public class StackCommand extends CommandAreaShop {
 		}.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<>();
@@ -59,13 +59,12 @@ public class TeleportCommand extends CommandAreaShop {
 			plugin.message(player, "teleport-noRentOrBuy", args[1]);
 			return;
 		}
+		if(args.length >= 3 && (args[2].equalsIgnoreCase("sign") || args[2].equalsIgnoreCase("yes") || args[2].equalsIgnoreCase("true"))) {
+			region.getTeleportFeature().teleportPlayer(player, true);
+		} else {
+			region.getTeleportFeature().teleportPlayer(player, false);
+		}

-		boolean toSign = args.length >= 3 && (
-				args[2].equalsIgnoreCase("sign")
-						|| args[2].equalsIgnoreCase("yes")
-						|| args[2].equalsIgnoreCase("true")
-		);
-		region.getTeleportFeature().teleportPlayer(player, toSign, true);
 	}

 	@Override
@@ -1,31 +0,0 @@
-package me.wiefferink.areashop.commands;
-
-import com.sk89q.worldedit.math.BlockVector3;
-import com.sk89q.worldedit.regions.Region;
-import com.sk89q.worldguard.protection.ApplicableRegionSet;
-import com.sk89q.worldguard.protection.regions.ProtectedRegion;
-import me.wiefferink.areashop.AreaShop;
-import org.bukkit.Location;
-import org.bukkit.command.Command;
-import org.bukkit.command.CommandExecutor;
-import org.bukkit.command.CommandSender;
-import org.bukkit.entity.Player;
-import org.jetbrains.annotations.NotNull;
-
-public class TestCommand implements CommandExecutor {
-
-    private AreaShop areaShop = AreaShop.getInstance();
-
-    @Override
-    public boolean onCommand(@NotNull CommandSender sender, @NotNull Command command, @NotNull String label, @NotNull String[] args) {
-        if (sender instanceof Player) {
-            final Player player = (Player) sender;
-            final Location location = player.getLocation();
-            ApplicableRegionSet region = areaShop.getRegionManager(player.getWorld()).getApplicableRegions(BlockVector3.at(location.getX(), location.getY(), location.getZ()));
-            for (ProtectedRegion r : region.getRegions()) {
-                player.sendMessage(r.getId());
-            }
-        }
-        return true;
-    }
-}
@@ -2,7 +2,6 @@ package me.wiefferink.areashop.commands;

 import me.wiefferink.areashop.regions.GeneralRegion;
 import me.wiefferink.areashop.regions.RentRegion;
-import me.wiefferink.areashop.regions.TransactionalRegion;
 import me.wiefferink.areashop.tools.Utils;
 import org.bukkit.command.CommandSender;
 import org.bukkit.entity.Player;
@@ -12,87 +11,86 @@ import java.util.List;

 public class UnrentCommand extends CommandAreaShop {

-    /**
-     * 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, GeneralRegion region) {
-        if (person.hasPermission("areashop.unrent")) {
-            return true;
-        }
-        if (person instanceof Player && region instanceof TransactionalRegion) {
-            Player player = (Player) person;
-            return ((TransactionalRegion) region).isTransactionHolder(player) && person.hasPermission("areashop.unrentown");
-        }
-        return false;
-    }
+	@Override
+	public String getCommandStart() {
+		return "areashop unrent";
+	}

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

-    @Override
-    public String getHelp(CommandSender target) {
-        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, GeneralRegion 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")) {
-            plugin.message(sender, "unrent-noPermission");
-            return;
-        }
-        RentRegion rent;
-        if (args.length <= 1) {
-            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[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 void execute(CommandSender sender, String[] args) {
+		if(!sender.hasPermission("areashop.unrent") && !sender.hasPermission("areashop.unrentown")) {
+			plugin.message(sender, "unrent-noPermission");
+			return;
+		}
+		RentRegion rent;
+		if(args.length <= 1) {
+			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[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());
-                }
-            }
-        }
-        return result;
-    }
+	@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());
+				}
+			}
+		}
+		return result;
+	}
 }


@@ -16,7 +16,6 @@ public class RegionEvent<T> extends Event {
 		return handlers;
 	}

-	// Required by Bukkit/Spigot
 	public static HandlerList getHandlerList() {
 		return handlers;
 	}
@@ -1,19 +0,0 @@
-package me.wiefferink.areashop.events.ask;
-
-import me.wiefferink.areashop.events.CancellableRegionEvent;
-import me.wiefferink.areashop.regions.GeneralRegion;
-
-/**
- * Broadcasted when a region has been added to AreaShop.
- */
-public class AddingRegionEvent extends CancellableRegionEvent<GeneralRegion> {
-
-	/**
-	 * Constructor.
-	 * @param region The region that has been added
-	 */
-	public AddingRegionEvent(GeneralRegion region) {
-		super(region);
-	}
-
-}
@@ -1,19 +0,0 @@
-package me.wiefferink.areashop.events.ask;
-
-import me.wiefferink.areashop.events.CancellableRegionEvent;
-import me.wiefferink.areashop.regions.GeneralRegion;
-
-/**
- * Broadcasted when a region has been added to AreaShop.
- */
-public class DeletingRegionEvent extends CancellableRegionEvent<GeneralRegion> {
-
-	/**
-	 * Constructor.
-	 * @param region The region that has been added
-	 */
-	public DeletingRegionEvent(GeneralRegion region) {
-		super(region);
-	}
-
-}
@@ -1,118 +0,0 @@
-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.GeneralRegion;
-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(GeneralRegion region, GeneralRegion.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 == null || commands.isEmpty()) {
-			return;
-		}
-		region.runCommands(Bukkit.getConsoleSender(), commands);
-	}
-
-	@EventHandler(priority = EventPriority.MONITOR, ignoreCancelled = true)
-	public void addingRegion(AddingRegionEvent event) {
-		runEventCommands(event.getRegion(), GeneralRegion.RegionEvent.CREATED, true);
-	}
-
-	@EventHandler
-	public void addedRegion(AddedRegionEvent event) {
-		runEventCommands(event.getRegion(), GeneralRegion.RegionEvent.CREATED, false);
-	}
-
-	@EventHandler(priority = EventPriority.MONITOR, ignoreCancelled = true)
-	public void deletingRegion(DeletingRegionEvent event) {
-		runEventCommands(event.getRegion(), GeneralRegion.RegionEvent.DELETED, true);
-	}
-
-	@EventHandler
-	public void deletedRegion(DeletedRegionEvent event) {
-		runEventCommands(event.getRegion(), GeneralRegion.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() ? GeneralRegion.RegionEvent.EXTENDED : GeneralRegion.RegionEvent.RENTED, true);
-	}
-
-	@EventHandler
-	public void rentedRegion(RentedRegionEvent event) {
-		runEventCommands(event.getRegion(), event.hasExtended() ? GeneralRegion.RegionEvent.EXTENDED : GeneralRegion.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(), GeneralRegion.RegionEvent.BOUGHT, true);
-	}
-
-	@EventHandler
-	public void boughtRegion(BoughtRegionEvent event) {
-		runEventCommands(event.getRegion(), GeneralRegion.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(), GeneralRegion.RegionEvent.RESELL, true);
-	}
-
-	@EventHandler
-	public void resoldRegion(ResoldRegionEvent event) {
-		runEventCommands(event.getRegion(), GeneralRegion.RegionEvent.RESELL, false);
-	}
-
-	@EventHandler(priority = EventPriority.MONITOR, ignoreCancelled = true)
-	public void sellingRegion(SellingRegionEvent event) {
-		runEventCommands(event.getRegion(), GeneralRegion.RegionEvent.SOLD, true);
-	}
-
-	@EventHandler
-	public void soldRegion(SoldRegionEvent event) {
-		runEventCommands(event.getRegion(), GeneralRegion.RegionEvent.SOLD, false);
-	}
-
-	@EventHandler(priority = EventPriority.MONITOR, ignoreCancelled = true)
-	public void unrentingRegion(UnrentingRegionEvent event) {
-		runEventCommands(event.getRegion(), GeneralRegion.RegionEvent.UNRENTED, true);
-	}
-
-	@EventHandler
-	public void unrentedRegion(UnrentedRegionEvent event) {
-		runEventCommands(event.getRegion(), GeneralRegion.RegionEvent.UNRENTED, false);
-	}
-
-}
@@ -56,12 +56,13 @@ public class FriendsFeature extends RegionFeature {
 			return false;
 		}

-		List<String> friends = getRegion().getConfig().getStringList("general.friends");
+		Set<String> friends = new HashSet<>(getRegion().getConfig().getStringList("general.friends"));
 		friends.remove(player.toString());
-		if(friends.isEmpty()) {
+		List<String> list = new ArrayList<>(friends);
+		if(list.isEmpty()) {
 			getRegion().setSetting("general.friends", null);
 		} else {
-			getRegion().setSetting("general.friends", friends);
+			getRegion().setSetting("general.friends", list);
 		}
 		return true;
 	}
@@ -6,31 +6,10 @@ 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();
+	public YamlConfiguration config = plugin.getConfig();
 	private GeneralRegion region;

 	/**
@@ -42,7 +42,7 @@ public class WorldGuardRegionFlagsFeature extends RegionFeature {
 		// Region flags for all states
 		ConfigurationSection allFlags = flagProfileSection.getConfigurationSection("ALL");
 		if(allFlags != null) {
-			result = updateRegionFlags(region, allFlags);
+			result = result && updateRegionFlags(region, allFlags);
 		}

 		// Region flags for the current state
@@ -52,8 +52,9 @@ public class WorldGuardRegionFlagsFeature extends RegionFeature {
 		if(stateFlags == null && region.getState() == GeneralRegion.RegionState.RESELL) {
 			stateFlags = flagProfileSection.getConfigurationSection("resale");
 		}
+
 		if(stateFlags != null) {
-			result &= updateRegionFlags(region, stateFlags);
+			result = result && updateRegionFlags(region, stateFlags);
 		}

 		return result;
@@ -12,8 +12,6 @@ import org.bukkit.Material;
 import org.bukkit.block.Block;
 import org.bukkit.block.BlockFace;
 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;
@@ -26,259 +24,236 @@ import java.util.List;
 */
 public class RegionSign {

-    private final SignsFeature signsFeature;
-    private final String key;
+	private final SignsFeature signsFeature;
+	private final String key;

-    public RegionSign(SignsFeature signsFeature, String key) {
-        this.signsFeature = signsFeature;
-        this.key = key;
-    }
+	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"));
-    }
+	/**
+	 * 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());
-    }
+	/**
+	 * 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());
-    }
+	/**
+	 * 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 GeneralRegion getRegion() {
-        return signsFeature.getRegion();
-    }
+	/**
+	 * Get the region this sign is linked to.
+	 * @return The region this sign is linked to
+	 */
+	public GeneralRegion getRegion() {
+		return signsFeature.getRegion();
+	}

-    /**
-     * Remove this sign from the region.
-     */
-    public void remove() {
-        getLocation().getBlock().setType(Material.AIR);
-        signsFeature.getSignsRef().remove(getStringLocation());
-        SignsFeature.getAllSigns().remove(getStringLocation());
-        SignsFeature.getSignsByChunk().get(getStringChunk()).remove(this);
-        getRegion().setSetting("general.signs." + key, null);
-    }
+	/**
+	 * Remove this sign from the region.
+	 */
+	public void remove() {
+		getLocation().getBlock().setType(Material.AIR);
+		signsFeature.getSignsRef().remove(getStringLocation());
+		SignsFeature.getAllSigns().remove(getStringLocation());
+		SignsFeature.getSignsByChunk().get(getStringChunk()).remove(this);
+		getRegion().setSetting("general.signs." + key, null);
+	}

-    /**
-     * Get the 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 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 facing of the sign.
+	 * @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 {@link Material#WALL_SIGN}, {@link Material#SIGN}, or one of the other wood types (different result for 1.13-), Material.AIR if none.
-     */
-    public Material getMaterial() {
-        String name = getRegion().getConfig().getString("general.signs." + key + ".signType");
-        Material result = Materials.signNameToMaterial(name);
-        return result == null ? Material.AIR : result;
-    }
+	/**
+	 * Get the material of the sign
+	 * @return Material of the sign, normally {@link Material#WALL_SIGN} or {@link Material#SIGN_POST}, but could be something else or null.
+	 */
+	public Material getMaterial() {
+		String name = getRegion().getConfig().getString("general.signs." + key + ".signType");
+		if ("WALL_SIGN".equals(name)) {
+			return Materials.wallSign;
+		} else if ("SIGN_POST".equals(name) || "SIGN".equals(name)) {
+			return Materials.floorSign;
+		}
+		return null;
+	}

-    /**
-     * Update this sign.
-     *
-     * @return true if the update was successful, otherwise false
-     */
-    public boolean update() {
-        // Ignore updates of signs in chunks that are not loaded
-        Location signLocation = getLocation();
-        if (signLocation == null
-                || signLocation.getWorld() == null
-                || !signLocation.getWorld().isChunkLoaded(signLocation.getBlockX() >> 4, signLocation.getBlockZ() >> 4)) {
-            return false;
-        }
+	/**
+	 * Update this sign.
+	 * @return true if the update was successful, otherwise false
+	 */
+	public boolean update() {
+		// Ignore updates of signs in chunks that are not loaded
+		Location signLocation = getLocation();
+		if(signLocation == null
+				|| signLocation.getWorld() == null
+				|| !signLocation.getWorld().isChunkLoaded(signLocation.getBlockX() >> 4, signLocation.getBlockZ() >> 4)) {
+			return false;
+		}

-        if (getRegion().isDeleted()) {
-            return false;
-        }
+		if(getRegion().isDeleted()) {
+			return false;
+		}

-        YamlConfiguration regionConfig = getRegion().getConfig();
-        ConfigurationSection signConfig = getProfile();
-        Block block = signLocation.getBlock();
-        if (signConfig == null || !signConfig.isSet(getRegion().getState().getValue())) {
-            block.setType(Material.AIR);
-            return true;
-        }
+		YamlConfiguration regionConfig = getRegion().getConfig();
+		ConfigurationSection signConfig = getProfile();
+		Block block = signLocation.getBlock();
+		if(signConfig == null || !signConfig.isSet(getRegion().getState().getValue())) {
+			block.setType(Material.AIR);
+			return true;
+		}

-        ConfigurationSection stateConfig = signConfig.getConfigurationSection(getRegion().getState().getValue());
+		ConfigurationSection stateConfig = signConfig.getConfigurationSection(getRegion().getState().getValue());

-        // Get the lines
-        String[] signLines = new String[4];
-        boolean signEmpty = true;
-        for (int i = 0; i < 4; i++) {
-            signLines[i] = stateConfig.getString("line" + (i + 1));
-            signEmpty &= (signLines[i] == null || signLines[i].isEmpty());
-        }
-        if (signEmpty) {
-            block.setType(Material.AIR);
-            return true;
-        }
+		// Get the lines
+		String[] signLines = new String[4];
+		boolean signEmpty = true;
+		for(int i = 0; i < 4; i++) {
+			signLines[i] = stateConfig.getString("line" + (i + 1));
+			signEmpty &= (signLines[i] == null || signLines[i].isEmpty());
+		}
+		if(signEmpty) {
+			block.setType(Material.AIR);
+			return true;
+		}

-        // 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 (signType.name().contains("SIGN")) {
-                // Don't do physics here, we first need to update the direction
-                block.setType(signType, false);
-                BlockData data = block.getBlockData();
-                if (data instanceof WallSign) {
-                    ((WallSign) data).setFacing(getFacing());
-                } else if (data instanceof Sign) {
-                    ((org.bukkit.block.data.type.Sign) data).setRotation(getFacing());
-                }
-                block.setBlockData(data, true);
+		// Place the sign back (with proper rotation and type) after it has been hidden or (indirectly) destroyed
+		Sign signState = null;
+		if(!Materials.isSign(block.getType())) {
+			Material signType = getMaterial();
+			block.setType(signType);
+			if(!Materials.isSign(block.getType())) {
+				AreaShop.debug("Setting sign", key, "of region", getRegion().getName(), "failed, could not set sign block back");
+				return false;
+			}
+			signState = (Sign) block.getState();
+			org.bukkit.material.Sign signData = (org.bukkit.material.Sign)signState.getData();
+			BlockFace signFace = getFacing();
+			if(signFace != null) {
+				signData.setFacingDirection(signFace);
+				signState.setData(signData);
+			}
+		}
+		if(signState == null) {
+			signState = (Sign) block.getState();
+		}

-                // Check if the sign has popped
-                if (!Materials.isSign(block.getType())) {
-                    AreaShop.warn("Setting sign", key, "of region", getRegion().getName(), "failed, could not set sign block back");
-                    return false;
-                }
-            } else {
-                AreaShop.warn("Setting sign", key, "of region", getRegion().getName(), "failed, RegionSign material was: " + signType.name());
-            }
-        }
+		// Save current rotation and type
+		org.bukkit.material.Sign signData = (org.bukkit.material.Sign)signState.getData();
+		if(!regionConfig.isString("general.signs." + key + ".signType")) {
+			String signType = signState.getType().name();
+			if (signType.equals("SIGN")) {
+				signType = "SIGN_POST"; // Save with a backwards-compatible name
+			}
+			getRegion().setSetting("general.signs." + key + ".signType", signType);
+		}
+		if(!regionConfig.isString("general.signs." + key + ".facing")) {
+			getRegion().setSetting("general.signs." + key + ".facing", signData.getFacing().toString());
+		}

-        // Save current rotation and type
-        if (!regionConfig.isString("general.signs." + key + ".signType")) {
-            getRegion().setSetting("general.signs." + key + ".signType", block.getType().name());
-        }
-        if (!regionConfig.isString("general.signs." + key + ".facing")) {
-            final BlockFace rotation;
-            if (Materials.isSign(block.getType())) {
-                BlockData data = block.getBlockData();
-                if (data instanceof org.bukkit.block.data.type.Sign) {
-                    rotation = ((org.bukkit.block.data.type.Sign) block.getBlockData()).getRotation();
-                } else if (data instanceof WallSign) {
-                    rotation = ((WallSign) data).getFacing();
-                } else {
-                    rotation = null;
-                }
-            } else {
-                rotation = null;
-            }
-            getRegion().setSetting("general.signs." + key + ".facing", rotation == null ? null : rotation.toString());
-        }
+		// Apply replacements and color and then set it on the sign
+		for(int i = 0; i < signLines.length; i++) {
+			if(signLines[i] == null) {
+				signState.setLine(i, "");
+				continue;
+			}
+			signLines[i] = Message.fromString(signLines[i]).replacements(getRegion()).getSingle();
+			signLines[i] = Utils.applyColors(signLines[i]);
+			signState.setLine(i, signLines[i]);
+		}
+		signState.update();
+		return true;
+	}

-        // Apply replacements and color and then set it on the sign
-        Sign signState = (Sign) block.getState();
-        for (int i = 0; i < signLines.length; i++) {
-            if (signLines[i] == null) {
-                signState.setLine(i, "");
-                continue;
-            }
-            signLines[i] = Message.fromString(signLines[i]).replacements(getRegion()).getSingle();
-            signLines[i] = Utils.applyColors(signLines[i]);
-            signState.setLine(i, signLines[i]);
-        }
-        signState.update();
-        return true;
-    }
+	/**
+	 * 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());
+		// Check the lines for the timeleft tag
+		for(int i = 1; i <= 4; i++) {
+			String line = stateConfig.getString("line" + i);
+			if(line != null && !line.isEmpty() && line.contains(Message.VARIABLE_START + AreaShop.tagTimeLeft + Message.VARIABLE_END)) {
+				return true;
+			}
+		}
+		return false;
+	}

-    /**
-     * Check if the sign needs to update periodically.
-     *
-     * @return true if it needs periodic updates, otherwise false
-     */
-    public boolean needsPeriodicUpdate() {
-        ConfigurationSection signConfig = getProfile();
-        if (signConfig == null || !signConfig.isSet(getRegion().getState().getValue().toLowerCase())) {
-            return false;
-        }
+	/**
+	 * Run commands when a player clicks a sign.
+	 * @param clicker   The player that clicked the sign
+	 * @param clickType The type of clicking
+	 * @return true if the commands ran successfully, false if any of them failed
+	 */
+	public boolean runSignCommands(Player clicker, GeneralRegion.ClickType clickType) {
+		ConfigurationSection signConfig = getProfile();
+		if(signConfig == null) {
+			return false;
+		}
+		ConfigurationSection stateConfig = signConfig.getConfigurationSection(getRegion().getState().getValue().toLowerCase());

-        ConfigurationSection stateConfig = signConfig.getConfigurationSection(getRegion().getState().getValue().toLowerCase());
-        if (stateConfig == null) {
-            return false;
-        }
+		// Run player commands if specified
+		List<String> playerCommands = new ArrayList<>();
+		for(String command : stateConfig.getStringList(clickType.getValue() + "Player")) {
+			// TODO move variable checking code to InteractiveMessenger?
+			playerCommands.add(command.replace(Message.VARIABLE_START + AreaShop.tagClicker + Message.VARIABLE_END, clicker.getName()));
+		}
+		getRegion().runCommands(clicker, playerCommands);

-        // Check the lines for the timeleft tag
-        for (int i = 1; i <= 4; i++) {
-            String line = stateConfig.getString("line" + i);
-            if (line != null && !line.isEmpty() && line.contains(Message.VARIABLE_START + AreaShop.tagTimeLeft + Message.VARIABLE_END)) {
-                return true;
-            }
-        }
-        return false;
-    }
+		// Run console commands if specified
+		List<String> consoleCommands = new ArrayList<>();
+		for(String command : stateConfig.getStringList(clickType.getValue() + "Console")) {
+			consoleCommands.add(command.replace(Message.VARIABLE_START + AreaShop.tagClicker + Message.VARIABLE_END, clicker.getName()));
+		}
+		getRegion().runCommands(Bukkit.getConsoleSender(), consoleCommands);

-    /**
-     * Run commands when a player clicks a sign.
-     *
-     * @param clicker   The player that clicked the sign
-     * @param clickType The type of clicking
-     * @return true if the commands ran successfully, false if any of them failed
-     */
-    public boolean runSignCommands(Player clicker, GeneralRegion.ClickType clickType) {
-        ConfigurationSection signConfig = getProfile();
-        if (signConfig == null) {
-            return false;
-        }
-        ConfigurationSection stateConfig = signConfig.getConfigurationSection(getRegion().getState().getValue().toLowerCase());
+		return !playerCommands.isEmpty() || !consoleCommands.isEmpty();
+	}

-        // Run player commands if specified
-        List<String> playerCommands = new ArrayList<>();
-        for (String command : stateConfig.getStringList(clickType.getValue() + "Player")) {
-            // TODO move variable checking code to InteractiveMessenger?
-            playerCommands.add(command.replace(Message.VARIABLE_START + AreaShop.tagClicker + Message.VARIABLE_END, clicker.getName()));
-        }
-        getRegion().runCommands(clicker, playerCommands);
+	@Override
+	public boolean equals(Object object) {
+		return object instanceof RegionSign && ((RegionSign)object).getRegion().equals(this.getRegion()) && ((RegionSign)object).key.equals(this.key);
+	}

-        // Run console commands if specified
-        List<String> consoleCommands = new ArrayList<>();
-        for (String command : stateConfig.getStringList(clickType.getValue() + "Console")) {
-            consoleCommands.add(command.replace(Message.VARIABLE_START + AreaShop.tagClicker + Message.VARIABLE_END, clicker.getName()));
-        }
-        getRegion().runCommands(Bukkit.getConsoleSender(), consoleCommands);
-
-        return !playerCommands.isEmpty() || !consoleCommands.isEmpty();
-    }
-
-    @Override
-    public boolean equals(Object object) {
-        return object instanceof RegionSign && ((RegionSign) object).getRegion().equals(this.getRegion()) && ((RegionSign) object).key.equals(this.key);
-    }
-
-    @Override
-    public int hashCode() {
-        return Objects.hashCode(key, getRegion().getName());
-    }
+	@Override
+	public int hashCode() {
+		return Objects.hashCode(key, getRegion().getName());
+	}
 }
@@ -0,0 +1,769 @@
+/*
+ * Copyright 2011-2013 Tyler Blair. All rights reserved.
+ *
+ * Redistribution and use in source and binary forms, with or without modification, are
+ * permitted provided that the following conditions are met:
+ *
+ *    1. Redistributions of source code must retain the above copyright notice, this list of
+ *       conditions and the following disclaimer.
+ *
+ *    2. Redistributions in binary form must reproduce the above copyright notice, this list
+ *       of conditions and the following disclaimer in the documentation and/or other materials
+ *       provided with the distribution.
+ *
+ * THIS SOFTWARE IS PROVIDED BY THE AUTHOR ''AS IS'' AND ANY EXPRESS OR IMPLIED
+ * WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND
+ * FITNESS FOR A PARTICULAR PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL THE AUTHOR OR
+ * CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR
+ * CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR
+ * SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON
+ * ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT (INCLUDING
+ * NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF
+ * ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
+ *
+ * The views and conclusions contained in the software and documentation are those of the
+ * authors and contributors and should not be interpreted as representing official policies,
+ * either expressed or implied, of anybody else.
+ */
+
+package me.wiefferink.areashop.lib;
+
+import org.bukkit.Bukkit;
+import org.bukkit.Server;
+import org.bukkit.configuration.InvalidConfigurationException;
+import org.bukkit.configuration.file.YamlConfiguration;
+import org.bukkit.entity.Player;
+import org.bukkit.plugin.Plugin;
+import org.bukkit.plugin.PluginDescriptionFile;
+import org.bukkit.scheduler.BukkitTask;
+
+import java.io.BufferedReader;
+import java.io.ByteArrayOutputStream;
+import java.io.File;
+import java.io.IOException;
+import java.io.InputStreamReader;
+import java.io.OutputStream;
+import java.io.UnsupportedEncodingException;
+import java.lang.reflect.Method;
+import java.net.Proxy;
+import java.net.URL;
+import java.net.URLConnection;
+import java.net.URLEncoder;
+import java.nio.charset.StandardCharsets;
+import java.util.Collection;
+import java.util.Collections;
+import java.util.HashSet;
+import java.util.Iterator;
+import java.util.LinkedHashSet;
+import java.util.Set;
+import java.util.UUID;
+import java.util.logging.Level;
+import java.util.zip.GZIPOutputStream;
+
+public class Metrics {
+
+	/**
+	 * The current revision number.
+	 */
+	private static final int REVISION = 7;
+
+	/**
+	 * The base url of the metrics domain.
+	 */
+	private static final String BASE_URL = "http://report.mcstats.org";
+
+	/**
+	 * The url used to report a server's status.
+	 */
+	private static final String REPORT_URL = "/plugin/%s";
+
+	/**
+	 * Interval of time to ping (in minutes).
+	 */
+	private static final int PING_INTERVAL = 15;
+
+	/**
+	 * The plugin this metrics submits for.
+	 */
+	private final Plugin plugin;
+
+	/**
+	 * All of the custom graphs to submit to metrics.
+	 */
+	private final Set<Graph> graphs = Collections.synchronizedSet(new HashSet<Graph>());
+
+	/**
+	 * The plugin configuration file.
+	 */
+	private final YamlConfiguration configuration;
+
+	/**
+	 * The plugin configuration file.
+	 */
+	private final File configurationFile;
+
+	/**
+	 * Unique server id.
+	 */
+	private final String guid;
+
+	/**
+	 * Debug mode.
+	 */
+	private final boolean debug;
+
+	/**
+	 * Lock for synchronization.
+	 */
+	private final Object optOutLock = new Object();
+
+	/**
+	 * The scheduled task.
+	 */
+	private volatile BukkitTask task = null;
+
+	/**
+	 * Constructor.
+	 * @param plugin The plugin to report stats for
+	 * @throws IOException When the plugin or configuration is wrong
+	 */
+	public Metrics(final Plugin plugin) throws IOException {
+		if(plugin == null) {
+			throw new IllegalArgumentException("Plugin cannot be null");
+		}
+
+		this.plugin = plugin;
+
+		// load the config
+		configurationFile = getConfigFile();
+		configuration = YamlConfiguration.loadConfiguration(configurationFile);
+
+		// add some defaults
+		configuration.addDefault("opt-out", false);
+		configuration.addDefault("guid", UUID.randomUUID().toString());
+		configuration.addDefault("debug", false);
+
+		// Do we need to create the file?
+		if(configuration.get("guid", null) == null) {
+			configuration.options().header("http://mcstats.org").copyDefaults(true);
+			configuration.save(configurationFile);
+		}
+
+		// Load the guid then
+		guid = configuration.getString("guid");
+		debug = configuration.getBoolean("debug", false);
+	}
+
+	/**
+	 * Construct and create a Graph that can be used to separate specific plotters to their own graphs on the metrics
+	 * website. Plotters can be added to the graph object returned.
+	 * @param name The name of the graph
+	 * @return Graph object created. Will never return NULL under normal circumstances unless bad parameters are given
+	 */
+	public Graph createGraph(final String name) {
+		if(name == null) {
+			throw new IllegalArgumentException("Graph name cannot be null");
+		}
+
+		// Construct the graph object
+		final Graph graph = new Graph(name);
+
+		// Now we can add our graph
+		graphs.add(graph);
+
+		// and return back
+		return graph;
+	}
+
+	/**
+	 * Add a Graph object to BukkitMetrics that represents data for the plugin that should be sent to the backend.
+	 * @param graph The name of the graph
+	 */
+	public void addGraph(final Graph graph) {
+		if(graph == null) {
+			throw new IllegalArgumentException("Graph cannot be null");
+		}
+
+		graphs.add(graph);
+	}
+
+	/**
+	 * Start measuring statistics. This will immediately create an async repeating task as the plugin and send the
+	 * initial data to the metrics backend, and then after that it will post in increments of PING_INTERVAL * 1200
+	 * ticks.
+	 * @return True if statistics measuring is running, otherwise false.
+	 */
+	public boolean start() {
+		synchronized(optOutLock) {
+			// Did we opt out?
+			if(isOptOut()) {
+				return false;
+			}
+
+			// Is metrics already running?
+			if(task != null) {
+				return true;
+			}
+
+			// Begin hitting the server with glorious data
+			task = plugin.getServer().getScheduler().runTaskTimerAsynchronously(plugin, new Runnable() {
+
+				private boolean firstPost = true;
+
+				public void run() {
+					try {
+						// This has to be synchronized or it can collide with the disable method.
+						synchronized(optOutLock) {
+							// Disable Task, if it is running and the server owner decided to opt-out
+							if(isOptOut() && task != null) {
+								task.cancel();
+								task = null;
+								// Tell all plotters to stop gathering information.
+								for(Graph graph : graphs) {
+									graph.onOptOut();
+								}
+							}
+						}
+
+						// We use the inverse of firstPost because if it is the first time we are posting,
+						// it is not a interval ping, so it evaluates to FALSE
+						// Each time thereafter it will evaluate to TRUE, i.e PING!
+						postPlugin(!firstPost);
+
+						// After the first post we set firstPost to false
+						// Each post thereafter will be a ping
+						firstPost = false;
+					} catch(IOException e) {
+						if(debug) {
+							Bukkit.getLogger().log(Level.INFO, "[Metrics] " + e.getMessage());
+						}
+					}
+				}
+			}, 0, PING_INTERVAL * 1200);
+
+			return true;
+		}
+	}
+
+	/**
+	 * If the server owner denied plugin metrics.
+	 * @return true if metrics should be opted out of it
+	 */
+	public boolean isOptOut() {
+		synchronized(optOutLock) {
+			try {
+				// Reload the metrics file
+				configuration.load(getConfigFile());
+			} catch(IOException ex) {
+				if(debug) {
+					Bukkit.getLogger().log(Level.INFO, "[Metrics] " + ex.getMessage());
+				}
+				return true;
+			} catch(InvalidConfigurationException ex) {
+				if(debug) {
+					Bukkit.getLogger().log(Level.INFO, "[Metrics] " + ex.getMessage());
+				}
+				return true;
+			}
+			return configuration.getBoolean("opt-out", false);
+		}
+	}
+
+	/**
+	 * Enables metrics for the server by setting "opt-out" to false in the config file and starting the metrics task.
+	 * @throws IOException when saving the config file fails
+	 */
+	public void enable() throws IOException {
+		// This has to be synchronized or it can collide with the check in the task.
+		synchronized(optOutLock) {
+			// Check if the server owner has already set opt-out, if not, set it.
+			if(isOptOut()) {
+				configuration.set("opt-out", false);
+				configuration.save(configurationFile);
+			}
+
+			// Enable Task, if it is not running
+			if(task == null) {
+				start();
+			}
+		}
+	}
+
+	/**
+	 * Disables metrics for the server by setting "opt-out" to true in the config file and canceling the metrics task.
+	 * @throws IOException when saving the config file fails
+	 */
+	public void disable() throws IOException {
+		// This has to be synchronized or it can collide with the check in the task.
+		synchronized(optOutLock) {
+			// Check if the server owner has already set opt-out, if not, set it.
+			if(!isOptOut()) {
+				configuration.set("opt-out", true);
+				configuration.save(configurationFile);
+			}
+
+			// Disable Task, if it is running
+			if(task != null) {
+				task.cancel();
+				task = null;
+			}
+		}
+	}
+
+	/**
+	 * Gets the File object of the config file that should be used to store data such as the GUID and opt-out status.
+	 * @return the File object for the config file
+	 */
+	public File getConfigFile() {
+		// I believe the easiest way to get the base folder (e.g craftbukkit set via -P) for plugins to use
+		// is to abuse the plugin object we already have
+		// plugin.getDataFolder() => base/plugins/PluginA/
+		// pluginsFolder => base/plugins/
+		// The base is not necessarily relative to the startup directory.
+		File pluginsFolder = plugin.getDataFolder().getParentFile();
+
+		// return => base/plugins/PluginMetrics/config.yml
+		return new File(new File(pluginsFolder, "PluginMetrics"), "config.yml");
+	}
+
+	/**
+	 * Gets the online player (backwards compatibility).
+	 * @return online player amount
+	 */
+	private int getOnlinePlayers() {
+		try {
+			Method onlinePlayerMethod = Server.class.getMethod("getOnlinePlayers");
+			if(onlinePlayerMethod.getReturnType().equals(Collection.class)) {
+				return ((Collection<?>)onlinePlayerMethod.invoke(Bukkit.getServer())).size();
+			} else {
+				return ((Player[])onlinePlayerMethod.invoke(Bukkit.getServer())).length;
+			}
+		} catch(Exception ex) {
+			if(debug) {
+				Bukkit.getLogger().log(Level.INFO, "[Metrics] " + ex.getMessage());
+			}
+		}
+
+		return 0;
+	}
+
+	/**
+	 * Generic method that posts a plugin to the metrics website.
+	 */
+	private void postPlugin(final boolean isPing) throws IOException {
+		// Server software specific section
+		PluginDescriptionFile description = plugin.getDescription();
+		String pluginName = description.getName();
+		boolean onlineMode = Bukkit.getServer().getOnlineMode(); // TRUE if online mode is enabled
+		String pluginVersion = description.getVersion();
+		String serverVersion = Bukkit.getVersion();
+		int playersOnline = this.getOnlinePlayers();
+
+		// END server software specific section -- all code below does not use any code outside of this class / Java
+
+		// Construct the post data
+		StringBuilder json = new StringBuilder(1024);
+		json.append('{');
+
+		// The plugin's description file containg all of the plugin data such as name, version, author, etc
+		appendJsonPair(json, "guid", guid);
+		appendJsonPair(json, "plugin_version", pluginVersion);
+		appendJsonPair(json, "server_version", serverVersion);
+		appendJsonPair(json, "players_online", Integer.toString(playersOnline));
+
+		// New data as of R6
+		String osname = System.getProperty("os.name");
+		String osarch = System.getProperty("os.arch");
+		String osversion = System.getProperty("os.version");
+		String javaVersion = System.getProperty("java.version");
+		int coreCount = Runtime.getRuntime().availableProcessors();
+
+		// normalize os arch .. amd64 -> x86_64
+		if(osarch.equals("amd64")) {
+			osarch = "x86_64";
+		}
+
+		appendJsonPair(json, "osname", osname);
+		appendJsonPair(json, "osarch", osarch);
+		appendJsonPair(json, "osversion", osversion);
+		appendJsonPair(json, "cores", Integer.toString(coreCount));
+		appendJsonPair(json, "auth_mode", onlineMode ? "1" : "0");
+		appendJsonPair(json, "java_version", javaVersion);
+
+		// If we're pinging, append it
+		if(isPing) {
+			appendJsonPair(json, "ping", "1");
+		}
+
+		if(graphs.size() > 0) {
+			synchronized(graphs) {
+				json.append(',');
+				json.append('"');
+				json.append("graphs");
+				json.append('"');
+				json.append(':');
+				json.append('{');
+
+				boolean firstGraph = true;
+
+				final Iterator<Graph> iter = graphs.iterator();
+
+				while(iter.hasNext()) {
+					Graph graph = iter.next();
+
+					StringBuilder graphJson = new StringBuilder();
+					graphJson.append('{');
+
+					for(Plotter plotter : graph.getPlotters()) {
+						appendJsonPair(graphJson, plotter.getColumnName(), Integer.toString(plotter.getValue()));
+					}
+
+					graphJson.append('}');
+
+					if(!firstGraph) {
+						json.append(',');
+					}
+
+					json.append(escapeJson(graph.getName()));
+					json.append(':');
+					json.append(graphJson);
+
+					firstGraph = false;
+				}
+
+				json.append('}');
+			}
+		}
+
+		// close json
+		json.append('}');
+
+		// Create the url
+		URL url = new URL(BASE_URL + String.format(REPORT_URL, urlEncode(pluginName)));
+
+		// Connect to the website
+		URLConnection connection;
+
+		// Mineshafter creates a socks proxy, so we can safely bypass it
+		// It does not reroute POST requests so we need to go around it
+		if(isMineshafterPresent()) {
+			connection = url.openConnection(Proxy.NO_PROXY);
+		} else {
+			connection = url.openConnection();
+		}
+
+
+		byte[] uncompressed = json.toString().getBytes();
+		byte[] compressed = gzip(json.toString());
+
+		// Headers
+		connection.addRequestProperty("User-Agent", "MCStats/" + REVISION);
+		connection.addRequestProperty("Content-Type", "application/json");
+		connection.addRequestProperty("Content-Encoding", "gzip");
+		connection.addRequestProperty("Content-Length", Integer.toString(compressed.length));
+		connection.addRequestProperty("Accept", "application/json");
+		connection.addRequestProperty("Connection", "close");
+
+		connection.setDoOutput(true);
+
+		if(debug) {
+			System.out.println("[Metrics] Prepared request for " + pluginName + " uncompressed=" + uncompressed.length + " compressed=" + compressed.length);
+		}
+
+		// Write the data
+		OutputStream os = connection.getOutputStream();
+		os.write(compressed);
+		os.flush();
+
+		// Now read the response
+		final BufferedReader reader = new BufferedReader(new InputStreamReader(connection.getInputStream()));
+		String response = reader.readLine();
+
+		// close resources
+		os.close();
+		reader.close();
+
+		if(response == null || response.startsWith("ERR") || response.startsWith("7")) {
+			if(response == null) {
+				response = "null";
+			} else if(response.startsWith("7")) {
+				response = response.substring(response.startsWith("7,") ? 2 : 1);
+			}
+
+			throw new IOException(response);
+		} else {
+			// Is this the first update this hour?
+			if(response.equals("1") || response.contains("This is your first update this hour")) {
+				synchronized(graphs) {
+					final Iterator<Graph> iter = graphs.iterator();
+
+					while(iter.hasNext()) {
+						final Graph graph = iter.next();
+
+						for(Plotter plotter : graph.getPlotters()) {
+							plotter.reset();
+						}
+					}
+				}
+			}
+		}
+	}
+
+	/**
+	 * GZip compress a string of bytes.
+	 * @param input Content to gzip
+	 * @return byte[] of the gzipped input
+	 */
+	public static byte[] gzip(String input) {
+		ByteArrayOutputStream baos = new ByteArrayOutputStream();
+		GZIPOutputStream gzos = null;
+
+		try {
+			gzos = new GZIPOutputStream(baos);
+			gzos.write(input.getBytes(StandardCharsets.UTF_8));
+		} catch(IOException e) {
+			e.printStackTrace();
+		} finally {
+			if(gzos != null) {
+				try {
+					gzos.close();
+				} catch(IOException ignore) {
+					// ignore
+				}
+			}
+		}
+
+		return baos.toByteArray();
+	}
+
+	/**
+	 * Check if mineshafter is present. If it is, we need to bypass it to send POST requests
+	 * @return true if mineshafter is installed on the server
+	 */
+	private boolean isMineshafterPresent() {
+		try {
+			Class.forName("mineshafter.MineServer");
+			return true;
+		} catch(Exception e) {
+			return false;
+		}
+	}
+
+	/**
+	 * Appends a json encoded key/value pair to the given string builder.
+	 */
+	private static void appendJsonPair(StringBuilder json, String key, String value) throws UnsupportedEncodingException {
+		boolean isValueNumeric = false;
+
+		try {
+			if(value.equals("0") || !value.endsWith("0")) {
+				Double.parseDouble(value);
+				isValueNumeric = true;
+			}
+		} catch(NumberFormatException e) {
+			isValueNumeric = false;
+		}
+
+		if(json.charAt(json.length() - 1) != '{') {
+			json.append(',');
+		}
+
+		json.append(escapeJson(key));
+		json.append(':');
+
+		if(isValueNumeric) {
+			json.append(value);
+		} else {
+			json.append(escapeJson(value));
+		}
+	}
+
+	/**
+	 * Escape a string to create a valid JSON string.
+	 */
+	private static String escapeJson(String text) {
+		StringBuilder builder = new StringBuilder();
+
+		builder.append('"');
+		for(int index = 0; index < text.length(); index++) {
+			char chr = text.charAt(index);
+
+			switch(chr) {
+				case '"':
+				case '\\':
+					builder.append('\\');
+					builder.append(chr);
+					break;
+				case '\b':
+					builder.append("\\b");
+					break;
+				case '\t':
+					builder.append("\\t");
+					break;
+				case '\n':
+					builder.append("\\n");
+					break;
+				case '\r':
+					builder.append("\\r");
+					break;
+				default:
+					if(chr < ' ') {
+						String t = "000" + Integer.toHexString(chr);
+						builder.append("\\u" + t.substring(t.length() - 4));
+					} else {
+						builder.append(chr);
+					}
+					break;
+			}
+		}
+		builder.append('"');
+
+		return builder.toString();
+	}
+
+	/**
+	 * Encode text as UTF-8.
+	 * @param text the text to encode
+	 * @return the encoded text, as UTF-8
+	 */
+	private static String urlEncode(final String text) throws UnsupportedEncodingException {
+		return URLEncoder.encode(text, "UTF-8");
+	}
+
+	/**
+	 * Represents a custom graph on the website.
+	 */
+	public static class Graph {
+
+		/**
+		 * The graph's name, alphanumeric and spaces only :) If it does not comply to the above when submitted, it is
+		 * rejected.
+		 */
+		private final String name;
+
+		/**
+		 * The set of plotters that are contained within this graph.
+		 */
+		private final Set<Plotter> plotters = new LinkedHashSet<Plotter>();
+
+		private Graph(final String name) {
+			this.name = name;
+		}
+
+		/**
+		 * Gets the graph's name.
+		 * @return the Graph's name
+		 */
+		public String getName() {
+			return name;
+		}
+
+		/**
+		 * Add a plotter to the graph, which will be used to plot entries.
+		 * @param plotter the plotter to add to the graph
+		 */
+		public void addPlotter(final Plotter plotter) {
+			plotters.add(plotter);
+		}
+
+		/**
+		 * Remove a plotter from the graph.
+		 * @param plotter the plotter to remove from the graph
+		 */
+		public void removePlotter(final Plotter plotter) {
+			plotters.remove(plotter);
+		}
+
+		/**
+		 * Gets an <b>unmodifiable</b> set of the plotter objects in the graph.
+		 * @return an unmodifiable {@link java.util.Set} of the plotter objects
+		 */
+		public Set<Plotter> getPlotters() {
+			return Collections.unmodifiableSet(plotters);
+		}
+
+		@Override
+		public int hashCode() {
+			return name.hashCode();
+		}
+
+		@Override
+		public boolean equals(final Object object) {
+			if(!(object instanceof Graph)) {
+				return false;
+			}
+
+			final Graph graph = (Graph)object;
+			return graph.name.equals(name);
+		}
+
+		/**
+		 * Called when the server owner decides to opt-out of BukkitMetrics while the server is running.
+		 */
+		protected void onOptOut() {
+		}
+	}
+
+	/**
+	 * Interface used to collect custom data for a plugin.
+	 */
+	public abstract static class Plotter {
+
+		/**
+		 * The plot's name.
+		 */
+		private final String name;
+
+		/**
+		 * Construct a plotter with the default plot name.
+		 */
+		public Plotter() {
+			this("Default");
+		}
+
+		/**
+		 * Construct a plotter with a specific plot name.
+		 * @param name the name of the plotter to use, which will show up on the website
+		 */
+		public Plotter(final String name) {
+			this.name = name;
+		}
+
+		/**
+		 * Get the current value for the plotted point. Since this function defers to an external function it may or may
+		 * not return immediately thus cannot be guaranteed to be thread friendly or safe. This function can be called
+		 * from any thread so care should be taken when accessing resources that need to be synchronized.
+		 * @return the current value for the point to be plotted.
+		 */
+		public abstract int getValue();
+
+		/**
+		 * Get the column name for the plotted point.
+		 * @return the plotted point's column name
+		 */
+		public String getColumnName() {
+			return name;
+		}
+
+		/**
+		 * Called after the website graphs have been updated.
+		 */
+		public void reset() {
+		}
+
+		@Override
+		public int hashCode() {
+			return getColumnName().hashCode();
+		}
+
+		@Override
+		public boolean equals(final Object object) {
+			if(!(object instanceof Plotter)) {
+				return false;
+			}
+
+			final Plotter plotter = (Plotter)object;
+			return plotter.name.equals(name) && plotter.getValue() == getValue();
+		}
+	}
+}
@@ -4,8 +4,8 @@ import me.wiefferink.areashop.AreaShop;
 import me.wiefferink.areashop.regions.BuyRegion;
 import me.wiefferink.areashop.regions.GeneralRegion;
 import me.wiefferink.areashop.regions.RentRegion;
-import me.wiefferink.areashop.regions.TransactionalRegion;
 import me.wiefferink.areashop.tools.Utils;
+import me.wiefferink.bukkitdo.Do;
 import org.bukkit.entity.Player;
 import org.bukkit.event.EventHandler;
 import org.bukkit.event.EventPriority;
@@ -16,120 +16,118 @@ import org.bukkit.event.player.PlayerLoginEvent.Result;
 import org.bukkit.event.player.PlayerQuitEvent;

 import java.util.ArrayList;
-import java.util.LinkedList;
 import java.util.List;

 /**
 * Notify region expiry and track activity time.
 */
 public final class PlayerLoginLogoutListener implements Listener {
-    private final AreaShop plugin;
+	private final AreaShop plugin;

-    /**
-     * Constructor.
-     *
-     * @param plugin The AreaShop plugin
-     */
-    public PlayerLoginLogoutListener(AreaShop plugin) {
-        this.plugin = 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();
+	/**
+	 * 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 (GeneralRegion generalRegion : plugin.getFileManager().getRegions()) {
-                if (!(generalRegion instanceof RentRegion)) {
-                    continue;
-                }
-                final RentRegion region = (RentRegion) generalRegion;
-                if (region.isTransactionHolder(player)) {
-                    String warningSetting = region.getStringSetting("rent.warningOnLoginTime");
-                    if (warningSetting == null || warningSetting.isEmpty()) {
-                        continue;
-                    }
-                    long warningTime = Utils.durationStringToLong(warningSetting);
-                    if (region.getTimeLeft() < warningTime) {
-                        // Send the warning message later to let it appear after general MOTD messages
-                        AreaShop.getInstance().message(player, "rent-expireWarning", region);
-                    }
-                }
-            }
+		// Schedule task to check for notifications, prevents a lag spike at login
+		Do.syncTimerLater(25, 25, () -> {
+			// Delay until all regions are loaded
+			if(!plugin.isReady()) {
+				return true;
+			}
+			if(!player.isOnline()) {
+				return false;
+			}
+			// Notify for rents that almost run out
+			for(RentRegion region : plugin.getFileManager().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);
+			// Notify admins for plugin updates
+			AreaShop.getInstance().notifyUpdate(player);
+			return false;
+		});

-        // Check if the player has regions that use an old name of him and update them
-        Utils.runCancellingTaskTimer(() -> {
-            if (!plugin.isReady()) {
-                return true;
-            }
+		// Check if the player has regions that use an old name of him and update them
+		Do.syncTimerLater(22, 10, () -> {
+			if(!plugin.isReady()) {
+				return true;
+			}

-            List<GeneralRegion> regions = new LinkedList<>();
-            for (GeneralRegion region : plugin.getFileManager().getRegions()) {
-                if (region instanceof TransactionalRegion && ((TransactionalRegion) region).isTransactionHolder(player)) {
-                    regions.add(region);
-                }
-            }
-            final String name = player.getName();
-            Utils.runAsBatches(regions,
-                    plugin.getConfig().getInt("nameupdate.regionsPerTick"),
-                    (region) -> {
-                        if (region instanceof BuyRegion || region instanceof RentRegion) {
-                            String key = region instanceof BuyRegion ? "buy.buyerName" : "rent.renterName";
-                            if (!name.equals(region.getStringSetting("buy.buyerName"))) {
-                                region.setSetting(key, player.getName());
-                                region.update();
-                            }
-                        }
-                    }, false);
-            return false;
-        }, 22, 10, false);
-    }
+			List<GeneralRegion> regions = new ArrayList<>();
+			for(GeneralRegion region : plugin.getFileManager().getRegions()) {
+				if(region.isOwner(player)) {
+					regions.add(region);
+				}
+			}

-    // Active time updates
-    @EventHandler(priority = EventPriority.MONITOR)
-    public void onPlayerLogout(PlayerQuitEvent event) {
-        updateLastActive(event.getPlayer());
-    }
+			Do.forAll(
+				plugin.getConfig().getInt("nameupdate.regionsPerTick"),
+				regions,
+				region -> {
+					if(region instanceof BuyRegion) {
+						if(!player.getName().equals(region.getStringSetting("buy.buyerName"))) {
+							region.setSetting("buy.buyerName", player.getName());
+							region.update();
+						}
+					} else if(region instanceof RentRegion) {
+						if(!player.getName().equals(region.getStringSetting("rent.renterName"))) {
+							region.setSetting("rent.renterName", player.getName());
+							region.update();
+						}
+					}
+				}
+			);
+			return false;
+		});
+	}

-    @EventHandler(priority = EventPriority.MONITOR)
-    public void onPlayerKick(PlayerKickEvent event) {
-        updateLastActive(event.getPlayer());
-    }
+	// Active time updates
+	@EventHandler(priority = EventPriority.MONITOR)
+	public void onPlayerLogout(PlayerQuitEvent event) {
+		updateLastActive(event.getPlayer());
+	}

-    /**
-     * Update the last active time for all regions the player is owner off.
-     *
-     * @param player The player to update the active times for
-     */
-    private void updateLastActive(Player player) {
-        for (GeneralRegion region : plugin.getFileManager().getRegions()) {
-            if (region instanceof TransactionalRegion && ((TransactionalRegion) region).isTransactionHolder(player)) {
-                region.updateLastActiveTime();
-            }
-        }
-    }
+	@EventHandler(priority = EventPriority.MONITOR)
+	public void onPlayerKick(PlayerKickEvent event) {
+		updateLastActive(event.getPlayer());
+	}
+
+	/**
+	 * Update the last active time for all regions the player is owner off.
+	 * @param player The player to update the active times for
+	 */
+	private void updateLastActive(Player player) {
+		for(GeneralRegion region : plugin.getFileManager().getRegions()) {
+			if(region.isOwner(player)) {
+				region.updateLastActiveTime();
+			}
+		}
+	}
 }


@@ -95,7 +95,7 @@ public class CommandManager extends Manager implements CommandExecutor, TabCompl
 	 * Get the list with AreaShop commands.
 	 * @return The list with AreaShop commands
 	 */
-	public List<CommandAreaShop> getCommands() {
+	public ArrayList<CommandAreaShop> getCommands() {
 		return commands;
 	}

@@ -114,7 +114,7 @@ public class CommandManager extends Manager implements CommandExecutor, TabCompl
 		plugin.message(target, "help-alias");
 		for(CommandAreaShop command : commands) {
 			String help = command.getHelp(target);
-			if(help != null && !help.isEmpty()) {
+			if(help != null && help.length() != 0) {
 				messages.add(help);
 			}
 		}
@@ -130,13 +130,11 @@ public class CommandManager extends Manager implements CommandExecutor, TabCompl
 			plugin.message(sender, "general-notReady");
 			return true;
 		}
-
 		// Redirect `/as info player <player>` to `/as me <player>`
 		if(args.length == 3 && "info".equals(args[0]) && "player".equals(args[1])) {
 			args[0] = "me";
 			args[1] = args[2];
 		}
-
 		// Execute command
 		boolean executed = false;
 		for(int i = 0; i < commands.size() && !executed; i++) {
@@ -145,21 +143,16 @@ public class CommandManager extends Manager implements CommandExecutor, TabCompl
 				executed = true;
 			}
 		}
-
-		// Show help
-		if (!executed) {
-			if (args.length == 0) {
-				this.showHelp(sender);
+		if(!executed && args.length == 0) {
+			this.showHelp(sender);
+		} else if(!executed && args.length > 0) {
+			// 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 {
-				// 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");
-				}
+				plugin.message(sender, "cmd-notValid");
 			}
 		}
-
 		return true;
 	}

@@ -188,7 +181,7 @@ public class CommandManager extends Manager implements CommandExecutor, TabCompl
 			}
 		}
 		// Filter and sort the results
-		if(!result.isEmpty()) {
+		if(result.size() > 0) {
 			SortedSet<String> set = new TreeSet<>();
 			for(String suggestion : result) {
 				if(suggestion.toLowerCase().startsWith(toCompletePrefix)) {
@@ -1,7 +1,6 @@
 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;
@@ -26,8 +25,7 @@ public class FeatureManager extends Manager {
 			SignsFeature.class,
 			FriendsFeature.class,
 			WorldGuardRegionFlagsFeature.class,
-			TeleportFeature.class,
-			CommandsFeature.class
+			TeleportFeature.class
 	));
 	// One instance of each feature, registered for event handling
 	private final Set<RegionFeature> globalFeatures;
@@ -42,11 +40,13 @@ public class FeatureManager extends Manager {
 		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);
+				try {
+					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
 			}
@@ -80,7 +80,7 @@ public class FeatureManager extends Manager {
 		try {
 			return regionFeatureConstructors.get(featureClazz).newInstance(region);
 		} catch(InstantiationException | InvocationTargetException | IllegalAccessException | IllegalArgumentException e) {
-			AreaShop.error("Failed to instantiate feature", featureClazz, "for region", region, e, e.getCause());
+			AreaShop.error("Failed to instanciate feature", featureClazz, "for region", region, e, e.getCause());
 		}
 		return null;
 	}
@@ -10,9 +10,6 @@ import org.bukkit.Location;
 import org.bukkit.Material;
 import org.bukkit.block.Block;
 import org.bukkit.block.BlockFace;
-import org.bukkit.block.data.BlockData;
-import org.bukkit.block.data.type.Sign;
-import org.bukkit.block.data.type.WallSign;
 import org.bukkit.entity.Player;
 import org.bukkit.event.EventHandler;
 import org.bukkit.event.EventPriority;
@@ -21,6 +18,7 @@ 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.HashMap;
@@ -133,16 +131,8 @@ public class SignLinkerManager extends Manager implements Listener {
 					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);
+				Sign sign = (Sign)block.getState().getData();
+				linker.setSign(block.getLocation(), block.getType(), sign.getFacing());
 			}
 		}
 	}
@@ -16,471 +16,557 @@ import org.bukkit.command.CommandSender;
 import org.bukkit.configuration.file.YamlConfiguration;
 import org.bukkit.entity.Player;

+import java.util.Calendar;
 import java.util.UUID;

-public class BuyRegion extends TransactionalRegion {
+public class BuyRegion extends GeneralRegion {

-    private static final String UNKNOWN_BUYER = "<UNKNOWN>";
+	public BuyRegion(YamlConfiguration config) {
+		super(config);
+	}

-    public BuyRegion(YamlConfiguration config) {
-        super(config, RegionType.BUY);
-    }
+	public BuyRegion(String name, World world) {
+		super(name, world);
+	}

-    public BuyRegion(String name, World world) {
-        super(name, world, RegionType.BUY);
-    }
+	@Override
+	public RegionType getType() {
+		return RegionType.BUY;
+	}

-    @Override
-    public RegionState getState() {
-        if (isSold() && isInResellingMode()) {
-            return RegionState.RESELL;
-        } else if (isSold() && !isInResellingMode()) {
-            return RegionState.SOLD;
-        } else {
-            return RegionState.FORSALE;
-        }
-    }
+	@Override
+	public RegionState getState() {
+		if(isSold() && isInResellingMode()) {
+			return RegionState.RESELL;
+		} else if(isSold() && !isInResellingMode()) {
+			return RegionState.SOLD;
+		} else {
+			return RegionState.FORSALE;
+		}
+	}

-    /**
-     * Get the UUID of the owner of this region.
-     *
-     * @return The UUID of the owner of this region
-     */
-    @Deprecated
-    public UUID getBuyer() {
-        String buyer = config.getString("buy.buyer");
-        if (buyer != null) {
-            try {
-                return UUID.fromString(buyer);
-            } catch (IllegalArgumentException e) {
-                // Incorrect UUID
-            }
-        }
-        return null;
-    }
+	@Override
+	public boolean isAvailable() {
+		return !isSold();
+	}

-    /**
-     * Set the buyer of this region.
-     *
-     * @param buyer The UUID of the player that should be set as buyer
-     */
-    @Deprecated
-    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));
-        }
-        this.setTransactionHolder(buyer);
-    }
+	/**
+	 * 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
-     */
-    @Deprecated
-    public boolean isBuyer(OfflinePlayer player) {
-        return player != null && isBuyer(player.getUniqueId());
-    }
+	/**
+	 * 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());
+	}

-    @Deprecated
-    public boolean isBuyer(UUID player) {
-        UUID buyer = getBuyer();
-        return !(buyer == null || player == null) && buyer.equals(player);
-    }
+	public boolean isBuyer(UUID player) {
+		UUID buyer = getBuyer();
+		return !(buyer == null || player == null) && buyer.equals(player);
+	}

-    /**
-     * 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 &lt;UNKNOWN&gt;
-     */
-    public String getPlayerName() {
-        String result = Utils.toName(getBuyer());
-        if (result.isEmpty()) {
-            result = getStringSetting("buy.buyerName");
-            if (result == null || result.isEmpty()) {
-                result = UNKNOWN_BUYER;
-            }
-        }
-        return result;
-    }
+	/**
+	 * 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));
+		}
+	}

-    /**
-     * 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 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 &lt;UNKNOWN&gt;
+	 */
+	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;
+	}

-    /**
-     * 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"));
-    }
+	/**
+	 * Check if the region is sold.
+	 * @return true if the region is sold, otherwise false
+	 */
+	public boolean isSold() {
+		return getBuyer() != null;
+	}

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

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

-    /**
-     * Stop this region from being in resell mode.
-     */
-    public void disableReselling() {
-        setSetting("buy.resellMode", null);
-        setSetting("buy.resellPrice", null);
-    }
+	/**
+	 * 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"));
+	}

-    @Override
-    public Object provideReplacement(String variable) {
-        switch (variable) {
-            case AreaShop.tagResellPrice:
-                return getFormattedResellPrice();
-            case AreaShop.tagRawResellPrice:
-                return getResellPrice();
-            default:
-                return super.provideReplacement(variable);
-        }
-    }
+	/**
+	 * 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());
+	}

-    /**
-     * Minutes until automatic unrent when player is offline.
-     *
-     * @return The number of milliseconds until the region is unrented while player is offline
-     */
-    @Deprecated
-    public long getInactiveTimeUntilSell() {
-        return Utils.getDurationFromMinutesOrStringInput(getStringSetting("buy.inactiveTimeUntilSell"));
-    }
+	/**
+	 * 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());
+	}

-    /**
-     * Get a human readable string indicating how long the player can be offline until automatic unrent.
-     *
-     * @return String indicating the inactive time until unrent
-     */
-    @Deprecated
-    public String getFormattedInactiveTimeUntilSell() {
-        return Utils.millisToHumanFormat(getInactiveTimeUntilSell());
-    }
+	/**
+	 * Change the price of the region.
+	 * @param price The price to set this region to
+	 */
+	public void setPrice(Double price) {
+		setSetting("buy.price", price);
+	}

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

-        if (plugin.getEconomy() == null) {
-            message(offlinePlayer, "general-noEconomy");
-            return false;
-        }
+	/**
+	 * Stop this region from being in resell mode.
+	 */
+	public void disableReselling() {
+		setSetting("buy.resellMode", null);
+		setSetting("buy.resellPrice", null);
+	}

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

-        if (getWorld() == null) {
-            message(offlinePlayer, "general-noWorld");
-            return false;
-        }
+	/**
+	 * 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);
+	}

-        if (getRegion() == null) {
-            message(offlinePlayer, "general-noRegion");
-            return false;
-        }
+	/**
+	 * 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());
+	}

-        if (isSold() && !(isInResellingMode() && !isBuyer(offlinePlayer))) {
-            if (isBuyer(offlinePlayer)) {
-                message(offlinePlayer, "buy-yours");
-            } else {
-                message(offlinePlayer, "buy-someoneElse");
-            }
-            return false;
-        }
+	@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();

-        boolean isResell = isInResellingMode();
+			default:
+				return super.provideReplacement(variable);
+		}
+	}

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

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

-        // 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;
-        }
+	/**
+	 * 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")) {
+			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))) {
+				boolean isResell = isInResellingMode();

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

-            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 " + getName() + ": " + r.errorMessage);
-                return false;
-            }
-            r = null;
-            OfflinePlayer oldOwnerPlayer = Bukkit.getOfflinePlayer(oldOwner);
-            String oldOwnerName = getPlayerName();
-            if (oldOwnerPlayer.hasPlayedBefore() && 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 " + getName() + " to " + offlinePlayer.getName());
-            }
-            // Resell is done, disable that now
-            disableReselling();
+				// 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;
+				}

-            // Set the owner
-            setBuyer(offlinePlayer.getUniqueId());
-            updateLastActiveTime();
+				// Check if the player has enough money
+				if((!isResell && plugin.getEconomy().has(offlinePlayer, getWorldName(), getPrice())) || (isResell && plugin.getEconomy().has(offlinePlayer, getWorldName(), getResellPrice()))) {
+					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;
+						}

-            // Update everything
-            handleSchematicEvent(RegionEvent.RESELL);
+						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 " + getName() + ": " + 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 " + getName() + " to " + offlinePlayer.getName());
+						}
+						// Resell is done, disable that now
+						disableReselling();
+						// Run commands
+						this.runEventCommands(RegionEvent.RESELL, true);
+						// Set the owner
+						setBuyer(offlinePlayer.getUniqueId());
+						updateLastActiveTime();

-            // Notify about updates
-            this.notifyAndUpdate(new ResoldRegionEvent(this, oldOwner));
+						// Update everything
+						handleSchematicEvent(RegionEvent.RESELL);

-            // 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;
-            }
+						// Notify about updates
+						this.notifyAndUpdate(new ResoldRegionEvent(this, oldOwner));

-            // 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 " + getName() + " to " + offlinePlayer.getName());
-                }
-            }
+						// Send message to the player
+						message(offlinePlayer, "buy-successResale", oldOwnerName);
+						Player seller = Bukkit.getPlayer(oldOwner);
+						if(seller != null) {
+							message(seller, "buy-successSeller", resellPrice);
+						}
+						// Run commands
+						this.runEventCommands(RegionEvent.RESELL, false);
+					} 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;
+						}

-            // Set the owner
-            setBuyer(offlinePlayer.getUniqueId());
-            updateLastActiveTime();
+						// 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 " + getName() + " to " + offlinePlayer.getName());
+							}
+						}

-            // Send message to the player
-            message(offlinePlayer, "buy-succes");
+						// Run commands
+						this.runEventCommands(RegionEvent.BOUGHT, true);
+						// Set the owner
+						setBuyer(offlinePlayer.getUniqueId());
+						updateLastActiveTime();

-            // Update everything
-            handleSchematicEvent(RegionEvent.BOUGHT);
+						// Notify about updates
+						this.notifyAndUpdate(new BoughtRegionEvent(this));

-            // Notify about updates
-            this.notifyAndUpdate(new BoughtRegionEvent(this));
-        }
-        return true;
-    }
+						// Update everything
+						handleSchematicEvent(RegionEvent.BOUGHT);

-    /**
-     * Sell a purchased 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;
-            }
-        }
+						// Send message to the player
+						message(offlinePlayer, "buy-succes");
+						// Run commands
+						this.runEventCommands(RegionEvent.BOUGHT, false);
+					}
+					return true;
+				} else {
+					// Player has not enough money
+					if(isResell) {
+						message(offlinePlayer, "buy-lowMoneyResell", Utils.formatCurrency(plugin.getEconomy().getBalance(offlinePlayer, getWorldName())));
+					} else {
+						message(offlinePlayer, "buy-lowMoney", Utils.formatCurrency(plugin.getEconomy().getBalance(offlinePlayer, getWorldName())));
+					}
+				}
+			} else {
+				if(isBuyer(offlinePlayer)) {
+					message(offlinePlayer, "buy-yours");
+				} else {
+					message(offlinePlayer, "buy-someoneElse");
+				}
+			}
+		} else {
+			message(offlinePlayer, "buy-noPermission");
+		}
+		return false;
+	}

-        if (plugin.getEconomy() == null) {
-            return false;
-        }
+	/**
+	 * 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;
+			}
+		}

-        // Broadcast and check event
-        SellingRegionEvent event = new SellingRegionEvent(this);
-        Bukkit.getPluginManager().callEvent(event);
-        if (event.isCancelled()) {
-            message(executor, "general-cancelled", event.getReason());
-            return false;
-        }
+		if(plugin.getEconomy() == null) {
+			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;
-                }
-            }
+		// Broadcast and check event
+		SellingRegionEvent event = new SellingRegionEvent(this);
+		Bukkit.getPluginManager().callEvent(event);
+		if(event.isCancelled()) {
+			message(executor, "general-cancelled", event.getReason());
+			return false;
+		}

-            // Give back the money
-            OfflinePlayer player = Bukkit.getOfflinePlayer(getTransactionHolder());
-            if (player.hasPlayedBefore() && !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 " + getName());
-                }
-            }
-        }
+		// Run commands
+		this.runEventCommands(RegionEvent.SOLD, true);

-        // Handle schematic save/restore (while %uuid% is still available)
-        handleSchematicEvent(RegionEvent.SOLD);
+		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;
+				}
+			}

-        // Send message: before actual removal of the buyer so that it is still available for variables
-        message(executor, "sell-sold");
+			// 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 " + getName());
+				}
+			}
+		}

-        // Remove friends and the owner
-        getFriendsFeature().clearFriends();
-        UUID oldBuyer = getBuyer();
-        setBuyer(null);
-        removeLastActiveTime();
+		message(executor, "sell-sold");

-        // Notify about updates
-        this.notifyAndUpdate(new SoldRegionEvent(this, oldBuyer, Math.max(moneyBack, 0)));
-        return true;
-    }
+		// Handle schematic save/restore (while %uuid% is still available)
+		handleSchematicEvent(RegionEvent.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)));
+
+		// Run commands
+		this.runEventCommands(RegionEvent.SOLD, false);
+		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();
+		//AreaShop.debug("currentTime=" + Calendar.getInstance().getTimeInMillis() + ", getLastPlayed()=" + lastPlayed + ", timeInactive=" + (Calendar.getInstance().getTimeInMillis()-player.getLastPlayed()) + ", inactiveSetting=" + inactiveSetting);
+		if(Calendar.getInstance().getTimeInMillis() > (lastPlayed + inactiveSetting)) {
+			AreaShop.info("Region " + getName() + " unrented because of inactivity for player " + getPlayerName());
+			AreaShop.debug("currentTime=" + Calendar.getInstance().getTimeInMillis() + ", getLastPlayed()=" + lastPlayed + ", timeInactive=" + (Calendar.getInstance().getTimeInMillis() - player.getLastPlayed()) + ", inactiveSetting=" + inactiveSetting);
+			return this.sell(true, null);
+		}
+		return false;
+	}

-    @Override
-    public boolean handleInactivity() {
-        return this.sell(true, null);
-    }
 }


@@ -148,8 +148,8 @@ public class RegionGroup {
 	 */
 	public Set<GeneralRegion> getMemberRegions() {
 		Set<GeneralRegion> result = new HashSet<>();
-		for(String playerName : getMembers()) {
-			result.add(plugin.getFileManager().getRegion(playerName));
+		for(String name : getMembers()) {
+			result.add(plugin.getFileManager().getRegion(name));
 		}
 		return result;
 	}
@@ -1,240 +0,0 @@
-package me.wiefferink.areashop.regions;
-
-import me.wiefferink.areashop.AreaShop;
-import me.wiefferink.areashop.tools.Utils;
-import org.bukkit.OfflinePlayer;
-import org.bukkit.World;
-import org.bukkit.configuration.file.YamlConfiguration;
-
-import java.util.UUID;
-
-public abstract class TransactionalRegion extends GeneralRegion {
-
-    private final String key;
-
-    private final RegionType type;
-    private UUID transactionHolder;
-    private String transactionHolderName;
-    private double price;
-    private double moneyBackPercentage;
-    private long inactivityThresholdMillis;
-
-    public TransactionalRegion(YamlConfiguration config, RegionType regionType) {
-        super(config);
-        this.type = regionType;
-        this.key = regionType.name().toLowerCase() + ".";
-        this.moneyBackPercentage = config.getDouble(this.key + "moneyBack");
-    }
-
-    public TransactionalRegion(String name, World world, RegionType type) {
-        super(name, world);
-        this.type = type;
-        this.key = type.name().toLowerCase() + ".";
-    }
-
-    protected final void setInactivityThresholdMillis(long inactivityThresholdMillis) {
-        this.inactivityThresholdMillis = inactivityThresholdMillis;
-    }
-
-    @Override
-    public RegionType getType() {
-        return type;
-    }
-
-    @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 getTransactionHolder() {
-        return transactionHolder;
-    }
-
-    /**
-     * Set the buyer of this region. WARNING - May trigger disk lookup for offline players!
-     *
-     * @param transactionHolder The UUID of the player that should be set as buyer
-     */
-    public void setTransactionHolder(UUID transactionHolder) {
-        if (transactionHolder == null) {
-            this.transactionHolder = null;
-            this.transactionHolderName = null;
-        } else {
-            this.transactionHolder = transactionHolder;
-            String name = Utils.toName(transactionHolder);
-            this.transactionHolderName = name.isEmpty() ? null : name;
-        }
-    }
-
-    /**
-     * Set the buyer of this region.
-     *
-     * @param player The instance of the player.
-     */
-    public void setTransactionHolder(final OfflinePlayer player) {
-        if (player == null) {
-            this.transactionHolder = null;
-            this.transactionHolderName = null;
-        } else {
-            String name = player.getName();
-            this.transactionHolderName = name == null || name.isEmpty() ? null : name;
-        }
-    }
-
-    @Override
-    public void setOwner(UUID player) {
-        setTransactionHolder(player);
-    }
-
-    /**
-     * Check if a player is the buyer/holder of this region.
-     *
-     * @param player Player to check
-     * @return true if this player owns this region, otherwise false
-     */
-    public boolean isTransactionHolder(OfflinePlayer player) {
-        return player != null && player.getUniqueId().equals(transactionHolder);
-    }
-
-    public boolean isTransactionHolder(UUID player) {
-        UUID buyer = getTransactionHolder();
-        return !(buyer == null || player == null) && buyer.equals(player);
-    }
-
-    /**
-     * 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 &lt;UNKNOWN&gt;
-     */
-    public String getPlayerName() {
-        return this.transactionHolderName == null ? "<UNKNOWN>" : transactionHolderName;
-    }
-
-    /**
-     * Check if the region is sold.
-     *
-     * @return true if the region is sold, otherwise false
-     */
-    public boolean isSold() {
-        return this.transactionHolder != null;
-    }
-
-    /**
-     * Get the price of the region.
-     *
-     * @return The price of the region
-     */
-    public double getPrice() {
-        return price;
-    }
-
-    /**
-     * Change the price of the region.
-     *
-     * @param price The price to set this region to
-     */
-    public void setPrice(double price) {
-        this.price = price;
-        super.config.set(key + "price", price);
-    }
-
-    /**
-     * 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 moneyBack percentage.
-     *
-     * @return The % of money the player will get back when selling
-     */
-    public double getMoneyBackPercentage() {
-        return moneyBackPercentage;
-    }
-
-    /**
-     * 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() * (moneyBackPercentage / 100D);
-    }
-
-    /**
-     * 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 getTransactionHolder();
-            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.getFormattedInactivityThreshold();
-            default:
-                return super.provideReplacement(variable);
-        }
-    }
-
-    public long getInactivityThresholdMillis() {
-        return this.inactivityThresholdMillis;
-    }
-
-    /**
-     * 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 getFormattedInactivityThreshold() {
-        return Utils.millisToHumanFormat(this.inactivityThresholdMillis);
-    }
-
-    @Override
-    public boolean checkInactivity(final OfflinePlayer player) {
-        if (isDeleted() || !isSold()) {
-            return false;
-        }
-        long inactiveSetting = getInactivityThresholdMillis();
-        if (inactiveSetting <= 0) {
-            return false;
-        }
-        if (player.isOnline()) {
-            return false;
-        }
-        long lastPlayed = getLastActiveTime();
-        long now = System.currentTimeMillis();
-        if (now > (lastPlayed + inactiveSetting)) {
-            AreaShop.info("Region " + getName() + " unrented because of inactivity for player " + getPlayerName());
-            AreaShop.debug("currentTime=" + now + ", getLastPlayed()=" + lastPlayed + ", timeInactive=" + (now - player.getLastPlayed()) + ", inactiveSetting=" + inactiveSetting);
-            return true;
-        }
-        return false;
-    }
-}
@@ -4,100 +4,144 @@ import me.wiefferink.areashop.AreaShop;
 import me.wiefferink.areashop.regions.BuyRegion;
 import me.wiefferink.areashop.regions.GeneralRegion;
 import me.wiefferink.areashop.regions.RentRegion;
-import org.bstats.bukkit.Metrics;
+import org.bstats.Metrics;

 import java.util.HashMap;
-import java.util.Map;

 public class Analytics {

-    private Analytics() {
+	/**
+	 * Start analytics tracking.
+	 */
+	public static void start() {
+		// Legacy MCstats statistics (remove at some point)
+		try {
+			new me.wiefferink.areashop.lib.Metrics(AreaShop.getInstance()).start();
+			AreaShop.debug("Started mcstats.org statistics service");
+		} catch(Exception e) {
+			AreaShop.debug("Could not start mcstats.org statistics service");
+		}

-    }
+		// bStats statistics
+		try {
+			Metrics metrics = new Metrics(AreaShop.getInstance());

-    /**
-     * Start analytics tracking.
-     */
-    public static void start() {
-        // bStats statistics
-        try {
-            Metrics metrics = new Metrics(AreaShop.getInstance());
+			// Number of regions
+			metrics.addCustomChart(new Metrics.SingleLineChart("region_count") {
+				@Override
+				public int getValue() {
+					return AreaShop.getInstance().getFileManager().getRegions().size();
+				}
+			});

-            // Number of regions
-            metrics.addCustomChart(new Metrics.SingleLineChart("region_count", () -> AreaShop.getInstance().getFileManager().getRegions().size()));
+			// Number of rental regions
+			metrics.addCustomChart(new Metrics.SingleLineChart("rental_region_count") {
+				@Override
+				public int getValue() {
+					return AreaShop.getInstance().getFileManager().getRents().size();
+				}
+			});

-            // Number of rental regions
-            metrics.addCustomChart(new Metrics.SingleLineChart("rental_region_count", () -> {
-                return AreaShop.getInstance().getFileManager().getRents().size();
-            }));
+			// Number of buy regions
+			metrics.addCustomChart(new Metrics.SingleLineChart("buy_region_count") {
+				@Override
+				public int getValue() {
+					return AreaShop.getInstance().getFileManager().getBuys().size();
+				}
+			});

-            // Number of buy regions
-            metrics.addCustomChart(new Metrics.SingleLineChart("buy_region_count", () -> AreaShop.getInstance().getFileManager().getBuys().size()));
+			// Language
+			metrics.addCustomChart(new Metrics.SimplePie("language") {
+				@Override
+				public String getValue() {
+					return AreaShop.getInstance().getConfig().getString("language");
+				}
+			});

-            // Language
-            metrics.addCustomChart(new Metrics.SimplePie("language", () -> AreaShop.getInstance().getConfig().getString("language")));
+			// Pie with region states
+			metrics.addCustomChart(new Metrics.AdvancedPie("region_state") {
+				@Override
+				public HashMap<String, Integer> getValues(HashMap<String, Integer> result) {
+					RegionStateStats stats = getStateStats();
+					result.put("For Rent", stats.forrent);
+					result.put("Rented", stats.rented);
+					result.put("For Sale", stats.forsale);
+					result.put("Sold", stats.sold);
+					result.put("Reselling", stats.reselling);
+					return result;
+				}
+			});

-            // Pie with region states
-            metrics.addCustomChart(new Metrics.AdvancedPie("region_state", () -> {
-                Map<String, Integer> map = new HashMap<>();
-                RegionStateStats stats = getStateStats();
-                map.put("For Rent", stats.forrent);
-                map.put("Rented", stats.rented);
-                map.put("For Sale", stats.forsale);
-                map.put("Sold", stats.sold);
-                map.put("Reselling", stats.reselling);
-                return map;
-            }));
+			// Time series of each region state
+			metrics.addCustomChart(new Metrics.SingleLineChart("forrent_region_count") {
+				@Override
+				public int getValue() {
+					return getStateStats().forrent;
+				}
+			});
+			metrics.addCustomChart(new Metrics.SingleLineChart("rented_region_count") {
+				@Override
+				public int getValue() {
+					return getStateStats().rented;
+				}
+			});
+			metrics.addCustomChart(new Metrics.SingleLineChart("forsale_region_count") {
+				@Override
+				public int getValue() {
+					return getStateStats().forsale;
+				}
+			});
+			metrics.addCustomChart(new Metrics.SingleLineChart("sold_region_count") {
+				@Override
+				public int getValue() {
+					return getStateStats().sold;
+				}
+			});
+			metrics.addCustomChart(new Metrics.SingleLineChart("reselling_region_count") {
+				@Override
+				public int getValue() {
+					return getStateStats().reselling;
+				}
+			});

-            // Time series of each region state
-            metrics.addCustomChart(new Metrics.SingleLineChart("forrent_region_count", () -> getStateStats().forrent));
+			// TODO track rent/buy/unrent/sell/resell actions (so that it can be reported per collection interval)

-            metrics.addCustomChart(new Metrics.SingleLineChart("rented_region_count", () -> getStateStats().rented));
+			AreaShop.debug("Started bstats.org statistics service");
+		} catch(Exception e) {
+			AreaShop.debug("Could not start bstats.org statistics service");
+		}
+	}

-            metrics.addCustomChart(new Metrics.SingleLineChart("forsale_region_count", () -> getStateStats().forsale));
+	private static class RegionStateStats {
+		int forrent = 0;
+		int forsale = 0;
+		int rented = 0;
+		int sold = 0;
+		int reselling = 0;
+	}

-            metrics.addCustomChart(new Metrics.SingleLineChart("sold_region_count", () -> getStateStats().sold));
-
-            metrics.addCustomChart(new Metrics.SingleLineChart("reselling_region_count", () -> getStateStats().reselling));
-
-            // TODO track rent/buy/unrent/sell/resell actions (so that it can be reported per collection interval)
-
-            AreaShop.debug("Started bstats.org statistics service");
-        } catch (Exception e) {
-            AreaShop.debug("Could not start bstats.org statistics service");
-        }
-    }
-
-    private static RegionStateStats getStateStats() {
-        RegionStateStats result = new RegionStateStats();
-        for (GeneralRegion region : AreaShop.getInstance().getFileManager().getRegions()) {
-            if (region instanceof RentRegion) {
-                RentRegion rent = (RentRegion) region;
-                if (rent.isAvailable()) {
-                    result.forrent++;
-                } else {
-                    result.rented++;
-                }
-            } else if (region instanceof BuyRegion) {
-                BuyRegion buy = (BuyRegion) region;
-                if (buy.isAvailable()) {
-                    result.forsale++;
-                } else if (buy.isInResellingMode()) {
-                    result.reselling++;
-                } else {
-                    result.sold++;
-                }
-            }
-        }
-        return result;
-    }
-
-    private static class RegionStateStats {
-        int forrent = 0;
-        int forsale = 0;
-        int rented = 0;
-        int sold = 0;
-        int reselling = 0;
-    }
+	private static RegionStateStats getStateStats() {
+		RegionStateStats result = new RegionStateStats();
+		for(GeneralRegion region : AreaShop.getInstance().getFileManager().getRegions()) {
+			if(region instanceof RentRegion) {
+				RentRegion rent = (RentRegion)region;
+				if(rent.isAvailable()) {
+					result.forrent++;
+				} else {
+					result.rented++;
+				}
+			} else if(region instanceof BuyRegion) {
+				BuyRegion buy = (BuyRegion)region;
+				if(buy.isAvailable()) {
+					result.forsale++;
+				} else if(buy.isInResellingMode()) {
+					result.reselling++;
+				} else {
+					result.sold++;
+				}
+			}
+		}
+		return result;
+	}

 }
@@ -1,28 +0,0 @@
-package me.wiefferink.areashop.tools;
-
-import org.bukkit.Chunk;
-
-public class ChunkUtils {
-
-    private final long twoPower32 = Integer.MAX_VALUE + 1L;
-
-    public static long getPackedChunkCoords(Chunk chunk) {
-        return packToLong(chunk.getX(), chunk.getZ());
-    }
-
-    public static long packToLong(int primary, int secondary) {
-        return (long) primary & 0xffffffffL | ((long) secondary & 0xffffffffL) << 32;
-    }
-
-    public static int getChunkX(long packed) {
-        return (int) packed;
-    }
-
-    public static int getChunkZ(long packed) {
-        return (int) (packed >> 32);
-    }
-
-    public static int[] getChunkCoords(long packed) {
-        return new int[]{(int) packed, (int) (packed >> 32)};
-    }
-}
@@ -49,8 +49,8 @@ public class GithubUpdateCheck {
 		this.author = author;
 		this.repository = repository;
 		this.currentVersion = plugin.getDescription().getVersion();
-		this.versionComparator = (latest, current) ->
-				!latest.equalsIgnoreCase(current);
+		this.versionComparator = (latestVersion, currentVersion) ->
+				!latestVersion.equalsIgnoreCase(currentVersion);

 		this.checking = false;
 		this.error = false;
@@ -5,44 +5,10 @@ import org.bukkit.Bukkit;
 import org.bukkit.Material;

 import java.util.Arrays;
-import java.util.HashSet;
 import java.util.List;

 public class Materials {

-	private Materials() {
-
-	}
-
-	private static final HashSet<String> WALL_SIGN_TYPES = new HashSet<>(Arrays.asList(
-		// 1.14+ types
-		"ACACIA_WALL_SIGN",
-		"BIRCH_WALL_SIGN",
-		"DARK_OAK_WALL_SIGN",
-		"JUNGLE_WALL_SIGN",
-		"OAK_WALL_SIGN",
-		"SPRUCE_WALL_SIGN",
-
-		// Legacy types
-		"LEGACY_WALL_SIGN",
-		"WALL_SIGN"
-	));
-	private static final HashSet<String> FLOOR_SIGN_TYPES = new HashSet<>(Arrays.asList(
-		// 1.14+ types
-		"ACACIA_SIGN",
-		"BIRCH_SIGN",
-		"DARK_OAK_SIGN",
-		"JUNGLE_SIGN",
-		"OAK_SIGN",
-		"SPRUCE_SIGN",
-
-		// Legacy types
-		"LEGACY_SIGN",
-		"LEGACY_SIGN_POST",
-		"SIGN",
-		"SIGN_POST"
-	));
-
 	private static boolean legacyMaterials = false;

 	static {
@@ -59,53 +25,34 @@ public class Materials {
 		}
 	}

-	/**
-	 * Get material based on a sign material name.
-	 * @param name Name of the sign material
-	 * @return null if not a sign, otherwise the material matching the name (when the material is not available on the current minecraft version, it returns the base type)
-	 */
-	public static Material signNameToMaterial(String name) {
-		// Expected null case
-		if (!isSign(name)) {
-			return null;
-		}
+	public static final Material wallSign = get("WALL_SIGN");
+	public static final Material floorSign = get("SIGN", "SIGN_POST");

-		Material result = null;
-		if (legacyMaterials) {
-			// 1.12 and lower just know SIGN_POST, WALL_SIGN and SIGN
-			if (FLOOR_SIGN_TYPES.contains(name)) {
-				result = Material.getMaterial("SIGN_POST");
-			} else if (WALL_SIGN_TYPES.contains(name)) {
-				result = Material.getMaterial("WALL_SIGN");
-				if (result == null) {
-					result = Material.getMaterial("SIGN");
-				}
-			}
+	/**
+	 * Get Material version independent.
+	 * @param name Name in 1.13 and later (uppercase, with underscores)
+	 * @return Material matching the name
+	 */
+	public static Material get(String name) {
+		return get(name, null);
+	}
+
+	/**
+	 * Get Material version independent.
+	 * @param name Name in 1.13 and later (uppercase, with underscores)
+	 * @param legacyName Name in 1.12 and earlier (uppercase, with underscores)
+	 * @return Material matching the name
+	 */
+	public static Material get(String name, String legacyName) {
+		Material result;
+		if (legacyMaterials && legacyName != null) {
+			result = Material.getMaterial(legacyName);
 		} else {
-			// Try saved name (works for wood types on 1.14, regular types for below)
 			result = Material.getMaterial(name);
-			if (result == null) {
-				// Cases for 1.13, which don't know wood types, but need new materials
-				if (FLOOR_SIGN_TYPES.contains(name)) {
-					// SIGN -> OAK_SIGN for 1.14
-					result = Material.getMaterial("OAK_SIGN");
-					// Fallback for 1.13
-					if (result == null) {
-						result = Material.getMaterial("SIGN");
-					}
-				} else if (WALL_SIGN_TYPES.contains(name)) {
-					// WALL_SIGN -> OAK_WALL_SIGN for 1.14
-					result = Material.getMaterial("OAK_WALL_SIGN");
-					// Fallback for 1.13
-					if (result == null) {
-						result = Material.getMaterial("WALL_SIGN");
-					}
-				}
-			}
 		}

 		if (result == null) {
-			AreaShop.debug("Materials.get() null result:", name, "legacyMaterials:", legacyMaterials);
+			AreaShop.debug("Materials.get() null result:", name, legacyName);
 		}

 		return result;
@@ -117,16 +64,7 @@ public class Materials {
 	 * @return true if the given material is a sign
 	 */
 	public static boolean isSign(Material material) {
-		return isSign(material.name());
-	}
-
-	/**
-	 * Check if a Material is a sign (of either the wall or floor type).
-	 * @param name String to check
-	 * @return true if the given material is a sign
-	 */
-	public static boolean isSign(String name) {
-		return name != null && name.toUpperCase().contains("SIGN");
+		return material != null && material.name().contains("SIGN");
 	}

 }
@@ -2,29 +2,29 @@ package me.wiefferink.areashop.tools;

 public class Value<T> {

-	private T content;
+	private T value;

 	/**
-	 * Create a container with a default content.
-	 * @param content The content to set
+	 * Create a container with a default value.
+	 * @param value The value to set
 	 */
-	public Value(T content) {
-		this.content = content;
+	public Value(T value) {
+		this.value = value;
 	}

 	/**
-	 * Get the stored content.
-	 * @return The stored content
+	 * Get the stored value.
+	 * @return The stored value
 	 */
 	public T get() {
-		return content;
+		return value;
 	}

 	/**
-	 * Set the content.
-	 * @param value The new content
+	 * Set the value.
+	 * @param value The new value
 	 */
 	public void set(T value) {
-		this.content = value;
+		this.value = value;
 	}
 }
@@ -1,181 +1,181 @@
-# ╔════════════════════════════════════════════════════════════════════════════════════════════════════════════════════════════╗
-# ║ config.yml file of the AreaShop plugin created by NLThijs48, Github can be found at https://github.com/NLthijs48/AreaShop. ║
-# ║ This file contains options to change the working of the plugin, the profiles defined here can be used in default.yml.      ║
-# ║ More information and tutorials can be found on the wiki: https://github.com/NLthijs48/AreaShop/wiki                        ║
-# ╚════════════════════════════════════════════════════════════════════════════════════════════════════════════════════════════╝
-# ┌────────────────────────────────────────────────────────────────────────────────────────────────────────────────────────────┐
-# │ GENERAL: Options that influence the global state of the plugin                                                             │
-# └────────────────────────────────────────────────────────────────────────────────────────────────────────────────────────────┘
-# Chat prefix used for all messages in the chat, also changes the greeting messages.
-chatPrefix:
-  - '[darkgreen][AreaShop][reset]'
-  - '  hover: AreaShop region management plugin'
-  - '  hover: %lang:action|Click to check the available commands|%'
-  - '  command: /areashop help'
-  - ' '
-# The language file that should be used, check the 'lang' folder for build-in languages (use the filename without .yml here).
-# More information can be found here: https://github.com/NLthijs48/AreaShop/wiki/Language-support.
-language: EN
-# The tags that need to be written on the first line of a sign to add it to AreaShop.
-signTags:
-  # Add a rental region.
-  rent: '[asrent]'
-  # Add a buy region.
-  buy: '[asbuy]'
-  # Add a sign to an existing region.
-  add: '[as]'
-
-
-# ┌────────────────────────────────────────────────────────────────────────────────────────────────────────────────────────────┐
-# │ ECONOMY: Options to change the display of prices.                                                                          │
-# └────────────────────────────────────────────────────────────────────────────────────────────────────────────────────────────┘
-# The characters displayed before a price.
-moneyCharacter: '$'
-# The characters displayed after a price.
-moneyCharacterAfter: ''
-# The character(s) to use as decimal mark.
-decimalMark: '.'
-# How many numbers behind the dot should be shown (2 will make numbers like '8.55', '9.01', '5.20').
-fractionalNumbers: 2
-# How many numbers behind the dot should be shown when using a metric symbol suffix.
-fractionalNumbersShort: 3
-# Set this to true if you want to hide '.0' for a number like '15.0' ('4.50' will still stay '4.50').
-hideEmptyFractionalPart: true
-# Use a suffix if the price is above a certain number (use 1.00M instead of 1000000.00 etc.)
-metricSymbols:
-  #1000: "k"
-  1000000: "M"
-  1000000000: "G"
-  1000000000000: "T"
-  1000000000000000: "P"
-  1000000000000000000: "E"
-  1000000000000000000000: "Z"
-  1000000000000000000000000: "Y"
-
-
-# ┌────────────────────────────────────────────────────────────────────────────────────────────────────────────────────────────┐
-# │ RENTING: Options that apply to all rent regions.                                                                           │
-# └────────────────────────────────────────────────────────────────────────────────────────────────────────────────────────────┘
-# Timeformat to use on the signs, default is like '30-06 14:52', US format: 'MM-dd KK:mm a'.
-# Search for 'java SimpleDateFormat' for more options and documentation.
-timeFormatSign: 'dd-MM HH:mm'
-# Timeformat used in the chat, default is like '30 june 2014 14:52', US format: 'MMMMMMMMMMMMMMMMM dd yyyy KK:mm a'.
-# Search for 'java SimpleDateFormat' for more options and documentation.
-timeFormatChat: 'dd MMMMMMMMMMMMMMMMM yyyy HH:mm'
-# Time indicators, used for specifing time periods (for example rent duration).
-seconds: [s, sec, secs, second, seconds]
-minutes: [m, min, mins, minute, minutes]
-hours: [h, hour, hours]
-days: [d, day, days]
-weeks: [w, week, weeks]
-months: [M,  month,  months]
-years: [y, year, years]
-
-
-# ┌────────────────────────────────────────────────────────────────────────────────────────────────────────────────────────────┐
-# │ PERMISSION GROUPS: Assigned by giving players certain permissions.                                                         │
-# └────────────────────────────────────────────────────────────────────────────────────────────────────────────────────────────┘
-# Configure the max total regions, max rent regions and max buy regions with different groups (-1 is unlimited).
-# Assign a group to players by giving them the permission 'areashop.limits.<group>'.
-# Every player already has the group 'default', OPs bypass the limits because of the 'areashop.limitbypass' permission.
-# All the groups applied to the player will be checked and only if they all allow an extra region it will be allowed.
-# More information like limits for regions of a certain group or in a certain word can be found here:
-#   https://github.com/NLthijs48/AreaShop/wiki/Limitgroups-information-and-examples.
-limitGroups:
-  default:
-    total: 1
-    rents: 1
-    buys: 1
-
-
-# ┌────────────────────────────────────────────────────────────────────────────────────────────────────────────────────────────┐
-# │ ADVANCED AND DEBUG: Specific options to tweak the plugin precisely and check if it functions correctly.                    │
-# └────────────────────────────────────────────────────────────────────────────────────────────────────────────────────────────┘
-# Blacklist of region names that cannot be added to AreaShop for renting or buying. Regular expressions can be used, search
-# for 'java regex pattern' to find documentation about how to use it.
-# Example: Blocking all regions that have a name like 'house_1', 'house_2', etc. would be done with 'house_\d+'.
-# The '\d' represents the numerical digits 0-9, the + symbol represents 1 or more times repeated.
-# This means it would also block 'house_123' and 'house_000456'. It will not block 'ahouse_1' or 'house_'.
-blacklist:
-  - '__global__'
-# Minimum length of the numbers that are suffixed for region names generated by the '/as stack' command.
-# When having this at 3 it will generate names like this: 'region-001', 'region-014', 'region-4567'.
-stackRegionNumberLength: 3
-# Allow/disallow adding players that did not visit the server yet as friend of a region.
-addFriendNotExistingPlayers: false
-# Enable sending stats to http://mcstats.org/ (Metrics plugin).
-# This information will give me an indication about how much the plugin is used and encourages me to continue development.
-sendStats: true
-# If enabled it will check for updates when loading the plugin, it will never download files, it will only notify about it.
-checkForUpdates: true
-# Use colors when sending messages to console and log files.
-useColorsInConsole: false
-# Use tellraw style messages, which can be interacted with by players
-useFancyMessages: true
-# Update all region flags and signs after starting the plugin.
-# This ensures that changes to the config are directly visible after restarting the server.
-updateRegionsOnStartup: true
-# Enables / disables debug messages in the console, could be useful to figure out where errors come from.
-debug: false
-# Version of the config, do not change!
-version: ${project.version}
-# Maximum number of blocks to save to or restore from a .schemetic file.
-maximumBlocks: 1000000
-# Maximum number of locations the teleport function should check to find a safe spot.
-maximumTries: 50000
-
-
-# ┌────────────────────────────────────────────────────────────────────────────────────────────────────────────────────────────┐
-# │ VARIABLES: Variables that can be used in messages and settings where a region is available.                                │
-# └────────────────────────────────────────────────────────────────────────────────────────────────────────────────────────────┘
-# If a tag has no value (for example %player% when the region is not rented/bought) then the tag will not get replaced.
-# %region%         The region name (with correct capitalization).
-# %player%         The name of the player that rents/buys the region (with correct capitalization).
-# %uuid%           The UUID of the player that rents/buys the region.
-# %friends%        The names of friends added to this region separated by ', '.
-# %friendsuuid%    The UUID's of friends added to this region separated by ', '.
-# %landlord%       The name of the landlord.
-# %landlorduuid%   The UUID of the landlord.
-# %price%          The price of the region formatted with the configured characters before and after the number.
-# %rawprice%       The price without formatting, like '10.0' or '7.77'.
-# %duration%       The duration of a rent region, for example '1 d', '4 minutes' or '2 years'.
-# %world%          The name of the world that the region is in.
-# %type%           The type of the region, 'rent' or 'buy'.
-# %until%          The end time of a rent formatted as configured with 'timeFormatChat'.
-# %untilshort%     The end time of a rent formatted as configured with 'timeFormatSign'.
-# %width%          The width of the region (number of blocks on the x-axis).
-# %depth%          The depth of the region (number of blocks on the z-axis).
-# %volume%         The number of blocks in a region (accounting for polygon shaped regions).
-# %height%         The height of the region (number of blocks on the y-axis).
-# %timeleft%       The time left on the rent (uses the unit of time that fits best, minutes used from 121 seconds till 120 minutes).
-# %clicker%        The name of the player that clicked the sign (only to be used in the signProfiles section).
-# %resellprice%    The price of a region when it is in resell mode.
-# %rawresellprice% The resellprice without formatting.
-# %moneyback%      The amount of money the player will get back when unrenting/selling the region (formatted with currency layout).
-# %rawmoneyback%   The moneyback without formatting.
-# %moneybackpercent% The percentage of the price the player will get back when unrenting the region.
-# %timesExtended%  The number of times the region has been extended (zero when first rented)
-# %maxextends%     The maximum number of extends a player can do on the region.
-# %extendsleft%    The number of extends that are left (maxextends - timesextended).
-# %maxrenttime%    The maximum time you can rent a region in advance (human readable).
-# %inactivetime%   The maximum time a player may be inactive before unrent/sell (human readable).
-# %year%           The current year.
-# %month%          The current month in the year.
-# %day%            The current day in the month.
-# %hour%           The current hour in the day (0-23).
-# %minute%         The current minute of the hour.
-# %second%         The current second of the minute.
-# %millisecond%    The current millisecond of the second.
-# %epoch%          The number of milliseconds since January 1, 1970 (Unix Epoch).
-# %tpx%            The exact x coordinate of the location that the teleport is set to
-# %tpy%            The exact y coordinate of the location that the teleport is set to
-# %tpz%            The exact z coordinate of the location that the teleport is set to
-# %tpblockx%       The rounded x coordinate of the location that the teleport is set to
-# %tpblocky%       The rounded y coordinate of the location that the teleport is set to
-# %tpblockz%       The rounded z coordinate of the location that the teleport is set to
-# %tppitch%        The exact pitch of the teleport location
-# %tppitchround%   The rounded pitch of the teleport location
-# %tpyaw%          The exact yaw of the teleport location
-# %tpyawround%     The rounded yaw of the teleport location
-# %tpworld%        The world name of the teleport location
-# %lang:<languageKey>|Optional arguments|%  Insert a message from EN.yml, for example: '%lang:timeleft-ended%' or '%lang:timeleft-years|15|%'
+# ╔════════════════════════════════════════════════════════════════════════════════════════════════════════════════════════════╗
+# ║ config.yml file of the AreaShop plugin created by NLThijs48, Github can be found at https://github.com/NLthijs48/AreaShop. ║
+# ║ This file contains options to change the working of the plugin, the profiles defined here can be used in default.yml.      ║
+# ║ More information and tutorials can be found on the wiki: https://github.com/NLthijs48/AreaShop/wiki                        ║
+# ╚════════════════════════════════════════════════════════════════════════════════════════════════════════════════════════════╝
+# ┌────────────────────────────────────────────────────────────────────────────────────────────────────────────────────────────┐
+# │ GENERAL: Options that influence the global state of the plugin                                                             │
+# └────────────────────────────────────────────────────────────────────────────────────────────────────────────────────────────┘
+# Chat prefix used for all messages in the chat, also changes the greeting messages.
+chatPrefix:
+  - '[darkgreen][AreaShop][reset]'
+  - '  hover: AreaShop region management plugin'
+  - '  hover: %lang:action|Click to check the available commands|%'
+  - '  command: /areashop help'
+  - ' '
+# The language file that should be used, check the 'lang' folder for build-in languages (use the filename without .yml here).
+# More information can be found here: https://github.com/NLthijs48/AreaShop/wiki/Language-support.
+language: EN
+# The tags that need to be written on the first line of a sign to add it to AreaShop.
+signTags:
+  # Add a rental region.
+  rent: '[asrent]'
+  # Add a buy region.
+  buy: '[asbuy]'
+  # Add a sign to an existing region.
+  add: '[as]'
+
+
+# ┌────────────────────────────────────────────────────────────────────────────────────────────────────────────────────────────┐
+# │ ECONOMY: Options to change the display of prices.                                                                          │
+# └────────────────────────────────────────────────────────────────────────────────────────────────────────────────────────────┘
+# The characters displayed before a price.
+moneyCharacter: '$'
+# The characters displayed after a price.
+moneyCharacterAfter: ''
+# The character(s) to use as decimal mark.
+decimalMark: '.'
+# How many numbers behind the dot should be shown (2 will make numbers like '8.55', '9.01', '5.20').
+fractionalNumbers: 2
+# How many numbers behind the dot should be shown when using a metric symbol suffix.
+fractionalNumbersShort: 3
+# Set this to true if you want to hide '.0' for a number like '15.0' ('4.50' will still stay '4.50').
+hideEmptyFractionalPart: true
+# Use a suffix if the price is above a certain number (use 1.00M instead of 1000000.00 etc.)
+metricSymbols:
+  #1000: "k"
+  1000000: "M"
+  1000000000: "G"
+  1000000000000: "T"
+  1000000000000000: "P"
+  1000000000000000000: "E"
+  1000000000000000000000: "Z"
+  1000000000000000000000000: "Y"
+
+
+# ┌────────────────────────────────────────────────────────────────────────────────────────────────────────────────────────────┐
+# │ RENTING: Options that apply to all rent regions.                                                                           │
+# └────────────────────────────────────────────────────────────────────────────────────────────────────────────────────────────┘
+# Timeformat to use on the signs, default is like '30-06 14:52', US format: 'MM-dd KK:mm a'.
+# Search for 'java SimpleDateFormat' for more options and documentation.
+timeFormatSign: 'dd-MM HH:mm'
+# Timeformat used in the chat, default is like '30 june 2014 14:52', US format: 'MMMMMMMMMMMMMMMMM dd yyyy KK:mm a'.
+# Search for 'java SimpleDateFormat' for more options and documentation.
+timeFormatChat: 'dd MMMMMMMMMMMMMMMMM yyyy HH:mm'
+# Time indicators, used for specifing time periods (for example rent duration).
+seconds: [s, sec, secs, second, seconds]
+minutes: [m, min, mins, minute, minutes]
+hours: [h, hour, hours]
+days: [d, day, days]
+weeks: [w, week, weeks]
+months: [M,  month,  months]
+years: [y, year, years]
+
+
+# ┌────────────────────────────────────────────────────────────────────────────────────────────────────────────────────────────┐
+# │ PERMISSION GROUPS: Assigned by giving players certain permissions.                                                         │
+# └────────────────────────────────────────────────────────────────────────────────────────────────────────────────────────────┘
+# Configure the max total regions, max rent regions and max buy regions with different groups (-1 is unlimited).
+# Assign a group to players by giving them the permission 'areashop.limits.<group>'.
+# Every player already has the group 'default', OPs bypass the limits because of the 'areashop.limitbypass' permission.
+# All the groups applied to the player will be checked and only if they all allow an extra region it will be allowed.
+# More information like limits for regions of a certain group or in a certain word can be found here:
+#   https://github.com/NLthijs48/AreaShop/wiki/Limitgroups-information-and-examples.
+limitGroups:
+  default:
+    total: 1
+    rents: 1
+    buys: 1
+
+
+# ┌────────────────────────────────────────────────────────────────────────────────────────────────────────────────────────────┐
+# │ ADVANCED AND DEBUG: Specific options to tweak the plugin precisely and check if it functions correctly.                    │
+# └────────────────────────────────────────────────────────────────────────────────────────────────────────────────────────────┘
+# Blacklist of region names that cannot be added to AreaShop for renting or buying. Regular expressions can be used, search
+# for 'java regex pattern' to find documentation about how to use it.
+# Example: Blocking all regions that have a name like 'house_1', 'house_2', etc. would be done with 'house_\d+'.
+# The '\d' represents the numerical digits 0-9, the + symbol represents 1 or more times repeated.
+# This means it would also block 'house_123' and 'house_000456'. It will not block 'ahouse_1' or 'house_'.
+blacklist:
+  - '__global__'
+# Minimum length of the numbers that are suffixed for region names generated by the '/as stack' command.
+# When having this at 3 it will generate names like this: 'region-001', 'region-014', 'region-4567'.
+stackRegionNumberLength: 3
+# Allow/disallow adding players that did not visit the server yet as friend of a region.
+addFriendNotExistingPlayers: false
+# Enable sending stats to http://mcstats.org/ (Metrics plugin).
+# This information will give me an indication about how much the plugin is used and encourages me to continue development.
+sendStats: true
+# If enabled it will check for updates when loading the plugin, it will never download files, it will only notify about it.
+checkForUpdates: true
+# Use colors when sending messages to console and log files.
+useColorsInConsole: false
+# Use tellraw style messages, which can be interacted with by players
+useFancyMessages: true
+# Update all region flags and signs after starting the plugin.
+# This ensures that changes to the config are directly visible after restarting the server.
+updateRegionsOnStartup: true
+# Enables / disables debug messages in the console, could be useful to figure out where errors come from.
+debug: false
+# Version of the config, do not change!
+version: ${project.version}
+# Maximum number of blocks to save to or restore from a .schemetic file.
+maximumBlocks: 1000000
+# Maximum number of locations the teleport function should check to find a safe spot.
+maximumTries: 50000
+
+
+# ┌────────────────────────────────────────────────────────────────────────────────────────────────────────────────────────────┐
+# │ VARIABLES: Variables that can be used in messages and settings where a region is available.                                │
+# └────────────────────────────────────────────────────────────────────────────────────────────────────────────────────────────┘
+# If a tag has no value (for example %player% when the region is not rented/bought) then the tag will not get replaced.
+# %region%         The region name (with correct capitalization).
+# %player%         The name of the player that rents/buys the region (with correct capitalization).
+# %uuid%           The UUID of the player that rents/buys the region.
+# %friends%        The names of friends added to this region separated by ', '.
+# %friendsuuid%    The UUID's of friends added to this region separated by ', '.
+# %landlord%       The name of the landlord.
+# %landlorduuid%   The UUID of the landlord.
+# %price%          The price of the region formatted with the configured characters before and after the number.
+# %rawprice%       The price without formatting, like '10.0' or '7.77'.
+# %duration%       The duration of a rent region, for example '1 d', '4 minutes' or '2 years'.
+# %world%          The name of the world that the region is in.
+# %type%           The type of the region, 'rent' or 'buy'.
+# %until%          The end time of a rent formatted as configured with 'timeFormatChat'.
+# %untilshort%     The end time of a rent formatted as configured with 'timeFormatSign'.
+# %width%          The width of the region (number of blocks on the x-axis).
+# %depth%          The depth of the region (number of blocks on the z-axis).
+# %volume%         The number of blocks in a region (accounting for polygon shaped regions).
+# %height%         The height of the region (number of blocks on the y-axis).
+# %timeleft%       The time left on the rent (uses the unit of time that fits best, minutes used from 121 seconds till 120 minutes).
+# %clicker%        The name of the player that clicked the sign (only to be used in the signProfiles section).
+# %resellprice%    The price of a region when it is in resell mode.
+# %rawresellprice% The resellprice without formatting.
+# %moneyback%      The amount of money the player will get back when unrenting/selling the region (formatted with currency layout).
+# %rawmoneyback%   The moneyback without formatting.
+# %moneybackpercent% The percentage of the price the player will get back when unrenting the region.
+# %timesExtended%  The number of times the region has been extended (zero when first rented)
+# %maxextends%     The maximum number of extends a player can do on the region.
+# %extendsleft%    The number of extends that are left (maxextends - timesextended).
+# %maxrenttime%    The maximum time you can rent a region in advance (human readable).
+# %inactivetime%   The maximum time a player may be inactive before unrent/sell (human readable).
+# %year%           The current year.
+# %month%          The current month in the year.
+# %day%            The current day in the month.
+# %hour%           The current hour in the day (0-23).
+# %minute%         The current minute of the hour.
+# %second%         The current second of the minute.
+# %millisecond%    The current millisecond of the second.
+# %epoch%          The number of milliseconds since January 1, 1970 (Unix Epoch).
+# %tpx%            The exact x coordinate of the location that the teleport is set to
+# %tpy%            The exact y coordinate of the location that the teleport is set to
+# %tpz%            The exact z coordinate of the location that the teleport is set to
+# %tpblockx%       The rounded x coordinate of the location that the teleport is set to
+# %tpblocky%       The rounded y coordinate of the location that the teleport is set to
+# %tpblockz%       The rounded z coordinate of the location that the teleport is set to
+# %tppitch%        The exact pitch of the teleport location
+# %tppitchround%   The rounded pitch of the teleport location
+# %tpyaw%          The exact yaw of the teleport location
+# %tpyawround%     The rounded yaw of the teleport location
+# %tpworld%        The world name of the teleport location
+# %lang:<languageKey>|Optional arguments|%  Insert a message from EN.yml, for example: '%lang:timeleft-ended%' or '%lang:timeleft-years|15|%'
@@ -10,7 +10,7 @@ general:
  # The y location within the region to start searching for safe teleport locations (x and z are in the middle of the region).
  # Possible values: 'bottom', 'middle', 'top' or a number indicating an exact y coordinate.
  teleportLocationY: bottom
-  # If true the teleportation algorithm only allows teleportation to inside the region, otherwise it will expand
+  # If true the teleportation algorithm only allows telportation to inside the region, otherwise it will expand
  # a cube from the starting point to check for safe spots (then it could end outside of the region).
  teleportIntoRegion: true
  # Same as above, but then for when you teleport to the sign of a region instead of the region itself.
@@ -414,9 +414,6 @@ add-success: "Added as %0%: [gray]%1%."
 add-failed: "Already registered: [gray]%0%."
 add-failedOtherWorld: "Already registered from another world: [gray]%0%."
 add-blacklisted: "On the blacklist: [gray]%0%."
-add-rentCancelled: "Rent cancelled: [gray]%0%."
-add-buyCancelled: "Buy cancelled: [gray]%0%."
-add-addCancelled: "Add cancelled: [gray]%0%."
 add-specifyWorld: "Specify the world of the region when using from console."
 add-incorrectWorld: "World '%0%' not found, try again (case-sensitive)."
 add-noPermissionRegions: "No permission to add: [gray]%0%."
@@ -425,7 +422,6 @@ add-noPermissionOwnerMember: "[gray]You either are not a member/owner of these r
 del-noPermission: "You don't have permission to remove regions."
 del-success: "Removed regions: [gray]%0%."
 del-failed: "No permission to remove or not registered: [gray]%0%."
-del-cancelled: "Delete cancelled: [gray]%0%."

 addsign-help: "/as addsign [region] [profile]."
 addsign-noSign: "You are not looking at a sign."
@@ -1,276 +1,273 @@
-name: AreaShop
-main: me.wiefferink.areashop.AreaShop
-version: "${project.version}${build.number}"
-description: "Selling and renting WorldGuard regions to your players, highly configurable."
-depend: [Vault, WorldGuard, WorldEdit]
-softdepend: [Multiverse-Core, FastAsyncWorldEdit]
-author: NLThijs48
-website: https://github.com/NLthijs48/AreaShop
-commands:
-  AreaShop:
-    description: 'For all commands use /as help.'
-    usage: 'AreaShop has not started correctly, check the log file (or console) and correct any errors.'
-    aliases: [as]
-  test:
-
-awareness:
-  - !@UTF8
-api-version: 1.13
-
-permissions:
-  areashop.*:
-    description: Give access to all commands of AreaShop
-    children:
-      areashop.help: true
-      areashop.createrent: true
-      areashop.createbuy: true
-      areashop.destroyrent: true
-      areashop.destroybuy: true
-      areashop.rent: true
-      areashop.buy: true
-      areashop.buyresell: true
-      areashop.buynormal: true
-      areashop.unrent: true
-      areashop.info: true
-      areashop.reload: true
-      areashop.setrestore: true
-      areashop.setprice: true
-      areashop.setduration: true
-      areashop.teleport: true
-      areashop.teleportall: true
-      areashop.setteleportall: true
-      areashop.teleportsign: true
-      areashop.teleportsignall: true
-      areashop.tabcomplete: true
-      areashop.setteleportoutsideregion: true
-      areashop.find: true
-      areashop.groupadd: true
-      areashop.groupdel: true
-      areashop.grouplist: true
-      areashop.groupinfo: true
-      areashop.limitbypass: true
-      areashop.schematicevents: true
-      areashop.addsign: true
-      areashop.delsign: true
-      areashop.renttimebypass: true
-      areashop.me: true
-      areashop.resellall: true
-      areashop.stopresellall: true
-      areashop.addfriendall: true
-      areashop.delfriendall: true
-      areashop.notifyupdate: true
-      areashop.stack: true
-      areashop.setlandlord: true
-      areashop.linksigns: true
-      areashop.message: true
-      areashop.import: true
-  areashop.landlord.*:
-    description: Give access to all landlord features
-    children:
-      areashop.createrent.owner: true
-      areashop.createbuy.owner: true
-      areashop.setprice.landlord: true
-      areashop.setduration.landlord: true
-      areashop.destroyrent.landlord: true
-      areashop.destroybuy.landlord: true
-  areashop.help:
-    description: Allows you to see the help pages
-    default: true
-  areashop.rent:
-    description: Allows you to rent a region
-    default: true
-  areashop.buy:
-    description: Allows you to buy a region
-    default: true
-  areashop.buyresell:
-    description: Allows you to buy a region that is in resell mode
-    default: true
-  areashop.buynormal:
-    description: Allows you to buy a region that is not in resell mode
-    default: true
-  areashop.unrent:
-    description: Allows you to unrent a specific region
-    default: op
-  areashop.unrentown:
-    description: Allows you to unrent your own region
-    default: true
-  areashop.sell:
-    description: Allows you to sell a specific region
-    default: op
-  areashop.sellown:
-    description: Allows you to sell your own region
-    default: true
-  areashop.createrent:
-    description: Allows you to add rent regions to AreaShop
-    default: op
-  areashop.createrent.member:
-    description: Allows you to add rent regions to AreaShop for which you are registered as member
-    default: false
-  areashop.createrent.owner:
-    description: Allows you to add rent regions to AreaShop for which you are registered as owner
-    default: false
-  areashop.createbuy:
-    description: Allows you to add buy regions to AreaShop
-    default: op
-  areashop.createbuy.member:
-    description: Allows you to add buy regions to AreaShop for which you are registered as member
-    default: false
-  areashop.createbuy.owner:
-    description: Allows you to add buy regions to AreaShop for which you are registered as owner
-    default: false
-  areashop.destroyrent:
-    description: Allows you remove rental regions from AreaShop
-    default: op
-  areashop.destroyrent.landlord:
-    description: Allows you to remove rental regions from AreaShop when you are the landlord
-    default: false
-  areashop.destroybuy:
-    description: Allows you to remove buy regions from AreaShop
-    default: op
-  areashop.destroybuy.landlord:
-    description: Allows you to remove buy regions from AreaShop when you are the landlord
-    default: false
-  areashop.info:
-    description: Allows you check the status of regions and players
-    default: true
-  areashop.reload:
-    description: Allows you to reload the config and update all region flags and signs
-    default: op
-  areashop.setrestore:
-    description: Allows you to change the restore settings
-    default: op
-  areashop.setprice:
-    description: Allows you to change the price
-    default: op
-  areashop.setprice.landlord:
-    description: Allows you to change the price of a region that you are landlord of
-    default: false
-  areashop.setduration:
-    description: Allows you to change the duration of a rent
-    default: op
-  areashop.setduration.landlord:
-    description: Allows you to change the duration of a region that you are landlord of
-    default: false
-  areashop.teleport:
-    description: Teleport to your region
-    default: true
-  areashop.teleportall:
-    description: Teleport to all regions
-    default: op
-  areashop.teleportsign:
-    description: Teleport to signs of regions you own
-    default: true
-  areashop.teleportsignall:
-    description: Teleport to signs of all regions
-    default: op
-  areashop.teleportfriend:
-    description: Teleport to regions where you are added as friend
-    default: true
-  areashop.teleportfriendsign:
-    description: Teleport to the sign of regions where you are added as friend
-    default: true
-  areashop.teleportavailable:
-    description: Teleport to regions which are available
-    default: true
-  areashop.teleportavailablesign:
-    description: Teleport to the sign of regions which are available
-    default: true
-  areashop.setteleport:
-    description: Set the teleport spot for your region
-    default: true
-  areashop.setteleportall:
-    description: Set the teleport for other regions
-    default: op
-  areashop.setteleportoutsideregion:
-    description: Set the teleport location outside the WorldGuard region
-    default: op
-  areashop.tabcomplete:
-    description: Allows you to tabcomplete all commands (also where you dont have permission)
-    default: op
-  areashop.find:
-    description: Allows you to teleport to a free region (/as find)
-    default: true
-  areashop.groupadd:
-    description: Allows you to add regions to groups
-    default: op
-  areashop.groupdel:
-    description: Allows you to delete regions from groups
-    default: op
-  areashop.grouplist:
-    description: Allows you to list all the groups currently created
-    default: op
-  areashop.groupinfo:
-    description: Allows you to display information about a group (all members)
-    default: op
-  areashop.rentextendbypass:
-    description: Bypass the extend limit on rents
-    default: op
-  areashop.limits.default:
-    description: Assign limits as set in the 'default' group in the 'limitGroups' section of the config
-    default: true
-  areashop.limitbypass:
-    description: Bypass the limits for renting/buying regions (how many you can have at the same time)
-    default: op
-  areashop.schematicevents:
-    description: Allows you to trigger schematic events for regions
-    default: op
-  areashop.addsign:
-    description: Allows you to add signs to existing regions
-    default: op
-  areashop.delsign:
-    description: Allows you to delete signs from existing regions
-    default: op
-  areashop.renttimebypass:
-    description: Bypass the maximum rent time you can have in advance
-    default: op
-  areashop.me:
-    description: Allows you to get information about your regions
-    default: true
-  areashop.setownerrent:
-    description: Allows you to set the owner of rent regions
-    default: op
-  areashop.setownerbuy:
-    description: Allows you to set the owner of buy regions
-    default: op
-  areashop.resell:
-    description: Allows you to set your region to sell mode for selling to other players
-    default: true
-  areashop.resellall:
-    description: Allows you to set any region into selling mode
-    default: op
-  areashop.stopresell:
-    description: Allows you to set your region into normal mode if it is in sell mode
-    default: true
-  areashop.stopresellall:
-    description: Allows you to set any region into normal mode if it is in sell mode
-    default: op
-  areashop.addfriend:
-    description: Allows you to add friends to your regions
-    default: true
-  areashop.addfriendall:
-    description: Allows you to add friends to all regions
-    default: op
-  areashop.delfriend:
-    description: Allows you to delete friends from your regions
-    default: true
-  areashop.delfriendall:
-    description: Allows you to delete friends from all regions
-    default: op
-  areashop.notifyupdate:
-    description: Will notify this player when an update is available
-    default: op
-  areashop.linksigns:
-    description: Allows you to enter sign linking mode
-    default: op
-  areashop.stack:
-    description: Allows you to create regions and add them to AreaShop like the WorldEdit //stack command
-    default: op
-  areashop.setlandlord:
-    description: Allows you to set the landlord of a region, the landlord receives all revenue
-    default: op
-  areashop.message:
-    description: Allows you to send AreaShop messages to players
-    default: op
-  areashop.import:
-    description: Allows importing regions from other plugins
-    default: op
+name: AreaShop
+main: me.wiefferink.areashop.AreaShop
+version: "${project.version}${build.number}"
+description: "Selling and renting WorldGuard regions to your players, highly configurable."
+depend: [Vault, WorldGuard, WorldEdit]
+softdepend: [Multiverse-Core, FastAsyncWorldEdit]
+author: NLThijs48
+website: https://github.com/NLthijs48/AreaShop
+commands:
+  AreaShop:
+    description: 'For all commands use /as help.'
+    usage: 'AreaShop has not started correctly, check the log file (or console) and correct any errors.'
+    aliases: [as]
+awareness:
+  - !@UTF8
+api-version: 1.13
+permissions:
+  areashop.*:
+    description: Give access to all commands of AreaShop
+    children:
+      areashop.help: true
+      areashop.createrent: true
+      areashop.createbuy: true
+      areashop.destroyrent: true
+      areashop.destroybuy: true
+      areashop.rent: true
+      areashop.buy: true
+      areashop.buyresell: true
+      areashop.buynormal: true
+      areashop.unrent: true
+      areashop.info: true
+      areashop.reload: true
+      areashop.setrestore: true
+      areashop.setprice: true
+      areashop.setduration: true
+      areashop.teleport: true
+      areashop.teleportall: true
+      areashop.setteleportall: true
+      areashop.teleportsign: true
+      areashop.teleportsignall: true
+      areashop.tabcomplete: true
+      areashop.setteleportoutsideregion: true
+      areashop.find: true
+      areashop.groupadd: true
+      areashop.groupdel: true
+      areashop.grouplist: true
+      areashop.groupinfo: true
+      areashop.limitbypass: true
+      areashop.schematicevents: true
+      areashop.addsign: true
+      areashop.delsign: true
+      areashop.renttimebypass: true
+      areashop.me: true
+      areashop.resellall: true
+      areashop.stopresellall: true
+      areashop.addfriendall: true
+      areashop.delfriendall: true
+      areashop.notifyupdate: true
+      areashop.stack: true
+      areashop.setlandlord: true
+      areashop.linksigns: true
+      areashop.message: true
+      areashop.import: true
+  areashop.landlord.*:
+    description: Give access to all landlord features
+    children:
+      areashop.createrent.owner: true
+      areashop.createbuy.owner: true
+      areashop.setprice.landlord: true
+      areashop.setduration.landlord: true
+      areashop.destroyrent.landlord: true
+      areashop.destroybuy.landlord: true
+  areashop.help:
+    description: Allows you to see the help pages
+    default: true
+  areashop.rent:
+    description: Allows you to rent a region
+    default: true
+  areashop.buy:
+    description: Allows you to buy a region
+    default: true
+  areashop.buyresell:
+    description: Allows you to buy a region that is in resell mode
+    default: true
+  areashop.buynormal:
+    description: Allows you to buy a region that is not in resell mode
+    default: true
+  areashop.unrent:
+    description: Allows you to unrent a specific region
+    default: op
+  areashop.unrentown:
+    description: Allows you to unrent your own region
+    default: true
+  areashop.sell:
+    description: Allows you to sell a specific region
+    default: op
+  areashop.sellown:
+    description: Allows you to sell your own region
+    default: true
+  areashop.createrent:
+    description: Allows you to add rent regions to AreaShop
+    default: op
+  areashop.createrent.member:
+    description: Allows you to add rent regions to AreaShop for which you are registered as member
+    default: false
+  areashop.createrent.owner:
+    description: Allows you to add rent regions to AreaShop for which you are registered as owner
+    default: false
+  areashop.createbuy:
+    description: Allows you to add buy regions to AreaShop
+    default: op
+  areashop.createbuy.member:
+    description: Allows you to add buy regions to AreaShop for which you are registered as member
+    default: false
+  areashop.createbuy.owner:
+    description: Allows you to add buy regions to AreaShop for which you are registered as owner
+    default: false
+  areashop.destroyrent:
+    description: Allows you remove rental regions from AreaShop
+    default: op
+  areashop.destroyrent.landlord:
+    description: Allows you to remove rental regions from AreaShop when you are the landlord
+    default: false
+  areashop.destroybuy:
+    description: Allows you to remove buy regions from AreaShop
+    default: op
+  areashop.destroybuy.landlord:
+    description: Allows you to remove buy regions from AreaShop when you are the landlord
+    default: false
+  areashop.info:
+    description: Allows you check the status of regions and players
+    default: true
+  areashop.reload:
+    description: Allows you to reload the config and update all region flags and signs
+    default: op
+  areashop.setrestore:
+    description: Allows you to change the restore settings
+    default: op
+  areashop.setprice:
+    description: Allows you to change the price
+    default: op
+  areashop.setprice.landlord:
+    description: Allows you to change the price of a region that you are landlord of
+    default: false
+  areashop.setduration:
+    description: Allows you to change the duration of a rent
+    default: op
+  areashop.setduration.landlord:
+    description: Allows you to change the duration of a region that you are landlord of
+    default: false
+  areashop.teleport:
+    description: Teleport to your region
+    default: true
+  areashop.teleportall:
+    description: Teleport to all regions
+    default: op
+  areashop.teleportsign:
+    description: Teleport to signs of regions you own
+    default: true
+  areashop.teleportsignall:
+    description: Teleport to signs of all regions
+    default: op
+  areashop.teleportfriend:
+    description: Teleport to regions where you are added as friend
+    default: true
+  areashop.teleportfriendsign:
+    description: Teleport to the sign of regions where you are added as friend
+    default: true
+  areashop.teleportavailable:
+    description: Teleport to regions which are available
+    default: true
+  areashop.teleportavailablesign:
+    description: Teleport to the sign of regions which are available
+    default: true
+  areashop.setteleport:
+    description: Set the teleport spot for your region
+    default: true
+  areashop.setteleportall:
+    description: Set the teleport for other regions
+    default: op
+  areashop.setteleportoutsideregion:
+    description: Set the teleport location outside the WorldGuard region
+    default: op
+  areashop.tabcomplete:
+    description: Allows you to tabcomplete all commands (also where you dont have permission)
+    default: op
+  areashop.find:
+    description: Allows you to teleport to a free region (/as find)
+    default: true
+  areashop.groupadd:
+    description: Allows you to add regions to groups
+    default: op
+  areashop.groupdel:
+    description: Allows you to delete regions from groups
+    default: op
+  areashop.grouplist:
+    description: Allows you to list all the groups currently created
+    default: op
+  areashop.groupinfo:
+    description: Allows you to display information about a group (all members)
+    default: op
+  areashop.rentextendbypass:
+    description: Bypass the extend limit on rents
+    default: op
+  areashop.limits.default:
+    description: Assign limits as set in the 'default' group in the 'limitGroups' section of the config
+    default: true
+  areashop.limitbypass:
+    description: Bypass the limits for renting/buying regions (how many you can have at the same time)
+    default: op
+  areashop.schematicevents:
+    description: Allows you to trigger schematic events for regions
+    default: op
+  areashop.addsign:
+    description: Allows you to add signs to existing regions
+    default: op
+  areashop.delsign:
+    description: Allows you to delete signs from existing regions
+    default: op
+  areashop.renttimebypass:
+    description: Bypass the maximum rent time you can have in advance
+    default: op
+  areashop.me:
+    description: Allows you to get information about your regions
+    default: true
+  areashop.setownerrent:
+    description: Allows you to set the owner of rent regions
+    default: op
+  areashop.setownerbuy:
+    description: Allows you to set the owner of buy regions
+    default: op
+  areashop.resell:
+    description: Allows you to set your region to sell mode for selling to other players
+    default: true
+  areashop.resellall:
+    description: Allows you to set any region into selling mode
+    default: op
+  areashop.stopresell:
+    description: Allows you to set your region into normal mode if it is in sell mode
+    default: true
+  areashop.stopresellall:
+    description: Allows you to set any region into normal mode if it is in sell mode
+    default: op
+  areashop.addfriend:
+    description: Allows you to add friends to your regions
+    default: true
+  areashop.addfriendall:
+    description: Allows you to add friends to all regions
+    default: op
+  areashop.delfriend:
+    description: Allows you to delete friends from your regions
+    default: true
+  areashop.delfriendall:
+    description: Allows you to delete friends from all regions
+    default: op
+  areashop.notifyupdate:
+    description: Will notify this player when an update is available
+    default: op
+  areashop.linksigns:
+    description: Allows you to enter sign linking mode
+    default: op
+  areashop.stack:
+    description: Allows you to create regions and add them to AreaShop like the WorldEdit //stack command
+    default: op
+  areashop.setlandlord:
+    description: Allows you to set the landlord of a region, the landlord receives all revenue
+    default: op
+  areashop.message:
+    description: Allows you to send AreaShop messages to players
+    default: op
+  areashop.import:
+    description: Allows importing regions from other plugins
+    default: op
@@ -64,11 +64,11 @@ For a preview join 'mc.go-craft.com' and go to the Survival server, the shops ar
 Old video for AreaShop v1.0: [Tutorial by VariationVault](https://www.youtube.com/watch?v=k2HMCxCCOYo)

 ### Required dependencies
-* Java 8 or higher (latest recommended)
-* Bukkit/Spigot 1.13.2 or higher (modded servers often include Bukkit/Spigot support, so it should also work on that, but it is not specifically tested for it)
-* [WorldGuard](http://dev.bukkit.org/bukkit-plugins/worldguard/): 7.0.3 or higher
-* [WorldEdit](http://dev.bukkit.org/bukkit-plugins/worldedit/): 7.0.1 or higher 
-* [Vault](http://dev.bukkit.org/bukkit-plugins/vault/): 1.7 or higher
+* Java 7 or higher (latest recommended)
+* Bukkit/Spigot 1.7.9 or higher (modded servers often include Bukkit/Spigot support, so it should also work on that, but it is not specifically tested for it)
+* [WorldGuard](http://dev.bukkit.org/bukkit-plugins/worldguard/): 5.9 or higher (6.0+ recommended)
+* [WorldEdit](http://dev.bukkit.org/bukkit-plugins/worldedit/): 5.6.3 or higher (6.0+ recommended)
+* [Vault](http://dev.bukkit.org/bukkit-plugins/vault/): 1.4.1 or higher
 * An economy plugin supported by Vault (check the [Vault page](http://dev.bukkit.org/bukkit-plugins/vault/) for a list of these)

 ### Metrics
@@ -0,0 +1 @@
+/target
@@ -0,0 +1,46 @@
+<project xmlns="http://maven.apache.org/POM/4.0.0" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
+         xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/xsd/maven-4.0.0.xsd">
+    <modelVersion>4.0.0</modelVersion>
+    <artifactId>areashop-fastasyncworldedit</artifactId>
+    <packaging>jar</packaging>
+    <name>AreaShop FastAsyncWorldEdit</name>
+    <version>latest</version>
+
+    <parent>
+        <groupId>me.wiefferink</groupId>
+        <artifactId>areashop-parent</artifactId>
+        <version>parent</version>
+    </parent>
+
+    <dependencies>
+        <dependency>
+            <groupId>org.bukkit</groupId>
+            <artifactId>craftbukkit</artifactId>
+            <version>1.13-R0.1-SNAPSHOT</version>
+            <type>jar</type>
+            <optional>true</optional>
+        </dependency>
+        <dependency>
+            <groupId>com.sk89q</groupId>
+            <artifactId>worldedit</artifactId>
+            <scope>system</scope>
+            <version>any</version>
+            <systemPath>${project.basedir}/../dependencies/FastAsyncWorldEdit-bukkit-1.13.132.jar</systemPath>
+        </dependency>
+        <dependency>
+            <groupId>com.sk89q</groupId>
+            <artifactId>worldguard</artifactId>
+            <scope>system</scope>
+            <version>any</version>
+            <systemPath>${project.basedir}/../dependencies/FastAsyncWorldEdit-worldguard-legacy-7.0.0-SNAPSHOT-dist.jar</systemPath>
+        </dependency>
+
+        <dependency>
+            <groupId>me.wiefferink</groupId>
+            <artifactId>areashop-interface</artifactId>
+            <version>latest</version>
+            <type>jar</type>
+        </dependency>
+
+    </dependencies>
+</project>
@@ -0,0 +1,193 @@
+package me.wiefferink.areashop.handlers;
+
+import com.sk89q.worldedit.EditSession;
+import com.sk89q.worldedit.IncompleteRegionException;
+import com.sk89q.worldedit.LocalSession;
+import com.sk89q.worldedit.MaxChangedBlocksException;
+import com.sk89q.worldedit.Vector;
+import com.sk89q.worldedit.bukkit.BukkitAdapter;
+import com.sk89q.worldedit.extent.clipboard.BlockArrayClipboard;
+import com.sk89q.worldedit.extent.clipboard.Clipboard;
+import com.sk89q.worldedit.extent.clipboard.io.ClipboardFormat;
+import com.sk89q.worldedit.extent.clipboard.io.ClipboardReader;
+import com.sk89q.worldedit.extent.clipboard.io.ClipboardWriter;
+import com.sk89q.worldedit.extent.transform.BlockTransformExtent;
+import com.sk89q.worldedit.function.mask.Mask;
+import com.sk89q.worldedit.function.mask.Mask2D;
+import com.sk89q.worldedit.function.operation.ForwardExtentCopy;
+import com.sk89q.worldedit.function.operation.Operations;
+import com.sk89q.worldedit.regions.CuboidRegion;
+import com.sk89q.worldedit.regions.Region;
+import com.sk89q.worldedit.session.ClipboardHolder;
+import com.sk89q.worldedit.util.io.Closer;
+import com.sk89q.worldguard.protection.regions.ProtectedRegion;
+import com.sk89q.worldguard.protection.regions.RegionType;
+import me.wiefferink.areashop.interfaces.AreaShopInterface;
+import me.wiefferink.areashop.interfaces.GeneralRegionInterface;
+import me.wiefferink.areashop.interfaces.WorldEditInterface;
+import me.wiefferink.areashop.interfaces.WorldEditSelection;
+import org.apache.commons.lang.exception.ExceptionUtils;
+import org.bukkit.entity.Player;
+
+import java.io.BufferedInputStream;
+import java.io.BufferedOutputStream;
+import java.io.File;
+import java.io.FileInputStream;
+import java.io.FileOutputStream;
+import java.io.IOException;
+
+// Future: this class could use the schematic save/paste api of FAWE: https://github.com/boy0001/FastAsyncWorldedit/wiki/Pasting-a-schematic
+// This would not allow for shaping the schematic to a polygon region though
+public class FastAsyncWorldEditHandler extends WorldEditInterface {
+
+	public FastAsyncWorldEditHandler(AreaShopInterface pluginInterface) {
+		super(pluginInterface);
+	}
+
+	@Override
+	public WorldEditSelection getPlayerSelection(Player player) {
+		try {
+			Region region = pluginInterface.getWorldEdit().getSession(player).getSelection(BukkitAdapter.adapt(player.getWorld()));
+			return new WorldEditSelection(
+					player.getWorld(),
+					BukkitAdapter.adapt(player.getWorld(), region.getMinimumPoint()),
+					BukkitAdapter.adapt(player.getWorld(), region.getMaximumPoint())
+			);
+		} catch (IncompleteRegionException e) {
+			return null;
+		}
+	}
+
+	@Override
+	public boolean restoreRegionBlocks(File rawFile, GeneralRegionInterface regionInterface) {
+		// TODO implement using the FastAsyncWorldEdit api to paste async
+		File file = null;
+		ClipboardFormat format = null;
+		for (ClipboardFormat formatOption : ClipboardFormat.values()) {
+			if (new File(rawFile.getAbsolutePath() + "." + formatOption.getExtension()).exists()) {
+				file = new File(rawFile.getAbsolutePath() + "." + formatOption.getExtension());
+				format = formatOption;
+			}
+		}
+		if(file == null) {
+			pluginInterface.getLogger().info("Did not restore region " + regionInterface.getName() + ", schematic file does not exist: " + rawFile.getAbsolutePath());
+			return false;
+		}
+		pluginInterface.debugI("Trying to restore region", regionInterface.getName(), " from file", file.getAbsolutePath(), "with format", format.name());
+
+		com.sk89q.worldedit.world.World world = null;
+		if(regionInterface.getName() != null) {
+			world = BukkitAdapter.adapt(regionInterface.getWorld());
+		}
+		if(world == null) {
+			pluginInterface.getLogger().info("Did not restore region " + regionInterface.getName() + ", world not found: " + regionInterface.getWorldName());
+			return false;
+		}
+		EditSession editSession = pluginInterface.getWorldEdit().getWorldEdit().getEditSessionFactory().getEditSession(world, pluginInterface.getConfig().getInt("maximumBlocks"));
+		editSession.enableQueue();
+		ProtectedRegion region = regionInterface.getRegion();
+		// Get the origin and size of the region
+		Vector origin = new Vector(region.getMinimumPoint().getBlockX(), region.getMinimumPoint().getBlockY(), region.getMinimumPoint().getBlockZ());
+
+		// Read the schematic and paste it into the world
+		try(Closer closer = Closer.create()) {
+			FileInputStream fis = closer.register(new FileInputStream(file));
+			BufferedInputStream bis = closer.register(new BufferedInputStream(fis));
+			ClipboardReader reader = format.getReader(bis);
+
+			LocalSession session = new LocalSession(pluginInterface.getWorldEdit().getLocalConfiguration());
+			Clipboard clipboard = reader.read();
+			if(clipboard.getDimensions().getY() != regionInterface.getHeight()
+					|| clipboard.getDimensions().getX() != regionInterface.getWidth()
+					|| clipboard.getDimensions().getZ() != regionInterface.getDepth()) {
+				pluginInterface.getLogger().warning("Size of the region " + regionInterface.getName() + " is not the same as the schematic to restore!");
+				pluginInterface.debugI("schematic|region, x:" + clipboard.getDimensions().getX() + "|" + regionInterface.getWidth() + ", y:" + clipboard.getDimensions().getY() + "|" + regionInterface.getHeight() + ", z:" + clipboard.getDimensions().getZ() + "|" + regionInterface.getDepth());
+			}
+			clipboard.setOrigin(clipboard.getMinimumPoint());
+			ClipboardHolder clipboardHolder = new ClipboardHolder(clipboard);
+			session.setBlockChangeLimit(pluginInterface.getConfig().getInt("maximumBlocks"));
+			session.setClipboard(clipboardHolder);
+
+			// Build operation
+			BlockTransformExtent extent = new BlockTransformExtent(clipboardHolder.getClipboard());
+			ForwardExtentCopy copy = new ForwardExtentCopy(extent, clipboard.getRegion(), clipboard.getOrigin(), editSession, origin);
+			copy.setTransform(clipboardHolder.getTransform());
+			// Mask to region (for polygon and other weird shaped regions)
+			// TODO make this more efficient (especially for polygon regions)
+			if(region.getType() != RegionType.CUBOID) {
+				copy.setSourceMask(new Mask() {
+					@Override
+					public boolean test(Vector vector) {
+						return region.contains(vector);
+					}
+
+					@Override
+					public Mask2D toMask2D() {
+						return null;
+					}
+				});
+			}
+			Operations.completeLegacy(copy);
+		} catch(MaxChangedBlocksException e) {
+			pluginInterface.getLogger().warning("exceeded the block limit while restoring schematic of " + regionInterface.getName() + ", limit in exception: " + e.getBlockLimit() + ", limit passed by AreaShop: " + pluginInterface.getConfig().getInt("maximumBlocks"));
+			return false;
+		} catch(IOException e) {
+			pluginInterface.getLogger().warning("An error occured while restoring schematic of " + regionInterface.getName() + ", enable debug to see the complete stacktrace");
+			pluginInterface.debugI(ExceptionUtils.getStackTrace(e));
+			return false;
+		} catch (Exception e) {
+			pluginInterface.getLogger().warning("crashed during restore of " + regionInterface.getName());
+			pluginInterface.debugI(ExceptionUtils.getStackTrace(e));
+			return false;
+		}
+		editSession.flushQueue();
+		return true;
+	}
+
+	@Override
+	public boolean saveRegionBlocks(File file, GeneralRegionInterface regionInterface) {
+		// TODO implement using the FastAsyncWorldEdit api to save async
+		ClipboardFormat format = ClipboardFormat.STRUCTURE;
+		// TODO allow selecting FAWE format in the config? (when enabled you cannot go back to vanilla WorldEdit easily)
+
+		file = new File(file.getAbsolutePath() + "." + format.getExtension());
+		pluginInterface.debugI("Trying to save region", regionInterface.getName(), " to file", file.getAbsolutePath(), "with format", format.name());
+		com.sk89q.worldedit.world.World world = null;
+		if(regionInterface.getWorld() != null) {
+			world = BukkitAdapter.adapt(regionInterface.getWorld());
+		}
+		if(world == null) {
+			pluginInterface.getLogger().warning("Did not save region " + regionInterface.getName() + ", world not found: " + regionInterface.getWorldName());
+			return false;
+		}
+		EditSession editSession = pluginInterface.getWorldEdit().getWorldEdit().getEditSessionFactory().getEditSession(world, pluginInterface.getConfig().getInt("maximumBlocks"));
+
+		// Create a clipboard
+		CuboidRegion selection = new CuboidRegion(world, regionInterface.getRegion().getMinimumPoint(), regionInterface.getRegion().getMaximumPoint());
+		BlockArrayClipboard clipboard = new BlockArrayClipboard(selection);
+		clipboard.setOrigin(regionInterface.getRegion().getMinimumPoint());
+		ForwardExtentCopy copy = new ForwardExtentCopy(editSession, new CuboidRegion(world, regionInterface.getRegion().getMinimumPoint(), regionInterface.getRegion().getMaximumPoint()), clipboard, regionInterface.getRegion().getMinimumPoint());
+		try {
+			Operations.completeLegacy(copy);
+		} catch(MaxChangedBlocksException e) {
+			pluginInterface.getLogger().warning("Exceeded the block limit while saving schematic of " + regionInterface.getName() + ", limit in exception: " + e.getBlockLimit() + ", limit passed by AreaShop: " + pluginInterface.getConfig().getInt("maximumBlocks"));
+			return false;
+		}
+
+		try(Closer closer = Closer.create()) {
+			FileOutputStream fos = closer.register(new FileOutputStream(file));
+			BufferedOutputStream bos = closer.register(new BufferedOutputStream(fos));
+			ClipboardWriter writer = closer.register(format.getWriter(bos));
+			writer.write(clipboard);
+		} catch(IOException e) {
+			pluginInterface.getLogger().warning("An error occured while saving schematic of " + regionInterface.getName() + ", enable debug to see the complete stacktrace");
+			pluginInterface.debugI(ExceptionUtils.getStackTrace(e));
+			return false;
+		} catch (Exception e) {
+			pluginInterface.getLogger().warning("Crashed during save of " + regionInterface.getName());
+			pluginInterface.debugI(ExceptionUtils.getStackTrace(e));
+			return false;
+		}
+		return true;
+	}
+}
@@ -0,0 +1,160 @@
+package me.wiefferink.areashop.handlers;
+
+import com.sk89q.worldedit.BlockVector;
+import com.sk89q.worldedit.BlockVector2D;
+import com.sk89q.worldedit.bukkit.BukkitAdapter;
+import com.sk89q.worldguard.WorldGuard;
+import com.sk89q.worldguard.domains.DefaultDomain;
+import com.sk89q.worldguard.protection.flags.Flag;
+import com.sk89q.worldguard.protection.flags.FlagContext;
+import com.sk89q.worldguard.protection.flags.Flags;
+import com.sk89q.worldguard.protection.flags.InvalidFlagFormat;
+import com.sk89q.worldguard.protection.flags.RegionGroup;
+import com.sk89q.worldguard.protection.flags.RegionGroupFlag;
+import com.sk89q.worldguard.protection.managers.RegionManager;
+import com.sk89q.worldguard.protection.regions.ProtectedCuboidRegion;
+import com.sk89q.worldguard.protection.regions.ProtectedRegion;
+import me.wiefferink.areashop.interfaces.AreaShopInterface;
+import me.wiefferink.areashop.interfaces.RegionAccessSet;
+import me.wiefferink.areashop.interfaces.WorldGuardInterface;
+import org.bukkit.Location;
+import org.bukkit.World;
+import org.bukkit.util.Vector;
+
+import java.util.ArrayList;
+import java.util.HashSet;
+import java.util.List;
+import java.util.Set;
+import java.util.UUID;
+
+public class FastAsyncWorldEditWorldGuardHandler extends WorldGuardInterface {
+
+	public FastAsyncWorldEditWorldGuardHandler(AreaShopInterface pluginInterface) {
+		super(pluginInterface);
+	}
+
+	@Override
+	public RegionManager getRegionManager(World world) {
+		return WorldGuard.getInstance().getPlatform().getRegionContainer().get(BukkitAdapter.adapt(world));
+	}
+
+	@Override
+	public Set<ProtectedRegion> getApplicableRegionsSet(Location location) {
+		Set<ProtectedRegion> result = new HashSet<>();
+		com.sk89q.worldedit.Vector vector = new com.sk89q.worldedit.Vector(location.getX(), location.getY(), location.getZ());
+		for(ProtectedRegion region : getRegionManager(location.getWorld()).getRegions().values()) {
+			if(region.contains(vector)) {
+				result.add(region);
+			}
+		}
+		return result;
+	}
+
+	/**
+	 * Build a DefaultDomain from a RegionAccessSet.
+	 * @param regionAccessSet RegionAccessSet to read
+	 * @return DefaultDomain containing the entities from the RegionAccessSet
+	 */
+	private DefaultDomain buildDomain(RegionAccessSet regionAccessSet) {
+		DefaultDomain owners = new DefaultDomain();
+
+		for(String playerName : regionAccessSet.getPlayerNames()) {
+			owners.addPlayer(playerName);
+		}
+
+		for(UUID uuid : regionAccessSet.getPlayerUniqueIds()) {
+			owners.addPlayer(uuid);
+		}
+
+		for(String group : regionAccessSet.getGroupNames()) {
+			owners.addGroup(group);
+		}
+
+		return owners;
+	}
+
+	@Override
+	public void setOwners(ProtectedRegion region, RegionAccessSet regionAccessSet) {
+		DefaultDomain defaultDomain = buildDomain(regionAccessSet);
+		if(!region.getOwners().toUserFriendlyString().equals(defaultDomain.toUserFriendlyString())) {
+			region.setOwners(defaultDomain);
+		}
+	}
+
+	@Override
+	public void setMembers(ProtectedRegion region, RegionAccessSet regionAccessSet) {
+		DefaultDomain defaultDomain = buildDomain(regionAccessSet);
+		if(!region.getMembers().toUserFriendlyString().equals(defaultDomain.toUserFriendlyString())) {
+			region.setMembers(defaultDomain);
+		}
+	}
+
+	@Override
+	public boolean containsMember(ProtectedRegion region, UUID player) {
+		return region.getMembers().contains(player);
+	}
+
+	@Override
+	public boolean containsOwner(ProtectedRegion region, UUID player) {
+		return region.getOwners().contains(player);
+	}
+
+	@Override
+	public RegionAccessSet getMembers(ProtectedRegion region) {
+		RegionAccessSet result = new RegionAccessSet();
+		result.getGroupNames().addAll(region.getMembers().getGroups());
+		result.getPlayerNames().addAll(region.getMembers().getPlayers());
+		result.getPlayerUniqueIds().addAll(region.getMembers().getUniqueIds());
+		return result;
+	}
+
+	@Override
+	public RegionAccessSet getOwners(ProtectedRegion region) {
+		RegionAccessSet result = new RegionAccessSet();
+		result.getGroupNames().addAll(region.getOwners().getGroups());
+		result.getPlayerNames().addAll(region.getOwners().getPlayers());
+		result.getPlayerUniqueIds().addAll(region.getOwners().getUniqueIds());
+		return result;
+	}
+
+	@Override
+	public Flag<?> fuzzyMatchFlag(String flagName) {
+		return Flags.fuzzyMatchFlag(WorldGuard.getInstance().getFlagRegistry(), flagName);
+	}
+
+	@Override
+	public <V> V parseFlagInput(Flag<V> flag, String input) throws InvalidFlagFormat {
+		return flag.parseInput(FlagContext.create().setInput(input).build());
+	}
+
+	@Override
+	public RegionGroup parseFlagGroupInput(RegionGroupFlag flag, String input) throws InvalidFlagFormat {
+		return flag.parseInput(FlagContext.create().setInput(input).build());
+	}
+
+	@Override
+	public Vector getMinimumPoint(ProtectedRegion region) {
+		BlockVector min = region.getMinimumPoint();
+		return new Vector(min.getX(), min.getY(), min.getZ());
+	}
+
+	@Override
+	public Vector getMaximumPoint(ProtectedRegion region) {
+		BlockVector min = region.getMaximumPoint();
+		return new Vector(min.getX(), min.getY(), min.getZ());
+	}
+
+	@Override
+	public List<Vector> getRegionPoints(ProtectedRegion region) {
+		List<Vector> result = new ArrayList<>();
+		for (BlockVector2D point : region.getPoints()) {
+			result.add(new Vector(point.getX(), 0,point.getZ()));
+		}
+		return result;
+	}
+
+	@Override
+	public ProtectedCuboidRegion createCuboidRegion(String name, Vector corner1, Vector corner2) {
+		return new ProtectedCuboidRegion(name, new BlockVector(corner1.getBlockX(), corner1.getBlockY(), corner1.getBlockZ()), new BlockVector(corner2.getBlockX(), corner2.getBlockY(), corner2.getBlockZ()));
+	}
+}
@@ -0,0 +1 @@
+/target
@@ -0,0 +1,42 @@
+<project xmlns="http://maven.apache.org/POM/4.0.0" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
+         xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/xsd/maven-4.0.0.xsd">
+    <modelVersion>4.0.0</modelVersion>
+    <artifactId>areashop-interface</artifactId>
+    <packaging>jar</packaging>
+    <name>AreaShop Interface</name>
+    <version>latest</version>
+
+    <parent>
+        <groupId>me.wiefferink</groupId>
+        <artifactId>areashop-parent</artifactId>
+        <version>parent</version>
+    </parent>
+
+    <dependencies>
+        <dependency>
+            <groupId>org.bukkit</groupId>
+            <artifactId>bukkit</artifactId>
+            <scope>system</scope>
+            <version>any</version>
+            <systemPath>${project.basedir}/../dependencies/bukkit-1.7.9-R0.2.jar</systemPath>
+            <type>jar</type>
+            <optional>true</optional>
+        </dependency>
+
+        <dependency>
+            <groupId>com.sk89q</groupId>
+            <artifactId>worldedit</artifactId>
+            <scope>system</scope>
+            <version>any</version>
+            <systemPath>${project.basedir}/../dependencies/worldedit-6.0.0-SNAPSHOT.jar</systemPath>
+        </dependency>
+        <dependency>
+            <groupId>com.sk89q</groupId>
+            <artifactId>worldguard</artifactId>
+            <scope>system</scope>
+            <version>any</version>
+            <systemPath>${project.basedir}/../dependencies/worldguard-6.0.0-SNAPSHOT.jar</systemPath>
+        </dependency>
+    </dependencies>
+
+</project>
@@ -56,7 +56,7 @@ public class RegionAccessSet {
 		result.addAll(playerUniqueIds);
 		for(String playerName : playerNames) {
 			OfflinePlayer offlinePlayer = Bukkit.getOfflinePlayer(playerName);
-			if (offlinePlayer.hasPlayedBefore()) {
+			if(offlinePlayer != null && offlinePlayer.getUniqueId() != null) {
 				result.add(offlinePlayer.getUniqueId());
 			}
 		}
@@ -0,0 +1,22 @@
+package me.wiefferink.areashop.interfaces;
+
+import org.bukkit.entity.Player;
+
+import java.io.File;
+
+public abstract class WorldEditInterface {
+	protected final AreaShopInterface pluginInterface;
+
+	public WorldEditInterface(AreaShopInterface pluginInterface) {
+		this.pluginInterface = pluginInterface;
+	}
+
+	// Different way to restore blocks per implementation, newer ones support entities as well
+	public abstract boolean restoreRegionBlocks(File file, GeneralRegionInterface regionInterface);
+
+	// Different way to save blocks per implementation, newer ones support entities as well
+	public abstract boolean saveRegionBlocks(File file, GeneralRegionInterface regionInterface);
+
+	public abstract WorldEditSelection getPlayerSelection(Player player);
+
+}
@@ -4,9 +4,9 @@ import org.bukkit.Location;
 import org.bukkit.World;

 public class WorldEditSelection {
-	private final World world;
-	private final Location minimum;
-	private final Location maximum;
+	private World world;
+	private Location minimum;
+	private Location maximum;

 	/**
 	 * Craete a WorldEditSelection.
@@ -0,0 +1 @@
+/target
@@ -0,0 +1,48 @@
+<project xmlns="http://maven.apache.org/POM/4.0.0" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
+         xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/xsd/maven-4.0.0.xsd">
+    <modelVersion>4.0.0</modelVersion>
+    <artifactId>areashop-worldedit-5</artifactId>
+    <packaging>jar</packaging>
+    <name>AreaShop WorldEdit 5</name>
+    <version>latest</version>
+
+    <parent>
+        <groupId>me.wiefferink</groupId>
+        <artifactId>areashop-parent</artifactId>
+        <version>parent</version>
+    </parent>
+
+    <dependencies>
+        <dependency>
+            <groupId>org.bukkit</groupId>
+            <artifactId>craftbukkit</artifactId>
+            <scope>system</scope>
+            <version>any</version>
+            <systemPath>${project.basedir}/../dependencies/craftbukkit-1.7.9-R0.2-SNAPSHOT.jar</systemPath>
+            <type>jar</type>
+            <optional>true</optional>
+        </dependency>
+
+        <dependency>
+            <groupId>com.sk89q</groupId>
+            <artifactId>worldedit</artifactId>
+            <scope>system</scope>
+            <version>any</version>
+            <systemPath>${project.basedir}/../dependencies/worldedit-5.7-SNAPSHOT.jar</systemPath>
+        </dependency>
+        <dependency>
+            <groupId>com.sk89q</groupId>
+            <artifactId>worldguard</artifactId>
+            <scope>system</scope>
+            <version>any</version>
+            <systemPath>${project.basedir}/../dependencies/worldguard-5.9.1-SNAPSHOT.jar</systemPath>
+        </dependency>
+
+        <dependency>
+            <groupId>me.wiefferink</groupId>
+            <artifactId>areashop-interface</artifactId>
+            <version>latest</version>
+            <type>jar</type>
+        </dependency>
+    </dependencies>
+</project>
@@ -0,0 +1,108 @@
+package me.wiefferink.areashop.handlers;
+
+import com.sk89q.worldedit.CuboidClipboard;
+import com.sk89q.worldedit.EditSession;
+import com.sk89q.worldedit.MaxChangedBlocksException;
+import com.sk89q.worldedit.Vector;
+import com.sk89q.worldedit.bukkit.BukkitWorld;
+import com.sk89q.worldedit.bukkit.selections.Selection;
+import com.sk89q.worldedit.data.DataException;
+import com.sk89q.worldedit.schematic.SchematicFormat;
+import com.sk89q.worldguard.protection.regions.ProtectedRegion;
+import me.wiefferink.areashop.interfaces.AreaShopInterface;
+import me.wiefferink.areashop.interfaces.GeneralRegionInterface;
+import me.wiefferink.areashop.interfaces.WorldEditInterface;
+import me.wiefferink.areashop.interfaces.WorldEditSelection;
+import org.apache.commons.lang.exception.ExceptionUtils;
+import org.bukkit.entity.Player;
+
+import java.io.File;
+import java.io.IOException;
+
+public class WorldEditHandler5 extends WorldEditInterface {
+
+	public WorldEditHandler5(AreaShopInterface pluginInterface) {
+		super(pluginInterface);
+	}
+
+	@Override
+	public WorldEditSelection getPlayerSelection(Player player) {
+		Selection selection = pluginInterface.getWorldEdit().getSelection(player);
+		if (selection == null) {
+			return null;
+		}
+		return new WorldEditSelection(
+				player.getWorld(),
+				selection.getMinimumPoint(),
+				selection.getMaximumPoint()
+		);
+	}
+
+	@Override
+	public boolean restoreRegionBlocks(File file, GeneralRegionInterface regionInterface) {
+		file = new File(file.getAbsolutePath() + ".schematic");
+		if(!file.exists() || !file.isFile()) {
+			pluginInterface.getLogger().info("Did not restore region " + regionInterface.getName() + ", schematic file does not exist: " + file.getAbsolutePath());
+			return false;
+		}
+		boolean result = true;
+		EditSession editSession = pluginInterface.getWorldEdit().getWorldEdit().getEditSessionFactory().getEditSession(new BukkitWorld(regionInterface.getWorld()), pluginInterface.getConfig().getInt("maximumBlocks"));
+		// Get the origin and size of the region
+		Vector origin = new Vector(regionInterface.getRegion().getMinimumPoint().getBlockX(), regionInterface.getRegion().getMinimumPoint().getBlockY(), regionInterface.getRegion().getMinimumPoint().getBlockZ());
+
+		editSession.enableQueue();
+		Exception otherException = null;
+		try {
+			CuboidClipboard clipBoard = SchematicFormat.MCEDIT.load(file);
+			if(clipBoard.getHeight() != regionInterface.getHeight()
+					|| clipBoard.getWidth() != regionInterface.getWidth()
+					|| clipBoard.getLength() != regionInterface.getDepth()) {
+				pluginInterface.getLogger().warning("Size of the region " + regionInterface.getName() + " is not the same as the schematic to restore!");
+				pluginInterface.debugI("schematic|region, x:" + clipBoard.getWidth() + "|" + regionInterface.getWidth() + ", y:" + clipBoard.getHeight() + "|" + regionInterface.getHeight() + ", z:" + clipBoard.getLength() + "|" + regionInterface.getDepth());
+			}
+			clipBoard.place(editSession, origin, false);
+		} catch(MaxChangedBlocksException e) {
+			pluginInterface.getLogger().warning("exceeded the block limit while restoring schematic of " + regionInterface.getName() + ", limit in exception: " + e.getBlockLimit() + ", limit passed by AreaShop: " + pluginInterface.getConfig().getInt("maximumBlocks"));
+			result = false;
+		} catch(DataException | IOException e) {
+			otherException = e;
+		}
+		if(otherException != null) {
+			pluginInterface.getLogger().warning("Failed to restore schematic for region " + regionInterface.getName());
+			pluginInterface.debugI(ExceptionUtils.getStackTrace(otherException));
+			result = false;
+		}
+		editSession.flushQueue();
+		return result;
+	}
+
+	@Override
+	public boolean saveRegionBlocks(File file, GeneralRegionInterface regionInterface) {
+		file = new File(file.getAbsolutePath() + ".schematic");
+		boolean result = true;
+		ProtectedRegion region = regionInterface.getRegion();
+		// Get the origin and size of the region
+		Vector origin = new Vector(region.getMinimumPoint().getBlockX(), region.getMinimumPoint().getBlockY(), region.getMinimumPoint().getBlockZ());
+		Vector size = (new Vector(region.getMaximumPoint().getBlockX(), region.getMaximumPoint().getBlockY(), region.getMaximumPoint().getBlockZ()).subtract(origin)).add(new Vector(1, 1, 1));
+		EditSession editSession = new EditSession(new BukkitWorld(regionInterface.getWorld()), pluginInterface.getConfig().getInt("maximumBlocks"));
+		// Save the schematic
+		editSession.enableQueue();
+		CuboidClipboard clipboard = new CuboidClipboard(size, origin);
+		clipboard.copy(editSession);
+		Exception otherException = null;
+		try {
+			SchematicFormat.MCEDIT.save(clipboard, file);
+		} catch(DataException | IOException e) {
+			otherException = e;
+		}
+		if(otherException != null) {
+			pluginInterface.getLogger().warning("Failed to save schematic for region " + regionInterface.getName());
+			pluginInterface.debugI(ExceptionUtils.getStackTrace(otherException));
+			result = false;
+		}
+		editSession.flushQueue();
+		return result;
+	}
+
+
+}
@@ -0,0 +1 @@
+/target
@@ -0,0 +1,48 @@
+<project xmlns="http://maven.apache.org/POM/4.0.0" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
+         xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/xsd/maven-4.0.0.xsd">
+    <modelVersion>4.0.0</modelVersion>
+    <artifactId>areashop-worldedit-6</artifactId>
+    <packaging>jar</packaging>
+    <name>AreaShop WorldEdit 6</name>
+    <version>latest</version>
+
+    <parent>
+        <groupId>me.wiefferink</groupId>
+        <artifactId>areashop-parent</artifactId>
+        <version>parent</version>
+    </parent>
+
+    <dependencies>
+        <dependency>
+            <groupId>org.bukkit</groupId>
+            <artifactId>craftbukkit</artifactId>
+            <scope>system</scope>
+            <version>any</version>
+            <systemPath>${project.basedir}/../dependencies/craftbukkit-1.7.9-R0.2-SNAPSHOT.jar</systemPath>
+            <type>jar</type>
+            <optional>true</optional>
+        </dependency>
+
+        <dependency>
+            <groupId>com.sk89q</groupId>
+            <artifactId>worldedit</artifactId>
+            <scope>system</scope>
+            <version>any</version>
+            <systemPath>${project.basedir}/../dependencies/worldedit-6.0.0-SNAPSHOT.jar</systemPath>
+        </dependency>
+        <dependency>
+            <groupId>com.sk89q</groupId>
+            <artifactId>worldguard</artifactId>
+            <scope>system</scope>
+            <version>any</version>
+            <systemPath>${project.basedir}/../dependencies/worldguard-6.0.0-SNAPSHOT.jar</systemPath>
+        </dependency>
+
+        <dependency>
+            <groupId>me.wiefferink</groupId>
+            <artifactId>areashop-interface</artifactId>
+            <version>latest</version>
+            <type>jar</type>
+        </dependency>
+    </dependencies>
+</project>
@@ -0,0 +1,190 @@
+package me.wiefferink.areashop.handlers;
+
+import com.sk89q.worldedit.EditSession;
+import com.sk89q.worldedit.LocalSession;
+import com.sk89q.worldedit.MaxChangedBlocksException;
+import com.sk89q.worldedit.Vector;
+import com.sk89q.worldedit.bukkit.BukkitWorld;
+import com.sk89q.worldedit.bukkit.selections.Selection;
+import com.sk89q.worldedit.extent.clipboard.BlockArrayClipboard;
+import com.sk89q.worldedit.extent.clipboard.Clipboard;
+import com.sk89q.worldedit.extent.clipboard.io.ClipboardFormat;
+import com.sk89q.worldedit.extent.clipboard.io.ClipboardReader;
+import com.sk89q.worldedit.extent.clipboard.io.ClipboardWriter;
+import com.sk89q.worldedit.extent.transform.BlockTransformExtent;
+import com.sk89q.worldedit.function.mask.Mask;
+import com.sk89q.worldedit.function.mask.Mask2D;
+import com.sk89q.worldedit.function.operation.ForwardExtentCopy;
+import com.sk89q.worldedit.function.operation.Operations;
+import com.sk89q.worldedit.internal.LocalWorldAdapter;
+import com.sk89q.worldedit.regions.CuboidRegion;
+import com.sk89q.worldedit.session.ClipboardHolder;
+import com.sk89q.worldedit.util.io.Closer;
+import com.sk89q.worldedit.world.registry.WorldData;
+import com.sk89q.worldguard.protection.regions.ProtectedRegion;
+import com.sk89q.worldguard.protection.regions.RegionType;
+import me.wiefferink.areashop.interfaces.AreaShopInterface;
+import me.wiefferink.areashop.interfaces.GeneralRegionInterface;
+import me.wiefferink.areashop.interfaces.WorldEditInterface;
+import me.wiefferink.areashop.interfaces.WorldEditSelection;
+import org.apache.commons.lang.exception.ExceptionUtils;
+import org.bukkit.entity.Player;
+
+import java.io.BufferedInputStream;
+import java.io.BufferedOutputStream;
+import java.io.File;
+import java.io.FileInputStream;
+import java.io.FileOutputStream;
+import java.io.IOException;
+
+public class WorldEditHandler6 extends WorldEditInterface {
+
+	public WorldEditHandler6(AreaShopInterface pluginInterface) {
+		super(pluginInterface);
+	}
+
+	@Override
+	public WorldEditSelection getPlayerSelection(Player player) {
+		Selection selection = pluginInterface.getWorldEdit().getSelection(player);
+		if (selection == null) {
+			return null;
+		}
+		return new WorldEditSelection(
+				player.getWorld(),
+				selection.getMinimumPoint(),
+				selection.getMaximumPoint()
+		);
+	}
+
+	@Override
+	public boolean restoreRegionBlocks(File file, GeneralRegionInterface regionInterface) {
+		file = new File(file.getAbsolutePath() + ".schematic");
+		if(!file.exists() || !file.isFile()) {
+			pluginInterface.getLogger().info("Did not restore region " + regionInterface.getName() + ", schematic file does not exist: " + file.getAbsolutePath());
+			return false;
+		}
+		com.sk89q.worldedit.world.World world = null;
+		if(regionInterface.getName() != null) {
+			world = LocalWorldAdapter.adapt(new BukkitWorld(regionInterface.getWorld()));
+		}
+		if(world == null) {
+			pluginInterface.getLogger().info("Did not restore region " + regionInterface.getName() + ", world not found: " + regionInterface.getWorldName());
+			return false;
+		}
+		EditSession editSession = pluginInterface.getWorldEdit().getWorldEdit().getEditSessionFactory().getEditSession(world, pluginInterface.getConfig().getInt("maximumBlocks"));
+		editSession.enableQueue();
+		ProtectedRegion region = regionInterface.getRegion();
+		// Get the origin and size of the region
+		Vector origin = new Vector(region.getMinimumPoint().getBlockX(), region.getMinimumPoint().getBlockY(), region.getMinimumPoint().getBlockZ());
+
+		// Read the schematic and paste it into the world
+		try(Closer closer = Closer.create()) {
+			FileInputStream fis = closer.register(new FileInputStream(file));
+			BufferedInputStream bis = closer.register(new BufferedInputStream(fis));
+			ClipboardReader reader = ClipboardFormat.SCHEMATIC.getReader(bis);
+
+			WorldData worldData = world.getWorldData();
+			LocalSession session = new LocalSession(pluginInterface.getWorldEdit().getLocalConfiguration());
+			Clipboard clipboard = reader.read(worldData);
+			if(clipboard.getDimensions().getY() != regionInterface.getHeight()
+					|| clipboard.getDimensions().getX() != regionInterface.getWidth()
+					|| clipboard.getDimensions().getZ() != regionInterface.getDepth()) {
+				pluginInterface.getLogger().warning("Size of the region " + regionInterface.getName() + " is not the same as the schematic to restore!");
+				pluginInterface.debugI("schematic|region, x:" + clipboard.getDimensions().getX() + "|" + regionInterface.getWidth() + ", y:" + clipboard.getDimensions().getY() + "|" + regionInterface.getHeight() + ", z:" + clipboard.getDimensions().getZ() + "|" + regionInterface.getDepth());
+			}
+			clipboard.setOrigin(clipboard.getMinimumPoint());
+			ClipboardHolder clipboardHolder = new ClipboardHolder(clipboard, worldData);
+			session.setBlockChangeLimit(pluginInterface.getConfig().getInt("maximumBlocks"));
+			session.setClipboard(clipboardHolder);
+
+			// Build operation
+			BlockTransformExtent extent = new BlockTransformExtent(clipboardHolder.getClipboard(), clipboardHolder.getTransform(), editSession.getWorld().getWorldData().getBlockRegistry());
+			ForwardExtentCopy copy = new ForwardExtentCopy(extent, clipboard.getRegion(), clipboard.getOrigin(), editSession, origin);
+			copy.setTransform(clipboardHolder.getTransform());
+			// Mask to region (for polygon and other weird shaped regions)
+			// TODO make this more efficient (especially for polygon regions)
+			if(region.getType() != RegionType.CUBOID) {
+				copy.setSourceMask(new Mask() {
+					@Override
+					public boolean test(Vector vector) {
+						return region.contains(vector);
+					}
+
+					@Override
+					public Mask2D toMask2D() {
+						return null;
+					}
+				});
+			}
+			Operations.completeLegacy(copy);
+		} catch(MaxChangedBlocksException e) {
+			pluginInterface.getLogger().warning("exceeded the block limit while restoring schematic of " + regionInterface.getName() + ", limit in exception: " + e.getBlockLimit() + ", limit passed by AreaShop: " + pluginInterface.getConfig().getInt("maximumBlocks"));
+			return false;
+		} catch(IOException e) {
+			pluginInterface.getLogger().warning("An error occured while restoring schematic of " + regionInterface.getName() + ", enable debug to see the complete stacktrace");
+			pluginInterface.debugI(ExceptionUtils.getStackTrace(e));
+			return false;
+		}
+		editSession.flushQueue();
+		return true;
+	}
+
+	@Override
+	public boolean saveRegionBlocks(File file, GeneralRegionInterface regionInterface) {
+		file = new File(file.getAbsolutePath() + ".schematic");
+		com.sk89q.worldedit.world.World world = null;
+		if(regionInterface.getWorld() != null) {
+			world = LocalWorldAdapter.adapt(new BukkitWorld(regionInterface.getWorld()));
+		}
+		if(world == null) {
+			pluginInterface.getLogger().warning("Did not save region " + regionInterface.getName() + ", world not found: " + regionInterface.getWorldName());
+			return false;
+		}
+		EditSession editSession = pluginInterface.getWorldEdit().getWorldEdit().getEditSessionFactory().getEditSession(world, pluginInterface.getConfig().getInt("maximumBlocks"));
+		// Create a clipboard
+		CuboidRegion selection = new CuboidRegion(world, regionInterface.getRegion().getMinimumPoint(), regionInterface.getRegion().getMaximumPoint());
+		BlockArrayClipboard clipboard = new BlockArrayClipboard(selection);
+		clipboard.setOrigin(regionInterface.getRegion().getMinimumPoint());
+		ForwardExtentCopy copy = new ForwardExtentCopy(editSession, new CuboidRegion(world, regionInterface.getRegion().getMinimumPoint(), regionInterface.getRegion().getMaximumPoint()), clipboard, regionInterface.getRegion().getMinimumPoint());
+		try {
+			Operations.completeLegacy(copy);
+		} catch(MaxChangedBlocksException e) {
+			pluginInterface.getLogger().warning("exceeded the block limit while saving schematic of " + regionInterface.getName() + ", limit in exception: " + e.getBlockLimit() + ", limit passed by AreaShop: " + pluginInterface.getConfig().getInt("maximumBlocks"));
+			return false;
+		}
+
+		try(Closer closer = Closer.create()) {
+			FileOutputStream fos = closer.register(new FileOutputStream(file));
+			BufferedOutputStream bos = closer.register(new BufferedOutputStream(fos));
+			ClipboardWriter writer = closer.register(ClipboardFormat.SCHEMATIC.getWriter(bos));
+			writer.write(clipboard, world.getWorldData());
+		} catch(IOException e) {
+			pluginInterface.getLogger().warning("An error occured while saving schematic of " + regionInterface.getName() + ", enable debug to see the complete stacktrace");
+			pluginInterface.debugI(ExceptionUtils.getStackTrace(e));
+			return false;
+		}
+		return true;
+	}
+}
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
@@ -0,0 +1 @@
+/target
@@ -0,0 +1,46 @@
+<project xmlns="http://maven.apache.org/POM/4.0.0" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
+         xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/xsd/maven-4.0.0.xsd">
+    <modelVersion>4.0.0</modelVersion>
+    <artifactId>areashop-worldedit-7_beta_1</artifactId>
+    <packaging>jar</packaging>
+    <name>AreaShop WorldEdit 7_beta_1</name>
+    <version>latest</version>
+
+    <parent>
+        <groupId>me.wiefferink</groupId>
+        <artifactId>areashop-parent</artifactId>
+        <version>parent</version>
+    </parent>
+
+    <dependencies>
+        <dependency>
+            <groupId>org.bukkit</groupId>
+            <artifactId>craftbukkit</artifactId>
+            <version>1.13-R0.1-SNAPSHOT</version>
+            <type>jar</type>
+            <optional>true</optional>
+        </dependency>
+
+        <dependency>
+            <groupId>com.sk89q</groupId>
+            <artifactId>worldedit</artifactId>
+            <scope>system</scope>
+            <version>any</version>
+            <systemPath>${project.basedir}/../dependencies/worldedit-bukkit-7.0.0-beta-01.jar</systemPath>
+        </dependency>
+        <dependency>
+            <groupId>com.sk89q</groupId>
+            <artifactId>worldguard</artifactId>
+            <scope>system</scope>
+            <version>any</version>
+            <systemPath>${project.basedir}/../dependencies/worldguard-legacy-7.0.0-beta-01.jar</systemPath>
+        </dependency>
+
+        <dependency>
+            <groupId>me.wiefferink</groupId>
+            <artifactId>areashop-interface</artifactId>
+            <version>latest</version>
+            <type>jar</type>
+        </dependency>
+    </dependencies>
+</project>
@@ -0,0 +1,228 @@
+package me.wiefferink.areashop.handlers;
+
+import com.sk89q.worldedit.EditSession;
+import com.sk89q.worldedit.IncompleteRegionException;
+import com.sk89q.worldedit.LocalSession;
+import com.sk89q.worldedit.MaxChangedBlocksException;
+import com.sk89q.worldedit.Vector;
+import com.sk89q.worldedit.bukkit.BukkitAdapter;
+import com.sk89q.worldedit.extent.clipboard.BlockArrayClipboard;
+import com.sk89q.worldedit.extent.clipboard.Clipboard;
+import com.sk89q.worldedit.extent.clipboard.io.ClipboardFormat;
+import com.sk89q.worldedit.extent.clipboard.io.ClipboardFormats;
+import com.sk89q.worldedit.extent.clipboard.io.ClipboardReader;
+import com.sk89q.worldedit.extent.clipboard.io.ClipboardWriter;
+import com.sk89q.worldedit.extent.transform.BlockTransformExtent;
+import com.sk89q.worldedit.function.mask.Mask;
+import com.sk89q.worldedit.function.mask.Mask2D;
+import com.sk89q.worldedit.function.operation.ForwardExtentCopy;
+import com.sk89q.worldedit.function.operation.Operations;
+import com.sk89q.worldedit.regions.CuboidRegion;
+import com.sk89q.worldedit.regions.Region;
+import com.sk89q.worldedit.session.ClipboardHolder;
+import com.sk89q.worldedit.util.io.Closer;
+import com.sk89q.worldguard.protection.regions.ProtectedRegion;
+import com.sk89q.worldguard.protection.regions.RegionType;
+import me.wiefferink.areashop.interfaces.AreaShopInterface;
+import me.wiefferink.areashop.interfaces.GeneralRegionInterface;
+import me.wiefferink.areashop.interfaces.WorldEditInterface;
+import me.wiefferink.areashop.interfaces.WorldEditSelection;
+import org.apache.commons.lang.exception.ExceptionUtils;
+import org.bukkit.entity.Player;
+
+import java.io.BufferedInputStream;
+import java.io.BufferedOutputStream;
+import java.io.File;
+import java.io.FileInputStream;
+import java.io.FileOutputStream;
+import java.io.IOException;
+import java.lang.reflect.InvocationTargetException;
+import java.lang.reflect.Method;
+import java.util.Arrays;
+
+public class WorldEditHandler7_beta_1 extends WorldEditInterface {
+
+	public WorldEditHandler7_beta_1(AreaShopInterface pluginInterface) {
+		super(pluginInterface);
+	}
+
+	@Override
+	public WorldEditSelection getPlayerSelection(Player player) {
+		try {
+			Region region = pluginInterface.getWorldEdit().getSession(player).getSelection(BukkitAdapter.adapt(player.getWorld()));
+			return new WorldEditSelection(
+					player.getWorld(),
+					BukkitAdapter.adapt(player.getWorld(), region.getMinimumPoint()),
+					BukkitAdapter.adapt(player.getWorld(), region.getMaximumPoint())
+			);
+		} catch (IncompleteRegionException e) {
+			return null;
+		}
+	}
+
+	@Override
+	public boolean restoreRegionBlocks(File rawFile, GeneralRegionInterface regionInterface) {
+		File file = null;
+		ClipboardFormat format = null;
+		for (ClipboardFormat formatOption : ClipboardFormats.getAll()) {
+			for (String extension : formatOption.getFileExtensions()) {
+				if (new File(rawFile.getAbsolutePath() + "." + extension).exists()) {
+					file = new File(rawFile.getAbsolutePath() + "." + extension);
+					format = formatOption;
+				}
+			}
+		}
+		if(file == null) {
+			pluginInterface.getLogger().info("Did not restore region " + regionInterface.getName() + ", schematic file does not exist: " + rawFile.getAbsolutePath());
+			return false;
+		}
+		pluginInterface.debugI("Trying to restore region", regionInterface.getName(), " from file", file.getAbsolutePath(), "with format", format.getName());
+
+		com.sk89q.worldedit.world.World world = null;
+		if(regionInterface.getName() != null) {
+			world = BukkitAdapter.adapt(regionInterface.getWorld());
+		}
+		if(world == null) {
+			pluginInterface.getLogger().info("Did not restore region " + regionInterface.getName() + ", world not found: " + regionInterface.getWorldName());
+			return false;
+		}
+		EditSession editSession = pluginInterface.getWorldEdit().getWorldEdit().getEditSessionFactory().getEditSession(world, pluginInterface.getConfig().getInt("maximumBlocks"));
+		editSession.enableQueue();
+		ProtectedRegion region = regionInterface.getRegion();
+		// Get the origin and size of the region
+		Vector origin = new Vector(region.getMinimumPoint().getBlockX(), region.getMinimumPoint().getBlockY(), region.getMinimumPoint().getBlockZ());
+
+		// Read the schematic and paste it into the world
+		try(Closer closer = Closer.create()) {
+			FileInputStream fis = closer.register(new FileInputStream(file));
+			BufferedInputStream bis = closer.register(new BufferedInputStream(fis));
+			ClipboardReader reader = format.getReader(bis);
+
+			//WorldData worldData = world.getWorldData();
+			LocalSession session = new LocalSession(pluginInterface.getWorldEdit().getLocalConfiguration());
+			Clipboard clipboard = reader.read();
+			if(clipboard.getDimensions().getY() != regionInterface.getHeight()
+					|| clipboard.getDimensions().getX() != regionInterface.getWidth()
+					|| clipboard.getDimensions().getZ() != regionInterface.getDepth()) {
+				pluginInterface.getLogger().warning("Size of the region " + regionInterface.getName() + " is not the same as the schematic to restore!");
+				pluginInterface.debugI("schematic|region, x:" + clipboard.getDimensions().getX() + "|" + regionInterface.getWidth() + ", y:" + clipboard.getDimensions().getY() + "|" + regionInterface.getHeight() + ", z:" + clipboard.getDimensions().getZ() + "|" + regionInterface.getDepth());
+			}
+			clipboard.setOrigin(clipboard.getMinimumPoint());
+			ClipboardHolder clipboardHolder = new ClipboardHolder(clipboard);
+			session.setBlockChangeLimit(pluginInterface.getConfig().getInt("maximumBlocks"));
+			session.setClipboard(clipboardHolder);
+
+			// Build operation
+			BlockTransformExtent extent = new BlockTransformExtent(clipboardHolder.getClipboard(), clipboardHolder.getTransform());
+			ForwardExtentCopy copy = new ForwardExtentCopy(extent, clipboard.getRegion(), clipboard.getOrigin(), editSession, origin);
+			copy.setCopyingEntities(false);
+			copy.setTransform(clipboardHolder.getTransform());
+			// Mask to region (for polygon and other weird shaped regions)
+			// TODO make this more efficient (especially for polygon regions)
+			if(region.getType() != RegionType.CUBOID) {
+				copy.setSourceMask(new Mask() {
+					@Override
+					public boolean test(Vector vector) {
+						return region.contains(vector);
+					}
+
+					@Override
+					public Mask2D toMask2D() {
+						return null;
+					}
+				});
+			}
+			Operations.completeLegacy(copy);
+		} catch(MaxChangedBlocksException e) {
+			pluginInterface.getLogger().warning("exceeded the block limit while restoring schematic of " + regionInterface.getName() + ", limit in exception: " + e.getBlockLimit() + ", limit passed by AreaShop: " + pluginInterface.getConfig().getInt("maximumBlocks"));
+			return false;
+		} catch(IOException e) {
+			pluginInterface.getLogger().warning("An error occured while restoring schematic of " + regionInterface.getName() + ", enable debug to see the complete stacktrace");
+			pluginInterface.debugI(ExceptionUtils.getStackTrace(e));
+			return false;
+		} catch (Exception e) {
+			pluginInterface.getLogger().warning("crashed during restore of " + regionInterface.getName());
+			pluginInterface.debugI(ExceptionUtils.getStackTrace(e));
+			return false;
+		}
+		editSession.flushQueue();
+		return true;
+	}
+
+	@Override
+	public boolean saveRegionBlocks(File file, GeneralRegionInterface regionInterface) {
+		ClipboardFormat format = ClipboardFormats.findByAlias("sponge");
+		if(format == null) {
+			// Sponge format does not exist, try to select another one
+			for(ClipboardFormat otherFormat : ClipboardFormats.getAll()) {
+				format = otherFormat;
+			}
+			if(format == null) {
+				pluginInterface.getLogger().warning("Cannot find a format to save a schematic in, no available formats!");
+				return false;
+			}
+		}
+
+		file = new File(file.getAbsolutePath() + "." + format.getPrimaryFileExtension());
+		pluginInterface.debugI("Trying to save region", regionInterface.getName(), " to file", file.getAbsolutePath(), "with format", format.getName());
+		com.sk89q.worldedit.world.World world = null;
+		if(regionInterface.getWorld() != null) {
+			world = BukkitAdapter.adapt(regionInterface.getWorld());
+		}
+		if(world == null) {
+			pluginInterface.getLogger().warning("Did not save region " + regionInterface.getName() + ", world not found: " + regionInterface.getWorldName());
+			return false;
+		}
+		EditSession editSession = pluginInterface.getWorldEdit().getWorldEdit().getEditSessionFactory().getEditSession(world, pluginInterface.getConfig().getInt("maximumBlocks"));
+
+		// Create a clipboard
+		CuboidRegion selection = new CuboidRegion(world, regionInterface.getRegion().getMinimumPoint(), regionInterface.getRegion().getMaximumPoint());
+		BlockArrayClipboard clipboard = new BlockArrayClipboard(selection);
+		clipboard.setOrigin(regionInterface.getRegion().getMinimumPoint());
+		ForwardExtentCopy copy = new ForwardExtentCopy(editSession, new CuboidRegion(world, regionInterface.getRegion().getMinimumPoint(), regionInterface.getRegion().getMaximumPoint()), clipboard, regionInterface.getRegion().getMinimumPoint());
+		try {
+			Operations.completeLegacy(copy);
+		} catch(MaxChangedBlocksException e) {
+			pluginInterface.getLogger().warning("Exceeded the block limit while saving schematic of " + regionInterface.getName() + ", limit in exception: " + e.getBlockLimit() + ", limit passed by AreaShop: " + pluginInterface.getConfig().getInt("maximumBlocks"));
+			return false;
+		}
+
+		try(Closer closer = Closer.create()) {
+			FileOutputStream fos = closer.register(new FileOutputStream(file));
+			BufferedOutputStream bos = closer.register(new BufferedOutputStream(fos));
+			ClipboardWriter writer = closer.register(format.getWriter(bos));
+			writer.write(clipboard);
+		} catch(IOException e) {
+			pluginInterface.getLogger().warning("An error occured while saving schematic of " + regionInterface.getName() + ", enable debug to see the complete stacktrace");
+			pluginInterface.debugI(ExceptionUtils.getStackTrace(e));
+			return false;
+		} catch (Exception e) {
+			pluginInterface.getLogger().warning("crashed during save of " + regionInterface.getName());
+			pluginInterface.debugI(ExceptionUtils.getStackTrace(e));
+			return false;
+		}
+		return true;
+	}
+}
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
@@ -0,0 +1 @@
+/target
@@ -0,0 +1,46 @@
+<project xmlns="http://maven.apache.org/POM/4.0.0" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
+         xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/xsd/maven-4.0.0.xsd">
+    <modelVersion>4.0.0</modelVersion>
+    <artifactId>areashop-worldedit-7_beta_4</artifactId>
+    <packaging>jar</packaging>
+    <name>AreaShop WorldEdit 7_beta_4</name>
+    <version>latest</version>
+
+    <parent>
+        <groupId>me.wiefferink</groupId>
+        <artifactId>areashop-parent</artifactId>
+        <version>parent</version>
+    </parent>
+
+    <dependencies>
+        <dependency>
+            <groupId>org.bukkit</groupId>
+            <artifactId>craftbukkit</artifactId>
+            <version>1.13-R0.1-SNAPSHOT</version>
+            <type>jar</type>
+            <optional>true</optional>
+        </dependency>
+
+        <dependency>
+            <groupId>com.sk89q</groupId>
+            <artifactId>worldedit</artifactId>
+            <scope>system</scope>
+            <version>any</version>
+            <systemPath>${project.basedir}/../dependencies/worldedit-bukkit-7.0.0-beta-04.jar</systemPath>
+        </dependency>
+        <dependency>
+            <groupId>com.sk89q</groupId>
+            <artifactId>worldguard</artifactId>
+            <scope>system</scope>
+            <version>any</version>
+            <systemPath>${project.basedir}/../dependencies/worldguard-legacy-7.0.0-beta-02.jar</systemPath>
+        </dependency>
+
+        <dependency>
+            <groupId>me.wiefferink</groupId>
+            <artifactId>areashop-interface</artifactId>
+            <version>latest</version>
+            <type>jar</type>
+        </dependency>
+    </dependencies>
+</project>
@@ -1,4 +1,4 @@
-package me.wiefferink.areashop.handlers.worldedit.v7;
+package me.wiefferink.areashop.handlers;

 import com.sk89q.worldedit.EditSession;
 import com.sk89q.worldedit.IncompleteRegionException;
@@ -36,10 +36,13 @@ import java.io.File;
 import java.io.FileInputStream;
 import java.io.FileOutputStream;
 import java.io.IOException;
+import java.lang.reflect.InvocationTargetException;
+import java.lang.reflect.Method;
+import java.util.Arrays;

-public class WorldEditHandler extends WorldEditInterface {
+public class WorldEditHandler7_beta_4 extends WorldEditInterface {

-	public WorldEditHandler(AreaShopInterface pluginInterface) {
+	public WorldEditHandler7_beta_4(AreaShopInterface pluginInterface) {
 		super(pluginInterface);
 	}

@@ -63,9 +66,8 @@ public class WorldEditHandler extends WorldEditInterface {
 		ClipboardFormat format = null;
 		for (ClipboardFormat formatOption : ClipboardFormats.getAll()) {
 			for (String extension : formatOption.getFileExtensions()) {
-				File fileOption = new File(rawFile.getAbsolutePath() + "." + extension);
-				if (fileOption.exists()) {
-					file = fileOption;
+				if (new File(rawFile.getAbsolutePath() + "." + extension).exists()) {
+					file = new File(rawFile.getAbsolutePath() + "." + extension);
 					format = formatOption;
 				}
 			}
@@ -84,9 +86,7 @@ public class WorldEditHandler extends WorldEditInterface {
 			pluginInterface.getLogger().info("Did not restore region " + regionInterface.getName() + ", world not found: " + regionInterface.getWorldName());
 			return false;
 		}
-		EditSession editSession = pluginInterface.getWorldEdit().getWorldEdit() // WARNING Deprecated in 7.2.0!
-				.getEditSessionFactory()
-				.getEditSession(world, pluginInterface.getConfig().getInt("maximumBlocks"));
+		EditSession editSession = pluginInterface.getWorldEdit().getWorldEdit().getEditSessionFactory().getEditSession(world, pluginInterface.getConfig().getInt("maximumBlocks"));
 		ProtectedRegion region = regionInterface.getRegion();
 		// Get the origin and size of the region
 		BlockVector3 origin = BlockVector3.at(region.getMinimumPoint().getBlockX(), region.getMinimumPoint().getBlockY(), region.getMinimumPoint().getBlockZ());
@@ -144,7 +144,7 @@ public class WorldEditHandler extends WorldEditInterface {
 			pluginInterface.debugI(ExceptionUtils.getStackTrace(e));
 			return false;
 		}
-		editSession.close();
+		editSession.flushSession();
 		return true;
 	}

@@ -172,9 +172,7 @@ public class WorldEditHandler extends WorldEditInterface {
 			pluginInterface.getLogger().warning("Did not save region " + regionInterface.getName() + ", world not found: " + regionInterface.getWorldName());
 			return false;
 		}
-		EditSession editSession = pluginInterface.getWorldEdit().getWorldEdit() // WARNING Deprecated in 7.2.0!
-				.getEditSessionFactory()
-				.getEditSession(world, pluginInterface.getConfig().getInt("maximumBlocks"));
+		EditSession editSession = pluginInterface.getWorldEdit().getWorldEdit().getEditSessionFactory().getEditSession(world, pluginInterface.getConfig().getInt("maximumBlocks"));

 		// Create a clipboard
 		CuboidRegion selection = new CuboidRegion(world, regionInterface.getRegion().getMinimumPoint(), regionInterface.getRegion().getMaximumPoint());
@@ -0,0 +1 @@
+/target
@@ -0,0 +1,41 @@
+<project xmlns="http://maven.apache.org/POM/4.0.0" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
+         xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/xsd/maven-4.0.0.xsd">
+    <modelVersion>4.0.0</modelVersion>
+    <artifactId>areashop-worldguard-5</artifactId>
+    <packaging>jar</packaging>
+    <name>AreaShop WorldGuard 5</name>
+    <version>latest</version>
+
+    <parent>
+        <groupId>me.wiefferink</groupId>
+        <artifactId>areashop-parent</artifactId>
+        <version>parent</version>
+    </parent>
+
+    <dependencies>
+        <dependency>
+            <groupId>org.bukkit</groupId>
+            <artifactId>bukkit</artifactId>
+            <scope>system</scope>
+            <version>any</version>
+            <systemPath>${project.basedir}/../dependencies/bukkit-1.7.9-R0.2.jar</systemPath>
+            <type>jar</type>
+            <optional>true</optional>
+        </dependency>
+
+        <dependency>
+            <groupId>com.sk89q</groupId>
+            <artifactId>worldguard</artifactId>
+            <scope>system</scope>
+            <version>any</version>
+            <systemPath>${project.basedir}/../dependencies/worldguard-5.9.1-SNAPSHOT.jar</systemPath>
+        </dependency>
+
+        <dependency>
+            <groupId>me.wiefferink</groupId>
+            <artifactId>areashop-interface</artifactId>
+            <version>latest</version>
+            <type>jar</type>
+        </dependency>
+    </dependencies>
+</project>
@@ -0,0 +1,172 @@
+package me.wiefferink.areashop.handlers;
+
+import com.sk89q.worldedit.BlockVector;
+import com.sk89q.worldedit.BlockVector2D;
+import com.sk89q.worldedit.Vector;
+import com.sk89q.worldguard.bukkit.WorldGuardPlugin;
+import com.sk89q.worldguard.domains.DefaultDomain;
+import com.sk89q.worldguard.protection.flags.DefaultFlag;
+import com.sk89q.worldguard.protection.flags.Flag;
+import com.sk89q.worldguard.protection.flags.InvalidFlagFormat;
+import com.sk89q.worldguard.protection.flags.RegionGroup;
+import com.sk89q.worldguard.protection.flags.RegionGroupFlag;
+import com.sk89q.worldguard.protection.managers.RegionManager;
+import com.sk89q.worldguard.protection.regions.ProtectedCuboidRegion;
+import com.sk89q.worldguard.protection.regions.ProtectedRegion;
+import me.wiefferink.areashop.interfaces.AreaShopInterface;
+import me.wiefferink.areashop.interfaces.RegionAccessSet;
+import me.wiefferink.areashop.interfaces.WorldGuardInterface;
+import org.bukkit.Bukkit;
+import org.bukkit.Location;
+import org.bukkit.OfflinePlayer;
+import org.bukkit.World;
+
+import java.util.ArrayList;
+import java.util.HashSet;
+import java.util.List;
+import java.util.Set;
+import java.util.UUID;
+
+public class WorldGuardHandler5 extends WorldGuardInterface {
+
+	public WorldGuardHandler5(AreaShopInterface pluginInterface) {
+		super(pluginInterface);
+	}
+
+	@Override
+	public RegionManager getRegionManager(World world) {
+		return WorldGuardPlugin.inst().getRegionManager(world);
+	}
+
+	@Override
+	public Set<ProtectedRegion> getApplicableRegionsSet(Location location) {
+		Set<ProtectedRegion> result = new HashSet<>();
+		Vector vector = new Vector(location.getX(), location.getY(), location.getZ());
+		for(ProtectedRegion region : pluginInterface.getWorldGuard().getRegionManager(location.getWorld()).getRegions().values()) {
+			if(region.contains(vector)) {
+				result.add(region);
+			}
+		}
+		return result;
+	}
+
+	@Override
+	public void setOwners(ProtectedRegion region, RegionAccessSet regionAccessSet) {
+		DefaultDomain defaultDomain = buildDomain(regionAccessSet);
+		if(!region.getOwners().toUserFriendlyString().equals(defaultDomain.toUserFriendlyString())) {
+			region.setOwners(defaultDomain);
+		}
+	}
+
+	@Override
+	public void setMembers(ProtectedRegion region, RegionAccessSet regionAccessSet) {
+		DefaultDomain defaultDomain = buildDomain(regionAccessSet);
+		if(!region.getMembers().toUserFriendlyString().equals(defaultDomain.toUserFriendlyString())) {
+			region.setMembers(defaultDomain);
+		}
+	}
+
+	@Override
+	public RegionAccessSet getMembers(ProtectedRegion region) {
+		RegionAccessSet result = new RegionAccessSet();
+		result.getGroupNames().addAll(region.getMembers().getGroups());
+		result.getPlayerNames().addAll(region.getMembers().getPlayers());
+		return result;
+	}
+
+	@Override
+	public RegionAccessSet getOwners(ProtectedRegion region) {
+		RegionAccessSet result = new RegionAccessSet();
+		result.getGroupNames().addAll(region.getOwners().getGroups());
+		result.getPlayerNames().addAll(region.getOwners().getPlayers());
+		return result;
+	}
+
+	/**
+	 * Build a DefaultDomain from a RegionAccessSet.
+	 * @param regionAccessSet RegionAccessSet to read
+	 * @return DefaultDomain containing the entities from the RegionAccessSet
+	 */
+	private DefaultDomain buildDomain(RegionAccessSet regionAccessSet) {
+		DefaultDomain owners = new DefaultDomain();
+
+		for(String playerName : regionAccessSet.getPlayerNames()) {
+			owners.addPlayer(playerName);
+		}
+
+		// Add by name since UUIDs were not yet supported
+		for(UUID uuid : regionAccessSet.getPlayerUniqueIds()) {
+			OfflinePlayer offlinePlayer = Bukkit.getOfflinePlayer(uuid);
+			if(offlinePlayer != null && offlinePlayer.getName() != null) {
+				owners.addPlayer(offlinePlayer.getName());
+			}
+		}
+
+		for(String group : regionAccessSet.getGroupNames()) {
+			owners.addGroup(group);
+		}
+
+		return owners;
+	}
+
+	@Override
+	public boolean containsMember(ProtectedRegion region, UUID player) {
+		if(player == null) {
+			return false;
+		} else {
+			String name = Bukkit.getOfflinePlayer(player).getName();
+			return name != null && region.getMembers().contains(name);
+		}
+	}
+
+	@Override
+	public boolean containsOwner(ProtectedRegion region, UUID player) {
+		if(player == null) {
+			return false;
+		} else {
+			String name = Bukkit.getOfflinePlayer(player).getName();
+			return name != null && region.getOwners().contains(name);
+		}
+	}
+
+	@Override
+	public Flag<?> fuzzyMatchFlag(String flagName) {
+		return DefaultFlag.fuzzyMatchFlag(flagName);
+	}
+
+	@Override
+	public <V> V parseFlagInput(Flag<V> flag, String input) throws InvalidFlagFormat {
+		return flag.parseInput(WorldGuardPlugin.inst(), null, input);
+	}
+
+	@Override
+	public RegionGroup parseFlagGroupInput(RegionGroupFlag flag, String input) throws InvalidFlagFormat {
+		return flag.parseInput(WorldGuardPlugin.inst(), null, input);
+	}
+
+	@Override
+	public org.bukkit.util.Vector getMinimumPoint(ProtectedRegion region) {
+		BlockVector min = region.getMinimumPoint();
+		return new org.bukkit.util.Vector(min.getX(), min.getY(), min.getZ());
+	}
+
+	@Override
+	public org.bukkit.util.Vector getMaximumPoint(ProtectedRegion region) {
+		BlockVector min = region.getMaximumPoint();
+		return new org.bukkit.util.Vector(min.getX(), min.getY(), min.getZ());
+	}
+
+	@Override
+	public List<org.bukkit.util.Vector> getRegionPoints(ProtectedRegion region) {
+		List<org.bukkit.util.Vector> result = new ArrayList<>();
+		for (BlockVector2D point : region.getPoints()) {
+			result.add(new org.bukkit.util.Vector(point.getX(), 0,point.getZ()));
+		}
+		return result;
+	}
+
+	@Override
+	public ProtectedCuboidRegion createCuboidRegion(String name, org.bukkit.util.Vector corner1, org.bukkit.util.Vector corner2) {
+		return new ProtectedCuboidRegion(name, new BlockVector(corner1.getBlockX(), corner1.getBlockY(), corner1.getBlockZ()), new BlockVector(corner2.getBlockX(), corner2.getBlockY(), corner2.getBlockZ()));
+	}
+}
@@ -0,0 +1 @@
+/target
@@ -0,0 +1,41 @@
+<project xmlns="http://maven.apache.org/POM/4.0.0" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
+         xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/xsd/maven-4.0.0.xsd">
+    <modelVersion>4.0.0</modelVersion>
+    <artifactId>areashop-worldguard-6</artifactId>
+    <packaging>jar</packaging>
+    <name>AreaShop WorldGuard 6</name>
+    <version>latest</version>
+
+    <parent>
+        <groupId>me.wiefferink</groupId>
+        <artifactId>areashop-parent</artifactId>
+        <version>parent</version>
+    </parent>
+
+    <dependencies>
+        <dependency>
+            <groupId>org.bukkit</groupId>
+            <artifactId>bukkit</artifactId>
+            <scope>system</scope>
+            <version>any</version>
+            <systemPath>${project.basedir}/../dependencies/bukkit-1.7.9-R0.2.jar</systemPath>
+            <type>jar</type>
+            <optional>true</optional>
+        </dependency>
+
+        <dependency>
+            <groupId>com.sk89q</groupId>
+            <artifactId>worldguard</artifactId>
+            <scope>system</scope>
+            <version>any</version>
+            <systemPath>${project.basedir}/../dependencies/worldguard-6.0.0-SNAPSHOT.jar</systemPath>
+        </dependency>
+
+        <dependency>
+            <groupId>me.wiefferink</groupId>
+            <artifactId>areashop-interface</artifactId>
+            <version>latest</version>
+            <type>jar</type>
+        </dependency>
+    </dependencies>
+</project>
@@ -0,0 +1,158 @@
+package me.wiefferink.areashop.handlers;
+
+import com.sk89q.worldedit.BlockVector;
+import com.sk89q.worldedit.BlockVector2D;
+import com.sk89q.worldedit.Vector;
+import com.sk89q.worldguard.bukkit.WorldGuardPlugin;
+import com.sk89q.worldguard.domains.DefaultDomain;
+import com.sk89q.worldguard.protection.flags.DefaultFlag;
+import com.sk89q.worldguard.protection.flags.Flag;
+import com.sk89q.worldguard.protection.flags.InvalidFlagFormat;
+import com.sk89q.worldguard.protection.flags.RegionGroup;
+import com.sk89q.worldguard.protection.flags.RegionGroupFlag;
+import com.sk89q.worldguard.protection.managers.RegionManager;
+import com.sk89q.worldguard.protection.regions.ProtectedCuboidRegion;
+import com.sk89q.worldguard.protection.regions.ProtectedRegion;
+import me.wiefferink.areashop.interfaces.AreaShopInterface;
+import me.wiefferink.areashop.interfaces.RegionAccessSet;
+import me.wiefferink.areashop.interfaces.WorldGuardInterface;
+import org.bukkit.Location;
+import org.bukkit.World;
+
+import java.util.ArrayList;
+import java.util.HashSet;
+import java.util.List;
+import java.util.Set;
+import java.util.UUID;
+
+public class WorldGuardHandler6 extends WorldGuardInterface {
+
+	public WorldGuardHandler6(AreaShopInterface pluginInterface) {
+		super(pluginInterface);
+	}
+
+	@Override
+	public RegionManager getRegionManager(World world) {
+		return WorldGuardPlugin.inst().getRegionManager(world);
+	}
+
+	@Override
+	public Set<ProtectedRegion> getApplicableRegionsSet(Location location) {
+		Set<ProtectedRegion> result = new HashSet<>();
+		Vector vector = new Vector(location.getX(), location.getY(), location.getZ());
+		for(ProtectedRegion region : getRegionManager(location.getWorld()).getRegions().values()) {
+			if(region.contains(vector)) {
+				result.add(region);
+			}
+		}
+		return result;
+	}
+
+	@Override
+	public void setOwners(ProtectedRegion region, RegionAccessSet regionAccessSet) {
+		DefaultDomain defaultDomain = buildDomain(regionAccessSet);
+		if(!region.getOwners().toUserFriendlyString().equals(defaultDomain.toUserFriendlyString())) {
+			region.setOwners(defaultDomain);
+		}
+	}
+
+	@Override
+	public void setMembers(ProtectedRegion region, RegionAccessSet regionAccessSet) {
+		DefaultDomain defaultDomain = buildDomain(regionAccessSet);
+		if(!region.getMembers().toUserFriendlyString().equals(defaultDomain.toUserFriendlyString())) {
+			region.setMembers(defaultDomain);
+		}
+	}
+
+	@Override
+	public RegionAccessSet getMembers(ProtectedRegion region) {
+		RegionAccessSet result = new RegionAccessSet();
+		result.getGroupNames().addAll(region.getMembers().getGroups());
+		result.getPlayerNames().addAll(region.getMembers().getPlayers());
+		result.getPlayerUniqueIds().addAll(region.getMembers().getUniqueIds());
+		return result;
+	}
+
+	@Override
+	public RegionAccessSet getOwners(ProtectedRegion region) {
+		RegionAccessSet result = new RegionAccessSet();
+		result.getGroupNames().addAll(region.getOwners().getGroups());
+		result.getPlayerNames().addAll(region.getOwners().getPlayers());
+		result.getPlayerUniqueIds().addAll(region.getOwners().getUniqueIds());
+		return result;
+	}
+
+	/**
+	 * Build a DefaultDomain from a RegionAccessSet.
+	 * @param regionAccessSet RegionAccessSet to read
+	 * @return DefaultDomain containing the entities from the RegionAccessSet
+	 */
+	private DefaultDomain buildDomain(RegionAccessSet regionAccessSet) {
+		DefaultDomain owners = new DefaultDomain();
+
+		for(String playerName : regionAccessSet.getPlayerNames()) {
+			owners.addPlayer(playerName);
+		}
+
+		for(UUID uuid : regionAccessSet.getPlayerUniqueIds()) {
+			owners.addPlayer(uuid);
+		}
+
+		for(String group : regionAccessSet.getGroupNames()) {
+			owners.addGroup(group);
+		}
+
+		return owners;
+	}
+
+	@Override
+	public boolean containsMember(ProtectedRegion region, UUID player) {
+		return region.getMembers().contains(player);
+	}
+
+	@Override
+	public boolean containsOwner(ProtectedRegion region, UUID player) {
+		return region.getOwners().contains(player);
+	}
+
+	@Override
+	public Flag<?> fuzzyMatchFlag(String flagName) {
+		return DefaultFlag.fuzzyMatchFlag(flagName);
+	}
+
+	@Override
+	public <V> V parseFlagInput(Flag<V> flag, String input) throws InvalidFlagFormat {
+		return flag.parseInput(WorldGuardPlugin.inst(), null, input);
+	}
+
+	@Override
+	public RegionGroup parseFlagGroupInput(RegionGroupFlag flag, String input) throws InvalidFlagFormat {
+		return flag.parseInput(WorldGuardPlugin.inst(), null, input);
+	}
+
+	@Override
+	public org.bukkit.util.Vector getMinimumPoint(ProtectedRegion region) {
+		BlockVector min = region.getMinimumPoint();
+		return new org.bukkit.util.Vector(min.getX(), min.getY(), min.getZ());
+	}
+
+	@Override
+	public org.bukkit.util.Vector getMaximumPoint(ProtectedRegion region) {
+		BlockVector min = region.getMaximumPoint();
+		return new org.bukkit.util.Vector(min.getX(), min.getY(), min.getZ());
+	}
+
+	@Override
+	public List<org.bukkit.util.Vector> getRegionPoints(ProtectedRegion region) {
+		List<org.bukkit.util.Vector> result = new ArrayList<>();
+		for (BlockVector2D point : region.getPoints()) {
+			result.add(new org.bukkit.util.Vector(point.getX(), 0,point.getZ()));
+		}
+		return result;
+	}
+
+	@Override
+	public ProtectedCuboidRegion createCuboidRegion(String name, org.bukkit.util.Vector corner1, org.bukkit.util.Vector corner2) {
+		return new ProtectedCuboidRegion(name, new BlockVector(corner1.getBlockX(), corner1.getBlockY(), corner1.getBlockZ()), new BlockVector(corner2.getBlockX(), corner2.getBlockY(), corner2.getBlockZ()));
+	}
+}
@@ -0,0 +1 @@
+/target
@@ -1,45 +1,41 @@
 <project xmlns="http://maven.apache.org/POM/4.0.0" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
         xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/xsd/maven-4.0.0.xsd">
    <modelVersion>4.0.0</modelVersion>
-    <artifactId>areashop-worldedit-7</artifactId>
+    <artifactId>areashop-worldguard-6_1_3</artifactId>
    <packaging>jar</packaging>
-    <name>AreaShop WorldEdit 7</name>
+    <name>AreaShop WorldGuard 6_1_3</name>
    <version>latest</version>

-    <description>
-        World Edit compatibility handler
-        - Deprecated usages on 7.2.0
-        - Compiles against 7.0.1, 7.1.0-SNAPSHOT, 7.2.0-SNAPSHOT
-    </description>
-
    <parent>
        <groupId>me.wiefferink</groupId>
        <artifactId>areashop-parent</artifactId>
-        <version>1.0</version>
-        <relativePath>../../pom.xml</relativePath>
+        <version>parent</version>
    </parent>

    <dependencies>
        <dependency>
-            <groupId>org.spigotmc</groupId>
-            <artifactId>spigot-api</artifactId>
-            <version>1.13.2-R0.1-SNAPSHOT</version>
-            <scope>provided</scope>
+            <groupId>org.bukkit</groupId>
+            <artifactId>bukkit</artifactId>
+            <scope>system</scope>
+            <version>any</version>
+            <systemPath>${project.basedir}/../dependencies/bukkit-1.7.9-R0.2.jar</systemPath>
            <type>jar</type>
            <optional>true</optional>
        </dependency>

        <dependency>
-            <groupId>com.sk89q.worldedit</groupId>
-            <artifactId>worldedit-bukkit</artifactId>
-            <version>7.0.1-SNAPSHOT</version>
-            <scope>provided</scope>
+            <groupId>com.sk89q.worldguard</groupId>
+            <artifactId>worldguard-legacy</artifactId>
+            <scope>system</scope>
+            <version>any</version>
+            <systemPath>${project.basedir}/../dependencies/worldguard-legacy-6.1.3-SNAPSHOT.jar</systemPath>
        </dependency>

        <dependency>
-            <groupId>com.sk89q.worldguard</groupId>
-            <artifactId>worldguard-bukkit</artifactId>
-            <version>7.0.4-SNAPSHOT</version>
+            <groupId>me.wiefferink</groupId>
+            <artifactId>areashop-worldguard-6</artifactId>
+            <version>latest</version>
+            <type>jar</type>
            <scope>provided</scope>
        </dependency>

@@ -0,0 +1,32 @@
+package me.wiefferink.areashop.handlers;
+
+import com.sk89q.worldguard.bukkit.WorldGuardPlugin;
+import com.sk89q.worldguard.protection.flags.DefaultFlag;
+import com.sk89q.worldguard.protection.flags.Flag;
+import com.sk89q.worldguard.protection.flags.FlagContext;
+import com.sk89q.worldguard.protection.flags.InvalidFlagFormat;
+import com.sk89q.worldguard.protection.flags.RegionGroup;
+import com.sk89q.worldguard.protection.flags.RegionGroupFlag;
+import me.wiefferink.areashop.interfaces.AreaShopInterface;
+
+public class WorldGuardHandler6_1_3 extends WorldGuardHandler6 {
+
+	public WorldGuardHandler6_1_3(AreaShopInterface pluginInterface) {
+		super(pluginInterface);
+	}
+
+	@Override
+	public Flag<?> fuzzyMatchFlag(String flagName) {
+		return DefaultFlag.fuzzyMatchFlag(WorldGuardPlugin.inst().getFlagRegistry(), flagName);
+	}
+
+	@Override
+	public <V> V parseFlagInput(Flag<V> flag, String input) throws InvalidFlagFormat {
+		return flag.parseInput(FlagContext.create().setInput(input).build());
+	}
+
+	@Override
+	public RegionGroup parseFlagGroupInput(RegionGroupFlag flag, String input) throws InvalidFlagFormat {
+		return flag.parseInput(FlagContext.create().setInput(input).build());
+	}
+}
@@ -0,0 +1 @@
+/target
@@ -0,0 +1,47 @@
+<project xmlns="http://maven.apache.org/POM/4.0.0" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
+         xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/xsd/maven-4.0.0.xsd">
+    <modelVersion>4.0.0</modelVersion>
+    <artifactId>areashop-worldguard-7_beta_1</artifactId>
+    <packaging>jar</packaging>
+    <name>AreaShop WorldGuard 7_beta_1</name>
+    <version>latest</version>
+
+    <parent>
+        <groupId>me.wiefferink</groupId>
+        <artifactId>areashop-parent</artifactId>
+        <version>parent</version>
+    </parent>
+
+    <dependencies>
+        <dependency>
+            <groupId>org.bukkit</groupId>
+            <artifactId>craftbukkit</artifactId>
+            <version>1.13-R0.1-SNAPSHOT</version>
+            <type>jar</type>
+            <optional>true</optional>
+        </dependency>
+
+        <dependency>
+            <groupId>com.sk89q</groupId>
+            <artifactId>worldedit</artifactId>
+            <scope>system</scope>
+            <version>any</version>
+            <systemPath>${project.basedir}/../dependencies/worldedit-bukkit-7.0.0-beta-01.jar</systemPath>
+        </dependency>
+
+        <dependency>
+            <groupId>com.sk89q</groupId>
+            <artifactId>worldguard</artifactId>
+            <scope>system</scope>
+            <version>any</version>
+            <systemPath>${project.basedir}/../dependencies/worldguard-legacy-7.0.0-beta-01.jar</systemPath>
+        </dependency>
+
+        <dependency>
+            <groupId>me.wiefferink</groupId>
+            <artifactId>areashop-interface</artifactId>
+            <version>latest</version>
+            <type>jar</type>
+        </dependency>
+    </dependencies>
+</project>
@@ -0,0 +1,160 @@
+package me.wiefferink.areashop.handlers;
+
+import com.sk89q.worldedit.BlockVector;
+import com.sk89q.worldedit.BlockVector2D;
+import com.sk89q.worldedit.Vector;
+import com.sk89q.worldedit.bukkit.BukkitAdapter;
+import com.sk89q.worldguard.WorldGuard;
+import com.sk89q.worldguard.domains.DefaultDomain;
+import com.sk89q.worldguard.protection.flags.Flag;
+import com.sk89q.worldguard.protection.flags.FlagContext;
+import com.sk89q.worldguard.protection.flags.Flags;
+import com.sk89q.worldguard.protection.flags.InvalidFlagFormat;
+import com.sk89q.worldguard.protection.flags.RegionGroup;
+import com.sk89q.worldguard.protection.flags.RegionGroupFlag;
+import com.sk89q.worldguard.protection.managers.RegionManager;
+import com.sk89q.worldguard.protection.regions.ProtectedCuboidRegion;
+import com.sk89q.worldguard.protection.regions.ProtectedRegion;
+import me.wiefferink.areashop.interfaces.AreaShopInterface;
+import me.wiefferink.areashop.interfaces.RegionAccessSet;
+import me.wiefferink.areashop.interfaces.WorldGuardInterface;
+import org.bukkit.Location;
+import org.bukkit.World;
+
+import java.util.ArrayList;
+import java.util.HashSet;
+import java.util.List;
+import java.util.Set;
+import java.util.UUID;
+
+public class WorldGuardHandler7_beta_1 extends WorldGuardInterface {
+
+	public WorldGuardHandler7_beta_1(AreaShopInterface pluginInterface) {
+		super(pluginInterface);
+	}
+
+	@Override
+	public RegionManager getRegionManager(World world) {
+		return WorldGuard.getInstance().getPlatform().getRegionContainer().get(BukkitAdapter.adapt(world));
+	}
+
+	@Override
+	public Set<ProtectedRegion> getApplicableRegionsSet(Location location) {
+		Set<ProtectedRegion> result = new HashSet<>();
+		Vector vector = new Vector(location.getX(), location.getY(), location.getZ());
+		for(ProtectedRegion region : getRegionManager(location.getWorld()).getRegions().values()) {
+			if(region.contains(vector)) {
+				result.add(region);
+			}
+		}
+		return result;
+	}
+
+	@Override
+	public void setOwners(ProtectedRegion region, RegionAccessSet regionAccessSet) {
+		DefaultDomain defaultDomain = buildDomain(regionAccessSet);
+		if(!region.getOwners().toUserFriendlyString().equals(defaultDomain.toUserFriendlyString())) {
+			region.setOwners(defaultDomain);
+		}
+	}
+
+	@Override
+	public void setMembers(ProtectedRegion region, RegionAccessSet regionAccessSet) {
+		DefaultDomain defaultDomain = buildDomain(regionAccessSet);
+		if(!region.getMembers().toUserFriendlyString().equals(defaultDomain.toUserFriendlyString())) {
+			region.setMembers(defaultDomain);
+		}
+	}
+
+	@Override
+	public RegionAccessSet getMembers(ProtectedRegion region) {
+		RegionAccessSet result = new RegionAccessSet();
+		result.getGroupNames().addAll(region.getMembers().getGroups());
+		result.getPlayerNames().addAll(region.getMembers().getPlayers());
+		result.getPlayerUniqueIds().addAll(region.getMembers().getUniqueIds());
+		return result;
+	}
+
+	@Override
+	public RegionAccessSet getOwners(ProtectedRegion region) {
+		RegionAccessSet result = new RegionAccessSet();
+		result.getGroupNames().addAll(region.getOwners().getGroups());
+		result.getPlayerNames().addAll(region.getOwners().getPlayers());
+		result.getPlayerUniqueIds().addAll(region.getOwners().getUniqueIds());
+		return result;
+	}
+
+	/**
+	 * Build a DefaultDomain from a RegionAccessSet.
+	 * @param regionAccessSet RegionAccessSet to read
+	 * @return DefaultDomain containing the entities from the RegionAccessSet
+	 */
+	private DefaultDomain buildDomain(RegionAccessSet regionAccessSet) {
+		DefaultDomain owners = new DefaultDomain();
+
+		for(String playerName : regionAccessSet.getPlayerNames()) {
+			owners.addPlayer(playerName);
+		}
+
+		for(UUID uuid : regionAccessSet.getPlayerUniqueIds()) {
+			owners.addPlayer(uuid);
+		}
+
+		for(String group : regionAccessSet.getGroupNames()) {
+			owners.addGroup(group);
+		}
+
+		return owners;
+	}
+
+	@Override
+	public boolean containsMember(ProtectedRegion region, UUID player) {
+		return region.getMembers().contains(player);
+	}
+
+	@Override
+	public boolean containsOwner(ProtectedRegion region, UUID player) {
+		return region.getOwners().contains(player);
+	}
+
+	@Override
+	public Flag<?> fuzzyMatchFlag(String flagName) {
+		return Flags.fuzzyMatchFlag(WorldGuard.getInstance().getFlagRegistry(), flagName);
+	}
+
+	@Override
+	public <V> V parseFlagInput(Flag<V> flag, String input) throws InvalidFlagFormat {
+		return flag.parseInput(FlagContext.create().setInput(input).build());
+	}
+
+	@Override
+	public RegionGroup parseFlagGroupInput(RegionGroupFlag flag, String input) throws InvalidFlagFormat {
+		return flag.parseInput(FlagContext.create().setInput(input).build());
+	}
+
+	@Override
+	public org.bukkit.util.Vector getMinimumPoint(ProtectedRegion region) {
+		BlockVector min = region.getMinimumPoint();
+		return new org.bukkit.util.Vector(min.getX(), min.getY(), min.getZ());
+	}
+
+	@Override
+	public org.bukkit.util.Vector getMaximumPoint(ProtectedRegion region) {
+		BlockVector min = region.getMaximumPoint();
+		return new org.bukkit.util.Vector(min.getX(), min.getY(), min.getZ());
+	}
+
+	@Override
+	public List<org.bukkit.util.Vector> getRegionPoints(ProtectedRegion region) {
+		List<org.bukkit.util.Vector> result = new ArrayList<>();
+		for (BlockVector2D point : region.getPoints()) {
+			result.add(new org.bukkit.util.Vector(point.getX(), 0,point.getZ()));
+		}
+		return result;
+	}
+
+	@Override
+	public ProtectedCuboidRegion createCuboidRegion(String name, org.bukkit.util.Vector corner1, org.bukkit.util.Vector corner2) {
+		return new ProtectedCuboidRegion(name, new BlockVector(corner1.getBlockX(), corner1.getBlockY(), corner1.getBlockZ()), new BlockVector(corner2.getBlockX(), corner2.getBlockY(), corner2.getBlockZ()));
+	}
+}
@@ -0,0 +1 @@
+/target